git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* git rebase -i <first_commit_in_repository>
@ 2009-10-26 17:14 eschvoca
  2009-10-26 17:24 ` Mike Hommey
  2009-10-26 17:25 ` Erik Faye-Lund
  0 siblings, 2 replies; 9+ messages in thread
From: eschvoca @ 2009-10-26 17:14 UTC (permalink / raw)
  To: git

Hi,

Is there a way to rewrite history, including the first commit.  It
seems that the first commit can not be modified with a rebase.

Cheers.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: git rebase -i <first_commit_in_repository>
  2009-10-26 17:14 git rebase -i <first_commit_in_repository> eschvoca
@ 2009-10-26 17:24 ` Mike Hommey
  2009-10-26 17:25 ` Erik Faye-Lund
  1 sibling, 0 replies; 9+ messages in thread
From: Mike Hommey @ 2009-10-26 17:24 UTC (permalink / raw)
  To: eschvoca; +Cc: git

On Mon, Oct 26, 2009 at 01:14:47PM -0400, eschvoca wrote:
> Hi,
> 
> Is there a way to rewrite history, including the first commit.  It
> seems that the first commit can not be modified with a rebase.

Unfortunately, there is no way to do so, except by hand, by checking out
the first commit, amend it, and then rebase.

Mike

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: git rebase -i <first_commit_in_repository>
  2009-10-26 17:14 git rebase -i <first_commit_in_repository> eschvoca
  2009-10-26 17:24 ` Mike Hommey
@ 2009-10-26 17:25 ` Erik Faye-Lund
  2009-10-26 18:08   ` eschvoca
  1 sibling, 1 reply; 9+ messages in thread
From: Erik Faye-Lund @ 2009-10-26 17:25 UTC (permalink / raw)
  To: eschvoca; +Cc: git

On Mon, Oct 26, 2009 at 6:14 PM, eschvoca <eschvoca@gmail.com> wrote:
> Hi,
>
> Is there a way to rewrite history, including the first commit.  It
> seems that the first commit can not be modified with a rebase.

This question is answered in the FAQ:
http://git.or.cz/gitwiki/GitFaq#HowdoIedittherootcommit.3F

-- 
Erik "kusma" Faye-Lund

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: git rebase -i <first_commit_in_repository>
  2009-10-26 17:25 ` Erik Faye-Lund
@ 2009-10-26 18:08   ` eschvoca
  2009-10-26 20:28     ` Dirk Süsserott
  2009-10-26 21:11     ` Johannes Schindelin
  0 siblings, 2 replies; 9+ messages in thread
From: eschvoca @ 2009-10-26 18:08 UTC (permalink / raw)
  To: kusmabite; +Cc: git

On Mon, Oct 26, 2009 at 1:25 PM, Erik Faye-Lund
<kusmabite@googlemail.com> wrote:
> On Mon, Oct 26, 2009 at 6:14 PM, eschvoca <eschvoca@gmail.com> wrote:
>> Hi,
>>
>> Is there a way to rewrite history, including the first commit.  It
>> seems that the first commit can not be modified with a rebase.
>
> This question is answered in the FAQ:
> http://git.or.cz/gitwiki/GitFaq#HowdoIedittherootcommit.3F
>

Thanks Eric.  Hopefully someone will enhance rebase to handle the root commit.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: git rebase -i <first_commit_in_repository>
  2009-10-26 18:08   ` eschvoca
@ 2009-10-26 20:28     ` Dirk Süsserott
  2009-10-26 20:47       ` Allan Caffee
  2009-10-26 21:11     ` Johannes Schindelin
  1 sibling, 1 reply; 9+ messages in thread
From: Dirk Süsserott @ 2009-10-26 20:28 UTC (permalink / raw)
  To: eschvoca; +Cc: kusmabite, git

Am 26.10.2009 19:08 schrieb eschvoca:
> On Mon, Oct 26, 2009 at 1:25 PM, Erik Faye-Lund
> <kusmabite@googlemail.com> wrote:
>> On Mon, Oct 26, 2009 at 6:14 PM, eschvoca <eschvoca@gmail.com> wrote:
>>> Hi,
>>>
>>> Is there a way to rewrite history, including the first commit.  It
>>> seems that the first commit can not be modified with a rebase.
>> This question is answered in the FAQ:
>> http://git.or.cz/gitwiki/GitFaq#HowdoIedittherootcommit.3F
>>
> 
> Thanks Eric.  Hopefully someone will enhance rebase to handle the root commit.

Hi,

probably my approach could help you in the future: When I create a new 
repo (git init) I firstly create an initial commit with nothing else 
than an initial commit, i.e.:

$ git init
$ echo "initial" > initial.commit
$ git add initial.commit
$ git commit -m "Initial commit"

and then secondly

$ git add .
$ git commit -m "*REAL* initial commit"

Afterwards I have a repo with an initial commit that only contains one 
file (initial.commit) and the "real" initial commits thereafter. Maybe 
that's a solution for you.

Cheers,
     Dirk

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: git rebase -i <first_commit_in_repository>
  2009-10-26 20:28     ` Dirk Süsserott
@ 2009-10-26 20:47       ` Allan Caffee
  2009-10-28 19:24         ` Dirk Süsserott
  0 siblings, 1 reply; 9+ messages in thread
From: Allan Caffee @ 2009-10-26 20:47 UTC (permalink / raw)
  To: Dirk Süsserott; +Cc: eschvoca, kusmabite, git

