Git Tips


> git-tips的集合,要添加您的提示吗? 查看

English | 中文 | Русский | 한국어 | Tiếng Việt | 日本語 | नेपाली | Polski


PS:所有这些命令都在git版本2.7.4(Apple Git-66)上进行了测试.

Everyday Git in twenty commands or so


Show helpful guides that come with Git

git help -g
git log -S&#39; <a term in the source>&#39;</a>

Show changes over time for specific file

git log -p<file_name>

Remove sensitive data from history, after a push

 git filter-branch --force --index-filter&#39;git rm --cached --ignore-unmatch<path-to-your-file>  &#39;--prune-empty --tag-name-filter cat---all &amp;&amp; git push origin --force --all

Sync with remote, overwrite local changes

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

List of all files till a commit

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

Git reset first commit

git update-ref -d头

Reset: preserve uncommitted local changes

git reset-保持<commit>

List all the conflicted files

git diff-仅名称--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-缓存


git diff --staged

Show both staged and unstaged changes

git diff头

List all branches that are already merged into master

git branch-合并的主

Quickly switch to the previous branch

git checkout-


git checkout @ {-1}

Remove branches that have already been merged with master

 git branch-合并的主|  grep -v&#39;^ \ *&#39;|  xargs -n 1 git分支-d


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

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


Track upstream branch

git branch -u来源/ mybranch

Delete local branch


Delete remote branch

git push origin-删除<remote_branchname>


git push来源:<remote_branchname>


Create local tag


Delete local tag


Delete remote tag

git push origin:参考/标签/<tag-name>
git checkout-<file_name>

Revert: Undo a commit by creating a new commit


Reset: Discard commits, advised for private branch


Reword the previous commit message

git commit -v-修改

See commit history for just the current branch

git cherry -v主控

Amend author.

 git commit --amend --author =&#39;作者姓名<> &#39;

Reset author, after author has been changed in the global config.

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

Changing a remote's URL

git remote set-url的起源<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

 curl -L;〜/ .git-completion.bash &amp;&amp; echo&#39;[-f〜/ .git-completion.bash] &amp;&amp;.  〜/ .git-completion.bash&#39;&gt;&gt;〜/ .bashrc

What changed since two weeks?

git log --no-merges --raw --since =&#39;2周前&#39;


git whatchanged --since =&#39;2周前&#39;

See all commits made since forking from master

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

Pick commits across branches using cherry-pick

 git结帐<branch-name> &amp;&amp; git cherry-pick<commit-ish>

Find out branches containing commit-hash

git branch -a-包含<commit-ish>


git branch-包含<commit-ish>

Git Aliases

git config-全局别名<handle><command> 
git config --global alias.st状态

Saving current state of tracked files without commiting

git stash


git stash push

Saving current state of unstaged changes to tracked files

git stash -k


git stash --keep-index

git stash push --keep-index

Saving current state including untracked files

git stash -u


git stash push -u

git stash push --include-untracked

Saving current state with message

git stash push -m<message>


git stash push-消息<message>

Saving current state of all files (ignored, untracked, and tracked)

git stash -a


git stash --all

git stash push-全部

Show list of all saved stashes

git stash show -p<stash@{n}>

Apply any stash without deleting from the stashed list

git stash适用<stash@{n}>

Apply last stashed state and delete it from stashed list

git stash pop


git stash apply stash @ {0} &amp;&amp; git stash drop藏匿@ {0}

Delete all stored stashes




Grab a single file from a stash

 git结帐<stash@{n}> --<file_path>


git checkout stash @ {0}-<file_path>

Show all tracked files

git ls文件-t

Show all untracked files

git ls-files-其他

Show all ignored files

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

Create new working tree from a repository (git 2.5)


Create new working tree from HEAD state

 git worktree添加--detach<path> 头

Untrack files without deleting

git rm-缓存<file_path>


git rm-缓存-r<directory_path>

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

Update all the submodules

git子模块foreach git pull


git子模块更新--init --recursive


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

git cherry -v主控


git cherry -v主控<branch-to-be-merged>

Rename a branch



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

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

git rebase master功能&amp;&amp; git checkout master &amp;&amp; git merge-

