author | Junio C Hamano <junkio@cox.net> | |
Wed, 25 Oct 2006 20:29:12 +0000 (13:29 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 25 Oct 2006 20:29:12 +0000 (13:29 -0700) |
1 | 2 | |||
---|---|---|---|---|
.gitignore | patch | | diff1 | | diff2 | | blob | history |
Makefile | patch | | diff1 | | diff2 | | blob | history |
builtin.h | patch | | diff1 | | diff2 | | blob | history |
git.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge
diff --cc builtin.h
index 4ac32d7780f3ebaf0bd91b639ed4781a8ab9d0e4,37915bce4faeab22294b1f3d102c85271161117b..708a2f22e8b14f337a0829c53c47e57393c4ee75
+++ b/builtin.h
extern int cmd_rev_list(int argc, const char **argv, const char *prefix);
extern int cmd_rev_parse(int argc, const char **argv, const char *prefix);
extern int cmd_rm(int argc, const char **argv, const char *prefix);
- extern int cmd_show_branch(int argc, const char **argv, const char *prefix);
+extern int cmd_runstatus(int argc, const char **argv, const char *prefix);
extern int cmd_show(int argc, const char **argv, const char *prefix);
+ extern int cmd_show_branch(int argc, const char **argv, const char *prefix);
extern int cmd_stripspace(int argc, const char **argv, const char *prefix);
extern int cmd_symbolic_ref(int argc, const char **argv, const char *prefix);
extern int cmd_tar_tree(int argc, const char **argv, const char *prefix);
diff --cc git.c
Simple merge