Don't commit unstaged gitlinks in FREEZE.index during rebase-update.
To avoid having users deal with merge conflicts between unstaged gitlinks modified before and after a git rebase-update we can just not commit unstaged gitlinks in our freeze index. This change results in whatever gitlinks are unstaged before git rebase-update to be just rebased on top of whatever the latest gitlinks are from remote. Bug: 1472148 Change-Id: If7dcb82778a0bdd14c408f0a0287780a7bdc5358 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4771356 Commit-Queue: Joanna Wang <jojwang@chromium.org> Reviewed-by: Gregory Nisbet <gregorynisbet@google.com> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>changes/56/4771356/9
parent
923bcf8635
commit
2541006811
Loading…
Reference in New Issue