diff --git a/man/git-extras.1 b/man/git-extras.1 index 03195d8..0251270 100644 --- a/man/git-extras.1 +++ b/man/git-extras.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-EXTRAS" "1" "December 2016" "" "Git Extras" +.TH "GIT\-EXTRAS" "1" "February 2018" "" "" . .SH "NAME" \fBgit\-extras\fR \- Awesome GIT utilities @@ -45,6 +45,9 @@ Self update\. \fBgit\-bug(1)\fR Create bug branch . .IP "\(bu" 4 +\fBgit\-bulk(1)\fR Run git commands on multiple repositories +. +.IP "\(bu" 4 \fBgit\-changelog(1)\fR Generate a changelog report . .IP "\(bu" 4 @@ -54,6 +57,9 @@ Self update\. \fBgit\-clear(1)\fR Rigorously clean up a repository . .IP "\(bu" 4 +\fBgit\-clear\-soft(1)\fR Soft clean up a repository +. +.IP "\(bu" 4 \fBgit\-commits\-since(1)\fR Show commit logs since some date . .IP "\(bu" 4 @@ -87,6 +93,9 @@ Self update\. \fBgit\-feature(1)\fR Create/Merge feature branch . .IP "\(bu" 4 +\fBgit\-force\-clone(1)\fR overwrite local repositories with clone +. +.IP "\(bu" 4 \fBgit\-fork(1)\fR Fork a repo on github . .IP "\(bu" 4 @@ -117,10 +126,10 @@ Self update\. \fBgit\-local\-commits(1)\fR List local commits . .IP "\(bu" 4 -\fBgit\-lock(1)\fR Lock a file excluded from version control +\fBgit\-locked(1)\fR ls files that have been locked . .IP "\(bu" 4 -\fBgit\-locked(1)\fR ls files that have been locked +\fBgit\-lock(1)\fR Lock a file excluded from version control . .IP "\(bu" 4 \fBgit\-merge\-into(1)\fR Merge one branch into another @@ -132,7 +141,10 @@ Self update\. \fBgit\-missing(1)\fR Show commits missing from another branch . .IP "\(bu" 4 -\fB# git\-mr(1)\fR Checks out a merge request locally +\fBgit\-mr(1)\fR Checks out a merge request locally +. +.IP "\(bu" 4 +\fBgit\-obliterate(1)\fR rewrite past commits to remove some files . .IP "\(bu" 4 \fBgit\-pr(1)\fR Checks out a pull request locally @@ -141,6 +153,9 @@ Self update\. \fBgit\-psykorebase(1)\fR Rebase a branch with a merge commit . .IP "\(bu" 4 +\fBgit\-pull\-request(1)\fR Create pull request for GitHub project +. +.IP "\(bu" 4 \fBgit\-reauthor(1)\fR Rewrite history to change author\'s identity . .IP "\(bu" 4 @@ -153,6 +168,9 @@ Self update\. \fBgit\-release(1)\fR Commit, tag and push changes to the repository . .IP "\(bu" 4 +\fBgit\-rename\-branch(1)\fR rename local branch and push to remote +. +.IP "\(bu" 4 \fBgit\-rename\-tag(1)\fR Rename a tag . .IP "\(bu" 4 @@ -186,9 +204,18 @@ Self update\. \fBgit\-squash(1)\fR Import changes from a branch . .IP "\(bu" 4 +\fBgit\-stamp(1)\fR Stamp the last commit message +. +.IP "\(bu" 4 +\fBgit\-standup(1)\fR Recall the commit history +. +.IP "\(bu" 4 \fBgit\-summary(1)\fR Show repository summary . .IP "\(bu" 4 +\fBgit\-sync(1)\fR Sync local branch with remote branch +. +.IP "\(bu" 4 \fBgit\-touch(1)\fR Touch and add file to the index . .IP "\(bu" 4 diff --git a/man/git-extras.html b/man/git-extras.html index 2bce5e4..2f2b55a 100644 --- a/man/git-extras.html +++ b/man/git-extras.html @@ -64,7 +64,7 @@
  1. git-extras(1)
    2. -
  2. Git Extras
    3. +
  4. git-extras(1)
@@ -99,9 +99,11 @@
  • git-authors(1) Generate authors report
  • git-back(1) Undo and Stage latest commits
  • git-bug(1) Create bug branch
    • +
  • git-bulk(1) Run git commands on multiple repositories
  • git-changelog(1) Generate a changelog report
  • git-chore(1) Create chore branch
  • git-clear(1) Rigorously clean up a repository
    • +
  • git-clear-soft(1) Soft clean up a repository
  • git-commits-since(1) Show commit logs since some date
  • git-contrib(1) Show user's contributions
  • git-count(1) Show commit count
    • @@ -113,6 +115,7 @@
  • git-delta(1) Lists changed files
  • git-effort(1) Show effort statistics on file(s)
  • git-feature(1) Create/Merge feature branch
    • +
  • git-force-clone(1) overwrite local repositories with clone
  • git-fork(1) Fork a repo on github
  • git-fresh-branch(1) Create fresh branches
  • git-gh-pages(1) Create the GitHub Pages branch
    • @@ -123,18 +126,21 @@
  • git-info(1) Returns information on current repository
  • git-line-summary(1) Show repository summary by line
  • git-local-commits(1) List local commits
    • -
  • git-lock(1) Lock a file excluded from version control
  • git-locked(1) ls files that have been locked
    • +
  • git-lock(1) Lock a file excluded from version control
  • git-merge-into(1) Merge one branch into another
  • git-merge-repo(1) Merge two repo histories
  • git-missing(1) Show commits missing from another branch
  • git-mr(1) Checks out a merge request locally
    • +
  • git-obliterate(1) rewrite past commits to remove some files
  • git-pr(1) Checks out a pull request locally
  • git-psykorebase(1) Rebase a branch with a merge commit
    • +
  • git-pull-request(1) Create pull request for GitHub project
  • git-reauthor(1) Rewrite history to change author's identity
  • 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-branch(1) rename local branch and push to remote
  • git-rename-tag(1) Rename a tag
  • git-repl(1) git read-eval-print-loop
  • git-reset-file(1) Reset one file
    • @@ -146,7 +152,10 @@
  • git-show-tree(1) show branch tree of commit history
  • git-show-unmerged-branches(1) Show unmerged branches
  • git-squash(1) Import changes from a branch
    • +
  • git-stamp(1) Stamp the last commit message
    • +
  • git-standup(1) Recall the commit history
  • git-summary(1) Show repository summary
    • +
  • git-sync(1) Sync local branch with remote branch
  • 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
    • @@ -155,7 +164,7 @@

    AUTHOR

    -

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

    +

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

    REPORTING BUGS

    @@ -168,7 +177,7 @@
    1. -
    2. December 2016
      3. +
    3. February 2018
    4. git-extras(1)
    diff --git a/man/git-extras.md b/man/git-extras.md index 76ad030..42818b6 100644 --- a/man/git-extras.md +++ b/man/git-extras.md @@ -26,9 +26,11 @@ git-extras(1) -- Awesome GIT utilities - **git-authors(1)** Generate authors report - **git-back(1)** Undo and Stage latest commits - **git-bug(1)** Create bug branch + - **git-bulk(1)** Run git commands on multiple repositories - **git-changelog(1)** Generate a changelog report - **git-chore(1)** Create chore branch - **git-clear(1)** Rigorously clean up a repository + - **git-clear-soft(1)** Soft clean up a repository - **git-commits-since(1)** Show commit logs since some date - **git-contrib(1)** Show user's contributions - **git-count(1)** Show commit count @@ -40,6 +42,7 @@ git-extras(1) -- Awesome GIT utilities - **git-delta(1)** Lists changed files - **git-effort(1)** Show effort statistics on file(s) - **git-feature(1)** Create/Merge feature branch + - **git-force-clone(1)** overwrite local repositories with clone - **git-fork(1)** Fork a repo on github - **git-fresh-branch(1)** Create fresh branches - **git-gh-pages(1)** Create the GitHub Pages branch @@ -50,18 +53,21 @@ git-extras(1) -- Awesome GIT utilities - **git-info(1)** Returns information on current repository - **git-line-summary(1)** Show repository summary by line - **git-local-commits(1)** List local commits - - **git-lock(1)** Lock a file excluded from version control - **git-locked(1)** ls files that have been locked + - **git-lock(1)** Lock a file excluded from version control - **git-merge-into(1)** Merge one branch into another - **git-merge-repo(1)** Merge two repo histories - **git-missing(1)** Show commits missing from another branch - **git-mr(1)** Checks out a merge request locally + - **git-obliterate(1)** rewrite past commits to remove some files - **git-pr(1)** Checks out a pull request locally - **git-psykorebase(1)** Rebase a branch with a merge commit + - **git-pull-request(1)** Create pull request for GitHub project - **git-reauthor(1)** Rewrite history to change author's identity - **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-branch(1)** rename local branch and push to remote - **git-rename-tag(1)** Rename a tag - **git-repl(1)** git read-eval-print-loop - **git-reset-file(1)** Reset one file @@ -73,7 +79,10 @@ git-extras(1) -- Awesome GIT utilities - **git-show-tree(1)** show branch tree of commit history - **git-show-unmerged-branches(1)** Show unmerged branches - **git-squash(1)** Import changes from a branch + - **git-stamp(1)** Stamp the last commit message + - **git-standup(1)** Recall the commit history - **git-summary(1)** Show repository summary + - **git-sync(1)** Sync local branch with remote branch - **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 diff --git a/man/git-mr.1 b/man/git-mr.1 index 6808476..5306f15 100644 --- a/man/git-mr.1 +++ b/man/git-mr.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-MR" "1" "June 2017" "" "" +.TH "GIT\-MR" "1" "February 2018" "" "" . .SH "NAME" \fBgit\-mr\fR \- Checks out a merge request locally diff --git a/man/git-mr.html b/man/git-mr.html index 83545cf..ab3a340 100644 --- a/man/git-mr.html +++ b/man/git-mr.html @@ -108,7 +108,7 @@ Switched to branch 'mr/51'

    AUTHOR

    -

    Written by Étienne BERSAC bersace03@gmail.com from git-pr(1).

    +

    Written by Étienne BERSAC bersace03@gmail.com from git-pr(1).

    REPORTING BUGS

    @@ -121,7 +121,7 @@ Switched to branch 'mr/51'
    1. -
    2. June 2017
      3. +
    3. February 2018
    4. git-mr(1)
    diff --git a/man/git-mr.md b/man/git-mr.md index d908a60..03a62fd 100644 --- a/man/git-mr.md +++ b/man/git-mr.md @@ -1,4 +1,5 @@ -# git-mr(1) -- Checks out a merge request locally +git-mr(1) -- Checks out a merge request locally +======================================== ## SYNOPSIS diff --git a/man/index.txt b/man/index.txt index 3a2d9fb..de813f5 100644 --- a/man/index.txt +++ b/man/index.txt @@ -4,9 +4,11 @@ git-archive-file(1) git-archive-file git-authors(1) git-authors git-back(1) git-back git-bug(1) git-bug +git-bulk(1) git-bulk git-changelog(1) git-changelog git-chore(1) git-chore git-clear(1) git-clear +git-clear-soft(1) git-clear-soft git-commits-since(1) git-commits-since git-contrib(1) git-contrib git-count(1) git-count @@ -19,6 +21,7 @@ git-delta(1) git-delta git-effort(1) git-effort git-extras(1) git-extras git-feature(1) git-feature +git-force-clone(1) git-force-clone git-fork(1) git-fork git-fresh-branch(1) git-fresh-branch git-gh-pages(1) git-gh-pages @@ -29,8 +32,8 @@ git-ignore(1) git-ignore git-info(1) git-info git-line-summary(1) git-line-summary git-local-commits(1) git-local-commits -git-lock(1) git-lock git-locked(1) git-locked +git-lock(1) git-lock git-merge-into(1) git-merge-into git-merge-repo(1) git-merge-repo git-missing(1) git-missing @@ -38,10 +41,12 @@ git-mr(1) git-mr git-obliterate(1) git-obliterate git-pr(1) git-pr git-psykorebase(1) git-psykorebase +git-pull-request(1) git-pull-request git-reauthor(1) git-reauthor git-rebase-patch(1) git-rebase-patch git-refactor(1) git-refactor git-release(1) git-release +git-rename-branch(1) git-rename-branch git-rename-tag(1) git-rename-tag git-repl(1) git-repl git-reset-file(1) git-reset-file @@ -54,7 +59,9 @@ git-show-tree(1) git-show-tree git-show-unmerged-branches(1) git-show-unmerged-branches git-squash(1) git-squash git-stamp(1) git-stamp +git-standup(1) git-standup git-summary(1) git-summary +git-sync(1) git-sync git-touch(1) git-touch git-undo(1) git-undo git-unlock(1) git-unlock diff --git a/man/manning-up.sh b/man/manning-up.sh index 42e1f32..290fadd 100755 --- a/man/manning-up.sh +++ b/man/manning-up.sh @@ -1,21 +1,37 @@ -#!/bin/bash +#!/usr/bin/env bash +set -e -test "$1" && ronn $1 && mv -f ${1/.md/}.1.html ${1/.md/}.html && exit 0 +update_git_extras_index() { + echo '# manuals' > index.txt.tmp + ln=$(awk '/## COMMANDS/{print NR};' ./git-extras.md) + awk "NR <= $ln+1" git-extras.md > git-extras.md.tmp + 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) + test "$extra" != "git-extras" && echo " - **"${title/" --"/"**"} >> git-extras.md.tmp + done + ln=$(awk '/## AUTHOR/{print NR};' ./git-extras.md) + awk "NR >= $ln-1" git-extras.md >> git-extras.md.tmp + mv -f index.txt.tmp index.txt + mv -f git-extras.md.tmp git-extras.md +} -echo '# manuals' > index.txt.tmp -ln=$(awk '/## COMMANDS/{print NR};' ./git-extras.md) -awk "NR <= $ln+1" git-extras.md > git-extras.md.tmp -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) - test "$extra" != "git-extras" && echo " - **"${title/" --"/"**"} >> git-extras.md.tmp -done -ln=$(awk '/## AUTHOR/{print NR};' ./git-extras.md) -awk "NR >= $ln-1" git-extras.md >> git-extras.md.tmp && mv -f index.txt.tmp index.txt && mv -f git-extras.md.tmp git-extras.md +if [ -n "$1" ] +then + if [[ "$1" == git-extras.md ]] + then + update_git_extras_index + fi -for file in $(ls git*.md); do - extra=${file/.md/} - ronn $file && mv -f $extra.1.html $extra.html -done + ronn $1 + mv -f ${1/.md/}.1.html ${1/.md/}.html +else + + update_git_extras_index + for file in $(ls git*.md); do + extra=${file/.md/} + ronn $file && mv -f $extra.1.html $extra.html + done +fi