summaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2009-02-16 17:34:57 +0100
committerJunio C Hamano <gitster@pobox.com>2009-02-18 10:41:45 -0800
commitbf3c20f6e855521fb92f455a9e70fbe8f107c53d (patch)
treeccb794c4c38985f68e873dba98b8b2a672c0509b /gitweb
parenta393777ec9ca7c33cb76efa225ddacc53784c0dd (diff)
downloadgit-bf3c20f6e855521fb92f455a9e70fbe8f107c53d.tar.gz
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 'gitweb')
0 files changed, 0 insertions, 0 deletions