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

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Johannes Schindelin <Johannes.Schindelin@...>
Cc: Sergei Organov <osv@...>, <git@...>
Date: Wednesday, October 31, 2007 - 5:29 pm

On Wed, Oct 31, 2007 at 09:12:06PM +0000, Johannes Schindelin wrote:

That would make sense to me if this was a mistake that could easily
happen.

I'd assumed that in the case of a conflict that stopped the rebase
process, the index and working tree are always left dirty, so that if
they both agree with the HEAD at the time of commit, then it's because
the user explicitly made them that way.

I ran into the same confusion as the original poster when starting to
use rebase, so I suspect it's common.

--b.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Newbie: report of first experience with git-rebase., Sergei Organov, (Wed Oct 31, 3:39 pm)
Re: Newbie: report of first experience with git-rebase., Sergei Organov, (Wed Oct 31, 4:28 pm)
Re: Newbie: report of first experience with git-rebase., Johannes Schindelin, (Wed Oct 31, 5:12 pm)
Re: Newbie: report of first experience with git-rebase., David Kastrup, (Wed Oct 31, 6:49 pm)
Re: Newbie: report of first experience with git-rebase., Junio C Hamano, (Wed Oct 31, 5:39 pm)
Re: Newbie: report of first experience with git-rebase., Sergei Organov, (Thu Nov 1, 8:13 am)
Re: Newbie: report of first experience with git-rebase., Johannes Schindelin, (Thu Nov 1, 10:24 am)
Re: Newbie: report of first experience with git-rebase., J. Bruce Fields, (Thu Nov 1, 11:10 am)
Re: Newbie: report of first experience with git-rebase., Nicolas Pitre, (Wed Oct 31, 10:27 pm)
Re: Newbie: report of first experience with git-rebase., David Kastrup, (Wed Oct 31, 6:53 pm)
Re: Newbie: report of first experience with git-rebase., J. Bruce Fields, (Wed Oct 31, 5:29 pm)
Re: Newbie: report of first experience with git-rebase., Steven Grimm, (Wed Oct 31, 6:06 pm)
Re: Newbie: report of first experience with git-rebase., J. Bruce Fields, (Wed Oct 31, 6:38 pm)
Re: Newbie: report of first experience with git-rebase., Daniel Barkalow, (Wed Oct 31, 6:35 pm)