diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-23 22:27:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-23 22:27:03 -0800 |
| commit | 816c02ce8ecddce065e83db9f4ecb78f6b0e23dc (patch) | |
| tree | b85fa8225e982f67dd4e9d516b92c3f03a1f99bc /git-merge.sh | |
| parent | 1d3d03bbeaaf55844868affc96231930aae792e6 (diff) | |
| parent | 7bd1527d2d8c80a6e9a0f8583082a5aee5428c68 (diff) | |
| download | git-816c02ce8ecddce065e83db9f4ecb78f6b0e23dc.tar.gz | |
Merge fixes early for next maint series.
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh index 4609fe54d5..7be9e81f1f 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -134,7 +134,7 @@ case "$#,$common,$no_commit" in echo "Updating from $head to $1." git-update-index --refresh 2>/dev/null new_head=$(git-rev-parse --verify "$1^0") && - git-read-tree -u -m $head "$new_head" && + git-read-tree -u -v -m $head "$new_head" && finish "$new_head" "Fast forward" dropsave exit 0 @@ -150,7 +150,7 @@ case "$#,$common,$no_commit" in echo "Trying really trivial in-index merge..." git-update-index --refresh 2>/dev/null - if git-read-tree --trivial -m -u $common $head "$1" && + if git-read-tree --trivial -m -u -v $common $head "$1" && result_tree=$(git-write-tree) then echo "Wonderful." |