summaryrefslogtreecommitdiff
path: root/t/t5536-fetch-conflicts.sh
diff options
context:
space:
mode:
authorLibravatar Galan Rémi <remi.galan-alfonso@ensimag.grenoble-inp.fr>2015-06-29 22:20:31 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-30 12:14:25 -0700
commit370799596081e1d1f862e42305ba8119183bde94 (patch)
tree4acfcfbf09f3783608a6cb8b58b89cb2c8e8d5c5 /t/t5536-fetch-conflicts.sh
parentgit-rebase -i: add command "drop" to remove a commit (diff)
downloadtgif-370799596081e1d1f862e42305ba8119183bde94.tar.xz
git rebase -i: warn about removed commits
Check if commits were removed (i.e. a line was deleted) and print warnings or stop git rebase depending on the value of the configuration variable rebase.missingCommitsCheck. This patch gives the user the possibility to avoid silent loss of information (losing a commit through deleting the line in this case) if he wants. Add the configuration variable rebase.missingCommitsCheck. - When unset or set to "ignore", 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 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-alfonso@ensimag.grenoble-inp.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5536-fetch-conflicts.sh')
0 files changed, 0 insertions, 0 deletions