4 commits

Author	SHA1	Message	Date
Joey Hess	b87ea12b6b	git-annex merge branch ... * merge: When run with a branch parameter, merges from that branch. This is especially useful when using an adjusted branch, because it applies the same adjustment to the branch before merging it.	2019-08-09 13:21:15 -04:00
Joey Hess	d98dc13345	update for preferred content	2019-05-21 14:56:45 -04:00
Joey Hess	48c2a95efb	simpler setup instructions ... This commit was sponsored by Denis Dzyubenko on Patreon.	2019-04-10 12:34:28 -04:00
Joey Hess	1a1a5177fd	add tip for new adb import feature ... This commit was sponsored by Jake Vosloo on Patreon.	2019-04-09 17:45:55 -04:00