Skip to content

Instantly share code, notes, and snippets.

@disouzam
Created January 26, 2026 13:06
Show Gist options
  • Select an option

  • Save disouzam/66c0a7c1de97c9e660f38d682e2c1e82 to your computer and use it in GitHub Desktop.

Select an option

Save disouzam/66c0a7c1de97c9e660f38d682e2c1e82 to your computer and use it in GitHub Desktop.
Check correctness of rebase operation
#!/bin/bash
function rebase_check() {
echo -e "Checking if rebase was correct..." > rebase-check.md
echo -e "\n==============================" >> rebase-check.md
echo -e "References before rebase: $1..$2\n" >> rebase-check.md
git fl2 $1 -n1 >> rebase-check.md
echo "" >> rebase-check.md
git fl2 $2 -n1 >> rebase-check.md
echo "" >> rebase-check.md
echo -e "\n==============================" >> rebase-check.md
echo -e "References after rebase: $3..$4\n" >> rebase-check.md
git fl2 $3 -n1 >> rebase-check.md
echo "" >> rebase-check.md
git fl2 $4 -n1 >> rebase-check.md
echo "" >> rebase-check.md
echo "" >> rebase-check.md
get_short_log "$1..$2" >> rebase-check.md
git add rebase-check.md
echo -e "Checking if rebase was correct..." > rebase-check.md
echo -e "\n==============================" >> rebase-check.md
echo -e "References before rebase: $1..$2\n" >> rebase-check.md
git fl2 $1 -n1 >> rebase-check.md
echo "" >> rebase-check.md
git fl2 $2 -n1 >> rebase-check.md
echo "" >> rebase-check.md
echo -e "\n==============================" >> rebase-check.md
echo -e "References after rebase: $3..$4\n" >> rebase-check.md
git fl2 $3 -n1 >> rebase-check.md
echo "" >> rebase-check.md
git fl2 $4 -n1 >> rebase-check.md
echo "" >> rebase-check.md
echo "" >> rebase-check.md
get_short_log "$3..$4" >> rebase-check.md
}
@disouzam
Copy link
Author

How to use

rebase_check {commit_hash_1} {commit_hash_2} {commit_hash_3} {commit_hash_4}

where
{commit_hash_1}: base of changes before rebase
{commit_hash_2}: tip of rebased branch before rebase
{commit_hash_3}: base of changes after rebase
{commit_hash_4}: tip of rebased branch after rebase

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment