diff options
| author | Michele Ballabio <barra_cuda@katamail.com> | 2009-03-18 21:53:49 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-18 19:25:01 -0700 |
| commit | 570ccad33e067616865aa9697b90c7b927d6dcf4 (patch) | |
| tree | d2175cc960aa57e00a8eafc1b8c948730247e9ee | |
| parent | 5e75d56f1182c99364c9f5375665c814985f384d (diff) | |
| download | git-570ccad33e067616865aa9697b90c7b927d6dcf4.tar.gz git-570ccad33e067616865aa9697b90c7b927d6dcf4.tar.xz | |
rebase: add options passed to git-am
Add the options --committer-date-is-author-date and --ignore-date
to git-rebase. They were introduced in commit a79ec62d0 for git-am.
These options imply --force-rebase.
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-rebase.txt | 5 | ||||
| -rwxr-xr-x | git-rebase.sh | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 276f1510c..3d5a066c3 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -270,6 +270,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 d38ab0b83..0ade69922 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -309,6 +309,10 @@ do ;; esac ;; + --committer-date-is-author-date|--ignore-date) + git_am_opt="$git_am_opt $1" + force_rebase=t + ;; -C*) git_am_opt="$git_am_opt $1" ;; |