Skip to content

Commit 99452fd

Browse files
committed
Merge branch 'mh/doc-commit-title-not-subject' into seen
* mh/doc-commit-title-not-subject: doc: use 'title' consistently
2 parents 16c9bca + 47f9102 commit 99452fd

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Documentation/git-commit.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,16 @@ OPTIONS
9898
replaces the log message of _<commit>_ with its own log message
9999
but makes no changes to the content of _<commit>_.
100100
+
101-
The commit created by plain `--fixup=<commit>` has a subject
102-
composed of "fixup!" followed by the subject line from _<commit>_,
101+
The commit created by plain `--fixup=<commit>` has a title
102+
composed of "fixup!" followed by the title of _<commit>_,
103103
and is recognized specially by `git rebase --autosquash`. The `-m`
104104
option may be used to supplement the log message of the created
105105
commit, but the additional commentary will be thrown away once the
106106
"fixup!" commit is squashed into _<commit>_ by
107107
`git rebase --autosquash`.
108108
+
109109
The commit created by `--fixup=amend:<commit>` is similar but its
110-
subject is instead prefixed with "amend!". The log message of
110+
title is instead prefixed with "amend!". The log message of
111111
_<commit>_ is copied into the log message of the "amend!" commit and
112112
opened in an editor so it can be refined. When `git rebase
113113
--autosquash` squashes the "amend!" commit into _<commit>_, the
@@ -128,7 +128,7 @@ See linkgit:git-rebase[1] for details.
128128

129129
`--squash=<commit>`::
130130
Construct a commit message for use with `git rebase --autosquash`.
131-
The commit message subject line is taken from the specified
131+
The commit message title is taken from the specified
132132
commit with a prefix of "squash! ". Can be used with additional
133133
commit message options (`-m`/`-c`/`-C`/`-F`). See
134134
linkgit:git-rebase[1] for details.

0 commit comments

Comments
 (0)