Merge branch 'sp/reflog'
commitf0679f474a884df13ce032d81dde34175c0fa343
authorJunio C Hamano <junkio@cox.net>
Sun, 4 Jun 2006 06:59:03 +0000 (3 23:59 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 4 Jun 2006 06:59:03 +0000 (3 23:59 -0700)
tree0301dd2bce3c261b87ce29fbb18c0eb0be6e097c
parent731651fe25a7d7a242584e4b85112a610c32a23f
parent99bd0f555823f3c3868561af33d85864a90a7d9a
Merge branch 'sp/reflog'

* sp/reflog:
  fetch.c: do not pass uninitialized lock to unlock_ref().
  Test that git-branch -l works.
  Verify git-commit provides a reflog message.
  Enable ref log creation in git checkout -b.
  Create/delete branch ref logs.
  Include ref log detail in commit, reset, etc.
  Change order of -m option to update-ref.
  Correct force_write bug in refs.c
  Change 'master@noon' syntax to 'master@{noon}'.
  Log ref updates made by fetch.
  Force writing ref if it doesn't exist.
  Added logs/ directory to repository layout.
  General ref log reading improvements.
  Fix ref log parsing so it works properly.
  Support 'master@2 hours ago' syntax
  Log ref updates to logs/refs/<ref>
  Convert update-ref to use ref_lock API.
  Improve abstraction of ref lock/write.
Documentation/config.txt
Documentation/git-rev-parse.txt
cache.h
git-commit.sh
http-fetch.c