aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
main
chrome/4147
chrome/3987
chrome/3865
chrome/3904
infra/config
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'dff2104727'
${ noResults }
depot_tools/man/man1/git-new-branch.1

177 lines
5.8 KiB
Groff
Raw Normal View History Unescape Escape

Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
'\" t
.\" Title: git-new-branch
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
Update documentation of `git new-branch` Include verbose output of `git map-branches` to make visible what the state of the different branches is. R=iannucci@chromium.org Change-Id: I4af03ef15b39e4ba84a41c01d1ec801e7bb4bbd6 Reviewed-on: https://chromium-review.googlesource.com/c/1360711 Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
6 years ago
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
[man] Fix link to the git repository "here" is not a nice name for the link, and the footnote generated for the man page. Replace it by a properly named link. Note that some of the changes in the generated files are unrelated. Those files have not been updated since May 2019, and it seems like some previous changes were not reflected yet. R=ehmaldonado@chromium.org Change-Id: I31c784e7eb649bcaa74ba223027fb2c142f52838 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2346371 Reviewed-by: Dirk Pranke <dpranke@google.com> Commit-Queue: Clemens Backes <clemensb@chromium.org>
5 years ago
.\" Date: 08/10/2020
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.\" Manual: Chromium depot_tools Manual
[man] Fix link to the git repository "here" is not a nice name for the link, and the footnote generated for the man page. Replace it by a properly named link. Note that some of the changes in the generated files are unrelated. Those files have not been updated since May 2019, and it seems like some previous changes were not reflected yet. R=ehmaldonado@chromium.org Change-Id: I31c784e7eb649bcaa74ba223027fb2c142f52838 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2346371 Reviewed-by: Dirk Pranke <dpranke@google.com> Commit-Queue: Clemens Backes <clemensb@chromium.org>
5 years ago
.\" Source: depot_tools 8c3f7227
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.\" Language: English
.\"
[man] Fix link to the git repository "here" is not a nice name for the link, and the footnote generated for the man page. Replace it by a properly named link. Note that some of the changes in the generated files are unrelated. Those files have not been updated since May 2019, and it seems like some previous changes were not reflected yet. R=ehmaldonado@chromium.org Change-Id: I31c784e7eb649bcaa74ba223027fb2c142f52838 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2346371 Reviewed-by: Dirk Pranke <dpranke@google.com> Commit-Queue: Clemens Backes <clemensb@chromium.org>
5 years ago
.TH "GIT\-NEW\-BRANCH" "1" "08/10/2020" "depot_tools 8c3f7227" "Chromium depot_tools Manual"
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
git-new-branch \- Create a new branch with correct tracking information\&.
.SH "SYNOPSIS"
.sp
.nf
\fIgit new\-branch\fR <branch_name>
\fIgit new\-branch\fR \-\-upstream_current <branch_name>
\fIgit new\-branch\fR \-\-upstream <REF> <branch_name>
\fIgit new\-branch\fR \-\-lkgr <branch_name>
.fi
.sp
.SH "DESCRIPTION"
.sp
Revert "Fix semantics of git new-branch --upstream" This reverts commit ba83229a731721ff888374b0ba6eab8ec80fb652. Reason for revert: After mail discussion we came to the conclusion that the old behavior makes more sense. Original change's description: > Fix semantics of git new-branch --upstream > > Currently, the "--upstream A" option for new-branch behaves totally > different than "--upstream_current". While "--upstream A" checks out > branch A and then creates a new branch which tracks A, > "--upstream_current" creates a new branch for the current HEAD and sets > the upstream to the previously checked out branch. > > As the documentation does not mention that any of the options changes > the currently-checked-out commit (HEAD), this CL changes the semantics > of "git new-branch --upstream A B" to be identical to "git checkout -b B > && git branch --set-upstream-to A". > > It also slightly extends the documentation to mention that in any case > the new branch is based on HEAD. > > R=​iannucci@chromium.org > > Change-Id: Ic335d2caf27cb6afca1b8bc5a008424c0e880fca > Reviewed-on: https://chromium-review.googlesource.com/c/1350748 > Reviewed-by: Robbie Iannucci <iannucci@chromium.org> > Commit-Queue: Clemens Hammacher <clemensh@chromium.org> > Auto-Submit: Clemens Hammacher <clemensh@chromium.org> TBR=iannucci@chromium.org,tandrii@chromium.org,clemensh@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: I7463935af172f0801c7da94d2de106a02fc4c42e Reviewed-on: https://chromium-review.googlesource.com/c/1362972 Reviewed-by: Sergiy Belozorov <sergiyb@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
6 years ago
Creates a new branch\&. By default the new branch will track the configured upstream for the repo (defaults to \fIorigin/master\fR)\&. If one of the other options is specified, it will track that other ref instead\&.
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.sp
Conceptually, each branch in your repo represents one \fIChange List (CL)\fR\&. If you have many independent CLs (i\&.e\&. the changes in one do not interact with/depend on the changes in another), then you should create them as new branches tracking the default upstream (i\&.e\&. git new\-branch <branch_name>)\&. If you have features which depend on each other, you should create stacked branches using git new\-branch \-\-upstream_current <branch_name>\&.
.SH "OPTIONS"
.PP
\-\-upstream_current
.RS 4
Set the tracking (upstream) branch to the currently\-checked\-out branch\&.
.RE
.PP
Fix typo in man page for git new-branch The option is --upstream, not --uptstream. R=sergiyb@chromium.org Change-Id: I007dfecae9ba576d65bbb8b96c3f2296d2152a23 Reviewed-on: https://chromium-review.googlesource.com/c/1350747 Auto-Submit: Clemens Hammacher <clemensh@chromium.org> Reviewed-by: Sergiy Belozorov <sergiyb@chromium.org> Reviewed-by: Dirk Pranke <dpranke@chromium.org> Commit-Queue: Dirk Pranke <dpranke@chromium.org>
6 years ago
\-\-upstream <REF>
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.RS 4
Set the tracking (upstream) branch to <REF>\&. <REF> may be a local branch, remote branch, or a tag\&.
.RE
.PP
\-\-lkgr
.RS 4
Alias for
\-\-upstream lkgr\&.
.RE
.PP
<branch_name>
.RS 4
The name for the new branch\&.
.RE
.SH "CONFIGURATION VARIABLES"
.SS "depot\-tools\&.upstream"
.sp
[man] Fix link to the git repository "here" is not a nice name for the link, and the footnote generated for the man page. Replace it by a properly named link. Note that some of the changes in the generated files are unrelated. Those files have not been updated since May 2019, and it seems like some previous changes were not reflected yet. R=ehmaldonado@chromium.org Change-Id: I31c784e7eb649bcaa74ba223027fb2c142f52838 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2346371 Reviewed-by: Dirk Pranke <dpranke@google.com> Commit-Queue: Clemens Backes <clemensb@chromium.org>
5 years ago
This configures the default \fIupstream\fR for all new branches\&. If it is unset, it defaults to \fIorigin\fR\*(Aqs default branch or \fIorigin/master\fR if that can\(cqt be found\&. This is considered to be the \fIroot\fR branch\&.
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.SH "EXAMPLE"
Add a tutorial / walkthrough for pure-git workflow. TBR=agable@chromium.org, szager@chromium.org BUG=261743 Review URL: https://codereview.chromium.org/225433003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263164 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.sp
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.sp
.if n \{\
.RS 4
.\}
.nf
Update documentation of `git new-branch` Include verbose output of `git map-branches` to make visible what the state of the different branches is. R=iannucci@chromium.org Change-Id: I4af03ef15b39e4ba84a41c01d1ec801e7bb4bbd6 Reviewed-on: https://chromium-review.googlesource.com/c/1360711 Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
6 years ago
\fB$ git map\-branches \-v\fR
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
origin/master
Update documentation of `git new-branch` Include verbose output of `git map-branches` to make visible what the state of the different branches is. R=iannucci@chromium.org Change-Id: I4af03ef15b39e4ba84a41c01d1ec801e7bb4bbd6 Reviewed-on: https://chromium-review.googlesource.com/c/1360711 Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
6 years ago
cool_feature [ ahead 4 ]
subfeature [ ahead 2 | behind 1 ]
fixit [ ahead 2 ]
\fB frozen_branch * [ ahead 3 ]
Add a tutorial / walkthrough for pure-git workflow. TBR=agable@chromium.org, szager@chromium.org BUG=261743 Review URL: https://codereview.chromium.org/225433003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263164 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
$ git new\-branch independent_cl\fR
Update documentation of `git new-branch` Include verbose output of `git map-branches` to make visible what the state of the different branches is. R=iannucci@chromium.org Change-Id: I4af03ef15b39e4ba84a41c01d1ec801e7bb4bbd6 Reviewed-on: https://chromium-review.googlesource.com/c/1360711 Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
6 years ago
\fB$ git map\-branches \-v\fR
Add a tutorial / walkthrough for pure-git workflow. TBR=agable@chromium.org, szager@chromium.org BUG=261743 Review URL: https://codereview.chromium.org/225433003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263164 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
\fBorigin/master
Update documentation of `git new-branch` Include verbose output of `git map-branches` to make visible what the state of the different branches is. R=iannucci@chromium.org Change-Id: I4af03ef15b39e4ba84a41c01d1ec801e7bb4bbd6 Reviewed-on: https://chromium-review.googlesource.com/c/1360711 Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
6 years ago
\fR cool_feature [ ahead 4 ]
subfeature [ ahead 2 | behind 1 ]
fixit [ ahead 2 ]
frozen_branch [ ahead 3 ]
Add a tutorial / walkthrough for pure-git workflow. TBR=agable@chromium.org, szager@chromium.org BUG=261743 Review URL: https://codereview.chromium.org/225433003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263164 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
\fB independent_cl *
Update documentation of `git new-branch` Include verbose output of `git map-branches` to make visible what the state of the different branches is. R=iannucci@chromium.org Change-Id: I4af03ef15b39e4ba84a41c01d1ec801e7bb4bbd6 Reviewed-on: https://chromium-review.googlesource.com/c/1360711 Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
6 years ago
$ vi foo && git add \-A && git commit \-m foo\fR
\fB$ git map\-branches \-v\fR
origin/master
cool_feature [ ahead 4 ]
subfeature [ ahead 2 | behind 1 ]
fixit [ ahead 2 ]
frozen_branch [ ahead 3 ]
\fB independent_cl * [ ahead 1 ]
Add a tutorial / walkthrough for pure-git workflow. TBR=agable@chromium.org, szager@chromium.org BUG=261743 Review URL: https://codereview.chromium.org/225433003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263164 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
$ git new\-branch \-\-upstream subfeature nested_cl\fR
Update documentation of `git new-branch` Include verbose output of `git map-branches` to make visible what the state of the different branches is. R=iannucci@chromium.org Change-Id: I4af03ef15b39e4ba84a41c01d1ec801e7bb4bbd6 Reviewed-on: https://chromium-review.googlesource.com/c/1360711 Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
6 years ago
\fB$ git map\-branches \-v\fR
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
origin/master
Update documentation of `git new-branch` Include verbose output of `git map-branches` to make visible what the state of the different branches is. R=iannucci@chromium.org Change-Id: I4af03ef15b39e4ba84a41c01d1ec801e7bb4bbd6 Reviewed-on: https://chromium-review.googlesource.com/c/1360711 Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
6 years ago
cool_feature [ ahead 4 ]
\fB subfeature [ ahead 2 | behind 1 ] \fR\fB\fB(1)\fR\fR\fB
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
nested_cl *
Update documentation of `git new-branch` Include verbose output of `git map-branches` to make visible what the state of the different branches is. R=iannucci@chromium.org Change-Id: I4af03ef15b39e4ba84a41c01d1ec801e7bb4bbd6 Reviewed-on: https://chromium-review.googlesource.com/c/1360711 Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
6 years ago
\fR fixit [ ahead 2 ]
frozen_branch [ ahead 3 ]
independent_cl [ ahead 1 ]
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
\fB$ git checkout cool_feature\fR
Improvements and bugfixes to the depot_tools doc generation process. Works on linux in addition to OS X now. TBR=agable@chromium.org BUG= Review URL: https://codereview.chromium.org/234733003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263292 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
Switched to branch \*(Aqcool_feature\*(Aq
Add a tutorial / walkthrough for pure-git workflow. TBR=agable@chromium.org, szager@chromium.org BUG=261743 Review URL: https://codereview.chromium.org/225433003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263164 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&.
(use "git push" to publish your local commits)
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
\fB$ git new\-branch \-\-upstream_current cl_depends_on_cool_feature\fR
Update documentation of `git new-branch` Include verbose output of `git map-branches` to make visible what the state of the different branches is. R=iannucci@chromium.org Change-Id: I4af03ef15b39e4ba84a41c01d1ec801e7bb4bbd6 Reviewed-on: https://chromium-review.googlesource.com/c/1360711 Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
6 years ago
\fB$ git map\-branches \-v\fR
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
origin/master
Update documentation of `git new-branch` Include verbose output of `git map-branches` to make visible what the state of the different branches is. R=iannucci@chromium.org Change-Id: I4af03ef15b39e4ba84a41c01d1ec801e7bb4bbd6 Reviewed-on: https://chromium-review.googlesource.com/c/1360711 Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
6 years ago
\fB cool_feature [ ahead 4 ]
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
cl_depends_on_cool_feature *
Update documentation of `git new-branch` Include verbose output of `git map-branches` to make visible what the state of the different branches is. R=iannucci@chromium.org Change-Id: I4af03ef15b39e4ba84a41c01d1ec801e7bb4bbd6 Reviewed-on: https://chromium-review.googlesource.com/c/1360711 Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
6 years ago
\fR subfeature [ ahead 2 | behind 1 ]
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
nested_cl
Update documentation of `git new-branch` Include verbose output of `git map-branches` to make visible what the state of the different branches is. R=iannucci@chromium.org Change-Id: I4af03ef15b39e4ba84a41c01d1ec801e7bb4bbd6 Reviewed-on: https://chromium-review.googlesource.com/c/1360711 Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
6 years ago
fixit [ ahead 2 ]
frozen_branch [ ahead 3 ]
independent_cl [ ahead 1 ]
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.fi
.if n \{\
.RE
.\}
.sp
Add a tutorial / walkthrough for pure-git workflow. TBR=agable@chromium.org, szager@chromium.org BUG=261743 Review URL: https://codereview.chromium.org/225433003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263164 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.sp
Add a tutorial / walkthrough for pure-git workflow. TBR=agable@chromium.org, szager@chromium.org BUG=261743 Review URL: https://codereview.chromium.org/225433003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263164 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.RS 4
.ie n \{\
\h'-04' 1.\h'+01'\c
.\}
.el \{\
.sp -1
.IP " 1." 4.2
.\}
Note that both branches are cyan because they are currently the same
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
\fIcommit\fR
object\&. See
Add a tutorial / walkthrough for pure-git workflow. TBR=agable@chromium.org, szager@chromium.org BUG=261743 Review URL: https://codereview.chromium.org/225433003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263164 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
\fBgit-map-branches\fR(1)
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
for more detail\&.
Add a tutorial / walkthrough for pure-git workflow. TBR=agable@chromium.org, szager@chromium.org BUG=261743 Review URL: https://codereview.chromium.org/225433003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263164 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.RE
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.SH "SUGGESTED ALIASES"
.sp
Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitconfig\fR file\&.
.sp
.if n \{\
.RS 4
.\}
.nf
[alias]
git nb = new\-branch
git tb = new\-branch \-\-upstream_current \fB(1)\fR
.fi
.if n \{\
.RE
.\}
.sp
.sp
\fB1. \fRmnemonic: tb \(-> "track branch"
.br
.SH "SEE ALSO"
.sp
\fBgit-rebase-update\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-rename-branch\fR(1), \fBgit-upstream-diff\fR(1)
.SH "CHROMIUM DEPOT_TOOLS"
.sp
[man] Fix link to the git repository "here" is not a nice name for the link, and the footnote generated for the man page. Replace it by a properly named link. Note that some of the changes in the generated files are unrelated. Those files have not been updated since May 2019, and it seems like some previous changes were not reflected yet. R=ehmaldonado@chromium.org Change-Id: I31c784e7eb649bcaa74ba223027fb2c142f52838 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2346371 Reviewed-by: Dirk Pranke <dpranke@google.com> Commit-Queue: Clemens Backes <clemensb@chromium.org>
5 years ago
Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools by checking out the \m[blue]\fBgit repository\fR\m[]\&\s-2\u[1]\d\s+2\&.
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.SH "NOTES"
.IP " 1." 4
[man] Fix link to the git repository "here" is not a nice name for the link, and the footnote generated for the man page. Replace it by a properly named link. Note that some of the changes in the generated files are unrelated. Those files have not been updated since May 2019, and it seems like some previous changes were not reflected yet. R=ehmaldonado@chromium.org Change-Id: I31c784e7eb649bcaa74ba223027fb2c142f52838 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2346371 Reviewed-by: Dirk Pranke <dpranke@google.com> Commit-Queue: Clemens Backes <clemensb@chromium.org>
5 years ago
git repository
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.RS 4
depot_tools: Run automatic spell-checker. Specifically, this CL was made by running codespell (https://github.com/lucasdemarchi/codespell), manually filtering for changes in non-third-party files that appear correct. Change-Id: Ia16c1b29483d777744450d7bea45a178cf877a25 Reviewed-on: https://chromium-review.googlesource.com/420871 Commit-Queue: Quinten Yearsley <qyearsley@chromium.org> Reviewed-by: Aaron Gable <agable@chromium.org>
8 years ago
\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
Add a family of git-commands to assist with the management of multiple CLs/branches. git-rebase-update - ensure all branches are up to date git-new-branch - create branches git-rename-branch - rename a branch while preserving parentage relationships git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent. git-squash-branch - collapse a branch into a single commit git-upstream-diff - show the diff between the current branch and it's upstream branch git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch. R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org BUG=261738 Review URL: https://codereview.chromium.org/184253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
.RE