From: Junio C Hamano <junkio@cox.net>
Date: Tue, 23 May 2006 22:07:47 +0000 (-0700)
Subject: Merge branch 'sp/reflog' into next
X-Git-Tag: v1.4.1-rc1~66
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dcaad49c928f047d5ffa1c5a1753aff6e87f16b5;p=git.git

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.
---

dcaad49c928f047d5ffa1c5a1753aff6e87f16b5
diff --cc Documentation/git-checkout.txt
index d82efc00d,064394385..fbdbadc74
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@@ -35,11 -35,13 +35,16 @@@ OPTION
  	Force a re-read of everything.
  
  -b::
 -	Create a new branch and start it at <branch>.
 +	Create a new branch named <new_branch> and start it at
 +	<branch>.  The new branch name must pass all checks defined
 +	by gitlink:git-check-ref-format[1].  Some of these checks
 +	may restrict the characters allowed in a branch name.
  
+ -l::
+ 	Create the new branch's ref log.  This activates recording of
+ 	all changes to made the branch ref, enabling use of date
+ 	based sha1 expressions such as "<branchname>@{yesterday}".
+ 
  -m::
  	If you have local modifications to one or more files that
  	are different between the current branch and the branch to