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 /git-merge-octopus.sh | |
parent | fetch: Misc output cleanup (diff) | |
download | tgif-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>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions