diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-03-07 22:33:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-07 22:33:26 -0800 |
| commit | 5628a7a309e11c413138291b215a8cecedaddd24 (patch) | |
| tree | 1273cebf4c951b8c9cec3d7df9e47720abee494a /Documentation/git-merge-file.txt | |
| parent | Merge branch 'cb/mergetool' (diff) | |
| parent | log/show/whatchanged: introduce format.pretty configuration (diff) | |
| download | tgif-5628a7a309e11c413138291b215a8cecedaddd24.tar.xz | |
Merge branch 'dc/format-pretty'
* dc/format-pretty:
log/show/whatchanged: introduce format.pretty configuration
specify explicit "--pretty=medium" with `git log/show/whatchanged`
whatchanged documentation: share description of --pretty with others
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions