OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f4db874
6750f62
)
Merge branch 'po/fix-doc-merge-base-illustration'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 26 Oct 2016 20:14:55 +0000
(13:14 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 26 Oct 2016 20:14:55 +0000
(13:14 -0700)
Some AsciiDoc formatter mishandles a displayed illustration with
tabs in it. Adjust a few of them in merge-base documentation to
work around them.
* po/fix-doc-merge-base-illustration:
doc: fix the 'revert a faulty merge' ASCII art tab spacing
doc: fix merge-base ASCII art tab spacing
Trivial merge