2009/6/16 David C. Rankin, J.D.,P.E.
On or about Tuesday 16 June 2009 at approximately 12:29:46 Rafał Miłecki composed:
2009/6/16 David C. Rankin, J.D.,P.E.
: On or about Tuesday 16 June 2009 at approximately 10:47:13 Rafał Miłecki
composed:
git checkout src/rhd_pm.c
Now what? I did that and I'm in vi looking at:
Er, is this already merged/commited...? Just checkout origin/master as new clean branch, as I said :) This will be the easiest.
-- Rafał Miłecki
err, um ... Crap! I have got to "get" better with "git".
Rafal, I'm stuck.
Obviously the fix is simple and it is probably a simple as applying the randr patch.
12:53 alchemy:~/archlinux/apps/radeonhd> git pull Updating 08acc05..8a3fa92 Fast forward src/r600_reg_r6xx.h | 2 +- src/r6xx_accel.c | 1 + src/rhd_atombios.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++- src/rhd_atombios.h | 5 ++ src/rhd_cs.c | 2 +- src/rhd_dig.c | 6 +- src/rhd_driver.c | 144 ++++++++++++++++----------------------------------- src/rhd_id.c | 16 ++++-- src/rhd_lvtma.c | 4 +- src/rhd_mc.c | 7 ++- src/rhd_pll.c | 12 ++++- src/rhd_pm.c | 119 +++++++++++++++++++++++++++++++++++------- src/rhd_pm.h | 6 ++- src/rhd_randr.c | 74 ++++++++++++++++++++++++-- src/rhd_regs.h | 2 - 15 files changed, 389 insertions(+), 146 deletions(-) 12:53 alchemy:~/archlinux/apps/radeonhd> git show-branch [master] randr: Reformat AtomBIOS parameter correctly when setting. 12:53 alchemy:~/archlinux/apps/radeonhd> git show 12:54 alchemy:~/archlinux/apps/radeonhd> git branch * master 12:55 alchemy:~/archlinux/apps/radeonhd> git checkout -t -b clean master/origin fatal: git checkout: updating paths is incompatible with switching branches. Did you intend to checkout 'master/origin' which can not be resolved as commit?
Can you help a brother out? What do I need to do to get back in sync? Thanks.
Try this: git commit -a -m garbages git checkout -t -b clean origin/master git pull make You (or me in instruction) mistaken origin/master with master/origin. -- Rafał Miłecki -- To unsubscribe, e-mail: radeonhd+unsubscribe@opensuse.org For additional commands, e-mail: radeonhd+help@opensuse.org