diff options
| author |  Derrick Stolee <dstolee@microsoft.com> | 2018-07-20 16:33:04 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-20 15:38:54 -0700 |
| commit | 6404355657fb3ec27668fb88c5175bb22aff3acc (patch) | |
| tree | fe54e41041c355ae014cb00d9e513be157a15ac9 /builtin/merge.c | |
| parent | commit-reach: move walk methods from commit.c (diff) | |
| download | tgif-6404355657fb3ec27668fb88c5175bb22aff3acc.tar.xz | |
commit.h: remove method declarations
These methods are now declared in commit-reach.h. Remove them from
commit.h and add new include statements in all files that require these
declarations.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index d1b547d973..4c601c40a2 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -36,6 +36,7 @@ #include "packfile.h" #include "tag.h" #include "alias.h" +#include "commit-reach.h" #define DEFAULT_TWOHEAD (1<<0) #define DEFAULT_OCTOPUS (1<<1) |