Re: Call Me Gitless

From: Elijah Newren <newren@gmail.com>
Date: Aug 22, 2008, 19:10 UTC
Message-ID: <51419b2c0808221210k6e7defdcw3ba9e4ef89e054e7@mail.gmail.com>
In-Reply-To: <48AD7895.5010707@gnu.org>

On Thu, Aug 21, 2008 at 8:15 AM, Paolo Bonzini <bonzini@gnu.org> wrote:

Show 10 quoted lines

> I used to think that the proposal I saw in another git frontend, which is:
>
>        git diff --cached -->   git diff --staged
>        git diff -->            git diff --unstaged
>        git diff HEAD -->       git diff
>
> was a good one, but it is actually not when you start thinking about what to
> do during a large merge with few conflicts.  In fact, even though I use the
> index almost exclusively when merging (*), I don't mind the few extra
> keystrokes.

If you look a little closer, you'll note that the three lines of this proposal has an exception specifically for the conflict during merge case. :-)

Elijah

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