{"thread":{"id":"8281","subject":"[PATCH] Add an option to override the configured setting for merge summaries","startedAt":"2007-05-23T16:04:57Z","lastAt":"2007-05-23T16:04:57Z","messageCount":1,"participants":["Alex Riesen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"43037","messageId":"81b0412b0705230904i70a3e325r81a9d506c30bb81b@mail.gmail.com","threadId":"8281","inReplyTo":null,"subject":"[PATCH] Add an option to override the configured setting for merge summaries","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-05-23T16:04:57Z","receivedAt":"2007-05-23T16:04:57Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"Just for completeness.\n\nSigned-off-by: Alex Riesen <raa.lkml@gmail.com>\n---\n git-merge.sh |    5 ++++-\n git-pull.sh  |    3 +++\n 2 files changed, 7 insertions(+), 1 deletions(-)\n\n\nFrom 48a6a3db1a21f1ce3db516987b167a9d6b2143a7 Mon Sep 17 00:00:00 2001\nFrom: Alex Riesen <raa.lkml@gmail.com>\nDate: Wed, 23 May 2007 17:36:00 +0200\nSubject: [PATCH] Add an option to override the configured setting for merge summaries\n\nJust for completeness.\n\nSigned-off-by: Alex Riesen <raa.lkml@gmail.com>\n---\n git-merge.sh |    5 ++++-\n git-pull.sh  |    3 +++\n 2 files changed, 7 insertions(+), 1 deletions(-)\n\ndiff --git a/git-merge.sh b/git-merge.sh\nindex 7fbe03a..e79cc76 100755\n--- a/git-merge.sh\n+++ b/git-merge.sh\n@@ -3,7 +3,7 @@\n # Copyright (c) 2005 Junio C Hamano\n #\n \n-USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'\n+USAGE='[-n] [--summary] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'\n \n SUBDIRECTORY_OK=Yes\n . git-sh-setup\n@@ -128,6 +128,9 @@ do\n \t-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\\\n \t\t--no-summa|--no-summar|--no-summary)\n \t\tno_summary=t ;;\n+\t--summary)\n+\t\tno_summary=\n+\t\t;;\n \t--sq|--squ|--squa|--squas|--squash)\n \t\tsquash=t no_commit=t ;;\n \t--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)\ndiff --git a/git-pull.sh b/git-pull.sh\nindex a3665d7..ba0ca07 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -22,6 +22,9 @@ do\n \t-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\\\n \t\t--no-summa|--no-summar|--no-summary)\n \t\tno_summary=-n ;;\n+\t--summary)\n+\t\tno_summary=$1\n+\t\t;;\n \t--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)\n \t\tno_commit=--no-commit ;;\n \t--sq|--squ|--squa|--squas|--squash)\n-- \n1.5.2.787.g56770\n\n"}]}