Git Tips
git-tips¶
> git-tips的集合,要添加您的提示吗? 查看 contributing.md
English | 中文 | Русский | 한국어 | Tiếng Việt | 日本語 | नेपाली | Polski
Tools:¶
- git-tip -方便的CLI,可最佳利用这些技巧. (Here in Docker container)
PS:所有这些命令均在git版本2.7.4(Apple Git-66)上进行了测试.
Everyday Git in twenty commands or so¶
git每天帮助
Show helpful guides that come with Git¶
git help -g
git log -S' <a term in the source>'</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'git rm --cached --ignore-unmatch<path-to-your-file> '--prune-empty --tag-name-filter cat---all && git push origin --force --all
Sync with remote, overwrite local changes¶
git fetch origin && git reset --hard origin / master && git clean -f -d
List of all files till a commit¶
git ls-tree-仅名称-r<commit-ish>
Git reset first commit¶
git update-ref -d头
Reset: preserve uncommitted local changes¶
git reset --keep<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-缓存
Alternatives:
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-
Alternatives:
git checkout @ {-1}
Remove branches that have already been merged with master¶
git branch-合并的主| grep -v'^ \ *'| xargs -n 1 git分支-d
Alternatives:
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¶
git分支-vv
Track upstream branch¶
git branch -u来源/ mybranch
Delete local branch¶
git分支-d<local_branchname>
Delete remote branch¶
git push origin-删除<remote_branchname>
Alternatives:
git push来源:<remote_branchname>
git分支-dr<remote/branch>
Delete local tag¶
git标签-d<tag-name>
Delete remote tag¶
git push origin:参考/标签/<tag-name>
git checkout-<file_name>
Revert: Undo a commit by creating a new commit¶
git还原<commit-ish>
Reset: Discard commits, advised for private branch¶
git重置<commit-ish>
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 ='作者姓名<email@address.com> '
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¶
git远程
Alternatives:
git远程显示
Get list of all local and remote branches¶
git分支-a
Get only remote branches¶
git分支-r
Stage parts of a changed file, instead of the entire file¶
git添加-p
Get git bash completion¶
curl -L http://git.io/vfhol>〜/ .git-completion.bash && echo'[-f〜/ .git-completion.bash] &&. 〜/ .git-completion.bash'>>〜/ .bashrc
What changed since two weeks?¶
git log --no-merges --raw --since ='2周前'
Alternatives:
git whatchanged --since ='2周前'
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> && git cherry-pick<commit-ish>
Find out branches containing commit-hash¶
git branch -a-包含<commit-ish>
Alternatives:
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
Alternatives:
git stash保存
Saving current state of unstaged changes to tracked files¶
git stash -k
Alternatives:
git stash --keep-index
git stash save --keep-index
Saving current state including untracked files¶
git stash -u
Alternatives:
git stash save -u
git stash save --include-untracked
Saving current state with message¶
git stash保存<message>
Saving current state of all files (ignored, untracked, and tracked)¶
git stash -a
Alternatives:
git stash --all
git stash save --all
Show list of all saved stashes¶
git存储列表
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
Alternatives:
git stash apply stash @ {0} && git stash drop存放stash @ {0}
Delete all stored stashes¶
git隐藏
Alternatives:
git隐藏<stash@{n}>
Grab a single file from a stash¶
git结帐<stash@{n}> -<file_path>
Alternatives:
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文件--others -i --exclude-standard
Create new working tree from a repository (git 2.5)¶
git工作树添加-b<branch-name><path><start-point>
Create new working tree from HEAD state¶
git worktree添加--detach<path> 头
Untrack files without deleting¶
git rm-缓存<file_path>
Alternatives:
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
Alternatives:
git子模块更新--init --recursive
git子模块更新-远程
Show all commits in the current branch yet to be merged to master¶
git cherry -v主控
Alternatives:
git cherry -v主控<branch-to-be-merged>
Rename a branch¶
git分支-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 rebase master功能&& git checkout master && git merge-
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
Prunes references to remote branches that have been deleted in the remote.¶
git fetch -p
Alternatives:
git remote prune起源
Retrieve the commit hash of the initial revision.¶
git rev-list --reverse HEAD |复制代码头-1
Alternatives:
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
Alternatives:
gitk-全部
git log --graph --pretty =格式:'%C(auto)%h | %s | %an | %ar%d'
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 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
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>
Alternatives:
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是
Alternatives:
#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'$ EDITOR'
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运行
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.¶
git添加-i
List ignored files.¶
git check-ignore *
Status of ignored files.¶
git status-忽略
Commits in Branch1 that are not in Branch2¶
git log分支1 ^分支2
List n last commits¶
git日志-<n>
Alternatives:
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 && git分支-不合并
Find guilty with binary search¶
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 https://github.com/user/repo.git
Create and switch new branch¶
git checkout -b<branch-name>
Alternatives:
git分支<branch-name> && 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 ='%(refname:short)'refs / heads /
Find lines matching the pattern (regex or string) in tracked files¶
git grep --heading --line-number'foo bar'
Clone a shallow copy of a repository¶
git clone https://github.com/user/repo.git --depth 1
Search Commit log across all branches for given text¶
git log --all --grep ='<given-text> '
Get first commit in a branch (from master)¶
git log --oneline主站<branch-name> | 尾-1
Alternatives:
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¶
git远程添加<remote-nickname><remote-url>
List all currently configured remotes¶
git remote -v
Show the author, time and last revision made to each line of a given file¶
吉特怪<file-name>
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 ='_ Your_Name_Here_'--pretty = tformat:--numstat | gawk'{添加+ =<!-- @doxie.inject start --> ; 潜艇+ =<!-- @doxie.inject end --> ; loc + =<!-- @doxie.inject start --> --<!-- @doxie.inject end --> } END {printf“添加了行:%s已删除行:%s总行:%s “,添加,订阅,位置}'-
Alternatives:
git log --author ='_ Your_Name_Here_'--pretty = tformat:--numstat | awk'{添加+ =<!-- @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 '!f() { git reset --hard $(git rev-parse --abbrev-ref HEAD)@{${1-1}}; }; f'
Add object notes¶
git notes add -m'上一次提交的注释....
Show all the git-notes¶
git log --show-notes ='*'
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
Alternatives:
git log @ {u} ..
吉特樱桃-v
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>
List all Git variable.¶
git var -l
Show a Git specific variable.¶
你走了<variable>
Preformatted patch file.¶
git format-patch -M上游..主题
Get the repo name.¶
git rev-parse --show-toplevel
logs between date range¶
git log --since ='FEB 1 2017'--until ='FEB 14 2017'
Exclude author from logs¶
git log --perl-regexp --author ='^((?!排除作者正则表达式).*)
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-远程git://git.kernel.org/pub/scm/git/git.git
Backup untracked files.¶
git ls文件--others -i --exclude-standard | xargs zip untracked.zip
List all git aliases¶
git config -l | grep其他| sed的/ ^其他\ .// G'
Alternatives:
git config -l | grep别名| 切-d'.' -f 2
Show git status short¶
git status --short-分支
Checkout a commit prior to a day ago¶
git checkout master @ {昨天}
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.'git@github.com:'.insteadOf'https://github.com/'
Update a submodule to the latest commit¶
光盘<path-to-submodule> git pull起源<branch> 光盘<root-of-your-main-project> git添加<path-to-submodule> git commit -m“子模块已更新”
Prevent auto replacing LF with CRLF¶
git config --global core.autocrlf否