diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-09-28 14:14:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-09-28 14:58:48 -0400 |
| commit | a9f8f8336bbb141c238ba9c71d78de00d8d0091e (patch) | |
| tree | 105f4b137c235852885443697c51f5ee71aa6d6e /doc | |
| parent | bf4c5f82de894139789136457c04dd048956c617 (diff) | |
sync: Added --cleanup, which removes local and remote synced/ branches.
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.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/git-annex-sync.mdwn | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/git-annex-sync.mdwn b/doc/git-annex-sync.mdwn index 7b03a2ed1..f4d644fd3 100644 --- a/doc/git-annex-sync.mdwn +++ b/doc/git-annex-sync.mdwn @@ -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) |