From 00050b91da559f0663145c9ea2f4a3f56ee06f8e Mon Sep 17 00:00:00 2001 From: Paul Schreiber Date: Tue, 17 Mar 2015 11:01:45 -0400 Subject: [PATCH] add show-merged-branches and show-unmerged-branches --- AUTHORS | 1 + bin/git-show-merged-branches | 3 + bin/git-show-unmerged-branches | 3 + man/git-delete-merged-branches.1 | 2 +- man/git-delete-merged-branches.html | 2 +- man/git-delete-merged-branches.md | 2 +- man/git-extras.html | 2 + man/git-extras.md | 2 + man/git-show-merged-branches.1 | 30 ++++++++ man/git-show-merged-branches.html | 110 ++++++++++++++++++++++++++++ man/git-show-merged-branches.md | 26 +++++++ man/git-show-unmerged-branches.1 | 30 ++++++++ man/git-show-unmerged-branches.html | 110 ++++++++++++++++++++++++++++ man/git-show-unmerged-branches.md | 26 +++++++ man/index.txt | 2 + 15 files changed, 348 insertions(+), 3 deletions(-) create mode 100644 bin/git-show-merged-branches create mode 100644 bin/git-show-unmerged-branches create mode 100644 man/git-show-merged-branches.1 create mode 100644 man/git-show-merged-branches.html create mode 100644 man/git-show-merged-branches.md create mode 100644 man/git-show-unmerged-branches.1 create mode 100644 man/git-show-unmerged-branches.html create mode 100644 man/git-show-unmerged-branches.md diff --git a/AUTHORS b/AUTHORS index bf21165..ad25458 100644 --- a/AUTHORS +++ b/AUTHORS @@ -29,3 +29,4 @@ Patches and Suggestions - Duane Johnson - Todd Wolfson - Niklas Fiekas +- Paul Schreiber diff --git a/bin/git-show-merged-branches b/bin/git-show-merged-branches new file mode 100644 index 0000000..a3d99c7 --- /dev/null +++ b/bin/git-show-merged-branches @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +git branch --no-color --merged | grep -v "\*" | grep -v master | tr -d ' ' diff --git a/bin/git-show-unmerged-branches b/bin/git-show-unmerged-branches new file mode 100644 index 0000000..47f0556 --- /dev/null +++ b/bin/git-show-unmerged-branches @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +git branch --no-color --no-merged | grep -v "\*" | grep -v master | tr -d ' ' diff --git a/man/git-delete-merged-branches.1 b/man/git-delete-merged-branches.1 index 179297a..8eaf77b 100644 --- a/man/git-delete-merged-branches.1 +++ b/man/git-delete-merged-branches.1 @@ -10,7 +10,7 @@ \fBgit\-delete\-merged\-branches\fR . .SH "DESCRIPTION" -Deletes all branches merged into current HEAD\. Does not delete \fImaster\fR, even if run from a branch that is a descendant of \fImaster\fR\. +Deletes all branches merged in to current HEAD\. Does not delete \fImaster\fR, even if run from a branch that is a descendant of \fImaster\fR\. . .SH "EXAMPLES" . diff --git a/man/git-delete-merged-branches.html b/man/git-delete-merged-branches.html index eeccaee..a156fcc 100644 --- a/man/git-delete-merged-branches.html +++ b/man/git-delete-merged-branches.html @@ -79,7 +79,7 @@

DESCRIPTION

-

Deletes all branches merged into current HEAD. Does not delete master, even if run from a branch that is +

Deletes all branches merged in to current HEAD. Does not delete master, even if run from a branch that is a descendant of master.

EXAMPLES

