{"thread":{"id":"18376","subject":"[PATCH 2/3] document --force-rebase","startedAt":"2009-03-18T18:05:56Z","lastAt":"2009-03-27T18:58:00Z","messageCount":13,"participants":["Michele Ballabio","Junio C Hamano","Johannes Schindelin","Sverre Rabbelier"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"108398","messageId":"1237399558-27289-1-git-send-email-barra_cuda@katamail.com","threadId":"18376","inReplyTo":null,"subject":"[PATCH 1/3] rebase: fix typo (force_rebas -> force-rebas)","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2009-03-18T18:05:56Z","receivedAt":"2009-03-18T18:05:56Z","isPatch":true,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>\n---\n git-rebase.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex d38ab0b..e38d68a 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -315,7 +315,7 @@ do\n \t--root)\n \t\trebase_root=t\n \t\t;;\n-\t-f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force_rebas|--force-rebase)\n+\t-f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase)\n \t\tforce_rebase=t\n \t\t;;\n \t-*)\n-- \n1.6.2.22.gc2ac\n"},{"id":"108396","messageId":"1237399558-27289-2-git-send-email-barra_cuda@katamail.com","threadId":"18376","inReplyTo":"1237399558-27289-1-git-send-email-barra_cuda@katamail.com","subject":"[PATCH 2/3] document --force-rebase","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2009-03-18T18:05:57Z","receivedAt":"2009-03-18T18:05:57Z","isPatch":true,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>\n---\n Documentation/git-rebase.txt |    6 ++++++\n 1 files changed, 6 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 57bd333..6cb902a 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -258,6 +258,12 @@ OPTIONS\n \tcontext exist they all must match.  By default no context is\n \tever ignored.\n \n+-f::\n+--force-rebase::\n+\tForce the rebase even if the current branch is up to date.\n+\tNormally, if the current branch is up to date, the rebase is\n+\taborted.\n+\n --whitespace=<option>::\n \tThis flag is passed to the 'git-apply' program\n \t(see linkgit:git-apply[1]) that applies the patch.\n-- \n1.6.2.22.gc2ac\n"},{"id":"108397","messageId":"1237399558-27289-3-git-send-email-barra_cuda@katamail.com","threadId":"18376","inReplyTo":"1237399558-27289-1-git-send-email-barra_cuda@katamail.com","subject":"[PATCH 3/3] rebase: add options passed to git-am","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2009-03-18T18:05:58Z","receivedAt":"2009-03-18T18:05:58Z","isPatch":true,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"Add the options --committer-date-is-author-date and --ignore-date\nto git-rebase. They were introduced in commit a79ec62d0 for git-am.\n\nSigned-off-by: Michele Ballabio <barra_cuda@katamail.com>\n---\n\nI'm not sure if force_rebase should be set in this case.\n\n Documentation/git-rebase.txt |    5 +++++\n git-rebase.sh                |    3 +++\n 2 files changed, 8 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 6cb902a..457340c 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -269,6 +269,11 @@ OPTIONS\n \t(see linkgit:git-apply[1]) that applies the patch.\n \tIncompatible with the --interactive option.\n \n+--committer-date-is-author-date::\n+--ignore-date::\n+\tThese flags are passed to 'git-am' to easily change the dates\n+\tof the rebased commits (see linkgit:git-am[1]).\n+\n -i::\n --interactive::\n \tMake a list of the commits which are about to be rebased.  Let the\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex e38d68a..d89d71c 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -309,6 +309,9 @@ do\n \t\t\t;;\n \t\tesac\n \t\t;;\n+\t--committer-date-is-author-date|--ignore-date)\n+\t\tgit_am_opt=\"$git_am_opt $1\"\n+\t\t;;\n \t-C*)\n \t\tgit_am_opt=\"$git_am_opt $1\"\n \t\t;;\n-- \n1.6.2.22.gc2ac\n"},{"id":"108405","messageId":"7v7i2mfzgs.fsf@gitster.siamese.dyndns.org","threadId":"18376","inReplyTo":"1237399558-27289-2-git-send-email-barra_cuda@katamail.com","subject":"Re: [PATCH 2/3] document --force-rebase","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-03-18T18:38:43Z","receivedAt":"2009-03-18T18:38:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michele Ballabio <barra_cuda@katamail.com> writes:\n\n> +-f::\n> +--force-rebase::\n> +\tForce the rebase even if the current branch is up to date.\n> +\tNormally, if the current branch is up to date, the rebase is\n> +\taborted.\n> +\n\nFor the sake of brevity we say \"up to date\" in the error message from the\ncommand, but for people who looks up the manual to figure out why their\nrebase is not rebasing with that error message, we may want to explain\nwhat the phrase means in this context.  E.g.\n\n\t... even if the branch is a descendant of the commit you are\n\trebasing onto.  Normally the command will exit with a message\n\t\"Current branch is up to date\" in such a situation.\n"},{"id":"108406","messageId":"7v63i6fzgc.fsf@gitster.siamese.dyndns.org","threadId":"18376","inReplyTo":"1237399558-27289-2-git-send-email-barra_cuda@katamail.com","subject":"Re: [PATCH 2/3] document --force-rebase","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-03-18T18:38:59Z","receivedAt":"2009-03-18T18:38:59Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michele Ballabio <barra_cuda@katamail.com> writes:\n\n> +-f::\n> +--force-rebase::\n> +\tForce the rebase even if the current branch is up to date.\n> +\tNormally, if the current branch is up to date, the rebase is\n> +\taborted.\n> +\n\nFor the sake of brevity we say \"up to date\" in the error message from the\ncommand, but for people who look up the manual to figure out why their\nrebase is not rebasing with that error message, we may want to explain\nwhat the phrase means in this context.  E.g.\n\n\t... even if the branch is a descendant of the commit you are\n\trebasing onto.  Normally the command will exit with a message\n\t\"Current branch is up to date\" in such a situation.\n"},{"id":"108407","messageId":"7v1vsufzbs.fsf@gitster.siamese.dyndns.org","threadId":"18376","inReplyTo":"1237399558-27289-3-git-send-email-barra_cuda@katamail.com","subject":"Re: [PATCH 3/3] rebase: add options passed to git-am","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-03-18T18:41:43Z","receivedAt":"2009-03-18T18:41:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michele Ballabio <barra_cuda@katamail.com> writes:\n\n> Add the options --committer-date-is-author-date and --ignore-date\n> to git-rebase. They were introduced in commit a79ec62d0 for git-am.\n>\n> Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>\n> ---\n>\n> I'm not sure if force_rebase should be set in this case.\n\nGood thinking.\n\nThese are clearly \"I want to change these commit\" request just like\nthe \"--whitespace=fix\" option is, so I think it is probably a good idea.\n"},{"id":"108414","messageId":"1237409619-4229-1-git-send-email-barra_cuda@katamail.com","threadId":"18376","inReplyTo":"7v63i6fzgc.fsf@gitster.siamese.dyndns.org","subject":"[PATCH v2 2/3] document --force-rebase","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2009-03-18T20:53:39Z","receivedAt":"2009-03-18T20:53:39Z","isPatch":true,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"Words by Junio.\n\nSigned-off-by: Michele Ballabio <barra_cuda@katamail.com>\n---\n Documentation/git-rebase.txt |    7 +++++++\n 1 files changed, 7 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 57bd333..276f151 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -258,6 +258,13 @@ OPTIONS\n \tcontext exist they all must match.  By default no context is\n \tever ignored.\n \n+-f::\n+--force-rebase::\n+\tForce the rebase even if the current branch is a descendant\n+\tof the commit you are rebasing onto.  Normally the command will\n+\texit with the message \"Current branch is up to date\" in such a\n+\tsituation.\n+\n --whitespace=<option>::\n \tThis flag is passed to the 'git-apply' program\n \t(see linkgit:git-apply[1]) that applies the patch.\n-- \n1.6.2.22.gc2ac\n"},{"id":"108415","messageId":"1237409629-4289-1-git-send-email-barra_cuda@katamail.com","threadId":"18376","inReplyTo":"7v1vsufzbs.fsf@gitster.siamese.dyndns.org","subject":"[PATCH v2 3/3] rebase: add options passed to git-am","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2009-03-18T20:53:49Z","receivedAt":"2009-03-18T20:53:49Z","isPatch":true,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"Add the options --committer-date-is-author-date and --ignore-date\nto git-rebase. They were introduced in commit a79ec62d0 for git-am.\nThese options imply --force-rebase.\n\nSigned-off-by: Michele Ballabio <barra_cuda@katamail.com>\n---\n Documentation/git-rebase.txt |    5 +++++\n git-rebase.sh                |    4 ++++\n 2 files changed, 9 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 276f151..3d5a066 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -270,6 +270,11 @@ OPTIONS\n \t(see linkgit:git-apply[1]) that applies the patch.\n \tIncompatible with the --interactive option.\n \n+--committer-date-is-author-date::\n+--ignore-date::\n+\tThese flags are passed to 'git-am' to easily change the dates\n+\tof the rebased commits (see linkgit:git-am[1]).\n+\n -i::\n --interactive::\n \tMake a list of the commits which are about to be rebased.  Let the\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex e38d68a..b83fd3f 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -309,6 +309,10 @@ do\n \t\t\t;;\n \t\tesac\n \t\t;;\n+\t--committer-date-is-author-date|--ignore-date)\n+\t\tgit_am_opt=\"$git_am_opt $1\"\n+\t\tforce_rebase=t\n+\t\t;;\n \t-C*)\n \t\tgit_am_opt=\"$git_am_opt $1\"\n \t\t;;\n-- \n1.6.2.22.gc2ac\n"},{"id":"108425","messageId":"alpine.DEB.1.00.0903182214450.10279@pacific.mpi-cbg.de","threadId":"18376","inReplyTo":"1237409619-4229-1-git-send-email-barra_cuda@katamail.com","subject":"Re: [PATCH v2 2/3] document --force-rebase","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-03-18T21:15:22Z","receivedAt":"2009-03-18T21:15:22Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 18 Mar 2009, Michele Ballabio wrote:\n\n> Words by Junio.\n\nOkay, but who arranged it?  And who wrote the melody in the first place?\n\nCiao,\nDscho\n\nP.S.: :-)\n"},{"id":"108513","messageId":"fabb9a1e0903190401k1127dc8ev7704c8a7bd381c99@mail.gmail.com","threadId":"18376","inReplyTo":"1237399558-27289-2-git-send-email-barra_cuda@katamail.com","subject":"Re: [PATCH 2/3] document --force-rebase","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-03-19T11:01:43Z","receivedAt":"2009-03-19T11:01:43Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Wed, Mar 18, 2009 at 19:05, Michele Ballabio <barra_cuda@katamail.com> wrote:\n> Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>\n> ---\n>  Documentation/git-rebase.txt |    6 ++++++\n>  1 files changed, 6 insertions(+), 0 deletions(-)\n\nAwesome, thanks! Perhaps you could, for extra brownie points, add a\nline to the --whitespace=fix documentation that it implies\n--force-rebase?\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"108538","messageId":"1237476528-6040-1-git-send-email-barra_cuda@katamail.com","threadId":"18376","inReplyTo":"fabb9a1e0903190401k1127dc8ev7704c8a7bd381c99@mail.gmail.com","subject":"[PATCH v3 2/3] document --force-rebase","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2009-03-19T15:28:47Z","receivedAt":"2009-03-19T15:28:47Z","isPatch":true,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"Words by Junio.\n\nSigned-off-by: Michele Ballabio <barra_cuda@katamail.com>\n---\n\nOn Thursday 19 March 2009, Sverre Rabbelier wrote:\n> Awesome, thanks! Perhaps you could, for extra brownie points, add a\n> line to the --whitespace=fix documentation that it implies\n> --force-rebase?\n\nYou're right, I resent 3/3 for the same reason.\n\n Documentation/git-rebase.txt |    9 +++++++++\n 1 files changed, 9 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 57bd333..7ffeec8 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -258,10 +258,19 @@ OPTIONS\n \tcontext exist they all must match.  By default no context is\n \tever ignored.\n \n+-f::\n+--force-rebase::\n+\tForce the rebase even if the current branch is a descendant\n+\tof the commit you are rebasing onto.  Normally the command will\n+\texit with the message \"Current branch is up to date\" in such a\n+\tsituation.\n+\n --whitespace=<option>::\n \tThis flag is passed to the 'git-apply' program\n \t(see linkgit:git-apply[1]) that applies the patch.\n \tIncompatible with the --interactive option.\n+\tIf the option `fix` (or its equivalent `strip`) is used, it implies\n+\t--force-rebase.\n \n -i::\n --interactive::\n-- \n1.6.2.22.gc2ac\n"},{"id":"108539","messageId":"1237476528-6040-2-git-send-email-barra_cuda@katamail.com","threadId":"18376","inReplyTo":"fabb9a1e0903190401k1127dc8ev7704c8a7bd381c99@mail.gmail.com","subject":"[PATCH v3 3/3] rebase: add options passed to git-am","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2009-03-19T15:28:48Z","receivedAt":"2009-03-19T15:28:48Z","isPatch":true,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"Add the options --committer-date-is-author-date and --ignore-date\nto git-rebase. They were introduced in commit a79ec62d0 for git-am.\nThese options imply --force-rebase.\n\nSigned-off-by: Michele Ballabio <barra_cuda@katamail.com>\n---\n Documentation/git-rebase.txt |    6 ++++++\n git-rebase.sh                |    4 ++++\n 2 files changed, 10 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 7ffeec8..592ec76 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -272,6 +272,12 @@ OPTIONS\n \tIf the flag `fix` (or its equivalent `strip`) is used, it implies\n \t--force-rebase.\n \n+--committer-date-is-author-date::\n+--ignore-date::\n+\tThese flags are passed to 'git-am' to easily change the dates\n+\tof the rebased commits (see linkgit:git-am[1]).\n+\tBoth imply --force-rebase.\n+\n -i::\n --interactive::\n \tMake a list of the commits which are about to be rebased.  Let the\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex e38d68a..b83fd3f 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -309,6 +309,10 @@ do\n \t\t\t;;\n \t\tesac\n \t\t;;\n+\t--committer-date-is-author-date|--ignore-date)\n+\t\tgit_am_opt=\"$git_am_opt $1\"\n+\t\tforce_rebase=t\n+\t\t;;\n \t-C*)\n \t\tgit_am_opt=\"$git_am_opt $1\"\n \t\t;;\n-- \n1.6.2.22.gc2ac\n"},{"id":"109675","messageId":"200903271958.00795.barra_cuda@katamail.com","threadId":"18376","inReplyTo":"1237399558-27289-1-git-send-email-barra_cuda@katamail.com","subject":"Re: [PATCH 1/3] rebase: fix typo (force_rebas -> force-rebas)","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2009-03-27T18:58:00Z","receivedAt":"2009-03-27T18:58:00Z","isPatch":true,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"Just a reminder, since this patch was probably dropped.\n\nOn Wednesday 18 March 2009, Michele Ballabio wrote:\n> Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>\n> ---\n>  git-rebase.sh |    2 +-\n>  1 files changed, 1 insertions(+), 1 deletions(-)\n> \n> diff --git a/git-rebase.sh b/git-rebase.sh\n> index d38ab0b..e38d68a 100755\n> --- a/git-rebase.sh\n> +++ b/git-rebase.sh\n> @@ -315,7 +315,7 @@ do\n>  \t--root)\n>  \t\trebase_root=t\n>  \t\t;;\n> -\t-f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force_rebas|--force-rebase)\n> +\t-f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase)\n>  \t\tforce_rebase=t\n>  \t\t;;\n>  \t-*)\n"}]}