Commit graph

20 commits

Author SHA1 Message Date
98dad64976
jj: Add jj insert alias for forgotten commits
Allows the user to just use the `ji` alias to quickly create a (previous) change,
commit whatever they forgot and move back to the current commit.
2025-02-14 10:48:00 +01:00
cfa59ae9df
jj: Add revset aliases 2025-02-14 10:47:54 +01:00
25c6788247
jj: Make aliased log revset default in config
Instead of aliasing the revset I am always using currently, we simply
set it to be the default for any log command. If we want a different
revset we can still supply it. Other aliases keep different revsets
(e.g. `jL` variants for `all()` revsets).
2025-02-14 10:47:54 +01:00
98c54443e9
git: Add pr alias which fetches a specific github pull request
Used like `g pr 1234` to create local pr/1234 branch.
2025-02-14 10:47:53 +01:00
43aefd2369
jj: Automatically show git diff for commit descriptions 2025-02-14 10:47:52 +01:00
0bd604298f
jj: Add git commit signing and private commits
Git commits, on push, will be signed by default (just like my git
configuration itself) but *not* every change is signed since that is a
hassle with the working copy technically also being an ever changing
git commit.

Additionally, added a private-commit option which will refuse to push
commits beginning with 'wip: ' to any remote, which is not super useful
for my current use cases but also a nice feature and fun to experiment
with for the future.
2025-02-14 10:47:51 +01:00
7922e5285f
jj: Add alias for showing a commit with description 2025-02-14 10:47:50 +01:00
2eccfe88ec
jj: Improve default log invocation
The default log invoked when hitting `j` is now composed of the working copy history as well as all
ancestors, recent commits to visible heads and the trunk.

`jl` shows the same view, only as oneline commits.
2025-02-14 10:47:50 +01:00
9f4b3b14e7 jj: Improve aliases 2025-02-07 23:10:38 +01:00
5952e32bce
git: Add pull request fetching alias
Gets a pull request for the repo by directly fetching from the pull
folder of the repository. Works perfectly with github (should also work
with gitlab, and gitea/forgejo).

Searches for a remote called github or uses the default origin one.
2025-02-07 16:45:00 +01:00
8b6e338fc2
git: Reformat config 2025-02-07 16:41:59 +01:00
9b7290c93c
jj: Use delta as diff pager 2025-02-07 15:05:24 +01:00
31dc3fa9b7
git: Change merge conflict to zdiff3 style 2025-02-07 13:12:47 +01:00
fee876b87f
vcs: Fix jj program structure 2024-09-19 11:04:54 +02:00
f6b1c5ff2e
vcs: Fix git program structure 2024-09-19 11:03:36 +02:00
11d6a08bcc
vcs: Set default diff editor
Using neovim 'hunk.nvim' plugin
2024-09-19 10:07:32 +02:00
bfb4fadee0
vcs: Add aliases for jj 2024-09-19 10:07:04 +02:00
bcd93eb237
vcs: Restructure vcs module
Just like writing and qutebrowser modules, restructured the version
control software module to make more use of dotter's ability to
precisely link files. All contained programs have a top-level directory
and all the files that correspond to that specific software lie beneath
in the directory tree.
2024-09-18 17:38:44 +02:00
0b6f0c235d
vcs: Add jujutsu config file 2024-09-18 17:28:13 +02:00
4aec6b9ba3
vcs: Rename from git to support multiple vcs 2024-09-18 17:25:12 +02:00