There are a couple of files in our git-controlled codebase that I'd like to rename. Specifically, I just want to change the case of the file, so that sourceCode.java becomes SourceCode.java, for example. The catch: I'm on a Windows box, and the filesystem thinks those are the same file name. How can I get Windows and git to recognize ...
In his 2005 email to the Linux Kernel mailing list, Linus Torvalds is very emphatic that tags in git should be private and not be automatically included when fetching from others: Pulling a regular head cannot and must not update tags. Tags are not associated with the tree, and they cannot and must not be so, exactly because that...
My working copy is on master branch, how to update from remote server? Say I working locally on my own custom branch, but I want to update the master with the remote branch, how would I do that? ...
Hello, I am trying to integrate git into my workflow. I'm starting it by using it to manage working copies of code cloned off of a Subversion repository. I've tried using both git 1.5.1 and 1.6.5. Both of these were built from source. I am using an official Debian package for Subversion. Using both versions of git yields the same error...
Somebody is planning to move the subversion repository I work on (8000+ commits). Is there a way to use git-svn to replay the last, say, 20 commits from the old location once the migration is finished? (not only my own commits, but also other team members) Bonus question: How do I add multiple svn repositories to my git local copy? ...
hi guys! i'm looking for a simple tutorial for how to use tortoisegit without any server? i've tried google but, although a lot of people mention you can use tortoisegit without a server, no one explains how to do it so any help is greatly appreciated! kind regards, reinhard ...
I've looked at the githooks manpage but unless I'm missing something I don't see an option for local, post-push git hooks. I'd like to have one that updates the api docs on my web server (for which I already have a script) after I push the master branch to the GitHub repo. Of course I could just write my own script that combines the gi...
I was hoping somebody might be able to give me a hand by pointing out where I'm going wrong with github. I have my branch cloned down to my machine and I'm attempting to fetch from another user's branch on github. >git remote add rally25rs git://github.com/rally25rs/SubSonic-3.0.git >git fetch rally25rs master github.com[0: 207.97.227...
Hi, I get the error below after I run "git commit ." CSApprox needs gui support - not loading. See :help |csapprox-+gui| for possible workarounds. Error detected while processing /Users/{username}/.vim/plugin/syntastic.vim: line 94: E319: Sorry, the command is not available in this version: sign define SyntasticError text=>> texthl...
Say someone clones repository A which results in repository B and then I clone repository B, is there a way to determine what the upstream repository (i.e. repository A) is? I know that github shows the 'forked from blah/blah' but I'm not using github for this project. The reason I ask is that I'd like to get all the changes that the p...
Is there a way to have Git force a manual resolution for a file when the file was edited in both branches? My problem is that I want some of the changes from one branch and some of the changes from the other. It turns out these changes don't always step on each other but the algorithm is not always picking the correct change. One thing...
how can I see a diff between a local branch and a remote branch? ...
I created a local GIT repository on Windows. Let's call it AAA. I staged, committed, and pushed the contents to GitHub. [email protected]:username/AAA.git I realized I made a mistake with the name. On GitHub, I renamed it to [email protected]:username/BBB.git Now, on my Windows machine, I need to change this [email protected]:username/AAA.gi...
Hi, I know how to work in git. But, now I want to set up a git server in my org. so that developers can access it via internet from any where around the globe. I know about Github and I want to build my own custom git server for my organisation developers alone and I donot wish to outsource it to git hub like apps. I need to provide b...
Hi, I've read a few git questions here, but could not find an answer to this one: I have a public and a private branches where I want to allow certain files to diverge. Those are configuration files with passwords and my local customizations. I do want to be able to merge the branches both ways: from private to public and back, but...
When I created my SSH key while setting up git, I chose to use a pass-phrase for the key. Now, whenever I push to my remote repository (unfuddle), I get prompted for this pass-phrase. Is there some way to automate this? ...
I was trying to find out when a certain feature branch in one of my repositories was created and I found that surprisingly hard. I ended up using a combination of git show-branch and git log. Is there any easier way to find this little piece of information quickly and efficiently from the command line? ...
I'm trying out Hudson to replace our current Buildbot setup. I installed the git plugin. Our current setup is like: ssh://server:/repo/test_framework.git ssh://server:/repo/project_a.git Now, to build project_a I added a new job with multiple git repositories (the ones above). I wanted Hudson to clone the repositories into different d...
With SVN it is easy to reverse-merge a commit, but how to do that with Git? ...
So I have 3 git branches: master refresh auth_upgrade I haven't really been using branches like I should...so master is way out of date, refresh is somewhat out of date and auth_upgrade is actually the branch that is completely current. So...I ultimately want to make auth_upgrade the master branch and then git push it to my github r...