Commit Graph

8 Commits

Author SHA1 Message Date
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