From 6459db39aa50a4f69c10c127a2393eb79211adf1 Mon Sep 17 00:00:00 2001 From: Leila Muhtasib Date: Mon, 18 Jun 2012 14:28:05 -0400 Subject: [PATCH 01/14] git-undo now includes -h|--hard option. -h option allows you to undo the last commit without keeping the changes in the local working directory. Use with care. Updated documentation to include new option. --- bin/git-undo | 32 +++++++++++++++++++++++--------- man/git-undo.1 | 10 ++++++++-- man/git-undo.html | 18 +++++++++++------- man/git-undo.md | 6 +++++- 4 files changed, 47 insertions(+), 19 deletions(-) diff --git a/bin/git-undo b/bin/git-undo index 5784377..aedc844 100755 --- a/bin/git-undo +++ b/bin/git-undo @@ -1,13 +1,27 @@ #!/bin/sh -if test $# -eq 0; then - git reset --soft HEAD~1 - git reset +hard='no' +digit=1 + +parseArgs () { + for var in "$@"; do + if [ "$var" = "--hard" -o "$var" = "-h" ]; then + hard='yes'; + elif `echo $var | grep -q [^[:digit:]]`; then + echo "You entered an invalid option. Valid options are [--hard|-h] [commitcount]." 1>&2 + exit 1; + else + digit=$var + fi + done +} + +parseArgs $@ + +if [ "$hard" = "yes" ]; then + git reset --hard HEAD~$digit else - if `echo $1 | grep -q [^[:digit:]]`; then - echo "$1 is not a number" 1>&2 - else - git reset --soft HEAD~$1 - git reset - fi + git reset --soft HEAD~$digit + git reset fi + diff --git a/man/git-undo.1 b/man/git-undo.1 index 3dbc81c..fb4e64a 100644 --- a/man/git-undo.1 +++ b/man/git-undo.1 @@ -1,13 +1,13 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-UNDO" "1" "March 2011" "" "Git Extras" +.TH "GIT\-UNDO" "1" "June 2012" "" "" . .SH "NAME" \fBgit\-undo\fR \- Remove latest commits . .SH "SYNOPSIS" -\fBgit\-undo\fR [] +\fBgit\-undo\fR [] [\-\-hard|\-h] . .SH "DESCRIPTION" Removes the latest commits\. @@ -18,6 +18,12 @@ Removes the latest commits\. .P Number of commits to remove\. Defaults to \fI1\fR, thus remove the latest commit\. . +.P +\-\-hard or \-h +. +.P +This option wipes your commit(s), so that your changes cannot be recovered\. Use with care\. +. .SH "EXAMPLES" Removes the latest commit\. . diff --git a/man/git-undo.html b/man/git-undo.html index 5149dd7..6126a14 100644 --- a/man/git-undo.html +++ b/man/git-undo.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-undo(1)
    2. -
  2. Git Extras
    3. +
  4. git-undo(1)
@@ -76,7 +76,7 @@

SYNOPSIS

-

git-undo [<commitcount>]

+

git-undo [<commitcount>] [--hard|-h]

DESCRIPTION

@@ -88,6 +88,10 @@

Number of commits to remove. Defaults to 1, thus remove the latest commit.

+

--hard or -h

+ +

This option wipes your commit(s), so that your changes cannot be recovered. Use with care.

+

EXAMPLES

Removes the latest commit.

@@ -102,20 +106,20 @@

AUTHOR

-

Written by Kenneth Reitz <me@kennethreitz.com>

+

Written by Kenneth Reitz <me@kennethreitz.com>

REPORTING BUGS

-

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

+

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

SEE ALSO

-

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

+

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

  1. -
  2. March 2011
    3. +
  3. June 2012
  4. git-undo(1)
diff --git a/man/git-undo.md b/man/git-undo.md index 55f344c..82694a4 100644 --- a/man/git-undo.md +++ b/man/git-undo.md @@ -3,7 +3,7 @@ git-undo(1) -- Remove latest commits ## SYNOPSIS -`git-undo` [<commitcount>] +`git-undo` [<commitcount>] [--hard|-h] ## DESCRIPTION @@ -15,6 +15,10 @@ git-undo(1) -- Remove latest commits Number of commits to remove. Defaults to *1*, thus remove the latest commit. + --hard or -h + + This option wipes your commit(s), so that your changes cannot be recovered. Use with care. + ## EXAMPLES Removes the latest commit. From aa084d9b7b939e5e8cfc10513c957460a18cc3a1 Mon Sep 17 00:00:00 2001 From: TweeKane Date: Wed, 23 Mar 2011 12:49:52 +0300 Subject: [PATCH 02/14] Add global gitignore to git-ignore output --- bin/git-ignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/git-ignore b/bin/git-ignore index e0c1474..bbbf216 100755 --- a/bin/git-ignore +++ b/bin/git-ignore @@ -2,9 +2,14 @@ if test $# -eq 0; then test -f .gitignore && cat .gitignore + if test -f `git config --global core.excludesfile`; then + echo -e "\n# Global gitignore:\n" + cat `git config --global core.excludesfile` + fi else for pattern in $@; do echo "... adding '$pattern' to .gitignore" (test -f .gitignore && grep -q $pattern .gitignore) || echo $pattern >> .gitignore done fi + From 8f4a17044d2fda343a34c028e6501a64d7d6c300 Mon Sep 17 00:00:00 2001 From: nickl- Date: Sat, 21 Jul 2012 22:47:50 +0200 Subject: [PATCH 03/14] Added git-show-tree. See commits from all the branches plotted in a tree view. --- bin/git-show-tree | 3 + man/git-show-tree.1 | 63 +++++++++++++++++++ man/git-show-tree.html | 140 +++++++++++++++++++++++++++++++++++++++++ man/git-show-tree.md | 56 +++++++++++++++++ 4 files changed, 262 insertions(+) create mode 100644 bin/git-show-tree create mode 100644 man/git-show-tree.1 create mode 100644 man/git-show-tree.html create mode 100644 man/git-show-tree.md diff --git a/bin/git-show-tree b/bin/git-show-tree new file mode 100644 index 0000000..b0e5d2c --- /dev/null +++ b/bin/git-show-tree @@ -0,0 +1,3 @@ +#!/bin/sh + +git log --all --graph --decorate --oneline --simplify-by-decoration diff --git a/man/git-show-tree.1 b/man/git-show-tree.1 new file mode 100644 index 0000000..a6b3039 --- /dev/null +++ b/man/git-show-tree.1 @@ -0,0 +1,63 @@ +.\" generated with Ronn/v0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 +. +.TH "GIT\-SHOW\-TREE" "1" "July 2012" "" "" +. +.SH "NAME" +\fBgit\-show\-tree\fR \- show branch tree of commit history +. +.SH "SYNOPSIS" +\fBgit\-show\-tree\fR +. +.SH "DESCRIPTION" +Show the decorated graph view of one liner summarized commits from all branches\. +. +.SH "EXAMPLES" +Output the commit history log for all branches as tree view: +. +.IP "" 4 +. +.nf + +* 4b57684 (HEAD, develop) Merge branch upstream master\. +|\e +| * 515e94a Merge pull request #128 from nickl\-/git\-extras\-html\-hyperlinks +| |\e +| | * 815db8b (nickl/git\-extras\-html\-hyperlinks, git\-extras\-html\-hyperlinks) help ronn make hyperlinks\. +| * | 7398d10 (nickl/develop) Fix #127 git\-ignore won\'t add duplicates\. +| |/ +| | * ab72c1e (refs/stash) WIP on develop: 5e943f5 Fix #127 git\-ignore won\'t add duplicates\. +| |/ +|/| +* | 730ca89 (bolshakov) Rebase bolshakov with master +|/ +* 60f8371 (origin/master, origin/HEAD, master) Merge pull request #126 from agrimaldi/fix\-changelog\-last\-tag +* 9627780 (tag: 1\.7\.0) Release 1\.7\.0 +* 2e53ff6 (tag: 1\.6\.0) Release 1\.6\.0 +* bbd32d8 (tag: 1\.5\.1) Release 1\.5\.1 +| * 6b6b758 (nickl/gh\-pages, gh\-pages) add example git\-extras to gh\-pages +| * 19cfd11 (origin/gh\-pages) Index page +| | * 881a70e (tag: 1\.5\.0) Release 1\.5\.0 +| |/ +|/| +* | 4db5ee0 (tag: 1\.4\.0) Release 1\.4\.0 +* | 9b0bc89 (tag: 1\.3\.0) Release 1\.3\.0 +* | be49961 (tag: 1\.2\.0) Release 1\.2\.0 +* | c1d2dfc (tag: 1\.1\.0) Release 1\.1\.0 +* | 4a56adb (tag: 1\.0\.0) Release 1\.0\.0 +* | 948308b (tag: 0\.9\.0) Release 0\.9\.0 +* | 40b131d (tag: 0\.8\.1) Release 0\.8\.1 +* | 391431d (tag: 0\.8\.0) Release 0\.8\.0 +. +.fi +. +.IP "" 0 +. +.SH "AUTHOR" +Written by Nick Lombard \fIgithub@jigsoft\.co\.za\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/git-show-tree.html b/man/git-show-tree.html new file mode 100644 index 0000000..84fa66f --- /dev/null +++ b/man/git-show-tree.html @@ -0,0 +1,140 @@ + + + + + + git-show-tree(1) - show branch tree of commit history + + + + +
+ + + +
    +
  1. git-show-tree(1)
    2. +
  2. +
  3. git-show-tree(1)
    4. +
+ +

NAME

+

+ git-show-tree - show branch tree of commit history +

+ +

SYNOPSIS

+ +

git-show-tree

+ +

DESCRIPTION

+ +

Show the decorated graph view of one liner summarized commits from all branches.

+ +

EXAMPLES

+ +

Output the commit history log for all branches as tree view:

+ +
*   4b57684 (HEAD, develop) Merge branch upstream master.
+|\
+| *   515e94a Merge pull request #128 from nickl-/git-extras-html-hyperlinks
+| |\
+| | * 815db8b (nickl/git-extras-html-hyperlinks, git-extras-html-hyperlinks) help ronn make hyperlinks.
+| * | 7398d10 (nickl/develop) Fix #127 git-ignore won't add duplicates.
+| |/
+| | * ab72c1e (refs/stash) WIP on develop: 5e943f5 Fix #127 git-ignore won't add duplicates.
+| |/
+|/|
+* | 730ca89 (bolshakov) Rebase bolshakov with master
+|/
+* 60f8371 (origin/master, origin/HEAD, master) Merge pull request #126 from agrimaldi/fix-changelog-last-tag
+* 9627780 (tag: 1.7.0) Release 1.7.0
+* 2e53ff6 (tag: 1.6.0) Release 1.6.0
+* bbd32d8 (tag: 1.5.1) Release 1.5.1
+| * 6b6b758 (nickl/gh-pages, gh-pages) add example git-extras to gh-pages
+| * 19cfd11 (origin/gh-pages) Index page
+| | * 881a70e (tag: 1.5.0) Release 1.5.0
+| |/
+|/|
+* | 4db5ee0 (tag: 1.4.0) Release 1.4.0
+* | 9b0bc89 (tag: 1.3.0) Release 1.3.0
+* | be49961 (tag: 1.2.0) Release 1.2.0
+* | c1d2dfc (tag: 1.1.0) Release 1.1.0
+* | 4a56adb (tag: 1.0.0) Release 1.0.0
+* | 948308b (tag: 0.9.0) Release 0.9.0
+* | 40b131d (tag: 0.8.1) Release 0.8.1
+* | 391431d (tag: 0.8.0) Release 0.8.0
+
+ +

