3 dgit - tutorial for package maintainers of Debian-native packages
7 This document describes elements of a workflow for maintaining a
8 native Debian package using B<dgit>.
14 We expect that your git history is fast-forwarding.
18 You should be prepared to tolerate a small amount of
19 ugliness in your git history
20 in the form of merges which stitch
21 the dgit-generated archive view
22 into your maintainer history.
24 This is to handle uploads that were not made with dgit,
25 such as the uploads you made before switching to this workflow,
36 Benefit from dgit's safety catches. In particular, ensure that your
37 upload always matches exactly your git HEAD.
43 to downstream dgit users.
47 Incorporate an NMU with one command.
51 =head1 FIRST PUSH WITH DGIT
53 You do not need to do anything special to your tree
56 Simply prepare your git tree in the usual way, and then:
60 % dgit -wgf sbuild -A -c sid
61 % dgit -wgf --overwrite push
65 (Do not make any tags yourself: dgit push will do that.)
67 The --overwrite option tells dgit that you are expecting
68 that your git history is not a descendant of the
69 history which dgit synthesised from the previous
72 dgit will make a merge commit
74 but without making any code changes
77 which will be pushed to the dgit git server,
78 is fast forward from the dgit archive view.
80 =head1 SUBSEQUENT PUSHES
90 =head1 INCORPORATING AN NMU
100 Or, if you would prefer to review the changes,
106 % dgit diff HEAD..dgit/dgit/sid
110 If you do not merge the NMU into your own git history,
111 the next push will then require I<--overwrite>.