From 31e54bb94a8acb0fa4fa5099bc455ea8355db621 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 26 Feb 2013 19:41:34 -0500 Subject: [PATCH 1/2] Documentation/submodule: Add --force to update synopsis In commit 9db31bdf (submodule: Add --force option for git submodule update, 2011-04-01) we added the option to the implementation's usage synopsis but forgot to add it to the synopsis in the command documentation. Add the option to the synopsis in the same location it is reported in usage and re-wrap the options to avoid long lines. Signed-off-by: Brad King Signed-off-by: Junio C Hamano --- Documentation/git-submodule.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index b1de3bade7..349378448c 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -13,7 +13,7 @@ SYNOPSIS [--reference ] [--] [] 'git submodule' [--quiet] status [--cached] [--recursive] [--] [...] 'git submodule' [--quiet] init [--] [...] -'git submodule' [--quiet] update [--init] [-N|--no-fetch] [--rebase] +'git submodule' [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [--rebase] [--reference ] [--merge] [--recursive] [--] [...] 'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) ] [commit] [--] [...] From 8d44277d91989ad2b37d4908096bd5256d6390c4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 27 Feb 2013 10:09:59 -0800 Subject: [PATCH 2/2] Update draft release notes to 1.8.1.5 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.1.5.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/RelNotes/1.8.1.5.txt b/Documentation/RelNotes/1.8.1.5.txt index 92da6b2777..30d30a1cf9 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.