Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2010-05-08 | Merge branch 'cc/revert-strategy' | Junio C Hamano | 1 | -74/+105 |
2010-05-08 | cherry-pick: do not dump core when iconv fails | Jonathan Nieder | 1 | -2/+7 |
2010-04-03 | Merge branch 'jn/merge-diff3-label' | Junio C Hamano | 1 | -39/+64 |
2010-04-01 | revert: add "--strategy" option to choose merge strategy | Christian Couder | 1 | -2/+23 |
2010-04-01 | revert: refactor merge recursive code into its own function | Christian Couder | 1 | -48/+58 |
2010-04-01 | revert: use strbuf to refactor the code that writes the merge message | Christian Couder | 1 | -36/+34 |
2010-03-28 | Merge branch 'cc/cherry-pick-ff' | Junio C Hamano | 1 | -4/+42 |
2010-03-20 | cherry-pick, revert: add a label for ancestor | Jonathan Nieder | 1 | -1/+4 |
2010-03-20 | revert: clarify label on conflict hunks | Jonathan Nieder | 1 | -39/+62 |
2010-02-22 | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 1 | -0/+460 |