aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,100 Commits
6 Branches
0 Tags
183 MiB
main
chrome/4147
chrome/3987
chrome/3865
chrome/3904
infra/config
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '29291966a3'
${ noResults }
Commit Graph

6 Commits (29291966a3ed413e88627a05073bfed0cd11a8fc)

Author SHA1 Message Date
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
sammc@chromium.org 900a33fb4d Add a git-drover. 
This uses the same trick as git-new-workdir to reuse an existing git
checkout without interfering with it. However, this makes it only usable
on platforms where os.symlink exists.

BUG=404755

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296920 0039d316-1c4b-4281-b951-d872f2087c98
 10 years ago
mmoss@chromium.org 6f9c7cfb79 Clear up some git-drover docs confusion. 
TBR=iannucci@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@291889 0039d316-1c4b-4281-b951-d872f2087c98
 11 years ago
mmoss@chromium.org 442678585a Add 'revert' example to git-drover docs. 
TBR=iannucci@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@291840 0039d316-1c4b-4281-b951-d872f2087c98
 11 years ago
mmoss@chromium.org a2e54c17a5 Add some more context to git-drover tutorial. 
BUG=407284
R=iannucci@google.com

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@291619 0039d316-1c4b-4281-b951-d872f2087c98
 11 years ago
mmoss@chromium.org 62e41c3487 Add stub git-drover documentation. 
R=iannucci@google.com
BUG=261738

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@290946 0039d316-1c4b-4281-b951-d872f2087c98
 11 years ago