Skip to content

Commit 570ccad

Browse files
chungagitster
authored andcommitted
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 a79ec62 for git-am. These options imply --force-rebase. Signed-off-by: Michele Ballabio <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5e75d56 commit 570ccad

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

Documentation/git-rebase.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,11 @@ OPTIONS
270270
(see linkgit:git-apply[1]) that applies the patch.
271271
Incompatible with the --interactive option.
272272

273+
--committer-date-is-author-date::
274+
--ignore-date::
275+
These flags are passed to 'git-am' to easily change the dates
276+
of the rebased commits (see linkgit:git-am[1]).
277+
273278
-i::
274279
--interactive::
275280
Make a list of the commits which are about to be rebased. Let the

git-rebase.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,10 @@ do
309309
;;
310310
esac
311311
;;
312+
--committer-date-is-author-date|--ignore-date)
313+
git_am_opt="$git_am_opt $1"
314+
force_rebase=t
315+
;;
312316
-C*)
313317
git_am_opt="$git_am_opt $1"
314318
;;

0 commit comments

Comments
 (0)