Daniel Siepmann
40de1d353f
Keep old git merge behaviour
...
I find it way to much / complicated and am used to my old way to merge
things which I keep for now.
2022-04-19 13:33:45 +02:00
Daniel Siepmann
df46cb05ed
Cleanup nix flakes + shells
...
Remove flakes for now.
I will use shells for now to not have a mixed setup.
Add composer v1 for a single customer project as overlay due to usage in
shell instead of flakes.
Adjust folder to not have unnecessary deep structure.
Add shell for reuter monorepo using composer v1.
2022-04-14 15:46:49 +02:00
Daniel Siepmann
def8300cca
Disable paging for some git commands
...
I don't like pager for those commands.
2022-03-30 13:02:58 +02:00
Daniel Siepmann
2cd771c838
Use less as general pager
...
I tried nvimpager but it was a bit complex for me to re use existing
Neovim settings tweak for specific usage as pager.
I decided to stick with less for everything.
2022-03-29 15:29:10 +02:00
Daniel Siepmann
126b0fa422
Add new plugin to Neovim for easier merges
...
I'll give it a try and check how well it works.
2022-03-23 17:28:36 +01:00
Daniel Siepmann
cdbf6a8680
Link Git mergetool against nixpkgs neovim
...
Do not use any global path.
2022-03-23 17:27:43 +01:00
Daniel Siepmann
3bf0d66f3b
Add inline todos with new plugins and programs to try
2022-03-16 09:04:03 +01:00
Daniel Siepmann
152e540dc1
Remove unused option to use xxdiff from git
...
I never used that feature, I always use less as pager and CLI context
for diffing.
2022-03-10 13:36:51 +01:00
Daniel Siepmann
a0832b3767
Add new Git alias
...
I use cherry-picks in one project and am to lazy to always wait for
auto completion.
2022-02-23 13:54:57 +01:00
Daniel Siepmann
00320b8a48
Use my own git diff setup
...
That one includes local base and remote at top.
It turns diffthis off for the merged result to have proper code
highlighting of result.
2022-02-21 13:39:22 +01:00
Daniel Siepmann
6a67e5df5d
Migrate git setup to home-manager
...
This was previously done through custom dotfiles.
2022-02-02 21:50:24 +01:00
Daniel Siepmann