git

Finding GIT installer for Ubuntu.

I just started using Ubuntu Linux for the first time. I know the GIT official site but not following which package to download and install the core GIT engine. ...

git checkout remote branch

Hi I am trying to checkout a remote branch: Somebody pushed a branch called test with git push origin test to a shared repository. I can see the branch with git branch -r. But how can I get this branch? git checkout test does nothing git checkout origin/test does something, but git branch says * (no branch). I am on no branch? How ...

gitosis did not generate projects.list automatically, gitweb can't work.

I setup a gitosis managed git server. git clone is ok. but when I set gitweb via gitweb.conf as below: $projectroot = "/srv/gitosis/repositories"; $git_temp = "/tmp"; $home_text = "indextext.html"; $projects_list = "/srv/gitosis/gitosis/projects.list"; $stylesheet = "/gitweb/gitweb.css"; $logo = "/gitweb/git-logo.png"; $favico...

Does git clone work through NTLM proxies?

I've tried both using export http_proxy=http://[username]:[pwd]@[proxy] and git config --global http.proxy http://[username]:[pwd]@[proxy]. I couldn't make it work. It looks like git uses Basic authentication: Initialized empty Git repository in /home/.../.git/ * Couldn't find host github.com in the .netrc file, using defaults * About...

How to Git merge a branch that only contains a subfolder of trunk?

I am currently working on a project using svn (server is version 1.4 which means no modern merge tools available). I want to merge a branch with quite a few weeks of work in it. The problem is that back when the branch was created, it was made as a copy only of a subfolder. Svn structure of project: /trunk/folder1 /file...

What do these Git commands do?

What exactly are these commands doing: ssh serveradmin%mt-example.com@[email protected] cd domains/git.mt-example.com/html/mt-example.git git --bare update-server-info cd hooks mv post-update.sample post-update chmod a+x post-update I'm not sure why the after the git --bar command they have update-server-info And what is goin...

When creating a git repository that will be on the server, can I convert it to a bare repository?

I already created a repository. Can I make it a bare type or shall I start over? ...

Creating a git repo on my server

I logged into my server, and created a git repo: (reference: http://kb.mediatemple.net/questions/1594/Using+Git) So I created a folder: blah.git I then did: git --bare init I then went into the hooks folder and changed the permissions on the post-update. Now locally on windows, I tried this: git clone http://git.example.com/bla...

Why did git create a master folder in my working folder?

My git folder looks like: c:\mygits\project1.git\ So I went into that project1.git folder, and then did a clone. For some reason (is this normal?), it created a master folder which I am forced to go into. c:\mygits\project1.git\master\ if I just to to the project1.git folder, it says no repo is here. ...

how to view file history in GIT?

With subversion I could use tortieseSVN to view the history/log of a file. How can I do this with git? Just looking for history record for a particular file, and then the ability to compare the different versions. ...

bulk delete in GIT?

If I manually go into windows explorer and delete a bunch of files, is there any way to bulk commit the change? I believe even after doing a : git add . it still tells me I have to do a: git rm /path/to/file Which will be a bit annoying if I have tons of files to delete? ...

How do I find out what options git-diff uses when it invokes less?

I want to reproduce the pager behavior that git-diff uses but I don't know how. Is there a way I could find out what options it uses with less? I already tried this: strings "$(dirname $(which git-diff))/*" | grep 'less ' And this (while less was running): ps aux | grep less <= Didn't show me which options it was using. I'm on Darwin....

Git Svn Fetch More Revisions

I am using git-svn for our svn repository. However, the repo is huge, so I first checked out the project like so: git svn clone svn://svn.server.com/project -s -r 12000:HEAD So, now I have only revisions 12000 to the current revision. I would like to checkout some more revisions, but the following does nothing: git svn fetch -r 11000...

Matlab Simulink version control with multiple developers

We're using Matlab Simulink for model development (and Real-Time Workshop autocoding) within a team of several developers. We currently use Visual Source Safe (yes, I know its terrible) for version control, using locks to prevent conflicting changes. We'd like to migrate our programme to a different version control system (svn, hg or g...

git: push a single commit

Say I made several commits and wish to cherry pick which ones I push to the remote repository. How can I do that (in ascii: C1->C2->C3->C4 and I want to push C2 and C4). Will reordering with rebase, resetting, pushing and then resetting work? (C1->C2->C3->C4 => C2->C4->C1->C3 => reset C4 => push => reset C3). Is there a nicer way? ...

git-svn rebase gone horribly wrong

Is there a way to redo a git-svn rebase. or reset any effects by it. In my +8000 commit git-svn repository, something went wrong after merging a branch. My local "master" does not reflect anything near a complete log of trunk. And running git svn rebase correctly fetches new revisions but then tries to apply what looks like all 8000+ c...

How can I keep git cvsimport from skipping patchsets?

I'm trying to import a cvs module into an existing git repo. I can get it to work properly if I import into a fresh repo, but when I try to import into the existing repo it seems determined to skip all the patchsets that are dated before the last commit to the branch that I've specified with -o. This is what I'm currently trying: git cv...

Diffing between two entire directories/projects?

I inherited a project originally stored in CVS with all the revisions. I made quite a few edits, and I'm trying to compare all the changes I made in the original directory, in regards to new files added versus the old ones. Is there some sort of utility for hg/git where I can do a tree diff, or something of that nature? So that say, the...

Has anyone found a way to merge changes in Xcode project or Core Data model files?

Is there a way to use a VCS (I'm using git) and have it work with merges to the Xcode files? For example, if my co-worker adds a new Group to the project, when I merge in his changes, I get the Group merged in? Or if he adds an attr to a Core Data entity, I get that attr in my Core Data model? ...

Enable ident string for Git repos

How do I enable ident $Id$ on files in a Git repository? ...