From: John Keeping <john@keeping.me.uk>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
"Eric S. Raymond" <esr@thyrsus.com>,
git@vger.kernel.org, David Michael Barr <b@rr-dav.id.au>,
Pete Wyckoff <pw@padd.com>, Thomas Rast <trast@student.ethz.ch>
Subject: [PATCH v2 1/2] git-fast-import(1): combine documentation of --[no-]relative-marks
Date: Wed, 9 Jan 2013 19:44:38 +0000 [thread overview]
Message-ID: <cf4a4a10c1de73491048e8283582bdbf8c79c75e.1357760256.git.john@keeping.me.uk> (raw)
In-Reply-To: <cover.1357760256.git.john@keeping.me.uk>
The descriptions of '--relative-marks' and '--no-relative-marks' make
more sense when read together instead of as two independent options.
Combine them into a single description block.
Signed-off-by: John Keeping <john@keeping.me.uk>
---
Documentation/git-fast-import.txt | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 3da5cc2..75ce808 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -83,19 +83,17 @@ OPTIONS
Like --import-marks but instead of erroring out, silently
skips the file if it does not exist.
---relative-marks::
+--[no-]relative-marks::
After specifying --relative-marks the paths specified
with --import-marks= and --export-marks= are relative
to an internal directory in the current repository.
In git-fast-import this means that the paths are relative
to the .git/info/fast-import directory. However, other
importers may use a different location.
++
+Relative and non-relative marks may be combined by interweaving
+--(no-)-relative-marks with the --(import|export)-marks= options.
---no-relative-marks::
- Negates a previous --relative-marks. Allows for combining
- relative and non-relative marks by interweaving
- --(no-)-relative-marks with the --(import|export)-marks=
- options.
--cat-blob-fd=<fd>::
Write responses to `cat-blob` and `ls` queries to the
--
1.8.1.468.g3d9f9b6
next prev parent reply other threads:[~2013-01-09 19:51 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-05 16:44 [PATCH] Alphabetize the fast-import options, following a suggestion on the list Eric S. Raymond
2013-01-05 23:11 ` Jonathan Nieder
2013-01-06 5:13 ` Eric S. Raymond
2013-01-06 7:12 ` Junio C Hamano
2013-01-06 13:29 ` [PATCH] git-fast-import(1): reorganise options John Keeping
2013-01-06 13:51 ` Jonathan Nieder
2013-01-06 14:28 ` John Keeping
2013-01-06 23:10 ` Junio C Hamano
2013-01-09 19:43 ` [PATCH v2 0/2] Reorganise options in git-fast-import(1) John Keeping
2013-01-09 19:44 ` John Keeping [this message]
2013-01-09 21:42 ` [PATCH v2 1/2] git-fast-import(1): combine documentation of --[no-]relative-marks Jonathan Nieder
2013-01-09 19:45 ` [PATCH v2 2/2] git-fast-import(1): reorganise options John Keeping
2013-01-09 22:21 ` Junio C Hamano
2013-01-06 13:34 ` [PATCH/RFC] fast-import doc: split OPTIONS into subsections Jonathan Nieder
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cf4a4a10c1de73491048e8283582bdbf8c79c75e.1357760256.git.john@keeping.me.uk \
--to=john@keeping.me.uk \
--cc=b@rr-dav.id.au \
--cc=esr@thyrsus.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=pw@padd.com \
--cc=trast@student.ethz.ch \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).