![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Thomas Rast <trast@student.ethz.ch> | |
| Mon, 16 Feb 2009 16:34:57 +0000 (17:34 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Feb 2009 18:41:45 +0000 (10:41 -0800) | ||
| commit | bf3c20f6e855521fb92f455a9e70fbe8f107c53d | |
| tree | ccb794c4c38985f68e873dba98b8b2a672c0509b | tree | snapshot |
| parent | a393777ec9ca7c33cb76efa225ddacc53784c0dd | commit | 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 <trast@student.ethz.ch>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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>
| contrib/completion/git-completion.bash | diff | blob | history |