3 - reset to what I dgit pushed most recently (6282cfd4)
4 - open =gitk --first-parent=
5 - ensure the git stash is poppable on top of the right commit
8 - from the "Update to upstream 2.9.7 commit" onwards, describe the commits
9 + mixture of packaging commits, patches to upstream, auto commits
10 + the top two commits pseudomerge over previous upload
11 + that happened because I only just switched this package to use
14 - note that in this example the patches do not appear at the end of
15 the history. This is because I did not debrebase before uploading.
17 - run: =git log --oneline v2.9.7..debian/2.9.7-1 -- . ':!debian'=
19 - we can see that there are four commits that change the upstream
20 source, i.e. we have a delta queue of length 4
22 - now: magit log on the file README.md to show how it's a completely
23 normal git log with the Debian commit on the top
25 - my goal for this demo here is to make a change to the upstream
26 source, and then rearrange the delta queue such that this change
27 appears second in the queue, right before the README decruft
28 + you might want to do this because you want to add other patches
29 that build on this one
31 - I prepared a commit to patch the upstream source and add a changelog
32 entry, I'll just pop it from my git stash stack
36 + =git commit -a -m "be more excited about helm"=
38 - refresh gitk and show the new mixed commit
40 - alright, now it's time to debrebase because things are a bit of a mess
42 + move the commit to the right place, =C-c C-c=
44 + count the five commits to upstream source and look at the change
46 + we now have two "be more excited by helm" commits
47 + and the auto commit of debian/patches has been stripped out
48 + and the delta queue is at the end of the branch
50 - from here, you can type =dgit push-source= to upload, and you will
51 get a =debian/patches= that exactly matches these five commits
53 - or if we need to push to salsa, =git debrebase conclude= will get us
54 something that is a fast-forward of what we had before
56 + git debrebase conclude
58 + now we see exactly what we had before =git debrebase conclude=
59 except it is a FF of what we had before, so we can push to salsa
63 - Check readability of gitk, term and Emacs -- might want to bump font sizes.