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 /git-pull.html | |
| parent | 624dd4c072be7e13e57519eb729f35089386fec9 (diff) | |
| download | git-htmldocs-d75148af8e54fe1d655796c75a601e5f79804808.tar.gz | |
Autogenerated HTML docs for v1.9.1-506-g7bf27
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/git-pull.html b/git-pull.html index 7095e5c97..a89890524 100644 --- a/git-pull.html +++ b/git-pull.html @@ -963,14 +963,13 @@ merge.</p></div> </dt>
<dd>
<p>
- 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 <tt>HEAD</tt>, nor record <tt>$GIT_DIR/MERGE_HEAD</tt> to
- cause the next <tt>git commit</tt> 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 <tt>HEAD</tt>, or record <tt>$GIT_DIR/MERGE_HEAD</tt>
+ (to cause the next <tt>git commit</tt> 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).
</p>
<div class="paragraph"><p>With --no-squash perform the merge and commit the result. This
option can be used to override --squash.</p></div>
|