[Fix #360] Set alias giR to reset the index interactively
[Fix #349] Display diff when committing
Export $MANPATH and $INFOPATH
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Export $MANPATH and $INFOPATH
  [Fix #349] Display diff when committing
  [Fix #360] Set alias giR to reset the index interactively