summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Michele Ballabio <barra_cuda@katamail.com>2009-03-18 21:53:49 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-18 19:25:01 -0700
commit570ccad33e067616865aa9697b90c7b927d6dcf4 (patch)
treed2175cc960aa57e00a8eafc1b8c948730247e9ee /Documentation
parentdocument --force-rebase (diff)
downloadtgif-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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rebase.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 276f1510c6..3d5a066c31 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