diff options
Diffstat (limited to '.config/git/config##template')
| -rw-r--r-- | .config/git/config##template | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/.config/git/config##template b/.config/git/config##template index f8c16b2..0a3418a 100644 --- a/.config/git/config##template +++ b/.config/git/config##template @@ -1,5 +1,7 @@ [init] defaultBranch = master +[core] + quotepath = off [user] email = loek@pipeframe.xyz name = Loek Le Blansch @@ -31,3 +33,11 @@ l = log d = diff cloc = !git ls-files -z | xargs -0 cloc + conflict = !git diff --name-only --diff-filter=U --relative + ec = !git conflict -z | xargs -0 -- $EDITOR + ours = !git conflict -z | xargs -0 -- git checkout --ours + theirs = !git conflict -z | xargs -0 -- git checkout --theirs +[pager] + log = diff-highlight | less + show = diff-highlight | less + diff = diff-highlight | less |