Tree
- Tree:
678b258500cf4c971333af448fa26c5c71d1b8e7
- Date:
- Message:
- make 'got rebase' find a merge base with topological sorting if needed Fixes a problematic case of spurious conflicts encountered by naddy@ on landry's firefox package git repository. The current implementation of toposort is expensive, so this might make rebase appear to run slowly on large repositories. However, this is better than letting users deal with spurious conflicts. ok op@
Makefile | commits | blame |
path_test.c | commits | blame |