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 2014-08-12 13:24:02 -04:00
commit 26ceb09794
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_2_f6d977a534264b4368401e1b13628931._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://launchpad.net/~rorymcc"
nickname="rorymcc"
subject="comment 2"
date="2014-08-11T18:37:46Z"
content="""
Thanks for your reply. I think I might have done a \"git merge git-annex\" at some point (or many times), because I thought that was what you were supposed to do... :( PEBKAC I'll try to fix up my repository. Thanks.
"""]]

8
doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_3_d534da276b79a40fdb7d8d158f6eae26._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://launchpad.net/~rorymcc"
nickname="rorymcc"
subject="comment 3"
date="2014-08-11T18:41:05Z"
content="""
Would just standard \"git rm ./000/\" etc. in master be OK? Instead of hunting down and reverting all the commits?
"""]]