Skip to content

Commit f1e890e

Browse files
committed
Updates for v2.4.10
1 parent cf804a3 commit f1e890e

File tree

3 files changed

+42
-2
lines changed

3 files changed

+42
-2
lines changed

content/_index.md

+5
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ StGit is licensed under the GNU General Public License, version 2.
3535

3636
## News
3737

38+
### 2024-08-17: [StGit v2.4.10][v2.4.10] has been released.
39+
3840
### 2024-05-05: [StGit v2.4.7][v2.4.7] has been released.
3941

4042
### 2024-04-07: [StGit v2.4.6][v2.4.6] has been released.
@@ -86,6 +88,9 @@ bzip2-rs crate which allows for static linking when not using the
8688

8789
This release also contains a few more bugfixes to `stg import`.
8890

91+
[v2.4.10]: https://github.com/stacked-git/stgit/releases/tag/v2.4.10
92+
[v2.4.9]: https://github.com/stacked-git/stgit/releases/tag/v2.4.9
93+
[v2.4.8]: https://github.com/stacked-git/stgit/releases/tag/v2.4.8
8994
[v2.4.7]: https://github.com/stacked-git/stgit/releases/tag/v2.4.7
9095
[v2.4.6]: https://github.com/stacked-git/stgit/releases/tag/v2.4.6
9196
[v2.4.5]: https://github.com/stacked-git/stgit/releases/tag/v2.4.5

content/changelog/_index.md

+33
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,39 @@ title = 'StGit Changelog'
44

55
# Changelog
66

7+
## 2.4.10 2024-08-17
8+
9+
### Fixed
10+
11+
- fix(import): --reject should create empty commit (#471)
12+
- docs(changelog): repair heading
13+
14+
### Changed
15+
16+
- updated dependencies
17+
18+
19+
## 2.4.9 2024-07-28
20+
21+
### Changed
22+
23+
- feat(rebase): do not rebase to same base
24+
- feat(rebase): show ref names of rebase target
25+
- chore: update gix to 0.64.0
26+
27+
28+
## 2.4.8 2024-07-21
29+
30+
### Fixed
31+
32+
- fix(refresh): handle edited message and patch name (#470)
33+
- fix: harden "stg rebase -i" against patches with multi-line subjects
34+
- fix: prefer --authdate over patch time with author
35+
36+
### Changed
37+
- updated dependencies
38+
39+
740
## 2.4.7 2024-05-05
841

942
### Fixed

content/man/stg-import.adoc

+4-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ Patches may also be imported from a mail file (-m/--mail), an mbox (-M/--mbox),
3636
or a series (-S/--series). Furthermore, the -u/--url option allows the patches
3737
source to be fetched from a url instead of from a local file.
3838

39-
If a patch does not apply cleanly, the failed diff is written to a
40-
.stgit-failed.patch file and an empty patch is added to the stack.
39+
If a patch does not apply cleanly import is aborted unless '--reject' is
40+
specified, in which case it will apply to the work tree the parts of the patch
41+
that are applicable, leave the rejected hunks in corresponding *.rej files,
42+
and add an empty patch to the stack.
4143
4244
The patch description must be separated from the diff with a "---" line.
4345

0 commit comments

Comments
 (0)