News for hackers. Stuff that matters.
Re:Git is cheap by Shorel on Tuesday October 16, 2012 @02:28PM (#4661171)
I can integrate continuously by doing this:

  git commit  (in my_branch)
  git checkout master
  git pull
  git checkout my_branch
  git merge master
  (possibly resolve conflicts)
Ta! Da!!

Continuous integration AND branching.

Re:Git is cheap by strager on Wednesday October 17, 2012 @12:40PM (#4665275)

    git commit
    git fetch
    git merge origin/master
No need to switch your current branch to pull.