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