Skip to content

Commit e58cd19

Browse files
committed
Updates for v2.4.0
1 parent a5acf7f commit e58cd19

File tree

5 files changed

+52
-11
lines changed

5 files changed

+52
-11
lines changed

content/_index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ StGit is licensed under the GNU General Public License, version 2.
3535

3636
## News
3737

38+
### 2023-10-08: [StGit v2.4.0][v2.4.0] has been released.
39+
40+
This release adds some new command line options to `stg branch`, `stg
41+
sink`, and `stg delete`.
42+
3843
### 2023-10-04: [StGit v2.3.3][v2.3.3] has been released.
3944

4045
Fixes to zsh completions along with MacOS portability improvements.
@@ -66,6 +71,7 @@ bzip2-rs crate which allows for static linking when not using the
6671

6772
This release also contains a few more bugfixes to `stg import`.
6873

74+
[v2.4.0]: https://github.com/stacked-git/stgit/releases/tag/v2.4.0
6975
[v2.3.3]: https://github.com/stacked-git/stgit/releases/tag/v2.3.3
7076
[v2.3.2]: https://github.com/stacked-git/stgit/releases/tag/v2.3.2
7177
[v2.3.1]: https://github.com/stacked-git/stgit/releases/tag/v2.3.1

content/changelog/_index.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ title = 'StGit Changelog'
44

55
# Changelog
66

7+
## 2.4.0 2024-10-08
8+
9+
### Added
10+
- feat(delete): --all -A -U -H options
11+
- feat(sink): -T/--above option
12+
- feat(branch): short opts for clone and delete
13+
14+
715
## 2.3.3 2023-10-04
816

917
### Fixed

content/man/stg-branch.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ SYNOPSIS
1616
'stg branch' [--merge] <branch>
1717
'stg branch' {--list,-l}
1818
'stg branch' {--create,-c} <new-branch> [committish]
19-
'stg branch' --clone [new-branch]
19+
'stg branch' {--clone,-C} [new-branch]
2020
'stg branch' {--rename,-r} [old-name] <new-name>
2121
'stg branch' {--protect,-p} [branch]
2222
'stg branch' {--unprotect,-u} [branch]
23-
'stg branch' --delete [--force] <branch>
23+
'stg branch' {--delete,-D} [--force] <branch>
2424
'stg branch' --cleanup [--force] [branch]
2525
'stg branch' {--describe,-d} <description> [branch]
2626

content/man/stg-delete.adoc

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ stg-delete - Delete patches
1212
SYNOPSIS
1313
--------
1414
[verse]
15-
'stg delete' [OPTIONS] <patch>...
15+
'stg delete' [OPTIONS] [<patch>...]
16+
'stg delete' [OPTIONS] [-A] [-U] [-H]
17+
'stg delete' [OPTIONS] --all
1618
'stg delete' [OPTIONS] --top
1719

1820
DESCRIPTION
@@ -22,17 +24,33 @@ Delete patches
2224

2325
OPTIONS
2426
-------
27+
-a::
28+
--all::
29+
Delete all patches
30+
31+
-A::
32+
--applied::
33+
Delete the applied patches
34+
35+
-U::
36+
--unapplied::
37+
Delete the unapplied patches
38+
39+
-H::
40+
--hidden::
41+
Delete the hidden patches
42+
43+
-t::
44+
--top::
45+
Delete topmost patch
46+
2547
--spill::
2648
Delete the patches, but without modifying the index and worktree. This only
2749
works when deleting applied patches at the top of the stack. The effect is
2850
to "spill" the patch contents into the index and worktree.
2951
+
3052
This can be useful for splitting a patch into smaller pieces.
3153

32-
-t::
33-
--top::
34-
Delete topmost patch
35-
3654
-b <branch>::
3755
--branch=<branch>::
3856
Use <branch> instead of current branch

content/man/stg-sink.adoc

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ DESCRIPTION
2020
Move the specified patches down the stack.
2121

2222
If no patch is specified on the command line, the current (topmost) patch is
23-
sunk. By default, patches are sunk to the bottom of the stack, but the '--to'
24-
option may be used to place them under any applied patch.
23+
sunk. By default, patches are sunk to the bottom of the stack, but the
24+
'--above' or '--below' (alias '--to') options may be used to place them above
25+
or below any applied patch.
2526

2627
Internally, sinking involves popping all patches to the bottom (or to the
27-
target patch if '--to' is used), then pushing the patches to sink, and then,
28-
unless '--nopush' is specified, pushing back any other formerly applied patches.
28+
target patch if '--above' or '--below' is used), then pushing the patches to
29+
sink, and then, unless '--nopush' is specified, pushing back any other formerly
30+
applied patches.
2931

3032
Sinking may be useful, for example, to group stable patches at the bottom of
3133
the stack where they less likely to be impacted by the push of another patch,
@@ -40,11 +42,18 @@ OPTIONS
4042
sink are pushed.
4143

4244
-t <target>::
45+
--below=<target>::
4346
--to=<target>::
4447
Sink patches below <target> patch.
4548
+
4649
Specified patches are placed below <target> instead of at the bottom of the stack.
4750

51+
-T <target>::
52+
--above=<target>::
53+
Sink patches above <target> patch.
54+
+
55+
Specified patches are placed above <target> instead of at the bottom of the stack.
56+
4857
-k::
4958
--keep::
5059
Keep the local changes

0 commit comments

Comments
 (0)