diff options
| author | Loek Le Blansch <loek@pipeframe.xyz> | 2025-10-13 19:22:30 +0200 |
|---|---|---|
| committer | Loek Le Blansch <loek@pipeframe.xyz> | 2025-10-13 19:22:30 +0200 |
| commit | 9468fda222d000c86108908569b7e1129305831e (patch) | |
| tree | 5889d7ce31b505b847acd97a09d0275a3c3aed71 /.config/git | |
| parent | 180101c75a0f882510c51a6fed5651d1e77f691d (diff) | |
updates from work
Diffstat (limited to '.config/git')
| -rw-r--r-- | .config/git/config##template | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.config/git/config##template b/.config/git/config##template index 8f34c5d..0a3418a 100644 --- a/.config/git/config##template +++ b/.config/git/config##template @@ -33,6 +33,10 @@ 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 |