summaryrefslogtreecommitdiff
path: root/git-resolve.sh
diff options
context:
space:
mode:
authorSanti Béjar <sbejar@gmail.com>2006-10-01 05:34:17 +0200
committerJunio C Hamano <junkio@cox.net>2006-09-30 22:13:28 -0700
commitba0ac36ec5708820e670731001f7ab35351c6c48 (patch)
tree67829a9b6a4f9380f6542b3d77e72a40abb8a090 /git-resolve.sh
parent20a3847d8a5032ce41f90dcc68abfb36e6fee9b1 (diff)
downloadgit-ba0ac36ec5708820e670731001f7ab35351c6c48.tar.gz
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>
Diffstat (limited to 'git-resolve.sh')
-rwxr-xr-xgit-resolve.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-resolve.sh b/git-resolve.sh
index 729ec65dc9..36b90e3849 100755
--- a/git-resolve.sh
+++ b/git-resolve.sh
@@ -46,7 +46,7 @@ case "$common" in
exit 0
;;
"$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-update-ref -m "resolve $merge_name: Fast forward" \
HEAD "$merge" "$head"