{"thread":{"id":"40093","subject":"rebase with unknown -s parameter discards commits","startedAt":"2015-08-15T00:01:18Z","lastAt":"2015-08-15T00:01:18Z","messageCount":1,"participants":["Szunti"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"268111","messageId":"55CE814E.1050603@gmail.com","threadId":"40093","inReplyTo":null,"subject":"rebase with unknown -s parameter discards commits","fromName":"Szunti","fromEmail":"szunti@gmail.com","sentAt":"2015-08-15T00:01:18Z","receivedAt":"2015-08-15T00:01:18Z","isPatch":false,"sender":{"key":"szunti@gmail.com","avatar":null},"body":"git version: 2.5.0\nArchlinux\n\nHi,\n\n'git rebase -s nonsense master' gives an error message but still changes \nthe branch.\n\n$git rebase -s nonsense master topic\nFirst, rewinding head to replay your work on top of it...\n/usr/lib/git-core/git-rebase--merge: line 70: git-merge-nonsense: \ncommand not found\nUnknown exit code (127) from command: git-merge-nonsense \n3cf5c040ccda670cc103184a6d7e03fc20293b81^ -- HEAD \n3cf5c040ccda670cc103184a6d7e03fc20293b8\n\nAnd topic is the same as master now.\n\nIf I try to continue\n$git rebase --continue\nAlready applied: 0001 Topic\nAll done.\n\nBut still topic is the same as master.\n\n-----------------------------------------------------\ntopic and master was created with these commands:\n\n$git init\n$echo orig > text\n$git add text\n$git commit -m Orig\n\n$git checkout -b topic\n$echo topic > text\n$git commit -am Topic\n\n$git checkout master\n$echo master > text\n$git commit -am Master\n\n$git rebase -s nonsense master topic\n$git rebase --continue\n\n$git log --oneline\n04d7f1d Master\n0ac994c Orig\n"}]}