From: Jari Aalto <jari.aalto@cante.net>
To: Mikael Magnusson <mikachu@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Improve --patch option documentation in git-add
Date: Sun, 13 Sep 2009 17:09:11 +0300 [thread overview]
Message-ID: <87vdjnlywo.fsf@jondo.cante.net> (raw)
In-Reply-To: <237967ef0909130648l36b592aft9c50ccff5d03d1b1@mail.gmail.com> (Mikael Magnusson's message of "Sun, 13 Sep 2009 15:48:40 +0200")
[-- Attachment #1: Type: text/plain, Size: 593 bytes --]
Mikael Magnusson <mikachu@gmail.com> writes:
>> + Interactively choose hunks of patch between the index and the
> diff probably makes more sense than patch here
>
>> + work tree and add them to the index. This gives a change to
> a chance
>
>> + review the difference before adding modified contents to the
> differences? Not sure which I prefer on this one.
>
>> + index.
>> +
>> + This effectively runs ``add --interactive``, but bypass the
> bypasses
>
>> + initial command menu and directly jump to `patch` subcommand.
> jumps
An update. Thanks,
Jari
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Improve-patch-option-documentation-in-git-add.patch --]
[-- Type: text/x-diff, Size: 1200 bytes --]
>From beca0d3dcd668e1b578588378149320cd3aed9d9 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Sun, 13 Sep 2009 17:08:51 +0300
Subject: [PATCH] Improve --patch option documentation in git-add
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
Documentation/git-add.txt | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index e67b7e8..0b2a2a6 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -72,9 +72,14 @@ OPTIONS
-p::
--patch::
- Similar to Interactive mode but the initial command loop is
- bypassed and the 'patch' subcommand is invoked using each of
- the specified filepatterns before exiting.
+ Interactively choose hunks of diff between the index and the
+ work tree and add them to the index. This gives a change to
+ review the differences before adding modified contents to the
+ index.
+
+ This effectively runs ``add --interactive``, but bypass the
+ initial command menu and directly jumps to `patch` subcommand.
+ See ``Interactive mode'' for details.
-e, \--edit::
Open the diff vs. the index in an editor and let the user
--
1.6.3.3
next prev parent reply other threads:[~2009-09-13 14:09 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-30 17:29 [PATCH] Documentation/git-add.txt: Explain --patch option in layman terms Jari Aalto
2009-08-30 20:14 ` Junio C Hamano
2009-08-30 21:02 ` Jeff King
2009-08-30 21:56 ` Jari Aalto
2009-08-30 22:13 ` Junio C Hamano
2009-08-30 23:06 ` Jari Aalto
2009-08-30 23:20 ` Junio C Hamano
2009-08-31 7:46 ` Jari Aalto
2009-08-31 23:42 ` Junio C Hamano
2009-09-13 6:44 ` [PATCH] Improve --patch option documentation in git-add Jari Aalto
2009-09-13 13:48 ` Mikael Magnusson
2009-09-13 14:09 ` Jari Aalto [this message]
2009-09-14 13:13 ` Sean Estabrooks
2009-09-15 5:35 ` [PATCH] Improve --patch option documentation in git-add (updated patch) Jari Aalto
2009-09-15 6:52 ` Nanako Shiraishi
2009-09-15 8:17 ` Jari Aalto
2009-09-15 10:35 ` Nanako Shiraishi
2009-08-30 23:31 ` [PATCH] Documentation/git-add.txt: Explain --patch option in layman terms Junio C Hamano
2009-08-31 7:06 ` Jari Aalto
2009-08-31 7:32 ` Junio C Hamano
2009-08-30 22:00 ` Jari Aalto
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=87vdjnlywo.fsf@jondo.cante.net \
--to=jari.aalto@cante.net \
--cc=git@vger.kernel.org \
--cc=mikachu@gmail.com \
/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).