path/command	description
`/`	root directory
`~`	my home directory
`~/.zshrc`	config file, there are more of them (.zprofile, .zlogin, .zenv)
`~/.oh-my-zh`	folder
`alias`	a list of diffetent commands/aliases from several sources (lib/plugin etc. folders)

USING GIT

Based on this article and this gist.

Still working on it ...

Set up your Git configuration

git config --global user.email "[email protected]"

git config --global user.name "Your Name"
git config --global core.editor "nano" - setting the editor
git config --global color.ui true
--local and --system as well

See Git configuration

git config --list

To initialise a local repository

git init

Adding to the repo

git add <filename> git add . ... add all the files to the repo

Making a commit

git commit -m "Message about the change goes here" <filename> git commit -am "Message about the change goes here" ... commit all changes to git of muliple files - no filenames needed

See the commits in a historical linear fashion

git log

Git has a 3 Tier Architecture: Working - Staging - Repo

Changes to files are put in a Checksum SHA-1 hash 40digit value containing parent hash, author and message.

HEAD is the latest commit of the checked out branch

Basic Commands

git status (the command 'git status' tells which files are not added or committed from Working to Staging to Repository) git commit -m "" (Commits and changes to all files that are in Staging into Repo) git diff (show changes between Working and Local Repo, no file supplied shows all files) git diff --staged (shows changes between Staged and Local Repo) git rm file.txt (will remove file from working then git commit -m "" to also remove from Repo) git rm --cached file.txt (leaves copy of file in Working but removes from Staging and Repo) git mv (rename or move files - then git commit -m "" to move to Repo) git commit -am "text goes here" (adds all files straight to Repo from Staging if they have changes - meaning they skip git add) git checkout -- file.txt (restore Repo file to Working Directory using current branch) git reset --soft HEAD^ (restore repo file to staging) git reset HEAD file.txt (Move a Stage file out of Stage back to Working) git commit --amend -m "message" file.txt (Change last commit to Repo - only last one can change) ❓Reverting --soft --mixed --hard will go back to previous commits git log (gets the sha1s so you can see the commits where you want revert back to) git reset --soft sha (changes Repo but not Staging or Working) git reset --mixed sha (changes Repo and Staging but not Working) git reset --hard sha (changes all 3 Tiers) git clean -f (remove untracked files from Working)

git ignore

.gitignore (ignores files to track in Working / track the .gitignore file) ❓ .gitignore_global (global ignore - create in home folder)

.DS_Store
.Trashes
.Spotlight_V100

git config --global core.excludesfile ~/.gitignore*global (add to gitconfig)

Stop tracking changes

git rm --cached file.txt (leaves copy in Repo and Working)

Track Folders changes

Add an invisble file to a folder like .gitkeeper then add and commit

Commit Log

git ls-tree HEAD git ls-tree master git log --oneline git log --author="Neil" git log --grep="temp"

Show Commits

git show dc094cb (show SHA1) ... 7 characters is enough

Compare Commits ... nic tu neni

Branches

