chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: start 9.14
[dgit.git]
/
git-debrebase.1.pod
diff --git
a/git-debrebase.1.pod
b/git-debrebase.1.pod
index d1b4507fab135f63d4dd3ea694c40f1016715c16..639b07d2e6af4feb4b17a0b9720d6e08a222a774 100644
(file)
--- a/
git-debrebase.1.pod
+++ b/
git-debrebase.1.pod
@@
-14,7
+14,7
@@
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 # 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"
+ git debrebase
new-upstream 1.2.3-1 [-i]
# 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.
dpkg-buildpackage -uc -b # get test debs, at any time
To add patches, or edit the packaging, just make git commits.
@@
-129,11
+129,12
@@
You should consider using B<prepush> or B<conclude> instead.
=item git-debrebase scrap
Throws away all the work since the branch was last stitched.
=item git-debrebase scrap
Throws away all the work since the branch was last stitched.
-This is done by rewinding you to ffq-prev.
+This is done by resetting you to ffq-prev
+and discarding all working tree changes.
If you are in the middle of a git-rebase, will abort that too.
If you are in the middle of a git-rebase, will abort that too.
-=item git-debrebase new-upstream <new-version> [<upstream-details>...]
+=item git-debrebase new-upstream <new-version> [<upstream-details>...]
[--|-i <git-rebase options...>]
Rebases the delta queue
onto a new upstream version. In detail:
Rebases the delta queue
onto a new upstream version. In detail: