Commits

Author Commit Message Labels Comments Date
Junio C Hamano
git-fetch: send informational output to >&2 consistently. Only the "Fetching ... using http" was leaking to stdout. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Give default merge message after failed automerge. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Do not require clean tree when reverting and cherry-picking. My stupidity deserved to be yelled at by Linus ... there is no reason to require the working tree to be clean when merging -- the only requirements are index to match HEAD commit and the paths involved in merge are up to date in the working tree. Revert and cherry-pick are just specialized forms of merge, and the requirements should be the same. Remove the 'general purpose routine to make sure t…
Junio C Hamano
Fix overzealous cleanliness check in git-merge Being able to try multiple strategies and automatically picking one that seems to give less conflicting result may or may not much sense in practice. At least that should not force normal use case to additionally require the working tree to be fully clean. As Linus shouted, local changes do not matter unless they interfere with the merge. This commit changes git-merge not to require a clean wor…
Junio C Hamano
git-clone: check out "master" by default. And with -n flag you can tell it not to. Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Mackerras
Use "$@" rather than "${1+$@}" when invoking wish.
Junio C Hamano
Plug a small race in update-ref.c. Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Mackerras
Change wish8.4 back to wish Checking in the change from wish to wish8.4 was a mistake; I had changed it for a test but forgot to change it back before checking in a patch.
Linus Torvalds
[PATCH] Add "git-update-ref" to update the HEAD (or other) ref This is a careful version of the script stuff that currently just blindly writes HEAD with a new value. You can use git-update-ref HEAD <newhead> or git-update-ref HEAD <newhead> <oldhead> where the latter version verifies that the old value of HEAD matches oldhead. It basically allows a "ref" file to be a symbolic pointer to another ref file by starting with the four-byte header sequence …
Fredrik Kuivinen
[PATCH] More descriptive messages for conflict cases in merges The merge strategies can give more descriptive error messages for conflict cases if they are given the actual branch names instead of the SHA1s. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen
[PATCH] recursive-merge: Don't print a stack trace when read-tree fails. If the working tree is dirty read-tree will fail, and we don't want an ugly stack trace in that case. Also make sure we don't print stack traces when we use 'die'. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Diff: --name-status output format. The new output format shows only the status letter and paths. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Diff: -l<num> to limit rename/copy detection. When many paths are modified, rename detection takes a lot of time. The new option -l<num> can be used to disable rename detection when more than <num> paths are possibly created as renames. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Diff clean-up. This is a long overdue clean-up to the code for parsing and passing diff options. It also tightens some constness issues. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'fixes'
Junio C Hamano
Clean generated files a bit more. Now we conditionally compile things in compat/, so we should remove object files there. Python execution can leave *.pyc and *.pyo, which need to be cleaned as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Stop installing the backward compatible symlinks. Also cmd-renames.sh can now be used to remove the backward compatible symlinks -- this is not used by default in any way. As discussed on the list with Pasky, git-ssh-push and git-ssh-pull will keep calling each other for a while longer. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
show-branch: fix commit naming breakage. It was ignoring the generation number of the commit when naming 2nd and later parents, showing "(linus^n)^2" for any <n> incorrectly as "linus^2". Signed-off-by: Junio C Hamano <junkio@cox.net>
Daniel Barkalow
[PATCH] Finish documenting trivial merge rules Fix missing symbol explanations, a few incorrect cases, and add two-way merge rules. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
git-grep: fix 'git grep -e $pattern' handling People typically say 'grep -e $pattern' because $pattern has a leading dash which would be mistaken as a grep flag. Make sure we pass -e in front of $pattern when we invoke grep. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Remove use of 'xargs -0' from git-reset. Even without the trouble it causes to people without GNU xargs, it was not really necessary to print from Perl and then remove it outside. Just unlink it inside Perl. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Use 0.99.7.GIT as version between 0.99.7 and 0.99.8 Pasky taught me how he does his versioning for ELinks. This will sort after 0.99.7 and interim fixes 0.99.7a, and before 0.99.8. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Solaris: give a bit more built-in defaults. Taking the make command line Peter Eriksen uses, give defaults to SHELL_PATH, TAR, CURLDIR, NO_STRCASESTR, and INSTALL. Signed-off-by: Junio C Hamano <junkio@cox.net>
Patrick Mauritz
[PATCH] CURLDIR in Makefile Support systems that do not install curl headers and libraries in /usr/{include,lib}. Signed-off-by: Patrick Mauritz <oxygene@studentenbude.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
Petr Baudis
[PATCH] Rename daemon.c's lognotice() to loginfo() The syslog code logs with severity LOG_INFO in the loginfo() function, so make things less confusing. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Petr Baudis
[PATCH] git-daemon --syslog to log through syslog Well, this makes it even more clear that we need the packet reader and friends to use the daemon logging code. :/ Therefore, we at least indicate in the "Disconnect" log message if the child process exitted with an error code or not. Idea by Linus. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Petr Baudis
[PATCH] Update git-daemon documentation wrt. the --verbose parameter Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Really ignore generated distribution material. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
daemon.c: pid_t is not int. Reported by Morten Welinder <mwelinder@gmail.com>. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge 'fixes' branch. Signed-off-by: Junio C Hamano <junkio@cox.net>
  1. Prev
  2. Next