I've got a project that I'm deploying to heroku. The source code tree includes a bunch of mp3 files (the website will be for a recording project I was heavily involved with). I'd like to put the source code for it up on github, but github has a 300 MB limit on their free accounts. I don't want to use 50 MB of my limit on a bunch of m...
As a subversion user, git's index is the most challenging new concept I'm facing as I consider using it for new projects. I read many people's comments saying that they don't use the Index (always commit -a) but I'm thinking there might be a killer reason out there as to why I would want to make use of it. (I'm sharing code with around...
Hi, Is there a way to tell what I am committing to git does not contain whitespace errors? I currently is viewing it in my editor line by line. That is very slow and painful. Thank you for any suggestion. ...
I want to run JSLint before a commit into either a Mercurial or Git repo is done. I want this as an automatic step that is set up instead of relying on the developer (mainly me) remembering to run JSLint before-hand. I normally run JSLint while developing, but want to specify a contract on JS files that they pass JSLint before being com...
I'm playing with git in isolation on my own machine, and even like that I find it difficult to maintain a mental model of all my branches and commits. I know I can do a git log to see the commit history from where I am, but is there a way to see the entire branch topography, something like these ascii maps that seem to be used everywhere...
I'am using git as scm of choice but have to use a svn-repo. I can create a svn-remote-branch like this: git svn branch the_branch But how can i delete the remote branch? ...
with GIT: when diff'ing between master and branch-n, how can I see a graphical view of differences? i.e. I want to see a list of all files that are different, and a graphical view that let's me manually merge files if I want to (if I don't want to auto-merge). Say after I manually view each file that was changed, I want to merge all, ...
I'm working in a branch, and got a working copy with is really unclean. When looking through the changes to commit, I wanted a few oneliner fixes to be committed to the master branch. In this case, using git stash is not really helping, because my working copy has lots of other changes which won't merge with master yet. Is there a more...
We use tags in git as part of our deployment process. From time to time, we want to clean up these tags by removing them from our remote repository. This is pretty straightforward. One user deletes the local tag and the remote tag in one set of commands. We have a little shell script that combines both steps. The 2nd (3rd, 4th,...) ...
How can I show the name of branches in the output of git log? For example with, git log --graph --all I get a nice overview of the commits, but get confused which line is master, and which is my branch for example. ...
The development group I'm currently in uses Visual Source Safe for our version control; this choice was originally made due to cost and it's tight integration with Visual Studio. As our repository has grown Source Safe is really starting to show it's limitations and we are considering moving to another solution. Up for discussion prima...
Hi, Can you please tell me how can I resolve the 'patch does not apply' error when I try to 'git apply-patch'? $ git apply 0001-my.patch error: patch failed:test.xml:114 error: text.xml: patch does not apply I do have 'test.xml' in my local directory. And when I do 'git status', it shows I don't have local changes. Thank you for any...
Hi, How can I get list of branches emerging from any branch in git ? Also what is the difference between fetch and pull command in git ? ...
How do I restore a file I accidentally removed from my git repository? I know this is a trivial question, but I haven't found the answer in the documentation. ...
Git reports the following status on one of my branches: # On branch awesome # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # new file: NEW.txt # # Changed but not updated: # (use "git add ..." to update what will be committed) # # modified: NEW.txt # This came about because I created NEW.txt th...
Hi, I've been using git for a while for my one-man developments, but I haven't run into any tricky branching issues until now and I seem to have forgotten something fundamental that I no doubt "knew" just after reading the Pragmatic Version Control Using Git Book.. I'm often several releases ahead of what is actually published on my we...
I did: git add -A so that all my updates would be ready for commit, but for some reason it says that I have to manually do a git rm for each file that was deleted before I can commit the changes. why is that, I thought git add -A did everything in terms of adding any new files, deleting old ones, etc. (getting them ready for commit)?...
I have cloned a git repo which has my emacs config files in. I would like to add pylookup in a subdirectory. What is the correct way to do this? Below are the options I can think of. If I clone it into ~/.emacs.d/pylookup/ and add that folder to my emacs repo, will that update properly when I do: cd ~/.emacs.d/pylookup/ git pull c...
I am still a bit weary of branches and comparing exactly what has changed. I don't like how things are just dumped to the console, especially when file sizes are large and many files have changed. If I plug in perforces diff, will I get this: a list of branches, and changes the ability to diff between branches and all effected files a...
I am in need of a site that offers the same services as Github (Git hosting, Ticketing, downloads, etc, etc) but allows me to have my source be private. I don't mind paying if I can find these features, and I've already tried gitorious, unfuddled, and codebase. I also wouldn't mind hosting my own if the application already exists for th...