git-svn: allow empty email-address using authors-prog and authors-file

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index a09d5974639fa772ba86c5547fe70716fd044f73..4a58aad4b83b9e365b57a8afa71f1ab939c47aee 100644 (file)
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it.
 
 theirs;;
        This is the opposite of 'ours'; note that, unlike 'ours', there is
-       no 'theirs' merge stragegy to confuse this merge option with.
+       no 'theirs' merge strategy to confuse this merge option with.
 
 patience;;
        With this option, 'merge-recursive' spends a little extra time
@@ -58,11 +58,12 @@ diff-algorithm=[patience|minimal|histogram|myers];;
 ignore-space-change;;
 ignore-all-space;;
 ignore-space-at-eol;;
+ignore-cr-at-eol;;
        Treats lines with the indicated type of whitespace change as
        unchanged for the sake of a three-way merge.  Whitespace
        changes mixed with other changes to a line are not ignored.
-       See also linkgit:git-diff[1] `-b`, `-w`, and
-       `--ignore-space-at-eol`.
+       See also linkgit:git-diff[1] `-b`, `-w`,
+       `--ignore-space-at-eol`, and `--ignore-cr-at-eol`.
 +
 * If 'their' version only introduces whitespace changes to a line,
   'our' version is used;