DevOps Tools/SCM/Git - Revision history

R00t at 02:06, 22 September 2022

2022-09-22T02:06:10Z

2021-01-26T20:38:37Z

‎Branch

2021-01-26T20:37:48Z

‎pull

2020-12-04T08:49:56Z

‎reset

2019-02-07T20:31:38Z

‎Update existing branch

2019-02-07T20:31:29Z

‎Examples

2019-02-07T20:14:56Z

2019-01-14T17:12:19Z

‎clone

2019-01-09T18:15:49Z

2019-01-09T18:13:05Z

‎Create a new branch for changes, then merge into master

@@ Line 32: / Line 32: @@
   <nowiki>~$ git config user.name "user"
 ~$ git config user.email "user@example.com"</nowiki>
 ==Basics==
 ===add===

@@ Line 117: / Line 117: @@
 Create new branch and select at the same time
   <nowiki>~$ git checkout -b new_branch</nowiki>
 =Examples=

@@ Line 75: / Line 75: @@
 pull changes from repo to local
   <nowiki>~$ git pull origin master</nowiki>
 ===ignore===
 Ignore file types in local/specific repository

@@ Line 89: / Line 89: @@
   <nowiki>~$ git rm {file name}</nowiki>
 ===reset===
 reset the local branch and remove any local commits
   <nowiki>git reset --hard origin/master</nowiki>

@@ Line 143: / Line 143: @@
 ==Update existing branch==
-  </nowiki>~$ git checkout branch01
+  <nowiki>~$ git checkout branch01
 ~$ git add .
 ~$ git commit -m "new commit message"
 ~$ git push origin branch01</nowiki>

← Older revision		Revision as of 20:31, 7 February 2019
Line 141:		Line 141:
	~$ git push origin --delete new_feature_01 #delete new branch (remote)		~$ git push origin --delete new_feature_01 #delete new branch (remote)
	</nowiki>		</nowiki>
		+
		+	==Update existing branch==
		+	</nowiki>~$ git checkout branch01
		+	~$ git add .
		+	~$ git commit -m "new commit message"
		+	~$ git push origin branch01</nowiki>

@@ Line 88: / Line 88: @@
 remove a file from the repo and local
   <nowiki>~$ git rm {file name}</nowiki>
 ==Global Settings==

@@ Line 65: / Line 65: @@
 ~$ git clone user@hostname:repo_directory   ---   assumes the repo directory is in the remote user's home directory.
 ~$ git clone https://github.com/repository/project.git
 </nowiki>
 ===push===
 push changes to repo

@@ Line 83: / Line 83: @@
 merges two branches together. start by selecting the branch you want to merge another branch into.
   <nowiki>~$ git merge branch_name</nowiki>
 ==Global Settings==

@@ Line 115: / Line 115: @@
 ~$ git push ssh://git@gitlab01.r00tedvw.com:8922/user/project01.git master</nowiki>
 ==Create a new branch for changes, then merge into master==
-  <nowiki>~$ git status
+  <nowiki>~$ git pull origin master
 On branch master
 ~$ git checkout -b new_feature_01                                     #create a new branch and switch to it