From: Neil Horman Date: Fri, 20 Apr 2012 14:36:17 +0000 (-0400) Subject: git-rebase: add keep_empty flag X-Git-Tag: v1.7.11-rc0~80^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/90e1818f9a06015159712e204dd90868e0a6c421?hp=90e1818f9a06015159712e204dd90868e0a6c421 git-rebase: add keep_empty flag Add a command line switch to git-rebase to allow a user the ability to specify that they want to keep any commits in a series that are empty. When git-rebase's type is am, then this option will automatically keep any commit that has a tree object identical to its parent. This patch changes the default behavior of interactive rebases as well. With this patch, git-rebase -i will produce a revision set passed to git-revision-editor, in which empty commits are commented out. Empty commits may be kept manually by uncommenting them. If the new --keep-empty option is used in an interactive rebase the empty commits will automatically all be uncommented in the editor. Signed-off-by: Neil Horman Signed-off-by: Junio C Hamano ---