projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 75a8180) | patch
git.el: Added a function to diff against the other heads in a merge.
authorAlexandre Julliard <julliard@winehq.org>
Sun, 19 Mar 2006 09:06:10 +0000 (10:06 +0100)
committerJunio C Hamano <junkio@cox.net>
Sun, 19 Mar 2006 20:30:14 +0000 (12:30 -0800)
commit2b1c0ef2e5d103efacb535f32fb142114490dc33
treef65feef3d90bcbe4b8530810fdc58f72bfb751a1tree | snapshot
parent75a8180d4b6939aca03b2c6320f128469abd5879commit | diff
git.el: Added a function to diff against the other heads in a merge.

git-diff-file-merge-head generates a diff against the first merge
head, or with a prefix argument against the nth head. Bound to `d h'
by default.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
contrib/emacs/git.el diff | blob | history
The core git plumbing