diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-28 11:25:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-28 11:25:54 -0700 |
| commit | 1032eb9c2aa34b4a908fb9d2d1cfe9680e0c34ce (patch) | |
| tree | 10bf06936fb9e52fccc4fd2cf929d5fd7eb421a1 /Documentation/git-commit.txt | |
| parent | 475495ff5e071c895dca772cb59e277ceff84d84 (diff) | |
| parent | 661c3e9bc064564a492281364413dc805eaddf95 (diff) | |
| download | git-1032eb9c2aa34b4a908fb9d2d1cfe9680e0c34ce.tar.gz | |
Merge branch 'mm/doc-tt' into maint
More mark-up updates to typeset strings that are expected to
literally typed by the end user in fixed-width font.
* mm/doc-tt:
doc: typeset HEAD and variants as literal
CodingGuidelines: formatting HEAD in documentation
doc: typeset long options with argument as literal
doc: typeset '--' as literal
doc: typeset long command-line options as literal
doc: typeset short command-line options as literal
Documentation/git-mv.txt: fix whitespace indentation
Diffstat (limited to 'Documentation/git-commit.txt')
| -rw-r--r-- | Documentation/git-commit.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index e7049537d9..b0a294d3b5 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -75,7 +75,7 @@ OPTIONS -c <commit>:: --reedit-message=<commit>:: - Like '-C', but with '-c' the editor is invoked, so that + Like '-C', but with `-c` the editor is invoked, so that the user can further edit the commit message. --fixup=<commit>:: @@ -260,7 +260,7 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].) staged for other paths. This is the default mode of operation of 'git commit' if any paths are given on the command line, in which case this option can be omitted. - If this option is specified together with '--amend', then + If this option is specified together with `--amend`, then no paths need to be specified, which can be used to amend the last commit without committing changes that have already been staged. |