Age | Commit message (Expand) | Author |
---|---|---|
2008-08-24 | merge: fix numerus bugs around "trivial merge" area | Junio C Hamano |
2008-08-21 | "git-merge": allow fast-forwarding in a stat-dirty tree | Junio C Hamano |
2008-07-30 | Fix merge name generation in "merge in C" | Junio C Hamano |
2008-07-24 | Make non-static functions, that may be static, static | Stephan Beyer |
2008-07-22 | builtin-merge: add missing structure initialization | Pierre Habouzit |
2008-07-22 | 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-16 | Merge branch 'mv/merge-in-c' | Junio C Hamano |
2008-07-10 | Teach merge.log to "git-merge" again | Junio C Hamano |
2008-07-08 | Build in merge | Miklos Vajna |