|
1 | 1 | ifndef::manversion[:manversion: 0.0.0] |
2 | 2 |
|
3 | 3 | = git-draft(1) |
4 | | -Matthieu Monsch |
| 4 | +Matthieu Monsch <[email protected]> |
5 | 5 | v{manversion} |
6 | 6 | :doctype: manpage |
7 | 7 | :manmanual: GIT-DRAFT |
@@ -110,58 +110,58 @@ When the working directory is clean, a single commit is created and set as the d |
110 | 110 |
|
111 | 111 | [source] |
112 | 112 | ---- |
113 | | -o <some commit> (main, draft/123) |
114 | 113 | o draft! prompt: <prompt> (draft/123+, refs/drafts/123/1) |
| 114 | +o <some commit> (main, draft/123) |
115 | 115 | ---- |
116 | 116 |
|
117 | 117 | If the working directory is dirty, a sync commit is added to identify the LLM-generated changes. |
118 | 118 |
|
119 | 119 | [source] |
120 | 120 | ---- |
121 | | -o <some commit> (main, draft/123) |
122 | | -o draft! sync(prompt) |
123 | 121 | o draft! prompt: <prompt> (draft/123+, refs/drafts/123/1) |
| 122 | +o draft! sync(prompt) |
| 123 | +o <some commit> (main, draft/123) |
124 | 124 | ---- |
125 | 125 |
|
126 | 126 | If merging is enabled, it have both the LLM-generated changes and manual edits as parents. |
127 | 127 |
|
128 | 128 | [source] |
129 | 129 | ---- |
130 | | -o <some commit> (main) |
| 130 | +o Merge (draft/123, draft/123/+) |
131 | 131 | |\ |
132 | | -| o draft! sync(prompt) |
133 | | -o | draft! sync(merge) |
134 | 132 | | o draft! prompt: <prompt> (refs/drafts/123/1) |
| 133 | +o | draft! sync(merge) |
| 134 | +| o draft! sync(prompt) |
135 | 135 | |/ |
136 | | -o Merge (draft/123, draft/123/+) |
| 136 | +o <some commit> (main) |
137 | 137 | ---- |
138 | 138 |
|
139 | 139 | Otherwise, the user is free to incorporate the changes as needed. |
140 | 140 | Note that the steps above can be repeated arbitrarily many times within a given draft branch, both with and without automatic merging. |
141 | 141 |
|
142 | 142 | [source] |
143 | 143 | ---- |
144 | | -o <some commit> (main) |
145 | | -|\ |
146 | | -| o draft! prompt: <prompt1> (refs/drafts/123/1) |
147 | | -o draft! sync(prompt) |
148 | | -o draft! prompt: <prompt2> (refs/drafts/123/2) |
149 | | -o <a manual commit> (draft/123) |
150 | 144 | o draft! prompt: <prompt3> (draft/123+, refs/drafts/123/3) |
| 145 | +o <a manual commit> (draft/123) |
| 146 | +o draft! prompt: <prompt2> (refs/drafts/123/2) |
| 147 | +o draft! sync(prompt) |
| 148 | +| o draft! prompt: <prompt1> (refs/drafts/123/1) |
| 149 | +|/ |
| 150 | +o <some commit> (main) |
151 | 151 | ---- |
152 | 152 |
|
153 | 153 | Sync commits will be reused if no new changes were added. |
154 | 154 | This can be useful when iterating on a prompt, and discarding results from prior iterations. |
155 | 155 |
|
156 | 156 | [source] |
157 | 157 | ---- |
158 | | -o <some commit> (main) |
159 | | -o draft! sync(prompt) |
160 | | -|\ |
161 | | -| \ |
162 | | -|\ o draft! prompt: <prompt1> (refs/drafts/123/1) |
163 | | -| o draft! prompt: <prompt2> (refs/drafts/123/2) |
164 | 158 | o draft! prompt: <prompt3> (refs/drafts/123/3) |
| 159 | +| o draft! prompt: <prompt2> (refs/drafts/123/2) |
| 160 | +|/ o draft! prompt: <prompt1> (refs/drafts/123/1) |
| 161 | +| / |
| 162 | +|/ |
| 163 | +o draft! sync(prompt) |
| 164 | +o <some commit> (main) |
165 | 165 | ---- |
166 | 166 |
|
167 | 167 |
|
|
0 commit comments