Archive the master branch

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

Modify previous commit without modifying the commit message

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

Prunes references to remove branches that have been deleted in the remote.

git fetch -p


git remote prune起源

Delete local branches that has been squash and merged in the remote.

 git branch -vv |  grep&#39;:走了]&#39;|  awk&#39;{print<!-- @doxie.inject start -->  }&#39;|  xargs git分支-D

Retrieve the commit hash of the initial revision.

  git rev-list --reverse HEAD |复制代码头-1


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

 git log --pretty = oneline | 尾巴-1 | 切-c 1-40
 git log --pretty = oneline --reverse | 头-1 | 切-c 1-40

Visualize the version tree.

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



 git log --graph --pretty =格式:&#39;%C(auto)%h |  %s |  %an |  %ar%d&#39;

Visualize the tree including commits that are only referenced from reflogs

git log --graph --decorate --oneline $(git rev-list --walk-reflogs --all)

Deploying git tracked subfolder to gh-pages

git subtree push --prefix subfolder_name原始gh-pages

Adding a project to repo using subtree

 git子树添加--prefix =<directory_name>  /<project_name>  --squash<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<username>  /<project_name>  .git master

Export a branch with history to a file.

git bundle创建<file><branch-name>

Import from a bundle

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

Get the name of current branch.

git rev-parse --abbrev-ref头

Ignore one file on commit (e.g. Changelog).

 git update-index-假定不变的变更日志;  git commit -a;  git update-index-无假设不变的变更日志

Stash changes before rebasing

git rebase --autostash

Fetch pull request by ID to a local branch

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


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

Show the most recent tag on the current branch.

git describe --tags --abbrev = 0

Show inline word diff.

git diff --word-diff

Show changes using common diff tools.

 git difftool [-t<tool>  ]<commit1><commit2><path>

Don’t consider changes for tracked file.

git update-index-假定不变<file_name>

Undo assume-unchanged.

git update-index-无假设不变<file_name>

Clean the files from .gitignore.

git clean -X -f

Restore deleted file.

 git结帐<deleting_commit> --<file_path>

Restore file to a specific commit-hash

 git结帐<commit-ish> --<file_path>

Always rebase instead of merge on pull.

git config --global pull.rebase是


#git < 1.7.9
git config --global branch.autosetuprebase总是

List all the alias and configs.

git config --list

Make git case sensitive.

git config --global core.ignorecase否

Add custom editors.

git config --global core.editor&#39;$ EDITOR&#39;

Auto correct typos.

git config --global help.autocorrect 1

Check if the change was a part of a release.

git name-rev-仅名称<SHA-1>

Dry run. (any command that supports dry-run flag should do.)

git clean -fd --dry-run

Marks your commit as a fix of a previous commit.

git commit --fixup<SHA-1>

Squash fixup commits normal commits.

git rebase -i-自动压扁

Skip staging area during commit.

git commit-仅<file_path>

Interactive staging.


List ignored files.

git check-ignore *

Status of ignored files.

git status-忽略

Commits in Branch1 that are not in Branch2

git log Branch1 ^ Branch2

List n last commits



git log -n<n>

Reuse recorded resolution, record and reuse previous conflicts resolutions.

git config --global rerere.enabled 1

Open all conflicted files in an editor.

 git diff-仅名称|  uniq |  xargs $ EDITOR

Count unpacked number of objects and their disk consumption.

git count-objects-可读

Prune all unreachable objects from the object database.

git gc --prune = now --aggressive

Instantly browse your working repository in gitweb.

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

View the GPG signatures in the commit log

git log --show-signature

Remove entry in the global config.

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

Checkout a new branch without any history

git checkout --orphan<branch_name>

Extract file from another branch.

 git show<branch_name>  :<file_name>

List only the root and merge commits.

git log --first-parent

Change previous two commits with an interactive rebase.

git rebase-交互式HEAD〜2

List all branch is WIP

git checkout master &amp;&amp; git分支-不合并
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 

Bypass pre-commit and commit-msg githooks

git commit --no-verify

List commits and changes to a specific file (even through renaming)

