branch: elpa/magit commit c6654e6c51c1db0cbd04f10d587e719e1f8ef5cf Author: Kyle Meyer <k...@kyleam.com> Commit: Kyle Meyer <k...@kyleam.com>
manual: Fix a typo --- docs/magit.org | 2 +- docs/magit.texi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/magit.org b/docs/magit.org index f5c190ba84..1139d00480 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 5f62c126aa..eb22c3d753 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.