diff options
author | Charvi Mendiratta <charvi077@gmail.com> | 2021-01-29 18:20:48 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-01-29 23:21:56 (GMT) |
commit | 1d410cd8c25978c1591a7d35c9077745146c6129 (patch) | |
tree | 5bee0ffb629bcff9bac4458639d17ee4587f50d7 /t/t3437 | |
parent | 9e3cebd97cbd47909e683e617d5ffa2781f0adaa (diff) | |
download | git-1d410cd8c25978c1591a7d35c9077745146c6129.zip git-1d410cd8c25978c1591a7d35c9077745146c6129.tar.gz git-1d410cd8c25978c1591a7d35c9077745146c6129.tar.bz2 |
t3437: test script for fixup [-C|-c] options in interactive rebase
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Charvi Mendiratta <charvi077@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3437')
-rw-r--r-- | t/t3437/expected-combined-message | 21 | ||||
-rw-r--r-- | t/t3437/expected-squash-message | 51 |
2 files changed, 72 insertions, 0 deletions
diff --git a/t/t3437/expected-combined-message b/t/t3437/expected-combined-message new file mode 100644 index 0000000..a26cfb2 --- /dev/null +++ b/t/t3437/expected-combined-message @@ -0,0 +1,21 @@ +# This is a combination of 4 commits. +# This is the 1st commit message: + +B + +# This is the commit message #2: + +# amend! B + +new subject + +new +body + +# The commit message #3 will be skipped: + +# A2 + +# This is the commit message #4: + +A3 diff --git a/t/t3437/expected-squash-message b/t/t3437/expected-squash-message new file mode 100644 index 0000000..ab2434f --- /dev/null +++ b/t/t3437/expected-squash-message @@ -0,0 +1,51 @@ +# This is a combination of 6 commits. +# The 1st commit message will be skipped: + +# B +# +# Signed-off-by: Rebase Committer <rebase.committer@example.com> + +# The commit message #2 will be skipped: + +# fixup! B + +# The commit message #3 will be skipped: + +# amend! B +# +# B +# +# edited 1 +# +# Signed-off-by: Rebase Committer <rebase.committer@example.com> + +# This is the commit message #4: + +# amend! amend! B + +B + +edited 1 + +edited 2 + +Signed-off-by: Rebase Committer <rebase.committer@example.com> + +# This is the commit message #5: + +# squash! amend! amend! B + +edited squash + +# This is the commit message #6: + +# amend! amend! amend! B + +B + +edited 1 + +edited 2 + +edited 3 +squashed |