From: "Jonathan del Strother" <maillist@steelskies.com>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Cc: "Git Mailing List" <git@vger.kernel.org>
Subject: Re: git log -S doesn't search stash WIPs
Date: Sat, 9 Feb 2008 15:18:51 +0000 [thread overview]
Message-ID: <57518fd10802090718w2ab705aeg6cb1c531666d52a2@mail.gmail.com> (raw)
In-Reply-To: <alpine.LSU.1.00.0802081208580.11591@racer.site>
On Feb 8, 2008 12:18 PM, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> Hi,
>
> On Fri, 8 Feb 2008, Jonathan del Strother wrote:
>
> > "git log --all -Sfoo" doesn't find strings introduced in stash WIP
> > commits, only the stash index.
>
> It is a little unfortunate that a stash will do this:
>
> HEAD ------- stash
> \ /
> index
>
> In other words, the index will be "committed" as a regular commit, but the
> working directory will actually be a "merge commit".
>
> So you need to add "--cc" to see the commit.
>
> Further, the stash is not just a branch. The stash is actually a stack of
> reflogs. So could you try again, with
>
> $ git log --cc -Sfoo --walk-reflogs stash
Hmmm, I'm a little fuzzy on why --cc helps, though it looks like
either or both of --cc and --walk-reflogs will do the trick.
Thanks for the help
Jon
prev parent reply other threads:[~2008-02-09 15:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-08 10:46 git log -S doesn't search stash WIPs Jonathan del Strother
2008-02-08 12:18 ` Johannes Schindelin
2008-02-09 15:18 ` Jonathan del Strother [this message]
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=57518fd10802090718w2ab705aeg6cb1c531666d52a2@mail.gmail.com \
--to=maillist@steelskies.com \
--cc=Johannes.Schindelin@gmx.de \
--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 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).