Comments on: Git For Windows Developers – Git Series – Part 2

By: Terry Aney

Terry Aney — Wed, 27 Apr 2011 01:54:00 +0000

Found a good noob tutorial here http://www.silverwareconsulting.com/index.cfm/2010/6/6/Using-Git-Rebase-to-Squash-Commits

By: Terry Aney

Terry Aney — Tue, 26 Apr 2011 15:21:00 +0000

For a git noob, mind expanding that a ‘bit’. Just trying to get a policy in place of generally ‘cleaning up local repo’ before pushing.

In my example I did…
git checkout -b SquashTest
edit…
git commit -a -m “Squash Commit 1″
edit..
git commit -a -m “Squash Commit 2″

…now what? I want to make these two commits one ‘Squash Feature’ commit.

I tried git rebase -i, but it wants more options supplied…still getting over initial learning curve and if something on git-rebase man page was supposed to click, it didn’t.

Thanks in advance.

By: Jason Meridth

Jason Meridth — Mon, 25 Apr 2011 22:21:00 +0000

Terry: I use “git rebase -i” to squash my commits from my local feature branch to my local master branch, and then push.

a) I need to :)
b) it isn’t “invalid”, it is just the one I was using at the time. :) I do squash

Thank you, glad this series helped.

By: Terry Aney

Terry Aney — Mon, 25 Apr 2011 21:15:00 +0000

“UPDATE: I no longer use the “git pull –squash…” workflow. I have a Part 4 post pending. Please read the first part of this post for Github.com knowledge, but just skim the remainder. Thanks.”

a) Is Part 4 still pending?
b) Does this mean that your workflow just a bit below this update statement is invalid? I’m thinking I want to make a pattern for our environment that you always squash your commits on your local repo before they are put into our ‘master repo’ so this seemed to be what I was interested in.

Great 3 part series…I’m late to the game but enjoyed them nonetheless.

By: Jason Meridth

Jason Meridth — Mon, 24 Aug 2009 20:48:48 +0000

@Sam

Glad they helped

By: Sam Bloomquist

Sam Bloomquist — Mon, 24 Aug 2009 20:34:10 +0000

Thanks for a great set of tutorials. Git has been the back of my mind as something I need to learn for a while, and these few blog posts got me up to speed with the basics in a very short amount of time. Great work.

By: Adam D.

Adam D. — Sat, 15 Aug 2009 00:19:48 +0000

git push

and

git pull

will work with no params if you set it up correctly:

git config remote.origin.url=
git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
git config branch.master.remote origin
git config branch.master.merge refs/heads/master

set up automatic tracking for any new branches you want to put up on the remote repo:
git config –global push.default tracking

By: Jason Meridth

Jason Meridth — Thu, 09 Jul 2009 14:23:15 +0000

@Stefan

That is awesome. Thank you for clarifying the GIT/SSH protocol relationships. I’m updating the post to reference your comment. Thanks for catching the typo also.

By: Stefan Näwe

Stefan Näwe — Thu, 09 Jul 2009 09:56:08 +0000

In section “git remotes” the side note says:

“git@github.com/armmer/console_app.git doesn’t look like a HTTP URL or a ssh:// protocol. What protocol is that? Um….it’s the git protocol. :) It’s optimized for this purpose. Information here. The note to take away is that it uses port 9418 by default, so if you have a paranoid firewall admin….no luck.”

That’s not 100% correct.

(BTW. There’s a typo in the URL. It should read ‘git@github.com:armmer/console_app.git’ )

The URL “git@github.com…” does a connection using the SSH protocol and tunnels its own GIT protocol through it (i.e. it uses port 22 by default).
Using the ‘raw’ GIT protocol (for cloning,pulling, fetching only) requires a URL like this:

git://hostname/path/to/repo,git

(More on the GIT URLs to be found in ‘git help fetch’)

Good article(s) anyway.

Regards,
Stefan

By: Jason Meridth

Jason Meridth — Wed, 08 Jul 2009 18:09:00 +0000

@Donn
np, glad it helped

@Dan
Thank you for the info. Those pesky Firewall admins…:)