[Aptitude-devel] Rebasing published software and avoid git revert/merge

[Russ Allbery]

Axel Beckert <abe at debian.org> writes:
> Daniel Hartwig wrote:

>> For historical reasons, aptitude is a non-native package.  We have a
>> combined gbp and upstream setup at the moment:
>> 
>> - master (“upstream” development)
>> - upstream (merged from master via git-import-orig)

> "merged" not in the sense of merging the branch but in the sense of
> reimporting it, right? At least I don't see an git-import-orig option
> which allows "upstream-source" to be a git branch.

git-import-orig --upstream-vcs-tag.  It's great.  :)  I use it for all my
projects where upstream is also using Git.

-- 
Russ Allbery (rra at debian.org)               <http://www.eyrie.org/~eagle/>