mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

merged fix from kyle

Browse source
This commit is contained in:
Joey Hess 2021-01-07 13:47:29 -04:00
parent 33bcee86f1
commit 1e65d1b9af
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -20,6 +20,9 @@ git-annex (8.20201130) UNRELEASED; urgency=medium
be used.
* Fix --time-limit, which got broken in several ways by some optimisations
in version 8.20201007.
* When syncing changes back from an adjusted branch to the basis branch,
include deletions of submodules.
Thanks, Kyle Meyer for the patch.
-- Joey Hess <id@joeyh.name> Mon, 04 Jan 2021 12:52:41 -0400

1
doc/bugs/Submodule_deletion_not_synced_from_adjusted_branch.mdwn
View file

@ -121,3 +121,4 @@ base-commit: f3546976483aa4c29e1050081af6d5a03290e25b
[[!meta author=kyle]]
[[!tag projects/datalad]]
> [[done]] thanks! --[[Joey]]

8
doc/bugs/Submodule_deletion_not_synced_from_adjusted_branch/comment_1_6473d7eceae5141e36c87156044b9d06._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2021-01-07T17:41:49Z"
content="""
Clearly correct. The `_` pattern match hid this when
[[!commit a13c0ce66c]] added TreeCommit.
"""]]