Skip to content
Snippets Groups Projects
Select Git revision
  • v1.6.5.2
  • master default protected
  • seen
  • next
  • todo
  • maint
  • jch
  • v2.50.1
  • v2.50.0
  • v2.47.3
  • v2.48.2
  • v2.49.1
  • v2.43.7
  • v2.44.4
  • v2.45.4
  • v2.46.4
  • v2.50.0-rc2
  • v2.50.0-rc1
  • v2.50.0-rc0
  • v2.49.0
  • v2.49.0-rc2
  • v2.49.0-rc1
  • v2.49.0-rc0
  • v2.48.1
  • v2.48.0
  • v2.48.0-rc2
  • v2.48.0-rc1
27 results

emacs

  • Clone with SSH
  • Clone with HTTPS
  • user avatar
    Martin Nordholts authored and Junio C Hamano committed
    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: default avatarMartin Nordholts <martinn@src.gnome.org>
    Acked-by: default avatarAlexandre Julliard <julliard@winehq.org>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    aaa68dd5
    History