| 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 * `{NO UPSTREAM}` is a special placeholder in [fuchsia]#magenta#. | 24 * `{NO UPSTREAM}` is a special placeholder in [fuchsia]#magenta#. |
| 25 ** Branches which have this as their parent are usually misconfigured, and | 25 ** 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 | 26 should be assigned a parent by checking out the branch and running git branch |
| 27 » --set-upstream-to=<correct parent branch>. | 27 --set-upstream-to=<correct parent branch>. |
| 28 | 28 |
| 29 NOTE: If multiple branches are on the same commit, they will all be cyan. | 29 NOTE: If multiple branches are on the same commit, they will all be cyan. |
| 30 | 30 |
| 31 EXAMPLE | 31 EXAMPLE |
| 32 ------- | 32 ------- |
| 33 | 33 |
| 34 Given the hypothetical demo repo in linkgit:git-map[1]\'s EXAMPLE section, and | 34 Given the hypothetical demo repo in linkgit:git-map[1]\'s EXAMPLE section, and |
| 35 assuming that the `frozen_changes` branch was currently checked out, running | 35 assuming that the `frozen_changes` branch was currently checked out, running |
| 36 'git map-branches' would result in an output like: | 36 'git map-branches' would result in an output like: |
| 37 | 37 |
| 38 [subs="quotes"] | 38 [subs="quotes"] |
| 39 ---- | 39 ---- |
| 40 [white]**$ git map-branches** | 40 [white]**$ git map-branches** |
| 41 [red]#origin/master# | 41 [red]#origin/master# |
| 42 [green]#cool_feature# | 42 [green]#cool_feature# |
| 43 [green]#subfeature# | 43 [green]#subfeature# |
| 44 [aqua]#frozen_changes *# | 44 [aqua]#frozen_changes *# |
| 45 [green]#master# | 45 [green]#master# |
| 46 [fuchsia]#{NO UPSTREAM}# | 46 [fuchsia]#{NO UPSTREAM}# |
| 47 [green]#bogus_noparent# | 47 [green]#bogus_noparent# |
| 48 [aqua]#duplicate_cool_feature_no_upstream# | 48 [aqua]#duplicate_cool_feature_no_upstream# |
| 49 ---- | 49 ---- |
| 50 | 50 |
| 51 include::_aliases.txt[] |
| 52 |
| 53 ---- |
| 54 [alias] |
| 55 git bmap = map-branches |
| 56 ---- |
| 57 |
| 51 SEE ALSO | 58 SEE ALSO |
| 52 -------- | 59 -------- |
| 53 linkgit:git-map[1] | 60 linkgit:git-map[1] |
| 54 | 61 |
| 55 include::_footer.txt[] | 62 include::_footer.txt[] |
| 56 | 63 |
| 57 // vim: ft=asciidoc noexpandtab: | 64 // vim: ft=asciidoc: |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 184253003:
Add git-reup and friends (Closed)
Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@freeze_thaw