summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2024-05-30Merge pull request #113 from wxpppp/masterHEADmasterStephen Jung
deps: bump libc from 0.2.153 to 0.2.155
2024-05-30deps: bump libc from 0.2.153 to 0.2.155wangweijie
Signed-off-by: wangweijie <wangweijie@loongson.cn>
2024-04-09Merge pull request #111 from Pi-Cla/add-badgeStephen Jung
Add repology badge and openSUSE
2024-04-09Add repology badge and openSUSEPi-Cla
2024-04-06Merge pull request #110 from ErichDonGubler/derived-clap-cliStephen Jung
refactor: use `derive` interface of `clap`
2024-04-06style: collapse braced completions `match`Erich Gubler
2024-04-06refactor: s/args_clone/cmd/Erich Gubler
2024-04-06refactor: use `derive` interface of `clap`Erich Gubler
2024-04-03bump 0.6.130.6.13tummychow
2024-03-31Merge pull request #108 from Pi-Cla/patch-1Stephen Jung
Apply cargo clippy lints
2024-03-31Apply cargo clippy lintsPi-Cla
2024-03-24Merge pull request #106 from Pi-Cla/add-nushellStephen Jung
Add nushell completions
2024-03-24Add nushell completionsPi-Cla
2024-03-23Merge pull request #105 from Pi-Cla/patch-1Stephen Jung
Use get_flag instead of contains_id
2024-03-24Use get_flag instead of contains_idPi-Cla
Turns out get_flag is the intended command when checking whether a flag is present rather than contains_id
2024-03-23Merge pull request #104 from Pi-Cla/edition-2021Stephen Jung
Bump Rust edition, use caret requirements, upgrade to clap 4
2024-03-22Upgrade to clap 4Pi-Cla
I did this because clap 2 and 3 has a dependency on atty which is unmaintained and has a potential security vulnerability https://rustsec.org/advisories/RUSTSEC-2021-0145 clap 4 migration details: - Arg::with_name() has been replaced with Arg::new() - possible_values has been replaced with value_parser - args.value_of has been replaced with args.get_one::<String> - args.gen_completions_to() has been replaced with generate() - The way we use args.is_present() means it is replaced with contains_id() - Shell completion has been moved to the clap_complete crate - app_from_crate! has been replaced with command! * Which now requires a the `cargo` feature flag to access - line wrapping is now behind a feature flag `wrap_help` * Migration guide recommends we enable this or else we would need to manually implement line wrapping - Args are now assumed to take values by default so in order to specify a flag we need to append .action(ArgAction::SetTrue) to each arg. * takes_value() has been removed
2024-03-22Use Caret Requirements and run cargo updatePi-Cla
It seems caret requirements is the default semver compatible strategy https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#caret-requirements
2024-03-22Set Rust edition to 2021Pi-Cla
I ran `cargo msrv` and the minimum version of this crate was 1.64.0 so bumping the Rust edition does not raise the minimum
2024-02-27Merge pull request #103 from halostatue/patch-1Stephen Jung
Add MacPorts installation instructions
2024-02-27Add MacPorts installation instructionsAustin Ziegler
2024-02-25Merge pull request #102 from kiprasmel/always-shaStephen Jung
introduce git config option `absorb.fixupTargetAlwaysSHA`
2024-02-25introduce git config option `absorb.fixupTargetAlwaysSHA`Kipras Melnikovas
i've gotten used to SHAs and find them clearer & faster to identify than commit summaries, simply because the messages can be similar meanwhile shas differ very quickly.
2024-02-23bump 0.6.120.6.12tummychow
2024-02-23Merge pull request #98 from kiprasmel/auto-addStephen Jung
autostage: automatically add everything to index if index was empty
2024-02-23improve warning if 0 patches considered: 2 possible scenariosKipras Melnikovas
the warning didn't consider the case that some changes were staged, but couldn't be applied.
2024-02-23autostage: enable behavior only if enabled via configKipras Melnikovas
2024-02-23autostage: automatically add everything to index if index was emptyKipras Melnikovas
often times, i just want to try and absorb everything. right now, this means an extra step of `git add .` before `git absorb`, and potentially a `git reset @` later if not everything was fixed up. in this patch we remove both of the extra step for convenience: if nothing was staged, we stage everything, try to create fixups, and whatever's left uncommitted - we unstage.
2024-02-22Merge pull request #101 from kiprasmel/config-one-commit-per-fixupStephen Jung
introduce git config option `absorb.oneFixupPerCommit`
2024-02-23introduce git config option `absorb.oneFixupPerCommit`Kipras Melnikovas
2024-02-23refactor git-config utils into config.rsKipras Melnikovas
2024-02-22Merge pull request #100 from kiprasmel/rebase-autostashStephen Jung
rebase: add `--autostash` arg to perform rebase even if uncommitted changes left
2024-02-23rebase: add `--autostash` arg to perform rebase even if uncommitted changes leftKipras Melnikovas
2024-02-12Merge pull request #99 from tummychow/dependabot/cargo/libgit2-sys-0.16.21.7.2Stephen Jung
Bump libgit2-sys from 0.16.1+1.7.1 to 0.16.2+1.7.2
2024-02-12Bump libgit2-sys from 0.16.1+1.7.1 to 0.16.2+1.7.2dependabot[bot]
Bumps [libgit2-sys](https://github.com/rust-lang/git2-rs) from 0.16.1+1.7.1 to 0.16.2+1.7.2. - [Changelog](https://github.com/rust-lang/git2-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/git2-rs/commits) --- updated-dependencies: - dependency-name: libgit2-sys dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
2023-11-28bump 0.6.110.6.11tummychow
2023-11-28upgrade to git2 0.18.1tummychow
2023-09-06Merge pull request #94 from isomorpheme/patch-1Stephen Jung
Simplify nixpkgs install command
2023-09-06Simplify nixpkgs install commandDaan Rijks
The package is available as an attribute on `nixpkgs` directly, plus it looks like `gitAndTools` is a deprecated alias.
2023-08-03Merge pull request #93 from rbartlensky/fix-one-fixup-per-commitStephen Jung
Update `head_tree` when no commit happens.
2023-08-04Update `head_tree` when no commit happens.Robert Bartlensky
This regression was introduced in fb9e1b3950ab9b821ad402098c34bac46cfbd453. Moreover, the tests didn't catch it because they didn't check that there are no leftover changes.
2023-07-26Merge pull request #92 from rbartlensky/one-fixup-per-commitStephen Jung
Only update head_tree when we commit.
2023-07-26Only update head_tree when we commit.Robert Bartlensky
Fixes the case where if we pass `--dry-run` the additions/deletions keep growing in number since we never "reset" the tree back.
2023-07-25Merge pull request #91 from rbartlensky/one-fixup-per-commitStephen Jung
Add feature to generate one fixup per commit.
2023-07-25Add some `cargo-fmt` changes.Robert Bartlensky
2023-07-25Add basic tests for `one_fixup_per_commit` feature.Robert Bartlensky
2023-07-25Add option to create one fixup per commit.Robert Bartlensky
This means that all hunks meant to be fixed up into the same commit will be grouped into a single commit, rather than multiple ones. In order to not break the workflow of others, we choose to make this an option rather than the default. Moreover, folks can `alias git-absorb="git-absorb --one-fixup-per-commit"` if they wish to always use this option, and not have to type it out.
2023-05-03Merge pull request #87 from agriffis/patch-1Stephen Jung
add fedora to system package manager list
2023-05-03add fedora to system package manager listAron Griffis
2023-04-12Merge pull request #84 from theaquamarine/targetStephen Jung
Fix conditional in release.yml