global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 02:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/fsck-reflog' into next

Browse Source 
* jc/fsck-reflog:
  git reflog expire
  Move in_merge_bases() to commit.c
  reflog: fix warning message.
  Teach git-repack to preserve objects referred to by reflog entries.
  Protect commits recorded in reflog from pruning.
  add for_each_reflog_ent() iterator
  diff documentation: mostly talk about <commit>
  compat/inet_ntop: do not use u_int
  git-add: error out when given no arguments.

Conflicts:

	commit.h
This commit is contained in:
Junio C Hamano
2006-12-20 17:22:34 -08:00
parent 545bc00371 4264dc15e1
commit d180419a63
17 changed files with 333 additions and 35 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 */