From the man page on git-merge, there are a number of merge strategies you can use. resolve - This can only resolve two heads (i.e. the current branch and another branch you pulled from) using 3-way merge algorithm. It tries to carefully detect criss-cross merge ambiguities and is considered generally safe and fast. recursive - Thi...
Hi, I need to make some commits using Git but I would like the timestamp in git-log to be in the future. How can I do a commit in git that causes a future timestamp to register in the git-log? Thanks Git-noob ...
I have just start using git and i can't get it to remember my passphrase I'm using cmd.exe elevated and my git host is github and i have create a ssh key like that guide on github but i still get *\subnus.mvc>git push origin master Enter passphrase for key '/c/Users/Subnus/.ssh/id_rsa': ...
I've run the suggested commands found here but I still can't seem to get the network view working. Here's what the page/view says instead: If this is a Github repository you can set your credentials to view your network git config github.user REPO_USER git config github.repo REPO_NAME ...
My employer uses subversion for version-control, and this is unlikely to change. I'm interested in learning more about git, and using git-svn to interface with my employer's subversion repositories. My question is: if I were to begin using git-svn, would I need to do some or all of my version control work from the command-line? Or is the...
In Git, how could I search for a file or directory by path across a number of branches? I've written something in a branch, but I don't remember which one. Now I need to find it. Clarification: I'm looking for a file which I created on one of my branches. I'd like to find it by path, and not by its contents, as I don't remember what...
If I have a clone of a git repository as a cached copy on a remote server for capistrano/vlad style deployment, is it better to do A) git archive --format=tar origin/master | (cd #{destination} && tar xf -) or B) cp -R cached-copy #{destination} && rm -Rf #{destination}/.git ? To Clarify, the repository is already on the remote serv...
Is there a way in Git to rollback to a much earlier version of a file? I can roll back to the previous version with REVERT, but what if i want to go back to earlier versions? Whats the best workflow for managing waypoints in yout code? Branch each time so that you have a full copy of your code at a certain period in time? ...
I want to know how to simply publish over http = much like Mercurial's hg serve! On the Windows/work box do this: git serve and then on the Linux box SIMPLY go: git clone http://project project finished. ...
Tracking a single remote branch as a local branch is straightforward enough. $ git checkout --track -b ${branch_name} origin/${branch_name} Pushing all local branches up to the remote, creating new remote branches as needed is also easy. $ git push --all origin I want to do the reverse. If I have X number of remote branches at a s...
Does anyone know of any versioning system with a great web interface so that it can basically be managed and used from a browser? The interface would need to function in the areas of committing new code and viewing/downloading previous commits. ...
I read through a bunch of questions asking about simple source code control tools and git seemed like a reasonable choice. I have it up and running and it works well so far. One aspect that I like about CVS is the automatic incrementation of a version number. I understand that this makes less sense in a distributed repository, but a...
The only distributed revision control system I've used on my projects is bazaar. I don't know much about git and mercurial except how to do checkouts. The reason I like bazaar is the automv plugin. It detects when I've moved/deleted files manualy (from command line/ide etc.) which I tend to do alot when I'm in a hurry. But bazaar is real...
I have a repository which I have already cloned from SVN. I've been doing some work in this repository in its Git form and I would hate to lose that structure by cloning again. However, when I originally cloned the repository, I failed to correctly specify the svn.authors property (or a semantically-similar option). Is there any way I...
I need to use git over SSH (it's a self-imposed limitation, but one I am loathe to break). If my laptop is sitting on my home network, it all works great. When I'm at work or logged in via VPN, however, I would need to use corkscrew to access my remote repository, which I can set up without problems. I would like to remain lazy and ...
Say I have two repositories that were created from the same initial content. For example, if I were using git to manage my apache config files in /etc/apache2 and I ran git init on machine-a and machine-b separately. I've since made some configuration changes to machine-b that I would like to apply to the configuration on machine-a wit...
One of my coworkers is having a problem pushing changes from git on his machine. If he logs into another machine, he can push just fine - but from his machine, when he tries to push he gets the following error D:\Projects\test1\best-practices>git push Counting objects: 4, done. Compressing objects: 100% (2/2), done. Wr...
What do you think - which functions should be implemented to make work with Git from Emacs more comfortable? Which functions are missing in magit/git.el/egg/git-emacs/...? ...
I've got some shell stuff set up that dynamically defines aliases depending on what sort of VC repo the CWD contains -- so, for example, 'd' runs 'svn diff' or 'git diff', depending. (Based on this blog post, if anybody is interested...) I'd like to define some aliases differently depending on whether I'm in a git repo versus a git-svn ...
If I delete a file in Subversion, how can I look at it's history and contents? If I try to do svn cat or svn log on a nonexistent file, it complains that the file doesn't exist. Also, if I wanted to resurrect the file, should I just svn add it back? (I asked specifically about Subversion, but I'd also like to hear about how Bazaar, Mer...