diff --git a/man/git-delete-merged-branches.md b/man/git-delete-merged-branches.md index 52c46c6..b124a57 100644 --- a/man/git-delete-merged-branches.md +++ b/man/git-delete-merged-branches.md @@ -7,7 +7,7 @@ git-delete-merged-branches(1) -- Delete merged branches ## DESCRIPTION - Deletes all branches merged into current HEAD. Does not delete *master*, even if run from a branch that is + Deletes all branches merged in to current HEAD. Does not delete *master*, even if run from a branch that is a descendant of *master*. ## EXAMPLES diff --git a/man/git-extras.html b/man/git-extras.html index df69a66..406d104 100644 --- a/man/git-extras.html +++ b/man/git-extras.html @@ -127,7 +127,9 @@
  • git-repl(1) git read-eval-print-loop
  • git-reset-file(1) Reset one file
  • git-setup(1) Set up a git repository
    • +
  • git-show-merged-branches(1) Show merged branches
  • 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-summary(1) Show repository summary
  • git-touch(1) Touch and add file to the index
    • diff --git a/man/git-extras.md b/man/git-extras.md index 58ee067..842df72 100644 --- a/man/git-extras.md +++ b/man/git-extras.md @@ -54,7 +54,9 @@ git-extras(1) -- Awesome GIT utilities - **git-repl(1)** git read-eval-print-loop - **git-reset-file(1)** Reset one file - **git-setup(1)** Set up a git repository + - **git-show-merged-branches(1)** show merged branches - **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-summary(1)** Show repository summary - **git-touch(1)** Touch and add file to the index diff --git a/man/git-show-merged-branches.1 b/man/git-show-merged-branches.1 new file mode 100644 index 0000000..eae285c --- /dev/null +++ b/man/git-show-merged-branches.1 @@ -0,0 +1,30 @@ +.\" generated with Ronn/v0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 +. +.TH "GIT\-SHOW\-MERGED\-BRANCHES" "1" "March 2015" "" "" +. +.SH "NAME" +\fBgit\-show\-merged\-branches\fR \- Show merged branches +. +.SH "SYNOPSIS" +\fBgit\-show\-merged\-branches\fR +. +.SH "DESCRIPTION" +Shows all branches merged in to current HEAD\. +. +.SH "EXAMPLES" +. +.nf + +$ git show\-merged\-branches +. +.fi +. +.SH "AUTHOR" +Written by Paul Schreiber <\fIpaulschreiber@gmail\.com\fR> +. +.SH "REPORTING BUGS" +<\fIhttps://github\.com/tj/git\-extras/issues\fR> +. +.SH "SEE ALSO" +<\fIhttps://github\.com/tj/git\-extras\fR> diff --git a/man/git-show-merged-branches.html b/man/git-show-merged-branches.html new file mode 100644 index 0000000..08f3c0b --- /dev/null +++ b/man/git-show-merged-branches.html @@ -0,0 +1,110 @@ + + + + + + git-shw-merged-branches(1) - Show merged branches + + + + +
    + + + +
      +
    1. git-show-merged-branches(1)
      2. +
    2. +
    3. git-show-merged-branches(1)
      4. +
    + +

    NAME

    +

    + git-show-merged-branches - Show merged branches +

    + +

    SYNOPSIS

    + +

    git-show-merged-branches

    + +

    DESCRIPTION

    + +

    Shows all branches merged in to current HEAD.

    + +

    EXAMPLES

    + +
    $ git show-merged-branches
