From 982d6ae6123195c0c38f1f65354c41f4133f8e59 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 24 Aug 2018 21:42:59 +0100 Subject: [PATCH] git-debrebase(5): Warn against renaming branch while unstitched Signed-off-by: Ian Jackson --- git-debrebase.5.pod | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index 751529e1..f641a70f 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -527,6 +527,21 @@ If you add patches your work is likely to be discarded. Instead of editing patches, use git-debrebase to edit the corresponding commits. +=item Renaming (etc.) branch while unstitched + +The previous HEAD, +which will be pseudomerged over +by operations like git-debrebase stitch, +is recorded in a ref name dervied from your branch name. + +If you rename unstitched branches, +this information can get out of step. + +Conversely, +creating a new branch from an unstitched branch +is good for making a branch to play about in, +but the result cannot be stitched. + =back =head1 COMMIT MESSAGE ANNOTATIONS -- 2.30.2