Merge branch 'master' into next
commit3e292162cca524cfec0070c901d4696c73672aa6
authorJunio C Hamano <gitster@pobox.com>
Sat, 12 Sep 2009 05:52:31 +0000 (11 22:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 12 Sep 2009 05:52:31 +0000 (11 22:52 -0700)
tree2598ef5a2c4a66646aa53534ae04e629981b52f0
parent4efab9805c424097c1accfa6ede2bbadbc9db4a1
parent0c3d3ac352427738e7c4393c0a959e0e698a0c7a
Merge branch 'master' into next

* master:
  rebase: use plumbing to show dirty state
  pager: set LESS=FRSX also on Windows
  start_command: do not clobber cmd->env on Windows code path