summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Lee Marlow <lee.marlow@gmail.com>2008-08-14 16:41:11 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-08-14 17:49:12 -0700
commit5a13c8f6f7ef7463ddaa3dd7144bf66af4fcd9be (patch)
treedc8099aef712240eba61db1b6745d13698784ad3 /merge-index.c
parentbash completion: Add completion for 'git mergetool' (diff)
downloadtgif-5a13c8f6f7ef7463ddaa3dd7144bf66af4fcd9be.tar.xz
bash completion: Add '--merge' long option for 'git log'
Signed-off-by: Lee Marlow <lee.marlow@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions