[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: git is screwed

From: Steinar Bang
Subject: Re: git is screwed
Date: Thu, 26 Mar 2015 09:00:26 +0100
User-agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt)

>>>>> Jonas Bernoulli <address@hidden>:

> (And several people here implying that those of us who have embraced
> the staging area suffer from Stockholm syndrome certainly doesn't
> motivate me to rethink this decision).

FWIW the way magit displays the staging area are one of the things that
makes it really useful to me.

The way magit displays a merge with conflicts, and makes me work with
the conflicts, makes it my favourite tool for resolving the conflicts.

I even use it for merges that have no conflicts.  It's the quickest way
to walk the staged files and examining the diffs, before I commit.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]