Difference between revisions of "Git Cheat Sheet"
Jump to navigation
Jump to search
Line 3: | Line 3: | ||
'''Create New Branch from Master or Other Branch''' | '''Create New Branch from Master or Other Branch''' | ||
+ | $ git checkout master # first, we work in master branch | ||
$ git pull # pull from original branch | $ git pull # pull from original branch | ||
$ git checkout -b [new_branch_name] # creating new branch in our local fs | $ git checkout -b [new_branch_name] # creating new branch in our local fs | ||
Line 19: | Line 20: | ||
$ git push origin :[name_of_branch] | $ git push origin :[name_of_branch] | ||
+ | |||
+ | '''Merge Branch to Master''' | ||
+ | |||
+ | $ git checkout master # switched to branch master | ||
+ | $ git merge [branch_name] # merge |
Revision as of 09:07, 23 July 2020
https://www.earthdatascience.org/workshops/intro-version-control-git/basic-git-commands/
Create New Branch from Master or Other Branch
$ git checkout master # first, we work in master branch $ git pull # pull from original branch $ git checkout -b [new_branch_name] # creating new branch in our local fs $ git push origin [new_branch_name] # push our new branch to Github or Gitlab $ git config core.autocrlf false # stop replacement warning message
Delete Branch in Our Local Filesystem
$ git branch -d [name_of_branch]
or
$ git branch -D [name_of_branch] # force deletion
Delete Branch in Github or Gitlab
$ git push origin :[name_of_branch]
Merge Branch to Master
$ git checkout master # switched to branch master $ git merge [branch_name] # merge