Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ $ brew install git-extras
- `git archive-file`
- `git missing`
- `git lock`
- `git locked`
- `git unlock`
- `git reset-file`
- `git pr`
Expand Down Expand Up @@ -650,10 +651,23 @@ Lock a local file `filename`:
$ git lock config/database.yml
```

## git-locked

List local locked files:

```bash
$ git locked
config/database.yml
```

## git-unlock filename

Unlock a local file `filename`

```bash
$ git unlock config/database.yml
```

## git-reset-file filename [commit]

Reset one file to `HEAD` or certain commit
Expand Down
3 changes: 3 additions & 0 deletions bin/git-locked
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

git ls-files -v | grep ^S | sed -e 's|S ||'
136 changes: 136 additions & 0 deletions man/git-fork.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions man/git-locked.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
.TH "GIT\-LOCKED" "1" "October 2014" "" ""
.
.SH "NAME"
\fBgit\-locked\fR \- ls files that have been locked
.
.SH "SYNOPSIS"
\fBgit\-locked\fR
.
.SH "DESCRIPTION"
List local files that have been locked
.
.SH "EXAMPLES"
.
.nf

$ git lock config/database\.yml
$ git locked
config/database\.yml
.
.fi
.
.SH "AUTHOR"
Written by Kevin Woo <\fIkevinawoo@gmail\.com\fR>
.
.SH "REPORTING BUGS"
<\fIhttps://github\.com/visionmedia/git\-extras/issues\fR>
.
.SH "SEE ALSO"
<\fIhttps://github\.com/visionmedia/git\-extras\fR>
112 changes: 112 additions & 0 deletions man/git-locked.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions man/git-locked.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
git-locked(1) -- ls files that have been locked
========================================================

## SYNOPSIS

`git-locked`

## DESCRIPTION

List local files that have been locked

## EXAMPLES

$ git lock config/database.yml
$ git locked
config/database.yml

## AUTHOR

Written by Kevin Woo &lt;<[email protected]>&gt;

## REPORTING BUGS

&lt;<https://github.com/visionmedia/git-extras/issues>&gt;

## SEE ALSO

&lt;<https://github.com/visionmedia/git-extras>&gt;
Loading