diff options
| author | Richard Quirk <richard.quirk@gmail.com> | 2008-04-27 17:35:10 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-27 21:38:22 -0700 |
| commit | 07ba53f724b95a817f957b8e943c9e4f545a0949 (patch) | |
| tree | e2aff2295122b87eb5878adf173b0e9c016f1063 /combine-diff.c | |
| parent | rev-parse: fix --verify to error out when passed junk after a good rev (diff) | |
| download | git-07ba53f724b95a817f957b8e943c9e4f545a0949.tar.gz git-07ba53f724b95a817f957b8e943c9e4f545a0949.zip | |
bash: Add completion for gitk --merge
Option is only completed when .git/MERGE_HEAD is present.
Signed-off-by: Richard Quirk <richard.quirk@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions