Somewhen (around the 1.6.x releases, I think) git became aware of changes inside submodules. That only serves to annoy me: $ git status vendor | grep modified: # modified: vendor/rails (modified content) $ git diff vendor/ diff --git a/vendor/rails b/vendor/rails --- a/vendor/rails +++ b/vendor/rails @@ -1 +1 @@ -Subproject ...
At work, we use Perforce for version control. There are problems with this: 1) with this centralized model, we can't check in changes until they are ready for regression. This means that we have no revision control during the development process. 2) We don't back up our client view of the depot, so our work is unsafe until we can chec...
We had an old branch, feature-x, and we tried merging in a recent master. In the merge we saw that a bunch of the commits from the feature-x branch had been overwritten, and the code had disappeared. I'm now cherry-picking the relevant commits into a fresh branch off master, but I was wondering why this happens. Anecdotally this also hap...
I have an existing git repo (a bare one) which has up to this point only been writable by me. I want to open it up to some UNIX user group, foo, so that all members of foo can push to it. I'm aware that I can easily set up a new git repo with: git init --bare --shared=group repodir chgrp -R foo repodir But I need the equivalent oper...
Hello, allow me to first of all say I'm a Git n00b and relatively new to version control entirely. We've done a good job of using Git in a Windows environemnt with Visual Studio so far, and all seems to be going well. However something that is annoying is the .gitmodules 'battle' we currently have on our hands. If UserA creates a new su...
I want to use EGit in a small eclipse project with my colleagues, but we don't want to Submit the project to the github.com. What I should do with the next picture ? The ip address is 192.168.16.40 and the project is in D:\EclipseProjects\ForwardA.git. How I should fill the URI,Host,Repository Path ? Is the Authentiacation for the comp...
I'm able to list git stashes by date with git stash list --date=local but how do I select a revision without getting fatal: Needed a single revision ...
I'm attempting to run the mvn release:prepare goal and it's hanging after the push. Any idea what I could be doing wrong? [INFO] [INFO] ------------------------------------------------------------------------ [INFO] [INFO] BUILD SUCCESSFUL [INFO] [INFO] ------------------------------------------------------------------------ [INFO] [IN...
I have two branches, and I am merging branch1 into branch2 with a no fast-forward. After the merge, I run the command 'git show', I only get the message that of the commit (which is the merge from the no fast-forward) and no list files that changed. How do I get the list files changed in the merge? SOLVED: When at branch2 after th...
My current process is: git checkout dev make changes and commits (& push to development branch on origin occasionally) git checkout master git merge dev git push origin master git checkout dev Would it be possible to instead merge from the development branch to master without checking out the master branch? And then would it be furt...
Hi all, I have multiple projects that I'd like to put up onto GitHub.com. All of these projects are in my local Git repository. I have just one repository, but for each project, I'd like to have 1 GitHub project. That way, bugs can be organized by the project. How can I set this up so that it isn't that difficult to manage? Do I ne...
Hi, Is there any tool out there which enables me to see differences between different versions in git? and the differences is shown in-line in a file? E.g. like the way eclipse shows 2 files differences? Thank you. ...
I've just started using Git and I love it, but I have had an issue figuring out the best way to handle configuration control of multiple projects. So, lets say I have the following projects: Common Project1 Project1b Project2 Where Project[x] has dependencies within Common and Project1b has dependencies in both Common and Project1. R...
Which is effecient? SSH:// or Git:// (File compression) I understand in Git , git protocol is smart because there is a protocol agent on both end of commumnication to compress the file transfer resulting in faster clone by effeciently using the network bandwidth. From an O'Reilly book I found the following statements. For secure, aut...
I'm using one file from a git repository off of github in a project living in my own repository. As it is right now whenever a new version of the file on github is created I have to manually download it and commit it to my repository. Is there a way to automatically keep it in sync with the remote repository whenever I pull new changes t...
Hello, I committed and pushed some bad things. How do I force revert my local repo to HEAD~7, and re-commit so that HEAD is now at that version? Git docs confuse me. Thanks! ...
hi, I created a repository in my desktop and push to github, then clone that repository to my laptop to make development, later committed the changes and push to github. now back to my desktop, i tried 'git pull' to get all the changed i made, it showed the error message: Permission denied (publickey) fatal: The remote end hung up unex...
When I have a fix for a change that was a few commits earlier, I always wind up running rebase twice in a row. Is it possible to do this workflow all in one step? Let's say I have 4 new commits. * (master) D * C * B * A * Base I find a bug in B so I create a branch and fix it. * (master) D * C | * (fix) Fix. |/ * B * A * Base Nex...
Hi I'm fairly new to Git, and have been working with it for only 3 months. We previously migrated our repositories from SVN. I'd like to be able to merge changes from the master into my dev branch without getting "normal merge" conflicts that require "git mergetool", just so I can inspect a change that could have been merged without s...
Suppose Project X is the base project and Project Y depends on X. Project Y might be a plugin for Project X, or perhaps it is a standalone app that requires Project X in some other fashion. I have thought all this time that Project Y should be the superproject, and Project X should be a submodule of Project Y. However, upon reading th...