user-manual: Add section on ignoring files

[git.git] / Documentation / merge-options.txt

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index eebaf3aaffa72996ac8bdbc8e9498814cd99f506..182cef54be5963ff0f32a24329ca195607413e29 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -6,11 +6,19 @@
        not autocommit, to give the user a chance to inspect and
        further tweak the merge result before committing.
 
+--squash::
+       Produce the working tree and index state as if a real
+       merge happened, 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).
 
 -s <strategy>, \--strategy=<strategy>::
        Use the given merge strategy; can be supplied more than
        once to specify them in the order they should be tried.
        If there is no `-s` option, a built-in list of strategies
-       is used instead (`git-merge-resolve` when merging a single
+       is used instead (`git-merge-recursive` when merging a single
        head, `git-merge-octopus` otherwise).