git-mark-merge-base.1 2.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869
  1. '\" t
  2. .\" Title: git-mark-merge-base
  3. .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
  4. .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
  5. .\" Date: 05/03/2019
  6. .\" Manual: Chromium depot_tools Manual
  7. .\" Source: depot_tools e58cce6c
  8. .\" Language: English
  9. .\"
  10. .TH "GIT\-MARK\-MERGE\-BA" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual"
  11. .\" -----------------------------------------------------------------
  12. .\" * Define some portability stuff
  13. .\" -----------------------------------------------------------------
  14. .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  15. .\" http://bugs.debian.org/507673
  16. .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
  17. .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  18. .ie \n(.g .ds Aq \(aq
  19. .el .ds Aq '
  20. .\" -----------------------------------------------------------------
  21. .\" * set default formatting
  22. .\" -----------------------------------------------------------------
  23. .\" disable hyphenation
  24. .nh
  25. .\" disable justification (adjust text to left margin only)
  26. .ad l
  27. .\" -----------------------------------------------------------------
  28. .\" * MAIN CONTENT STARTS HERE *
  29. .\" -----------------------------------------------------------------
  30. .SH "NAME"
  31. git-mark-merge-base \- Manually interact with depot_tools\*(Aq merge\-base markers\&.
  32. .SH "SYNOPSIS"
  33. .sp
  34. .nf
  35. \fIgit mark\-merge\-base\fR
  36. \fIgit mark\-merge\-base\fR <commit hash>
  37. \fIgit mark\-merge\-base\fR [\-d | \-\-delete]
  38. .fi
  39. .sp
  40. .SH "DESCRIPTION"
  41. .sp
  42. Inspect, set or delete the current merge\-base marker for the current branch\&. This should not be needed, but is useful if things get into a snarled state\&. Pass no arguments to view the current value\&. If you provide <commit hash>, then git mark\-merge\-base will attempt to set that as the merge\-base value\&.
  43. .sp
  44. It is invalid to pick a commit which is not an ancestor of the current branch\&.
  45. .sp
  46. See \fBgit-rebase-update\fR(1)\*(Aqs description of the branch\&.<name>\&.base configuration variable for more info on what the merge base markers are for\&.
  47. .SH "OPTIONS"
  48. .PP
  49. \-d, \-\-delete
  50. .RS 4
  51. Delete the merge\-base marker for the current branch\&.
  52. .RE
  53. .PP
  54. <commit hash>
  55. .RS 4
  56. The new value to set for the current branch\(cqs merge\-base marker\&.
  57. .RE
  58. .SH "SEE ALSO"
  59. .sp
  60. \fBgit-rebase-update\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-rename-branch\fR(1), \fBgit-upstream-diff\fR(1)
  61. .SH "CHROMIUM DEPOT_TOOLS"
  62. .sp
  63. Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
  64. .SH "NOTES"
  65. .IP " 1." 4
  66. here
  67. .RS 4
  68. \%https://chromium.googlesource.com/chromium/tools/depot_tools.git
  69. .RE