Mktrost at 23:13, 7 July 2011

2011-07-07T23:13:18Z

← Older revision		Revision as of 19:13, 7 July 2011
Line 1:		Line 1:
	[[File:GitCheatSheet.pdf]]		This page is OBE in preference of the PDF version that is easier to print: [[File:GitCheatSheet.pdf]]

Mktrost at 23:10, 7 July 2011

2011-07-07T23:10:42Z

← Older revision		Revision as of 19:10, 7 July 2011
Line 1:		Line 1:
	{\| border="1" align="left" style="border-collapse: collapse; "		[[File:GitCheatSheet.pdf]]


			{\| border="1" align="left" style="border-collapse: collapse;"
	\|+ Git CheatSheet		\|+ Git CheatSheet
	\|-		\|-

Mktrost at 22:49, 7 July 2011

2011-07-07T22:49:00Z

Show changes

Mktrost at 22:37, 7 July 2011

2011-07-07T22:37:43Z

← Older revision		Revision as of 18:37, 7 July 2011
Line 1:		Line 1:
	{\| style="border-collapse: collapse font-size:10pt" border="1" align="left"		{\| style="border-collapse: collapse; font-size: 10pt" border="1" align="left"
	\|+ Git CheatSheet		\|+ Git CheatSheet
	\|-		\|-

Mktrost at 22:28, 7 July 2011

2011-07-07T22:28:26Z

← Older revision		Revision as of 18:28, 7 July 2011
Line 1:		Line 1:
	{\| style="border-collapse: collapse" border="1" align="left"		{\| style="border-collapse: collapse font-size:10pt" border="1" align="left"
	\|+ Git CheatSheet		\|+ Git CheatSheet
	\|-		\|-

Mktrost: Created page with '{| style="border-collapse: collapse" border="1" align="left" |+ Git CheatSheet |- ! colspan="2" | Help |- | Get Help || git help ''command'' |- ! colspan="2" | Clone/Copy Repo |…'

2011-07-07T22:07:47Z

Created page with '{| style="border-collapse: collapse" border="1" align="left" |+ Git CheatSheet |- ! colspan="2" | Help |- | Get Help || git help ''command'' |- ! colspan="2" | Clone/Copy Repo |…'

New page

{| style="border-collapse: collapse" border="1" align="left"
|+ Git CheatSheet
|-
! colspan="2" | Help
|-
| Get Help || git help ''command''
|-
! colspan="2" | Clone/Copy Repo
|-
| Copy Repo || git clone ''source'' [''destName'']
|-
! colspan="2" | Checking what has Changed
|-
| What files changed? || git status
|-
| What changed in a file? || git diff ''fileName''
|-
| What changed in a file between commits? || git diff ''commit1 commit2 fileName''
|-
| Check History Logs || git log [''fileName'']
|-
! colspan="2" | Saving Changes (2 step process)
|-
| 1) Stage Changes || git add ''fileName1 fileName2''
|-
| 2) Commit Changes || git commit -m “''commit message''”
|-
! colspan="2" | Undoing Things
|-
| Undo staging || git reset HEAD ''fileName''
|-
| Undo unstaged changes || git checkout -- ''fileName''
|-
! colspan="2" | Working with a Remote
|-
| Get the latest updates || git pull
|-
| Share your Changes || git push
|-
| 1st time pushing branch || git push origin ''branchName''
|-
| Push to Remote || git push origin ''tagName''
|-
| See all branches including remotes || git branch -a
|-
| Base work on a remote branch/merge back to it || git checkout --track origin/''branchName''
|-
! colspan="2" | Tags
|-
| Create a tag || git tag -a ''tagName'' -m "''tag description''"
|-
| List Tags || git tag
|-
| List tags with certain name || git tag -l ''partialName*''
|-
| Get info on a tag || git show ''tagName''
|-
| Push to Remote || git push origin ''tagName''
|-
! colspan="2" | Branches
|-
| See what branches exist (current marked with *) || git branch
|-
| Switch branch || git checkout ''branchName''
|-
| Create & switch to branch (branches from current one) || git checkout -b ''branchName''
|-
| Merge from another branch to this one || git merge ''branchMergingFrom''
|-
| See all branches including remotes || git branch -a
|-
| Base work on a remote branch/merge back to it || git checkout --track origin/''branchName''
|-
| 1st time pushing branch || git push origin ''branchName''
|-
| Delete Local Branch || git branch -d ''branchName''
|-
| Delete Remote Branch || git push origin :''branchName''
|-
! colspan="2" | Resolving Merge Conflicts
|-
| 1) Make changes || ''use your favorite text editor''
|-
| 2) Delete <<<<<<<, =======, and >>>>>>> || ''use your favorite text editor''
|-
| 3) Stage the conflict resolution || git add ''nowMergedFile''
|-
| 4) Commit the merge || git commit
|-
! colspan="2" | Create New “Remote” Repo
|-
| Create Repo with only the database info (no source) || git init --bare --shared ''myRepoName''
|-
| Push to Remote for the first time || git push origin master
|}

Git Cheat Sheet - Revision history

Mktrost at 23:13, 7 July 2011

Mktrost at 23:10, 7 July 2011

Mktrost at 22:49, 7 July 2011

Mktrost at 22:37, 7 July 2011

Mktrost at 22:28, 7 July 2011

Mktrost: Created page with '{| style="border-collapse: collapse" border="1" align="left" |+ Git CheatSheet |- ! colspan="2" | Help |- | Get Help || git help ''command'' |- ! colspan="2" | Clone/Copy Repo |…'