@matheusbsbs / matheus-bagliano / commits / ba0ac36ec5
Fork 0

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

Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Santi Béjar committed Oct 1, 2006 at 05:34 UTC ba0ac36ec5708820e670731001f7ab35351c6c48
2 files changed +2 -2
git-merge.sh
+1 -1
@@ -197,7 +197,7 @@ f,*)
197 ;;
198 ?,1,"$head",*)
199 # Again the most common case of merging one remote.
200 - echo "Updating from $head to $1"
200 + echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
201 git-update-index --refresh 2>/dev/null
202 new_head=$(git-rev-parse --verify "$1^0") &&
203 git-read-tree -u -v -m $head "$new_head" &&
git-resolve.sh
+1 -1
@@ -46,7 +46,7 @@ case "$common" in
46 exit 0
47 ;;
48 "$head")
49 - echo "Updating from $head to $merge"
49 + echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $merge)"
50 git-read-tree -u -m $head $merge || exit 1
51 git-update-ref -m "resolve $merge_name: Fast forward" \
52 HEAD "$merge" "$head"