aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
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.
main
chrome/4147
chrome/3987
chrome/3865
chrome/3904
infra/config
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6e1e951984'
${ noResults }
depot_tools/man/src
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
 		10 years ago
..
.gitignore Move docs folder to man. 11 years ago
_aliases.txt Move docs folder to man. 11 years ago
_footer.txt Move docs folder to man. 11 years ago
_git-auto-svn_desc.helper.txt Introduct git-auto-svn 11 years ago
_git-cherry-pick-upload_desc.helper.txt Add git cherry picking extension 11 years ago
_git-drover_desc.helper.txt Add stub git-drover documentation. 11 years ago
_git-footers_desc.helper.txt Added git footers tool to parse conventional metadata from git commits 11 years ago
_git-freeze_desc.helper.txt Move docs folder to man. 11 years ago
_git-map-branches_desc.helper.txt Move docs folder to man. 11 years ago
_git-map_desc.helper.txt Move docs folder to man. 11 years ago
_git-mark-merge-base_desc.helper.txt Move docs folder to man. 11 years ago
_git-nav-downstream_desc.helper.txt Move docs folder to man. 11 years ago
_git-nav-upstream_desc.helper.txt Move docs folder to man. 11 years ago
_git-new-branch_desc.helper.txt Move docs folder to man. 11 years ago
_git-rebase-update_desc.helper.txt Move docs folder to man. 11 years ago
_git-rename-branch_desc.helper.txt Move docs folder to man. 11 years ago
_git-reparent-branch_desc.helper.txt Move docs folder to man. 11 years ago
_git-retry_desc.helper.txt Added 'git-retry' bootstrap 11 years ago
_git-squash-branch_desc.helper.txt Move docs folder to man. 11 years ago
_git-thaw_desc.helper.txt Move docs folder to man. 11 years ago
_git-upstream-diff_desc.helper.txt Move docs folder to man. 11 years ago
_helper_prefix.txt Move docs folder to man. 11 years ago
asciidoc-override.css Move docs folder to man. 11 years ago
common_demo_functions.sh Add a git-drover. 10 years ago
demo_repo.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
depot_tools.txt Move docs folder to man. 11 years ago
depot_tools_tutorial.demo.walkthrough.sh Added hyphen-only options 11 years ago
depot_tools_tutorial.txt Fixed ``smart'' quotes in code block. 10 years ago
filter_demo_output.py Move docs folder to man. 11 years ago
git-auto-svn.txt Introduct git-auto-svn 11 years ago
git-cherry-pick-upload.demo.1.sh Add git cherry picking extension 11 years ago
git-cherry-pick-upload.txt Fix manpage creation error. 11 years ago
git-drover.demo.1.sh Add a git-drover. 10 years ago
git-drover.demo.2.sh Add 'revert' example to git-drover docs. 11 years ago
git-drover.demo.3.sh Add a git-drover. 10 years ago
git-drover.demo.4.sh Support merging with conflicts with git-drover. 10 years ago
git-drover.demo.common.sh Clear up some git-drover docs confusion. 11 years ago
git-drover.txt Support merging with conflicts with git-drover. 10 years ago
git-footers.demo.1.sh Added git footers tool to parse conventional metadata from git commits 11 years ago
git-footers.txt Fix typo in git-footers docs. 11 years ago
git-freeze.demo.1.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
git-freeze.txt Move docs folder to man. 11 years ago
git-map-branches.demo.1.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
git-map-branches.txt Fix map-branches issues and add coloring for 'branch-heads', 11 years ago
git-map.demo.1.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
git-map.txt Move docs folder to man. 11 years ago
git-mark-merge-base.txt Move docs folder to man. 11 years ago
git-nav-downstream.demo.1.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
git-nav-downstream.txt Move docs folder to man. 11 years ago
git-nav-upstream.demo.1.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
git-nav-upstream.txt Move docs folder to man. 11 years ago
git-new-branch.demo.1.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
git-new-branch.txt Move docs folder to man. 11 years ago
git-rebase-update.txt Add a --keep-going flag for people who run rebase-update infrequently. 10 years ago
git-rename-branch.txt Move docs folder to man. 11 years ago
git-reparent-branch.txt Move docs folder to man. 11 years ago
git-retry.txt Added 'git-retry' bootstrap 11 years ago
git-squash-branch.demo.1.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
git-squash-branch.txt Move docs folder to man. 11 years ago
git-thaw.txt Move docs folder to man. 11 years ago
git-upstream-diff.txt Add fast --HEAD option to upstream-diff. 11 years ago
make_docs.sh Introduct git-auto-svn 11 years ago
prep_demo_repo.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago