diff options
| author | Johannes Altmanninger <aclopte@gmail.com> | 2024-01-25 00:51:41 +0100 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2024-01-26 09:52:01 +1100 |
| commit | c7eeb0ead5d35b3dac6feb7ce51ef33304ba792d (patch) | |
| tree | b410699e190e776065970be20fcc7fbc9e5743b2 | |
| parent | 6eb3d1baf51ffe13236f604fb4b51f13f7ec145f (diff) | |
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.
| -rw-r--r-- | rc/tools/git.kak | 2 |
1 files changed, 1 insertions, 1 deletions
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 |