summaryrefslogtreecommitdiff
path: root/stack.yaml
diff options
context:
space:
mode:
authorSean Whitton2016-08-20 08:33:20 -0700
committerJoey Hess2016-08-20 14:52:23 -0400
commit845d9de7ab790a1691237c8f3b7a6bf8787b3489 (patch)
tree621987633d74e720cb54754605e537128aee9ceb /stack.yaml
parent5020a86907ade611324c66c82cf4ee074789bdd5 (diff)
pass --allow-unrelated-histories to git merge
Fixes merging the /usr/src/propellor git bundle with git 2.9.
Diffstat (limited to 'stack.yaml')
0 files changed, 0 insertions, 0 deletions