| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2010-08-18 | merge script: handle -m --log correctly |  Jonathan Nieder | 1 | -4/+10 |
| 2010-08-18 | merge script: forbid merge -s index | Jonathan Nieder | 1 | -0/+5 |
| 2010-08-18 | merge script: allow custom strategies | Jonathan Nieder | 1 | -2/+6 |
| 2010-08-18 | merge script: merge -X<option> | Jonathan Nieder | 1 | -1/+7 |
| 2010-08-18 | merge script: improve log message subject | Jonathan Nieder | 1 | -8/+19 |
| 2010-08-18 | merge script: refuse to merge during merge | Jonathan Nieder | 1 | -0/+3 |
| 2010-08-18 | merge script: tweak unmerged files message to match builtin | Jonathan Nieder | 1 | -1/+1 |
| 2010-08-18 | merge script: --squash, --ff from unborn branch are errors | Jonathan Nieder | 1 | -0/+4 |
| 2010-01-17 | git merge -X<option> |  Avery Pennarun | 1 | -1/+2 |
| 2009-10-24 | Use 'fast-forward' all over the place |  Felipe Contreras | 1 | -4/+4 |
| 2008-07-16 | Merge branch 'sb/dashless' |  Junio C Hamano | 1 | -2/+2 |
| 2008-07-07 | Build in merge |  Miklos Vajna | 1 | -0/+554 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |