mirror of
https://github.com/git/git.git
synced 2025-12-18 12:00:25 +01:00
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>
This commit is contained in:
committed by
Junio C Hamano
parent
5e75d56f11
commit
570ccad33e
@@ -270,6 +270,11 @@ OPTIONS
|
|||||||
(see linkgit:git-apply[1]) that applies the patch.
|
(see linkgit:git-apply[1]) that applies the patch.
|
||||||
Incompatible with the --interactive option.
|
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::
|
-i::
|
||||||
--interactive::
|
--interactive::
|
||||||
Make a list of the commits which are about to be rebased. Let the
|
Make a list of the commits which are about to be rebased. Let the
|
||||||
|
|||||||
@@ -309,6 +309,10 @@ do
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
--committer-date-is-author-date|--ignore-date)
|
||||||
|
git_am_opt="$git_am_opt $1"
|
||||||
|
force_rebase=t
|
||||||
|
;;
|
||||||
-C*)
|
-C*)
|
||||||
git_am_opt="$git_am_opt $1"
|
git_am_opt="$git_am_opt $1"
|
||||||
;;
|
;;
|
||||||
|
|||||||
Reference in New Issue
Block a user