summaryrefslogtreecommitdiffstats
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorDaniel Barkalow <barkalow@iabervon.org>2009-03-09 02:06:05 +0100
committerJunio C Hamano <gitster@pobox.com>2009-03-09 23:41:16 +0100
commita9c37a72c4fbc8537de294d66b05bdfd7f9a4016 (patch)
tree117ca075b1b84094aaabc9e4145434868ab43228 /git-merge-resolve.sh
parentbuiltin-remote.c: no "commented out" code, please (diff)
downloadgit-a9c37a72c4fbc8537de294d66b05bdfd7f9a4016.tar.xz
git-a9c37a72c4fbc8537de294d66b05bdfd7f9a4016.zip
Use a common function to get the pretty name of refs
The result should be consistent between fetch and push, so we ought to use the same code in both cases, even though it's short. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions