View differences of branches with meld?
...
git
How to reset a remote GIT repository to remove all revisions?
How to reset a remote and local GIT repository to remove all revisions, and start fresh with the current Head as initial commit. ...
Is there an standard naming convention for git tags?
Hi. I've seen a lot of projects using v1.2.3 as the naming convention for tags in git. I've also seen some use 1.2.3. Is there an officially endorsed style, or are there any good arguments for using either? ...
Gettext .po files under version control
Currently using Gettext on a project and the .po files are nicely kept under version control. PO files of course contain translations, but in addition to that they also contain some metadata - information about the exact files and line numbers where the translatable strings are located. The problem is that each time you update the PO f...
How to join two different git repositories into one with two branches?
I want to join two different git repositories into one repository with two branches. Is it possible? How? ...
Howto prevent git from pushing changes to some files
Hi. I've cloned a subversion repository using git svn. The source has some config files that i have to edit to fit my system. I would like to store my changes to those files in my local repo (to easily switch between branches without worrying about locally modified files) but i would like to prevent those changes to be pushed to the rem...
Rollback to an old commit using git
So I've done many google searches, read through the man pages, and even asked in git's irc chat room but I still don't know how I could go about rolling back to a specific commit in git. The best answer someone could give me was to use git revert x times until i reach the desired commit. So let's say I want to revert back to a commit t...
Git clone fails due to untracked files but all branches are clean
I am attempting to clone a git repository. The clone fails with the following message: Untracked working tree file ... would be overwritten by merge. I have run git clean on all of the branches; none have untracked files. The file which is labeled untracked is only used in the branch I am currently working in and it is tracked. A...
Git client on the iPhone, possible? How?
Is it possible to embed git in the iPhone app? Only in a passive mode, i.e. to be able to read commit messages (with date and user) and diffs given some online git repository in order to present it in some readable table views? ...
git http push via WebDAV - what if my username has an "@" in it?
My web hosting provider lets me access my webspace via WebDAV, so I thought I'd set up a git repository over there just to see what happens. Cloning the repository read-only works just fine, as "git clone http://my.server.com/repo.git" just uses the standard HTTP transport. Problems arise when I try to use WebDAV, because my user id is...
get all the commits done by me in the last 5 days in git
I am not very good at sed or awk. Every friday I like to see all the commits done by me in the last 5 days to find out what work I did. At this time the only command I know of is git log --since=5.days ...
How to have Git 1.6 follow "beyond symlinks"
Apparently, the bug where git follows and track files beyond symlinks (git add symlink/) has been fixed around v1.6. Now this was a bug that works in my favor. Now that we've upgraded to v1.6.3.3, is there any way to reproduce that behavior without downgrading? ...
Updating an unpacked and customised gem
We have an interesting scenario I need to sort out: 1) We have an existing application running with an unpacked gem 2) The application has some customisations to the unpacked gem 3) I would like to somehow "merge" a new version of said gem into this unpacked gem to bring it up to date. Any ideas on a nice way of doing this? All the c...
Coloured diff to HTML
I enjoy using git diff --color-words to clearly see the words that have changed in a file. However I want to share that diff with someone without git or a colour terminal for that matter. So does anyone know of a tool or trick that can convert colour escaped terminal output into HTML? ...
Hooks for git-svn
Can I set hooks for "pull"/"push"ing from/to a git-svn managed repository? The situation is that I have a project host on Google Code, and use git to manage the local working copy. I want to set some hooks so that when checking in/out data from/to the SVN repository with git svn fetch and git svn dcommit, I can do some modification to t...
Why include `master` in the command `git fetch upstream master`?
In the section Pulling in upstream changes on help.github's Forking a project it states: Some time has passed, the upstream repo has changed and you want to update your fork before you submit a new patch. There are two ways to do this: $ git fetch upstream master $ git merge upstream/master Why are they including master in the f...
How do you merge changes on non-master branches from a forked github repository?
In both of the following StackOverflow questions, the accepted answer describes how to merge changes from a forked repository in the situation where you fork a repo, the original repo is modified, and then you want to merge the changes made to the master branch back into your forked repo. Merging between forks in GitHub Merge changes f...
Git Submodules: Is it possible to have more than one URL for each?
I was wondering if it is possible to have more than one URL for each git submodule. It would be interested to have more than one source of it if one of them is down or someone is behind a proxy that blocks one of them. Have you ever had this problem? How would you solve it? ...
Git clone does not bring master branch
I have a remote repository http://github.com/fernandezpablo85/Test This repo has a master branch, but it's behind two other branches so when I clone it I get this warining: warning: remote HEAD refers to nonexistent ref, unable to checkout. And also I don't get a local master branch (git branch shows nothing). I can fix the whole...
git status shows modifications, git checkout -- <file> doesn't remove them
I would like to remove all changes to my working copy. Running 'git status' shows files modified. Nothing I do seems to remove these modifications. E.g.: rbellamy@PROMETHEUS /d/Development/rhino-etl (master) $ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use...