Commit graph

7 commits

Author SHA1 Message Date
fd5c5b15f5 git: gitconfig: Always use verbose for commits
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-05-21 10:27:17 +05:30
f8ce9ccb21 git: gitconfig: Remove diff3 as conflict style
diff3 as conflict style was required by vim-mergetool. It is not
required by the current plugins we are using.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-05-05 11:26:23 +05:30
534eebb89e nvim: Remove mergetool and switch to DiffConflicts for git merge
Also add the conflict-marker plugin. This should also be useful
for doing rebases and resolving conflicts. Might drop one later
if one of them serves all the purposes in all cases.

While at it, add unimpaired style bindings for moving between
tabs. This is required since :DiffConflictsShowHistory opens
a new tab and default tab navigation bindings gt/gT at least
are binded to something else in python.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-05-03 21:35:28 +05:30
7eeb5cf7ea git: Use a global gitignore
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-16 10:26:58 +05:30
7738d0c621 git: Use vim-mergetool for merge conflicts
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-02-16 17:54:11 +05:30
2237cdf38f git: Update gitconfig
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2019-12-31 14:59:43 +05:30
8f0b2fb93e Individual configs should still be in directories
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2019-12-31 14:38:50 +05:30
Renamed from gitconfig (Browse further)