diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-06-07 16:16:22 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-06-07 16:17:46 -0400 |
| commit | 007aa90a739fa754625f146001d880a9a45483a4 (patch) | |
| tree | f8525f863c4a2d9219e6c6deb984dc04caf2b803 /CHANGELOG | |
| parent | 656efe58861dc621c462eaee6fe795395c0d343c (diff) | |
assistant: Merge changes from refs/remotes/foo/master into master.
Previously, only sync branches were merged. This makes regular git push
into a repository watched by the assistant auto-merge.
While this does hardcode an assumption about what the remote tracking
branch is named, which some unusual git configurations won't match,
git-annex sync already made the same assumption.
Also, changed behavior when a tracking branch like
refs/remotes/synced/not/master is received. When on the master branch,
that used to get merged into it, but it's the tracking branch for
not/master, so should only be merged in when on the not/master branch.
This commit was sponsored by Ewen McNeill.
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -22,6 +22,9 @@ git-annex (6.20170520) UNRELEASED; urgency=medium * Fix bug that prevented transfer locks from working when run on SMB or other filesystem that does not support fcntl locks and hard links. + * assistant: Merge changes from refs/remotes/foo/master into master. + Previously, only sync branches were merged. This makes regular git push + into a repository watched by the assistant auto-merge. -- Joey Hess <id@joeyh.name> Wed, 24 May 2017 14:03:40 -0400 |