From: "Stephen P. Smith" <ischis2@cox.net>
To: git@vger.kernel.org
Cc: "Linus Torvalds" <torvalds@linux-foundation.org>,
"Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 0/3] Add 'human' date format
Date: Sun, 30 Dec 2018 17:31:47 -0700 [thread overview]
Message-ID: <20181231003150.8031-1-ischis2@cox.net> (raw)
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 <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
+ 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
next reply other threads:[~2018-12-31 0:32 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-31 0:31 Stephen P. Smith [this message]
2018-12-31 0:31 ` [PATCH 1/3] Add 'human' date format Stephen P. Smith
2019-01-03 7:37 ` Jeff King
2019-01-03 13:19 ` Stephen P. Smith
2019-01-04 7:50 ` Jeff King
2019-01-04 13:03 ` Stephen P Smith
2019-01-06 6:19 ` Jeff King
2018-12-31 0:31 ` [PATCH 2/3] Add 'human' date format documentation Stephen P. Smith
2018-12-31 0:31 ` [PATCH 3/3] t0006-date.sh: add `human` date format tests Stephen P. Smith
2019-01-02 18:15 ` Junio C Hamano
2019-01-03 2:36 ` Stephen & Linda Smith
2019-01-03 6:42 ` Junio C Hamano
2019-01-03 13:20 ` Stephen P. Smith
2019-01-03 21:14 ` Philip Oakley
2019-01-03 21:45 ` Junio C Hamano
2019-01-03 23:57 ` Stephen P. Smith
2019-01-03 7:44 ` Jeff King
2019-01-03 13:12 ` Stephen & Linda Smith
2019-01-08 21:27 ` Johannes Sixt
2019-01-09 0:44 ` Stephen P. Smith
2019-01-09 6:58 ` Johannes Sixt
2019-01-10 1:50 ` Stephen & Linda Smith
2019-01-18 6:18 ` [PATCH v2 0/5] Re-roll of 'human' date format patch set Stephen P. Smith
2019-01-18 6:18 ` [PATCH v2 1/5] Add 'human' date format Stephen P. Smith
2019-01-18 6:18 ` [PATCH v2 2/5] Remove the proposed use of auto as secondary way to specify human Stephen P. Smith
2019-01-18 18:35 ` Junio C Hamano
2019-01-19 3:44 ` Stephen & Linda Smith
2019-01-18 6:18 ` [PATCH v2 3/5] Add 'human' date format documentation Stephen P. Smith
2019-01-18 18:47 ` Junio C Hamano
2019-01-18 6:18 ` [PATCH v2 4/5] Add `human` format to test-tool Stephen P. Smith
2019-01-18 19:03 ` Junio C Hamano
2019-01-20 22:11 ` Stephen P. Smith
2019-01-22 18:29 ` Junio C Hamano
2019-01-18 6:18 ` [PATCH v2 5/5] Add `human` date format tests Stephen P. Smith
2019-01-18 19:24 ` Junio C Hamano
2019-01-21 5:31 ` [PATCH v3 0/5] Re-roll of 'human' date format patch set Stephen P. Smith
2019-01-21 5:31 ` [PATCH v3 1/5] Add 'human' date format Stephen P. Smith
2019-01-21 5:31 ` [PATCH v3 2/5] Replace the proposed 'auto' mode with 'auto:' Stephen P. Smith
2019-01-21 5:31 ` [PATCH v3 3/5] Add 'human' date format documentation Stephen P. Smith
2019-01-21 5:31 ` [PATCH v3 4/5] Add `human` format to test-tool Stephen P. Smith
2019-01-22 22:34 ` Junio C Hamano
2019-01-21 5:31 ` [PATCH v3 5/5] Add `human` date format tests Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 0/5] Re-roll of 'human' date format patch set Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 1/5] Add 'human' date format Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 2/5] Replace the proposed 'auto' mode with 'auto:' Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 3/5] Add 'human' date format documentation Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 4/5] Add `human` format to test-tool Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 5/5] Add `human` date format tests Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 0/5] Re-roll of 'human' date format patch set Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 1/5] Add 'human' date format Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 2/5] Replace the proposed 'auto' mode with 'auto:' Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 3/5] Add 'human' date format documentation Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 4/5] Add `human` format to test-tool Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 5/5] Add `human` date format tests Stephen P. Smith
2019-01-21 15:04 ` SZEDER Gábor
2019-01-22 0:53 ` Stephen & Linda Smith
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181231003150.8031-1-ischis2@cox.net \
--to=ischis2@cox.net \
--cc=alpine.LFD.2.21.999.1807071502260.18818@i7.lan \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).