AUTHOR

+ +

Written by Nick Lombard github@jigsoft.co.za

+ +

REPORTING BUGS

+ +

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

+ +

SEE ALSO

+ +

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

+ + +
    +
  1. +
  2. July 2012
    3. +
  3. git-show-tree(1)
    4. +
+ +
+ + diff --git a/man/git-show-tree.md b/man/git-show-tree.md new file mode 100644 index 0000000..7433234 --- /dev/null +++ b/man/git-show-tree.md @@ -0,0 +1,56 @@ +git-show-tree(1) -- show branch tree of commit history +====================================================== + +## SYNOPSIS + +`git-show-tree` + +## DESCRIPTION + +Show the decorated graph view of one liner summarized commits from all branches. + +## EXAMPLES + + Output the commit history log for all branches as tree view: + + * 4b57684 (HEAD, develop) Merge branch upstream master. + |\ + | * 515e94a Merge pull request #128 from nickl-/git-extras-html-hyperlinks + | |\ + | | * 815db8b (nickl/git-extras-html-hyperlinks, git-extras-html-hyperlinks) help ronn make hyperlinks. + | * | 7398d10 (nickl/develop) Fix #127 git-ignore won't add duplicates. + | |/ + | | * ab72c1e (refs/stash) WIP on develop: 5e943f5 Fix #127 git-ignore won't add duplicates. + | |/ + |/| + * | 730ca89 (bolshakov) Rebase bolshakov with master + |/ + * 60f8371 (origin/master, origin/HEAD, master) Merge pull request #126 from agrimaldi/fix-changelog-last-tag + * 9627780 (tag: 1.7.0) Release 1.7.0 + * 2e53ff6 (tag: 1.6.0) Release 1.6.0 + * bbd32d8 (tag: 1.5.1) Release 1.5.1 + | * 6b6b758 (nickl/gh-pages, gh-pages) add example git-extras to gh-pages + | * 19cfd11 (origin/gh-pages) Index page + | | * 881a70e (tag: 1.5.0) Release 1.5.0 + | |/ + |/| + * | 4db5ee0 (tag: 1.4.0) Release 1.4.0 + * | 9b0bc89 (tag: 1.3.0) Release 1.3.0 + * | be49961 (tag: 1.2.0) Release 1.2.0 + * | c1d2dfc (tag: 1.1.0) Release 1.1.0 + * | 4a56adb (tag: 1.0.0) Release 1.0.0 + * | 948308b (tag: 0.9.0) Release 0.9.0 + * | 40b131d (tag: 0.8.1) Release 0.8.1 + * | 391431d (tag: 0.8.0) Release 0.8.0 + +## AUTHOR + +Written by Nick Lombard + +## REPORTING BUGS + +<> + +## SEE ALSO + +<> From c749fdc54ff90d95eaeda3bc3e69700276c7ff2c Mon Sep 17 00:00:00 2001 From: nickl- Date: Sat, 21 Jul 2012 22:58:41 +0200 Subject: [PATCH 04/14] Complete git-ignore includes global. Did a rebase merge from the old pull request #46 which we may close now. Yet it wasn't as simple as that in the end but all things have a resolve: Added 2 context type arguments to specify --local or --global. Refactored usage into functions te prevent duplication. Capable to view and append to both global gitignore as well as the .gitignore from the working folder. Supports all types of ignore patters including ! negated, comments as well as blank lines. Complete documentation including several examples. --- bin/git-ignore | 55 +++++++++++++--- man/git-ignore.1 | 151 ++++++++++++++++++++++++++++++++++++++------ man/git-ignore.html | 121 +++++++++++++++++++++++++++++------ man/git-ignore.md | 117 +++++++++++++++++++++++++++++----- 4 files changed, 383 insertions(+), 61 deletions(-) diff --git a/bin/git-ignore b/bin/git-ignore index bbbf216..dac8113 100755 --- a/bin/git-ignore +++ b/bin/git-ignore @@ -1,15 +1,50 @@ -#!/bin/sh +#!/bin/bash + +function show_contents { + test -f "$2" && echo "$1 gitignore: $2" && cat "$2" +} + +function show_global { + show_contents Global `git config --global core.excludesfile` +} + +function add_global { + add_patterns `git config --global core.excludesfile` "$@" +} + +function show_local { + show_contents Local .gitignore +} + +function add_local { + add_patterns .gitignore "$@" +} + +function add_patterns { + echo "Adding pattern(s) to: $1" + for pattern in "${@:2}"; do + echo "... adding '$pattern'" + (test -f "$1" && test "$pattern" && grep -q "$pattern" "$1") || echo "$pattern" >> "$1" + done +} if test $# -eq 0; then - test -f .gitignore && cat .gitignore - if test -f `git config --global core.excludesfile`; then - echo -e "\n# Global gitignore:\n" - cat `git config --global core.excludesfile` - fi + show_global + echo "---------------------------------" + show_local else - for pattern in $@; do - echo "... adding '$pattern' to .gitignore" - (test -f .gitignore && grep -q $pattern .gitignore) || echo $pattern >> .gitignore - done + case "$1" in + -l|--local) + test $# -gt 1 && add_local "${@:2}" && echo + show_local + ;; + -g|--global) + test $# -gt 1 && add_global "${@:2}" && echo + show_global + ;; + *) + add_local "$@" + ;; + esac fi diff --git a/man/git-ignore.1 b/man/git-ignore.1 index 986ea8b..e87bc44 100644 --- a/man/git-ignore.1 +++ b/man/git-ignore.1 @@ -1,53 +1,168 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-IGNORE" "1" "March 2011" "" "Git Extras" +.TH "GIT\-IGNORE" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-ignore\fR \- Add \.gitignore patterns . .SH "SYNOPSIS" -\fBgit\-ignore\fR [\|\.\|\.\|\.] +\fBgit\-ignore\fR [] [ []\.\.\.] . .SH "DESCRIPTION" -Adds the given _pattern_s to a gitignore file\. +Adds the given _pattern_s to a \.gitignore file if it doesn\'t already exist\. . .SH "OPTIONS" + . -.SH "EXAMPLES" -To lazy to open up \fI\.gitignore\fR? me too! simply pass some patterns: +.P +\-l, \-\-local . -.IP "" 4 +.P +Sets the context to the \.gitignore file in the current working directory\. (default) . -.nf - -$ git ignore build "*\.o" "*\.log" -\|\.\|\.\|\. added \'build\' - \|\.\|\.\|\. added \'*\.o\' -\|\.\|\.\|\. added \'*\.log\' +.P +\-g, \-\-global . -.fi +.P +Sets the context to the global gitignore file fol the current user\. +. +.P + +. +.P +A space delimited list of patterns to append to the file in context\. +. +.SS "PATTERN FORMAT" +Pattern format as described in the git manual +. +.IP "\(bu" 4 +A blank line matches no files, so it can serve as a separator for readability\. To append a blank line use empty quotes ""\. +. +.IP "\(bu" 4 +A line starting with # serves as a comment\. For example, "# This is a comment" +. +.IP "\(bu" 4 +An optional prefix ! which negates the pattern; any matching file excluded by a previous pattern will become included again\. If a negated pattern matches, this will override lower precedence patterns sources\. To use an exclamation ! as command line argument it is best placed between single quotes \'\'\. For example, \'!src\' +. +.IP "\(bu" 4 +If the pattern ends with a slash, it is removed for the purpose of the following description, but it would only find a match with a directory\. In other words, foo/ will match a directory foo and paths underneath it, but will not match a regular file or a symbolic link foo (this is consistent with the way how pathspec works in general in git)\. +. +.IP "\(bu" 4 +If the pattern does not contain a slash /, git treats it as a shell glob pattern and checks for a match against the pathname relative to the location of the \.gitignore file (relative to the toplevel of the work tree if not from a \.gitignore file)\. +. +.IP "\(bu" 4 +Otherwise, git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname\. For example, "Documentation/*\.html" matches "Documentation/git\.html" but not "Documentation/ppc/ppc\.html" or "tools/perf/Documentation/perf\.html"\. +. +.IP "\(bu" 4 +A leading slash matches the beginning of the pathname\. For example, "/*\.c" matches "cat\-file\.c" but not "mozilla\-sha1/sha1\.c"\. . .IP "" 0 . -.P -Running \fBgit\-ignore\fR without a pattern will display the current patterns: +.SH "EXAMPLES" +All arguments are optional so calling git\-ignore alone will display first the global then the local gitignore files: . .IP "" 4 . .nf $ git ignore -build -*\.o +Global gitignore: /home/alice/\.gitignore +# Numerous always\-ignore extensions +*\.diff +*\.err +*\.orig +*\.rej +*\.swo +*\.swp +*\.vi +*~ +*\.sass\-cache + +# OS or Editor folders +\.DS_Store +\.Trashes +\._* +Thumbs\.db +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- +Local gitignore: \.gitignore +\.cache +\.project +\.settings +\.tmproj +nbproject +. +.fi +. +.IP "" 0 +. +.P +If you only want to see the global context use the \-\-global argument (for local use \-\-local): +. +.IP "" 4 +. +.nf + +$ git ignore +Global gitignore: /home/alice/\.gitignore +\.DS_Store +\.Trashes +\._* +Thumbs\.db +. +.fi +. +.IP "" 0 +. +.P +To quickly append a new pattern to the default/local context simply: +. +.IP "" 4 +. +.nf + +$ git ignore *\.log +Adding pattern(s) to: \.gitignore +\.\.\. adding \'*\.log\' +. +.fi +. +.IP "" 0 +. +.P +You can now configure any patterns without ever using an editor, with a context and pattern arguments: The resulting configuration is also returned for your convenience\. +. +.IP "" 4 +. +.nf + +$ git ignore \-\-local "" "# Temporary files" *\.tmp "*\.log" tmp/* "" "# Files I\'d like to keep" \'!work\' "" +Adding pattern(s) to: \.gitignore +\.\.\. adding \'\' +\.\.\. adding \'# Temporary files\' +\.\.\. adding \'index\.tmp\' +\.\.\. adding \'*\.log\' +\.\.\. adding \'tmp/*\' +\.\.\. adding \'\' +\.\.\. adding \'# Files I\'d like to keep\' +\.\.\. adding \'!work\' +\.\.\. adding \'\' + +Local gitignore: \.gitignore + +# Temporary files +index\.tmp *\.log + +# Files I\'d like to keep +!work . .fi . .IP "" 0 . .SH "AUTHOR" -Written by Tj Holowaychuk <\fItj@vision\-media\.ca\fR> +Written by Tj Holowaychuk <\fItj@vision\-media\.ca\fR> and Tema Bolshakov <\fItweekane@gmail\.com\fR> and Nick Lombard <\fIgithub@jigsoft\.co\.za\fR> . .SH "REPORTING BUGS" <\fIhttp://github\.com/visionmedia/git\-extras/issues\fR> diff --git a/man/git-ignore.html b/man/git-ignore.html index 4acd25f..8b36a77 100644 --- a/man/git-ignore.html +++ b/man/git-ignore.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-ignore(1)
    2. -
  2. Git Extras
    3. +
  4. git-ignore(1)
