When I use git format-patch, it doesn't seem to include merges. How can I perform a merge and then e-mail it to someone as a set of patches? For example, let's say that I merge two branches and perform another commit on top of the merge: git init echo "initial file" > test.txt git add test.txt git commit -m "Commit A" git checkout -b...
I am wondering why some behaviour using git occurs: I forked a project on github to my own project on github. I then cloned my project to my computer. Some changes occured to the original project, so I told github to commit them using its fork queue. I do git pull on my computer to get these changes. Now some more changes came to th...
The advantages of using git-svn over git are obvious(svn compatibility), but what are the advantages of git over git-svn? ...
This is how gitk currently looks in one of our projects: https://dl.dropbox.com/u/2582508/gitk.png This apparently, from all we can tell, happened after a single "git merge" was done with a remote branch - we're not sure why or what is going on. Any idea what happened here? More importantly, what's the best way to fix it? Those merge ...
Every git tutorial you look into has a clear opinion about tags: One should always use annotated tags, one of the reasons being that they are used by git describe. However, I don’t see anything bad in using git describe --tags which also takes the unannotated tags as a reference point. Is there anything else that’s considered bad about ...
Tim Pope argues for a particular git commit message style in his blog post: http://www.tpope.net/node/106 Here is a quick summary of what he recommends: First line is 50 characters or less Then a blank line Remaining text should be wrapped at 72 characters His blog post gives the rationale for these recommendations (which I will cal...
Desired: I'd like to be have my git commits reference some higher order/level task or todo list. Background: I use Git as my version control. Now, DVCS is great. A great side effect is that the log should contain, with some care, an atomic list of the actions taken to achieve a task. This is the bottom level of a 'knowledge base' r...
Hi, i and a friend are developing a web application and using Git for versioning. In the office we are using a model of a central repository and also, each developer has your personal repository. I and my friend are working from house now, and i have implemented features that my friend needs. How i can send a resume of my commits to my f...
How to direct the output of the command format-patch to a single file? ...
I've seen a ton of statistics about how git is faster than svn, but most of those statistics are only comparing git's local operations to SVN's equivalent remote operation. Dos anyone have links to hard data comparing git's speed with remote operations to SVN's speed with remote operations? ...
Update: I think this is related to an issue with the windows git client msysgit. Sorry to trouble you guys. http://code.google.com/p/msysgit/issues/detail?id=379&colspec=ID%20Type%20Status%20Priority%20Component%20Owner%20Summary I'm looking for a way to keep several client boxes in synch with a remote git repo. Forcing updates from...
I am trying to do 'deploy:cold' for my app. The git repo is local to my deployment server (i.e. I only have one server for everything and I don't host my code on github). Here is the transcript (replaced my app name with "myapp" for privacy) executing `deploy:cold' executing `deploy:update' ** transaction: start executing `deploy:upda...
Hello, I would like a specific string in a specific file to be hidden every time I commit changes to that file. Actually, I have a URL in a file that shouldn't be public in a remote repository. Is there anyway to hide it using pre-commit and post-commit hooks or something similar? Currently I am working with a git repository but it w...
I've written a Git post-commit hook and it works correctly. However, I want to add this hook to apply to all current (and future) git repositories I am working on. I tried adding the hook to my ~/.git/hooks/ instead of in the hooks directory in the project directory, however, this did not seem to work. Is there any way to create globa...
I've been trying to use Git on my personal projects for almost a month now. I have a pretty good understanding of the basic set of commands and while its user experience isn't awesome, I still find myself liking Git more than the other VCS's I've used in the past. However, one concept that I still don't think I have "gotten" is the r...
I have a rails + postgresql project hosted on github. I usually work on it from my laptop and push the changes out. I would like the same project source to come on my desktop as well so I can work on it if I am on my desktop. The project is also deployed to heroku so I'd like to pull the db changes and stuff as well. I already have g...
I cloned a project from github over to my desktop. I used to work on it form my laptop. However, on laptop heroku does not seem to work for this app eventhough i have it installed. First problem: heroku open >No app specified. >Run this command from app folder or set it adding --app <app name> I did not have to specify the --app o...
Given a file foo.m, how can I get Git to show me the complete contents of foo.m, as they were at some commit x? ...
So I have a project hosted on github. I created a branch on one computer, then pushed my changes to github with git push origin branch-name Now I am on a different computer, and I want to download that branch. So I tried git pull origin branch-name but all this did was overwrite my master branch with the changes in my new branch. ...
When I go to set up git to run with ssh, I get the following error: file "usr/lib/python2.5/site-packages/gitosis-0.2-py2.5.egg/gitosis/init.py", line 35, in ssh_extract_user _, user = pubkey.rsplit(None, 1) ValueError: need more than 1 value to unpack the command I typed: sudo -H -u git gitosis-init < /home/sean/.ssh/pubkey.pub ...