summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorDenis Cheng <crquan@gmail.com>2008-03-02 09:05:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-05 20:06:09 (GMT)
commit9225d7be0abab0c3b1325a733aea127b45a18625 (patch)
treefc716474a8004a05c67eabe8eba757a03b141750 /git-merge.sh
parent5348337a3406a28a2db35fdfba8cb766b0241949 (diff)
downloadgit-9225d7be0abab0c3b1325a733aea127b45a18625.zip
git-9225d7be0abab0c3b1325a733aea127b45a18625.tar.gz
git-9225d7be0abab0c3b1325a733aea127b45a18625.tar.bz2
specify explicit "--pretty=medium" with `git log/show/whatchanged`
The following patch will introduce a new configuration variable, "format.pretty", from then on the pretty format without specifying "--pretty" might not be the default "--pretty=medium", it depends on the user's config. So all kinds of Shell/Perl/Emacs scripts that needs the default medium pretty format must specify it explicitly. Signed-off-by: Denis Cheng <crquan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 03cd398..7dbbb1d 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 () {