login
Header Space

 
 

Re: [PATCH] git-merge: add option --no-ff

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Lars Hjemli <hjemli@...>
Cc: Junio C Hamano <gitster@...>, Andreas Ericsson <ae@...>, Johannes Schindelin <Johannes.Schindelin@...>, Chris Shoemaker <c.shoemaker@...>, <git@...>
Date: Tuesday, September 18, 2007 - 2:23 am

Lars Hjemli <hjemli@gmail.com> wrote:

That still involves having to get the user to use something new to avoid
shooting themselves in the foot.  Perhaps putting a
"test -d $GIT_DIR/svn" condition in front of the git-svn call I proposed
in git-merge would be alright.

If anybody else is thinking about 'git-svn rebase', this is completely
different.  Using git-rebase alone doesn't allow git-svn users to shoot
themselves in the foot like git-merge does.  'git-svn rebase' only
serves to minimize typing and brain power needed to operate git-svn.

-- 
Eric Wong
-
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] git-merge: add option --no-ff, Lars Hjemli, (Mon Sep 17, 8:17 am)
Re: [PATCH] git-merge: add option --no-ff, Andreas Ericsson, (Mon Sep 17, 8:39 am)
Re: [PATCH] git-merge: add option --no-ff, Lars Hjemli, (Mon Sep 17, 9:16 am)
Re: [PATCH] git-merge: add option --no-ff, Johannes Schindelin, (Mon Sep 17, 9:23 am)
Re: [PATCH] git-merge: add option --no-ff, Lars Hjemli, (Mon Sep 17, 9:38 am)
Re: [PATCH] git-merge: add option --no-ff, Johannes Schindelin, (Mon Sep 17, 9:57 am)
Re: [PATCH] git-merge: add option --no-ff, Lars Hjemli, (Mon Sep 17, 10:12 am)
Re: [PATCH] git-merge: add option --no-ff, Chris Shoemaker, (Mon Sep 17, 12:07 pm)
Re: [PATCH] git-merge: add option --no-ff, Lars Hjemli, (Mon Sep 17, 12:14 pm)
Re: [PATCH] git-merge: add option --no-ff, Johannes Schindelin, (Mon Sep 17, 11:05 am)
Re: [PATCH] git-merge: add option --no-ff, Lars Hjemli, (Mon Sep 17, 11:17 am)
[PATCH] git-merge: add option --no-ff, Lars Hjemli, (Mon Sep 17, 12:23 pm)
Re: [PATCH] git-merge: add option --no-ff, Peter Baumann, (Tue Sep 18, 6:51 pm)
Re: [PATCH] git-merge: add option --no-ff, Lars Hjemli, (Wed Sep 19, 3:09 am)
Re: [PATCH] git-merge: add option --no-ff, Eric Wong, (Mon Sep 17, 8:50 pm)
Re: [PATCH] git-merge: add option --no-ff, Lars Hjemli, (Tue Sep 18, 2:12 am)
Re: [PATCH] git-merge: add option --no-ff, Junio C Hamano, (Tue Sep 18, 2:53 am)
Re: [PATCH] git-merge: add option --no-ff, Lars Hjemli, (Tue Sep 18, 4:02 am)
Re: [PATCH] git-merge: add option --no-ff, Sam Vilain, (Tue Sep 18, 3:30 am)
Re: [PATCH] git-merge: add option --no-ff, Sam Vilain, (Tue Sep 18, 5:12 am)
Re: [PATCH] git-merge: add option --no-ff, Lars Hjemli, (Tue Sep 18, 7:19 am)
Re: [PATCH] git-merge: add option --no-ff, Johannes Schindelin, (Tue Sep 18, 8:29 am)
Re: [PATCH] git-merge: add option --no-ff, Lars Hjemli, (Tue Sep 18, 8:38 am)
Re: [PATCH] git-merge: add option --no-ff, Sam Vilain, (Tue Sep 18, 7:50 am)
Re: [PATCH] git-merge: add option --no-ff, Lars Hjemli, (Tue Sep 18, 8:03 am)
Re: [PATCH] git-merge: add option --no-ff, Sam Vilain, (Tue Sep 18, 9:22 am)
Re: [PATCH] git-merge: add option --no-ff, Lars Hjemli, (Tue Sep 18, 10:01 am)
Re: [PATCH] git-merge: add option --no-ff, Sam Vilain, (Tue Sep 18, 10:34 am)
Re: [PATCH] git-merge: add option --no-ff, Eric Wong, (Tue Sep 18, 2:23 am)
Re: [PATCH] git-merge: add option --no-ff, Junio C Hamano, (Mon Sep 17, 9:09 pm)
Re: [PATCH] git-merge: add option --no-ff, Eric Wong, (Mon Sep 17, 9:39 pm)
Re: [PATCH] git-merge: add option --no-ff, Chris Shoemaker, (Mon Sep 17, 9:37 am)
Re: [PATCH] git-merge: add option --no-ff, Johannes Schindelin, (Mon Sep 17, 9:52 am)
Re: [PATCH] git-merge: add option --no-ff, Lars Hjemli, (Mon Sep 17, 9:40 am)
speck-geostationary