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)
* 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

1  2 
cache.h
merge-recursive.c
path.c
refs.c
submodule.c
submodule.h

diff --cc cache.h
Simple merge
Simple merge
diff --cc path.c
Simple merge
diff --cc refs.c
Simple merge
diff --cc submodule.c
index 7f0da48bc25e086aa8dd55b5a6f7f9e54e66d41a,dcb4b5da7166c865d06d55014d650a35b4abb998..91a47587478ae0550be8f41c00cb1749c85834f4
@@@ -6,10 -6,7 +6,11 @@@
  #include "revision.h"
  #include "run-command.h"
  #include "diffcore.h"
+ #include "refs.h"
 +#include "string-list.h"
 +
 +struct string_list config_name_for_path;
 +struct string_list config_ignore_for_name;
  
  static int add_submodule_odb(const char *path)
  {
diff --cc submodule.h
Simple merge