Marown/tips
1
0
Fork 0
mirror of https://github.com/git-tips/tips.git synced 2024-09-21 00:01:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Import Chinese version

Browse Source
This commit is contained in:
xueweihan 2016-07-23 10:35:37 +08:00
parent 8140fe8762
commit 89e9fa678c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
README.md
View File

@ -1,6 +1,8 @@
## git-tips ## git-tips
> Collection of `git-tips`, want to add your tips? Checkout [contributing.md](./contributing.md) > Collection of `git-tips`, want to add your tips? Checkout [contributing.md](./contributing.md)
[English](http://git.io/git-tips) | [中文](https://github.com/521xueweihan/git-tips)
P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`.
<!-- @doxie.inject start toc --> <!-- @doxie.inject start toc -->
@ -353,7 +355,7 @@ git branch --contains <commit-ish>
## Git Aliases ## Git Aliases
```sh ```sh
git config --global alias.<handle> <command> git config --global alias.<handle> <command>
git config --global alias.st status git config --global alias.st status
``` ```
@ -517,7 +519,7 @@ __Alternatives:__
git branch -m [<old-branch-name>] <new-branch-name> git branch -m [<old-branch-name>] <new-branch-name>
``` ```
## rebases 'feature' to 'master' and merges it in to master ## rebases 'feature' to 'master' and merges it in to master
```sh ```sh
git checkout feature && git rebase @{-1} && git checkout @{-2} && git merge @{-1} git checkout feature && git rebase @{-1} && git checkout @{-2} && git merge @{-1}
``` ```
@ -798,12 +800,12 @@ git checkout master && git branch --no-merged
## Find guilty with binary search ## Find guilty with binary search
```sh ```sh
git bisect start # Search start git bisect start # Search start
git bisect bad # Set point to bad commit git bisect bad # Set point to bad commit
git bisect good v2.6.13-rc2 # Set point to good commit|tag git bisect good v2.6.13-rc2 # Set point to good commit|tag
git bisect bad # Say current state is bad git bisect bad # Say current state is bad
git bisect good # Say current state is good git bisect good # Say current state is good
git bisect reset # Finish search git bisect reset # Finish search
``` ```