From: "Shawn O. Pearce" <spearce@spearce.org>
To: Johannes Sixt <J.Sixt@eudaptics.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-gui: Call changes "Staged" and "Unstaged" in file list titles.
Date: Tue, 8 May 2007 10:38:59 -0400 [thread overview]
Message-ID: <20070508143859.GO11311@spearce.org> (raw)
In-Reply-To: <46405FF2.1B600CBE@eudaptics.com>
Johannes Sixt <J.Sixt@eudaptics.com> wrote:
> From: Johannes Sixt <johannes.sixt@telecom.at>
>
> All menu entries talk about "staging" and "unstaging" changes, but the
> titles of the file lists use different wording, which may confuse
> newcomers.
>
> Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
> ---
> I hope the patch went through without my MUA's "improvements".
Yes. But...
> git-gui/git-gui.sh | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
That's the wrong path. Clearly you made this patch in git.git and
not the git-gui.git repository itself. Fortunately for me I added
-3 to git-am out of habit:
$ git am -3 -s gg
Applying 'git-gui: Call changes "Staged" and "Unstaged" in file list titles.'
error: git-gui/git-gui.sh: does not exist in index
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Renamed git-gui/git-gui.sh => git-gui.sh
Wrote tree 8e034a94d9533af707279766e174b78ddf3874cc
Committed: a1a4975824e8f9f88a8c96ae908c488a2c6047c5
Yay Git! Go go gadget rename detection! ;-)
I didn't even realize the git-gui/ prefix on the path in the patch
until after I saw the rename detection message.
--
Shawn.
next prev parent reply other threads:[~2007-05-08 14:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-08 11:33 [PATCH] git-gui: Call changes "Staged" and "Unstaged" in file list titles Johannes Sixt
2007-05-08 14:38 ` Shawn O. Pearce [this message]
2007-05-08 15:13 ` Johannes Schindelin
2007-05-08 19:29 ` Junio C Hamano
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=20070508143859.GO11311@spearce.org \
--to=spearce@spearce.org \
--cc=J.Sixt@eudaptics.com \
--cc=git@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.