SpiritCroc
|
f6801a5be0
|
Revert "[TMP] merge_helpers.sh: Hardcode develop branch"
This reverts commit d13494aa67.
|
2022-12-15 11:02:24 +01:00 |
|
SpiritCroc
|
d13494aa67
|
[TMP] merge_helpers.sh: Hardcode develop branch
Change-Id: I3aecb7aae1d16b0f578a15b6271d2e66bc443cea
|
2022-12-15 10:38:32 +01:00 |
|
SpiritCroc
|
0e2de3eadb
|
merge_helpers.sh: Fix downstream_latest_tag if sc_v and sc_last are identical
Change-Id: I750b4ce873229de098988c5dbf94e0cfe6a57b82
|
2022-12-03 17:17:06 +01:00 |
|
SpiritCroc
|
c8c82d40dd
|
merge_helpers.sh: Fix downstream_latest_tag after introducing sc_last
Change-Id: I558633e54c445770ef9d99ce42286f208edbb15d
|
2022-11-29 09:19:15 +01:00 |
|
SpiritCroc
|
791766dce2
|
pre_merge.sh: tag last pre-merge commit
Change-Id: Iaf7ffada4c7cc77b85547e7b3c64aaa96e80b64b
|
2022-11-18 15:13:36 +01:00 |
|
SpiritCroc
|
f57dd91035
|
merge_helpers.sh: depend less on upstream tags
Change-Id: Ic79931eba7d501e4f76e5dd069921f9f3486f86c
|
2022-09-07 19:46:33 +02:00 |
|
SpiritCroc
|
c6c5b123d6
|
merge_helpers.sh: upstream_previous_tag: fix if merge not on sc
Change-Id: Ib13460fd12afec1c7aa69eee7a2a4ded1485ec8c
|
2021-10-06 09:14:57 +02:00 |
|
SpiritCroc
|
4803fbbc05
|
merge_helpers.sh: Allow restoring upstream files deleted downstream
Change-Id: Ib02d37f4c5e2414b04e5fdf6006e6e3c13f4827a
|
2021-09-11 10:01:11 +02:00 |
|
SpiritCroc
|
0389084cb6
|
merge_helpers.sh: upstream renamed master -> main
Change-Id: I7980f26bdc7f90399999d8b86536b92ca1683d10
|
2021-06-23 11:09:09 +02:00 |
|
SpiritCroc
|
5d7a1605da
|
merge_helpers.sh: Fix spaces for upstream_previous_tag
Change-Id: I669fd7e764419c9c78c15d7a3c5e5a6ce8af4af4
|
2021-04-12 16:01:39 +02:00 |
|
SpiritCroc
|
61e9bfce5b
|
pre_merge.sh: Fix when last merge was not tagged
Change-Id: Ib48f8369884a13b7556bb0c3a70c367a940028c9
|
2021-04-09 11:55:15 +02:00 |
|
SpiritCroc
|
f4d0993a2b
|
Enable semi-automatic correct_strings.sh-patching
Change-Id: I072f2ff71e862a1a140c8879754669f7231745c2
|
2021-02-21 10:35:55 +01:00 |
|
SpiritCroc
|
c30a9b8a57
|
Move restore_{sc,upstream} to merge_helpers.sh
Easier to use manually
Change-Id: Ieb87301e2b0b5d7e1299d3d0c8d49992d4cdde63
|
2020-12-22 09:15:42 +01:00 |
|
SpiritCroc
|
a51b44a40d
|
merge_helpers: allow adding extra args to revert_last
Change-Id: I5ef98b8130fe373d5a9f3d469140117c4570906e
|
2020-12-15 16:05:43 +01:00 |
|
SpiritCroc
|
da6547cedd
|
merge_helpers.sh: upstream_previous_tag: for previous downstream tag
Change-Id: I2204c727d825aa1f14e5051f607bb7ea8dc4b6e3
|
2020-12-12 14:30:20 +01:00 |
|
SpiritCroc
|
786660f3bd
|
merge_helpers.sh: downstream_latest_tag: Refer to HEAD instead of sc
Fix getting the best tag in detached head state, when sc is not
up-to-date.
Change-Id: I50294b9de3134815deef30a4b1c61da81721de89
|
2020-11-06 14:24:10 +01:00 |
|
SpiritCroc
|
096e046556
|
merge_helpers.sh: Introduce NO_REQUIRE_CLEAN_GIT env var
Change-Id: I278b39959c93d95869414ab00577953422057e28
|
2020-11-05 16:46:32 +01:00 |
|
SpiritCroc
|
97be4a5812
|
merge_helpers: add upstream_log
Change-Id: I368d2728ac6ba2538fd2fbcf61c5546e938dc641
|
2020-09-27 13:57:46 +02:00 |
|
SpiritCroc
|
8cba674d01
|
merge_helpers.sh: Fix some tagging logic
Change-Id: I81ae8acd49b8069b658b4cc5acfef0e9e2b35825
|
2020-09-10 11:11:22 +02:00 |
|
SpiritCroc
|
7d467d622a
|
Update merge helpers
Change-Id: I2da35a52c6f7209acc822c7fd878255df082bc52
|
2020-09-08 19:17:15 +02:00 |
|
SpiritCroc
|
cc2058a58c
|
Add merge_helpers.sh
Change-Id: Ia11bf326b360a9845c8df65d386c239b7b3eb414
|
2020-09-08 18:38:11 +02:00 |