| OLD | NEW |
|---|
| (Empty) | |
| 1 git-mark-merge-base(1) |
| 2 ====================== |
| 3 |
| 4 NAME |
| 5 ---- |
| 6 git-mark-merge-base - |
| 7 include::_git-mark-merge-base_desc.helper.txt[] |
| 8 |
| 9 SYNOPSIS |
| 10 -------- |
| 11 [verse] |
| 12 'git mark-merge-base' |
| 13 'git mark-merge-base' <commit hash> |
| 14 'git mark-merge-base' [-d | --delete] |
| 15 |
| 16 DESCRIPTION |
| 17 ----------- |
| 18 |
| 19 Inspect, set or delete the current merge-base marker for the current branch. |
| 20 This should not be needed, but is useful if things get into a snarled state. |
| 21 Pass no arguments to view the current value. If you provide <commit hash>, then |
| 22 `git mark-merge-base` will attempt to set that as the merge-base value. |
| 23 |
| 24 It is invalid to pick a commit which is not an ancestor of the current branch. |
| 25 |
| 26 See linkgit:git-rebase-update[1]'s description of the `branch.<name>.base` |
| 27 configuration variable for more info on what the merge base markers are for. |
| 28 |
| 29 OPTIONS |
| 30 ------- |
| 31 |
| 32 -d:: |
| 33 --delete:: |
| 34 Delete the merge-base marker for the current branch. |
| 35 |
| 36 <commit hash>:: |
| 37 The new value to set for the current branch's merge-base marker. |
| 38 |
| 39 SEE ALSO |
| 40 -------- |
| 41 linkgit:git-rebase-update[1], linkgit:git-reparent-branch[1], |
| 42 linkgit:git-rename-branch[1], linkgit:git-upstream-diff[1] |
| 43 |
| 44 include::_footer.txt[] |
| 45 |
| 46 // vim: ft=asciidoc noexpandtab: |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 184253003:
Add git-reup and friends (Closed)
Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@freeze_thaw