]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5942c18) | patch
gitmerge: Add cherry pick to gitmerge-skip-regexp
authorDavid Engster <deng@randomsample.de>
Sun, 1 May 2016 19:05:18 +0000 (21:05 +0200)
committerDavid Engster <deng@randomsample.de>
Sun, 1 May 2016 19:17:55 +0000 (21:17 +0200)
commitf648e4866981b142fca788372e1fd9013a0bb16a
treec1a0c01b1ee806a6d8802fd306bb76a83c59369ftree | snapshot
parent5942c18e9a4f04996d80071b717049f55c1f69d8commit | diff
gitmerge: Add cherry pick to gitmerge-skip-regexp

* gitmerge.el (gitmerge-skip-regexp): Add "cherry picked from commit",
  which is the string appended by 'git cherry-pick -x'.
admin/gitmerge.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.