Age | Commit message (Expand) | Author |
---|---|---|
2010-05-09 | Merge branch 'cc/revert-strategy' | Junio C Hamano |
2010-05-08 | cherry-pick: do not dump core when iconv fails | Jonathan Nieder |
2010-04-03 | Merge branch 'jn/merge-diff3-label' | Junio C Hamano |
2010-04-01 | 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-03-29 | Merge branch 'cc/cherry-pick-ff' | Junio C Hamano |
2010-03-21 | cherry-pick, revert: add a label for ancestor | Jonathan Nieder |
2010-03-21 | revert: clarify label on conflict hunks | Jonathan Nieder |
2010-02-22 | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds |