login
Login / Register
Header Space

 
 

Home » Mailing list archives » git » 2007 » September » 17

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

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Lars Hjemli <hjemli@...>
To: Johannes Schindelin <Johannes.Schindelin@...>
Cc: Andreas Ericsson <ae@...>, Junio C Hamano <gitster@...>, <git@...>, Eric Wong <normalperson@...>
Subject: Re: [PATCH] git-merge: add option --no-ff
Date: Monday, September 17, 2007 - 10:12 am

On 9/17/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Probably. The case I'm trying to solve is:
  -git-svn branch A is merged into git-svn branch B
  -A is a fast-forward of B

This might look unrealistic, but it happened to me today when I wanted
to merge a feature-branch into a relase-branch. The release-branch had
previously been merged into the feature-branch (to get a few
bugfixes), but the release-branch had not changed since this merge. So
when merging the feature-branch into the release-branch it just
fast-forwarded, leaving me with an 'un-dcomittable' release-branch. I
obviously could have done the merge in subversion (haha!), but doing
it in git preserves the correct history.

Btw: I have redone the merge with --no-ff, and dcommit then worked
like a charm ;-)

-- 
larsh
-
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)

Mail archive search
Enter your search terms.
Optionally limit your search to a specific mailing list.
advanced
Recent Tags
more tags
Colocation donated by:
Who's online
There are currently 3 users and 1309 guests online.

Online users

Syndicate
Syndicate content
© 2007 KernelTrap.  |  Powered by Drupal.  |  Legal statement.
speck-geostationary