mirror of
https://github.com/mawww/kakoune.git
synced 2024-08-17 00:30:26 +03:00
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.
This commit is contained in:
parent
6eb3d1baf5
commit
c7eeb0ead5
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user