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 git-cherrypick, 
> so it won't commit the cherry picked commit instantly, but let you 
> investigate and possibly modify it.
>

Also, a nice trick is to do git add --patch (-p) to stage just the lines 
you want and then committing (not sure if cherrypick will stage, but do a 
reset first if so).

-- 
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 from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to