b184fc490a
Sometimes users would get confused because an option they were looking for was not mentioned on a subcommand's man page, and they had not noticed that the main git-annex man page had a list of common options. This change lets each subcommand mention the common options, similarly to how the matching options are handled. This commit was sponsored by Svenne Krap on Patreon.
39 lines
858 B
Markdown
39 lines
858 B
Markdown
# NAME
|
|
|
|
git-annex merge - merge changes from remotes
|
|
|
|
# SYNOPSIS
|
|
|
|
git annex merge [branch]
|
|
|
|
# DESCRIPTION
|
|
|
|
When run without any parameters, this performs the same merging (and merge
|
|
conflict resolution) that is done by the sync command, but without pushing
|
|
or pulling any data.
|
|
|
|
When a branch to merge is specified, this merges it, using the same merge
|
|
conflict resolution as the sync command. This is especially useful on
|
|
an adjusted branch, because it applies the same adjustment to the
|
|
branch before merging it.
|
|
|
|
When annex.resolvemerge is set to false, merge conflict resolution
|
|
will not be done.
|
|
|
|
# OPTIONS
|
|
|
|
* The [[git-annex-common-options]](1) can be used.
|
|
|
|
# SEE ALSO
|
|
|
|
[[git-annex]](1)
|
|
|
|
[[git-annex-sync]](1)
|
|
|
|
[[git-annex-adjust]](1)
|
|
|
|
# AUTHOR
|
|
|
|
Joey Hess <id@joeyh.name>
|
|
|
|
Warning: Automatically converted into a man page by mdwn2man. Edit with care.
|