[kwlug-disc] git: merging some but not all commits

[Paul Nijjar]

On Thu, Mar 21, 2019 at 12:34:46PM -0400, Chris Irwin wrote:
> On Thu, Mar 21, 2019, at 03:00, Paul Nijjar via kwlug-disc wrote:
> 
> 2. Merge devel, and revert commits you don't want
> 
> Merge devel into master, then revert the specific commits that you don't want in master. This is also potentially error-prone (as you need to identify the commits to revert).
> 
> Pros: Preserves original git history, with commit times and messages unmodified from your development.
> 
> Cons: It's really just the inverse of #1, you need to manually identify commits. Additionally, those patches (and all of devel) will be in 'master' history, and will be pushed externally.
> 

Say I do this. Then let's say that I commit future changes to devel.
The next time I merge do I get only non-config changes? If this is the
case then I only have to go through the pain once, as opposed to the
first option where I have to remember to cherry-pick every single
time. 

I agree with others that it is not great to keep config checked into
git, but this is one of those situations where I am trying to figure
out what is going on with somebody else's code, and I do not want to
break production before I understand things better.

- Paul