git

tracking a different branch on github

I am trying to track a different branch of a github project. The project is restful_authentication: http://github.com/technoweenie/restful-authentication However, what I really want to clone is the modular branch: http://github.com/technoweenie/restful-authentication/tree/modular I found this guide: http://github.com/guides/showing-...

Does any version control system have a "persistent local only change" feature?

This question occurred to me whilst playing around with git, but I'll ask the general case... I just thought of a feature which might be nice for version control, but I don't know if it exists or what it is called. I want to call it persistent local changes. Say I have a config file in svn, which has lots of useful non-recreatable stuf...

Setting up git server with web interface?

As our company would never let a third party like github anywhere near our source code, is anyone aware of any software or setup guides or blogs on how to setup a scm server like github, ie it would support Creation of repostories using a web interface Limiting/managing user access to individual repositories Browsing repositories onlin...

Rebase-push cycles for git branches

I'm currently using a github repository with a single branch, based of a master branch of another repository. The github branch is a backup of my work, and definitely not meant for pulling, and as such I'm comfortable with rewriting its history when rebasing from the master repository. My problem is that I want a clean history, and if h...

How to reset my local repository to be just like the remote repository HEAD

How do I reset my local repository to be just like the remote repository HEAD? I did: git reset -hard HEAD^ But when I do a git status, On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: java/com/mycompany/TestContacts.java modified: java/com/mycompany/TestParser.java C...

Git: Move recent commit to a new branch

I'd like to move the last several commits I've made to master to a new branch and take master back to before those commits were made. Unfortunately, my Git-fu isn't strong enough yet, any help? Thanks. ...

Git tags dissapear when doing a push then clone?

We have a repository with multiple tags. Each tag represents a version of the software. We are pushing the repository to a remote server. When we do a fresh clone off the remote server, the tags are no longer there. How do you ensure other developers or clients can check out specific versions of software off the remote server? ...

Kubunutu/Windows 7 dual-boot and git

I've been using Kubuntu and Windows 7 on my laptop for some time. Recently I also started using git to keep track of a project I'm working on. At first I thought I'd use the same git repo for editing from both Kubuntu and Win, but I soon discovered that committing changes on Win would make git on Kubuntu think all the files have changed ...

Moving a git repo to another server

I have a git clone/repo on a development server, but I am now moving to another one. I don't want to commit all my local branches and changes to the main repository, so how can I make an exact copy of everything on oldserver to newserver? I tried oldserver:~$ scp -rp project newserver:~/project but then I just get loads and loads of "t...

git fetch tagged file without cloning

git://perl5.git.perl.org/perl.git http://perl5.git.perl.org/perl.git/tags say i want to get the MANIFEST from perl-5.10.0, how? ...

Capistrano & Git: Needed a single revision

Capistrano and Git worked properly till I moved my site to another server. My first attempt to deploy went wrong because of an SSH-known-hosts related problem. Even if I managed to solve this problem, another one raised and I can't deploy any more: * executing `deploy' * executing `deploy:update' ** transaction: start * executi...

How to get GitExtensions installed on Visual Studio 2010 Beta 2?

How do I manually install GitExtensions as a plugin for Visual Studio 2010 Beta 2? There is no automatic option in the present installer, only plugin options for Visual Studio 2005/2008. ...

Why I can't add new repositories using gitosis?

I set up gitosis but even when i can clone, pull and push to the gitosis-admin repo, i can't create new ones. According to every doc i read, to create a new repo one has to: Give user write access to the repo (inside a group put: writable = repo-name) The user create a repo locally add a remote then does a push The repo is created in ...

What's the difference between git reset --hard and git reset --merge

In my experiments I haven't been able to find any functional difference between git reset --hard and git reset --merge The usage instructions don't give any hint either --hard reset HEAD, index and working tree --merge reset HEAD, index and working tree I regularly use the --hard option so understa...

How do I use Notepad++ (or other) with msysgit?

How do I use Notepad++ (or any other editor besides vim) with msysgit? I tried all of the following to no avail: git config --global core.editor C:\Program Files\Notepad++\notepad++.exe git config --global core.editor "C:\Program Files\Notepad++\notepad++.exe" git config --global core.editor C:/Program Files/Notepad++/notepad++.exe ...

git log --pretty=oneline on win xp cmd

I just recently noticed this behaviour. To put it shortly, it displays the commits with an END on a white background, and gets stuck. Upon pressing "q" it asks if I wish to terminate the batch job ? Is anyone else experiencing this ? Is this a known bug, or ... ? ...

Automatically rewrite full git history to get rid of simple merge commits

Our team uses a purely merge-based git workflow, and we're discussing the possibility of just asking all team members to push all work to server one afternoon and do an evening of rebasing the server repo. The stuff we'd really like to rebase looks like this: or or . I (think) what I would like to do automatically is that as long as...

Good Revision Control For PLT Scheme

Hello, Now I'm following one more friend and now I started to learn PLT Scheme(using DrScheme), but I and my friends normally help each other in some projects, to do this we use revision controllers(normally SVN, in sometimes we use git), but which is the best revision control to use with PLT Scheme? Thanks. ...

Git-SVN with multiple branch locations?

Our company subversion repo is a bit tricky: We've got a basic "default" layout with trunk, tags and branches. However, inside the branches, we have a "work" directory which contains more branches. Something like this: branches/release_1_0_x branches/release_1_1_x branches/work/dave/topic_one branches/work/tom/topic_two branches/work/s...

git question. How can I push 1 commit without the other?

Hi, I have made a git commit but I have not pushed. And I am now working on a new bug fix, which should not touch the same files as the first commit. Is it possible for me to commit this bug fix AND git push only this commit? Thank you. ...