* In case one is using an external diff program
such as difftastic, this won't work as expected
* thread 'main' panicked at 'Hunk lines should be present in matched lines', /home/$USER/.cargo/registry/src/github.com-1ecc6299db9ec823/difftastic-0.37.0/src/display/hunks.rs:637:31
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
fatal: external diff died, stopping at core/Makefile
Change-Id: Ie455016fa24b6e00ea021088cc5fc1e4bca3bf94
* Handles "Already up to date." merge being registered as "merge"
instead of "nochange" in merged_repos.txt
Change-Id: I6e73013aa5c30a17f150a444b16365c39cf4280e
* There might be conflicting tags due to subtree use in device
and kernel repositories, preventing the actual merge from happening.
Change-Id: I96d6421b2e8675fc898e28b57e2f948c9db2c27c
* Useful to find differences and potential missing commits
between AOSP tags with different ancestor on repositories
that we have not forked.
One example is this month, switching from Pixel 6
December 2021 tag to qcom Pixel January 2022 tag.
Change-Id: Ib5bafd50c20375368255ad9bbb8ca702c3361652
* This makes repositories end up with inconsistent
git history, requiring force push at some cases.
Just merge normally, if there are no changes we
are going to handle it in a cleaner way.
Change-Id: Ida69e91c1881c52dc6d805a07d870d9fe26d6279
* Merge and commit separately,
to get newline between commit content and Change-Id
* Install prepare-commit-msg git hook, for nicer conflict messages
https://gist.github.com/mikeNG/e55ef8e7a1e5cd596a950386503054fd/
Change-Id: I97370b352ccf4f146b4b6ea89af75e032fb13730
* This script can be used by other callers to merge individual repos
* Get branch name from our variables
* Don't repo sync -d, it removes any local changes we made to merge
scripts. Let's just manually sync before running this script.
Change-Id: I7ddfbfd934908e4a72fc2742753b4c704fa6c5e3
