| commit | a6e0a6770129e612398c8db98cd214586dc250f4 | |
| author | David Engster <deng@randomsample.de> | |
| Sun, 1 May 2016 19:05:18 +0000 (1 21:05 +0200) | ||
| committer | Noam Postavsky <npostavs@gmail.com> | |
| Fri, 7 Oct 2016 01:39:55 +0000 (6 21:39 -0400) | ||
| tree | e0c85aa3d06abc2d5e9d2769e1fa2b0748cfc7dc | treesnapshot (tar.gz zip) |
| parent | fb12af2084a751566ff5445654d75f5653f2253d | commitdiff |
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)
* 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 | diffblobblamehistory |