From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Feb 2013 18:10:28 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.2-rc2~2
X-Git-Url: https://repo.or.cz/w/git.git/commitdiff_plain/443d803e0dacd0a1c6700503689f3cd95751aba1

Merge branch 'maint'

* maint:
  Update draft release notes to 1.8.1.5
  Documentation/submodule: Add --force to update synopsis
---

443d803e0dacd0a1c6700503689f3cd95751aba1
diff --cc Documentation/git-submodule.txt
index a0c9df85f4,349378448c..c99d795618
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@@ -13,8 -13,8 +13,9 @@@ SYNOPSI
  	      [--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]
 -'git submodule' [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [--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>