diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-10 01:22:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-10 01:22:42 -0800 |
| commit | 7be2b6e02b4f2a1b4812764f65b12cafb11a934e (patch) | |
| tree | c94ad7eb3a4d478a1c71eb6ef0aaf1c0f7348660 /commit.h | |
| parent | c07a07c588fea82c2426d795a75324b3035c0a71 (diff) | |
| parent | 591aa2536fdbc4090ba8d4ca512d4ee7df4bf05d (diff) | |
| download | git-7be2b6e02b4f2a1b4812764f65b12cafb11a934e.tar.gz | |
Merge branch 'master' into cc/help
This is to primarily pull in MANPATH tweak and help.txt formatting fix
from the master branch.
Diffstat (limited to 'commit.h')
| -rw-r--r-- | commit.h | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -113,8 +113,7 @@ extern struct commit_list *get_shallow_commits(struct object_array *heads, int in_merge_bases(struct commit *, struct commit **, int); -extern int interactive_add(void); -extern void add_files_to_cache(int verbose, const char *prefix, const char **files); +extern int interactive_add(int argc, const char **argv, const char *prefix); extern int rerere(void); static inline int single_parent(struct commit *commit) |