mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2020-06-16 13:55:07 -04:00
commit f0f1a23404
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 60 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

37
doc/tips/android_sync_with_adb/comment_1_18e0b24a2907ba8df033454315e50212._comment Normal file
View file

@ -0,0 +1,37 @@
[[!comment format=mdwn
username="https://dead-doomer.livejournal.com/"
subject=" How do I specify a merge command if I don't need separate branches?"
date="2020-06-16T16:17:48Z"
content="""
>>If you want its files to not be in a subdirectory, set it to \"master\" instead.
I did that. Than I issued:
```
git annex import master --from android
```
which downloaded a lot of files
Then:
```
git annex merge android/master
merge android/master
merge: android/master - not something we can merge
failed
git-annex: merge: 1 failed
```
I tried different combinations of android/master, ./master, master/. , but all seem to fail.
plain git status shows a lot of non-added files for an \"initial commit\", and no files added. git annex status lists a lot of
```
? sdcard/bla
```
files.
Any suggestions?
"""]]

10
doc/tips/android_sync_with_adb/comment_2_68affd1a753abdeca0f161698cc63413._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://dead-doomer.livejournal.com/"
subject="comment 2"
date="2020-06-16T16:31:32Z"
content="""
At which point should I do ordinary git commits?
So far the repo has been at just the \"Initial commit\"
"""]]