diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-03-23 14:32:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-03-23 14:32:46 -0700 |
commit | 322c6244651c408d924f71f73effd8ed833916d3 (patch) | |
tree | 6e8cf8d283e2a923cc330b4b64eeb3c972341edd /git-rerere.txt | |
parent | 0762262193bb8a218def4fd749a68476d5337b5d (diff) | |
download | git-htmldocs-322c6244651c408d924f71f73effd8ed833916d3.tar.gz |
Autogenerated HTML docs for v2.3.4-263-gf53fc
Diffstat (limited to 'git-rerere.txt')
-rw-r--r-- | git-rerere.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index a62227f84..9ee083c41 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -69,7 +69,7 @@ Prune records of conflicted merges that occurred a long time ago. By default, unresolved conflicts older than 15 days and resolved conflicts older than 60 days are pruned. These defaults are controlled via the -`gc.rerereunresolved` and `gc.rerereresolved` configuration +`gc.rerereUnresolved` and `gc.rerereResolved` configuration variables respectively. |