Junio C Hamano d180419a63 Merge branch 'jc/fsck-reflog' into next ...

* 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

2006-12-20 17:22:34 -08:00

3.6 KiB

Raw Blame History

View Raw