Re: [PATCH 2/2] rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved

2017-08-20 Thread Junio C Hamano
Ramsay Jones writes: > On 19/08/17 21:30, Junio C Hamano wrote: > >> In the future, we may find other variables that only allow an >> integer that specifies "this many days" (or other unit of time) and >> allow them to also do the same, and at that point we probably would >> want to move the help

Re: [PATCH 2/2] rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved

2017-08-20 Thread Ramsay Jones
On 19/08/17 21:30, Junio C Hamano wrote: > These two configuration variables are described in the documentation > to take an expiry period expressed in the number of days: > > gc.rerereResolved:: > Records of conflicted merge you resolved earlier are > kept for this many

[PATCH 2/2] rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved

2017-08-19 Thread Junio C Hamano
These two configuration variables are described in the documentation to take an expiry period expressed in the number of days: gc.rerereResolved:: Records of conflicted merge you resolved earlier are kept for this many days when 'git rerere gc' is run. The d