diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-04-03 13:39:03 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-03 13:39:03 -0700 |
commit | 38245956648c54d138efc7b95b450dc7203e2a2f (patch) | |
tree | 7cd5d4ef84f71587cc35f3dade01b1340eba9943 /pretty.c | |
parent | Merge branch 'jk/shallow-update-fix' into maint (diff) | |
parent | Documentation/merge-strategies: avoid hyphenated commands (diff) | |
download | tgif-38245956648c54d138efc7b95b450dc7203e2a2f.tar.xz |
Merge branch 'rr/doc-merge-strategies' into maint
* rr/doc-merge-strategies:
Documentation/merge-strategies: avoid hyphenated commands
Diffstat (limited to 'pretty.c')
0 files changed, 0 insertions, 0 deletions