2009/10/26 Dirk Süsserott <newsletter@dirk.my1.cc>:
> Am 26.10.2009 19:08 schrieb eschvoca:
> Hi,
>
> probably my approach could help you in the future: When I create a new repo
> (git init) I firstly create an initial commit with nothing else than an
> initial commit, i.e.:
>
> $ git init
> $ echo "initial" > initial.commit
> $ git add initial.commit
> $ git commit -m "Initial commit"

I don't think this is actually necessary.  You should just be able to do:
$ git init
$ git commit --allow-empty -m "Initial commit (empty)"

--
Allan

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: git rebase -i <first_commit_in_repository>
  2009-10-26 18:08   ` eschvoca
  2009-10-26 20:28     ` Dirk Süsserott
@ 2009-10-26 21:11     ` Johannes Schindelin
  2009-10-27  0:27       ` eschvoca
  1 sibling, 1 reply; 9+ messages in thread
From: Johannes Schindelin @ 2009-10-26 21:11 UTC (permalink / raw)
  To: eschvoca; +Cc: kusmabite, git

[-- Attachment #1: Type: TEXT/PLAIN, Size: 660 bytes --]

Hi,

On Mon, 26 Oct 2009, eschvoca wrote:

> On Mon, Oct 26, 2009 at 1:25 PM, Erik Faye-Lund
> <kusmabite@googlemail.com> wrote:
> > On Mon, Oct 26, 2009 at 6:14 PM, eschvoca <eschvoca@gmail.com> wrote:
> >> Hi,
> >>
> >> Is there a way to rewrite history, including the first commit.  It
> >> seems that the first commit can not be modified with a rebase.
> >
> > This question is answered in the FAQ:
> > http://git.or.cz/gitwiki/GitFaq#HowdoIedittherootcommit.3F
> 
> Thanks Eric.  Hopefully someone will enhance rebase to handle the root 
> commit.

If you cannot do it yourself, you can always offer to bribe^Wpay somebody 
to do it for you.

Ciao,
Dscho

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: git rebase -i <first_commit_in_repository>
  2009-10-26 21:11     ` Johannes Schindelin
@ 2009-10-27  0:27       ` eschvoca
  0 siblings, 0 replies; 9+ messages in thread
From: eschvoca @ 2009-10-27  0:27 UTC (permalink / raw)
  To: Johannes Schindelin; +Cc: kusmabite, git

Hi,

On Mon, Oct 26, 2009 at 5:11 PM, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> Hi,
>
> On Mon, 26 Oct 2009, eschvoca wrote:
>
>> On Mon, Oct 26, 2009 at 1:25 PM, Erik Faye-Lund
>> <kusmabite@googlemail.com> wrote:
>> > On Mon, Oct 26, 2009 at 6:14 PM, eschvoca <eschvoca@gmail.com> wrote:
>> >> Hi,
>> >>
>> >> Is there a way to rewrite history, including the first commit.  It
>> >> seems that the first commit can not be modified with a rebase.
>> >
>> > This question is answered in the FAQ:
>> > http://git.or.cz/gitwiki/GitFaq#HowdoIedittherootcommit.3F
>>
>> Thanks Eric.  Hopefully someone will enhance rebase to handle the root
>> commit.
>
> If you cannot do it yourself, you can always offer to bribe^Wpay somebody
> to do it for you.
>
> Ciao,
> Dscho
>

I can do the workaround myself but not the production ready patch.
Right now the only bribe I can offer is that it might be less work
writing the patch than supporting this corner case with answering
questions and writing a FAQ entry about it.  It also would make the
awesome rebase -i even awesomer :)  I know, a disappointing bribe but
from a thankful user.

Thanks

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: git rebase -i <first_commit_in_repository>
  2009-10-26 20:47       ` Allan Caffee
@ 2009-10-28 19:24         ` Dirk Süsserott
  0 siblings, 0 replies; 9+ messages in thread
From: Dirk Süsserott @ 2009-10-28 19:24 UTC (permalink / raw)
  To: Allan Caffee; +Cc: Dirk Süsserott, eschvoca, kusmabite, git

Am 26.10.2009 21:47 schrieb Allan Caffee:
> 2009/10/26 Dirk Süsserott <newsletter@dirk.my1.cc>:
>> Am 26.10.2009 19:08 schrieb eschvoca:
>> Hi,
>>
>> probably my approach could help you in the future: When I create a new repo
>> (git init) I firstly create an initial commit with nothing else than an
>> initial commit, i.e.:
>>
>> $ git init
>> $ echo "initial" > initial.commit
>> $ git add initial.commit
>> $ git commit -m "Initial commit"
> 
> I don't think this is actually necessary.  You should just be able to do:
> $ git init
> $ git commit --allow-empty -m "Initial commit (empty)"
> 

Allan,

that works great and is not as cumbersome as my solution.
Thank you!

Dirk

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2009-10-28 19:25 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-26 17:14 git rebase -i <first_commit_in_repository> eschvoca
2009-10-26 17:24 ` Mike Hommey
2009-10-26 17:25 ` Erik Faye-Lund
2009-10-26 18:08   ` eschvoca
2009-10-26 20:28     ` Dirk Süsserott
2009-10-26 20:47       ` Allan Caffee
2009-10-28 19:24         ` Dirk Süsserott
2009-10-26 21:11     ` Johannes Schindelin
2009-10-27  0:27       ` eschvoca

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).