views:

1160

answers:

4

Hello!

After working for some time with SVN I decided to try git with my new django project and installed the plugin for it into eclipse. I made a new pydev project and added django initial project files to the src directory. Then I "shared" the project to Git, added and commited all files. Now I have strange problems - all files except "manage.py" are "up to date" and manage.py has a strange icon that means it is "staged". What does this mean? I tried to google for it, but without success. :(

Thanks beforehand.

+9  A: 
VonC
Thanks a lot.I wonder why it is in staging area... It does not let me commit it. I'll try other version of plugin.
freiksenet
A: 

Isn't it a "+" icon? Staging area in git is when file is added to the index but not committed.

From git-commit manual: "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the "index" with git-add."

Also git-stage is an alias for git-add.

Marcin Gil
A: 

I'd recommend that you make yourself familiar with the git command-line before embarking on using Git from inside Eclipse. The command-line is git's primary interface, and if you aren't comfortable with the different concepts such as index, push, pull, rebase, etc., then using Git from Eclipse will probably confuse you even more.

JesperE
A: 

http://progit.org/book