Colin Walters 051cdf396c lib/checkout: Rename disjoint union, change to merge identical files ... It turns out that librpm automatically merges identical files between distinct packages, and this occurs in practice with Fedora today between `chkconfig` and `initscripts` for exmaple. Since we added this for rpm-ostree, we basically want to do what librpm does, let's change the semantics to do a merge. While we're here rename to `UNION_IDENTICAL`. Closes: #1156 Approved by: jlebon		2017-09-13 19:19:33 +00:00
..
ostree-admin-cleanup.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-admin-config-diff.xml	Rename "osname" → "stateroot"	2017-04-24 16:09:51 +00:00
ostree-admin-deploy.xml	ostree-sysroot: make simple_write_deployment smarter	2017-08-25 01:02:15 +00:00
ostree-admin-init-fs.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-admin-instutil.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-admin-os-init.xml	Rename "osname" → "stateroot"	2017-04-24 16:09:51 +00:00
ostree-admin-set-origin.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-admin-status.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-admin-switch.xml	Rename "osname" → "stateroot"	2017-04-24 16:09:51 +00:00
ostree-admin-undeploy.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-admin-unlock.xml	admin: Add an unlock command, and libostree API	2016-03-23 11:09:09 -04:00
ostree-admin-upgrade.xml	Rename "osname" → "stateroot"	2017-04-24 16:09:51 +00:00
ostree-admin.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-cat.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-checkout.xml	lib/checkout: Rename disjoint union, change to merge identical files	2017-09-13 19:19:33 +00:00
ostree-checksum.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-commit.xml	commit: Update manpage to reflect --editor	2016-05-25 18:37:47 +00:00
ostree-config.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-diff.xml	diff: Add ostree_diff_dirs_with_options(), expose via cmdline	2017-03-21 13:38:04 +00:00
ostree-export.xml	man/ostree-export.xml: Add to git	2016-02-15 06:39:49 -05:00
ostree-fsck.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-gpg-sign.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-init.xml	tree-wide: Replace archive-z2 with archive	2017-09-01 20:54:12 +00:00
ostree-log.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-ls.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-prune.xml	fixup! fix typo in docs/manual/atomic-upgrades.md	2016-08-12 21:20:08 +00:00
ostree-pull-local.xml	Add --untrusted option to pull and pull-local	2016-03-25 12:56:55 +00:00
ostree-pull.xml	tree-wide: Replace archive-z2 with archive	2017-09-01 20:54:12 +00:00
ostree-refs.xml	man: Update ostree-refs manpage	2017-08-10 14:31:49 +00:00
ostree-remote.xml	man: document configured branches	2017-08-10 14:54:03 +00:00
ostree-reset.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-rev-parse.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-show.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree-static-delta.xml	Documentation: static delta default from	2017-08-07 15:06:55 +00:00
ostree-summary.xml	ostree/summary: Add support for adding additional metadata	2017-06-27 19:19:32 +00:00
ostree-trivial-httpd.xml	build: Move man pages into man/	2016-01-28 09:31:34 -05:00
ostree.repo-config.xml	repo: Add add-remotes-config-dir option	2017-09-11 10:53:20 +00:00
ostree.repo.xml	man: Mention bare-user in manpages, along with the other modes	2016-11-30 15:47:24 +00:00
ostree.xml	Rename "osname" → "stateroot"	2017-04-24 16:09:51 +00:00
rofiles-fuse.xml	Import rofiles-fuse	2016-02-10 13:11:25 +01:00