git-annex merge branch
* merge: When run with a branch parameter, merges from that branch. This is especially useful when using an adjusted branch, because it applies the same adjustment to the branch before merging it.
This commit is contained in:
parent
b90ee6dc52
commit
b87ea12b6b
7 changed files with 58 additions and 28 deletions
|
@ -57,7 +57,7 @@ for more details, and bear in mind that you can also use commands like
|
|||
these to only import from or export to the android device:
|
||||
|
||||
git annex import master:android --from android
|
||||
git merge android/master
|
||||
git annex merge android/master
|
||||
git annex export master:android --to android
|
||||
|
||||
## sample workflows
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue