[Development] Recover from a bad rebase (incorrect squash)

2013-10-21 Thread Mandeep Sandhu
Hi All, Is there a safe to recover from a bad rebase ? I've squashed commits incorrectly. Situation before rebase was: (oldest) A - B - C - D (newest) I wanted to squash B D together so during interactive rebase, I chose 'squash' options for B D (wrongly assuming that these 2 would get

Re: [Development] Recover from a bad rebase (incorrect squash)

2013-10-21 Thread Koehne Kai
a bad rebase (incorrect squash) Hi All, Is there a safe to recover from a bad rebase ? I've squashed commits incorrectly. Use 'git reflog' to get the HEAD of the commit before the squash, and use git reset to restore it. Regards Kai

Re: [Development] Recover from a bad rebase (incorrect squash)

2013-10-21 Thread Mandeep Sandhu
Hi All, Is there a safe to recover from a bad rebase ? I've squashed commits incorrectly. Use 'git reflog' to get the HEAD of the commit before the squash, and use git reset to restore it. Thanks Kai! That fixed it! -mandeep Regards Kai

Re: [Development] Recover from a bad rebase (incorrect squash)

2013-10-21 Thread Konstantin Tokarev
21.10.2013, 16:06, Mandeep Sandhu mandeepsandhu@gmail.com:  Hi All,  Is there a safe to recover from a bad rebase ? I've squashed commits  incorrectly.  Use 'git reflog' to get the HEAD of the commit before the squash, and use git reset to restore it. Thanks Kai! That fixed it!