summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-24 16:07:04 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-24 16:07:04 -0800
commitdb65f0fc3b1e16d5cc4ebf00f5af56c91546d839 (patch)
tree0d95b9e43724a4e8b5492bc582b0b4bb71c6ddc1
parentec7ff5ba272b565ed093a98dc13dd5cd26aeac92 (diff)
parent2eeeef24ff5a6538f41f5fe44f3a4e7f6e36e7e5 (diff)
parentad6c3739a33586ba15a8c5c245dcd59e8a31cef1 (diff)
downloadgit-db65f0fc3b1e16d5cc4ebf00f5af56c91546d839.tar.gz
Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scaler