- [PATCH 1/2] git-rebase -i: add command "drop" to remove a commit The 'drop' command is added as a way to explicitely remove commits in git rebase -i. This patch does not prevent users from commenting the line, removing the line or using the 'noop' command if they want to. While the 'noop' command has the same effect, it doesn't seem to be the right use for it since 'noop' merely ignores everything that follows, in particular writing 'noop <SHA-1> <text>' can be confusing. Commenting a line also has the same effect but the 2/2 part of the patch is not made for working correctly with comments (though it still works with 'noop'). This command is inspired by the command 'drop' in histedit of Mercurial (though in the idea, it is not made to make migrants from Mercurial feel better but rather because it seems like a good idea). For the 'drop' command, maybe instead of just doing the same thing as noop, checking if the SHA-1 that supposedly follow does exist could be a good idea.
- [PATCH 2/2] git rebase -i: warn about removed commits Since the default behaviour is 'ignore', meaning that no checking is done and no warning is displayed, users that are used to remove the lines to remove a commit can still do so without changing their configuration. However this patch gives the user the possibility to avoid silent loss of information if he wants. Regarding the comments of v1 : The dupplicated commits are not checked anymore ((about the review by Eric Sunshine) thus the error case stays within the warning test, now that we only have one test for warnings). The list of removed commits is now shown in the format '<short SHA-1> <commit-message>' instead of '<full SHA-1>', this was done following an idea given by Matthieu Moy outside of the mailing list. Because of this some code have been added and modified and thus need reviewing. A test has been added to check the correct behaviour of the error configuration. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