git log-关注-p-<file_path>

Clone a single branch

 git clone -b<branch-name>  --single-branch

Create and switch new branch

git checkout -b<branch-name>


 git分支<branch-name> &amp;&amp; git结帐<branch-name>


Ignore file mode changes on commits

git config core.fileMode错误

Turn off git colored terminal output

git config --global color.ui false

Specific color settings

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

Show all local branches ordered by recent commits

git for-each-ref --sort = -committerdate --format =&#39;%(refname:short)&#39;refs / heads /

Find lines matching the pattern (regex or string) in tracked files

git grep --heading --line-number&#39;foo bar&#39;

Clone a shallow copy of a repository

git clone --depth 1

Search Commit log across all branches for given text

 git log --all --grep =&#39;<given-text>  &#39;

Get first commit in a branch (from master)

 git log --oneline主站<branch-name> | 尾-1


 git log --reverse master ..<branch-name>  | 头-6

Unstaging Staged file

git reset HEAD<file-name>

Force push to Remote Repository

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

Adding Remote name


List all currently configured remotes

git remote -v

Show the author, time and last revision made to each line of a given file


Group commits by authors and title

git shortlog

Forced push but still ensure you don't overwrite other's work

git push-强制租赁<remote-name><branch-name>

Show how many lines does an author contribute

 git log --author =&#39;_ Your_Name_Here_&#39;--pretty = tformat:--numstat |  gawk&#39;{添加+ =<!-- @doxie.inject start -->  ; 潜艇+ =<!-- @doxie.inject end -->  ;  loc + =<!-- @doxie.inject start -->  --<!-- @doxie.inject end -->  } END {printf“添加了行:%s已删除行:%s总行:%s


 git log --author =&#39;_ Your_Name_Here_&#39;--pretty = tformat:--numstat |  awk&#39;{添加+ =<!-- @doxie.inject start -->  ; 潜艇+ =<!-- @doxie.inject end -->  ;  loc + =<!-- @doxie.inject start -->  --<!-- @doxie.inject end -->  } END {printf“添加了行:%s,已删除的行:%s,总行:%s
", add, subs, loc }' - # on Mac OSX

Revert: Reverting an entire merge

git revert -m 1<commit-ish>

Number of commits in a branch

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

Alias: git undo

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

Add object notes

git notes add -m&#39;关于上一次提交的注释....

Show all the git-notes

git log --show-notes =&#39;*&#39;

Apply commit from another repository

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

Specific fetch reference

git fetch origin master:引用/远程/源/ mymaster

Find common ancestor of two branches

git go-base<branch-name><other-branch-name>

List unpushed git commits

git log --branches --not --remotes


git log @ {u} ..


Add everything, but whitespace changes

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

Edit [local/global] git config

git config [--global] --edit

blame on certain range

 git怪-L<start>  ,<end>

Show a Git logical variable.

git var -l |<variable>

Preformatted patch file.

git format-patch -M上游..主题

Get the repo name.

git rev-parse --show-toplevel

logs between date range

git log --since =&#39;FEB 1 2017&#39;--until =&#39;FEB 14 2017&#39;

Exclude author from logs

git log --perl-regexp --author =&#39;^((?!排除作者正则表达式).*)

Generates a summary of pending changes

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

List references in a remote repository

git ls-remote git://

Backup untracked files.

 git ls文件--others -i --exclude-standard |  xargs zip

List all git aliases

 git config -l |  grep其他|  sed的/ ^其他\ .// G&#39;


 git config -l |  grep别名| 切-d&#39;.&#39;  -f 2

Show git status short

git status --short-分支

Checkout a commit prior to a day ago

git checkout master @ {昨天}

Push the current branch to the same name on the remote repository

git push origin HEAD

Push a new local branch to remote repository and track

git push -u起源<branch_name>

Change a branch base

git rebase --onto<new_base><old_base>

Use SSH instead of HTTPs for remotes

git config --global url.&#39;;.insteadOf&#39;;

Update a submodule to the latest commit

git pull起源<branch>
git commit -m“子模块已更新”

Prevent auto replacing LF with CRLF

git config --global core.autocrlf否