[PATCH 1/3] rebase: fix typo (force_rebas -> force-rebas)

[PATCH 1/3] rebase: fix typo (force_rebas -> force-rebas)

[Michele Ballabio]

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---
 git-rebase.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-rebase.sh b/git-rebase.sh
index d38ab0b..e38d68a 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -315,7 +315,7 @@ do
 	--root)
 		rebase_root=t
 		;;
-	-f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force_rebas|--force-rebase)
+	-f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase)
 		force_rebase=t
 		;;
 	-*)
-- 
1.6.2.22.gc2ac

[PATCH 2/3] document --force-rebase

[Michele Ballabio]

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---
 Documentation/git-rebase.txt |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 57bd333..6cb902a 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -258,6 +258,12 @@ OPTIONS
 	context exist they all must match.  By default no context is
 	ever ignored.
 
+-f::
+--force-rebase::
+	Force the rebase even if the current branch is up to date.
+	Normally, if the current branch is up to date, the rebase is
+	aborted.
+
 --whitespace=<option>::
 	This flag is passed to the 'git-apply' program
 	(see linkgit:git-apply[1]) that applies the patch.
-- 
1.6.2.22.gc2ac

[PATCH 3/3] rebase: add options passed to git-am

[Michele Ballabio]

Add the options --committer-date-is-author-date and --ignore-date
to git-rebase. They were introduced in commit a79ec62d0 for git-am.

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---

I'm not sure if force_rebase should be set in this case.

 Documentation/git-rebase.txt |    5 +++++
 git-rebase.sh                |    3 +++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 6cb902a..457340c 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -269,6 +269,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
diff --git a/git-rebase.sh b/git-rebase.sh
index e38d68a..d89d71c 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -309,6 +309,9 @@ do
 			;;
 		esac
 		;;
+	--committer-date-is-author-date|--ignore-date)
+		git_am_opt="$git_am_opt $1"
+		;;
 	-C*)
 		git_am_opt="$git_am_opt $1"
 		;;
-- 
1.6.2.22.gc2ac

Re: [PATCH 2/3] document --force-rebase

[Junio C Hamano]

Michele Ballabio <barra_cuda@katamail.com> writes:

> +-f::
> +--force-rebase::
> +	Force the rebase even if the current branch is up to date.
> +	Normally, if the current branch is up to date, the rebase is
> +	aborted.
> +

For the sake of brevity we say "up to date" in the error message from the
command, but for people who looks up the manual to figure out why their
rebase is not rebasing with that error message, we may want to explain
what the phrase means in this context.  E.g.

	... even if the branch is a descendant of the commit you are
	rebasing onto.  Normally the command will exit with a message
	"Current branch is up to date" in such a situation.

Re: [PATCH 2/3] document --force-rebase

[Junio C Hamano]

Michele Ballabio <barra_cuda@katamail.com> writes:

> +-f::
> +--force-rebase::
> +	Force the rebase even if the current branch is up to date.
> +	Normally, if the current branch is up to date, the rebase is
> +	aborted.
> +

For the sake of brevity we say "up to date" in the error message from the
command, but for people who look up the manual to figure out why their
rebase is not rebasing with that error message, we may want to explain
what the phrase means in this context.  E.g.

	... even if the branch is a descendant of the commit you are
	rebasing onto.  Normally the command will exit with a message
	"Current branch is up to date" in such a situation.

Re: [PATCH 3/3] rebase: add options passed to git-am

[Junio C Hamano]

Michele Ballabio <barra_cuda@katamail.com> writes:

> Add the options --committer-date-is-author-date and --ignore-date
> to git-rebase. They were introduced in commit a79ec62d0 for git-am.
>
> Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
> ---
>
> I'm not sure if force_rebase should be set in this case.

Good thinking.

These are clearly "I want to change these commit" request just like
the "--whitespace=fix" option is, so I think it is probably a good idea.

[PATCH v2 2/3] document --force-rebase

[Michele Ballabio]

Words by Junio.

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---
 Documentation/git-rebase.txt |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 57bd333..276f151 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -258,6 +258,13 @@ OPTIONS
 	context exist they all must match.  By default no context is
 	ever ignored.
 
