[git-users] cherry-picking modifies more than it should

2013-10-07 Thread Paulo Matos
that this wouldn't be possible and cherry-picking would be more like a git format-patch + git apply with a nicer interface. Cheers, Paulo Matos -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails

[git-users] Re: cherry-picking modifies more than it should

2013-10-07 Thread Paulo Matos
This is in git 1.8.1.3. On Monday, 7 October 2013 16:44:33 UTC+1, Paulo Matos wrote: Hi, I am seeing an unexpected effect of cherry-picking. I have two branches master and feature where feature branched off master awhile ago. I commit patch A to feature (in this case

Re: [git-users] cherry-picking modifies more than it should

2013-10-25 Thread Paulo Matos
the introduced code is not even part of the conflict. Current theory is that there's a bug in git 1.8.1. Will try latest release. I can reproduce this easily but unfortunately the used code if closed. I have contacted our IT dept. and they are looking at it. Cheers, -- Paulo Matos -- You received