IRCloggy #git 2016-03-05

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.

2016-03-05

← citizen-stig left00:01
← sargas left00:02
→ quenode joined00:03
← daito left00:03
← diegoviola left00:04
← cagedwisdom left00:05
→ Wetmelon joined00:07
← Jetchisel left00:08
← axelitus left00:09
→ Lunatrius` joined00:09
→ diegoviola joined00:10
← Lunatrius left00:10
Lunatrius` → Lunatrius00:10
← CEnnis91 left00:15
← ffabi_ left00:16
→ lunarmage joined00:16
gitinfo set mode: +v00:17
← mdw left00:17
lunarmage this is more of a "would you recommend this" than an actual question, but which would you say is better, requiring the user get a module from a package manager like pip or cpan or using git-submodule00:18
← clemf left00:19
osse how do I use git add -p's search feature? I typed a string that is added in a hunk, but git-add won't find it00:19
→ clemf joined00:19
euxneks i7c: thanks for the response :)00:19
→ Sonicbit joined00:20
osse lunarmage: unless you have specific requirements, I would prefer pip00:20
← mezod left00:20
→ mdw joined00:20
lunarmage osse: define "specific requirements"00:20
osse specific version requirements I mean00:20
← clemf left00:20
lunarmage makes sense00:21
osse but a submodule is nice if you're worried about the reproducibility thing00:21
← botevoker left00:22
osse like in 5 years from now you check out commit from today and you want to be sure you get00:22
*exaaaaactly* the same thing00:22
← mdw left00:23
→ ffabi joined00:24
← mattfoo left00:26
→ botevoker joined00:27
→ mdw joined00:28
→ DenysLins joined00:28
← DenysLins left00:29
← thiago left00:30
→ mattfoo joined00:31
← ffabi left00:32
← diegoaguilar left00:33
← PHPanos left00:35
→ Rodya_ joined00:36
← hahuang65 left00:39
Eugene HedgeMage - PM00:39
→ ffabi joined00:40
← mdw left00:40
→ mdw joined00:42
← theWhisperIn_ left00:43
→ mezod joined00:43
← cdg left00:44
→ cdg joined00:44
→ mostlybadfly joined00:46
→ Midoshi27 joined00:46
← netj left00:48
← Rodya_ left00:48
← mdw left00:48
→ netj joined00:48
→ nettoweb joined00:49
← cdg left00:49
← diegoviola left00:49
← ffabi left00:49
→ Lyqyd joined00:49
← nettoweb left00:50
← rubyonrailed left00:50
← mizu_no_oto left00:51
← EvilPeng1 left00:54
→ ffabi joined00:56
← d4rklit3 left00:57
→ fstd_ joined01:00
→ daito joined01:00
→ joufflu joined01:00
→ clemf joined01:00
← clemf left01:00
← kilo_bravo left01:01
i7c I wanted to put the [user] section of my gitconfig into another file01:01
← imachuchu left01:02
→ d4rklit3 joined01:02
i7c But [include] does not seem to work with the [user] section. It works with other sections tho. Any hints why?01:02
Oh no actually it works, I'm just not allowed to use the --global flag.01:03
← fstd left01:03
fstd_ → fstd01:03
← dlam left01:03
i7c nvmd :)01:03
← intrigueD left01:03
→ slappymcfry joined01:04
→ a_thakur joined01:04
← daito left01:04
→ gfixler1 joined01:07
← leprechau left01:08
← MattMaker left01:08
→ MattMaker joined01:08
→ zmachine joined01:08
→ tachoknight__ joined01:12
← espindola left01:12
→ mdw joined01:16
← tachoknight__ left01:16
→ diegoviola joined01:17
← tgunr left01:17
→ LiamGoodacre joined01:21
← jonmorehouse left01:23
← weox left01:23
← mezod left01:24
← leeN left01:27
← dsdeiz left01:27
→ tang^ joined01:27
← kpease left01:28
← euxneks left01:30
→ eka joined01:31
→ vmonteco joined01:31
vmonteco Hello!01:31
← mdw left01:31
← sssilver left01:33
gitinfo set mode: +v01:34
LiamGoodacre Hello, on an existing repo, if (on the `master` branch) I do `git checkout --orphan foo && git rm -rf . && touch README && git add README && git commit -m'readme' && git checkout master`. Then I clone that repo, the orphan branch `foo` doesn't get listed in `git branch` and I can't access it with `git checkout foo`. Is this expected behaviour? :)01:34
→ oonuma joined01:35
← MattMaker left01:36
← nnyk_ left01:37
← King_Hual left01:37
→ stonerfish joined01:37
→ MattMaker joined01:38
→ Aerosonic joined01:38
← MattMaker left01:38
→ MattMaker joined01:39
← MattMaker left01:40
→ nnyk_ joined01:43
→ Lunatrius` joined01:44
← nowhere_man left01:45
→ citizen-stig joined01:46
← Lunatrius left01:48
Lunatrius` → Lunatrius01:48
← durham left01:48
→ _leb joined01:49
→ Rodya_ joined01:49
vmonteco I have a little problem, I wanted to move some commits to an other (new) branch, so I tried this : http://stackoverflow.com/a/1628584/3156085 but I can't checkout to the commit I wanted to move (I still have its hash though). How could I do? (Here are the commands I entered : http://dpaste.com/3V5B8AD)01:49
vmonteco: Oh my bad nevermind :X01:50
sorry, everything is fine01:50
← citizen-stig left01:50
→ dsdeiz joined01:52
← dsdeiz left01:52
→ dsdeiz joined01:52
← paddyez left01:53
← Rodya_ left01:55
← modocache left01:55
→ thiago joined01:56
→ mezod joined01:57
← HelloAtMega left01:57
→ shinnya joined01:58
→ jason__ joined01:58
← nwkj86 left01:59
← diegoviola left01:59
→ daito joined02:01
→ HanClinto joined02:01
→ eletuchy joined02:02
← mezod left02:04
← dsfreak93 left02:05
← daito left02:06
→ paddyez joined02:06
→ dreiss joined02:06
← madewokherd left02:07
→ madewokherd joined02:08
← paddyez left02:11
→ espindola joined02:13
→ nowhere_man joined02:13
← eletuchy left02:15
→ mizu_no_oto joined02:16
→ eletuchy joined02:16
← espindola left02:18
→ sargas joined02:18
← infernix left02:22
← sargas left02:23
→ michelangelo joined02:26
← fees left02:26
← nnyk_ left02:26
→ kn-928 joined02:26
← mmlb left02:28
→ mablae joined02:29
← hgl left02:29
← |node left02:29
← donmichelangelo left02:30
← mablae__ left02:31
→ xlegoman joined02:31
← LiamGoodacre left02:32
← slappymcfry left02:32
← mizu_no_oto left02:33
← maletor left02:33
→ Vampire0_ joined02:37
→ neanderslob joined02:38
→ cyphase_ joined02:39
→ bennyZ joined02:39
→ Sucks joined02:40
← Vampire0 left02:40
cyphase_ → cyphase02:40
← a_thakur left02:41
← drodger left02:41
← pks left02:42
→ infernix joined02:44
→ sssilver joined02:46
← cmosguy left02:46
← bennyZ left02:46
→ pks_ joined02:47
→ Rodya_ joined02:47
← blackwind_123 left02:48
→ drodger joined02:48
← Midoshi27 left02:48
→ blackwind_123 joined02:50
← harish_ left02:50
→ harish joined02:50
← harish left02:51
→ harish joined02:51
→ clemf joined02:53
← neanderslob left02:53
← user083 left02:53
→ neanderslob joined02:53
← kn-928 left02:54
← eletuchy left02:58
← clemf left02:59
→ a_thakur joined03:00
← Rodya_ left03:02
← staticshock left03:03
→ gsingh joined03:04
→ kn-928 joined03:04
→ Rodya_ joined03:06
→ Goplat joined03:06
← gsingh left03:07
← bollullera left03:07
← Ahmed90 left03:10
→ cagedwisdom joined03:10
← _leb left03:11
← oonuma left03:11
← sssilver left03:13
→ espindola joined03:14
→ staticshock joined03:14
← cagedwisdom left03:15
→ sssilver joined03:15
→ oonuma joined03:15
← nydel07 left03:16
← d4rklit3 left03:16
← Rodya_ left03:18
→ Rodya_ joined03:18
← espindola left03:18
← a_thakur left03:20
← Rodya_ left03:20
← Noldorin left03:21
→ Rodya_ joined03:22
← Sucks left03:22
← staticshock left03:22
← chachasmooth left03:23
→ chachasmooth joined03:23
← kn-928 left03:26
→ bhavik joined03:26
→ cagedwisdom joined03:29
← lolmac left03:31
← t-mart_ left03:31
← sssilver left03:32
← Rodya_ left03:32
→ modocache joined03:32
→ lolmac joined03:34
← nemix left03:34
→ nemix joined03:34
← gfixler1 left03:35
→ citizen-stig joined03:35
← nemix left03:35
→ Dougie187 joined03:35
→ nemix joined03:36
→ eletuchy joined03:36
→ nemix_ joined03:38
← lolmac left03:38
← LeBlaaanc left03:39
→ mehola joined03:39
→ t-mart joined03:39
← citizen-stig left03:39
← nemix left03:41
← oonuma left03:45
→ lolmac joined03:47
→ nettoweb joined03:50
← D-Boy left03:50
← DJ_Spies left03:50
← eletuchy left03:51
← lolmac left03:51
→ jonmorehouse joined03:51
→ kadoban joined03:52
← sesquipedalian left03:53
← harish left03:54
→ harish joined03:55
→ lolmac joined03:58
→ Rodya_ joined04:00
→ jottr joined04:00
→ daito joined04:01
← Sasazuka__ left04:02
← jottr_ left04:03
→ kfoonamalik joined04:03
← Rodya_ left04:04
→ eletuchy joined04:05
→ drbean joined04:05
← daito left04:06
← fscala left04:06
← drbean left04:07
→ drbean joined04:08
← ribas left04:09
→ fscala joined04:10
→ drbean_ joined04:11
→ D-Boy joined04:11
→ veebull_ joined04:12
← drbean left04:13
→ drbean- joined04:13
← drbean- left04:14
→ espindola joined04:14
→ Rodya_ joined04:15
← xlegoman left04:15
← drbean_ left04:17
← lolmac left04:17
← tang^ left04:18
→ staticshock joined04:18
← espindola left04:19
→ nilsi joined04:20
→ lolmac joined04:21
← harish left04:22
← staticshock left04:23
→ Midoshi27 joined04:23
← boombatower left04:23
→ drbean joined04:25
← drbean left04:25
← nettoweb left04:25
← joufflu left04:27
← Aerosonic left04:27
→ Sasazuka joined04:28
→ fracting joined04:29
→ Lyqyd_ joined04:30
→ sssilver joined04:30
→ jeffreylevesque joined04:32
← Lyqyd left04:32
← Lyqyd_ left04:32
→ Lyqyd joined04:33
← gtristan left04:33
← fracting left04:35
→ leprechau joined04:37
→ Lor_ joined04:39
← knownasilya left04:40
← Lor_ left04:40
← eletuchy left04:42
← kfoonamalik left04:42
→ treaki_ joined04:43
← waspinator left04:43
→ a_thakur joined04:43
← botevoker left04:43
← buzzLightBeer left04:46
→ buzzLightBeer joined04:46
← Rodya_ left04:46
← treaki left04:47
→ fracting joined04:47
← roygbiv left04:50
← jonmorehouse left04:52
← ericvw left04:52
→ latrommi joined04:55
→ Limes_ joined04:56
→ LeBlaaanc joined04:56
← [BNC]WizJin left04:56
← nilsi left04:57
→ WizJin joined04:58
← nickthetait left04:58
→ Rodya_ joined04:59
→ tristanp_ joined05:00
← tristanp left05:01
← Limes_ left05:02
← Rodya_ left05:03
← PtxDK left05:05
→ PtxDK joined05:05
→ safe joined05:06
→ jottr_ joined05:08
→ raijin joined05:10
→ swordonly joined05:11
← jottr left05:11
← madewokherd left05:13
→ espindola joined05:15
→ ramsub07 joined05:15
→ bahamut24_ joined05:18
← LeBlaaanc left05:18
→ LeBlaaanc joined05:19
→ staticshock joined05:19
← bahamut24 left05:20
→ gtristan joined05:20
← akiva left05:20
→ botevoker joined05:20
← espindola left05:20
→ harish joined05:24
← staticshock left05:24
→ citizen-stig joined05:24
← Domhack left05:25
→ Domhack joined05:25
← fracting left05:28
← citizen-stig left05:29
→ nnyk_ joined05:31
→ GT4066 joined05:32
→ ik__ joined05:36
ik__ suggestions on mergetool for git on rhel?05:36
preaction vim05:39
→ nilsi joined05:39
← Cabanossi left05:40
← jottr_ left05:41
→ Cabanossi joined05:42
ik__ preaction: well. that I need to learn.05:42
→ eletuchy joined05:42
preaction then whatever editor you use05:42
ik__ preaction: on windows I'd used diffmerge. couldn't find the same for rhel05:43
preaction do you not have a text editor?05:43
ik__ preaction: I do.05:43
preaction then use that05:43
and we're the only two talking, so you don't need to use my name every time05:43
ik__ okay.05:45
themill preaction: meld and kdiff3 are two commonly used ones if you want the 3-panel interface05:45
preaction themill: what?05:46
themill err... ik__ ^^05:46
ik__ themill: kdiff3; I didn't find that for rhel or I didn't search enough05:46
← eletuchy left05:47
→ daito joined05:47
→ fracting joined05:49
→ moobee joined05:49
gitinfo set mode: +v05:49
← daito left05:51
← radsy left05:52
← arooni left05:54
← ik__ left05:54
→ silentz0r joined06:00
→ phaleth joined06:01
← moobee left06:01
→ dineshp joined06:03
→ Rodya_ joined06:04
dineshp I used git format-patch to generate patch files and used git send-email to send the patch. How do I apply the patch using git am? How can i access the email in mbox format to apply the patch from the termainal?06:05
*terminal06:05
← eka left06:05
→ ayaz joined06:06
Seveas dineshp: that depends on your mail client. e.g. in mutt I'd tag them and ;|git am06:06
dineshp i use the gmail through the browser. is there any way to do that through the browser?06:07
any alternatives?06:07
← Rodya_ left06:09
Seveas use the 'show original' function and save that to a file06:09
← d0nn1e left06:11
→ emPi joined06:12
→ d0nn1e joined06:12
→ howdoi joined06:14
← fracting left06:15
← dineshp left06:15
→ espindola joined06:16
← a_thakur left06:16
→ a_thakur_ joined06:16
← nilsi left06:16
← bhavik left06:19
← GT4066 left06:19
← Gamecubic left06:19
→ staticshock joined06:20
← espindola left06:20
← leprechau left06:20
→ MrWoohoo joined06:22
← PryMar56 left06:22
← drawkula left06:23
→ drupald joined06:23
→ intrigueD joined06:24
← staticshock left06:25
← drupald_ left06:25
→ fracting joined06:29
→ sauvin joined06:30
← HanClinto left06:34
← LeBlaaanc left06:35
→ subhojit777 joined06:35
→ sargas joined06:36
→ drawkula joined06:37
→ leprechau joined06:37
← sdothum left06:37
→ isxek joined06:38
→ Silenced joined06:40
← Silenced left06:41
→ Silenced joined06:41
→ nilsi joined06:41
← chris_wot left06:42
← ToBeCloud left06:44
→ eletuchy joined06:44
← kadoban left06:48
← a_thakur_ left06:48
← eletuchy left06:49
→ cyan__ joined06:49
← botevoker left06:49
← mitzip left06:57
→ muthu joined06:57
→ mitzip_ joined06:58
← sssilver left06:58
→ slayerjain joined06:59
→ mwhooker joined07:01
← sargas left07:02
→ skystar84 joined07:02
← mitzip_ left07:03
→ Rodya_ joined07:05
← intrigueD left07:08
← mwhooker left07:08
→ mitzip joined07:08
← Rodya_ left07:09
← phaleth left07:11
→ polyidus joined07:11
→ LucaTM joined07:12
→ citizen-stig joined07:13
→ a_thakur joined07:15
← Lyqyd left07:16
→ a_thakur_ joined07:16
→ freimatz joined07:16
← subhojit777 left07:16
→ espindola joined07:17
← presto left07:17
→ a_thaku__ joined07:17
← citizen-stig left07:17
→ presto joined07:18
← presto left07:18
→ presto joined07:19
← a_thakur left07:19
→ a_thak___ joined07:19
← a_thakur_ left07:21
← albel727 left07:21
← espindola left07:21
← a_thaku__ left07:22
← Insti left07:22
→ staticshock joined07:22
← a_thak___ left07:23
→ a_thakur joined07:23
→ rubyonrailed joined07:23
← presto left07:24
→ eka joined07:25
→ eletuchy joined07:27
← staticshock left07:27
→ albel727 joined07:28
→ freimatz3 joined07:29
← Peuc left07:31
← freimatz left07:31
← latrommi left07:31
→ freimatz joined07:32
→ muthu_ joined07:32
→ latrommi joined07:33
← muthu left07:33
← eka left07:33
→ Peuc joined07:33
← eletuchy left07:34
← gtristan left07:35
→ adamm joined07:36
→ tvw joined07:40
→ eletuchy joined07:41
← diogenese left07:45
← a_thakur left07:46
pks_ → pks07:46
← eletuchy left07:46
← CrypticGator left07:47
→ daito joined07:48
→ diogenese joined07:49
→ Corosauce joined07:50
← polyidus left07:51
← Corosus left07:51
← Silenced left07:52
← daito left07:52
← ramsub07 left07:53
← dsdeiz left07:58
→ ramsub07 joined07:58
← thiago left07:58
→ polyidus joined07:58
← veebull_ left08:00
→ WayToDoor joined08:01
← cyan__ left08:01
← ramsub07 left08:03
→ citizen-stig joined08:03
→ pantsman- joined08:03
→ sbasso joined08:03
← Wetmelon left08:03
→ radsy joined08:05
→ elastix joined08:05
← polyidus left08:05
→ Rodya_ joined08:06
← citizen-stig left08:08
→ weox joined08:08
→ Macaveli joined08:10
← safe left08:10
← Rodya_ left08:11
← tvw left08:12
← kam270 left08:12
← sbasso left08:14
→ sbasso joined08:15
→ espindola joined08:18
→ kn-928 joined08:18
← sbasso left08:19
← strayPuppy left08:19
← Goplat left08:19
→ sbasso joined08:20
← kn-928 left08:20
← fscala left08:21
→ cyan__ joined08:22
→ fscala joined08:22
← espindola left08:22
→ staticshock joined08:23
→ nitin_ joined08:23
← nnyk_ left08:24
← neanderslob left08:24
→ neanderslob joined08:24
← modocache left08:27
← staticshock left08:28
← sbasso left08:28
→ ugjka joined08:29
→ sbasso joined08:29
← neanderslob left08:30
→ neanderslob joined08:31
← sbasso left08:31
→ armyriad joined08:32
← neanderslob left08:32
→ neanderslob joined08:34
→ Silenced joined08:36
← Silenced left08:36
→ Silenced joined08:36
← silentz0r left08:37
← skystar84 left08:38
← nitin_ left08:39
← neanderslob left08:40
→ sbasso joined08:42
→ eletuchy joined08:42
→ ramsub07 joined08:44
→ botevoker joined08:46
← eletuchy left08:47
→ eletuchy joined08:47
← lindenle_ left08:48
← eletuchy left08:49
→ a_thakur joined08:49
→ subhojit777 joined08:50
→ t0by joined08:51
→ mayankgupta27 joined08:51
→ eletuchy joined08:52
→ neanderslob_ joined08:54
← diogenese left08:54
← neanderslob_ left08:54
→ neanderslob joined08:54
→ _tk_ joined08:55
→ ShadeS joined08:55
ShadeS hey08:55
if i have a repo08:56
and i was pushing from another machine08:56
osse No need to brag about it08:56
ShadeS how do I get those newest changes on this other machine08:56
→ bodom joined08:56
ShadeS that already has a less up to date repo08:56
← realz left08:57
osse It sounds like you want git pull, or git fetch08:57
bodom Hi there! I am following an open source project with a personal fork. I've always been using a pull/push/merge workflow. This time, I would like to merge the upstream branch BUT skip a commit. Is it possible?08:57
← jaafar left08:58
→ mayankgupta1996 joined08:59
osse bodom: No. You can either merge and then use git revert afterwards, or manually intervene with the merge process and edit the result to your liking08:59
→ FunkyAss joined08:59
← ramsub07 left08:59
→ nnyk_ joined09:01
bodom osse: Mhhh... if a do a revert, will it look exactly as if it was never modified? By example, let's say file 'a.c' has been completely reindented in that commit. If i do a revert and then merge the recerted branch, and i also have modified 'a.c', will i get a conflict?09:02
osse bodom: you have to merge and then revert09:02
← mayankgupta27 left09:03
osse .. .you mean skip one of the upstream commits right?09:03
bodom osse: yep09:03
← rubyonrailed left09:04
osse you cannot revert a commit that's not in your repo09:04
bodom i could then 1. check-out upstream up to the "bad" commit, 2. revert it, 3. pull subsequent commits from upstream, 4. merge this branch with my repo. Could it work?09:05
osse just to be clear, by revert I specifically mean man git-revert09:06
gitinfo the git-revert manpage is available at http://jk.gs/git-revert.html09:06
→ jbitdrop joined09:06
→ digidog joined09:06
← nnyk_ left09:07
osse your suggestion won't work because step 3. after you revert you cannot pull, because you've effectively edited the history09:07
→ Rodya_ joined09:07
← mayankgupta1996 left09:07
→ mayankgupta1996 joined09:07
bodom yes, but my doubt now is: if i have commit A and do commit B that reverts A. When i merge with branch C that conflict with A, will i still get a conflict even if i reverted A?09:07
in other words, is the conflict computed based on the actual status or on the whole history?09:08
← slayerjain left09:09
osse i didn't get the first question. the answer to the second one is no.09:09
ShadeS the git fetch didn't quite do it09:10
something must have not been pushed last minute09:10
;(09:10
i'll have to check on it in the morning09:10
osse Hmm, so I guess the answer to the first question is no to, but I don't see how it applies since this commit A is upstream, not yours09:10
← digidog left09:10
bodom the problem is that commit A conflicts heavily with my branch09:11
that's why i want to "skip" it09:11
osse ah09:11
bodom: create a local branch that corresponds to the upstream one. Do the git revert there, then merge this local copy into your own branch rather than the upstream directly09:12
← Rodya_ left09:12
bodom osse: I'm trying it, thank you09:12
osse maybe that's the idea you had in mind all along and I didn't understand it :p09:13
bodom honestly, yep. But i couldn't explain myself :)09:13
← joki left09:14
→ jost joined09:14
→ Manikandan joined09:14
→ maner joined09:14
osse heh09:15
← a_thakur left09:16
← cyan__ left09:17
← fracting left09:18
→ moobee joined09:18
gitinfo set mode: +v09:18
→ [Brain] joined09:18
→ espindola joined09:18
→ joki joined09:19
← elastix left09:21
← subhojit777 left09:22
→ kam270 joined09:22
← dreiss left09:22
← espindola left09:22
→ staticshock joined09:24
→ Neico joined09:25
← sbasso left09:27
← staticshock left09:28
← Sasazuka left09:30
→ quadrupel joined09:31
→ nnyk_ joined09:32
→ subhojit777 joined09:39
← synchronous left09:40
← bdesmet left09:40
→ synchronous joined09:41
← TreyHarris left09:41
← Manikandan left09:42
→ cyan__ joined09:42
→ biertie joined09:43
→ buffal0 joined09:45
→ TreyHarris joined09:45
← nnyk_ left09:48
→ daito joined09:48
→ lindenle joined09:49
→ citizen-stig joined09:52
→ wrouesnel2 joined09:53
← daito left09:53
← lindenle left09:53
← deepy left09:54
→ deepy joined09:54
→ flavi0 joined09:54
← _tk_ left09:54
← citizen-stig left09:56
→ irc-ape joined09:57
→ mdw joined09:57
← howdoi left09:58
→ intrigueD joined09:59
← irc-ape left10:02
→ intellix joined10:03
← wrouesnel2 left10:04
→ rubyonrailed joined10:05
→ HelloAtMega joined10:05
→ leeN joined10:06
→ TomyLobo joined10:07
→ Rodya_ joined10:08
← rubyonrailed left10:09
← mdw left10:11
← weox left10:13
← Rodya_ left10:14
→ nnyk_ joined10:17
← josuebrunel left10:19
→ espindola joined10:19
Dynetrekk1 how can I use an external program instead of "diff"?10:20
← cyphase left10:20
Dynetrekk1 git ndiff = ... in some config file?10:20
→ mdw joined10:22
← espindola left10:24
→ staticshock joined10:24
→ dsdeiz joined10:25
← staticshock left10:29
← isxek left10:36
← neanderslob left10:36
→ toogley joined10:38
→ a_thakur joined10:38
← mdw left10:40
osse Dynetrekk1: export GIT_EXTERNAL_DIFF=mydiffrofl10:41
→ fees joined10:41
→ x10an14 joined10:42
x10an14 Hi! Does anyone here have an idea/suggestion for how I could "smartly" share a subfolder (and all commits/history of the files inside) of one git repo, to another git repo?10:42
→ codeman joined10:43
← Silenced left10:44
→ slappymcfry joined10:46
→ Wetmelon joined10:47
→ Glooomy joined10:47
→ weox joined10:48
→ nuge joined10:53
← ugjka left10:54
→ Silenced joined10:55
← blackwind_123 left10:55
← intrigueD left10:56
← aspiers left10:56
→ blackwind_123 joined10:57
→ aspiers joined10:57
→ elastix joined10:58
VarunAgw x10an14: I'm not expert, but I think you can use Git Submodules for this.10:59
→ PHPanos joined11:00
← jbitdrop left11:01
← Atm0spher1c left11:03
← a_thakur left11:04
← radsy left11:04
→ rubyonrailed joined11:05
→ z3r000 joined11:06
bodom osse: it took me a while but it worked, thank you11:06
osse bodom: if i understanding it correctly all you did was what you had come up with yourself, so... you're welcome I guess? :p11:07
→ pwnz0r joined11:07
bodom osse: i had a good consulting anyway ;)11:08
osse bodom: true. what's your billing address?11:08
bodom osse: i meant a good and free consulting11:08
:D11:08
but i can send you a postcard if you like to :D11:09
→ Rodya_ joined11:10
← rubyonrailed left11:11
→ ugjka joined11:12
osse heh11:13
← subhojit777 left11:13
← Rodya_ left11:15
→ Balliad joined11:16
← mayankgupta1996 left11:16
→ Balliad_ joined11:17
→ mayankgupta1996 joined11:18
← Wetmelon left11:18
→ espindola joined11:20
← Balliad left11:20
← Balliad_ left11:22
← pwnz0r left11:23
← espindola left11:24
→ staticshock joined11:25
→ Limes_ joined11:26
→ raininja joined11:26
← raijin left11:27
→ dineshp joined11:28
← staticshock left11:30
← mayankgupta1996 left11:30
← kam270 left11:32
← ayaz left11:32
→ nwkj86 joined11:34
→ a_thakur joined11:38
← FunkyAss left11:39
→ citizen-stig joined11:39
→ mayankgupta1996 joined11:39
← PHPanos left11:41
← mehola left11:42
← infernix left11:43
→ kam270 joined11:44
→ rolha joined11:44
rolha hi everyone11:45
← mayankgupta1996 left11:47
rolha I'm a bit new to git, so against good practices I kept on working on a single branch on something "tentative". I now wanted to go back to a commit I did 2 weeks ago, but without loosing all the work after that.11:48
→ lohfu joined11:49
rolha I thought of doing it like so: checkout the old commit, create a branch with it, make it master and delete the old master (if that makes sense)11:49
cbreak rolha: git checkout -b newbranchname @{two.weeks.ago}11:49
→ daito joined11:49
rolha but then I'll loose all the previous work11:49
osse rolha: create a new branch where you are now, *then* do what you described11:50
rolha great! thank you!11:50
cbreak just create a new branch from the commit you jump to11:50
the current work is already on a branch11:50
just leave it alone11:50
rolha ok, cool. thanks11:50
→ lindenle joined11:51
lohfu hi. this is a very weird question. i want to do the following to correctly show the progression of a module. On our initial commit i only added a README.md. On the second commit, a coder added a file, say "index.js". Now i want to edit the initial commit to include an earlier version of index.js, which should then be modified instead of added in the second commit. I have tried `git rebase -i --root`, added the11:51
file but calling `git rebase --continue` throws a both added error.11:51
← buffal0 left11:51
cbreak lohfu: git rebase to the first commit11:52
then commit --amend it11:52
then continue, and resolve the conflict11:52
→ MattMaker joined11:53
cbreak resolving should be trivial, git checkout --theirs -- filename11:53
osse rolha: the flaw in your logic was that you deleted the old master before having a difference reference to it.11:53
← daito left11:54
osse but yeah it's just as easy to just leave it alone11:54
lohfu cbreak: but how do i resolve the conflict? as i said, the conflict is 'both added'. if i `git add index.js`, then `git commit --amend` i am still amending the initial commit.11:54
cbreak rolha: if you don't like branch names, just change them. Git allows renaming branches11:54
lohfu: you will not get the conflict on commit --amend11:55
← cagedwisdom left11:55
cbreak you will get it when you rebase --continue11:55
rolha osse, cbreak : yeah, thanks. I don't mind the "old" branch hanging around. it's just for reference, I don't plan on merging it or anything11:55
cbreak run git checkout --theirs, as I said above, to resolve it11:55
lohfu `git checkout --theirs index.js` and then `git commit --amend --no-edit` gives me "error: commit is not possible because you have unmerged files."11:57
← lindenle left11:57
lohfu also, i think i want --ours.11:57
← z3r000 left11:57
→ delight joined12:00
cbreak lohfu: no, NO12:01
why commit --amend?12:01
lohfu: don't you read the output of git?12:01
git rebase --continue12:01
→ Juzzika joined12:01
cbreak you'll have to git add after the git checkout to mark it as resolved12:01
← dineshp left12:03
→ SpNk- joined12:03
← SpNk- left12:04
lohfu ok that removed the second commit. should i mark 'edit' on both the commits?12:05
→ ramsub07 joined12:05
cbreak lohfu: no12:05
edit the first one, pick the rest12:05
lohfu: did you use --ours or --theirs?12:06
you probably used --ours12:06
so the commit was pointless and dropped12:06
if you had used --theirs, the commit would have persisted, changing the file to what it originally was in their commit12:07
rolha worked like a charm, back in business :)12:07
→ rubyonrailed joined12:07
lohfu cbreak: oh my god, i have not understood how rebase works before. thank you!12:08
cbreak np12:08
← bodom left12:08
Vampire0_ → Vampire012:09
← netj left12:11
→ netj joined12:11
→ Rodya_ joined12:11
← rubyonrailed left12:12
← ramsub07 left12:13
→ ayaz joined12:15
→ PHPanos joined12:16
← Rodya_ left12:16
→ e66 joined12:17
→ infernix joined12:17
← freimatz left12:18
→ Balliad joined12:18
→ sgambino joined12:19
→ espindola joined12:21
← sgambino left12:22
← Balliad left12:22
← nuge left12:22
→ freimatz joined12:23
→ nydel07 joined12:24
← HelloAtMega left12:24
← espindola left12:25
→ staticshock joined12:26
← freimatz3 left12:26
i7c I'm a bit surprised that config --global won't consider included config files.12:27
But other than that there is no difference?12:27
→ cyphase joined12:27
← cyphase left12:27
→ cyphase joined12:27
→ sbasso joined12:28
x10an14 VarunAgw: Thanks for your suggestion, I'll look it up =)12:28
i7c I track my dotfiles with git and want to put the [user] section in a separate file because I use different emails at work and at home obviously.12:28
← dsdeiz left12:29
← a3Dman left12:30
← staticshock left12:31
← sbasso left12:32
→ ramsub07 joined12:32
← fscala left12:32
→ David1977 joined12:32
← flavi0 left12:33
→ PCatinean joined12:34
→ Dragooon joined12:35
→ flavi0 joined12:35
← moobee left12:35
→ fscala joined12:35
→ a3Dman joined12:36
← ramsub07 left12:36
→ slayerjain joined12:38
→ ramsub07 joined12:39
→ Balliad joined12:39
← MattMaker left12:41
← Juzzika left12:42
→ mayankgupta1996 joined12:43
→ Balliad_ joined12:44
← Balliad left12:46
→ zarubin joined12:47
→ Juzzika joined12:47
← ayaz left12:48
→ mdw joined12:51
→ simonlinj joined12:51
→ buffal0 joined12:53
← citizen-stig left12:54
← Silenced left12:55
→ lukehaas joined12:57
← buffal0 left12:57
← lukehaas left12:57
→ fstd_ joined13:00
← a_thakur left13:00
→ synthroid joined13:00
→ MattMaker joined13:01
← WayToDoor left13:02
fkm It it possible to clone a specific tag from a specific branch via a Git URI? Something like: .git#branch,tag13:02
← David1977 left13:02
← Limes_ left13:03
← fstd left13:03
fstd_ → fstd13:03
← lolmac left13:04
← Macaveli left13:05
← ramsub07 left13:05
→ Macaveli joined13:07
← robogoat left13:07
→ lolmac joined13:07
→ dimi1947 joined13:08
cbreak no13:08
tags are not on branches13:08
tags just are13:08
→ rubyonrailed joined13:08
→ dineshp joined13:10
← PHPanos left13:10
→ subhojit777 joined13:11
→ doener joined13:11
← rubyonrailed left13:12
→ Rodya_ joined13:13
→ sq-one joined13:13
← botevoker left13:14
← Macaveli left13:14
→ botevoker joined13:15
← mdw left13:17
→ hiroki joined13:17
← MattMaker left13:17
← Rodya_ left13:18
→ mdw joined13:20
← Dougie187 left13:20
→ espindola joined13:21
fkm Ok. Thank you cbreak!13:22
→ Juzzika_ joined13:24
← espindola left13:26
→ staticshock joined13:27
← Juzzika left13:27
← eletuchy left13:27
→ ToBeCloud joined13:28
← jason__ left13:28
← intellix left13:29
→ ramsub07 joined13:29
← lolmac left13:29
→ nettoweb joined13:30
→ sdothum joined13:31
→ ncd|leeN joined13:31
← staticshock left13:31
→ raven-au_ joined13:32
→ MattMaker joined13:32
→ lolmac joined13:33
← leeN left13:34
← MattMaker left13:34
← raven-au left13:35
raven-au_ → raven-au13:35
→ daito joined13:35
← Juzzika_ left13:35
→ mehola joined13:37
← daito left13:40
← mehola left13:41
← mayankgupta1996 left13:43
→ mezod joined13:43
→ MattMaker joined13:43
→ espindola joined13:44
← MattMaker left13:45
→ mayankgupta1996 joined13:46
← Balliad_ left13:46
→ daito joined13:46
← espindola left13:47
← elastix left13:47
← codeman left13:47
← emPi left13:47
← lolmac left13:48
gitinfo set mode: +v13:48
← sdothum left13:48
→ emPi joined13:49
← dineshp left13:49
→ sdothum joined13:50
← daito left13:52
→ mmlb joined13:55
→ intellix joined13:57
→ wiched joined13:57
→ a_thakur joined13:59
→ a_thakur_ joined14:01
→ jason__ joined14:01
← ramsub07 left14:03
→ josuebrunel joined14:03
← josuebrunel left14:03
→ tgunr joined14:04
← a_thakur left14:04
← a3Dman left14:04
← nwkj86 left14:04
→ citizen-stig joined14:05
→ ramsub07 joined14:06
→ HanClinto joined14:06
← infernix left14:08
→ rubyonrailed joined14:09
← wiched left14:09
← citizen-stig left14:10
← TomyLobo left14:11
← Glooomy left14:11
→ Rodya_ joined14:14
← joako left14:14
← rubyonrailed left14:14
→ joako joined14:14
← mdw left14:15
→ MattMaker joined14:15
→ dineshp joined14:16
← nnyk_ left14:17
→ nnyk_ joined14:19
← Rodya_ left14:19
← MattMaker left14:20
→ a3Dman joined14:23
→ robogoat joined14:23
→ staticshock joined14:27
→ eletuchy joined14:28
→ spinningarrow joined14:28
→ codeman joined14:28
→ Rodya_ joined14:29
← ramsub07 left14:30
← raininja left14:31
← staticshock left14:32
← tobias left14:32
← eletuchy left14:32
← Rodya_ left14:33
→ King_Hual joined14:34
← King_Hual left14:34
→ King_Hual joined14:34
→ Gamecubic joined14:35
→ grayjoc joined14:36
← dineshp left14:36
→ ramsub07 joined14:38
→ mehola joined14:38
← a3Dman left14:39
→ sgambino joined14:43
← mehola left14:43
← subhojit777 left14:44
→ sargas joined14:46
→ a3Dman joined14:47
← a_thakur_ left14:48
→ dreiss joined14:50
← botevoker left14:50
← nnyk_ left14:50
→ aranea joined14:51
← grayjoc left14:52
← stonerfish left14:53
← woxidu left14:53
→ mellernoia joined14:54
→ nnyk_ joined14:54
→ The_Phoenix joined14:54
→ rubyonrailed joined14:55
← nettoweb left14:56
→ troglotit joined14:57
← poi left14:58
← simonlinj left14:58
→ simonlinj joined14:58
← slappymcfry left14:58
← nnyk_ left15:02
← troglotit left15:03
→ CEnnis91 joined15:05
→ lolmac joined15:06
→ gtristan joined15:07
← mayankgupta1996 left15:07
← simonlinj left15:07
← gtristan left15:08
← njbair left15:09
← rubyonrailed left15:09
→ subhojit777 joined15:10
→ fracting joined15:10
← tristanp_ left15:11
→ tristanp joined15:11
→ mohabaks joined15:11
← ramsub07 left15:11
→ mayankgupta1996 joined15:13
→ njbair joined15:14
← s00pcan left15:15
← fracting left15:17
← causasui left15:19
← sargas left15:21
← dreiss left15:21
→ nbha joined15:21
← [Brain] left15:22
← Gianormagantrous left15:22
→ rubyonrailed joined15:23
← felixjet left15:24
→ zadock joined15:25
← sq-one left15:26
→ tobias joined15:27
→ aard_ joined15:27
tobias → Guest8083515:27
→ staticshock joined15:28
→ fracting joined15:29
→ Balliad joined15:29
← rubyonrailed left15:30
→ nwkj86 joined15:31
← subhojit777 left15:31
→ simonlinj joined15:32
← spinningarrow left15:33
← staticshock left15:33
→ ivo_ joined15:33
← ivo_ left15:33
→ ivo_ joined15:33
→ paddyez joined15:34
← paddyez left15:34
→ paddyez joined15:34
→ diegoaguilar joined15:35
← codeman left15:36
→ subhojit777 joined15:37
→ a_thakur joined15:38
← Balliad left15:39
→ mehola joined15:40
← Kulrak left15:40
→ Gianormagantrous joined15:40
← mellernoia left15:40
← a_thakur left15:41
→ jaafar joined15:41
→ a_thakur joined15:41
← doener left15:44
→ safe joined15:44
← mehola left15:44
→ basiclaser joined15:45
← brandonw left15:46
← nbha left15:47
← duderonomy left15:48
→ text1 joined15:48
→ brandonw joined15:48
→ daito joined15:48
→ nardev joined15:48
← safe left15:51
→ mizu_no_oto joined15:52
→ s00pcan joined15:52
← daito left15:53
→ iyoj joined15:54
→ SimonNa joined15:54
→ citizen-stig joined15:54
→ Kulrak joined15:54
← Kulrak left15:54
→ Kulrak joined15:54
← SimonNa left15:54
→ Balliad joined15:54
→ duderono_ joined15:54
← mohabaks left15:55
→ nettoweb joined15:56
← mizu_no_oto left15:57
→ mdw joined15:57
→ whitby joined15:58
→ bollullera joined15:58
← citizen-stig left15:59
← x10an14 left15:59
← nardev left15:59
→ nfk joined16:01
→ Macaveli joined16:02
→ madewokherd joined16:04
→ howdoi joined16:06
→ jimmyeatworld joined16:09
← iyoj left16:09
→ _kfpratt joined16:10
→ IlNominePatre joined16:12
→ Cassiopaya joined16:12
→ infernix joined16:13
← kfpratt left16:13
→ dagi joined16:14
→ Rodya_ joined16:16
→ lindenle joined16:19
← Macaveli left16:20
← muthu_ left16:20
← skasturi left16:21
→ davisonio joined16:23
← lindenle left16:24
→ waspinator joined16:24
← lolmac left16:25
→ kfoonamalik joined16:26
→ felixjet joined16:28
→ staticshock joined16:29
→ eletuchy joined16:29
→ raijin joined16:30
← a_thakur left16:30
→ a_thakur joined16:32
← staticshock left16:34
← eletuchy left16:34
→ glaux joined16:34
→ glaux_ joined16:36
→ sesquipedalian joined16:38
→ lolmac joined16:38
→ mizu_no_oto joined16:38
→ InfoTest joined16:40
→ mehola joined16:40
← davisonio left16:42
→ davisonio joined16:42
← mayankgupta1996 left16:42
← InfoTest left16:42
← glaux_ left16:44
← pacbard left16:45
← mehola left16:45
← jost left16:45
→ Tryop88 joined16:46
→ jost joined16:47
← fscala left16:47
→ fscala joined16:48
→ thiago joined16:48
← glaux left16:49
davisonio → NewNick16:50
NewNick → davisonio16:50
→ ramsub07 joined16:52
← kfoonamalik left16:53
→ Timvde joined16:53
← fracting left16:53
→ dsfreak93 joined16:54
← jost left16:55
← The_Phoenix left16:55
→ LeBlaaanc joined16:55
→ mablae_ joined16:57
← mablae left16:58
← daynaskully left17:00
→ GT4066 joined17:02
→ Macaveli joined17:02
→ Ahmed90 joined17:02
→ Motoko joined17:03
← weox left17:03
→ Goplat joined17:04
← a_thakur left17:04
→ tlaxkit joined17:04
→ kfoonamalik joined17:05
← jason__ left17:06
→ fedexo joined17:07
← lolmac left17:08
← nemix_ left17:09
← dsfreak93 left17:11
→ fracting joined17:11
→ nemix_ joined17:13
→ intrigueD joined17:13
← kaiza left17:13
→ presto joined17:14
← CEnnis91 left17:15
→ The_Phoenix joined17:17
← Rodya_ left17:18
→ Jackneill joined17:19
→ Limes_ joined17:21
→ lolmac joined17:21
→ Rodya_ joined17:23
→ skasturi joined17:24
← diegoaguilar left17:24
→ Sucks joined17:26
← Macaveli left17:26
→ averell joined17:27
← lolmac left17:28
← nwkj86 left17:28
← mizu_no_oto left17:29
→ nwkj86 joined17:30
→ staticshock joined17:30
→ T7rees joined17:30
→ lolmac joined17:31
→ dreiss joined17:32
→ kn-928 joined17:33
← staticshock left17:34
← Guest25536 left17:34
← davisonio left17:35
← kfoonamalik left17:35
← intrigueD left17:36
→ woxidu joined17:37
← GT4066 left17:37
← lolmac left17:37
← nilsi left17:38
→ Silenced joined17:38
← Silenced left17:39
→ Silenced joined17:39
→ davisonio joined17:40
→ diegoaguilar joined17:40
→ lolmac joined17:41
→ mizu_no_oto joined17:41
→ Guest4980 joined17:41
→ mehola joined17:41
→ durham joined17:42
→ diegoviola joined17:42
→ citizen-stig joined17:43
← durham left17:43
← intellix left17:44
→ durham joined17:44
→ HelloAtMega joined17:44
← lolmac left17:45
← mehola left17:46
← citizen-stig left17:47
→ silentz0r joined17:47
→ Lyqyd joined17:48
← durham left17:48
→ durham joined17:48
← basiclaser left17:49
← durham left17:49
→ daito joined17:49
→ egeerardyn joined17:50
→ lolmac joined17:50
← qpdb left17:50
← raijin left17:50
→ muld joined17:52
← daito left17:54
→ muld25 joined17:55
→ qpdb joined17:55
→ sangy joined17:56
← Balliad left17:56
← woxidu left17:56
← muld left17:57
→ cdg joined17:58
← lolmac left17:58
← cdg left17:59
→ cdg joined18:00
→ staticshock joined18:01
→ GT4066 joined18:01
→ diogenese joined18:01
→ Noldorin joined18:03
← kn-928 left18:03
→ dhureen joined18:04
← muld25 left18:04
← sangy left18:06
→ lolmac joined18:06
← nemix_ left18:07
→ postsneakernet joined18:10
→ Glooomy joined18:10
← Goplat left18:11
→ Macaveli joined18:11
← Noldorin left18:12
← lolmac left18:14
← mdw left18:14
← dreiss left18:20
← LeBlaaanc left18:20
→ lindenle joined18:21
→ jason__ joined18:21
← Macaveli left18:23
← The_Phoenix left18:24
← lindenle left18:25
← ugjka left18:25
← jimmyeatworld left18:26
→ mohabaks joined18:28
→ Balliad joined18:28
← dhureen left18:29
← fees left18:33
→ Borkr joined18:34
← howdoi left18:38
→ hardenedapple joined18:39
→ ugjka joined18:40
→ daynaskully joined18:41
→ sangy joined18:41
→ italoacasas joined18:42
→ mehola joined18:42
← Sucks left18:45
→ lolmac joined18:46
→ Sucks joined18:46
→ dsfreak93 joined18:46
← mehola left18:47
← Midoshi27 left18:47
← davisonio left18:48
jason__ → jason23718:48
→ Midoshi27 joined18:48
← lolmac left18:50
← Tryop88 left18:52
→ ajf- joined18:53
← daynaskully left18:56
→ PryMar56 joined18:58
← Lyqyd left18:58
← ncd|leeN left18:59
→ daynaskully joined18:59
→ muld joined18:59
← e66 left19:01
← dsfreak93 left19:01
→ sssilver joined19:02
→ sanketdg joined19:02
→ jimmyeatworld joined19:03
→ citizen-stig joined19:06
→ Wetmelon joined19:06
← aard_ left19:07
← sanketdg left19:07
← cyan__ left19:07
← Midoshi27 left19:10
← ugjka left19:11
← delight left19:13
→ polyidus joined19:14
← jason237 left19:16
← dimi1947 left19:17
→ mdw joined19:18
comps_ → comps19:20
← quadrupel left19:22
← mohabaks left19:22
→ Midoshi27 joined19:22
← PCatinean left19:25
← Limes_ left19:26
← Glooomy left19:27
meloc_ How is it possible for `git worktree list` to list the same directory twice with two different branches?19:27
→ boombatower joined19:29
→ davisonio joined19:29
← sssilver left19:31
→ Kicer86 joined19:32
← maner left19:33
→ tomog999 joined19:34
meloc_ I'm nervous to do anything now19:35
← tomog9991 left19:37
→ MutantMahesh joined19:38
→ Mobutils joined19:40
→ delight joined19:40
→ jason237 joined19:40
← mizu_no_oto left19:41
→ Rynomster joined19:42
← Rynomster left19:42
→ Rynomster joined19:42
→ mehola joined19:43
← mdw left19:44
← Midoshi27 left19:45
← brandonw left19:46
← mehola left19:47
→ samw joined19:47
← Sucks left19:48
→ LeBlaaanc joined19:49
← stefanct left19:49
→ daito joined19:50
→ socketguru joined19:50
→ Sucks joined19:50
← LeBlaaanc left19:51
→ LeBlaaanc joined19:52
→ cdg_ joined19:53
← Mobutils left19:54
← daito left19:54
← Silenced left19:55
← muld left19:55
← Sucks left19:55
← samw left19:55
← Borkr left19:56
← cdg left19:57
← cdg_ left19:58
→ samw joined19:59
← LeBlaaanc left20:00
→ LeBlaaanc joined20:00
← LeBlaaanc left20:02
→ CEnnis91 joined20:02
→ LeBlaaanc joined20:02
→ kn-928 joined20:07
→ yereby joined20:08
← yereby left20:08
← samw left20:08
→ lukehaas joined20:10
← citizen-stig left20:10
Seveas first guess is that you manually removed a worktree and then recreated it with a different branch20:10
← lukehaas left20:11
Corosauce → Corosus20:11
← cyphase left20:11
← nettoweb left20:12
→ lolmac joined20:12
← swordonly left20:13
→ samw joined20:13
← ajf- left20:14
→ nettoweb joined20:14
→ encod3 joined20:16
← encod3 left20:16
→ jagob joined20:18
← zadock left20:18
→ star_prone joined20:19
← silentz0r left20:20
→ lindenle joined20:22
← samw left20:22
→ mdw joined20:22
← MutantMahesh left20:22
← diogenese left20:23
→ roygbiv joined20:23
← lolmac left20:23
← staticshock left20:24
← erin1983684 left20:24
← jason237 left20:24
→ cyphase joined20:25
← simonlinj left20:26
← polyidus left20:26
← lindenle left20:26
→ Midoshi27 joined20:27
→ samw joined20:27
← kn-928 left20:27
→ staticshock joined20:28
→ muld joined20:28
→ simonlinj joined20:28
← roygbiv left20:29
← punto left20:29
→ punto joined20:30
← samw left20:32
← Rodya_ left20:32
→ Sasazuka joined20:33
← mdw left20:34
→ mdw joined20:37
← tristanp left20:37
← mdw left20:37
→ mdw joined20:37
← Balliad left20:37
← muld left20:40
→ samw joined20:41
← diegoviola left20:41
← diegoaguilar left20:42
→ jaguarmagenta joined20:42
→ mehola joined20:44
→ phaleth joined20:44
→ woxidu joined20:46
← mehola left20:48
→ lolmac joined20:49
← simonlinj left20:51
← kfunk left20:52
→ Lyqyd joined20:53
← mdw left20:55
← egeerardyn left20:55
← jaafar left20:56
→ jeffmjack joined20:56
← mezod left20:56
← lolmac left20:57
← ramsub07 left20:57
→ brandonw joined20:57
→ jaafar joined20:58
← fscala left20:58
→ mehola joined20:59
→ fscala joined21:01
→ Balliad joined21:01
→ urda joined21:01
← synthroid left21:03
→ ramsub07 joined21:03
← samw left21:03
← staticshock left21:04
→ dsdeiz joined21:04
← mehola left21:06
← treehug88 left21:08
← urda left21:08
→ mischat joined21:08
→ samw joined21:08
→ urda joined21:08
→ Guest55 joined21:10
← punto left21:10
→ punto joined21:11
← aranea left21:12
← urda left21:12
→ Mobutils joined21:14
← ahel left21:14
→ staticshock joined21:14
→ cdg joined21:15
→ Limes_ joined21:17
← samw left21:17
→ mdw joined21:18
→ citizen-stig joined21:21
→ samw joined21:22
← Guest55 left21:24
→ mezod joined21:24
→ MattMaker joined21:25
← citizen-stig left21:26
→ lolmac joined21:27
→ elastix joined21:28
→ mehola joined21:29
→ vF3hNGxc47h8 joined21:29
← Mobutils left21:30
← nettoweb left21:31
← Balliad left21:31
→ citizen-stig joined21:32
→ zotherstupidguy joined21:32
→ Mobutils joined21:32
← zotherstupidguy left21:33
→ rolha_ joined21:34
← pantsman- left21:35
← samw left21:36
→ nettoweb joined21:37
← nettoweb left21:37
← Kicer86 left21:38
→ Sigfrid joined21:38
← staticshock left21:39
← kam270 left21:39
→ staticshock joined21:40
→ samw joined21:41
→ Tryop88 joined21:41
← lolmac left21:41
← elastix left21:41
← Samual left21:41
← davisonio left21:43
→ Balliad joined21:43
→ elastix joined21:43
→ lolmac joined21:44
→ WayToDoor joined21:44
→ egeerardyn joined21:44
← subhojit777 left21:45
← WayToDoor left21:45
→ polyidus joined21:45
→ WayToDoor joined21:46
→ hahuang65 joined21:46
→ jfelchner joined21:46
→ Samual joined21:46
→ muld joined21:49
→ jeremy___ joined21:49
← samw left21:50
← sdothum left21:51
→ daito joined21:51
← jeremy_c_ left21:51
→ sdothum joined21:53
← phaleth left21:53
← hardenedapple left21:54
← freimatz left21:54
→ samw joined21:54
→ nettoweb joined21:55
← daito left21:55
← lolmac left21:57
→ acetakwas joined21:57
← LucaTM left21:58
→ lolmac joined22:01
→ tristanp joined22:01
→ rubyonrailed joined22:03
→ trewe joined22:03
← samw left22:03
→ jaguarmagenta2 joined22:04
duderono_ → duderonomy22:04
→ stevenbenner joined22:07
← lolmac left22:08
← jaguarmagenta left22:08
→ samw joined22:08
← emPi left22:10
← rolha_ left22:11
→ jason237 joined22:11
→ rolha_ joined22:11
→ lolmac joined22:12
→ sssilver joined22:12
← samw left22:13
→ intrigueD joined22:13
← sssilver left22:14
← CEnnis91 left22:15
← Jackneill left22:16
← tristanp left22:16
← sangy left22:17
→ Boki joined22:20
← dermoth left22:21
← acetakwas left22:21
← hahuang65 left22:22
→ samw joined22:22
← njbair left22:23
← jason237 left22:25
← _nadim left22:25
← nettoweb left22:25
← elastix left22:25
→ Wintergreen joined22:27
→ elastix joined22:28
← Wintergreen left22:28
← Dragooon left22:28
→ leeN joined22:29
← Boki left22:29
→ Boki joined22:29
→ martixy joined22:30
← leeN left22:30
← muld left22:30
← samw left22:31
← lolmac left22:31
← mdw left22:32
← AustinMatherne left22:32
→ HelloShitty joined22:32
martixy Hello. I made a change to my gitignore(and commited that change), then made a change to the newly ignored file, now git still tracks?(I think that was the word) that ignored file. Why?22:33
qsx martixy: !ignore_tr22:33
gitinfo martixy: [!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.22:33
← rideh left22:33
← HelloAtMega left22:33
→ jaguarmagenta joined22:34
← Tryop88 left22:34
← netj left22:34
← rolha_ left22:34
← jgornick left22:34
martixy Oh... cool. I guess that's common enough to have its own bot keyword. :)22:34
← jaguarmagenta2 left22:35
→ netj joined22:35
← Neal|ZNC left22:35
← Kamilion left22:35
← dsdeiz left22:36
martixy Thanks anyway.22:36
→ samw joined22:36
← intrigueD left22:36
← imMute left22:36
← Boki left22:38
→ AustinMatherne joined22:39
→ imMute joined22:39
→ lolmac joined22:39
→ Neal_ joined22:40
→ cschneid joined22:40
→ Hedgework joined22:40
→ rideh joined22:40
→ Peuc2 joined22:40
← vF3hNGxc47h8 left22:40
→ HedgeMage joined22:40
← elastix left22:40
→ batrick joined22:41
→ Kamilion joined22:41
← Peuc left22:42
Peuc2 → Peuc22:42
→ jgornick joined22:42
→ cyan__ joined22:42
→ GGMethos joined22:43
← samw left22:44
→ forrestv joined22:45
← lolmac left22:46
→ choki joined22:46
→ samw joined22:49
← trewe left22:50
← jeffreylevesque left22:56
← HelloShitty left22:56
← samw left22:58
→ jeffreylevesque joined22:58
→ lolmac joined22:59
→ jottr_ joined22:59
← egeerardyn left23:00
→ cagedwisdom joined23:01
← rubyonrailed left23:02
→ leeN joined23:03
← lolmac left23:05
← T7rees left23:05
← VarunAgw left23:05
→ Gloomy joined23:06
← Lyqyd left23:06
→ VarunAgw joined23:07
← cyphase left23:07
← jottr_ left23:08
← VarunAgw left23:09
→ diegoviola joined23:10
→ VarunAgw joined23:10
→ lolmac joined23:13
→ eletuchy joined23:14
← toogley left23:16
← systmkor_ left23:16
← lolmac left23:17
→ kadoban joined23:18
→ cyphase joined23:21
← ramsub07 left23:21
← cagedwisdom left23:21
→ lolmac joined23:23
→ liamonade joined23:24
→ lindenle joined23:25
← HanClinto left23:26
→ Goplat joined23:27
← WayToDoor left23:28
← lindenle left23:29
← lolmac left23:30
← diegoviola left23:31
← t0by left23:33
→ fahadash joined23:33
→ cagedwisdom joined23:34
← fedexo left23:35
→ dsdeiz joined23:35
→ diegoviola joined23:36
→ Noldorin joined23:36
← VarunAgw left23:37
→ ramsub07 joined23:38
→ VarunAgw joined23:39
→ lolmac joined23:40
→ nilsi joined23:40
← jeffreylevesque left23:42
← Gloomy left23:43
← VarunAgw left23:43
← nilsi left23:44
← waspinator left23:45
→ kam270 joined23:46
← aspiers left23:46
→ VarunAgw joined23:47
→ benbergman joined23:47
→ WayToDoor joined23:49
← ivo_ left23:49
← Balliad left23:50
→ sangy joined23:50
← mmlb left23:51
→ daito joined23:51
→ simonlinj joined23:52
→ diegoaguilar joined23:53
← simonlinj left23:54
→ Balliad joined23:54
← JanC left23:54
← mischat left23:55
← daito left23:56
→ lethjakman-l joined23:57
→ jason237 joined23:58
← leeN left23:59

Logs Search ←Prev date Next date→ Channels Documentation