| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2008-08-20 | Fix "git-merge -s bogo" help text |  Junio C Hamano | 1 | -3/+11 |
| 2008-08-20 | "git-merge": allow fast-forwarding in a stat-dirty tree | Junio C Hamano | 1 | -1/+1 |
| 2008-07-30 | Fix merge name generation in "merge in C" | Junio C Hamano | 1 | -2/+2 |
| 2008-07-29 | builtin-merge: allow using a custom strategy |  Miklos Vajna | 1 | -7/+35 |
| 2008-07-23 | Make non-static functions, that may be static, static |  Stephan Beyer | 1 | -1/+1 |
| 2008-07-21 | builtin-merge: add missing structure initialization |  Pierre Habouzit | 1 | -0/+1 |
| 2008-07-21 | builtin-merge: give a proper error message for invalid strategies in config | Miklos Vajna | 1 | -25/+12 |
| 2008-07-20 | builtin-merge.c: Fix option parsing |  Michele Ballabio | 1 | -2/+3 |
| 2008-07-20 | Teach 'git merge' that some merge strategies no longer exist | Miklos Vajna | 1 | -2/+0 |
| 2008-07-15 | Merge branch 'mv/merge-in-c' | Junio C Hamano | 1 | -0/+1156 |
| 2008-07-10 | Teach merge.log to "git-merge" again | Junio C Hamano | 1 | -0/+2 |
| 2008-07-07 | Build in merge | Miklos Vajna | 1 | -0/+1153 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |
path: root/builtin-merge.c