Scenario: I'm trying to get my unix dot-files under git. I have to work between (at least) the cygwin environment and some standard linux distros (ubuntu and opensuse), and I have files/lines of code that are only specific to, say, cygwin. Since I don't want to checkout useless files or have to deal with lots of cases inside my dotfiles,...
when i do git push origin master i get an alert message "invalid port number" and on the console i can see "fatal: The remote end hung up unexpectedly" Please could someone help me what i am doing wrong? Thank you ...
I have a ruby project, and the database host and port might be different on dev and production. I need a way to get different values for those into my scripts for the two environments. The project should be complete - so there should be some way to specify default values. I don't want a clone to be missing the config files. So ignoring...
When I load gitk (git version 1.6.5.1) on OS X (SL) I recieve an error/warning about GreaseKit: Error loading /Library/Application Support/SIMBL/Plugins/GreaseKit.bundle/Contents/MacOS/GreaseKit: dlopen(/Library/Application Support/SIMBL/Plugins/GreaseKit.bundle/Contents/MacOS/GreaseKit, 265): no suitable image found. Did find: /...
Here's the situation: We've got a huge svn repository, which is the "master" (can't change this because it's actually "owned" by another company). We would prefer to work locally in git to get the branching flexibility and speed that git offers. But we don't want to clone the whole repository. The repository structure looks roughly like...
I have a project with a submodule that is pointing to an invalid commit: the submodule commit remained local and when I try to fetch it from another repo I get: $ git submodule update fatal: reference is not a tree: 2d7cfbd09fc96c04c4c41148d44ed7778add6b43 Unable to checkout '2d7cfbd09fc96c04c4c41148d44ed7778add6b43' in submodule path '...
At work we keep all out clients projects in subversion repositories and are not going to change this in the foreseeable future. A lot of our projects use the same plugins/modules and we also open source some of these and share them on our own github accounts. What I'd like to do is: Maintain a client project with all the code in subve...
I am trying to clone Papercut, an smtp server emulator I'm getting the list of SVN authors with svn log -q https://papercut.svn.codeplex.com/svn | grep -e '^r'| awk 'BEGIN {FS="|"};{print $2}'|sort|uniq which is giving me RNO\_MCLWEB SND\krobertson_cp I created an authors.txt with the SVN_User = UserName <Email> format, but when I ru...
i want to push the code to origin server after rebasing op applied. conflict is reported every time. ...
Hi, In git, I stash away my changes. Is it possible that I can create a patch with what I stash away? And the apply that patch in some other repository (my co-worker's)? I know 'git format-patch -1' but I think that is for what I have committed. But I am looking for the same thing for changes I stashed away? And how can I apply a pat...
Hi all, I'd like to track a remote branch on SVN from within Git. I can see the basics of how to do this with the git-svn command, I was hoping to do something like the following: Git branch | SVN branch ----------------------- master | Trunk feature1 | <not mapped> feature2 | <not mapped> so that once I merge into git/master...
I'm using git to manage a grails project I have.I set up a git repository on a remote server and what I want to do is when I have code working locally, I want to commit it and push to the remote server. I want the updated groovy file and gsp's to be put into the right spot on the remote server so that grails will pick up the changes for ...
(solved, see bottom of the question body) Looking for this for a long time now, what I have till now is: http://dound.com/2009/04/git-forever-remove-files-or-folders-from-history/ and http://progit.org/book/ch9-7.html Pretty much the same method, but both of them leave objects in pack files... Stuck. What I tried: git filter-branch ...
So I'm using git and interacting with an svn repo. I have a svn TRUNK that looks like this: A-B-C-D And a svn bug_fixes branch that branches off at commit B or C: -c-d-e-f-g-h-i Now I need to get the cdefghi commits that are in my svn branch back into the master branch. I'm aware that I could just do a squashed commit, let's cal...
I'm working on a project that will be a base site for multiple other sites. Most of the core functionality will be the same so I don't want to maintain the same code all over the place and I'm wondering how best to do this. Currently I have the "core" site in its own repo and then I just clone from that to make a new site. I can continu...
I've just started using git, and am impressed with the workflow differences from SVN, but I've run into one structural/setup question that the documentation doesn't seem to intuitively explain how to set up, and I'm wondering if it's even possible. My setup is that I have several computers I do development from (desktop and laptop), so...
My Git repository is on the server and I need to... restore the repository remove logs / history remove all files How could I do it? Thank you. ...
I have a feeling I am asking something that can't be done in git, but I might as well ask. Is there any way that I can make one change and commit it to all branches? For instance, suppose I want to make a change to my AUTHORS file or LICENSE file. I know I can commit the change to one branch and then cherry-pick it to each branch indi...
I just recently learned of SVN's auto-versioning feature for WebDAV. Although I understand this is not replacement for proper versioning, with messages documenting change sets, it strikes me as a solid and safe replacement to Dropbox (minus nice GUIs and web pages). However, since commits in auto-versioning are frequent, I'd imagine that...
Hi, Can someone suggest for me only one git gui client on windows that is the same as GitX on Mac? (nice, easy to use, wonderful interface, etc...) I have tried some but I do not feel happy :p Thank you ...