Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Use git-merge in git-pull (second try). This again makes git-pull to use git-merge, so that different merge strategy can be specified from the command line. Without explicit strategy parameter, it defaults to git-merge-resolve if only one remote is pulled, and git-merge-octopus otherwise, to keep the default behaviour of the command the same as the original. Also this brings another usability measure: -n flag from the command line, if…
Junio C Hamano
Use git-update-ref in scripts. This uses the git-update-ref command in scripts for safer updates. Also places where we used to read HEAD ref by using "cat" were fixed to use git-rev-parse. This will matter when we start using symbolic references. Signed-off-by: Junio C Hamano <junkio@cox.net>
Peter Hagervall
[PATCH] Make some needlessly global stuff static Insert 'static' where appropriate. Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld
[PATCH] Support for more CURL SSL settings via environment variables Added support for additional CURL SSL settings via environment variables. Client certificate/key files can be specified as well as alternate CA information. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Tom Prince
[PATCH] Add new programs to .gitignore. Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Fastpath the normal case by not checking that index matches HEAD. The merge strategy would check this itself and typically does it by using git-read-tree -m -u 3-way merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Fix default pull not to do an unintended Octopus. The refspecs specified in the .git/remotes/<remote> on the "Pull: " lines are for fetching multiple heads in one go, but most of the time making an Octopus out of them is not what is wanted. Make git-fetch leave the marker in .git/FETCH_HEAD file so that later stages can tell which heads are for merging and which are not. Tom Prince made me realize how stupid the original behaviour was. Signed-…
Junio C Hamano
Update the case table in t/t1000. It still talked about "the proposed alternative semantics" but we have used those alternative semantics for quite some time. Update them to avoid confusion. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge master.kernel.org:/home/hpa/git/daemon
Junio C Hamano
git-commit: use update-index --stdin, instead of xargs. Now update-index supports '-z --stdin', we do not have to rely on platform xargs to support -0 option. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
update-index: document --stdin and -z Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
update-index: --stdin and -z The new option --stdin reads list of paths to be updated from the standard input. As usual, -z means the paths are terminated with NUL characters, as opposed to LF without that option. This is useful to use git-diff-files -z and git-ls-files -z when the platform xargs does not support -0 option, and obviously saves one process even when xargs can take -0. Signed-off-by: Junio C Hamano <junkio@c…
H. Peter Anvin
COPTS -> CFLAGS
H. Peter Anvin
Parallelize the build
H. Peter Anvin
H. Peter Anvin
Restore chdir(".git")
Nick Hengeveld
[PATCH] Return CURL error message when object transfer fails Return CURL error message when object transfer fails [jc: added similar curl_errorstr errors to places where we use curl_easy_perform() to run fetch that _must_ succeed.] Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Daniel Barkalow
[PATCH] Implement --recover for git-*-fetch With the --recover option, we verify that we have absolutely everything reachable from the target, not assuming that things reachable from refs will be complete. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Sven Verdoolaege
[PATCH] Provide access to git_dir through get_git_dir(). Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Peter Eriksen
[PATCH] Make the test more shell generic and fix missing Solaris find option This is from Peter Eriksen, but further fixed. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Really require tk 8.4 (RPM) **BLUSH** Signed-off-by: Junio C Hamano <junkio@cox.net>
H. Peter Anvin
Support a modicum of path validation, and allow an export all trees option.
Junio C Hamano
Require tk 8.4 (RPM) Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
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.
  1. Prev
  2. Next