git-tips/README.md

git-tips

Collection of git-tips, want to add your tips? Checkout contributing.md

• Overwrite pull
• List of all files till a commit
• Git reset first commit
• List all the conflicted files
• List of all files changed in a commit
• Unstaged changes since last commit
• Changes staged for commit
• Show both staged and unstaged changes
• List all branches that are already merged into master
• Quickly switch to the previous branch
• Remove branches that have already been merged with master
• List all branches and their upstreams, as well as last commit on branch
• Track upstream branch
• Delete local branch
• Delete remote branch
• Undo local changes with the last content in head
• Revert: Undo a commit by creating a new commit
• Reset: Discard commits, advised for private branch
• Reword the previous commit message
• Changing a remote's URL
• Get list of all remote references
• Get list of all local and remote branches
• Get only remote branches
• Stage parts of a changed file, instead of the entire file
• Get git bash completion
• What changed since two weeks?
• See all commits made since forking from master
• Pick commits across branches using cherry-pick
• Find out branches containing commit-hash
• Git Aliases
• Saving current state of tracked files without commiting
• Saving current state including untracked files
• Show list of all saved stashes
• Apply any stash without deleting from the stashed list
• Apply last stashed state and delete it from stashed list
• Delete all stored stashes
• Show all tracked files
• Show all untracked files
• Show all ignored files
• Create new working tree from a repository (git 2.5)
• Create new working tree from HEAD state
• Before deleting untracked files/directory, do a dry run to get the list of these files/directories
• Forcefully remove untracked files
• Forcefully remove untracked directory
• Update all the submodules
• Show all commits in the current branch yet to be merged to master
• Rename a branch
• rebases 'feature' to 'master' and merges it in to master
• Archive the master branch
• Modify previous commit without modifying the commit message
• Purnes branches that have been deleted in the remote.
• Retrieve the commit hash of the initial revision.
• Visualize the version tree.
• Deploying git tracked subfolder to gh-pages
• Adding a project to repo using subtree
• Get latest changes in your repo for a linked project using subtree

Overwrite pull

git fetch --all && git reset --hard origin/master

List of all files till a commit

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

Git reset first commit

git update-ref -d HEAD

List all the conflicted files

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

List of all files changed in a commit

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

Unstaged changes since last commit

git diff

Changes staged for commit

git diff --cached

Show both staged and unstaged changes

git diff HEAD

List all branches that are already merged into master

git checkout master && git branch --merged

Quickly switch to the previous branch

git checkout -

Remove branches that have already been merged with master

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

List all branches and their upstreams, as well as last commit on branch

git branch -vv

Track upstream branch

git branch -u origin/mybranch

Delete local branch

git branch -d <local_branchname>

Delete remote branch

git push origin --delete <remote_branchname>

Alternatives:

git push origin :<remote_branchname>

Undo local changes with the last content in head

git checkout -- <file_name>

Revert: Undo a commit by creating a new commit

git revert <commit-ish>

Reset: Discard commits, advised for private branch

git reset <commit-ish>

Reword the previous commit message

git commit -v --amend

Changing a remote's URL

git remote set-url origin <URL>

Get list of all remote references

git remote

Alternatives:

git remote show

Get list of all local and remote branches

git branch -a

Get only remote branches

git branch -r

Stage parts of a changed file, instead of the entire file

git add -p

Get git bash completion

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

What changed since two weeks?

git whatchanged --since='2 weeks ago'

See all commits made since forking from master

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

Pick commits across branches using cherry-pick

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

Find out branches containing commit-hash

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

Alternatives:

git branch --contains <commit-ish>

Git Aliases

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

Saving current state of tracked files without commiting

git stash

Alternatives:

git stash save

Saving current state including untracked files

git stash save -u

Alternatives:

git stash save --include-untracked

Show list of all saved stashes

git stash list

Apply any stash without deleting from the stashed list

git stash apply <stash@{n}>

Apply last stashed state and delete it from stashed list

git stash pop

Alternatives:

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

Delete all stored stashes

git stash clear

Alternatives:

git stash drop <stash@{n}>

Show all tracked files

git ls-files -t

Show all untracked files

git ls-files --others

Show all ignored files

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

Create new working tree from a repository (git 2.5)

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

Create new working tree from HEAD state

git worktree add --detach <path> HEAD

Before deleting untracked files/directory, do a dry run to get the list of these files/directories

git clean -n

Forcefully remove untracked files

git clean -f

Forcefully remove untracked directory

git clean -f -d

Alternatives:

git clean -df

Update all the submodules

git submodule foreach git pull

Show all commits in the current branch yet to be merged to master

git cherry -v master

Alternatives:

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

Rename a branch

git branch -m <new-branch-name>

Alternatives:

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

rebases 'feature' to 'master' and merges it in to master

git checkout feature && git rebase @{-1} && git checkout @{-2} && git merge @{-1}

Archive the master branch

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

Modify previous commit without modifying the commit message

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

Purnes branches that have been deleted in the remote.

git fetch -p

Alternatives:

git remote prune origin

Retrieve the commit hash of the initial revision.

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

Visualize the version tree.

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

Alternatives:

gitk --all

Deploying git tracked subfolder to gh-pages

git subtree push --prefix subfolder_name origin gh-pages

Adding a project to repo using subtree

git subtree add --prefix=<directory_name>/<project_name> --squash git@github.com:<username>/<project_name>.git master

Get latest changes in your repo for a linked project using subtree

git subtree pull --prefix=<directory_name>/<project_name> --squash git@github.com:<username>/<project_name>.git master