git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-15 09:08:42 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'master' into js/shallow

Browse Source 
This is to adjust to:

  count-objects -v: show number of packs as well.

which will break a test in this series.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-12-27 02:43:46 -08:00
parent 4bcb310c25 ae72f68541
commit 37818d7db0
226 changed files with 9285 additions and 6237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
commit.h
View File

@@ -114,4 +114,5 @@ extern int is_repository_shallow();
extern struct commit_list *get_shallow_commits(struct object_array *heads,
int depth, int shallow_flag, int not_shallow_flag);
int in_merge_bases(struct commit *rev1, struct commit *rev2);
#endif /* COMMIT_H */