diff options
| author | Michael Forney <mforney@mforney.org> | 2021-09-07 02:04:14 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2021-09-07 13:41:11 -0700 |
| commit | a936fbebd1d538e65d71b7075b635a761063970f (patch) | |
| tree | 5b635d58c252193d37eb441c200e126df544aaf9 /scripts | |
| parent | d623cd7d0c3eaf105bd9ec7812db7e26b1aa3e4e (diff) | |
Use --keep-non-patch when applying git patches
Some of our patches use bracketed tags.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/fetch-git.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/fetch-git.sh b/scripts/fetch-git.sh index eea32d1c..460df460 100644 --- a/scripts/fetch-git.sh +++ b/scripts/fetch-git.sh @@ -9,5 +9,5 @@ cd "$1" git submodule update --init --checkout src if [ -d patch ] ; then - git -C src am --whitespace=nowarn "$PWD"/patch/* + git -C src am --keep-non-patch --whitespace=nowarn "$PWD"/patch/* fi |