summaryrefslogtreecommitdiff
path: root/mergetools/tkdiff
diff options
context:
space:
mode:
authorLibravatar Martin Ågren <martin.agren@gmail.com>2018-03-10 12:52:10 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-13 12:20:03 -0700
commita8210328f4db27cc119178b33e9512f8fcbba35c (patch)
treea588045e32c1193111b9d6d05032f4ce1ffaaf50 /mergetools/tkdiff
parentMerge branch 'ys/bisect-object-id-missing-conversion-fix' into maint (diff)
downloadtgif-a8210328f4db27cc119178b33e9512f8fcbba35c.tar.xz
git-shortlog.txt: reorder usages
The first usage we give is the original one where, e.g., `git log` is piped through `git shortlog`. The description that follows reads the other way round, by first focusing on the general behavior, then ending with the behavior when reading from stdin. It is also a tiny bit odd that what is probably the most common usage and the one a reader is probably looking for is not at the top of the list. Of course, it is only a two-item list, so it is not _that_ hard to find... The next commit will add the original usage to the usage string in builtin/shortlog.c, and it feels more natural to do so below the most common usage. To avoid being inconsistent, reorder these two usages here first. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/tkdiff')
0 files changed, 0 insertions, 0 deletions