![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 11 Mar 2008 09:05:12 +0000 (02:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 11 Mar 2008 09:05:12 +0000 (02:05 -0700) | ||
| commit | 5d921e2931e5041884d8f86fdccc9004a7b071cc | |
| tree | deedbb6c40af5a3cceedf01ce0f315217a39fa16 | tree | snapshot |
| parent | 1c536069780bc67c05e621f0485f787d04559f24 | commit | diff |
| parent | 8177631547e4d10ae071def07eff83e056092bfa | commit | diff |
Merge branch 'jc/cherry-pick' (early part)
* 'jc/cherry-pick' (early part):
expose a helper function peel_to_type().
merge-recursive: split low-level merge functions out.
Conflicts:
Makefile
builtin-merge-recursive.c
sha1_name.c
* 'jc/cherry-pick' (early part):
expose a helper function peel_to_type().
merge-recursive: split low-level merge functions out.
Conflicts:
Makefile
builtin-merge-recursive.c
sha1_name.c
| Makefile | diff1 | | diff2 | | blob | history |
| builtin-merge-recursive.c | diff1 | | | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| sha1_name.c | diff1 | | diff2 | | blob | history |