@@ -7,319 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
7
7
<!-- next-header -->
8
8
## [ Unreleased] - ReleaseDate
9
9
10
- ## [ 0.6.0] - 2022-03-01
11
-
12
- ### Breaking Changes
13
-
14
- - ` --stack ` , ` --format ` , ` --fixup ` are now case sensitive
15
- - Most ` --format ` options are replaced with ` --format graph --show-commits ... `
16
-
17
- ### Features
18
-
19
- - ` --format list ` to list branches that are part of the selected stacks (` --stack ` ).
20
-
21
- ### Fixes
22
-
23
- - Be more explicit in why a push didn't happen
24
- - Decouple showing of commits from ` --format `
25
-
26
- ## [ 0.5.6] - 2022-02-28
27
-
28
- ### Fixes
29
-
30
- - Respect existing upstream configured for current branch
31
- - Respect ` remote.pushDefault `
32
-
33
- ## [ 0.5.5] - 2022-01-26
34
-
35
- ### Fixes
36
-
37
- - Don't panic on ` --base --onto --stack all `
38
-
39
- ## [ 0.5.4] - 2022-01-11
40
-
41
- ## [ 0.5.3] - 2021-11-13
42
-
43
- ### Fixes
44
-
45
- - Only prune branches when they don't exist on the server, rather than also if they have a ` / `
46
-
47
- ## [ 0.5.2] - 2021-11-11
48
-
49
- ### Fixes
50
-
51
- - Do not auto-protect (by age or user) HEAD
52
-
53
- ## [ 0.5.1] - 2021-11-11
54
-
55
- ### Fixes
56
-
57
- - Read ` protect-commit-age ` from gitconfig
58
-
59
- ## [ 0.5.0] - 2021-11-09
60
-
61
- ### Breaking Changes
62
-
63
- ### Features
64
-
65
- - New ` --repair ` flag
66
- - Re-stacks branches on top of each other
67
- - Tries to merge branches that have diverged
68
-
69
- ### Fixes
70
-
71
- - Stack visualization
72
- - Made it more compact
73
- - Change the commit glyph
74
- - Made it more consistently linear
75
- - Fix sorting so the longest branches are last
76
- - Always show leaf commits
77
- - Refined stack visualization
78
- - Don't lose tranbhes with ` --onto `
79
- - Don't treat base/onto as protected branches
80
- - Don't pull all when there is nothing to pull
81
- - Respect ` --format=commits `
82
- - Preserve old commit time on ` --rebase `
83
- - Branch backup now includes the rebase during ` --pull `
84
- - Show ` --pull ` s behavior on dry-run
85
- - Allow dirty tree on dry-run
86
-
87
- ### Performance
88
-
89
- - Reduce the amount of data we process
90
- - Reduce stack usage when rendering
91
-
92
- ## [ 0.4.8] - 2021-10-25
93
-
94
- ### Fixes
95
-
96
- - We should only squash the fixup and not the ones before it
97
-
98
- ## [ 0.4.7] - 2021-10-23
99
-
100
- ### Fixes
101
-
102
- - Detect multi-commit branches are pushable
103
-
104
- ## [ 0.4.6] - 2021-10-22
105
-
106
- ### Fixes
107
-
108
- - Further reduce the chance for stackoverflows
109
-
110
- ## [ 0.4.5] - 2021-10-22
111
-
112
- ### Fixes
113
-
114
- - Summarize other people's branches to unclutter visualization
115
- - Avoid summarizing a branch with HEAD
116
-
117
- ## [ 0.4.4] - 2021-10-22
118
-
119
- ### Fixes
120
-
121
- - Always prune from the push-remote, not just when configured
122
- - Speed up fetching large push-remotes by only fetching what is needed
123
- - Don't fetch the push-remote on dry-run
124
- - Don't mark local edits as protected
125
-
126
- ## [ 0.4.3] - 2021-10-22
127
-
128
- ### Fixes
129
-
130
- - Color log level, regardless of min log level
131
-
132
- ## [ 0.4.2] - 2021-10-22
133
-
134
- ### Fixes
135
-
136
- - Clean up stack visualization
137
- - Remove nesting by not showing merge-bases of protected branches
138
- - Treat large branches as protected, abbreviating them
139
- - Summarize empty stacks
140
- - Summarize old branches
141
- - Reduced or eliminated stackoverflows
142
-
143
- ## [ 0.4.1] - 2021-10-21
144
-
145
- ### Fixes
146
-
147
- - Read all values from ` .gitconfig ` , rather than just some
148
-
149
- ## [ 0.4.0] - 2021-10-21
150
-
151
- ### Breaking Changes
152
-
153
- - Renamed config ` stack.fixp ` to ` stack.auto-fixup ` to clarify role
154
-
155
- ### Fixes
156
-
157
- - Changed ` --pull ` to not perform ` stack.auto-fixup `
158
- - Allow ` --fixup ` to run without ` --rebase `
159
-
160
- ## [ 0.3.0] - 2021-10-20
161
-
162
- ### Breaking Changes
163
-
164
- - Command line argument values have changed
165
- - Renamed ` git-branch-backup ` to ` git-branch-stash `
166
-
167
- ### Features
168
-
169
- - Auto-stash support
170
-
171
- ### Fixes
172
-
173
- - Switched command line arguments to match config file
174
- - Vendor libgit2
175
- - Don't panic on some merge conflicts
176
- - Correctly detect ` init.defaultBranch ` as a protected branch
177
- - Correctly detect some more protected commit cases
178
- - Reduce scope of dirty checks
179
- - Some visualization improvements
180
- - Fix some branch deletion corner cases
181
- - Auto-delete branches from squash-merges
182
-
183
- ## [ 0.2.9] - 2021-10-07
184
-
185
- ### Features
186
-
187
- - ` git stack --pull ` will also fetch the push-remote, ensuring we show the latest status relative to it.
188
-
189
- ### Fixes
190
-
191
- - Highlight detached HEAD
192
- - Changed branch status precedence
193
- - Tweaked colors
194
- - Smarter color control
195
-
196
- ## [ 0.2.8] - 2021-09-10
197
-
198
- ### Fixes
199
-
200
- - Stack View:
201
- - Make highlights stand out more by using less color
202
- - Highlight dev branches pointing to protected commits
203
- - Make HEAD more obvious by listing it first
204
- - Removed a superfluous remote status
205
-
206
- ## [ 0.2.7] - 2021-09-01
207
-
208
- ### Fixes
209
-
210
- - Stack View:
211
- - Ensure protected commits are hidden when showing multiple protected branches
212
-
213
- ## [ 0.2.6] - 2021-09-01
214
-
215
- ### Fixes
216
-
217
- - Crash on merge of parent branch into child branch
218
-
219
- ## [ 0.2.5] - 2021-08-31
220
-
221
- ### Fixes
222
-
223
- - Don't stack unrelated branches (broken in 0.2.3)
224
-
225
- ### Features
226
-
227
- - Stack View
228
- - List HEAD branch after all dev branches to make it easier to spot
229
- - Highlight HEAD branch
230
-
231
- ## [ 0.2.4] - 2021-08-31
232
-
233
- ### Fixes
234
-
235
- - Resolved some more stack construction corner cases
236
- - Stack View
237
- - Removed some degenerate cases by prioritizing protected branches over development branches
238
- - We elide "o" joints, where possible
239
- - Improved legibility of debug view by grouping non-nesting fields
240
-
241
- ## [ 0.2.3] - 2021-08-30
242
-
243
- ### Fixes
244
-
245
- - Don't crash with multiple protected branches
246
- - ` --dump-config ` now dumps in ` gitconfig ` format
247
- - Stack View: don't duplicate commits
248
-
249
- ## [ 0.2.2] - 2021-08-27
250
-
251
- ### Fixes
252
-
253
- - Rebase
254
- - Don't backup during dry-run
255
- - Stack View:
256
- - Ensure default format shows all branches
257
- - Don't use warning-color on protected commits
258
- - Use distinct color for commits and protected branches
259
- - Reduce nesting in stack view in some degenerate cases
260
- - Show on rebase+dry-run, show tree as-if rebase succeeded
261
-
262
10
## [ 0.2.1] - 2021-08-25
263
11
264
- ### Fixes
265
-
266
- - Close a quote in the undo message
267
-
268
12
## [ 0.2.0] - 2021-08-25
269
13
270
- ### Features
271
-
272
- - Undo option
273
- - Built on new ` git branch-backup ` command which is like ` git stash ` for branch state
274
- - atm only backs up the result of a rebase and not ` --pull `
275
- - Stack View
276
- - Added new ` --format branch-commits ` option, now the default
277
- - Added new ` --format debug ` option to help with reporting issues
278
- - Abbreviate commit IDs
279
- - Show per-branch status, separating from commit status
280
- - Auto-delete branches on ` --pull ` that were merged into a protected branch
281
-
282
- ### Fixes
283
-
284
- - Reduced conflicts during ` --rebase `
285
- - Load config when in a worktree
286
- - Restore correct HEAD when multiple branches on the same commit
287
-
288
- ### Breaking Chanages
289
-
290
- - Renamed ` --format ` options:
291
- - ` brief ` -> ` branches `
292
- - ` full ` -> ` commits `
14
+ ## [ 0.1.0] - 2021-08-17
293
15
294
16
<!-- next-url -->
295
- [ Unreleased ] : https://github.com/epage/git-stack/compare/v0.6.0...HEAD
296
- [ 0.6.0 ] : https://github.com/epage/git-stack/compare/v0.5.6...v0.6.0
297
- [ 0.5.6 ] : https://github.com/epage/git-stack/compare/v0.5.5...v0.5.6
298
- [ 0.5.5 ] : https://github.com/epage/git-stack/compare/v0.5.4...v0.5.5
299
- [ 0.5.4 ] : https://github.com/epage/git-stack/compare/v0.5.3...v0.5.4
300
- [ 0.5.3 ] : https://github.com/epage/git-stack/compare/v0.5.2...v0.5.3
301
- [ 0.5.2 ] : https://github.com/epage/git-stack/compare/v0.5.1...v0.5.2
302
- [ 0.5.1 ] : https://github.com/epage/git-stack/compare/v0.5.0...v0.5.1
303
- [ 0.5.0 ] : https://github.com/epage/git-stack/compare/v0.4.8...v0.5.0
304
- [ 0.4.8 ] : https://github.com/epage/git-stack/compare/v0.4.7...v0.4.8
305
- [ 0.4.7 ] : https://github.com/epage/git-stack/compare/v0.4.6...v0.4.7
306
- [ 0.4.6 ] : https://github.com/epage/git-stack/compare/v0.4.5...v0.4.6
307
- [ 0.4.5 ] : https://github.com/epage/git-stack/compare/v0.4.4...v0.4.5
308
- [ 0.4.4 ] : https://github.com/epage/git-stack/compare/v0.4.3...v0.4.4
309
- [ 0.4.3 ] : https://github.com/epage/git-stack/compare/v0.4.2...v0.4.3
310
- [ 0.4.2 ] : https://github.com/epage/git-stack/compare/v0.4.1...v0.4.2
311
- [ 0.4.1 ] : https://github.com/epage/git-stack/compare/v0.4.0...v0.4.1
312
- [ 0.4.0 ] : https://github.com/epage/git-stack/compare/v0.3.0...v0.4.0
313
- [ 0.3.0 ] : https://github.com/epage/git-stack/compare/v0.2.10...v0.3.0
314
- [ 0.2.10 ] : https://github.com/epage/git-stack/compare/v0.2.9...v0.2.10
315
- [ 0.2.9 ] : https://github.com/epage/git-stack/compare/v0.2.8...v0.2.9
316
- [ 0.2.8 ] : https://github.com/epage/git-stack/compare/v0.2.7...v0.2.8
317
- [ 0.2.7 ] : https://github.com/epage/git-stack/compare/v0.2.6...v0.2.7
318
- [ 0.2.6 ] : https://github.com/epage/git-stack/compare/v0.2.5...v0.2.6
319
- [ 0.2.5 ] : https://github.com/epage/git-stack/compare/v0.2.4...v0.2.5
320
- [ 0.2.4 ] : https://github.com/epage/git-stack/compare/v0.2.3...v0.2.4
321
- [ 0.2.3 ] : https://github.com/epage/git-stack/compare/v0.2.2...v0.2.3
322
- [ 0.2.2 ] : https://github.com/epage/git-stack/compare/v0.2.1...v0.2.2
323
- [ 0.2.1 ] : https://github.com/epage/git-stack/compare/v0.2.0...v0.2.1
324
- [ 0.2.0 ] : https://github.com/epage/git-stack/compare/v0.1.0...v0.2.0
325
- [ v0.1.0 ] : https://github.com/epage/git-stack/compare/3137a1293f...v0.1.0
17
+ [ Unreleased ] : https://github.com/gitext-rs/git-fixture/compare/v0.2.1...HEAD
18
+ [ 0.2.1 ] : https://github.com/gitext-rs/git-fixture/compare/v0.2.0...v0.2.1
19
+ [ 0.2.0 ] : https://github.com/gitext-rs/git-fixture/compare/v0.1.0...v0.2.0
20
+ [ 0.1.0 ] : https://github.com/gitext-rs/git-fixture/compare/d31f282831975fe7ddcbaed7153a949edae49809...v0.1.0
0 commit comments