| commit | aaa68dd50f7b4226fdfdfbbe8bbb2dfd9a9e6d66 | |
| author | Martin Nordholts <enselic@gmail.com> | |
| Thu, 3 Sep 2009 20:27:24 +0000 (3 22:27 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Sep 2009 19:11:44 +0000 (9 12:11 -0700) | ||
| tree | 361f80e53ddebdcd48febb2d6121e552305a5a08 | treesnapshot (tar.gz zip) |
| parent | 3de8ba021718e80ef1bbf8a5a541beec86930f4c | commitdiff |
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>
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 | diffblobblamehistory |