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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: man/src/git-rebase-update.txt

Issue 436963005: Added hyphen-only options (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Fixed options in some calling code Created 6 years, 4 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 | « man/src/depot_tools_tutorial.demo.walkthrough.sh ('k') | tests/git_rebase_update_test.py » ('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-rebase-update(1) 1 git-rebase-update(1)
2 ==================== 2 ====================
3 3
4 NAME 4 NAME
5 ---- 5 ----
6 git-rebase-update - 6 git-rebase-update -
7 include::_git-rebase-update_desc.helper.txt[] 7 include::_git-rebase-update_desc.helper.txt[]
8 8
9 SYNOPSIS 9 SYNOPSIS
10 -------- 10 --------
11 [verse] 11 [verse]
12 'git rebase-update' [-v | --verbose] [-n | --no_fetch] 12 'git rebase-update' [-v | --verbose] [-n | --no-fetch]
13 13
14 DESCRIPTION 14 DESCRIPTION
15 ----------- 15 -----------
16 16
17 Brings all branches up-to-date with their tracking branches. This involves 17 Brings all branches up-to-date with their tracking branches. This involves
18 several phases: 18 several phases:
19 19
20 Preparation:: 20 Preparation::
21 If you currently have a branch checked out, any changes on that branch are 21 If you currently have a branch checked out, any changes on that branch are
22 'frozen' (See linkgit:git-freeze[1] for more detail). Additionally, the curren t 22 'frozen' (See linkgit:git-freeze[1] for more detail). Additionally, the curren t
23 branch is recorded for the 'Restoration' phase later (see 'CONFIGURATION 23 branch is recorded for the 'Restoration' phase later (see 'CONFIGURATION
24 VARIABLES' for details on `depot-tools.rebase-update.starting-branch`). 24 VARIABLES' for details on `depot-tools.rebase-update.starting-branch`).
25 25
26 Fetching:: 26 Fetching::
27 All branches are examined to find their upstream references. The correct set 27 All branches are examined to find their upstream references. The correct set
28 of git remotes is determined, and fetched accordingly. Note that if any 28 of git remotes is determined, and fetched accordingly. Note that if any
29 branches have a tag as their upstream, we are forced to pull all remotes. 29 branches have a tag as their upstream, we are forced to pull all remotes.
30 + 30 +
31 Pass `--no_fetch` to skip this phase. 31 Pass `--no-fetch` to skip this phase.
32 32
33 Rebasing:: 33 Rebasing::
34 All branches are rebased in topological order from roots (upstreams) to 34 All branches are rebased in topological order from roots (upstreams) to
35 leaves. Each branch is rebased from its marked merge-base (see 'CONFIGURATION 35 leaves. Each branch is rebased from its marked merge-base (see 'CONFIGURATION
36 VARIABLES') to the branch tip on top of its parent branch. If the parent 36 VARIABLES') to the branch tip on top of its parent branch. If the parent
37 branch is 'frozen' (see linkgit:git-freeze[1]), the branch will be rebased 37 branch is 'frozen' (see linkgit:git-freeze[1]), the branch will be rebased
38 onto the last non-freeze commit on the parent branch. 38 onto the last non-freeze commit on the parent branch.
39 + 39 +
40 Things get interesting when there are merge conflicts on rebase. The *most 40 Things get interesting when there are merge conflicts on rebase. The *most
41 common* cause for conflicts is when your branch has been committed to the 41 common* cause for conflicts is when your branch has been committed to the
(...skipping 18 matching lines...) Expand all
60 if necessary (see linkgit:git-thaw[1]). If the branch you started on got 60 if necessary (see linkgit:git-thaw[1]). If the branch you started on got
61 cleaned up, `git rebase-update` will checkout the 'root' ref (defaults to 61 cleaned up, `git rebase-update` will checkout the 'root' ref (defaults to
62 'origin/master', as configured by `depot-tools.upstream`, see 62 'origin/master', as configured by `depot-tools.upstream`, see
63 linkgit:git-new-branch[1]). 63 linkgit:git-new-branch[1]).
64 64
65 65
66 OPTIONS 66 OPTIONS
67 ------- 67 -------
68 68
69 -n:: 69 -n::
70 --no_fetch:: 70 --no-fetch::
71 Skip the `git fetch` phase of rebase-update. 71 Skip the `git fetch` phase of rebase-update.
72 72
73 -v:: 73 -v::
74 --verbose:: 74 --verbose::
75 More text than your terminal can handle. 75 More text than your terminal can handle.
76 76
77 77
78 CONFIGURATION VARIABLES 78 CONFIGURATION VARIABLES
79 ----------------------- 79 -----------------------
80 80
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 121
122 SEE ALSO 122 SEE ALSO
123 -------- 123 --------
124 linkgit:git-new-branch[1], linkgit:git-reparent-branch[1], 124 linkgit:git-new-branch[1], linkgit:git-reparent-branch[1],
125 linkgit:git-rename-branch[1], linkgit:git-upstream-diff[1], 125 linkgit:git-rename-branch[1], linkgit:git-upstream-diff[1],
126 linkgit:git-freeze[1], linkgit:git-mark-merge-base[1] 126 linkgit:git-freeze[1], linkgit:git-mark-merge-base[1]
127 127
128 include::_footer.txt[] 128 include::_footer.txt[]
129 129
130 // vim: ft=asciidoc: 130 // vim: ft=asciidoc:
OLDNEW
« no previous file with comments | « man/src/depot_tools_tutorial.demo.walkthrough.sh ('k') | tests/git_rebase_update_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698