Skip to content

Commit 5136dbc

Browse files
authored
Merge pull request #114 from 521xueweihan/master
Import Chinese version
2 parents 8140fe8 + 89e9fa6 commit 5136dbc

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

README.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
## git-tips
22
> Collection of `git-tips`, want to add your tips? Checkout [contributing.md](./contributing.md)
33
4+
[English](http://git.io/git-tips) | [中文](https://github.com/521xueweihan/git-tips)
5+
46
P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`.
57

68
<!-- @doxie.inject start toc -->
@@ -353,7 +355,7 @@ git branch --contains <commit-ish>
353355

354356
## Git Aliases
355357
```sh
356-
git config --global alias.<handle> <command>
358+
git config --global alias.<handle> <command>
357359
git config --global alias.st status
358360
```
359361

@@ -517,7 +519,7 @@ __Alternatives:__
517519
git branch -m [<old-branch-name>] <new-branch-name>
518520
```
519521

520-
## rebases 'feature' to 'master' and merges it in to master
522+
## rebases 'feature' to 'master' and merges it in to master
521523
```sh
522524
git checkout feature && git rebase @{-1} && git checkout @{-2} && git merge @{-1}
523525
```
@@ -798,12 +800,12 @@ git checkout master && git branch --no-merged
798800

799801
## Find guilty with binary search
800802
```sh
801-
git bisect start # Search start
802-
git bisect bad # Set point to bad commit
803-
git bisect good v2.6.13-rc2 # Set point to good commit|tag
804-
git bisect bad # Say current state is bad
805-
git bisect good # Say current state is good
806-
git bisect reset # Finish search
803+
git bisect start # Search start
804+
git bisect bad # Set point to bad commit
805+
git bisect good v2.6.13-rc2 # Set point to good commit|tag
806+
git bisect bad # Say current state is bad
807+
git bisect good # Say current state is good
808+
git bisect reset # Finish search
807809

808810
```
809811

0 commit comments

Comments
 (0)