diff --git a/docs/html/depot_tools.html b/docs/html/depot_tools.html new file mode 100644 index 0000000000..1c3084a73c --- /dev/null +++ b/docs/html/depot_tools.html @@ -0,0 +1,836 @@ + + + + + +depot_tools(1) + + + + + +
+
+

DESCRIPTION

+
+

The Chromium depot_tools suite contains many tools to assist/augment the +Chromium development environment. The tools may be downloaded from +here.

+

There are two primary categories of tools. Some of these tools are essential +to the development flow, in the sense that you cannot successfully develop +Chromium without them.

+

Other tools are merely helper tools. Not required, but they can substantially +ease the develpment workflow.

+

A listing of both categories of tools follows.

+
+
+
+

HELPER TOOLS

+
+
+
+git-freeze(1) +
+
+

+Freeze all changes on a branch (indexed and unindexed). +

+
+
+git-map-branches(1) +
+
+

+Helper script to display all local git branches with ‘upstream’ hierarchy in +colorized terminal format. +

+
+
+
+
+git-map(1) +
+
+

+Display history of all branches in a colorized terminal format. +

+
+
+
+
+git-nav-downstream(1) +
+
+

+Checkout a downstream branch of the currently checked out branch. +

+
+
+git-nav-upstream(1) +
+
+

+Checkout the upstream branch of the currently checked out branch. +

+
+
+git-thaw(1) +
+
+

+Un-freeze all changes on a frozen branch. +

+
+
+
+
+
+
+ + + diff --git a/git_docs/htmlout/git-freeze.html b/docs/html/git-freeze.html similarity index 86% rename from git_docs/htmlout/git-freeze.html rename to docs/html/git-freeze.html index 3f1abf5163..f938c5c1de 100644 --- a/git_docs/htmlout/git-freeze.html +++ b/docs/html/git-freeze.html @@ -535,6 +535,13 @@ body.manpage div.sectionbody { } +div.listingblock > div.content { + background: rgb(28, 28, 28); +} + +div.listingblock > div > pre > code { + color: rgb(187, 187, 187); +} + + + +
+
+

SYNOPSIS

+
+
+
git map-branches
+
+
+
+
+
+

DESCRIPTION

+
+

Git map-branches displays all local branches such that:

+
    +
  • +

    +Current branch is cyan. +

    +
      +
    • +

      +The branch which will be modified with git-commit is denoted with an asterisk + (*) after the name. +

      +
      • +
    +
    • +
  • +

    +Local branches are green. +

    +
    • +
  • +

    +Remote branches are red (usually, the root of all other branches). +

    +
    • +
  • +

    +{NO UPSTREAM} is a special placeholder in magenta. +

    +
      +
    • +

      +Branches which have this as their parent are usually misconfigured, and + should be assigned a parent by checking out the branch and running git branch + --set-upstream-to=<correct parent branch>. +

      +
      • +
    +
    • +
+
+ + + +
+
Note
+		If multiple branches are on the same commit, they will all be cyan.
+
+
+
+
+

EXAMPLE

+
+

Given the hypothetical demo repo in git-map(1)'s EXAMPLE section, and +assuming that the frozen_changes branch was currently checked out, running +git map-branches would result in an output like:

+
+
+
$ git map-branches
+origin/master
+  cool_feature
+    subfeature
+  frozen_changes *
+  master
+{NO UPSTREAM}
+  bogus_noparent
+  duplicate_cool_feature_no_upstream
+
+
+
+
+

SEE ALSO

+
+

git-map(1)

+
+
+
+

CHROMIUM DEPOT_TOOLS

+
+

Part of the chromium depot_tools(1) suite. These tools are meant to +assist with the development of chromium and related projects. Download the tools +from here.

+
+
+
+
+ + + diff --git a/docs/html/git-map.html b/docs/html/git-map.html new file mode 100644 index 0000000000..828e1c0576 --- /dev/null +++ b/docs/html/git-map.html @@ -0,0 +1,879 @@ + + + + + +git-map(1) + + + + + +
+
+

SYNOPSIS

+
+
+
git map [<extra_args>…]
+
+
+
+
+
+

DESCRIPTION

+
+

Git map formats the output of git log --graph from all refs such that:

+
    +
  • +

    +Current branch is cyan. +

    +
    • +
  • +

    +Local branches are green. +

    +
    • +
  • +

    +Remote branches are red. +

    +
    • +
  • +

    +Tags are magenta. +

    +
    • +
  • +

    +The currently checked out commit is highlighted with a blue background. +

    +
    • +
+

The output is automatically piped through the less pager command, even on +windows.

+
+
+
+

OPTIONS

+
+
+
+<extra_args>… +
+
+

+ Extra parameters to pass to the internal git-log(1) invocation. This + can be used to restrict what refs git map operates on, etc. +

+

If you run git map with a series of fixed arguments frequently, you can use +the depot_tools.map_extra configuration variable to pre-set arguments (See +CONFIGURATION VARIABLES)

+
+
+
+
+
+

CONFIGURATION VARIABLES

+
+
+

depot_tools.map_extra

+

Each value of the depot_tools.map_extra config variable is applied as an +additional argument to git log during the execution of git map. If you wish to +configure this, use git config --add depot_tools.map_extra <value> to do so.

