#3088 PR merged
: Update SSH_ROOT_PASSWORD in example.conf files¶
Labels: enhancement
, documentation
, fixed / solved / done
jsmeix opened issue at 2023-11-21 12:42:¶
In example.conf files use
{ SSH_ROOT_PASSWORD='...' ; } 2>>/dev/$SECRET_OUTPUT_DEV
(i.e. with SECRET_OUTPUT_DEV)
jsmeix commented at 2023-11-21 12:51:¶
@rear/contributors
unless there are objections
I would like to merge it tomorrow afternoon.
jsmeix commented at 2023-11-22 13:12:¶
@pcahyna
thank you for your sharp-sighted review!
jsmeix commented at 2023-11-22 16:06:¶
@pcahyna
ah - yes - thank you for the hint about squashing commits.
I like to be able to see the history how things were developed
(and the overall result is visible in the merge commit)
so normally I don't like squashing commits so that
I am not used to think about squashing commits.
But in this case it would be better to squash them.
jsmeix commented at 2023-11-22 16:08:¶
This was my very first try to use "Squash and merge"
in the GitHub web frontend - let's see what the result is...
jsmeix commented at 2023-11-22 16:11:¶
...ah!
https://github.com/rear/rear/commit/7c5c9bc83db5202fb515cbaa803efcd18d9fcd1e
shows me that I also have to manually squash the merge commit message.
Next time I (hopefully) remember that and do better.
pcahyna commented at 2023-11-23 14:57:¶
...ah! 7c5c9bc shows me that I also have to manually squash the merge commit message. Next time I (hopefully) remember that and do better.
@jsmeix I usually squash only commits that I need manually using
git rebase --interactive --autosquash
and I force push. This allows me
to squash only commits that I want to have squashed and adjust the
commit messages. For example, in this case, I would have squashed both
commits Update SLE11-SLE12-SAP-HANA-UEFI-example.conf together, both
Update SLE12-SP1-btrfs-example.conf commits together etc. but maybe not
all commits together.
[Export of Github issue for rear/rear.]