From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jan 2017 23:19:07 +0000 (-0800)
Subject: Merge branch 'lr/doc-fix-cet' into maint
X-Git-Tag: v2.11.1~29
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/34d5a66a611d6fc09a385ba0c847159437e0993d?ds=inline;hp=-c

Merge branch 'lr/doc-fix-cet' into maint

* lr/doc-fix-cet:
date-formats.txt: Typo fix
---

34d5a66a611d6fc09a385ba0c847159437e0993d
diff --combined Documentation/date-formats.txt
index 35e8da2010,80307ed36c..6926e0a4c8
--- a/Documentation/date-formats.txt
+++ b/Documentation/date-formats.txt
@@@ -1,7 -1,7 +1,7 @@@
  DATE FORMATS
  ------------
  
 -The GIT_AUTHOR_DATE, GIT_COMMITTER_DATE environment variables
 +The `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` environment variables
  ifdef::git-commit[]
  and the `--date` option
  endif::git-commit[]
@@@ -11,7 -11,7 +11,7 @@@ Git internal format:
  	It is `<unix timestamp> <time zone offset>`, where `<unix
  	timestamp>` is the number of seconds since the UNIX epoch.
  	`<time zone offset>` is a positive or negative offset from UTC.
- 	For example CET (which is 2 hours ahead UTC) is `+0200`.
+ 	For example CET (which is 1 hour ahead of UTC) is `+0100`.
  
  RFC 2822::
  	The standard email format as described by RFC 2822, for example