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

Re: [PATCH] git.el: Make it easy to add unmerged files

From
AJAlexandre Julliard <julliard@winehq.org>
Date
Aug 30, 2009, 15:58 UTC
Message-ID
<87ws4l47k2.fsf@wine.dyndns.org>
In-Reply-To
<4A9A92F4.2090209@chromecode.com>
Martin Nordholts <martin@chromecode.com> writes:
Show 5 quoted lines
> (Resending as I managed to mangle the previous patch despite trying not to...)
>
> It is nice and easy to git-add ignored and unknown files in a
> git-status buffer. Make it equally easy to add unmerged files which is
> a common use case.

That's not quite what adding a file means in git.el, unmerged files are considered added already, and marking them resolved is done through the git-resolve-file command. Of course that was implemented before git overloaded the meaning of git-add to mean git-update-index, so maybe we should follow the trend and use git-add-file for all index updates. In that case git-resolve-file should probably be removed.

-- 
Alexandre Julliard
julliard@winehq.org
Previous: Martin NordholtsNext: Martin Nordholts
Message 2 of 4 in “git.el: Make it easy to add unmerged files”
  1. git.el: Make it easy to add unmerged filesMartin Nordholts, Aug 30, 2009
  2. Alexandre JulliardAug 30, 2009
  3. Martin NordholtsSep 2, 2009
  4. Alexandre JulliardSep 2, 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.