diff options
| author | Leah Rowe <leah@libreboot.org> | 2026-09-06 10:16:00 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2026-09-06 10:16:00 +0100 |
| commit | 01cb422c9771c7daa00c6f832c3294d59802a635 (patch) | |
| tree | 07726debac388777e6284dfd5371267fed26db29 | |
| parent | 8d0ad21112b73c956907d75c1565d09d26980ac4 (diff) | |
include/get.sh: 3-way merge on git am
this will make managing updates easier. which will
be soon, because i have a lot of patches.
no idea why i didn't add this before. normally, i just
copy a directory and git-fetch, then cherry-pick as
i please. this will make it trivial to just update
a revision and merge the patches. then i can just
intervene only when necessary, on a given src tree.
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | include/get.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/get.sh b/include/get.sh index 8ce26e39..acbd745a 100644 --- a/include/get.sh +++ b/include/get.sh @@ -443,7 +443,7 @@ tmpclone() while read -r tmpclone_patch; do - ( x_ git -C "$2" am --keep-cr "$tmpclone_patch" ) || \ + ( x_ git -C "$2" am -3 --keep-cr "$tmpclone_patch" ) || \ err "Can't apply '$tmpclone_patch'" "tmpclone" "$@"; : done < "$tmpclone_patchlist" || \ |