summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2008-04-06 01:23:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-04-13 02:28:18 (GMT)
commitd8abe148bece83f6c3e5ebe6075aef236322ed74 (patch)
treede668ac4309de778b211bd4834a5cc14090b6e6c /git-merge.sh
parentf5a84c372f8f044899dde91f1a415d2bf963377e (diff)
downloadgit-d8abe148bece83f6c3e5ebe6075aef236322ed74.zip
git-d8abe148bece83f6c3e5ebe6075aef236322ed74.tar.gz
git-d8abe148bece83f6c3e5ebe6075aef236322ed74.tar.bz2
merge, pull: introduce '--(no-)stat' option
This option has the same effect as '--(no-)summary' (i.e. whether to show a diffsat at the end of the merge or not), and it is consistent with the '--stat' option of other git commands. Documentation, tests, and bash completion are updaed accordingly, and the old --summary option is marked as being deprected. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 7dbbb1d..0b15924 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -8,8 +8,10 @@ OPTIONS_SPEC="\
git-merge [options] <remote>...
git-merge [options] <msg> HEAD <remote>
--
-summary show a diffstat at the end of the merge
-n,no-summary don't show a diffstat at the end of the merge
+stat show a diffstat at the end of the merge
+n,no-stat don't show a diffstat at the end of the merge
+summary (synonym to --stat)
+no-summary (synonym to --no-stat)
squash create a single commit instead of doing a merge
commit perform a commit if the merge sucesses (default)
ff allow fast forward (default)
@@ -148,9 +150,9 @@ merge_name () {
parse_config () {
while test $# != 0; do
case "$1" in
- -n|--no-summary)
+ -n|--no-stat|--no-summary)
show_diffstat=false ;;
- --summary)
+ --stat|--summary)
show_diffstat=t ;;
--squash)
test "$allow_fast_forward" = t ||