git

Importing Subversion to GIT: problem with subpaths

We currently run a big subversion repository, and I'm trying to move it to GIT. The problem is that it uses trunks and tags below the root directory. For example: MyDepartment\MyOS\Project1\trunk\ <-- master branch MyDepartment\MyOS\Project1\branch\v1 <-- other branch MyDepartment\MyOS\Project1\tags\v1_20100101 ...

Finding diff between two git repositories

Hi All, I have forked git repository of one project on github and made my own changes to it. I wanted to get diff between my repository and original repository that I've forked. Can someone tell me git command to get that diff ? I need to submit the diff for review. Original repository: git://github.com/apache/hive.git My repository: g...

Creating a SSH key with ssh-keygen does not create the .ssh folder

Hi, I am trying to create my public/private rsa key pair with msysgit I run this command: ssh-keygen -C "[email protected]" -t rsa Everything looks fine, I have the message Enter file in which to save the key (/c/Users/user/.ssh/id_rsa) Then I have the confirmation: Your public key has been saved in project.pub But I can't acce...

Creating a submodule in a git project

Hi, I have a Django project and it's currently hosted in GitHub and it's private. I'm looking to move many useful parts of it into an open-source project. I think I need to use a 'submodule' thing, but unfortunately I have no idea how to operate these. Please can someone help me :) Joe ...

Gitosis local filesystem clone

I set up gitosis on a server. Cloning and pushing from my laptop works fine. However, I want to make a local clone on the server using my user (not the git user). Gitosis seems to manage the file permissions by itself, making all repos unreadable by others. Is there some better way to get around this than just cloning via ssh to localhos...

setting up git for a project with many existing snapshots

I need to set up a project for git revisionning. The project team has kept backup snapshots of about 40 of the current 200+ numbered builds. What would be the most efficient way to bring that into a new git repo? My thinking is the obvious one: use the oldest backup to init the repo, then walk through the 40 snapshots one by one, for ea...

git: list commits not pushed to the origin yet

How do I list all commits which have not been pushed to the origin yet? Alternatively, how to determine if a commit with particular hash have been pushed to the origin already? ...

How to resolve this git error: git upload-pack: unable to fork git-pack-objects

$ git pull fatal: git upload-pack: unable to fork git-pack-objects fatal: The remote end hung up unexpectedly fatal: protocol error: bad pack header I'm experiencing the above error, it is weird because this error is occuring on a machine where the repository is local. I can still push/pull from my computer to that remote machine. How ...

Is Git a good version control system for web development (HTML/CSS/Javascript) on a corporate project?

I'm currently involved in a large project - the redevelopment of a corporate website. The project involves many staff across several teams (content, design, etc). There is a small team (myself and another developer) in charge of the front-end/presentation layer of the system - that is - the development of templates using HTML, CSS and ...

Local git repository is inconsistent with github repo

I use git for my source management, I have a local repository on my mac and a remote repository at github. They are BOTH suppose to be the same exact thing. I work by myself and I am the only programmer working on my web applications.. I can't get git to act right - with svn I could simply commit the code to the repository and BAM! T...

Where does git store files?

I just ran the following commands on my rails project: git init git add . git commit -a -m 'Initial' Where does git actually store this repository? (it's on my local machine, but where?) Thanks! ...

How can i clone more than one git repository. If its possible ?

Just say possible or not ...

git: avoid duplicate methods during merge

I was doing some refactoring on another branch and moved some methods in different place in the same file. Then, after merge to master, git did not remove the old placement, and imported the new methods in new location. As a result I got a new file with some methods duplicated (also some code blocks were messed up). It looks like git t...

Necessity of having license information present in all code revisions

I'm considering posting some code on github. Older revisions of the code don't have a COPYING file or other licensing information in them. What's the effect of posting this publicly? Would people be able to copy and use that code freely without adhering to any license constraints? Although there doesn't appear to be a "default licens...

in Git: how do i move my current work to a topic branch?

I started on a simple task in the main branch. ya' know the type of task where "this is too simple even to bother with a git branch"... the inevitable result was that now I have a lot of unfinished work in the master branch and need to work on other things. How do I move my current work to a new branch? ...

Hudson + Poll SCM - build upstream projects first?

We have a bunch of maven2 projects in Hudson, all set to Poll SCM at the same time. The problem is that there doesn't seem to be an order in the way it polls and builds the projects. Ideally it would check the upstream projects first. I could set the poll SCM schedule to account for this, but this seems error-prone as new projects are a...

C# LOC counting with GIT

Hi everyone, I was wondering if there is any tools out there that can report on the LOC for Added, Modified and Deleted code from a GIT check in. It would be awesome if it could then add the count to a some sort of DB ...

Using git to merge specific files from another branch commit

I have a git repository that I am using and I've screwed up. I made a few patches to the source tree and then went on to do upgrades without committing the patches first. Then I committed the whole batch together as one. My intent was to be doing the upgrades on a separate branch, which I did create before the commit. Now at this p...

What happens when Dan change text into 'aB' and John to 'abc'?

Imagine a very simple textdocument (text.txt) with as content just the letters 'ab'. This file has been check-in in a canonical (remote) repository. Two people have a local close of this repository and thus this file and start editing it. Dan changes the content to 'aB' (note the capital B) and John edits his version to 'abc'. Dan does ...

Need GIT workflow suggestion

Hi there, I have been studding GIT for the last couple of weeks in an attempt to get my team's code under control. Unfortunately the code we work with is a proprietary language with some peculiarities which is keeping me from finding a practical enough workflow to be implemented. Still, I'm probably not aware of all GIT's capabilities s...