[PATCH] merge-options.txt: Clarify merge --squash
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- May 25, 2009, 16:00 UTC
- Message-ID
- <1243267210-28997-1-git-send-email-git@drmicha.warpmail.net>
With the --squash option, merge sets up the index just like for a real merge, but without the merge info (stages). Say so.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> --- I think this kind of fell under the rug back then when it was discussed (http://permalink.gmane.org/gmane.comp.version-control.git/119185). So I'm resending it.
Cheers, Michael
Documentation/merge-options.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 637b53f..adadf8e 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -39,7 +39,8 @@ --squash:: Produce the working tree and index state as if a real - merge happened, but do not actually make a commit or + merge happened (except for the merge information), + but do not actually make a commit or move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to cause the next `git commit` command to create a merge commit. This allows you to create a single commit on
-- 1.6.3.1.241.g24356