diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2025-02-02 23:21:08 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2025-02-02 23:21:10 -0500 |
| commit | c6654e6c51c1db0cbd04f10d587e719e1f8ef5cf (patch) | |
| tree | 7ce9e57a9b9c7940ebb172e476819da81e8bf049 /docs | |
| parent | bb11a56df421607bb52e54af6dd6801e03e4cdaf (diff) | |
manual: Fix a typo
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/magit.org | 2 | ||||
| -rw-r--r-- | docs/magit.texi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/magit.org b/docs/magit.org index f5c190b..1139d00 100644 --- a/docs/magit.org +++ b/docs/magit.org @@ -4727,7 +4727,7 @@ message, or that you immediately edit an existing message. The new commits are called "squash" and "fixup" commits. The difference is that when a "squash" commit is squashed into its -targeted commit, the user gets a change to modify the message to be +targeted commit, the user gets a chance to modify the message to be used for the final commit; while for "fixup" commits the existing message of the targeted commit is used as-is and the message of the "fixup" commit is discarded. diff --git a/docs/magit.texi b/docs/magit.texi index 5f62c12..eb22c3d 100644 --- a/docs/magit.texi +++ b/docs/magit.texi @@ -5619,7 +5619,7 @@ message, or that you immediately edit an existing message. The new commits are called "squash" and "fixup" commits. The difference is that when a "squash" commit is squashed into its -targeted commit, the user gets a change to modify the message to be +targeted commit, the user gets a chance to modify the message to be used for the final commit; while for "fixup" commits the existing message of the targeted commit is used as-is and the message of the "fixup" commit is discarded. |