Thread (1 message) 1 message, 1 author, 2016-06-15

Re: Picking up multiple cherries at one go.

From: Alex Riesen <hidden>
Date: 2016-06-15 22:48:29

Please, don't strip gitml from cc. Your questions maybe interesting to
someone else.

On Wed, Mar 24, 2010 at 10:36, Jozef Babjak [off-list ref] wrote:
Thanks for hint. I did not used interactive git commands ever; maybe I
should try.
quoted
Try git rebase -i (interactive) next time. It does not exactly what your
script does, but ... You may like it.
 ^-- Do you mean to make a copy of the multi_purpose_branch first and
then to rebase interactively that new base onto master or any other
ancestor branch and removing unwanted comits? The issue is that I
usually want to keep only small portion of commits in newly created
topic branch. It seems to be easier to mark somehow 5 commits I want
instead of 95 commits I do not want.
You'll be amazed how easy it is (and how nothing it costs) to make a copy
of a branch: "git branch tmp". And you can rebase-interactive a portion
of the branch you're on: "git rebase -i HEAD~10". This will consider last
10 commits for cherry-picking. And even if you want to review all 100
commits, it maybe not that hard if you have a plain text file with subject
lines of the commits (and their sha1). You always can start a history
browser of your choice (gitk?) to help you with that.
At least that's how I do that since Johannes invented rebase-interactive.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help