From 4b2c939e725b18b1432617c19aa19ca862cc74de Mon Sep 17 00:00:00 2001 From: Henry Webel Date: Thu, 13 Nov 2025 11:26:31 +0100 Subject: [PATCH 1/6] :art: show instructions more detailed --- instructions_251105.md | 43 +++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/instructions_251105.md b/instructions_251105.md index 2c06f50..49e6cca 100644 --- a/instructions_251105.md +++ b/instructions_251105.md @@ -174,20 +174,41 @@ Common actions during interactive rebase: It will look something similar to this (taken from the tutorial linked above): ```bash -pick 2231360 some old commit -pick ee2adc2 Adds new feature +pick 1ad9716 Added brandade croquettes (#58) +pick d5c6d74 :memo: description +pick c55c98c :art: enumerate instructions as steps for recipe +pick a0b894b 🚧 fix local git issues using git mv - -# Rebase 2cf755d..ee2adc2 onto 2cf755d (9 commands) +# Rebase c0dd3ef..a0b894b onto c0dd3ef (4 commands) # # Commands: -# p, pick = use commit -# r, reword = use commit, but edit the commit message -# e, edit = use commit, but stop for amending -# s, squash = use commit, but meld into previous commit -# f, fixup = like "squash", but discard this commit's log message -# x, exec = run command (the rest of the line) using shell -# d, drop = remove commit +# p, pick = use commit +# r, reword = use commit, but edit the commit message +# e, edit = use commit, but stop for amending +# s, squash = use commit, but meld into previous commit +# f, fixup [-C | -c] = like "squash" but keep only the previous +# commit's log message, unless -C is used, in which case +# keep only this commit's message; -c is same as -C but +# opens the editor +# x, exec = run command (the rest of the line) using shell +# b, break = stop here (continue rebase later with 'git rebase --continue') +# d, drop = remove commit +# l, label