Git Operations - Revision history

Admin: /* Delete Latest Commits From Master Branch */

2018-04-18T21:12:28Z

Delete Latest Commits From Master Branch

@@ Line 13: / Line 13: @@
 If you're making multilpe fixes to a remote repository, you might end up creating multiple branches, one for each PR you're submitting. This leaves lots of remote branches laying around. If you want to delete these, here are instructions: [[Git/Delete Remote Branch]]
-==Delete Latest Commits From Master Branch==
+==Move Last N Commits Off Of Master Branch==
 If you royally fuck things up and commit to the master branch when you did not intend to, git purists will relegate you to the seventh layer of hell.
 Don't worry, hope is not lost, here's how you can fix it (quick, before anybody notices!): [[Git/Delete Commits from Master]]
 ==Resolving Git Push Conflicts==

2018-03-22T23:01:32Z

Create Orphan Branch

← Older revision		Revision as of 23:01, 22 March 2018
Line 75:		Line 75:
	git push origin gh-pages		git push origin gh-pages
	</pre>		</pre>

			(This results in a bunch of weird stuff.)

	=Flags=		=Flags=

2018-03-22T22:38:43Z

Create Orphan Branch

← Older revision		Revision as of 22:38, 22 March 2018
Line 71:		Line 71:
	<pre>		<pre>
	echo "<h1>hello world</h1>" > index.html		echo "<h1>hello world</h1>" > index.html
			git add index.html
			git commit index.html -m 'initial commit of gh-pages branch'
			git push origin gh-pages
	</pre>		</pre>

2018-03-22T22:38:18Z

Create Orphan Branch

← Older revision		Revision as of 22:38, 22 March 2018
Line 50:		Line 50:

	==Create Orphan Branch==		==Create Orphan Branch==

			Before you do this, make sure you have stashed or committed all changes. This will throw away the current contents of your repository, but will not require you to check out an entirely new copy of your git repo - it does not touch the .git directory.

			(Alternatively, you can clone a second copy of your repo, and create the orphan branch from there.)

	To create an orphan branch (i.e., an empty branch that shares no history with any other branches):		To create an orphan branch (i.e., an empty branch that shares no history with any other branches):
Line 57:		Line 61:
	</pre>		</pre>

	~~The example above is useful for creating a gh~~-~~pages~~ branch in a ~~github repo~~.		Now, all of the files that were previously in your repository will show up as uncommitted/untracked files. You can remove everything in your current directory with this (BE CAREFUL):

			<pre>
			rm -rf *
			</pre>

			Now test out your new branch by adding a single test file.

			<pre>
			echo "<h1>hello world</h1>" > index.html
			</pre>

	=Flags=		=Flags=

2018-03-22T22:35:03Z

Create Orphan Branch

← Older revision		Revision as of 22:35, 22 March 2018
Line 51:		Line 51:
	==Create Orphan Branch==		==Create Orphan Branch==

	To create an orphan branch (i.e., an empty branch that shares no history with any other branches)~~, see [[Git~~/~~Oprhan Branch]]~~		To create an orphan branch (i.e., an empty branch that shares no history with any other branches):

			<pre>
			git checkout --orphan gh-pages
			</pre>

			The example above is useful for creating a gh-pages branch in a github repo.

	=Flags=		=Flags=

2018-03-22T22:34:26Z

Discard Changes

← Older revision		Revision as of 22:34, 22 March 2018
Line 48:		Line 48:
	git reset -- HEAD <file>		git reset -- HEAD <file>
	</pre>		</pre>

			==Create Orphan Branch==

			To create an orphan branch (i.e., an empty branch that shares no history with any other branches), see [[Git/Oprhan Branch]]

	=Flags=		=Flags=

2018-02-28T11:49:17Z

Diff with Prior Commit

← Older revision		Revision as of 11:49, 28 February 2018
Line 31:		Line 31:
	</pre>		</pre>

			==Discard Changes==

			===Discard Changes Not Yet Added===

			If changes to a file have not been added to the staging area (i.e., you modified the file but did not run git add), restore the file like this:

			<pre>
			git checkout -- <filename>
			</pre>

			===Discard Changes Already Added===

			On the other hand, if you made changes to a file and ran git add, but you no longer want those changes, you should run a slightly different command:

			<pre>
			git reset -- HEAD <file>
			</pre>

	=Flags=		=Flags=

2018-01-07T09:05:52Z

Resolving Git Push Conflicts

← Older revision		Revision as of 09:05, 7 January 2018
Line 23:		Line 23:
	Notes on how to resolve conflicts that occur when running <code>git push</code>. See [[Git/Resolving Push Conflicts]]		Notes on how to resolve conflicts that occur when running <code>git push</code>. See [[Git/Resolving Push Conflicts]]

			==Diff with Prior Commit==

			If you want to compare a commit to the prior commit, use the notation <code>hash^</code> to refer to the previous commit:

			<pre>
			git diff 572ecd1^ 572ecd1
			</pre>


			=Flags=

	[[Category:Git]]		[[Category:Git]]

2017-11-17T23:55:43Z

Stop Github Asking for Username and Password

← Older revision		Revision as of 23:55, 17 November 2017
Line 3:		Line 3:
	==Stop Github Asking for Username and Password==		==Stop Github Asking for Username and Password==

	If git keeps pestering you for your github username and password, the problem is that ~~all of your repositories are being checked out using their~~ HTTPS ~~url to github. This '''~~always~~'''~~ requires ~~you to enter your~~ password.		If git keeps pestering you for your github username and password, the problem is that the remote URL is an HTTPS URL, which always requires a username/password. Here are notes on how to fix that: [[Github/Stop Asking for Username and Password]]

	~~Notes~~: [[Github/Stop Asking for Username and Password]]

	==Update/Sync a Fork==		==Update/Sync a Fork==

2017-11-17T23:53:49Z

Stop Github Asking for Username and Password

@@ Line 3: / Line 3: @@
 ==Stop Github Asking for Username and Password==
 If git keeps pestering you for your github username and password, the problem is that all of your repositories are being checked out using their HTTPS url to github. This '''always''' requires you to enter your password.
 ==Update/Sync a Fork==