diff options
| author | Santi Béjar <sbejar@gmail.com> | 2006-10-01 05:34:17 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-30 22:13:28 -0700 |
| commit | ba0ac36ec5708820e670731001f7ab35351c6c48 (patch) | |
| tree | 67829a9b6a4f9380f6542b3d77e72a40abb8a090 | |
| parent | 20a3847d8a5032ce41f90dcc68abfb36e6fee9b1 (diff) | |
| download | git-ba0ac36ec5708820e670731001f7ab35351c6c48.tar.gz git-ba0ac36ec5708820e670731001f7ab35351c6c48.tar.xz | |
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>
| -rwxr-xr-x | git-merge.sh | 2 | ||||
| -rwxr-xr-x | git-resolve.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh index 5b34b4de9..49c46d55d 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" && diff --git a/git-resolve.sh b/git-resolve.sh index 729ec65dc..36b90e384 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" |