{"thread":{"id":"30619","subject":"behaviour of .gitignore","startedAt":"2012-05-25T16:32:45Z","lastAt":"2012-05-25T22:41:09Z","messageCount":3,"participants":["J.V.","Matthieu Moy","Neal Kreitzinger"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"192166","messageId":"4FBFB42D.3090303@gmail.com","threadId":"30619","inReplyTo":null,"subject":"behaviour of .gitignore","fromName":"J.V.","fromEmail":"jvsrvcs@gmail.com","sentAt":"2012-05-25T16:32:45Z","receivedAt":"2012-05-25T16:32:45Z","isPatch":false,"sender":{"key":"jvsrvcs@gmail.com","avatar":null},"body":"On my local machine, I create a /bin/ directory added some bash scripts, \ncomitted and then pushed them to the repository.\n\nNow today I do a git pull and they are gone but cannot see that anyone \ndeleted them in the git log / history, but there is a /bin/ entry in the \n.gitignore file.\n\nDoes this mean, the files are still in the shared repository (orgin) \nthat I could get them back?\n\nI tried removing /bin/ from the git ignore and doing a pull but my /bin/ \ndirectory is still not there.\n\nIs there anyway to do a pull now and have it look at my local gitignore \nand pull the directory back?\n\nthanks\n\n\nJ.V.\n"},{"id":"192173","messageId":"vpqr4u8rwuf.fsf@bauges.imag.fr","threadId":"30619","inReplyTo":"4FBFB42D.3090303@gmail.com","subject":"Re: behaviour of .gitignore","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2012-05-25T17:31:36Z","receivedAt":"2012-05-25T17:31:36Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"\"J.V.\" <jvsrvcs@gmail.com> writes:\n\n> On my local machine, I create a /bin/ directory added some bash\n> scripts, comitted and then pushed them to the repository.\n\nCan you check that \"git show --stat\" on the commit you did actually\nshows the files as added?\n\n> Now today I do a git pull and they are gone but cannot see that anyone\n> deleted them in the git log / history, but there is a /bin/ entry in\n> the .gitignore file.\n\nWhat does \"git log -- bin\" say?\n\nWhat does \"git status\" say?\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"192213","messageId":"4FC00A85.9090400@gmail.com","threadId":"30619","inReplyTo":"4FBFB42D.3090303@gmail.com","subject":"Re: behaviour of .gitignore","fromName":"Neal Kreitzinger","fromEmail":"nkreitzinger@gmail.com","sentAt":"2012-05-25T22:41:09Z","receivedAt":"2012-05-25T22:41:09Z","isPatch":false,"sender":{"key":"nkreitzinger@gmail.com","avatar":null},"body":"On 5/25/2012 11:32 AM, J.V. wrote:\n> On my local machine, I create a /bin/ directory added some bash\n> scripts, comitted and then pushed them to the repository.\n>\nYou should be able to click on that commit in gitk and see that the\nfiles were added (confirm you really added them).\n\n> Now today I do a git pull and they are gone but cannot see that\n> anyone deleted them in the git log / history, but there is a /bin/\n> entry in the .gitignore file.\n>\nIf that ignore entry was there when you did the commit then maybe you\nnever really committed them.\n\n> Does this mean, the files are still in the shared repository (orgin)\n>  that I could get them back?\n>\nThe gitk step above will tell you if they are there.\n\n> I tried removing /bin/ from the git ignore and doing a pull but my\n> /bin/ directory is still not there.\n>\nIts not looking like you really committed them like you thought you did.\n\n> Is there anyway to do a pull now and have it look at my local\n> gitignore and pull the directory back?\n>\nIf the files were really committed, then you should have that commit in\nyour history also.  Therefore, you should be able to 'git checkout' \nthose files into your worktree.\n\nv/r,\nneal\n"}]}