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

Re: How to rebase after upstream was merged?

From
Johannes Sixt <j.sixt@eudaptics.com>
Date
Jul 4, 2007, 13:45 UTC
Message-ID
<468BA46A.C66E85CA@eudaptics.com>
In-Reply-To
<Pine.LNX.4.64.0707041426570.4071@racer.site>
Johannes Schindelin wrote:
> [...how to check for linear history...]
> I usually to
> 
>         test -z "$(git rev-list --parents origin..HEAD | grep " .* ")"
Ah, that's much better.

Thanks, -- Hannes

Previous: Johannes Schindelin
Message 3 of 3 in “How to rebase after upstream was merged?”
  1. Johannes SixtJul 4, 2007
  2. Johannes SchindelinJul 4, 2007
  3. Johannes SixtJul 4, 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.