git

light-version of a repository/branch in git

Hello, I am using git on a project, that generates lots of data-files (simulation-results). I am "forced" to version and track all those results in the same repository. (This is a hard requirement and can not be changed) However I don't need them. We have about 50 MB for the project and 5 GB results in the repository. Is it feasible f...

Can a svn repository include/link-to an external git repository?

I have a svn repository, R, that depends on a library, l, in another repository. The goal is that when someone checks out R, they also check out l. We want l to still be in its own repository so that l can be updated without dependence on R. I don't know much about external svn links, but I believe that when depending on a svn-based li...

partial commits with subversion

Given the case I made two independent changes in one file: eg. added a new method and changed another method. I often don't want to commit both changes as one commit, but as two independent commits. On a git repository I would use the Interactive Mode of git-add(1) to split the hunk into smaller ones: git add --patch What's the eas...

Git pack file entry format

My understanding of the Git pack file format is something like: Where the table is 32-bits wide, and the first three 32-bit words are the pack file header. The last row of 32 bits are the first 4 bytes of an entry. As I understand it, the size of the entry is specified by consecutive bytes with the MSB set, followed by compressed dat...

What are the relative strengths and weaknesses of Git, Mercurial, and Bazaar?

What do folks here see as the relative strengths and weaknesses of Git, Mercurial, and Bazaar? In considering each of them with one another and against version control systems like SVN and Perforce, what issues should be considered? In planning a migration from SVN to one of these distributed version control systems, what factors would...

Why is Github more popular than Gitorious?

Gitorious has been around longer and the two sites seem to cover the same ground, yet a quick Google Fight shows Github almost two orders of magnitude higher. Is there a larger distinction that I'm not aware of? ...

How to migrate SVN with history to a new Git repository?

I read git manual, FAQ, Git - SVN crash course, etc. and they all explain this and that, but nowhere can you find a simple instruction like: SVN repository in: svn://myserver/path/to/svn/repos Git repository in: git://myserver/path/to/git/repos git-do-the-magic-svn-import-with-history svn://myserver/path/to/svn/repos git://myserver/pat...

What is the best Git GUI on OSX?

What is the best GUI on OSX for viewing a repository, and (optionally) manipulating it? ...

Git over Email

Assuming network access is sporadic with no central server, what would be the best way to use git to keep three or more branches in sync? Is there a way to extract just my deltas, email those, and merge them on the other end? ...

How can I get git to follow symlinks?

I've had a google for how to do this, but not had any luck. Is my best be going to be a shell script which replaces symlinks with copies, or is there another way of telling git to follow symlinks? PS: I know it's not very secure, but I only want to do it in a few specific cases. ...

Trying to load files from github through a firewall is impossibly slow. Any suggestions for workarounds?

I'm a little hesitant to post this, as I'm not completely sure what I'm doing. Any help would be wonderful. I'm on a computer with a firewall/filter on it. I can download files without any difficulty. When I try to clone files from Github, though, the computer just hangs. Nothing happens. It creates a git file in the folder, but the key...

Using git to grep through a file's previous versions?

Is there a command that would allow me to check if the string "xyz" was ever in file foo.c in the repository and print which revisions they were found in? ...

Recover dropped stash in git

I frequently use "git stash" and "git stash pop" to save and restore changes in my working tree. Yesterday I had some changes in my working tree that I had stashed and popped, and then I made more changes to my working tree. I'd like to go back and review yesterday's stashed changes, but "git stash pop" appears to remove all references t...

Why isn't the git stash unique per branch?

I suppose it allows for moving changes from one branch to the next but that's what cherry picking is for and if you're not making a commit of your changes, perhaps you shouldn't be moving them around? I have on occasion applied the wrong stash at the wrong branch, which left me wondering about this question. ...

Git - is it pull or rebase when working on branches with other people

Hi everybody, So if I'm using branches that are remote (tracked) branches, and I want to get the lastest, I'm still unclear if I should be doing git pull or git rebase. I thought I had read that doing git rebase when working on a branch with other users, it can screw them up when they pull or rebase. Is that true? Should we all be using...

Is there a way to purge some files from the history of git?

I have migrated a couple of project from Subversion to git. It work really well but when I clone my repository, it's really long because I have all the history of a lot of .jar file included in the transfer. Is there a way to keep only the latest version of certain type of file in my main repository. I mainly want to delete old version ...

How do I examine the configuration of a remote git repository?

I've got a git-svn clone of an svn repo, and I want to encourage my colleagues to look at git as an option. The problem is that cloning the repo out of svn takes 3 days, but cloning from my git instance takes 10 minutes. I've got a script that will allow people to clone my git repo and re-point it at the original SVN, but it requires kn...

Aborting a merge in git

I've done 'git pull', and received a merge conflict. I know that the other version of the file is good, and that mine is bad (all my changes should be abandoned). How do I do this? unmerged: _widget.html.erb You are in the middle of a conflicted merge. ...

Are there any good, cross platform, Mac, Win32, *nix, Git GUI clients?

It should also support SSH2 and public key auth for starters. secondly on Mac/Windows it should have a decent installer. ...

How Can I Remove .DS_Store Files From A Git Repository?

How can I remove those annoying Mac OS X .DS_Store files from a Git repository? ...