diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-24 21:42:59 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-24 21:43:16 +0100 |
| commit | 982d6ae6123195c0c38f1f65354c41f4133f8e59 (patch) | |
| tree | aa8d7cd72de29cac8eb20026b2b5bad6bcad87b9 /git-debrebase.5.pod | |
| parent | b9ef2453ea950bd60ddb52e2253cdf762f34534d (diff) | |
git-debrebase(5): Warn against renaming branch while unstitched
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase.5.pod')
| -rw-r--r-- | git-debrebase.5.pod | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index 751529e..f641a70 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 |