Re: GIT vs Other: Need argument

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: GIT vs Other: Need argument

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:06

Karl Hasselström [off-list ref] writes:
This is the main selling point of StGIT, in my opinion. It keeps track
of stuff for you when you rebase, so you won't accidentally forget
things. The extra help isn't needed much when everything goes
smoothly, but as soon as you get a conflict or three in the middle of
rebasing a largish stack, it's invaluable to just be able to say "stg
series" to see which patches have been applied to HEAD, and which are
still floating in limbo.
I do not think we are talking about the same thing.  In your
example, you perfectly well remember that you were in the middle
of StGIT operation.  The problem I described is that sometimes I
do not even recall if I was rebasing or merging after resolving
conflicts.  If I *knew* I was in the middle of a rebase, I know
where to look (.dotest/ has all the necessary "state" for
rebase/am to continue) to remind me where I was.

Re: GIT vs Other: Need argument

From: Petr Baudis <hidden>
Date: 2016-06-15 22:43:06

On Fri, Apr 20, 2007 at 12:39:43PM CEST, Junio C Hamano wrote:
The problem I described is that sometimes I
do not even recall if I was rebasing or merging after resolving
conflicts.  If I *knew* I was in the middle of a rebase, I know
where to look (.dotest/ has all the necessary "state" for
rebase/am to continue) to remind me where I was.
In Cogito, cg-status always tell you that you're in the middle of
something special if you are. Perhaps git status could let you know as
well. (It wouldn't be as easy to see since git status seems so verbose
though compared to cg-status; that has been one of my pet peeves, though
I suppose it's unlikely to change. ;-)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Ever try. Ever fail. No matter. // Try again. Fail again. Fail better.
		-- Samuel Beckett
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help