summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorSanti Béjar <sbejar@gmail.com>2006-10-01 03:34:17 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-01 05:13:28 (GMT)
commitba0ac36ec5708820e670731001f7ab35351c6c48 (patch)
tree67829a9b6a4f9380f6542b3d77e72a40abb8a090 /git-merge.sh
parent20a3847d8a5032ce41f90dcc68abfb36e6fee9b1 (diff)
downloadgit-ba0ac36ec5708820e670731001f7ab35351c6c48.zip
git-ba0ac36ec5708820e670731001f7ab35351c6c48.tar.gz
git-ba0ac36ec5708820e670731001f7ab35351c6c48.tar.bz2
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-merge.sh')
-rwxr-xr-xgit-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 5b34b4d..49c46d5 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -197,7 +197,7 @@ f,*)
;;
?,1,"$head",*)
# 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
new_head=$(git-rev-parse --verify "$1^0") &&
git-read-tree -u -v -m $head "$new_head" &&