Short Notes on git - Revision history

Admin at 01:58, 20 March 2021

2021-03-20T01:58:46Z

2021-03-20T01:52:27Z

2021-02-20T12:16:55Z

2020-04-24T19:02:37Z

‎Typical Flow

2019-12-27T16:35:43Z

2019-12-27T16:34:02Z

‎Skip Retyping Your Password

2018-10-01T12:32:25Z

‎Basic Commands

2017-07-20T14:19:36Z

‎Basic Commands

2017-02-10T12:35:37Z

‎Typical Flow

2016-10-27T13:32:28Z

‎Basic Commands

@@ Line 138: / Line 138: @@
 > master</pre>
-=== Set ''meld'' as your <tt>difftool</tt> ===
+=== Set ''meld'' as your <tt>difftool</tt> and <tt>mergetool</tt> ===
-−
 Edit your <tt>~/.gitconfig</tt> file as follows:
 <pre>[diff]
      tool = meld
@@ Line 150: / Line 150: @@
 Now, running <tt>git difftool</tt> will bring up your dear ol' ''meld''.

← Older revision		Revision as of 01:52, 20 March 2021
Line 137:		Line 137:
	<pre>$ git current		<pre>$ git current
	> master</pre>		> master</pre>
		+
		+	=== Set ''meld'' as your <tt>difftool</tt> ===
		+
		+
		+	Edit your <tt>~/.gitconfig</tt> file as follows:
		+	<pre>[diff]
		+	tool = meld
		+	[difftool]
		+	prompt = false
		+	[difftool "meld"]
		+	cmd = meld "$LOCAL" "$REMOTE"</pre>
		+
		+	Now, running <tt>git difftool</tt> will bring up your dear ol' ''meld''.

@@ Line 103: / Line 103: @@
 Now you need to manually edit the file(s) to resolve the conflict, and then <tt>add/commit</tt> the resolved file(s).
 === Skip Retyping Your Password ===
@@ Line 121: / Line 123: @@
 $ git commit -m "Added .gitignore file"
 $ git push origin master</pre>

@@ Line 61: / Line 61: @@
 == Typical Flow ==
-<pre>$ git clone [remote repo]                     # get a local copy of the repo
+<pre>
 $ git checkout -b <branch>                    # start a new branch
 # do your changes...
@@ Line 76: / Line 78: @@
 $ git merge <branch>                          # this should pass ok; commit to "master" afterwards
 $ git branch -d <branch>                      # clean up - remove the branch
-$ git tag <tag> <commit id>                   # optionally, also tag the commit after merging</pre>
+$ git tag <tag> <commit id>                   # optionally, also tag the commit after merging
 === Resolve Conflict ===

← Older revision		Revision as of 16:35, 27 December 2019
Line 118:		Line 118:
	$ git commit -m "Added .gitignore file"		$ git commit -m "Added .gitignore file"
	$ git push origin master</pre>		$ git push origin master</pre>
−
−	~~== Using Git with gnome-keyring ==~~
−
−	~~<pre>sudo apt-get install libgnome-keyring-dev~~
−	~~cd /usr/share/doc/git/contrib/credential/gnome-keyring~~
−	~~sudo make~~
−	~~git config --global credential.helper /usr/share/doc/git/contrib/credential/gnome-keyring/git-credential-gnome-keyring</pre>~~

@@ Line 103: / Line 103: @@
 === Skip Retyping Your Password ===
-<pre>$ git config --global credential.helper cache</pre>
+<pre>$ git config --global credential.helper store</pre>
 === Ignoring Files and Folders ===

@@ Line 17: / Line 17: @@
 $ git pull <remote> <branch>                 # pull specific branch
 $ git diff <source> <dest>                   # view differences between "source" and "dest" branches
-$ git merge <branch>                         # merge changes from another branch (e.g. "master")
+$ git merge <branch>                         # merge changes from another branch (e.g. "origin/master")
 # set meld as diff and merge tool; use --global to apply globally, not just per-repo
@@ Line 41: / Line 42: @@
 $ git checkout -b <branch>                   # create a new branch, and switch to it, or
 $ git checkout <branch>                      # switch to branch (make it your HEAD)
-$ git push origin <branch>                   # make the branch available to others
+$ git push origin <branch> --set-upstream    # make the branch available to others, and set the upstream
 $ git branch -d <branch>                     # delete local branch
 $ git branch -dr <remote/branch>             # delete remote branch

@@ Line 13: / Line 13: @@
 $ git status                                 # get info about local copy, incl. branch ID, changes, etc.
 $ git pull                                   # update the local copy to the latest revision
 $ git diff <source> <dest>                   # view differences between "source" and "dest" branches
 $ git merge <branch>                         # merge changes from another branch (e.g. "master")
@@ Line 29: / Line 31: @@
 $ git commit -m 'message'                    # commit changes from index to head
 $ git push origin master                     # push changes from head to master branch, or
-$ git push origin <branch>                   # push changes to <branch>
+$ git push <remote> <branch>                 # push changes to <branch>
 $ git checkout -- <file>                     # revert file and replace with current HEAD version, exc. of changes added to Index
@@ Line 36: / Line 38: @@
 # branching
-$ git checkout -b <branch_name>              # create a new branch, and switch to it
+$ git branch -av                             # list existing branches
-$ git push origin <branch_name>              # make the branch available to others
+$ git checkout -b <branch>                   # create a new branch, and switch to it, or
 # other stuff

@@ Line 48: / Line 48: @@
 $ git submodule add -b <branch> <repo> [<folder>]
 $ git add <folder> .gitmodules ; + commit ; + push
 </pre>