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.
depot_tools/man/src
Joanna Wang 677da3c869 Revert "Add --no-squash argument to git rebase-update"
This reverts commit 80cc67cc00.

Reason for revert: Not +1'd by anyone from owning team.

Original change's description:
> Add --no-squash argument to git rebase-update
>
> --no-squash makes it faster to run rebase-update when there are merge
> conflicts and you know that squashing will not help. For example, I
> store all of my branches in one commit each, so I know that squashing
> isn't even possible because they are already squashed.
>
> Change-Id: I2679a855ad79d602a6d1ee09c140f2fd27ae20c5
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2904096
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
> Commit-Queue: Joey Arhar <jarhar@chromium.org>

Change-Id: I0b577b053a3e6c7514e28cde4cb7849f50ecd64f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4411905
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Joanna Wang <jojwang@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
2 years ago
..
.gitignore
_aliases.txt
_footer.txt [man] Fix link to the git repository 5 years ago
_git-cl_desc.helper.txt
_git-footers_desc.helper.txt
_git-freeze_desc.helper.txt
_git-hyper-blame_desc.helper.txt
_git-map-branches_desc.helper.txt
_git-map_desc.helper.txt
_git-mark-merge-base_desc.helper.txt
_git-nav-downstream_desc.helper.txt
_git-nav-upstream_desc.helper.txt
_git-new-branch_desc.helper.txt
_git-rebase-update_desc.helper.txt
_git-rename-branch_desc.helper.txt
_git-reparent-branch_desc.helper.txt
_git-retry_desc.helper.txt
_git-squash-branch_desc.helper.txt
_git-thaw_desc.helper.txt
_git-upstream-diff_desc.helper.txt
_helper_prefix.txt
asciidoc-override.css
common_demo_functions.sh Use py3 in documentation generation 3 years ago
demo_repo.sh Use main as default branch in documentation 4 years ago
depot_tools.txt [man] Fix link to the git repository 5 years ago
depot_tools_tutorial.demo.walkthrough.sh Use py3 in documentation generation 3 years ago
depot_tools_tutorial.txt Use main as default branch in documentation 4 years ago
filter_demo_output.py Use py3 in documentation generation 3 years ago
git-cl.txt
git-footers.demo.1.sh Use main ref in git-footers documentation 4 years ago
git-footers.txt Use main ref in git-footers documentation 4 years ago
git-freeze.demo.1.sh
git-freeze.txt
git-hyper-blame.demo.1.sh
git-hyper-blame.demo.2.sh
git-hyper-blame.demo.common.sh
git-hyper-blame.txt
git-map-branches.demo.1.sh Extend documentation for `git map-branches` 6 years ago
git-map-branches.txt [docs] Fix alias settings 4 years ago
git-map.demo.1.sh
git-map.txt
git-mark-merge-base.txt
git-nav-downstream.demo.1.sh Use main as default branch in documentation 4 years ago
git-nav-downstream.txt [docs] Fix alias settings 4 years ago
git-nav-upstream.demo.1.sh
git-nav-upstream.txt [docs] Fix alias settings 4 years ago
git-new-branch.demo.1.sh Add documentation for --inject_current 4 years ago
git-new-branch.txt [docs] Fix alias settings 4 years ago
git-rebase-update.txt Revert "Add --no-squash argument to git rebase-update" 2 years ago
git-rename-branch.txt
git-reparent-branch.txt [docs] Fix alias settings 4 years ago
git-retry.txt
git-squash-branch.demo.1.sh
git-squash-branch.txt [docs] Fix alias settings 4 years ago
git-thaw.txt
git-upstream-diff.txt [docs] Fix alias settings 4 years ago
make_docs.sh Use py3 in documentation generation 3 years ago
prep_demo_repo.sh