Hi, peops. I'm pretty much sure that's a bug. What I did was putting git diff (i needed to tell people that for my changes to start working they needed to aplly message-inline patch to some code which was not under git) in commit message. Like adding: diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 937da74..0e8440d 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -42,7 +42,7 @@ class SettingsController < ApplicationController end def snmp_mibs - render layout: 'ext3' + render layout: 'ext3_2' end def cfg_auth_keys(auth_type=:all) though the commit itself didn't contain that change. So while `git rebase some_branch_name` I started getting: First, rewinding head to replay your work on top of it... Applying: My cool patch. fatal: sha1 information is lacking or useless (app/controllers/settings_controller.rb). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 My cool patch. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". I wasn't able to figure out what was wrong for a very long time, when things came to my mind. Thanks. -- View this message in context: http://git.661346.n2.nabble.com/Git-Bug-diff-in-commit-message-tp6772145p6772145.html Sent from the git mailing list archive at Nabble.com. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html