+
+
+
+
+

EXAMPLE

+
+

Running git map would result in an output something like:

+
+
+
$ git map
+*​ 7dcfe47        (​frozen_changes​) 2014-03-12 ~ FREEZE.unindexed
+* 4b0c180        2014-03-12 ~ modfile
+* 59a7cca        2014-03-12 ~ a deleted file
+* 6bec695        (​origin/master​) 2014-03-11 ~ Add neat feature
+* d15a38a        2014-03-11 ~ Epic README update
+* d559894        (​master​) 2014-03-11 ~ Important upstream change
+| * 9c311fd      (​cool_feature​) 2014-03-11 ~ Respond to CL comments
+| | * 2a1eeb2    (​subfeature​) 2014-03-11 ~ integrate with CoolService
+| | * d777af6    2014-03-11 ~ slick commenting action
+| |/
+| * 265803a      2014-03-11 ~ another improvement
+| * 6d831ac      (​spleen_tag​) 2014-03-11 ~ Refactor spleen
+| * 82e74ab      2014-03-11 ~ Add widget
+|/
+* d08c5b3        (​bogus_noparent​) 2014-03-11 ~ Wonderful beginnings
+
+

As you can see, the structure of the commit history is visible, particularly +what the parents of each commit are. In order to see the upstream +relationships of the branches (i.e. which branch is tracking which other +branch), use the git-map-branches(1) command.

+
+
+
+

SEE ALSO

+
+

git-map-branches(1)

+
+
+
+

CHROMIUM DEPOT_TOOLS

+
+

Part of the chromium depot_tools(1) suite. These tools are meant to +assist with the development of chromium and related projects. Download the tools +from here.

+
+
+
+
+ + + diff --git a/docs/html/git-nav-downstream.html b/docs/html/git-nav-downstream.html new file mode 100644 index 0000000000..da5b509386 --- /dev/null +++ b/docs/html/git-nav-downstream.html @@ -0,0 +1,825 @@ + + + + + +git-nav-downstream(1) + + + + + +
+
+

SYNOPSIS

+
+
+
git nav-downstream
+
+
+
+
+
+

DESCRIPTION

+
+

git-nav-downstream takes the current branch and discovers all branches +downstream of it. If there is only one branch downstream of the current branch, +the command will check that out. If there's more than one downstream branch, the +command will prompt you with a selection of the branches.

+
+
+
+

EXAMPLE

+
+
+
+
$ git map-branches
+origin/master *​
+  cool_feature
+    subfeature
+  frozen_changes
+  master
+{NO UPSTREAM}
+  bogus_noparent
+$ git nav-downstream
+
+Please select a downstream branch
+  0. cool_feature
+  1. frozen_changes
+  2. master
+Selection (0-2)[0]: 0
+$ git map-branches
+origin/master
+  cool_feature *​
+    subfeature
+  frozen_changes
+  master
+{NO UPSTREAM}
+  bogus_noparent
+
+
+
+
+

SEE ALSO

+
+

git-map-branches(1), git-nav-upstream(1)

+
+
+
+

CHROMIUM DEPOT_TOOLS

+
+

Part of the chromium depot_tools(1) suite. These tools are meant to +assist with the development of chromium and related projects. Download the tools +from here.

+
+
+
+
+ + + diff --git a/docs/html/git-nav-upstream.html b/docs/html/git-nav-upstream.html new file mode 100644 index 0000000000..bfe08f8707 --- /dev/null +++ b/docs/html/git-nav-upstream.html @@ -0,0 +1,817 @@ + + + + + +git-nav-upstream(1) + + + + + +
+
+

SYNOPSIS

+
+
+
git nav-upstream
+
+
+
+
+
+

DESCRIPTION

+
+

git-nav-upstream takes the current branch, finds it's upstream branch, and +checks that out.

+
+
+
+

EXAMPLE

+
+
+
+
$ git map-branches
+origin/master
+  cool_feature
+    subfeature *​
+  frozen_changes
+  master
+{NO UPSTREAM}
+  bogus_noparent
+$ git nav-upstream
+$ git map-branches
+origin/master
+  cool_feature *​
+    subfeature
+  frozen_changes
+  master
+{NO UPSTREAM}
+  bogus_noparent
+
+
+
+
+

SEE ALSO

+
+

git-map-branches(1), git-nav-downstream(1)

+
+
+
+

CHROMIUM DEPOT_TOOLS

+
+

Part of the chromium depot_tools(1) suite. These tools are meant to +assist with the development of chromium and related projects. Download the tools +from here.

+
+
+
+
+ + + diff --git a/git_docs/htmlout/git-thaw.html b/docs/html/git-thaw.html similarity index 97% rename from git_docs/htmlout/git-thaw.html rename to docs/html/git-thaw.html index cc2683a5ff..a568e7db5a 100644 --- a/git_docs/htmlout/git-thaw.html +++ b/docs/html/git-thaw.html @@ -535,6 +535,13 @@ body.manpage div.sectionbody { } +div.listingblock > div.content { + background: rgb(28, 28, 28); +} + +div.listingblock > div > pre > code { + color: rgb(187, 187, 187); +}