diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-14 01:50:32 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-14 01:54:35 +0100 |
| commit | 4a164d48df6bb1b4a771741c63d4437fd2dca0bb (patch) | |
| tree | 73e3b0ca16e8ea83e9f761af476736c29b24caf9 /builtin.h | |
| parent | Merge branch 'jc/deprecate' (diff) | |
| parent | Allow in_merge_bases() to take more than one reference commits. (diff) | |
| download | git-4a164d48df6bb1b4a771741c63d4437fd2dca0bb.tar.xz git-4a164d48df6bb1b4a771741c63d4437fd2dca0bb.zip | |
Merge branch 'jc/merge-base' (early part)
This contains an evil merge to fast-import, in order to
resolve in_merge_bases() update.
Diffstat (limited to 'builtin.h')
| -rw-r--r-- | builtin.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -44,6 +44,7 @@ extern int cmd_ls_files(int argc, const char **argv, const char *prefix); extern int cmd_ls_tree(int argc, const char **argv, const char *prefix); extern int cmd_mailinfo(int argc, const char **argv, const char *prefix); extern int cmd_mailsplit(int argc, const char **argv, const char *prefix); +extern int cmd_merge_base(int argc, const char **argv, const char *prefix); extern int cmd_merge_file(int argc, const char **argv, const char *prefix); extern int cmd_mv(int argc, const char **argv, const char *prefix); extern int cmd_name_rev(int argc, const char **argv, const char *prefix); |