summaryrefslogtreecommitdiff
path: root/mergesort.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2018-12-11 08:11:35 -0800
committerJunio C Hamano <gitster@pobox.com>2018-12-28 12:49:48 -0800
commit45339f74ef87123ab79831310bf8047cebe5177b (patch)
tree14111c37d5934fd02e6e7556a3c4269038dc6f33 /mergesort.c
parent5400677903bdb852e0ca89e41e009afb8a1b6239 (diff)
downloadgit-45339f74ef87123ab79831310bf8047cebe5177b.tar.gz
am, rebase--merge: do not overlook --skip'ed commits with post-rewrite
The post-rewrite hook is supposed to be invoked for each rewritten commit. The fact that a commit was selected and processed by the rebase operation (even though when we hit an error a user said it had no more useful changes), suggests we should write an entry for it. In particular, let's treat it as an empty commit trivially squashed into its parent. This brings the rebase--am and rebase--merge backends in sync with the behavior of the interactive rebase backend. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergesort.c')
0 files changed, 0 insertions, 0 deletions