[PATCH/RFCv4 1/2] git-rebase -i: add command drop to remove a commit

by mistake. Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr --- Documentation/git-rebase.txt | 3 +++ git-rebase--interactive.sh| 18 ++ t/lib-rebase.sh | 4 ++-- t/t3404-rebase-interactive.sh | 10 ++ 4 files changed, 33

[PATCH/RFCv4 2/2] git rebase -i: warn about removed commits

, warnings are displayed and the rebase is aborted. rebase.missingCommitsCheck defaults to ignore. Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr --- Documentation/config.txt | 10 ++ Documentation/git-rebase.txt | 6 git-rebase--interactive.sh| 82

[PATCH/RFCv5 1/3] git-rebase -i: add command drop to remove a commit

by mistake. Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr --- In t3404, test_rebase_end is introduced, mainly because it will be reused in future tests (in 2/3 and 3/3). Documentation/git-rebase.txt | 3 +++ git-rebase--interactive.sh| 3 ++- t/lib-rebase.sh

[PATCH/RFCv5 2/3] git rebase -i: warn about removed commits

, warnings are displayed and the rebase is stopped. (The user can then use 'git rebase --edit-todo' and 'git rebase --continue', or 'git rebase --abort') rebase.missingCommitsCheck defaults to ignore. Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr --- In git

[PATCH/RFCv5 3/3] git rebase -i: add static check for commands and SHA-1

to avoid doing half of a rebase before finding an error and giving back what's left of the todo list to the user and prompt him to fix when it might be too late for him to do so (he might have to abort and restart the rebase). Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr

[PATCHv6 1/3] git-rebase -i: add command drop to remove a commit

by mistake. Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr --- Documentation/git-rebase.txt | 3 +++ git-rebase--interactive.sh| 3 ++- t/lib-rebase.sh | 4 ++-- t/t3404-rebase-interactive.sh | 16 4 files changed, 23 insertions(+), 3

[PATCHv6 2/3] git rebase -i: warn about removed commits

, warnings are displayed and the rebase is stopped. (The user can then use 'git rebase --edit-todo' and 'git rebase --continue', or 'git rebase --abort') rebase.missingCommitsCheck defaults to ignore. Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr

[PATCHv6 3/3] git rebase -i: add static check for commands and SHA-1

to avoid doing half of a rebase before finding an error and giving back what's left of the todo list to the user and prompt him to fix when it might be too late for him to do so (he might have to abort and restart the rebase). Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr

[PATCH/RFCv2 2/2] git rebase -i: warn about removed commits

, the commits are checked, warnings are displayed but git rebase still proceeds. - When set to error, the commits are checked, warnings are displayed and the rebase is aborted. rebase.checkLevel defaults to ignore. Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr

[PATCH/RFCv2 1/2] git-rebase -i: add command drop to remove a commit

by mistake. Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr --- Documentation/git-rebase.txt | 3 +++ git-rebase--interactive.sh| 3 ++- t/lib-rebase.sh | 4 ++-- t/t3404-rebase-interactive.sh | 11 +++ 4 files changed, 18 insertions(+), 3

[PATCH/RFCv2 0/2] rebase -i : drop command and removed commits

- [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

[PATCH/RFCv2 2/2] git rebase -i: warn about removed commits

, the commits are checked, warnings are displayed but git rebase still proceeds. - When set to error, the commits are checked, warnings are displayed and the rebase is aborted. rebase.checkLevel defaults to ignore. Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr

[PATCH/RFCv2 1/2] git-rebase -i: add command drop to remove a commit

by mistake. Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr --- Documentation/git-rebase.txt | 3 +++ git-rebase--interactive.sh| 3 ++- t/lib-rebase.sh | 4 ++-- t/t3404-rebase-interactive.sh | 11 +++ 4 files changed, 18 insertions(+), 3

[PATCH/RFCv3 1/2] git-rebase -i: add command drop to remove a commit

by mistake. Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr --- Documentation/git-rebase.txt | 3 +++ git-rebase--interactive.sh| 18 ++ t/lib-rebase.sh | 4 ++-- t/t3404-rebase-interactive.sh | 10 ++ 4 files changed, 33

[PATCH/RFCv3 2/2] git rebase -i: warn about removed commits

is done. - When set to warn, the commits are checked, warnings are displayed but git rebase still proceeds. - When set to error, the commits are checked, warnings are displayed and the rebase is aborted. rebase.missingCommitsCheckLevel defaults to ignore. Signed-off-by: Galan Rémi

[PATCH/RFC 2/2] git rebase -i: Warn removed or dupplicated commits

to IGNORED, no checking is done. - When set to WARN, the commits are checked, warnings are displayed but git rebase still proceeds. - When set to ERROR, the commits are checked, warnings are displayed and the rebase is aborted. Signed-off-by: Galan Rémi remi.galan-alfo

[PATCH/RFC 1/2] git-rebase -i: Add key word drop to remove a commit

a commit by mistake. Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr --- Documentation/git-rebase.txt | 3 +++ git-rebase--interactive.sh| 4 t/lib-rebase.sh | 4 ++-- t/t3404-rebase-interactive.sh | 11 +++ 4 files changed, 20 insertions(+), 2

[PATCHv7 3/3] git rebase -i: add static check for commands and SHA-1

to avoid doing half of a rebase before finding an error and giving back what's left of the todo list to the user and prompt him to fix when it might be too late for him to do so (he might have to abort and restart the rebase). Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr

rebase -i: drop, missing commits and static checks

Changes between versions: In t3404: Changed 'test_rebase_end' to 'rebase_setup_and_clean'. Changed the indentation in 'rebase_setup_and_clean'. Changed the names of the branches created in my tests (avoid names like 'tmp'). Added 'test_might_fail' in front of 'git branch -D'. Remove 'test_config

[PATCHv7 1/3] git-rebase -i: add command drop to remove a commit

by mistake. Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr --- Documentation/git-rebase.txt | 3 +++ git-rebase--interactive.sh| 3 ++- t/lib-rebase.sh | 4 ++-- t/t3404-rebase-interactive.sh | 18 ++ 4 files changed, 25 insertions(+), 3

[PATCHv7 2/3] git rebase -i: warn about removed commits

, warnings are displayed and the rebase is stopped. (The user can then use 'git rebase --edit-todo' and 'git rebase --continue', or 'git rebase --abort') rebase.missingCommitsCheck defaults to ignore. Signed-off-by: Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr