I work in an environment with large scale multi-parallel branching. Looking at GIT I see it has several merge strategies: already up-to-date fast-forward octopus resolve recursive Does Mercurial have the equivalent of each of these? (ie is the implementation of Mercurial's merge algorithm as good as recursive? ...
I have a git media repository that I'm keeping all of my javascript and css master files and scripts that I'll use on various projects. My question is if I create a new project that's in it's own git repository, how do I use javascript files from my media repository in my new project in a way that makes it so I don't have to update both ...
I put my home directory under version control and if I start git-gui now from my Gnome panel I can only work on this repository. There is no longer this dialog that lets me browse for or enter a repository location or pick one that I used before. I could not find an according commandline or .gitconfig switch. How can I force git-gui to...
How do you know how many developers were involved in a project using a Revision Control System? A friend of mine found this way to look up the answer in git log: git log | grep Author: | sort -u | cut –delimiter=” ” -f2 | sort -u | wc -l Is there a straightforward way in git? How about other Revision Control System like Subversion...
Hello, Is there any way to get a list of files that will be committed when I type the following? git commit -m "my changes" git status lists too much. I could strip out all the words, but I'd rather not. And I don't want to be told about untracked files. I've tried git ls-files -md but that doesn't show files that have been re...
Hi All, I have a bit of a predicament. Basically I have a local "master" git repository. Every few hours, I 'git push' my changes to a server from which I then pull to my client machines. Well, being the genius I am, I accidentally used GITK to roll back my local "master" repository one version too far. What are the steps to pull th...
i'm looking for a console UI tool for resolving merge conflicts in git... like vimdiff but 'easier' ...
Every time I see a conflict on something like imports or method signature changes (e.g. renames of variables) in my SCM I wonder if there is something like a language aware diff/merge method that can handle the more annoying small changes that can happen on a shared project. Is there anything out there that handles conflicts more smoothl...
How would I go about simulating a global increasing revision number for every commit in the git main line? So, after I commit I would like a script to run increases a number somewhere. This will allow me to tell my customers easily that X feature was fixed in git revision XYZ. I am looking for a practical sample script that is robu...
I would like to be able to use ediff with "git mergetool". I found some patches that alter the source code, which I don't want to do. Instead, I'd like to add ediff support with my .gitconfig. I know git has builtin support for emerge, but I prefer ediff. I attempted to add these lines to my .gitconfig: [mergetool "ediff"] cmd = ...
Hi, I know there is hgsubversion extension for mercurial. But before I knew how it works, I maintain two separate repositories, one is SVN repo and one is Hg repo. I made most of my recent changes in the Hg repository and I need to "push" them to the svn repository. The most straight forward way to do this is to get one revision from s...
On my local computer's master branch (I cloned a repo from a remote server, master branch). So I updated a file, and I want to revert back to the original version from the remote master branch. how can I do this? ...
I would like to stop Git from showing ignored files in git status, because having tons of Documentation and config files in the list of Changed but not updated files, renders the list half-useless. Can anyone tell me, if it is normal behavior for Git to show these files? I put the ignore information in a .gitignore file in the root dire...
Hi - I am a newcomer to GIT and wanted to know how to just get a latest version of the trunk and DISCARD all of my curent changes. All I seem to get is the notuptodate error. I do not want to save my old changes... I also get Your branch is behind 'origin/master' by 15 commits, and can be fast-forwarded. How do I fast forward? Again, ...
Hi, How can I apply a patch in my location repository in git? I tried $ git am < 0001-Add-Voicemail-tab-to-Contacts.patch Patch does not have a valid e-mail address. I tried $git apply 0001-my.patch but I get fatal: git diff header lacks filename information (line 27) where line 27 is "GIT binary patch" in my patch file. My patch fil...
Hi, I setup my shell prompt to show git branch. So it looks like /Volumes/android/mydroid/packages/apps/Contacts(1.6_r1.4) $ But after I did this: $ git am < 0001-my.patch Patch does not have a valid e-mail address. The prompt change to /Volumes/android/mydroid/packages/apps/Contacts(1.6_r1.4|AM) $ Can you please tell me what does '...
Hi, I wish to create a git server for which I wish developers in my team to access their git repos through HTTP/git protocol by a web application. I want to develop this solution fairly in a short amount of time and i have to depend on the existing tools to do this. I am having a dilemma of choosing java/python/ruby(rails) for this purp...
So I think it may have to do with textmate, but we work in a small team and are having some issues with full-file conflicts of nearly identical files in git because each line of one branch has a ^M appended to it. I would just google it, but since google searches strip special characters like ^ I am coming to you guys for help on this. ...
I deleted the default.aspx.cs file by mistake in my local master branch. How can I get this file back from my remote repositories master? ...
A file couldn't be merged, how do I merge it with git? ...