summaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@student.ethz.ch>2009-02-16 17:34:57 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-30 09:06:48 -0700
commit67f1fe5f08d3f6146cf13f8a65ceeab1509581a8 (patch)
treec58c0f46a91c8f58cab2f3bd58ab5a9ed2268d7b /t/t6026-merge-attr.sh
parentgit-tag(1): add hint about commit messages (diff)
downloadtgif-67f1fe5f08d3f6146cf13f8a65ceeab1509581a8.tar.xz
bash completion: only show 'log --merge' if merging
The gitk completion only shows --merge if MERGE_HEAD is present. Do it the same way for git-log completion. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6026-merge-attr.sh')
0 files changed, 0 insertions, 0 deletions