From: Shawn O. Pearce <spearce@spearce.org>
Date: Tue, 08 May 2007 14:38:59 GMT
Subject: Re: [PATCH] git-gui: Call changes "Staged" and "Unstaged" in file list titles.
Message-ID: <20070508143859.GO11311@spearce.org>
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.