Re: [PATCH v2] Teach 'git pull' about --rebase

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Junio C Hamano
Date: Wednesday, November 28, 2007 - 4:32 pm

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:


I suspect that people who do not like the two modes of checkout will
certainly not appreciate the overloading two behaviours to create
different kind of histories and two different ways to continue when the
integration do not go smoothly upon conflicts these two behaviours have.

However, I agree very much with an earlier comment made by Daniel about
our UI being task oriented instead of being command oriented, and I
actually consider it a good thing.  So it does not bother me too much
that "git pull --rebase" has a quite different workflow from the regular
"merge" kind of pull.

So let's queue "pull --rebase" and see what happens.


-
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:
[PATCH] Teach 'git pull' the '--rebase' option, Johannes Schindelin, (Thu Oct 25, 3:54 pm)
Re: [PATCH] Teach 'git pull' the '--rebase' option, Linus Torvalds, (Thu Oct 25, 4:04 pm)
Re: [PATCH] Teach 'git pull' the '--rebase' option, Johannes Schindelin, (Thu Oct 25, 4:10 pm)
Re: [PATCH] Teach 'git pull' the '--rebase' option, Linus Torvalds, (Thu Oct 25, 4:36 pm)
Re: [PATCH] Teach 'git pull' the '--rebase' option, Linus Torvalds, (Thu Oct 25, 4:49 pm)
Re: [PATCH] Teach 'git pull' the '--rebase' option, Junio C Hamano, (Thu Oct 25, 4:54 pm)
Re: [PATCH] Teach 'git pull' the '--rebase' option, Johannes Schindelin, (Fri Oct 26, 2:52 am)
Re: [PATCH] Teach 'git pull' the '--rebase' option, Jeff King, (Fri Oct 26, 4:43 am)
Re: [PATCH] Teach 'git pull' the '--rebase' option, Jeff King, (Fri Oct 26, 4:45 am)
Re: [PATCH] Teach 'git pull' the '--rebase' option, Junio C Hamano, (Tue Nov 27, 5:11 pm)
[PATCH v2] Teach 'git pull' about --rebase, Johannes Schindelin, (Wed Nov 28, 6:11 am)
Re: [PATCH v2] Teach 'git pull' about --rebase, Jonathan del Strother, (Wed Nov 28, 6:15 am)
Re: [PATCH v2] Teach 'git pull' about --rebase, Johannes Schindelin, (Wed Nov 28, 7:02 am)
Re: [PATCH v2] Teach 'git pull' about --rebase, Steven Grimm, (Wed Nov 28, 1:35 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, Johannes Schindelin, (Wed Nov 28, 1:40 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, Lars Hjemli, (Wed Nov 28, 2:10 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, Junio C Hamano, (Wed Nov 28, 2:55 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, Johannes Schindelin, (Wed Nov 28, 2:58 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, Jon Loeliger, (Wed Nov 28, 2:59 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, Johannes Schindelin, (Wed Nov 28, 3:02 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, Steven Grimm, (Wed Nov 28, 3:06 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, J. Bruce Fields, (Wed Nov 28, 3:33 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, J. Bruce Fields, (Wed Nov 28, 3:47 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, Johannes Schindelin, (Wed Nov 28, 4:12 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, Junio C Hamano, (Wed Nov 28, 4:32 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, J. Bruce Fields, (Wed Nov 28, 4:56 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, Johannes Schindelin, (Wed Nov 28, 5:16 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, Nicolas Pitre, (Wed Nov 28, 8:23 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, Andreas Ericsson, (Thu Nov 29, 1:36 am)