On Sun, May 11, 2008 at 10:17:26PM -0700, Sverre Hvammen Johansen <hvammen@xxxxxxxxx> wrote: > I am hereby sending an updated version of these patches as > attachments to this mail. The patch series consists of the > following six patches: > > 0001-Documentation-for-joining-more-than-two-histories.patch > 0002-New-merge-tests.patch > 0003-Introduce-ff-fast-forward-option.patch > 0004-Restructure-git-merge.sh.patch > 0005-Head-reduction-before-selecting-merge-strategy.patch > 0006-Introduce-fast-forward-option-only.patch > > The first patch add some documentation, for how git currently handles > merges where more than one remote is involved. The second patch add > some tests. The third, fifth, and sixth adds new features and they are all > trivial. The fourth patch computes the reduced parents but uses it only > to determine whether we are up-to-date or doing a fast forward. According to Documentation/SubmittingPatches, you should not attach patches, but send one email / patch with the patch inline. Just use git-send-email to do so. :)
Attachment:
pgpB4X18cLXvf.pgp
Description: PGP signature
