tree fe949e15582b1b986133c8ec8f85b25bb9904747
parent 4fa81474ca684014840f6ba20d840d6ac2278d54
author Tim Zimmermann <tim@linux4.de> 1657135401 +0200
committer Tim Zimmermann <tim@linux4.de> 1657135403 +0200
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEuwYxAyE4TRnuhLgPbcIaY/gZxe8FAmLF4UUACgkQbcIaY/gZ
 xe9lEw/9FyavBrQ5BFztP5oghUNsMSaNCAmTO62sR4X59iqgSJ77/oDjGcLgihA4
 igbvjchnes1Q1omWU3dVNh/kKIKxE1dhM0o3KN1VBA+NVXLj/heIxsYLH99Xvz1G
 QWbyK9a3Oak9Zbf0a//AIsOagaOGJjEyPLIw1PaLXHCd12U1e4HxvO1lKFkJHjJT
 0xpzfeK7qmxlf5dHRZxUErd595bJ6Ie/wj9Wou65pX8pyTRBzm1TgfYiAtTUtK4k
 66+xho3h3cK5A7Hi70XOROesYHoe2XiOaVzGUoW3MHxbga5dFSG0oATGk5v1OqCt
 YXYuka0JLDLy2K5x8+Srff8qtIis0k/9EknPmmig/uQ1G3GB02uJspotATGfZ1nO
 inlDG+bywWt9nIQeaZoz98khkO+OKzQiFXkWniwv/FUhSg4im6/YlaKhgVafjZtA
 Tg4Rtz8bDQiJeOX8QP5kcoxqsQJck/snqm0Hr4py9yo0APD7hBoD6s5chRXHEa7Q
 iKd3/8p2gBCvjrArq13yHSic2+5RXvAVJ1mO73UR9hJ18+PXdy1K4cpv0Qrwkqxz
 U5LViFucqCA3Ivy9oFWHlzrLR6lHK+lDL9FYclIdlSxi3QSXeiAdJeWUFvgMZtwd
 x4p4pIUJP6PAlsn1/wU5YGbEf+QXaMC0/RLDLMIy4Ls6kmvj0QA=
 =W7G9
 -----END PGP SIGNATURE-----

scripts: aosp-merger: Stop using --no-edit

* When using this with --log sometimes the line
  between last log line and Change-Id is removed
  causing git to add another Change-Id when picking
  the squash

Change-Id: I0ca5ac24bdf3c05ddfe445c361c88060da13fc1a