mirror of
https://github.com/tj/git-extras.git
synced 2026-09-10 07:26:17 -04:00
Merge pull request #264 from jamesmanning/patch-1
Fixed descriptions: match required/optional params.
This commit is contained in:
commit
27554380d3
|
|
@ -642,7 +642,7 @@ Falling back to patching base and 3-way merge...
|
|||
Auto-merging README.txt
|
||||
```
|
||||
|
||||
## git-lock [filename]
|
||||
## git-lock filename
|
||||
|
||||
Lock a local file `filename`:
|
||||
|
||||
|
|
@ -650,11 +650,11 @@ Lock a local file `filename`:
|
|||
$ git lock config/database.yml
|
||||
```
|
||||
|
||||
## git-unlock [filename]
|
||||
## git-unlock filename
|
||||
|
||||
Unlock a local file `filename`
|
||||
|
||||
## git-reset-file [filename] commit
|
||||
## git-reset-file filename [commit]
|
||||
|
||||
Reset one file to `HEAD` or certain commit
|
||||
|
||||
|
|
@ -670,7 +670,7 @@ or reset one file to certain commit
|
|||
$ git reset-file .htaccess dc82b19
|
||||
```
|
||||
|
||||
## git-pr [number]
|
||||
## git-pr number
|
||||
|
||||
Checks out a pull request from GitHub
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue