Merge branch 'refs/heads/t/afh-preserve' into next
authorAndre Noll <maan@tuebingen.mpg.de>
Thu, 6 Jun 2019 06:36:15 +0000 (08:36 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Thu, 6 Jun 2019 06:36:15 +0000 (08:36 +0200)
commit189d595bb71bf16d17beacef6132bbd30ed6e2f2
tree2338a96e7c538c62735a2a6b61b60bce07659835
parentfcb5f26a54214cf2e1ec4240885df6bf3cbbbd20
parent0e34285da6ad1111b270d3463d5216493ffcde6f
Merge branch 'refs/heads/t/afh-preserve' into next

* refs/heads/t/afh-preserve:
  afh: Implement --preserve.