@@ -12,6 +12,25 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
12
12
13
13
### Breaking changes
14
14
15
+ ### Deprecations
16
+
17
+ ### New features
18
+
19
+ ### Fixed bugs
20
+
21
+ ## [ 0.26.0] - 2025-02-05
22
+
23
+ ### Release highlights
24
+
25
+ * Improved Git push/fetch compatibility by spawning an external ` git ` process.
26
+ This can be enabled by the ` git.subprocess=true ` config knob, and will be the
27
+ default in a future release.
28
+
29
+ * ` jj log ` can now show cryptographic commit signatures. The output can be
30
+ controlled by the ` ui.show-cryptographic-signatures=true ` config knob.
31
+
32
+ ### Breaking changes
33
+
15
34
* ` jj abandon ` now deletes bookmarks pointing to the revisions to be abandoned.
16
35
Use ` --retain-bookmarks ` to move bookmarks backwards. If deleted bookmarks
17
36
were tracking remote bookmarks, the associated bookmarks (or branches) will be
@@ -88,21 +107,17 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
88
107
89
108
* ` jj restore ` now supports ` -i ` /` --interactive ` selection.
90
109
91
- * Add templater support for rendering commit signatures.
92
-
93
110
* ` jj file list ` now supports templating.
94
111
95
- * ` jj status ` now shows untracked files when they reside directly under a tracked directory.
96
-
97
- * New ` merge-tools.<TOOL>.diff-expected-exit-codes ` config option to suppress
98
- warnings from tools exiting with non-zero exit codes.
99
-
100
- * Add a new template alias ` builtin_op_log_oneline ` along with ` format_operation_oneline ` and ` format_snapshot_operation_oneline `
112
+ * There is a new ` builtin_op_log_oneline ` template alias you can pass to `jj op
113
+ log -T` for a more compact output. You can use ` format_operation_oneline` and
114
+ ` format_snapshot_operation_oneline ` to customize parts of it.
101
115
102
116
* New template function ` config(name) ` to access to configuration variable from
103
117
template.
104
118
105
- * New template function ` pad_centered() ` to center content within a minimum width.
119
+ * New template function ` pad_centered() ` to center content within a minimum
120
+ width.
106
121
107
122
* Templater now supports ` list.filter(|x| ..) ` method.
108
123
@@ -112,40 +127,49 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
112
127
113
128
* The ` diff.stat() ` template method now provides methods to get summary values.
114
129
115
- * New ` git.sign-on-push ` config option to automatically sign commits which are being
116
- pushed to a Git remote.
130
+ * ` jj log ` can now show cryptographic commit signatures. The output can be
131
+ controlled by the ` ui.show-cryptographic-signatures=true ` config knob. The
132
+ signature template can be customized using
133
+ ` format_detailed_cryptographic_signature(signature) ` and
134
+ ` format_short_cryptographic_signature(signature) ` .
135
+
136
+ * New ` git.sign-on-push ` config option to automatically sign commits which are
137
+ being pushed to a Git remote.
117
138
118
139
* New ` git.push-new-bookmarks ` config option to push new bookmarks without
119
140
` --allow-new ` .
120
141
142
+ * ` jj status ` now shows untracked files when they reside directly under a
143
+ tracked directory. There's still an issue that files under untracked
144
+ directories aren't listed. [ #5389 ] ( https://github.com/jj-vcs/jj/issues/5389 )
145
+
146
+ * New ` merge-tools.<TOOL>.diff-expected-exit-codes ` config option to suppress
147
+ warnings from tools exiting with non-zero exit codes.
148
+
121
149
* New ` fix.tools.TOOL.enabled ` config option to enable/disable tools. This is
122
150
useful for defining disabled tools in user configuration that can be enabled
123
151
in individual repositories with one config setting.
124
152
125
- * The Jujutsu documentation site now publishes a schema for the official
126
- configuration file, which can be integrated into your editor for autocomplete,
127
- inline errors, and more. Please [ see the documentation] ( /docs/config.md#json-schema-support )
128
- for more on this.
153
+ * Added ` --into ` flag to ` jj restore ` , similarly to ` jj squash ` and `jj
154
+ absorb` . It is equivalent to ` --to` , but ` --into` is the recommended name.
129
155
130
- * Add a config option ` ui.show-cryptographic-signatures ` . When set to ` "true" ` , the
131
- builtin templates will show signataure information if available. The signature display
132
- can be customized using ` format_detailed_cryptographic_signature(signature) ` and
133
- ` format_short_cryptographic_signature(signature) ` .
134
-
135
- * Added ` --into ` flag to ` jj restore ` , similarly to ` jj squash ` and ` jj absorb ` . It is
136
- equivalent to ` --to ` , but ` --into ` is the recommended name.
137
-
138
- * Italic text is now supported. You can set e.g. ` color.error = { fg = "red", italic = true } `
139
- in your config.
156
+ * Italic text is now supported. You can set e.g. `color.error = { fg = "red",
157
+ italic = true }` in your config.
140
158
141
159
* New ` author_name ` /` author_email ` /` committer_name ` /` committer_email(pattern) `
142
160
revset functions to match either name or email field explicitly.
143
161
144
162
* New ` subject(pattern) ` revset function that matches first line of commit
145
163
descriptions.
146
164
147
- * Conditional configuration now supports ` --when.commands ` to change configuration
148
- based on subcommand.
165
+ * Conditional configuration now supports ` --when.commands ` to change
166
+ configuration based on subcommand.
167
+
168
+ * The Jujutsu documentation site now publishes a schema for the official
169
+ configuration file, which can be integrated into your editor for autocomplete,
170
+ inline errors, and more.
171
+ Please [ see the documentation] ( /docs/config.md#json-schema-support ) for more
172
+ on this.
149
173
150
174
### Fixed bugs
151
175
@@ -171,6 +195,42 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
171
195
` revset-aliases.'trunk()' ` are now escaped if necessary.
172
196
[ #5359 ] ( https://github.com/jj-vcs/jj/issues/5359 )
173
197
198
+ ### Contributors
199
+
200
+ Thanks to the people who made this release happen!
201
+
202
+ * Angel Ezquerra (@AngelEzquerra )
203
+ * Antoine Martin (@alarsyo )
204
+ * Anton Bulakh (@necauqua )
205
+ * Austin Seipp (@thoughtpolice )
206
+ * Baltasar Dinis (@bsdinis )
207
+ * Benjamin Tan (@bnjmnt4n )
208
+ * blinry (@blinry )
209
+ * Bryce Berger (@bryceberger )
210
+ * Charlie-83 (@Charlie-83 )
211
+ * Christian Stoitner (@cstoitner )
212
+ * Evan Martin (@evmar )
213
+ * George Christou (@gechr )
214
+ * Ilya Grigoriev (@ilyagr )
215
+ * Jakob Hellermann (@jakobhellermann )
216
+ * JDSeiler (@JDSeiler )
217
+ * Jonathan Frere (@MrJohz )
218
+ * Jonathan Gilchrist (@jgilchrist )
219
+ * Josh Steadmon (@steadmon )
220
+ * Martin von Zweigbergk (@martinvonz )
221
+ * Matt Kulukundis (@fowles )
222
+ * Ollivier Robert (@keltia )
223
+ * Philip Metzger (@PhilipMetzger )
224
+ * Philipp Albrecht (@pylbrecht )
225
+ * Robert Jackson (@rwjblue )
226
+ * Samuel Tardieu (@samueltardieu )
227
+ * Scott Taylor (@scott2000 )
228
+ * Stephen Jennings (@jennings )
229
+ * Valentin Gatien-Baron (@v-gb )
230
+ * Vincent Ging Ho Yim (@cenviity )
231
+ * Waleed Khan (@arxanas )
232
+ * Yuya Nishihara (@yuja )
233
+
174
234
## [ 0.25.0] - 2025-01-01
175
235
176
236
### Release highlights
0 commit comments