From 0a3bc99d9abcf2d56fee9557a7d950a7a6c0b861 Mon Sep 17 00:00:00 2001 From: spacewander Date: Thu, 6 Nov 2014 21:18:29 +0800 Subject: [PATCH] correct the '-m' argument for grep. Then regenralize git-extra '-m' option is supported both in GNU grep and in BSD grep GNU grep: BSD grep: --- man/git-extras.1 | 29 ++++++++++++++++++++++++++++- man/git-extras.html | 13 +++++++++++-- man/git-extras.md | 11 ++++++++++- man/manning-up.sh | 2 +- 4 files changed, 50 insertions(+), 5 deletions(-) diff --git a/man/git-extras.1 b/man/git-extras.1 index 0a580e7..2c45ae7 100644 --- a/man/git-extras.1 +++ b/man/git-extras.1 @@ -33,6 +33,9 @@ Self update\. \fBgit\-alias(1)\fR Define, search and show aliases . .IP "\(bu" 4 +\fBgit\-archive\-file(1)\fR Export the current HEAD of the git repository to a archive +. +.IP "\(bu" 4 \fBgit\-back(1)\fR Undo and Stage latest commits . .IP "\(bu" 4 @@ -72,6 +75,9 @@ Self update\. \fBgit\-feature(1)\fR Create feature branch . .IP "\(bu" 4 +\fBgit\-fork(1)\fR Fork a repo on github +. +.IP "\(bu" 4 \fBgit\-fresh\-branch(1)\fR Create fresh branches . .IP "\(bu" 4 @@ -90,6 +96,21 @@ Self update\. \fBgit\-local\-commits(1)\fR List local commits . .IP "\(bu" 4 +\fBgit\-locked(1)\fR ls files that have been locked +. +.IP "\(bu" 4 +\fBgit\-lock(1)\fR Lock a file excluded from version control +. +.IP "\(bu" 4 +\fBgit\-missing(1)\fR Show commits missing from another branch +. +.IP "\(bu" 4 +\fBgit\-pr(1)\fR Checks out a pull request locally +. +.IP "\(bu" 4 +\fBgit\-rebase\-patch(1)\fR Rebases a patch +. +.IP "\(bu" 4 \fBgit\-refactor(1)\fR Create refactor branch . .IP "\(bu" 4 @@ -102,13 +123,16 @@ Self update\. \fBgit\-repl(1)\fR git read\-eval\-print\-loop . .IP "\(bu" 4 +\fBgit\-reset\-file(1)\fR Reset one file +. +.IP "\(bu" 4 \fBgit\-setup(1)\fR Set up a git repository . .IP "\(bu" 4 \fBgit\-show\-tree(1)\fR show branch tree of commit history . .IP "\(bu" 4 -\fBgit\-squash(1)\fR Import changes form a branch +\fBgit\-squash(1)\fR Import changes from a branch . .IP "\(bu" 4 \fBgit\-summary(1)\fR Show repository summary @@ -119,6 +143,9 @@ Self update\. .IP "\(bu" 4 \fBgit\-undo(1)\fR Remove latest commits . +.IP "\(bu" 4 +\fBgit\-unlock(1)\fR Unlock a file excluded from version control +. .IP "" 0 . .SH "AUTHOR" diff --git a/man/git-extras.html b/man/git-extras.html index 71733a6..df69a66 100644 --- a/man/git-extras.html +++ b/man/git-extras.html @@ -95,6 +95,7 @@

AUTHOR

-

Written by Tj Holowaychuk <tj@vision-media.ca>

+

Written by Tj Holowaychuk <tj@vision-media.ca>

REPORTING BUGS

diff --git a/man/git-extras.md b/man/git-extras.md index 9f20af3..58ee067 100644 --- a/man/git-extras.md +++ b/man/git-extras.md @@ -22,6 +22,7 @@ git-extras(1) -- Awesome GIT utilities ## COMMANDS - **git-alias(1)** Define, search and show aliases + - **git-archive-file(1)** Export the current HEAD of the git repository to a archive - **git-back(1)** Undo and Stage latest commits - **git-bug(1)** Create bug branch - **git-changelog(1)** Generate the changelog report @@ -35,22 +36,30 @@ git-extras(1) -- Awesome GIT utilities - **git-delete-tag(1)** Delete tags - **git-effort(1)** Show effort statistics on file(s) - **git-feature(1)** Create feature branch + - **git-fork(1)** Fork a repo on github - **git-fresh-branch(1)** Create fresh branches - **git-gh-pages(1)** Create the GitHub Pages branch - **git-graft(1)** Merge and destroy a given branch - **git-ignore(1)** Add .gitignore patterns - **git-info(1)** Returns information on current repository - **git-local-commits(1)** List local commits + - **git-locked(1)** ls files that have been locked + - **git-lock(1)** Lock a file excluded from version control + - **git-missing(1)** Show commits missing from another branch + - **git-pr(1)** Checks out a pull request locally + - **git-rebase-patch(1)** Rebases a patch - **git-refactor(1)** Create refactor branch - **git-release(1)** Commit, tag and push changes to the repository - **git-rename-tag(1)** Rename a tag - **git-repl(1)** git read-eval-print-loop + - **git-reset-file(1)** Reset one file - **git-setup(1)** Set up a git repository - **git-show-tree(1)** show branch tree of commit history - - **git-squash(1)** Import changes form a branch + - **git-squash(1)** Import changes from a branch - **git-summary(1)** Show repository summary - **git-touch(1)** Touch and add file to the index - **git-undo(1)** Remove latest commits + - **git-unlock(1)** Unlock a file excluded from version control ## AUTHOR diff --git a/man/manning-up.sh b/man/manning-up.sh index a76eddf..42e1f32 100755 --- a/man/manning-up.sh +++ b/man/manning-up.sh @@ -9,7 +9,7 @@ for file in $(ls git*.md); do extra=${file/.md/} spaced=" " echo "$extra(1)${spaced:${#extra}}$extra" >> index.txt.tmp; - title=$(grep -m=1 $extra"(1) -- " $file) + title=$(grep -m 1 $extra"(1) -- " $file) test "$extra" != "git-extras" && echo " - **"${title/" --"/"**"} >> git-extras.md.tmp done ln=$(awk '/## AUTHOR/{print NR};' ./git-extras.md)