Difference between revisions of "Basic Git Command"

From Gejoreuy
Jump to navigation Jump to search
 
(4 intermediate revisions by the same user not shown)
Line 2: Line 2:
  
  
'''Create Branch from Master or Other Branch'''
+
'''Create New Branch from Master or Other Branch'''
  $ git pull
+
$ git checkout master                        # first, we work in master branch
  $ git checkout -b [new_branch_name]
+
  $ git pull                                   # pull from original branch
  $ git push origin [new_branch_name]
+
  $ git checkout -b [new_branch_name]           # creating new branch in our local fs
  $ git config core.autocrlf false
+
  $ 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
 +
 
 +
 
 +
'''Make Branch Same As Master or Other Branch"
 +
 
 +
$ git checkout [name_of_branch]              # checkout to branch that will be reseted to be same as master
 +
$ git reset --hard master                    # reset to be same as master

Latest revision as of 21:57, 3 August 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


Make Branch Same As Master or Other Branch"

$ git checkout [name_of_branch]               # checkout to branch that will be reseted to be same as master
$ git reset --hard master                     # reset to be same as master