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 /git-merge.sh | |
| 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 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 03cd39873a..7dbbb1d79d 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -71,7 +71,7 @@ finish_up_to_date () { squash_message () { echo Squashed commit of the following: echo - git log --no-merges ^"$head" $remoteheads + git log --no-merges --pretty=medium ^"$head" $remoteheads } finish () { |