summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-01-06 21:48:30 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-01-06 21:48:30 -0400
commit2557bb876426d9d72f195f041b4efb43153725bd (patch)
treeaf9f38013b068ea519fe6cab574fd17bc7a67483
parentdef6ca054e8265a1f3aa394d281b37f58d667520 (diff)
complete set of log options
-rw-r--r--Command/Log.hs4
-rw-r--r--doc/git-annex.mdwn5
2 files changed, 6 insertions, 3 deletions
diff --git a/Command/Log.hs b/Command/Log.hs
index 3336df873..d59c8efd8 100644
--- a/Command/Log.hs
+++ b/Command/Log.hs
@@ -38,7 +38,9 @@ def = [withOptions options $
options :: [Option]
options =
- [ Option.field [] "after" paramDate "show log after date"
+ [ Option.field [] "since" paramDate "show log since date"
+ , Option.field [] "after" paramDate "show log after date"
+ , Option.field [] "until" paramDate "show log until date"
, Option.field [] "before" paramDate "show log before date"
, Option.field ['n'] "max-count" paramNumber "limit number of logs displayed"
]
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index b9704f3bd..1103ffaf6 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -278,8 +278,9 @@ subdirectories).
Displays the location log for the specified file or files,
showing each repository they were added to ("+") and removed from ("-").
- To only show location changes after a date, specify --after=date.
- (The "date" can be any format accepted by git log, ie "last wednesday")
+ To limit how far back to seach for location log changes, the options
+ --since, --after, --until, --before, and --max-count can be specified.
+ They are passed through to git log. For example, --since "1 month ago"
* status