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

* jc/fsck-reflog:
  Don't crash during repack of a reflog with pruned commits.
  Introduce a global level warn() function.
  Rename imap-send's internal info/warn functions.
  _XOPEN_SOURCE problem also exists on FreeBSD
  parse-remote: mark all refs not for merge only when fetching more than one
  git-reset --hard: tell the user what the HEAD was reset to
  git-tag: support -F <file> option
  Revert "git-pull: refuse default merge without branch.*.merge"
  Suggest 'add' in am/revert/cherry-pick.
  Use git-merge-file in git-merge-one-file, too
  diff --check: fix off by one error
  Documentation/git-branch: new -r to delete remote-tracking branches.
  Fix system header problems on Mac OS X
  spurious .sp in manpages

2006-12-21 23:15:11 -08:00

71 KiB

Raw Blame History

View Raw