Now I can't to access to tree complety. I have this for the moment

$ git log --graph --oneline --decorate --all
* 9d62a1f (HEAD, master) -Actualizacion de .gitignore
* d4392db Actualizacion de .gitignore para no incluri los archivos del tipo
.db
* 9e9d5f7 -Actualizacion de .gitignore
* eef0663 commit antes de actualizar
* fe14405 -Implementacion de una clase Java que permite seleccionar los
usuarios
| *   261f502 (origin/master) Merge branch 'master' of file:/
| |\
| |/
|/|
* | cb9269a -Modificacion del Spring Security para que soporte el logueo
con la
* |   d400eba Merge remote-tracking branch 'origin/master'
|\ \
| * | 9432a89 -Adicion de las clases mapper y de negocio de la entidad
RangoCodi
* | | da61580 -Modificacion de .gitignore -Customizacion del logueo con
| | * 97bafd5 commir antes de actualizar
| | * 204b8ca commit 10:21
| | *   f98e90a Resolucion de conflictos
| | |\
| |_|/
|/| |
* | | 4d8e97e -Adicion de clases para la autenticacion customizada via
spring se
* | |   ba0d452 Merge remote-tracking branch 'origin/master'



2012/11/18 Konstantin Khomoutov <flatw...@users.sourceforge.net>

> On Sun, Nov 18, 2012 at 03:05:43PM -0800, Cesar Casasola wrote:
>
> > In this case there are two commits
> >
> >
> > $ git log --graph --oneline --decorate --all****
> [...]
>
> > How I can to merge the commits *261f502* and *9d62a1f?*
> >
> > If they were three or more commits?
>
> The graph tree appears to be completely botched (I tried to view both
> alternative parts outside of my mail reader, but to no avail either) so
> it's hard do decipher.  A small PNG screenshot may be?
>
> --
>
>
>

-- 


Reply via email to