mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fixes early for next maint series.

Browse Source
This commit is contained in:
Junio C Hamano
2006-02-23 22:27:03 -08:00
parent 1d3d03bbea 7bd1527d2d
commit 816c02ce8e
9 changed files with 82 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-merge.sh
View File

@ -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."