Martin von Zweigbergk martinv...@gmail.com writes:
I'm working on a re-roll of
http://thread.gmane.org/gmane.comp.version-control.git/205796
and finally got around to including test cases for what you fixed in
this patch. I want to make sure I'm testing what you fixed here. See
questions
On Fri, Feb 1, 2013 at 1:05 PM, Phil Hord ho...@cisco.com wrote:
This is probably right, but it is not exactly the case that caused my itch.
I think my branch looked like [...]
That also makes sense. I'll add tests for both cases. Your patch makes
both of them pass.
# a---b---c
# \ \
I'm working on a re-roll of
http://thread.gmane.org/gmane.comp.version-control.git/205796
and finally got around to including test cases for what you fixed in
this patch. I want to make sure I'm testing what you fixed here. See
questions below.
On Sat, Jan 12, 2013 at 12:46 PM, Phil Hord
Martin von Zweigbergk wrote:
I'm working on a re-roll of
http://thread.gmane.org/gmane.comp.version-control.git/205796
and finally got around to including test cases for what you fixed in
this patch. I want to make sure I'm testing what you fixed here. See
questions below.
Thanks for that.
On Sat, Jan 12, 2013 at 03:46:01PM -0500, Phil Hord wrote:
Since 90e1818f9a (git-rebase: add keep_empty flag, 2012-04-20)
'git rebase --preserve-merges' fails to preserve empty merge commits
unless --keep-empty is also specified. Merge commits should be
preserved in order to preserve the
Phil Hord ho...@cisco.com writes:
Subject: [PATCH] rebase --preserve-merges keeps empty merge commits
I would rephrase it as
rebase --preserve-merges: keep empty merge commits
we usually give orders in commit messages, not state facts (it's not
clear from the existing subject line whether
Matthieu Moy matthieu@grenoble-inp.fr writes:
Phil Hord ho...@cisco.com writes:
Subject: [PATCH] rebase --preserve-merges keeps empty merge commits
I would rephrase it as
rebase --preserve-merges: keep empty merge commits
we usually give orders in commit messages, not state facts
Junio C Hamano wrote:
Matthieu Moy matthieu@grenoble-inp.fr writes:
Phil Hord ho...@cisco.com writes:
Subject: [PATCH] rebase --preserve-merges keeps empty merge commits
I would rephrase it as
rebase --preserve-merges: keep empty merge commits
we usually give orders in commit
Since 90e1818f9a (git-rebase: add keep_empty flag, 2012-04-20)
'git rebase --preserve-merges' fails to preserve empty merge commits
unless --keep-empty is also specified. Merge commits should be
preserved in order to preserve the structure of the rebased graph,
even if the merge commit does not
9 matches
Mail list logo
