|
||
|
#261
|
||||
|
||||
|
git add (ruta archivo) (añade todos los que te aparezcan en rojo) git commit -a y luego sigue |
|
|
|
#262
|
||||
|
||||
|
Lo de flood descarado no lo digo por ti si no por ese usuario que se marca tres, cuatro e incluso cinco mensajes sin editar. Para eso existe la herramienta para editar. |
| Gracias de parte de: | ||
|
#263
|
||||
|
||||
|
Siento la confusión BitratE, no estoy fino hoy.... Estoy como Sansón, me han cortado el pelo y no estoy afinao jajaja.
__________________
![]()
|
|
#264
|
||||
|
||||
|
|
| Gracias de parte de: | ||
|
#265
|
||||
|
||||
|
__________________
![]()
|
| Gracias de parte de: | ||
|
#267
|
||||
|
||||
|
|
|
#269
|
||||
|
||||
|
Para que te saliera el error del cherry-pick tenias que tener alguna cambio fuera de commit o sin añadir al Head. Para poder hacer un cherry-pick tienes que tener todo limpio, es decir, que al hacer git status no te salga nada en rojo o verde.
Edito: como dice mbc596, un los siempre es de ayuda...
__________________
Última edición por AlvaroOrduna Día 22/09/13 a las 18:49:52. |
|
#270
|
||||
|
||||
|
|
| Gracias de parte de: | ||
|
#271
|
||||
|
||||
|
Código:
git commit -m 0e846d1a210f9ac937689ac6fa6052decd6090bd [detached HEAD 5daea00] 0e846d1a210f9ac937689ac6fa6052decd6090bd 70 files changed, 2880 insertions(+) create mode 100755 core/java/android/app/LayerActivity.java create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_back_left.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_back_right.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_batch_message.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_bg.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_bigred.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_black_x.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_clear_all.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_dismiss.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_marker.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_marker_b.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_marker_t.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_message.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_pinned_app.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_silence_left.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_silence_right.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_system_message.png create mode 100755 packages/SystemUI/res/drawable-hdpi/ic_notify_halo_normal.png create mode 100755 packages/SystemUI/res/drawable-hdpi/ic_notify_halo_pressed.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_back_left.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_back_right.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_batch_message.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_bg.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_bigred.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_black_x.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_clear_all.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_dismiss.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_marker.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_marker_b.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_marker_t.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_message.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_pinned_app.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_silence_left.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_silence_right.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_system_message.png create mode 100755 packages/SystemUI/res/drawable-mdpi/ic_notify_halo_normal.png create mode 100755 packages/SystemUI/res/drawable-mdpi/ic_notify_halo_pressed.png create mode 100755 packages/SystemUI/res/drawable-nodpi/halo_speech_l_d.9.png create mode 100755 packages/SystemUI/res/drawable-nodpi/halo_speech_l_u.9.png create mode 100755 packages/SystemUI/res/drawable-nodpi/halo_speech_r_d.9.png create mode 100755 packages/SystemUI/res/drawable-nodpi/halo_speech_r_u.9.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_back_left.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_back_right.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_batch_message.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_bg.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_bigred.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_black_x.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_clear_all.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_dismiss.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_marker.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_marker_b.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_marker_t.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_message.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_pinned_app.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_silence_left.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_silence_right.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_system_message.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_normal.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_pressed.png create mode 100755 packages/SystemUI/res/drawable/halo_number_shape.xml create mode 100755 packages/SystemUI/res/drawable/ic_notify_halo.xml create mode 100755 packages/SystemUI/res/layout/halo_bubble.xml create mode 100755 packages/SystemUI/res/layout/halo_number.xml create mode 100755 packages/SystemUI/res/layout/halo_speech.xml create mode 100755 packages/SystemUI/res/layout/halo_trigger.xml create mode 100755 packages/SystemUI/src/com/android/systemui/Transparent.java create mode 100755 packages/SystemUI/src/com/android/systemui/statusbar/halo/CustomObjectAnimator.java create mode 100755 packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java create mode 100755 packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java create mode 100755 packages/SystemUI/src/com/android/systemui/statusbar/policy/CenterClock.java lis4rd0:base lis4rd0$ git status # HEAD detached from ebed47c nothing to commit, working directory clean |
|
#272
|
||||
|
||||
|
Código:
git commit -m 0e846d1a210f9ac937689ac6fa6052decd6090bd [detached HEAD 5daea00] 0e846d1a210f9ac937689ac6fa6052decd6090bd 70 files changed, 2880 insertions(+) create mode 100755 core/java/android/app/LayerActivity.java create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_back_left.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_back_right.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_batch_message.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_bg.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_bigred.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_black_x.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_clear_all.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_dismiss.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_marker.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_marker_b.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_marker_t.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_message.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_pinned_app.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_silence_left.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_silence_right.png create mode 100755 packages/SystemUI/res/drawable-hdpi/halo_system_message.png create mode 100755 packages/SystemUI/res/drawable-hdpi/ic_notify_halo_normal.png create mode 100755 packages/SystemUI/res/drawable-hdpi/ic_notify_halo_pressed.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_back_left.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_back_right.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_batch_message.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_bg.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_bigred.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_black_x.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_clear_all.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_dismiss.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_marker.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_marker_b.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_marker_t.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_message.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_pinned_app.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_silence_left.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_silence_right.png create mode 100755 packages/SystemUI/res/drawable-mdpi/halo_system_message.png create mode 100755 packages/SystemUI/res/drawable-mdpi/ic_notify_halo_normal.png create mode 100755 packages/SystemUI/res/drawable-mdpi/ic_notify_halo_pressed.png create mode 100755 packages/SystemUI/res/drawable-nodpi/halo_speech_l_d.9.png create mode 100755 packages/SystemUI/res/drawable-nodpi/halo_speech_l_u.9.png create mode 100755 packages/SystemUI/res/drawable-nodpi/halo_speech_r_d.9.png create mode 100755 packages/SystemUI/res/drawable-nodpi/halo_speech_r_u.9.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_back_left.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_back_right.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_batch_message.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_bg.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_bigred.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_black_x.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_clear_all.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_dismiss.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_marker.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_marker_b.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_marker_t.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_message.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_pinned_app.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_silence_left.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_silence_right.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/halo_system_message.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_normal.png create mode 100755 packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_pressed.png create mode 100755 packages/SystemUI/res/drawable/halo_number_shape.xml create mode 100755 packages/SystemUI/res/drawable/ic_notify_halo.xml create mode 100755 packages/SystemUI/res/layout/halo_bubble.xml create mode 100755 packages/SystemUI/res/layout/halo_number.xml create mode 100755 packages/SystemUI/res/layout/halo_speech.xml create mode 100755 packages/SystemUI/res/layout/halo_trigger.xml create mode 100755 packages/SystemUI/src/com/android/systemui/Transparent.java create mode 100755 packages/SystemUI/src/com/android/systemui/statusbar/halo/CustomObjectAnimator.java create mode 100755 packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java create mode 100755 packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java create mode 100755 packages/SystemUI/src/com/android/systemui/statusbar/policy/CenterClock.java lis4rd0:base lis4rd0$ git status # HEAD detached from ebed47c nothing to commit, working directory clean ![]() |
|
#274
|
||||
|
||||
|
|
|
#275
|
||||
|
||||
|
Ahora salí con el peke en cuanto llegue comento. Pero si intento añadir el siguiente commit me responde el error de HEAD detached from..
Estos commits son los que postee para añadir el active display Saludos Edito: He eliminado TODO. Para volver a empezar de cero . Estoy con repo sync . y luego añadiré de nuevo halo. Cuando este por el active display aviso :beer: Gracias companys ! Última edición por menan Día 22/09/13 a las 20:53:28. |
|
#277
|
||||
|
||||
|
|
| Gracias de parte de: | ||
|
#279
|
||||
|
||||
|
|
|
|
![]() |
Estás aquí
|
||||||
|
||||||
| Herramientas | |