Experimental Physics and
Industrial Control System
| 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 <2018> 2019 2020 2021 2022 2023 2024 | Index | 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 <2018> 2019 2020 2021 2022 2023 2024 |
| <== Date ==> | <== Thread ==> |
|---|
| Subject: | Re: A question for the git experts |
| From: | Niklas Claesson <[email protected]> |
| To: | Dirk Zimoch <[email protected]> |
| Cc: | core-talk <[email protected]> |
| Date: | Mon, 1 Oct 2018 11:51:17 +0200 (CEST) |
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
──┐ ┌─┐ ┌─┐ ┌─┐ ┌───────────────────────────┐ ┌─┐ ┌─┐ ┌─┐ ┌──
└─┘ └─┘ └─┘ └─┘ └─┘ └─┘ └─┘ └─┘
└─┘ └─┘ └─┘ └─┘
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
──┐ ┌─┐ ┌─┐ ┌─┐ ┌───────────────────────────┐ ┌─┐ ┌─┐ ┌─┐ ┌──
└─┘ └─┘ └─┘ └─┘ └─┘ └─┘ └─┘ └─┘
- Replies:
- Re: A question for the git experts Dirk Zimoch
- References:
- Re: A question for the git experts Konrad, Martin
- Re: A question for the git experts Dirk Zimoch
- Navigate by Date:
- Prev: Re: A question for the git experts Ralph Lange
- Next: Build failed in Jenkins: EPICS-7 #116 Jenkins Epics PSI
- Index: 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 <2018> 2019 2020 2021 2022 2023 2024
- Navigate by Thread:
- Prev: Re: A question for the git experts Ralph Lange
- Next: Re: A question for the git experts Dirk Zimoch
- Index: 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 <2018> 2019 2020 2021 2022 2023 2024
·
Home
·
News
·
About
·
Base
·
Modules
·
Extensions
·
Distributions
·
Download
·
· Search · EPICS V4 · IRMIS · Talk · Bugs · Documents · Links · Licensing ·