git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Improve bash prompt to detect merge / rebase in progress

From
Shawn O. Pearce <spearce@spearce.org>
Date
Sep 2, 2007, 00:44 UTC
Message-ID
<20070902004407.GI18160@spearce.org>
In-Reply-To
<Pine.LNX.4.64.0709020133540.28586@racer.site>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 8 quoted lines
> 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.
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 5 of 13 in “Improve bash prompt to detect merge / rebase in progress”
  1. Improve bash prompt to detect merge / rebase in progressRobin Rosenberg, Sep 1, 2007
  2. Junio C HamanoSep 1, 2007
  3. Shawn O. PearceSep 1, 2007
  4. Johannes SchindelinSep 2, 2007
  5. Shawn O. PearceSep 2, 2007
  6. Johannes SchindelinSep 1, 2007
  7. Robin RosenbergSep 1, 2007
  8. Johannes SixtSep 2, 2007
  9. Robin RosenbergSep 2, 2007
  10. Shawn O. PearceSep 4, 2007
  11. Improve bash prompt to detect various states like an unfinished mergeRobin Rosenberg, Sep 30, 2007
  12. Junio C HamanoOct 1, 2007
  13. Robin RosenbergOct 1, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.