diff --git a/man/html/depot_tools.html b/man/html/depot_tools.html index 8e78621f4..1bb34bd60 100644 --- a/man/html/depot_tools.html +++ b/man/html/depot_tools.html @@ -927,7 +927,7 @@ Print a diff of the current branch, compared to its upstream.
diff --git a/man/html/depot_tools_tutorial.html b/man/html/depot_tools_tutorial.html index 4ca80473c..3975870e7 100644 --- a/man/html/depot_tools_tutorial.html +++ b/man/html/depot_tools_tutorial.html @@ -1253,11 +1253,11 @@ It was a Domo-Kuun. * 2250f53 2014-04-10 ~ ozone: evdev: Filter devices by path * 33a7a74 2014-04-10 ~ Always output seccomp error messages to stderr $ git status -# On branch fix_typo -# Your branch is ahead of 'origin/master' by 1 commit. -# (use "git push" to publish your local commits) -# -nothing to commit, working directory clean +On branch fix_typo +Your branch is ahead of 'origin/master' by 1 commit. + (use "git push" to publish your local commits) + +nothing to commit, working tree clean $ git cl upload -r domo@chromium.org --send-mail ... truncated output ...

While we wait for feedback, let's do something else.

$ git new-branch chap2
@@ -1272,15 +1272,15 @@ overhead, barely disturbing the thick cigarette smoke. No doubt was left about
 when the fan was last cleaned.
 EOF
 $ git status
-# On branch chap2
-# Your branch is up-to-date with 'origin/master'.
-#
-# Changes not staged for commit:
-#   (use "git add <file>..." to update what will be committed)
-#   (use "git checkout -- <file>..." to discard changes in working directory)
-#
-#	modified:   build/whitespace_file.txt
-#
+On branch chap2
+Your branch is up to date with 'origin/master'.
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+
+	modified:   build/whitespace_file.txt
+
 no changes added to commit (use "git add" and/or "git commit -a")

