diff --git a/Readme.md b/Readme.md index c8d8585..6feb404 100644 --- a/Readme.md +++ b/Readme.md @@ -69,6 +69,7 @@ $ brew install git-extras - `git archive-file` - `git missing` - `git lock` + - `git locked` - `git unlock` - `git reset-file` - `git pr` @@ -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 diff --git a/bin/git-locked b/bin/git-locked new file mode 100755 index 0000000..4233893 --- /dev/null +++ b/bin/git-locked @@ -0,0 +1,3 @@ +#!/bin/sh + +git ls-files -v | grep ^S | sed -e 's|S ||' diff --git a/man/git-fork.html b/man/git-fork.html new file mode 100644 index 0000000..f4fbbe2 --- /dev/null +++ b/man/git-fork.html @@ -0,0 +1,136 @@ + + + + + + git-fork(1) - Fork a repo on github + + + + +
+ + + +
    +
  1. git-fork(1)
    2. +
  2. +
  3. git-fork(1)
    4. +
+ +

NAME

+

+ git-fork - Fork a repo on github +

+ +

SYNOPSIS

+ +

git-fork [<github-repo-url>]

+ +

DESCRIPTION

+ +

Fork the given github repo. Like clone but forks first.

+ +
    +
  1. forks the repo on github
    2. +
  2. clones the repo into the current dir
    3. +
  3. adds the original repo as a remote
    4. +
+ + +

EXAMPLE

+ +

Fork expect.js:

+ +
$ git fork https://github.com/LearnBoost/expect.js
+
+ +

or just:

+ +
$ git fork LearnBoost/expect.js
+
+ +

Then:

+ +
$ ..<forks into your github profile and clones repo locally to expect.js dir>...
+
+$ cd expect.js && git remote -v
+
+  origin          git@github.com:<user>/expect.js (fetch)
+  origin          git@github.com:<user>/expect.js (push)
+  original        git@github.com:LearnBoost/expect.js (fetch)
+  original        git@github.com:LearnBoost/expect.js (push)
+
+ +

AUTHOR

+ +

Written by Andrew Griffiths <mail@andrewgriffithsonline.com>

+ +

REPORTING BUGS

+ +

<https://github.com/visionmedia/git-extras/issues>

+ +

SEE ALSO

+ +

<https://github.com/visionmedia/git-extras>

+ + +
    +
  1. +
  2. October 2014
    3. +
  3. git-fork(1)
    4. +
+ +
+ + diff --git a/man/git-locked.1 b/man/git-locked.1 new file mode 100644 index 0000000..d41e97d --- /dev/null +++ b/man/git-locked.1 @@ -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> diff --git a/man/git-locked.html b/man/git-locked.html new file mode 100644 index 0000000..417cee3 --- /dev/null +++ b/man/git-locked.html @@ -0,0 +1,112 @@ + + + + + + git-locked(1) - ls files that have been locked + + + + +
+ + + +
    +
  1. git-locked(1)
    2. +
  2. +
  3. git-locked(1)
    4. +
+ +

NAME

+

+ git-locked - 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 <kevinawoo@gmail.com>

+ +

REPORTING BUGS

+ +

<https://github.com/visionmedia/git-extras/issues>

+ +

SEE ALSO

+ +

<https://github.com/visionmedia/git-extras>

+ + +
    +
  1. +
  2. October 2014
    3. +
  3. git-locked(1)
    4. +
+ +
+ + diff --git a/man/git-locked.md b/man/git-locked.md new file mode 100644 index 0000000..04f60f7 --- /dev/null +++ b/man/git-locked.md @@ -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 <> + +## REPORTING BUGS + +<> + +## SEE ALSO + +<> diff --git a/man/git-rebase-patch b/man/git-rebase-patch new file mode 100644 index 0000000..0e6da84 --- /dev/null +++ b/man/git-rebase-patch @@ -0,0 +1,60 @@ +.\" generated with Ronn/v0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 +. +.TH "GIT\-REBASE\-PATCH" "" "October 2014" "" "" +. +.SH "SYNOPSIS" +\fBgit\-rebase\-patch\fR +. +.SH "DESCRIPTION" +Given you have a patch that doesn\'t apply to the current HEAD, but you know it applied to some commit in the past, \fBgit\-rebase\-patch\fR will help you find that commit and do a rebase\. +. +.SH "OPTIONS" +. +.TP + +The patch to be applied\. +. +.SH "EXAMPLES" +Executing +. +.IP "" 4 +. +.nf + +$ git rebase\-patch test\.patch +. +.fi +. +.IP "" 0 +. +.P +could give you something like that: +. +.IP "" 4 +. +.nf + +Trying to find a commit the patch applies to\.\.\. +Patch applied to dbcf408dd26 as 7dc8b23ae1a +First, rewinding head to replay your work on top of it\.\.\. +Applying: test\.patch +Using index info to reconstruct a base tree\.\.\. +Falling back to patching base and 3\-way merge\.\.\. +Auto\-merging README\.txt +. +.fi +. +.IP "" 0 +. +.P +Then your last commit has the changes of the patch and is named \fItest\.patch\fR\. +. +.SH "AUTHOR" +Written by Niklas Fiekas <\fIniklas\.fiekas@tu\-clausthal\.de\fR> +. +.SH "REPORTING BUGS" +<\fIhttp://github\.com/visionmedia/git\-extras/issues\fR> +. +.SH "SEE ALSO" +<\fIhttp://github\.com/visionmedia/git\-extras\fR> diff --git a/man/index.txt b/man/index.txt index 61c78fc..923edaf 100644 --- a/man/index.txt +++ b/man/index.txt @@ -23,6 +23,7 @@ git-ignore(1) git-ignore git-info(1) git-info git-local-commits(1) git-local-commits git-lock(1) git-lock +git-locked(1) git-locked git-missing(1) git-missing git-pr(1) git-pr git-rebase-patch(1) git-rebase-patch