From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Aug 2010 06:27:59 +0000 (-0700)
Subject: Merge branch 'hv/submodule-find-ff-merge'
X-Git-Tag: v1.7.3-rc0~52
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2d984464c6be7ced6772a8dcf95d6a461a659a78;p=git.git

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

2d984464c6be7ced6772a8dcf95d6a461a659a78
diff --cc submodule.c
index 7f0da48bc,dcb4b5da7..91a475874
--- a/submodule.c
+++ b/submodule.c
@@@ -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)
  {