git branch (Show local branch name - the asterisk _ is the one we are on git branch -r (Shows remote branches) git branch -a (Shows local and remote) git branch newbranch (creates a new branch) git checkout newbranch (switch to new branch) git checkout -b oldbranch (creates and switches to new branch) git push origin newbranch (Push new branch to remote)

Diff in Branches

git diff master..otherbranch (shows diff) git diff --color-words master..otherbranch (shows diff in color) git branch --merged (shows any merged branches)

Rename Branch

git branch -m oldname newname

Delete Branch

git branch -d nameofbranch

Merge Branch

git merge branchname (be on the receiver branch to merge the other branch) Merge Conflicts between the same file on 2 branches are marked in HEAD and other branch git merge --abort (Abort basically cancels the merge)

Manually Fix Files and commit ???

The Stash

git stash save "text message here" git stash list (shows whats in stash) git stash show -p stash@{0} (Show the diff in the stash) git stash pop stash@{0} (restores the stash deletes the tash) git stash apply stash@{0} (restores the stash and keeps the stash) git stash clear (removes all stash) git stash drop stash@{0}

Remotes

You can push to and fetch from the remote server, merge any differences - then push any new to the remote - ❓(na toto se musim jeste podivat, nedava mi to smysl) 3 branches work remote server branch, local origin master and local master
Create a repo in GitHub, then add that remote to your local repo
You will need to add a SSH key from your local machine and store it in GitHub - ref: https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/

git remote add origin https://....git (origin (just a label/name) can be named whatever followed by the remote = git repo url) git remote (to show all remotes) git remote show origin (to see remote URL) git remote remove origin (to remove remote) git remote rm origin (to remove remote)

Cloning a repo

Cloning a GitHub Repo - create and get the URL of a new repository from GitHub, then clone that to your local repo, example below uses local repo named 'nameoffolder' git clone https://github.com...git nameoffolder

Push to Remote from Local

git push -u origin master - push to remote (origin) and branch (master) ... since when we pushed the local to remote we used -u parameter then the remote branch is tracked to the local branch and we just need to use... git push

git push origin newbranch (push a specific branch to a remote)

Fetch changes from a cloned Repo

git fetch origin - pulls down latest committs from remote origin/master not origin, also pull down any branches pushed to Repo

❗️ Fetch before you work ❗️ Fetch before you pull ❗️ Fetch often

Merge with origin/master

git merge origin/master git pull - you can also do git pull which is = git fetch + git merge

Checkout/Copy a remote branch to local

git branch branchname origin/branchname (this will bring the remote branch to local and track with the remote)

Delete branch

git branch -d branchname

❓(Checkout and switch branch and track to remote) ❓git checkout -b nontracking origin/nontracking

Remove remote branch

git push origin --delete branch

Undoing

git checkout path-to-file (restores a file before it is staged) git reset HEAD path-to-file (if it is staged - restores a file from last commit and then git checkout path-to-file) git checkout HEAD^ path-to-file (if is staged and committed - restores from last commit) git reset --hard HEAD^ (restore prior commit)

Keeping the local synced with the origin after the local is reset, reference: http://stackoverflow.com/questions/17667023/git-how-to-reset-origin-master-to-a-commit

git push --force origin master git rm --cached filetoremove (Removes a file that is committed from repo but leaves it still locally - handy when you've added something that you don't want tracked)

Undo last push to github - below forces commit entered in to overwrite remote - so in case below origin is local and master is remote) git push -f origin last_known_good_commit:master

Syncing a Fork

Have the Fork already created in Github
http://stackoverflow.com/questions/7244321/how-do-i-update-a-github-forked-repository

make a local copy of the fork - git clone [email protected]:me/myfork.git myfork
cd into the repo
make an upstream remote repo - git remote add upstream https://github.com/theotherguy/theoriginal.git
check all the repos - git remote -v
get the original repo - git fetch upstream
ensure you are in your local master branch - git checkout master
rewrite your local master branch on top of the upstream - git rebase upstream/master
git push -f origin master (needs -f the first time after rebase)

This will result in the fork master branch being 'even' with the original master branch

Creating an Upstream Branch from an already added branch

git push --set-upstream dev master (Here the remote 'dev' branch is set as Upstream to the local 'master' branch)

git branch -vv (Shows which branch is the Upstream, if you need to change just use the preceeding command again)

Checking out a Fork with a certain pull request on a new branch

git checkout -b newbranchname

git pull https://github.com/username/the-repo.git theirbranchname

Remove Git submodule

https://stackoverflow.com/questions/1759587/un-submodule-a-git-submodule

git rm --cached submodule_path # delete reference to submodule HEAD (no trailing slash) git rm .gitmodules # if you have more than one submodules, # you need to edit this file instead of deleting! rm -rf submodule_path/.git # make sure you have backup!! git add submodule_path # will add files instead of commit reference git commit -m "remove submodule"

jtrfs/WEB DEV SHORTCUTS.md

FILES paths

oh-my-zsh