]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fb12af2) | 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)
committerNoam Postavsky <npostavs@gmail.com>
Fri, 7 Oct 2016 01:39:55 +0000 (21:39 -0400)
commita6e0a6770129e612398c8db98cd214586dc250f4
treee0c85aa3d06abc2d5e9d2769e1fa2b0748cfc7dctree | snapshot
parentfb12af2084a751566ff5445654d75f5653f2253dcommit | 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'.

(cherry picked from commit f648e4866981b142fca788372e1fd9013a0bb16a)
admin/gitmerge.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.