gitCheatsheet

gitCheatsheet.txt

To pull before push without merging:
git reset --soft HEAD~ && git stash && git pull && git stash pop

Troubleshoot pbxproj file (Optional):
sed -i '' '/<<<<</d' *.xcodeproj/project.pbxproj
sed -i '' '/=====/d' *.xcodeproj/project.pbxproj
sed -i '' '/>>>>>/d' *.xcodeproj/project.pbxproj

To pick granular setup commits:
git cherry-pick <hash>

To setup CI tool:
git checkout -b setup-travis && touch .travis.yml && git commit -m "Setup .travis.yml" && git push
vi .travis.yml && git commit -m "Fix Setup .travis.yml" && git push
git checkout master && git merge setup-travis

Rebasing:
git fetch
git rebase -i origin/develop
git push --force-with-lease