Git - Revision history

Adamcolton: /* Cheat sheet */

2018-02-02T14:04:26Z

Cheat sheet

← Older revision		Revision as of 14:04, 2 February 2018
Line 14:		Line 14:
	unstage		unstage
	git reset <file>		git reset <file>

			submodule; go to the root of the git repo
			git submodule add [remote-repo] [path]
			the directory defined by path should not exist.

	== Commands ==		== Commands ==

2018-01-31T19:13:52Z

Cheat sheet

← Older revision		Revision as of 19:13, 31 January 2018
Line 11:		Line 11:
	find in history		find in history
	git log -S'the line from your file' -- path/to/your/file.txt		git log -S'the line from your file' -- path/to/your/file.txt

			unstage
			git reset <file>

	== Commands ==		== Commands ==

2017-10-20T13:06:07Z

← Older revision		Revision as of 13:06, 20 October 2017
Line 1:		Line 1:
	http://byte.kde.org/~zrusin/git/git-cheat-sheet.svg		http://byte.kde.org/~zrusin/git/git-cheat-sheet.svg

			== Cheat sheet ==
			undo commit
			$ git commit -m "Something terribly misguided"
			$ git reset HEAD~
			<< edit files as necessary >>
			$ git add ...
			$ git commit -c ORIG_HEAD

			find in history
			git log -S'the line from your file' -- path/to/your/file.txt

	== Commands ==		== Commands ==

2014-07-29T15:24:12Z

← Older revision		Revision as of 15:24, 29 July 2014
Line 103:		Line 103:
	git config --global user.name "John Doe"		git config --global user.name "John Doe"
	git config --global user.email johndoe@example.com		git config --global user.email johndoe@example.com

			== Rebase ==
			git rebase dev
			Do this from master after dev work is done

	== Tests ==		== Tests ==

2014-02-13T22:20:52Z

Examples

@@ Line 48: / Line 48: @@
    git remote add origin https://your_repo_identity_here/online_workbench.git
    git push -u origin master
 == Concepts ==

2014-02-12T02:53:24Z

Commands

← Older revision		Revision as of 02:53, 12 February 2014
Line 10:		Line 10:
	** add . : ??? I think this stages all files (good for new repository)		** add . : ??? I think this stages all files (good for new repository)
	** -p : asks what chunks of the file you want to add, good for small checkins		** -p : asks what chunks of the file you want to add, good for small checkins
	* reset (filename) : Unstages a change		* reset
			** (filename) : Unstages a change
			** --hard (commit id/tag) : rollback to that commit
	* commit : commit staged changes		* commit : commit staged changes
	** -m ("comment")		** -m ("comment")

2013-06-14T20:28:20Z

Commands

← Older revision		Revision as of 20:28, 14 June 2013
Line 30:		Line 30:
	* fetch		* fetch
	* merge : combine two branches		* merge : combine two branches
	* push : pushes to ~~remove~~ - I'm not clear which, how, what if there are multiple - much confusion.		* push : pushes to remote - I'm not clear which, how, what if there are multiple - much confusion.
	* remote		* remote
	* add origin (url)		* add origin (url)

2013-06-14T20:27:42Z

← Older revision		Revision as of 20:27, 14 June 2013
Line 60:		Line 60:
	=== Remote ===		=== Remote ===
	A git server. This is where I get confused.		A git server. This is where I get confused.

			==== SSH ====
			I've been using ssh key files (pem) because that's what Amazon uses and it seems like a better practice than passwords. The best method I've found for this is to run bash in ssh-agent:
			ssh-agent bash
			You're now running bash-in-bash, a little odd but it works. Now add a key (ssh-add '''keyfile''') and all the remote commands will work.

	==== Origin ====		==== Origin ====

2013-06-10T21:00:33Z

Concepts

← Older revision		Revision as of 21:00, 10 June 2013
Line 72:		Line 72:
	Origin : The name of the remote when a repository is cloned		Origin : The name of the remote when a repository is cloned

	=== ~~Things I am Still Confused About~~ ===		=== Bare ===
	~~Bare~~		This is a repo containing just the repo data and no working files. This is how you would configure a "Server", particularly good for syncing up users. To be clear, you can clone a non-bare repository from a bare one.

	== Setup ==		== Setup ==

2013-06-10T14:59:25Z

Commands

← Older revision		Revision as of 14:59, 10 June 2013
Line 13:		Line 13:
	* commit : commit staged changes		* commit : commit staged changes
	** -m ("comment")		** -m ("comment")
			** -a : commit all (skips staging)
	* log : shows the history of the repository		* log : shows the history of the repository
	** --skip=n : skips the last n commits		** --skip=n : skips the last n commits