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 182cef54be5963ff0f32a24329ca195607413e29..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.
 
@@ -21,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).
-