aboutsummaryrefslogtreecommitdiff
path: root/reflog-walk.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-11 11:30:07 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-11 11:30:08 -0700
commitd318a3997a76155795f28ffefb52158c0c4133ab (patch)
tree9bfc9676e442fe7efc66238ab12a15364c097b8e /reflog-walk.h
parent65029d8224159326e723b7719d18db2f3d5ab8e3 (diff)
parent55ccf85a524f6a2d8cb5582d80a2927ff11dfb64 (diff)
downloadgit-d318a3997a76155795f28ffefb52158c0c4133ab.tar.gz
git-d318a3997a76155795f28ffefb52158c0c4133ab.tar.xz
Merge branch 'jk/maint-reflog-walk-count-vs-time'
Gives a better DWIM behaviour for --pretty=format:%gd, "stash list", and "log -g", depending on how the starting point ("master" vs "master@{0}" vs "master@{now}") and date formatting options (e.g. "--date=iso") are given on the command line. By Jeff King (4) and Junio C Hamano (1) * jk/maint-reflog-walk-count-vs-time: reflog-walk: tell explicit --date=default from not having --date at all reflog-walk: always make HEAD@{0} show indexed selectors reflog-walk: clean up "flag" field of commit_reflog struct log: respect date_mode_explicit with --format:%gd t1411: add more selector index/date tests
Diffstat (limited to 'reflog-walk.h')
-rw-r--r--reflog-walk.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/reflog-walk.h b/reflog-walk.h
index afb1ae3fd..50265f51c 100644
--- a/reflog-walk.h
+++ b/reflog-walk.h
@@ -11,13 +11,13 @@ extern int add_reflog_for_walk(struct reflog_walk_info *info,
extern void fake_reflog_parent(struct reflog_walk_info *info,
struct commit *commit);
extern void show_reflog_message(struct reflog_walk_info *info, int,
- enum date_mode);
+ enum date_mode, int force_date);
extern void get_reflog_message(struct strbuf *sb,
struct reflog_walk_info *reflog_info);
extern const char *get_reflog_ident(struct reflog_walk_info *reflog_info);
extern void get_reflog_selector(struct strbuf *sb,
struct reflog_walk_info *reflog_info,
- enum date_mode dmode,
+ enum date_mode dmode, int force_date,
int shorten);
#endif