Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Stacked Git #69

Merged
merged 5 commits into from
Oct 14, 2024
Merged

Add Stacked Git #69

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
552cd97
style(flake): split buildInputs over multiple lines and sort
PoolloverNathan Oct 14, 2024
3282568
fix(flake)!: new branches will no longer track main by default
PoolloverNathan Oct 14, 2024
76e6d97
fix(flake): remove duplicate nix installation
PoolloverNathan Oct 14, 2024
0569ae2
feat(flake): install stgit (stacked git, https://stacked-git.github.io/)
PoolloverNathan Oct 14, 2024
4364777
Merge branch 'main' into stg
PoolloverNathan Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,21 @@
};
formatter = pkgs.alejandra;
devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [nix jdk17 gradle git gh nix bashInteractive];
buildInputs = with pkgs; [
bashInteractive
gh
git
gradle
jdk17
nix
stgit
];
shellHook = ''
alias pr="gh co"
alias mkpr="gh pr create"
br() {
git fetch origin main
git switch -c "''${1?}" origin/main
git switch -c "''${1?}" --no-track origin/main
}
rv() {
if test -z "$1"; then
Expand Down