GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copy

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index f37a77648934fcd8c707cfc1446ef5425cc7fa79..ffbc6e9861094f48fd3f24af3a0b343c9c0ea7f4 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -2,10 +2,12 @@
        Show a diffstat at the end of the merge. The diffstat is also
        controlled by the configuration option merge.stat.
 
--n, \--no-stat::
+-n::
+--no-stat::
        Do not show diffstat at the end of the merge.
 
---summary, \--no-summary::
+--summary::
+--no-summary::
        Synonyms to --stat and --no-stat; these are deprecated and will be
        removed in the future.
 
@@ -49,7 +51,8 @@
        a fast-forward, only update the branch pointer. This is
        the default behavior of git-merge.
 
--s <strategy>, \--strategy=<strategy>::
+-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