aboutsummaryrefslogtreecommitdiff
path: root/doc/git-annex-merge.mdwn
Commit message (Collapse)AuthorAge
* configuration to disable automatic merge conflict resolutionGravatar Joey Hess2017-06-01
| | | | | | | | | | | | | | | * Added annex.resolvemerge configuration, which can be set to false to disable the usual automatic merge conflict resolution done by git-annex sync and the assistant. * sync: Added --no-resolvemerge option. Note that disabling merge conflict resolution is probably not a good idea in a direct mode repo or adjusted branch. Since updates to both are done outside the usual work tree, if it fails the tree is not left in a conflicted state, and it would be hard to manually resolve the conflict. Still, made annex.resolvemerge be supported in those cases for consistency. This commit was sponsored by Riku Voipio.
* documentation updates for new receive.denyCurrentBranch=updateInstead supportGravatar Joey Hess2017-02-17
| | | | This commit was sponsored by andrea rota.
* expand manpages cross-references significantlyGravatar Antoine Beaupré2015-05-29
| | | | | | | | | | | | | | | | | | i found that most man pages only had references to the main git-annex manpage, which i stillfind pretty huge and hard to navigate through. i tried to sift through all the man pages and add cross-references between relevant pages. my general rule of thumb is that links should be both ways unless one of the pages is a more general page that would become ridiculously huge if all backlinks would be added (git-annex-preferred-content comes to mind). i have also make the links one per line as this is how it was done in the metadata pages so far. i did everything but the plumbing, utility and test commands, although some of those are linked from the other commands so cross-links were added there as well.
* splitting up the man pageGravatar Joey Hess2015-03-23
Common command man pages all split out and often expanded. A few sections split out into their own pages. Still need to do all the other commands..