Merge branch 'gr/rebase-i-drop-warn'
commit3a760cad7952ce5d17ff77a8f376aaa35299dfa7
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:22 +0000 (3 11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:22 +0000 (3 11:01 -0700)
tree42b5f7541479c4a798d90f2ffdf361edff5ffc66
parent720e20eb68a476d43e59b9bd568da6cc4932a5ef
parent804098bb30a5339cccb0be981a3e876245aa0ae5
Merge branch 'gr/rebase-i-drop-warn'

Add "drop commit-object-name subject" command as another way to
skip replaying of a commit in "rebase -i", and then punish those
who do not use it (and instead just remove the lines) by throwing
a warning.

* gr/rebase-i-drop-warn:
  git rebase -i: add static check for commands and SHA-1
  git rebase -i: warn about removed commits
  git-rebase -i: add command "drop" to remove a commit
Documentation/config.txt
Documentation/git-rebase.txt
git-rebase--interactive.sh
t/t3404-rebase-interactive.sh