diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-18 22:08:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-18 22:08:29 -0700 |
| commit | a4c6ae5a76f6f18876be69e5c1684f425e04bfc1 (patch) | |
| tree | 8376d41bcb2b012159db6c4feecad08e082e667f /git-resolve.sh | |
| parent | 170487fbc3d7ec0f36208eed18d4ca0ea1e1acb7 (diff) | |
| parent | ba0ac36ec5708820e670731001f7ab35351c6c48 (diff) | |
| download | git-a4c6ae5a76f6f18876be69e5c1684f425e04bfc1.tar.gz | |
Merge branch 'sb/fetch'
* sb/fetch:
merge and resolve: Output short hashes and .. in "Updating ..."
fetch: Misc output cleanup
Diffstat (limited to 'git-resolve.sh')
| -rwxr-xr-x | git-resolve.sh | 2 |
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" |