| commit | fde4a19b5e116bf6b6add1747d36ffe5d31a61d4 | [log] [tgz] |
|---|---|---|
| author | Skyler Grey <minion@clicks.codes> | Fri May 24 23:24:22 2024 +0000 |
| committer | Skyler Grey <minion@clicks.codes> | Sat May 25 17:57:54 2024 +0000 |
| tree | 57b8a436309c9f8bce63560cd46db6d8d4cdbac9 | |
| parent | 1bf9e19f969d7da7ec6ec99cbae7eaeb3df3f513 [diff] |
feat(git): enable rebase.updateRefs updateRefs automatically updates branch references when we rebase. As we use rebase a lot, this is pretty helpful for avoiding old commits being referenced in random places See also this Git documentation: - https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---update-refs And this blog post: - https://andrewlock.net/working-with-stacked-branches-in-git-is-easier-with-update-refs/ Change-Id: I7fedae4926097142545ae03dea21a10cb41909d9 Reviewed-on: https://git.clicks.codes/c/Chimera/NixFiles/+/702 Tested-by: Skyler Grey <minion@clicks.codes> Reviewed-by: Samuel Shuert <coded@clicks.codes>
diff --git a/modules/home/git/default.nix b/modules/home/git/default.nix index 918ec79..6b80781 100644 --- a/modules/home/git/default.nix +++ b/modules/home/git/default.nix
@@ -69,7 +69,8 @@ if config.chimera.git.gpg.push then "if-asked" else false ); }; - pull.rebase = "merges"; + pull.rebase = "merges"; + rebase.updateRefs = true; url = { "ssh://git@github.com/".pushInsteadOf = "https://github.com/"; "ssh://${config.chimera.git.auth.clicksUsername}@ssh.clicks.codes:29418/".pushInsteadOf = "https://git.clicks.codes/";