diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-25 07:20:42 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-25 07:20:42 +0100 |
| commit | c3b21df9639ae811a7b8c436a34d558917526b47 (patch) | |
| tree | 96b68f3392b1a376bf487c53fafd3d215573ea36 /git-debrebase.1.pod | |
| parent | 839b666ac93688e2ef24c3fb7b1fbb0a0024bb33 (diff) | |
| parent | 97d91ead98b8c771271e1b6878b14db030932560 (diff) | |
Merge tag 'debian/9.5' into buster-bpo
dgit release 9.5 for unstable (sid) [dgit]
[dgit distro=debian no-split]
# gpg: Signature made Mon 22 Jul 2019 09:40:00 PM BST
# gpg: using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240
# gpg: Good signature from "Sean Whitton <spwhitton@spwhitton.name>" [ultimate]
# Primary key fingerprint: 8DC2 487E 51AB DD90 B5C4 753F 0F56 D055 3B6D 411B
# Subkey fingerprint: 9B91 7007 AE03 0E36 E4FC 248B 695B 7AE4 BF06 6240
Diffstat (limited to 'git-debrebase.1.pod')
| -rw-r--r-- | git-debrebase.1.pod | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index af6e364..d1b4507 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -1,21 +1,35 @@ =head1 NAME -git-debrebase - delta queue rebase tool for Debian packaging +git-debrebase - tool to maintain series of Debian changes to upstream source =head1 SYNOPSYS git-debrebase [<options...>] [-- <git-rebase options...>] git-debrebase [<options...>] <operation> [<operation options...> -=head1 INTRODUCTION +=head1 QUICK REFERENCE -git-debrebase is a tool for representing in git, -and manpulating, -Debian packages based on upstream source code. +These are most of the commands you will regularly need: + + git debrebase -i # edit the patch queue + git debrebase conclude && git push # push to eg salsa + git debrebase conclude && dgit push-source # source-only upload + git debrebase [-i] new-upstream 1.2.3-1 # uses tag, eg "v1.2.3" + dpkg-buildpackage -uc -b # get test debs, at any time + +To add patches, or edit the packaging, just make git commits. +Ignore anything that may appear in debian/patches. +Avoid using "git pull" and "git merge" without "--ff-only". + +git-debrebase has a special branch format, so see +"CONVERTING AN EXISTING PACKAGE" in L<dgit-maint-debrebase(7)>. + +=head1 GUIDE TO DOCUMENTATION This is the command line reference. -Please read the tutorial -L<dgit-maint-debrebase(7)>. +There is also a detailed workflow tutorial at +L<dgit-maint-debrebase(7)> +(on which the above "QUICK REFERENCE" is based). For background, theory of operation, and definitions see L<git-debrebase(5)>. @@ -619,6 +633,6 @@ The result is the laundered branch. =head1 SEE ALSO git-debrebase(1), -dgit-maint-rebase(7), +dgit-maint-debrebase(7), dgit(1), gitglossary(7) |