[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25
|
From: |
Glenn Morris |
|
Subject: |
Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25 |
|
Date: |
Tue, 12 Jan 2016 12:09:34 -0500 |
|
User-agent: |
Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
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.
Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25, John Wiegley, 2016/01/12