diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-05-25 13:43:20 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-05-25 13:43:20 -0400 |
| commit | 48325750438ef077b28de478bf3dc7e27b7cab8f (patch) | |
| tree | bb30dfc61b8b9a2a0843427753e05cee2b3e9733 /doc/git-annex-sync.mdwn | |
| parent | ae063520943a71de460d296877de3e7168602a2e (diff) | |
improve docs, mention git config receive.denyCurrentBranch updateInstead
Diffstat (limited to 'doc/git-annex-sync.mdwn')
| -rw-r--r-- | doc/git-annex-sync.mdwn | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/git-annex-sync.mdwn b/doc/git-annex-sync.mdwn index cabe5fed9..a27d31565 100644 --- a/doc/git-annex-sync.mdwn +++ b/doc/git-annex-sync.mdwn @@ -26,8 +26,9 @@ versions of a file have been committed, both will be added to the tree, under different filenames. For example, file "foo" would be replaced with "foo.somekey" and "foo.otherkey". -Note that syncing with a remote will not update the remote's working -tree with changes made to the local repository. However, those changes +Note that syncing with a remote will not normally update the remote's working +tree with changes made to the local repository. (Unless it's configured +with receive.denyCurrentBranch=updateInstead.) However, those changes are pushed to the remote, so they can be merged into its working tree by running "git annex sync" on the remote. |