| OLD | NEW |
|---|
| 1 git-drover(1) | 1 git-drover(1) |
| 2 ============= | 2 ============= |
| 3 | 3 |
| 4 NAME | 4 NAME |
| 5 ---- | 5 ---- |
| 6 git-drover - | 6 git-drover - |
| 7 include::_git-drover_desc.helper.txt[] | 7 include::_git-drover_desc.helper.txt[] |
| 8 | 8 |
| 9 SYNOPSIS | 9 SYNOPSIS |
| 10 -------- | 10 -------- |
| 11 [verse] | 11 [verse] |
| 12 'git drover' --branch <branch> --cherry-pick <commit> | 12 'git drover' --branch <branch> |
| 13 (--cherry-pick <change> | --continue [path_to_workdir] | |
| 14 --abort [path_to_workdir]) |
| 13 [--parent_checkout <path-to-existing-checkout>] | 15 [--parent_checkout <path-to-existing-checkout>] |
| 14 [--verbose] [--dry-run] | 16 [--verbose] [--dry-run] |
| 15 | 17 |
| 16 DESCRIPTION | 18 DESCRIPTION |
| 17 ----------- | 19 ----------- |
| 18 | 20 |
| 19 `git drover` applies a commit to a release branch. It creates a new workdir from | 21 `git drover` applies a commit to a release branch. It creates a new workdir from |
| 20 an existing checkout to avoid downloading a new checkout without affecting the | 22 an existing checkout to avoid downloading a new checkout without affecting the |
| 21 existing checkout. Creating a workdir requires symlinks so this does not work on | 23 existing checkout. |
| 22 Windows. See the EXAMPLE section for the equivalent sequence of commands to run. | |
| 23 | 24 |
| 24 `git drover` does not support reverts. See the EXAMPLE section for the | 25 `git drover` does not support reverts. See the EXAMPLE section for the |
| 25 equivalent sequence of commands to run. | 26 equivalent sequence of commands to run. |
| 26 | 27 |
| 27 OPTIONS | 28 OPTIONS |
| 28 ------- | 29 ------- |
| 29 --branch <branch>:: | 30 --branch <branch>:: |
| 30 The branch to cherry-pick the commit to. | 31 The branch to cherry-pick the commit to. |
| 31 | 32 |
| 32 --cherry-pick <commit>:: | 33 --cherry-pick <commit>:: |
| 33 The commit to cherry-pick. | 34 The commit to cherry-pick. |
| 34 | 35 |
| 36 --continue [path_to_workdir]:: |
| 37 Continue a cherry-pick that required manual resolution. The path to the drover |
| 38 workdir is optional. If unspecified, the current directory is used. |
| 39 |
| 40 --abort [path_to_workdir]:: |
| 41 Abort a cherry-pick that required manual resolution and clean up its workdir. |
| 42 The path to the drover workdir is optional. If unspecified, the current |
| 43 directory is used. |
| 44 |
| 35 --parent_checkout:: | 45 --parent_checkout:: |
| 36 The path to the chromium checkout to use as the source for a creating | 46 The path to the chromium checkout to use as the source for a creating |
| 37 git-new-workdir workdir to use for cherry-picking. If unspecified, the current | 47 git-new-workdir workdir to use for cherry-picking. If unspecified, the current |
| 38 directory is used. | 48 directory is used. |
| 39 | 49 |
| 40 -v:: | 50 -v:: |
| 41 --verbose:: | 51 --verbose:: |
| 42 Enable verbose logging. | 52 Enable verbose logging. |
| 43 | 53 |
| 44 --dry-run:: | 54 --dry-run:: |
| (...skipping 11 matching lines...) Expand all Loading... |
| 56 endif::backend-xhtml11[] | 66 endif::backend-xhtml11[] |
| 57 ifdef::backend-docbook[] | 67 ifdef::backend-docbook[] |
| 58 'gclient sync --with_branch_heads' | 68 'gclient sync --with_branch_heads' |
| 59 endif::backend-docbook[] | 69 endif::backend-docbook[] |
| 60 at least once to fetch the branches. | 70 at least once to fetch the branches. |
| 61 | 71 |
| 62 Merge Example | 72 Merge Example |
| 63 ^^^^^^^^^^^^^ | 73 ^^^^^^^^^^^^^ |
| 64 demo:1[] | 74 demo:1[] |
| 65 | 75 |
| 76 Merge with Conflicts Example |
| 77 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
| 78 demo:4[] |
| 79 |
| 66 Revert Example | 80 Revert Example |
| 67 ^^^^^^^^^^^^^^ | 81 ^^^^^^^^^^^^^^ |
| 68 demo:2[] | 82 demo:2[] |
| 69 | 83 |
| 70 Manual Merge Example | 84 Manual Merge Example |
| 71 ^^^^^^^^^^^^^^^^^^^^ | 85 ^^^^^^^^^^^^^^^^^^^^ |
| 72 demo:3[] | 86 demo:3[] |
| 73 | 87 |
| 74 SEE ALSO | 88 SEE ALSO |
| 75 -------- | 89 -------- |
| 76 linkgit:git-cherry-pick[1], linkgit:git-revert[1] | 90 linkgit:git-cherry-pick[1], linkgit:git-revert[1] |
| 77 | 91 |
| 78 include::_footer.txt[] | 92 include::_footer.txt[] |
| 79 | 93 |
| 80 // vim: ft=asciidoc: | 94 // vim: ft=asciidoc: |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1397313002:
Support merging with conflicts with git-drover. (Closed)
Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master