Skip to content

Commit

Permalink
rebase: add options passed to git-am
Browse files Browse the repository at this point in the history
Add the options --committer-date-is-author-date and --ignore-date
to git-rebase. They were introduced in commit a79ec62 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>
  • Loading branch information
Michele Ballabio authored and Junio C Hamano committed Mar 19, 2009
1 parent 5e75d56 commit 570ccad
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Documentation/git-rebase.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions git-rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
Expand Down

0 comments on commit 570ccad

Please sign in to comment.