Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merger: Handle merges with cherry-pick merge-mode | Joshua Watt | 2022-05-11 | 1 | -0/+7 |
Merges cannot be cherry-picked in git, so if a change is a merge, do a `git merge` instead of a cherry-pick to match how Gerrit will merge the change. Change-Id: I9bc7025d2371913b63f0a6723aff480e7e63d8a3 Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> |