Question

I use Git to deploy my projects in my production system. The procedure I follow is:

• First time I clone the repository, make changes in the config file (different in any production server) and then create a branch called “pro” that keeps these changes. Production server is always working in “pro” branch.

• Then, when there are changes and I want to update my server I execute a batch file that makes this (more or less):

  git checkout master
  git pull
  git checkout pro
  git rebase master
  

I’m sure that git has a easier way to do this, but I don’t know how (perhaps it’s possible to update one branch from another). Is just for curiosity and learn more about Git.

Answer 1

Should work (on pro)

git fetch --all
git rebase origin/master

However, I don’t see any problem with a 4-liner 😉