Merge pull request #34 from bill-auger/master

latest git-branch-status script
jwiegley · Jul 12, 2017 · 9f1c84d · 9f1c84d
2 parents 4485bcc + 4708bfa
commit 9f1c84d
Show file tree

Hide file tree

Showing 2 changed files with 281 additions and 161 deletions.
diff --git a/git-branch-status-subtree/README.md b/git-branch-status-subtree/README.md
@@ -1,28 +1,66 @@
-# git-branch-status
-A BASH script that prints out pretty git branch sync status reports
+# git-branch-status - print pretty git branch sync status reports
+
+By default, the `git-branch-status` command shows the divergence relationship between branches for which the upstream differs from it's local counterpart.
+
+A number of command-line switches exist, selecting various reports that compare any or all local or remote branches.
+
 
 ![git-branch-status screenshot][scrot]
 
+
+#### Notes regarding the screenshot above:
+
+* This is showing the exhaustive '--all' report. Other reports are constrained (see 'USAGE' below).
+* The "local <-> upstream" section is itemizing all local branches. In this instance:
+  * The local branch 'deleteme' is not tracking any remote branch.
+  * The local branch 'kd35a' is tracking remote branch 'kd35a/master'.
+  * The local branch 'knovoselic' is tracking remote branch 'knovoselic/master'.
+  * The local branch 'master' is tracking remote branch 'origin/master'.
+* The "local <-> kd35a" section is itemizing all branches on the 'kd35a' remote. In this instance:
+  * The local branch 'master' is 2 commits behind and 24 commits ahead of the remote branch 'kd35a/master'.
+* The "local <-> knovoselic" section is itemizing all branches on the 'knovoselic' remote. In this instance:
+  * The local branch 'master' is 4 commits behind and 24 commits ahead of the remote branch 'knovoselic/master'.
+* The "local <-> origin" section is itemizing all branches on the 'origin' remote. In this instance:
+  * The remote branch 'origin/delete-me' is not checked-out locally.
+  * The remote branch 'origin/master' is tracked by the local branch 'master'.
+* The asterisks to the left of the local 'master' branch names indicate the current working branch.
+* The blue branch names indicate a tracking relationship between a local and it's upstream branch.
+* The "local <-> upstream" section relates tracking branches while remote-specific sections relate identically named branches. This distinction determines the semantics of the green "... synchronized" messages.
+  * In the "local <-> upstream" section, this indicates that all local branches which are tracking an upstream are synchronized with their respective upstream counterparts.
+  * In remote-specific sections, this indicates that all local branches which have the same name as some branch on this remote are synchronized with that remote branch.
+  * In single branch reports, this indicates that the local branch is tracking an upstream branch and is synchronized with it's upstream counterpart.
+  * In arbitrary branch comparison reports, this indicates that the two compared branches are synchronized with each other.
+
+
 ```
 USAGE:
 
   git-branch-status
-  git-branch-status [-a | --all]
-  git-branch-status [-b | --branch] [branch-name]
-  git-branch-status [-d | --dates]
-  git-branch-status [-h | --help]
-  git-branch-status [-r | --remotes]
-  git-branch-status [-v | --verbose]
+  git-branch-status [ base-branch-name compare-branch-name ]
+  git-branch-status [ -a | --all ]
+  git-branch-status [ -b | --branch ] [filter-branch-name]
+  git-branch-status [ -d | --dates ]
+  git-branch-status [ -h | --help ]
+  git-branch-status [ -l | --local ]
+  git-branch-status [ -r | --remotes ]
+  git-branch-status [ -v | --verbose ]
+
 
 EXAMPLES:
 
-  # show only branches for which upstream HEAD differs from local
+  # show only branches for which upstream differs from local
   $ git-branch-status
     | collab-branch  | (behind 1) | (ahead 2) | origin/collab-branch  |
     | feature-branch | (even)     | (ahead 2) | origin/feature-branch |
     | master         | (behind 1) | (even)    | origin/master         |
 
-  # show all branches - even those with no upstream or no local and those up-to-date
+  # compare two arbitrary branches (either local and either remote)
+  $ git-branch-status local-arbitrary-branch fork/arbitrary-branch
+    | local-arbitrary-branch | (even)     | (ahead 1) | fork/arbitrary-branch  |
+  $ git-branch-status fork/arbitrary-branch local-arbitrary-branch
+    | fork/arbitrary-branch  | (behind 1) | (even)    | local-arbitrary-branch |
+
+  # show all branches - including those synchronized, non-tracking, or not checked-out
   $ git-branch-status -a
   $ git-branch-status --all
     | master         | (even)     | (ahead 1) | origin/master             |
@@ -53,11 +91,18 @@ EXAMPLES:
   $ git-branch-status --help
       "prints this usage message"
 
-  # show all remote branches - even those with no local
+  # show all local branches - including those synchronized or non-tracking
+  $ git-branch-status -l
+  $ git-branch-status --local
+    | master         | (even)     | (ahead 1) | origin/master             |
+    | tracked-branch | (even)     | (even)    | origin/tracked-branch     |
+    | local-branch   | n/a        | n/a       | (no upstream)             |
+
+  # show all remote branches - including those not checked-out
   $ git-branch-status -r
   $ git-branch-status --remotes
-    | master         | (behind 1) | (even) | a-remote/master           |
-    | (no local)     | n/a        | n/a    | a-remote/untracked-branch |
+    | master     | (behind 1) | (even) | a-remote/master           |
+    | (no local) | n/a        | n/a    | a-remote/untracked-branch |
 
   # show all branches with timestamps (like -a -d)
   $ git-branch-status -v
@@ -67,9 +112,12 @@ EXAMPLES:
     | 1999-12-31 tracked | (even)     | (even) | 2000-01-01 origin/tracked |
 ```
 
-_NOTE: please direct comments, bug reports, feature requests, or PRs to the upstream repo:
-[https://github.com/bill-auger/git-branch-status/issues/][issues]_
+
+_NOTE: please direct comments, bug reports, feature requests, or PRs to one of the upstream repos:_
+* [https://github.com/bill-auger/git-branch-status/issues/][github-issues]
+* [https://notabug.org/bill-auger/git-branch-status/issues/][notabug-issues]
 
 
-[scrot]:  http://bill-auger.github.io/git-branch-status-scrot.png "git-branch-status screenshot"
-[issues]: https://github.com/bill-auger/git-branch-status/issues/
+[scrot]:          http://bill-auger.github.io/git-branch-status-scrot.png "git-branch-status screenshot"
+[github-issues]:  https://github.com/bill-auger/git-branch-status/issues/
+[notabug-issues]: https://notabug.org/bill-auger/git-branch-status/issues/