Re: Merging commits together into a super-commit

From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Date: May 10, 2007, 20:29 UTC
Message-ID: <200705102229.29221.robin.rosenberg.lists@dewire.com>
In-Reply-To: <87tzuk31fu.wl%cworth@cworth.org>

torsdag 10 maj 2007 skrev Carl Worth:

Show 5 quoted lines

> But there are still some places where an experienced git user runs
> into some awkward situations trying to use stg. For example, "stg
> refresh" is basically always doing the equivalent of "commit -a" so
> there's annoyingly no way to refresh only some of the modified state
> into the commit.

List the files to refresh and you get what you want.

	stg refresh file1 file2...

> Also, if I want to edit a commit message while under the influence of
> stg, how do I do that? If I do "git commit --amend" will I seriously
> confuse stg, (I'm guessing I would, but I don't know).

	stg refresh -e

[...]

Show 7 quoted lines

> Plus, all the stuff that stg provides to allow it to be used
> standalone ends up just being noise to the git user that just wants to
> do some stack-based manipulation of an unpublished branch, for
> example.
>
> So, I'd really like to see something more integrated into git itself
> that provides some of the missing functionality.

I agree mixing stgit and git is not really comfy until you learn it and still I mess things up somtimes. Also rebase seems quite a bit faster than stgit, but I have not intuitive understanding for rebase so I get scared everytime. Having a gui that lets me mark commits and "drag" them to the new location would be nice.

-- robin