diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-02-17 15:43:16 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-02-17 15:43:16 -0400 |
| commit | a6b07a44d010566d43e7834399d291948a3921ac (patch) | |
| tree | 41de0287671b2c9c221a32afd8b85212a2a15bff /doc/git-annex-merge.mdwn | |
| parent | 2c74780d475a2c9e60d8bf4d222bec7e15ca9dd6 (diff) | |
documentation updates for new receive.denyCurrentBranch=updateInstead support
This commit was sponsored by andrea rota.
Diffstat (limited to 'doc/git-annex-merge.mdwn')
| -rw-r--r-- | doc/git-annex-merge.mdwn | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/doc/git-annex-merge.mdwn b/doc/git-annex-merge.mdwn index a86886e75..3001e9bed 100644 --- a/doc/git-annex-merge.mdwn +++ b/doc/git-annex-merge.mdwn @@ -12,10 +12,6 @@ This performs the same merging (and merge conflict resolution) that is done by the sync command, but without pushing or pulling any data. -One way to use this is to put `git annex merge` into a repository's -post-receive hook. Then any syncs to the repository will update its -working copy automatically. - # SEE ALSO [[git-annex]](1) |