aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-27 10:10:28 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-27 10:10:28 -0800
commit443d803e0dacd0a1c6700503689f3cd95751aba1 (patch)
tree8e876ee7fd8896ce98cf6b2abff856be63f71749
parent3e07d2683de55f0e21b13a6724b59bdcd548b5d8 (diff)
parent8d44277d91989ad2b37d4908096bd5256d6390c4 (diff)
downloadgit-443d803e0dacd0a1c6700503689f3cd95751aba1.tar.gz
git-443d803e0dacd0a1c6700503689f3cd95751aba1.tar.xz
Merge branch 'maint'
* maint: Update draft release notes to 1.8.1.5 Documentation/submodule: Add --force to update synopsis
-rw-r--r--Documentation/RelNotes/1.8.1.5.txt6
-rw-r--r--Documentation/git-submodule.txt5
2 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.8.1.5.txt b/Documentation/RelNotes/1.8.1.5.txt
index 92da6b277..30d30a1cf 100644
--- a/Documentation/RelNotes/1.8.1.5.txt
+++ b/Documentation/RelNotes/1.8.1.5.txt
@@ -1,9 +1,13 @@
Git 1.8.1.5 Release Notes
=========================
-Fixes since v1.8.1.5
+Fixes since v1.8.1.4
--------------------
+ * Given a string with a multi-byte character that begins with '-' on
+ the command line where an option is expected, the option parser
+ used just one byte of the unknown letter when reporting an error.
+
* "git apply --summary" has been taught to make sure the similarity
value shown in its output is sensible, even when the input had a
bogus value.
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index a0c9df85f..c99d79561 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -13,8 +13,9 @@ SYNOPSIS
[--reference <repository>] [--] <repository> [<path>]
'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]
'git submodule' [--quiet] init [--] [<path>...]
-'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch] [--rebase]
- [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
+'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch]
+ [-f|--force] [--rebase] [--reference <repository>]
+ [--merge] [--recursive] [--] [<path>...]
'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>]
[commit] [--] [<path>...]
'git submodule' [--quiet] foreach [--recursive] <command>