From: Neal Kreitzinger <nkreitzinger@gmail.com>
To: "J.V." <jvsrvcs@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: behaviour of .gitignore
Date: Fri, 25 May 2012 17:41:09 -0500 [thread overview]
Message-ID: <4FC00A85.9090400@gmail.com> (raw)
In-Reply-To: <4FBFB42D.3090303@gmail.com>
On 5/25/2012 11:32 AM, J.V. wrote:
> On my local machine, I create a /bin/ directory added some bash
> scripts, comitted and then pushed them to the repository.
>
You should be able to click on that commit in gitk and see that the
files were added (confirm you really added them).
> Now today I do a git pull and they are gone but cannot see that
> anyone deleted them in the git log / history, but there is a /bin/
> entry in the .gitignore file.
>
If that ignore entry was there when you did the commit then maybe you
never really committed them.
> Does this mean, the files are still in the shared repository (orgin)
> that I could get them back?
>
The gitk step above will tell you if they are there.
> I tried removing /bin/ from the git ignore and doing a pull but my
> /bin/ directory is still not there.
>
Its not looking like you really committed them like you thought you did.
> Is there anyway to do a pull now and have it look at my local
> gitignore and pull the directory back?
>
If the files were really committed, then you should have that commit in
your history also. Therefore, you should be able to 'git checkout'
those files into your worktree.
v/r,
neal
prev parent reply other threads:[~2012-05-25 22:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-25 16:32 behaviour of .gitignore J.V.
2012-05-25 17:31 ` Matthieu Moy
2012-05-25 22:41 ` Neal Kreitzinger [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FC00A85.9090400@gmail.com \
--to=nkreitzinger@gmail.com \
--cc=git@vger.kernel.org \
--cc=jvsrvcs@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).