Re: git rebase loses the additional changes in evil merges

2013-03-05 Thread Dale Worley
From: Junio C Hamano gits...@pobox.com I think this is to be expected for git rebase, as it does not even look at merges. It is a way to find non-merge commits that haven't been applied yet, and apply them to the upstream to create a new linear history. I disagree. git rebase is not

Re: git rebase loses the additional changes in evil merges

2013-03-05 Thread Junio C Hamano
Dale Worley wor...@c-66-31-108-177.hsd1.ma.comcast.net writes: From: Junio C Hamano gits...@pobox.com I think this is to be expected for git rebase, as it does not even look at merges. It is a way to find non-merge commits that haven't been applied yet, and apply them to the upstream to

Re: git rebase loses the additional changes in evil merges

2013-03-05 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Tuesday, March 05, 2013 9:35 PM Dale Worley wor...@c-66-31-108-177.hsd1.ma.comcast.net writes: From: Junio C Hamano gits...@pobox.com I think this is to be expected for git rebase, as it does not even look at merges. It is a way to find non-merge

Re: git rebase loses the additional changes in evil merges

2013-03-05 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: Given that many folk appear to trip up with their rebase mindset, does this suggest that a few tweaks to the manual may be in order to stop such misunderstandings? Perhaps. -- To unsubscribe from this list: send the line unsubscribe git in the body

git rebase loses the additional changes in evil merges

2013-03-04 Thread Dale R. Worley
(git version 1.7.7.6) I've been learning how to use Git. While exploring git rebase, I've discovered that if the branch being rebased contains an evil merge, that is, a merge which contains changes that are in addition to the changes in any of the parent commits, the rebase operation will

Re: git rebase loses the additional changes in evil merges

2013-03-04 Thread Thomas Rast
Junio C Hamano gits...@pobox.com writes: wor...@alum.mit.edu (Dale R. Worley) writes: (git version 1.7.7.6) I've been learning how to use Git. While exploring git rebase, I've discovered that if the branch being rebased contains an evil merge, that is, a merge which contains changes that

Re: git rebase loses the additional changes in evil merges

2013-03-04 Thread Junio C Hamano
Thomas Rast tr...@student.ethz.ch writes: Junio C Hamano gits...@pobox.com writes: wor...@alum.mit.edu (Dale R. Worley) writes: (git version 1.7.7.6) I've been learning how to use Git. While exploring git rebase, I've discovered that if the branch being rebased contains an evil merge,