summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-23 22:07:47 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-23 22:07:47 (GMT)
commitdcaad49c928f047d5ffa1c5a1753aff6e87f16b5 (patch)
treea688a7fcc3922b37fb72a5d52c00928ac5667bdb /Documentation/git-checkout.txt
parent33b292610dea9f94c986eb88f12e503f5b8375dd (diff)
parent6858d494926437ad7b7e9199ea39953eb90c7bab (diff)
downloadgit-dcaad49c928f047d5ffa1c5a1753aff6e87f16b5.zip
git-dcaad49c928f047d5ffa1c5a1753aff6e87f16b5.tar.gz
git-dcaad49c928f047d5ffa1c5a1753aff6e87f16b5.tar.bz2
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.
Diffstat (limited to 'Documentation/git-checkout.txt')
-rw-r--r--Documentation/git-checkout.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index d82efc0..fbdbadc 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -8,7 +8,7 @@ git-checkout - Checkout and switch to a branch
SYNOPSIS
--------
[verse]
-'git-checkout' [-f] [-b <new_branch>] [-m] [<branch>]
+'git-checkout' [-f] [-b <new_branch> [-l]] [-m] [<branch>]
'git-checkout' [-m] [<branch>] <paths>...
DESCRIPTION
@@ -40,6 +40,11 @@ OPTIONS
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