Commit message (Expand) | Author | Files | Lines | |
---|---|---|---|---|
2010-08-27 | merge-recursive: options to ignore whitespace changes | Justin Frankel | 3 | -0/+207 |
2010-08-26 | merge-recursive --patience | Justin Frankel | 6 | -0/+14 |
2010-08-26 | ll-merge: replace flag argument with options struct | Jonathan Nieder | 7 | -66/+104 |
2010-08-26 | merge-recursive: expose merge options for builtin merge | Jonathan Nieder | 4 | -31/+26 |
2010-08-06 | merge-recursive --renormalize | Jonathan Nieder | 8 | -8/+45 |
2010-08-06 | rerere: never renormalize | Jonathan Nieder | 1 | -6/+5 |
2010-08-06 | rerere: migrate to parse-options API | Jonathan Nieder | 2 | -24/+119 |
2010-08-06 | t4200 (rerere): modernize style | Jonathan Nieder | 1 | -125/+180 |
2010-08-06 | ll-merge: let caller decide whether to renormalize | Jonathan Nieder | 5 | -8/+19 |
2010-08-06 | ll-merge: make flag easier to populate | Jonathan Nieder | 4 | -9/+28 |