Comments on: Git: Using topic branches and interactive rebasing effectively

By: Jannis Leidel

Jannis Leidel — Tue, 29 Nov 2011 09:26:53 +0000

I can’t stress enough how useful defunkt’s “hub” command tool is: https://github.com/defunkt/hub This should remove the need for a few ninja moves.

By: kumar303

kumar303 — Wed, 23 Nov 2011 15:52:22 +0000

@Allen whoa, I didn’t know that git commit –amend worked the same as fixing up the last commit with new changes. Thanks!

By: Marlena

Marlena — Tue, 22 Nov 2011 22:29:06 +0000

Thanks for writing this up. It makes the reasons for rebasing much clearer.

By: kumar303

kumar303 — Tue, 22 Nov 2011 21:13:48 +0000

@Stefan hmm, that doesn’t work for me. Maybe my config is missing some values to make fetch do what it does for you.

By: Stefan Naewe

Stefan Naewe — Tue, 22 Nov 2011 08:23:06 +0000

Me too on the “Synchronization with master, for ninjas”: You can even skip the `git checkout … git checkout` part. Just do `git fetch && git rebase origin/master` (or even easier: use `git config branch..rebase`).

By: Allen

Allen — Tue, 22 Nov 2011 08:03:38 +0000

You can use `git commit –amend` instead of having to commit a fixup revision, if you’re just changing the last one.

By: kumar303

kumar303 — Mon, 21 Nov 2011 21:15:20 +0000

@Fernando wow, thanks! I didn’t know you could do that and I like that better too. I updated my dotfiles: https://github.com/kumar303/dotfiles

By: Fernando Takai

Fernando Takai — Mon, 21 Nov 2011 21:01:10 +0000

On the “Synchronization with master, for ninjas” you can skip the branch param using git checkout – (it works just like cd -).

“!f() { echo Syncing this branch with master && git checkout master && git pull && git checkout – && git rebase master; }; f”

I think it gets not only easier but makes a little bit more intuitive.

By: Nick

Nick — Mon, 21 Nov 2011 20:17:58 +0000

Beautiful article. I work with your exact workflow and it rocks.

By: kumar303

kumar303 — Mon, 21 Nov 2011 17:34:36 +0000

@Matt git’s cli interface is one of the most unintuitive, inconsistent interfaces I’ve come across but I have grown to love it. Stockholm syndrome? I wish hg did this stuff out of the box better. Plus, I am scared to rewrite hg history because you actually are deleting nodes in your repo unlike in git which is more mark and sweep.