@@ -76,35 +76,120 @@

SYNOPSIS

-

git-ignore [<pattern>...]

+

git-ignore [<context>] [<pattern> [<pattern>]...]

DESCRIPTION

-

Adds the given _pattern_s to a gitignore file.

+

Adds the given _pattern_s to a .gitignore file if it doesn't already exist.

OPTIONS

+

<context>

+ +

-l, --local

+ +

Sets the context to the .gitignore file in the current working directory. (default)

+ +

-g, --global

+ +

Sets the context to the global gitignore file fol the current user.

+ +

<pattern>

+ +

A space delimited list of patterns to append to the file in context.

+ +

PATTERN FORMAT

+ +

Pattern format as described in the git manual

+ +
    +

  • A blank line matches no files, so it can serve as a separator for readability. To append a blank line use empty quotes "".

    • +

  • A line starting with # serves as a comment. For example, "# This is a comment"

    • +

  • An optional prefix ! which negates the pattern; any matching file excluded by a previous pattern will become included again. If a negated pattern matches, this will override lower precedence patterns sources. To use an exclamation ! as command line argument it is best placed between single quotes ''. For example, '!src'

    • +

  • If the pattern ends with a slash, it is removed for the purpose of the following description, but it would only find a match with a directory. In other words, foo/ will match a directory foo and paths underneath it, but will not match a regular file or a symbolic link foo (this is consistent with the way how pathspec works in general in git).

    • +

  • If the pattern does not contain a slash /, git treats it as a shell glob pattern and checks for a match against the pathname relative to the location of the .gitignore file (relative to the toplevel of the work tree if not from a .gitignore file).

    • +

  • Otherwise, git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, "Documentation/*.html" matches "Documentation/git.html" but not "Documentation/ppc/ppc.html" or "tools/perf/Documentation/perf.html".

    • +

  • A leading slash matches the beginning of the pathname. For example, "/*.c" matches "cat-file.c" but not "mozilla-sha1/sha1.c".

    • +
+ +

EXAMPLES

-

To lazy to open up .gitignore? me too! simply pass some patterns:

- -
$ git ignore build "*.o" "*.log"
-... added 'build'
-  ... added '*.o'
-... added '*.log'
-
- -

Running git-ignore without a pattern will display the current patterns:

+

All arguments are optional so calling git-ignore alone will display first the global then the local gitignore files:

$ git ignore
-build
-*.o
-*.log 
+Global gitignore: /home/alice/.gitignore
+# Numerous always-ignore extensions
+*.diff
+*.err
+*.orig
+*.rej
+*.swo
+*.swp
+*.vi
+*~
+*.sass-cache
+
+# OS or Editor folders
+.DS_Store
+.Trashes
+._*
+Thumbs.db
+---------------------------------
+Local gitignore: .gitignore
+.cache
+.project
+.settings
+.tmproj
+nbproject
+
+ +

If you only want to see the global context use the --global argument (for local use --local):

+ +
$ git ignore
+Global gitignore: /home/alice/.gitignore
+.DS_Store
+.Trashes
+._*
+Thumbs.db
+
+ +

To quickly append a new pattern to the default/local context simply:

+ +
$ git ignore *.log
+Adding pattern(s) to: .gitignore
+... adding '*.log'
+
+ +

You can now configure any patterns without ever using an editor, with a context and pattern arguments: +The resulting configuration is also returned for your convenience.

