diff options
author | 2014-08-12 13:24:02 -0400 | |
---|---|---|
committer | 2014-08-12 13:24:02 -0400 | |
commit | 92404aafbcfe66657accc7f81539d7c389761071 (patch) | |
tree | 1ec9ecdbaf379074afaa524f293cf951427a4ce8 | |
parent | 67fd45c894d48d5168faeff4c419cce8fb2fe43f (diff) | |
parent | 348d20eb746688173064741403f950b927b573cb (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
2 files changed, 16 insertions, 0 deletions
diff --git a/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_2_f6d977a534264b4368401e1b13628931._comment b/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_2_f6d977a534264b4368401e1b13628931._comment new file mode 100644 index 000000000..e90238063 --- /dev/null +++ b/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_2_f6d977a534264b4368401e1b13628931._comment @@ -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. +"""]] diff --git a/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_3_d534da276b79a40fdb7d8d158f6eae26._comment b/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_3_d534da276b79a40fdb7d8d158f6eae26._comment new file mode 100644 index 000000000..214444c61 --- /dev/null +++ b/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_3_d534da276b79a40fdb7d8d158f6eae26._comment @@ -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? +"""]] |