Someone on the code review pointed out that our typo-fix has a typo :( We're still working on 'chap2' but we really want to land 'fix_typo', so let's switch over and fix it.

$ git freeze
 $ git checkout fix_typo
@@ -1328,20 +1328,26 @@ It was a Domo-Banana  chap2
   fix_typo *
 $ git nav-upstream
-Note: checking out 'origin/master'.
+Note: switching to 'origin/master'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+state without impacting any branches by switching back to a branch.
 
 If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
 
-  git checkout -b <new-branch-name>
+Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at beec6f4... Make ReflectorImpl use mailboxes
+HEAD is now at beec6f4 Make ReflectorImpl use mailboxes
 $ git nav-downstream
-Previous HEAD position was beec6f4... Make ReflectorImpl use mailboxes
+Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes
 Switched to branch 'chap2'
 Your branch is ahead of 'origin/master' by 1 commit.
   (use "git push" to publish your local commits)
@@ -1470,7 +1476,7 @@ Rebasing: chap2
   There was an poignant pause.
 
   CHAPTER 3:
-++<<<<<<< 59cdb7335b1c3a159ecc22214441cbe2194de25c
+++<<<<<<< HEAD
  +Hilariousness! This chapter is awesome!
 ++=======
 + Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he
@@ -1580,7 +1586,7 @@ from 
 

 
 
diff --git a/man/html/git-cl.html b/man/html/git-cl.html
index 971fcb062..2d9dd1b1c 100644
--- a/man/html/git-cl.html
+++ b/man/html/git-cl.html
@@ -1026,7 +1026,7 @@ from 
 

 
 
diff --git a/man/html/git-drover.html b/man/html/git-drover.html
index 203ca36a9..6a5e549f2 100644
--- a/man/html/git-drover.html
+++ b/man/html/git-drover.html
@@ -858,7 +858,7 @@ at least once to fetch the branches.

Merge Example

# Here's a commit (from some.committer) that we want to 'drover'.
 $ git log -n 1 --pretty=fuller
-commit c4c505c80a710432a95089cd7dca83e801bd3787
+commit c980d966aab8516cc651409da4bf21ca8a4a3613
 Author:     some.committer <some.committer@chromium.org>
 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 Commit:     some.committer <some.committer@chromium.org>
@@ -867,10 +867,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
     This change needs to go to branch 9999
 
 # Now do the 'drover'.
-$ git drover --branch 9999 --cherry-pick c4c505c80a710432a95089cd7dca83e801bd3787
+$ git drover --branch 9999 --cherry-pick c980d966aab8516cc651409da4bf21ca8a4a3613
 Going to cherry-pick
 """
-commit c4c505c80a710432a95089cd7dca83e801bd3787
+commit c980d966aab8516cc651409da4bf21ca8a4a3613
 Author: some.committer <some.committer@chromium.org>
 Date:   Thu Apr 10 08:54:46 2014 +0000
 
@@ -888,7 +888,7 @@ About to land on 9999. Continue (y/n)? y
 
Merge with Conflicts Example

 
# Here's a commit (from some.committer) that we want to 'drover'.
 $ git log -n 1 --pretty=fuller
-commit 1bf3c1360a47ee7db9ab3a1960bada575652ab18
+commit 2d78cf765179c7be5e7e6d1e4565a0d3769e9174
 Author:     some.committer <some.committer@chromium.org>
 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 Commit:     some.committer <some.committer@chromium.org>
@@ -897,10 +897,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
     This change needs to go to branch 9999
 
 # Now do the 'drover'.
-$ git drover --branch 9999 --cherry-pick 1bf3c1360a47ee7db9ab3a1960bada575652ab18
+$ git drover --branch 9999 --cherry-pick 2d78cf765179c7be5e7e6d1e4565a0d3769e9174
 Going to cherry-pick
 """
-commit 1bf3c1360a47ee7db9ab3a1960bada575652ab18
+commit 2d78cf765179c7be5e7e6d1e4565a0d3769e9174
 Author: some.committer <some.committer@chromium.org>
 Date:   Thu Apr 10 08:54:46 2014 +0000
 
@@ -938,28 +938,28 @@ About to land on 9999. Continue (y/n)? y
 
 # Checkout the branch with the change we want to revert.
 $ git checkout -b drover_9999 branch-heads/9999
-Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
+Branch 'drover_9999' set up to track remote ref 'refs/branch-heads/9999'.
 
 # Here's the commit we want to revert.
 $ git log -n 1
-commit 62b99a198636d608dd761b8f87714627154dbd34
+commit 54f88a53372983c7aecacfb9a4d2fa63501fda58
 Author: some.committer <some.committer@chromium.org>
 Date:   Thu Apr 10 08:54:46 2014 +0000
 
     This change is horribly broken.
 
 # Now do the revert.
-$ git revert 62b99a198636d608dd761b8f87714627154dbd34
+$ git revert 54f88a53372983c7aecacfb9a4d2fa63501fda58
 
 # That reverted the change and committed the revert.
 $ git log -n 1
-commit 5ae4e652a29fd78de0ef0a9560878e5ae95c6c82
+commit 4d932bdd1071e318e6a4d3d6fd6034f9105cad5a
 Author: you <you@chromium.org>
 Date:   Thu Apr 10 09:11:36 2014 +0000
 
     Revert "This change is horribly broken."
 
-    This reverts commit 62b99a198636d608dd761b8f87714627154dbd34.
+    This reverts commit 54f88a53372983c7aecacfb9a4d2fa63501fda58.
 
 # As with old drover, reverts are generally OK to commit without LGTM.
 $ git cl upload -r some.committer@chromium.org --send-mail
@@ -976,7 +976,7 @@ button on the original cherrypick CL.

 
 # Here's a commit (from some.committer) that we want to 'drover'.
 $ git log -n 1 --pretty=fuller
-commit 91ee663980fecd3bb7d6e8e166458e84b4e02d99
+commit 8ed5a6585548f2092890b404f6ff49bd5ce6ab9a
 Author:     some.committer <some.committer@chromium.org>
 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 Commit:     some.committer <some.committer@chromium.org>
@@ -986,12 +986,12 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
 
 # Checkout the branch we want to 'drover' to.
 $ git checkout -b drover_9999 branch-heads/9999
-Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
+Branch 'drover_9999' set up to track remote ref 'refs/branch-heads/9999'.
 
 # Now do the 'drover'.
 # IMPORTANT!!! Do Not leave off the '-x' flag
-$ git cherry-pick -x 91ee663980fecd3bb7d6e8e166458e84b4e02d99
-[drover_9999 73a5705] This change needs to go to branch 9999
+$ git cherry-pick -x 8ed5a6585548f2092890b404f6ff49bd5ce6ab9a
+[drover_9999 77a956b] This change needs to go to branch 9999
  Author: some.committer <some.committer@chromium.org>
  Date: Thu Apr 10 08:54:46 2014 +0000
  1 file changed, 1 insertion(+)
@@ -1000,7 +1000,7 @@ Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
 # That took the code authored by some.committer and committed it to
 # the branch by the person who drovered it (i.e. you).
 $ git log -n 1 --pretty=fuller
-commit 73a5705417e67c31f93d27fdee8240204082b5ef
+commit 77a956ba0f28eb29ed009f58a5d71b6a10283358
 Author:     some.committer <some.committer@chromium.org>
 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 Commit:     you <you@chromium.org>
@@ -1008,7 +1008,7 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000
 
     This change needs to go to branch 9999
 
-    (cherry picked from commit 91ee663980fecd3bb7d6e8e166458e84b4e02d99)
+    (cherry picked from commit 8ed5a6585548f2092890b404f6ff49bd5ce6ab9a)
 
 # Looks good. Ship it!
 $ git cl upload
@@ -1041,7 +1041,7 @@ from 
 

 
 
diff --git a/man/html/git-footers.html b/man/html/git-footers.html
index b16d3b991..87d54cd4f 100644
--- a/man/html/git-footers.html
+++ b/man/html/git-footers.html
@@ -871,7 +871,7 @@ from 
 

 
 
diff --git a/man/html/git-freeze.html b/man/html/git-freeze.html
index 290e9aa0a..697a962ff 100644
--- a/man/html/git-freeze.html
+++ b/man/html/git-freeze.html
@@ -790,7 +790,7 @@ time you ran git freeze (freshly modified files, new files, etc.).

 $ git freeze
 $ git status --short
 $ git log -n 2 --stat
-commit c819cf561064339cde3dff88311c4fa63ce35d5c
+commit 7aeb49f4c5b451bbb7eacecae9d505d7225b93b4
 Author: local <local@chromium.org>
 Date:   Thu Apr 10 08:54:56 2014 +0000
 
@@ -802,7 +802,7 @@ Date:   Thu Apr 10 08:54:56 2014 +0000
  unstaged_deleted_file            | 1 -
  4 files changed, 2 insertions(+), 1 deletion(-)
 
-commit 5ab592982f141dd6857ee2ddd4aa5b97e2c13746
+commit d0f7d7d198cc9274ef8e7467a4a817a47eb80a13
 Author: local <local@chromium.org>
 Date:   Thu Apr 10 08:54:56 2014 +0000
 
@@ -852,7 +852,7 @@ from 
 

 
 
diff --git a/man/html/git-hyper-blame.html b/man/html/git-hyper-blame.html
index fedb29fae..34bb19f1c 100644
--- a/man/html/git-hyper-blame.html
+++ b/man/html/git-hyper-blame.html
@@ -871,7 +871,7 @@ from 
 

 
 
diff --git a/man/html/git-map-branches.html b/man/html/git-map-branches.html
index b8ebf4b56..541ece3ec 100644
--- a/man/html/git-map-branches.html
+++ b/man/html/git-map-branches.html
@@ -862,7 +862,7 @@ assuming that the frozen_changes branch was currently checked out,
 origin/master                               
   cool_feature         [ ahead 4            ]
     subfeature         [ ahead 2 | behind 1 ]
-  fixit                [ ahead 6            ]
+  fixit                [ ahead 2            ]
     frozen_branch *    [ ahead 3            ]

@@ -897,7 +897,7 @@ from
diff --git a/man/html/git-map.html b/man/html/git-map.html index 68abb4e1c..206b63d9b 100644 --- a/man/html/git-map.html +++ b/man/html/git-map.html @@ -880,7 +880,7 @@ from
diff --git a/man/html/git-mark-merge-base.html b/man/html/git-mark-merge-base.html index 212b6f6f5..605859422 100644 --- a/man/html/git-mark-merge-base.html +++ b/man/html/git-mark-merge-base.html @@ -819,7 +819,7 @@ from
diff --git a/man/html/git-nav-downstream.html b/man/html/git-nav-downstream.html index 1820b3418..989bbbe57 100644 --- a/man/html/git-nav-downstream.html +++ b/man/html/git-nav-downstream.html @@ -779,7 +779,7 @@ command will prompt you with a selection of the branches.

fixit frozen_branch $ git nav-downstream -Previous HEAD position was beec6f4... Make ReflectorImpl use mailboxes +Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes Switched to branch 'cool_feature' Your branch is ahead of 'origin/master' by 4 commits. (use "git push" to publish your local commits) @@ -796,7 +796,7 @@ Selection (0-1)[0]: 0 $ git nav-downstream Switched to branch 'subfeature' Your branch and 'cool_feature' have diverged, -and have 2 and 1 different commit each, respectively. +and have 2 and 1 different commits each, respectively. (use "git pull" to merge the remote branch into yours) $ git map-branches origin/master @@ -837,7 +837,7 @@ from
diff --git a/man/html/git-nav-upstream.html b/man/html/git-nav-upstream.html index 9068a0bc1..799901433 100644 --- a/man/html/git-nav-upstream.html +++ b/man/html/git-nav-upstream.html @@ -787,18 +787,24 @@ Your branch is ahead of 'origin/master' by 4 commits. fixit frozen_branch $ git nav-upstream -Note: checking out 'origin/master'. +Note: switching to 'origin/master'. You are in 'detached HEAD' state. You can look around, make experimental <1> changes and commit them, and you can discard any commits you make in this -state without impacting any branches by performing another checkout. +state without impacting any branches by switching back to a branch. If you want to create a new branch to retain commits you create, you may -do so (now or later) by using -b with the checkout command again. Example: +do so (now or later) by using -c with the switch command. Example: - git checkout -b <new-branch-name> + git switch -c <new-branch-name> -HEAD is now at beec6f4... Make ReflectorImpl use mailboxes +Or undo this operation with: + + git switch - + +Turn off this advice by setting config variable advice.detachedHead to false + +HEAD is now at beec6f4 Make ReflectorImpl use mailboxes $ git map-branches origin/master cool_feature @@ -840,7 +846,7 @@ from
diff --git a/man/html/git-new-branch.html b/man/html/git-new-branch.html index ad6e71410..8d15ecf53 100644 --- a/man/html/git-new-branch.html +++ b/man/html/git-new-branch.html @@ -925,7 +925,7 @@ from
diff --git a/man/html/git-rebase-update.html b/man/html/git-rebase-update.html index 84eebeea8..8fabe5ae2 100644 --- a/man/html/git-rebase-update.html +++ b/man/html/git-rebase-update.html @@ -846,6 +846,17 @@ Restoration
+-k +
+
+--keep-going +
+
+

+ Keep processing past failed rebases. +

+
+
-n
@@ -867,6 +878,14 @@ Restoration More text than your terminal can handle.

+
+--current +
+
+

+ Only rebase the current branch. +

+
@@ -935,7 +954,7 @@ from
diff --git a/man/html/git-rename-branch.html b/man/html/git-rename-branch.html index 62b42fb61..c5ec5e070 100644 --- a/man/html/git-rename-branch.html +++ b/man/html/git-rename-branch.html @@ -787,7 +787,7 @@ from
diff --git a/man/html/git-reparent-branch.html b/man/html/git-reparent-branch.html index 91410d45c..dc04a0b41 100644 --- a/man/html/git-reparent-branch.html +++ b/man/html/git-reparent-branch.html @@ -840,7 +840,7 @@ from
diff --git a/man/html/git-retry.html b/man/html/git-retry.html index 4051be714..eed059d72 100644 --- a/man/html/git-retry.html +++ b/man/html/git-retry.html @@ -851,7 +851,7 @@ from
diff --git a/man/html/git-squash-branch.html b/man/html/git-squash-branch.html index 2773afc8c..99660d7ba 100644 --- a/man/html/git-squash-branch.html +++ b/man/html/git-squash-branch.html @@ -874,7 +874,7 @@ from
diff --git a/man/html/git-thaw.html b/man/html/git-thaw.html index bd1367b5f..6ed8cab03 100644 --- a/man/html/git-thaw.html +++ b/man/html/git-thaw.html @@ -787,7 +787,7 @@ from
diff --git a/man/html/git-upstream-diff.html b/man/html/git-upstream-diff.html index 44e906318..713c23b28 100644 --- a/man/html/git-upstream-diff.html +++ b/man/html/git-upstream-diff.html @@ -819,11 +819,15 @@ $ # etc.

Print a colorized word-wise diff instead of a line-wise diff.

-
-
-
Show a diff between the specified branch and its upstream, instead of using
-the current branch.
-
+ +
+--branch branch +
+
+

+ Show a diff between the specified branch and its upstream, instead of using + the current branch. +

<extra args for git-diff> @@ -912,7 +916,7 @@ from
diff --git a/man/man1/git-cl.1 b/man/man1/git-cl.1 index a04ca7b18..db341d439 100644 --- a/man/man1/git-cl.1 +++ b/man/man1/git-cl.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-cl .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 06/21/2017 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 0867192e +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-CL" "1" "06/21/2017" "depot_tools 0867192e" "Chromium depot_tools Manual" +.TH "GIT\-CL" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/git-drover.1 b/man/man1/git-drover.1 index 1344fb4f9..b185dd050 100644 --- a/man/man1/git-drover.1 +++ b/man/man1/git-drover.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-drover .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 06/21/2017 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 0867192e +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-DROVER" "1" "06/21/2017" "depot_tools 0867192e" "Chromium depot_tools Manual" +.TH "GIT\-DROVER" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -101,7 +101,7 @@ Before working with branches, you must \fIgclient sync \-\-with_branch_heads\fR .nf # Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&. \fB$ git log \-n 1 \-\-pretty=fuller\fR -commit 386bdd1dc15d367d7c33aa5d2ae5d10eb4b278bf +commit 1f4859134ea36bfc71bab20d4b4463908860fd04 Author: some\&.committer AuthorDate: Thu Apr 10 08:54:46 2014 +0000 Commit: some\&.committer @@ -110,10 +110,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000 This change needs to go to branch 9999 # Now do the \*(Aqdrover\*(Aq\&. -\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 386bdd1dc15d367d7c33aa5d2ae5d10eb4b278bf\fR +\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 1f4859134ea36bfc71bab20d4b4463908860fd04\fR Going to cherry\-pick """ -commit 386bdd1dc15d367d7c33aa5d2ae5d10eb4b278bf +commit 1f4859134ea36bfc71bab20d4b4463908860fd04 Author: some\&.committer Date: Thu Apr 10 08:54:46 2014 +0000 @@ -148,7 +148,7 @@ About to land on 9999\&. Continue (y/n)? y .nf # Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&. \fB$ git log \-n 1 \-\-pretty=fuller\fR -commit 870faa8f7621b82b98e2e9a29056dff1fbf6b713 +commit 351e3be4c0f2f65ff1bcbcafd2fd4c53ab3b4587 Author: some\&.committer AuthorDate: Thu Apr 10 08:54:46 2014 +0000 Commit: some\&.committer @@ -157,10 +157,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000 This change needs to go to branch 9999 # Now do the \*(Aqdrover\*(Aq\&. -\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 870faa8f7621b82b98e2e9a29056dff1fbf6b713\fR +\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 351e3be4c0f2f65ff1bcbcafd2fd4c53ab3b4587\fR Going to cherry\-pick """ -commit 870faa8f7621b82b98e2e9a29056dff1fbf6b713 +commit 351e3be4c0f2f65ff1bcbcafd2fd4c53ab3b4587 Author: some\&.committer Date: Thu Apr 10 08:54:46 2014 +0000 @@ -215,28 +215,28 @@ About to land on 9999\&. Continue (y/n)? y # Checkout the branch with the change we want to revert\&. \fB$ git checkout \-b drover_9999 branch\-heads/9999\fR -Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&. +Branch \*(Aqdrover_9999\*(Aq set up to track remote ref \*(Aqrefs/branch\-heads/9999\*(Aq\&. # Here\*(Aqs the commit we want to revert\&. \fB$ git log \-n 1\fR -commit 7066f3820fe39e50400b9d406a394117f807538e +commit 8f0c06e50f535e3fcca2b189bb6b5d106bb1e5e6 Author: some\&.committer Date: Thu Apr 10 08:54:46 2014 +0000 This change is horribly broken\&. # Now do the revert\&. -\fB$ git revert 7066f3820fe39e50400b9d406a394117f807538e\fR +\fB$ git revert 8f0c06e50f535e3fcca2b189bb6b5d106bb1e5e6\fR # That reverted the change and committed the revert\&. \fB$ git log \-n 1\fR -commit 13e37b2a88d8fcd4ca4a55a4db27c619345f8396 +commit 829317133eb319e61f222fea996ca2703cd27fbe Author: you Date: Thu Apr 10 09:11:36 2014 +0000 Revert "This change is horribly broken\&." - This reverts commit 7066f3820fe39e50400b9d406a394117f807538e\&. + This reverts commit 8f0c06e50f535e3fcca2b189bb6b5d106bb1e5e6\&. # As with old drover, reverts are generally OK to commit without LGTM\&. \fB$ git cl upload \-r some\&.committer@chromium\&.org \-\-send\-mail\fR @@ -269,7 +269,7 @@ If your cherrypick onto a release branch gets reverted, do not create a new cher # Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&. \fB$ git log \-n 1 \-\-pretty=fuller\fR -commit 54631489ecf24a4ae3f5a12c393619a717cee85a +commit ceb84b4befd7a7c060d210fdc57b3d0f46d68fa4 Author: some\&.committer AuthorDate: Thu Apr 10 08:54:46 2014 +0000 Commit: some\&.committer @@ -279,12 +279,12 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000 # Checkout the branch we want to \*(Aqdrover\*(Aq to\&. \fB$ git checkout \-b drover_9999 branch\-heads/9999\fR -Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&. +Branch \*(Aqdrover_9999\*(Aq set up to track remote ref \*(Aqrefs/branch\-heads/9999\*(Aq\&. # Now do the \*(Aqdrover\*(Aq\&. # IMPORTANT!!! Do Not leave off the \*(Aq\-x\*(Aq flag -\fB$ git cherry\-pick \-x 54631489ecf24a4ae3f5a12c393619a717cee85a\fR -[drover_9999 56188f1] This change needs to go to branch 9999 +\fB$ git cherry\-pick \-x ceb84b4befd7a7c060d210fdc57b3d0f46d68fa4\fR +[drover_9999 bd9bd5b] This change needs to go to branch 9999 Author: some\&.committer Date: Thu Apr 10 08:54:46 2014 +0000 1 file changed, 1 insertion(+) @@ -293,7 +293,7 @@ Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&. # That took the code authored by some\&.committer and committed it to # the branch by the person who drovered it (i\&.e\&. you)\&. \fB$ git log \-n 1 \-\-pretty=fuller\fR -commit 56188f1e5b44b5ce95394d41912e980bccca8cc2 +commit bd9bd5b74ab9b942d127ddbefb99eec50b65fbf1 Author: some\&.committer AuthorDate: Thu Apr 10 08:54:46 2014 +0000 Commit: you @@ -301,7 +301,7 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000 This change needs to go to branch 9999 - (cherry picked from commit 54631489ecf24a4ae3f5a12c393619a717cee85a) + (cherry picked from commit ceb84b4befd7a7c060d210fdc57b3d0f46d68fa4) # Looks good\&. Ship it! \fB$ git cl upload\fR diff --git a/man/man1/git-footers.1 b/man/man1/git-footers.1 index 69172004f..1e97c0785 100644 --- a/man/man1/git-footers.1 +++ b/man/man1/git-footers.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-footers .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/15/2016 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools f72f1ad +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-FOOTERS" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual" +.TH "GIT\-FOOTERS" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/git-freeze.1 b/man/man1/git-freeze.1 index 08c99f480..78d21a235 100644 --- a/man/man1/git-freeze.1 +++ b/man/man1/git-freeze.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-freeze .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/15/2016 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools f72f1ad +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-FREEZE" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual" +.TH "GIT\-FREEZE" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -60,7 +60,7 @@ D deleted_file \fB$ git freeze\fR \fB$ git status \-\-short\fR \fB$ git log \-n 2 \-\-stat\fR -commit ba39366fbf53c9501a8649a09d82f7823d22ebd8 +commit d2b155e804b71d99ce51280d2fb9a56917351680 Author: local Date: Thu Apr 10 08:54:56 2014 +0000 @@ -72,7 +72,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000 unstaged_deleted_file | 1 \- 4 files changed, 2 insertions(+), 1 deletion(\-) -commit 6071396fbc51599932099e642d49fd66db8abcb4 +commit bc45c733e95a18f2b2f641e31c7792441cb7da21 Author: local Date: Thu Apr 10 08:54:56 2014 +0000 diff --git a/man/man1/git-hyper-blame.1 b/man/man1/git-hyper-blame.1 index fa27c0ad0..e01b42685 100644 --- a/man/man1/git-hyper-blame.1 +++ b/man/man1/git-hyper-blame.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-hyper-blame .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/15/2016 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools f72f1ad +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-HYPER\-BLAME" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual" +.TH "GIT\-HYPER\-BLAME" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/git-map-branches.1 b/man/man1/git-map-branches.1 index 07db7aabf..21901e751 100644 --- a/man/man1/git-map-branches.1 +++ b/man/man1/git-map-branches.1 @@ -2,12 +2,12 @@ .\" Title: git-map-branches .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 12/04/2018 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 3edf049e +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-MAP\-BRANCHES" "1" "12/04/2018" "depot_tools 3edf049e" "Chromium depot_tools Manual" +.TH "GIT\-MAP\-BRANCHES" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -174,7 +174,7 @@ $ git map\-branches \-v\fR origin/master cool_feature [ ahead 4 ] subfeature [ ahead 2 | behind 1 ] - fixit [ ahead 6 ] + fixit [ ahead 2 ] \fB frozen_branch * [ ahead 3 ]\fR .fi .if n \{\ diff --git a/man/man1/git-map.1 b/man/man1/git-map.1 index d853bd693..aeb5c9b7f 100644 --- a/man/man1/git-map.1 +++ b/man/man1/git-map.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-map .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/15/2016 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools f72f1ad +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-MAP" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual" +.TH "GIT\-MAP" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/git-mark-merge-base.1 b/man/man1/git-mark-merge-base.1 index 9fc01fb64..724a9fd6e 100644 --- a/man/man1/git-mark-merge-base.1 +++ b/man/man1/git-mark-merge-base.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-mark-merge-base .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/15/2016 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools f72f1ad +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-MARK\-MERGE\-BA" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual" +.TH "GIT\-MARK\-MERGE\-BA" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/git-nav-downstream.1 b/man/man1/git-nav-downstream.1 index 03398b3c5..02fbb59b0 100644 --- a/man/man1/git-nav-downstream.1 +++ b/man/man1/git-nav-downstream.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-nav-downstream .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/15/2016 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools f72f1ad +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-NAV\-DOWNSTREAM" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual" +.TH "GIT\-NAV\-DOWNSTREAM" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -53,7 +53,7 @@ git-nav-downstream \- Checkout a downstream branch of the currently checked out fixit frozen_branch \fB$ git nav\-downstream\fR -Previous HEAD position was beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes +Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes Switched to branch \*(Aqcool_feature\*(Aq Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&. (use "git push" to publish your local commits) @@ -70,7 +70,7 @@ origin/master \fB$ git nav\-downstream\fR Switched to branch \*(Aqsubfeature\*(Aq Your branch and \*(Aqcool_feature\*(Aq have diverged, -and have 2 and 1 different commit each, respectively\&. +and have 2 and 1 different commits each, respectively\&. (use "git pull" to merge the remote branch into yours) \fB$ git map\-branches\fR origin/master diff --git a/man/man1/git-nav-upstream.1 b/man/man1/git-nav-upstream.1 index ac8eb8351..eaddba25e 100644 --- a/man/man1/git-nav-upstream.1 +++ b/man/man1/git-nav-upstream.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-nav-upstream .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/15/2016 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools f72f1ad +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-NAV\-UPSTREAM" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual" +.TH "GIT\-NAV\-UPSTREAM" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -63,18 +63,24 @@ origin/master fixit frozen_branch \fB$ git nav\-upstream\fR -Note: checking out \*(Aqorigin/master\*(Aq\&. +Note: switching to \*(Aqorigin/master\*(Aq\&. You are in \*(Aqdetached HEAD\*(Aq state\&. You can look around, make experimental \fB(1)\fR changes and commit them, and you can discard any commits you make in this -state without impacting any branches by performing another checkout\&. +state without impacting any branches by switching back to a branch\&. If you want to create a new branch to retain commits you create, you may -do so (now or later) by using \-b with the checkout command again\&. Example: +do so (now or later) by using \-c with the switch command\&. Example: - git checkout \-b + git switch \-c -HEAD is now at beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes +Or undo this operation with: + + git switch \- + +Turn off this advice by setting config variable advice\&.detachedHead to false + +HEAD is now at beec6f4 Make ReflectorImpl use mailboxes \fB$ git map\-branches\fR \fBorigin/master \fR cool_feature diff --git a/man/man1/git-new-branch.1 b/man/man1/git-new-branch.1 index 51469003c..fafe5e58f 100644 --- a/man/man1/git-new-branch.1 +++ b/man/man1/git-new-branch.1 @@ -2,12 +2,12 @@ .\" Title: git-new-branch .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 12/05/2018 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 0379dbb3 +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-NEW\-BRANCH" "1" "12/05/2018" "depot_tools 0379dbb3" "Chromium depot_tools Manual" +.TH "GIT\-NEW\-BRANCH" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/git-rebase-update.1 b/man/man1/git-rebase-update.1 index ef349c566..03780708c 100644 --- a/man/man1/git-rebase-update.1 +++ b/man/man1/git-rebase-update.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-rebase-update .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/15/2016 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools f72f1ad +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-REBASE\-UPDATE" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual" +.TH "GIT\-REBASE\-UPDATE" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -113,6 +113,11 @@ depot\-tools\&.upstream, see .RE .SH "OPTIONS" .PP +\-k, \-\-keep\-going +.RS 4 +Keep processing past failed rebases\&. +.RE +.PP \-n, \-\-no\-fetch .RS 4 Skip the @@ -124,6 +129,11 @@ phase of rebase\-update\&. .RS 4 More text than your terminal can handle\&. .RE +.PP +\-\-current +.RS 4 +Only rebase the current branch\&. +.RE .SH "CONFIGURATION VARIABLES" .SS "depot\-tools\&.rebase\-update\&.starting\-branch" .sp diff --git a/man/man1/git-rename-branch.1 b/man/man1/git-rename-branch.1 index 5fea96982..4061ae70f 100644 --- a/man/man1/git-rename-branch.1 +++ b/man/man1/git-rename-branch.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-rename-branch .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/15/2016 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools f72f1ad +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-RENAME\-BRANCH" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual" +.TH "GIT\-RENAME\-BRANCH" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/git-reparent-branch.1 b/man/man1/git-reparent-branch.1 index a6050ecd0..d269132cb 100644 --- a/man/man1/git-reparent-branch.1 +++ b/man/man1/git-reparent-branch.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-reparent-branch .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/15/2016 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools f72f1ad +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-REPARENT\-BRANC" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual" +.TH "GIT\-REPARENT\-BRANC" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/git-retry.1 b/man/man1/git-retry.1 index f0cfb6eaa..280317c1a 100644 --- a/man/man1/git-retry.1 +++ b/man/man1/git-retry.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-retry .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/15/2016 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools f72f1ad +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-RETRY" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual" +.TH "GIT\-RETRY" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/git-squash-branch.1 b/man/man1/git-squash-branch.1 index db3be2591..e83034041 100644 --- a/man/man1/git-squash-branch.1 +++ b/man/man1/git-squash-branch.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-squash-branch .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 02/27/2017 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools a6ba28f5 +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-SQUASH\-BRANCH" "1" "02/27/2017" "depot_tools a6ba28f5" "Chromium depot_tools Manual" +.TH "GIT\-SQUASH\-BRANCH" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/git-thaw.1 b/man/man1/git-thaw.1 index 2ae7443fb..10e09a532 100644 --- a/man/man1/git-thaw.1 +++ b/man/man1/git-thaw.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-thaw .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/15/2016 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools f72f1ad +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-THAW" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual" +.TH "GIT\-THAW" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/git-upstream-diff.1 b/man/man1/git-upstream-diff.1 index c0b308070..cd76c5b96 100644 --- a/man/man1/git-upstream-diff.1 +++ b/man/man1/git-upstream-diff.1 @@ -2,12 +2,12 @@ .\" Title: git-upstream-diff .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 06/20/2018 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 79d42dfb +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "GIT\-UPSTREAM\-DIFF" "1" "06/20/2018" "depot_tools 79d42dfb" "Chromium depot_tools Manual" +.TH "GIT\-UPSTREAM\-DIFF" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -86,17 +86,11 @@ $ # etc\&. \-\-wordwise .RS 4 Print a colorized word\-wise diff instead of a line\-wise diff\&. -.sp -.if n \{\ -.RS 4 -.\} -.nf -Show a diff between the specified branch and its upstream, instead of using -the current branch\&. -.fi -.if n \{\ .RE -.\} +.PP +\-\-branch branch +.RS 4 +Show a diff between the specified branch and its upstream, instead of using the current branch\&. .RE .PP diff --git a/man/man7/depot_tools.7 b/man/man7/depot_tools.7 index 7d358e9c1..2b8e5e020 100644 --- a/man/man7/depot_tools.7 +++ b/man/man7/depot_tools.7 @@ -1,13 +1,13 @@ '\" t .\" Title: depot_tools .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 02/27/2017 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools a6ba28f5 +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "DEPOT_TOOLS" "7" "02/27/2017" "depot_tools a6ba28f5" "Chromium depot_tools Manual" +.TH "DEPOT_TOOLS" "7" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man7/depot_tools_tutorial.7 b/man/man7/depot_tools_tutorial.7 index ba4f3730a..452a5e83f 100644 --- a/man/man7/depot_tools_tutorial.7 +++ b/man/man7/depot_tools_tutorial.7 @@ -1,13 +1,13 @@ '\" t .\" Title: depot_tools_tutorial .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/15/2016 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 05/03/2019 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools f72f1ad +.\" Source: depot_tools e58cce6c .\" Language: English .\" -.TH "DEPOT_TOOLS_TUTORIAL" "7" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual" +.TH "DEPOT_TOOLS_TUTORIAL" "7" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -222,13 +222,13 @@ Clone the \fIdepot_tools\fR repository: .\} .sp .sp -Add \fIdepot_tools\fR to the \fIfront\fR of your PATH (you will probably want to put this in your ~/\&.bashrc or ~/\&.zshrc)\&. Assuming you cloned \fIdepot_tools\fR to /path/to/depot_tools: +Add \fIdepot_tools\fR to the \fIend\fR of your PATH (you will probably want to put this in your ~/\&.bashrc or ~/\&.zshrc)\&. Assuming you cloned \fIdepot_tools\fR to /path/to/depot_tools: .sp .if n \{\ .RS 4 .\} .nf -\fB$ export PATH=/path/to/depot_tools:$PATH\fR +\fB$ export PATH=$PATH:/path/to/depot_tools\fR .fi .if n \{\ .RE @@ -582,11 +582,11 @@ It was a Domo\-Kuun\&. * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr \fB$ git status\fR -# On branch fix_typo -# Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. -# (use "git push" to publish your local commits) -# -nothing to commit, working directory clean +On branch fix_typo +Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. + (use "git push" to publish your local commits) + +nothing to commit, working tree clean \fB$ git cl upload \-r domo@chromium\&.org \-\-send\-mail\fR \&.\&.\&. truncated output \&.\&.\&. .fi @@ -612,15 +612,15 @@ overhead, barely disturbing the thick cigarette smoke\&. No doubt was left about when the fan was last cleaned\&. EOF \fB$ git status\fR -# On branch chap2 -# Your branch is up\-to\-date with \*(Aqorigin/master\*(Aq\&. -# -# Changes not staged for commit: -# (use "git add \&.\&.\&." to update what will be committed) -# (use "git checkout \-\- \&.\&.\&." to discard changes in working directory) -# -# modified: build/whitespace_file\&.txt -# +On branch chap2 +Your branch is up to date with \*(Aqorigin/master\*(Aq\&. + +Changes not staged for commit: + (use "git add \&.\&.\&." to update what will be committed) + (use "git restore \&.\&.\&." to discard changes in working directory) + + modified: build/whitespace_file\&.txt + no changes added to commit (use "git add" and/or "git commit \-a") .fi .if n \{\ @@ -701,20 +701,26 @@ origin/master chap2 \fB fix_typo * $ git nav\-upstream\fR -Note: checking out \*(Aqorigin/master\*(Aq\&. +Note: switching to \*(Aqorigin/master\*(Aq\&. You are in \*(Aqdetached HEAD\*(Aq state\&. You can look around, make experimental changes and commit them, and you can discard any commits you make in this -state without impacting any branches by performing another checkout\&. +state without impacting any branches by switching back to a branch\&. If you want to create a new branch to retain commits you create, you may -do so (now or later) by using \-b with the checkout command again\&. Example: +do so (now or later) by using \-c with the switch command\&. Example: + + git switch \-c + +Or undo this operation with: + + git switch \- - git checkout \-b +Turn off this advice by setting config variable advice\&.detachedHead to false -HEAD is now at beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes +HEAD is now at beec6f4 Make ReflectorImpl use mailboxes \fB$ git nav\-downstream\fR -Previous HEAD position was beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes +Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes Switched to branch \*(Aqchap2\*(Aq Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. (use "git push" to publish your local commits) @@ -909,7 +915,7 @@ Rebasing: chap2 There was an poignant pause\&. CHAPTER 3: -++<<<<<<< 59cdb7335b1c3a159ecc22214441cbe2194de25c +++<<<<<<< HEAD +Hilariousness! This chapter is awesome! ++======= + Mr\&. Usagi felt that something wasn\*(Aqt right\&. Shortly after the Domo\-Kun left he diff --git a/man/src/git-rebase-update.txt b/man/src/git-rebase-update.txt index 22fe4ebed..288c2430b 100644 --- a/man/src/git-rebase-update.txt +++ b/man/src/git-rebase-update.txt @@ -70,6 +70,10 @@ Restoration:: OPTIONS ------- +-k:: +--keep-going:: + Keep processing past failed rebases. + -n:: --no-fetch:: Skip the `git fetch` phase of rebase-update. @@ -78,6 +82,9 @@ OPTIONS --verbose:: More text than your terminal can handle. +--current:: + Only rebase the current branch. + CONFIGURATION VARIABLES -----------------------