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.

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		10 years ago
..
depot_tools.html	Fix typo in git-footers docs.	11 years ago
depot_tools_tutorial.html	Fixed ``smart'' quotes in code block.	10 years ago
git-auto-svn.html	Introduct git-auto-svn	11 years ago
git-cherry-pick-upload.html	Fix manpage creation error.	11 years ago
git-drover.html	Support merging with conflicts with git-drover.	10 years ago
git-footers.html	Fix typo in git-footers docs.	11 years ago
git-freeze.html	Move docs folder to man.	11 years ago
git-map-branches.html	Fix map-branches issues and add coloring for 'branch-heads',	11 years ago
git-map.html	Move docs folder to man.	11 years ago
git-mark-merge-base.html	Move docs folder to man.	11 years ago
git-nav-downstream.html	Move docs folder to man.	11 years ago
git-nav-upstream.html	Move docs folder to man.	11 years ago
git-new-branch.html	Move docs folder to man.	11 years ago
git-rebase-update.html	Add a --keep-going flag for people who run rebase-update infrequently.	10 years ago
git-rename-branch.html	Move docs folder to man.	11 years ago
git-reparent-branch.html	Move docs folder to man.	11 years ago
git-retry.html	Added 'git-retry' bootstrap	11 years ago
git-squash-branch.html	Move docs folder to man.	11 years ago
git-thaw.html	Move docs folder to man.	11 years ago
git-upstream-diff.html	Add fast --HEAD option to upstream-diff.	11 years ago