gerardo-orozco · August 29, 2015 14:06 · Oct 28, 2014 · Oct 28, 2014 · Sep 10, 2014 · Jul 8, 2014
diff --git a/Git cheatsheet.rst → Git cheatsheet.md b/Git cheatsheet.rst → Git cheatsheet.md
diff --git a/README.md → Git cheatsheet.rst b/README.md → Git cheatsheet.rst
diff --git a/README.md b/README.md
@@ -318,6 +318,9 @@ Show remote details:
 Add remote origin from GitHub:
 `git remote add origin https://github.com/user/project.git`
 
+Add remote origin from server:
+`git remote add origin ssh://[email protected]/path/to/repository/.git`
+
 Remove origin:
 `git remote rm origin`
 

diff --git a/README.md b/README.md
@@ -152,9 +152,12 @@ Merge to master (only if fast forward):
 Merge to master (forc a new commit):
 `git merge --no-ff branchname`
 
-Abort merge:
+Stop merge (in case of conflicts):
 `git merge --abort`
 
+Stop merge (in case of conflicts):
+`git reset --merge` // prior to v1.7.4
+
 
 Stash
 -----------

diff --git a/README.md b/README.md
@@ -336,6 +336,12 @@ Push to default:
 Fetch:
 `git fetch origin`
 
+Pull:
+`git pull`
+
+Pull specific branch:
+`git pull origin branchname`
+
 Merge fetched commits:
 `git merge origin/master`
 

diff --git a/README.md b/README.md
@@ -346,6 +346,9 @@ Clone to localhost:
 Clone to localhost folder:
 `git clone https://github.com/user/project.git ~/dir/folder`
 
+Clone specific branch to localhost:
+`git clone -b branchname https://github.com/user/project.git`
+
 Delete remote branch (push nothing):
 `git push origin :branchname` or:
 `git push origin --delete branchname`
diff --git a/README.md b/README.md
@@ -6,7 +6,9 @@ Global Settings
 
 Related Setup: https://gist.github.com/hofmannsven/6814278
 
-Interactive Tutorial: http://try.github.io/
+Related Pro Tips: https://ochronus.com/git-tips-from-the-trenches/
+
+Interactive Beginners Tutorial: http://try.github.io/
 
 
 Reminder

diff --git a/README.md b/README.md
@@ -344,6 +344,6 @@ Clone to localhost:
 Clone to localhost folder:
 `git clone https://github.com/user/project.git ~/dir/folder`
 
-Relete remote branch (push nothing):
+Delete remote branch (push nothing):
 `git push origin :branchname` or:
 `git push origin --delete branchname`
diff --git a/README.md b/README.md
@@ -288,9 +288,15 @@ Releases & Version Tags
 Show all released versions:
 `git tag`
 
+Show all released versions with comments:
+`git tag -l -n1`
+
 Create release version:
 `git tag v1.0`
 
+Create release version with comment:
+`git tag -a v1.0 -m 'Message'`
+
 Checkout a specific release version:
 `git checkout v1.0`
 

diff --git a/README.md b/README.md
@@ -282,6 +282,19 @@ Useful comparings:
 `git diff --stat --summary 6eb715d..HEAD`
 
 
+Releases & Version Tags
+-----------
+
+Show all released versions:
+`git tag`
+
+Create release version:
+`git tag v1.0`
+
+Checkout a specific release version:
+`git checkout v1.0`
+
+
 Collaborate
 -----------
 

diff --git a/README.md b/README.md
@@ -16,8 +16,6 @@ Press `minus + shift + s` and `return` to chop/fold long lines!
 
 Show folder content: `ls -la`
 
-Go straight to MAMP/htdocs: `cd /Applications/MAMP/htdocs`
-
 
 Setup
 -----------

diff --git a/README.md b/README.md
@@ -6,6 +6,8 @@ Global Settings
 
 Related Setup: https://gist.github.com/hofmannsven/6814278
 
+Interactive Tutorial: http://try.github.io/
+
 
 Reminder
 -----------

diff --git a/README.md b/README.md
@@ -58,6 +58,9 @@ Add and commit in one step:
 Remove files from Git:
 `git rm index.html`
 
+Update all changes:
+`git add -u`
+
 Kepp file but do not track anymore:
 `git rm --cached index.html`
 

diff --git a/README.md b/README.md
@@ -316,7 +316,8 @@ Merge fetched commits:
 `git merge origin/master`
 
 Clone to localhost:
-`git clone https://github.com/user/project.git`
+`git clone https://github.com/user/project.git` or:
+`git clone ssh://[email protected]/~/dir/.git`
 
 Clone to localhost folder:
 `git clone https://github.com/user/project.git ~/dir/folder`

