Hacker News Board Hacker News, browsed like a classic message board
Live data from Hacker News

Advanced Git tips (slides)

git-tips.heroku.com

Post reply on HN
Print view View original

11–20 of 53 posts

Re: Advanced Git tips (slides)

#11

Post by JustAGeek »

Loic wrote: post #8
nickcharlton wrote: post #3

Earlier quoted context omitted.

Click inside the content, then use the keyboard arrow keys to move around.

For someone looking only at the tips, this is sadly very unfriendly. Basically, you need to click or press more than 300 times on your keyboard to go through. This cannot be used as a reference even so some stuff were interesting (I gave up at slide 84). I welcome a reformatting as a cheat sheet by a courageous reader :)

You can find some of the tips here: http://mislav.uniqpath.com/2010/07/git-tips

Re: Advanced Git tips (slides)

#12

Post by jlgbecom »

amix wrote: post #6

We recently switched from SVN to Git and the transition has been painful - last week there has been at least one issue pr. day that has stopped work and that needed to be addressed. Personally, I have used Git before via github and it has worked well (tho' my usage was mostly doing small updates, no branches, no merges etc.) My current impression of Git is that it's very powerful, but too low level and not that user…

I've had similar experiences. Git has great potential, but the tools seem very immature, and basic things I took for granted with Subversion are huge pita's with Git. And it seems like all that needs to happen is a really solid toolkit to simplify those tasks.

Re: Advanced Git tips (slides)

#13

Post by JustAGeek »

amix wrote: post #6

We recently switched from SVN to Git and the transition has been painful - last week there has been at least one issue pr. day that has stopped work and that needed to be addressed. Personally, I have used Git before via github and it has worked well (tho' my usage was mostly doing small updates, no branches, no merges etc.) My current impression of Git is that it's very powerful, but too low level and not that user…

Which issues did you have exactly? I'm asking because my team members want to switch to Git after having to suffer through my praising git for long enough and I'd like to know which traps to avoid.

My personal switch from SVN to Git was rather painless but that's probably because I "only" used git-svn and at first used Git pretty much like I used SVN and then step by step explored the possibilities offered by Git like local branches etc. pp.

That's what I'd recommend to anyone making the switch, first try it out with git-svn, don't use every new feature at once.

DVCS is a completely different paradigm, it requires some time to wrap your head around. :)

Re: Advanced Git tips (slides)

#14

Post by JustAGeek »

jlgbecom wrote: post #12
amix wrote: post #6

We recently switched from SVN to Git and the transition has been painful - last week there has been at least one issue pr. day that has stopped work and that needed to be addressed. Personally, I have used Git before via github and it has worked well (tho' my usage was mostly doing small updates, no branches, no merges etc.) My current impression of Git is that it's very powerful, but too low level and not that user…

I've had similar experiences. Git has great potential, but the tools seem very immature, and basic things I took for granted with Subversion are huge pita's with Git. And it seems like all that needs to happen is a really solid toolkit to simplify those tasks.

Could you please elaborate on that? What basic things did you have problems with?

Re: Advanced Git tips (slides)

#15

Post by ciupicri »

amix wrote: post #6

We recently switched from SVN to Git and the transition has been painful - last week there has been at least one issue pr. day that has stopped work and that needed to be addressed. Personally, I have used Git before via github and it has worked well (tho' my usage was mostly doing small updates, no branches, no merges etc.) My current impression of Git is that it's very powerful, but too low level and not that user…

Git and Mercurial are pretty similar, but I must say that I don't like the Mercurial branching model. It forces me to have a repository for every topic branch when I'm contributing to an open source project. You can read more about this here:

[1] http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-me...

[2] http://hgbook.red-bean.com/read/managing-releases-and-branch...

Re: Advanced Git tips (slides)

#16

Post by steveklabnik »

Loic wrote: post #8
nickcharlton wrote: post #3

Earlier quoted context omitted.

Click inside the content, then use the keyboard arrow keys to move around.

For someone looking only at the tips, this is sadly very unfriendly. Basically, you need to click or press more than 300 times on your keyboard to go through. This cannot be used as a reference even so some stuff were interesting (I gave up at slide 84). I welcome a reformatting as a cheat sheet by a courageous reader :)

This is a presentation, made using the showoff gem. Seen through that light, it's pretty solid.

Re: Advanced Git tips (slides)

#17

Post by city41 »

jlgbecom wrote: post #12
amix wrote: post #6

We recently switched from SVN to Git and the transition has been painful - last week there has been at least one issue pr. day that has stopped work and that needed to be addressed. Personally, I have used Git before via github and it has worked well (tho' my usage was mostly doing small updates, no branches, no merges etc.) My current impression of Git is that it's very powerful, but too low level and not that user…

I've had similar experiences. Git has great potential, but the tools seem very immature, and basic things I took for granted with Subversion are huge pita's with Git. And it seems like all that needs to happen is a really solid toolkit to simplify those tasks.

I've had the opposite experience. I've generally found git a joy to use and I don't miss SVN in the slightest. I highly recommend reading Chacon's Pro Git book. As really understanding how Git works internally helps in using it a lot.

Re: Advanced Git tips (slides)

#18

Post by fr0sty »

amix wrote: post #6

We recently switched from SVN to Git and the transition has been painful - last week there has been at least one issue pr. day that has stopped work and that needed to be addressed. Personally, I have used Git before via github and it has worked well (tho' my usage was mostly doing small updates, no branches, no merges etc.) My current impression of Git is that it's very powerful, but too low level and not that user…

My team of 5 switched to git this year. Hust yesterday (I'm not making this up) one of my team members thanked me for pushing the change. Develoment for us has gone much more quickly now than before and we have had very few issues.

One thing that is essential to a good transition is to have a strong evangelist who is willing to address problems, educate people and investigate when something happens that you don't understand.

ProTip: #git on freenode is a great resource if you find yourself out of your depth.

Re: Advanced Git tips (slides)

#19

Post by adam-_- »

amix wrote: post #6

We recently switched from SVN to Git and the transition has been painful - last week there has been at least one issue pr. day that has stopped work and that needed to be addressed. Personally, I have used Git before via github and it has worked well (tho' my usage was mostly doing small updates, no branches, no merges etc.) My current impression of Git is that it's very powerful, but too low level and not that user…

We use git to manage the codebase of two apps that have about 15 people working on each. Every team or project branches from master at the start of an iteration and works off that branch until the end of the iteration then merges/rebases back onto the master branch.

Then we we tag and branch at the end of an iteration to push code live.

Works very well for us and seems a lot less painful than the frontend guys using SVN.

Post reply on HN