[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25

From: John Wiegley
Subject: Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25
Date: Tue, 12 Jan 2016 09:12:18 -0800
User-agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin)

>>>>> Glenn Morris <address@hidden> writes:

> Oh, I guess it is because the original commit message happened to contain
> the word "merge", and thus match gitmerge-skip-regexp. IIRC, gitmerge should
> ask you whether to skip a given commit, not just unconditionally skip it.
> Some judgement is required when deciding to answer yes or no to that prompt.
> The gitmerge regexp is biased to match more rather than less.

This was my mistake, in thinking gitmerge was DTRT. I'll review each skip
manually from now on.

John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2

reply via email to

[Prev in Thread] Current Thread [Next in Thread]