From dd48130b2905bfd74a3c0b47c9c2a4687d2fe188 Mon Sep 17 00:00:00 2001 From: Gavin Mak Date: Tue, 15 Sep 2020 19:55:03 +0000 Subject: [PATCH] update depot_tools_tutorial to include git reset issue Bug:997395 Change-Id: Iabd189cb05ee9c87866697cc24c7d08d200b9b91 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2412474 Reviewed-by: Josip Sokcevic Commit-Queue: Gavin Mak --- man/html/depot_tools_tutorial.html | 18 ++++++++++++++++-- man/man7/depot_tools_tutorial.7 | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/man/html/depot_tools_tutorial.html b/man/html/depot_tools_tutorial.html index add94292b..f17882c0c 100644 --- a/man/html/depot_tools_tutorial.html +++ b/man/html/depot_tools_tutorial.html @@ -1105,8 +1105,22 @@ you started on.

Note
-Running git rebase-update will update all your branches, but it will not -automatically run gclient sync to update your dependencies. + +
    +
  • +

    +Running git rebase-update will update all your branches, but it will not +automatically run gclient sync to update your dependencies. +

    +
  • +
  • +

    +Use caution when running git reset as it may result in unexpected behavior of +git rebase-update and depot_tools in general - see +crbug.com/997395. +

    +
  • +
diff --git a/man/man7/depot_tools_tutorial.7 b/man/man7/depot_tools_tutorial.7 index 7a5a6172a..9056ef5d4 100644 --- a/man/man7/depot_tools_tutorial.7 +++ b/man/man7/depot_tools_tutorial.7 @@ -420,7 +420,7 @@ Once you\(cqre done resolving all of the merge conflict, just run git rebase\-up .ps -1 .br .sp -Running git rebase\-update will update all your branches, but it will not automatically run gclient sync to update your dependencies\&. +Running git rebase\-update will update all your branches, but it will not automatically run gclient sync to update your dependencies\&. Use caution when running git reset as it may result in unexpected behavior of git rebase\-update and \fIdepot_tools\fR in general. .sp .5v .RE .SH "MANAGING MULTIPLE CLS"