egit

Problems cloning 1and1 git repository in 1and1 shared Linux server with Eclipse EGit

拟墨画扇 提交于 2019-12-06 11:22:44
I have just setup a git repository in my 1and1 shared hosting. 1and1 offers git as part of the Linux business package and I decided to use it instead of installing my own git. When I do dir .git I can see the information inside the repository: -rw-r--r-- 1 foo ftpusers 23 Sep 6 19:41 HEAD drwxr-xr-x 2 foo ftpusers 6 Sep 6 19:41 branches -rw-r--r-- 1 foo ftpusers 92 Sep 6 20:42 config -rw-r--r-- 1 foo ftpusers 73 Sep 6 19:41 description drwxr-xr-x 2 foo ftpusers 4096 Sep 6 19:41 hooks -rw-r--r-- 1 foo ftpusers 1038768 Sep 6 19:41 index drwxr-xr-x 2 foo ftpusers 20 Sep 6 19:41 info drwxr-xr-x

Eclipse Git keyword expansion

馋奶兔 提交于 2019-12-06 06:02:38
问题 I need to to update my source code revision keywords (@version, @date, etc) every time I am checking out the source to the git-hub server. As you might know: The main problem with this in Git is that you can’t modify a file with information about the commit after you’ve committed, because Git checksums the file first. Basically what I want to achieve is that my source code should look like below: * Git revision information: * * @version $Revision: 1e7f611039399b32e9000ec454609a0641dde368 $ *

How to git merge squash in Eclipse

冷暖自知 提交于 2019-12-06 05:22:09
问题 Sometimes I need to merge squash from Eclipse. I know I can do it in command line, but it will be really useful to have graphic option integrated in Eclipse. Do you know how to do it? 回答1: You can start an interactive rebase in EGit , and select squash for the commits you want squashed. Note: for squashing the last few commits, historically the other way was a soft reset (see this thread) select in history the first commit which I don't want to squash right-click and say " Team->Reset->Soft "

How to keep .git folder out of a Cloned Eclipse Project

喜欢而已 提交于 2019-12-06 05:11:53
Issue After importing an Eclipse project from a cloned git repository, I make some changes and commit - and wtf? I get a ".git" folder added to the project, the whole shebang with the heads and refs and worst of all the whole object database gets added to the project, all files/folders having that little question-mark icon signaling that the files have not been added / are not yet tracked by git. This .git folder exists in the actual Working Directory (how does that even make sense?). You can imagine what an annoyance this causes when trying to use the "Synchronize" tool/view (which is

No repository found containing: osgi.bundle and org.eclipse.update.feature

空扰寡人 提交于 2019-12-06 04:48:30
问题 I am trying to link my Android app to a Github repository. Following the EGit User Guide, I have first created a new Git repository, but when trying to add to version control ("Team" -> "Add to version control"), this option is not on my list options, either push, commit, merge and many others. I can only chose from Apply Patch or Share Project. So I am guessing I am missing some Software from the Collaboration section. So then I try to install the missing Git stuff: the command line

EGit - Project subfolder in repository

霸气de小男生 提交于 2019-12-06 04:45:23
I have the following problem with EGit 3.4.2.201412180340-r in Eclipse Luna Service Release 1a (4.4.1), using GitHub (which should be mostly irrelevant): I have a example java project set up that is configured with EGit and is connected to a GitHub Repository. I commited a few example changes to master and pushed them as well. The problem is: My repositories always have a weird kind of file layout: Repository Root > MyProjectName > src > cf > randers > myproject > main > Main.java The most projects I know on GitHub have the following layout: Repository Root > src > cf > randers > myproject >

How to configure Eclipse EGit to use custom proxy settings?

你离开我真会死。 提交于 2019-12-06 03:47:23
问题 I'm behind a corporate firewall, so most of the time (e.g. Eclipse updates) I want to be going through a proxy. However, the servers I pull from in Git are all internal. I currently have to change my proxy settings every time I switch, but I'd like to set it up so that EGit uses a direct connection. My guess is that it's just not a feature EGit has, but can anyone think of a workaround maybe? Thanks! 回答1: EGit should follow the General > Network configuration settings. If you set that Network

Merge using EGit results in commit of all changes as done by the merger

心不动则不痛 提交于 2019-12-06 02:40:12
I'm using Eclipse with EGit and and my origin/master is on github. On this project are working 3 programmers. When I pull changes to my local git (using EGit) and there are conflicts I solve them, no problem. The thing is that when I commit, it commits a merge that includes all the changed files since my last commit (before pull) and in git I see all these changes by other programmers as if done by me on this last commit of the merge... Why does this happen? What am I doing wrong? Update (14.10.2012): Thanks to @robinst I managed to correctly commit a correct merge with only the merged files.

Importing git project into workspace without using egit

偶尔善良 提交于 2019-12-06 02:03:48
问题 I asked a question a relating to Egit a few weeks ago & it was suggested that I read pro git, which I have been referencing. I'd rather use git from the command line and wait for egit's stable release with the Eclipse Indigo release in June, because there are to many bugs and it tends to make my ide stall. So to try it out I copied my working directory to a new location created a git repo & init then added all the files in the working directory. My thought was I could control all the git

Can't add files to my repository with Eclipse EGit

不羁的心 提交于 2019-12-05 23:27:39
问题 I use Eclipse (Helios) with PDT and EGit. I have a project without versioning, so I created a git repository for it by doing: Team -> Share Project When I try to add the files of my project to the repository: Team -> Add I get an exception: Failed to add resource to index Failed to add resource to index Exception caught during execution of add command When I add the files manually on the command line, everything is working fine. Any ideas? EDIT: The error eclipse gives is: Caused by: org