Home » Mailing list archives » git » 2007 » November » 28

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

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Steven Grimm
Subject: Re: [PATCH v2] Teach 'git pull' about --rebase
Date: Wednesday, November 28, 2007 - 1:35 pm

On Nov 28, 2007, at 5:11 AM, Johannes Schindelin wrote:

I wonder if this shouldn't be branch.<name>.pulltype or something like  
that, so we can represent more than just "rebase or not." Values could  
be "rebase", "merge" (the default) and maybe even "manual" to specify  
that git-pull should neither merge nor rebase a particular branch even  
if it matches a wildcard refspec.

Not too sure about that last suggestion but it seems like there might  
be other settings than "rebase" and "merge" in the future even if  
that's not one of them.

-Steve
-
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)
Re: [PATCH v2] Teach 'git pull' about --rebase, Björn, (Sat Dec 1, 1:37 pm)
Re: [PATCH v2] Teach 'git pull' about --rebase, Karl , (Mon Dec 3, 6:10 am)