On Wednesday 22 November 2006 11:01, Jakub Narebski wrote: > Alan Chandler wrote: ... > > 2) Some files get completely munged with conflict resolution markers > > every few lines. Is there a simple way to say "don't use this file, but > > use the [stage2/stage3] sources of the merge". (ie one of the original > > inputs to the merge - and if so, which one is which) > > "git cat-file -p :<stage>: <filename> > <filename>", where stage = 1 means > version from the ancestor, stage = 2 means version from the HEAD (from the > base), and stage = 3 means version from the remote/other branch (from the > branch being rebased). Just a comment for the list. There have been lots of documentation ideas floating around recently. One thing that could be done is to cross reference the key sections in the man pages somewhat. I read the man page for git-cat-file, and that just says the non flag parameter is <object> and its an SHA1. Once I saw this, I was puzzled and eventually found a reference to in in git-rev-parse. > > > 3) I sometime hit a merge conflict in a file which I know will actually > > be deleted at the tip of the topic I am rebasing. Is there a way at this > > point to just tell the conflict resolution to say make this file go away. > > "git rm <filename>" plus "git update-index <filename>" doesn't work? Well I _thought_ I tried git-update-index --remove and that hadn't worked. > > > 4) I repeat the question I asked in a thread above. What is the --merge > > switch on git-rebase actually do. The man page starts talking about > > merge strategies, but there already is a -s switch for that. > > "git rebase" uses "git format-patch" + "git-am --3way" machinery by > default. The --merge option makes it use merge machinery instead (similar > to the way "git checkout -m" uses merge strategy IIRC). Yes but ... ... what does that mean in usage terms? Why would I want to use one rather than the other? -- Alan Chandler http://www.chandlerfamily.org.uk - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html