Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'cc/revert-strategy' | Junio C Hamano | 2010-05-08 |
|\ | |||
| * | revert: add "--strategy" option to choose merge strategy | Christian Couder | 2010-04-01 |
| * | revert: refactor merge recursive code into its own function | Christian Couder | 2010-04-01 |
| * | revert: use strbuf to refactor the code that writes the merge message | Christian Couder | 2010-04-01 |
* | | cherry-pick: do not dump core when iconv fails | Jonathan Nieder | 2010-05-08 |
* | | Merge branch 'jn/merge-diff3-label' | Junio C Hamano | 2010-04-03 |
|\ \ | |/ | |||
| * | cherry-pick, revert: add a label for ancestor | Jonathan Nieder | 2010-03-20 |
| * | revert: clarify label on conflict hunks | Jonathan Nieder | 2010-03-20 |
* | | Merge branch 'cc/cherry-pick-ff' | Junio C Hamano | 2010-03-28 |
|/ | |||
* | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 |