diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-14 11:46:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-14 11:46:16 -0700 |
| commit | adc3a81ce21754595d6263c78f3ceac5b9bb30d9 (patch) | |
| tree | 63fb0bf78dce58d485a43215f1aaa63e7006ebe4 /reflog-walk.h | |
| parent | badabc06f3f34a85a931dffa8e8d607d2ff016fc (diff) | |
| parent | 55ccf85a524f6a2d8cb5582d80a2927ff11dfb64 (diff) | |
| download | git-adc3a81ce21754595d6263c78f3ceac5b9bb30d9.tar.gz | |
Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint
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.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/reflog-walk.h b/reflog-walk.h index afb1ae3fde..50265f51c5 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 |