b6d46c212e
* unannex, uninit: Avoid committing after every file is unannexed,
for massive speedup.
* --notify-finish switch will cause desktop notifications after each
file upload/download/drop completes
(using the dbus Desktop Notifications Specification)
* --notify-start switch will show desktop notifications when each
file upload/download starts.
* webapp: Automatically install Nautilus integration scripts
to get and drop files.
* tahoe: Pass -d parameter before subcommand; putting it after
the subcommand no longer works with tahoe-lafs version 1.10.
(Thanks, Alberto Berti)
* forget --drop-dead: Avoid removing the dead remote from the trust.log,
so that if git remotes for it still exist anywhere, git annex info
will still know it's dead and not show it.
* git-annex-shell: Make configlist automatically initialize
a remote git repository, as long as a git-annex branch has
been pushed to it, to simplify setup of remote git repositories,
including via gitolite.
* add --include-dotfiles: New option, perhaps useful for backups.
* Version 5.20140227 broke creation of glacier repositories,
not including the datacenter and vault in their configuration.
This bug is fixed, but glacier repositories set up with the broken
version of git-annex need to have the datacenter and vault set
in order to be usable. This can be done using git annex enableremote
to add the missing settings. For details, see
http://git-annex.branchable.com/bugs/problems_with_glacier/
* Added required content configuration.
* assistant: Improve ssh authorized keys line generated in local pairing
or for a remote ssh server to set environment variables in an
alternative way that works with the non-POSIX fish shell, as well
as POSIX shells.
# imported from the archive
38 lines
918 B
Markdown
38 lines
918 B
Markdown
# NAME
|
|
|
|
git-union-merge - Join branches together using a union merge
|
|
|
|
# SYNOPSIS
|
|
|
|
git union-merge ref ref newref
|
|
|
|
# DESCRIPTION
|
|
|
|
Does a union merge between two refs, storing the result in the
|
|
specified newref.
|
|
|
|
The union merge will always succeed, but assumes that files can be merged
|
|
simply by concacenating together lines from all the oldrefs, in any order.
|
|
So, this is useful only for branches containing log-type data.
|
|
|
|
Note that this does not touch the checked out working copy. It operates
|
|
entirely on git refs and branches.
|
|
|
|
# EXAMPLE
|
|
|
|
git union-merge git-annex origin/git-annex refs/heads/git-annex
|
|
|
|
Merges the current git-annex branch, and a version from origin,
|
|
storing the result in the git-annex branch.
|
|
|
|
# BUGS
|
|
|
|
File modes are not currently merged.
|
|
|
|
# AUTHOR
|
|
|
|
Joey Hess <joey@kitenet.net>
|
|
|
|
<http://git-annex.branchable.com/>
|
|
|
|
Warning: Automatically converted into a man page by mdwn2man. Edit with care
|