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 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
──┐ ┌─┐ ┌─┐ ┌─┐ ┌───────────────────────────┐ ┌─┐ ┌─┐ ┌─┐ ┌──
└─┘ └─┘ └─┘ └─┘ └─┘ └─┘ └─┘ └─┘
