diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2016-06-28 13:40:11 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-28 08:36:45 -0700 |
| commit | bcf9626a71a0d90be65acc265ad0ec488d95d6ed (patch) | |
| tree | 9612c442f9437ba58b7b7baa46ba73282ff790a6 /Documentation/git-branch.txt | |
| parent | 23f8239bbe0a893bd8754a03e9d4fda62804ac14 (diff) | |
| download | git-bcf9626a71a0d90be65acc265ad0ec488d95d6ed.tar.gz | |
doc: typeset long command-line options as literal
Similarly to the previous commit, use backquotes instead of
forward-quotes, for long options.
This was obtained with:
perl -pi -e "s/'(--[a-z][a-z=<>-]*)'/\`\$1\`/g" *.txt
and manual tweak to remove false positive in ascii-art (o'--o'--o' to
describe rewritten history).
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-branch.txt')
| -rw-r--r-- | Documentation/git-branch.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 4a7037f1c8..123144fe8a 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -172,7 +172,7 @@ This option is only applicable in non-verbose mode. + This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you -want `git checkout` and `git branch` to always behave as if '--no-track' +want `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch. |