From: "Shawn O. Pearce" <spearce@spearce.org>
To: Marc Weber <marco-oweber@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] add--interactive: rename [r]evert command to [r]eset
Date: Mon, 6 Oct 2008 07:55:09 -0700 [thread overview]
Message-ID: <20081006145509.GD8203@spearce.org> (raw)
In-Reply-To: <b41e1729a8817f0d3cba2be1edc37513a72901dd.1223304141.git.marco-oweber@gmx.de>
Marc Weber <marco-oweber@gmx.de> wrote:
> diff --git a/git-add--interactive.perl b/git-add--interactive.perl
> index da768ee..5352d16 100755
> --- a/git-add--interactive.perl
> +++ b/git-add--interactive.perl
> @@ -498,8 +498,8 @@ sub update_cmd {
> print "\n";
> }
>
> -sub revert_cmd {
> - my @update = list_and_choose({ PROMPT => 'Revert',
> +sub reset_cmd {
> + my @update = list_and_choose({ PROMPT => 'Reset',
> HEADER => $status_head, },
> list_modified());
> if (@update) {
This patch is mangled. The context line immediately above is
indented with tabs in the source file, but is 8 spaces in the patch.
The patch doesn't apply.
--
Shawn.
next prev parent reply other threads:[~2008-10-06 14:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-05 15:26 What about renaming ga -i [r]evert to [r]eset ? Marc Weber
2008-10-05 16:41 ` Jeff King
2008-10-05 21:46 ` [PATCH 2] renaming git add -i [r]evert -> reset and adding gitt add -i [c]heckout Marc Weber
2008-10-05 22:11 ` Jeff King
2008-10-06 14:46 ` [PATCH 1/2] add--interactive: rename [r]evert command to [r]eset Marc Weber
2008-10-06 14:49 ` [PATCH 2/2] add--interactive: added [c]heckout Marc Weber
2008-10-06 14:51 ` Shawn O. Pearce
2008-10-06 15:55 ` Marc Weber
2008-10-06 14:55 ` Shawn O. Pearce [this message]
2008-10-06 15:51 ` [PATCH 1/2] add--interactive: rename [r]evert command to [r]eset Marc Weber
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=20081006145509.GD8203@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=marco-oweber@gmx.de \
/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).