diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-05-16 14:35:37 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-05-16 14:35:37 -0400 |
| commit | 2e77647c6da30b15bcbb37c64f934fbd1a1efdf8 (patch) | |
| tree | 9eb2daafe2b52c33e0f776fa3331c92434f802bd /CHANGELOG | |
| parent | 4c816e4f7df10c031320a73246764d8303c64d3e (diff) | |
Work around bug in git 2.13.0 involving GIT_COMMON_DIR that broke merging changes into adjusted branches.
Might want to remove this when it gets fixed, in case adjusted branches are
used in a repo with a great many refs, which would become unnecessarily
slow.
This commit was supported by the NSF-funded DataLad project.
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -6,6 +6,8 @@ git-annex (6.20170511) UNRELEASED; urgency=medium only one ssh password prompt will be made at a time. * Removed dependency on MissingH, instead depending on the split library. * Progress is displayed for transfers of files of unknown size. + * Work around bug in git 2.13.0 involving GIT_COMMON_DIR that broke + merging changes into adjusted branches. -- Joey Hess <id@joeyh.name> Thu, 11 May 2017 15:16:23 -0400 |