+ +
$ git ignore --local "" "# Temporary files" *.tmp "*.log" tmp/*  "" "# Files I'd like to keep" '!work'  ""
+Adding pattern(s) to: .gitignore
+... adding ''
+... adding '# Temporary files'
+... adding 'index.tmp'
+... adding '*.log'
+... adding 'tmp/*'
+... adding ''
+... adding '# Files I'd like to keep'
+... adding '!work'
+... adding ''
+
+Local gitignore: .gitignore
+
+# Temporary files
+index.tmp
+*.log
+
+# Files I'd like to keep
+!work

AUTHOR

-

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

+

Written by Tj Holowaychuk <tj@vision-media.ca> and Tema Bolshakov <tweekane@gmail.com> +and Nick Lombard <github@jigsoft.co.za>

REPORTING BUGS

@@ -117,7 +202,7 @@ build
  1. -
  2. March 2011
    3. +
  3. July 2012
  4. git-ignore(1)
diff --git a/man/git-ignore.md b/man/git-ignore.md index 2d7eead..e0fad92 100644 --- a/man/git-ignore.md +++ b/man/git-ignore.md @@ -1,35 +1,122 @@ git-ignore(1) -- Add .gitignore patterns -======================================= +======================================== ## SYNOPSIS -`git-ignore` [<pattern>...] +`git-ignore` [<context>] [<pattern> [<pattern>]...] ## DESCRIPTION -Adds the given _pattern_s to a gitignore file. +Adds the given _pattern_s to a .gitignore file if it doesn't already exist. ## OPTIONS + <context> + + -l, --local + + Sets the context to the .gitignore file in the current working directory. (default) + + -g, --global + + Sets the context to the global gitignore file fol the current user. + + <pattern> + + A space delimited list of patterns to append to the file in context. + +### PATTERN FORMAT + +Pattern format as described in the git manual + + * A blank line matches no files, so it can serve as a separator for readability. To append a blank line use empty quotes "". + + * A line starting with # serves as a comment. For example, "# This is a comment" + + * An optional prefix ! which negates the pattern; any matching file excluded by a previous pattern will become included again. If a negated pattern matches, this will override lower precedence patterns sources. To use an exclamation ! as command line argument it is best placed between single quotes ''. For example, '!src' + + * If the pattern ends with a slash, it is removed for the purpose of the following description, but it would only find a match with a directory. In other words, foo/ will match a directory foo and paths underneath it, but will not match a regular file or a symbolic link foo (this is consistent with the way how pathspec works in general in git). + + * If the pattern does not contain a slash /, git treats it as a shell glob pattern and checks for a match against the pathname relative to the location of the .gitignore file (relative to the toplevel of the work tree if not from a .gitignore file). + + * Otherwise, git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, "Documentation/*.html" matches "Documentation/git.html" but not "Documentation/ppc/ppc.html" or "tools/perf/Documentation/perf.html". + + * A leading slash matches the beginning of the pathname. For example, "/*.c" matches "cat-file.c" but not "mozilla-sha1/sha1.c". + + ## EXAMPLES - To lazy to open up _.gitignore_? me too! simply pass some patterns: - - $ git ignore build "*.o" "*.log" - ... added 'build' - ... added '*.o' - ... added '*.log' - - Running `git-ignore` without a pattern will display the current patterns: + All arguments are optional so calling git-ignore alone will display first the global then the local gitignore files: $ git ignore - build - *.o - *.log + Global gitignore: /home/alice/.gitignore + # Numerous always-ignore extensions + *.diff + *.err + *.orig + *.rej + *.swo + *.swp + *.vi + *~ + *.sass-cache + + # OS or Editor folders + .DS_Store + .Trashes + ._* + Thumbs.db + --------------------------------- + Local gitignore: .gitignore + .cache + .project + .settings + .tmproj + nbproject + +If you only want to see the global context use the --global argument (for local use --local): + + $ git ignore + Global gitignore: /home/alice/.gitignore + .DS_Store + .Trashes + ._* + Thumbs.db + +To quickly append a new pattern to the default/local context simply: + + $ git ignore *.log + Adding pattern(s) to: .gitignore + ... adding '*.log' + +You can now configure any patterns without ever using an editor, with a context and pattern arguments: +The resulting configuration is also returned for your convenience. + + $ git ignore --local "" "# Temporary files" *.tmp "*.log" tmp/* "" "# Files I'd like to keep" '!work' "" + Adding pattern(s) to: .gitignore + ... adding '' + ... adding '# Temporary files' + ... adding 'index.tmp' + ... adding '*.log' + ... adding 'tmp/*' + ... adding '' + ... adding '# Files I'd like to keep' + ... adding '!work' + ... adding '' + + Local gitignore: .gitignore + + # Temporary files + index.tmp + *.log + + # Files I'd like to keep + !work ## AUTHOR -Written by Tj Holowaychuk <> +Written by Tj Holowaychuk <> and Tema Bolshakov <> +and Nick Lombard <> ## REPORTING BUGS From e47d8d1a1742b25ab703a1ae66d1cf520f7b97b1 Mon Sep 17 00:00:00 2001 From: nickl- Date: Sat, 21 Jul 2012 23:03:46 +0200 Subject: [PATCH 05/14] Added examples to git-commits-since --- man/git-commits-since.1 | 29 ++++++++++++++++++++++++++++- man/git-commits-since.html | 29 +++++++++++++++++++++++++---- man/git-commits-since.md | 21 +++++++++++++++++++++ 3 files changed, 74 insertions(+), 5 deletions(-) diff --git a/man/git-commits-since.1 b/man/git-commits-since.1 index 7af161b..d29f844 100644 --- a/man/git-commits-since.1 +++ b/man/git-commits-since.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-COMMITS\-SINCE" "1" "October 2010" "" "Git Extras" +.TH "GIT\-COMMITS\-SINCE" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-commits\-since\fR \- Show commit logs since some date @@ -19,6 +19,33 @@ List of commits since the given \fIdate\fR\. Show commits more recent than \fIdate\fR\. By default, the command shows the commit logs since "last week"\. . .SH "EXAMPLES" +It is really flexible and these are only 3 of the options, go ahead give it a try: +. +.IP "" 4 +. +.nf + +$ git commits\-since yesterday +\.\.\. commits since yesterday +nickl\- \- Merge branch upstream master\. +nickl\- \- Rebase bolshakov with master +TJ Holowaychuk \- Merge pull request #128 from nickl\-/git\-extras\-html\-hyperlinks +TJ Holowaychuk \- Merge pull request #129 from nickl\-/develop +nickl\- \- Fix #127 git\-ignore won\'t add duplicates\. + +$ git commits\-since 3 o clock pm +\.\.\. commits since 3 o clock pm +nickl\- \- Merge branch upstream master\. + +$ git commits\-since 2 hour ago +\.\.\. commits since 2 hour ago +nickl\- \- Merge branch upstream master\. +TJ Holowaychuk \- Merge pull request #128 from nickl\-/git\-extras\-html\-hyperlinks +TJ Holowaychuk \- Merge pull request #129 from nickl\-/develop +. +.fi +. +.IP "" 0 . .SH "AUTHOR" Written by Tj Holowaychuk <\fItj@vision\-media\.ca\fR> diff --git a/man/git-commits-since.html b/man/git-commits-since.html index 4698cf3..198f052 100644 --- a/man/git-commits-since.html +++ b/man/git-commits-since.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-commits-since(1)
    2. -
  2. Git Extras
    3. +
  4. git-commits-since(1)
@@ -90,9 +90,30 @@

EXAMPLES

+

It is really flexible and these are only 3 of the options, go ahead give it a try:

+ +
$ git commits-since yesterday
+... commits since yesterday
+nickl- - Merge branch upstream master.
+nickl- - Rebase bolshakov with master
+TJ Holowaychuk - Merge pull request #128 from nickl-/git-extras-html-hyperlinks
+TJ Holowaychuk - Merge pull request #129 from nickl-/develop
+nickl- - Fix #127 git-ignore won't add duplicates.
+
+$ git commits-since 3 o clock pm
+... commits since 3 o clock pm
+nickl- - Merge branch upstream master.
+
+$ git commits-since 2 hour ago
+... commits since 2 hour ago
+nickl- - Merge branch upstream master.
+TJ Holowaychuk - Merge pull request #128 from nickl-/git-extras-html-hyperlinks
+TJ Holowaychuk - Merge pull request #129 from nickl-/develop
+
+

AUTHOR

-

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

+

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

REPORTING BUGS

@@ -105,7 +126,7 @@
  1. -
  2. October 2010
    3. +
  3. July 2012
  4. git-commits-since(1)
diff --git a/man/git-commits-since.md b/man/git-commits-since.md index dfc046f..709c98a 100644 --- a/man/git-commits-since.md +++ b/man/git-commits-since.md @@ -17,6 +17,27 @@ git-commits-since(1) -- Show commit logs since some date ## EXAMPLES + It is really flexible and these are only 3 of the options, go ahead give it a try: + + $ git commits-since yesterday + ... commits since yesterday + nickl- - Merge branch upstream master. + nickl- - Rebase bolshakov with master + TJ Holowaychuk - Merge pull request #128 from nickl-/git-extras-html-hyperlinks + TJ Holowaychuk - Merge pull request #129 from nickl-/develop + nickl- - Fix #127 git-ignore won't add duplicates. + + $ git commits-since 3 o clock pm + ... commits since 3 o clock pm + nickl- - Merge branch upstream master. + + $ git commits-since 2 hour ago + ... commits since 2 hour ago + nickl- - Merge branch upstream master. + TJ Holowaychuk - Merge pull request #128 from nickl-/git-extras-html-hyperlinks + TJ Holowaychuk - Merge pull request #129 from nickl-/develop + + ## AUTHOR Written by Tj Holowaychuk <> From 2aeb45a160306dfae71b2d6f4d9ba997bf573057 Mon Sep 17 00:00:00 2001 From: nickl- Date: Sat, 21 Jul 2012 23:05:17 +0200 Subject: [PATCH 06/14] whitespace only --- man/git-info.1 | 22 ++++++++++++---------- man/git-info.html | 18 +++++++++++------- man/git-info.md | 13 +++++++------ 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/man/git-info.1 b/man/git-info.1 index 4406bdd..f736426 100644 --- a/man/git-info.1 +++ b/man/git-info.1 @@ -12,20 +12,22 @@ .SH "DESCRIPTION" Shows the following information about a repository: . -.br -1\. Remote Url(s) +.IP "1." 4 +Remote Url(s) . -.br -2\. Remote Branches +.IP "2." 4 +Remote Branches . -.br -3\. Local Branches +.IP "3." 4 +Local Branches . -.br -4\. Most recent commit +.IP "4." 4 +Most recent commit . -.br -5\. Configuration Info +.IP "5." 4 +Configuration Info +. +.IP "" 0 . .SH "OPTIONS" N/A diff --git a/man/git-info.html b/man/git-info.html index e50c040..76eb4f9 100644 --- a/man/git-info.html +++ b/man/git-info.html @@ -80,12 +80,16 @@

DESCRIPTION

-

Shows the following information about a repository:
-1. Remote Url(s)
-2. Remote Branches
-3. Local Branches
-4. Most recent commit
-5. Configuration Info

+

Shows the following information about a repository:

+ +
    +
  1. Remote Url(s)
    2. +
  2. Remote Branches
    3. +
  3. Local Branches
    4. +
  4. Most recent commit
    5. +
  5. Configuration Info
    6. +
+

OPTIONS

@@ -141,7 +145,7 @@ branch.master.merge=refs/heads/master

AUTHOR

-

Written by Leila Muhtasib <muhtasib@gmail.com>

+

Written by Leila Muhtasib <muhtasib@gmail.com>

REPORTING BUGS

diff --git a/man/git-info.md b/man/git-info.md index df0d1cf..6a55f00 100644 --- a/man/git-info.md +++ b/man/git-info.md @@ -7,12 +7,13 @@ git-info(1) -- Returns information on current repository ## DESCRIPTION -Shows the following information about a repository: -1. Remote Url(s) -2. Remote Branches -3. Local Branches -4. Most recent commit -5. Configuration Info +Shows the following information about a repository: + + 1. Remote Url(s) + 2. Remote Branches + 3. Local Branches + 4. Most recent commit + 5. Configuration Info ## OPTIONS From 7007b6e6e59d54319cd5dfcc18e9f31e31a2db55 Mon Sep 17 00:00:00 2001 From: nickl- Date: Sat, 21 Jul 2012 23:20:54 +0200 Subject: [PATCH 07/14] Added automated manual generation. Bash script which rebuilds the indexes (index.txt and the links listed in git-extras.md) based on the collection of .md file documents avalable. By interrogating the .md file for the documented description we null and void yet another possible consistency issue and avoid manual duplication mistakes. Once the indexes are up to date we start from the begining of the directory listing again calling ronn on each .md to generate the man and html files as well as renaming the incerrectly name html file. Result several incorrectly named .html documents are now removed, and all the documentation is up to date. Documentation also updated. --- man/Readme.md | 29 ++++++++++++++++++----------- man/manning-up.sh | 19 +++++++++++++++++++ 2 files changed, 37 insertions(+), 11 deletions(-) create mode 100755 man/manning-up.sh diff --git a/man/Readme.md b/man/Readme.md index e53749a..811ddc7 100644 --- a/man/Readme.md +++ b/man/Readme.md @@ -9,29 +9,36 @@ To generate documentation: 2) Then use a program ronn. Get ronn from github. -3) Run ronn: +3) Run ronn: - $ronn <filename>.md + $ronn <filename>.md -4) Remember, we use the following naming convention for files: - git-<command>.html - git-<command>.1 - git-<command>.md +4) Remember, we use the following naming convention for files: + git-<command>.html + git-<command>.1 + git-<command>.md - You'll need to rename the html file, as ronn probably inserted a 1 into the filename. + You'll need to rename the html file, as ronn probably inserted a 1 into the filename. ## EXAMPLE -$ ronn git-effort.md + $ ronn git-effort.md - roff: ./git-effort.1 - html: ./git-effort.1.html +man + roff: ./git-effort.1 + html: ./git-effort.1.html +man -$mv git-effort.1.html git-effort.html + $mv git-effort.1.html git-effort.html + +## SHELL SCRIPT + +Alternatively you can run the `manning-up.sh` automated shell script included in the man folder. The script will recreate the git-extras index based on the list of .md files available before it runs `ronn` against each one to generate the documents as well as renaming the generated `.html` files to their desired form. + + $ ./manning-up.sh ## AUTHOR Written by Leila Muhtasib <> +Shell Script by Nick Lombard <> ## REPORTING BUGS diff --git a/man/manning-up.sh b/man/manning-up.sh new file mode 100755 index 0000000..bd9fe15 --- /dev/null +++ b/man/manning-up.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +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 + +for file in $(ls git*.md); do + extra=${file/.md/} + ronn $file && mv -f $extra.1.html $extra.html +done From b7fe4c123a6680b419803649be6090ed850ee556 Mon Sep 17 00:00:00 2001 From: nickl- Date: Sat, 21 Jul 2012 23:22:32 +0200 Subject: [PATCH 08/14] The complete index of all available documents. --- man/git-extras.1 | 93 +++++++++++++++++++++++++++++++++++++-------- man/git-extras.html | 62 ++++++++++++++++++++++-------- man/git-extras.md | 59 ++++++++++++++++++++-------- man/index.txt | 47 +++++++++++++++-------- 4 files changed, 199 insertions(+), 62 deletions(-) diff --git a/man/git-extras.1 b/man/git-extras.1 index 38db7f3..4921c05 100644 --- a/man/git-extras.1 +++ b/man/git-extras.1 @@ -9,52 +9,115 @@ .SH "SYNOPSIS" \fBgit\-extras\fR [\-v,\-\-version] [\-h,\-\-help] [update] . +.SH "OPTIONS" +\-v, \-\-version +. +.P +Show git\-extras version number\. +. +.P +\-h, \-\-help +. +.P +Show this help\. This option can also be used for any of the extras commands\. +. +.P +update +. +.P +Self update\. +. .SH "COMMANDS" . .IP "\(bu" 4 -\fBgit\-changelog(1)\fR changelog population +\fBgit\-alias(1)\fR Define, search and show aliases . .IP "\(bu" 4 -\fBgit\-commits\-since(1)\fR show commit logs since some date +\fBgit\-back(1)\fR Undo and Stage latest commits . .IP "\(bu" 4 -\fBgit\-contrib(1)\fR show a user\'s contribution +\fBgit\-bug(1)\fR Create bug branch . .IP "\(bu" 4 -\fBgit\-count(1)\fR show commit count +\fBgit\-changelog(1)\fR Generate the changelog report . .IP "\(bu" 4 -\fBgit\-effort(1)\fR show effort statistics on file(s) +\fBgit\-commits\-since(1)\fR Show commit logs since some date . .IP "\(bu" 4 -\fBgit\-fresh\-branch(1)\fR create fresh branches +\fBgit\-contrib(1)\fR Show user\'s contributions . .IP "\(bu" 4 -\fBgit\-graft(1)\fR merge and destroy a given branch +\fBgit\-count(1)\fR Show commit count . .IP "\(bu" 4 -\fBgit\-ignore(1)\fR add \.gitignore patterns +\fBgit\-create\-branch(1)\fR Create branches . .IP "\(bu" 4 -\fBgit\-release(1)\fR commit, tag and push changes to the repository +\fBgit\-delete\-branch(1)\fR Delete branches . .IP "\(bu" 4 -\fBgit\-setup(1)\fR set up a git repository with initial commit +\fBgit\-delete\-merged\-branches(1)\fR Delete merged branches . .IP "\(bu" 4 -\fBgit\-repl(1)\fR GIT read\-eval\-print\-loop +\fBgit\-delete\-submodule(1)\fR Delete submodules . .IP "\(bu" 4 -\fBgit\-summary(1)\fR repository summary & contrib +\fBgit\-delete\-tag(1)\fR Delete tags . .IP "\(bu" 4 -\fBgit\-touch(1)\fR touch and add file to the index +\fBgit\-effort(1)\fR Show effort statistics on file(s) . .IP "\(bu" 4 -\fBgit\-undo(1)\fR undo one or more of the latest commits +\fBgit\-feature(1)\fR Create feature branch . .IP "\(bu" 4 -\fBgit\-info(1)\fR show information about the repository +\fBgit\-fresh\-branch(1)\fR Create fresh branches +. +.IP "\(bu" 4 +\fBgit\-gh\-pages(1)\fR Create the GitHub Pages branch +. +.IP "\(bu" 4 +\fBgit\-graft(1)\fR Merge and destroy a given branch +. +.IP "\(bu" 4 +\fBgit\-ignore(1)\fR Add \.gitignore patterns +. +.IP "\(bu" 4 +\fBgit\-info(1)\fR Returns information on current repository +. +.IP "\(bu" 4 +\fBgit\-local\-commits(1)\fR List local commits +. +.IP "\(bu" 4 +\fBgit\-refactor(1)\fR Create refactor branch +. +.IP "\(bu" 4 +\fBgit\-release(1)\fR Commit, tag and push changes to the repository +. +.IP "\(bu" 4 +\fBgit\-rename\-tag(1)\fR Rename a tag +. +.IP "\(bu" 4 +\fBgit\-repl(1)\fR git read\-eval\-print\-loop +. +.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 +. +.IP "\(bu" 4 +\fBgit\-summary(1)\fR Show repository summary +. +.IP "\(bu" 4 +\fBgit\-touch(1)\fR Touch and add file to the index +. +.IP "\(bu" 4 +\fBgit\-undo(1)\fR Remove latest commits . .IP "" 0 . diff --git a/man/git-extras.html b/man/git-extras.html index f4e7f6e..9c58271 100644 --- a/man/git-extras.html +++ b/man/git-extras.html @@ -55,6 +55,7 @@ +
  1. git-alias(1)
    2. -
  2. Git Extras
    3. +
  4. git-alias(1)
@@ -119,7 +119,7 @@ whois = !sh -c 'git log -i -1 --pretty="format:%an <%ae>

AUTHOR

-

Written by Jonhnny Weslley <jw@jonhnnyweslley.net>

+

Written by Jonhnny Weslley <jw@jonhnnyweslley.net>

REPORTING BUGS

@@ -132,7 +132,7 @@ whois = !sh -c 'git log -i -1 --pretty="format:%an <%ae>
  1. -
  2. March 2011
    3. +
  3. July 2012
  4. git-alias(1)
diff --git a/man/git-back.1 b/man/git-back.1 new file mode 100644 index 0000000..4ff8cb2 --- /dev/null +++ b/man/git-back.1 @@ -0,0 +1,54 @@ +.\" generated with Ronn/v0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 +. +.TH "GIT\-BACK" "1" "July 2012" "" "" +. +.SH "NAME" +\fBgit\-back\fR \- Undo and Stage latest commits +. +.SH "SYNOPSIS" +\fBgit\-back\fR [] +. +.SH "DESCRIPTION" +Removes the latest commits, and add their changes to your staging area\. +. +.SH "OPTIONS" + +. +.P +Number of commits to remove\. Defaults to \fI1\fR, thus remove the latest commit\. +. +.SH "EXAMPLES" +Removes the latest commit\. +. +.IP "" 4 +. +.nf + +$ git back +. +.fi +. +.IP "" 0 +. +.P +Remove the latest 3 commits: +. +.IP "" 4 +. +.nf + +$ git back 3 +. +.fi +. +.IP "" 0 +. +.SH "AUTHOR" +Written by Kenneth Reitz <\fIme@kennethreitz\.com\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/git-back.html b/man/git-back.html new file mode 100644 index 0000000..a69055b --- /dev/null +++ b/man/git-back.html @@ -0,0 +1,124 @@ + + + + + + git-back(1) - Undo and Stage latest commits + + + + +
+ + + +
    +
  1. git-back(1)
    2. +
  2. +
  3. git-back(1)
    4. +
+ +

NAME

+

+ git-back - Undo and Stage latest commits +

+ +

SYNOPSIS

+ +

git-back [<commitcount>]

+ +

DESCRIPTION

+ +

Removes the latest commits, and add their changes to your staging area.

+ +

OPTIONS

+ +

<commitcount>

+ +

Number of commits to remove. Defaults to 1, thus remove the latest commit.

+ +

EXAMPLES

+ +

Removes the latest commit.

+ +
$ git back
+
+ +

Remove the latest 3 commits:

+ +
$ git back 3
+
+ +

AUTHOR

+ +

Written by Kenneth Reitz <me@kennethreitz.com>

+ +

REPORTING BUGS

+ +

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

+ +

SEE ALSO

+ +

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

+ + +
    +
  1. +
  2. July 2012
    3. +
  3. git-back(1)
    4. +
+ +
+ + diff --git a/man/git-bug.1 b/man/git-bug.1 new file mode 100644 index 0000000..a0ca5ac --- /dev/null +++ b/man/git-bug.1 @@ -0,0 +1,47 @@ +.\" generated with Ronn/v0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 +. +.TH "GIT\-BUG" "1" "July 2012" "" "" +. +.SH "NAME" +\fBgit\-bug\fR \- Create bug branch +. +.SH "SYNOPSIS" +\fBgit\-bug\fR [finish] +. +.SH "DESCRIPTION" +Create the given bug branch +. +.SH "OPTIONS" + +. +.P +Merge and delete the bug branch\. +. +.P + +. +.P +The name of the bug branch\. +. +.SH "EXAMPLES" +. +.nf + +$ git bug bug\-123456 +\.\.\. +$ git commit \-m "Some changes" +\.\.\. +$ git checkout master +$ git bug finish bug\-123456 +. +.fi +. +.SH "AUTHOR" +Written by Jesús Espino <\fIjespinog@gmail\.com\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/git-bug.html b/man/git-bug.html new file mode 100644 index 0000000..ed99680 --- /dev/null +++ b/man/git-bug.html @@ -0,0 +1,126 @@ + + + + + + git-bug(1) - Create bug branch + + + + +
+ + + +
    +
  1. git-bug(1)
    2. +
  2. +
  3. git-bug(1)
    4. +
+ +

NAME

+

+ git-bug - Create bug branch +

+ +

SYNOPSIS

+ +

git-bug [finish] <name>

+ +

DESCRIPTION

+ +

Create the given bug branch

+ +

OPTIONS

+ +

<finish>

+ +

Merge and delete the bug branch.

+ +

<name>

+ +

The name of the bug branch.

+ +

EXAMPLES

+ +
$ git bug bug-123456
+...
+$ git commit -m "Some changes"
+...
+$ git checkout master
+$ git bug finish bug-123456
+
+ +

AUTHOR

+ +

Written by Jesús Espino <jespinog@gmail.com>

+ +

REPORTING BUGS

+ +

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

+ +

SEE ALSO

+ +

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

+ + +
    +
  1. +
  2. July 2012
    3. +
  3. git-bug(1)
    4. +
+ +
+ + diff --git a/man/git-changelog.1 b/man/git-changelog.1 index 73af36d..5aa951a 100644 --- a/man/git-changelog.1 +++ b/man/git-changelog.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-CHANGELOG" "1" "October 2010" "" "Git Extras" +.TH "GIT\-CHANGELOG" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-changelog\fR \- Generate the changelog report diff --git a/man/git-changelog.html b/man/git-changelog.html index a8c1624..363dac7 100644 --- a/man/git-changelog.html +++ b/man/git-changelog.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-changelog(1)
    2. -
  2. Git Extras
    3. +
  4. git-changelog(1)
@@ -116,7 +116,7 @@

AUTHOR

-

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

+

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

REPORTING BUGS

@@ -129,7 +129,7 @@
  1. -
  2. October 2010
    3. +
  3. July 2012
  4. git-changelog(1)
diff --git a/man/git-contrib.1 b/man/git-contrib.1 index e478a22..432ddee 100644 --- a/man/git-contrib.1 +++ b/man/git-contrib.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-CONTRIB" "1" "October 2010" "" "Git Extras" +.TH "GIT\-CONTRIB" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-contrib\fR \- Show user\'s contributions diff --git a/man/git-contrib.html b/man/git-contrib.html index 1717c8b..fb2ed5c 100644 --- a/man/git-contrib.html +++ b/man/git-contrib.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-contrib(1)
    2. -
  2. Git Extras
    3. +
  4. git-contrib(1)
@@ -102,7 +102,7 @@ visionmedia (18):

AUTHOR

-

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

+

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

REPORTING BUGS

@@ -115,7 +115,7 @@ visionmedia (18):
  1. -
  2. October 2010
    3. +
  3. July 2012
  4. git-contrib(1)
diff --git a/man/git-count.1 b/man/git-count.1 index f0cff8b..5b3fcb5 100644 --- a/man/git-count.1 +++ b/man/git-count.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-COUNT" "1" "October 2010" "" "Git Extras" +.TH "GIT\-COUNT" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-count\fR \- Show commit count diff --git a/man/git-count.html b/man/git-count.html index c0262a2..4cf1fba 100644 --- a/man/git-count.html +++ b/man/git-count.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-count(1)
    2. -
  2. Git Extras
    3. +
  4. git-count(1)
@@ -125,7 +125,7 @@ total 1844

AUTHOR

-

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

+

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

REPORTING BUGS

@@ -138,7 +138,7 @@ total 1844
  1. -
  2. October 2010
    3. +
  3. July 2012
  4. git-count(1)
diff --git a/man/git-create-branch.1 b/man/git-create-branch.1 index e321262..9950fdd 100644 --- a/man/git-create-branch.1 +++ b/man/git-create-branch.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-CREATE\-BRANCH" "1" "February 2011" "" "Git Extras" +.TH "GIT\-CREATE\-BRANCH" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-create\-branch\fR \- Create branches diff --git a/man/git-create-branch.1.html b/man/git-create-branch.html similarity index 89% rename from man/git-create-branch.1.html rename to man/git-create-branch.html index 78ff595..5647240 100644 --- a/man/git-create-branch.1.html +++ b/man/git-create-branch.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-create-branch(1)
    2. -
  2. Git Extras
    3. +
  4. git-create-branch(1)
@@ -95,7 +95,7 @@

AUTHOR

-

Written by Jonhnny Weslley <jw@jonhnnyweslley.net>

+

Written by Jonhnny Weslley <jw@jonhnnyweslley.net>

REPORTING BUGS

@@ -108,7 +108,7 @@
  1. -
  2. February 2011
    3. +
  3. July 2012
  4. git-create-branch(1)
diff --git a/man/git-delete-branch.1 b/man/git-delete-branch.1 index 5b19eb5..6b6f2a2 100644 --- a/man/git-delete-branch.1 +++ b/man/git-delete-branch.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-DELETE\-BRANCH" "1" "October 2010" "" "Git Extras" +.TH "GIT\-DELETE\-BRANCH" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-delete\-branch\fR \- Delete branches diff --git a/man/git-delete-branch.html b/man/git-delete-branch.html index 1987149..acbab84 100644 --- a/man/git-delete-branch.html +++ b/man/git-delete-branch.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-delete-branch(1)
    2. -
  2. Git Extras
    3. +
  4. git-delete-branch(1)
@@ -95,7 +95,7 @@

AUTHOR

-

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

+

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

REPORTING BUGS

@@ -108,7 +108,7 @@
  1. -
  2. October 2010
    3. +
  3. July 2012
  4. git-delete-branch(1)
diff --git a/man/git-delete-merged-branches.1 b/man/git-delete-merged-branches.1 new file mode 100644 index 0000000..2b93851 --- /dev/null +++ b/man/git-delete-merged-branches.1 @@ -0,0 +1,30 @@ +.\" generated with Ronn/v0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 +. +.TH "GIT\-DELETE\-MERGED\-BRANCHES" "1" "July 2012" "" "" +. +.SH "NAME" +\fBgit\-delete\-merged\-branches\fR \- Delete merged branches +. +.SH "SYNOPSIS" +\fBgit\-delete\-merged\-branches\fR +. +.SH "DESCRIPTION" +Deletes all local merged branches\. +. +.SH "EXAMPLES" +. +.nf + +$ git delete\-merged\-branches +. +.fi +. +.SH "AUTHOR" +Written by Jesús Espino <\fIjespinog@gmail\.com\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/git-delete-merged-branches.html b/man/git-delete-merged-branches.html new file mode 100644 index 0000000..efff10c --- /dev/null +++ b/man/git-delete-merged-branches.html @@ -0,0 +1,110 @@ + + + + + + git-delete-merged-branches(1) - Delete merged branches + + + + +
+ + + +
    +
  1. git-delete-merged-branches(1)
    2. +
  2. +
  3. git-delete-merged-branches(1)
    4. +
+ +

NAME

+

+ git-delete-merged-branches - Delete merged branches +

+ +

SYNOPSIS

+ +

git-delete-merged-branches

+ +

DESCRIPTION

+ +

Deletes all local merged branches.

+ +

EXAMPLES

+ +
$ git delete-merged-branches
+
+ +

AUTHOR

+ +

Written by Jesús Espino <jespinog@gmail.com>

+ +

REPORTING BUGS

+ +

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

+ +

SEE ALSO

+ +

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

+ + +
    +
  1. +
  2. July 2012
    3. +
  3. git-delete-merged-branches(1)
    4. +
+ +
+ + diff --git a/man/git-delete-merged-branches.md b/man/git-delete-merged-branches.md index e4a4ea1..62f832e 100644 --- a/man/git-delete-merged-branches.md +++ b/man/git-delete-merged-branches.md @@ -1,4 +1,4 @@ -git-delete-merged-branch(1) -- Delete merged branches +git-delete-merged-branches(1) -- Delete merged branches ===================================================== ## SYNOPSIS diff --git a/man/git-delete-submodule.1 b/man/git-delete-submodule.1 index e4d5243..acbd0f2 100644 --- a/man/git-delete-submodule.1 +++ b/man/git-delete-submodule.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-DELETE\-SUBMODULE" "1" "October 2010" "" "Git Extras" +.TH "GIT\-DELETE\-SUBMODULE" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-delete\-submodule\fR \- Delete submodules diff --git a/man/git-delete-submodule.html b/man/git-delete-submodule.html index 8957761..77db2be 100644 --- a/man/git-delete-submodule.html +++ b/man/git-delete-submodule.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-delete-submodule(1)
    2. -
  2. Git Extras
    3. +
  4. git-delete-submodule(1)
@@ -93,7 +93,7 @@

AUTHOR

-

Written by Jonhnny Weslley <jw@jonhnnyweslley.net>

+

Written by Jonhnny Weslley <jw@jonhnnyweslley.net>

REPORTING BUGS

@@ -106,7 +106,7 @@
  1. -
  2. October 2010
    3. +
  3. July 2012
  4. git-delete-submodule(1)
diff --git a/man/git-delete-tag.1 b/man/git-delete-tag.1 index 9290cf8..ff741f1 100644 --- a/man/git-delete-tag.1 +++ b/man/git-delete-tag.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-DELETE\-TAG" "1" "October 2010" "" "Git Extras" +.TH "GIT\-DELETE\-TAG" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-delete\-tag\fR \- Delete tags diff --git a/man/git-delete-tag.html b/man/git-delete-tag.html index ef3b397..be0bec2 100644 --- a/man/git-delete-tag.html +++ b/man/git-delete-tag.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-delete-tag(1)
    2. -
  2. Git Extras
    3. +
  4. git-delete-tag(1)
@@ -95,7 +95,7 @@

AUTHOR

-

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

+

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

REPORTING BUGS

@@ -108,7 +108,7 @@
  1. -
  2. October 2010
    3. +
  3. July 2012
  4. git-delete-tag(1)
diff --git a/man/git-effort.1 b/man/git-effort.1 index 62e49c7..e55365c 100644 --- a/man/git-effort.1 +++ b/man/git-effort.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-EFFORT" "1" "June 2012" "" "" +.TH "GIT\-EFFORT" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-effort\fR \- Show effort statistics on file(s) diff --git a/man/git-effort.html b/man/git-effort.html index d348304..35cf365 100644 --- a/man/git-effort.html +++ b/man/git-effort.html @@ -117,20 +117,20 @@

AUTHOR

-

Written by Leila Muhtasib <muhtasib@gmail.com>

+

Written by Leila Muhtasib <muhtasib@gmail.com>

REPORTING BUGS

-

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

+

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

SEE ALSO

-

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

+

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

  1. -
  2. June 2012
    3. +
  3. July 2012
  4. git-effort(1)
diff --git a/man/git-feature.1 b/man/git-feature.1 new file mode 100644 index 0000000..06f0870 --- /dev/null +++ b/man/git-feature.1 @@ -0,0 +1,47 @@ +.\" generated with Ronn/v0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 +. +.TH "GIT\-FEATURE" "1" "July 2012" "" "" +. +.SH "NAME" +\fBgit\-feature\fR \- Create feature branch +. +.SH "SYNOPSIS" +\fBgit\-feature\fR [finish] +. +.SH "DESCRIPTION" +Create the given feature branch +. +.SH "OPTIONS" + +. +.P +Merge and delete the feature branch\. +. +.P + +. +.P +The name of the feature branch\. +. +.SH "EXAMPLES" +. +.nf + +$ git feature dependencies +\.\.\. +$ git commit \-m "Some changes" +\.\.\. +$ git checkout master +$ git feature finish dependencies +. +.fi +. +.SH "AUTHOR" +Written by Jesús Espino <\fIjespinog@gmail\.com\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/git-feature.html b/man/git-feature.html new file mode 100644 index 0000000..edcc67b --- /dev/null +++ b/man/git-feature.html @@ -0,0 +1,126 @@ + + + + + + git-feature(1) - Create feature branch + + + + +
+ + + +
    +
  1. git-feature(1)
    2. +
  2. +
  3. git-feature(1)
    4. +
+ +

NAME

+

+ git-feature - Create feature branch +

+ +

SYNOPSIS

+ +

git-feature [finish] <name>

+ +

DESCRIPTION

+ +

Create the given feature branch

+ +

OPTIONS

+ +

<finish>

+ +

Merge and delete the feature branch.

+ +

<name>

+ +

The name of the feature branch.

+ +

EXAMPLES

+ +
$ git feature dependencies
+...
+$ git commit -m "Some changes"
+...
+$ git checkout master
+$ git feature finish dependencies
+
+ +

AUTHOR

+ +

Written by Jesús Espino <jespinog@gmail.com>

+ +

REPORTING BUGS

+ +

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

+ +

SEE ALSO

+ +

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

+ + +
    +
  1. +
  2. July 2012
    3. +
  3. git-feature(1)
    4. +
+ +
+ + diff --git a/man/git-fresh-branch.1 b/man/git-fresh-branch.1 index c2f2851..7ded44f 100644 --- a/man/git-fresh-branch.1 +++ b/man/git-fresh-branch.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-FRESH\-BRANCH" "1" "October 2010" "" "Git Extras" +.TH "GIT\-FRESH\-BRANCH" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-fresh\-branch\fR \- Create fresh branches diff --git a/man/git-fresh-branch.html b/man/git-fresh-branch.html index 5e48b4d..e83a58e 100644 --- a/man/git-fresh-branch.html +++ b/man/git-fresh-branch.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-fresh-branch(1)
    2. -
  2. Git Extras
    3. +
  4. git-fresh-branch(1)
@@ -95,7 +95,7 @@

AUTHOR

-

Written by Kenneth Reitz <me@kennethreitz.com>

+

Written by Kenneth Reitz <me@kennethreitz.com>

REPORTING BUGS

@@ -108,7 +108,7 @@
  1. -
  2. October 2010
    3. +
  3. July 2012
  4. git-fresh-branch(1)
diff --git a/man/git-gh-pages.1 b/man/git-gh-pages.1 new file mode 100644 index 0000000..b442a8b --- /dev/null +++ b/man/git-gh-pages.1 @@ -0,0 +1,43 @@ +.\" generated with Ronn/v0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 +. +.TH "GIT\-GH\-PAGES" "1" "July 2012" "" "" +. +.SH "NAME" +\fBgit\-gh\-pages\fR \- Create the GitHub Pages branch +. +.SH "SYNOPSIS" +\fBgit\-gh\-pages\fR +. +.SH "DESCRIPTION" +Create the GitHub Pages branch (gh\-pages) with an initial dummy index\.html file\. +. +.SH "EXAMPLES" +. +.nf + +$ git gh\-pages +setting up gh\-pages +Removing \.\.\. +[gh\-pages (root\-commit) 94f4b26] Initial commit + 1 file changed, 1 insertion(+) + create mode 100644 index\.html +Counting objects: 3, done\. +Writing objects: 100% (3/3), 232 bytes, done\. +Total 3 (delta 0), reused 0 (delta 0) +To git@github\.com:myuser/myrepository\.git + * [new branch] gh\-pages \-> gh\-pages +Branch gh\-pages set up to track remote branch gh\-pages from origin\. +complete +$ +. +.fi +. +.SH "AUTHOR" +Written by Jesús Espino <\fIjespinog@gmail\.com\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/git-gh-pages.html b/man/git-gh-pages.html new file mode 100644 index 0000000..f03a38c --- /dev/null +++ b/man/git-gh-pages.html @@ -0,0 +1,123 @@ + + + + + + git-gh-pages(1) - Create the GitHub Pages branch + + + + +
+ + + +
    +
  1. git-gh-pages(1)
    2. +
  2. +
  3. git-gh-pages(1)
    4. +
+ +

NAME

+

+ git-gh-pages - Create the GitHub Pages branch +

+ +

SYNOPSIS

+ +

git-gh-pages

+ +

DESCRIPTION

+ +

Create the GitHub Pages branch (gh-pages) with an initial dummy index.html file.

+ +

EXAMPLES

+ +
$ git gh-pages
+setting up gh-pages
+Removing ...
+[gh-pages (root-commit) 94f4b26] Initial commit
+ 1 file changed, 1 insertion(+)
+ create mode 100644 index.html
+Counting objects: 3, done.
+Writing objects: 100% (3/3), 232 bytes, done.
+Total 3 (delta 0), reused 0 (delta 0)
+To git@github.com:myuser/myrepository.git
+ * [new branch]      gh-pages -> gh-pages
+Branch gh-pages set up to track remote branch gh-pages from origin.
+complete
+$
+
+ +

AUTHOR

+ +

Written by Jesús Espino <jespinog@gmail.com>

+ +

REPORTING BUGS

+ +

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

+ +

SEE ALSO

+ +

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

+ + +
    +
  1. +
  2. July 2012
    3. +
  3. git-gh-pages(1)
    4. +
+ +
+ + diff --git a/man/git-graft.1 b/man/git-graft.1 index 7e12c13..289dfbe 100644 --- a/man/git-graft.1 +++ b/man/git-graft.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-GRAFT" "1" "March 2011" "" "Git Extras" +.TH "GIT\-GRAFT" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-graft\fR \- Merge and destroy a given branch @@ -10,7 +10,7 @@ \fBgit\-graft\fR [] . .SH "DESCRIPTION" -Merge commits from into which defaults to \. +Merge commits from into which defaults to the current branch\. . .SH "OPTIONS" diff --git a/man/git-graft.html b/man/git-graft.html index df34422..420f793 100644 --- a/man/git-graft.html +++ b/man/git-graft.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-graft(1)
    2. -
  2. Git Extras
    3. +
  4. git-graft(1)
@@ -80,7 +80,7 @@

DESCRIPTION

-

Merge commits from <src-branch> into <dest-branch> which defaults to <master>.

+

Merge commits from <src-branch> into <dest-branch> which defaults to the current branch.

OPTIONS

@@ -96,7 +96,7 @@ $ git graft new_feature

AUTHOR

-

Written by Kenneth Reitz <me@kennethreitz.com>

+

Written by Kenneth Reitz <me@kennethreitz.com>

REPORTING BUGS

@@ -109,7 +109,7 @@ $ git graft new_feature
  1. -
  2. March 2011
    3. +
  3. July 2012
  4. git-graft(1)
diff --git a/man/git-local-commits.1 b/man/git-local-commits.1 index 059af61..e357102 100644 --- a/man/git-local-commits.1 +++ b/man/git-local-commits.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-LOCAL\-COMMITS" "1" "March 2012" "" "Git Extras" +.TH "GIT\-LOCAL\-COMMITS" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-local\-commits\fR \- List local commits diff --git a/man/git-local-commits.html b/man/git-local-commits.html index 997eec6..4d06a32 100644 --- a/man/git-local-commits.html +++ b/man/git-local-commits.html @@ -65,7 +65,7 @@
  1. git-local-commits(1)
    2. -
  2. Git Extras
    3. +
  4. git-local-commits(1)
@@ -95,7 +95,7 @@

AUTHOR

-

Written by Michael Komitee <mkomitee@gmail.com>

+

Written by Michael Komitee <mkomitee@gmail.com>

REPORTING BUGS

@@ -108,7 +108,7 @@
  1. -
  2. March 2012
    3. +
  3. July 2012
  4. git-local-commits(1)
diff --git a/man/git-refactor.1 b/man/git-refactor.1 new file mode 100644 index 0000000..de584df --- /dev/null +++ b/man/git-refactor.1 @@ -0,0 +1,47 @@ +.\" generated with Ronn/v0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 +. +.TH "GIT\-REFACTOR" "1" "July 2012" "" "" +. +.SH "NAME" +\fBgit\-refactor\fR \- Create refactor branch +. +.SH "SYNOPSIS" +\fBgit\-refactor\fR [finish] +. +.SH "DESCRIPTION" +Create the given refactor branch +. +.SH "OPTIONS" + +. +.P +Merge and delete the refactor branch\. +. +.P + +. +.P +The name of the refactor branch\. +. +.SH "EXAMPLES" +. +.nf + +$ git refactor mainlib_refactor +\.\.\. +$ git commit \-m "Some changes" +\.\.\. +$ git checkout master +$ git refactor finish mainlib_refactor +. +.fi +. +.SH "AUTHOR" +Written by Jesús Espino <\fIjespinog@gmail\.com\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/git-refactor.html b/man/git-refactor.html new file mode 100644 index 0000000..84deb21 --- /dev/null +++ b/man/git-refactor.html @@ -0,0 +1,126 @@ + + + + + + git-refactor(1) - Create refactor branch + + + + +
+ + + +
    +
  1. git-refactor(1)
    2. +
  2. +
  3. git-refactor(1)
    4. +
+ +

NAME

+

+ git-refactor - Create refactor branch +

+ +

SYNOPSIS

+ +

git-refactor [finish] <name>

+ +

DESCRIPTION

+ +

Create the given refactor branch

+ +

OPTIONS

+ +

<finish>

+ +

Merge and delete the refactor branch.

+ +

<name>

+ +

The name of the refactor branch.

+ +

EXAMPLES

+ +
$ git refactor mainlib_refactor
+...
+$ git commit -m "Some changes"
+...
+$ git checkout master
+$ git refactor finish mainlib_refactor
+
+ +

AUTHOR

+ +

Written by Jesús Espino <jespinog@gmail.com>

+ +

REPORTING BUGS

+ +

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

+ +

SEE ALSO

+ +

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

+ + +
    +
  1. +
  2. July 2012
    3. +
  3. git-refactor(1)
    4. +
+ +
+ + diff --git a/man/git-release.1 b/man/git-release.1 index 56b41b2..cc43306 100644 --- a/man/git-release.1 +++ b/man/git-release.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-RELEASE" "1" "October 2010" "" "Git Extras" +.TH "GIT\-RELEASE" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-release\fR \- Commit, tag and push changes to the repository diff --git a/man/git-release.html b/man/git-release.html index 2cec612..b06cbe3 100644 --- a/man/git-release.html +++ b/man/git-release.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-release(1)
    2. -
  2. Git Extras
    3. +
  4. git-release(1)
@@ -95,7 +95,7 @@

AUTHOR

-

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

+

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

REPORTING BUGS

@@ -108,7 +108,7 @@
  1. -
  2. October 2010
    3. +
  3. July 2012
  4. git-release(1)
diff --git a/man/git-rename-tag.1 b/man/git-rename-tag.1 new file mode 100644 index 0000000..183cc3e --- /dev/null +++ b/man/git-rename-tag.1 @@ -0,0 +1,58 @@ +.\" generated with Ronn/v0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 +. +.TH "GIT\-RENAME\-TAG" "1" "July 2012" "" "" +. +.SH "NAME" +\fBgit\-rename\-tag\fR \- Rename a tag +. +.SH "SYNOPSIS" +\fBgit\-rename\-tag\fR +. +.SH "DESCRIPTION" +Rename a tag (locally and remotely) +. +.SH "OPTIONS" + +. +.P +The name of the tag you want to rename\. +. +.P + +. +.P +The new name of the tag\. +. +.SH "EXAMPLES" +. +.nf + +$ git tag test +$ git push \-\-tags +Total 0 (delta 0), reused 0 (delta 0) +To git@myserver\.com:myuser/myrepository\.git + * [new tag] test \-> test +$ git tag +test +$ git rename\-tag test test2 +Deleted tag \'test\' (was 1111111) +Total 0 (delta 0), reused 0 (delta 0) +To git@myserver\.com:myuser/myrepository\.git + * [new tag] test2 \-> test2 +remote: warning: Deleting a non\-existent ref\. +To git@myserver\.com:myuser/myrepository\.git + \- [deleted] refs/tag/test +$ git tag +test2 +. +.fi +. +.SH "AUTHOR" +Written by Jesús Espino <\fIjespinog@gmail\.com\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/git-rename-tag.html b/man/git-rename-tag.html new file mode 100644 index 0000000..2e35679 --- /dev/null +++ b/man/git-rename-tag.html @@ -0,0 +1,137 @@ + + + + + + git-rename-tag(1) - Rename a tag + + + + +
+ + + +
    +
  1. git-rename-tag(1)
    2. +
  2. +
  3. git-rename-tag(1)
    4. +
+ +

NAME

+

+ git-rename-tag - Rename a tag +

+ +

SYNOPSIS

+ +

git-rename-tag <old-tag-name> <new-tag-name>

+ +

DESCRIPTION

+ +

Rename a tag (locally and remotely)

+ +

OPTIONS

+ +

<old-tag-name>

+ +

The name of the tag you want to rename.

+ +

<new-tag-name>

+ +

The new name of the tag.

+ +

EXAMPLES

+ +
$ git tag test
+$ git push --tags
+Total 0 (delta 0), reused 0 (delta 0)
+To git@myserver.com:myuser/myrepository.git
+ * [new tag]         test -> test
+$ git tag
+test
+$ git rename-tag test test2
+Deleted tag 'test' (was 1111111)
+Total 0 (delta 0), reused 0 (delta 0)
+To git@myserver.com:myuser/myrepository.git
+ * [new tag]         test2 -> test2
+remote: warning: Deleting a non-existent ref.
+To git@myserver.com:myuser/myrepository.git
+ - [deleted]         refs/tag/test
+$ git tag
+test2
+
+ +

AUTHOR

+ +

Written by Jesús Espino <jespinog@gmail.com>

+ +

REPORTING BUGS

+ +

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

+ +

SEE ALSO

+ +

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

+ + +
    +
  1. +
  2. July 2012
    3. +
  3. git-rename-tag(1)
    4. +
+ +
+ + diff --git a/man/git-repl.1 b/man/git-repl.1 index 21c7c0b..f2f96d0 100644 --- a/man/git-repl.1 +++ b/man/git-repl.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-REPL" "1" "October 2010" "" "Git Extras" +.TH "GIT\-REPL" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-repl\fR \- git read\-eval\-print\-loop diff --git a/man/git-repl.html b/man/git-repl.html index c489b58..bf19236 100644 --- a/man/git-repl.html +++ b/man/git-repl.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-repl(1)
    2. -
  2. Git Extras
    3. +
  4. git-repl(1)
@@ -104,7 +104,7 @@ git> quit

AUTHOR

-

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

+

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

REPORTING BUGS

@@ -117,7 +117,7 @@ git> quit
  1. -
  2. October 2010
    3. +
  3. July 2012
  4. git-repl(1)
diff --git a/man/git-setup.1 b/man/git-setup.1 index 80bf5c5..1a18e65 100644 --- a/man/git-setup.1 +++ b/man/git-setup.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-SETUP" "1" "October 2010" "" "Git Extras" +.TH "GIT\-SETUP" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-setup\fR \- Set up a git repository diff --git a/man/git-setup.html b/man/git-setup.html index 37d67de..5afa0c2 100644 --- a/man/git-setup.html +++ b/man/git-setup.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-setup(1)
    2. -
  2. Git Extras
    3. +
  4. git-setup(1)
@@ -95,7 +95,7 @@

AUTHOR

-

Written by Aggelos Orfanakos <agorf@agorf.gr>

+

Written by Aggelos Orfanakos <agorf@agorf.gr>

REPORTING BUGS

@@ -108,7 +108,7 @@
  1. -
  2. October 2010
    3. +
  3. July 2012
  4. git-setup(1)
diff --git a/man/git-squash.1 b/man/git-squash.1 new file mode 100644 index 0000000..f64b9af --- /dev/null +++ b/man/git-squash.1 @@ -0,0 +1,48 @@ +.\" generated with Ronn/v0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 +. +.TH "GIT\-SQUASH" "1" "July 2012" "" "" +. +.SH "NAME" +\fBgit\-squash\fR \- Import changes form a branch +. +.SH "SYNOPSIS" +\fBgit\-squash\fR [] +. +.SH "DESCRIPTION" +Produce the working tree and index state as if a real merge happened without the commit or merge marks\. +. +.SH "OPTIONS" + +. +.P +Branch to squash on the actual branch\. +. +.P + +. +.P +If commit\-message is given, commit the squash result and delete the source\-branch\. +. +.SH "EXAMPLES" +. +.nf + +$ git squash my\-other\-branch +Updating a2740f5\.\.533b19c +Fast\-forward +Squash commit \-\- not updating HEAD + my\-changed\-file | 1 + + 1 file changed, 1 insertion(+) +$ git commit \-m "New commit without a real merge" +. +.fi +. +.SH "AUTHOR" +Written by Jesús Espino <\fIjespinog@gmail\.com\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/git-squash.html b/man/git-squash.html new file mode 100644 index 0000000..e3b5e1b --- /dev/null +++ b/man/git-squash.html @@ -0,0 +1,128 @@ + + + + + + git-squash(1) - Import changes form a branch + + + + +
+ + + +
    +
  1. git-squash(1)
    2. +
  2. +
  3. git-squash(1)
    4. +
+ +

NAME

+

+ git-squash - Import changes form a branch +

+ +

SYNOPSIS

+ +

git-squash <source-branch> [<commit-message>]

+ +

DESCRIPTION

+ +

Produce the working tree and index state as if a real merge happened without + the commit or merge marks.

+ +

OPTIONS

+ +

<source-branch>

+ +

Branch to squash on the actual branch.

+ +

<commit-message>

+ +

If commit-message is given, commit the squash result and delete the source-branch.

+ +

EXAMPLES

+ +
$ git squash my-other-branch
+Updating a2740f5..533b19c
+Fast-forward
+Squash commit -- not updating HEAD
+ my-changed-file | 1 +
+ 1 file changed, 1 insertion(+)
+$ git commit -m "New commit without a real merge"
+
+ +

AUTHOR

+ +

Written by Jesús Espino <jespinog@gmail.com>

+ +

REPORTING BUGS

+ +

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

+ +

SEE ALSO

+ +

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

+ + +
    +
  1. +
  2. July 2012
    3. +
  3. git-squash(1)
    4. +
+ +
+ + diff --git a/man/git-summary.1 b/man/git-summary.1 index e9b09bf..c0b4d04 100644 --- a/man/git-summary.1 +++ b/man/git-summary.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-SUMMARY" "1" "October 2010" "" "Git Extras" +.TH "GIT\-SUMMARY" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-summary\fR \- Show repository summary diff --git a/man/git-summary.html b/man/git-summary.html index c51169d..b23dd80 100644 --- a/man/git-summary.html +++ b/man/git-summary.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-summary(1)
    2. -
  2. Git Extras
    3. +
  4. git-summary(1)
@@ -128,7 +128,7 @@ authors :

AUTHOR

-

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

+

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

REPORTING BUGS

@@ -141,7 +141,7 @@ authors :
  1. -
  2. October 2010
    3. +
  3. July 2012
  4. git-summary(1)
diff --git a/man/git-touch.1 b/man/git-touch.1 index 9d18689..7dff79c 100644 --- a/man/git-touch.1 +++ b/man/git-touch.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-TOUCH" "1" "October 2010" "" "Git Extras" +.TH "GIT\-TOUCH" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-touch\fR \- Touch and add file to the index diff --git a/man/git-touch.html b/man/git-touch.html index 137fdb5..7214548 100644 --- a/man/git-touch.html +++ b/man/git-touch.html @@ -61,11 +61,11 @@ AUTHOR REPORTING BUGS SEE ALSO - +
  1. git-touch(1)
    2. -
  2. Git Extras
    3. +
  4. git-touch(1)
@@ -94,7 +94,7 @@

AUTHOR

-

Written by Alex McHale <alexmchale@gmail.com>

+

Written by Alex McHale <alexmchale@gmail.com>

REPORTING BUGS

@@ -107,7 +107,7 @@
  1. -
  2. October 2010
    3. +
  3. July 2012
  4. git-touch(1)
diff --git a/man/git-undo.1 b/man/git-undo.1 index fb4e64a..1172422 100644 --- a/man/git-undo.1 +++ b/man/git-undo.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-UNDO" "1" "June 2012" "" "" +.TH "GIT\-UNDO" "1" "July 2012" "" "" . .SH "NAME" \fBgit\-undo\fR \- Remove latest commits diff --git a/man/git-undo.html b/man/git-undo.html index 6126a14..3902cbc 100644 --- a/man/git-undo.html +++ b/man/git-undo.html @@ -106,7 +106,7 @@

AUTHOR

-

Written by Kenneth Reitz <me@kennethreitz.com>

+

Written by Kenneth Reitz <me@kennethreitz.com>

REPORTING BUGS

@@ -119,7 +119,7 @@
  1. -
  2. June 2012
    3. +
  3. July 2012
  4. git-undo(1)
From b7f5529b73ff867ce7f82730e540062fbf193ba3 Mon Sep 17 00:00:00 2001 From: nickl- Date: Sun, 22 Jul 2012 01:24:52 +0200 Subject: [PATCH 10/14] Add docs for shorthand version of --list. --- man/git-changelog.1 | 4 ++-- man/git-changelog.html | 6 +++--- man/git-changelog.md | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/man/git-changelog.1 b/man/git-changelog.1 index 5aa951a..bd835d3 100644 --- a/man/git-changelog.1 +++ b/man/git-changelog.1 @@ -7,13 +7,13 @@ \fBgit\-changelog\fR \- Generate the changelog report . .SH "SYNOPSIS" -\fBgit\-changelog\fR [\-\-list] +\fBgit\-changelog\fR [\-l, \-\-list] . .SH "DESCRIPTION" Populates the file named matching \fIchange|history \-i\fR with the commits since the previous tag or since the project began when no tags are present\. Opens the changelog in \fB$EDITOR\fR when set\. . .SH "OPTIONS" -\-\-list +\-l, \-\-list . .P Show commit logs from the current version\. diff --git a/man/git-changelog.html b/man/git-changelog.html index 363dac7..c9a812b 100644 --- a/man/git-changelog.html +++ b/man/git-changelog.html @@ -76,7 +76,7 @@

SYNOPSIS

-

git-changelog [--list]

+

git-changelog [-l, --list]

DESCRIPTION

@@ -84,7 +84,7 @@

OPTIONS

-

--list

+

-l, --list

Show commit logs from the current version.

@@ -116,7 +116,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-changelog.md b/man/git-changelog.md index 81f5d8b..4d0fce9 100644 --- a/man/git-changelog.md +++ b/man/git-changelog.md @@ -3,7 +3,7 @@ git-changelog(1) -- Generate the changelog report ## SYNOPSIS -`git-changelog` [--list] +`git-changelog` [-l, --list] ## DESCRIPTION @@ -11,7 +11,7 @@ git-changelog(1) -- Generate the changelog report ## OPTIONS - --list + -l, --list Show commit logs from the current version. From 95630d7fcba0cb145f02717c6e837b53e4687244 Mon Sep 17 00:00:00 2001 From: nickl- Date: Sun, 22 Jul 2012 02:15:12 +0200 Subject: [PATCH 11/14] Make all bin scripts executable. --- bin/git-obliterate | 0 bin/git-show-tree | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/git-obliterate mode change 100644 => 100755 bin/git-show-tree diff --git a/bin/git-obliterate b/bin/git-obliterate old mode 100644 new mode 100755 diff --git a/bin/git-show-tree b/bin/git-show-tree old mode 100644 new mode 100755 From 79c87534360cfb0f70a7434eedc4e9ab8e32460a Mon Sep 17 00:00:00 2001 From: nickl- Date: Sun, 22 Jul 2012 03:19:11 +0200 Subject: [PATCH 12/14] Add bash_completion for new git-ignore switches. --- etc/bash_completion.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/etc/bash_completion.sh b/etc/bash_completion.sh index adff45f..e37fa74 100644 --- a/etc/bash_completion.sh +++ b/etc/bash_completion.sh @@ -32,6 +32,19 @@ _git_graft(){ __gitcomp "$(__git_heads)" } +_git_ignore(){ + case "$cur" in + --*) + __gitcomp "--global --local" + return + ;; + -*) + __gitcomp "--global --local -g -l" + return + ;; + esac +} + _git_squash(){ __gitcomp "$(__git_heads)" } From 2dc72a1d3b4351bd031e20cf4a4094b980b5b7ef Mon Sep 17 00:00:00 2001 From: nickl- Date: Sun, 22 Jul 2012 17:18:21 +0200 Subject: [PATCH 13/14] merge with muthasib as per pull req #114. Pull req #114 Add -h --hard to git-undo. --- man/git-undo.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/man/git-undo.html b/man/git-undo.html index 3902cbc..1eaed2a 100644 --- a/man/git-undo.html +++ b/man/git-undo.html @@ -106,15 +106,15 @@

AUTHOR

-

Written by Kenneth Reitz <me@kennethreitz.com>

+

Written by Kenneth Reitz <me@kennethreitz.com>

REPORTING BUGS

-

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

+

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

SEE ALSO

-

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

+

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

    From f076565a981b28e95d8b443319dbb5c5b8037593 Mon Sep 17 00:00:00 2001 From: nickl- Date: Sun, 22 Jul 2012 18:56:24 +0200 Subject: [PATCH 14/14] Generate only a single manual. Added the ability to pass the .md document template as argument to manning-up.sh which will only generate the single document and rename the .1.html correctly before exiting and thus not building the index and all the docs again. Includes updated documentation. --- man/Readme.md | 4 ++++ man/manning-up.sh | 2 ++ 2 files changed, 6 insertions(+) diff --git a/man/Readme.md b/man/Readme.md index 811ddc7..5d6af16 100644 --- a/man/Readme.md +++ b/man/Readme.md @@ -35,6 +35,10 @@ Alternatively you can run the `manning-up.sh` automated shell script included in $ ./manning-up.sh +To only (re)generate a specific .md manual template and have `.1.html` renamed to `.html` yau may also use manning-up.sh. + + $ ./manning-up.sh git-info.md + ## AUTHOR Written by Leila Muhtasib <> diff --git a/man/manning-up.sh b/man/manning-up.sh index bd9fe15..a76eddf 100755 --- a/man/manning-up.sh +++ b/man/manning-up.sh @@ -1,5 +1,7 @@ #!/bin/bash +test "$1" && ronn $1 && mv -f ${1/.md/}.1.html ${1/.md/}.html && exit 0 + echo '# manuals' > index.txt.tmp ln=$(awk '/## COMMANDS/{print NR};' ./git-extras.md) awk "NR <= $ln+1" git-extras.md > git-extras.md.tmp