[title slide]

Hi.

[context slide]

Sean Whitton and I are here to present a new git workflow tool for
Debian packaging.  It's primarily intended for Debian package
maintainers.  It's an alternative to gbp pq and to git-dpm.

Before I get tell you all about it I need to show where it fits into
the ecosystem of Debian package management software.  On this slide we
have you, the maintainer, on the left.  On the right we have the
Debian repositories.

You may have heard me plugging dgit once or twice.  You should all use
dgit!  dgit push publishes your git history so Debian's users can use
it!  But, that's not actually what I am here to talk about today.
git-debrebase does not need dgit, and dgit does not need
git-debrebase.

git-debrebase is a tool to help manage your git branch containing the
Debian version of a package you maintain.  git-debrebase helps you
maintain a useful git branch with the contents you need (for building
and uploading).

It maintains your Debian delta queue - that is, that is, the changes
you make, for Debian, to the upstream parts of the package - as a
series of commits.

[usps slide]

You can git commit -m fixup! and git commit -m squash!
| always, unlike gbp pq

You can git-am and git-cherry-pick upstream patches
| always, unlike gbp pq

You may make mixed commits touching debian/ and upstream files
| unlike any other Debian delta queue workflow

There is no need to ever use quilt

There is no in-tree metadata to get out of date
| unlike git-dpm

Your working tree is never dirtied by your tools
| unlike gbp pq

There is no need to switch branches or switch views
| unlike gbp pq

Your working tree is always buildable, in-tree, with dpkg-buildpackage, debuild, git-buildpackage, etc.
| unlike gbp pq

You can mostly ignore the `3.0 (quilt)' source package format

During development you do not need any orig tarballs;
they are only needed when actually uploading to Debian.

The Debian delta queue is managed using a standard git-rebase workflow.

git-log and git-blame on upstream files show the real upstream history
followed by your delta queue commits, as expected.

git-log and git-blame on debian/ files show your packaging history.

You don't need to edit diffs, or read diffs of diffs.
Instead, you edit commits the standard git way.