]>
www.fi.muni.cz Git - test/testrepo.git/log
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 20:05:49 +0000 (22:05 +0200)]
Merge branch 'master' of ssh://ariadna1.fi.muni.cz/~/testrepo
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 20:05:45 +0000 (22:05 +0200)]
pokus2
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 20:03:04 +0000 (22:03 +0200)]
Merge branch 'master' of ssh://ariadna1.fi.muni.cz/~git/testrepo
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 20:02:58 +0000 (22:02 +0200)]
pokus
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 19:59:33 +0000 (21:59 +0200)]
put soubor2
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 19:59:07 +0000 (21:59 +0200)]
put soubor2
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 19:56:08 +0000 (21:56 +0200)]
pokus
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 19:55:23 +0000 (21:55 +0200)]
Merge branch 'master' of ssh://ariadna1.fi.muni.cz/~git/testrepo
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 19:53:21 +0000 (21:53 +0200)]
pokus
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 19:51:30 +0000 (21:51 +0200)]
put soubor2
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 19:51:18 +0000 (21:51 +0200)]
put soubor_v_podadresari
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 19:50:45 +0000 (21:50 +0200)]
put soubor1
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 19:49:21 +0000 (21:49 +0200)]
put soubor1
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 19:38:29 +0000 (21:38 +0200)]
put soubor1
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 19:35:05 +0000 (21:35 +0200)]
pokus
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 19:34:47 +0000 (21:34 +0200)]
pokus
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 19:31:20 +0000 (21:31 +0200)]
subdir/soubor1
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 19:30:24 +0000 (21:30 +0200)]
jezek
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 14:34:40 +0000 (16:34 +0200)]
Konfliktni zmena
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 14:21:32 +0000 (16:21 +0200)]
Konfliktni zmena
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 14:20:43 +0000 (16:20 +0200)]
Nekonfliktni zmena
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 14:16:23 +0000 (16:16 +0200)]
put soubor_v_podadresari podruhe
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 14:10:43 +0000 (16:10 +0200)]
put soubor_v_podadresari
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 13:25:00 +0000 (15:25 +0200)]
Pridan podadresar
Jan "Yenya" Kasprzak [Thu, 14 Apr 2011 11:45:53 +0000 (13:45 +0200)]
lorem_ipsum
Jan "Yenya" Kasprzak [Tue, 12 Apr 2011 23:16:14 +0000 (01:16 +0200)]
Merge branch 'master' of ssh://ariadna1.fi.muni.cz/~/testrepo
Daniel Navratil [Mon, 11 Apr 2011 11:34:05 +0000 (13:34 +0200)]
Bazén pro tuxe
Daniel Navratil [Mon, 11 Apr 2011 10:05:51 +0000 (12:05 +0200)]
2 nové soubory s tučňákem (git add tux.txt; git add -N tux2.txt)
Daniel Navratil [Mon, 11 Apr 2011 09:59:02 +0000 (11:59 +0200)]
ASCII tux
Daniel Navratil [Mon, 11 Apr 2011 09:45:02 +0000 (11:45 +0200)]
Tučnáci ve Zlíně :-)
Tomas Obsivac [Mon, 11 Apr 2011 09:15:32 +0000 (11:15 +0200)]
tucnak.txt: úchylka + ZOO
Daniel Navratil [Mon, 11 Apr 2011 08:46:24 +0000 (10:46 +0200)]
Tucnak
Daniel Navratil [Mon, 11 Apr 2011 08:45:15 +0000 (10:45 +0200)]
Tucnak je nejlepsi.
Daniel Navratil [Mon, 11 Apr 2011 08:36:40 +0000 (10:36 +0200)]
Pridan druhy blabol :-)
Jan "Yenya" Kasprzak [Fri, 8 Apr 2011 14:45:21 +0000 (16:45 +0200)]
Merge branch 'master' of ssh://ariadna1.fi.muni.cz/~/testrepo
Jan "Yenya" Kasprzak [Fri, 8 Apr 2011 14:45:02 +0000 (16:45 +0200)]
tucnak.txt: kompletne prepsano :-)
Juraj Hudak [Thu, 7 Apr 2011 10:46:37 +0000 (12:46 +0200)]
Merge branch 'master' of ssh://ariadna1.fi.muni.cz/~git/testrepo
Juraj Hudak [Thu, 7 Apr 2011 10:46:11 +0000 (12:46 +0200)]
prohozeni v druhem odstavci
Juraj Hudak [Thu, 7 Apr 2011 10:45:32 +0000 (12:45 +0200)]
prohozeni radku v prvni odstavci
Juraj Hudak [Thu, 7 Apr 2011 10:43:34 +0000 (12:43 +0200)]
Merge branch 'master' of ssh://ariadna1.fi.muni.cz/~git/testrepo
Juraj Hudak [Thu, 7 Apr 2011 10:43:08 +0000 (12:43 +0200)]
inicialni import
Daniel Jakubik [Wed, 6 Apr 2011 14:28:55 +0000 (16:28 +0200)]
Blabol
Daniel Jakubik [Wed, 6 Apr 2011 14:20:55 +0000 (16:20 +0200)]
Test
Daniel Jakubik [Wed, 6 Apr 2011 14:19:01 +0000 (16:19 +0200)]
Test na rozkopirovani
Jan "Yenya" Kasprzak [Wed, 6 Apr 2011 12:18:26 +0000 (14:18 +0200)]
Zkousim konflikt.
Jan "Yenya" Kasprzak [Wed, 6 Apr 2011 12:01:13 +0000 (14:01 +0200)]
put_www_scripts presunuto do /usr/local/bin
Adam Libusa [Tue, 5 Apr 2011 15:00:48 +0000 (17:00 +0200)]
put zizala.txt
Adam Libusa [Tue, 5 Apr 2011 14:56:08 +0000 (16:56 +0200)]
zkouska jednoducheho konfliktu krtek.txt
Juraj Hudak [Tue, 5 Apr 2011 14:50:13 +0000 (16:50 +0200)]
smazani chybneho adresare...
Juraj Hudak [Tue, 5 Apr 2011 14:49:09 +0000 (16:49 +0200)]
testovani adresare
Jan "Yenya" Kasprzak [Tue, 5 Apr 2011 14:44:27 +0000 (16:44 +0200)]
put lorem_ipsum.txt
Adam Libusa [Tue, 5 Apr 2011 14:38:16 +0000 (16:38 +0200)]
put krtek.txt
Adam Libusa [Tue, 5 Apr 2011 14:34:32 +0000 (16:34 +0200)]
Mala oprava krtecka
Adam Libusa [Tue, 5 Apr 2011 14:32:53 +0000 (16:32 +0200)]
Pridan komentar na ponechani jezka
Adam Libusa [Tue, 5 Apr 2011 14:32:10 +0000 (16:32 +0200)]
Pridany komentar na zruseni jezka
Juraj Hudak [Tue, 5 Apr 2011 12:20:29 +0000 (14:20 +0200)]
oprava cestiny ;-)
Juraj Hudak [Tue, 5 Apr 2011 12:09:31 +0000 (14:09 +0200)]
oprava chybneho vysledku nasobeni
Juraj Hudak [Tue, 5 Apr 2011 12:08:13 +0000 (14:08 +0200)]
znovu cestina
Dan Keder [Tue, 5 Apr 2011 12:04:59 +0000 (14:04 +0200)]
13
Juraj Hudak [Tue, 5 Apr 2011 12:01:32 +0000 (14:01 +0200)]
zalozeni konfliktniho souboru
Dan Keder [Tue, 5 Apr 2011 11:51:13 +0000 (13:51 +0200)]
uhetonsa
Dan Keder [Tue, 5 Apr 2011 11:50:05 +0000 (13:50 +0200)]
druha oprava
Dan Keder [Tue, 5 Apr 2011 11:44:54 +0000 (13:44 +0200)]
Urgentna oprava niecoho
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 19:33:56 +0000 (21:33 +0200)]
put tucnak.txt
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 19:03:24 +0000 (21:03 +0200)]
put lorem_ipsum.txt
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 19:02:41 +0000 (21:02 +0200)]
put lorem_ipsum.txt
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 18:56:39 +0000 (20:56 +0200)]
put lorem_ipsum.txt
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 18:56:23 +0000 (20:56 +0200)]
lorem_ipsum.txt
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 15:45:14 +0000 (17:45 +0200)]
put lorem_ipsum.txt
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 15:43:11 +0000 (17:43 +0200)]
put lorem_ipsum.txt
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 15:41:19 +0000 (17:41 +0200)]
put lorem_ipsum.txt
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 15:39:18 +0000 (17:39 +0200)]
put lorem_ipsum.txt
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 15:38:10 +0000 (17:38 +0200)]
put lorem_ipsum.txt
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 15:37:24 +0000 (17:37 +0200)]
put lorem_ipsum.txt
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 15:36:05 +0000 (17:36 +0200)]
put lorem_ipsum.txt
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 15:30:59 +0000 (17:30 +0200)]
Dlouhy soubor pro nekonfliktni zmeny.
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 15:19:46 +0000 (17:19 +0200)]
README: URL na rozepsanou dokumentaci
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 15:15:24 +0000 (17:15 +0200)]
README.txt - popis prace s testovacim repozitarem.
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 15:08:54 +0000 (17:08 +0200)]
Dalsi zmena
Jan "Yenya" Kasprzak [Mon, 4 Apr 2011 15:07:52 +0000 (17:07 +0200)]
Vytvarim nove soubory do pokusneho repozitare.
https://www.fi.muni.cz/~kas/git / test / testrepo.git / log