| commit | f648e4866981b142fca788372e1fd9013a0bb16a | |
| author | David Engster <deng@randomsample.de> | |
| Sun, 1 May 2016 19:05:18 +0000 (1 21:05 +0200) | ||
| committer | David Engster <deng@randomsample.de> | |
| Sun, 1 May 2016 19:17:55 +0000 (1 21:17 +0200) | ||
| tree | c1a0c01b1ee806a6d8802fd306bb76a83c59369f | treesnapshot (tar.gz zip) |
| parent | 5942c18e9a4f04996d80071b717049f55c1f69d8 | 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'.
* gitmerge.el (gitmerge-skip-regexp): Add "cherry picked from commit",
which is the string appended by 'git cherry-pick -x'.
| admin/gitmerge.el | diffblobblamehistory |