News for hackers. Stuff that matters.

A comment on High-Level Problems with Git and How to Fix Them. Parent comment

Re:High-Level Problems with Git and How to Fix Them by spiznnx on Tuesday December 12, 2017 @02:46AM (#15903737)
The author purports that this can be achieved without staging. For example, you could slowly commit small changes that you think are ok on a work-in-progress feature branch with `git commit -p --allow-empty-message`. When you are done you could squash rebase + message rewrite.

While currently this workflow is clunky, it could be made to work with the same nice semantics of your workflow, and not have a staging area at all.

[ Parent | on HN ]
Re:High-Level Problems with Git and How to Fix Them by maxxxxx on Tuesday December 12, 2017 @09:30AM (#15905756)
Sure. I can get the same result I can get with simple staging with a complicated squash workflow. But why would I do that?

I have seen people get in trouble with rebasing and generally while manipulating history but never with the staging area.

[ Parent | on HN ]
Re:High-Level Problems with Git and How to Fix Them by tonfa on Wednesday December 13, 2017 @06:08AM (#15913494)
> I have seen people get in trouble with rebasing and generally while manipulating history but never with the staging area.

I think that's what mercurial tries to solve, it makes manipulating history safe (by tracking the state of the commits, whether they were published or not for example, and always keeping all the history but hiding it after it was rewritten).

[ Parent | on HN ]
Re:High-Level Problems with Git and How to Fix Them by maxxxxx on Tuesday December 12, 2017 @12:56PM (#15907765)
I should add. I always use a GUI like SourceTree for staging. With the command line it's much less fun.
[ Parent | on HN ]