![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Alexandre Julliard <julliard@winehq.org> | |
| Sat, 2 Aug 2008 16:04:31 +0000 (18:04 +0200) | ||
| committer | Alexandre Julliard <julliard@winehq.org> | |
| Fri, 21 Nov 2008 19:39:02 +0000 (20:39 +0100) | ||
| commit | 6fb204266cc985284b554e9f9f1894ec8360b2f5 | |
| tree | a29ca6eaea2341e907893336e52919bd661f2cb4 | tree | snapshot |
| parent | 9ddf6d7c105e58d76ea6762d8cc8eebdf463903e | commit | diff |
git.el: Simplify handling of merge heads in the commit log-edit buffer.
Use a single Merge: header instead of one Parent: header for each
parent, and don't list the current HEAD as a merged head. Support
symbolic references too.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Use a single Merge: header instead of one Parent: header for each
parent, and don't list the current HEAD as a merged head. Support
symbolic references too.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
| contrib/emacs/git.el | diff | blob | history |