~james/core

core/lexicons/git/mergeCommit.json -rw-r--r-- 2.2 KiB
452f17b7 — james chore(import): snapshot james.dad.town/core at f70c71c7696a 16 hours ago 
                                                                                
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85

{
  "lexicon": 1,
  "id": "sh.tangled.git.mergeCommit",
  "defs": {
    "main": {
      "type": "procedure",
      "description": "DEPRECATED: use `org.tangled.temp.git.mergeCommit`",
      "input": {
        "encoding": "application/json",
        "schema": {
          "type": "object",
          "required": ["target", "source", "style"],
          "properties": {
            "target": {
              "type": "ref",
              "ref": "#target"
            },
            "source": {
              "type": "ref",
              "ref": "#source"
            },
            "style": {
              "type": "string",
              "enum": [
                "rebase",
                "merge",
                "rebase-merge",
                "squash-rebase",
                "squash-rebase-merge",
                "fast-forward-only"
              ]
            },
            "mergeCommit": {
              "type": "ref",
              "ref": "#mergeCommitContent",
              "description": "Merge commit content. Used when merge commit is created."
            }
          }
        }
      }
    },
    "target": {
      "type": "object",
      "required": ["repo", "branch", "commit"],
      "properties": {
        "repo": {
          "type": "string",
          "format": "did",
          "description": "DID of target git repository"
        },
        "branch": {
          "type": "string",
          "description": "Target branch to merge into"
        },
        "commit": {
          "type": "string",
          "description": "Head commit ID of target branch"
        }
      }
    },
    "source": {
      "type": "object",
      "required": ["repo", "commit"],
      "properties": {
        "repo": {
          "type": "string",
          "format": "did",
          "description": "DID of source git repository"
        },
        "commit": {
          "type": "string",
          "description": "Head commit ID to merge"
        }
      }
    },
    "mergeCommitContent": {
      "type": "object",
      "description": "Merge commit content. Used when merge commit is created.",
      "properties": {
        "author": { "type": "ref", "ref": "sh.tangled.git.defs#signature" },
        "message": { "type": "string", "maxLength": 1000000 }
      }
    }
  }
}