From d0f3b01c31fbc270428e0c39de88e69e7c113c3b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Jan 2020 14:38:40 -0400 Subject: [PATCH] update comments to point to conversion docs want to avoid use of -c annex.largefiles.. --- ..._5_40abc819288a97753747562f16b8febe._comment | 8 ++------ ...15_4ad7931038b50344b4238459bd79f74f._comment | 17 ----------------- ...16_00304872f9750e515c66fad68826e4ff._comment | 8 -------- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 doc/tips/largefiles/comment_15_4ad7931038b50344b4238459bd79f74f._comment delete mode 100644 doc/tips/largefiles/comment_16_00304872f9750e515c66fad68826e4ff._comment diff --git a/doc/git-annex-unlock/comment_5_40abc819288a97753747562f16b8febe._comment b/doc/git-annex-unlock/comment_5_40abc819288a97753747562f16b8febe._comment index 25cd0dbb83..cc425484f4 100644 --- a/doc/git-annex-unlock/comment_5_40abc819288a97753747562f16b8febe._comment +++ b/doc/git-annex-unlock/comment_5_40abc819288a97753747562f16b8febe._comment @@ -3,10 +3,6 @@ subject="""Re: Move file from git annex to just git in one commit""" date="2019-09-30T17:29:39Z" content=""" - git annex unlock MYFILE - git -c annex.largefiles=nothing add MYFILE - git commit -n MYFILE - -(The -n is only needed with git-annex older than 7.20190912 but will work -with newer versions too.) +See [[tips/largefiles]], it has recipes for conversion from annex to git and +from git to annex. """]] diff --git a/doc/tips/largefiles/comment_15_4ad7931038b50344b4238459bd79f74f._comment b/doc/tips/largefiles/comment_15_4ad7931038b50344b4238459bd79f74f._comment deleted file mode 100644 index a12c88ae28..0000000000 --- a/doc/tips/largefiles/comment_15_4ad7931038b50344b4238459bd79f74f._comment +++ /dev/null @@ -1,17 +0,0 @@ -[[!comment format=mdwn - username="Dwk" - avatar="http://cdn.libravatar.org/avatar/65fade4f1582ef3f00e9ad6ae27dae56" - subject="annexed -> normal git does not work if annexed file was unlocked" - date="2019-10-05T01:45:14Z" - content=""" -The sequence of commands given to shift an unlocked annexed file to normal git (for instance a file annexed by mistake due to the new git-add behaviour), namely - - git annex unlock file - git -c annex.largefiles=nothing add file - git commit file - -does not work if the file is unmodified, as git sees no change to commit. In this case, I believe one should replace the first command with - - git annex unannex file - -"""]] diff --git a/doc/tips/largefiles/comment_16_00304872f9750e515c66fad68826e4ff._comment b/doc/tips/largefiles/comment_16_00304872f9750e515c66fad68826e4ff._comment deleted file mode 100644 index 40a7ad6b37..0000000000 --- a/doc/tips/largefiles/comment_16_00304872f9750e515c66fad68826e4ff._comment +++ /dev/null @@ -1,8 +0,0 @@ -[[!comment format=mdwn - username="joey" - subject="""Re: annexed -> normal git does not work if annexed file was unlocked""" - date="2019-10-08T18:14:45Z" - content=""" -Touching the file first avoids the problem, or git rm --cached to force -git to re-add it. I've updated the example. -"""]] -- 2.30.2