Merge branch 'rs/history-short-help-fix'

Glitches in "git history -h" have been corrected. * rs/history-short-help-fix: history: fix short help for argument of --update-refs