diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-09 21:09:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-09 21:09:43 -0800 |
| commit | 23ea3e201cea0deea909569e08e950a9ec2345f7 (patch) | |
| tree | 614520079f232d1459467b6e718182a8721aadd5 /git-merge.sh | |
| parent | 5ca15b8af7f018b9ae9da30130f9dcd1a896e0b3 (diff) | |
| parent | a1c292958f9968565f4048a17196d99fd16fc7ca (diff) | |
GIT 0.99.9gv0.99.9g
Another snapshot, as slow and steady marth towards 1.0 continues.
Major changes include:
- Jim Radford's RPM split.
- Fredrik's recursive merge strategy is now default for two heads merge.
- Yaacov's SVN importer updates.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh index b810fceaf8..7f481e4caa 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -110,7 +110,14 @@ do die "$remote - not something we can merge" done -common=$(git-show-branch --merge-base $head "$@") +case "$#" in +1) + common=$(git-merge-base --all $head "$@") + ;; +*) + common=$(git-show-branch --merge-base $head "$@") + ;; +esac echo "$head" >"$GIT_DIR/ORIG_HEAD" case "$#,$common,$no_commit" in @@ -162,7 +169,7 @@ case "$#,$common,$no_commit" in up_to_date=t for remote do - common_one=$(git-merge-base $head $remote) + common_one=$(git-merge-base --all $head $remote) if test "$common_one" != "$remote" then up_to_date=f |