git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Valentin Haenel <valentin.haenel@gmx.de>
To: git@vger.kernel.org
Cc: Eric Wong <normalperson@yhbt.net>,
	"Shawn O. Pearce" <spearce@spearce.org>,
	Junio C Hamano <gitster@pobox.com>,
	Valentin Haenel <valentin.haenel@gmx.de>
Subject: [PATCH 1/2] git-svn.txt: move option descriptions
Date: Fri, 22 Apr 2011 19:03:38 +0200	[thread overview]
Message-ID: <1303491819-9850-2-git-send-email-valentin.haenel@gmx.de> (raw)
In-Reply-To: <1303491819-9850-1-git-send-email-valentin.haenel@gmx.de>

The options '---use-log-author' and '--add-author-from' are applicable to other
subcommands except 'fetch' -- therefore move them from the 'fetch' section to
the more general 'options' section

Signed-off-by: Valentin Haenel <valentin.haenel@gmx.de>
---
 Documentation/git-svn.txt |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 30a6748..e12f9f8 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -145,17 +145,6 @@ Skip "branches" and "tags" of first level directories;;
 ------------------------------------------------------------------------
 --
 
---use-log-author;;
-	When retrieving svn commits into git (as part of fetch, rebase, or
-	dcommit operations), look for the first From: or Signed-off-by: line
-	in the log message and use that as the author string.
---add-author-from;;
-	When committing to svn from git (as part of commit or dcommit
-	operations), if the existing log message doesn't already have a
-	From: or Signed-off-by: line, append a From: line based on the
-	git commit's author string.  If you use this, then --use-log-author
-	will retrieve a valid author string for all commits.
-
 'clone'::
 	Runs 'init' and 'fetch'.  It will automatically create a
 	directory based on the basename of the URL passed to it;
@@ -572,6 +561,17 @@ repository that will be fetched from.
 For 'branch' and 'tag', display the urls that will be used for copying when
 creating the branch or tag.
 
+--use-log-author::
+	When retrieving svn commits into git (as part of fetch, rebase, or
+	dcommit operations), look for the first From: or Signed-off-by: line
+	in the log message and use that as the author string.
+--add-author-from::
+	When committing to svn from git (as part of commit or dcommit
+	operations), if the existing log message doesn't already have a
+	From: or Signed-off-by: line, append a From: line based on the
+	git commit's author string.  If you use this, then --use-log-author
+	will retrieve a valid author string for all commits.
+
 
 ADVANCED OPTIONS
 ----------------
-- 
1.7.1

  reply	other threads:[~2011-04-22 17:17 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-22 17:03 [PATCH 0/2] Documentation fixes for git-svn.txt Valentin Haenel
2011-04-22 17:03 ` Valentin Haenel [this message]
2011-04-22 17:03 ` [PATCH 2/2] git-svn.txt: small typeface improvements Valentin Haenel
2011-04-25 21:06 ` [PATCH 0/2] Documentation fixes for git-svn.txt Eric Wong
2011-04-25 21:36   ` [PATCH] git-svn.txt: fix usage of --add-author-from Valentin Haenel
2011-04-25 21:58     ` Junio C Hamano
2011-04-26 11:34   ` [PATCHv2 0/2] Documentation fixes for git-svn.txt Valentin Haenel
2011-04-26 11:34   ` [PATCHv2 1/2] git-svn.txt: move option descriptions Valentin Haenel
2011-04-26 11:34   ` [PATCHv2 2/2] git-svn.txt: small typeface improvements Valentin Haenel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1303491819-9850-2-git-send-email-valentin.haenel@gmx.de \
    --to=valentin.haenel@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=normalperson@yhbt.net \
    --cc=spearce@spearce.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).