Merge branch 'maint'

* maint:
  Update draft release notes to 1.8.1.5
  Documentation/submodule: Add --force to update synopsis
This commit is contained in:
Junio C Hamano 2013-02-27 10:10:28 -08:00
commit 443d803e0d
2 changed files with 8 additions and 3 deletions

View File

@ -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.

View File

@ -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>