This commit is contained in:
Joey Hess 2016-04-22 14:35:48 -04:00
parent 46e3319995
commit 7945dd3c3e
Failed to extract signature
3 changed files with 16 additions and 13 deletions

View file

@ -16,4 +16,5 @@ but AFAICS, git-annex never uses `git pull`)
> [[done]]; used the environment variable
> `GIT_MERGE_ALLOW_UNRELATED_HISTORIES` which will hopefully land in git
> `next` (currently in `pu`) --[[Joey]]
> `next` (currently Junio has posted a patch but not even landed it in `pu`
> yet) --[[Joey]]