diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-05-20 20:40:06 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-21 13:23:14 +0900 |
| commit | 65b5f9483eafea0ccdea59884da4e00e0cfeee1f (patch) | |
| tree | a6ffd68d8ba419391d7224d8ca3330ffbd0ad87f /builtin/merge.c | |
| parent | completion: reduce completable command list (diff) | |
| download | tgif-65b5f9483eafea0ccdea59884da4e00e0cfeee1f.tar.xz | |
Move declaration for alias.c to alias.h
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.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 9db5a2cf16..e3681cd850 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -34,6 +34,7 @@ #include "string-list.h" #include "packfile.h" #include "tag.h" +#include "alias.h" #define DEFAULT_TWOHEAD (1<<0) #define DEFAULT_OCTOPUS (1<<1) |