diff options
| author | Martin Nordholts <enselic@gmail.com> | 2009-09-03 22:27:24 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-09 12:11:44 -0700 |
| commit | aaa68dd50f7b4226fdfdfbbe8bbb2dfd9a9e6d66 (patch) | |
| tree | 361f80e53ddebdcd48febb2d6121e552305a5a08 /mailmap.c | |
| parent | 3de8ba021718e80ef1bbf8a5a541beec86930f4c (diff) | |
| download | git-aaa68dd50f7b4226fdfdfbbe8bbb2dfd9a9e6d66.tar.gz | |
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>
Diffstat (limited to 'mailmap.c')
0 files changed, 0 insertions, 0 deletions