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 '6fee2673e9'
${ noResults }
depot_tools/man/man1/git-mark-merge-base.1

70 lines
2.7 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-mark-merge-base
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
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
.\" Date: 12/15/2016
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
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
.\" Source: depot_tools f72f1ad
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
.\"
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
.TH "GIT\-MARK\-MERGE\-BA" "1" "12/15/2016" "depot_tools f72f1ad" "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-mark-merge-base \- Manually interact with depot_tools\*(Aq merge\-base markers\&.
.SH "SYNOPSIS"
.sp
.nf
\fIgit mark\-merge\-base\fR
\fIgit mark\-merge\-base\fR <commit hash>
\fIgit mark\-merge\-base\fR [\-d | \-\-delete]
.fi
.sp
.SH "DESCRIPTION"
.sp
Inspect, set or delete the current merge\-base marker for the current branch\&. This should not be needed, but is useful if things get into a snarled state\&. Pass no arguments to view the current value\&. If you provide <commit hash>, then git mark\-merge\-base will attempt to set that as the merge\-base value\&.
.sp
It is invalid to pick a commit which is not an ancestor of the current branch\&.
.sp
See \fBgit-rebase-update\fR(1)\*(Aqs description of the branch\&.<name>\&.base configuration variable for more info on what the merge base markers are for\&.
.SH "OPTIONS"
.PP
\-d, \-\-delete
.RS 4
Delete the merge\-base marker for the current branch\&.
.RE
.PP
<commit hash>
.RS 4
The new value to set for the current branch\(cqs merge\-base marker\&.
.RE
.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
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
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 from \m[blue]\fBhere\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
here
.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