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

sync: Added --cleanup, which removes local and remote synced/ branches.

Browse source 
Also deletes any tagged pushes that the assistant might have done,
since those would also prevent resetting a branch back.

This commit was sponsored by andrea rota.
This commit is contained in:
Joey Hess 2017-09-28 14:14:07 -04:00
parent 4d0e522b72
commit e8c9a5c515
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 107 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
doc/git-annex-sync.mdwn
View file

@ -125,6 +125,19 @@ by running "git annex sync" on the remote.
resolution. It can also be disabled by setting annex.resolvemerge
to false.
* `--cleanup`
Removes the local and remote `synced/` branches, which were created
and pushed by `git-annex sync`.
This can come in handy when you've synced a change to remotes and now
want to reset your master branch back before that change. So you
run `git reset` and force-push the master branch to remotes, only
to find that the next `git annex merge` or `git annex sync` brings the
changes back. Why? Because the `synced/master` branch is hanging
around and still has the change in it. Cleaning up the `synced/` branches
prevents that problem.
# SEE ALSO
[[git-annex]](1)