diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:02 -0700 |
| commit | 25b336421f7393f54bada27f60658fdfe7270215 (patch) | |
| tree | a23f287b4758d3d49f1d4aeb30ba0748b0a4201c /t/t6047-diff3-conflict-markers.sh | |
| parent | Merge branch 'dr/doc-recurse-submodules' (diff) | |
| parent | commit-graph: fix buggy --expire-time option (diff) | |
| download | tgif-25b336421f7393f54bada27f60658fdfe7270215.tar.xz | |
Merge branch 'ds/commit-graph-expiry-fix'
"git commit-graph write --expire-time=<timestamp>" did not use the
given timestamp correctly, which has been corrected.
* ds/commit-graph-expiry-fix:
commit-graph: fix buggy --expire-time option
Diffstat (limited to 't/t6047-diff3-conflict-markers.sh')
0 files changed, 0 insertions, 0 deletions