From: "Shawn O. Pearce" <spearce@spearce.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>,
Robin Rosenberg <robin.rosenberg@dewire.com>,
git@vger.kernel.org
Subject: Re: [PATCH] Improve bash prompt to detect merge / rebase in progress
Date: Sat, 1 Sep 2007 20:44:07 -0400 [thread overview]
Message-ID: <20070902004407.GI18160@spearce.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0709020133540.28586@racer.site>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> On Sat, 1 Sep 2007, Shawn O. Pearce wrote:
> > Junio C Hamano <gitster@pobox.com> wrote:
> > >
> > > I might be in the middle of resolving a conflicted "git am".
> >
> > And there's no way to tell the difference either.
>
> AFAICT git-am creates an "info" file in .dotest/.
But git-rebase without -m and -i is defined as format-patch|am.
So when rebasing it looks identical to git-am. Hence no way to
tell the difference between the two.
I think post 1.5.3 one of the things we should work on is trying
to better track our current operation state. Most of that would
be to refactor how we track state in things like rebase/am/merge.
--
Shawn.
next prev parent reply other threads:[~2007-09-02 0:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-01 10:22 [PATCH] Improve bash prompt to detect merge / rebase in progress Robin Rosenberg
2007-09-01 18:07 ` Junio C Hamano
2007-09-01 22:20 ` Shawn O. Pearce
2007-09-02 0:35 ` Johannes Schindelin
2007-09-02 0:44 ` Shawn O. Pearce [this message]
2007-09-01 23:02 ` Johannes Schindelin
2007-09-01 23:52 ` Robin Rosenberg
2007-09-02 10:18 ` Johannes Sixt
2007-09-02 10:40 ` Robin Rosenberg
2007-09-04 7:13 ` Shawn O. Pearce
2007-09-30 0:20 ` [PATCH] Improve bash prompt to detect various states like an unfinished merge Robin Rosenberg
2007-10-01 8:15 ` Junio C Hamano
2007-10-01 18:29 ` Robin Rosenberg
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=20070902004407.GI18160@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=robin.rosenberg@dewire.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.
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).