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

Re: Newbie: report of first experience with git-rebase.

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 1, 2007, 20:20 UTC
Message-ID
<7v8x5hbtvv.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20071101151016.GA26103@fieldses.org>
"J. Bruce Fields" <bfields@fieldses.org> writes:
Show 19 quoted lines
> On Thu, Nov 01, 2007 at 02:24:37PM +0000, Johannes Schindelin wrote:
>> 
>> They are rare events.  In your case I guess that subtly different versions 
>> were _actually_ applied (such as white space fixes),
>
> That's actually pretty common, in my experience.
>
>> which is why such a rare event hit you.
>
> I'm using git to track some changes I submitted to a project that's
> mainly text, and that I only get release tarballs of.  On my most recent
> rebase all my patches got applied, but the text also got re-wrapped and
> re-indented at the same time.  So all but I think one or two of a dozen
> patches ended up with a conflict resolution and then --skip.
>
> Which may not be a case git's really intended for--fair enough.  But
> I've found it's pretty common in my kernel work too.  Either I'm
> rebasing against changes I made myself, or else a maintainer took my
> changes but fixed up some minor style problems along the way.
Ok, so I retract that "rare" comment.

Now, we have established that this is a real problem worth solving, what's next?

Previous: J. Bruce FieldsNext: Andreas Ericsson
Message 15 of 20 in “Newbie: report of first experience with git-rebase.”
  1. Sergei OrganovOct 31, 2007
  2. Björn SteinbrinkOct 31, 2007
  3. Sergei OrganovOct 31, 2007
  4. Johannes SchindelinOct 31, 2007
  5. J. Bruce FieldsOct 31, 2007
  6. Steven GrimmOct 31, 2007
  7. Daniel BarkalowOct 31, 2007
  8. J. Bruce FieldsOct 31, 2007
  9. Junio C HamanoOct 31, 2007
  10. David KastrupOct 31, 2007
  11. Nicolas PitreNov 1, 2007
  12. Sergei OrganovNov 1, 2007
  13. Johannes SchindelinNov 1, 2007
  14. J. Bruce FieldsNov 1, 2007
  15. Junio C HamanoNov 1, 2007
  16. Andreas EricssonNov 2, 2007
  17. Junio C HamanoNov 2, 2007
  18. David KastrupOct 31, 2007
  19. Alex RiesenOct 31, 2007
  20. Andreas EricssonNov 2, 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.