I'm using git to manage an extended CodeIgniter Framework. It's a clone of the current CI release with extra helpers, libraries ect. I have many sites all using this framework and if I add a new helper method or fix a bug in one site I want to be able to easily update all the other sites without overwriting any of their custom files. I...
I tried to diff only .cs files, I use: git diff HEAD -- ./*.cs It just didn't work. Note there are several cs files under different directories. What is the correct command? Thanks! I use msysgit in windows. I decided to write a python script for it. Here it is: import os screenOutput = os.popen('git status').read() lines =screenOut...
Seems like my project is getting bigger and bigger with every git commit/push. Is there a way to clean up my git folder? ...
Hi, How to disable auto-merging in GIT? The purpose is to have the same behaviour as for conflict merges resolution in automatic merges during invocation of command chain: $ git fetch $ git merge some_branch $ git mergetool The last command leads us to 3-way merge of files in case of merge conflicts. I would like to have an easy way...
Is there any way to store changes made to submodules in the parent repository? I'm using a library which I have modified very slightly (just a couple lines of code modified). I'd rather not check the entire library into my repository if there's an alternative. ...
Hi, I have a remote read-only git repository A, which I have cloned in my local filesystem. A is updated periodically, and I pull and merge the updated code in my system after each update. I want to collaborate with my team members on the files of A, for which, I have create a new remote repository B. How do I manage to sync B with my ...
Is it possible, without pop whole stash and save another without this particular file? ...
I am starting to read about git-svn now to use it with a project that use SVN. I would like to have some files just for me (todo files, scratch code, etc), and I will like to keep track of them in the Git repository. Is it possible to have some files in the Git but not in the SVN repository? I though about having a branch master that w...
Hello, I am new to GIT (from SVN). When I make a merge, all the file is set as conflicted (not only the lines where there is really a conflict). This should come from a "end of line" problem between me (Windows) and my partner (Mac) but how to solve that? Thanks in advance for your help! Farf ...
I have a project under git. I'd like to start a new branch to add a major new feature. Under the main branch, I'll continue to add bug fixes and minor features. At regular intervals I'd like to pull the changes from the main branch into my "major new feature" branch. What's the best way to do this? Eventually, I'll merge the "major new f...
I'm coding with two other friends and we're all using the same repository. For some reason, git randomly fails for me, and only me. error: insufficient permission for adding an object to repository database .git/ objects What's intriguing is that we noticed that when friend A pushes his code, I don't get this error anymore, and I can h...
I can't figure out why git show-branch isn't giving me the same full history that git log --graph shows me. Why would the following discrepancy occur? $ git log --graph --oneline --date-order * 786c9bd Merge branch 'master' into testbr |\ * | dda9989 ch2 to couch * | 05d0851 chg 1 to couch | * 3df86c2 change 1 to tv | * 900ad58 adde...
I have a repository on GitHub which depends on two projects which are developed in Bazaar. Currently I just download and unpack sources, but it would be nice if I could actually keep their history. Is there a simple solution for this? ...
I'm using git against a central remote svn repository using 'git-svn'. The SVN repository uses https with a self-signed certificate. Everything works fine, with one nasty exception. As long as I use directly with svn, the password is remembered, so it has to by typed only on the first command. When using git-svn operations (e.g. dcommi...
I am developing a ruby on rails website using heroku and git. What tools and features should I use to set up the following simple development process? CODE > CHECK-IN > AUTO TEST > AUTO DEPLOY I check my code into my repository (preferred option, hosted git like github) Tests are automatically run AND website is deployed in my stagin...
Every piece of documentation I've read on git (including the online book and the built-in help) says I can type "git diff" from command line, but whenever I do that I get: usage: git diff [--no-index] <path> <path> Here's what I've tried so far (all are examples from the documentation): $ git diff usage: git diff [--no-index] <path> <...
I'm looking for a Ruby or Python implementation of the Git client that can be used to update and commit changes in a local repository. I prefer if the library does not use shell commands at all but keeps everything in "pure code". Are there any? Thank you in advance. ...
I've done a manual cherry pick of a commit from one project into my git project, and I'd like to give credit to the true author by faking the author info somehow for this one commit, so that the true author is the author, and I am the committer. Any idea how to do this? ...
I've got a Git repo from which I need to create a patch file in something other than the default git diff format. My use case is I've got a clunky old OSF/1 machine on which I need to apply the patch, and the /bin/patch program there doesn't understand unified diffs. If I use GIT_EXTERNAL_DIFF=diff, hoping that I can then use GIT_DIFF_O...
Is there a sourcecode management system (svn, git, etc.) webclient which you can use to change the code? (without ruining the system), I am hosting at sourceforge. ...