{"thread":{"id":"19332","subject":"rebase edit handling","startedAt":"2009-05-13T06:51:33Z","lastAt":"2009-05-13T09:52:07Z","messageCount":4,"participants":["Nguyen Thai Ngoc Duy","Anders Melchiorsen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"113728","messageId":"fcaeb9bf0905122351y3a1235e8s5cc9b83c225ca9c6@mail.gmail.com","threadId":"19332","inReplyTo":null,"subject":"rebase edit handling","fromName":"Nguyen Thai Ngoc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2009-05-13T06:51:33Z","receivedAt":"2009-05-13T06:51:33Z","isPatch":false,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Hi,\n\nCould we unit the way to squash/edit commits in rebase? If I squash a\ncommit it, I need to to update the index and continue rebase. If I\nedit a commit, I need to amend that commit. The problem is when I have\na few edits/squashes in the same rebase, I easily get confused and do\n\"commit --amend\" on squash too.\n-- \nDuy\n"},{"id":"113729","messageId":"fcaeb9bf0905122359s28a2229bwfbc4aa18cad45227@mail.gmail.com","threadId":"19332","inReplyTo":"fcaeb9bf0905122351y3a1235e8s5cc9b83c225ca9c6@mail.gmail.com","subject":"Re: rebase edit handling","fromName":"Nguyen Thai Ngoc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2009-05-13T06:59:28Z","receivedAt":"2009-05-13T06:59:28Z","isPatch":false,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Wed, May 13, 2009 at 4:51 PM, Nguyen Thai Ngoc Duy <pclouds@gmail.com> wrote:\n> Hi,\n>\n> Could we unit the way to squash/edit commits in rebase? If I squash a\n\nSorry I meant \"unique\"\n-- \nDuy\n"},{"id":"113741","messageId":"589ffd8942fd21b6f727163f78592381@mail.hotelhot.dk","threadId":"19332","inReplyTo":"fcaeb9bf0905122351y3a1235e8s5cc9b83c225ca9c6@mail.gmail.com","subject":"Re: rebase edit handling","fromName":"Anders Melchiorsen","fromEmail":"mail@cup.kalibalik.dk","sentAt":"2009-05-13T08:18:27Z","receivedAt":"2009-05-13T08:18:27Z","isPatch":false,"sender":{"key":"mail@cup.kalibalik.dk","avatar":null},"body":"On Wed, 13 May 2009 16:51:33 +1000, Nguyen Thai Ngoc Duy\n<pclouds@gmail.com>\nwrote:\n\n> Could we unit the way to squash/edit commits in rebase? If I squash a\n> commit it, I need to to update the index and continue rebase. If I\n> edit a commit, I need to amend that commit. The problem is when I have\n> a few edits/squashes in the same rebase, I easily get confused and do\n> \"commit --amend\" on squash too.\n\nA squash does not leave you at the prompt, unless you abort the editor\nwith the concatenated commit messages. So where does your confusion\ncome from?\n\nAnyway, here is a (fruitless) thread on the confusing UI of interactive\nrebase:\n\n  http://thread.gmane.org/gmane.comp.version-control.git/105738\n\nMaybe it answers your question in some way.\n\n\nAnders.\n"},{"id":"113755","messageId":"fcaeb9bf0905130252t2a55b742j425d121eb06b9193@mail.gmail.com","threadId":"19332","inReplyTo":"589ffd8942fd21b6f727163f78592381@mail.hotelhot.dk","subject":"Re: rebase edit handling","fromName":"Nguyen Thai Ngoc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2009-05-13T09:52:07Z","receivedAt":"2009-05-13T09:52:07Z","isPatch":false,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Wed, May 13, 2009 at 6:18 PM, Anders Melchiorsen\n<mail@cup.kalibalik.dk> wrote:\n> On Wed, 13 May 2009 16:51:33 +1000, Nguyen Thai Ngoc Duy\n> <pclouds@gmail.com>\n> wrote:\n>\n>> Could we unit the way to squash/edit commits in rebase? If I squash a\n>> commit it, I need to to update the index and continue rebase. If I\n>> edit a commit, I need to amend that commit. The problem is when I have\n>> a few edits/squashes in the same rebase, I easily get confused and do\n>> \"commit --amend\" on squash too.\n>\n> A squash does not leave you at the prompt, unless you abort the editor\n> with the concatenated commit messages. So where does your confusion\n> come from?\n\nHmm.. I was confused even when writing mail :P No not squash, actually\nconflicts.\n\n> Anyway, here is a (fruitless) thread on the confusing UI of interactive\n> rebase:\n>\n>  http://thread.gmane.org/gmane.comp.version-control.git/105738\n>\n> Maybe it answers your question in some way.\n\nYes, looks interesting.\n\n-- \nDuy\n"}]}