diff --git a/README.md b/README.md
@@ -319,7 +319,7 @@ Clone to localhost:
 `git clone https://github.com/user/project.git`
 
 Clone to localhost folder:
-`git clone https://github.com/user/project.git dir/folder`
+`git clone https://github.com/user/project.git ~/dir/folder`
 
 Relete remote branch (push nothing):
 `git push origin :branchname` or:

diff --git a/README.md b/README.md
@@ -289,7 +289,7 @@ Show remote details:
 `git remote -v`
 
 Add remote origin from GitHub:
-`git remode add origin https://github.com/user/project.git`
+`git remote add origin https://github.com/user/project.git`
 
 Remove origin:
 `git remote rm origin`

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Press `minus + shift + s` and `return` to chop/fold long lines!
 
 Show folder content: `ls -la`
 
-Go straight to MAMP/htdocs: `cd /Applications/MAMP/htdocs/`
+Go straight to MAMP/htdocs: `cd /Applications/MAMP/htdocs`
 
 
 Setup

diff --git a/README.md b/README.md
@@ -7,6 +7,16 @@ Global Settings
 Related Setup: https://gist.github.com/hofmannsven/6814278
 
 
+Reminder
+-----------
+
+Press `minus + shift + s` and `return` to chop/fold long lines!
+
+Show folder content: `ls -la`
+
+Go straight to MAMP/htdocs: `cd /Applications/MAMP/htdocs/`
+
+
 Setup
 -----------
 
@@ -48,13 +58,16 @@ Add and commit in one step:
 Remove files from Git:
 `git rm index.html`
 
+Kepp file but do not track anymore:
+`git rm --cached index.html`
+
 Move or rename files:
 `git mv index.html dir/index_new.html`
 
 Undo modifications (restore files from latest commited version):
 `git checkout -- index.html`
 
-Restore file from a custom commit:
+Restore file from a custom commit (in current branch):
 `git checkout 6eb715d -- index.html`
 
 
@@ -169,6 +182,10 @@ Delete complete stash:
 Gitignore & Gitkeep
 -----------
 
+About: https://help.github.com/articles/ignoring-files
+
+Useful templates: https://github.com/github/gitignore
+
 Add or edit gitignore: 
 `nano .gitignore`
 

diff --git a/README.md b/README.md
@@ -58,7 +58,41 @@ Restore file from a custom commit:
 `git checkout 6eb715d -- index.html`
 
 
-Branching
+Reset
+-----------
+
+Go back to commit:
+`git revert 073791e7dd71b90daa853b2c5acc2c925f02dbc6`
+
+Soft reset (move HEAD only; neither staging nor working dir is changed):
+`git reset --soft 073791e7dd71b90daa853b2c5acc2c925f02dbc6`
+
+Mixed reset (move HEAD and change staging to match repo; does not affect working dir):
+`git reset --mixed 073791e7dd71b90daa853b2c5acc2c925f02dbc6`
+
+Hard reset (move HEAD and change staging dir and working dir to match repo):
+`git reset --hard 073791e7dd71b90daa853b2c5acc2c925f02dbc6`
+
+Update & Delete
+-----------
+
+Test-Delete untracked files:
+`git clean -n`
+
+Delete untracked files (not staging):
+`git clean -f`
+
+Unstage (undo adds):
+`git reset HEAD index.html`
+
+Commit to most recent commit:
+`git commit --amend -m "Message"`
+
+Update most recent commit message:
+`git commit --amend -m "New Message"`
+
+
+Branch
 -----------
 
 Show branches:
@@ -104,7 +138,7 @@ Abort merge:
 `git merge --abort`
 
 
-Stashing
+Stash
 -----------
 
 Put in stash:
@@ -189,7 +223,7 @@ Show history of commits as graph-summary:
 `git log --oneline --graph --all --decorate`
 
 
-Compare versions
+Compare
 -----------
 
 Compare modified files:

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Using Git
 Global Settings
 -----------
 
-Related Intro: https://gist.github.com/hofmannsven/6814278
+Related Setup: https://gist.github.com/hofmannsven/6814278
 
 
 Setup
@@ -77,6 +77,9 @@ Rename branch:
 `git branch -m branchname new_branchname` or:
 `git branch --move branchname new_branchname`
 
+Show all completely merged branches with current branch:
+`git branch --merged`
+
 Delete merged branch (only possible if not HEAD):
 `git branch -d branchname` or:
 `git branch --delete branchname`
@@ -101,6 +104,34 @@ Abort merge:
 `git merge --abort`
 
 