+
    + +

    AUTHOR

    + +

    Written by Paul Schreiber <paulschreiber@gmail.com>

    + +

    REPORTING BUGS

    + +

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

    + +

    SEE ALSO

    + +

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

    + + +
      +
    1. +
    2. March 2015
      3. +
    3. git-show-merged-branches(1)
      4. +
    + +
    + + diff --git a/man/git-show-merged-branches.md b/man/git-show-merged-branches.md new file mode 100644 index 0000000..1e344a0 --- /dev/null +++ b/man/git-show-merged-branches.md @@ -0,0 +1,26 @@ +git-show-merged-branches(1) -- Show merged branches +=================================================== + +## SYNOPSIS + +`git-show-merged-branches` + +## DESCRIPTION + + Show all branches merged in to current HEAD. + +## EXAMPLES + + $ git show-merged-branches + +## AUTHOR + +Written by Paul Schreiber <> + +## REPORTING BUGS + +<> + +## SEE ALSO + +<> diff --git a/man/git-show-unmerged-branches.1 b/man/git-show-unmerged-branches.1 new file mode 100644 index 0000000..7ed3d0f --- /dev/null +++ b/man/git-show-unmerged-branches.1 @@ -0,0 +1,30 @@ +.\" generated with Ronn/v0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 +. +.TH "GIT\-SHOW\-UNMERGED\-BRANCHES" "1" "March 2015" "" "" +. +.SH "NAME" +\fBgit\-show\-unmerged\-branches\fR \- Show unmerged branches +. +.SH "SYNOPSIS" +\fBgit\-show\-unmerged\-branches\fR +. +.SH "DESCRIPTION" +Shows all branches not merged in to current HEAD\. +. +.SH "EXAMPLES" +. +.nf + +$ git show\-unmerged\-branches +. +.fi +. +.SH "AUTHOR" +Written by Paul Schreiber <\fIpaulschreiber@gmail\.com\fR> +. +.SH "REPORTING BUGS" +<\fIhttps://github\.com/tj/git\-extras/issues\fR> +. +.SH "SEE ALSO" +<\fIhttps://github\.com/tj/git\-extras\fR> diff --git a/man/git-show-unmerged-branches.html b/man/git-show-unmerged-branches.html new file mode 100644 index 0000000..bb6e899 --- /dev/null +++ b/man/git-show-unmerged-branches.html @@ -0,0 +1,110 @@ + + + + + + git-shw-unmerged-branches(1) - Show unmerged branches + + + + +
    + + + +
      +
    1. git-show-unmerged-branches(1)
      2. +
    2. +
    3. git-show-unmerged-branches(1)
      4. +
    + +

    NAME

    +

    + git-show-unmerged-branches - Show unmerged branches +

    + +

    SYNOPSIS

    + +

    git-show-unmerged-branches

    + +

    DESCRIPTION

    + +

    Shows all branches not merged in to current HEAD.

    + +

    EXAMPLES

    + +
    $ git show-unmerged-branches
+
    + +

    AUTHOR

    + +

    Written by Paul Schreiber <paulschreiber@gmail.com>

    + +

    REPORTING BUGS

    + +

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

    + +

    SEE ALSO

    + +

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

    + + +
      +
    1. +
    2. March 2015
      3. +
    3. git-show-unmerged-branches(1)
      4. +
    + +
    + + diff --git a/man/git-show-unmerged-branches.md b/man/git-show-unmerged-branches.md new file mode 100644 index 0000000..5612156 --- /dev/null +++ b/man/git-show-unmerged-branches.md @@ -0,0 +1,26 @@ +git-show-unmerged-branches(1) -- Show unmerged branches +======================================================= + +## SYNOPSIS + +`git-show-unmerged-branches` + +## DESCRIPTION + + Show all branches not merged in to current HEAD. + +## EXAMPLES + + $ git show-unmerged-branches + +## AUTHOR + +Written by Paul Schreiber <> + +## REPORTING BUGS + +<> + +## SEE ALSO + +<> diff --git a/man/index.txt b/man/index.txt index 6250cd7..beb9920 100644 --- a/man/index.txt +++ b/man/index.txt @@ -33,7 +33,9 @@ git-rename-tag(1) git-rename-tag git-repl(1) git-repl git-reset-file(1) git-reset-file git-setup(1) git-setup +git-show-merged-branches(1) git-show-merged-branches git-show-tree(1) git-show-tree +git-show-unmerged-branches(1) git-show-unmerged-branches git-squash(1) git-squash git-summary(1) git-summary git-touch(1) git-touch