Commit message (Expand) | Author | Age | |
---|---|---|---|
* | tests: merge-recursive is usable without Python | Junio C Hamano | 2006-10-27 |
* | rebase: allow --merge option to handle patches merged upstream | Eric Wong | 2006-06-25 |
* | Add a test for rebase when a change was picked upstream | Yann Dirson | 2006-01-08 |