From c7eeb0ead5d35b3dac6feb7ce51ef33304ba792d Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Thu, 25 Jan 2024 00:51:41 +0100 Subject: [PATCH] rc tools git: suggest -3/--3way argument to git apply Sometimes a patch that fails to apply will apply cleanly after adding -3. Also sometimes we do want to apply with conflict markers. So this is another somewhat common option. --- rc/tools/git.kak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc/tools/git.kak b/rc/tools/git.kak index fea1d4c0..181dd731 100644 --- a/rc/tools/git.kak +++ b/rc/tools/git.kak @@ -107,7 +107,7 @@ define-command -params 1.. \ case "$1" in commit) printf -- "--amend\n--no-edit\n--all\n--reset-author\n--fixup\n--squash\n"; git ls-files -m ;; add) git ls-files -dmo --exclude-standard ;; - apply) printf -- "--reverse\n--cached\n--index\n" ;; + apply) printf -- "--reverse\n--cached\n--index\n--3way\n" ;; grep|edit) git ls-files -c --recurse-submodules ;; esac fi