+Stashing
+-----------
+
+Put in stash:
+`git stash save "Message"`
+
+Show stash:
+`git stash list`
+
+Show stash stats:
+`git stash show stash@{0}`
+
+Show stash changes:
+`git stash show -p stash@{0}`
+
+Use custom stash item and drop it:
+`git stash pop stash@{0}`
+
+Use custom stash item and do not drop it:
+`git stash apply stash@{0}`
+
+Delete custom stash item:
+`git stash drop stash@{0}`
+
+Delete complete stash:
+`git stash clear`
+
+
 Gitignore & Gitkeep
 -----------
 
@@ -170,6 +201,12 @@ Compare modified files and highlight changes only:
 Compare modified files within the staging area:
 `git diff --staged`
 
+Compare branches:
+`git diff master..branchname`
+
+Compare branches like above:
+`git diff --color-words master..branchname^`
+
 Compare commits:
 `git diff 6eb715d`
 `git diff 6eb715d..HEAD`

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Using Git
 Global Settings
 -----------
 
-Related Tutorial: https://gist.github.com/hofmannsven/6814278
+Related Intro: https://gist.github.com/hofmannsven/6814278
 
 
 Setup
@@ -189,3 +189,50 @@ Compare without caring about all spaces:
 
 Useful comparings:
 `git diff --stat --summary 6eb715d..HEAD`
+
+
+Collaborate
+-----------
+
+Show remote:
+`git remote`
+
+Show remote details:
+`git remote -v`
+
+Add remote origin from GitHub:
+`git remode add origin https://github.com/user/project.git`
+
+Remove origin:
+`git remote rm origin`
+
+Show remote branches:
+`git branch -r`
+
+Show all branches:
+`git branch -a`
+
+Compare:
+`git diff origin/master..master`
+
+Push (set default with `-u`):
+`git push -u origin master`
+
+Push to default:
+`git push origin master`
+
+Fetch:
+`git fetch origin`
+
+Merge fetched commits:
+`git merge origin/master`
+
+Clone to localhost:
+`git clone https://github.com/user/project.git`
+
+Clone to localhost folder:
+`git clone https://github.com/user/project.git dir/folder`
+
+Relete remote branch (push nothing):
+`git push origin :branchname` or:
+`git push origin --delete branchname`
diff --git a/README.md b/README.md
@@ -45,6 +45,72 @@ Commit changes:
 Add and commit in one step:
 `git commit -am "Message"`
 
+Remove files from Git:
+`git rm index.html`
+
+Move or rename files:
+`git mv index.html dir/index_new.html`
+
+Undo modifications (restore files from latest commited version):
+`git checkout -- index.html`
+
+Restore file from a custom commit:
+`git checkout 6eb715d -- index.html`
+
+
+Branching
+-----------
+
+Show branches:
+`git branch`
+
+Create branch:
+`git branch branchname`
+
+Change to branch:
+`git checkout branchname`
+
+Create and change to new branch:
+`git checkout -b branchname`
+
+Rename branch:
+`git branch -m branchname new_branchname` or:
+`git branch --move branchname new_branchname`
+
+Delete merged branch (only possible if not HEAD):
+`git branch -d branchname` or:
+`git branch --delete branchname`
+
+Delete not merged branch:
+`git branch -D branch_to_delete`
+
+
+Merge
+-----------
+
+True merge (fast forward):
+`git merge branchname`
+
+Merge to master (only if fast forward):
+`git merge --ff-only branchname`
+
+Merge to master (forc a new commit):
+`git merge --no-ff branchname`
+
+Abort merge:
+`git merge --abort`
+
+
+Gitignore & Gitkeep
+-----------
+
+Add or edit gitignore: 
+`nano .gitignore`
+
+Track empty dir: 
+`touch dir/.gitkeep`
+
+
 Log
 -----------
 
@@ -91,6 +157,10 @@ Show history of commits as graph:
 Show history of commits as graph-summary:
 `git log --oneline --graph --all --decorate`
 
+
+Compare versions
+-----------
+
 Compare modified files:
 `git diff`
 
@@ -100,9 +170,22 @@ Compare modified files and highlight changes only:
 Compare modified files within the staging area:
 `git diff --staged`
 
-Remove files from Git:
-`git rm index.html`
+Compare commits:
+`git diff 6eb715d`
+`git diff 6eb715d..HEAD`
+`git diff 6eb715d..537a09f`
 
-Move or rename files:
-`git mv index.html dir/index_new.html`
+Compare commits of file:
+`git diff 6eb715d index.html`
+`git diff 6eb715d..537a09f index.html`
+
+Compare without caring about spaces:
+`git diff -b 6eb715d..HEAD` or:
+`git diff --ignore-space-change 6eb715d..HEAD`
+
+Compare without caring about all spaces:
+`git diff -w 6eb715d..HEAD` or:
+`git diff --ignore-all-space 6eb715d..HEAD`
 
