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

Added a comment: Move file from git annex to just git in one commit

Browse source
This commit is contained in:
tobiasBora 2019-09-26 22:52:35 +00:00 committed by admin
parent 9220899c8a
commit 38a8a671d6
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/git-annex-unlock/comment_4_d04a1d4159306939b91a34fd17ab0325._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="tobiasBora"
avatar="http://cdn.libravatar.org/avatar/80a7d8c2a7b475b6b71198cce0faa6b0"
subject="Move file from git annex to just git in one commit"
date="2019-09-26T22:52:35Z"
content="""
Hello. I'd like to know, how could I move back a file managed by git annex to a normal file (for example, say I added by mistake a text file in it). For now, I do `git unlock MYFILE`, then I remove the file from git: `git rm --cached MYFILE`, and `git commit -am 'Remove file'`, and finally I add back the file, `git add MYFILE && git commit -am 'File added back in git'`. However, this creates two commits, which is a bit annoying and leave the feeling that the file has been removed while it was just a kind of modification. How could I do that in less commands, and with a single commit?
Thanks!
"""]]