git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] git.el: Use git-add-file for unmerged files, remove git-resolve-file

From
AJAlexandre Julliard <julliard@winehq.org>
Date
Sep 8, 2009, 18:43 UTC
Message-ID
<873a6x9t0l.fsf@wine.dyndns.org>
In-Reply-To
<4AA026AC.10907@gmail.com>
Martin Nordholts <enselic@gmail.com> writes:
Show 6 quoted lines
> 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>
Looks good, thanks.
Acked-by: Alexandre Julliard <julliard@winehq.org>
-- 
Alexandre Julliard
julliard@winehq.org
Previous: Martin NordholtsNext: Junio C Hamano
Message 2 of 6 in “git.el: Use git-add-file for unmerged files, remove git-resolve-file”
  1. git.el: Use git-add-file for unmerged files, remove git-resolve-fileMartin Nordholts, Sep 3, 2009
  2. Alexandre JulliardSep 8, 2009
  3. Junio C HamanoSep 8, 2009
  4. Junio C HamanoSep 8, 2009
  5. Alexandre JulliardSep 9, 2009
  6. Junio C HamanoSep 9, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.