Hi, On Wed, Aug 11, 2010 at 5:35 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > * en/rebase-against-rebase-fix (2010-08-06) 2 commits > - pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches > - t5520-pull: Add testcases showing spurious conflicts from git pull --rebase It looks like you pulled my original submission, despite the fact that you commented on v3 of the series. Granted, everything after v1 was just commit log wording changes and testsuite fixups, but I'll resend to make it easy for you to grab the latest. > * en/fast-export-fix (2010-07-17) 2 commits > - fast-export: Add a --full-tree option > - fast-export: Fix dropping of files with --import-marks and path limiting <snip> > * en/d-f-conflict-fix (2010-07-27) 7 commits > (merged to 'next' on 2010-08-03 at 7f78604) > + t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test > + fast-import: Improve robustness when D->F changes provided in wrong order > + fast-export: Fix output order of D/F changes > + merge_recursive: Fix renames across paths below D/F conflicts > + merge-recursive: Fix D/F conflicts > + Add a rename + D/F conflict testcase > + Add additional testcases for D/F conflicts Out of curiosity, is there anything preventing these two series from advancing? I was particularly hoping that the fix (first patch) in the en/fast-export-fix series would be applied to maint; Sverre seemed to agree -- http://article.gmane.org/gmane.comp.version-control.git/151046. If it's just time, I understand, I was just curious if there was anything I could or should do to help these series (or the new en/rebase-against-rebase-fix one) along. Thanks, Elijah -- 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