projects
/
dotfiles-framework.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
702b118
)
Use '-p1' instead of '-p0' for patching.
author
W. Trevor King
<wking@drexel.edu>
Mon, 30 Jan 2012 04:20:47 +0000
(23:20 -0500)
committer
W. Trevor King
<wking@drexel.edu>
Mon, 30 Jan 2012 04:22:24 +0000
(23:22 -0500)
This allows for patches like
--- a/.dir_colors ...
+++ b/.dir_colors ...
which I like better than
--- .dir_colors ...
+++ somewhere-else/.dir_colors ...
dotfiles.sh
patch
|
blob
|
history
diff --git
a/dotfiles.sh
b/dotfiles.sh
index 63d0adecc08a5913e387f0e43785cebb60136265..6bd279d41265ad593b617a86b8975264c3bac381 100755
(executable)
--- 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}" -p
0
< "../../${FILE}" || return 1
+ "${PATCH}" -p
1
< "../../${FILE}" || return 1
popd > /dev/null || return 1
fi
done