undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge and resolve: Output short hashes and .. in "Updating ..."

Browse Source 
Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Santi Béjar 2006-10-01 05:34:17 +02:00 committed by Junio C Hamano
parent 20a3847d8a
commit ba0ac36ec5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge.sh
View File

@ -197,7 +197,7 @@ f,*)
;; ;;
?,1,"$head",*) ?,1,"$head",*)
# Again the most common case of merging one remote. # Again the most common case of merging one remote.
echo "Updating from $head to $1" echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
git-update-index --refresh 2>/dev/null git-update-index --refresh 2>/dev/null
new_head=$(git-rev-parse --verify "$1^0") && new_head=$(git-rev-parse --verify "$1^0") &&
git-read-tree -u -v -m $head "$new_head" && git-read-tree -u -v -m $head "$new_head" &&

2
git-resolve.sh
View File

@ -46,7 +46,7 @@ case "$common" in
exit 0 exit 0
;; ;;
"$head") "$head")
echo "Updating from $head to $merge" echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $merge)"
git-read-tree -u -m $head $merge || exit 1 git-read-tree -u -m $head $merge || exit 1
git-update-ref -m "resolve $merge_name: Fast forward" \ git-update-ref -m "resolve $merge_name: Fast forward" \
HEAD "$merge" "$head" HEAD "$merge" "$head"