blob: 3001e9bed97216babfc14645c811c1103b7c7d27 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
# NAME
git-annex merge - automatically merge changes from remotes
# SYNOPSIS
git annex merge
# DESCRIPTION
This performs the same merging (and merge conflict resolution)
that is done by the sync command, but without pushing or pulling any
data.
# SEE ALSO
[[git-annex]](1)
[[git-annex-sync]](1)
# AUTHOR
Joey Hess <id@joeyh.name>
Warning: Automatically converted into a man page by mdwn2man. Edit with care.
|
