Re: Question about "git commit -a"

From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Oct 5, 2007, 11:35 UTC
Message-ID: <vpqsl4piykb.fsf@bauges.imag.fr>
In-Reply-To: <47060E98.2090601@op5.se>

Andreas Ericsson <ae@op5.se> writes:

Show 7 quoted lines

>>> or check which merge- conflicts you've already resolved,
>>
>> At least bzr and baz have this kind of conflict management. It's just
>> a separate file, containing the list of unresolved conflicts.
>
> Can you check them against any revision you want? If so, I'm
> impressed :)

If you mean s/check/diff/, not in a simple way, no. Otherwise, I don't understand what you mean by "check merge-conflicts you've already resolved against any revision".

-- 
Matthieu

$ 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.