Merge branch 'sp/reflog' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 23 May 2006 22:07:47 +0000 (15:07 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 23 May 2006 22:07:47 +0000 (15:07 -0700)
commitdcaad49c928f047d5ffa1c5a1753aff6e87f16b5
treea688a7fcc3922b37fb72a5d52c00928ac5667bdb
parent33b292610dea9f94c986eb88f12e503f5b8375dd
parent6858d494926437ad7b7e9199ea39953eb90c7bab
Merge branch 'sp/reflog' into next

* sp/reflog:
  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/git-branch.txt
Documentation/git-checkout.txt
cache.h
git-am.sh
git-commit.sh
http-fetch.c