diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-11 22:05:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-11 22:05:58 -0700 |
| commit | 3499cb1ae7b97ce8f67879156e2014e31dd985b6 (patch) | |
| tree | 7985807d8eb0936df801616e76ba63578731745a /diff-no-index.c | |
| parent | merge-recursive: demonstrate an incorrect conflict with submodule (diff) | |
| parent | t/README: document --root option (diff) | |
| download | git-3499cb1ae7b97ce8f67879156e2014e31dd985b6.tar.gz git-3499cb1ae7b97ce8f67879156e2014e31dd985b6.zip | |
Merge branch 'maint'
* maint:
t/README: document --root option
Makefile: default pager on AIX to "more"
Diffstat (limited to 'diff-no-index.c')
0 files changed, 0 insertions, 0 deletions