Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | revert: refactor merge recursive code into its own function | Christian Couder | 2010-04-01 | 1 | -48/+58 |
* | revert: use strbuf to refactor the code that writes the merge message | Christian Couder | 2010-04-01 | 1 | -36/+34 |
* | cherry-pick, revert: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -1/+4 |
* | revert: clarify label on conflict hunks | Jonathan Nieder | 2010-03-20 | 1 | -39/+62 |
* | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 | 1 | -0/+460 |