Experimental Physics and
Industrial Control System

Michael Davidsaver <[email protected]> · Tue, 2 Oct 2018 10:51:03 -0700

Dirk,

Have you found "git rebase -i <rev>"?  This allows interactive
(via a text editor) operations on <rev>..HEAD .  I use this on
a daily basis to juggle patch sets to move revisions I don't
want to push after those which I do.

I also occasionally move patch stacks between branches with

> git rebase --onto <new_base> <rev_from> <branch>

This moves <rev_from>...<branch> onto <new_base> and then
checks out <branch> at it's new location.

I imagine there are equivalents with "git cherry-pick", so my
preference may be historical at this point.

On 10/2/18 12:08 AM, Dirk Zimoch wrote:
> The cherry-pick method works well, including the ranged version.
> 
> I use gitk as a graphical fronted, but that does not support multiple cherry-picks at once. Still works reasonably well.
> 
> Thanks everyone.
> Dirk
> 
> On 01.10.2018 11:51, Niklas Claesson wrote:
>> Hi Dirk,
>>
>> With modern git versions (>1.7.2) you can do `git cherry-pick A..B`, where A would be the hash of the initial commit you want and B can be a commit hash or branch name.
>>
>> Here are some convenient aliases to look at the git history in the terminal instead of using guis:
>>
>> [alias]
>> l = log --graph --pretty=format:'%C(yellow)%h%Creset%C(blue)%d%Creset %C(white bold)%s%Creset %C(white dim)(by %an %ar)%Creset'
>> ll = !git l --all
>>
>>
>> Cheers
>>
>>
>> ----- On 1 Oct, 2018, at 09:47, Dirk Zimoch <[email protected]> wrote:
>>
>>     On 28.09.2018 16:31, Konrad, Martin wrote:
>>      > Hi Dirk,
>>      >> Is there a better way to do this?
>>      > Always merge from "upstream" to "PSI-7.0"
>>
>>     Yes, that part works.
>>
>>      > never the other way around.
>>      > Develop on your "PSI-7.0" branch and then "git cherry-pick" the
>>     commits
>>      > you consider generic enough to "upstream". This shouldn't result in
>>      > merge conflicts when you merge from "upstream" to "PSI-7.0" in
>>     the future.
>>      >
>>      > -Martin
>>
>>     There is no way to automatically cherry-pick all the changes after a
>>     given commit, is there?
>>
>>
>> -- 
>> ───────────────────────┐ ┌─┐ ┌─┐ ┌─┐ ┌───────────────────────
>>                         └─┘ └─┘ └─┘ └─┘
>> Niklas Claesson, HW & SW Developer        Cosylab Switzerland
>> M.S., Electrical Engineering           http://www.cosylab.com
>>   Email: [email protected]
>>   Phone: +41 765 491901
>> Google: [email protected]
>>   Skype: nickez
>> ──┐ ┌─┐ ┌─┐ ┌─┐ ┌───────────────────────────┐ ┌─┐ ┌─┐ ┌─┐ ┌──
>>    └─┘ └─┘ └─┘ └─┘                           └─┘ └─┘ └─┘ └─┘

Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System