{"thread":{"id":"18022","subject":"[PATCH/RFC] git-pull: forward --summary to git-rebase to allow diffstat on --rebase","startedAt":"2009-02-25T22:37:47Z","lastAt":"2009-02-25T22:37:47Z","messageCount":1,"participants":["Tor Arne Vestbø"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"106269","messageId":"49A5C83B.8050100@trolltech.com","threadId":"18022","inReplyTo":null,"subject":"[PATCH/RFC] git-pull: forward --summary to git-rebase to allow diffstat on --rebase","fromName":"Tor Arne Vestbø","fromEmail":"tavestbo@trolltech.com","sentAt":"2009-02-25T22:37:47Z","receivedAt":"2009-02-25T22:37:47Z","isPatch":true,"sender":{"key":"torarnv@gmail.com","avatar":"https://gravatar.com/avatar/847af0150a5a28ad86d9db1556a48aba04e7642c6a29a5a767f8c2bdf1720321?d=mp&s=160"},"body":"git-rebase gets aliases for --summary and --stat to --verbose, as well\nas a --no-stat, so that git-pull can just forward the --summary directly.\n\nSigned-off-by: Tor Arne Vestbø <tavestbo@trolltech.com>\n---\n\nWould something like this be welcomed? I'd be happy to tweak the\nimplementation, and add docs, tests, and a config option like\nmerge.stat. Just wanted to check the mood first :)\n\ngit-pull.sh   |    2 +-\n git-rebase.sh |    5 ++++-\n 2 files changed, 5 insertions(+), 2 deletions(-)\n\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 75c3610..12e0ae8 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -179,7 +179,7 @@ fi\n \n merge_name=$(git fmt-merge-msg $log_arg <\"$GIT_DIR/FETCH_HEAD\") || exit\n test true = \"$rebase\" &&\n-\texec git-rebase $strategy_args --onto $merge_head \\\n+\texec git-rebase $no_stat $strategy_args --onto $merge_head \\\n \t${oldremoteref:-$merge_head}\n exec git-merge $no_stat $no_commit $squash $no_ff $log_arg $strategy_args \\\n \t\"$merge_name\" HEAD $merge_head\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 528b604..9940eea 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -257,9 +257,12 @@ do\n \t\tesac\n \t\tdo_merge=t\n \t\t;;\n-\t-v|--verbose)\n+\t-v|--verbose|--stat|--summary)\n \t\tverbose=t\n \t\t;;\n+\t-n|--no-stat)\n+\t\tverbose=\n+\t\t;;\n \t--whitespace=*)\n \t\tgit_am_opt=\"$git_am_opt $1\"\n \t\t;;\n-- \n1.6.1.GIT\n"}]}