A git svn clone with --stdlayout get me multiple branches if the source SVN repo has multiple branches (and tags). I want to push all of them to another git repo. The git svn clone did seem to have retrieved all the history for all the versions. Is this a matter of giving better instructions to git push? Here's my possibly misguided w...
Is there an objective-c git library that would support pushing to/pulling from a remote repository? I'm familiar with objective-git, but if I'm reading it correctly, it is for interaction with a local repository. Ideally, the library would work on iOS and Mac OS X, and would be permissible for inclusion in app store apps. ...
I am working on a file where the my current commit ended up being bad and I want to go back to earlier commits for a specific file? I did a search it looks like no one has answered a similar question (how to roll back changes in a file in a previous commit in git).... Hopefully a simple answer? ...
I have a directory that looks like this: ProjectFolder/ + project_file + project_file_2 + project_folder/ + another_file * my_stuff/ <= add to repo * foo <= add to repo * bar <= add to repo * my_file <= add to repo * my_other_file <= add to repo ProjectFolder is a piece...
Hi, I've made some private changes to the public Three20 libraries. Three20 will now work with semi-trusted SSL certs. Custom views are now working for headers in grouped table views. Custom chrome is now allowed on the photocontroller, and the network performance was tuned for image loading over 3G. Finally, a display bug that woul...
My Ant build.xml script starts with <property environment="env"/> <echo>GIT_BRANCH = ${env.GIT_BRANCH}</echo> <echo>PWD = ${env.PWD}</echo> Hudson CI is setup to build when any branch changes. Console output is... Commencing build of Revision 90906a63929e9074035eb5b10c71ee055ad3e13c (origin/DPM-48) GitAPI created Checking out Revisi...
Hi, I'm using a VWWare image of Ubuntu 8.04 and experiencing problems while setting up git access over SSH I get the following output debug1: Authentications that can continue: publickey debug1: Next authentication method: publickey debug1: Offering public key: debug1: Authentications that can continue: publickey debug1: Offering pub...
A fellow coder uses a Windows computer that is putting carriage returns everywhere in our source. Is there a way to write a git hook that converts all \r\n to \n? Note I haven't used git hooks before, so a little extra hand-holding might go a long way :) ...
Trying to work on my both my actual "work" repos, and my personal repos on git hub, from my computer. The work account was set up first, and everything works flawlessly. My personal account, however cannot seem to push to my personal repo, which is set up under a different account/email. I've tried copying my work key up to my persona...
Lets say for the sake of argument that we don't care much about history. If I have a master branch that is being updated somewhat often and I have a shared topic branch that is rather long lived, will regularly merging master-> topic branch (and resolving conflicts as they arise) allow for a smooth merge of the topic branch -> master la...
I added two submodules to my vim repository, and the git status command always outputs this: On branch master Changed but not updated: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: bundle/snipmate modified: bundle/yankring I've ...
There's an SVN open-source project which I have read-only access to, and I'd like to create a GIT mirror of that project up to date on GitHub. I know how to set up the initial mirror and then keep it up to date with git svn rebase, but that still requires having a server set up somewhere with a cron job running to handle the syncing, s...
Many open-source projects (e.g. django) have GIT mirrors which are, in turn, forked for private or public development. GIT mirrors are kept up to date with git svn rebase. But the Pro Git Book contains this unequivocal recommendation: Ahh, but the bliss of rebasing isn’t without its drawbacks, which can be summed up in a single ...
I am running an Ubuntu Lucid guest inside VMWare Player on a Windows XP machine, using a shared folder. git status is slow in the VM (24 seconds) but fast on the host machine (0.06 seconds) Any idea why? More details: My repo is about 620 MB (obtained by doing du -hs . in the guest OS) I've tried running git gc as described here, bu...
I have a large repository that I am trying to clone, but there seems to be a few PSD files that have been added that I can't avoid at the current moment. I have a specific path on the repository that I want to checkout but I'm having trouble figuring out what specific command I need to follow. I was told filter-branch is what I need to ...
Hi, What do you guys use to deploy and application and track their files in production? I mean tracking if the file was not changed directly in the server? thanks ...
We have two applications running on production servers, each in its own directory under /usr/local, so let's say there's /usr/local/app1 and /usr/local/app2. Each app has a separate remote git repo. app1 is already being deployed for quite some time via capistrano+webistrano using remote_cache including some recipe changes that were ma...
I have a github-based git repository that represents development up to a certain point, and then a svn repository, not initialized with git svn, that has further development. I want to bring the svn changes into the git repository, start using the git repo for development, and push changes using git svn dcommit. Is this possible? Is i...
I have a bash script under Git version control on Windows (cygwin git). I would like checkout file from repo with LF (it is bash script) on windows (and I have core.autocrlf=true). As a result, I've got CRLF file and "$'\r': command not found" error message for script. How I could workaround this issue? BR ...