+-f::
+--force-rebase::
+	Force the rebase even if the current branch is a descendant
+	of the commit you are rebasing onto.  Normally the command will
+	exit with the message "Current branch is up to date" in such a
+	situation.
+
 --whitespace=<option>::
 	This flag is passed to the 'git-apply' program
 	(see linkgit:git-apply[1]) that applies the patch.
-- 
1.6.2.22.gc2ac

[PATCH v2 3/3] rebase: add options passed to git-am

[Michele Ballabio]

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>
---
 Documentation/git-rebase.txt |    5 +++++
 git-rebase.sh                |    4 ++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 276f151..3d5a066 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
diff --git a/git-rebase.sh b/git-rebase.sh
index e38d68a..b83fd3f 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -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"
 		;;
-- 
1.6.2.22.gc2ac

Re: [PATCH v2 2/3] document --force-rebase

[Johannes Schindelin]

Hi,

On Wed, 18 Mar 2009, Michele Ballabio wrote:

> Words by Junio.

Okay, but who arranged it?  And who wrote the melody in the first place?

Ciao,
Dscho

P.S.: :-)

Re: [PATCH 2/3] document --force-rebase

[Sverre Rabbelier]

Heya,

On Wed, Mar 18, 2009 at 19:05, Michele Ballabio <barra_cuda@katamail.com> wrote:
> Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
> ---
>  Documentation/git-rebase.txt |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)

Awesome, thanks! Perhaps you could, for extra brownie points, add a
line to the --whitespace=fix documentation that it implies
--force-rebase?

-- 
Cheers,

Sverre Rabbelier

[PATCH v3 2/3] document --force-rebase

[Michele Ballabio]

Words by Junio.

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---

On Thursday 19 March 2009, Sverre Rabbelier wrote:
> Awesome, thanks! Perhaps you could, for extra brownie points, add a
> line to the --whitespace=fix documentation that it implies
> --force-rebase?

You're right, I resent 3/3 for the same reason.

 Documentation/git-rebase.txt |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 57bd333..7ffeec8 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -258,10 +258,19 @@ OPTIONS
 	context exist they all must match.  By default no context is
 	ever ignored.
 
+-f::
+--force-rebase::
+	Force the rebase even if the current branch is a descendant
+	of the commit you are rebasing onto.  Normally the command will
+	exit with the message "Current branch is up to date" in such a
+	situation.
+
 --whitespace=<option>::
 	This flag is passed to the 'git-apply' program
 	(see linkgit:git-apply[1]) that applies the patch.
 	Incompatible with the --interactive option.
+	If the option `fix` (or its equivalent `strip`) is used, it implies
+	--force-rebase.
 
 -i::
 --interactive::
-- 
1.6.2.22.gc2ac

[PATCH v3 3/3] rebase: add options passed to git-am

[Michele Ballabio]

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>
---
 Documentation/git-rebase.txt |    6 ++++++
 git-rebase.sh                |    4 ++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 7ffeec8..592ec76 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -272,6 +272,12 @@ OPTIONS
 	If the flag `fix` (or its equivalent `strip`) is used, it implies
 	--force-rebase.
 
+--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]).
+	Both imply --force-rebase.
+
 -i::
 --interactive::
 	Make a list of the commits which are about to be rebased.  Let the
diff --git a/git-rebase.sh b/git-rebase.sh
index e38d68a..b83fd3f 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -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"
 		;;
-- 
1.6.2.22.gc2ac

Re: [PATCH 1/3] rebase: fix typo (force_rebas -> force-rebas)

[Michele Ballabio]

Just a reminder, since this patch was probably dropped.

On Wednesday 18 March 2009, Michele Ballabio wrote:
> Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
> ---
>  git-rebase.sh |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/git-rebase.sh b/git-rebase.sh
> index d38ab0b..e38d68a 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -315,7 +315,7 @@ do
>  	--root)
>  		rebase_root=t
>  		;;
> -	-f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force_rebas|--force-rebase)
> +	-f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase)
>  		force_rebase=t
>  		;;
>  	-*)