| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge: fix numerus bugs around "trivial merge" area | Junio C Hamano | 2008-08-23 | 1 | -7/+9 |
| * | "git-merge": allow fast-forwarding in a stat-dirty tree | Junio C Hamano | 2008-08-20 | 1 | -1/+1 |
| * | Fix merge name generation in "merge in C" | Junio C Hamano | 2008-07-30 | 1 | -2/+2 |
| * | Make non-static functions, that may be static, static | Stephan Beyer | 2008-07-23 | 1 | -1/+1 |
| * | builtin-merge: add missing structure initialization | Pierre Habouzit | 2008-07-21 | 1 | -0/+1 |
| * | builtin-merge: give a proper error message for invalid strategies in config | Miklos Vajna | 2008-07-21 | 1 | -25/+12 |
| * | builtin-merge.c: Fix option parsing | Michele Ballabio | 2008-07-20 | 1 | -2/+3 |
| * | Teach 'git merge' that some merge strategies no longer exist | Miklos Vajna | 2008-07-20 | 1 | -2/+0 |
| * | Merge branch 'mv/merge-in-c' | Junio C Hamano | 2008-07-15 | 1 | -0/+1 |
| * | Teach merge.log to "git-merge" again | Junio C Hamano | 2008-07-10 | 1 | -0/+2 |
| * | Build in merge | Miklos Vajna | 2008-07-07 | 1 | -0/+1153 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/builtin-merge.c