Comments for Scott James Remnant

Comment on GIT sucks by Aman

Aman — Mon, 20 Feb 2012 14:11:50 +0000

I agree with you. I think GIT is more powerfull for developer only, or say it master developer, not for end-user or the learner. Yes, we can learn a bit of GIT. But GIT system it’s not only for one direction like any other daemon. It’s look like so simple from beginning when we think it’s only like upload and download operation. But there are somewhere who only need to get some sources, for example, how it very complicated.

I am using GIT to get source: stable and development for some packages. But it so confusing that make you headache on large project source like Linux kernel and any other large project while I was only want the stable one and the latest development tree one to trying it.

The big problem is we cannot resume the clone operation on bad and unstable connection.

Comment on GIT sucks by Andrew

Andrew — Sat, 18 Feb 2012 00:16:38 +0000

PPS: http://gitready.com/ is a great resource!

Comment on GIT sucks by Andrew

Andrew — Sat, 18 Feb 2012 00:12:49 +0000

I love git! I use it daily with 5 web-developers and we never have problems. We have never lost files, commits or anything. We also have several local branches each for experiments and certain tasks which we merge and push and pull from and to with ease! All of these “git sucks” stories I read (which I don’t know why I googled in the first place) are by people are using it for the first time, working on a project with a deadline and expecting it to work the way they think it should. Are you people on an old terminal or something with no internet access? I understand the idealistic view that man pages should be sufficient, but whenever I have a problem with git I open up my Internet browsing software, type google.com into the address bar, type in my problem in the search field and voi-la!: Someone already had my problem and posted the answer! Do you people not know about this?

Ok, excuse the sarcasm there but I am a big git enthusiast and it makes me sad to read all these negative comments about. All the problems listed here I have had before and just took the time learn how to get through and now I have no problems and have knowledge of an incredibly powerful VCS. Again, I have NEVER screwed-up a project before, even when less knowledgable co-workers push weird things, every problem can be worked through with ease when you have TAKEN THE TIME to learn how the software beforehand.

If you really want some kind of wrapper around it, check out Git Tower (for Mac).

PS, I have never used git with Windoze and never plan to so I can’t refute any claims again it.

Comment on git smash by Michael Wild

Michael Wild — Wed, 15 Feb 2012 16:11:37 +0000

You might enjoy Stacked Git then: http://www.procode.org/stgit. I use it a lot for exactly this kind of patch creation work.

Comment on git smash by Jo Liss

Jo Liss — Thu, 09 Feb 2012 00:28:34 +0000

The advantage of using –autosquash might be that if the rebase goes wrong, you can easily back out using rebase –abort, where with git-smash, you’re stuck in the middle of your history.

That said, I appreciate that the smash command you posted is faster than committing followed by rebase -i.

Comment on git smash by Daniel

Daniel — Tue, 07 Feb 2012 11:48:49 +0000

I’m not sure, but something like this might work:

git rebase -i $(git merge-base HEAD origin/master)

Comment on git smash by daniels

daniels — Tue, 07 Feb 2012 11:47:59 +0000

Or another way to do it:
[hack one]
git commit -a -m ‘did some stuff’
[hack two]
git commit -a -m ‘some other stuff’
[hack three]
git commit -a -m ‘fixup! did some stuff’
git rebase -i –autosquash

The autosquash bit will automatically move commit #3 as a fixup of the ‘did some stuff’ commit, with prefix matching. Setting rebase.autosquash = yes in the config will make this the default behaviour on rebase -i.

Comment on git smash by Arun Raghavan

Arun Raghavan — Tue, 07 Feb 2012 06:30:28 +0000

Have you tried git rebase –autosquash ?

Comment on git smash by scott

scott — Mon, 06 Feb 2012 23:22:18 +0000

I'm pretty sure you can, doing the git rebase -i, add a line saying fixup STASH@{0} below the commit you want amended; which drops three commands. The downside here is that you can end up rebasing onto a later origin/master which may not be what you want.

Comment on git smash by Monty Taylor

Monty Taylor — Mon, 06 Feb 2012 23:09:31 +0000

Just for the sake of completeness, there’s another way to go about that:

git stash
git rebase -i origin/master
# change pick to edit on the commit you want to apply it to
git stash pop
git commit -a –amend
git rebase –continue

This will allow you to edit the commit that is the target you’re trying to amend, and will carry the edit down through its dependent changes pretty cleanly.

Of course – if you have pushed your changes anywhere that someone may have consumed them, you don’t want to do either your method or my method – unless of course you’re using gerrit, in which case you can happily re-submit them to gerrit and the right thing will happen.