diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 13:04:39 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 13:14:21 +0100 |
| commit | edc1cd049cfa01e7d6249ea199725d2448858704 (patch) | |
| tree | 19b33409c2401b5799a7a81dd573f09077b0eed1 /git-debrebase.1.pod | |
| parent | 1e87a7002be126e23144cd2b0a43271e522a75e7 (diff) | |
git-debrebase: Use git-deborig style upstream commitish finding
As discussed in email with Sean.
We could use git-deborig --just-print --version= but its error
handling is rather troublesome.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase.1.pod')
| -rw-r--r-- | git-debrebase.1.pod | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 4d4c85a..f17f1d6 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -142,7 +142,10 @@ The <upstream-details> are, optionally, in order: =item <upstream-commit-ish> The new upstream branch (or commit-ish). -Default is C<upstream>. +The default is to look for one of these tags, in this order: +U vU upstream/U; +where U is the new upstream version. +(This is the same algorithm as L<git-deborig(1)>.) It is a snag if the upstream contains a debian/ directory; if forced to proceed, |