-
Notifications
You must be signed in to change notification settings - Fork 0
Description
git init
echo 'hello\nworld' > file.txt
git add file.txt
git commit -m 'initial'
echo a > requirements.txt
git add requirements.txt
git commit -m "requirements"
git switch -c feature
echo again >> file.txt
echo b >> requirements.txt
git add file.txt requirements.txt
git commit -m "Adding many"
echo a > requirements.txt
git add requirements.txt
git commit -m "Removing some"
git switch master
echo b >> requirements.txt
git add requirements.txt
git commit -m "Adding some"
echo a > requirements.txt
git add requirements.txt
git commit -m "Removing all"
git show | git patch-id
git switch feature
git show | git patch-id
git rebase -i master
b is present in requirements.txt
when it is not present in either of the branches before rebase!!
(the commit is not even presented when doing git rebase --interactive! because it has the same patch-id
git show | git patch-id)