diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-08-24 12:05:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-24 12:05:40 -0700 |
| commit | 7939a33425d0efabb9d1ce3f94ecbc3ef560c359 (patch) | |
| tree | 6af43956135de9c9bea3809313d9afa4f2411314 /Documentation/git-merge-file.txt | |
| parent | Merge branch 'hv/coding-guidelines' into maint-1.7.11 (diff) | |
| parent | rev-list docs: clarify --topo-order description (diff) | |
| download | tgif-7939a33425d0efabb9d1ce3f94ecbc3ef560c359.tar.xz | |
Merge branch 'jc/maint-rev-list-topo-doc' into maint-1.7.11
It was unclear what "--topo-order" was really about in the
documentation. It is not just about "children before parent", but
also about "don't mix lineages".
* jc/maint-rev-list-topo-doc:
rev-list docs: clarify --topo-order description
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions