From 515d0723165461ff22b0b45119344d8464313c97 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sun, 29 Jan 2012 23:20:47 -0500 Subject: [PATCH] Use '-p1' instead of '-p0' for patching. This allows for patches like --- a/.dir_colors ... +++ b/.dir_colors ... which I like better than --- .dir_colors ... +++ somewhere-else/.dir_colors ... --- dotfiles.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles.sh b/dotfiles.sh index 63d0ade..6bd279d 100755 --- a/dotfiles.sh +++ b/dotfiles.sh @@ -476,7 +476,7 @@ function patch() if [ -f "${FILE}" ]; then echo "apply ${FILE}" pushd "${REPO}/patched-src/" > /dev/null || return 1 - "${PATCH}" -p0 < "../../${FILE}" || return 1 + "${PATCH}" -p1 < "../../${FILE}" || return 1 popd > /dev/null || return 1 fi done -- 2.26.2