Commit Graph

67 Commits

Author SHA1 Message Date
Sanchayan Maity efdebf6d6f
git/ignore: Ignore ncmpcpp error log 2024-03-27 20:08:54 +05:30
Sanchayan Maity 129c16f1ff
git/ignore: Ignore local fd ignore files
fd ignore file in XDG_CONFIG_HOME does not seem to work.
https://github.com/sharkdp/fd/issues/763
2024-02-23 21:28:17 +05:30
Sanchayan Maity 14eae7eeb4
git: Update configuration 2024-02-07 14:56:43 +05:30
Sanchayan Maity 8027f7fbf3
git/ignore: Ignore local cabal project files & ghci history 2023-12-26 16:52:03 +05:30
Sanchayan Maity 7810c43679
git: Set receive.fsckObjects for additional protection against in-flight object corruption
See
https://people.kernel.org/monsieuricon/cross-fork-object-sharing-in-git-is-not-a-bug
2023-11-15 13:40:32 +05:30
Sanchayan Maity 3421c83582
git: Add an alias for getting branches recently updated 2023-06-19 13:09:15 +05:30
Sanchayan Maity b2e42c2cd6
git: Add an alias for git-jump 2023-06-07 13:14:58 +05:30
Sanchayan Maity 620540000a
git/ignore: Ignore GHC environment files generated by cabal build 2023-05-19 18:59:35 +05:30
Sanchayan Maity 9e0a966191
git: Clean up git ignore
We have been adding a few entries to gitignore which we wanted to
be ignored by ripgrep for search. Remove them. We will move them
to ripgrep configuration.
2023-05-09 16:19:07 +05:30
Sanchayan Maity ff616c1481
git: Set addIgnoredFile to false
Do not advice if we attempt to add an ignored file to the index.
2023-05-09 16:19:07 +05:30
Sanchayan Maity 89bc06651e
git/ignore: Ignore node garbage 2023-04-07 19:54:56 +05:30
Sanchayan Maity d4a71942d0
git: ignore: Ignore cabal build directory 2023-03-04 15:30:43 +05:30
Sanchayan Maity 91cbcbe75f
git/ignore: Ignore gstreamer-sharp directory
We do not give a crap about C# and do not want results from that
in our search.
2023-01-30 11:42:54 +05:30
Sanchayan Maity 674409573b
git/nvim: Drop diffconflicts
See the discussion on
https://github.com/whiteinge/diffconflicts/issues/26

Also
https://www.eseth.org/2020/mergetools.html
2023-01-17 10:09:29 +05:30
Sanchayan Maity 97700eecc8
git: Enable pager for difftool
We need this for using Difftastic.
2023-01-14 18:58:51 +05:30
Sanchayan Maity 7f086ca74a
git: Arrange alphabetically for sanity 2023-01-14 18:58:51 +05:30
Sanchayan Maity 7c57397ae6
git/attributes: Treat package lock files as binary 2023-01-14 18:58:51 +05:30
Sanchayan Maity 22596f2998
git: Set context and interHunkContext to a higher value
Default value of 3 turns out to be low sometimes. Increase it to 8.
2023-01-12 18:39:37 +05:30
Sanchayan Maity 5aec04f0cc
git/ignore: Ignore GStreamer docs directory
It is annoying when files from docs directory show up in ripgrep
searches.
2022-12-19 19:30:50 +05:30
Sanchayan Maity 8a38372b6c
git: Add signing key 2022-12-16 20:05:56 +05:30
Sanchayan Maity e3be97b0e9 tut: Add configuration for tut Mastodon TUI client
Right now all settings are at defaults.
2022-11-29 20:26:28 +05:30
Sanchayan Maity ac6a09238e git: Enable updateRefs by default for rebase
The feature is explained here
https://github.blog/2022-10-03-highlights-from-git-2-38/#rebase-dependent-branches-with-update-refs
2022-11-04 17:46:44 +05:30
Sanchayan Maity d946db650e git/ignore: Ignore GStreamer ChangeLog files
It is annoying when ChangeLog files show up in ripgrep searches.
2022-11-03 13:05:58 +05:30
Sanchayan Maity d6c36f8f9f git: ignore: Ignore compile_commands.json 2022-10-09 11:12:50 +05:30
Sanchayan Maity ca2d092166 Revert "fish/git: Manually set file type to git when calling nvim"
This reverts commit 2102b9983b.

