Added documentation and tests for the previously submitted patch. The
previous patch was rebased and the conflict in cache.h was resolved.
Range diff for Linus' original code:
1: 74e8221b52 ! 1: dd8ea66414 Add 'human' date format
@@ -26,6 +26,10 @@
Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
+ Rebased lt/date-human to git version 2.20.1 and resolved a conflict.
+
+ Intentionally did not change logic or add documentation/tests to the
+ original commit so that the sign-offs would still be legitimate.
diff --git a/builtin/blame.c b/builtin/blame.c
--- a/builtin/blame.c
@@ -46,13 +50,13 @@
--- a/cache.h
+++ b/cache.h
@@
- struct date_mode {
- enum date_mode_type {
- DATE_NORMAL = 0,
-+ DATE_HUMAN,
- DATE_RELATIVE,
- DATE_SHORT,
- DATE_ISO8601,
+
+ enum date_mode_type {
+ DATE_NORMAL = 0,
++ DATE_HUMAN,
+ DATE_RELATIVE,
+ DATE_SHORT,
+ DATE_ISO8601,
diff --git a/date.c b/date.c
--- a/date.c
Linus Torvalds (1):
Add 'human' date format
Stephen P. Smith (2):
Add 'human' date format documentation
t0006-date.sh: add `human` date format tests.
Documentation/rev-list-options.txt | 8 ++
builtin/blame.c | 4 +
cache.h | 1 +
date.c | 130 ++++++++++++++++++++++++-----
t/t0006-date.sh | 24 ++++++
t/t4202-log.sh | 24 ++++++
t/t7007-show.sh | 25 ++++++
7 files changed, 196 insertions(+), 20 deletions(-)
--
2.20.1.2.gb21ebb671b
