iankelling.org
/
git
/
distro-setup
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
78d2e2f
)
lines requiring sudo are broken, remove them
author
Ian Kelling
<ian@iankelling.org>
Mon, 23 May 2016 05:55:50 +0000
(22:55 -0700)
committer
Ian Kelling
<ian@iankelling.org>
Mon, 23 May 2016 05:55:50 +0000
(22:55 -0700)
conflink
patch
|
blob
|
history
diff --git
a/conflink
b/conflink
index 0170797245893eca5817df400986ac9274da026b..74ced8d47622fa9b000a465eac0138162fa69c5c 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-21,10
+21,6
@@
fi
shopt -s nullglob
shopt -s extglob
-s lnf -T /q/p /p
-s lnf -T /a/bin /b
-
-
# if we make a link back to the root, traversing the subdirs stops.
# This makes it so we can do subdir directories. Must call with absolute
# paths.