diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:48:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:48:38 -0700 |
| commit | d75148af8e54fe1d655796c75a601e5f79804808 (patch) | |
| tree | 1aed2433cb2e2d7db853a72387f48ec081ce01dc /merge-options.txt | |
| parent | 624dd4c072be7e13e57519eb729f35089386fec9 (diff) | |
| download | git-htmldocs-d75148af8e54fe1d655796c75a601e5f79804808.tar.gz | |
Autogenerated HTML docs for v1.9.1-506-g7bf27
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/merge-options.txt b/merge-options.txt index e1343155f..f08e9b80c 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -63,14 +63,13 @@ merge. --squash:: --no-squash:: - Produce the working tree and index state as if a real - 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 - top of the current branch whose effect is the same as - merging another branch (or more in case of an octopus). + Produce the working tree and index state as if a real merge + happened (except for the merge information), but do not actually + make a commit, move the `HEAD`, or 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 top of + the current branch whose effect is the same as merging another + branch (or more in case of an octopus). + With --no-squash perform the merge and commit the result. This option can be used to override --squash. |