diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-23 16:05:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-23 16:05:46 -0700 |
| commit | e13067a7499f3cbf543d4a30865c70613f055b4b (patch) | |
| tree | b7bd4d007656599959fed85db64ff5cd2cef37a9 /Documentation/rev-list-options.txt | |
| parent | dd0ffd5b31a672db90d8b775988d55829e6f5f9f (diff) | |
| parent | 77599cc0bbd0a08defc3bfa80ca52d931d8dc786 (diff) | |
| download | git-e13067a7499f3cbf543d4a30865c70613f055b4b.tar.gz git-e13067a7499f3cbf543d4a30865c70613f055b4b.tar.xz | |
Merge branch 'maint'
* maint:
rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
Add missing "short" alternative to --date in rev-list-options.txt
git-show.txt: Not very stubby these days.
Clarify repack -n documentation
Diffstat (limited to 'Documentation/rev-list-options.txt')
| -rw-r--r-- | Documentation/rev-list-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 3558348b7..dfcef79a6 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -13,7 +13,7 @@ include::pretty-options.txt[] Synonym for `--date=relative`. ---date={relative,local,default,iso,rfc}:: +--date={relative,local,default,iso,rfc,short}:: Only takes effect for dates shown in human-readable format, such as when using "--pretty". `log.date` config variable sets a default |