commit | 152a9c17a802379a3a48e025b74dedd76e2623cc | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Wed Nov 06 14:34:43 2013 -0800 |
committer | Junio C Hamano <gitster@pobox.com> | Wed Nov 06 14:34:43 2013 -0800 |
tree | 35adf01f3da51119a475392076d1cb290b800a00 | |
parent | f26f72de159d7ade2fbe8b48734ce98c1aba4d72 [diff] | |
parent | abf03eeb8e99538cd31806d5f252214b9fe695a6 [diff] |
Merge branch 'fc/trivial' A random collection of style fixes and minor doc updates. * fc/trivial: setup: trivial style fixes run-command: trivial style fixes diff: trivial style fix revision: trivial style fixes pretty: trivial style fix describe: trivial style fixes transport-helper: trivial style fix sha1-name: trivial style cleanup branch: trivial style fix revision: add missing include doc/pull: clarify the illustrations t: replace pulls with merges merge: simplify ff-only option