# rebase edit handling 4 messages from 2009-05-13 to 2009-05-13. Participants: Nguyen Thai Ngoc Duy, Anders Melchiorsen. Thread: https://gitlist.dev/t/19332 ## Nguyen Thai Ngoc Duy, 2009-05-13 06:51 Subject: rebase edit handling Message-ID: URL: https://gitlist.dev/e/fcaeb9bf0905122351y3a1235e8s5cc9b83c225ca9c6%40mail.gmail.com ``` Hi, Could we unit the way to squash/edit commits in rebase? If I squash a commit it, I need to to update the index and continue rebase. If I edit a commit, I need to amend that commit. The problem is when I have a few edits/squashes in the same rebase, I easily get confused and do "commit --amend" on squash too. -- Duy ``` ## Nguyen Thai Ngoc Duy, 2009-05-13 06:59 Subject: Re: rebase edit handling Message-ID: URL: https://gitlist.dev/e/fcaeb9bf0905122359s28a2229bwfbc4aa18cad45227%40mail.gmail.com In-Reply-To: ``` On Wed, May 13, 2009 at 4:51 PM, Nguyen Thai Ngoc Duy wrote: > Hi, > > Could we unit the way to squash/edit commits in rebase? If I squash a Sorry I meant "unique" -- Duy ``` ## Anders Melchiorsen, 2009-05-13 08:18 Subject: Re: rebase edit handling Message-ID: <589ffd8942fd21b6f727163f78592381@mail.hotelhot.dk> URL: https://gitlist.dev/e/589ffd8942fd21b6f727163f78592381%40mail.hotelhot.dk In-Reply-To: ``` On Wed, 13 May 2009 16:51:33 +1000, Nguyen Thai Ngoc Duy wrote: > Could we unit the way to squash/edit commits in rebase? If I squash a > commit it, I need to to update the index and continue rebase. If I > edit a commit, I need to amend that commit. The problem is when I have > a few edits/squashes in the same rebase, I easily get confused and do > "commit --amend" on squash too. A squash does not leave you at the prompt, unless you abort the editor with the concatenated commit messages. So where does your confusion come from? Anyway, here is a (fruitless) thread on the confusing UI of interactive rebase: http://thread.gmane.org/gmane.comp.version-control.git/105738 Maybe it answers your question in some way. Anders. ``` ## Nguyen Thai Ngoc Duy, 2009-05-13 09:52 Subject: Re: rebase edit handling Message-ID: URL: https://gitlist.dev/e/fcaeb9bf0905130252t2a55b742j425d121eb06b9193%40mail.gmail.com In-Reply-To: <589ffd8942fd21b6f727163f78592381@mail.hotelhot.dk> ``` On Wed, May 13, 2009 at 6:18 PM, Anders Melchiorsen wrote: > On Wed, 13 May 2009 16:51:33 +1000, Nguyen Thai Ngoc Duy > > wrote: > >> Could we unit the way to squash/edit commits in rebase? If I squash a >> commit it, I need to to update the index and continue rebase. If I >> edit a commit, I need to amend that commit. The problem is when I have >> a few edits/squashes in the same rebase, I easily get confused and do >> "commit --amend" on squash too. > > A squash does not leave you at the prompt, unless you abort the editor > with the concatenated commit messages. So where does your confusion > come from? Hmm.. I was confused even when writing mail :P No not squash, actually conflicts. > Anyway, here is a (fruitless) thread on the confusing UI of interactive > rebase: > >  http://thread.gmane.org/gmane.comp.version-control.git/105738 > > Maybe it answers your question in some way. Yes, looks interesting. -- Duy ```