git

git: branching removed some commits

I had a weird situation today.. I'll try and recreate what I think happened. I wanted to move a speculative change (made to a_file) to a new branch and continue working on the main branch without it. On master with a_file and b_file dirty I did: git checkout -b saved_feature git commit a_file -m "Putting this modification on a differ...

Hudson Git Plugin not working on windows

I have msysgit installed with OpenSSH option. In Git bash, I can run ssh-agent, and it manages the passphrase for my ssh key. Is it possible for the Hudson Git plugin to use ssh-agent? Currently, it hangs when trying to clone, no doubt waiting for the passphrase to be entered. Thanks! ...

Hudson git plugin won't clone repo on Linux

Alright, so I'm having some issues with my repo on github being cloned on my Hudson server which is running Fedora 8. The output is the usual error output when an error is encountered with git: Started by user anonymous Checkout:workspace / /home/tomcat/.hudson/jobs/CIExample/workspace - hudson.remoting.LocalChannel@3861e6 Using strateg...

Possible to purge all git data before a specific commit?

I have a few repos (for websites) that are growing very large due to the fact that images constantly change. Is there a way to remove old data from git in order to reduce the size of the repo? ...

GIT Pull & Clone times out

I've recently set up a small turnkeylinux revision control VM (which has about 256MB RAM), and am attempting to clone one of the repositories I pushed up to it. It is very fast to push to (via ssh) but is extremely slow to pull from. Here's what I get if I leave it till SSH times out: $ git pull [email protected]'s password: remote: Cou...

pushing to a git repository does not work

I am just starting out with GIT (i'm coming from cvs) and would like to set up something akin to cvs/svn with Git. I performed the following steps: cd o:/repository git init cd <working directory> git clone o:/repository i now created a file called file.txt with some content doing a "git status" lists appropriate changes. I then do...

Missing files after git pull?

I have a remote that is the same, or similar, to the rails project in my current directory. To sync the two, I do git init git remote add origin blah@blah git pull The problem is that some of the files I had in my working copy were added (ie not in the remote), so when I do git status it should show a bunch of untracked files. Ins...

Is it possible to move a bunch of files from one git repository to another while preserving (most) history?

I added some files to the wrong repository and didn't realize until later, once they already had quite a bit of history (just linear revisions, no branching or anything). Is it possible to get these files and move them to another git repository together with their history? I don't care if their remnants stay in their current one or not,...

Can gitk show the diff of merges by default?

Currently for merges without conflicts gitk shows no diffs. Is it possible to have the diffs resulting from a merge (which are indeed there, e.g. git diff HEAD~1 after the merge shows these diffs) shown by defautl, e.g. using a command line switch? Or why does gitk by default not show them? ...

How can a patchfile created with `git-log -p <filename>` be applied to create all the commits included?

Background: this question. git apply <patchfile> just recreates the file but without committing the history, which in this case would be desireable. Is there any switch for git-apply to do so? Or is there a way to convert the patchfile into a git-am compatible file? (Currently, git-am complains "Patch format detection failed") ...

Git progress watch while pulling / fetching

Here is my problem: When I'm doing pull/fetch of some big repository i want to show progress somewhere else than in console (for example on website) I know that in git 1.7.1.1 there is option --progress but I can't use this version and must stay with 1.6.0.4 does anybody have idea how to watch git fetch/pull progress (for example how t...

git status reports modified files in a freshly cloned repo

Solved It seems the remote repo contains two files named the same, except for the first letter. This caused a file overwrite on my system, which led to the issue below. Update It seems it has nothing to do with newlines, but I can't yet find an explanation. Here's what happens. git status reports FileStartingWithCapitalLetter.php has...

How do I add project-specific information to the Git commit comment?

With Git, if you are committing, it includes a section under the commit message that is commented out. This contains instructions on writing a commit message as well as a list of files that are changing. Like this: # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts ...

Git with two remote repos, one git, one svn

So I'm using git-svn to keep in sync with our main svn repo. I also have created a remote git repo to push branches for safekeeping off of my machine until the changes are ready to be merged into svn. The problem is when I have a commit that needs to go to both svn and git, I have to git svn dcommit first. dcommit rewrites the SHAs of c...

How do I delete unpushed git commits?

I accidentally committed to the wrong branch. How do I delete that commit? ...

Why doesn't "git log -- foo" work for deleted file foo?

My repository underwent changes such as: ...some unrelated commits... Commit new file foo with 100 lines of content ...intervening commits, some of which touch foo... Insert the contents of foo at the top of an existing file bar and git rm foo in the same commit ...more unrelated commits... Now I want to see the log of deleted file f...

Git deny users to create tags

Hello Here is a question about git repo management... Is it possible to configure git repo to allow TAG creation only for some users? And similar question for branch: is it possible to configure list of user, who are able to modify particular branch? The idea for all this config is: there is git repo with MANY developers, and we want ...

How do I import one specific SVN branch to a git repository?

We recently moved from SVN to Git, but there's a single legacy branch that I need to bring in to the Git repository. The SVN and Git repositories are the same logical code (i.e. they're both called foo-lib), but the Git one has newer revisions from after we switched to Git. Is there a way we can use git-svn to grab the history of a spec...

What are the drawbacks to hosting a git repository with WebDAV instead of SSH?

I have a large git repository that I am hosting with Dreamhost. It has grown slowly over time and have had no problems with it until just now. It has no problem pushing and pulling but when I try to clone from the remote the pack-objects process is getting a kill signal 9. From what I have read this is dreamhost killing the process becau...

Git cancel a revert

Hi, In git let say I commit A and B A---[B] But then I revet with git revert HEAD So I am there now: [A]---B How do I cancel my revert so that I can go back to B? Thanks ...