All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Tor Arne Vestbø" <tavestbo@trolltech.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org
Subject: [PATCH/RFC] git-pull: forward --summary to git-rebase to allow diffstat on --rebase
Date: Wed, 25 Feb 2009 23:37:47 +0100	[thread overview]
Message-ID: <49A5C83B.8050100@trolltech.com> (raw)

git-rebase gets aliases for --summary and --stat to --verbose, as well
as a --no-stat, so that git-pull can just forward the --summary directly.

Signed-off-by: Tor Arne Vestbø <tavestbo@trolltech.com>
---

Would something like this be welcomed? I'd be happy to tweak the
implementation, and add docs, tests, and a config option like
merge.stat. Just wanted to check the mood first :)

git-pull.sh   |    2 +-
 git-rebase.sh |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/git-pull.sh b/git-pull.sh
index 75c3610..12e0ae8 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -179,7 +179,7 @@ fi
 
 merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
 test true = "$rebase" &&
-	exec git-rebase $strategy_args --onto $merge_head \
+	exec git-rebase $no_stat $strategy_args --onto $merge_head \
 	${oldremoteref:-$merge_head}
 exec git-merge $no_stat $no_commit $squash $no_ff $log_arg $strategy_args \
 	"$merge_name" HEAD $merge_head
diff --git a/git-rebase.sh b/git-rebase.sh
index 528b604..9940eea 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -257,9 +257,12 @@ do
 		esac
 		do_merge=t
 		;;
-	-v|--verbose)
+	-v|--verbose|--stat|--summary)
 		verbose=t
 		;;
+	-n|--no-stat)
+		verbose=
+		;;
 	--whitespace=*)
 		git_am_opt="$git_am_opt $1"
 		;;
-- 
1.6.1.GIT

                 reply	other threads:[~2009-02-25 22:29 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=49A5C83B.8050100@trolltech.com \
    --to=tavestbo@trolltech.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.