mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 22:02:23 +02:00
Code

rebase: add options passed to git-am

Browse Source 
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:
Michele Ballabio 2009-03-18 21:53:49 +01:00 committed by Junio C Hamano
parent 5e75d56f11
commit 570ccad33e
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-rebase.txt
View File

@ -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

4
git-rebase.sh
View File

@ -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"
;;