diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:27:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:27:59 -0700 |
| commit | 2d984464c6be7ced6772a8dcf95d6a461a659a78 (patch) | |
| tree | ebde8778f17609acc0587524636ec4862c065ca9 /builtin/merge.c | |
| parent | Merge branch 'en/rebase-against-rebase-fix' (diff) | |
| parent | Implement automatic fast-forward merge for submodules (diff) | |
| download | tgif-2d984464c6be7ced6772a8dcf95d6a461a659a78.tar.xz | |
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
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions