On Thursday, September 12, 2013 10:06:40 PM UTC+2, Gergely Polonkai wrote:
Cherry picking is your friend here. The easiest way maybe if you add the
bug fixing two lines as a separate commit. This way you will only have to
cherry pick that only commit. Otherwise, you may add -n to
Cherrypick commits by default. You can add -n to prevent it, in which case
the picked changes will be staged, and the commit message will be filled
with the original commit message.
On 13 Sep 2013 08:31, Thomas Ferris Nicolaisen tfn...@gmail.com wrote:
On Thursday, September 12, 2013 10:06:40 PM
What would be the steps required to achieve this?
* create branch to work on a bug branch1 from master
* checkout branch1
* make lots of changes to branch1 putting in print statements all over
the place etc, but then identifying the actual issue fixing
* in summary say then there are 20
Cherry picking is your friend here. The easiest way maybe if you add the
bug fixing two lines as a separate commit. This way you will only have to
cherry pick that only commit. Otherwise, you may add -n to git-cherrypick,
so it won't commit the cherry picked commit instantly, but let you
ok thanks - I'll read up on cherry picking
On Friday, September 13, 2013 6:06:40 AM UTC+10, Gergely Polonkai wrote:
Cherry picking is your friend here. The easiest way maybe if you add the
bug fixing two lines as a separate commit. This way you will only have to
cherry pick that only
