From: Junio C Hamano <junkio@cox.net>
Date: Wed, 1 Mar 2006 09:33:23 +0000 (-0800)
Subject: Merge branch 'cvsserver' of http://locke.catalyst.net.nz/git/git-martinlanghoff;... 
X-Git-Tag: v1.3.0-rc1~54^2~21
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6ecc321ba5d8f89a8dd0a9a11d264d03ab624dc1;p=git.git

Merge branch 'cvsserver' of locke.catalyst.net.nz/git/git-martinlanghoff; branch 'master' into next

Conflicts:

	Documentation/git-cvsserver.txt
	git-cvsserver.perl

Originally Martin's tree was based on "next", which meant that all
the other things that I am not ready to push out to "master" were
contained in it.  His changes looked good, and I wanted to have them
in "master".

So, here is what I did:

 - fetch Martin's tree into a temporary topic branch.
   $ git fetch $URL $remote:ml/cvsserver
   $ git checkout ml/cvsserver

 - rebase it on top of "master".
   $ git rebase --onto master next

 - pull that master into "next", recording Martin's head as well.
   $ git pull --append . master

Since I have apply.whitespace=strip in my configuration file, the
rebased cvsserver changes have trailing whitespaces introduced by
Martin's tree cleansed out.  Hence the above conflicts.

The reason I made this octopus is to make sure that next time Martin
pulls from my "next" branch, it results in a fast forward.  There is
no reason to force him do the same conflict resolution I did with this
merge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

6ecc321ba5d8f89a8dd0a9a11d264d03ab624dc1