From: Michele Ballabio <barra_cuda@katamail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH 3/3] rebase: add options passed to git-am
Date: Wed, 18 Mar 2009 19:05:58 +0100 [thread overview]
Message-ID: <1237399558-27289-3-git-send-email-barra_cuda@katamail.com> (raw)
In-Reply-To: <1237399558-27289-1-git-send-email-barra_cuda@katamail.com>
Add the options --committer-date-is-author-date and --ignore-date
to git-rebase. They were introduced in commit a79ec62d0 for git-am.
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---
I'm not sure if force_rebase should be set in this case.
Documentation/git-rebase.txt | 5 +++++
git-rebase.sh | 3 +++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 6cb902a..457340c 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -269,6 +269,11 @@ OPTIONS
(see linkgit:git-apply[1]) that applies the patch.
Incompatible with the --interactive option.
+--committer-date-is-author-date::
+--ignore-date::
+ These flags are passed to 'git-am' to easily change the dates
+ of the rebased commits (see linkgit:git-am[1]).
+
-i::
--interactive::
Make a list of the commits which are about to be rebased. Let the
diff --git a/git-rebase.sh b/git-rebase.sh
index e38d68a..d89d71c 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -309,6 +309,9 @@ do
;;
esac
;;
+ --committer-date-is-author-date|--ignore-date)
+ git_am_opt="$git_am_opt $1"
+ ;;
-C*)
git_am_opt="$git_am_opt $1"
;;
--
1.6.2.22.gc2ac
next prev parent reply other threads:[~2009-03-18 17:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-18 18:05 [PATCH 1/3] rebase: fix typo (force_rebas -> force-rebas) Michele Ballabio
2009-03-18 18:05 ` [PATCH 2/3] document --force-rebase Michele Ballabio
2009-03-18 18:38 ` Junio C Hamano
2009-03-18 18:38 ` Junio C Hamano
2009-03-18 20:53 ` [PATCH v2 " Michele Ballabio
2009-03-18 21:15 ` Johannes Schindelin
2009-03-19 11:01 ` [PATCH " Sverre Rabbelier
2009-03-19 15:28 ` [PATCH v3 " Michele Ballabio
2009-03-19 15:28 ` [PATCH v3 3/3] rebase: add options passed to git-am Michele Ballabio
2009-03-18 18:05 ` Michele Ballabio [this message]
2009-03-18 18:41 ` [PATCH " Junio C Hamano
2009-03-18 20:53 ` [PATCH v2 " Michele Ballabio
2009-03-27 18:58 ` [PATCH 1/3] rebase: fix typo (force_rebas -> force-rebas) Michele Ballabio
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=1237399558-27289-3-git-send-email-barra_cuda@katamail.com \
--to=barra_cuda@katamail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).