A couple of minor fixes seen while looking at the Git-for-Wondows patch thicket and getting my head around the conflict resolutions I did note that there was potential for the rerere-train to be integrated with the main rerere code, and maybe learn from the range-diff, and the rebasing merge todo lists, when repetition is occuring in development. Maybe also 'show' options for the resolutions (-cc?). Possibly an intersting student project, including its documenation. Philip Oakley (2): rerere doc: quote `rerere.enabled` describe doc: remove '7-char' abbreviation reference Documentation/git-describe.txt | 2 +- Documentation/git-rerere.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.21.0.windows.1.80.gdc2ae9a382
