]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d25c72f 68d03e4)
Merge branch 'hv/submodule-find-ff-merge'
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:27:59 +0000 (23:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:27:59 +0000 (23:27 -0700)
commit2d984464c6be7ced6772a8dcf95d6a461a659a78
treeebde8778f17609acc0587524636ec4862c065ca9tree | snapshot
parentd25c72f7da5116f7b7a1f88a59d2bc14415a03b2commit | diff
parent68d03e4a6e448aa557f52adef92595ac4d6cd4bdcommit | 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
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
Unnamed repository; edit this file 'description' to name the repository.