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

Re: [PATCH 1/3] rebase: allow --merge option to handle patches merged upstream

From
EWEric Wong <normalperson@yhbt.net>
Date
Jun 25, 2006, 04:59 UTC
Message-ID
<20060625045912.GB17674@hand.yhbt.net>
In-Reply-To
<Pine.LNX.4.63.0606250401490.29667@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 10 quoted lines
> Hi,
> 
> On Sat, 24 Jun 2006, Eric Wong wrote:
> 
> > +		if test -n "`git-diff-index HEAD`"
> 
> This is not a sufficient test if the patch was already merged to upstream. 
> For example, you can have two patches which touched the same file, and one 
> of them was applied to upstream, the other not. The test fails to see 
> that. Or am I missing something?

This is just to tell if there's anything worth committing after a merge is complete. If not, then it assumes it's been a) merged upstream or b) empty in the first place (very unlikely).

-- 
Eric Wong
Previous: Johannes SchindelinNext: Eric Wong
Message 8 of 10 in “rebase --merge: fix for rebasing more than 7 commits.”
  1. rebase --merge: fix for rebasing more than 7 commits.Junio C Hamano, Jun 22, 2006
  2. Junio C HamanoJun 22, 2006
  3. Eric WongJun 22, 2006
  4. Junio C HamanoJun 24, 2006
  5. 0/3 rebase --merge improvements and fixesEric Wong, Jun 25, 2006
  6. 1/3 rebase: allow --merge option to handle patches merged upstreamEric Wong, Jun 25, 2006
  7. Johannes SchindelinJun 25, 2006
  8. Eric WongJun 25, 2006
  9. 2/3 rebase: cleanup rebasing with --mergeEric Wong, Jun 25, 2006
  10. 3/3 rebase: allow --skip to work with --mergeEric Wong, Jun 25, 2006

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.