ambroisie/nix-config
ambroisie/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
872 commits 9 branches 0 tags 3.8 MiB
Commit graph

22 commits

Author SHA1 Message Date
Bruno BELANYI e32ce32860 home: git: use 'zdiff3' merge conflict markers 
See GitHub's presentation about this feature [1].

[1]: https://github.blog/2022-01-24-highlights-from-git-2-35/
 2022-03-11 14:11:32 +01:00
Bruno BELANYI 9dd3dceb83 home: ssh: add 'work' host
All checks were successful
continuous-integration/drone/push Build is passing
Details
2022-01-25 15:53:01 +01:00
Bruno BELANYI 0becdd4b99 home: git: do not change metadata color
All checks were successful
continuous-integration/drone/push Build is passing
Details
2021-12-06 21:24:31 +01:00
Bruno BELANYI 925b872305 home: git: switch to 'delta'
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Now that my issue with it has been resolved [1], let's switch to the
more mature tool.

This also solves a small issue that I had with `diff-highlight` which is
that non-highlighted text should not be boldened.

[1]: https://github.com/dandavison/delta/issues/544
 2021-11-29 17:50:07 +01:00
Bruno BELANYI 2b5fedadd2 home: git: use diff-highlight in interactive diffs 
Now even `git log -p` and `git add -p` can use the more readable diffs.
 2021-11-29 13:13:48 +01:00
Bruno BELANYI 708d60bcc6 home: git: rewrite gitlab URLs to use ssh
All checks were successful
continuous-integration/drone/push Build is passing
Details
2021-10-18 14:45:23 +02:00
Bruno BELANYI 5e438f9e77 home: git: rewrite github URLs to use ssh 2021-10-18 14:44:19 +02:00
Bruno BELANYI 9e33f4ca82 home: git: rewrite personal gitea URLs to use ssh 2021-10-18 14:44:08 +02:00
Bruno BELANYI b1cff1b8a3 home: git: add git-related packages when enabled
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Instead of adding them in the general packages section.
 2021-10-13 15:36:28 +02:00
Bruno BELANYI e475855e18 home: git: inline EPITA configuration include 2021-10-13 15:36:28 +02:00
Bruno BELANYI 111ee136c8 home: git: use 'mkMailAccount' 2021-10-13 15:36:28 +02:00
Bruno BELANYI b298607ea7 home: git: add 'git' alias
All checks were successful
continuous-integration/drone/push Build is passing
Details
2021-10-12 16:33:33 +02:00
Bruno BELANYI f2dfeeb35b home: git: use topological order in log 
It is the one that makes most sense, rather than some kind of date
order...
 2021-07-13 17:50:44 +02:00
Bruno BELANYI f66da6fee6 home: git: add 'pick' alias
All checks were successful
continuous-integration/drone/push Build is passing
Details 
I wanted to name it 'pickaxe' but for a curious reason, it does not seem
to be working when I use that alias...

I am trying to find a second alias name for `git log -p -S`, which only
shows commits that change the number of occurrences of its pickaxe in
the file. Whereas `-G` shows any commit involving the pickaxe in its
diff.
 2021-05-25 23:13:35 +02:00
Bruno BELANYI 3e9ccdbca7 home: git: clean up ignore file handling
All checks were successful
continuous-integration/drone/push Build is passing
Details
2021-03-15 20:54:18 +00:00
Bruno BELANYI 4363c1312e home: git: sort configuration attributes 2021-03-15 20:53:52 +00:00
Bruno BELANYI 2732d0558a home: git: make it enable-able 2021-03-14 12:18:09 +00:00
Bruno BELANYI 94950d3360 home: git: set up colors for diff-highlight 2021-03-03 17:02:48 +00:00
Bruno BELANYI 863fcfafc2 home: git: enable diff-highlight 2021-03-03 17:02:48 +00:00
Bruno BELANYI bf2671a162 home: git: add default ignores 2021-03-03 17:02:48 +00:00
Bruno BELANYI d5ec493b92 home: git: add EPITA identity 
Make it conditional on the repositorie's path, as with the Arch
configuration.
 2021-03-03 17:02:48 +00:00
Bruno BELANYI 12712f3f77 home: add git 2021-03-03 17:02:48 +00:00