Re: [git-users] How to recover deleted files from a bad usage of .gitignore

2015-02-10 Thread Nelson Efrain A. Cruz
Hi, when you ignore a file in git it becomes invisible to git, so you can't use git to try to recover it after a deletion. About your question about git rm AFAIK it deletes the file and marks it to the stage area. Anyway if you use git rm it means that you have the file under git, so you can use

Re: [git-users] how to use git check gerrit patch sets

2015-02-10 Thread Magnus Therning
On Tue, Feb 10, 2015 at 06:24:54AM -0800, pierre Kuo wrote: hi all: There is a Diff against select box in gerrit UI to check the difference of patch sets. Is there any way to check patch sets difference in gerrit by git command? appreciate your help in advance, This is a git user list, I

Re: [git-users] How to recover deleted files from a bad usage of .gitignore

2015-02-10 Thread Gergely Polonkai
Hello, Nelson is just right about git rm, except it does nothing with untracked files. What you may have done is git clean -x which removes all files unknown to Git (even untracked ones). In this case you are on your own and try some file system utilities, if any, to recover your files. Best,

Re: [git-users] how to use git check gerrit patch sets

2015-02-10 Thread pierre Kuo
hi Magnus: On Tue, Feb 10, 2015 at 06:24:54AM -0800, pierre Kuo wrote: hi all: There is a Diff against select box in gerrit UI to check the difference of patch sets. Is there any way to check patch sets difference in gerrit by git command? appreciate your help in advance,

Re: [git-users] Why Git does not resolve conlicts

2015-02-10 Thread Magnus Therning
On Tue, Feb 10, 2015 at 12:03:20AM -0800, Markku Nikkanen wrote: Hello, does anyone know why Git does not resolve changes automatically to translation files e.g. following change should be resolved automatically not being shown as a conflict. Should I teach Git the messages file

[git-users] How to recover deleted files from a bad usage of .gitignore

2015-02-10 Thread sylvain bougnoux
Hi all, Does someone know where the files after a git rm go? Some of my files where deleted by git, of course I have no copy, I tried several file recovery utilities, but so far none of them see the deleting files. I am running Windows 7; git 1.9.4; gitextension 2.48.03 Full story: One week

[git-users] how to use git check gerrit patch sets

2015-02-10 Thread pierre Kuo
hi all: There is a Diff against select box in gerrit UI to check the difference of patch sets. Is there any way to check patch sets difference in gerrit by git command? appreciate your help in advance, -- You received this message because you are subscribed to the Google Groups Git for human

[git-users] Why Git does not resolve conlicts

2015-02-10 Thread Markku Nikkanen
Hello, does anyone know why Git does not resolve changes automatically to translation files e.g. following change should be resolved automatically not being shown as a conflict. Should I teach Git the messages file notation? # yyy = some text1 # ccc = some text text === # ccc = some