projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3de8ba0) | patch
git.el: Use git-add-file for unmerged files, remove git-resolve-file
authorMartin Nordholts <enselic@gmail.com>
Thu, 3 Sep 2009 20:27:24 +0000 (22:27 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Sep 2009 19:11:44 +0000 (12:11 -0700)
commitaaa68dd50f7b4226fdfdfbbe8bbb2dfd9a9e6d66
tree361f80e53ddebdcd48febb2d6121e552305a5a08tree | snapshot
parent3de8ba021718e80ef1bbf8a5a541beec86930f4ccommit | diff
git.el: Use git-add-file for unmerged files, remove git-resolve-file

Use `git-add-file' to mark unmerged files as resolved in the
*git-status* buffer to be consistent with git's CLI instructions. Also
remove `git-resolve-file' to make it clear that that "R" is a now a
free keybinding.

Signed-off-by: Martin Nordholts <martinn@src.gnome.org>
Acked-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/emacs/git.el diff | blob | history
Git—the stupid content tracker