undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ar/mergestat'

Browse Source 
* ar/mergestat:
  Add a configuration option to control diffstat after merge
This commit is contained in:
Junio C Hamano 2007-05-29 00:38:52 -07:00
commit 8250465859
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-merge.txt
View File

@ -9,7 +9,7 @@ git-merge - Join two or more development histories together
SYNOPSIS SYNOPSIS
-------- --------
[verse] [verse]
'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]... 'git-merge' [-n] [--summary] [--no-commit] [--squash] [-s <strategy>]...
[-m <msg>] <remote> <remote>... [-m <msg>] <remote> <remote>...
DESCRIPTION DESCRIPTION

4
Documentation/merge-options.txt
View File

@ -1,3 +1,7 @@
--summary::
Show a diffstat at the end of the merge. The diffstat is also
controlled by the configuration option merge.diffstat.
-n, \--no-summary:: -n, \--no-summary::
Do not show diffstat at the end of the merge. Do not show diffstat at the end of the merge.

18
git-merge.sh
View File

@ -3,7 +3,7 @@
# Copyright (c) 2005 Junio C Hamano # Copyright (c) 2005 Junio C Hamano
# #
USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+' USAGE='[-n] [--summary] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'
SUBDIRECTORY_OK=Yes SUBDIRECTORY_OK=Yes
. git-sh-setup . git-sh-setup
@ -88,12 +88,11 @@ finish () {
'') '')
;; ;;
?*) ?*)
case "$no_summary" in if test "$show_diffstat" = t
'') then
# We want color (if set), but no pager # We want color (if set), but no pager
GIT_PAGER='' git-diff --stat --summary -M "$head" "$1" GIT_PAGER='' git-diff --stat --summary -M "$head" "$1"
;; fi
esac
;; ;;
esac esac
} }
@ -126,7 +125,9 @@ do
case "$1" in case "$1" in
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\ -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
--no-summa|--no-summar|--no-summary) --no-summa|--no-summar|--no-summary)
no_summary=t ;; show_diffstat=false ;;
--summary)
show_diffstat=t ;;
--sq|--squ|--squa|--squas|--squash) --sq|--squ|--squa|--squas|--squash)
squash=t no_commit=t ;; squash=t no_commit=t ;;
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
@ -168,6 +169,11 @@ do
shift shift
done done
if test -z "$show_diffstat"; then
test "$(git-config --bool merge.diffstat)" = false && show_diffstat=false
test -z "$show_diffstat" && show_diffstat=t
fi
# This could be traditional "merge <msg> HEAD <commit>..." and the # This could be traditional "merge <msg> HEAD <commit>..." and the
# way we can tell it is to see if the second token is HEAD, but some # way we can tell it is to see if the second token is HEAD, but some
# people might have misused the interface and used a committish that # people might have misused the interface and used a committish that

3
git-pull.sh
View File

@ -22,6 +22,9 @@ do
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\ -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
--no-summa|--no-summar|--no-summary) --no-summa|--no-summar|--no-summary)
no_summary=-n ;; no_summary=-n ;;
--summary)
no_summary=$1
;;
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
no_commit=--no-commit ;; no_commit=--no-commit ;;
--sq|--squ|--squa|--squas|--squash) --sq|--squ|--squa|--squas|--squash)