Merge or Cherry-Pick?

Dawit A adawit at
Thu Feb 3 05:21:17 GMT 2011

On Wed, Feb 2, 2011 at 1:03 PM, Dawit A <adawit at> wrote:
> Would someone be so kind to tell me how to undo accidentally pushed
> commits to trunk ? By accident I pushed the following commits to trunk
> when I only meant to push backported fixes in 4.6 branch:

For those like me who made a mistake like this one there is an easy
solution... Do

git config --global push.default tracking

and use the -t or --track option when creating your branches (branch
or checkout -b). This way you can 'git push' (no arguments) in the
current tracked branch without accidentally pushing your changes in
other branches.

More information about the kde-core-devel mailing list