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