Git : How to get a snapshot of a git repository
I'm looking for the right way to get an archive of a git repository without the .git/ directory in order to send a daily snapshot to testers. ...
git
How do you squash commits into one patch with git format-patch?
I've got eight commits on a branch that I'd like to email to some people who aren't git enlightened, yet. So far, everything I do either gives me 8 patch files, or starts giving me patch files for every commit in the branch's history, since the beginning of time. I used git rebase --interactive to squash the commits, but now everything...
git push rejected
I give up! Whenever I try to push I get a stupid: ! [rejected] master -> master (non-fast forward) error: failed to push some refs to '[email protected]:companyX/projectX.git' Our team has a new git setup. Instead of making private branches I now Forked our main repository (on github) to create my own copy. At some point what I ...
How to setup public git repositories?
I recently tried to setup git repo on a linux box and wasted about 10 hours with absolutely no results. There aren't any problems with compilation or anything like that, it's just configuration issue. 2 hours later I got mercurial to do everything i need: public repos web ui push/pull with per-user permissions (not tied to linux accoun...
Can I easily update all local git branches from remote branches simultaneously?
I have a git repository with (at present) three branches: head is the stable version (not to be confused with git HEAD) experimental is experimental code; it's supposed to compile norman is my sandbox; code in it might be broken The "master" git repo is on a file server that is backed up. But I have replicas on a local disk, on a m...
Why isn't Git used for package management?
I've heard that Git has lots of advantages over subversion/CVS, especially speed so why do projects like FreeBSD continue to use CVS for the ports system? Wouldn't the distributed version control make it easier for new ports to be created and updated too? Also mercurial should be another good option and the same gos for all package manag...
git without bash/cygwin
I'm on a vista laptop, trying out git for the first time. I installed the msysgit version, and it installed a "git bash" shortcut on the desktop. When I run it, it seems to run in a cygwin kind of box, where C:\ is /c/ Is it safe to use git from the windows command line where /c/ is C:\? does that create any conflict with the way git e...
Git and Trac (or similar)
In the past I have really enjoyed using Trac with subversion repositories hosted on some of my own servers. The integrated ticketing and online code browsing is very convenient. I have used github for some of my public projects but I don't have the money to shell out for an extra service, espcially when I am already paying for remote V...
msysgit on windows -- what should I be aware of, if any?
This is related to another question I asked recently. When installing msysgit, the installer presents 3 options related to system path: Never change windows environment. With this option, you have to use the "bash" shell to work with git. Add the git\bin directory to the PATH environment variable, but without overriding some builtin w...
Can I make git-svn more like git?
Is it possible (or desirable?!) to set up git svn to behave more like git? For example, instead of writing git svn dcommit why can't I just write git push Similarly, instead of git svn rebase why not just git pull ...
How to ignore a file which is already comitted in the previous commit?
Previously, the following was my .gitignore file. ... ... config/database.yml .DS_Store Later i created a app_config.yml file in the config directory and comitted it. Now, I realized that I don't need that app_config.yml file in the git repository. And I modified my .gitignore file ... config/app_config.yml config/database.yml .DS...
Git Svn dcommit error - restart the commit
Last week, I made a number of changes to my local branch before leaving town for the weekend. This morning I wanted to dcommit all of those changes to the company's Svn repository, but I get a merge conflict in one file: Merge conflict during commit: Your file or directory 'build.properties.sample' is probably out-of-date: The versio...
Is there a way to import svn history into git after the fact?
I already have a svn read only repo checked out (svn co and not git svn). I have made some changes and commits using git which is then pushed up to github. At this point, git does not have all of the history from svn. I was wondering if there was a way to extract and import this at this point. The various git-svn guides show how to im...
How do I import multiple branch-type directories into git-svn which aren't exclusive children of the same parent?
Sorry for the long title, but I wanted to make clear the distinction between this question and The one asked by CaptainPicard I have a svn structure like: trunk/ branches/* tags/* Release Candidate/* for all intents and purposes Release Candidates are used exactly like branches. So, I can tell git-svn to use Release Candidates as br...
svn to git conversion
I am trying to convert a sourceforge project from svn to git. According to some googling it should be possible to use this command: git svn clone http://PROJECT.svn.sourceforge.net/ PROJECT.git where PROJECT is the project name at sourceforge to get a svn project checked out into a local git repository. However this just gives the fo...
Git merge mystery
I have a git repository with 2 branches: master and test. There are differences between master and test branches. Both branches have all changes committed. If I do: git checkout master git diff test A screen full of changes appears showing the differences. I want to merge the changes in the test branch and so do: git merge test ...
Unable to recover a file in Git
I have two branches in my Git, master and newFeature. At the branch newFeature, I removed the fileA physically first in terminal and then in Git by git rm fileA Subsequently, I run git add . git commit Right now, I need the fileA again. I had the idea that I can get it back, by simply switching to the branch master. I was apparent...
Unable to remove fast many files in Git
I removed 777 files which were in Git's branch newFeature by rm !(example) I would like to commit. Git ask me to manually remove each of the removed files by git rm file It would take a lot of time to write the above command for all 777 files which names are not similar. How can I remove these 777 files in my Git branch newFeatur...
Msys Git Merge Tool Command Options Issue
I'm using msys Git for source control on a Windows machine and I'm trying to figure out how to get my merge tool, WinMerge, to work with Git. I've followed the instructions on this blog to the best of my ability since it's the closest I've found to what I'm trying to do. Basically what I did was: Modify my .gitconfig file to include th...
How do I track local-only changes/change sets with git-svn?
I want to have files that I track in my local git repository that do not get checked in to the central svn repository when I run git-svn dcommit. I often have long-lived local-only changes to files tracked in the repository. Sometimes it's for debugging code. I also have project IDE files that I'd like to track. With plain old svn, I...