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/man1
sammc@chromium.org 8990189aed Support merging with conflicts with git-drover.
Currently, git-drover gives up and cleans up if the cherry-pick fails.
This change allows the user to manually resolve conflicts when using
git-drover.

BUG=404755

Review URL: https://codereview.chromium.org/1397313002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297429 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
..
git-auto-svn.1 Introduct git-auto-svn 11 years ago
git-cherry-pick-upload.1
git-drover.1 Support merging with conflicts with git-drover. 9 years ago
git-footers.1
git-freeze.1
git-map-branches.1 Fix map-branches issues and add coloring for 'branch-heads', 11 years ago
git-map.1
git-mark-merge-base.1
git-nav-downstream.1
git-nav-upstream.1
git-new-branch.1
git-rebase-update.1 Add a --keep-going flag for people who run rebase-update infrequently. 10 years ago
git-rename-branch.1
git-reparent-branch.1
git-retry.1
git-squash-branch.1
git-thaw.1
git-upstream-diff.1