Guess this got fixed in upstream commit 927d4d2.
2022-09-05 16:20:01 +05:30
Sanchayan Maity 2102b9983b fish/git: Manually set file type to git when calling nvim
This reverts 7b84c0e again. Seems the issue is back with upstream.
2022-08-06 11:18:12 +05:30
Sanchayan Maity 96aa7aec83 git: Use nvimdiff1 as the merge tool
The feature provided by the vim-diffconflicts plugin seems to have been
merged upstream. Use of nvimdiff1 should now suffice.

See https://www.eseth.org/2020/mergetools.html

There also seems to be a new proposal adding layout support which will
be interesting once merged.
https://lore.kernel.org/all/20220327112307.151044-1-greenfoo@u92.eu/
2022-05-04 10:59:39 +05:30
Sanchayan Maity 16c4e4ee27 git: ignore: Ignore any private notes we use 2022-05-04 10:59:39 +05:30
Sanchayan Maity c878a7b0be git: Use zealous diff3 style of merge conflict presentation
This is only available from git 2.35. A description of how this works is
in the original commit.
4496526f80
2022-05-03 18:31:36 +05:30
Sanchayan Maity 6a6a8b4d2a git: Global blame settings 2022-04-12 18:26:44 +05:30
Sanchayan Maity fc7d824d99 git: Do not use nvim as pager
For big repositories, using neovim as pager slows down commands like
git log.
2022-04-12 12:31:45 +05:30
Sanchayan Maity 2ca0beb1bf git: Add difftastic as a difftool option 2022-03-31 19:37:31 +05:30
Sanchayan Maity 7b84c0eb20 Revert "fish/functions/gl: git: Manually set the file type to git when calling nvim"
This reverts commit a30eda8531.

Fixed upstream with https://github.com/neovim/neovim/pull/17517.
2022-02-26 11:04:30 +05:30
Sanchayan Maity 4151be1e4b git: Ignore a work related directory 2022-01-06 15:25:10 +05:30
Sanchayan Maity a30eda8531 fish/functions/gl: git: Manually set the file type to git when calling nvim
See discussion in
https://github.com/neovim/neovim/issues/16940
2022-01-06 15:15:20 +05:30
Sanchayan Maity f3fdde252a git: Add support for using kitty as a difftool
While at it drop unnecessary double quotes.
2022-01-04 19:35:33 +05:30
Sanchayan Maity 664218addb git: ignore: Ignore cargo build directories 2021-12-16 18:12:51 +05:30
Sanchayan Maity 168e03563d git: Use neovim as our diff tool and pager 2021-12-14 15:44:33 +05:30
Sanchayan Maity 13dbf4a8c1 git: ignore: Ignore mediasoup directories
We want ripgrep to ignore mediasoup while grepping.
2021-12-08 20:59:21 +05:30
Sanchayan Maity 34bc9978d9 git: ignore: Ignore anything which looks like gdb stuff 2021-11-17 16:15:42 +05:30
Sanchayan Maity 19e5b410b9 git: Continue listing the history of a file beyond renames 2021-10-20 18:01:08 +05:30
Sanchayan Maity 138720944c git: Drop followTags setting for push
Not sure if we ever really needed this considering that we work on open
source projects, where we need only push the branch from which we raise
the MR. Pretty much the same for current client work as well. Are tags
ever required for such scenario?.
2021-10-14 15:01:43 +05:30
Sanchayan Maity 94aee9daf5 git: ignore: Ignore clangd cache 2021-10-13 12:12:24 +05:30
Sanchayan Maity bcf24ef5f6 git: Ignore gdb log and history files 2021-10-07 15:32:14 +05:30
Sanchayan Maity ccdb81f9b5 git: Set push.default
Do not push anything (error out) unless a refspec is given. We want
to avoid mistakes by always being explicit.

See https://git-scm.com/docs/git-config#Documentation/git-config.txt-pushdefault
2021-09-25 13:21:01 +05:30
Sanchayan Maity 0a220f0e8d git: Fix merge tool command 2021-04-28 13:29:17 +05:30
Sanchayan Maity b70f282dc8 git: Update to use our own email id 2021-02-12 00:58:47 +05:30
Sanchayan Maity 9377d973c1 git: Set default branch 2021-02-02 09:40:08 +05:30
Sanchayan Maity 6828369a17 git: Set auto squash for rebase by default and addEmptyPathspec to false 2021-01-30 15:03:57 +05:30
Sanchayan Maity 10b835beac git: Ignore .git globally 2021-01-14 20:05:41 +05:30