| OLD | NEW |
|---|
| 1 git-map-branches(1) | 1 git-map-branches(1) |
| 2 =================== | 2 =================== |
| 3 | 3 |
| 4 NAME | 4 NAME |
| 5 ---- | 5 ---- |
| 6 git-map-branches - | 6 git-map-branches - |
| 7 include::_git-map-branches_desc.helper.txt[] | 7 include::_git-map-branches_desc.helper.txt[] |
| 8 | 8 |
| 9 SYNOPSIS | 9 SYNOPSIS |
| 10 -------- | 10 -------- |
| 11 [verse] | 11 [verse] |
| 12 'git map-branches' | 12 'git map-branches' |
| 13 | 13 |
| 14 DESCRIPTION | 14 DESCRIPTION |
| 15 ----------- | 15 ----------- |
| 16 | 16 |
| 17 Git map-branches displays all local branches such that: | 17 Git map-branches displays all local branches such that: |
| 18 | 18 |
| 19 * Current branch is [aqua]#cyan#. | 19 * Current branch is [aqua]#cyan#. |
| 20 ** The branch which will be modified with git-commit is denoted with an asterisk | 20 ** The branch which will be modified with git-commit is denoted with an asterisk |
| 21 (`*`) after the name. | 21 (`*`) after the name. |
| 22 * Local branches are [green]#green#. | 22 * Local branches are [green]#green#. |
| 23 * Remote branches are [red]#red# (usually, the root of all other branches). | 23 * Remote branches are [red]#red# (usually, the root of all other branches). |
| 24 * 'branch-heads' branches are [blue]#blue#. |
| 24 * `{NO UPSTREAM}` is a special placeholder in [fuchsia]#magenta#. | 25 * `{NO UPSTREAM}` is a special placeholder in [fuchsia]#magenta#. |
| 25 ** Branches which have this as their parent are usually misconfigured, and | 26 ** Branches which have this as their parent are usually misconfigured, and |
| 26 should be assigned a parent by checking out the branch and running git branch | 27 should be assigned a parent by checking out the branch and running git branch |
| 27 --set-upstream-to=<correct parent branch>. | 28 --set-upstream-to=<correct parent branch>. |
| 28 | 29 |
| 29 NOTE: If multiple branches are on the same commit, they will all be cyan. | 30 NOTE: If multiple branches are on the same commit, they will all be cyan. |
| 30 | 31 |
| 31 EXAMPLE | 32 EXAMPLE |
| 32 ------- | 33 ------- |
| 33 | 34 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 44 git bmap = map-branches | 45 git bmap = map-branches |
| 45 ---- | 46 ---- |
| 46 | 47 |
| 47 SEE ALSO | 48 SEE ALSO |
| 48 -------- | 49 -------- |
| 49 linkgit:git-map[1] | 50 linkgit:git-map[1] |
| 50 | 51 |
| 51 include::_footer.txt[] | 52 include::_footer.txt[] |
| 52 | 53 |
| 53 // vim: ft=asciidoc: | 54 // vim: ft=asciidoc: |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 576423002:
Fix map-branches issues and add coloring for 'branch-heads', (Closed)
Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master