+Useful comparings:
+`git diff --stat --summary 6eb715d..HEAD`
diff --git a/README.md b/README.md
@@ -1,18 +1,25 @@
 Using Git
 ===============
 
-Setup
+Global Settings
 -----------
 
-Create an alias (shortcut) for `git status`:
-`git config --global alias.st status`
+Related Tutorial: https://gist.github.com/hofmannsven/6814278
+
+
+Setup
+-----------
 
 See where Git is located:
 `which git`
 
 Get the version of Git:
 `git --version`
 
+Create an alias (shortcut) for `git status`:
+`git config --global alias.st status`
+
+
 Help
 -----------
 
@@ -30,10 +37,72 @@ Get verything ready to commit:
 `git add .`
 
 Get custom file ready to commit:
-`git add filename.txt`
+`git add index.html`
 
 Commit changes:
 `git commit -m "Message"`
 
 Add and commit in one step:
-`git commit -am "Message"`
+`git commit -am "Message"`
+
+Log
+-----------
+
+Show commits:
+`git log`
+
+Show oneline-summary of commits:
+`git log --oneline`
+
+Show oneline-summary of commits with full SHA-1:
+`git log --format=oneline`
+
+Show oneline-summary of the last three commits:
+`git log --oneline -3`
+
+Show only custom commits:
+`git log --author="Sven"`
+`git log --grep="Message"`
+`git log --until=2013-01-01`
+`git log --since=2013-01-01`
+
+Show only custom data of commit:
+`git log --format=short`
+`git log --format=full`
+`git log --format=fuller`
+`git log --format=email`
+`git log --format=raw`
+
+Show changes:
+`git log -p`
+
+Show every commit since special commit for custom file only:
+`git log 6eb715d.. index.html`
+
+Show changes of every commit since special commit for custom file only:
+`git log -p 6eb715d.. index.html`
+
+Show stats and summary of commits:
+`git log --stat --summary`
+
+Show history of commits as graph:
+`git log --graph`
+
+Show history of commits as graph-summary:
+`git log --oneline --graph --all --decorate`
+
+Compare modified files:
+`git diff`
+
+Compare modified files and highlight changes only:
+`git diff --color-words index.html`
+
+Compare modified files within the staging area:
+`git diff --staged`
+
+Remove files from Git:
+`git rm index.html`
+
+Move or rename files:
+`git mv index.html dir/index_new.html`
+
diff --git a/README.md b/README.md
@@ -1,8 +1,39 @@
 Using Git
 ===============
 
+Setup
+-----------
+
 Create an alias (shortcut) for `git status`:
 `git config --global alias.st status`
 
+See where Git is located:
+`which git`
+
+Get the version of Git:
+`git --version`
+
+Help
+-----------
+
 Help:
-`git help`
+`git help`
+
+
+General
+-----------
+
+Initialize Git:
+`git init`
+
+Get verything ready to commit:
+`git add .`
+
+Get custom file ready to commit:
+`git add filename.txt`
+
+Commit changes:
+`git commit -m "Message"`
+
+Add and commit in one step:
+`git commit -am "Message"`
diff --git a/cheatsheet b/cheatsheet
@@ -1,9 +0,0 @@
-Initialize Git:
-`git init`
-
-Get verything ready to commit:
-`git add .`
-
-Get custom file ready to commit:
-
-`git add filename.txt`

diff --git a/global b/global
@@ -1,6 +0,0 @@
-See where Git is located:
-`which git`
-
-Get the version of Git:
-`git --version`
-

diff --git a/README.md b/README.md
@@ -1,5 +1,8 @@
 Using Git
 ===============
 
-See where Git is located:
-`which git`
+Create an alias (shortcut) for `git status`:
+`git config --global alias.st status`
+
+Help:
+`git help`
diff --git a/cheatsheet b/cheatsheet
@@ -0,0 +1,9 @@
+Initialize Git:
+`git init`
+
+Get verything ready to commit:
+`git add .`
+
+Get custom file ready to commit:
+
+`git add filename.txt`
diff --git a/global b/global
@@ -0,0 +1,6 @@
+See where Git is located:
+`which git`
+
+Get the version of Git:
+`git --version`
+
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 Using Git
 ===============
 
-`asd`
+See where Git is located:
+`which git`
diff --git a/README.md b/README.md
@@ -0,0 +1,4 @@
+Using Git
+===============
+
+`asd`