IRCloggy #git 2017-01-24

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2017-01-24

← roelmonnens left00:00
← denete_ left00:01
→ hahuang65 joined00:06
→ dreiss joined00:08
← hahuang61 left00:08
← bgerber left00:10
← finalbeta left00:10
→ Nilesh_ joined00:12
← thiago left00:12
← shinnya left00:13
← Guest55 left00:14
← martin290 left00:14
→ ianmethyst joined00:14
← ikelso left00:14
← Rodya_ left00:14
← jimi_ left00:15
→ Darren_ joined00:15
→ ikelso joined00:15
← rominronin left00:15
→ jimi_ joined00:16
← cbreak left00:17
← BackEndCoder left00:18
→ BackEndCoder joined00:18
← ikelso left00:19
← Darcidride left00:20
← jimi_ left00:20
→ Guest55 joined00:21
← onmeac left00:21
← ianmethyst left00:21
← FeyFre left00:23
← mizu_no_oto left00:24
→ GodGinrai joined00:24
→ Rodya_ joined00:25
→ jimi_ joined00:26
← Rodya_ left00:27
← timvisher left00:27
← Darren_ left00:27
← Murii left00:27
← m0viefreak left00:27
← spacelord_ left00:28
← jimi_ left00:28
← GodGinrai left00:29
→ timvisher joined00:29
→ eizua joined00:30
→ cbreak joined00:33
← ocbtec left00:33
→ Darren_ joined00:33
→ MrJoshua joined00:34
→ Rodya_ joined00:34
→ GavinMagnus joined00:35
← msonntag left00:35
→ pity joined00:36
→ msonntag joined00:37
→ frostythesnowman joined00:38
→ spacelord_ joined00:38
← dreiss left00:39
frostythesnowman hi, i'm a bit confused with how pull requests work. i've created a new PR that compares my dev branch with master. however, when i look at the diff, it seems to be comparing my dev branch with an OLD version of master00:39
i did some research and PR's are supposed compare your branch with the 'base branch'. is there some reason why it wouldn't be comparing against the 'latest' version of my base branch?00:39
→ dirtyroshi joined00:40
← pity left00:40
← Rodya_ left00:41
← eizua left00:41
← tyreld left00:43
→ Rodya_ joined00:43
← gugah left00:45
← Darren_ left00:45
→ mohabaks joined00:46
→ snits joined00:46
← Rodya_ left00:46
← spacelord_ left00:47
← jmpp left00:47
→ DolphinDream joined00:48
→ Rodya_ joined00:50
→ roelmonnens joined00:50
→ dreiss joined00:52
→ madewokherd joined00:52
→ fandi joined00:52
→ martin290 joined00:52
martin290 can i get some help with git? i feel totally lost :(00:52
→ Lyqyd joined00:53
← dreiss left00:53
← leeN left00:54
← Rodya_ left00:54
← roelmonnens left00:55
→ Rodya_ joined00:55
← mohabaks left00:56
→ voldz1tic3n joined00:56
← WifiBrain left00:56
BlessJah !ask00:57
gitinfo Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.00:57
← chardan left00:57
BlessJah martin290: !man git-checkout01:00
gitinfo martin290: The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?01:00
martin290: the git-checkout manpage is available at http://jk.gs/git-checkout.html01:00
→ rominronin joined01:00
← imachuchu left01:00
← Rodya_ left01:01
← MrWoohoo left01:01
← GavinMagnus left01:01
→ Rodya_ joined01:02
→ pandeiro joined01:03
← Starky left01:03
BlessJah martin290: to undo commited use revert, staged use reset, unstaged use checkout01:03
staged == 'changes to be commited'01:03
← pandeiro left01:05
BlessJah I have to go to bed, I hope you'll manage with manpages and three "undo" commands01:05
BlessJah computer went to sleep01:05
→ gugah joined01:05
← rominronin left01:05
martin290 BlessJah: what is staged and unstaged?01:06
→ Atrumx joined01:06
→ Kaisyu joined01:07
→ oaao joined01:07
→ thiago joined01:07
← Rodya_ left01:08
← druonysus_ left01:08
→ syg__ joined01:08
→ MrWoohoo joined01:08
← redhedded1 left01:10
→ jmpp joined01:11
← SwiftMatt left01:12
← King_Hual left01:12
→ King_Hual joined01:12
← King_Hual left01:12
→ King_Hual joined01:12
→ Rodya_ joined01:12
→ dreiss joined01:13
→ spacelord_ joined01:13
→ UnnamedPlayer joined01:13
martin290 i have a vendor folder that i don't want to commit so i ignored it, but every time i commit a change, my vendor folder changes (things get deleted in it), any ideas what i can do???01:13
→ nckpz joined01:14
← timvisher left01:15
→ jtri joined01:16
jtri i have gotten very mixed up trying to rebase develop (akin to master) into my branch and the force pushing01:18
→ druonysus_ joined01:19
← martin290 left01:19
→ BSaboia joined01:19
→ Darren_ joined01:19
← Darren_ left01:19
jtri here are two looks at the graph using git log, the second is with --all http://dpaste.com/2BX8C0B http://dpaste.com/1WEZP8301:20
i'm afraid to do anything for fear of loosing my work, or overwriting something on the server01:21
→ timvisher joined01:21
jtri we've been having issues with git merge and so adopted a new strategy of rebasing the develop branch into our working branch, then merging back into develop, but it didn't go as i expected01:22
← Guest55 left01:23
→ Darren_ joined01:23
← BSAlb left01:23
→ dp joined01:24
← m4sk1n left01:25
jtri somehow, the pointer to "jared" branch is at a commit from 12 months ago?01:26
← astrofog left01:26
jtri and when i look on the website for bitbucket it's the same, my code in jared branch is not there, and the jared branch is way way way behind, by 12 months01:27
→ fahadash joined01:27
← jccn left01:28
→ Guest55 joined01:28
← Darren_ left01:29
← dp left01:29
→ dp joined01:29
jtri i think waht i'd like to do is move the "jared" pointer to "origin/jared" and then force push, but i really want to make sure at this point01:29
← dreiss left01:30
← dp left01:30
→ dp joined01:31
← dp left01:32
← strugee left01:32
← mischat left01:33
← King_Hual left01:33
→ dreiss joined01:35
→ Ryanar joined01:35
→ Darren_ joined01:37
→ jimi_ joined01:37
← jimi_ left01:38
→ mizu_no_oto joined01:39
← dreiss left01:39
← sargas left01:39
→ dreiss joined01:39
← Lyqyd left01:41
→ jimi_ joined01:41
← brent__ left01:41
→ strugee joined01:42
→ d0pamine joined01:42
← jimi_ left01:43
→ jimi_ joined01:44
← d0pamine left01:45
→ roelmonnens joined01:45
→ jameser joined01:46
→ umpc joined01:48
→ prawnzy joined01:48
← roelmonnens left01:50
← jimi_ left01:50
→ eizua joined01:50
→ dp joined01:52
← dp left01:53
← MrWoohoo left01:56
← overlord_tm left01:57
← Rodya_ left02:02
→ rominronin joined02:03
← Tobbi left02:06
→ denete_ joined02:07
← timvisher left02:08
← Sasazuka left02:09
→ timvisher joined02:10
→ ryouma joined02:11
← govg left02:12
← denete_ left02:13
← prawnzy left02:13
→ tmcmahon joined02:13
← jaggz left02:14
← matsaman left02:14
→ amikiri joined02:15
→ matsaman joined02:16
→ MrWoohoo joined02:19
← matsaman left02:20
→ prawnzy joined02:21
← tmcmahon left02:22
← tvw left02:23
→ GodGinrai joined02:25
← pks left02:26
→ pks joined02:28
← GodGinrai left02:29
→ pity joined02:30
→ mischat joined02:34
→ finalbeta joined02:34
← mizu_no_oto left02:35
→ brent__ joined02:35
→ mizu_no_oto joined02:38
← rominronin left02:38
← mischat left02:39
← texinwien left02:40
← brent__ left02:40
→ ppppp5 joined02:40
→ roelmonnens joined02:40
← jtri left02:41
→ aavrug joined02:41
← roelmonnens left02:45
← ilbot3 left02:45
← Guest55 left02:46
← timvisher left02:46
→ timvisher joined02:47
→ redhedded1 joined02:48
→ ilbot3 joined02:48
→ albel727 joined02:49
← str left02:49
← forrestv left02:50
→ bluepixel joined02:51
→ Vampire0_ joined02:53
→ dermoth_ joined02:53
→ forrestv joined02:53
← dermoth left02:54
dermoth_ → dermoth02:54
← pity left02:54
← voldz1tic3n left02:56
← kulelu88 left02:56
← d^sh left02:57
← Vampire0 left02:57
← svm_invictvs left02:57
→ d^sh joined02:57
→ Guest55 joined02:57
→ Rodya_ joined03:02
← druonysus_ left03:05
← Vortex34 left03:05
→ druonysus_ joined03:05
← bruce_lee left03:06
→ bruce_lee joined03:06
← duderonomy left03:06
← sunri5e left03:06
→ MTecknology joined03:08
→ pity joined03:08
← Rodya_ left03:09
→ voldz1tic3n joined03:09
← ispn left03:11
→ sunri5e joined03:11
← jmpp left03:11
→ govg joined03:13
→ tmcmahon joined03:14
→ xall_ joined03:15
← fandi left03:17
← zeroshft left03:18
→ Vortex34 joined03:18
→ Nokurn joined03:18
← tobiasBora left03:18
← tmcmahon left03:22
→ matsaman joined03:22
→ digidog joined03:23
← Ryanar left03:23
→ jbitdrop joined03:25
→ arescorpio joined03:27
← digidog left03:27
→ fstd_ joined03:28
→ raspado joined03:28
→ tmcmahon joined03:29
→ SwiftMatt joined03:30
→ sklvch joined03:30
→ mehola joined03:31
sklvch I have two projects in apache using two different repos, I am able to clone/push to github with one, but not another, using the same SSH keys. Any ideas what may be causing this?03:31
← fstd left03:32
fstd_ → fstd03:32
→ cdown joined03:34
→ mischat joined03:35
← mischat left03:35
→ rominronin joined03:35
← fahadash left03:35
→ roelmonnens joined03:35
→ Ryanar joined03:36
← tmcmahon left03:40
← roelmonnens left03:40
← chachasmooth left03:40
← sklvch left03:40
← govg left03:41
→ shamowfski joined03:42
← Ryanar left03:43
→ chachasmooth joined03:43
← timvisher left03:46
← mizu_no_oto left03:47
thiago people need to wait for the answer...03:47
← Noldorin left03:47
← disconnect_me_ left03:48
→ govg joined03:48
→ timvisher joined03:49
← jbitdrop left03:50
→ z3t0 joined03:51
→ Oatmeal joined03:52
← raspado left03:53
← ryouma left03:53
→ sargas joined03:57
← Nokurn left03:58
← amikiri left03:58
← z3t0 left03:59
→ Nokurn joined04:00
→ lcb joined04:00
← hexagoxel left04:01
← lcb left04:02
→ tobiasBora joined04:05
← pity left04:06
→ Goplat joined04:06
← sargas left04:07
→ hexagoxel joined04:07
→ duderonomy joined04:09
← rominronin left04:09
→ beatdown joined04:10
gitinfo set mode: +v04:10
→ mohabaks joined04:10
← Guest55 left04:11
← kyan left04:12
→ pity joined04:13
→ sargas joined04:14
→ Hudu joined04:15
← publio left04:15
← Hudu left04:15
→ Rodya_ joined04:17
→ mizu_no_oto joined04:17
← pity left04:17
← msonntag left04:20
→ msonntag joined04:20
→ snowkidind joined04:21
← Rodya_ left04:21
→ pity joined04:23
→ cagedwisdom joined04:25
→ GodGinrai joined04:26
← druonysus_ left04:26
→ druonysus_ joined04:27
→ ayogi joined04:29
→ zivester joined04:29
→ nazri joined04:30
← GodGinrai left04:30
→ roelmonnens joined04:30
→ pietv joined04:33
← roelmonnens left04:35
→ mischat joined04:36
← aidalgol left04:36
→ danimal2 joined04:37
→ subhojit777 joined04:37
← mischat left04:41
← snowkidind left04:41
← CheckDavid left04:43
← timvisher left04:46
→ [0xAA] joined04:46
→ disconnect_me joined04:46
← lindenle left04:48
→ timvisher joined04:48
← mikecmpbll left04:48
← Guest91504 left04:49
→ Cabanoss- joined04:49
← mohabaks left04:50
→ atrigent joined04:50
→ Guest55 joined04:51
← atrigent_ left04:51
→ sbulage joined04:52
← Cabanossi left04:53
Cabanoss- → Cabanossi04:53
→ tirej joined04:55
← douglascorrea left04:56
→ mohabaks joined04:57
← dendazen left04:58
← druonysus_ left04:58
→ druonysus_ joined04:59
→ ws2k3_ joined04:59
→ cdown_ joined04:59
← druonysus_ left04:59
← dermoth left05:00
→ dermoth joined05:00
→ svm_invictvs joined05:01
← cdown left05:02
cdown_ → cdown05:02
← dirtyroshi left05:02
← svm_invictvs left05:02
← govg left05:02
→ atrigent_ joined05:04
← atrigent left05:05
→ rominronin joined05:06
← mohabaks left05:09
→ canuk_ joined05:11
← nazri left05:11
→ jrm2 joined05:11
jrm2 → jrm05:13
← canuk left05:13
← arescorpio left05:13
← Cthalupa left05:16
← voldz1tic3n left05:18
→ bgerber joined05:19
→ Limes__ joined05:23
→ cluelessperson joined05:24
cluelessperson hey guys, is there a way to have Git automatically sync with a remote repo immediately when I submit something?05:24
← rivarun left05:24
→ rivarun joined05:25
→ roelmonnens joined05:26
← DolphinDream left05:27
← roelmonnens left05:30
← mizu_no_oto left05:33
→ svm_invictvs joined05:34
← Limes__ left05:35
→ mischat joined05:36
← Samual left05:37
→ TomTomTo1 joined05:38
kadoban cluelessperson: What is "submit" ?05:38
← TomTomTosch left05:41
→ ckruczek joined05:41
← mischat left05:41
← rominronin left05:42
cluelessperson kadoban, commit?05:43
→ ShekharReddy joined05:43
← prawnzy left05:43
→ Samual joined05:44
← ShekharReddy left05:44
→ snowkidind joined05:45
→ miczac joined05:45
gitinfo set mode: +v05:45
kadoban cluelessperson: Sounds like a bad idea, but there is a post-commit hook. Sounds like a *really* bad idea really. Part of the nice part of git is that commits are quick and thus you're able to do them without it being disruptive to work.05:45
→ AlgorithmWizard joined05:47
→ lindenle joined05:48
← timvisher left05:49
← matsaman left05:49
_ikke_ and being able to review / rewrite them before pushing05:49
→ Cthalupa joined05:49
_ikke_ and without needing to pull everytime because someone else had just pushed05:50
→ sarri joined05:51
← sarri left05:51
→ sarri joined05:51
kadoban Right, that too05:51
→ rajat joined05:52
← lindenle left05:53
→ Peng_ joined05:53
→ timvisher joined05:53
← pietv left05:55
→ ShekharReddy joined05:57
← sbulage left05:57
← [0xAA] left05:58
→ ljc joined06:00
→ pabs3 joined06:02
→ [0xAA] joined06:05
← pks left06:06
→ pks joined06:07
← mns left06:08
→ dec0n joined06:09
pabs3 anyone have any tips on how to get my gitk patch accepted? http://public-inbox.org/git/20161225140611.30536-1-pabs3@bonedaddy.net/06:09
grawity was it rejected, or just ignored?06:10
→ sargas_ joined06:10
pabs3 I think the latter. I CCed the gitk maintainer06:11
→ leprechau joined06:12
→ govg joined06:12
_ikke_ I believe someone else is maintaining it06:13
→ Levex joined06:13
← sargas left06:13
_ikke_ Might be wrong06:13
← snowkidind left06:13
pabs3 hmm, ok. any idea who?06:14
← cdown left06:15
pabs3 all the commits Junio merged recently were from the person I CCed (Paul Mackerras [email@hidden.address]06:16
_ikke_ Right\06:16
← xall_ left06:16
_ikke_ It is probable him then06:16
→ xall_ joined06:18
→ Rodya_ joined06:18
→ drbean joined06:19
← peepsalot left06:19
osse pabs3: No shame in resending after a week or so. Has happened to me before, and I think Junio has even said so06:20
pabs3 has been a month, so will do. guess I'll CC again06:20
→ sbulage joined06:20
← Darren_ left06:21
← nckpz left06:22
← Rodya_ left06:23
→ nckpz joined06:23
← Boniche left06:24
← bgerber left06:24
→ mns joined06:24
→ Boniche joined06:25
→ jay-m joined06:26
→ GodGinrai joined06:27
← kadoban left06:27
← madewokherd left06:29
← Zamyatin left06:31
→ safe joined06:31
← GodGinrai left06:31
→ tarkus joined06:34
← timvisher left06:34
← mehola left06:35
→ mischat joined06:37
← tarkus left06:38
→ rominronin joined06:39
→ jnavila joined06:41
→ tubaman joined06:41
→ mathematic-alpha joined06:41
← ParticleGolem left06:41
← mathematic-alpha left06:42
← mischat left06:42
→ brent__ joined06:42
← nckpz left06:43
← spacelord_ left06:44
← jnavila left06:47
← brent__ left06:47
→ Raging_Hog joined06:48
→ Hudu joined06:49
← Hudu left06:49
← safe left06:50
→ peepsalot joined06:50
→ ParticleGolem joined06:50
→ ThomasLocke joined06:50
→ zeroed joined06:52
← jaafar left06:54
← miczac left06:54
osse I've added the Git for Windows repos in MSYS2 but have problems getting updates. Can anyone confirm?06:55
← jay-m left06:56
→ ThomasLocke_ joined06:57
← ThomasLocke_ left06:57
→ ThomasLocke_ joined06:57
→ jay-m joined06:58
→ navidr joined06:59
← mns left06:59
← zeroed left07:00
→ Rodya_ joined07:00
→ spacelord_ joined07:01
→ jagob joined07:01
→ mohabaks joined07:01
← jameser left07:02
← [0xAA] left07:02
← Nokurn left07:03
← eizua left07:04
← drbean left07:05
← pabs3 left07:05
← Rodya_ left07:05
→ zeroed joined07:05
← zeroed left07:05
→ zeroed joined07:05
→ freimatz joined07:05
→ MrMojito joined07:06
← mohabaks left07:06
→ mehola joined07:07
← zeroed left07:07
→ Mo joined07:09
→ t0by joined07:09
→ Alienpruts joined07:09
→ mns joined07:11
→ jameser joined07:11
→ lb1c joined07:11
← rominronin left07:13
→ sQVe joined07:14
← albel727 left07:14
← Singmyr left07:16
→ albel727 joined07:16
← pity left07:17
→ ngm joined07:18
→ chele joined07:19
→ [0xAA] joined07:20
→ xcesariox joined07:21
→ roelmonnens joined07:22
→ cyan__ joined07:22
→ zeroed joined07:23
→ rominronin joined07:26
← albel727 left07:27
→ texinwien joined07:27
← djb-irc left07:27
← UnnamedPlayer left07:28
← shamowfski left07:28
→ eduardas_m joined07:29
→ UnnamedPlayer joined07:32
→ markzen joined07:33
markzen hi07:33
gitinfo markzen: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.07:33
osse my name is07:34
→ jnavila joined07:34
markzen how do you make an initial commit, after git init, to a branch different than master?07:34
eg. to some 'dev' branch07:35
grawity a) commit, then rename master to whatever07:35
or b) git symbolic-ref HEAD refs/heads/dev, then commit07:35
or actually, doesn't `git checkout -b dev` work?07:35
Knirch checkout -b dev works just fine :)07:35
markzen can i checkout sth just after a git init?07:35
Knirch yes07:35
osse you can checkout any time you like, but you can never leave07:36
grawity -b doesn't actually check out anything, it creates a new branch for the current workdir, so it should work07:36
markzen nice, tyvm07:36
→ ihradek joined07:38
markzen in the same vein, how do you definitively erase all commits but the last one?07:38
grawity whyyyyyyyyy07:38
markzen if you've been fooling around in master, and you want to make your repo public07:38
grawity but I suppose you could `git checkout --orphan` then re-commit07:38
→ mischat joined07:38
grawity or publish it as is, who cares07:38
osse markzen: git checkout --orphan newbranch; git commit -m 'Init'; git branch -M master07:39
grawity there are other ways, could use `git replace` to edit out the parent from the commit07:39
(`git replace --edit` that is, then bake it in)07:39
← nowhere_man left07:39
← b100s left07:39
jast my personal favourite for that: 1) git reset --soft <ID of first commit>; git commit --amend -C HEAD@{1}07:40
because more cryptic ;)07:40
← rivarun left07:40
→ albel727 joined07:40
markzen thx, didn't know about git replace07:40
→ rivarun joined07:40
grawity if you want cryptic, git reset --soft $(git cat-file @ | sed /^parent/d | git hash-object -t commit --stdin)07:41
← spacelord_ left07:41
← sargas_ left07:41
→ JeroenT joined07:41
← ngm left07:42
→ ferr1 joined07:42
← t0by left07:42
osse even more cryptic; rm -rf .git; git init; git commit -m Init07:42
with a git add . somewhere07:43
← mischat left07:43
grawity hah07:43
markzen ok thanks all07:43
← rivarun left07:44
← Atm0spher1c left07:44
← mehola left07:45
← ThomasLocke_ left07:45
jast grawity: yeah, yours is more cryptic, but it will potentially mess up the commit message07:46
← rajat left07:46
jast also, you forgot the type arg for cat-file :}07:46
and the -w for hash-object07:47
→ rivarun joined07:48
← subhojit777 left07:49
← boombatower left07:50
← gugah left07:50
← Gloomy left07:51
→ ac3takwas joined07:54
← cyan__ left07:55
← dreiss left07:55
← chipotle left07:56
← markzen left07:56
← sQVe left07:57
→ landstrider joined07:58
→ zefferno joined07:59
→ Atm0spher1c joined07:59
← Guest55 left07:59
→ Singmyr joined07:59
← landstrider left07:59
← ash_workz left08:00
← Atm0spher1c left08:00
→ Disgeae joined08:02
← rominronin left08:03
→ hhee joined08:05
→ overlord_tm joined08:05
→ chipotle joined08:06
← eduardas_m left08:07
← msonntag left08:10
→ msonntag joined08:10
→ lordjancso joined08:11
→ roelmonn_ joined08:11
← roelmonnens left08:15
← govg left08:16
→ zerotresBR joined08:17
→ rominronin joined08:18
→ djb-irc joined08:19
← danimal2 left08:19
← gigq left08:20
→ leeN joined08:23
← djb-irc left08:24
→ guampa joined08:24
→ TomyLobo joined08:24
← mns left08:25
→ treehug88 joined08:27
→ GodGinrai joined08:27
→ runlevl4 joined08:28
← dhollinger left08:29
→ jknetl joined08:30
→ nowhere_man joined08:31
→ dhollinger joined08:31
→ mns joined08:32
← GodGinrai left08:32
← roelmonn_ left08:35
→ roelmonnens joined08:35
→ mathematic-alpha joined08:36
← mathematic-alpha left08:36
→ mathematic-alpha joined08:36
← mathematic-alpha left08:37
→ djb-irc joined08:37
→ elect__ joined08:38
→ govg joined08:38
→ Tobbi joined08:38
→ pietv joined08:38
← pietv left08:39
→ Balliad joined08:42
→ eduardas_m joined08:44
→ roelmonn_ joined08:45
→ Hudu joined08:45
→ smithbone joined08:45
← roelmonn_ left08:46
← roelmonnens left08:46
→ mehola joined08:46
→ roelmonnens joined08:46
→ theoceaniscool joined08:49
← mehola left08:50
→ tvw joined08:52
→ lindenle joined08:52
← zacts left08:54
→ mikecmpbll joined08:56
→ pietv joined08:57
← lindenle left08:57
→ amikiri joined08:58
→ King_Hual joined08:58
→ Xatenev joined09:02
Xatenev Hi09:02
→ Rodya_ joined09:02
→ sparetire joined09:02
← amikiri left09:02
→ durham joined09:02
osse my name is09:04
gitinfo set mode: +v09:04
ckruczek hahah09:04
→ vuoto joined09:05
→ rajat joined09:06
← Rodya_ left09:06
→ bongjovi joined09:07
→ Murii joined09:08
→ miczac joined09:09
gitinfo set mode: +v09:09
→ kurkale6ka joined09:09
← sbulage left09:09
← todd_dsm left09:09
Xatenev Hi09:10
→ mohabaks joined09:10
Xatenev I used git log -S 'string' --source --all to find all commits that changed/introduced a specific string09:10
That gives me a bunch of weird messages like:09:11
C:/Users/myUser/AppData/Local/Temp/file1.dot is not a Word Document.09:11
Error: PDF file is damaged - attemping to reconstruct xref table...09:11
Wtf is that?09:11
osse I have no idea. Have you installed some custom diff viewer thing?09:12
Xatenev Not that I know of.09:12
I am using PHPStorm's diff viewer to do that09:12
→ cqi joined09:12
Xatenev It shows me the correct commits for that change though.09:13
→ marcogmonteiro joined09:13
Xatenev Just that weirdb unch of messages after09:13
osse does it go away if you remove -S string ?09:13
Xatenev You mean only git log --source --all?09:13
→ pity joined09:13
osse oui09:13
Xatenev Seems like.09:13
Tho I can't scroll through all commits now09:14
osse Xatenev: cat .gitattributes09:14
Xatenev Maybe they get shot at the end and I just dont see it.09:14
← JeroenT left09:14
→ rkazak joined09:14
Xatenev I dont have that file09:14
→ JeroenT joined09:14
→ GodGinrai joined09:14
osse cat .git/info/attributes09:14
Xatenev I dont have attributes there09:15
only exclude09:15
I am on windows btw09:15
osse git config --get-regexp '.*diff.*'09:15
← perlpilot left09:15
osse noob me. git config --get-regexp diff09:15
Xatenev That worked though09:15
Obv i have weird diff tools09:15
for some reason.09:15
osse \o/09:16
Xatenev KDiff3 and meld09:16
← zeroed left09:16
Xatenev I go uninstall them09:16
osse oh, no that's fine. git log shouldn't launch a diff tool09:16
→ JeroenT_ joined09:16
Xatenev How can I remove them as git diff viewer thing?09:17
I uninstalled the programs but they are still listed09:17
← JeroenT left09:17
osse edit the config09:17
that's probably not the problem though09:17
Xatenev I dont need them tho09:18
→ zeroed joined09:18
← zeroed left09:18
→ zeroed joined09:18
Xatenev Nope its not the problem.09:18
osse Xatenev: do GIT_TRACE=/tmp/lol.txt git log -S ... etc. and show me /tmp/lol.txt09:18
→ bernardio joined09:19
← GodGinrai left09:19
← Naan left09:19
→ ChiLL_SurF joined09:19
← bernardio left09:20
→ zacts joined09:20
Xatenev No output?09:21
can this be possible? :P09:21
osse you used the actual git log command right?09:21
Xatenev ye09:21
osse not literally what I wrote09:21
← pity left09:21
Xatenev maybe he cannot write to /tmp/09:21
← xall_ left09:22
Xatenev can I set GIT_TRACE=./tmp ?09:22
osse no09:22
do GIT_TRACE=1 git log ... 2>lol.txt09:22
→ pity joined09:22
Xatenev That outputs the correct thing09:22
All the commits foun din the lol.txt09:22
And only that.09:23
osse can you show me the complete lol.txt09:23
→ xall_ joined09:23
Xatenev https://bpaste.net/show/c3e8a70408dc09:23
osse fuck me09:23
Xatenev I only x'ed out names and stuff09:23
osse you cannot possible have run what i said09:23
notice the 2 in front of the >09:24
→ nettoweb joined09:24
Xatenev Oh I didnt write the 209:24
My bad09:24
Oh09:24
Now all the bad lines are in the lol.txt09:24
And the correct things are output in the git bash09:24
and only them09:24
osse show me09:25
Xatenev https://bpaste.net/show/e02a395f064309:25
are there docs on 2>? :P09:25
What does that mena09:25
osse that's regular shell redirection09:25
Xatenev What does that mean09:25
osse it makes standard error go to the given file09:25
man bash09:25
Xatenev ah09:26
thanks :)09:26
osse do you remember whether you have installed any sort of diff thing for viewing documents?09:26
→ clmsy joined09:26
→ t0by joined09:26
← t0by left09:26
→ t0by joined09:26
osse and you remembered GIT_TRACE=1 too right??09:26
Xatenev ye i did that09:26
Umm09:26
not rly09:27
Don't think I got any other diff tools, I can search through my programs quick tho09:27
Maybe I find something weird09:27
osse GIT_TRACE=1 git... not GIT_TRACE=1; git09:27
because that file is not what I expect09:27
Xatenev Well09:27
im not listening to you sorry, sec :(09:28
I though tthose are two commands.09:28
osse they are not09:28
Xatenev osse: https://bpaste.net/show/57b48d45e07b09:28
← syg__ left09:29
osse that's better09:29
now tell me, what the hell is astextplain ?09:29
← mindfart left09:29
← mohabaks left09:29
→ interrobangd joined09:30
Xatenev I dont know09:30
I never heard of that09:30
And i definetly never installed that.09:30
(Manually)09:30
osse it's causing the problem09:30
do git ls-files | grep .giattributes | xargs cat09:30
oops09:30
do git ls-files | grep .gitattributes | xargs cat09:30
→ quackgyver joined09:30
Xatenev https://github.com/msysgit/msysgit09:30
I think when I started working here, my git has been installed with this09:30
From some sysadmin09:31
on my pc.09:31
"diff=astextplain (msysGit only): converts those files (under the condition that their extension be *.doc, *.pdf, *.rtf, etc.) to a text format before generating their diff."09:31
osse yes, there we go09:31
you have at least one .gitattributes file09:31
Xatenev Wheres that09:31
osse remove the | xargs git part09:31
that file is telling git to use astextplain to produce the diff output09:31
Xatenev So only git ls-files | grep .gitattributes ?09:32
← pity left09:32
osse yes, trust yuorself09:32
Xatenev That outputs nothing09:32
← t-mart left09:32
← clmsy left09:33
osse i don't believe you09:33
Xatenev I can post you an image09:33
xD09:33
wait09:33
osse sure09:33
← svm_invictvs left09:34
Xatenev osse: http://i.imgur.com/UjKaTBP.png09:34
→ reto_ joined09:35
← freimatz left09:35
osse now why did the one with | xargs cat print something?09:35
Xatenev It didnt09:35
osse fuck09:35
gitinfo set mode: +v09:35
osse where did that diff=astextplain come from then09:35
Xatenev I dunno09:36
→ pity joined09:36
osse you don't know!?!?!09:36
you pasted it here, where did you copy it from?!?09:36
reto_ I can't find a way to set 'rename-threshold' in the .gitconfig file09:37
Xatenev osse: What?09:37
reto_ is this possible?09:37
Xatenev osse: I copied it from the output?09:37
← tirej left09:37
Xatenev osse: Lol you mean that what I quoted.09:37
osse: That was from a stackoverflow page that mentioned astextplain09:38
← robattila256 left09:38
Xatenev "http://stackoverflow.com/questions/28146244/what-is-the-difference-between-diff-and-diff-astextplain"09:38
And it says: "The string value astextplain is not part of Git core: in fact, runninggit grep "astextplain" in the Git project repository returns nothing. As far as I can tell, it's a shell script that ships with msysGit and allows you to convert files such as"09:38
← jay-m left09:38
osse Xatenev: is it mentioned in git config --get-regexp diff ?09:38
Xatenev yep09:38
Its not in my .gitconfig though09:38
barteks2x I somehow ended up in state "HEAD detached from <something>", how to fix it?09:39
osse ok, next time jsut show me everything my commands print09:39
← rajat left09:39
Xatenev sorry09:39
diff.astextplain.textconv astextplain09:39
osse firstly, your git is really old.09:39
→ mischat joined09:39
Xatenev yeap09:39
osse secondly, you msut go to C:\Program\ Files\wherever and edit the config file09:39
Xatenev The config file of what09:39
Of astextplain?09:39
osse Git09:39
Xatenev Where is that in that folder09:40
You mean etc/gitconfig ?09:40
osse wherever git is installed09:40
Xatenev Yea here it is09:40
osse do git config -l | grep astextplain09:40
Xatenev Git/etc/gitconfig [diff "astextplain"]09:40
barteks2x and reflog is a bit unhelpful. All I see is clone, then checkout, and then commit09:40
→ b100s joined09:40
Xatenev osse: It worked now the weird lines are gone09:41
osse: thank you :)09:41
← govg left09:41
← donught left09:41
→ robattila256 joined09:42
← mischat left09:42
→ govg joined09:42
→ mischat joined09:42
reto_ is ist possible configure git merge -X rename-threshold with .gitconfig?09:43
osse Xatenev: ooor maybe it's your files that are broken since astextplain stopped working. I see that astextplain is still a part of the newest git for windows09:43
jast barteks2x: does this explanation help to understand what might have happened? !detached09:43
gitinfo barteks2x: A detached HEAD (aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach09:43
← King_Hual left09:43
← pity left09:43
barteks2x I'm in a submodule09:43
but still not idea how it happened09:44
→ chll_ joined09:44
barteks2x I simply added a submodule and added one commit09:44
jast in submodules the detached state is normal, because submodules normally tie themselves to a specific commit instead of following a branch09:46
barteks2x so I should just leave it that way?09:46
jast it's not exactly straightforward to work directly inside a submodule, and submodules are not at all designed for keeping your own changes in the submodule without putting them in the upstream repo (if that's what you're trying to do, you might want to look into alternatives)09:47
→ Serpent7776 joined09:47
→ mehola joined09:47
barteks2x I want to push the changes09:48
← mischat left09:48
jast well, you *can* leave it as it is, but the commit you made on top of the detached HEAD is likely to get lost at some point, so... maybe not :)09:48
← Xatenev left09:48
→ mischat joined09:48
jast are the main repo and the repo for the submodule both maintained by you?09:48
barteks2x yes09:49
jast okay. do you want your change to end up in the submodule's upstream repo, too?09:49
I guess you do, if you're trying to push09:50
barteks2x where "submodule's upstream repo" is? I'm confused as to what it would be09:50
jast the source for your submodule, whatever URL you used for adding it09:50
→ cr34ton joined09:50
barteks2x yes, I have it on github and I want to push my changes. It seemed to work before (the same submodule but in different project)09:51
jast right, probably because HEAD was not detached there09:51
okay, you can work this way, you just have to remember to check whether the submodule's HEAD got detached09:51
← finalbeta left09:51
jast this time we're going to copy the commit back onto the branch, and in the future you just have to remember to checkout the branch before committing09:52
→ finalbeta joined09:52
barteks2x I use submodule for a simple library that is usually changed together with the project I use it in09:52
← mehola left09:52
jast to copy the commit, do the following: 1) git checkout thebranch (e.g. master), 2) git cherry-pick HEAD@{1} (this copies over the commit that was at HEAD immediately before switching back to the branch)09:53
← energizer left09:53
jast then you can do a quick 'git log' to make sure the result looks sensible09:53
barteks2x how does it end up with detached head in the first place?09:54
osse git submodule update09:54
for example09:54
jast it's something git's submodule feature always does when updating the submodule09:54
anyway, after that you should be able to push. one more thing: as I said before, submodules are tied to a specific commit. this means that if you push your main repo and clone it somewhere else, the clone will still give you the older commit in the submodule. telling the main repo to point to another commit in the submodule is a separate step, it's pretty simple:09:54
in the main repo, 'git add path/to/submodule' followed by 'git commit'09:54
barteks2x yes, I understand that. This is how I did it since the beginning but I've never seen it create detached head09:55
jast alternatively you can use submodules differently, so that they follow a branch instead of tracking a specific commit. that should make it more natural to work with for what you seem to want to do. I'm not very familiar with that mode of submodules, though, so I can't tell you much about it.09:55
→ rnsanchez joined09:56
barteks2x ideally I would like to completely stop using submodule but it will have to wait09:56
← djb-irc left09:58
→ SilverBe joined09:59
← dec0n left10:00
Vampire0_ → Vampire010:01
← cqi left10:01
→ jay-m joined10:01
→ tirej joined10:02
→ dec0n joined10:02
→ Rodya_ joined10:02
barteks2x in all the mess I created, I lost my changes, without any clear idea how :(10:04
wait, no, I was looking in the wrong repository10:05
← rasto left10:06
← SwiftMatt left10:06
← jfr left10:06
→ jsolano joined10:07
← Rodya_ left10:07
→ m4sk1n joined10:07
→ causasui joined10:08
→ achadwick joined10:10
→ DarsVaeda joined10:12
← marcogmonteiro left10:12
DarsVaeda hi, I'm on master and changed some files but did not commit, unfortunately these changes should have gone to a new branch, but I forgot to add that branch and change to it before changing the files10:14
→ cdown joined10:14
DarsVaeda I wonder: if I add the new branch now and change to it, would that work too?10:14
tobiasvl DarsVaeda: yes: !float10:16
gitinfo DarsVaeda: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.10:16
← jameser left10:18
→ rasto joined10:19
→ ShapeShifter499 joined10:19
→ jfr joined10:20
→ mischat_ joined10:26
← miczac left10:28
← felher_ left10:28
→ Mir4g3 joined10:28
→ goTAN joined10:29
→ cdown_ joined10:29
← mischat left10:30
DarsVaeda ah thanks!10:31
← cdown left10:32
cdown_ → cdown10:32
→ syg__ joined10:33
→ marcogmonteiro joined10:34
→ Gloomy joined10:36
← Tobbi left10:36
← Alienpruts left10:37
→ Alienpruts joined10:39
← dsdeiz left10:40
→ manuelschneid3r joined10:41
← chipotle left10:42
→ aw1 joined10:42
→ ngm joined10:42
mikecmpbll ack, this should be a simple question as i've done it before but my googling is failing me: how can i retrieve a commit message from a commit that i've reset?10:48
(reset to before the commit)10:48
← Goplat left10:48
osse mikecmpbll: reflog10:49
tobiasvl mikecmpbll: if you have the SHA, just "git show SHA". if not, find the SHA in "git reflog"10:49
osse gti show branch@{1} for example10:49
← finalbeta left10:49
mikecmpbll ahh, `git show` :]10:49
i could see it there in the reflog but just the one line10:49
→ YuGiOhJCJ joined10:49
mikecmpbll thanks osse , tobiasvl !10:49
→ finalbeta joined10:49
osse mikecmpbll: you can commit the message directly if you create a new commit: git commit -C abc123410:50
mikecmpbll osse : ahh yeh, that's the command i'd done before that i couldn't recall. super, thanks :)10:50
← theoceaniscool left10:52
→ theoceaniscool joined10:54
← zeroed left10:55
← DarsVaeda left10:58
← xall_ left11:00
← rkazak left11:00
← jay-m left11:02
→ LBV_User joined11:02
→ masuberu joined11:02
→ jay-m joined11:03
→ Snugglebash joined11:03
→ Rodya_ joined11:03
→ aswen joined11:04
→ ShalokShalom_ joined11:05
← finalbeta left11:06
→ finalbeta joined11:06
← Rodya_ left11:08
← ShalokShalom left11:09
→ svm_invictvs joined11:10
← hhee left11:10
→ gigq joined11:10
→ t-mart joined11:11
→ afuentes joined11:11
← navidr left11:11
→ megamnrld joined11:12
→ dersand joined11:12
← goTAN left11:12
← msonntag left11:12
→ goTAN joined11:13
← JeroenT_ left11:13
→ msonntag joined11:14
→ mohabaks joined11:14
← Nilesh_ left11:14
← svm_invictvs left11:14
← jsolano left11:15
→ zeroed joined11:16
→ xall_ joined11:17
→ irco joined11:17
← msonntag left11:18
← mohabaks left11:19
→ msonntag joined11:19
→ sbulage joined11:20
← BackEndCoder left11:22
← vuoto left11:22
→ BackEndCoder joined11:22
→ IndigoTiger joined11:22
→ chipotle joined11:26
ShalokShalom_ → ShalokShalom11:26
← megamnrld left11:28
← pietv left11:29
→ vuoto joined11:29
→ nahra joined11:30
→ freimatz joined11:32
← Alienpruts left11:33
→ Alienpruts joined11:34
→ gajus joined11:35
→ pietv joined11:35
← Hudu left11:36
← xall_ left11:38
→ dsdeiz joined11:41
← dsdeiz left11:41
→ dsdeiz joined11:41
→ JeroenT joined11:41
← pietv left11:44
← govg left11:46
← cdown left11:47
← theoceaniscool left11:49
→ miczac joined11:52
gitinfo set mode: +v11:52
→ ertesx joined11:53
← ljc left11:54
→ lindenle joined11:55
← msonntag left11:55
→ ismithers joined11:55
← ertes left11:56
ertesx → ertes11:56
gitinfo set mode: +v11:56
← aswen left11:56
← Snugglebash left11:57
→ Hudu joined11:57
← zeroed left11:58
→ msonntag joined11:59
→ zeroed joined11:59
← zeroed left11:59
→ zeroed joined11:59
← miczac left11:59
← mischat_ left11:59
← lindenle left11:59
→ mentazoom joined12:00
→ mischat joined12:01
← eduardas_m left12:03
← JeroenT left12:04
→ mischat_ joined12:04
← mischat left12:04
→ JeroenT joined12:05
← canuk_ left12:08
← irco left12:08
→ theoceaniscool joined12:08
← cr34ton left12:09
→ eduardas_m joined12:09
← jay-m left12:10
→ jay-m joined12:10
← mischat_ left12:10
→ mischat joined12:11
→ hhee joined12:11
→ Droolio joined12:13
→ Lea2 joined12:13
→ Snugglebash joined12:13
← Learath2 left12:16
← mentazoom left12:19
← zeroed left12:21
← mischat left12:21
→ mentazoom joined12:22
← [0xAA] left12:22
← DaveTaboola left12:25
Vampire0 Hey guys, is there a way to *not* detect renamed / copied files when doing a diff?12:25
osse --no-find-renames12:26
← finalbeta left12:27
Vampire0 Ah, almost. --no-renames it is, thanks osse12:28
→ finalbeta joined12:28
← DrSlony left12:28
← cagedwisdom left12:30
← aavrug left12:30
← SilverBe left12:32
→ aard_ joined12:33
← Snugglebash left12:33
→ rafalcpp joined12:33
Vampire0 osse, and is there an easy way to list all files that were not change between two commits? I now use diff with --name-only and --no-renames to write the list of changed files to a file and then ls-tree -r and a grep -vf to filter out the changed files from the list12:34
→ [0xAA] joined12:36
→ douglascorrea joined12:36
→ Ediz joined12:36
→ ColdKeyboard joined12:37
osse Vampire0: that sounds like exactly the solution I recommended to someone else a couple of weeks ago12:37
← mentazoom left12:37
osse git ls-tree --name-only -r branch1 | grep -vFf <(git diff --name-only branch1 branch2)12:37
I can't think of anything better12:37
→ aard__ joined12:38
→ Snugglebash joined12:38
← nowhere_man left12:39
← aard_ left12:39
Vampire0 ok, thx osse12:40
osse Vampire0: btw no-renames is not necessary with name-only12:40
→ mentazoom joined12:41
osse also my solution is more sexy than a temp file etc, but requires bash or zsh12:41
← msonntag left12:42
Vampire0 osse, yes, the subshell redirect is nice, I like it, didn't think of it12:42
← ngm left12:42
Vampire0 But no-renames is necessary, otherwise you only get the new file, not both12:42
osse i get both12:42
→ msonntag joined12:42
Vampire0 I don't12:42
Just tried it12:42
← JeroenT left12:42
osse never mind, my git is old12:43
boo git12:43
Vampire0 2.9.3 here12:43
→ jameser joined12:43
→ JeroenT joined12:43
→ mischat joined12:44
osse I like to compile things myself, install to /usr/local and then forget to update12:44
← mvdan left12:45
Vampire0 Ah, and -x should be given to grep too, otherwise a change of 'foo' will match a change of 'fooBar'12:45
← Xenophon1 left12:45
osse the -F takes care of that12:45
→ zeroed joined12:45
← mischat left12:45
→ XenophonF joined12:46
osse ehh, nope12:46
→ mischat joined12:46
osse stupid grep12:46
→ canuk joined12:46
← theoceaniscool left12:47
Vampire0 yes it is12:47
do echo -e 'foo\nfooBar' | grep -vFf <(echo foo)12:47
osse i agree12:47
Vampire0 and do echo -e 'foo\nfooBar' | grep -vxFf <(echo foo)12:47
osse the nope was a nope to "-F takes care of that"12:47
Vampire0 -F just says that it is plain text, not a regex12:47
Ah, ok12:47
→ str joined12:48
→ tlaxkit joined12:48
→ anand[m] joined12:49
osse for some reason I interpret the docs as saying it msut match the whole line12:49
since the fixed strings are separated by newlines12:49
ohw ell12:49
Vampire0 And actually diff is also not good, depending on the use-case. If you want to match all files that were touched and you changed a file and changed it back, it would not match12:49
What I have now is12:49
← [0xAA] left12:49
Vampire0 git ls-tree -r --name-only 9aae~ | grep -vFxf <(git log 9aae~..9aae -c --name-only --no-renames --pretty=format: | sort -u)12:49
osse A few weeks ago, and now, I wonder how on earth the list of *unchanged* files is interesting12:50
→ DolphinDream joined12:52
← ojdo left12:52
← jameser left12:53
→ WayToDoor joined12:56
Vampire0 osse me neither, it is for a SO question where I try to help. :-)12:57
← mentazoom left12:58
← jay-m left12:59
→ ojdo joined12:59
→ irqq joined12:59
→ HardlySeen joined13:00
← goTAN left13:00
← HardlySeen left13:00
→ HardlySeen joined13:00
← dsdeiz left13:01
→ roelmonn_ joined13:01
MapMan Hi! I have a file which is tracked in my repo, I added it a few commits back. Now I want the file to be untracked but still be there. Also when my friend pulls the repo, the file will be there as well but untracked. Is it enough to add the file to gitignore and remove tracking by using git rm --cache file?13:02
osse MapMan: not possible. you can use rm --cached but your friend needs to take care13:03
MapMan: it is easy enough to resurrect it after the pull13:03
and if he has local changes the pull will fail13:03
← sbulage left13:04
← zeroed left13:04
→ jameser joined13:04
→ zeroed joined13:04
← zeroed left13:04
→ zeroed joined13:04
← roelmonnens left13:05
→ Rodya_ joined13:05
→ mentazoom joined13:05
MapMan osse: Ok, so option B for me is to simply untrack and ignore the files, so everyone can create his own. Since the file is already tracked, what should I do? Simply remove the file, add to gitignore and push?13:05
← Singmyr left13:06
osse it's the only thing you can do13:06
→ cdown joined13:06
→ nowhere_man joined13:07
→ JuliusN joined13:07
← ShalokShalom left13:07
→ ShalokShalom_ joined13:07
JuliusN git status says head detached, but i've checked out a branch. i thought detached heads only occur when checking out commits.13:08
osse JuliusN: what branch did you check out13:09
_ikke_ correct, so apparently you have not checked out a branch13:09
(remote tracking branches do not count as branches)13:09
JuliusN oh13:09
← Hudu left13:09
JuliusN that's new to me13:09
← Rodya_ left13:09
Vampire0 osse, http://stackoverflow.com/questions/41827809/git-get-unchaged-files-between-commits if you are interested in the use-case13:09
→ Hudu joined13:09
osse the use case makes sense13:10
i approve13:10
→ Singmyr joined13:10
osse unless the person removes those files without vetting them first13:10
also now I know what you look like. does that make you uneasy?13:10
→ synthroid joined13:10
Vampire0 osse, if it would, I wouldn't post my pic all over the web :-)13:11
JuliusN after checking out a remote branch can i make it an actual branch?13:12
→ dcpc007 joined13:12
_ikke_ git checkout -b <branchname>13:12
Vampire0 osse, hm, and you look like Guybrush13:12
osse correct!13:12
JuliusN i don't remember having to re-checkout from remote branches before13:13
← Ediz left13:13
→ Ediz joined13:13
MapMan osse: thanks, this is what I did. Out of curiosity, what about git update-index --assume-unchanged file? Wouldn't it do what I wanted in the first place?13:14
Vampire0 JuliusN, afair when you do "git checkout foo" with foo not being a tag or local branch, but remote tracking branch, Git should automatically create a local branch from the remote branch and check out the local branch13:14
osse JuliusN: maybe cause you made use of Git's ESP before. if you type 'git checkout bleh' and bleh doesn't exist but origin/bleh does, Git will create that braanch for you13:14
Vampire0: sometimes I look like a different guybrush13:14
→ mizu_no_oto joined13:14
osse mabye that's only on Steam13:15
JuliusN is it because i typed origin/branchname?13:15
_ikke_ JuliusN: correct13:15
JuliusN gotcha13:15
_ikke_ JuliusN: Note that when you type branchname, and it does not exist yet, and there is only one remote with that name, then git automatically creates the branch13:15
→ carandraug joined13:15
JuliusN yeah i think i got it13:16
osse third time's the charm!13:16
→ jay-m joined13:16
← jeffreylevesque left13:17
→ Tobbi joined13:17
← Gloomy left13:17
→ cdown_ joined13:18
← DolphinDream left13:18
→ Ice_Strike joined13:18
→ DolphinDream joined13:19
Ice_Strike I did git stash before and I want it back13:19
how do I do that?13:19
← cdown left13:19
← DolphinDream left13:19
→ daisy_ joined13:19
→ clmsy joined13:20
_ikke_ git stash pop13:20
Vampire0 osse, are you then one from Data Respons?13:21
← askb left13:22
→ oskarkv joined13:22
tobiasvl we don't need to doxx people in here, do we13:22
grawity git doxx drop13:23
← cdown_ left13:23
← mizu_no_oto left13:24
osse Vampire0: can I answer with a youtube link?13:24
Vampire0 I don't know, try :-D13:24
← Hudu left13:24
→ Gloomy joined13:24
Ice_Strike _ikke_ I just done git stash pop, files missing13:25
Can I get a list of stash?13:25
tobiasvl git stash list13:25
osse Vampire0: https://www.youtube.com/watch?v=gM4DkF2rQ4U13:25
osse removes linkedin profile13:26
Ice_Strike Ah13:26
git stash show -p stash@{1}13:26
I need that back13:26
→ Hudu joined13:26
Ice_Strike How do I get stash pop stash@{1} ?13:26
osse Vampire0: that was a joke13:26
← ayogi left13:26
← eycsigfy left13:27
tobiasvl Ice_Strike: did you try git stash pop stash@{1} ? or did you already pop that off the stash13:27
Vampire0 osse, I'm not that flexible anyway and interpret it as yes :-D So now we are square *g*13:27
→ mohabaks joined13:27
→ Starky joined13:27
osse lol13:28
_ikke_ git stash apply stash@{1}13:28
← Derperperd left13:28
← ws2k3_ left13:29
Ice_Strike Will tru13:29
try13:29
*.js.map is a pain with working with developers13:29
they all use gulp command13:29
← jozwior left13:30
jast generated files should not be checked in at all13:30
Ice_Strike so .gitignore ?13:30
^7heo what language?13:30
Ice_Strike php laravel13:30
^7heo ok13:30
in Go, generated files *have* to be checked in.13:31
but in PHP, I don't know.13:31
_ikke_ PHP as a language does not require anything13:31
← ShekharReddy left13:31
_ikke_ different frameworks have different requirements13:31
^7heo yeah13:32
I guess.13:32
I'm not too good with PHP.13:32
Ice_Strike I need to google how to deal with *.js.map and *.css.map file13:33
osse Ice_Strike: what are those?13:34
_ikke_ Files that tell the browser how to deal with minimized files13:34
→ theoceaniscool joined13:34
Ice_Strike It is source maps13:34
_ikke_ (for developer tools)13:34
Lea2 → Learath213:35
→ [0xAA] joined13:35
→ jozwior joined13:36
^7heo _ikke_: ah, so sorta like a symbol table13:37
← carandraug left13:37
← daisy_ left13:37
→ skunkz joined13:39
← aard__ left13:39
Ice_Strike *.js.map and *.css.map get generated via gulp command13:39
so each developer will use gulp command13:39
← bongjovi left13:40
← JuliusN left13:40
→ marijnfs joined13:40
Ice_Strike and when I pull, it can cause conflict13:40
so I guess put that in gitignore file13:40
and then run gulp for myself13:40
osse so it's a generated file13:40
remove them from the repo13:40
Ice_Strike osse what about app.js ? when mulitple files are merged into app.js13:41
I came issue with that as well13:41
← vuoto left13:41
Ice_Strike conflict13:41
osse that you just have to deal with13:41
qqx Generally app.js would also be a generated file, and so shouldn't be in the repo.13:41
← nettoweb left13:42
Ice_Strike So when its ready for production - I will push to git master, on the production server I will do git pull and then gulp.13:42
→ pepe123 joined13:42
Ice_Strike or setup auto deployment. Git pull, gulp.13:42
→ cdown joined13:43
← pepe123 left13:43
→ brent__ joined13:43
qqx Right. Besides causing conflicts, including generated files also causes clutter in diffs making it harder to do code reviews.13:43
→ bongjovi joined13:43
Ice_Strike qqx Actually.13:45
→ nettoweb joined13:45
← Snugglebash left13:46
→ ShekharReddy joined13:47
→ Snugglebash joined13:47
→ aard_ joined13:47
← brent__ left13:47
← WayToDoor left13:49
→ mehola joined13:49
→ Derperperd joined13:50
→ kadoban joined13:52
← Impaloo left13:52
← mehola left13:53
← mohabaks left13:53
← Derperperd left13:55
← masuberu left13:55
→ nickabbey joined13:55
← nettoweb left13:55
→ jeffreylevesque joined13:56
← frobnic left13:57
→ denete_ joined13:57
→ nettoweb joined13:58
→ WayToDoor joined13:58
← nickabbey left14:00
→ Impaloo joined14:02
← WayToDoor left14:05
→ minikN joined14:05
→ Rodya_ joined14:05
→ frobnic joined14:09
← tirej left14:09
← Guest36461 left14:10
← Rodya_ left14:10
→ mda1 joined14:11
→ eroussel joined14:11
→ nickabbey joined14:12
← roelmonn_ left14:16
→ roelmonnens joined14:17
→ pietv joined14:17
→ jimi_ joined14:17
→ Nilesh_ joined14:18
← ckruczek left14:19
→ aard__ joined14:22
→ snowkidind joined14:23
← aard_ left14:23
← Snugglebash left14:24
→ Ryanar joined14:24
← Starky left14:27
← pietv left14:27
→ Starky joined14:27
← Gloomy left14:29
← ferr1 left14:29
← aard__ left14:29
→ ikelso joined14:31
→ tirej joined14:31
→ todd_dsm joined14:32
← Orphis left14:33
← mostlybadfly left14:34
← tirej left14:35
→ tirej joined14:35
← tirej left14:35
→ tirej joined14:35
← lordjancso left14:35
← ShekharReddy left14:36
← ChiLL_SurF left14:36
← jameser left14:37
→ kpease joined14:38
← snowkidind left14:38
→ Snugglebash joined14:39
→ snowkidind joined14:40
→ snowkidi_ joined14:40
← aw1 left14:40
→ jameser joined14:42
→ AlexP11223 joined14:43
→ Dougie187 joined14:44
→ kpease_ joined14:44
← kpease left14:46
→ dendazen joined14:47
← Murii left14:48
→ mohabaks joined14:48
← MrWoohoo left14:48
→ Murii joined14:48
→ Orphis joined14:48
AlexP11223 If I change date of my commits using git filter-branch (before push) is it possible to detect it later?14:49
I don't want to do it, but I encountered one person asking about it, probably with intents like cheating his employee/client14:49
So I wonder if it is possible to detect such things14:49
employer*14:50
→ ankit01ojha joined14:51
→ Darcidride joined14:51
← snowkidi_ left14:51
rewt it isn't14:52
kadoban AlexP11223: There's no inherent way to verify the commit metadata like that, unless someone else has an original version.14:52
← Murii left14:52
→ masuberu joined14:52
← snowkidind left14:52
← Ryanar left14:53
kadoban It'd be impossible to enforce, if you control a computer, how is the software supposed to stop you? git is distributed, meaning that unless you tell it to, everything stays on your machine alone. There is no central verifier of truth.14:53
→ snowkidind joined14:53
→ aw1 joined14:54
→ Rodya_ joined14:54
→ snowkidi_ joined14:55
→ Guest36461 joined14:57
← mda1 left14:58
→ lindenle joined14:58
→ Emperor_Earth joined14:59
→ cyan__ joined15:00
← ismithers left15:00
← sdothum left15:01
← jagob left15:01
→ chipotle_ joined15:01
← minikN left15:01
→ sdothum joined15:02
← dec0n left15:02
← jknetl left15:03
← mikecmpbll left15:04
← masuberu left15:04
← lindenle left15:04
← chipotle left15:05
→ setuid joined15:05
→ mikecmpbll joined15:05
← douglascorrea left15:05
→ robotroll joined15:06
← snowkidi_ left15:06
→ voldz1tic3n joined15:07
← ShalokShalom_ left15:10
→ multi_io_ joined15:10
→ ShalokShalom joined15:12
→ LeBlaaanc joined15:12
← sammyo left15:12
← Orphis left15:13
→ hs366 joined15:13
→ titankiller joined15:13
→ sammyo joined15:13
→ Orphis joined15:13
← multi_io left15:13
→ AaronMT joined15:13
← Muzer left15:13
← Orphis left15:16
→ Noldorin joined15:18
← JeroenT left15:18
← causasui left15:19
→ sveinse joined15:20
← tvw left15:20
→ causasui joined15:20
→ cdg joined15:21
→ Ryanar joined15:21
sveinse How do I properly fetch/pull a repo into a bare mirror repo? All the examples I find is using git push --mirror, but I don't have access to the upstream side.15:21
→ Orphis joined15:22
← jay-m left15:22
sveinse If use 'git remote update --prune'. Will that cover it?15:23
← hs366 left15:24
← tirej left15:24
→ le_melomane joined15:26
→ chipotle joined15:26
← Ryanar left15:26
→ snowkidi_ joined15:27
→ JeroenT joined15:27
→ texinwien_ joined15:27
← theoceaniscool left15:27
← ac3takwas left15:28
← chipotle_ left15:29
← eroussel left15:29
→ Junior joined15:30
→ eroussel joined15:30
← Orphis left15:30
← canuk left15:30
← texinwien left15:31
← cdg left15:33
→ Orphis joined15:33
→ cdg joined15:33
→ mikecmpb_ joined15:34
← jameser left15:35
→ ResidentBiscuit joined15:35
← mikecmpbll left15:36
← snowkidi_ left15:36
← xissburg left15:36
→ jameser joined15:36
→ King_Hual joined15:37
← overlord_tm left15:40
← bl0w3d_0ut left15:40
← Disgeae left15:40
→ raspado joined15:44
← [0xAA] left15:45
→ mischat_ joined15:45
→ Darren_ joined15:46
← mischat left15:47
→ bgerber joined15:48
→ mehola joined15:50
← mohabaks left15:53
→ bl0w3d_0ut joined15:53
→ e14 joined15:53
→ snowkidi_ joined15:53
→ douglascorrea joined15:54
← rivarun left15:55
← mehola left15:55
→ rivarun joined15:55
← snowkidi_ left15:55
← snowkidind left15:56
→ snowkidind joined15:57
→ kyan joined15:57
← snowkidind left15:57
→ snowkidind joined15:58
→ Particle1olem joined15:58
← thiago left15:59
→ snowkidi_ joined15:59
← snowkidind left16:00
← snowkidi_ left16:00
← ParticleGolem left16:01
→ snowkidind joined16:01
→ dksvvljsdvs joined16:01
→ Emperor_Earth_ joined16:01
← snowkidind left16:02
← Emperor_Earth left16:02
← robattila256 left16:02
→ snowkidind joined16:02
← bgerber left16:02
← snowkidind left16:03
← kyan left16:03
→ geoid_ joined16:03
→ roelmonn_ joined16:03
← roelmonn_ left16:04
← titankiller left16:04
→ tinti joined16:04
gitinfo set mode: +v16:05
dksvvljsdvs need a one-liner that will return latest commit user only - no luck with git show for me - any help?16:05
grawity something along the lines of: git log --format=%A -116:05
→ isysd joined16:06
→ celebre joined16:06
← celebre left16:06
← clmsy left16:06
→ xissburg joined16:07
← roelmonnens left16:07
→ jagob joined16:08
← rominronin left16:09
← WhiskerBiscuit left16:09
→ rominronin joined16:10
→ jsolano joined16:10
← Rodya_ left16:10
← ThomasLocke left16:11
← Darren_ left16:12
sveinse grawity: git log -n1?16:13
→ jknetl joined16:13
grawity whichever16:13
the %format is definitely missing a letter though16:13
→ kettlewell joined16:13
← zefferno left16:13
→ zefferno joined16:14
← chele left16:14
sveinse grawity: git log -n1 --format="%ae" ?16:14
← rominronin left16:14
→ ash_workz joined16:14
→ dreiss joined16:15
sveinse or %an if it's the name you're after16:15
→ chardan joined16:16
← Snugglebash left16:17
→ brent__ joined16:17
→ thierryp joined16:18
← King_Hual left16:18
→ z1haze_work joined16:19
z1haze_work i just did a git add -A but i forogt to add a directory to my gitignore.. how can i undo that add -A16:19
RichiH z1haze_work: git status will show you the options from what's staged16:20
→ King_Hual joined16:20
← King_Hual left16:20
→ King_Hual joined16:20
RichiH in this case, not giving you the direct answer is probably better, long-term :)16:20
z1haze_work yea its got my whole .idea folder in there16:20
RichiH run git status and see for yourself16:20
z1haze_work i know what ive added16:21
im asking how to do i add it16:21
→ pity joined16:21
z1haze_work UNadd16:21
RichiH yes, and i am telling you that git status will tell you16:21
_ikke_ z1haze_work: what he means is that git status also gives hints on how to unstage and other things16:21
→ treia joined16:21
z1haze_work "git checkout -- <file>..." this?16:22
then i have to do this for every single file?16:22
→ roelmonnens joined16:22
← zefferno left16:22
→ macivy joined16:22
RichiH z1haze_work: as always, <file> refers to a path16:23
→ canuk joined16:23
RichiH so git checkout -- .16:23
jast except that's not going to unadd anything16:23
because you've been looking in the wrong section of 'git status' :)16:24
→ LionsMane joined16:24
← Kaisyu left16:24
z1haze_work look16:24
a lot of the files i added i want in there16:24
jast the 'git checkout -- <file>...' is for unstaged changes, whereas you've got *staged* changes16:24
z1haze_work only one directory i accidentally added16:24
jast that's one section further up. you find that command, pass it the name of that directory and you're done16:25
← pity left16:25
z1haze_work i got it now thanks16:25
→ svm_invictvs joined16:26
← roelmonnens left16:26
← JeroenT left16:27
← raspado left16:27
dksvvljsdvs git log -n1 --format="%an" is getting me a full username it's close but looking for actual git username16:27
jast there's no such thing as a "git username" tracked in history16:28
commit metadata contains only the name/e-mail you set up in (for example) ~/.gitconfig16:28
← durham left16:29
← macivy left16:29
→ raspado joined16:30
→ Snugglebash joined16:30
sveinse grawity: heh, sorry, I mistook you for the one asking the question of git log. :P16:30
← jameser left16:30
← mikecmpb_ left16:31
← chipotle left16:31
→ Peetz0r joined16:31
→ hobodave joined16:31
→ jameser joined16:32
← rivarun left16:33
→ jccn joined16:33
← Peetz0r left16:33
sonOfRa dksvvljsdvs: are you looking for the github username mapped to that name/email?16:33
→ mikecmpbll joined16:34
→ rivarun joined16:34
→ Peetz0r joined16:34
→ thethorongil joined16:34
sonOfRa If yes, I don't think you can perform that "reverse lookup"16:34
→ InfoTest joined16:34
dksvvljsdvs sonOfRa - correct16:34
sonOfRa Github shows the username based on the committer email16:34
hiroki Small question: Am I correct to assume that a push to a Gitolite master that has slaves configured (replicating everything) will propogate changes to the slaves right away without a delay ?16:34
→ mindfart joined16:34
sonOfRa You can look up the emails a user has if you know their email, but not the other way around16:34
→ Rodya_ joined16:35
→ stamina joined16:35
hiroki Wrong channel....16:35
← Rodya_ left16:36
→ x0h_eax joined16:36
← Peetz0r left16:36
sonOfRa dksvvljsdvs: you MIGHT be able to use the github API for this. But git itself does not record this information16:37
→ Darren_ joined16:37
→ gugah joined16:37
← voldz1tic3n left16:37
→ Peetz0r joined16:37
← zeroed left16:38
→ zeroed joined16:38
← zeroed left16:38
→ zeroed joined16:38
→ madewokherd joined16:39
→ durham joined16:39
← jameser left16:39
← eduardas_m left16:39
→ howitdo joined16:40
← howitdo left16:40
→ howitdo joined16:40
← e14 left16:41
← Balliad left16:41
← jknetl left16:41
→ jameser joined16:42
→ voldz1tic3n joined16:42
→ g_zen joined16:43
← voldz1tic3n left16:43
dksvvljsdvs sonOfRa ty ty16:44
← sonOfRa left16:44
→ jaafar joined16:45
← gugah left16:48
← nostrora left16:48
→ thiago joined16:49
← hahuang65 left16:49
→ sonOfRa joined16:49
← pdgwien left16:50
← nowhere_man left16:50
x0h_eax → xoh_eax_16:51
← multi_io_ left16:51
← svm_invictvs left16:51
→ pdgwien joined16:52
← Alienpruts left16:52
→ multi_io joined16:52
← eroussel left16:53
→ eZanmoto joined16:53
→ CheckDavid joined16:53
xoh_eax_ → x0h_eax16:53
→ mischat joined16:54
← raspado left16:54
← ihradek left16:54
← ikelso left16:56
→ ikelso joined16:57
← mischat_ left16:57
→ tyreld joined16:57
→ matsaman joined16:59
← jnavila left17:00
→ ikelso_ joined17:00
← ikelso left17:00
→ e14 joined17:00
eZanmoto Can you get access to the changes being pushed on the server side when you're using the `update` hook?17:01
sveinse 17:01
→ paladinn joined17:01
← paladinn left17:01
→ paladinn joined17:01
→ mischat_ joined17:02
eZanmoto i.e. if I'm pushing changes, can I test those changes before they're committed to the remote repo using the `update` hook?17:02
→ tang^ joined17:03
→ m0viefreak joined17:03
LiENUS is there a way to set up a branch (that gets pushed to remote as well) that follows another branch without needing to be pulled, committed and pushed on a regular basis?17:04
sort of a branch alias17:04
← mischat left17:04
← dksvvljsdvs left17:04
← cdown left17:05
← Serpent7776 left17:05
→ cdown joined17:06
← mischat_ left17:08
← Hudu left17:09
→ Ryanar joined17:09
→ theoceaniscool joined17:10
→ rominron_ joined17:11
← jameser left17:11
← Snugglebash left17:12
→ jameser joined17:12
← matsaman left17:13
← skunkz left17:16
← Mo left17:17
← Zoxc left17:18
→ Hudu joined17:19
→ matsaman joined17:19
→ Snugglebash joined17:20
→ Murii joined17:20
← rivarun left17:20
→ rivarun joined17:20
← Snugglebash left17:20
grawity nope17:21
well, if you want them to be *identical*, you could ssh to the remote and set up a symbolic ref17:22
assuming you can ssh to the remote17:22
but otherwise no, not without some client-side hook scripting17:22
→ ac3takwas joined17:22
← jameser left17:22
→ perlpilot joined17:23
← Starky left17:23
→ Starky joined17:24
LiENUS im doing it on github17:24
← geoid_ left17:25
LiENUS the jist is im using docker hub's dynamic tag name stuff, it generates new tags on docker based on branch and tag names17:25
→ chipotle joined17:25
→ geoid_ joined17:26
LiENUS i have a branch for 3.0 of some software but it also needs to be master17:26
→ [0xAA] joined17:27
← jaafar left17:27
→ jaafar joined17:29
← jsolano left17:29
← dreiss left17:29
← geoid_ left17:30
→ timvisher joined17:31
→ tvw joined17:31
← g_zen left17:33
→ svm_invictvs joined17:34
← mikecmpbll left17:34
← Raging_Hog left17:36
→ publio joined17:36
→ kyan joined17:36
← duderonomy left17:37
→ Raging_Hog joined17:37
← interrobangd left17:38
→ al-damiri joined17:39
← Raging_Hog left17:39
← ikelso_ left17:41
→ ikelso joined17:42
← zeroed left17:42
→ raspado joined17:43
← bongjovi left17:43
→ Raging_Hog joined17:44
← rominron_ left17:44
→ Rodya_ joined17:44
→ mda1 joined17:45
← tvw left17:45
← e14 left17:45
→ chipotle_ joined17:46
← Raging_Hog left17:46
← ikelso left17:46
→ e14 joined17:47
← Guest36461 left17:47
→ Rodya__ joined17:48
← freimatz left17:48
→ Guest36461 joined17:48
← chipotle left17:49
← Rodya_ left17:49
← tinti left17:49
mmattice are there cases where `git log -p $filename` won't show changes to that file?17:50
Vampire0 LiENUS, so when you push to 3.0 you want to push the same state to master?17:50
→ geoid_ joined17:51
← mda1 left17:51
← Ryanar left17:51
LiENUS Vampire0, well probably push to master and it updates 3.0 but thats pretty much the same thing17:51
well from what i understand it is the same thing as far as git is concerned17:51
Vampire0 LiENUS, how about `git config alias.push3 push master master:3.0`?17:51
LiENUS docker is slightly different about it17:51
Vampire0 LiENUS, this should push master to master and 3.0 if you do `git push317:52
LiENUS so i would remove my local 3.0 branch and just use master?17:52
← kurkale6ka left17:52
→ mohabaks joined17:53
→ BSAlb joined17:55
← BSAlb left17:56
← Hudu left17:56
← ac3takwas left17:57
→ Hudu joined17:57
← BSaboia left17:57
→ sargas_ joined17:57
← achadwick left17:57
→ hahuang65 joined17:58
→ TheCynicalPanda joined18:00
Vampire0 LiENUS, if you don't need it, sure. You can always push any arbitrary commit to a remote branch by using a full refspec. That `git push master` automatically does `git push master:master` is just convention. You can also do `git push 3466df6:master` if you want (and have a commit with that SHA1)18:00
← causasui left18:01
→ causasui joined18:01
→ lindenle joined18:02
→ chipotle joined18:04
← m0viefreak left18:04
thiago mohabaks: it could happen for a merge commit18:04
← mentazoom left18:05
← lindenle left18:07
← thethorongil left18:07
→ hramrach joined18:08
← chipotle_ left18:08
→ codemann joined18:08
← b100s left18:10
← hramrach__ left18:10
← Ediz left18:10
← rewt left18:11
→ doener joined18:12
← hramrach left18:12
← LionsMane left18:13
→ spacelord_ joined18:14
← cdown left18:14
→ ikelso joined18:14
← TheCynicalPanda left18:15
← mohabaks left18:15
← tyreld left18:16
→ rewt joined18:17
← synthroid left18:18
→ cdown joined18:19
→ noecc joined18:20
→ ianmethyst joined18:21
← Tobbi left18:22
← chipotle left18:22
→ eroussel joined18:24
→ xall_ joined18:25
→ hramrach joined18:25
→ dreiss joined18:26
← thierryp left18:27
→ Nysar joined18:27
← umpc left18:28
← Rodya__ left18:28
← NeverDie left18:28
← douglascorrea left18:29
→ douglascorrea joined18:30
→ Rodya_ joined18:30
← xall_ left18:31
→ gugah joined18:31
← cdown left18:31
→ metachr01 joined18:31
← metachr0n left18:31
→ jstein_ joined18:32
← marcogmonteiro left18:32
→ metachr0n joined18:33
→ thierryp joined18:33
→ nowhere_man joined18:34
jstein_ → jstein18:34
← douglascorrea left18:35
→ hasc joined18:36
→ douglascorrea joined18:36
← Kulrak left18:37
→ mda1 joined18:38
→ ihradek joined18:38
← dreiss left18:38
← ihradek left18:38
← tlaxkit left18:39
← thierryp left18:40
← Guest36461 left18:40
← Hudu left18:40
← qqx left18:41
→ qqx joined18:41
→ rominron_ joined18:41
← nowhere_man left18:42
← elect__ left18:43
→ btyne79 joined18:43
→ nowhere_man joined18:43
→ Hudu joined18:43
← texinwien_ left18:44
→ duderonomy joined18:44
→ Croves joined18:45
← Rodya_ left18:45
→ Rodya_ joined18:46
Croves Hi folks. I have reverted my branch to before a specific merge request using `git revert -m 1 <merge>`. Now, I'd like to go "foward" in each merge to see in what merge my feature stop working. Is that possible?18:46
→ synthroid joined18:46
← [0xAA] left18:46
grawity that's not how `git revert` works though18:46
or rather, that's not what "revert" does in Git18:46
← ianmethyst left18:47
grawity you would use `git checkout` if you merely want to jump around between commits18:47
and `git bisect` to automate bug searching18:47
→ XVar joined18:47
← aw1 left18:47
Croves grawity: is this work with remote branches?18:49
grawity it works with remote-tracking branches just as well as local ones18:49
← Nysar left18:50
grawity though before doing it, maybe remove that revert that you needlessly added18:50
Croves How should I revert that?18:50
→ jost joined18:51
Croves I just figured out that my server erases the remote branch after the testing & deployment18:51
→ dreiss joined18:51
→ mehola joined18:51
→ Kulrak joined18:51
← Kulrak left18:51
→ Kulrak joined18:51
← codemann left18:51
→ Nysar joined18:52
← jimi_ left18:53
← eZanmoto left18:53
→ boombatower joined18:53
← e14 left18:55
→ cdg_ joined18:55
← matsaman left18:56
← mehola left18:56
← ResidentBiscuit left18:57
← z1haze_work left18:57
← cdg left18:58
→ ResidentBiscuit joined18:59
← krillr left18:59
← BackEndCoder left19:00
← ankit01ojha left19:00
→ codemann joined19:00
→ aw1 joined19:01
→ BackEndCoder joined19:01
→ prawnzy joined19:02
→ fatalhalt joined19:02
← fatalhalt left19:02
→ e14 joined19:03
← prg3 left19:03
→ Ryanar joined19:04
→ srcerer joined19:06
→ b100s joined19:06
← prawnzy left19:07
→ prg3 joined19:07
→ regedit joined19:08
→ tyreld joined19:09
← Croves left19:09
→ prawnzy joined19:10
← moei left19:10
→ zeroed joined19:13
← zeroed left19:13
→ zeroed joined19:13
→ cdown joined19:13
→ cdg joined19:14
→ bill99 joined19:14
← isysd left19:16
→ MacWinner joined19:17
← rominron_ left19:17
← MacWinner left19:17
← Nysar left19:17
← cdg_ left19:17
→ cqi joined19:18
→ ecuanaso joined19:20
← ecuanaso left19:21
→ ecuanaso joined19:21
← zerotresBR left19:21
→ Nysar joined19:21
→ durham_ joined19:21
← cdg left19:21
← durham left19:21
← sargas_ left19:22
→ sargas joined19:22
← bocaneri left19:24
← Ryanar left19:24
→ MineCoins joined19:25
→ idlemind joined19:29
→ druonysus_ joined19:29
→ denete__ joined19:30
← synthroid left19:30
← durham_ left19:32
← jccn left19:32
← CheckDavid left19:33
← denete_ left19:34
→ satifant joined19:35
← idlemind left19:35
← chll_ left19:36
→ kent\n joined19:38
→ jccn joined19:39
→ beny joined19:41
← beny left19:41
→ beny joined19:41
→ Flaghacker joined19:42
← codemann left19:43
Flaghacker I had a problem that was caused by something going corrupt in .git (as we determined a couple of days ago on this channel) but the issue is solved when I clone my local project. I can't however figure out a way to do this while cloning all branches and keeping the old origin (Github). How can I do a full clone?19:44
← InfoTest left19:44
← beny left19:45
moritz Flaghacker: generally with git clone --mirror19:45
Flaghacker moritz, Thanks, I'll try that!19:45
→ peacememories joined19:47
peacememories hi everyone19:47
gitinfo peacememories: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.19:47
→ NeverDie joined19:47
← Singmyr left19:47
← theoceaniscool left19:47
peacememories can't quite figure this out: if i have a git repo, and another git repo in a subdirectory, can i somehow merge the subdirectory with its history into the parent repo?19:47
← geoid_ left19:47
→ hasc_ joined19:47
→ t94j0 joined19:48
grawity yeah, search for 'subtree merge'19:48
I think even `git subtree` is a thing nowadays19:48
← t94j0 left19:48
→ geoid_ joined19:48
peacememories grawity already did, but it sounds a bit like it's supposed to pull in the subdirs from remotes instead of just using the local ones?19:48
← hasc left19:49
← e14 left19:49
→ jsolano joined19:49
→ hasc joined19:50
→ idlemind joined19:50
peacememories oh, sorry for disappearing after asking a question, but i have to go. bye everyone19:51
← peacememories left19:51
→ durham joined19:52
← hasc_ left19:52
← spacelord_ left19:52
← cqi left19:52
← geoid_ left19:53
← jsolano left19:54
→ spacelord_ joined19:54
← paladinn left19:55
→ hobodave_ joined19:56
→ pity joined19:58
← hobodave left19:58
Flaghacker moritz, That only cloned the .git folder though. Should I just put those files in the result of a normal clone?19:58
osse --mirror implies --bare AFAIK19:59
moritz Flaghacker: it creates a bare repo; you can push from that19:59
Flaghacker: if you want a copy to work with, do a normal clone19:59
there are also tutorials out there on how to turn a bare repo in a non-bare one20:00
→ nowhereman joined20:00
Flaghacker moritz, The problem was that a normal clone doesn't copy all the the branches, would starting from a bare one and turning it into a non-bare one fix that?20:01
moritz Flaghacker: yes20:02
→ dedondesta joined20:02
Flaghacker And it doesn't simply copy the whole .git folder over, right? Because that wouldn't solve my proble.20:02
→ lindenle joined20:02
← pity left20:02
dedondesta how do i undo merge and already been pushed?20:02
→ jimi_ joined20:03
← nowhere_man left20:03
kadoban dedondesta: You can revert a merge. It has one big thing to remember though: when you want to merge in the future *first, revert the revert of the merge*20:04
← LBV_User left20:04
kadoban man git revert20:04
gitinfo the git-revert manpage is available at http://jk.gs/git-revert.html20:04
→ aidalgol joined20:04
→ LBV_User joined20:04
← cyan__ left20:07
← LBV_User left20:08
→ overlord_tm joined20:09
→ texinwien joined20:13
→ rominron_ joined20:14
← texinwien left20:14
→ texinwien joined20:14
→ askb joined20:15
→ Cabanoss- joined20:18
← gugah left20:19
→ e14 joined20:21
← jost left20:22
← Cabanossi left20:22
Cabanoss- → Cabanossi20:22
← Rodya_ left20:22
← nickabbey left20:22
← noecc left20:23
← prawnzy left20:23
→ geoid_ joined20:24
→ rwb joined20:25
← ikelso left20:27
→ ikelso joined20:28
→ prawnzy joined20:28
← cdown left20:29
→ cdown joined20:29
→ m0viefreak joined20:29
← MineCoins left20:30
→ n-st joined20:30
← ikelso left20:32
→ mischat joined20:32
← mischat left20:32
→ mischat joined20:33
← Es0teric left20:34
→ jnavila joined20:35
← mischat left20:35
→ Es0teric joined20:36
→ ikelso joined20:37
← cdown left20:39
→ lucasem joined20:41
→ ji joined20:42
← ji left20:43
→ ji joined20:43
→ courrier joined20:44
← ji left20:44
→ HELPme joined20:45
HELPme → Guest420620:45
gitinfo set mode: +v20:46
Guest4206 hello20:46
gitinfo Guest4206: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.20:46
Guest4206 i need help20:46
anytime i try to clone a link from github i get 'fatal' unable to resolve host 'github.com'20:46
is anyone here who can help?20:47
← rominron_ left20:48
← crayon left20:48
← e14 left20:48
Guest4206 anyone at all?20:48
kadoban Guest4206: Sounds like a network problem more than anything. Are you behind any kind of proxy, or?20:49
Can you visit github.com in your browser successfully?20:49
Guest4206 I disable firewall. I don't believe i am behind a proxy20:49
i can visit github.com successfully yes20:49
→ mischat joined20:50
→ LionsMane joined20:50
→ nickabbey joined20:51
→ e14 joined20:52
← HardlySeen left20:53
→ gugah joined20:54
← zeroed left20:54
Guest4206 any suggestions?20:54
Dougie187 How are you cloning?20:55
→ kulelu88 joined20:55
← ecuanaso left20:55
→ d5sx43 joined20:55
Guest4206 git clone + link20:55
Dougie187 But what kind of link?20:55
[email@hidden.address] or https://github.com?20:55
Guest4206 https://github.com20:56
→ Atm0spher1c joined20:56
Dougie187 can you ping www.github.com?20:58
Guest4206 yes20:58
← Flaghacker left20:58
→ zeroed joined20:58
→ Flaghacker joined20:58
← sarri left20:58
Dougie187 No ideas from me then. I don't usually use the https links because I find them more annoying.20:58
maybe someone else can give some ideas.20:59
→ j416 joined20:59
→ ecuanaso joined20:59
Guest4206 up till last week whenever i cloned any link it all went smoothly20:59
← n-st left20:59
Guest4206 this week for some strange reason it just is unable to resolve host github.com21:00
→ theoceaniscool joined21:00
→ sarri joined21:01
← sarri left21:01
→ sarri joined21:01
← Es0teric left21:03
← ShapeShifter499 left21:03
→ n-st joined21:05
→ cagedwisdom joined21:05
← n-st left21:05
→ Tobbi joined21:05
← dreiss left21:06
← canuk left21:06
← d5sx43 left21:06
→ n-st joined21:06
← eroussel left21:06
← Guest4206 left21:07
→ dsdeiz joined21:07
← jeffreylevesque left21:08
← j416 left21:08
← nowhereman left21:10
→ anuxivm joined21:10
→ j416 joined21:10
← Nysar left21:13
← NeverDie left21:14
→ Nysar joined21:14
→ Singmyr joined21:15
← MrMojito left21:17
→ Derperperd joined21:18
→ matsaman joined21:18
→ dreiss joined21:18
← Ice_Strike left21:19
← druonysus_ left21:23
← ecuanaso left21:24
← LeBlaaanc left21:26
→ ecuanaso joined21:27
← jccn left21:28
← rwb left21:28
← rivarun left21:29
→ jeffreylevesque joined21:29
→ rivarun joined21:29
← denete__ left21:30
→ denete_ joined21:31
→ jccn joined21:33
← YuGiOhJCJ left21:33
← tyreld left21:33
→ Rodya_ joined21:34
← b100s left21:35
← dreiss left21:36
← Flaghacker left21:36
→ eroussel joined21:40
→ Flaghacker joined21:40
→ Limes__ joined21:41
Flaghacker Hey guys! I cloned a local project using "git clone --mirror ...", then I converted the resulting bare project to a normal one using this guide (http://stackoverflow.com/a/10637882/5517612). When I now try to "git push origin master" i get the error "error: --mirror can't be combined with refspecs". I already tried changing origin to be github again, is there something else I need to do?21:43
moritz Flaghacker: does the .git/config mention "bare" or "mirror" or anything related?21:44
→ energizer joined21:44
energizer is it possible to git diff <(sort myfile) <(sort file2)21:44
→ rominronin joined21:44
moritz energizer: have you tried it?21:45
Flaghacker moritz, Under [core] it says "bare = false" and under [remote "origin"] it says "mirror = true", so yes.21:45
← Nysar left21:45
energizer moritz: yeah doesnt work exactly like that, maybe somehing a little different21:45
← nickabbey left21:46
← neunon left21:47
→ nickabbey joined21:47
moritz energizer: you could use ordinary diff -u21:47
energizer moritz: im looking for --color-words21:48
moritz Flaghacker: try removing the mirror = true21:48
→ tyreld joined21:49
→ Sasazuka joined21:49
Flaghacker moritz, Thanks, that worked! What did that mean?21:49
moritz Flaghacker: "hey look, this is not a mirror anymore"21:49
→ HcsOmot_ joined21:50
moritz energizer: you can use diff-hilight for that21:50
Flaghacker And what does it mean to be a mirror? Why was that specified within [remote "origin"]?21:50
moritz Flaghacker: it means that pulling and pushing works on all branches by default, not just on the current oen21:51
← IndigoTiger left21:52
→ mehola joined21:53
→ SwiftMatt joined21:53
← idlemind left21:53
← tyreld left21:54
→ dreiss joined21:54
← jccn left21:54
← thallada left21:55
← madewokherd left21:56
Flaghacker moritz, Okay thanks for helping me and thanks for the explanation.21:56
← metachr01 left21:58
← mehola left21:58
→ idlemind joined21:59
→ cdown joined22:00
→ tvw joined22:00
→ thallada joined22:02
← energizer left22:02
← thallada left22:02
← spacelord_ left22:02
→ thallada joined22:02
← jagob left22:02
← x0h_eax left22:03
HcsOmot_ i'm trying to learn git by solving problems on learngitbranching.js.org and I'm wondering how accurate it is. this is what one of the problems looks like, and what I did. the app didn't accept my solution as valid. I'm wondering what exactly happens to commits when you do git reset HEAD^. could anyone help out please?22:03
→ Lea2 joined22:03
← Learath2 left22:03
HcsOmot_ http://pasteboard.co/q4XQca77U.png22:03
← jimi_ left22:04
Lea2 → Learath222:04
→ energizer joined22:04
← blackwind_123 left22:04
→ cdg joined22:04
← cdg left22:05
→ cdg joined22:05
← ash_workz left22:05
→ tyreld joined22:05
→ blackwind_123 joined22:06
← Emperor_Earth_ left22:06
← ikelso left22:07
← douglascorrea left22:08
← rivarun left22:08
→ ikelso joined22:08
→ rivarun joined22:08
→ douglascorrea joined22:08
→ jstimm joined22:09
→ chipotle joined22:09
→ Nysar joined22:10
← Rodya_ left22:10
→ sand-bird joined22:10
→ isysd joined22:10
HcsOmot_ actually, take this link into considerations22:11
http://pasteboard.co/q57NAF8Gj.png22:11
→ ikelso_ joined22:11
← ikelso left22:11
→ dunpeal joined22:12
← douglascorrea left22:13
← afuentes left22:13
→ systemovich joined22:13
dunpeal Hi. I have master, and a branch foo diverging from it. Since the divergence, foo had one unique commit A made into it, followed by a merge of master (1 commit B) followed by one more unique commit C on foo. I'd like to squash A and C together into a single commit D, but not include B. Is there a clean option?22:14
← systemovich left22:14
← energizer left22:14
→ energizer1 joined22:14
→ Rodya_ joined22:14
thiago dunpeal: no22:15
dunpeal If I do `git rebase -i A^`, I get the B commit in the list of commits to be merged.22:15
← ecuanaso left22:15
dunpeal thiago: really? I'm OK with rebasing foo.22:15
→ MattMaker joined22:15
→ irqq_ joined22:15
dunpeal It's a private branch, I'm the only user.22:15
→ Cabanoss- joined22:16
← jnavila left22:16
→ cdg_ joined22:16
← MattMaker left22:16
thiago the problem is B22:16
you need to undo the merge22:16
→ MattMaker joined22:16
dunpeal Can't I just rebase C onto A?22:17
thiago easiest is to checkout A, then cherry-pick -n C, git commit --amend22:17
← cdg left22:17
dunpeal right, or just rebase C onto A, then squash them with rebase -i22:17
← lindenle left22:17
← hahuang65 left22:17
← Cabanossi left22:17
Cabanoss- → Cabanossi22:17
← kpease_ left22:18
← irqq left22:18
thiago the problem with doing the rebase is that it might show the commits coming via B22:18
← rominronin left22:19
thiago so I cannot recommend it because I don't know how rebase -i will behave22:19
dunpeal Seems fine, actually.22:19
→ peacememories joined22:19
dunpeal I just did a rebase -i, and removed B manually.22:19
→ ghoti joined22:19
→ canuk joined22:20
dunpeal The reason I asked is because it seems like a common task that would be tedious.22:20
← le_melomane left22:20
← peacememories left22:21
← Virox left22:21
dunpeal I.E. this is obviously a minimal example, with just 3 commits, but often you will have have tons of merged ("B") commits sprinkled among foo commits.22:21
So I thought there would be a shortcut.22:21
→ d5sx43 joined22:21
→ peacememories joined22:21
← jstimm left22:21
← ikelso_ left22:21
← Flaghacker left22:22
→ ikelso joined22:22
← mischat left22:22
→ mischat joined22:23
← TrentonDAdams_ left22:23
thiago it's unlikely to be common22:23
→ TrentonDAdams_ joined22:23
dunpeal I think another thing you can do here is to merge --squash back to master.22:24
→ jccn joined22:24
thiago if you're still working on your commits and you possibly want to edit them, you shouldn't be merging22:24
← dreiss left22:24
thiago you should be rebasing22:24
← TrentonDAdams_ left22:24
→ TrentonDAdams_ joined22:24
dunpeal thiago: thing is, rebasing so often is kinda messy.22:24
you have to push -f every time you do.22:24
← Nysar left22:24
← TrentonDAdams_ left22:24
→ TrentonDAdams joined22:25
→ cdg joined22:25
dunpeal thiago: also, this question is relevant even if you're done working and just want to merge back via a PR or whatever.22:25
TrentonDAdams is there a way of forcing git log graph option to always show a branch with a branch? i.e. I have a branch I just rebased against master, but it's confusing for that branch to show in the same line as the master, cause it's a different branch22:25
→ ismaris joined22:25
dunpeal e.g. you want to have a PR be a single clean commit, instead of a jumble of many small ones.22:25
TrentonDAdams dunpeal, I'm toying with the squashing concept. It seems nice, because you don't get sprinkled commits22:26
And, it's very clear if you have a project branch, what was changed22:26
← nickabbey left22:27
← ikelso left22:27
← d5sx43 left22:27
→ shamowfski joined22:27
→ Virox joined22:27
← mischat left22:27
thiago TrentonDAdams: if it's been rebased, there's no branching22:28
dunpeal: you can do that, via rebase.22:28
← cdg_ left22:29
thiago you always rebase. Don't merge until it's finished.22:29
← zeroed left22:29
← dendazen left22:29
→ d5sx43 joined22:29
← Murii left22:29
→ rwb joined22:30
← kettlewell left22:30
← nettoweb left22:30
→ lindenle joined22:30
← d5sx43 left22:32
→ nettoweb joined22:32
→ dreiss joined22:34
← nettoweb left22:34
← denete_ left22:36
adymitruk is there a way to only show decorated commits, branch points and merge points in git log --graph and exclude all other commits?22:36
or even simpler, only show decorated commits and any relevant branches and merges to them?22:37
→ crayon joined22:38
→ hahuang65 joined22:38
← eroussel left22:42
← cagedwisdom left22:44
→ Ryanar joined22:44
← t0by left22:45
← publio left22:45
→ ToBeCloud joined22:47
gitinfo set mode: +v22:47
← satifant left22:48
← sargas left22:50
→ douglascorrea joined22:53
peacememories hmm, still can't figure this out. trying to integrate a repository into a parent repository (preserving commits etc)22:53
← ismaris left22:54
→ MrWoohoo joined22:55
← hobodave_ left22:56
→ Nokurn joined22:56
← e14 left22:57
→ cagedwisdom joined22:57
← perlpilot left22:57
← redhedded1 left22:58
→ redhedded1 joined22:58
Eugene peacememories - !subrepo22:58
gitinfo peacememories: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.22:58
Eugene If you want to merge the subrepo's history with the parent.... then you're in for a ride22:59
peacememories Eugene then i guess i'm in for a ride^^'22:59
Eugene The usual approach is to copy the files in and commit it with a message of "Copied from $OLD_REPO_URL at commit ABCDEF"22:59
Here's a blog post(I haven't tried it) that gives the full rollercoaster procedure. https://passingcuriosity.com/2015/combining-git-repositories/23:00
You'll also want to read man git-filter-branch23:00
gitinfo the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html23:00
← fmeerkoetter left23:01
→ fmeerkoetter joined23:01
← stamina left23:01
Eugene Straightening out merges is left as an exercise23:01
My honest advice is to re-examine why you care about history. In almost all scenarios the answer is "because I want to", and IMO it is far, far simpler to leave a note explaining why you didn't bother.23:02
You may also want to reat up on https://git.wiki.kernel.org/index.php/GraftPoint23:02
peacememories yeah, i think i just won't bother^^'23:02
i was hoping to find a somewhat elegant solution, but it's really not worth it breaking open the git internals^^23:03
TrentonDAdams thiago, I rebased though, I didn't merge it to master.23:04
Yes, the history is the same up until the branch I rebased, and then it's just my changes from that point on, but it's still weird visually to see it look like the changes are on master.23:04
→ cdg_ joined23:05
TrentonDAdams Oh, it does change the color of the graph characters.23:05
Eugene Indeed.23:05
← Limes__ left23:06
← dsdeiz left23:06
← Dougie187 left23:07
→ madewokherd joined23:07
→ ecuanaso joined23:07
← hahuang65 left23:08
← cdg left23:08
→ publio joined23:09
→ snowkidind joined23:09
→ Guest36461 joined23:10
→ WifiBrain joined23:10
← treia left23:10
← Cabanossi left23:11
→ Cabanossi joined23:11
→ dsdeiz joined23:12
← snowkidind left23:12
← mda1 left23:12
← ResidentBiscuit left23:13
← matsaman left23:14
← Rodya_ left23:14
→ NeverDie joined23:14
← swords left23:15
→ rominronin joined23:16
← lindenle left23:16
← dsdeiz left23:16
→ Nysar joined23:16
← ecuanaso left23:17
← Derperperd left23:17
← doener left23:17
→ cdg joined23:19
← King_Hual left23:21
→ lindenle joined23:21
← HcsOmot_ left23:22
→ snowkidind joined23:22
→ matsaman joined23:22
← cdg_ left23:22
→ ismaris joined23:24
← Nysar left23:24
→ Sasazuka__ joined23:24
← snowkidind left23:25
← Sasazuka left23:25
→ nettoweb joined23:25
← johnny56_ left23:26
← lindenle left23:26
← Samual left23:26
→ boz_v1 joined23:27
← energizer1 left23:27
→ snowkidind joined23:27
← nettoweb left23:28
→ ShapeShifter499 joined23:28
→ johnny56_ joined23:28
→ energizer joined23:29
→ dsdeiz joined23:29
← dersand left23:30
← peacememories left23:30
← courrier left23:30
→ CheckDavid joined23:30
→ Samual joined23:32
→ dendazen joined23:32
→ denete joined23:33
→ lindenle joined23:33
→ Nysar joined23:33
← m0viefreak left23:34
→ a_thakur joined23:35
← a_thakur left23:36
← energizer left23:36
→ a_thakur joined23:36
← msonntag left23:37
→ GavinMagnus joined23:37
→ bocaneri joined23:37
← denete left23:38
→ Kaisyu joined23:38
← cdg left23:39
→ trip joined23:39
← Samual left23:39
trip → Guest8131523:39
→ parasite_ joined23:39
← AaronMT left23:39
→ hasc_ joined23:41
← hasc left23:41
← MattMaker left23:42
→ cdg joined23:42
← snowkidind left23:43
← Hudu left23:43
← jccn left23:44
→ rkazak joined23:44
→ jameser joined23:44
← Hobbyboy left23:45
→ Samual joined23:46
← barteks2x left23:46
→ jccn joined23:48
← jameser left23:49
← rkazak left23:49
← tyreld left23:50
← rominronin left23:51
→ msonntag joined23:51
→ jameser joined23:51
← cdown left23:51
← hhee left23:52
→ swords joined23:52
→ sargas joined23:52
→ Zoxc joined23:53
← NeverDie left23:53
← raspado left23:53
→ NeverDie joined23:53
← jameser left23:53
→ moei joined23:54
← Zialus left23:55
← manuelschneid3r left23:55
← m4sk1n left23:55
→ raspado joined23:55
← msonntag left23:55
→ snowkidind joined23:55
→ snowkidi_ joined23:56
→ Zialus joined23:56
→ barteks2x joined23:58
BlessJah is there an actual algorith to determine graph color or is it just an random thing? (algorith as in "it's based on branching point hash" or "it will loop through red-yellow-magenta...")23:58
← NeverDie left23:59

Logs Search ←Prev date Next date→ Channels Documentation