File tree Expand file tree Collapse file tree 1 file changed +16
-0
lines changed Expand file tree Collapse file tree 1 file changed +16
-0
lines changed Original file line number Diff line number Diff line change @@ -47,6 +47,22 @@ export const enum CharCode {
4747 z = 122 ,
4848}
4949
50+ /**
51+ * `gk-merge-target` means the branch that the current branch is most likely to be merged into, e.g.
52+ * - branch to compare with by default
53+ * - default target for creating a PR
54+ * - etc.
55+ *
56+ * `gk-merge-target-user` — merge target branch explicitly defined by user,
57+ * if it's defined we use this value instead of `gk-merge-target`, but we keep storing `gk-merge-target` value that was determined automatically.
58+ *
59+ * `gk-merge-base` means the branch that the current branch originates from, e.g. what was the base in the moment of creation.
60+ * This value is used for: ... (TODO describe use cases).
61+ *
62+ * `vscode-merge-base` — value determined by VS Code that is used to determine the merge base for the current branch.
63+ * once `gk-merge-base` is determined, we stop using `vscode-merge-base`
64+ *
65+ */
5066export type GitConfigKeys =
5167 | `branch.${string } .vscode-merge-base`
5268 | `branch.${string } .gk-merge-base`
You can’t perform that action at this time.
0 commit comments