Makefile: rebuild git.o on version change, clean up git$X flags

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 53cc35590debbb7e4d7dfae536be19e59d038560..d64c259bb35d3140b371e8717a2553146d3f92f5 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,3 +1,7 @@
+--summary::
+       Show a diffstat at the end of the merge. The diffstat is also
+       controlled by the configuration option merge.diffstat.
+
 -n, \--no-summary::
        Do not show diffstat at the end of the merge.
 
@@ -6,6 +10,14 @@
        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
@@ -13,4 +25,3 @@
        If there is no `-s` option, a built-in list of strategies
        is used instead (`git-merge-recursive` when merging a single
        head, `git-merge-octopus` otherwise).
-