Skip to content

Commit c2d96bc

Browse files
hickfordgitster
authored andcommitted
doc: use 'title' consistently
The first line of a commit message is variously called 'title' or 'subject'. Prefer 'title' unless discussing email. Signed-off-by: M Hickford <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e2067b4 commit c2d96bc

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Documentation/git-commit.txt

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.

Documentation/git-rebase.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -599,11 +599,11 @@ See also INCOMPATIBLE OPTIONS below.
599599
--no-autosquash::
600600
Automatically squash commits with specially formatted messages into
601601
previous commits being rebased. If a commit message starts with
602-
"squash! ", "fixup! " or "amend! ", the remainder of the subject line
602+
"squash! ", "fixup! " or "amend! ", the remainder of the title
603603
is taken as a commit specifier, which matches a previous commit if it
604-
matches the subject line or the hash of that commit. If no commit
604+
matches the title or the hash of that commit. If no commit
605605
matches fully, matches of the specifier with the start of commit
606-
subjects are considered.
606+
titles are considered.
607607
+
608608
In the rebase todo list, the actions of squash, fixup and amend commits are
609609
changed from `pick` to `squash`, `fixup` or `fixup -C`, respectively, and they
@@ -613,7 +613,7 @@ be used to review and edit the todo list before proceeding.
613613
The recommended way to create commits with squash markers is by using the
614614
`--squash`, `--fixup`, `--fixup=amend:` or `--fixup=reword:` options of
615615
linkgit:git-commit[1], which take the target commit as an argument and
616-
automatically fill in the subject line of the new commit from that.
616+
automatically fill in the title of the new commit from that.
617617
+
618618
Setting configuration variable `rebase.autoSquash` to true enables
619619
auto-squashing by default for interactive rebase. The `--no-autosquash`

0 commit comments

Comments
 (0)