Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Side by Side Diff: docs/src/git-new-branch.txt

Issue 225433003: Add a basic tutorial for the tools in depot_tools. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@git_map
Patch Set: pylint Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « docs/src/git-nav-upstream.demo.1.sh ('k') | docs/src/git-new-branch.demo.1.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 git-new-branch(1) 1 git-new-branch(1)
2 ================= 2 =================
3 3
4 NAME 4 NAME
5 ---- 5 ----
6 git-new-branch - 6 git-new-branch -
7 include::_git-new-branch_desc.helper.txt[] 7 include::_git-new-branch_desc.helper.txt[]
8 8
9 SYNOPSIS 9 SYNOPSIS
10 -------- 10 --------
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 ----------------------- 49 -----------------------
50 50
51 depot-tools.upstream 51 depot-tools.upstream
52 ~~~~~~~~~~~~~~~~~~~~ 52 ~~~~~~~~~~~~~~~~~~~~
53 53
54 This configures the default 'upstream' for all new branches. If it is unset, it 54 This configures the default 'upstream' for all new branches. If it is unset, it
55 defaults to 'origin/master'. This is considered to be the 'root' branch. 55 defaults to 'origin/master'. This is considered to be the 'root' branch.
56 56
57 EXAMPLE 57 EXAMPLE
58 ------- 58 -------
59 demo:1[]
59 60
60 [subs="specialcharacters,quotes,attributes,callouts"] 61 1. Note that both branches are cyan because they are currently the same
61 ---- 62 'commit' object. See linkgit:git-map-branches[1] for more detail.
62 [white]**$ git map-branches**
63 [red]#origin/master#
64 [green]#cool_feature#
65 [green]#subfeature#
66 [aqua]#frozen_changes *#
67 [white]**$ git new-branch independent_cl**
68 [white]**$ git map-branches**
69 [red]#origin/master#
70 [green]#cool_feature#
71 [green]#subfeature#
72 [green]#frozen_changes#
73 [aqua]#independent_cl *#
74 [white]**$ git new-branch --upstream subfeature nested_cl**
75 [white]**$ git map-branches**
76 [red]#origin/master#
77 [green]#cool_feature#
78 [aqua]#subfeature# <1>
79 [aqua]#nested_cl *#
80 [green]#frozen_changes#
81 [green]#independent_cl#
82 [white]**$ git checkout cool_feature**
83 [white]**$ git new-branch --upstream_current cl_depends_on_cool_feature**
84 [white]**$ git map-branches**
85 [red]#origin/master#
86 [aqua]#cool_feature#
87 [aqua]#cl_depends_on_cool_feature *#
88 [green]#subfeature#
89 [green]#nested_cl#
90 [green]#frozen_changes#
91 [green]#independent_cl#
92 ----
93 <1> Note that both branches are cyan because they are currently the same
94 'commit' object. See linkgit::git-map-branches[1] for more detail.
95 63
96 include::_aliases.txt[] 64 include::_aliases.txt[]
97 65
98 ---- 66 ----
99 [alias] 67 [alias]
100 git nb = new-branch 68 git nb = new-branch
101 git tb = new-branch --upstream_current <1> 69 git tb = new-branch --upstream_current <1>
102 ---- 70 ----
103 <1> mnemonic: tb -> "track branch" 71 <1> mnemonic: tb -> "track branch"
104 72
105 73
106 SEE ALSO 74 SEE ALSO
107 -------- 75 --------
108 linkgit:git-rebase-update[1], linkgit:git-reparent-branch[1], 76 linkgit:git-rebase-update[1], linkgit:git-reparent-branch[1],
109 linkgit:git-rename-branch[1], linkgit:git-upstream-diff[1] 77 linkgit:git-rename-branch[1], linkgit:git-upstream-diff[1]
110 78
111 include::_footer.txt[] 79 include::_footer.txt[]
112 80
113 // vim: ft=asciidoc: 81 // vim: ft=asciidoc:
OLDNEW
« no previous file with comments | « docs/src/git-nav-upstream.demo.1.sh ('k') | docs/src/git-new-branch.demo.1.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698