I've already set up a Git repository on GitHub and committed a few changes from my Windows machine. But tomorrow I'll have to work in this repository from a machine running Ubuntu with limited privilege (i.e. no sudo). Is there a portable version of Git for Linux? Or some source that allows me to compile and install Git only for the cu...
I'm trying to learn git by applying it (retroactively) to a project where I have been tracking a remote codebase for a while. When I put everything into git, I simply made a remote branch for all the external versions and put my versions on master, so currently my repository looks like this: master: A0---A1.0--A1.1--A2.0--A2.1-.... ...
I'm working on a drupal website. I've been keeping an svn repository of my custom modules which I've recently ported to github to work with another developer. Coming from SVN I'm used to just being able to update my custom modules folder on the staging website directly from my SVN repository. But from what I've read (correct me if I'...
From the man page: Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in "remotes/<name>". So I removed a bunch of branches using git push origin :staleStuff and then ran git remote prune origin Howeve...
Hey all, this is quick one, since I'm quite new to git. I have a repo setup on a server (A) where access is via ssh rsa keys. I have a few users there including myself. Now I do git clone on my local machine and get a local copy, make changes, and push origin master, everything works fine. The problem I'm experiencing is that our testin...
Hi to all, Issue I merged a branch in a master not updated at last commit. What I do I merged a branch in master git merged BRANCHNAME Conflicts Automatic merge failed; fix conflicts and then commit the result. git commit -a -m "Resolved conflicts while merging email-fix branch" Then I tried to push all to origin master, but i...
I have a project under git. One day I moved all project files from current directory to foo/bar/ under the project. I did it using git mv. Then I added some more files and did some changes to already existing files. As a result, now when I look at the history of foo/bar/file.c, I can only see changes that I did after I moved the file. ...
I'm going to migrate our project from svn to git. Now some of the developers work only on a subtree of it. Is it possible in git? To be specific, we one need to be able to: - checkout a subtree of the trunk, change it and commit the changes - without seeing the trunk. A person may not even be granted privileges to read any other part of ...
I'm new to git so I apologize (and please correct me) if I misuse terminology here, but I'll do my best. I'm trying to set up a bare git repo (hub) and a development site working copy (prime) on a web server. I've tried to pattern it after this article. I want the development working copy to be updated whenever the hub repo is pushed to...
Hi, I'm used to svn to use svn:propset to set bugtraq URLs, pus^H^H^Hcommit them to the server and all users who clo^H^H^Hcheckout from it have the settings. In git I can store them in my local or repository specific configuration, but other users who clone from it don't benefit from it: they simply don't get my bugtraq configuration. ...
I'm very confused about how to use git archive. I have a git repository with folder Foo, Bar and Baz at the top level. I need to export folder Foo in a SVN-ish sort of way for quick test deployment. I learned that I could use git-archive in an SVN-ish export sort of way. But here's the thing, The following works fine: git archive m...
How does the patience algorithm differ from the default git diff algorithm, and when would I want to use it? ...
I've read about a bajillion Q&A's on this very topic, and followed all the instructions to the letter. But I'm still getting headaches trying to set up Git to diff and merge using WinMerge. I've taken the following steps using the Git terminal: git config --global diff.tool winmerge git config --global difftool.winmerge.cmd "winmerge.s...
The app I'm creating uses git to move repositories around. I'm trying to find a strategy that will let me implement a step like: Then the commit "d786239d8sd" is pushed from "[email protected]:opsb/conference_hub" to "[email protected]:conference_hub_ci.git" Given the command uses git, which interacts with the filesystem, how do I implemen...
I have made a central bare shared repo at foo.org. user A has done git clone ssh://foo.org/blah.git user A has created file 'lol' which is a blank file. Commits it to local repo. Does git push user B does mkdir foo and cd foo user B then does git clone ssh://foo.org/blah.git. user B edits lol file. user A edits lol file. user A commits...
Can anyone recommend hosts other than github ( 100% git ), codesion and beanstalk which support both svn and git? ...
I am trying Git, and so if i do mkdir foo cd foo git clone git://github.com/some_repo/sdk.git so my project folder will now have sdk, which is a library or an sdk. How to make sdk part of my project now? That is, just 1 repo instead of git init and have 2 separate repos? ...
Imagine, I have several branches: master, a, b, c ... Now I'm in master branch and "git pull". This fetches all changes from remote server into origin/master, origin/a, origin/b ... branches and merges CURRENT branch (master) with origin/master. But then I want to switch to A branch and again merge these remote changes from remote track...
Hello, I have a problem with the PATH variable on Debian Linux when executing commands via SSH. This happens for example when I use GIT or Mercurial and I have them installed in /opt instead of /usr/local. But I can also reproduce this easily like this: When I login to the server via SSH in a normal way and then do echo $PATH then I ge...
When I attempt to push to my heroku.com remote git repository, i get this message: ssh: connect to host heroku.com port 22: Connection refused I can easily work with my repository on github with the same ssh key. Entering: $ssh [email protected] #outputs: success message $ssh [email protected] #outputs: ssh: connect to host heroku.c...