xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rc tools git: suggest -3/--3way argument to git apply

Browse Source 
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.
This commit is contained in:
Johannes Altmanninger 2024-01-25 00:51:41 +01:00 committed by Maxime Coste
parent 6eb3d1baf5
commit c7eeb0ead5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rc/tools/git.kak
View File

@ -107,7 +107,7 @@ define-command -params 1.. \
case "$1" in case "$1" in
commit) printf -- "--amend\n--no-edit\n--all\n--reset-author\n--fixup\n--squash\n"; git ls-files -m ;; 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 ;; 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 ;; grep|edit) git ls-files -c --recurse-submodules ;;
esac esac
fi fi