On Sat, Mar 21, 2015 at 6:01 PM, Alexander Potashev <aspotas...@gmail.com> wrote: > 2015-03-21 1:50 GMT+03:00 Luigi Toscano <luigi.tosc...@tiscali.it>: >> That's not a merge commit: it even says "Squashed commit of the following:", >> so all the commits have been merged together and applied on top of master, if >> I see the history correctly. The frameworks branch is still there, >> independent >> from master. >> You can track it locally as usual with: >> git checkout -t remotes/origin/frameworks > > Luigi, Ben, > > Thanks for the clarification on merging as a squashed commit. > > I'm pretty sure there's no frameworks branch anymore because: > 1. The "git checkout" command you suggested doesn't work for me, Git says > "Did you intend to checkout 'remotes/origin/frameworks' which can not > be resolved as commit?", even after I did all the "git remote update" > / "git fetch". > 2. It's missing from the output of "git branch -a". > 3. The KWordQuiz project page [1] shows no "frameworks" branch in the > combo box. > > Ben, can you please clarify how to fetch those backups? I don't see > any relevant branches by running "git branch -a".
Backups can be retrieved by running something along these lines I believe: git fetch <remote name> +refs/backups/*:refs/backups/* To get a listing of backup refs you've retrieved, you can run: git ls-remote . | grep refs/backups/ The names of backup refs take the form of <type>-<name>-<timestamp> So a branch named frameworks could be found at refs/backups/branch-frameworks-<timestamp> where <timestamp> is when it was deleted. > > [1] https://projects.kde.org/projects/kde/kdeedu/kwordquiz/repository > > -- > Alexander Potashev Regards, Ben > >>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe << >> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
