Skip to content

Instantly share code, notes, and snippets.

@cheezedigital
Last active August 29, 2015 14:13
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save cheezedigital/b05c073a603da8f2f162 to your computer and use it in GitHub Desktop.
Save cheezedigital/b05c073a603da8f2f162 to your computer and use it in GitHub Desktop.
this is the golden ticket
git fetch --all
git checkout sprint015
git pull origin sprint015
git checkout -b my-new-feature
git add .
git commit -m "all my feature"
git checkout sprint015
git pull origin sprint015
git checkout my-new-feature
git rebase -i sprint015
git push origin my-new-feature
if you happen to have already pushed to my-new-feature before you rebase you will need to:
git push -f origin my-new-feature
because that is rewriting history
put in pull request
artem +1
git checkout sprint015
git merge --no-ff my-new-feature
git push origin sprint015
git branch -D my-new-feature
git push origin --delete my-new-feature
****addititon added Jan 28. 2015****
on master
git fetch
git checkout -b spring016 origin/master
git push origin sprint016 #this pushes the newly created branch to remote via github. refresh browser and have a look.
***to pull down a remote branch***
git fetch --all
git checkout origin/cl-676
git checkout -b cl-676 *******676 is an example******
****when the shit goes down better be ready*****
git checkout sprint016
git pull origin sprint016
git checkout -b CL-849-2
git cherry-pick 6e0580a947454112547dbf0df1e36f8eac9e9ed1 ex here biootcchs
git push origin CL-849-2
close out old PR
put in new pr
***before merging into master*** this is a test. it's only a test. bascially, create a test branch and merge all 100+ commits to see if shit is working, or the app is broke.
git checkout master
git checkout -b test-merge
git merge sprint015
***also take a look***
https://github.com/hgslabs/cls3/branches
***dafaq***
https://dataload.clause-logic.com/
***dafaq2**
http://api.clause-logic.com/
***pretty badass**
git log --oneline --decorate --graph
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment