Commit 35f46cf
committed
no longer use native rebase to find commits
seems pointless & hacky to launch 2 rebases instead of finding the
commits ourselves & then only launching the rebase when appropriate
to do the actual rebasing.
because of stuff like hooks etc., it just doesn't feel right.
i don't know if there's stuff we're missing out on that native rebase
is better at, esp. w/ edge cases, but i suppose we'll have to find out.
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>1 parent b2f9b72 commit 35f46cf
1 file changed
+13
-12
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
258 | 258 | | |
259 | 259 | | |
260 | 260 | | |
261 | | - | |
262 | | - | |
263 | | - | |
264 | | - | |
265 | | - | |
266 | | - | |
267 | | - | |
268 | | - | |
269 | | - | |
270 | | - | |
271 | | - | |
272 | | - | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
273 | 273 | | |
274 | 274 | | |
275 | 275 | | |
| |||
970 | 970 | | |
971 | 971 | | |
972 | 972 | | |
| 973 | + | |
973 | 974 | | |
974 | 975 | | |
975 | 976 | | |
| |||
0 commit comments