diff options
Diffstat (limited to 'doc/git-union-merge.mdwn')
| -rw-r--r-- | doc/git-union-merge.mdwn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/git-union-merge.mdwn b/doc/git-union-merge.mdwn index 0322641ef..495612f36 100644 --- a/doc/git-union-merge.mdwn +++ b/doc/git-union-merge.mdwn @@ -4,7 +4,7 @@ git-union-merge - Join branches together using a union merge # SYNOPSIS -git union-merge newref ref ref +git union-merge ref ref newref # DESCRIPTION @@ -20,7 +20,7 @@ entirely on git refs and branches. # EXAMPLE - git union-merge refs/heads/git-annex git-annex origin/git-annex + 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. |