Skip to content

Commit

Permalink
Updates for v2.4.10
Browse files Browse the repository at this point in the history
  • Loading branch information
jpgrayson committed Aug 17, 2024
1 parent cf804a3 commit f1e890e
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 2 deletions.
5 changes: 5 additions & 0 deletions content/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ StGit is licensed under the GNU General Public License, version 2.

## News

### 2024-08-17: [StGit v2.4.10][v2.4.10] has been released.

### 2024-05-05: [StGit v2.4.7][v2.4.7] has been released.

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

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

[v2.4.10]: https://github.com/stacked-git/stgit/releases/tag/v2.4.10
[v2.4.9]: https://github.com/stacked-git/stgit/releases/tag/v2.4.9
[v2.4.8]: https://github.com/stacked-git/stgit/releases/tag/v2.4.8
[v2.4.7]: https://github.com/stacked-git/stgit/releases/tag/v2.4.7
[v2.4.6]: https://github.com/stacked-git/stgit/releases/tag/v2.4.6
[v2.4.5]: https://github.com/stacked-git/stgit/releases/tag/v2.4.5
Expand Down
33 changes: 33 additions & 0 deletions content/changelog/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,39 @@ title = 'StGit Changelog'

# Changelog

## 2.4.10 2024-08-17

### Fixed

- fix(import): --reject should create empty commit (#471)
- docs(changelog): repair heading

### Changed

- updated dependencies


## 2.4.9 2024-07-28

### Changed

- feat(rebase): do not rebase to same base
- feat(rebase): show ref names of rebase target
- chore: update gix to 0.64.0


## 2.4.8 2024-07-21

### Fixed

- fix(refresh): handle edited message and patch name (#470)
- fix: harden "stg rebase -i" against patches with multi-line subjects
- fix: prefer --authdate over patch time with author

### Changed
- updated dependencies


## 2.4.7 2024-05-05

### Fixed
Expand Down
6 changes: 4 additions & 2 deletions content/man/stg-import.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ Patches may also be imported from a mail file (-m/--mail), an mbox (-M/--mbox),
or a series (-S/--series). Furthermore, the -u/--url option allows the patches
source to be fetched from a url instead of from a local file.

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

0 comments on commit f1e890e

Please sign in to comment.