I just started using Git recently and I was reading up on Git best practices and it seems the most common one is to never work out of your master branch, always create a separate branch and work out of that. I'm wondering if this is only true when working with other developers or if this is something I should be doing if I'm the only de...
I installed Git for windows XP, and for some reason I couldn't get it to work. It threw and error code that showed it was looking for a network drive (drive Z:\ instead of the local drive C:). I got tired of fooling with it and decided to try the bash that came with GIT. Well, I got into the command prompt and saw the following: Z:\[...
I wanted to move a sql file to my staging server that was related to some coding. I overlooked the fact that it was 1Gig in size and committed the file. I don't remember if it ever finished committing but I continued committing other changes from different files. Now when I'm on my staging server and I fetch or pull the changes from deve...
I have a git repo, where I replaced a lot of files locally. git status now shows many many modified files. Some are "really modified", others only differ by line endings. I want the ones that differ only by line endings to go away (git reset them), but I cannot seem to find the linux-piping-foo to make it happen. Bonus points for how...
Say there are two repositories X and Y with a file structure like below. X-+ |- /A |- /B |- /C Y-+ |- /E |- /F |- /G I know it's possible to pull X into Y and git will merge the files. Is it possible to pull directory B into directory F of repository Y? I'm guessing it isn't because git doesn't track directories. Is it ...
With bash and zsh I can source subfiles in order to better organize my config. Can I do something similar with .gitconfig? ...
Possible Duplicate: Git gui client for Linux Does anybody know a good GUI for git on Linux Ubuntu? ...
I am behind a proxy and I have a git gem in my Gemfile. How can I configure bundler to use git with the appropriate proxy parameters? I already have $http_proxy appropriatelly set, as well as my .gemrc . Still, it doesn't work. ...
Hi all. I have a git branch (called v4) that was made from master just yesterday. There were a couple of changes to master that i want to get into v4. So, in v4, i tried to do a rebase from master, and one file keeps screwing things up: a one-line text file that contains the version number. This file is app/views/common/version.txt, ...
Hello, I am currently looking for git clients for Mac OSX, I have tried the following: GitX (Didn't like it.. doesn't seem functional enough) Git Gui / GitK.. (Butt Ugly! i mean yuuuuuck! and not user friendly) Source Tree (By far the best but still lacking somewhat) Is there a functionally equivalent nice looking "versions" or "cor...
Hello, I am looking at building an application with heavy ties to git.. Are there language bindings available and if so which are the most comprehensive? Would it mean going to Bare Metal C? Or does perl python php C# have a set of full bindings? Thanks Daniel ...
I'm trying to implement Git to manage creative assets (Photoshop, Illustrator, Maya, etc.), and I'd like to exclude files from Git based on file size rather than extension, location, etc. For example, I don't want to exclude all .avi files, but there are a handful of massive +1GB avi files in random directories that I don't want to comm...
Hi, I'm trying to install Abingo for my Rails application which seems can only be installed as a plugin, but it consistently fails silently with just an empty folder created. I've installed plugins in the past (although not on this app, with another in my InstantRails folder), but for some reason today nothing is installing at all, and ...
I imagine that I should write a git commit hook (post-merge?) that would look at the list of changed files and run bundle install if necessary after I fetch and merge from my git repo. But after some googling, I figure that either this should exist (couldn't find it!) or there's a good reason not to do this. Thoughts? ...
Here is the error remote: warning: suboptimal pack - out of memory error: git upload-pack: git-pack-objects died with error.remote: fatal: Out of memory, malloc failed fatal: git upload-pack: aborting due to possible repository corruption on the remote side.remote: aborting due to possible repository corruption on the remote side. ...
Hi, I managed to make git work for pull and push over http. Now the last step it getting around the git push asking twice for my password. I don't want to use the .netrc file. any idea ? thanks ...
What are the most common ways of losing or having overwritten code when sharing a repository with another developer? I say this after working with several share repos where magically a lot of my information disappears. What are some safe workarounds? I use Github. ...
I've seen a lot of advice about Git workflow, but it wasn't extremely usable for us. I'd like to get a piece of advice with respect to our situation. We are a very small web-development company from Russia. A lot of our orders are small web-sites for firms or events. It adds some specifics to our workflow. A "release" or "version" mak...
I think I'm about fed up with GIT - I keep getting these obscure errors with no indication as to where or why. This last is on a pull on a cygwin side with GIT version 1.7.2.3 - I get an 'early eof' message and then it won't go any more. The repository scenario is: MAC - working repository MAC - bare repository serving as a central ...
It seems like you have to interact with github.com to initiate a pull request. Is this so? ...