]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4fab26b) | patch
Compute a better commit message for merges
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 22 Mar 2016 23:42:28 +0000 (16:42 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 22 Mar 2016 23:42:42 +0000 (16:42 -0700)
commitddd9111a90f59abedd5065bfb7ac53454f816780
treeab6b478e8645787a421319ff4c13c16d9f9e8199tree | snapshot
parent4fab26ba5ac381ce836eff521fc56d8d28570221commit | diff
Compute a better commit message for merges

Problem reported by David Engster in:
http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01270.html
* admin/gitmerge.el (gitmerge-commit-message):
Truncate the computed commit message to at most 72 characters per line.
(gitmerge-maybe-resume): Don’t use "-" as the commit message for
merges; use the computed commit message instead.
admin/gitmerge.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.