Commit graph

70 commits

Author SHA1 Message Date
9377d973c1 git: Set default branch 2021-02-02 09:40:08 +05:30
6828369a17 git: Set auto squash for rebase by default and addEmptyPathspec to false 2021-01-30 15:03:57 +05:30
10b835beac git: Ignore .git globally 2021-01-14 20:05:41 +05:30
a98fca0d40 git: Ignore patch and diff files 2021-01-09 22:30:13 +05:30
dfe44fb14c git/nvim: Switch to using diffconflicts for resolving merge conflicts
While we dropped diffconflicts earlier and switch to vanilla vimdiff,
two way merges are definitely better than three way merges. 3 way merge
as in gina or vimdiff is extremely confusing except for may be the
simplest of merge conflicts.

conflict-marker and diffconflicts should let us handle all cases.
2020-12-19 16:29:06 +05:30
3e3b3cd153 Revert "git: Use vimdiff3 for merge"
This reverts commit 513c5f4dda.
2020-10-06 17:28:16 +05:30
a37f176d94 git: Prune tags by default on fetch 2020-10-05 17:59:25 +05:30
39e9b824a6 git: Some improvements to git configuration
Use fast forward only for merge, auto stash when doing rebase and take
care of tags when doing a push.
2020-10-02 12:08:21 +05:30
4f6aedb2cd git: Some updates based on delta's README 2020-09-26 10:48:00 +05:30
513c5f4dda git: Use vimdiff3 for merge
Use vimdiff3 instead of vimdiff. Might be better as mentioned below?
7c147b77d3
2020-09-26 10:48:00 +05:30
61d5759407 git: Set fetch.prune globally
Automatically delete remote tracking local branches that have been
removed from remote. This makes pruning references part of our
normal work flow.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-09-18 11:32:05 +05:30
d8fc9facec nvim/git: Use vimdiff as merge tool & drop DiffConflicts
The conflict markers plugin is what we have been using all the time and
is useful even without resorting to merge tool. Drop the DiffConflicts
plugin and use vimdiff as the merge tool if at all we need to resort to
a full 3 way merge view.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-09-17 10:48:11 +05:30
6bca8ccaad git: gitconfig: Use merge as default strategy for git pull
git config pull.rebase false  # merge (the default strategy)
git config pull.rebase true   # rebase
git config pull.ff only       # fast-forward only

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-06-13 14:15:10 +05:30
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