Git - Revision history

Milosivanovic at 05:03, 25 May 2015

2015-05-25T05:03:25Z

Milosivanovic at 23:14, 29 January 2015

2015-01-29T23:14:36Z

Milosivanovic at 23:10, 29 January 2015

2015-01-29T23:10:26Z

Milosivanovic at 22:35, 29 January 2015

2015-01-29T22:35:14Z

Milosivanovic at 22:09, 29 January 2015

2015-01-29T22:09:10Z

Milosivanovic: Created page with "== Undo last commit and KEEP changes ==

 git reset --soft HEAD~1

== Undo last commit and LOSE changes ==

 git reset --hard HEAD~1

2015-01-16T03:20:05Z

Created page with "== Undo last commit and KEEP changes == <pre> git reset --soft HEAD~1 </pre> == Undo last commit and LOSE changes == <pre> git reset --hard HEAD~1 </pre>"

New page

== Undo last commit and KEEP changes ==
<pre>
git reset --soft HEAD~1
</pre>

== Undo last commit and LOSE changes ==
<pre>
git reset --hard HEAD~1
</pre>

@@ Line 37: / Line 37: @@
 <pre>
 git lol
 </pre>

← Older revision		Revision as of 23:14, 29 January 2015
Line 30:		Line 30:
	</pre>		</pre>
	where <code>-m</code> means maximum verbosity, automatically implied only with non-merge commits		where <code>-m</code> means maximum verbosity, automatically implied only with non-merge commits
		+
		+	== View pretty git history on the console ==
		+	<pre>
		+	git config --global alias.lol "log --oneline --graph --decorate"
		+	</pre>
		+	<pre>
		+	git lol
		+	</pre>

← Older revision		Revision as of 23:10, 29 January 2015
Line 24:		Line 24:
	git remote set-branches origin <branch-name>		git remote set-branches origin <branch-name>
	</pre>		</pre>
		+
		+	== Show contents of merge commit ==
		+	<pre>
		+	git show -m [SHA1]
		+	</pre>
		+	where <code>-m</code> means maximum verbosity, automatically implied only with non-merge commits

← Older revision		Revision as of 22:35, 29 January 2015
Line 14:		Line 14:
	</pre>		</pre>
	where <code>remote-name</code> is usually something like <code>origin</code>		where <code>remote-name</code> is usually something like <code>origin</code>
		+
		+	== Checkout remote branch and set it up for tracking ==
		+	Note: These instructions are specific to having cloned in this manner: <code>git clone -b <branch-name> --single-branch</code> as it only tracks the branch chosen at clone time.
		+	<pre>
		+	git fetch origin <branch-name>
		+	</pre>
		+
		+	<pre>
		+	git remote set-branches origin <branch-name>
		+	</pre>

← Older revision		Revision as of 22:09, 29 January 2015
Line 8:		Line 8:
	git reset --hard HEAD~1		git reset --hard HEAD~1
	</pre>		</pre>
		+
		+	== List all remote branches ==
		+	<pre>
		+	git ls-remote --heads <remote-name>
		+	</pre>
		+	where <code>remote-name</code> is usually something like <code>origin</code>