Signed-off-by: James Bowes <jbowes@xxxxxxxxxxxxxxxxxx> --- With asciidoc 8.1.0 and xmlto 0.0.18, git-config.xml failed to validate. This patch just makes the asciidoc formatting for branch.autosetupmerge the same as the other config options. Documentation/config.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index eb2e79a..14aa3bd 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -281,11 +281,11 @@ apply.whitespace:: as the '--whitespace' option. See gitlink:git-apply[1]. branch.autosetupmerge:: - Tells `git-branch' and `git-checkout' to setup new branches + Tells `git-branch` and `git-checkout` to setup new branches so that gitlink:git-pull[1] will appropriately merge from that remote branch. Note that even if this option is not set, - this behavior can be chosen per-branch using the `--track` - and `--no-track` options. This option defaults to false. + this behavior can be chosen per-branch using the '--track' + and '--no-track' options. This option defaults to false. branch.<name>.remote:: When in branch <name>, it tells `git fetch` which remote to fetch. -- 1.5.2.762.gd8c6 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
