* [PATCH] merge-options.txt: Clarify merge --squash
@ 2009-05-25 16:00 Michael J Gruber
2009-05-25 22:23 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Michael J Gruber @ 2009-05-25 16:00 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] merge-options.txt: Clarify merge --squash
2009-05-25 16:00 [PATCH] merge-options.txt: Clarify merge --squash Michael J Gruber
@ 2009-05-25 22:23 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2009-05-25 22:23 UTC (permalink / raw)
To: Michael J Gruber; +Cc: git
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-05-25 22:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-25 16:00 [PATCH] merge-options.txt: Clarify merge --squash Michael J Gruber
2009-05-25 22:23 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).