From 4e31627a4c47fdb479ad9edf8c88a7988e9719b8 Mon Sep 17 00:00:00 2001 From: M Hickford Date: Thu, 13 Feb 2025 10:07:15 +0000 Subject: [PATCH] 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 --- Documentation/git-commit.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 602e2f1200bbfb..70a5e4a181cf0d 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -98,8 +98,8 @@ OPTIONS replaces the log message of __ with its own log message but makes no changes to the content of __. + -The commit created by plain `--fixup=` has a subject -composed of "fixup!" followed by the subject line from __, +The commit created by plain `--fixup=` has a title +composed of "fixup!" followed by the title of __, and is recognized specially by `git rebase --autosquash`. The `-m` option may be used to supplement the log message of the created commit, but the additional commentary will be thrown away once the @@ -107,7 +107,7 @@ commit, but the additional commentary will be thrown away once the `git rebase --autosquash`. + The commit created by `--fixup=amend:` is similar but its -subject is instead prefixed with "amend!". The log message of +title is instead prefixed with "amend!". The log message of __ is copied into the log message of the "amend!" commit and opened in an editor so it can be refined. When `git rebase --autosquash` squashes the "amend!" commit into __, the @@ -128,7 +128,7 @@ See linkgit:git-rebase[1] for details. `--squash=`:: Construct a commit message for use with `git rebase --autosquash`. - The commit message subject line is taken from the specified + The commit message title is taken from the specified commit with a prefix of "squash! ". Can be used with additional commit message options (`-m`/`-c`/`-C`/`-F`). See linkgit:git-rebase[1] for details.