aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
depot_tools/man/html
History
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
..
depot_tools.html Fix typo in git-footers docs.
depot_tools_tutorial.html Fixed ``smart'' quotes in code block.
git-auto-svn.html Introduct git-auto-svn
git-cherry-pick-upload.html Fix manpage creation error.
git-drover.html Support merging with conflicts with git-drover.
git-footers.html Fix typo in git-footers docs.
git-freeze.html Move docs folder to man.
git-map-branches.html Fix map-branches issues and add coloring for 'branch-heads',
git-map.html Move docs folder to man.
git-mark-merge-base.html Move docs folder to man.
git-nav-downstream.html Move docs folder to man.
git-nav-upstream.html Move docs folder to man.
git-new-branch.html Move docs folder to man.
git-rebase-update.html Add a --keep-going flag for people who run rebase-update infrequently.
git-rename-branch.html Move docs folder to man.
git-reparent-branch.html Move docs folder to man.
git-retry.html Added 'git-retry' bootstrap
git-squash-branch.html Move docs folder to man.
git-thaw.html Move docs folder to man.
git-upstream-diff.html Add fast --HEAD option to upstream-diff.