diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-05-26 08:38:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-05-26 08:38:52 +0000 |
| commit | 9f10ed359a3a4153921ef654002b468cc7f8c78f (patch) | |
| tree | 710a04bf01fdd71fbb37a0e59d6086f4db4e9642 /merge-options.txt | |
| parent | 7ae18250dc61b6e3620aa3fac36eac9fc0a6cd07 (diff) | |
| download | git-htmldocs-9f10ed359a3a4153921ef654002b468cc7f8c78f.tar.gz | |
Autogenerated HTML docs for v1.6.3.1-169-g33fd
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-options.txt b/merge-options.txt index 637b53f89..adadf8e4b 100644 --- a/merge-options.txt +++ b/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 |