diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2009-02-16 17:34:57 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-30 18:06:48 +0200 |
| commit | 67f1fe5f08d3f6146cf13f8a65ceeab1509581a8 (patch) | |
| tree | c58c0f46a91c8f58cab2f3bd58ab5a9ed2268d7b /builtin-merge-file.c | |
| parent | git-tag(1): add hint about commit messages (diff) | |
| download | git-67f1fe5f08d3f6146cf13f8a65ceeab1509581a8.tar.xz git-67f1fe5f08d3f6146cf13f8a65ceeab1509581a8.zip | |
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 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions