![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Aug 2010 06:27:59 +0000 (23:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Aug 2010 06:27:59 +0000 (23:27 -0700) | ||
| commit | 2d984464c6be7ced6772a8dcf95d6a461a659a78 | |
| tree | ebde8778f17609acc0587524636ec4862c065ca9 | tree | snapshot |
| parent | d25c72f7da5116f7b7a1f88a59d2bc14415a03b2 | commit | diff |
| parent | 68d03e4a6e448aa557f52adef92595ac4d6cd4bd | commit | diff |
Merge branch 'hv/submodule-find-ff-merge'
* hv/submodule-find-ff-merge:
Implement automatic fast-forward merge for submodules
setup_revisions(): Allow walking history in a submodule
Teach ref iteration module about submodules
Conflicts:
submodule.c
* hv/submodule-find-ff-merge:
Implement automatic fast-forward merge for submodules
setup_revisions(): Allow walking history in a submodule
Teach ref iteration module about submodules
Conflicts:
submodule.c
| cache.h | diff1 | | diff2 | | blob | history |
| merge-recursive.c | diff1 | | diff2 | | blob | history |
| path.c | diff1 | | diff2 | | blob | history |
| refs.c | diff1 | | diff2 | | blob | history |
| submodule.c | diff1 | | diff2 | | blob | history |
| submodule.h | diff1 | | diff2 | | blob | history |