mingrammer/git-tips

git help everyday

git help -g

git log -S'<a term in the source>'

git fetch origin && git reset --hard origin/master && git clean -f -d

git ls-tree --name-only -r <commit-ish>

git update-ref -d HEAD

git diff --name-only --diff-filter=U

git diff-tree --no-commit-id --name-only -r <commit-ish>

git diff

git diff --cached

git diff --staged

git diff HEAD

git branch --merged master

git checkout -

git checkout @{-1}

git branch --merged master | grep -v '^\*' | xargs -n 1 git branch -d

git branch --merged master | grep -v '^\*\|  master' | xargs -n 1 git branch -d # will not delete master if master is not checked out

git branch -vv

git branch -u origin/mybranch

git branch -d <local_branchname>

git push origin --delete <remote_branchname>

git push origin :<remote_branchname>

git tag -d <tag-name>

git push origin :refs/tags/<tag-name>

git checkout -- <file_name>

git revert <commit-ish>

git reset <commit-ish>

git commit -v --amend

git cherry -v master

git commit --amend --author='Author Name <[email protected]>'

git commit --amend --reset-author --no-edit

git remote set-url origin <URL>

git remote

git remote show

git branch -a

git branch -r

git add -p

curl http://git.io/vfhol > ~/.git-completion.bash && echo '[ -f ~/.git-completion.bash ] && . ~/.git-completion.bash' >> ~/.bashrc

git log --no-merges --raw --since='2 weeks ago'

git whatchanged --since='2 weeks ago'

git log --no-merges --stat --reverse master..

git checkout <branch-name> && git cherry-pick <commit-ish>

git branch -a --contains <commit-ish>

git branch --contains <commit-ish>

git config --global alias.<handle> <command> 
git config --global alias.st status

git stash

git stash save

git stash -k

git stash --keep-index

git stash save --keep-index

git stash -u

git stash save -u

git stash save --include-untracked

git stash save <message>

git stash -a

git stash --all

git stash save --all

git stash list

git stash apply <stash@{n}>

git stash pop

git stash apply stash@{0} && git stash drop stash@{0}

git stash clear

git stash drop <stash@{n}>

git checkout <stash@{n}> -- <file_path>

git checkout stash@{0} -- <file_path>

git ls-files -t

git ls-files --others

git ls-files --others -i --exclude-standard

git worktree add -b <branch-name> <path> <start-point>

git worktree add --detach <path> HEAD

git rm --cached <file_path>

git rm --cached -r <directory_path>

git clean -n

git clean -f

git clean -f -d

git clean -df

git submodule foreach git pull

git submodule update --init --recursive

git submodule update --remote

git cherry -v master

git cherry -v master <branch-to-be-merged>

git branch -m <new-branch-name>

git branch -m [<old-branch-name>] <new-branch-name>

git rebase master feature && git checkout master && git merge -

git archive master --format=zip --output=master.zip

git add --all && git commit --amend --no-edit

git fetch -p

git remote prune origin

 git rev-list --reverse HEAD | head -1

git rev-list --max-parents=0 HEAD

git log --pretty=oneline | tail -1 | cut -c 1-40

git log --pretty=oneline --reverse | head -1 | cut -c 1-40

git log --pretty=oneline --graph --decorate --all

gitk --all

git subtree push --prefix subfolder_name origin gh-pages

git subtree add --prefix=<directory_name>/<project_name> --squash [email protected]:<username>/<project_name>.git master

git subtree pull --prefix=<directory_name>/<project_name> --squash [email protected]:<username>/<project_name>.git master

git bundle create <file> <branch-name>

git clone repo.bundle <repo-dir> -b <branch-name>

git rev-parse --abbrev-ref HEAD

git update-index --assume-unchanged Changelog; git commit -a; git update-index --no-assume-unchanged Changelog

git rebase --autostash

git fetch origin pull/<id>/head:<branch-name>

git pull origin pull/<id>/head:<branch-name>

git describe --tags --abbrev=0

git diff --word-diff

git difftool -t <commit1> <commit2> <path>

git update-index --assume-unchanged <file_name>

git update-index --no-assume-unchanged <file_name>

git clean -X -f

git checkout <deleting_commit>^ -- <file_path>

git checkout <commit-ish> -- <file_path>

git config --global pull.rebase true

#git < 1.7.9
git config --global branch.autosetuprebase always

git config --list

git config --global core.ignorecase false

