[Pkg-samba-maint] (forw) [Samba] [Announce] Samba 4.0.6 Available for Download

[Jeroen Dekkers]

At Tue, 21 May 2013 18:12:58 +0200,
Christian PERRIER wrote:
> That seems to be a good opportunity to document the "merge new
> upstream version" process into git.
> 
> Of course, "git-import-orig" will certainly do the job, but wouldn't
> there be a possibility to "link" to upstream's git and merge the
> difference from there?

You can do that with the --upstream-vcs-tag option of git-import-orig:

http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.UPSTREAM-GIT

Russ Allbery describes how it works in a bit more detail on his blog:

http://www.eyrie.org/~eagle/journal/2013-04/001.html