From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Mar 2010 06:24:25 +0000 (-0800)
Subject: Merge branch 'maint-1.6.6' into maint
X-Git-Tag: v1.7.0.2~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/507665e4f4c87fa4ca8fbe8519e9d0cc36a93d3d?ds=inline;hp=-c

Merge branch 'maint-1.6.6' into maint

* maint-1.6.6:
Remove extra '-' from git-am(1)
---

507665e4f4c87fa4ca8fbe8519e9d0cc36a93d3d
diff --combined Documentation/git-am.txt
index c66c565bbe,40178be922..23864df8da
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@@ -15,7 -15,7 +15,7 @@@ SYNOPSI
  	 [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
  	 [--reject] [-q | --quiet] [--scissors | --no-scissors]
  	 [<mbox> | <Maildir>...]
 -'git am' (--skip | --resolved | --abort)
 +'git am' (--continue | --skip | --abort)
  
  DESCRIPTION
  -----------
@@@ -37,14 -37,14 +37,14 @@@ OPTION
  
  -k::
  --keep::
 -	Pass `-k` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]).
 +	Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
  
  -c::
  --scissors::
  	Remove everything in body before a scissors line (see
  	linkgit:git-mailinfo[1]).
  
- ---no-scissors::
+ --no-scissors::
  	Ignore scissors lines (see linkgit:git-mailinfo[1]).
  
  -q::
@@@ -53,7 -53,7 +53,7 @@@
  
  -u::
  --utf8::
 -	Pass `-u` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]).
 +	Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
  	The proposed commit log message taken from the e-mail
  	is re-coded into UTF-8 encoding (configuration variable
  	`i18n.commitencoding` can be used to specify project's
@@@ -63,7 -63,7 +63,7 @@@ This was optional in prior versions of 
  default.   You can use `--no-utf8` to override this.
  
  --no-utf8::
 -	Pass `-n` flag to 'git-mailinfo' (see
 +	Pass `-n` flag to 'git mailinfo' (see
  	linkgit:git-mailinfo[1]).
  
  -3::
@@@ -81,7 -81,7 +81,7 @@@
  -p<n>::
  --directory=<dir>::
  --reject::
 -	These flags are passed to the 'git-apply' (see linkgit:git-apply[1])
 +	These flags are passed to the 'git apply' (see linkgit:git-apply[1])
  	program that applies
  	the patch.
  
@@@ -107,7 -107,6 +107,7 @@@
  	Skip the current patch.  This is only meaningful when
  	restarting an aborted patch.
  
 +--continue::
  -r::
  --resolved::
  	After a patch failure (e.g. attempting to apply
@@@ -122,7 -121,7 +122,7 @@@
  	to the screen before exiting.  This overrides the
  	standard message informing you to use `--resolved`
  	or `--skip` to handle the failure.  This is solely
 -	for internal use between 'git-rebase' and 'git-am'.
 +	for internal use between 'git rebase' and 'git am'.
  
  --abort::
  	Restore the original branch and abort the patching operation.