diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-05-25 19:44:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-25 19:44:52 -0700 |
| commit | 23807fa0086ae6ad6980a2a1071f23ed1a6dde93 (patch) | |
| tree | 7e73547d4f5187bfb985282d94d358ed7b0ca255 /Documentation/merge-options.txt | |
| parent | convert bare readlink to strbuf_readlink (diff) | |
| parent | Prepare for 1.6.3.2 (diff) | |
| download | tgif-23807fa0086ae6ad6980a2a1071f23ed1a6dde93.tar.xz | |
Merge branch 'maint'
* maint:
Prepare for 1.6.3.2
fix cat-file usage message and documentation
fetch: report ref storage DF errors more accurately
lock_ref: inform callers of unavailable ref
merge-options.txt: Clarify merge --squash
Conflicts:
RelNotes
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | 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 637b53f898..adadf8e4bf 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 |