Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Eric Wong <normalperson@xxxxxxxx> writes:
>
> > Thomas Rast <trast@xxxxxxxxxxxxxxx> wrote:
> >> git-svn has the following rule to detect the SVN base for its
> >> operations: find the first git-svn-id line reachable through
> >> first-parent ancestry. IOW,
> >>
> >> git log --grep=^git-svn-id: --first-parent -1
> >>
> >> Document this, as it is very important when using merges with git-svn.
> >>
> >> Signed-off-by: Thomas Rast <trast@xxxxxxxxxxxxxxx>
> >
> > Thanks Thomas,
> >
> > Acked-by: Eric Wong <normalperson@xxxxxxxx>
>
> Thanks; is it a good time to pull from your bogomips repository to get
> accumulated changes?
Now is, I just pushed to it:
Eric Wong (3):
git svn: read global+system config for clone+init
git svn: add authorsfile test case for ~/.gitconfig
git svn: attempt to create empty dirs on clone+rebase
Thomas Rast (1):
Document git-svn's first-parent rule
Toby Allsopp (1):
git svn: handle SVN merges from revisions past the tip of the branch
HEAD=ce45a45f24cc7b3ccc7f6ebcd0025559b4421bda
--
Eric Wong
--
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