{"thread":{"id":"39456","subject":"Re: [PATCH/RFC 1/2] git-rebase -i: Add key word \"drop\" to remove a commit","startedAt":"2015-05-29T08:33:31Z","lastAt":"2015-05-29T15:36:14Z","messageCount":2,"participants":["Remi Galan Alfonso","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"262396","messageId":"1416141686.132444.1432888411621.JavaMail.zimbra@ensimag.grenoble-inp.fr","threadId":"39456","inReplyTo":"1836557143.132299.1432888016868.JavaMail.zimbra@ensimag.grenoble-inp.fr","subject":"Re: [PATCH/RFC 1/2] git-rebase -i: Add key word \"drop\" to remove a commit","fromName":"Remi Galan Alfonso","fromEmail":"remi.galan-alfonso@ensimag.grenoble-inp.fr","sentAt":"2015-05-29T08:33:31Z","receivedAt":"2015-05-29T08:33:31Z","isPatch":true,"sender":{"key":"remi.galan-alfonso@ensimag.grenoble-inp.fr","avatar":"https://avatars.githubusercontent.com/u/12509162?v=4"},"body":"At first we wanted a clear indication about removing a commit in\nrebase -i. We didn't know about the noop command.\n - 'noop' does the same thing as 'drop' but for the user deleting a\n   commit through 'noop' doesn't seem to be the proper way to use this\n   command. Moreover 'noop' is not documented (especially it is not\n   shown in the short help that is display in the editor during the\n   rebase -i)\n - Commenting the line does the same but will cause problems with the\n   second part of the patch (warn about removed commits) because the\n   line is then not taken into consideration.\n\nWe wanted to add the 'drop' command because we wanted a way for\nclearly deleting a commit (and also for the second part of the patch)\nand there is no clear way so far.\n"},{"id":"262425","messageId":"xmqqwpzre6q9.fsf@gitster.dls.corp.google.com","threadId":"39456","inReplyTo":"1416141686.132444.1432888411621.JavaMail.zimbra@ensimag.grenoble-inp.fr","subject":"Re: [PATCH/RFC 1/2] git-rebase -i: Add key word \"drop\" to remove a commit","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-05-29T15:36:14Z","receivedAt":"2015-05-29T15:36:14Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>\nwrites:\n\n> At first we wanted a clear indication about removing a commit in\n> rebase -i. We didn't know about the noop command.\n>  - 'noop' does the same thing as 'drop' but for the user deleting a\n>    commit through 'noop' doesn't seem to be the proper way to use this\n>    command. Moreover 'noop' is not documented (especially it is not\n>    shown in the short help that is display in the editor during the\n>    rebase -i)\n\nAs Matthieu said elsewhere during the discussion, 'noop' is merely\nto ignore everything that follows (so 'noop stupid git' does not\nmean \"ignore commit identified by 'stupid git'\") and the only reason\nwhy it exists is as a hack to have a way to make a non-empty todo\nlist, because an empty todo list means \"do not do anything, not even\nrewinding to the onto commit\".\n\nAs such, I actually think it is a mistake to consider 'noop' as\n\"drop _this_ commit\"; the remainder of the line that begins with\n'noop' does not name any commit.\n"}]}