| 2016-03-06 |
| → mischat joined | 00:01 |
| → barajasfab joined | 00:01 |
| ← Sigfrid left | 00:03 |
| ← eletuchy left | 00:03 |
| ← Balliad left | 00:04 |
| ← jason237 left | 00:06 |
| ← flavi0 left | 00:07 |
| ← sdothum left | 00:08 |
| → eletuchy joined | 00:08 |
| → JanC joined | 00:08 |
| ← GT4066 left | 00:09 |
| → sdothum joined | 00:10 |
| ← polyidus left | 00:13 |
| ← eletuchy left | 00:15 |
| ← diegoviola left | 00:18 |
| ← barajasfab left | 00:18 |
| ← mischat left | 00:19 |
| ← fracting left | 00:21 |
| ← delight left | 00:23 |
| ← mattfoo left | 00:24 |
| → espindola joined | 00:25 |
| → mattfoo joined | 00:28 |
| ← Bat`O_ left | 00:28 |
| → jottr_ joined | 00:29 |
| ← cagedwisdom left | 00:29 |
| ← espindola left | 00:31 |
| → linuxmint joined | 00:32 |
| ← linuxmint left | 00:33 |
| → rolha_ joined | 00:34 |
| ← rolha left | 00:35 |
| ← paddyez left | 00:37 |
| → chris_wot joined | 00:37 |
| → user083 joined | 00:37 |
| ← dsdeiz left | 00:38 |
| → rolha joined | 00:39 |
| ← rolha_ left | 00:40 |
| ← jimmyeatworld left | 00:42 |
| → HelloAtMega joined | 00:42 |
| → cagmz joined | 00:45 |
| ← nwkj86 left | 00:49 |
|
martixy
| Hm, I a bit of a problem. I wanna set up a local dev env for a project I forked. I can easily create local versions of the config/project files, but that still means I have to modify the single gitignore file. That either means a commit that throws a wrench in the whole affair or having to worry about keeping those changes unstaged for all eternity. Is there a better way? | 00:49 |
| → Jauble joined | 00:49 |
| ← Goplat left | 00:52 |
| → daito joined | 00:52 |
| ← Midoshi27 left | 00:53 |
| → diogenese joined | 00:53 |
| → eletuchy joined | 00:54 |
| ← Tatsh left | 00:56 |
| ← BombStrike left | 00:56 |
| ← daito left | 00:57 |
| ← Limes_ left | 00:57 |
| → fstd_ joined | 01:00 |
| → BombStrike joined | 01:01 |
| ← Domhack left | 01:01 |
| → Domhack joined | 01:02 |
| ← whitby left | 01:02 |
| ← fstd left | 01:03 |
| fstd_ → fstd | 01:03 |
| ← lolmac left | 01:10 |
| ← MissionCritical left | 01:11 |
| ← user083 left | 01:12 |
| → LBV_User joined | 01:13 |
| → lolmac joined | 01:14 |
| ← King_Hual left | 01:15 |
| ← kam270 left | 01:15 |
| → Rodya_ joined | 01:17 |
| → dsdeiz joined | 01:17 |
| ← sangy left | 01:18 |
| → espindola joined | 01:20 |
| → MissionCritical joined | 01:21 |
| → rubyonrailed joined | 01:23 |
| ← Rodya_ left | 01:26 |
| ← liamonade left | 01:26 |
| → jottr joined | 01:26 |
| → Rodya_ joined | 01:26 |
| ← jottr_ left | 01:30 |
| ← espindola left | 01:30 |
| ← Rodya_ left | 01:31 |
| → CEnnis91 joined | 01:32 |
| → DaveLib joined | 01:32 |
| → sargas joined | 01:33 |
| ← jaafar left | 01:34 |
| → sssilver joined | 01:37 |
| ← jaguarmagenta left | 01:37 |
| ← MattMaker left | 01:38 |
| → Goplat joined | 01:38 |
| ← lethjakman-l left | 01:38 |
| ← pasky left | 01:43 |
| ← Dreamer3 left | 01:43 |
| → hgl joined | 01:43 |
| → Dreamer3 joined | 01:44 |
| → lucasem joined | 01:47 |
| ← Impaloo left | 01:48 |
| ← cdg left | 01:49 |
| → Impaloo joined | 01:49 |
| → pasky joined | 01:50 |
| → linuxmint joined | 01:50 |
| → Dreamer__ joined | 01:50 |
| → tristanp joined | 01:51 |
| → diegoviola joined | 01:52 |
| → ajf- joined | 01:53 |
| → daito joined | 01:53 |
| ← tristanp left | 01:54 |
| ← diegoviola left | 01:54 |
| ← Dreamer3 left | 01:55 |
| ← ajf- left | 01:55 |
| ← mezod left | 01:55 |
| ← cyan__ left | 01:58 |
| ← daito left | 01:58 |
| → espindola joined | 02:03 |
| ← dsdeiz left | 02:03 |
| → MattMaker joined | 02:04 |
| ← MattMaker left | 02:04 |
| → diegoviola joined | 02:04 |
| → cagmz_ joined | 02:05 |
| → jaguarmagenta joined | 02:05 |
| ← m0viefreak left | 02:05 |
| → m0viefreak joined | 02:06 |
| ← DaveLib left | 02:06 |
| ← Goplat left | 02:06 |
| → nettoweb joined | 02:07 |
| → kfoonamalik joined | 02:08 |
|
osse
| martixy: use .git/info/exclude | 02:08 |
| ← cagmz left | 02:08 |
| → rolha_ joined | 02:08 |
|
osse
| it's like a private .gitignore | 02:08 |
| → DaveLib joined | 02:09 |
| → weox joined | 02:09 |
| ← kfoonamalik left | 02:09 |
| ← cagmz_ left | 02:09 |
|
martixy
| Huh... cool. Thank you. | 02:09 |
| ← rolha left | 02:10 |
| ← jaguarmagenta left | 02:10 |
| → jaguarmagenta joined | 02:10 |
|
martixy
| Wait... shit. Windows. | 02:12 |
| → cdg joined | 02:13 |
| → codeman joined | 02:19 |
| → tachoknight__ joined | 02:22 |
| → cagmz joined | 02:22 |
| ← tachoknight__ left | 02:23 |
| ← nettoweb left | 02:24 |
| → dan2k3k4 joined | 02:24 |
| → donmichelangelo joined | 02:26 |
| → ajf- joined | 02:27 |
| → Rodya_ joined | 02:27 |
| → HanClinto joined | 02:27 |
| → lindenle joined | 02:27 |
| ← michelangelo left | 02:29 |
| ← jottr left | 02:30 |
| ← espindola left | 02:30 |
| → spb joined | 02:30 |
| → espindola joined | 02:31 |
| ← rolha_ left | 02:31 |
| ← lindenle left | 02:31 |
| ← espindola left | 02:32 |
| → Literphor joined | 02:33 |
| → rolha joined | 02:33 |
| → mablae__ joined | 02:34 |
| → Goplat joined | 02:34 |
| ← sssilver left | 02:34 |
| → sssilver joined | 02:35 |
| → lethjakman-l joined | 02:36 |
| → Vampire0_ joined | 02:36 |
| → sangy joined | 02:36 |
| ← jeffmjack left | 02:37 |
| ← cdg left | 02:37 |
| ← mablae_ left | 02:37 |
| → cdg joined | 02:37 |
| ← Vampire0 left | 02:39 |
| → cdg_ joined | 02:40 |
| ← lethjakman-l left | 02:41 |
| ← cdg left | 02:42 |
| ← pks left | 02:44 |
| → pks_ joined | 02:45 |
| ← Rodya_ left | 02:47 |
| → diego2 joined | 02:47 |
| → Rodya_ joined | 02:47 |
| ← diego2 left | 02:47 |
| → diego2 joined | 02:47 |
| diegoviola → Guest65114 | 02:48 |
| diego2 → diegoviola | 02:48 |
| ← Rodya_ left | 02:48 |
| → espindola joined | 02:49 |
| ← Guest65114 left | 02:49 |
| ← espindola left | 02:50 |
|
osse
| martixy: so what? | 02:52 |
| ← cagmz left | 02:53 |
|
martixy
| slashes | 02:53 |
|
| Not allowed in filenames. | 02:53 |
|
osse
| martixy: .git and info are directories | 02:53 |
|
martixy
| Oh. | 02:53 |
|
osse
| slashes aren't allowed anywhere I know of | 02:54 |
|
martixy
| I dunno... I vaguely remember linux being more permissive. | 02:55 |
|
osse
| martixy: it is definitely more permissive. | 02:55 |
|
| / and \0 are the only ones that aren't allowed | 02:56 |
| → ColdKeybo[a]rd joined | 02:57 |
| → Sucks joined | 02:57 |
| ← ColdKeyboard left | 02:58 |
| ← ColdKeybo[a]rd left | 02:58 |
| → lbv-user joined | 02:59 |
| ← ShapeShifter499 left | 02:59 |
| → ColdKeyboard joined | 02:59 |
|
martixy
| Hmm.. interesting. So you can name your files with control characters? :) | 02:59 |
|
osse
| yes | 03:00 |
| ← lbv-user left | 03:01 |
|
martixy
| That's mildly amusing. :) | 03:01 |
| ← LBV_User left | 03:02 |
| ← nfk left | 03:03 |
| ← IlNominePatre left | 03:03 |
| ← Cassiopaya left | 03:03 |
| → Limes_ joined | 03:03 |
| ← Sucks left | 03:04 |
| ← Ahmed90 left | 03:05 |
| ← lolmac left | 03:07 |
| ← LeBlaaanc left | 03:08 |
| ← Limes_ left | 03:09 |
| ← Noldorin left | 03:09 |
| ← cdg_ left | 03:09 |
| → strayPuppy joined | 03:10 |
| → rolha_ joined | 03:10 |
| → lolmac joined | 03:11 |
| ← rolha left | 03:13 |
| → fedexo joined | 03:13 |
| → Noldorin joined | 03:16 |
| ← fscala left | 03:17 |
|
qsx
| especially if you do it on NTFS and try to access it from windows | 03:18 |
| → jaguarmagenta2 joined | 03:18 |
|
qsx
| ever tried deleting (not to mention open or so) a file containing a colon on windows? | 03:18 |
| ← dan2k3k4 left | 03:18 |
| ← codeman left | 03:18 |
| ← ajf- left | 03:18 |
| → fscala joined | 03:19 |
| ← Noldorin left | 03:19 |
| ← rubyonrailed left | 03:20 |
| ← chachasmooth left | 03:20 |
| → rubyonrailed joined | 03:21 |
| ← jaguarmagenta left | 03:22 |
| → chachasmooth joined | 03:23 |
| ← jagob left | 03:23 |
| → Dougie187 joined | 03:25 |
| → dan2k3k4 joined | 03:27 |
| ← Literphor left | 03:29 |
| → botevoker joined | 03:31 |
| → lethjakman-l joined | 03:36 |
| → nettoweb joined | 03:38 |
| ← nettoweb left | 03:40 |
| → choki_ joined | 03:43 |
| → jason237 joined | 03:43 |
| ← rubyonrailed left | 03:45 |
| ← choki left | 03:45 |
| ← jason237 left | 03:47 |
| → spinningarrow joined | 03:48 |
| → d4rklit3 joined | 03:48 |
| → Rodya_ joined | 03:49 |
| → cmosguy joined | 03:50 |
| ← D-Boy left | 03:50 |
| → jason237 joined | 03:50 |
| → joufflu joined | 03:52 |
|
fahadash
| How do I revert files changes that have not been staged back to the last commit? git checkout master --force does not work | 03:54 |
| → Literphor joined | 03:54 |
| → daito joined | 03:54 |
|
darlinger
| fahadash: git checkout HEAD | 03:55 |
|
| fahadash: actually, git reset --hard HEAD^ | 03:55 |
|
| to go back to the least commit | 03:56 |
|
fahadash
| after doing git reset --hard HEAD I continue to see the unstaged changes | 03:57 |
| ← dan2k3k4 left | 03:58 |
|
fahadash
| those changes are new directories created | 03:58 |
| ← daito left | 03:59 |
| → arescorpio joined | 03:59 |
| → nilsi joined | 03:59 |
|
fahadash
| ok I tried this... git add --all then git reset --hard HEAD and it worked | 04:00 |
|
| Thanks | 04:00 |
| → D-Boy joined | 04:01 |
| → dreiss joined | 04:02 |
| → cdg joined | 04:10 |
| → dhureen joined | 04:10 |
| → nppr joined | 04:10 |
| ← lrvick left | 04:11 |
| → Silenced joined | 04:11 |
| ← Silenced left | 04:11 |
| → Silenced joined | 04:11 |
| ← nppr left | 04:11 |
| → jfelchner_ joined | 04:12 |
| ← jfelchner left | 04:13 |
| ← diegoviola left | 04:14 |
| ← s00pcan left | 04:17 |
| ← Jauble left | 04:18 |
| ← cdg left | 04:18 |
| ← DaveLib left | 04:20 |
| ← diegoaguilar left | 04:20 |
| → roygbiv joined | 04:21 |
| ← Rodya_ left | 04:21 |
| → Jauble joined | 04:21 |
| → s00pcan joined | 04:22 |
| ← spinningarrow left | 04:24 |
| ← fstd left | 04:24 |
| → ensyde_ joined | 04:25 |
| ← Dougie187 left | 04:26 |
| → mayankgupta1996 joined | 04:26 |
| → [TheFlash] joined | 04:27 |
| → lrvick joined | 04:27 |
|
[TheFlash]
| hi, i'm using "git bisect skip" to skip certain revisions while bisecting, but the number of revisions left doesn't seem to decrease when i do it, why is that? | 04:28 |
| → lindenle joined | 04:29 |
|
[TheFlash]
| it says it still has 23 revisions to test, but i really feel like i've skipped a lot more than 23 | 04:29 |
| ← bollullera left | 04:29 |
| ← tlaxkit left | 04:30 |
| → kam270 joined | 04:32 |
| → ShapeShifter499 joined | 04:33 |
| ← lindenle left | 04:33 |
| ← lrvick left | 04:33 |
| ← kam270 left | 04:34 |
| → kam270 joined | 04:34 |
| → diegoaguilar joined | 04:35 |
| ← HelloAtMega left | 04:35 |
| ← TDJACR left | 04:38 |
|
[TheFlash]
| ah, ok, it's done now | 04:41 |
|
| so i guess it only "felt" like more than 23 | 04:41 |
|
| nevermind | 04:41 |
| ← [TheFlash] left | 04:41 |
| → treaki__ joined | 04:42 |
| ← HanClinto left | 04:42 |
| → tigos2 joined | 04:43 |
| → |node joined | 04:43 |
| → xelxebar joined | 04:44 |
| ← botevoker left | 04:44 |
| ← diogenese left | 04:44 |
| ← m0viefreak left | 04:45 |
| ← CEnnis91 left | 04:45 |
| ← treaki_ left | 04:46 |
| ← Jauble left | 04:46 |
| ← tigos2 left | 04:47 |
| → Jauble joined | 04:47 |
| ← italoacasas left | 04:49 |
| ← |node left | 04:50 |
| ← Gamecubic left | 04:55 |
| → Gamecubic joined | 04:56 |
| → ahr3n joined | 04:56 |
| → Manikandan joined | 04:57 |
| → TDJACR joined | 04:57 |
| → jagob joined | 04:57 |
| ← ShapeShifter499 left | 05:01 |
| ← ensyde_ left | 05:03 |
| ← kadoban left | 05:04 |
| ← ToBeCloud left | 05:04 |
| ← PtxDK left | 05:05 |
| → PtxDK joined | 05:05 |
| ← srcerer left | 05:05 |
| → srcerer_ joined | 05:05 |
| ← martixy left | 05:06 |
| → bannakaffalatta joined | 05:07 |
| → diogenese joined | 05:08 |
| → ShapeShifter499 joined | 05:10 |
| → denimsoft joined | 05:10 |
| ← hgl left | 05:10 |
| ← diogenese left | 05:12 |
| ← srcerer_ left | 05:12 |
| → tinajohnson__ joined | 05:13 |
| → hgl joined | 05:13 |
| ← Jauble left | 05:16 |
| ← aviraldg left | 05:17 |
| → ensyde_ joined | 05:17 |
| ← Silenced left | 05:18 |
| → Rodya_ joined | 05:18 |
| ← lucasem left | 05:21 |
| ← Rodya_ left | 05:23 |
| → dinesh_ joined | 05:25 |
| → dinesh__ joined | 05:26 |
| ← dinesh__ left | 05:26 |
| ← Gamecubic left | 05:28 |
| ← benbergman left | 05:30 |
| ← sdothum left | 05:30 |
| → botevoker joined | 05:30 |
| → boudicca joined | 05:31 |
| → benbergman joined | 05:31 |
|
dinesh_
| hi | 05:31 |
| ← axisys left | 05:31 |
| ← dinesh_ left | 05:32 |
| ← ShapeShifter499 left | 05:32 |
| → dinesh_ joined | 05:32 |
| → dineshp joined | 05:33 |
| ← boudiccas left | 05:33 |
| ← dinesh_ left | 05:33 |
| → Jauble joined | 05:34 |
| ← botevoker left | 05:36 |
|
dineshp
| When I generate a patch using git patch format -1 , how do i ensure that the generated file has a maximum column width of 70 columns. Because when sending emails using git send-email, the community requires that the email is formatted to a amx of 70 columns | 05:36 |
|
| *max | 05:36 |
| ← punto left | 05:36 |
| ← dhureen left | 05:36 |
| → punto joined | 05:37 |
| ← sargas left | 05:38 |
| ← Cabanossi left | 05:38 |
| → Cabanossi joined | 05:41 |
| → swordonly joined | 05:42 |
|
PryMar56
| dineshp, did you install `git-email`? | 05:43 |
|
| dineshp, then, man git-send-email | 05:45 |
|
gitinfo
| dineshp: the git-send-email manpage is available at http://jk.gs/git-send-email.html | 05:45 |
|
dineshp
| PryMar56: no, I am using git format-patch to generate the patch files and emailing it using git send-email | 05:45 |
|
PryMar56
| dineshp, I'm Debian centric, not sure what your Env is | 05:45 |
|
dineshp
| PryMar56: linux mint | 05:46 |
| pks_ → pks | 05:46 |
|
dineshp
| the commands should be pretty similar | 05:46 |
| ← languitar left | 05:47 |
| → languitar joined | 05:47 |
|
dineshp
| how to the the people on the git mailing list format their emails and patches that they send, such that they are a max of 70 columns in width? | 05:47 |
| ← socketguru left | 05:47 |
| ← Manikandan left | 05:48 |
|
dineshp
| PryMar56: if you have experience sending out properly formatted patches, could you help me out? | 05:48 |
| → ShapeShifter499 joined | 05:48 |
|
PryMar56
| dineshp, try to test and send patches to a web email. Use a revision range straight from git | 05:49 |
|
dineshp
| PryMar56: I tried that but I am not able to restrict the width of each line to 70 columns. I am currently manually editing it to 70 columns per line. since this is very inefficient, ia ma looking to automate it | 05:51 |
|
| *i am | 05:51 |
| ← kam270 left | 05:53 |
| ← sssilver left | 05:54 |
| → daito joined | 05:55 |
| → cagmz joined | 05:55 |
| → Silenced joined | 05:56 |
| ← Silenced left | 05:56 |
| → Silenced joined | 05:56 |
|
PryMar56
| dineshp, 70 columns is not standard. Nice try | 05:56 |
|
| enjoy the fruitless edits and manual intervention | 05:57 |
|
dineshp
| PryMar56: I sent a patch yesterday and that was the comment I got from Junio. How do I format the patches and emails? What do you suggest? | 05:57 |
|
PryMar56
| git-format-patch accepts --stat=70 | 05:57 |
|
dineshp
| PryMar56: Thank you, will try it out | 05:58 |
| ← daito left | 05:59 |
| ← diegoaguilar left | 06:03 |
| → diogenese joined | 06:03 |
| → GuKKDevel joined | 06:04 |
|
dineshp
| PryMar56: git format-patch -1 --stat=70 -M origin/master -o outgoing/ | 06:05 |
|
| PryMar56: Still the patches are not being formatted properly, with 70 columns per line | 06:06 |
| → sssilver joined | 06:06 |
|
PryMar56
| dineshp, terminal width, luke | 06:08 |
|
dineshp
| PryMar56: I did not understand. | 06:08 |
|
| my terminal width 80characters, but some lines in the generated patch file contain 100 lines | 06:09 |
|
| *columns | 06:09 |
| ← arescorpio left | 06:11 |
| → kam270 joined | 06:12 |
| → jonmorehouse joined | 06:13 |
| ← dharrigan left | 06:14 |
| ← dreiss left | 06:14 |
| ← lethjakman-l left | 06:14 |
| ← kam270 left | 06:14 |
| → bennyZ joined | 06:15 |
| ← jonmorehouse left | 06:16 |
| → jonmorehouse joined | 06:17 |
| ← jonmorehouse left | 06:18 |
| → Dios joined | 06:18 |
| → Rodya_ joined | 06:19 |
| ← dineshp left | 06:19 |
| ← Jauble left | 06:20 |
| ← bennyZ left | 06:20 |
| ← drawkula left | 06:22 |
| → Aerosonic joined | 06:24 |
| → nilg joined | 06:24 |
| ← Rodya_ left | 06:25 |
| → floatingpoint joined | 06:25 |
| → jonmorehouse joined | 06:25 |
| ← cmosguy left | 06:26 |
| ← jonmorehouse left | 06:26 |
| → jonmorehouse joined | 06:27 |
| ← jonmorehouse left | 06:27 |
| → jonmorehouse joined | 06:29 |
| → srcerer joined | 06:29 |
| ← jonmorehouse left | 06:30 |
| → lindenle joined | 06:30 |
| → Jauble joined | 06:31 |
| ← cagmz left | 06:31 |
| ← joufflu left | 06:33 |
| ← lindenle left | 06:35 |
| → dharrigan joined | 06:35 |
| → drawkula joined | 06:36 |
| → freimatz joined | 06:42 |
| ← ramsub07 left | 06:42 |
| → StormLrd joined | 06:42 |
| ← GuKKDevel left | 06:43 |
| ← fedexo left | 06:43 |
| → jaafar joined | 06:45 |
| ← mayankgupta1996 left | 06:46 |
| → mayankgupta1996 joined | 06:49 |
| ← Goplat left | 06:51 |
|
_ikke_
| That's because the patch has to match the code | 06:52 |
|
| If the code is more than 80 columns, the resulting patch will be too | 06:53 |
| choki_ → choki | 06:53 |
| → fstd joined | 06:53 |
| → lethjakman-l joined | 06:54 |
| ← choki left | 06:54 |
| → elastix joined | 06:56 |
| → Kicer86 joined | 06:57 |
| ← Dios left | 06:57 |
| → ensyde__ joined | 06:58 |
| → FunkyAss joined | 06:59 |
| ← lethjakman-l left | 06:59 |
| → phaleth joined | 06:59 |
| ← Jauble left | 07:00 |
| ← ensyde_ left | 07:01 |
| ← sssilver left | 07:02 |
| ← nilg left | 07:02 |
| ← boombatower left | 07:04 |
| → sssilver joined | 07:07 |
| ← wrouesnel left | 07:07 |
| → subhojit777 joined | 07:08 |
| ← swordonly left | 07:09 |
| ← Silenced left | 07:09 |
| ← Sasazuka left | 07:09 |
| → LucaTM joined | 07:11 |
| → kaiza joined | 07:12 |
| ← elastix left | 07:12 |
| ← PryMar56 left | 07:13 |
| → Jauble joined | 07:15 |
| ← meloc_ left | 07:16 |
| ← crater2150 left | 07:19 |
| → Rodya_ joined | 07:21 |
| → paddyez joined | 07:22 |
| ← floatingpoint left | 07:23 |
| ← presto left | 07:23 |
| → emPi joined | 07:24 |
| ← denimsoft left | 07:24 |
| → lethjakman-l joined | 07:25 |
| ← Rodya_ left | 07:25 |
| ← elementalest left | 07:26 |
| → elementalest joined | 07:26 |
| ← elementalest left | 07:26 |
| → elementalest joined | 07:26 |
| → brcolow joined | 07:26 |
|
brcolow
| I have the following branch situation: http://imgur.com/mIzepN1 - I would like to flatten a la git rebase -i HEAD~1, but doing so causes a TON of annoying merge conflicts. is there a way to tell git to DWIM (which is to use the latest changes from the most recent commit) | 07:28 |
| → denimsoft joined | 07:29 |
| ← lethjakman-l left | 07:30 |
| → MutantMahesh joined | 07:30 |
| → spinningarrow joined | 07:30 |
|
_ikke_
| brcolow: This looks like a simple --no-ff merge that you want to undo? | 07:31 |
| ← jaafar left | 07:31 |
|
brcolow
| I am not sure | 07:32 |
|
_ikke_
| Oh no, I see it now | 07:32 |
|
brcolow
| I just want a straight line, linear history | 07:33 |
|
_ikke_
| right | 07:33 |
|
brcolow
| without a ton of merge conflicts, which maybe I don't fully understand, but /should/ be possible? | 07:33 |
| ← xelxebar left | 07:34 |
|
_ikke_
| brcolow: I think you first want to undo the merge | 07:34 |
|
| not sure, but that might contribute to the merge conflicts you're seeing | 07:34 |
|
brcolow
| git reset --hard 20145c3 ? | 07:34 |
|
_ikke_
| You know the consequences of rewriting published history? | 07:35 |
|
brcolow
| indeed | 07:35 |
|
_ikke_
| brcolow: Looks right | 07:35 |
|
brcolow
| I am the only consumer, thankfully | 07:35 |
| → Dragooon joined | 07:35 |
|
brcolow
| lmao | 07:35 |
|
_ikke_
| ? | 07:35 |
|
brcolow
| undoing the merge seems to have fixed everything, seems it is just a straight line now! | 07:36 |
|
| looks good now! :) thanks very much | 07:36 |
|
_ikke_
| right.. :P | 07:36 |
|
brcolow
| sometimes with git I feel really lost because of the amount of possibilities, but it is always so simple in my experience | 07:37 |
|
_ikke_
| Are you sure, beceause your history was still diverged | 07:37 |
| → cdg joined | 07:37 |
|
brcolow
| git pull shows up to date, I am on master, nothing to commit | 07:37 |
|
_ikke_
| brcolow: does git log --oneline master..origin/master return commits? | 07:37 |
|
brcolow
| returns nothing | 07:38 |
| → _nadim joined | 07:38 |
|
_ikke_
| That's because origin/master still has the merge commit | 07:38 |
|
brcolow
| oh, should I push --force? | 07:39 |
|
_ikke_
| Hold on a sec | 07:39 |
|
brcolow
| sure | 07:39 |
| ← tinajohnson__ left | 07:39 |
|
_ikke_
| can you post !situation somewhere? | 07:40 |
|
gitinfo
| Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain) | 07:40 |
| → daito joined | 07:40 |
|
_ikke_
| It does not show commit messages only branchnames and commits | 07:40 |
|
| increase 20 to 30 or something | 07:40 |
|
brcolow
| http://pastebin.com/6fhzAeBH | 07:41 |
| → grassass joined | 07:41 |
|
brcolow
| that bitfinex-link-brainstorm branch is just an idea branch I had, just holds some reworkings that I have no merged into master yet | 07:41 |
| ← cdg left | 07:42 |
| ← Motoko left | 07:42 |
|
_ikke_
| brcolow: besides the reset, what other commands did you run? | 07:43 |
|
| Something caused your origin/master to be reset too | 07:43 |
|
brcolow
| I /thought/ nothing...but looking at my command history I might have reflexively done git push --force...if I did I'm quite sorry for the confusion | 07:45 |
|
_ikke_
| That would explain it | 07:45 |
|
| but that also means you are missing some history | 07:45 |
| ← daito left | 07:45 |
|
_ikke_
| All the commits on the bottom of the image you pasted | 07:45 |
| → elastix joined | 07:46 |
| ← elastix left | 07:46 |
|
_ikke_
| brcolow: You should be really careful with git push --force | 07:46 |
|
brcolow
| hmm..I am comparing my current git log output to the image and nothing is missing | 07:47 |
|
_ikke_
| git branch --contains 3750136 | 07:49 |
| ← Jauble left | 07:49 |
| → Tryop88 joined | 07:49 |
|
brcolow
| ah..... | 07:50 |
|
| yes.. | 07:50 |
| → daito joined | 07:50 |
|
brcolow
| but now | 07:51 |
|
| I have a commit 71b...with the same commit message as 3750136 | 07:51 |
|
| it is the 2nd latest commit | 07:51 |
|
_ikke_
| Ok, so you already did do some rebasing? | 07:52 |
|
brcolow
| I'm honestly not sure at this point | 07:52 |
|
| but all appearances show that your suggestion did do what I want. How it worked and what nonsensical commands I typed into the terminal like a monkey is another matter | 07:53 |
| → dreiss joined | 07:53 |
| ← ixian8 left | 07:54 |
| → a_thakur joined | 07:54 |
| → Jauble joined | 07:55 |
| ← jagob left | 07:55 |
| ← daito left | 07:57 |
| → dmko joined | 07:57 |
| → ixian joined | 07:59 |
| → intrigueD joined | 08:01 |
|
Wetmelon
| is it possible to pick & choose commits to merge? | 08:02 |
| ← thiago left | 08:02 |
|
Wetmelon
| Say I branch, make 3 commits on the new branch but I only want to merge commits #1 and #3 back into master, is that doable? | 08:02 |
|
brcolow
| cherry-pick | 08:04 |
|
| https://git-scm.com/docs/git-cherry-pick | 08:04 |
| ← a_thakur left | 08:04 |
| ← spinningarrow left | 08:05 |
|
Wetmelon
| ty | 08:06 |
| ← freimatz left | 08:06 |
| → ssd532_ joined | 08:10 |
|
_ikke_
| brcolow: I suspect you did a rebase and then git pull afterwards | 08:10 |
| → akiva joined | 08:12 |
| ← weox left | 08:13 |
|
_ikke_
| Wetmelon: Note that cherry-pick does not merge history, just copies commits | 08:14 |
| ← MutantMahesh left | 08:16 |
|
Wetmelon
| Oh, that's fine | 08:18 |
| ← srcerer left | 08:18 |
| ← ahr3n left | 08:19 |
| → srcerer joined | 08:20 |
| → elastix joined | 08:21 |
| → Rodya_ joined | 08:22 |
| → ahr3n joined | 08:22 |
| → srcerer_ joined | 08:24 |
| → neanderslob_ joined | 08:26 |
| ← Rodya_ left | 08:26 |
| ← srcerer left | 08:26 |
| ← denimsoft left | 08:26 |
| → Silenced joined | 08:29 |
| ← Silenced left | 08:29 |
| → Silenced joined | 08:29 |
| ← Literphor left | 08:29 |
| srcerer_ → srcerer | 08:30 |
| ← dreiss left | 08:31 |
| → lindenle joined | 08:32 |
| → rolha joined | 08:34 |
| → moobee joined | 08:34 |
| gitinfo set mode: +v | 08:34 |
| ← rolha_ left | 08:35 |
| → ugjka joined | 08:36 |
| → nidr0x joined | 08:36 |
| → srcerer_ joined | 08:36 |
| ← lindenle left | 08:36 |
| ← srcerer left | 08:36 |
| ← Wetmelon left | 08:39 |
| ← ahr3n left | 08:39 |
| → morfin60 joined | 08:39 |
| ← morfin left | 08:39 |
| srcerer_ → srcerer | 08:40 |
| → t0by joined | 08:41 |
| ← text1 left | 08:41 |
| ← elastix left | 08:41 |
| ← Jauble left | 08:46 |
| → MutantMahesh joined | 08:48 |
| ← subhojit777 left | 08:52 |
| ← intrigueD left | 08:55 |
| → tinajohnson__ joined | 08:55 |
| → pantsman- joined | 08:59 |
| ← strayPuppy left | 08:59 |
| → subhojit777 joined | 09:02 |
| ← sssilver left | 09:03 |
| ← eletuchy left | 09:04 |
| ← MutantMahesh left | 09:05 |
| → moL-Ou joined | 09:07 |
| → davisonio joined | 09:08 |
| → Jauble joined | 09:12 |
| → slappymcfry joined | 09:13 |
| → lethjakman-l joined | 09:14 |
| ← joki left | 09:14 |
| ← Aerosonic left | 09:17 |
| → xelxebar joined | 09:17 |
| ← lethjakman-l left | 09:18 |
| → joki joined | 09:18 |
| → radsy joined | 09:19 |
| ← mayankgupta1996 left | 09:21 |
| → cyan__ joined | 09:25 |
| → Wetmelon joined | 09:27 |
| ← xelxebar left | 09:27 |
| ← Jauble left | 09:28 |
| → polyidus joined | 09:29 |
| → scarabx joined | 09:29 |
| → xelxebar joined | 09:30 |
| ← scarabx left | 09:30 |
| → jacob357 joined | 09:30 |
| → scarabx joined | 09:30 |
| ← bannakaffalatta left | 09:31 |
| → Fijit joined | 09:32 |
| ← Wetmelon left | 09:32 |
| ← jacob357 left | 09:32 |
| → cyber37 joined | 09:33 |
|
cyber37
| Hi guy's, i have a question about Git. I have a Git server hosted in a VPS server actually, and i clone my repo into my computer directly from that server. | 09:33 |
|
| Is it possible now to have a Git server in a local server (at home) witch make auto push to the Git server hosted on the VPS | 09:33 |
|
| Is it a "normal"service ? | 09:33 |
| → kfunk joined | 09:35 |
| → MutantMahesh joined | 09:35 |
|
cyber37
| Doing a simple copy is not "good" for me because i want to have the VPS Git always refreshed | 09:36 |
| ← scarabx left | 09:40 |
| → mohabaks joined | 09:40 |
| ← nidr0x left | 09:43 |
| → nidr0x joined | 09:43 |
| → Borkr joined | 09:43 |
|
mattcen
| cyber37: I'd look at git hooks on your local "server" | 09:43 |
|
| So you have your working repo, which you push to your local "server" repo, which has, say, a post-receive hook that pushes to the VPS | 09:44 |
|
| post-receive may not be the best place for it; check out !git-hooks | 09:44 |
|
| :( | 09:44 |
|
| !githooks | 09:45 |
|
| Ugh, anyway, check the githooks manpage | 09:45 |
| → eulb joined | 09:46 |
| → Rodya_ joined | 09:48 |
| ← mehola left | 09:49 |
| → mdw joined | 09:50 |
| ← mdw left | 09:51 |
| ← cyber37 left | 09:51 |
| → jfelchner joined | 09:52 |
| ← jfelchner_ left | 09:53 |
| ← Rodya_ left | 09:53 |
| → daito joined | 09:53 |
| → ivo_ joined | 09:57 |
| ← nidr0x left | 09:58 |
| ← daito left | 09:58 |
| ← d4rklit3 left | 09:58 |
| → nidr0x joined | 09:58 |
| → TomyLobo joined | 10:01 |
| ← subhojit777 left | 10:02 |
| ← MutantMahesh left | 10:02 |
| ← johnnyfive left | 10:03 |
| ← nidr0x left | 10:03 |
| → nwkj86 joined | 10:03 |
| → rolha_ joined | 10:03 |
| → eletuchy joined | 10:05 |
| ← rolha left | 10:06 |
| ← Domhack left | 10:06 |
| → e66 joined | 10:07 |
| → subhojit777 joined | 10:07 |
| → toogley joined | 10:08 |
| → akolar joined | 10:09 |
| ← eletuchy left | 10:09 |
| → ramsub07 joined | 10:10 |
| → johnnyfive joined | 10:12 |
| ← cyan__ left | 10:12 |
| → cyan__ joined | 10:12 |
| → lethjakman-l joined | 10:15 |
| → zeroed joined | 10:16 |
| → nidr0x joined | 10:17 |
| ← catsup left | 10:17 |
| → catsup joined | 10:17 |
| ← Borkr left | 10:18 |
| ← catsup left | 10:18 |
| ← cyan__ left | 10:19 |
| ← lethjakman-l left | 10:19 |
| ← WayToDoor left | 10:20 |
| → WayToDoor joined | 10:21 |
| → cyan__ joined | 10:21 |
| → Gloomy joined | 10:22 |
| ← davisonio left | 10:24 |
| → Jackneill joined | 10:25 |
| ← ramsub07 left | 10:25 |
| ← nidr0x left | 10:29 |
| → jimmyeatworld joined | 10:30 |
| ← Gloomy left | 10:31 |
| ← polyidus left | 10:31 |
| ← mohabaks left | 10:32 |
| → jost joined | 10:32 |
| ← drodger left | 10:32 |
|
Seveas
| mattcen: the bot responds to things like man githooks :) | 10:32 |
|
gitinfo
| mattcen: the githooks manpage is available at http://jk.gs/githooks.html | 10:32 |
| → delight joined | 10:33 |
| → drodger joined | 10:34 |
| ← radsy left | 10:36 |
| → mohabaks joined | 10:38 |
| ← akolar left | 10:38 |
| ← zeroed left | 10:42 |
| ← staticshock left | 10:42 |
| ← nilsi left | 10:43 |
| ← akiva left | 10:49 |
| → Rodya_ joined | 10:49 |
| → rolha joined | 10:50 |
| → davisonio joined | 10:51 |
| ← rolha_ left | 10:51 |
| ← davisonio left | 10:52 |
| → davisonio joined | 10:52 |
| ← Rodya_ left | 10:54 |
| ← Rynomster left | 10:55 |
| ← eulb left | 10:57 |
| ← blackwind_123 left | 10:59 |
| → Rynomster joined | 10:59 |
| ← Rynomster left | 10:59 |
| → Rynomster joined | 10:59 |
| → blackwind_123 joined | 11:00 |
| → mayankgupta1996 joined | 11:00 |
| → Amaa joined | 11:00 |
| → Limes_ joined | 11:01 |
| → rolha_ joined | 11:02 |
| → Jauble joined | 11:02 |
| ← rolha left | 11:02 |
| → HelloAtMega joined | 11:03 |
| ← mohabaks left | 11:07 |
|
mattcen
| Seveas: Thanks :) | 11:07 |
|
| There are so many different bot syntaces! (syntaxes? whatever.) | 11:08 |
| ← d0nn1e left | 11:08 |
| ← jimmyeatworld left | 11:09 |
|
grawity
| syntaxen | 11:09 |
| → d0nn1e joined | 11:10 |
| → spinningarrow joined | 11:10 |
| → Macaveli joined | 11:13 |
|
mattcen
| Wiktionary says syntaxes. *shrug* | 11:17 |
| ← Jauble left | 11:17 |
| → freimatz joined | 11:17 |
| ← slappymcfry left | 11:18 |
| → PCatinean joined | 11:19 |
| → nidr0x joined | 11:19 |
| → choki joined | 11:20 |
|
grawity
| I know, was kidding | 11:20 |
| ← cyan__ left | 11:21 |
| ← raven-au left | 11:22 |
| ← nidr0x left | 11:22 |
| → filcab joined | 11:25 |
| → wiched joined | 11:30 |
| → Jauble joined | 11:31 |
| ← Jauble left | 11:31 |
| → dineshp joined | 11:34 |
| → lindenle joined | 11:34 |
| ← Tryop88 left | 11:34 |
| → wrouesnel1 joined | 11:35 |
|
dineshp
| When I generate a patch using git patch format -1 , how do i ensure that the generated file has a maximum column width of 70 columns. Because when sending emails using git send-email, the community requires that the email is formatted to a amx of 70 columns | 11:35 |
| ← mattcen left | 11:36 |
|
dineshp
| if there is anyone who regularly sends out patches to the git source code, could you tell me how you format our patches and send out the emails? | 11:36 |
| ← fscala left | 11:37 |
| ← lindenle left | 11:39 |
| → staticshock joined | 11:39 |
| → fscala joined | 11:39 |
| → zadock joined | 11:40 |
|
grawity
| you can't ensure that | 11:40 |
|
| the diff format doesn't have any provisions for wrapping/continuing a line | 11:41 |
| → rolha joined | 11:41 |
| → aspiers joined | 11:41 |
|
dineshp
| well, I sent a patch yesterday to the git mailing list and that was the comment I recieved from Junio who is the git project maintainer. I could not find any documentation on this as well | 11:42 |
|
grawity
| if the community cannot accept that patches will have lines as long as the actual file (+ 1), the community needs to a) accept patches as attachments, b) accept Git pull requests, or c) reconsider its values... | 11:42 |
|
| oh is that git.git you're talking about? | 11:42 |
|
Seveas
| dineshp: that means in the source code the lines should me mate shorter | 11:42 |
|
| grawity: yeah | 11:42 |
|
grawity
| that is odd considering https://github.com/gitster/git/blob/master/Documentation/CodingGuidelines#L172 | 11:43 |
|
| dineshp: maybe Junio meant that your *commit message* should be wrapped to 70 columns? | 11:43 |
| ← subhojit777 left | 11:44 |
|
grawity
| dineshp: which is a thing you should do anyways | 11:44 |
|
| dineshp: and is done during `git commit (--amend)` | 11:44 |
| → exarch joined | 11:44 |
| → mattcen joined | 11:44 |
| ← staticshock left | 11:44 |
|
dineshp
| he mentioned code as well, so I was really lost trying all possible solutions including --stat=70 during git format-patch | 11:45 |
|
| yeah I guess he probably meant the commit message only | 11:45 |
| → raven-au joined | 11:45 |
|
Seveas
| dineshp: as a rough rule: code lines no longer htan 80 chares with tab being 8 chars, commit message title no longer than 60-ish chars (so [PATCH v2] fits) and commit message paragraphs again no longer than 70-ish. | 11:45 |
| ← Amaa left | 11:46 |
| ← paddyez left | 11:46 |
|
j416
| dineshp: link to the actual correspondence might shed light on the problem | 11:46 |
|
dineshp
| so this is my workflow: git format-patch --cover-letter -M origin/master -o outgoing/ , then gedit outgoing/0000-*, git send-email outgoing/* | 11:46 |
|
| j416: give me a minute , i will share the link | 11:47 |
|
j416
| Seveas: 60-ish -- where'd you get this from? (I'm not arguing against, just curious, since 50 seems to be a common limit used) | 11:47 |
|
grawity
| well 50 is a bit *too* short imho | 11:48 |
|
j416
| dineshp: why do you need to edit the patches? | 11:48 |
|
| grawity: maybe slightly. Through practice it's not very hard to stay at <= 50 though | 11:48 |
|
Seveas
| j416: I just did round_to_nearest_ten(70-len([patch v2])) :) | 11:48 |
|
j416
| Seveas: ah, _with_ [patch] eh | 11:49 |
| → mehola joined | 11:49 |
|
dineshp
| http://article.gmane.org/gmane.comp.version-control.git/288300 | 11:50 |
| → Rodya_ joined | 11:50 |
| → kam270 joined | 11:50 |
|
dineshp
| http://article.gmane.org/gmane.comp.version-control.git/288301 | 11:51 |
| ← HelloAtMega left | 11:51 |
|
dineshp
| http://article.gmane.org/gmane.comp.version-control.git/288303 | 11:51 |
| ← ivo_ left | 11:51 |
| → mdw joined | 11:51 |
|
grawity
| yes, so, your commit message really needs some line-wrapping | 11:51 |
| → Balliad joined | 11:52 |
|
dineshp
| j416: I edited the patch to type in my cover letter. Is there a better way to do it? | 11:52 |
|
| grawity: Other than that, anything else that needs to be done? | 11:53 |
|
j416
| dineshp: like you did --cover-letter | 11:53 |
|
| dineshp: (and yes, you're supposed to edit coverletter by hand) | 11:53 |
|
dineshp
| git format-patch --cover-letter -M origin/master -o outgoing/ | 11:53 |
|
j416
| dineshp: your editor should be able to have some sane wrap setting | 11:54 |
|
dineshp
| the above command generates the cover letter, but i still need to type it in | 11:54 |
| → daito joined | 11:54 |
|
j416
| dineshp: what editor are you using? | 11:54 |
| ← mehola left | 11:54 |
|
dineshp
| gedit | 11:54 |
|
j416
| ok, I don't know about that | 11:54 |
|
dineshp
| I use vi as well | 11:55 |
|
j416
| vim has some sane things | 11:55 |
|
| I don't know about other OSes, but if you'd install git via brew it also adds vim syntax files for git | 11:55 |
| → mxkr joined | 11:56 |
| → secki joined | 11:56 |
|
dineshp
| j416, so can you verify my workflow and correct me if I doing something wrong apart from the commit message | 11:56 |
|
| so this is my workflow: git format-patch --cover-letter -M origin/master -o outgoing/ , then gedit outgoing/0000-*, git send-email outgoing/* | 11:56 |
|
j416
| it'll indicate if your commit message is malformed and it'll wrap its body at 72 chars as is the norm | 11:56 |
|
grawity
| you can make gedit show a 'margin' at some column | 11:56 |
|
| and use it as a guideline | 11:56 |
| ← Rodya_ left | 11:56 |
|
j416
| dineshp: it seems the only error is in what you're doing in the gedit step | 11:56 |
| ← moobee left | 11:57 |
| ← spinningarrow left | 11:57 |
| ← pantsman- left | 11:57 |
|
dineshp
| I will amend the commit message and send the patch once again. Thank you j416 and grawity | 11:58 |
|
j416
| dineshp: you might also want to set your e-mail "From" to match your git username/email; just for logic's sake :) | 11:58 |
| ← mdw left | 11:58 |
| ← daito left | 11:58 |
| → spinningarrow joined | 11:59 |
| → shiriru joined | 11:59 |
| → a_thakur joined | 11:59 |
| → mdw joined | 12:01 |
| → boudiccas joined | 12:01 |
| → lethjakman-l joined | 12:04 |
| ← boudicca left | 12:04 |
| ← kam270 left | 12:04 |
| → eletuchy joined | 12:06 |
| ← dineshp left | 12:06 |
| → yereby joined | 12:08 |
| ← lethjakman-l left | 12:08 |
| → ramsub07 joined | 12:09 |
| → dsdeiz joined | 12:10 |
| ← raven-au left | 12:11 |
| ← eletuchy left | 12:12 |
| ← mxkr left | 12:13 |
| → nidr0x joined | 12:16 |
| ← nidr0x left | 12:16 |
| → oggi joined | 12:17 |
| → King_Hual joined | 12:18 |
| ← Cabanossi left | 12:18 |
| → dineshp joined | 12:20 |
| ← mdw left | 12:20 |
| → nidr0x joined | 12:20 |
| ← mayankgupta1996 left | 12:21 |
| ← e66 left | 12:22 |
| → mayankgupta1996 joined | 12:22 |
| → flavi0 joined | 12:22 |
| → MutantMahesh joined | 12:22 |
| → Tryop88 joined | 12:23 |
| ← choki left | 12:23 |
| → mdw joined | 12:24 |
| ← mdw left | 12:24 |
| → mdw joined | 12:26 |
| ← nidr0x left | 12:27 |
| → Gamecubic joined | 12:27 |
| ← mdw left | 12:27 |
| ← davisonio left | 12:27 |
| ← sauvin left | 12:27 |
| → nidr0x joined | 12:27 |
| → sauvin joined | 12:27 |
| → kam270 joined | 12:29 |
| → HelloAtMega joined | 12:29 |
| ← Balliad left | 12:29 |
| → mwhooker joined | 12:30 |
| ← oggi left | 12:31 |
| → dan2k3k4 joined | 12:31 |
| → pmort joined | 12:33 |
| → doener joined | 12:33 |
| ← toogley left | 12:33 |
| → mdw joined | 12:35 |
| → diegoviola joined | 12:35 |
| ← mdw left | 12:35 |
| → subhojit777 joined | 12:36 |
| → mdw joined | 12:36 |
| ← mdw left | 12:37 |
| ← rolha left | 12:37 |
| VarunAgw → Snowden | 12:38 |
| Snowden → Snowden25 | 12:39 |
| ← drawkula left | 12:39 |
| → egeerardyn joined | 12:39 |
| → drawkula joined | 12:40 |
| → staticshock joined | 12:41 |
| Snowden25 → VarunAgw | 12:41 |
| → johnmilton joined | 12:41 |
| → Balliad joined | 12:43 |
| → DocMAX joined | 12:44 |
|
DocMAX
| hi | 12:44 |
|
| i cange branch with "git branch mybranch2" | 12:45 |
| ← Balliad left | 12:45 |
| → davisonio joined | 12:45 |
|
grawity
| that doesn't change the branch though | 12:45 |
|
DocMAX
| how can i update the files now to have mybranch2 files? | 12:45 |
|
grawity
| you want `git checkout mybranch2` | 12:45 |
|
DocMAX
| oh yes | 12:45 |
|
| id did that after | 12:45 |
| ← staticshock left | 12:46 |
|
DocMAX
| now git reset --hard should update the files right? | 12:46 |
|
grawity
| no | 12:46 |
| ← CussBot left | 12:46 |
|
grawity
| `git checkout` already updates them | 12:46 |
|
| but | 12:46 |
|
DocMAX
| i see no updates | 12:46 |
|
grawity
| well you just created the branch right now | 12:46 |
|
| using 'git branch' | 12:46 |
|
| so it doesn't have any commits of its own yet | 12:46 |
|
| so where *would* the updates come from? | 12:46 |
|
DocMAX
| https://github.com/stintel/openwrt-packages/tree/master/net/strongswan | 12:46 |
|
| i want the "strongswan" branch cloned | 12:46 |
| ← johnmilton left | 12:47 |
| → CussBot joined | 12:47 |
| ← nidr0x left | 12:47 |
|
grawity
| so delete the one you created, and do `git checkout -b mybranch2 origin/strongswan` | 12:47 |
|
| or `git branch mybranch2 origin/strongswan; git checkout mybranch2` | 12:47 |
|
DocMAX
| one sec | 12:48 |
|
| i was in the strongswan folder | 12:48 |
|
| then i did a "git branch strongswan" (which was wrong) | 12:48 |
|
| then a "git checkout strongswan" (which switched the branch) | 12:49 |
| → daedeloth joined | 12:49 |
|
DocMAX
| then a "git reset --hard" (which did not update the files to this branch) | 12:49 |
|
| forget about mybranch2 | 12:49 |
| ← tinajohnson__ left | 12:49 |
|
DocMAX
| so what shall i do now? | 12:50 |
| → nidr0x joined | 12:50 |
|
DocMAX
| to get the files of branch "strongswan" | 12:50 |
|
grawity
| git reset --hard origin/strongswan | 12:50 |
|
| and maybe, git branch -u origin/strongswan | 12:50 |
|
| to make future updates easier | 12:50 |
| ← pmort left | 12:50 |
|
DocMAX
| fatal: ambiguous argument 'origin/strongswan': unknown revision or path not in the working tree. | 12:51 |
|
grawity
| hrmm | 12:51 |
|
| git fetch origin | 12:51 |
|
| then try again | 12:51 |
| → mehola joined | 12:51 |
|
DocMAX
| same | 12:51 |
| → Rodya_ joined | 12:52 |
|
DocMAX
| Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' | 12:52 |
|
| git reset --hard strongswan works | 12:53 |
|
| but doesnt update my files | 12:53 |
| ← spinningarrow left | 12:53 |
| → rolha joined | 12:53 |
| → emmajane joined | 12:54 |
| → espindola joined | 12:54 |
| → Juzzika joined | 12:55 |
|
grawity
| always remember that 'strongswan' on your clone is *not* the same branch as 'strongswan' on the Github repo | 12:55 |
|
| you created your own branch named 'strongswan' with no relation to what's on Github | 12:56 |
|
| so anyway | 12:56 |
|
DocMAX
| ah ok | 12:56 |
|
| but you know what i want | 12:56 |
|
| ? | 12:56 |
|
grawity
| basically each repo has its own branches | 12:56 |
|
| yeah | 12:56 |
| ← Rodya_ left | 12:56 |
|
DocMAX
| so how can i do what i want? | 12:56 |
|
grawity
| so can you pastebin the output of 'git remote -v; git fetch --all; git branch -a'? | 12:56 |
| ← mehola left | 12:57 |
|
DocMAX
| dur | 12:57 |
|
| sure | 12:57 |
| → zartu joined | 12:58 |
|
DocMAX
| http://pastebin.com/QrXPDy67 | 12:58 |
|
grawity
| hmm | 12:59 |
|
| what about `git config remote.origin.fetch`? | 12:59 |
|
DocMAX
| sorry its german | 12:59 |
| → johnmilton joined | 12:59 |
| ← nidr0x left | 12:59 |
|
DocMAX
| +refs/heads/master:refs/remotes/origin/master | 12:59 |
|
grawity
| git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/* | 12:59 |
|
DocMAX
| no output | 12:59 |
|
grawity
| now go back to `git fetch; git branch -u origin/strongswan; git reset --hard origin/strongswan` | 13:00 |
| ← davisonio left | 13:00 |
| → fstd_ joined | 13:00 |
|
DocMAX
| has a problem with "git branch -u origin/strongswan" | 13:01 |
|
| origin/strongswan doesn not exist | 13:01 |
|
grawity
| huh | 13:01 |
|
| `git fetch` should have downloaded that just fine | 13:01 |
| ← MutantMahesh left | 13:01 |
|
grawity
| oh waiiit a moment | 13:01 |
|
osse
| assuming it exists | 13:01 |
| → spinningarrow joined | 13:02 |
|
grawity
| are you actually in a submodule?... | 13:02 |
| → nidr0x joined | 13:02 |
| ← nidr0x left | 13:02 |
|
DocMAX
| how do i know? | 13:02 |
|
grawity
| ah, no | 13:02 |
|
| well you gave me a different repo than `git remote` shows | 13:02 |
|
DocMAX
| i'm still on branch strongswan | 13:02 |
|
grawity
| but I see now that it's actually just a fork | 13:02 |
|
| so | 13:02 |
| → _tk_ joined | 13:02 |
|
grawity
| git remote add -f stintel https://github.com/stintel/openwrt-packages | 13:03 |
|
| git branch -u stintel/strongswan | 13:03 |
|
| git reset --hard stintel/strongswan | 13:03 |
| ← fstd left | 13:03 |
| fstd_ → fstd | 13:03 |
|
grawity
| *that* should work | 13:03 |
|
DocMAX
| *that* worked! | 13:03 |
| → nidr0x joined | 13:03 |
| ← nidr0x left | 13:03 |
|
DocMAX
| and what ever those commands do | 13:04 |
|
| can you explain what i did? | 13:04 |
| → nnyk_ joined | 13:04 |
| → lethjakman-l joined | 13:05 |
|
grawity
| well like I said, each repo has its own branches | 13:05 |
|
| you originally cloned https://github.com/openwrt/packages | 13:05 |
|
| but the branch you want is only in https://github.com/stintel/openwrt-packages | 13:05 |
|
| so you added a remote (a bookmark basically) to download everything from that one | 13:05 |
|
| `git branch -u` sets the branch's "upstream" for when you do `git pull` in the future | 13:06 |
|
| since it was previously set to local master branch, or whatever you created the branch from | 13:06 |
| ← spinningarrow left | 13:06 |
|
DocMAX
| and to undo this i need to do what? | 13:06 |
|
| thx for the explanation very much! | 13:07 |
| → crater2150 joined | 13:07 |
|
grawity
| well `git checkout master` is probably enough | 13:07 |
|
| you can also delete the 'strongswan' branch with `git branch -D`, and/or remove the 'stintel' remote with `git remote rm` | 13:08 |
|
j416
| DocMAX: !book might give you a better undetstanding | 13:08 |
|
gitinfo
| DocMAX: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable | 13:08 |
| → eletuchy joined | 13:08 |
| ← ssd532_ left | 13:08 |
|
DocMAX
| yeah i guess i have to study git for those "simple" tasks | 13:09 |
| → spinningarrow joined | 13:09 |
| ← lethjakman-l left | 13:09 |
| ← rolha left | 13:11 |
| ← dsdeiz left | 13:11 |
|
j416
| DocMAX: it really helps. You might think it's faster to ask case-by-case, but spending a day reading will quite definitely save you a lot of time, if you are using git regularly. | 13:12 |
| → davisonio joined | 13:12 |
| ← espindola left | 13:13 |
| ← eletuchy left | 13:13 |
|
DocMAX
| grawity, wondering, where is the information saved? in .git folder? i dont see a .git folder in strongswan dir | 13:13 |
| → pmort joined | 13:13 |
|
DocMAX
| j416 thx! | 13:14 |
|
grawity
| git rev-parse --git-dir | 13:14 |
|
| I do still have a feeling it's a submodule | 13:14 |
|
DocMAX
| wow | 13:15 |
| ← davisonio left | 13:15 |
|
DocMAX
| it s in a completly different folder | 13:16 |
|
| how does git know where to look? | 13:16 |
|
grawity
| maybe the .git is a file | 13:16 |
|
DocMAX
| does it check the parent folders? | 13:16 |
| → davisonio joined | 13:16 |
|
grawity
| yeah it does | 13:16 |
|
DocMAX
| until it find a .git dir? | 13:16 |
| ← dineshp left | 13:16 |
|
grawity
| but, what exactly did that command print? | 13:16 |
|
DocMAX
| ./feeds/packages/.git | 13:16 |
|
| and i'm here: | 13:17 |
|
| ./package/feeds/packages/strongswan | 13:17 |
| → yiee joined | 13:17 |
|
DocMAX
| there is also a ./.git | 13:17 |
|
| does it jump from there to ./feeds/packages/.git ? | 13:17 |
|
j416
| how could it print "./feeds/packages/.git" if you are in package/feeds/packages/strongswan | 13:18 |
|
DocMAX
| thats the question | 13:18 |
|
| here is the full patch | 13:18 |
|
| path | 13:18 |
|
j416
| are you sure it printed exactly that? | 13:18 |
|
DocMAX
| docmax@ubuntu:~/openwrt/trunk/package/feeds/packages/strongswan$ git rev-parse --git-dir | 13:18 |
|
grawity
| if $GIT_DIR is set, it uses that; otherwise it only checks for .git going upwards | 13:18 |
|
DocMAX
| -/home/docmax/openwrt/trunk/feeds/packages/.git | 13:19 |
| ← Limes_ left | 13:19 |
|
j416
| DocMAX: right, so it didn't print ./feeds/packages/.git | 13:19 |
|
| DocMAX: "." means "current directory". | 13:19 |
| ← Macaveli left | 13:19 |
|
grawity
| and if it finds a *file* named .git, then it follows its contents | 13:19 |
|
DocMAX
| ok now it makes sense? :-) | 13:19 |
|
j416
| DocMAX: it doesn't because those are two separate directory trees | 13:20 |
|
| DocMAX: did you type that manually or something? | 13:20 |
|
DocMAX
| no | 13:20 |
|
| there is no env variable | 13:20 |
|
| and no git file | 13:20 |
| → intellix joined | 13:20 |
| ← pmort left | 13:21 |
|
j416
| ~/openwrt/trunk/package/feeds/packages/strongswan | 13:21 |
|
| ~/openwrt/trunk/feeds/packages | 13:21 |
|
| ^ | 13:21 |
|
DocMAX
| YOU are the experts | 13:21 |
| ← intellix left | 13:21 |
| → pmort joined | 13:21 |
|
DocMAX
| how does it work? | 13:21 |
|
| maybe goes upward till finds .git? | 13:21 |
| ← linuxmint left | 13:21 |
|
j416
| yes, but there is no upwards .git | 13:21 |
|
| it's sideways | 13:22 |
|
DocMAX
| the first .git is here: ~\openwrt\trunk\.git | 13:22 |
|
j416
| the git rev-parse --git-dir should give that | 13:22 |
|
| then* | 13:22 |
| → hexagoxel joined | 13:22 |
|
DocMAX
| no ides guys :-) | 13:23 |
|
| idea | 13:23 |
|
j416
| I suspect pebkac | 13:23 |
| → espindola joined | 13:23 |
|
j416
| DocMAX: could you !repro that again? | 13:23 |
|
gitinfo
| DocMAX: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session. | 13:23 |
|
DocMAX
| what? | 13:24 |
|
| where is the command i shall use? | 13:24 |
|
j416
| pwd | 13:25 |
|
| git rev-parse --git-dir | 13:25 |
|
| output of those two. | 13:25 |
|
DocMAX
| git rev-parse --git-dir is just one line | 13:25 |
|
j416
| how does that help me? | 13:25 |
|
DocMAX
| -/home/docmax/openwrt/trunk/feeds/packages/.git | 13:25 |
| → toogley joined | 13:25 |
|
DocMAX
| whats the sencond command? | 13:26 |
|
| second | 13:26 |
|
j416
| 14:25:09 +j416 | git rev-parse --git-dir | 13:26 |
| ← TomyLobo left | 13:26 |
|
DocMAX
| thats the 1st | 13:26 |
|
j416
| no | 13:26 |
|
DocMAX
| searching for this? http://pastebin.com/NThNgyDM | 13:27 |
|
j416
| DocMAX: try: cd -P . | 13:28 |
|
| (are there symlinks in your path?) | 13:28 |
|
DocMAX
| goes to that dir | 13:29 |
|
j416
| what dir | 13:29 |
|
DocMAX
| oh sorry | 13:29 |
|
| symlinks! | 13:29 |
|
| i was in a simlink dir | 13:30 |
|
j416
| problem solved then | 13:30 |
|
DocMAX
| sorry for the confusion | 13:30 |
|
| interesting, simlinks do not show .git? | 13:30 |
| ← doener left | 13:30 |
| → lss_ joined | 13:30 |
|
j416
| what do you mean? | 13:30 |
|
| a symlink is not a directory | 13:30 |
| → m0viefreak joined | 13:30 |
|
DocMAX
| cd -P . jumped to "~/openwrt/trunk/feeds/packages/net/strongswan" | 13:31 |
|
j416
| yes, as expected | 13:31 |
|
DocMAX
| but no .git there | 13:31 |
|
j416
| /home/docmax/openwrt/trunk/feeds/packages/.git | 13:31 |
|
| ^ | 13:31 |
| ← ugjka left | 13:31 |
|
DocMAX
| yes there it is | 13:31 |
|
j416
| now, this is above where you are currently | 13:32 |
|
| (which was not the case before) | 13:32 |
|
DocMAX
| goes 2x times upward | 13:32 |
|
j416
| yes. | 13:32 |
|
DocMAX
| and git follows symlinks | 13:32 |
|
j416
| yes and no | 13:32 |
|
| it stores symlinks as symlinks | 13:32 |
|
DocMAX
| ah ok | 13:33 |
|
j416
| your shell follows them | 13:33 |
| → ugjka joined | 13:33 |
| → The_Phoenix joined | 13:33 |
| ← The_Phoenix left | 13:33 |
| → The_Phoenix joined | 13:33 |
| ← espindola left | 13:35 |
| ← mwhooker left | 13:35 |
| → lindenle joined | 13:36 |
| ← HelloAtMega left | 13:36 |
| ← mrkat left | 13:38 |
| → T7rees joined | 13:40 |
| ← star_prone left | 13:40 |
| ← lindenle left | 13:40 |
| ← pmort left | 13:41 |
| → staticshock joined | 13:41 |
| ← Juzzika left | 13:42 |
| → tinajohnson__ joined | 13:42 |
| ← ramsub07 left | 13:44 |
| → Macaveli joined | 13:44 |
| → ramsub07 joined | 13:44 |
| → ErKa joined | 13:45 |
| → happy-dude joined | 13:46 |
| ← staticshock left | 13:46 |
| → espindola joined | 13:51 |
| → raven-au joined | 13:52 |
| ← espindola left | 13:53 |
| → Rodya_ joined | 13:53 |
| → daito joined | 13:55 |
| → Literphor joined | 13:55 |
| ← Rynomster left | 13:55 |
| → jel80 joined | 13:56 |
| ← tchan left | 13:56 |
| ← Rodya_ left | 13:57 |
| ← electrogeek left | 13:58 |
| → cebor_ joined | 13:58 |
| → rolha joined | 13:58 |
| ← neohe_ left | 13:58 |
| ← cebor left | 13:59 |
| → DocMAX2 joined | 13:59 |
| → neohe joined | 13:59 |
| → electrogeek joined | 13:59 |
| ← daito left | 14:00 |
| ← DocMAX left | 14:00 |
| → dineshp joined | 14:01 |
| ← kam270 left | 14:04 |
| ← dan2k3k4 left | 14:05 |
| → Limes_ joined | 14:07 |
| ← morfin60 left | 14:08 |
| ← yiee left | 14:08 |
| ← sangy left | 14:08 |
| → dsdeiz joined | 14:09 |
| ← dsdeiz left | 14:09 |
| → dsdeiz joined | 14:09 |
| → eletuchy joined | 14:10 |
| ← glebihan left | 14:11 |
| → Dnf joined | 14:11 |
| ← rolha left | 14:12 |
| ← a_thakur left | 14:12 |
| → a_thakur_ joined | 14:12 |
| ← diogenese left | 14:12 |
| ← happy-dude left | 14:12 |
| ← dineshp left | 14:13 |
| → intrigueD joined | 14:13 |
| → dineshp joined | 14:13 |
| ← eletuchy left | 14:14 |
| ← DocMAX2 left | 14:15 |
| → happy-dude joined | 14:15 |
| ← a_thakur_ left | 14:15 |
| → glebihan joined | 14:16 |
| → DocMAX joined | 14:16 |
| ← DocMAX left | 14:16 |
| ← spinningarrow left | 14:17 |
| → fees joined | 14:18 |
| ← davisonio left | 14:19 |
| → intellix joined | 14:19 |
| → Gloomy joined | 14:20 |
| ← Macaveli left | 14:21 |
| ← rolha_ left | 14:21 |
| → rolha joined | 14:22 |
| → tchan joined | 14:23 |
| ← ensyde__ left | 14:24 |
| → Cabanossi joined | 14:25 |
| → HelloAtMega joined | 14:25 |
| → nosmelc joined | 14:27 |
| → jaafar joined | 14:27 |
|
nosmelc
| I tagged some Git commits using Visual Studio 2015, but the tags aren't making it to the origin/master and origin/develop branches on Visual Studio Team Services. Any ideas why? | 14:28 |
| ← hgl left | 14:28 |
| ← intrigueD left | 14:28 |
|
osse
| probably because they are not pushed | 14:28 |
| ← Tryop88 left | 14:28 |
| → rolha_ joined | 14:29 |
|
osse
| I mean, that must definitely be the reason. Why VS doesn't do that I don't know | 14:29 |
|
nosmelc
| osse I think so too, but I see nothing in VS about how to push tags | 14:29 |
|
| osse I assumed they'd get pushed with the commits | 14:29 |
|
osse
| git push has a flag that does exactly that. maybe it's configurable | 14:30 |
| ← rolha left | 14:30 |
| ← tgunr left | 14:31 |
| → hgl joined | 14:31 |
| → Tryop88 joined | 14:31 |
| → mmlb joined | 14:32 |
| ← netj left | 14:33 |
| → netj joined | 14:33 |
| → rolha joined | 14:35 |
| ← rolha_ left | 14:35 |
| → Discovery joined | 14:35 |
| → IlNominePatre joined | 14:35 |
| ← hgl left | 14:36 |
| ← chigang left | 14:36 |
| → Balliad joined | 14:37 |
|
nosmelc
| osse that's git push --tags, right? | 14:37 |
|
j416
| nosmelc: plain git push does not push tags by default, you need to pass --tags. If VS can create tags, I assume it can push them somehow. | 14:37 |
|
osse
| nosmelc: I was thinking of --follow-tags, but --tags works too | 14:37 |
| ← zadock left | 14:38 |
|
j416
| nosmelc: you can also push indiviudal tags by using a full refspec (git push origin refs/tags/nameoftag) | 14:38 |
|
| nosmelc: so possibly you could.. I don't know, click a tag and select push, or so | 14:39 |
| ← Balliad left | 14:39 |
| → mischat joined | 14:40 |
|
nosmelc
| j416 maybe, but I don't see a way to push a tag in VS | 14:40 |
|
j416
| nosmelc: drop down to cmdline maybe :) | 14:40 |
| → star_prone joined | 14:41 |
|
nosmelc
| j416 haha yeah that might work. I was seeing if I could do everything right in VS2015 | 14:41 |
| ← mischat left | 14:41 |
|
nosmelc
| j416 getting tags onto the remote branches is the only thing I've had trouble with so far | 14:41 |
|
j416
| mhm | 14:42 |
|
| integrations are nice, when/if they work :) | 14:42 |
|
| mostly they don't | 14:42 |
| → staticshock joined | 14:42 |
|
nosmelc
| j416 SourceTree connected to BitBucket could do it | 14:43 |
|
j416
| I've heard good things about sourcetree | 14:43 |
| → cyan__ joined | 14:43 |
|
j416
| never tried it | 14:43 |
| ← star_prone left | 14:44 |
| → star_prone joined | 14:44 |
| → sinax joined | 14:44 |
| → sargas joined | 14:45 |
|
nosmelc
| Doing more searching I found the answer. VS2015 doesn't have the ability to push tags yet | 14:46 |
|
j416
| hah. | 14:46 |
|
nosmelc
| I'll need to do git push --tags origin | 14:46 |
|
osse
| that's really weird | 14:46 |
|
| how do you push branches with it? it's all the same (more or less) | 14:47 |
| ← staticshock left | 14:47 |
|
nosmelc
| osse you just do a Push, or you can do Synch which I think does a pull, merge, and then push | 14:47 |
|
osse
| :S | 14:48 |
|
j416
| ew | 14:48 |
|
| never push sync | 14:48 |
|
| er, never press the button for 'sync', is what I mean without terminology ambiguity | 14:49 |
|
| j416 off to dinner | 14:49 |
| ← jaguarmagenta2 left | 14:49 |
| → jaguarmagenta joined | 14:49 |
| → Goplat joined | 14:49 |
| → sdothum joined | 14:50 |
| → MadHatter42 joined | 14:50 |
| ← ramsub07 left | 14:50 |
| ← Tryop88 left | 14:51 |
| → Tryop88 joined | 14:51 |
| ← wrouesnel1 left | 14:52 |
| ← biertie left | 14:53 |
| → biertie joined | 14:53 |
| biertie → bdesmet | 14:53 |
| → lethjakman-l joined | 14:53 |
| → Rodya_ joined | 14:54 |
| ← nnyk_ left | 14:54 |
| → Noldorin joined | 14:55 |
| → morty29 joined | 14:56 |
| → spinningarrow joined | 14:56 |
| ← spinningarrow left | 14:57 |
| ← shiriru left | 14:57 |
| → spinningarrow joined | 14:57 |
| ← lethjakman-l left | 14:58 |
| ← Rodya_ left | 14:58 |
| ← subhojit777 left | 14:59 |
| → acetakwas joined | 15:00 |
| ← sinax left | 15:00 |
| ← spinningarrow left | 15:02 |
| ← Silenced left | 15:02 |
| ← Gitzilla left | 15:02 |
| → spinningarrow joined | 15:02 |
| → davisonio joined | 15:03 |
| ← Dnf left | 15:03 |
| ← shinnya left | 15:04 |
| ← PCatinean left | 15:04 |
| → grayjoc joined | 15:04 |
| → Silenced joined | 15:05 |
| ← Silenced left | 15:05 |
| → Silenced joined | 15:05 |
| → Tratos joined | 15:05 |
| ← acetakwas left | 15:06 |
| → orisk joined | 15:07 |
| → showaz joined | 15:09 |
|
showaz
| Hi, what are the mechanisms to bring back git-submoule (static) in the main (site) tree along with the history? | 15:09 |
| → Gitzilla joined | 15:10 |
| → eletuchy joined | 15:10 |
|
osse
| showaz: Do you mean git submodule init? | 15:13 |
| → intrigueD joined | 15:14 |
|
showaz
| osse: deinit (merge history to main storage) | 15:14 |
|
| osse: maybe this good http://stackoverflow.com/a/23328223/2126990 | 15:14 |
|
grawity
| you can import it as a subtree | 15:14 |
|
| yes, like that | 15:14 |
| ← eletuchy left | 15:15 |
| ← Silenced left | 15:16 |
| → mischat joined | 15:16 |
| → leeN joined | 15:16 |
| → Silenced joined | 15:16 |
| ← Silenced left | 15:16 |
| → Silenced joined | 15:16 |
| → pantsman- joined | 15:17 |
| ← t0by left | 15:17 |
| ← intrigueD left | 15:18 |
| ← Literphor left | 15:18 |
| ← MadHatter42 left | 15:18 |
| → pungi-man joined | 15:19 |
|
showaz
| grawity: but history save sub-module trash. | 15:20 |
| → MadHatter42 joined | 15:20 |
| → acetakwas joined | 15:20 |
| ← diegoviola left | 15:21 |
| → d4rklit3 joined | 15:22 |
| → bannakaffalatta joined | 15:22 |
| → espindola joined | 15:22 |
| ← FunkyAss left | 15:24 |
| → sssilver joined | 15:24 |
| → FunkyAss joined | 15:24 |
| ← espindola left | 15:25 |
| → denimsoft joined | 15:26 |
|
j416
| hah, tried out sourcetree | 15:27 |
|
| I've barely started the thing and the first thing it did (without asking) was to change one line and add 6 extra lines to my ~/.gitconfig | 15:28 |
| → Juzzika joined | 15:28 |
| ← Juzzika left | 15:28 |
| ← nosmelc left | 15:30 |
|
j416
| trailing whitespace at that agh | 15:30 |
|
| but I do like its "add -p" implementation allowing selection of individual lines, not just hunks | 15:30 |
|
| commit message editor is nuts | 15:31 |
|
| j416 uninstalls | 15:31 |
| → PHPanos joined | 15:31 |
| ← PHPanos left | 15:32 |
| → PHPanos joined | 15:32 |
| → nilsi joined | 15:33 |
| → neohe_ joined | 15:35 |
| ← MadHatter42 left | 15:35 |
| ← mayankgupta1996 left | 15:35 |
| → SabreWolfy joined | 15:36 |
|
grawity
| eh, `git gui` can do the same | 15:36 |
| → CEnnis91 joined | 15:36 |
| → Sucks joined | 15:37 |
| → lindenle joined | 15:37 |
| ← neohe left | 15:38 |
| → italoacasas joined | 15:39 |
| ← italoacasas left | 15:39 |
| ← delight left | 15:39 |
| → italoacasas joined | 15:40 |
| ← acetakwas left | 15:40 |
| ← italoacasas left | 15:41 |
| → Tryop88_ joined | 15:42 |
| ← lindenle left | 15:42 |
| ← grayjoc left | 15:42 |
| → staticshock joined | 15:43 |
| ← mischat left | 15:43 |
| ← Tryop88 left | 15:45 |
| → Puck6633 joined | 15:47 |
| ← staticshock left | 15:47 |
| → diegoaguilar joined | 15:49 |
| → diegoviola joined | 15:49 |
| → a_thakur joined | 15:50 |
|
j416
| grawity: true | 15:50 |
|
| grawity: except not to ~/.gitconfig -- it stores its info locally iirc | 15:51 |
|
| ooh select -> stage lines for commit -- I did not know it did this | 15:53 |
|
| nice | 15:53 |
| → mehola joined | 15:53 |
| ← emmajane left | 15:54 |
| → lethjakman-l joined | 15:54 |
| ← d4rklit3 left | 15:54 |
| → Rodya_ joined | 15:55 |
| → Guest55 joined | 15:55 |
| → daito joined | 15:55 |
| ← showaz left | 15:56 |
| → ramsub07 joined | 15:56 |
| ← _tk_ left | 15:56 |
| ← Silenced left | 15:57 |
| ← SabreWolfy left | 15:57 |
| ← orisk left | 15:58 |
| ← mehola left | 15:58 |
| → nosmelc joined | 15:58 |
| → mischat joined | 15:59 |
| ← Rodya_ left | 15:59 |
| ← diegoviola left | 15:59 |
| ← lethjakman-l left | 15:59 |
| ← daito left | 16:00 |
| → nnyk_ joined | 16:00 |
| → subhojit777 joined | 16:01 |
| → sq-one joined | 16:01 |
| ← nilsi left | 16:01 |
| → diogenese joined | 16:02 |
| → a_thakur_ joined | 16:03 |
| → cagmz joined | 16:03 |
| ← a_thakur left | 16:05 |
| ← T7rees left | 16:05 |
| → Pulp joined | 16:06 |
| → acetakwas joined | 16:06 |
| → delight joined | 16:07 |
| → RudolphFenz joined | 16:09 |
| → jaguarmagenta2 joined | 16:09 |
| ← denimsoft left | 16:10 |
| ← dmko left | 16:10 |
| → denimsoft joined | 16:11 |
| ← jaguarmagenta left | 16:11 |
| → eletuchy joined | 16:11 |
| → Silenced joined | 16:13 |
| ← Silenced left | 16:13 |
| → Silenced joined | 16:13 |
| ← pungi-man left | 16:13 |
| ← jost left | 16:14 |
| ← acetakwas left | 16:14 |
| ← eletuchy left | 16:16 |
| → Snopandan joined | 16:16 |
| ← a_thakur_ left | 16:17 |
| ← daynaskully left | 16:18 |
| ← ramsub07 left | 16:18 |
| → tvw joined | 16:18 |
| ← ErKa left | 16:19 |
| → ivo_ joined | 16:19 |
| → jost joined | 16:20 |
| ← HelloAtMega left | 16:22 |
| → dreiss joined | 16:22 |
| ← nydel07 left | 16:23 |
| ← cagmz left | 16:23 |
| ← Snopandan left | 16:24 |
| ← toogley left | 16:24 |
| ← Guest55 left | 16:24 |
| → staticshock joined | 16:25 |
| → zadock joined | 16:25 |
| → whitby joined | 16:26 |
| ← jost left | 16:28 |
| → jost joined | 16:30 |
| ← jost left | 16:31 |
| → tgunr joined | 16:35 |
| ← s00pcan left | 16:37 |
| → Ahmed90 joined | 16:38 |
| → s00pcan joined | 16:38 |
| → ErKa joined | 16:39 |
| ← sargas left | 16:41 |
| → daynaskully joined | 16:41 |
| → acetakwas joined | 16:43 |
| ← yereby left | 16:44 |
| ← kermit left | 16:44 |
| ← liri_ left | 16:47 |
| ← staticshock left | 16:49 |
| ← Tryop88_ left | 16:49 |
| → zeroed joined | 16:52 |
| ← Sucks left | 16:52 |
| ← brandonw left | 16:53 |
| → brandonw joined | 16:54 |
| → mehola joined | 16:55 |
| → lethjakman-l joined | 16:55 |
|
Gloomy
| Hey :) | 16:55 |
| → Rodya_ joined | 16:55 |
|
Gloomy
| I'm developing a little web app, is there a way I can run it directly from github? | 16:55 |
|
j416
| #github | 16:56 |
|
Gloomy
| oh. sorry | 16:56 |
|
j416
| afaik github only serves static content | 16:56 |
|
_ikke_
| yes | 16:56 |
| ← intellix left | 16:56 |
|
Gloomy
| It's only html/css/js | 16:57 |
| → e66 joined | 16:58 |
| → staticshock joined | 16:58 |
| ← echelon left | 16:59 |
| ← lethjakman-l left | 16:59 |
| ← mehola left | 16:59 |
| ← subhojit777 left | 17:00 |
| → Borkr joined | 17:00 |
| ← Rodya_ left | 17:01 |
| → subhojit777 joined | 17:01 |
| → jonesinator joined | 17:02 |
| ← aaronj left | 17:02 |
| → Jqj joined | 17:07 |
| ← secki left | 17:07 |
| → treehug88 joined | 17:07 |
| → toogley joined | 17:07 |
| ← dineshp left | 17:08 |
| → thiago_ joined | 17:08 |
| ← diegoaguilar left | 17:09 |
| → sbeller_ joined | 17:09 |
| → diegoaguilar joined | 17:09 |
| → sargas joined | 17:09 |
| ← sbeller left | 17:10 |
| → GandalfTheWizard joined | 17:10 |
| → mizu_no_oto joined | 17:11 |
| → eletuchy joined | 17:12 |
| → ramsub07 joined | 17:12 |
| ← spinningarrow left | 17:12 |
| ← daedeloth left | 17:13 |
| ← mizu_no_oto left | 17:14 |
| → MutantMahesh joined | 17:15 |
| → kn-928 joined | 17:16 |
| → durham joined | 17:16 |
| ← eletuchy left | 17:17 |
| ← kn-928 left | 17:18 |
| → t0by joined | 17:18 |
| ← t0by left | 17:18 |
| ← Jqj left | 17:19 |
| → Wetmelon joined | 17:20 |
| → lethjakman-l joined | 17:21 |
| → secki joined | 17:22 |
| ← m0viefreak left | 17:22 |
| ← The_Phoenix left | 17:24 |
| ← kalz left | 17:24 |
| → abiom joined | 17:24 |
| ← Gamecubic left | 17:24 |
| → subhojit777_ joined | 17:26 |
| ← jel80 left | 17:26 |
| ← lethjakman-l left | 17:27 |
| ← subhojit777 left | 17:28 |
| subhojit777_ → subhojit777 | 17:28 |
| ← morty29 left | 17:29 |
| ← e66 left | 17:30 |
| ← cyan__ left | 17:32 |
| → InfoTest joined | 17:32 |
| ← ramsub07 left | 17:34 |
| → Dios joined | 17:34 |
| ← Dios left | 17:35 |
| → PryMar56 joined | 17:37 |
| → lindenle joined | 17:39 |
| ← staticshock left | 17:40 |
| ← durham left | 17:41 |
| ← fstd left | 17:43 |
| ← woxidu left | 17:43 |
| ← lindenle left | 17:44 |
| → HelloAtMega joined | 17:44 |
| → fstd joined | 17:45 |
| → Rodya_ joined | 17:45 |
| ← abiom left | 17:47 |
| → diegoviola joined | 17:47 |
| → presto joined | 17:48 |
| → livingstn joined | 17:48 |
| ← star_prone left | 17:49 |
| → Domhack joined | 17:49 |
| → iuoqo joined | 17:50 |
| ← acetakwas left | 17:52 |
| → aaw joined | 17:53 |
| ← sssilver left | 17:53 |
| ← davisonio left | 17:54 |
| → mi100hael_ joined | 17:55 |
| → mehola joined | 17:55 |
| → Ardit joined | 17:56 |
| → daito joined | 17:56 |
| ← dreiss left | 17:57 |
| → scarabx joined | 17:59 |
| → mizu_no_oto joined | 17:59 |
| ← mi100hael left | 17:59 |
| ← mehola left | 18:00 |
| ← exarch left | 18:00 |
| ← iuoqo left | 18:00 |
| ← daito left | 18:01 |
| ← mizu_no_oto left | 18:01 |
| ← denimsoft left | 18:01 |
| ← M3mphiZ left | 18:01 |
| → subscope joined | 18:02 |
| ← InfoTest left | 18:02 |
| ← zeroed left | 18:03 |
| ← scarabx left | 18:03 |
| → scarabx joined | 18:03 |
| → d4rklit3 joined | 18:04 |
| → M3mphiZ joined | 18:05 |
| → satifant joined | 18:06 |
| → lethjakman-l joined | 18:07 |
| ← subscope left | 18:08 |
| → Lyqyd joined | 18:08 |
| → subscope joined | 18:09 |
| → ipt joined | 18:10 |
| → fedexo joined | 18:10 |
| ← lethjakman-l left | 18:13 |
| → eletuchy joined | 18:13 |
| → MutantMa_ joined | 18:15 |
| ← eletuchy left | 18:17 |
| ← Rodya_ left | 18:17 |
| ← treehug88 left | 18:19 |
| ← MutantMahesh left | 18:19 |
| ← happy-dude left | 18:19 |
| ← Borkr left | 18:20 |
| ← Gloomy left | 18:20 |
| → mizu_no_oto joined | 18:20 |
| ← fahadash left | 18:21 |
| ← roygbiv left | 18:21 |
| ← aaw left | 18:22 |
| ← livingstn left | 18:23 |
| ← M3mphiZ left | 18:23 |
| → livingstn joined | 18:24 |
| ← mizu_no_oto left | 18:25 |
| ← leeN left | 18:25 |
| → Sucks joined | 18:25 |
| → jagob joined | 18:26 |
| ← subscope left | 18:26 |
| → ochorocho1 joined | 18:26 |
| → M3mphiZ joined | 18:27 |
| → subscope joined | 18:27 |
| → Literphor joined | 18:28 |
| → vF3hNGxc47h8 joined | 18:29 |
| ← ipt left | 18:29 |
| ← subhojit777 left | 18:29 |
| ← diegoviola left | 18:30 |
| ← livingstn left | 18:31 |
| → mohabaks joined | 18:32 |
| → livingstn joined | 18:32 |
| → Gamecubic joined | 18:33 |
| ← mi100hael_ left | 18:33 |
| → Rodya_ joined | 18:33 |
| → Vgr_ joined | 18:34 |
| ← Vgr left | 18:35 |
| → sul joined | 18:35 |
| ← sul left | 18:35 |
| → mizu_no_oto joined | 18:37 |
| ← sargas left | 18:37 |
| → staticshock joined | 18:37 |
| → shinnya joined | 18:38 |
| ← Rodya_ left | 18:39 |
| → sul joined | 18:39 |
| ← Sucks left | 18:40 |
| → Sucks joined | 18:40 |
| ← Sucks left | 18:40 |
| → lindenle joined | 18:40 |
| → Sucks joined | 18:40 |
| ← Sucks left | 18:40 |
| → eletuchy joined | 18:41 |
| ← MutantMa_ left | 18:42 |
| → dopeddude joined | 18:42 |
| ← staticshock left | 18:42 |
| → paddyez joined | 18:42 |
| ← paddyez left | 18:42 |
| → paddyez joined | 18:42 |
| → espindola joined | 18:42 |
| → KtoTo joined | 18:42 |
| ← lindenle left | 18:44 |
| ← robogoat left | 18:45 |
| → star_prone joined | 18:46 |
| ← star_prone left | 18:47 |
| ← ErKa left | 18:49 |
| ← Goplat left | 18:49 |
| ← tinajohnson__ left | 18:49 |
| ← moL-Ou left | 18:51 |
| → e66 joined | 18:52 |
| ← espindola left | 18:52 |
| → staticshock joined | 18:53 |
| ← Silenced left | 18:54 |
| ← sgambino left | 18:55 |
| ← eletuchy left | 18:55 |
| → espindola joined | 18:55 |
| ← espindola left | 18:56 |
| → mehola joined | 18:56 |
| ← IlNominePatre left | 18:57 |
| ← Discovery left | 18:58 |
| ← mehola left | 19:01 |
| → IlNominePatre joined | 19:01 |
| → Cassiopaya joined | 19:01 |
| ← nnyk_ left | 19:02 |
| → leeN joined | 19:03 |
| ← netj left | 19:07 |
| → netj joined | 19:07 |
| → lethjakman-l joined | 19:09 |
|
ef5c_ef5c
| /quit | 19:11 |
| ← ef5c_ef5c left | 19:11 |
| ← sul left | 19:11 |
| → rubyonrailed joined | 19:12 |
| ← lethjakman-l left | 19:14 |
| → ghostlines joined | 19:15 |
| ← kaiza left | 19:15 |
| ← subscope left | 19:15 |
| → catsup joined | 19:16 |
| → espindola joined | 19:16 |
| → ArtursL joined | 19:16 |
| → zacts joined | 19:17 |
| ← espindola left | 19:17 |
| ← s00pcan left | 19:18 |
| → s00pcan joined | 19:19 |
| → sgambino joined | 19:19 |
| → mikiones joined | 19:20 |
| ← diogenese left | 19:20 |
| → subscope joined | 19:21 |
| → dreiss joined | 19:22 |
| ← mikiones left | 19:23 |
| ← Literphor left | 19:23 |
| → PityDaFool joined | 19:23 |
| → diogenese joined | 19:24 |
| → kalz joined | 19:25 |
| ← citizen-stig left | 19:26 |
| ← dreiss left | 19:27 |
| → cr4zy joined | 19:27 |
| → s00pcan_ joined | 19:28 |
| ← s00pcan left | 19:29 |
| → Literphor joined | 19:29 |
| ← RudolphFenz left | 19:30 |
| ← jagob left | 19:30 |
| → citizen-stig joined | 19:30 |
| → otho joined | 19:32 |
| ← oich left | 19:32 |
| ← ivo_ left | 19:32 |
| → Midoshi27 joined | 19:34 |
| → tomog999_ joined | 19:34 |
| ← cr4zy left | 19:35 |
| → woxidu joined | 19:35 |
| ← tomog999 left | 19:37 |
| ← Cassiopaya left | 19:38 |
| ← mangolisk_ left | 19:38 |
| → Rodya_ joined | 19:40 |
| → fstd_ joined | 19:40 |
| → lindenle joined | 19:41 |
| ← toogley left | 19:41 |
| → samw joined | 19:41 |
| ← IlNominePatre left | 19:41 |
| ← fstd left | 19:41 |
| fstd_ → fstd | 19:41 |
| → kaiza joined | 19:42 |
| → mangolisk joined | 19:42 |
| → radsy joined | 19:44 |
| ← lindenle left | 19:45 |
| ← Rodya_ left | 19:45 |
| ← diegoaguilar left | 19:47 |
| kolobyte → [cccp] | 19:47 |
| → cagedwisdom joined | 19:50 |
| → strayPuppy joined | 19:52 |
| → dopeddud_ joined | 19:53 |
| → chiromante joined | 19:54 |
| ← chiromante left | 19:55 |
| ← mizu_no_oto left | 19:55 |
| ← dopeddude left | 19:55 |
| ← samw left | 19:56 |
| → eletuchy joined | 19:56 |
| → safe joined | 19:56 |
| → ramsub07 joined | 19:56 |
| → zarel joined | 19:57 |
| → daito joined | 19:57 |
| ← zarel left | 19:58 |
| → zarel joined | 19:58 |
| ← thecomedian_ left | 19:59 |
| ← sq-one left | 19:59 |
| ← PryMar56 left | 19:59 |
| ← woxidu left | 20:00 |
| ← ramsub07 left | 20:01 |
| ← eletuchy left | 20:01 |
| → s00pcan joined | 20:01 |
| ← daito left | 20:01 |
| ← s00pcan_ left | 20:02 |
| [cccp] → kolobyte | 20:02 |
| → diegoaguilar joined | 20:02 |
| → thecomedian joined | 20:04 |
| ← dopeddud_ left | 20:05 |
| ← brandonw left | 20:08 |
| ← Midoshi27 left | 20:08 |
| → brandonw joined | 20:09 |
| ← lss_ left | 20:09 |
| ← Cabanossi left | 20:09 |
| → m0viefreak joined | 20:09 |
| → s00pcan_ joined | 20:09 |
| → lethjakman-l joined | 20:10 |
| → Cabanossi joined | 20:11 |
| → ajf- joined | 20:11 |
| ← s00pcan left | 20:12 |
| → ivo_ joined | 20:12 |
| ← lethjakman-l left | 20:15 |
| → s00pcan joined | 20:15 |
| → jfelchner_ joined | 20:16 |
| → lss joined | 20:16 |
| ← latrommi left | 20:17 |
| ← s00pcan_ left | 20:18 |
| ← jfelchner left | 20:18 |
| ← bedouin left | 20:18 |
| → diegoviola joined | 20:19 |
| ← ixian left | 20:19 |
| → sssilver joined | 20:20 |
| ← s00pcan left | 20:20 |
| ← electrogeek left | 20:20 |
| ← Spinkzeit left | 20:20 |
| → electrogeek joined | 20:21 |
| → ixian joined | 20:21 |
| ← thecomedian left | 20:22 |
| → CheckDavid joined | 20:22 |
| ← ugjka left | 20:23 |
| → thecomedian joined | 20:23 |
| → Spinkzeit joined | 20:23 |
| → s00pcan joined | 20:24 |
| → ErKa joined | 20:24 |
| ← aspiers left | 20:24 |
| ← thecomedian left | 20:24 |
| ← mischat left | 20:24 |
| → aspiers joined | 20:25 |
| → ramsub07 joined | 20:26 |
| → thecomedian joined | 20:26 |
| ← zadock left | 20:27 |
| ← thecomedian left | 20:28 |
| → bedouin joined | 20:28 |
| → thecomedian joined | 20:29 |
| → azimuth_ joined | 20:29 |
| → mehola joined | 20:29 |
| ← s00pcan left | 20:30 |
| ← benwaffle left | 20:31 |
| → Dyonisos joined | 20:31 |
| ← kaiza left | 20:32 |
| → s00pcan joined | 20:33 |
| ← rezrov left | 20:34 |
| → rezrov joined | 20:34 |
| ← strayPuppy left | 20:35 |
| → mizu_no_oto joined | 20:35 |
| ← zartu left | 20:35 |
| ← rubyonrailed left | 20:35 |
| → davisonio joined | 20:36 |
| → rubyonrailed joined | 20:37 |
| ← rubyonrailed left | 20:37 |
| ← s00pcan left | 20:37 |
| ← lss left | 20:38 |
| ← rolha left | 20:39 |
| → PryMar56 joined | 20:39 |
| → s00pcan joined | 20:40 |
| ← Dazzyp left | 20:40 |
| → lss joined | 20:41 |
| → Rodya_ joined | 20:41 |
| → rolha joined | 20:41 |
| → lindenle joined | 20:42 |
| → ahr3n joined | 20:42 |
| ← jfelchner_ left | 20:42 |
| → choki joined | 20:44 |
| ← Rodya_ left | 20:46 |
| → aidalgol joined | 20:47 |
| ← lindenle left | 20:47 |
| → rolha_ joined | 20:49 |
| ← rolha_ left | 20:50 |
| → eijk joined | 20:50 |
| ← sauvin left | 20:50 |
| → zartu joined | 20:51 |
| ← rolha left | 20:51 |
| ← mohabaks left | 20:51 |
| ← s00pcan left | 20:52 |
| → amdi_ joined | 20:52 |
| → rolha joined | 20:53 |
| → s00pcan joined | 20:53 |
| → sauvin joined | 20:53 |
| ← phaleth left | 20:54 |
| → nnyk_ joined | 20:54 |
| → acetakwas joined | 20:54 |
| → tpollard joined | 20:55 |
| ← rolha left | 20:57 |
| ← delight left | 20:57 |
| ← Lyqyd left | 21:01 |
| ← acetakwas left | 21:02 |
| ← ghostlines left | 21:02 |
| ← ramsub07 left | 21:04 |
| → mohabaks joined | 21:04 |
| ← freimatz left | 21:08 |
| ← nosmelc left | 21:08 |
| → mischat joined | 21:08 |
| ← mischat left | 21:09 |
|
lebster
| if i make tags into a branch1, then merge that branch1 into branch2, do the tags get added to the branch2? | 21:09 |
|
moritz
| lebster: tags always point at commits, not at branches | 21:10 |
| → xlegoman joined | 21:10 |
|
moritz
| so the tag is reachable from branch2, but it doesn't "get added to" it, whatever that means | 21:10 |
| n1000_ → n1000 | 21:12 |
|
_ikke_
| both tags and branches are refs, pointers to comimts | 21:13 |
|
| commits | 21:13 |
|
| the difference is that branches move and tags not | 21:13 |
| → rlf joined | 21:13 |
| → joufflu joined | 21:14 |
|
lebster
| soo if you delete a branch containing a commit that was tagged. the tag will still be there? | 21:15 |
| → mischat joined | 21:15 |
|
_ikke_
| yes | 21:16 |
|
| deleting a branch just removes a single pointer | 21:16 |
| ← secki left | 21:18 |
| ← joufflu left | 21:19 |
| ← mehola left | 21:20 |
| → sbasso joined | 21:21 |
| ← subscope left | 21:21 |
| → joufflu joined | 21:22 |
| ← a3Dman left | 21:22 |
| → a3Dman_ joined | 21:23 |
| ← rlf left | 21:23 |
| ← de-vri-es left | 21:23 |
| ← HelloAtMega left | 21:24 |
| → elastix joined | 21:24 |
| → de-vri-es joined | 21:26 |
| ← sauvin left | 21:27 |
| → apiarian joined | 21:27 |
| → saidi joined | 21:27 |
| → sauvin joined | 21:27 |
| ← mohabaks left | 21:30 |
| ← pantsman- left | 21:30 |
| ← apiarian left | 21:31 |
| ← zartu left | 21:31 |
| → arooni joined | 21:31 |
| ← xlegoman left | 21:31 |
| → nosmelc joined | 21:32 |
| → JTrader joined | 21:33 |
| → grayjoc joined | 21:33 |
| ← diogenese left | 21:34 |
| ← LucaTM left | 21:34 |
| ← tvw left | 21:36 |
| → dreiss joined | 21:37 |
| → Midoshi27 joined | 21:38 |
| ← nosmelc left | 21:40 |
| → denimsoft joined | 21:41 |
| → elsevero joined | 21:41 |
| → woxidu joined | 21:41 |
| → lethjakman-l joined | 21:41 |
| → espindola joined | 21:41 |
| ← espindola left | 21:42 |
| → Rodya_ joined | 21:42 |
| → diogenese joined | 21:43 |
| ← aidalgol left | 21:43 |
| → daito joined | 21:43 |
| ← esc left | 21:44 |
| → aidalgol joined | 21:45 |
| → Chill_Surf joined | 21:45 |
| ← Sonicbit left | 21:45 |
| ← flavi0 left | 21:46 |
| ← lethjakman-l left | 21:46 |
| ← elsevero left | 21:47 |
| → flavi0 joined | 21:47 |
| ← daito left | 21:47 |
| → elsevero joined | 21:47 |
| ← Rodya_ left | 21:47 |
| ← theskillwithin left | 21:48 |
| → theskillwithin joined | 21:48 |
| ← dsdeiz left | 21:50 |
| ← Jackneill left | 21:50 |
| → jottr joined | 21:51 |
| → daito joined | 21:54 |
| → pmort joined | 21:55 |
| ← pmort left | 21:55 |
| → zartu joined | 21:56 |
| ← zartu left | 21:56 |
| → pmort joined | 21:56 |
| → HelloAtMega joined | 21:57 |
| ← ivo_ left | 21:57 |
| ← HelloAtMega left | 21:57 |
| ← diogenese left | 21:57 |
| ← grayjoc left | 21:58 |
| → HelloShitty joined | 21:58 |
| HelloShitty → HelloAtMega | 21:59 |
| ← daito left | 22:00 |
| ← sssilver left | 22:01 |
| → nnyk joined | 22:02 |
| ← PHPanos left | 22:03 |
| ← eijk left | 22:04 |
| ← fscala left | 22:04 |
| ← nnyk_ left | 22:04 |
| → fscala joined | 22:05 |
| → dan2k3k4 joined | 22:05 |
| ← pmort left | 22:07 |
| → jnewt joined | 22:07 |
| ← Ardit left | 22:08 |
| ← Kicer86 left | 22:08 |
| → Lyqyd joined | 22:09 |
| ← mischat left | 22:10 |
| ← jottr left | 22:13 |
| → dsdeiz joined | 22:14 |
| ← dsdeiz left | 22:14 |
| → dsdeiz joined | 22:14 |
| → Sasazuka joined | 22:14 |
| ← saidi left | 22:15 |
| ← ErKa left | 22:17 |
| → bollullera joined | 22:18 |
| → diogenese joined | 22:18 |
| ← lss left | 22:19 |
| → FirewalkR joined | 22:20 |
| → lss joined | 22:22 |
| ← diogenese left | 22:23 |
| → t0by joined | 22:23 |
| ← t0by left | 22:23 |
| → err joined | 22:27 |
| → ToBeCloud joined | 22:27 |
| ← err left | 22:28 |
| ← mmlb left | 22:28 |
| → err joined | 22:29 |
| err → Guest68637 | 22:29 |
| ← brcolow left | 22:29 |
| ← Guest68637 left | 22:29 |
| → Guest68637 joined | 22:29 |
| ← Guest68637 left | 22:29 |
| → alandala_ joined | 22:30 |
| ← alandala_ left | 22:30 |
| ← emPi left | 22:30 |
| ← dreiss left | 22:31 |
| ← flavi0 left | 22:31 |
| ← johnmilton left | 22:32 |
| ← egeerardyn left | 22:32 |
| → liamonade joined | 22:34 |
| → latrommi joined | 22:35 |
| ← mizu_no_oto left | 22:35 |
| ← denimsoft left | 22:36 |
| → rolha joined | 22:37 |
| ← _nadim left | 22:38 |
| ← paddyez left | 22:39 |
| ← davisonio left | 22:40 |
| ← Literphor left | 22:41 |
| ← FirewalkR left | 22:41 |
| → kaiza joined | 22:41 |
| → lethjakman-l joined | 22:42 |
| → lindenle joined | 22:43 |
| → Rodya_ joined | 22:44 |
| → FirewalkR joined | 22:45 |
| ← Midoshi27 left | 22:45 |
| ← lethjakman-l left | 22:47 |
| ← elastix left | 22:47 |
| ← lindenle left | 22:48 |
| → Literphor joined | 22:48 |
| ← Rodya_ left | 22:49 |
| ← FunkyAss left | 22:50 |
| → eletuchy joined | 22:50 |
| ← ochorocho1 left | 22:52 |
| → mmlb joined | 22:53 |
| ← sbasso left | 22:55 |
| ← fees left | 22:56 |
| → mehola joined | 22:56 |
| ← Gitzilla left | 22:58 |
| → alandala joined | 22:58 |
| ← JTrader left | 22:59 |
| → TalkToMe joined | 22:59 |
| → pmort joined | 23:01 |
| ← rMdes left | 23:01 |
| ← dan2k3k4 left | 23:02 |
| ← Brando753 left | 23:03 |
| → astrofog joined | 23:04 |
| ← Fijit left | 23:06 |
| ← safe left | 23:08 |
| ← vmonteco left | 23:08 |
| ← King_Hual left | 23:09 |
| ← eletuchy left | 23:10 |
| ← Limes_ left | 23:10 |
| ← rolha left | 23:10 |
| → codeman joined | 23:10 |
| → johnmilton joined | 23:13 |
| ← satifant left | 23:13 |
| ← TalkToMe left | 23:14 |
| ← pmort left | 23:14 |
| → rolha joined | 23:14 |
| → mi100hael joined | 23:15 |
| ← liamonade left | 23:17 |
| → JTrader joined | 23:17 |
| → liamonade joined | 23:18 |
| ← diegoaguilar left | 23:20 |
| ← mi100hael left | 23:20 |
| ← ArtursL left | 23:21 |
| → p-l joined | 23:21 |
| → pmort joined | 23:23 |
| ← pmort left | 23:23 |
| ← p-l left | 23:23 |
| → pmort joined | 23:24 |
| → MattMaker joined | 23:25 |
| ← leprechau left | 23:25 |
| → samw joined | 23:25 |
| → EduardoMartins joined | 23:26 |
| ← otho left | 23:28 |
| → diogenese joined | 23:29 |
| → intrigueD joined | 23:29 |
| ← nwkj86 left | 23:29 |
| → Tryop88 joined | 23:29 |
| → nwkj86 joined | 23:30 |
| ← codeman left | 23:30 |
| ← samw left | 23:30 |
| ← MattMaker left | 23:32 |
| ← Tryop88 left | 23:33 |
| → MattMaker joined | 23:34 |
| ← rolha left | 23:35 |
| ← zarel left | 23:35 |
| → kam270 joined | 23:35 |
| ← ColdKeyboard left | 23:35 |
| ← ahr3n left | 23:36 |
| → ColdKeyboard joined | 23:37 |
| → jottr joined | 23:37 |
| → dj_spies joined | 23:38 |
| → Brando753 joined | 23:38 |
| → nfk joined | 23:39 |
| → p-l joined | 23:41 |
| → rolha joined | 23:42 |
| → watabou joined | 23:42 |
| → samw joined | 23:43 |
| → lindenle joined | 23:44 |
| ← rolha left | 23:44 |
| ← livingstn left | 23:45 |
| → Rodya_ joined | 23:45 |
| ← jottr left | 23:45 |
| → jottr joined | 23:45 |
| ← nnyk left | 23:46 |
| ← lindenle left | 23:49 |
| ← pR0Ps left | 23:49 |
| ← samw left | 23:49 |
| ← Rodya_ left | 23:49 |
| → rolha joined | 23:49 |
| ← p-l left | 23:50 |
| → mischat joined | 23:51 |
| → tristanp joined | 23:51 |
| → boombatower joined | 23:53 |
| ← radsy left | 23:53 |
| ← WayToDoor left | 23:54 |
| → samw joined | 23:54 |
| ← M3mphiZ left | 23:55 |
| → daito joined | 23:56 |
| → polyidus joined | 23:57 |
| → M3mphiZ joined | 23:57 |
| → ahr3n joined | 23:58 |
| → pR0Ps joined | 23:59 |