summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Santi Béjar <sbejar@gmail.com>2006-10-01 05:34:17 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2006-09-30 22:13:28 -0700
commitba0ac36ec5708820e670731001f7ab35351c6c48 (patch)
tree67829a9b6a4f9380f6542b3d77e72a40abb8a090 /git-merge-octopus.sh
parentfetch: Misc output cleanup (diff)
downloadtgif-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