diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-11-08 00:39:37 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-11-08 00:39:37 +0000 |
| commit | e1026645bc6576b9b0f4c20e59b5f785c125aff2 (patch) | |
| tree | c5b831b394361acf37090bb59a7c360433e065a9 | |
| parent | 8521ee9155c24772c1cc0c3c8b6fa00d7d742e2d (diff) | |
git-debrebase: Provide convert-from-unapplied aa alias for -gbp
Closes: #905433.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rwxr-xr-x | git-debrebase | 1 | ||||
| -rw-r--r-- | git-debrebase.1.pod | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index fee793c..829ab82 100755 --- a/git-debrebase +++ b/git-debrebase @@ -2537,6 +2537,7 @@ sub complete_convert_from ($$$$) { update_head_checkout $old_head, $new_head, $mrest; } +sub cmd_convert_from_unapplied () { cmd_convert_from_gbp(); } sub cmd_convert_from_gbp () { badusage __ "want only 1 optional argument, the upstream git commitish" unless @ARGV<=1; diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index a964180..00b664b 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -254,6 +254,8 @@ If the problem is simply that the existing patches were not made by git-debrebase, using dgit quilt-fixup instead should succeed. +=item git-debrebase convert-from-unapplied [<upstream-commit-ish>] + =item git-debrebase convert-from-gbp [<upstream-commit-ish>] Cnnverts any of the following into a git-debrebase interchange branch: @@ -277,6 +279,8 @@ so there are no patches =back +(These two commands operate identically and are simply aliases.) + The conversion is done by generating a new anchor merge, converting any quilt patches as a delta queue, and dropping the patches from the tree. |