diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-23 19:04:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-23 19:04:48 -0800 |
| commit | f630171d9d1839669446506aff0704a4dfe98b99 (patch) | |
| tree | 6fbf9fbff5cdf5b1ad1df6147090ce5f131a543c /t/t6024-recursive-merge.sh | |
| parent | Merge branch 'rs/maint-shortlog-foldline' into maint (diff) | |
| parent | diff --no-index -q: fix endless loop (diff) | |
| download | tgif-f630171d9d1839669446506aff0704a4dfe98b99.tar.xz | |
Merge branch 'tr/maint-no-index-fixes' into maint
* 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 't/t6024-recursive-merge.sh')
0 files changed, 0 insertions, 0 deletions