| 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' | 12 'git drover' --branch <branch> --cherry-pick <commit> |
| 13 [--parent_checkout <path-to-existing-checkout>] |
| 14 [--verbose] [--dry-run] |
| 13 | 15 |
| 14 DESCRIPTION | 16 DESCRIPTION |
| 15 ----------- | 17 ----------- |
| 16 | 18 |
| 17 `git drover` is NOT IMPLEMENTED yet. See the EXAMPLE section for the equivalent | 19 `git drover` applies a commit to a release branch. It creates a new workdir from |
| 18 sequence of commands to run. | 20 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 |
| 22 Windows. See the EXAMPLE section for the equivalent sequence of commands to run. |
| 23 |
| 24 `git drover` does not support reverts. See the EXAMPLE section for the |
| 25 equivalent sequence of commands to run. |
| 26 |
| 27 OPTIONS |
| 28 ------- |
| 29 --branch <branch>:: |
| 30 The branch to cherry-pick the commit to. |
| 31 |
| 32 --cherry-pick <commit>:: |
| 33 The commit to cherry-pick. |
| 34 |
| 35 --parent_checkout:: |
| 36 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 |
| 38 directory is used. |
| 39 |
| 40 -v:: |
| 41 --verbose:: |
| 42 Enable verbose logging. |
| 43 |
| 44 --dry-run:: |
| 45 Skip landing the cherry-pick. Just ensure that the commit can be cherry-picked |
| 46 into the branch. |
| 19 | 47 |
| 20 EXAMPLE | 48 EXAMPLE |
| 21 ------- | 49 ------- |
| 22 | 50 |
| 23 PREREQUISITES | 51 PREREQUISITES |
| 24 ~~~~~~~~~~~~~ | 52 ~~~~~~~~~~~~~ |
| 25 Before working with branches, you must | 53 Before working with branches, you must |
| 26 ifdef::backend-xhtml11[] | 54 ifdef::backend-xhtml11[] |
| 27 `gclient sync --with_branch_heads` | 55 `gclient sync --with_branch_heads` |
| 28 endif::backend-xhtml11[] | 56 endif::backend-xhtml11[] |
| 29 ifdef::backend-docbook[] | 57 ifdef::backend-docbook[] |
| 30 'gclient sync --with_branch_heads' | 58 'gclient sync --with_branch_heads' |
| 31 endif::backend-docbook[] | 59 endif::backend-docbook[] |
| 32 at least once to fetch the branches. | 60 at least once to fetch the branches. |
| 33 | 61 |
| 34 Merge Example | 62 Merge Example |
| 35 ^^^^^^^^^^^^^ | 63 ^^^^^^^^^^^^^ |
| 36 demo:1[] | 64 demo:1[] |
| 37 | 65 |
| 38 Revert Example | 66 Revert Example |
| 39 ^^^^^^^^^^^^^^ | 67 ^^^^^^^^^^^^^^ |
| 40 demo:2[] | 68 demo:2[] |
| 41 | 69 |
| 70 Manual Merge Example |
| 71 ^^^^^^^^^^^^^^^^^^^^ |
| 72 demo:3[] |
| 73 |
| 42 SEE ALSO | 74 SEE ALSO |
| 43 -------- | 75 -------- |
| 44 linkgit:git-cherry-pick[1], linkgit:git-revert[1] | 76 linkgit:git-cherry-pick[1], linkgit:git-revert[1] |
| 45 | 77 |
| 46 include::_footer.txt[] | 78 include::_footer.txt[] |
| 47 | 79 |
| 48 // vim: ft=asciidoc: | 80 // vim: ft=asciidoc: |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1342383002:
Add a git-drover. (Closed)
Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master