diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-05-13 21:05:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-13 21:05:59 -0700 |
| commit | 58066bec5a2cd8f5b6bb4884c8162364374ba0c1 (patch) | |
| tree | ffda17b9a7ebbca8a7c96fc43a4e70c134dbd108 /Documentation/merge-config.txt | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| parent | ls-tree manpage: output of ls-tree is compatible with update-index (diff) | |
| download | tgif-58066bec5a2cd8f5b6bb4884c8162364374ba0c1.tar.xz | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
ls-tree manpage: output of ls-tree is compatible with update-index
ls-tree manpage: use "unless" instead of "when ... is not"
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions