20 Feb '13, 10pm

Git merge vs. rebase

Merge vs. rebase By Mislav Marohnić on 20 Feb 2013 The short: git pull --rebase instead of git pull git rebase -i @{u} before git push (on “feature”) git merge master (on “master”) git merge -no-ff feature However if “feature” contains only 1 commit, avoid the merge commit: (on “master”) git cherry-pick feature The long: If you enjoy this post, check out my git tips you didn’t know about ! Avoid merge commits that result from git pull When you want to push your changes to a branch, but someone else already pushed before you, you have to pull in their changes first. Normally, git does a merge commit in that situation. Such merge commits can be numerous, especially between a team of people who push their changes often. Those merges convey no useful information to others, and litter the project’s history. You should always pull with git pull --rebase . To avoid having to alwa...

Full article: http://mislav.uniqpath.com/2013/02/merge-vs-rebase/


HK vs SIngapore Budget

forums.condosingapore.com 27 Feb '13, 9am

CONDOsingapore.com - Singapore Condo Property Forum | Discussion | Reviews | Pictures | New Launches | Construction Update...

rebase like a boss

rebase like a boss

robots.thoughtbot.com 15 Feb '13, 3pm

Everyone who loves Git hopefully loves branching. However, there’s a problem with branching: merging your work back in. Su...

Wealth Inequality In America vs

forums.condosingapore.com 05 Mar '13, 6am

Video on the Wealth Inequality In America http://www.youtube.com/watch?v=QPKKQ...ature=youtu.be Singapore's wealth dispari...

Curious: East Vs West Sun for Feng Shui - Page 4

forums.condosingapore.com 28 Feb '13, 1am

East Sun or West Sun, it's just which do you prefer to be heated first. East gets heated in the morning, west get heated i...

Blog: [VIDEO] Ucapan Tok Guru Nik Aziz BR1M & H...

anwaribrahimblog.com 23 Feb '13, 3am

[VIDEO] Ucapan Tok Guru Nik Aziz BR1M & Haiwan vs Versi TV3 & Utusan FULL