summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Jay Soffian <jaysoffian@gmail.com>2009-02-25 03:32:24 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-27 15:19:09 -0800
commite61e0cc6b7061d7e791e1c9722b9c4a6d85d629c (patch)
tree1d0d9b446d13d96ec13cf5eecc05968d069c5020 /git-merge-octopus.sh
parentbuiltin-remote: fix two inconsistencies in the output of "show <remote>" (diff)
downloadtgif-e61e0cc6b7061d7e791e1c9722b9c4a6d85d629c.tar.xz
builtin-remote: teach show to display remote HEAD
This is in preparation for teaching remote how to set refs/remotes/<remote>/HEAD to match what HEAD is set to at <remote>, but is useful in its own right. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions