diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:05:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:05:38 -0800 |
| commit | 33256e6b1bfb597f6505a7f40554097035c9ab60 (patch) | |
| tree | c11c1e63052e9a6e16c3487a48b811e1b9d89ed9 /Documentation/howto/revert-a-faulty-merge.txt | |
| parent | Merge branch 'as/autocorrect-alias' (diff) | |
| parent | diff --no-index -q: fix endless loop (diff) | |
| download | tgif-33256e6b1bfb597f6505a7f40554097035c9ab60.tar.xz | |
Merge branch 'tr/maint-no-index-fixes'
* tr/maint-no-index-fixes:
diff --no-index -q: fix endless loop
diff --no-index: test for pager after option parsing
diff: accept -- when using --no-index
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions