summaryrefslogtreecommitdiff
path: root/Documentation/git-cherry-pick.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-26 13:14:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-26 13:14:55 -0700
commit4abeeb62a04365d7595cd1ef83ce56764c4a8553 (patch)
tree20233f75ce13b6742f35825408a5521d825af45b /Documentation/git-cherry-pick.txt
parentMerge branch 'jk/tap-verbose-fix' (diff)
parentdoc: fix the 'revert a faulty merge' ASCII art tab spacing (diff)
downloadtgif-4abeeb62a04365d7595cd1ef83ce56764c4a8553.tar.xz
Merge branch 'po/fix-doc-merge-base-illustration'
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
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
0 files changed, 0 insertions, 0 deletions