calopez · May 31, 2016 12:44 · Oct 19, 2015 · Jul 29, 2015 · Jul 29, 2015 · Jul 29, 2015
diff --git a/README.md b/README.md
@@ -384,4 +384,14 @@ Security
 -----------
 
 Hide Git on the web via `.htaccess`: `RedirectMatch 404 /\.git` 
-(more info here: http://stackoverflow.com/a/17916515/1815847)
+(more info here: http://stackoverflow.com/a/17916515/1815847)
+
+
+Large File Storage
+-----------
+
+Website: https://git-lfs.github.com/
+
+Install: `brew install git-lfs`
+
+Track `*.psd` files: `git lfs track "*.psd"` (init, add, commit and push as written above)
diff --git a/README.md b/README.md
@@ -383,5 +383,5 @@ Ignore files that have already been committed to a Git repository: http://stacko
 Security
 -----------
 
-Prevent access to `.git` folders via `.htaccess`: `RedirectMatch 404 /\.git` 
+Hide Git on the web via `.htaccess`: `RedirectMatch 404 /\.git` 
 (more info here: http://stackoverflow.com/a/17916515/1815847)
diff --git a/README.md b/README.md
@@ -384,4 +384,4 @@ Security
 -----------
 
 Prevent access to `.git` folders via `.htaccess`: `RedirectMatch 404 /\.git` 
-(more in here: http://stackoverflow.com/a/17916515/1815847)
+(more info here: http://stackoverflow.com/a/17916515/1815847)
diff --git a/README.md b/README.md
@@ -377,4 +377,11 @@ Create a zip-archive: `git archive --format zip --output filename.zip master`
 Troubleshooting
 -----------
 
-Ignore files that have already been committed to a Git repository: http://stackoverflow.com/a/1139797/1815847
+Ignore files that have already been committed to a Git repository: http://stackoverflow.com/a/1139797/1815847
+
+
+Security
+-----------
+
+Prevent access to `.git` folders via `.htaccess`: `RedirectMatch 404 /\.git` 
+(more in here: http://stackoverflow.com/a/17916515/1815847)
diff --git a/README.md b/README.md
@@ -300,13 +300,13 @@ Show all released versions with comments:
 `git tag -l -n1`
 
 Create release version:
-`git tag v1.0`
+`git tag v1.0.0`
 
 Create release version with comment:
-`git tag -a v1.0 -m 'Message'`
+`git tag -a v1.0.0 -m 'Message'`
 
 Checkout a specific release version:
-`git checkout v1.0`
+`git checkout v1.0.0`
 
 
 Collaborate

diff --git a/README.md b/README.md
@@ -369,6 +369,11 @@ Delete remote branch (push nothing):
 `git push origin --delete branchname`
 
 
+Archive
+-----------
+Create a zip-archive: `git archive --format zip --output filename.zip master`
+
+
 Troubleshooting
 -----------
 

diff --git a/README.md b/README.md
@@ -366,4 +366,10 @@ Clone specific branch to localhost:
 
 Delete remote branch (push nothing):
 `git push origin :branchname` or:
-`git push origin --delete branchname`
+`git push origin --delete branchname`
+
+
+Troubleshooting
+-----------
+
+Ignore files that have already been committed to a Git repository: http://stackoverflow.com/a/1139797/1815847
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ General
 Initialize Git:
 `git init`
 
-Get verything ready to commit:
+Get everything ready to commit:
 `git add .`
 
 Get custom file ready to commit:

diff --git a/README.md b/README.md
@@ -318,10 +318,10 @@ Show remote:
 Show remote details:
 `git remote -v`
 
-Add remote origin from GitHub:
+Add remote origin from GitHub project:
 `git remote add origin https://github.com/user/project.git`
 
-Add remote origin from server:
+Add remote origin from existing empty project on server:
 `git remote add origin ssh://[email protected]/path/to/repository/.git`
 
 Remove origin:

diff --git a/README.md b/README.md
@@ -63,7 +63,7 @@ Remove files from Git:
 Update all changes:
 `git add -u`
 
-Kepp file but do not track anymore:
+Remove file but do not track anymore:
 `git rm --cached index.html`
 
 Move or rename files:

diff --git a/README.md b/README.md
@@ -286,6 +286,9 @@ Compare without caring about all spaces:
 Useful comparings:
 `git diff --stat --summary 6eb715d..HEAD`
 
+Blame:
+`git blame -L10,+1 index.html`
+
 
 Releases & Version Tags
 -----------

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`