Oliver Davies
|
75f983fea7
|
Revert "git: use difftastic "
This reverts commit c06fb20115 .
|
2024-07-28 13:30:11 +01:00 |
|
Oliver Davies
|
d2ae9d01ee
|
git-instafix: set a default upstream branch
|
2024-07-11 02:58:46 +01:00 |
|
Oliver Davies
|
5bf2253f98
|
git: organise extraConfig values
|
2024-07-09 14:25:00 +01:00 |
|
Oliver Davies
|
c06fb20115
|
git: use difftastic
|
2024-07-09 13:53:02 +01:00 |
|
Oliver Davies
|
53b8745b34
|
Update git-instafix to 0.2.7
v0.2.6 contained fixes for trunk-based development workflows that don't
require being on a separate branch.
https://github.com/quodlibetor/git-instafix/releases/tag/v0.2.6
|
2024-07-06 01:38:44 +01:00 |
|
Oliver Davies
|
d37e30e67c
|
git: ignore .ddev/providers
|
2024-07-05 15:12:06 +01:00 |
|
Oliver Davies
|
1e14953314
|
Add git-instafix
As seen on
https://www.youtube.com/live/ik_d0dWYQgQ?si=XSNR00ovIgSu7Ent&t=6510,
`git-instafix` is a tool for quickly fix up an old commit using your
currently-staged changes.
https://github.com/quodlibetor/git-instafix
|
2024-06-19 08:07:02 +01:00 |
|
Oliver Davies
|
7f2df5f726
|
Run nix fmt
Format using `nixfmt-rfc-style`.
|
2024-06-10 09:38:34 +01:00 |
|
Oliver Davies
|
ab20c7de69
|
Consolidate Git aliases
Move the `update` alias into the Git namespace, so it's now `git
update`, and remove the others that I wasn't using.
|
2024-05-20 19:09:17 +01:00 |
|
Oliver Davies
|
b1421c97e1
|
Format using nixfmt
|
2024-03-18 20:34:51 +00:00 |
|
Oliver Davies
|
b22ee35bb6
|
Remove lazygit configuration
|
2024-03-12 23:02:49 +00:00 |
|
Oliver Davies
|
506f99fdf1
|
Use a different email address for TfW codebases
|
2024-03-12 23:02:39 +00:00 |
|
Oliver Davies
|
9aa51a9446
|
git: include untracked files in stash
|
2024-03-02 23:42:15 +00:00 |
|
Oliver Davies
|
d2e1024897
|
Changes after working Scott Chacon's FOSDEM talk
- https://blog.gitbutler.com/fosdem-git-talk
- https://www.youtube.com/watch?v=aolI_Rz0ZqY
|
2024-03-01 23:26:36 +00:00 |
|
Oliver Davies
|
addad268e5
|
Rename system to lib
|
2024-02-29 08:24:01 +00:00 |
|