@@ -37,11 +37,11 @@ git draft [options] --templates [--json | [--edit] TEMPLATE]
3737
3838Merge generated changes automatically, updating the working directory.
3939This option can be repeated up to 3 times, with the following behavior at each level:
40-
40+ +
4141* `-a`: Merge changes conservatively, flagging any conflicts for manual user resolution.
4242* `-aa`: Merge changes aggressively, resolving all conflicts in favor of the generated change.
4343* `-aaa`: Merge changes aggressively (same as `-aa`) then run `--quit` automatically.
44-
44+ +
4545By default, changes are not merged - keeping the working directory untouched.
4646A different default can be set in the configuration file.
4747When doing so, the `--no-accept` flag can be used to disable merging at CLI invocation time.
@@ -60,7 +60,8 @@ See `--new` and `--templates` for details.
6060
6161-h::
6262--help::
63- Show help message and exit.
63+
64+ Show help message and exit.
6465
6566-j::
6667--json::
@@ -71,26 +72,31 @@ See `--new` and `--templates` for details.
7172
7273-N::
7374--new::
74- Create an AI-generated draft.
75- If the `--edit` option is set, an interactive editor will be opened with the rendered prompt to allow modification before it is forwarded to the bot.
75+
76+ Create an AI-generated draft.
77+ If the `--edit` option is set, an interactive editor will be opened with the rendered prompt to allow modification before it is forwarded to the bot.
7678
7779-Q::
7880--quit::
79- Go back to the draft's origin branch, keeping the working directory's current state.
80- This will delete the draft branch and its upstream.
81- Generated commits remain available via `ref/drafts`.
81+
82+ Go back to the draft's origin branch, keeping the working directory's current state.
83+ This will delete the draft branch and its upstream.
84+ Generated commits remain available via `ref/drafts`.
8285
8386--root::
84- Repository search root.
85- Defaults to the current working directory.
87+
88+ Repository search root.
89+ Defaults to the current working directory.
8690
8791-T::
8892--templates::
89- With no argument, lists available templates.
90- With an template name argument, displays the corresponding template's contents or, if the `--edit` option is set, opens an interactive editor.
93+
94+ With no argument, lists available templates.
95+ With an template name argument, displays the corresponding template's contents or, if the `--edit` option is set, opens an interactive editor.
9196
9297--version::
93- Show version and exit.
98+
99+ Show version and exit.
94100
95101
96102== Examples
0 commit comments