git config --global core.editor '$EDITOR'

git config --global help.autocorrect 1

git name-rev --name-only <SHA-1>

git clean -fd --dry-run

git commit --fixup <SHA-1>

git rebase -i --autosquash

git commit --only <file_path>

git add -i

git check-ignore *

git status --ignored

git log Branch1 ^Branch2

git log -<n>

git log -n <n>

git config --global rerere.enabled 1

git diff --name-only | uniq | xargs $EDITOR

git count-objects --human-readable

git gc --prune=now --aggressive

git instaweb [--local] [--httpd=<httpd>] [--port=<port>] [--browser=<browser>]

git log --show-signature

git config --global --unset <entry-name>

git checkout --orphan <branch_name>

git show <branch_name>:<file_name>

git log --first-parent

git rebase --interactive HEAD~2

git checkout master && git branch --no-merged

git bisect start                    # Search start 
git bisect bad                      # Set point to bad commit 
git bisect good v2.6.13-rc2         # Set point to good commit|tag 
git bisect bad                      # Say current state is bad 
git bisect good                     # Say current state is good 
git bisect reset                    # Finish search 

git commit --no-verify

git log --follow -p -- <file_path>

git clone -b <branch-name> --single-branch https://github.com/user/repo.git

git checkout -b <branch-name>

git branch <branch-name> && git checkout <branch-name>

git config core.fileMode false

git config --global color.ui false

git config --global <specific command e.g branch, diff> <true, false or always>

git for-each-ref --sort=-committerdate --format='%(refname:short)' refs/heads/

git grep --heading --line-number 'foo bar'

git clone https://github.com/user/repo.git --depth 1

git log --all --grep='<given-text>'

git log master..<branch-name> --oneline | tail -1

git reset HEAD <file-name>

git push -f <remote-name> <branch-name>

git remote add <remote-nickname> <remote-url>

git blame <file-name>

git shortlog

git push --force-with-lease <remote-name> <branch-name>

git log --author='_Your_Name_Here_' --pretty=tformat: --numstat | gawk '{ add += <!-- @doxie.inject start -->; subs += <!-- @doxie.inject end -->; loc += <!-- @doxie.inject start --> - <!-- @doxie.inject end --> } END { printf "added lines: %s removed lines: %s total lines: %s
", add, subs, loc }' -

git log --author='_Your_Name_Here_' --pretty=tformat: --numstat | awk '{ add += <!-- @doxie.inject start -->; subs += <!-- @doxie.inject end -->; loc += <!-- @doxie.inject start --> - <!-- @doxie.inject end --> } END { printf "added lines: %s, removed lines: %s, total lines: %s
", add, subs, loc }' - # on Mac OSX

git revert -m 1 <commit-ish>

git rev-list --count <branch-name>

git config --global alias.undo '!f() { git reset --hard $(git rev-parse --abbrev-ref HEAD)@{${1-1}}; }; f'

git notes add -m 'Note on the previous commit....'

git log --show-notes='*'

git --git-dir=<source-dir>/.git format-patch -k -1 --stdout <SHA1> | git am -3 -k

git fetch origin master:refs/remotes/origin/mymaster

diff -u <(git rev-list --first-parent BranchA) <(git rev-list --first-parent BranchB) | sed -ne 's/^ //p' | head -1

git log --branches --not --remotes

git log @{u}..

git cherry -v

git diff --ignore-all-space | git apply --cached

git config [--global] --edit

git blame -L <start>,<end>

git var -l | <variable>

git format-patch -M upstream..topic

git rev-parse --show-toplevel

git log --since='FEB 1 2017' --until='FEB 14 2017'

git log --perl-regexp --author='^((?!excluded-author-regex).*)

git request-pull v1.0 https://git.ko.xz/project master:for-linus

git ls-remote git://git.kernel.org/pub/scm/git/git.git

git ls-files --others -i --exclude-standard | xargs zip untracked.zip

git config -l | grep alias | sed 's/^alias\.//g'

git config -l | grep alias | cut -d '.' -f 2

git status --short --branch

git checkout master@{yesterday}

git push -u origin <branch_name>

git rebase --onto <new_base> <old_base>

git config --global url.'[email protected]:'.insteadOf 'https://github.com/'

cd <path-to-submodule>
git pull origin <branch>
cd <root-of-your-main-project>
git add <path-to-submodule>
git commit -m "submodule updated"

git config --global core.autocrlf false