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 /contrib | |
| parent | 003b93cfb3f588284b89dc4e4c89e1046913ff59 (diff) | |
| parent | 94c22a5e7b4247d7d6453272c4425d81071d2689 (diff) | |
| download | git-5628a7a309e11c413138291b215a8cecedaddd24.tar.gz git-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 'contrib')
| -rw-r--r-- | contrib/emacs/git.el | 2 | ||||
| -rw-r--r-- | contrib/hooks/post-receive-email | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el index c9268234a..4fa853fae 100644 --- a/contrib/emacs/git.el +++ b/contrib/emacs/git.el @@ -1299,7 +1299,7 @@ Return the list of files that haven't been handled." (let (author-name author-email subject date msg) (with-temp-buffer (let ((coding-system (git-get-logoutput-coding-system))) - (git-call-process-env t nil "log" "-1" commit) + (git-call-process-env t nil "log" "-1" "--pretty=medium" commit) (goto-char (point-min)) (when (re-search-forward "^Author: *\\(.*\\) <\\(.*\\)>$" nil t) (setq author-name (match-string 1)) diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email index 77c88ebf1..62a740c48 100644 --- a/contrib/hooks/post-receive-email +++ b/contrib/hooks/post-receive-email @@ -567,7 +567,7 @@ generate_general_email() echo "" if [ "$newrev_type" = "commit" ]; then echo $LOGBEGIN - git show --no-color --root -s $newrev + git show --no-color --root -s --pretty=medium $newrev echo $LOGEND else # What can we do here? The tag marks an object that is not |