aboutsummaryrefslogtreecommitdiff
path: root/doc/git-annex-merge.mdwn
Commit message (Expand)AuthorAge
* configuration to disable automatic merge conflict resolutionGravatar Joey Hess2017-06-01
* documentation updates for new receive.denyCurrentBranch=updateInstead supportGravatar Joey Hess2017-02-17
* expand manpages cross-references significantlyGravatar Antoine Beaupré2015-05-29
* splitting up the man pageGravatar Joey Hess2015-03-23