git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a393777)
bash completion: only show 'log --merge' if merging
authorThomas Rast <redacted>
Mon, 16 Feb 2009 16:34:57 +0000 (17:34 +0100)
committerJunio C Hamano <redacted>
Wed, 18 Feb 2009 18:41:45 +0000 (10:41 -0800)
commitbf3c20f6e855521fb92f455a9e70fbe8f107c53d
treeccb794c4c38985f68e873dba98b8b2a672c0509btree | snapshot
parenta393777ec9ca7c33cb76efa225ddacc53784c0ddcommit | diff
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 <redacted>
Acked-by: Shawn O. Pearce <redacted>
Signed-off-by: Junio C Hamano <redacted>
contrib/completion/git-completion.bash diff | blob | history
git clone https://git.99rst.org/PROJECT