IRCloggy #git 2015-12-19

Provider of IRC logs since 2005.

WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

	2015-12-19
	→ nkouevda joined	00:00
	← mtt5 left	00:01
	← jbudz_ left	00:02
milki	hm, this repo only has bad trees	00:05
	but.. the push doesnt see its already there -.-	00:05
	→ BeatrixKiddo joined	00:06
	← BeatrixKiddo left	00:06
	→ BeatrixKiddo joined	00:06
	← Limes_ left	00:08
	← circ-user-LMoE9 left	00:09
	→ Puhe joined	00:11
	→ hashpuppy joined	00:13
	← sangy left	00:14
	→ cdg joined	00:16
	→ abc123 joined	00:16
	← abc123_ left	00:16
	abc123 → abc123_	00:16
	← lindenle left	00:17
	← tang^ left	00:17
	→ strayPuppy joined	00:18
	→ s00pcan joined	00:18
	← str__ left	00:20
	← hexagoxel left	00:20
	→ wethu joined	00:22
	→ hexagoxel joined	00:22
	← weox left	00:22
	← clemf left	00:23
	← abc123_ left	00:23
	→ abc123 joined	00:24
	→ lindenle joined	00:24
	← wgrant left	00:25
	→ cjsarette joined	00:25
	← raijin left	00:25
	← AaronMT left	00:25
	← kzisme_ left	00:26
	→ jbudz joined	00:26
	→ kzisme joined	00:26
	→ otter768 joined	00:26
	→ clemf joined	00:27
	→ relipse2 joined	00:28
	← pozitron left	00:28
	→ Puhe_ joined	00:28
	→ darxun joined	00:29
	← sleezd_ left	00:30
	→ sleezd_ joined	00:30
	← jbudz left	00:31
	← otter768 left	00:31
	← abc123 left	00:31
	→ abc123_ joined	00:31
	← Puhe left	00:32
	→ faux___ joined	00:33
	← MattMaker left	00:33
	← rubyonrailed left	00:33
	← mizu_no_oto left	00:34
	← Sasazuka left	00:35
	← sleezd_ left	00:36
	→ sleezd_ joined	00:36
	← sleezd_ left	00:36
	← gaen left	00:36
	→ mellernoia joined	00:37
	→ sleezd_ joined	00:37
	← fscala left	00:37
	→ fscala joined	00:38
	← nkouevda left	00:39
	→ mischat joined	00:39
	→ jottr joined	00:39
	→ mizu_no_oto joined	00:39
	→ eluria joined	00:41
	→ griotspeak joined	00:41
	← dregad left	00:41
	→ SimonNa joined	00:44
	← jottr left	00:44
	← mischat left	00:45
	→ erste joined	00:46
	← boombatower left	00:47
eluria	Hi, I just tried to clone one of my repos and one of its submodules gives me the error 'fatal: reference is not a tree: 005c0a7ae35e45fc505546599e06ff3b9724ac11'. Cloning that repo separately and checking out that commit gives the same error. Strange thing is, I can find it on github: https://github.com/kylemcdonald/ofxCv/commit/005c0a7ae35e45fc505546599e06ff3b9724ac11.	00:48
	← wethu left	00:48
	→ arescorpio joined	00:48
eluria	I can probably find another suitable commit, but I don't understand what's going on here and I'd like to understand. Any ideas?	00:49
rewt	on github that seems to be a commit, not a tree	00:50
	which would be consistent with that error message	00:50
eluria	rewt: ok I have to read up on that difference. Yet this also exists: https://github.com/kylemcdonald/ofxCv/tree/005c0a7ae35e45fc505546599e06ff3b9724ac11/example-calibration	00:51
rewt	oh wow, hash collision?	00:52
	← dreiss left	00:52
	→ Lyqyd joined	00:52
	→ anbz joined	00:53
	← cjsarette left	00:53
rewt	all commits, trees, and blobs, have a hash (the id), and they should all be unique	00:53
	← aranea left	00:53
	← linduxed left	00:54
	→ cjsarette joined	00:54
	→ daito joined	00:54
eluria	hm ok that seems weird then. As this tree appears to have the same commit as its tip (correct terminology?) -- I posted a slightly wrong link btw, should be: https://github.com/kylemcdonald/ofxCv/tree/005c0a7ae35e45fc505546599e06ff3b9724ac11	00:55
	← anbz left	00:55
	← faux___ left	00:56
	→ linduxed joined	00:56
	→ anbz joined	00:56
	← kilo_bravo left	00:57
relipse2	anyone in here use Windows git bash ?	00:57
	← bodom left	00:57
rewt	oh, hm, nope, the /tree/ link seems to show the tree of the commit	00:57
	so that hash is a commit hash	00:57
	what did you do exactly when it complained about it not being a tree?	00:58
	→ Shentino2 joined	00:58
	← alexsystemf_- left	00:58
	← fstd left	00:59
	→ fstd joined	00:59
	← nour left	00:59
	← Shentino left	00:59
	← skylite left	00:59
	← italoacasas left	00:59
	← ferr left	00:59
	← daito left	00:59
eluria	I did a recursive clone of my project. The problematice ref is something I updated the submod to a while ago and git seemed to accept that back then.	01:00
	→ raijin joined	01:00
	→ alexsystemf_- joined	01:00
eluria	Is it possible to do a checkout to a specific commit in a submod, commit that change in the superproject and then later on get this error in a fresh clone?	01:00
	← cjsarette left	01:01
	← clemf left	01:01
	→ cjsarette joined	01:01
	→ mingwandroid joined	01:02
	→ Puhe__ joined	01:03
	→ dreiss joined	01:03
eluria	rewt: (One other thing I noticed: browsing through the commit history of the ofxCv repo does not show the 005c0a commit...)	01:04
	→ samw joined	01:05
	→ Gianormagantrous joined	01:06
	← Gianormagantrous left	01:06
	→ Gianormagantrous joined	01:06
	← Puhe_ left	01:06
	← relipse2 left	01:08
	← mingwandroid left	01:08
	→ star_prone joined	01:08
	← xaa left	01:08
	→ Puhe_ joined	01:08
	← star_prone left	01:08
	→ xaa joined	01:08
	→ italoacasas joined	01:09
	→ star_prone joined	01:09
	← alexsystemf_- left	01:10
	← star_prone left	01:10
	→ star_prone joined	01:10
	→ alexsystemf_- joined	01:10
	← relipse left	01:11
	← Puhe__ left	01:11
	← leeN left	01:12
	→ zacg joined	01:13
	← zacg left	01:13
	→ zacg joined	01:13
	← star_prone left	01:14
	→ lamont joined	01:15
	← cjsarette left	01:15
	← mellernoia left	01:18
	← Synthead left	01:19
	→ cjsarette joined	01:19
	← phrozensilver left	01:20
	← italoacasas left	01:20
	→ devoldmx joined	01:20
	→ italoacasas joined	01:20
	→ ajustrun joined	01:21
	← lamont left	01:21
	← jmpp left	01:22
	→ jmpp joined	01:24
	→ skcin7 joined	01:24
	← Sucks left	01:24
	→ Sucks joined	01:25
	← abc123_ left	01:27
	→ abc123 joined	01:28
	→ rkazak_ joined	01:28
	← jmpp left	01:28
	← HelloAtMega left	01:29
	← rpd left	01:30
	← dreiss left	01:30
	→ nkouevda joined	01:30
	← devoldmx left	01:30
	← nkouevda left	01:30
	→ UniFreak joined	01:32
	← winter__ left	01:32
	→ jmpp joined	01:32
	→ rewt joined	01:32
	→ devoldmx joined	01:32
	← devoldmx left	01:32
	← ciampix left	01:33
	← crayon left	01:35
	← semajnz left	01:36
	← mizu_no_oto left	01:36
	→ wgrant joined	01:36
	→ anybody joined	01:36
	← abc123 left	01:36
	→ abc123_ joined	01:36
	→ semajnz joined	01:36
	← cjsarette left	01:37
	← sleezd_ left	01:38
	→ sleezd_ joined	01:38
	← italoacasas left	01:38
	→ italoacasas joined	01:40
	← sleezd_ left	01:40
	← italoacasas left	01:40
	→ sleezd_ joined	01:40
	→ italoacasas joined	01:41
	→ mischat joined	01:41
	← sleezd_ left	01:41
	→ wxg joined	01:41
	← wxg left	01:41
	→ sleezd_ joined	01:42
	← sleezd_ left	01:42
	← sleezd left	01:42
	→ sleezd joined	01:42
	← sleezd left	01:43
	→ wxg joined	01:43
	← eijk_ left	01:44
	← paul424 left	01:44
	← wxg left	01:45
	→ DARSCODE joined	01:46
	→ wxg joined	01:46
	← raijin left	01:49
	→ raijin joined	01:51
	← anybody left	01:51
	→ kadoban joined	01:52
	→ Guin joined	01:53
	← maletor left	01:53
	→ cjsarette joined	01:54
	→ faux___ joined	01:58
	→ sleezd joined	01:58
	→ lamont joined	02:01
	← faux___ left	02:02
	→ devoldmx joined	02:03
	← msonntag left	02:04
	← devoldmx left	02:04
	← Sucks left	02:04
	→ MattMaker joined	02:04
	→ devoldmx joined	02:04
	→ msonntag joined	02:05
	← t-mart left	02:06
	← lamont left	02:07
	← MattMaker left	02:08
	→ pwnz0r joined	02:08
	→ t-mart joined	02:09
	→ zeroed joined	02:09
	→ leb joined	02:10
	→ denimsoft joined	02:10
	← Shentino2 left	02:11
	→ fracting joined	02:12
	→ mmitchell joined	02:13
	← m0viefreak left	02:13
	→ joufflu joined	02:13
	← sleezd left	02:14
	← LeBlaaanc left	02:14
	→ mablae_ joined	02:15
	← mmitchell left	02:15
	→ zzz_ joined	02:16
	← samw left	02:18
	← mablae__ left	02:19
	← pks left	02:19
	← zeroed left	02:19
	← denimsoft left	02:20
	→ samw joined	02:20
	→ cheetah2 joined	02:21
	→ pks joined	02:21
	→ Vampire0 joined	02:22
	← cjsarette left	02:23
	← skcin7 left	02:24
	→ cjsarette joined	02:24
	→ tyll joined	02:24
	← samw left	02:25
	← Vampire0_ left	02:25
eluria	rewt: thanks for your help. still unclear what's going on but I do have some more pointers. g'night!	02:26
	→ MattMaker joined	02:26
	→ SimonNaa joined	02:26
	← tyll_ left	02:26
	← eluria left	02:27
	→ lamont joined	02:27
	→ otter768 joined	02:27
	→ bb010g joined	02:29
	gitinfo set mode: +v	02:29
	← SimonNa left	02:29
	← Dazzyp left	02:30
	→ clemf joined	02:30
	← hashpuppy left	02:30
	→ chubbson joined	02:31
	← SimonNaa left	02:31
	→ mezod joined	02:31
	← jagob left	02:32
	← otter768 left	02:32
	← lamont left	02:32
	→ ril joined	02:33
	← joufflu left	02:34
	← cjsarette left	02:34
	← MattMaker left	02:34
	→ cjsarette joined	02:34
	→ eka joined	02:37
	→ jottr joined	02:40
	← jottr left	02:45
	← mischat left	02:47
	← harish_ left	02:48
	← italoacasas left	02:48
	→ phrozensilver joined	02:49
	→ skcin7 joined	02:50
	← cheetah2 left	02:52
	← fracting left	02:53
	→ Atrumx joined	02:54
	→ jbudz joined	02:54
	→ daito joined	02:55
	→ osxi joined	02:56
	← ril left	02:57
	→ chimeracoder joined	02:58
	→ ril joined	02:58
	→ cheetah2 joined	02:58
	→ star_prone joined	02:59
	← star_prone left	02:59
	→ star_prone joined	02:59
	← star_prone left	03:00
	← daito left	03:00
	→ pantsman- joined	03:00
	→ star_prone joined	03:00
	← yqt left	03:00
	← star_prone left	03:01
	→ star_prone joined	03:01
	← msonntag left	03:01
	← star_prone left	03:02
	→ star_pro_ joined	03:02
	→ nyx_ joined	03:02
	← star_pro_ left	03:02
	← cjsarette left	03:03
	→ star_prone joined	03:03
	→ cjsarette joined	03:03
	→ msonntag joined	03:03
	← chubbson left	03:05
	← star_prone left	03:07
	→ relipse joined	03:07
	← xaa left	03:07
	→ cagedwisdom joined	03:10
	→ nkouevda joined	03:10
	← nkouevda left	03:10
relipse	is there a reason git filter-branch 'rm blah' would increase my repo from 1.8gb to 3.2gb?	03:10
	i am trying to delete a large file	03:10
	→ SimonNa joined	03:10
relipse	completely from the repo	03:10
	→ rubyonrailed joined	03:11
relipse	after i run git filter-branch --index-filter 'git rm --cached --ignore-unmatch public_html/video/TheLovelinessOfChristPart1.mp4' HEAD and wait for a while what do I do after?	03:11
	← nyx_ left	03:11
	← cjsarette left	03:13
	→ cjsarette joined	03:13
	← pkeuter left	03:15
	← pantsman- left	03:15
	← pwnz0r left	03:15
	← cjsarette left	03:15
	→ cjsarette joined	03:16
	← rubyonrailed left	03:16
	← cjsarette left	03:17
	← jbudz left	03:17
	→ cjsarette joined	03:18
	→ pwnz0r joined	03:18
milki	relipse: see the bottom of man git filter-branch	03:18
gitinfo	relipse: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	03:18
	← cheetah2 left	03:19
relipse	git for-each-ref --format="%(refname)" refs/original/ \| xargs -n 1 git update-ref -d	03:20
	→ jbudz joined	03:21
	← cdg left	03:21
	← ril left	03:21
	→ cdg joined	03:21
relipse	that command is not working for me...	03:22
	→ sleezd joined	03:22
milki	hm, thats not what i expected	03:22
	relipse: what section are you reading?	03:22
	← sleezd left	03:23
relipse	https://confluence.atlassian.com/bitbucket/reduce-repository-size-321848262.html#Reducerepositorysize-ReduceRep-DRAFT-Reducerepositorysize-Runningfilter-branch	03:24
milki	relipse: i told you to look at man git filter-branch	03:24
gitinfo	relipse: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	03:24
	→ sleezd joined	03:24
	← jbudz left	03:25
	← abc123_ left	03:25
relipse	milki ok yeah i'm reading the bottom of that page now	03:26
	→ abc123 joined	03:26
relipse	it says after doing the git filter-branch you can just clone the repo	03:26
	← eka left	03:26
milki	thats one way to do it. the new clone will be smaller in size	03:26
	← skcin7 left	03:27
	ec → ELLIOTTCABLE	03:27
	← hackel left	03:27
	ELLIOTTCABLE → ec	03:27
relipse	interesting idea	03:27
	then just push the clone up?	03:27
	with -f ?	03:27
	→ skcin7 joined	03:27
	← bollullera left	03:28
milki	that wont help the repo size on the remote	03:28
relipse	hmm	03:28
	→ cdg_ joined	03:28
milki	that would require another step	03:28
relipse	for some reason my remote repo went from 1.8gb to 3.2gb after i removed that file	03:28
	← cagedwisdom left	03:28
milki	so push, then do the same thing on the other size, clone the repo	03:28
relipse	and did push -f	03:28
milki	pushing can only increase the size of a repo	03:29
relipse	I can't it is bitbucket	03:29
	← Guin left	03:29
milki	well, i guess if you delete refs, then all it does is delete refs	03:29
	relipse: o, then if you push, then bitbucket magic will happen	03:29
	dunno what bitbucket will do with a smaller repo	03:30
	cant help you there	03:30
	i guess just follow the atlassian docs then	03:30
	← msonntag left	03:31
relipse	hmm	03:32
	ok so instead of "cloning"	03:32
	← cdg left	03:32
relipse	to make small3er	03:32
	I do the more dangerous thing	03:32
	and then push -f	03:32
	→ eka joined	03:32
	← cdg_ left	03:32
	→ Goplat joined	03:33
	← phrozensilver left	03:35
	→ govg joined	03:36
	→ Limes_ joined	03:37
milki	if all you care about is bitbucket, then you only need to git push -f	03:37
	and then you can throw away the local clone	03:37
	new clones of your bitbucket repo will be smaller	03:38
relipse	well oddly i did this yesterday and the bb size went from 1.8gb to 3.2gb	03:38
	so now i'm trying to figure out how to make it smaller	03:39
milki	if you cant access the repo directly on bitbucket, theres nothing additional you can do	03:39
	you just need to wait for the bitbucket magic to happen	03:40
	or tell them to force it to happen	03:40
	→ mhg_ joined	03:40
	→ cagedwisdom joined	03:41
milki	relipse: tldr: talk to bitbucket if their directions arent working for you	03:41
	← mezod left	03:41
milki	you've done the things you can do with git alone	03:41
	theres nothing more to add	03:41
	← pwnz0r left	03:42
	→ ash_workz joined	03:42
	← Limes_ left	03:43
	→ DavidDudson joined	03:44
	→ mischat joined	03:45
	← griotspeak left	03:45
	← Uptime left	03:46
	→ Uptime joined	03:46
	→ msankhala joined	03:46
relipse	milki: i fear that my second command is not working: git for-each-ref --format="%(refname)" refs/original/ \| xargs -n 1 git update-ref -d	03:47
	am I supposed to insert something in that statement myself?	03:47
	← sleezd left	03:47
	→ sleezd joined	03:47
	→ griotspeak joined	03:48
	← eka left	03:49
	← mischat left	03:49
	← sleezd left	03:50
	→ sleezd joined	03:51
	← kadoban left	03:51
	← BeatrixKiddo left	03:53
	→ spykins joined	03:54
	← sleezd left	03:55
	→ joufflu joined	03:56
	→ sleezd joined	03:57
	← Puhe_ left	03:58
	← rpdprd left	03:58
	→ Shentino joined	03:58
	← happy-dude left	03:59
	→ nnyk_ joined	03:59
	→ Guin joined	03:59
	→ rubyonrailed joined	04:00
	← sleezd left	04:02
	→ sleezd joined	04:03
	← sleezd left	04:03
	→ sleezd joined	04:04
	→ ixian joined	04:05
	← sleezd left	04:07
	→ sleezd joined	04:08
	← sleezd left	04:09
	← durham left	04:10
	→ sleezd joined	04:10
	→ daito joined	04:11
	← sdothum left	04:11
	← theskillwithin left	04:12
	← leb left	04:12
	→ msonntag joined	04:12
	← toothrot left	04:13
	← bronson left	04:14
	← sleezd left	04:15
	→ sleezd joined	04:16
	← daito left	04:16
	← cjsarette left	04:21
	→ cjsarette joined	04:21
	← abc123 left	04:22
	→ abc123_ joined	04:22
	← oojacoboo left	04:23
	← sleezd left	04:23
	← d4rklit3 left	04:23
	→ sleezd joined	04:23
	→ sdothum joined	04:23
	← joki left	04:26
	← Guin left	04:27
	→ otter768 joined	04:28
	→ oojacoboo joined	04:29
	← otter768 left	04:32
	→ joki joined	04:33
	← TDJACR left	04:37
	→ raven-au joined	04:39
	→ jottr joined	04:41
	← sleezd left	04:42
	→ sleezd joined	04:42
	← griotspeak left	04:43
	← sleezd left	04:44
	→ TDJACR joined	04:45
	→ sleezd joined	04:45
	→ mischat joined	04:45
	← jottr left	04:45
	← tristanp left	04:45
	→ tristanp joined	04:46
	← DavidDudson left	04:47
	← gopar left	04:49
	← msankhala left	04:49
	→ gfixler joined	04:50
	→ msankhala joined	04:50
	→ BillCriswell joined	04:50
	← mischat left	04:50
	← msankhala left	04:51
	→ star_prone joined	04:51
	← star_prone left	04:52
	→ star_prone joined	04:53
Celelibi	Can I selectively apply the hunks from a given commit?	04:56
	← skapunker_ left	04:56
Celelibi	git checkout -p commit -- file	04:57
	← sparetire_ left	04:57
	← star_prone left	04:57
	← nvahalik left	04:59
	← tristanp left	05:00
	← raijin left	05:00
	→ tristanp joined	05:00
	← mhg_ left	05:00
	← pacbard left	05:01
	→ mizu_no_oto joined	05:02
	← tristanp left	05:02
	→ lamont joined	05:02
	← lldoge left	05:05
	← zacg left	05:06
	→ acetakwas joined	05:06
	← mac_ified left	05:08
	→ skapunker joined	05:11
	→ tristanp joined	05:11
	→ blahdodo joined	05:12
	← tristanp left	05:12
	→ weox joined	05:12
	→ sexaufspeed joined	05:13
	← krawchyk left	05:14
	→ faux___ joined	05:15
	→ griotspeak joined	05:15
	← mizu_no_oto left	05:16
	← sexaufspeed left	05:18
	→ GT joined	05:18
	→ samw joined	05:18
	← faux___ left	05:19
	← relipse left	05:19
	→ bronson joined	05:20
	← UTAN_dev left	05:20
	→ krawchyk joined	05:21
	→ phrozensilver joined	05:21
	← krawchyk left	05:21
	→ cheetah2 joined	05:21
	→ arvind_k joined	05:21
	← acetakwas left	05:21
	← frem left	05:22
	← samw left	05:22
	← GT left	05:23
	← arescorpio left	05:23
	→ jacksparrow007 joined	05:24
	← cheetah2 left	05:26
	→ mizu_no_oto joined	05:26
	→ faux___ joined	05:29
	← sdothum left	05:29
	← SrPx left	05:30
	← justanotheruser left	05:30
	→ justanotheruser joined	05:30
	← cjsarette left	05:31
	← strayPuppy left	05:31
	← ajustrun left	05:33
	→ cjsarette joined	05:36
	← Shentino left	05:36
	→ SrPx joined	05:36
	→ DavidDudson joined	05:38
	→ alanwill joined	05:38
	→ oojacobo_ joined	05:40
	← oojacobo_ left	05:40
	← DavidDudson left	05:40
	→ daito joined	05:42
	← wxg left	05:42
	→ tarkus26172 joined	05:42
	← SrPx left	05:46
	→ mischat joined	05:46
	← daito left	05:47
	← spykins left	05:48
	← Lyqyd left	05:49
	← mizu_no_oto left	05:50
	→ spykins joined	05:51
	← faux___ left	05:51
	← mischat left	05:52
	→ faux___ joined	05:53
	← abacuspowers left	05:53
	← cjsarette left	05:57
	→ rpdprd joined	05:57
	→ lactose joined	05:58
	→ hyperair joined	05:59
	← phrozensilver left	06:00
	← rpdprd left	06:01
	← s00pcan left	06:01
	→ cjsarette joined	06:03
	→ josuebrunel joined	06:04
	→ eka joined	06:04
	← zzz_ left	06:04
	← eka left	06:04
	← kaiza left	06:04
	→ Guest0 joined	06:04
	← FireArrow133 left	06:05
	← nnyk_ left	06:05
	→ UTAN_dev joined	06:06
	← spykins left	06:06
	← griotspeak left	06:09
	→ rpdprd joined	06:09
	← josuebrunel left	06:10
	← benbergman left	06:10
	← cjsarette left	06:13
	← ash_workz left	06:14
	→ griotspeak joined	06:14
	→ _cyril__ joined	06:14
	← chucky_z left	06:15
	← kzisme left	06:15
	→ benbergman joined	06:16
	→ cheetah2 joined	06:22
	→ durham joined	06:23
	← govg left	06:23
	→ govg joined	06:23
	← Kulrak left	06:24
	← UTAN_dev left	06:24
	← cheetah2 left	06:26
	→ otter768 joined	06:29
	← faux___ left	06:29
	→ kzisme_ joined	06:30
	→ mcint joined	06:31
	→ cheetah2 joined	06:33
	← otter768 left	06:33
	→ zipper joined	06:34
zipper	Hello there's this output that I get from a git fetch or a git pull that I don't quite get.	06:35
	* branch master -> FETCH_HEAD	06:35
	5fff8a6..a4e0aef master -> origin/master	06:35
	So what does the * mean in this case?	06:35
	and why is master pointing to both FETCH_HEAD and origin/master?	06:36
	and those two shortened checksums.	06:36
	← durham left	06:37
	→ durham joined	06:38
	← tarkus26172 left	06:39
milki	o	06:39
	there _are_ symbols there	06:39
	i actually never noticed	06:39
	i wonder if its documented	06:39
	man git fetch	06:39
gitinfo	the git-fetch manpage is available at http://jk.gs/git-fetch.html	06:39
	← SimonNa left	06:39
	→ Kulrak joined	06:40
	← Kulrak left	06:40
	→ Kulrak joined	06:40
milki	of course not -.-	06:40
	o	06:40
	no -.-	06:40
	→ jottr joined	06:42
milki	zipper: the ref part means that the remote's branch named master is stored as your local FETCH_HEAD, origin/master	06:42
	zipper: FETCH_HEAD is a special ref. used in fetching of course.	06:42
	zipper: which _is_ documented in man git fetch	06:42
gitinfo	zipper: the git-fetch manpage is available at http://jk.gs/git-fetch.html	06:42
	→ wallyduchamp joined	06:43
milki	zipper: dunno about the symbols though. from what i can tell, * corresponds to a new ref because it shows up with new branches	06:43
	← griotspeak left	06:43
zipper	milki: Seems I don't know what FETCH_HEAD is. I know that HEAD is a pointer to the current branch.	06:44
	Shouldn't FETCH_HEAD and origin/master be the same though?	06:44
	← jottr left	06:46
zipper	milki: I don't see any info on that in the man page.	06:47
	→ mischat joined	06:48
	→ Xuefer joined	06:53
	← mischat left	06:53
	← eb left	06:53
Xuefer	anyone know the format string of --pretty="oneline" ?	06:53
	→ eb joined	06:54
zipper	Xuefer: Format string?	06:54
milki	zipper: search for FETCH_HEAD in the man page	06:54
	zipper: its in the description section	06:54
	→ kaiza joined	06:55
milki	man git log	06:55
gitinfo	the git-log manpage is available at http://jk.gs/git-log.html	06:55
	← danmulvey left	06:55
milki	well, it tells you waht oneline shows	06:56
	then further down, it tells you what symbols to use to get those	06:56
Xuefer	i'd like to use git log --format=something instead of --pretty=oneline, i want to add date/author to oneline format, but i can't reproduce the nice output of oneline yet	06:56
milki	though, the actual words they use dont match -.-	06:56
	o yeah, it probably has other formatting like whitespace and colours huh	06:57
	well	06:57
	its probably hardcoded in the sorce...	06:57
Xuefer	yeah, color of "oneline" is much better than mine	06:57
	← zipper left	06:58
	→ subhojit777 joined	07:00
milki	wow	07:00
	no	07:00
	its a bunch of ifs	07:00
	i dont think you are gonna be able to replicate it	07:00
	https://github.com/git/git/blob/7d722536dd86b5fbd0c0434bfcea5588132ee6ad/pretty.c	07:00
	CMIT_FMT_ONELINE	07:00
	→ jagob joined	07:01
milki	it looks complicated	07:01
	→ yeshacker joined	07:03
	← ncthom91 left	07:04
	← yeshacker left	07:06
	← devoldmx left	07:10
	← kaiza left	07:12
	← Gamecubic left	07:12
	← mattcen left	07:14
	→ ome joined	07:17
	← cheetah2 left	07:20
	← durham left	07:21
	→ lldoge joined	07:22
	→ dsdeiz joined	07:23
	→ mehola joined	07:23
	→ imack joined	07:24
	→ gtristan joined	07:26
gtristan	Hi... How do I create a branch off of another branch (or master), without first switching to that branch ?	07:27
dsdeiz	git checkout -b <branch> <remote>/<remote branch>	07:27
	or i think something like git checkout -b <branch> <branch to branch off>	07:28
gtristan	I think: git branch new-branch original-branch	07:29
	checkout -b also switches to the branch	07:29
	gtristan is testing at the same time...	07:29
gtristan	Ok heres another question... How do I cherry-pick some commit onto another branch, which is not the active branch ?	07:30
	→ griotspeak joined	07:30
	→ MechtiIde joined	07:32
	→ phaleth joined	07:33
gtristan	hmmm, maybe not with cherry-pick command	07:33
	Better question: There are three branches: master, work-branch, dest-branch	07:34
	work-branch and dest-branch both diverge from master in some way	07:34
	← BillCriswell left	07:35
	→ fwoefm joined	07:35
gtristan	I am on work-branch, and I want to apply a commit to dest-branch, without modifying my active branch state	07:35
	How can I do it ?	07:35
fwoefm	morning	07:35
	← rubyonrailed left	07:35
gtristan	morning fwoefm	07:35
fwoefm	i dont even know how to phrase my question	07:36
	→ durham joined	07:36
fwoefm	i have a cms running on my server. the developer has the source code on github. i would like my server to update its copy using git. how do i do this?	07:37
	https://help.github.com/articles/using-pull-requests/ is confusing	07:37
	ah maybe git pull is different to a "pull request"?	07:38
gtristan	Ah here this is my question: http://stackoverflow.com/questions/13878904/git-cherry-pick-to-another-branch	07:39
wallyduchamp	fwoefm: it is indeed.	07:39
	← opencard left	07:39
wallyduchamp	fwoefm: git pull is the command that you want to run on your server. a pull request is what a developer submits to a repository for review and possible integration into a project by its maintainer(s).	07:39
gtristan	Thats a bit dense though; https://github.com/lennartcl/gitl/blob/master/git-cherry-copy actually does modify the local branch state, only it hides it inside of a script	07:40
	Hmmm	07:40
	→ daito joined	07:42
	→ King_Hual joined	07:45
	← King_Hual left	07:45
	→ King_Hual joined	07:45
	← daito left	07:47
gtristan	Ok so the reason why; is basically I disagree with the answers provided here: http://stackoverflow.com/questions/19768959/how-to-review-a-specific-commit-on-git	07:48
	Its regarding gerrit, and it's ultimately annoying way of getting in the way of your work	07:49
	So I hope to abstract this away, I would like to "wrap" git-review with a git-review-one script	07:49
	→ mischat joined	07:50
gtristan	So that I dont have to annoyingly checkout hundreds of separate branches just to properly create non-dependant commits	07:50
	← griotspeak left	07:50
gtristan	My approach was to hopefully have a "git-review-one <commit-id>" which would create a branch off of master, stage that specific commit-id onto that branch, and then use git-review of that branch	07:51
	← msonntag left	07:52
gtristan	I hope to accomplish all of this without ever modifying the local branch state, so if anything fails or whatever, you have not modified your local state	07:52
	→ ffio joined	07:52
	← durham left	07:53
	← fwoefm left	07:54
	← mischat left	07:54
	← MechtiIde left	08:03
	→ MechtiIde joined	08:06
	← ffio left	08:06
	→ msonntag joined	08:06
	← lindenle left	08:08
	→ devoldmx joined	08:11
	← Wetmelon left	08:11
	→ arup_r joined	08:11
	← weox left	08:12
	← Goplat left	08:13
	← mrkake left	08:13
	← devoldmx left	08:15
	→ toogley joined	08:16
	← jagob left	08:16
	← dsdeiz left	08:17
	→ elastix joined	08:18
	→ cheetah2 joined	08:21
	← cheetah2 left	08:22
	→ cheetah2 joined	08:22
	← heroux left	08:23
	← mehola left	08:23
	→ mehola joined	08:24
	← subhojit777 left	08:27
	→ jbudz joined	08:27
milki	gtristan: using git cli porcelain, you cannot update other branches with new commits. if you really want to, you could use plumbing to construct git objects the way you want to	08:28
	← _cyril__ left	08:28
milki	gtristan: why are you afraid of changing local branch state?	08:29
	→ Sleepy63 joined	08:29
milki	gtristan: you could try using another clone of the repo or a new worktree	08:29
	→ aidalgol joined	08:30
	→ otter768 joined	08:30
	→ subhojit777 joined	08:31
	← subhojit777 left	08:31
	→ _cyril__ joined	08:31
gtristan	milki, plumbing would be fine... honestly right now I have made a wrapper which does checkouts and it works well	08:31
	but I was thinking of proposing a patch to git-review proper, and thought it would be cleaner to do it without modifying local branch state	08:32
	← jbudz left	08:32
	gtristan runs off for supper...	08:32
milki	gtristan: plumbing involves things like constructing tree objects, commit objects, new blobs, invoking the git merge strategies, etc	08:33
	→ lindenle joined	08:33
milki	gtristan: using a library like libgit would be better probably	08:33
gtristan	right, some lower level command line thingies :)	08:33
	hmm	08:33
milki	i dont know how to invokve git merge strategies o.O	08:33
	everything else is straightforward	08:33
	but merging is hard	08:34
gtristan	me neither, which is why I was coming here :D	08:34
	hehehe	08:34
milki	the python library i use, dulwich, explicitly does not implement merging	08:34
	← otter768 left	08:35
milki	https://libgit2.github.com/libgit2/#HEAD/group/merge/git_merge_file	08:35
	looks like it does have parts	08:35
	all in "merge"	08:35
	so you could check those out	08:35
	← _cyril__ left	08:35
milki	https://github.com/libgit2/libgit2/blob/HEAD/include/git2/merge.h	08:36
	← Atrumx left	08:36
	← cheetah2 left	08:36
	→ cheetah2 joined	08:37
	← lindenle left	08:38
milki	gtristan: going all the way low level may not make it "cleaner"	08:38
	milki shrugs	08:38
milki	but doing it will let you learn so it would probably be fun to do	08:38
	→ rubyonrailed joined	08:38
gtristan	hehe	08:39
	Ok I haz to go eat :)	08:40
	milki, thanks for the pointer to libgit	08:40
	→ Kicer86 joined	08:40
gtristan	maybe I'll find some inspiration	08:40
	← Guest0 left	08:40
	gtristan was sufficiently annoyed to give it a go to add some feature to git-review upstream, as I think I'm not the only one annoyed with the lack of that feature	08:41
	→ faux___ joined	08:41
	→ Limes_ joined	08:42
milki	i would just modify local state. its easy to understand. no changes are lost. easy to implement.	08:42
	→ jottr joined	08:42
	← rubyonrailed left	08:43
	← gtristan left	08:45
	← faux___ left	08:46
	← clemf left	08:46
	← arup_r left	08:46
	← jottr left	08:47
	← pR0Ps left	08:49
	→ mischat joined	08:51
	→ pR0Ps joined	08:51
	→ heroux joined	08:51
	→ Outsider__ joined	08:53
	→ suffice joined	08:53
	← mischat left	08:56
	→ Guin joined	08:56
	→ wethu joined	08:56
	← Guin left	08:57
	→ Jackneill joined	09:00
	→ hans3000 joined	09:00
	← hans3000 left	09:00
	→ hans3000 joined	09:01
	→ marcogmonteiro joined	09:01
	← hans3000 left	09:01
	← wethu left	09:05
	→ samw joined	09:06
	→ UTAN_dev joined	09:08
	← elastix left	09:10
	← samw left	09:11
	→ mattcen joined	09:12
	← aidalgol left	09:16
	→ aidalgol joined	09:17
	← mcint left	09:19
	← thiago left	09:21
	← cheetah2 left	09:22
	→ Guest0 joined	09:23
	← nurupo left	09:23
	→ roxlu joined	09:24
	← raven-au left	09:24
	→ raven-au joined	09:24
	← mehola left	09:27
	→ subhojit777 joined	09:27
	→ mehola joined	09:28
	→ jbudz joined	09:28
	→ troulouliou_div2 joined	09:29
	→ mischat joined	09:32
	← jbudz left	09:32
	← MechtiIde left	09:32
	→ Dazzyp joined	09:36
	← mischat left	09:36
	← oojacoboo left	09:39
	← raven-au left	09:39
	→ hardenedapple joined	09:39
	← benbergman left	09:41
	→ Balliad joined	09:43
	→ raven-au joined	09:43
	→ daito joined	09:43
	← lldoge left	09:44
	→ lg188 joined	09:46
	← An_Ony_Moose left	09:47
	→ fracting joined	09:48
	← daito left	09:48
	→ kaiza joined	09:49
	→ gtristan joined	09:50
	← arvind_k left	09:50
	→ pantsman- joined	09:51
	← raven-au left	09:52
	← aidalgol left	09:52
	→ josuebrunel joined	09:52
	→ ahr3n joined	09:53
	→ raven-au joined	09:53
	← Ragnar left	09:54
	→ mrkake joined	09:55
	→ raven-au_ joined	09:56
	← raven-au left	09:58
	raven-au_ → raven-au	09:58
	← mehola left	10:01
	← kaiza left	10:03
	← mrkake left	10:05
	← Limes_ left	10:05
	→ _cyril__ joined	10:06
	→ Ragnar joined	10:07
	→ devoldmx joined	10:11
	← Balliad left	10:12
	→ msankhala joined	10:12
	→ Balliad joined	10:12
	← a-l-e left	10:13
	→ benbergman joined	10:14
	← Nikhil_D left	10:14
	→ nydel09 joined	10:15
	→ Nikhil_D joined	10:15
	← devoldmx left	10:16
	→ SrPx joined	10:18
	→ circ-user-LMoE9 joined	10:18
	→ SimonNa joined	10:19
	→ kaiza joined	10:20
	← kaiza left	10:20
	← raven-au left	10:20
	← moei left	10:20
	→ moei joined	10:21
gtristan	How can I do a 'git show --oneline' which does NOT show the patch itself ?	10:21
	or how can I do git log --oneline --only-show-one-commit <commit> ?	10:22
	→ cheetah2 joined	10:23
	→ raven-au joined	10:23
gtristan	ah	10:24
	→ kaiza joined	10:24
gtristan	git log --oneline <commit> -1	10:24
	magick and suspicious -1 at the end of command line :)	10:24
	← darkschneider left	10:26
	→ darkschneider joined	10:26
	→ rubyonrailed joined	10:27
	← raven-au left	10:28
	← cheetah2 left	10:28
	→ jottr joined	10:28
	→ otter768 joined	10:31
	← Balliad left	10:31
	← rubyonrailed left	10:33
	← SrPx left	10:33
	← jottr left	10:33
	→ lindenle joined	10:35
	← otter768 left	10:35
	→ SrPx joined	10:36
	← D-Boy left	10:38
	→ jost_ joined	10:38
	← josuebrunel left	10:39
	← lindenle left	10:39
	→ aard_ joined	10:40
	← jost left	10:42
osse	gtristan: git show -s	10:42
	→ m0viefreak joined	10:44
	→ raven-au joined	10:46
	→ TheTeapot joined	10:47
	← Xuefer left	10:47
	→ sdeleon28 joined	10:49
	← fracting left	10:49
	→ denimsoft joined	10:51
	← troulouliou_div2 left	10:52
gtristan	osse, ah that works too, git show -s --oneline :)	10:53
	→ ciampix joined	10:53
	← raven-au left	10:54
	→ eka joined	10:56
	← UniFreak left	10:56
	→ raven-au joined	11:00
	← DARSCODE left	11:00
	← fscala left	11:02
	→ HelloAtMega joined	11:03
	← denimsoft left	11:03
	→ nnyk_ joined	11:04
	→ fscala joined	11:04
	→ dopesong joined	11:04
	← a3Dman left	11:05
sdeleon28	Need help with pretty straighforward git checkout use case -> https://gist.github.com/sdeleon28/c282b1741d1c08c6ad56	11:05
	→ The_Phoenix joined	11:05
sdeleon28	I've been trying for a while to no avail	11:05
	→ a3Dman joined	11:06
	← ahr3n left	11:07
	← pantsman- left	11:08
	← The_Phoenix left	11:09
gtristan	sdeleon28, afaik you can just do 'git checkout ${branchname}' (without -b) and then 'git pull --rebase'	11:11
osse	sdeleon28: the restrictions you put on the local branch make it so that it's easier to just not have one	11:11
gtristan	git first will fail if the remote doesnt exist	11:11
osse	sdeleon28: git fetch; git reset --hard origin/foo. that's all you need	11:11
gtristan	s/git/the	11:11
osse	!deploy	11:11
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	11:11
sdeleon28	gtristan: osse: git reset --hard origin/foo sounds like what I need	11:13
	← toogley left	11:14
sdeleon28	I'm still wrapping my head around some git concepts that are not that similar to hg, Thank you guys!	11:14
	← TheTeapot left	11:16
	← alanwill left	11:18
osse	sdeleon28: read the deploy thing for deeper info	11:18
sdeleon28	osse: will do. thanks!	11:19
	→ stamina joined	11:20
	→ mrkake joined	11:21
osse	sdeleon28: think of it as you want to update the source to an arbitrary commit, not branch.	11:22
	→ WayToDoor joined	11:23
	→ D-Boy joined	11:23
	← WayToDoor left	11:24
	→ WayToDoor joined	11:24
sdeleon28	osse: Roger	11:26
	← mrkake left	11:27
	→ elsevero joined	11:29
	→ jbudz joined	11:29
	← Aboba left	11:30
	← cagedwisdom left	11:30
	→ pozitrono joined	11:32
	→ eijk_ joined	11:32
	← eka left	11:33
	→ xaa joined	11:33
	← jbudz left	11:34
	→ TheTeapot joined	11:35
	← Ragnar left	11:36
	→ eka joined	11:37
	← SrPx left	11:37
	← _nadim left	11:41
	← cebor left	11:42
	→ SrPx joined	11:42
	← msankhala left	11:43
	→ eka_ joined	11:43
	→ cebor joined	11:43
	→ fracting joined	11:43
	← WayToDoor left	11:44
	→ daito joined	11:44
	→ Balliad joined	11:44
	→ mrkake joined	11:45
	← SimonNa left	11:45
	← lss left	11:46
	← imack left	11:46
	← eka left	11:46
	→ mingwandroid joined	11:46
	← SrPx left	11:47
	→ MechtiIde joined	11:48
	← cebor left	11:48
	← daito left	11:49
	→ cebor joined	11:49
	← fracting left	11:49
	← eka_ left	11:51
	← mrkake left	11:51
	→ Matrixiumn joined	11:54
	→ eka joined	11:54
	Matrixiumn → Xack	11:56
	→ trobotham joined	11:58
	← rpdprd left	12:04
	← abc123_ left	12:07
	→ abc123 joined	12:07
	→ SrPx joined	12:08
	→ root_murdoc joined	12:08
	→ Karkus joined	12:09
	→ elastix joined	12:09
	→ msankhala joined	12:10
	→ selimcal joined	12:11
	→ mrkake joined	12:11
	← selimcal left	12:11
	← TheTeapot left	12:12
	← robbyoconnor left	12:12
	→ devoldmx joined	12:12
	→ robbyoconnor joined	12:13
	← dopesong left	12:13
	← pozitrono left	12:13
	← root_murdoc left	12:14
	→ TheTeapot joined	12:14
	→ root_murdoc joined	12:15
	← root_murdoc left	12:15
	→ root_murdoc joined	12:16
	← root_murdoc left	12:16
	→ rubyonrailed joined	12:16
	← skcin7 left	12:17
	→ root_murdoc joined	12:17
	← ome left	12:17
	← devoldmx left	12:17
	← root_murdoc left	12:17
	→ root_murdoc joined	12:18
	→ strayPuppy joined	12:19
	← TheTeapot left	12:19
	← root_murdoc left	12:19
	← eka left	12:21
	← rubyonrailed left	12:21
	← raven-au left	12:23
	→ cheetah2 joined	12:24
	→ dopesong joined	12:25
	→ alp82 joined	12:25
	← Karkus left	12:26
	← alp82 left	12:26
	← mrkake left	12:27
	→ raven-au joined	12:28
	→ Schnurpsel joined	12:28
	← Schnurpsel left	12:28
	← cheetah2 left	12:29
	→ jottr joined	12:29
	← msankhala left	12:29
	→ zeroed joined	12:31
	← eijk_ left	12:32
	→ Schnurpsel joined	12:32
	→ otter768 joined	12:32
	← Guest0 left	12:32
	→ eka joined	12:32
	← Schnurpsel left	12:33
	→ eijk_ joined	12:33
	← jottr left	12:34
	→ lindenle joined	12:36
	← otter768 left	12:36
	→ root_murdoc joined	12:37
	← dopesong left	12:37
	← root_murdoc left	12:37
	→ jottr joined	12:38
	→ dopesong joined	12:38
	→ root_murdoc joined	12:39
	← root_murdoc left	12:39
	← bronson left	12:39
	← eijk_ left	12:39
	→ root_murdoc joined	12:41
	← lindenle left	12:41
	→ sdothum joined	12:41
	← root_murdoc left	12:41
	→ samw joined	12:42
	← jottr left	12:43
	← Balliad left	12:44
	→ Karkus joined	12:45
	→ Balliad joined	12:47
	← samw left	12:47
	← eka left	12:49
	→ iLembus joined	12:50
	← iLembus left	12:51
	→ iLembus joined	12:51
	→ GT joined	12:51
	→ eka joined	12:52
	→ mrkake joined	12:53
	→ jottr joined	12:54
	→ _nadim joined	12:54
	→ TheTeapot joined	12:56
	← stamina left	12:58
	← raven-au left	12:58
	← Balliad left	12:58
	← jottr left	12:58
	← fstd left	12:59
	→ fstd joined	12:59
	→ Balliad joined	13:00
	→ cheetah2 joined	13:01
	← mrkake left	13:01
	→ raven-au joined	13:02
	→ nuge joined	13:03
	→ ahr3n joined	13:04
	→ fracting joined	13:04
	← ahr3n left	13:08
	→ jottr joined	13:09
	→ leeN joined	13:09
	→ DenysLins joined	13:11
	← cheetah2 left	13:11
	→ jayeshsolanki joined	13:11
	→ imack joined	13:13
	→ arex\work joined	13:13
	← jottr left	13:14
arex\work	I want to remove several folders from my git repo, including from the history. Is this the best apporach? git filter-branch --tree-filter 'rm -rf folder1 && rm -rf folder2' --prune-empty HEAD	13:14
	It is a pretty large repo, so it takes a long time, and I seem to run out of memory during the operation	13:16
	← CussBot left	13:16
	→ CussBot joined	13:16
cbreak	arex\work: if you want it to be faster, use index-filter	13:18
	(you'll have to change the filter code too)	13:18
	← Balliad left	13:19
arex\work	cbreak, so I can achieve the same thing with index-filter?	13:19
	→ denimsoft joined	13:20
	→ Balliad joined	13:20
cbreak	sure.	13:20
	arex\work: man git-filter-branch	13:20
gitinfo	arex\work: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	13:20
cbreak	there's at least one example	13:21
arex\work	thanks	13:21
	→ gaen joined	13:24
	← d0nn1e left	13:24
	→ sazed joined	13:24
	← Balliad left	13:25
	→ nurupo_ joined	13:25
	→ d0nn1e joined	13:25
	→ Balliad joined	13:27
	nurupo_ → nurupo	13:27
	← Karkus left	13:29
	← elsevero left	13:30
	← denimsoft left	13:30
	→ Sasazuka joined	13:30
	→ elsevero joined	13:30
	→ jbudz joined	13:31
	← jbudz left	13:35
	← elsevero left	13:36
	→ reim joined	13:36
	→ localuser- joined	13:36
	→ lindenle joined	13:37
	→ mrkake joined	13:40
	← lindenle left	13:42
	← TheTeapot left	13:42
	← Sasazuka left	13:44
	← ciampix left	13:44
	→ daito joined	13:45
	← skapunker left	13:45
	← jstimm left	13:46
	→ wethu joined	13:46
	← wethu left	13:46
	→ wethu joined	13:46
	→ jstimm joined	13:47
	→ skapunker joined	13:47
	→ beastd joined	13:48
	← marcogmonteiro left	13:48
	← daito left	13:49
	← gtristan left	13:50
	← oxsyn left	13:50
	← elastix left	13:56
	← nuge left	13:56
	← mrkake left	13:56
	← eka left	13:58
	→ raijin joined	13:58
	← linduxed left	13:58
	← Balliad left	13:59
	→ The_Phoenix joined	14:02
	→ linduxed joined	14:02
	← blackwind_123 left	14:02
	→ Balliad joined	14:03
	→ oxsyn joined	14:03
	→ rubyonrailed joined	14:05
	→ Gamecubic joined	14:05
	→ blackwind_123 joined	14:05
	→ tayfun joined	14:06
	→ mezod joined	14:06
	→ eka joined	14:09
	→ gtristan joined	14:09
	→ graSP joined	14:09
	← SrPx left	14:10
	← rubyonrailed left	14:10
	→ jottr joined	14:10
	← eka left	14:11
	→ KtoTo joined	14:11
	← jost_ left	14:11
	→ cheetah2 joined	14:11
	← Balliad left	14:12
	→ devoldmx joined	14:13
	→ cjsarette joined	14:13
	← raven-au left	14:13
	→ hhee joined	14:14
	→ rpdprd joined	14:14
	← jottr left	14:15
	← cjsarette left	14:15
	← skapunker left	14:16
	← cheetah2 left	14:16
	← zeroed left	14:17
	← devoldmx left	14:17
	→ David1977 joined	14:18
	← yoh_ left	14:18
	→ jost_ joined	14:19
hhee	guys, i want to develop some web-related stuff, my virtual machine will be a server.(both - linux based) where is quick ref to start working with? :)	14:19
cbreak	hhee: why not a mac?	14:20
	← graSP left	14:21
	← fracting left	14:22
hhee	cbreak, well..... i more like linux (and what i read about mac - i dont like) and, by the way they expensive too (as for me)	14:22
	→ raven-au joined	14:22
hhee	cbreak, in russia many it - related people dont like them (it's my opinion of mac world here)	14:24
	→ TomyLobo joined	14:24
	→ elastix joined	14:24
	→ mrkake joined	14:24
cbreak	Yes... I guess individuality and freedom isn't for everyone :)	14:24
	but really, for git it doesn't matter	14:24
	← Jackneill left	14:25
	← elastix left	14:25
hhee	cbreak, right. but your freedom maybe like oasis, you know that mac that is, but it may be fiction :) yeah	14:25
	← raijin left	14:26
	→ raijin joined	14:26
hhee	often things are not like it seems	14:26
cbreak	and often they are :)	14:27
	← darkschneider left	14:27
	← mrkake left	14:27
	→ darkschneider joined	14:27
	→ netcarver joined	14:28
hhee	cbreak, corporates need your money :) freedom individuality - buzz advertising words, no more. in world where profit in billion :)	14:28
cbreak	I see, you have never tasted true freedom :)	14:29
	→ zeroed joined	14:29
cbreak	"Screw the Rules, I have green hair!"	14:29
	→ zacg joined	14:29
	← zacg left	14:29
	→ zacg joined	14:29
hhee	cbreak, but if they can make to to believe that only with their things you are freedom - they eeeasily may sell you their stuff :)	14:29
	cbreak, you think you know a lot about freedom. funny reading that :) freedom == mac? :)	14:30
	go away from you house and see what really fredom is	14:30
cbreak	no	14:31
	freedom == not being bothered by stupid restrictions	14:31
hhee	well, you begin with another words above :)	14:31
	→ skapunker joined	14:31
	→ graSP joined	14:31
hhee	but your right in smth - Yes... I guess individuality and freedom isn't for everyone :)	14:32
	:)	14:32
	← raijin left	14:32
	→ otter768 joined	14:33
	→ yoh joined	14:33
	hhee not wear green hair :)	14:33
	← graSP left	14:35
	← xaa left	14:36
	← otter768 left	14:38
	← justanotheruser left	14:38
	← lightstalker left	14:38
	→ ahr3n joined	14:39
	← seg left	14:40
	→ bronson joined	14:40
	→ seg joined	14:40
	→ faux___ joined	14:41
	→ lightstalker joined	14:41
	→ SrPx joined	14:42
	→ cdg joined	14:43
	← ahr3n left	14:44
	← faux___ left	14:45
	→ faux___ joined	14:45
	← bronson left	14:45
	← cdg left	14:48
	← doener left	14:48
	← reim left	14:50
	→ macmod joined	14:50
	← macmod left	14:50
	→ macmod joined	14:51
	→ hvoigt joined	14:54
	→ cdg joined	14:55
	→ s00pcan joined	14:57
	→ Limes_ joined	14:59
	→ SimonNa joined	14:59
	→ reim joined	15:00
	→ star_prone joined	15:02
	→ Jackneill joined	15:03
	← zeroed left	15:04
	→ jbudz joined	15:06
	← circ-user-LMoE9 left	15:11
	→ ciampix joined	15:12
	→ dermoth_ joined	15:12
	← jmpp left	15:13
	← dermoth left	15:13
	→ cheetah2 joined	15:13
	dermoth_ → dermoth	15:13
	→ jottr joined	15:14
	← fscala left	15:14
	← sarri left	15:16
	→ fscala joined	15:17
	← cheetah2 left	15:18
	← jottr left	15:18
	← jbudz left	15:19
	→ ncthom91 joined	15:19
	→ Karkus joined	15:20
	← subhojit777 left	15:20
	→ leTali joined	15:21
	→ keroro520 joined	15:24
	← faux___ left	15:26
	→ pacbard joined	15:28
	→ sanketdg joined	15:28
	→ italoacasas joined	15:29
	→ mcint joined	15:30
	→ subhojit777 joined	15:31
	→ iLembus_ joined	15:33
	→ CheckDavid joined	15:33
	→ Ragnar joined	15:34
	→ absk007 joined	15:35
	← tayfun left	15:37
	← ciampix left	15:38
	→ Aboba joined	15:41
	← ncthom91 left	15:43
	→ jottr joined	15:44
	→ denimsoft joined	15:45
	→ dantix joined	15:45
	← lu_zero left	15:45
	→ daito joined	15:46
	→ circ-user-LMoE9 joined	15:46
	← David1977 left	15:47
	← synthmeat left	15:47
	→ lu_zero joined	15:47
	← lu_zero left	15:47
	→ lu_zero joined	15:47
	← jayeshsolanki left	15:48
	← jottr left	15:50
	← daito left	15:50
	→ ajustrun joined	15:50
	← wethu left	15:51
	→ synthmeat joined	15:52
	→ mac_ified joined	15:52
	← iLembus_ left	15:53
	← iLembus left	15:53
	→ sparetire_ joined	15:56
	→ arup_r joined	15:57
	→ mariuscc joined	16:01
	← skul left	16:02
	→ mizu_no_oto joined	16:02
	→ Limes__ joined	16:04
	← denimsoft left	16:04
	← m0viefreak left	16:04
	→ diegoviola joined	16:04
	← netj left	16:05
	→ netj joined	16:05
	→ jmpp joined	16:06
	← abc123 left	16:06
	→ abc123_ joined	16:06
	→ faux___ joined	16:07
	← Limes_ left	16:07
	→ denimsoft joined	16:07
	→ TheFlyingCorpse_ joined	16:09
	← jmpp left	16:10
	→ elastix joined	16:11
	← TheFlyingCorpse left	16:11
	→ Limes_ joined	16:11
	← mizu_no_oto left	16:12
	→ fracting joined	16:12
	← elastix left	16:12
	→ sarri joined	16:12
	→ elastix joined	16:13
	← reim left	16:13
	→ mahendra_ joined	16:13
	→ devoldmx joined	16:14
	← Limes__ left	16:14
	← netcarver left	16:14
	→ cheetah2 joined	16:14
	→ reim joined	16:14
	← foul_owl left	16:15
	→ NashvilleDev joined	16:17
	gitinfo set mode: +v	16:17
	→ mizu_no_oto joined	16:17
	← elastix left	16:17
NashvilleDev	Hello all... I am building an ASP.NET app, trying to configure a global .gitignore file, but it is not working, can someone assist?	16:18
	← devoldmx left	16:18
	← cheetah2 left	16:19
	→ _Atom_ joined	16:19
Karkus	How can I run git reset on all but one files?	16:19
	← reim left	16:19
NashvilleDev	Can someone help me configure my global .gitignore on windows powershell..	16:20
	← keroro520 left	16:21
	→ griotspeak joined	16:21
	← faux___ left	16:23
_ikke_	NashvilleDev: What is not working?	16:24
	→ Shentino joined	16:25
	← sleezd left	16:26
	→ sleezd joined	16:26
	→ bewbs joined	16:27
	→ foul_owl joined	16:28
	← fracting left	16:29
	← mcint left	16:30
	← dantix left	16:31
	← mahendra_ left	16:32
	→ otter768 joined	16:33
	→ rubyonrailed joined	16:34
NashvilleDev	I fixed it.. thanks _ikke_	16:34
	← NashvilleDev left	16:34
	→ adgtl joined	16:38
	← otter768 left	16:38
	→ waspinator joined	16:38
	← rubyonrailed left	16:39
	→ mahendra_ joined	16:39
	→ clemf joined	16:39
	→ root_murdoc joined	16:40
	→ ahr3n joined	16:40
	← root_murdoc left	16:40
	→ dantix joined	16:40
	→ root_murdoc joined	16:41
	→ pozitron joined	16:41
	← root_murdoc left	16:41
	← denimsoft left	16:41
	→ skul joined	16:42
	→ keroro520 joined	16:44
	← ahr3n left	16:44
	→ victorgama joined	16:48
	→ xaa joined	16:49
	← keroro520 left	16:49
	→ keroro520 joined	16:49
	← Karkus left	16:50
	← pozitron left	16:51
	← italoacasas left	16:52
	← blackwind_123 left	16:52
	→ italoacasas joined	16:52
	→ rubyonrailed joined	16:53
	→ mikeybisbo joined	16:54
	← localuser- left	16:54
	→ blackwind_123 joined	16:54
	→ localuser- joined	16:54
	← rubyonrailed left	16:57
	→ happy-dude joined	16:58
	← star_prone left	16:58
	→ star_prone joined	16:58
	→ bitri joined	16:58
	← localuser- left	17:00
	← keroro520 left	17:00
	→ localuser- joined	17:01
	← bitri left	17:01
	← roentgen left	17:01
	→ ncthom91 joined	17:02
	← joufflu left	17:02
	← phaleth left	17:03
	← DenysLins left	17:04
	→ justanotheruser joined	17:04
	→ phaleth joined	17:04
	→ weox joined	17:04
	→ jmpp joined	17:06
	← nnyk_ left	17:07
	→ jayeshsolanki joined	17:07
	← Yeomra left	17:08
	→ bitri joined	17:09
	← bitri left	17:09
	← adgtl left	17:10
	← roxlu left	17:11
	→ thiago joined	17:12
	← jmpp left	17:12
	→ Yeomra joined	17:13
	← zacg left	17:13
	→ Karkus joined	17:13
	← dantix left	17:14
	← heroux left	17:14
	← phaleth left	17:14
	→ cheetah2 joined	17:15
	→ Ahmed90 joined	17:16
	→ phaleth joined	17:17
	→ zadock joined	17:17
	← griotspeak left	17:19
	→ dantix joined	17:19
	← cheetah2 left	17:20
	→ dreiss joined	17:20
	← govg left	17:22
	→ sangy joined	17:23
	← macmod left	17:23
	→ frobnic joined	17:23
	→ faux___ joined	17:24
	→ g_ joined	17:24
	g_ → Guest67612	17:24
	→ zzz joined	17:27
	← JanC left	17:28
	← faux___ left	17:29
	← CheckDavid left	17:29
	← ItSANgo left	17:32
	← Dev0n left	17:32
	← bahar left	17:32
	← Tronsha left	17:32
	← hide left	17:32
	← sdeleon28 left	17:32
	→ Wetmelon joined	17:32
	→ ItSANg___ joined	17:32
	→ felixjet_ joined	17:32
	→ heroux joined	17:32
	← _nadim left	17:32
	→ madewokherd` joined	17:32
	→ diameter1 joined	17:32
	→ The_Phoenix1 joined	17:32
	→ Infamous_ joined	17:32
	→ Imaginat_ joined	17:32
	← sazed left	17:32
	→ sdeleon28 joined	17:32
	← madewokherd left	17:32
	→ hide joined	17:32
	→ nellicus_ joined	17:33
	→ Noldorin joined	17:33
	→ adgtl joined	17:33
	← The_Phoenix left	17:33
	← MrWoohoo left	17:33
	← djh left	17:33
	← esc left	17:33
	← ahf left	17:33
	→ Dev0n joined	17:33
	→ djh joined	17:33
	→ ahf_ joined	17:33
	→ esc joined	17:33
	← esc left	17:33
	→ esc joined	17:33
	← strayPuppy left	17:33
	→ Ranhir joined	17:33
	← felixjet left	17:34
	← tterrag left	17:34
	→ Tronsha joined	17:34
	ahf_ → ahf	17:34
	→ ygeLN joined	17:34
	→ zotherstupidguy joined	17:34
	← Guest67612 left	17:35
	→ Tryop88 joined	17:36
	← cdg left	17:37
	→ DolphinDream joined	17:37
	→ zzz_ joined	17:38
	→ FireArrow133 joined	17:38
	→ ghostlines joined	17:39
	← zzz left	17:40
	← sangy left	17:40
	→ Almis90 joined	17:42
	→ tterrag joined	17:43
	→ strayPuppy joined	17:43
	→ JanC joined	17:43
	← flaguy48 left	17:44
	→ griotspeak joined	17:45
	← adgtl left	17:45
Almis90	Hello guys, I writing git status and see that there are some changes but when I write git add . all changes are still there... I tried git add *, git add . --force, git add --all nothing works	17:46
	→ daito joined	17:46
	← ntio left	17:46
	→ jottr joined	17:47
	← jost_ left	17:48
	← Noldorin left	17:49
canton7	Almis90, pastebin the output of 'git status'?	17:49
	← nanga left	17:50
	→ cjsarette joined	17:50
	← zzz_ left	17:50
	← imack left	17:50
	← mariuscc left	17:51
	← daito left	17:51
Almis90	http://pastebin.com/k7X4KvE7	17:51
	← jottr left	17:51
	→ ciampix joined	17:51
	→ nanga joined	17:52
	← nanga left	17:52
	→ nanga joined	17:52
	→ rubyonrailed joined	17:53
	→ roentgen joined	17:53
	roentgen → Guest28681	17:54
	← Yeomra left	17:55
	← Guest28681 left	17:55
	← griotspeak left	17:55
	→ adgtl joined	17:55
	→ roentgen_ joined	17:56
	← D-Boy left	17:57
	→ griotspeak joined	17:57
	← Xack left	17:58
	← rubyonrailed left	17:58
	← marlinc left	17:58
	→ sam_ joined	17:59
	← erste left	18:00
	→ Neico joined	18:00
	→ marlinc joined	18:00
	→ Matrixiumn joined	18:00
	← tterrag left	18:00
	← adgtl left	18:01
	← jayeshsolanki left	18:01
	→ deed02392 joined	18:01
	→ tterrag joined	18:01
Almis90	canton7 you still herE?	18:01
canton7	yep, sorry you didn't ping me so I didn't notice you'd replied	18:01
	righty, so you've got some staged deletions, andsome unstaged additions	18:02
	(also looks like you're tracking a directory which contains build output, which is a very bad idea)	18:02
	→ tomog999_ joined	18:02
canton7	are you sure smarty isn't just changing files faster than you can tell git about them, or some such?	18:03
Almis90	yes you right, I using it mostly for backup	18:03
	Matrixiumn → Xack	18:03
Almis90	I dont think so, the website is not under development	18:03
	← mahendra_ left	18:03
Almis90	is *	18:03
	← dreiss left	18:04
canton7	righty, so what's the output of 'git status' if you 'git add cache'?	18:04
	← victorgama left	18:04
	← tomog999 left	18:05
	→ ril joined	18:05
	← cjsarette left	18:05
	← ciampix left	18:07
Almis90	http://pastebin.com/JNPtnFww	18:08
	→ jmpp joined	18:08
canton7	looks like they were all added fine	18:09
	→ dreiss joined	18:10
canton7	'git add .', 'git add --all', 'git add -u', 'git add *', or any of those sorts of things should have done the smae	18:10
Almis90	Ok I will try again	18:10
	→ fahadash joined	18:11
	→ cjsarette joined	18:11
	→ sangy joined	18:13
	→ xcesariox joined	18:13
	← jmpp left	18:14
	→ devoldmx joined	18:14
	← netj left	18:16
	← subhojit777 left	18:16
	→ cheetah2 joined	18:16
	→ netj joined	18:16
	→ Yeomra joined	18:17
	← mizu_no_oto left	18:17
	← cjsarette left	18:18
	← SrPx left	18:18
	→ subhojit777 joined	18:18
Lowell	What about git rm?	18:19
	← devoldmx left	18:19
	→ cjsarette joined	18:20
canton7	he was trying to stage modified files, not deletions	18:20
Lowell	K	18:20
	← roentgen_ left	18:21
	← cheetah2 left	18:21
	→ roentgen_ joined	18:21
	→ cdg joined	18:22
	← Yeomra left	18:22
	← texasmynsted left	18:22
	→ D-Boy joined	18:23
	← hyperair left	18:23
	← dreiss left	18:24
	→ texasmynsted joined	18:25
	→ faux___ joined	18:25
	→ flaguy48 joined	18:25
	→ Lyqyd joined	18:27
	← faux___ left	18:30
	→ zzz joined	18:30
	← subhojit777 left	18:30
	→ NashDev joined	18:31
	→ bronson joined	18:31
	→ SrPx joined	18:32
	→ stamina joined	18:32
	→ subhojit777 joined	18:32
	← nanga left	18:32
	→ nanga joined	18:34
	← nanga left	18:34
	→ nanga joined	18:34
	→ otter768 joined	18:34
	→ Yeomra joined	18:35
bewbs	i fucking hate git sometimes	18:36
	28 conflicts. revert them. stash pop, 28 conflicts still	18:36
	← griotspeak left	18:37
	← NashDev left	18:37
bewbs	resolved using mine	18:37
	still 28 conflicts	18:37
	← ghostlines left	18:37
	← phaleth left	18:37
bewbs	resolved using hteirs, still 28 conflicts	18:37
	← bronson left	18:37
	← cjsarette left	18:37
	→ cjsarette joined	18:37
	→ edisto joined	18:38
	→ phaleth joined	18:38
	→ _nadim joined	18:39
bewbs	this is fucking amazing!	18:39
	← Almis90 left	18:39
	← otter768 left	18:39
bewbs	git decies to add random ass text to my files that i have to manually delete	18:39
	← dopesong left	18:39
	→ Goplat joined	18:39
	→ geoid joined	18:41
	→ toothrot joined	18:41
	→ ahr3n joined	18:41
	← _Atom_ left	18:41
	→ jmpp joined	18:42
	→ beatdown joined	18:42
	← abc123_ left	18:42
	→ abc123 joined	18:43
	→ rubyonrailed joined	18:43
	← roentgen_ left	18:44
	→ t0by joined	18:45
	→ roentgen joined	18:45
	← ahr3n left	18:45
	→ cagedwisdom joined	18:45
	← dantix left	18:46
qsuscs	bewbs: !eek	18:46
gitinfo	bewbs: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	18:46
	→ otter768 joined	18:46
	→ jottr joined	18:47
bewbs	i know how it works	18:48
	→ faux___ joined	18:48
bewbs	i've resolved the conflicts	18:48
	i've deleted them	18:48
	i've reverted them	18:48
t0by	(of course merge conflicts sometimes are NOT a natural part of collaboration but the result of some dork committing whitespaces and blank lines by mistake)	18:48
bewbs	but it still screams about them	18:48
t0by	and did you git add the resolved files? :)	18:49
bewbs	i've tried everything short of reverting the entire project	18:49
	← sanketdg left	18:49
gtristan	bewbs, that is the only time I have problems too, friggn stash conflicts	18:49
bewbs	it's driving me insane	18:49
	and resetting hte project isn't an option	18:50
	i need these stashed files	18:50
gtristan	bewbs, this is how I am now working around it: git stash show -p > ~/patchfile	18:50
bewbs	well, thousands of tohers stashed files	18:50
gtristan	patch -p1 < ~/patchfile	18:50
	commit	18:50
	well, commit after conflict fix, of course	18:50
	that or, create patch from stash; drop stash, apply patch & fix conflicts, then re-create stash	18:51
bewbs	unfortunately i am not terribly skilled with git	18:52
	just enough to get through the basics	18:52
	← xcesariox left	18:52
	→ Torne joined	18:52
	→ bronson joined	18:52
Torne	Where does the win32 git installer store the autocrlf setting? It doesn't appear to be in the user global configuration, or in any file in the git install dir that I can find	18:52
	← jottr left	18:53
bewbs	when it says there is a conflict, that means the files in the stash can't be merged with the new files right?	18:53
edisto	I just did a git reset --HARD^^ and am trying to upload the changes I wanted to make rather than the last two I made... But now it says my branch is up to date. How do I recalibrate to show the repository I've made changes?	18:53
_ikke_	bewbs: correct	18:53
edisto	er --hard HEAD^^	18:53
	→ Dumle29 joined	18:54
	← faux___ left	18:54
bewbs	how do i make it ignore files with conflicts	18:54
	and merge everything else	18:54
gtristan	bewbs, when you run git stash apply or git stash pop, it does something weird	18:54
	i.e. when there are conflicts	18:54
bewbs	using tortoisegit, i right click and resolve, but that doesn't work	18:55
	i resolve using theirs or mine, same result	18:55
	i revert, same result	18:55
	← rubyonrailed left	18:55
	→ rubyonra_ joined	18:55
gtristan	when there are conflicts with normal commits, interactive rebases, or cherry-picks, everything makes sense	18:55
_ikke_	bewbs: That's because the conflict is not recorded in the index	18:55
gtristan	but git diff shows you like, "only the conflict" after a stash conflict	18:55
_ikke_	bewbs: with git stash apply, it only records the conflict in the file itself	18:56
	→ durham joined	18:56
gtristan	while git diff HEAD shows you something different :-S	18:56
	→ WayToDoor joined	18:56
bewbs	will git stash apply alter anything	18:56
_ikke_	it alters your working tree	18:56
bewbs	which is hte files i have	18:57
_ikke_	correct	18:57
bewbs	what files does it alter	18:57
	→ NashDev joined	18:57
edisto	crap I just deleted all teh changes I made with that --hard HEAD^^ how do I undo?	18:58
bewbs	you don't	18:58
gtristan	hahaha edisto they are actually somewhere still in your history	18:58
_ikke_	edisto: were those uncomitted changes?	18:58
gtristan	I recall recovering from a misguided git reset --hard, because I happened to have an output of git log --oneline sitting around	18:59
bewbs	i need a way to pop this stash without losing all my changes. i have backed up the conflicts, but i can't get rid of the conflicts	18:59
	i absolutely need everythign else though	18:59
edisto	_ikke_: I commited them but forgot to delete files so that is why I was resetting	18:59
	→ devoldmx joined	19:00
edisto	_ikke_: so I just want like 3 files from those commits	19:00
	← durham left	19:00
gtristan	bewbs, just work around it: git stash show -p will give you an output that is a "patch"	19:00
_ikke_	edisto: use git reflog to find the commits	19:00
	edisto: then checkout the files from those commits	19:00
	→ durham joined	19:00
	gtristan takes note of awesome reflog command :)	19:00
bewbs	i have over a hundred files that are altered	19:01
	← geoid left	19:01
bewbs	over 3000 lines in the stash	19:01
_ikke_	That's a big stash you made then	19:01
bewbs	it is very big	19:01
	i need it for my version	19:01
_ikke_	bewbs: Do you have any uncommitted changes you need to keep? (anything either not in the stash, and not comitted)	19:01
	bewbs: What kind of merge conflicts do you have?	19:02
bewbs	nothing is comitted, everything is stashed	19:02
	← NashDev left	19:02
bewbs	28 files that i don't care about	19:02
	67 lines added, 4 lines removed	19:02
_ikke_	Can't you just checkout those files from the index?	19:03
edisto	_ikke_: I see the commit HEAD@{2} so how do I go about checking out a few files on this commit?	19:03
_ikke_	edisto: git checkout @{2} path/to/file	19:03
bewbs	you said words that i understand independently, but not when you string them together	19:03
_ikke_	bewbs: git checkout <file> for each file you don't care about	19:03
	→ CheckDavid joined	19:06
bewbs	how do i paste in the command window	19:06
_ikke_	Are you on windows?	19:06
bewbs	yup	19:07
	typically it would be right click	19:07
_ikke_	right click	19:07
	← stamina left	19:07
_ikke_	yeah	19:07
bewbs	no such luck	19:07
_ikke_	then right click on the top left icon, there is a paste item there	19:07
	→ m0viefreak joined	19:08
	→ saidi joined	19:08
	← saidi left	19:08
	→ saidi joined	19:08
	← discipline left	19:08
	← saidi left	19:09
	→ discipline joined	19:09
	→ saidi joined	19:10
edisto	whew....	19:10
	_ikke_: thanks	19:10
	→ elastix joined	19:10
	← durham left	19:11
	← roentgen left	19:12
	→ Rvir joined	19:12
	← Rvir left	19:13
	→ roentgen joined	19:14
	→ stamina joined	19:14
	← aard_ left	19:15
	← mingwandroid left	19:15
	← saidi left	19:16
	← ril left	19:16
	→ saidi joined	19:16
	← saidi left	19:16
	→ saidi joined	19:16
	← otter768 left	19:16
bewbs	git checkout file.lua	19:17
	← SrPx left	19:17
bewbs	error: pathspec 'did not match any files known to git'	19:17
	← eb left	19:18
	→ eb joined	19:19
	→ SrPx joined	19:20
bewbs	right clicking each conflict and going to edit, then delete seems to be fixing it	19:23
	but i can't do more than one	19:23
	at a time	19:23
	← rubyonra_ left	19:23
	→ rubyonrailed joined	19:23
sangy	bewbs: I'm not sure, do you want to reset all unstaged changes in a file? git checkout -- file.lua would do the trick. Also check git checkout --theirs/--ours file.lua	19:24
	→ Guest0 joined	19:24
	→ anchorite joined	19:25
	→ LeBlaaanc joined	19:25
bewbs	nevermind...	19:26
	it didn't work	19:26
	i'm going to lose so much fucking work, i hate this thing	19:26
	→ santi_ joined	19:27
johnw	why would you lose work?	19:27
_ikke_	What happens when you just checkout those files that you don't want to keep	19:27
bewbs	it says hte file doesn't exist	19:27
	i can't pop the stash	19:27
	← MechtiIde left	19:28
johnw	so, the data is there	19:28
	→ faux___ joined	19:28
johnw	you can always check out the stash itself in a copy of the repository, if you must	19:28
bewbs	150 files, 2823+ lines, 2313- lines, non-versioned=80, deleted 35, conflicted 28	19:28
	← saidi left	19:29
bewbs	why is an issue like this even possible	19:29
	i don't understand why there is a conflict	19:29
	i don't understand why i can't get rid of hte conflict	19:29
	→ saidi joined	19:29
	← saidi left	19:29
	→ saidi joined	19:29
bewbs	or revert, or undo, or anything	19:29
johnw	can you paste me what "git status" says right now?	19:29
bewbs	it's like 10 pages	19:30
johnw	ok. first things first	19:30
bewbs	andi can't right click at all in my git bash for some reason	19:30
johnw	copy this repository elsewhere, so that we have a backup	19:30
	← sdeleon28 left	19:30
	→ sleeparrow joined	19:30
bewbs	copying now	19:31
	15k files, gonna take a minute	19:31
	ChanServ set mode: +vvv	19:31
johnw	after that is done, use "git reset --hard HEAD", and then make sure that "git status" is now clean	19:31
	and then try to apply your stash, to get back to your previous state	19:31
	← sleeparrow left	19:32
bewbs	conflicts	19:32
johnw	"git status" was clean a moment ago?	19:32
bewbs	nope	19:32
	there's some untracked files that are mine	19:33
johnw	but untracked files were the only things there?	19:33
bewbs	yup	19:33
johnw	ok, was the conflict with any of those files?	19:33
	← faux___ left	19:33
	→ joufflu joined	19:33
bewbs	nope	19:33
	→ WABDHFL joined	19:33
	← localuser- left	19:33
johnw	ok	19:33
	← zotherstupidguy left	19:33
johnw	now, check out "git stash list"	19:33
	it will tell you which commit your stash was made against	19:34
bewbs	only one	19:34
johnw	"<description>: <commit id> <description>"	19:34
	→ localuser- joined	19:34
johnw	we're now going to git reset --hard <commit id>	19:34
bewbs	stash@{0}: WIP on master: 8df5ae2 database update	19:34
johnw	to take us back to the commit against which the stash was made	19:34
	right	19:34
	git reset --hard 8df5ae2	19:34
	then try to "git stash apply"	19:34
bewbs	what is apply vs pop	19:35
johnw	pop deletes the stash after successfully applying	19:35
	apply keeps it around	19:35
bewbs	gotcha	19:35
	← saidi left	19:35
bewbs	success	19:35
	no conflict	19:35
johnw	excellent, now you see all your modified files in "git status"?	19:35
bewbs	yup	19:36
	as moidified	19:36
	→ nnyk_ joined	19:36
johnw	ok, here's what I would do at this point	19:36
	→ saidi joined	19:36
	→ skylite joined	19:36
johnw	create a new branch, and start making commits into this branch from your modifications	19:36
	make multiple branches if necessary	19:36
	→ zotherstupidguy joined	19:36
	→ MechtiIde joined	19:36
johnw	then, we can checkout the original master branch again, and use git reset --hard to go back to where it was originally	19:36
	← asdofindia left	19:36
johnw	and then start merging in these new branches you made, as a way to get your content into the mainline	19:37
bewbs	what if i just deleted the 28 files here	19:37
	or reverted	19:37
johnw	is that what you want?	19:37
bewbs	then updated	19:37
	then add htem back in	19:37
johnw	well, sure	19:37
	that's another way to do it	19:37
	just move them to another directory	19:37
	go back to origin/master (or wherever you were), and then copy them back in	19:37
bewbs	already have backup copies of htem	19:37
johnw	ok	19:37
	yes, this will work too	19:37
	one thing to remember about Git: it's extremely hard to actually lose work	19:38
	→ clmsy joined	19:38
johnw	it's a question of knowing how to extract the information it has stored	19:38
	→ Sasazuka joined	19:38
johnw	in general, the last 30 days of whatever you have done is in your repository, somewhere	19:38
bewbs	odd	19:39
	these files are now ?	19:39
	i can't revert	19:39
johnw	you can always revert with git reset --hard	19:39
	that forces your repository and your working tree to be at a certain commit	19:40
	the only thing it doesn't do is touch untracked files	19:40
bewbs	ok i'm going to create a new stash now right	19:40
johnw	I wouldn't use the stash any more	19:40
	not today	19:40
	do this manually	19:40
	← netj left	19:40
bewbs	i deleted hte 28 files, i want to make a new stash, then pull, then apply the new one, don't i?	19:40
johnw	the stash is just a poor man's temporary feature branch, it's meant for rather simple use cases; and it doesn't seem that you are in a simple scenario right now	19:41
	no	19:41
	just pull	19:41
	then copy those files from your backup of them	19:41
bewbs	but there are 150+ other files that are altered	19:41
	that weren't conflicts	19:41
johnw	ah, I see	19:41
bewbs	just the 28 i couldn't resolve	19:41
johnw	ok, then I would do this:	19:41
	take the current state of your repository, after the git stash apply	19:41
	and turn that entire state into a branch, rather than a stash:	19:42
	← Lyqyd left	19:42
	→ dopesong joined	19:42
johnw	git checkout -b feature ; git commit -a -m "Everything that was in my stash"	19:42
	then pull	19:42
	then: git merge feature	19:42
	this way, it will happen even if there are conflicts	19:42
	and you can then resolve those conflicts by hand	19:42
bewbs	when you say 'everything that was in my stash'	19:42
	→ netj joined	19:42
bewbs	does that mean typing out everything in the stash	19:43
johnw	no	19:43
bewbs	ok	19:43
johnw	just git reset --hard HEAD, and git stash apply again	19:43
	← jwest left	19:43
johnw	since we didn't use "pop", it's still there	19:43
	and now, commit all of those changes into a branch	19:43
	branches can be easier to work with than stashes	19:43
bewbs	that's not something i am familiar with doing	19:43
johnw	git checkout -b feature ; git commit -a -m "Everything that was in my	19:44
	stash"	19:44
	→ guacjack joined	19:44
edisto	I am getting a HEAD deatched from, when I do git status... how do I reattach the head?	19:44
johnw	edisto: it means you checked out a commit that is not represented by a ref	19:44
bewbs	do i have to name it at some point?	19:44
johnw	edisto: you need to "git checkout" the name of a ref	19:44
bewbs	what should i put in the quotes	19:44
johnw	bewbs: the command I gave you above will name it "feature"	19:44
bewbs	ah	19:44
johnw	in the quotes: put any description you want	19:44
guacjack	Hello folks, just got a quick question, When a PR is opened on GitHub with for example 5 commits, when that pull request is merged into the requested branch via GitHub... are the commits squashed? Apologies if this is not the correct place for a GitHub question	19:45
johnw	no, they are not squashed	19:45
	→ Puhe_ joined	19:45
	← ajustrun left	19:45
johnw	if you want that, you can merge them at the command-line	19:45
bewbs	i did git pull, it said no tracking info for current branch	19:45
guacjack	ah yeah I knew that already just wondered if GitHub did that already	19:45
	thanks :D	19:45
johnw	bewbs: use 'git checkout <foo>' to go back to the previous branch you were on	19:46
	whatever <foo> was called (probably master)	19:46
bewbs	i was on master	19:46
johnw	bewbs: before continuing	19:46
	do: git diff master feature	19:46
	to make sure it looks like everything you had on you stash	19:46
guacjack	Is it normal practice to ask the person submitting the PR to squash them into a normal manner rather than random ones like 'Fix stuff' etc	19:46
johnw	guacjack: that entirely depends on the project and its own standards	19:47
bewbs	ok i've switche dto mater and pulled	19:47
johnw	bewbs: now "git merge feature"	19:47
bewbs	how do i merge with feature branch	19:47
johnw	expect it to report conflicts	19:47
	→ daito joined	19:47
bewbs	2034 files changed, 26725 inserts, etc	19:47
	i can't scroll up far enough to see it all	19:47
guacjack	cool, just wanted to be sure cause I merged a PR and closed it and i have all 5 commits from that persons branch, when I thought they would be squashed into the 'Merge pull request ...' commit	19:47
johnw	bewbs: anyway, now begins the work of resolving the merge	19:48
	← strayPuppy left	19:48
guacjack	Thanks for the help johnw	19:48
johnw	guacjack: sure thing, easy questions are always welcome :)	19:48
guacjack	johnw wasnt sure if this was the right place for a GitHub question.. always nice to speak to a friendly community	19:49
johnw	there's also #github	19:49
bewbs	how can i go about resolving the merge	19:49
johnw	which technically is the better place, but I wager many of us here use GitHub also	19:49
	bewbs: that's a separate question from your previous problem, and not one I can answer without standing behind your shoulder to see what you see	19:49
bewbs	i see	19:50
	← wallyduchamp left	19:50
johnw	we've at least restored your work from the stash, and attempting to merge it with the current master	19:50
bewbs	so i have an updated version, then this branch that has all my stuff	19:50
johnw	you have "feature", which contains all your previous work	19:51
	and you have a merged master now, which attempted to combine the two	19:51
	and you've got a bunch of conflicted files, where that could not be done automatically	19:51
	← guacjack left	19:51
johnw	you have to edit each conflict files, resolve the merge markers by hand, and then "git add" that file to state that you've resolved the conflict	19:51
	often a GUI tool can make this easier to do	19:52
	since it sounds like you've got many conflicts	19:52
	← daito left	19:52
bewbs	i ahve tortoisegit	19:52
	as well	19:52
johnw	ah, I'm not a Windows person, so I have no idea how to proceed with that tool	19:52
bewbs	it's fairly simple	19:52
johnw	anyway, once every merged file has been resolved, then you "git commit" to complete the merge	19:53
	assuming you've tested that it still builds and passes tests, or whatever your metric is for quality	19:53
	but everything you did is in "feature", so your work cannot be lost	19:53
bewbs	all my configs have been reverted	19:53
	i am not sure how to retrieve feature	19:53
johnw	what do you mean by "retrieve"?	19:54
	→ Darcidride joined	19:54
bewbs	the information in it	19:54
johnw	so, you can always checkout that branch at any time, if your working tree is in a good state	19:55
	or, you can copy your repository to another place, wipe out its changes, and then checkout that branch	19:55
	← nnyk_ left	19:55
johnw	the point of the merge is to combine the work done in feature with the current state of the project	19:55
bewbs	i appreciate your help	19:55
	→ wallyduchamp joined	19:55
johnw	good luck!	19:55
bewbs	thank you	19:55
	and i appreciat eyour patience	19:55
_ikke_	johnw: thanks for helping him	19:55
	→ ajustrun joined	19:56
johnw	my heart goes out to anyone who is frustrated with Git while trying to get real work done	19:56
	← HelloAtMega left	19:56
bewbs	the number of people who know how to use git, and the number of people who use git, are two very different numbers	19:56
	← mac_ified left	19:56
bewbs	the truth is, git is not hte appropriate medium for hte work i'm doing, but i'm forced to use it	19:56
	even though my version will be different from master greatly much of hte time	19:57
gtristan	bewbs, be thankful you have not been exposed to CVS :)	19:57
bewbs	i miss svn	19:57
	rgiht click > ignore	19:57
	done	19:57
	svn will remember not to touch that file again	19:57
gtristan	bewbs, git has .gitignore as well, so did cvs	19:58
johnw	bewbs: oh, do you want to maintain a set of local changes that should never be pushed? In a sense, maintaining a local fork?	19:58
gtristan	you are probably missing your GUI frontend for SVN	19:58
	not SVN itself :)	19:58
bewbs	basically, there's files i don't want it to ever touch or care about	19:58
	i added them into .git-ignore	19:59
johnw	there is a file, .git/info/exclude, where you can name files that locally Git should ignore	19:59
bewbs	but it didn't ignore them	19:59
gtristan	I dont believe there is a hyphen in that	19:59
	it's just .gitignore	19:59
	→ HelloAtMega joined	19:59
bewbs	you're right	19:59
	.gitignore	19:59
	the files and their paths are listed	19:59
johnw	.gitignore is committed to the project, but .git/info/exclude is entirely local	19:59
bewbs	but they still become conflicts	19:59
johnw	I'm not sure that even .git/info/exclude will ignore files that are currently being tracked by Git	19:59
	← saidi left	20:00
bewbs	when i do a git stash pop, and it displays conflicts	20:00
	does that mean everything that isn't a conflict made it back in?	20:00
johnw	there are two scenarios there	20:00
bewbs	cause when i check, some of htem did	20:01
	but i can't be sure all did	20:01
johnw	in the first, it applied the stash with merge conflict markers	20:01
	in the second, it abort applying the stash	20:01
	"git status" should tell you which of the two occurred	20:01
bewbs	mid apply	20:01
	it does	20:01
	however with this many modified files	20:01
	→ aard_ joined	20:01
johnw	bewbs: ok, here's a command you might like: git update-index --skip-worktree FILENAME	20:01
	described more fully here: http://devblog.avdi.org/2011/05/20/keep-local-modifications-in-git-tracked-files/	20:02
bewbs	it's not practical to see with human eyes	20:02
	with hundreds of files	20:02
	i've googled this a hundred times	20:03
	i'm reading now though	20:03
gtristan	bewbs, what is it exactly you are trying to accomplish using git ? generally speaking	20:03
bewbs	get some updates that others have pushed, while maintaining my own version	20:04
gtristan	of code ?	20:04
bewbs	yes	20:04
	when i have updates that are good for the "central" purpose, i push them	20:04
	← wallyduchamp left	20:04
bewbs	but there are many files that are suitable only to me	20:04
gtristan	and it happens to you regularly to have hundreds of files of unstaged changes ?	20:05
johnw	bewbs: what you describe is exactly my situation when tracking the "nixpkgs" repo	20:05
bewbs	i pull roughly monthly	20:05
	typically git stash, git pull, git stash pop	20:05
	every 2-3 months this issue comes up	20:05
gtristan	bewbs, but why do you have so many changes in a "stash" ?	20:05
bewbs	there are probably 200 commits a month	20:05
	because i don't know how to use git	20:06
gtristan	Ok	20:06
_ikke_	git stash is not a good way to do these kind of things	20:06
johnw	bewbs: I would recommend boning up on using branches to manage your workflow, rather than the stash; I've used both in similar scenarios, and while branches take a bit more work, they better conduce to sanity	20:06
bewbs	i know it's not the ideal situation	20:06
gtristan	First thing, make sure you commit everything locally in your own tree before pulling from upstream	20:06
bewbs	but i have to merge the master into my branch somehow	20:06
johnw	for example, maintain a local branch named "mine", and merge origin/master into it from time to time	20:07
gtristan	Second, I think it's recommendable to always git pull --rebase	20:07
bewbs	which i had a text document that explained that, but i lost it	20:07
gtristan	not just git pull	20:07
	I.e., make sure that your changes always sit cleanly ON TOP of upstream changes	20:07
johnw	if you're in "mine", use: git fetch origin ; git merge origin/master	20:07
gtristan	not intermingled with them	20:07
	→ strayPuppy joined	20:07
johnw	anyway, I'll let gtristan recommend other workflows, lunchtime for me	20:07
	→ otter768 joined	20:08
gtristan	bewbs, but if you at least follow the first rule: Commit everything important to you before pulling, you will have a much better conflict resolution experience	20:08
	than when trying to resolve conflicts from a stash	20:08
bewbs	typically, with tortoisegit, it is not to bad	20:08
	← ncthom91 left	20:08
bewbs	usually i can go in, right click, resolve using hteirs, pull again, and done	20:08
	then go and re-edit the file	20:09
	however something happened this time where that is not the case	20:09
	i would like to know why	20:09
	why do these 28, out of hundreds, have a conflict that i can't resolve	20:09
gtristan	If you really want to know why, I would recommend using the CLI	20:09
	using a UI will most probably do "things" without telling you what it's doing	20:10
bewbs	cli is great, with the exception that it has limitations	20:10
	and is difficult to use when you're working with a LOT of files	20:10
	← subhojit777 left	20:10
	→ mizu_no_oto joined	20:11
gtristan	Not sure I follow, git cli works well with projects like xorg, libreoffice and linux kernel	20:11
	bewbs, the trick is to always commit small atomic commits which are self contained	20:11
	→ Noldorin joined	20:12
	→ jbudz joined	20:12
gtristan	or, sometimes you have a large changeset where you have a 2 line change to apply in 200+ source files	20:12
	that also still works well	20:12
	← italoacasas left	20:12
gtristan	But always make small commits that are relevant to a specific thing that you changed	20:12
	→ pozitron joined	20:12
	← zotherstupidguy left	20:12
bewbs	local commits	20:13
	→ italoacasas joined	20:13
bewbs	not to master	20:13
gtristan	It can be to master, sure	20:13
	remember that master is your master	20:13
bewbs	of branch	20:13
	→ jbudz_ joined	20:13
gtristan	committing to master does not effect the upstream project, unless you are allowed to push to that repository	20:14
	and then it only does when you actually push it	20:14
bewbs	i understand git conceptually, it's just hard to keep track of it all	20:14
	could you help me figure out why one of these commits won't go away?	20:14
	can i delete files from a stash?	20:15
	so it wont' try and bring htem in?	20:15
gtristan	its 5am, I'm not sure I can make it that far	20:15
bewbs	np, i understand	20:15
gtristan	no, I dont think you can delete files from a stash	20:15
	← robbyoconnor left	20:15
bewbs	so i need to revert to the version i was at where it wasn't a conflict	20:16
	revert it, then stash, hten pop	20:16
	← MechtiIde left	20:16
gtristan	stop using a stash as a means to carry changes which you care about, if you must, to work yourself out of a temporary situation, then recreate a new stash in the state that you want it to be	20:16
bewbs	i agree it's not great, but at the moment i'm under a timeline	20:16
	once it's working, i can work on a better solution	20:16
gtristan	I would honestly work it out by hand	20:16
	← jbudz left	20:16
gtristan	again: git stash show -p > patchfile	20:17
bewbs	if i do that i can't scroll to the top	20:17
gtristan	edit patch file by hand, remove all the diffs against files you dont care about	20:17
	apply it without git, using "patch -p1 < patchfile"	20:17
bewbs	oh	20:17
gtristan	then you'll have the unstaged changes you want	20:17
	→ cheetah2 joined	20:17
bewbs	237kb	20:18
	← jmpp left	20:18
	→ yqt joined	20:20
	→ dreiss joined	20:20
	← thiago left	20:21
	→ MechtiIde joined	20:21
	← bronson left	20:21
	← cheetah2 left	20:22
	→ ash_workz joined	20:24
	← jbudz_ left	20:25
	→ jmpp joined	20:26
	← Infamous_ left	20:27
	→ Infamous joined	20:28
	→ ncthom91 joined	20:30
	← cdg left	20:31
	← otter768 left	20:31
	→ gusto joined	20:31
	→ boudiccas joined	20:33
	← MechtiIde left	20:33
	← ncthom91 left	20:34
	→ zotherstupidguy joined	20:34
	→ ril joined	20:35
	← Tryop88 left	20:35
	→ cheetah2 joined	20:36
	← jmpp left	20:36
	→ nilg joined	20:36
	← SrPx left	20:37
	→ cdg joined	20:37
	→ jmpp joined	20:40
	→ nfk\|laptop joined	20:42
	← hardenedapple left	20:42
	gaen → gaen[away]	20:43
boudiccas	If I git clone --recursive https://github.com/getpelican/pelican-themes initially, how can i update the repo [get a 'pull'?] on my computer please?	20:43
	← boudiccas left	20:44
	→ boudiccas joined	20:44
	← boudiccas left	20:44
	→ boudiccas joined	20:46
boudiccas	If I git clone --recursive https://github.com/getpelican/pelican-themes initially, how can i update the repo [get a 'pull'?] on my computer please?	20:46
	← zadock left	20:46
	← localuser- left	20:47
	→ localuser- joined	20:47
	→ faux___ joined	20:48
	→ SrPx joined	20:49
	→ jottr joined	20:49
_ikke_	What do you mean exactly?	20:49
	← zotherstupidguy left	20:49
johnw	boudiccas: if you cd into your pelican-themes working tree, just "git pull" should do it	20:50
boudiccas	ah, okay, thanks	20:50
	even though the branch master is not kept up-to-date?	20:51
johnw	I'm not entirely sure what you mean by that...	20:51
	I think "git pull" is what you want, but I'm now at 87% certainty	20:51
	← Sasazuka left	20:52
	← Arsonide left	20:52
boudiccas	the branch pulls in various git instances of various themes developed by different people, some are actively being worked on, and some are dormant, and the git clone --recursive pulkls in evryone's repo to start with. i'm looking for a over-all git command which will visit each repo in trun and update my main repo as necessary	20:53
johnw	ah	20:53
	git pull && git submodule update --init	20:53
boudiccas	ah thanks	20:53
	→ nour joined	20:53
johnw	or apparently: git pull --recurse-submodules	20:54
	→ wallyduchamp joined	20:54
	← jottr left	20:54
johnw	though I haven't used that way of doing it	20:54
	← SrPx left	20:54
	← wallyduchamp left	20:54
johnw	btw, save yourself some typing: git config --global alias.su 'git pull && git submodule update --init'	20:55
	now you can just type "git su" in future	20:55
boudiccas	su? sub-module update?	20:55
	→ SrPx joined	20:56
johnw	yep, "pull and update all SUbmodules" :)	20:56
boudiccas	ah thanks	20:56
	thought i recognised the nick, i know of you from emacs :)	20:56
	→ gopar joined	20:57
johnw	nice to meet you in the Gitverse :)	20:57
boudiccas	:)	20:57
	gaen[away] → gaen	20:57
boudiccas	git su Expansion of alias 'su' failed; 'git' is not a git command	20:59
	← _nadim left	20:59
	← waspinator left	20:59
johnw	this is from "git su" at the command-line?	21:00
	cat you "cat ~/.gitconfig", and be sure it looks like this:	21:00
	[alias]	21:00
	→ waspinator joined	21:01
johnw	su = git pull && git submodule update --init	21:01
boudiccas	this is whats in my .gitconfig su = git pull && git submodule update --init	21:01
	→ Felishia joined	21:01
Felishia	why can't I change my username?	21:01
	halp	21:01
	← elastix left	21:01
boudiccas	but if i try to use su then the terminakl thinks that i want sudo	21:01
Felishia	it's still the same no matters what I do	21:01
	on github btw	21:01
johnw	boudiccas: is that within an "[alias]" section?	21:01
boudiccas	ergo, change the command not to use su!	21:01
johnw	Felishia: #github may know better	21:02
	→ elastix joined	21:02
	← The_Phoenix1 left	21:02
boudiccas	yes	21:02
	← Felishia left	21:02
johnw	boudiccas: ok, then I am a bit mystified...	21:02
	← texasmynsted left	21:02
boudiccas	its debian	21:02
	← kaiza left	21:02
	← phaleth left	21:04
	← LeBlaaanc left	21:05
	→ wakd joined	21:08
	← WayToDoor left	21:08
	→ texasmynsted joined	21:08
	← cdg left	21:08
	→ LeBlaaanc joined	21:09
	← evanvarvell left	21:11
	→ namikr joined	21:11
	← cheetah2 left	21:12
	← weox left	21:12
	← texasmynsted left	21:12
	← localuser- left	21:12
	→ localuser- joined	21:13
	← faux___ left	21:13
	→ evanvarvell joined	21:13
	→ govg joined	21:14
	→ alanwill joined	21:15
	→ WayToDoor joined	21:15
	← Darcidride left	21:16
	← WayToDoor left	21:16
	→ nnyk_ joined	21:17
	→ texasmynsted joined	21:17
	→ WayToDoor joined	21:18
	→ Darcidride joined	21:19
	← WayToDoor left	21:19
	← arup_r left	21:19
	← beatdown left	21:20
	→ nour_ joined	21:20
	← LeBlaaanc left	21:21
	← diegoviola left	21:22
	→ bronson joined	21:22
	← nour left	21:22
	← gusto left	21:22
	← texasmynsted left	21:22
	→ LeBlaaanc joined	21:23
	← Jackneill left	21:24
	→ Sucks joined	21:24
	→ texasmynsted joined	21:25
	← skapunker left	21:25
	← abc123 left	21:26
	→ abc123_ joined	21:26
	← bronson left	21:27
	→ skapunker joined	21:27
bremner	boudiccas: please pastebin your .gitconfig; it looks like you mis the [alias] part	21:28
	→ ferr joined	21:29
	← localuser- left	21:29
	→ localuser- joined	21:29
	→ abc123 joined	21:30
	← abc123_ left	21:30
	abc123 → abc123_	21:30
	← nfk\|laptop left	21:30
	← texasmynsted left	21:30
	← namikr left	21:31
	← fscala left	21:31
	← Guest0 left	21:33
	→ sbasso joined	21:34
	→ fscala joined	21:34
	→ texasmynsted joined	21:34
	← mizu_no_oto left	21:35
	→ Tryop88 joined	21:36
	→ nfk\|laptop joined	21:36
	→ Guest0 joined	21:37
	← Tryop88 left	21:40
	→ abc123 joined	21:41
	← localuser- left	21:41
Seveas	johnw: boudiccas you'll need a ! at the start of that alias	21:41
	← abc123_ left	21:41
	abc123 → abc123_	21:42
	→ ahr3n joined	21:42
Seveas	otherwise git will interpret it as "git git pull '&&' git submodule update --init"	21:42
	→ Arsonide joined	21:44
	← nnyk_ left	21:44
	← nfk\|laptop left	21:45
	← Guest0 left	21:45
boudiccas	http://paste.debian.net/351893/	21:45
	→ spykins joined	21:46
	← aard_ left	21:46
	→ diegoviola joined	21:46
	→ nour__ joined	21:47
	← ahr3n left	21:47
	→ Burgerz joined	21:47
	→ daito joined	21:48
Seveas	boudiccas: line 37 needs an !	21:48
	subup = !git pull && git submodule update --init	21:48
boudiccas	ah, thanks	21:49
	← nour_ left	21:50
	→ Mannequin joined	21:52
	← daito left	21:52
	→ santi__ joined	21:53
	→ ciampix joined	21:55
	← santi_ left	21:55
	← clmsy left	21:56
	→ ahr3n joined	21:56
	← gaen left	21:56
	→ gaen joined	21:57
	→ Tryop88 joined	21:58
	→ skcin7 joined	22:00
	→ smw joined	22:02
	← elastix left	22:02
	← Kicer86 left	22:03
	← ahr3n left	22:04
	→ jottr joined	22:05
	← italoacasas left	22:09
	← nour__ left	22:09
	← jottr left	22:09
	← nydel07 left	22:10
	→ nydel07 joined	22:10
	← abc123_ left	22:10
	← Outsider__ left	22:12
	← raven-au left	22:13
	→ jmah joined	22:13
	← jmah left	22:13
	← spykins left	22:14
	← SrPx left	22:14
	← adiman left	22:17
	← Noldorin left	22:19
	← ash_workz left	22:21
	→ raven-au joined	22:22
	→ Hogofwar joined	22:22
	→ Noldorin joined	22:23
	← anchorite left	22:23
	← strayPuppy left	22:27
	← rubyonrailed left	22:28
	→ rubyonrailed joined	22:28
	→ _nadim joined	22:28
	← darkschneider left	22:29
	← happy-dude left	22:29
	→ otter768 joined	22:32
	→ keroro520 joined	22:33
	→ durham joined	22:34
	→ relipse joined	22:34
	← otter768 left	22:37
	← Darcidride left	22:37
	← keroro520 left	22:38
	→ mellernoia joined	22:38
	← mellernoia left	22:39
	→ mellernoia joined	22:39
	tterrag → tterrag\|away	22:39
	← Goplat left	22:44
	→ faux___ joined	22:44
	→ toogley joined	22:46
	← clemf left	22:46
	← mellernoia left	22:48
	→ macmod joined	22:48
	← faux___ left	22:49
	← Ahmed90 left	22:50
	← durham left	22:52
	← toogley left	22:53
	← LeBlaaanc left	22:56
	← s00pcan left	22:57
	→ LeBlaaanc joined	22:58
	→ s00pcan joined	22:59
	← nilg left	23:00
	← dopesong left	23:00
	→ ahr3n joined	23:00
	→ josuebrunel joined	23:02
	→ dopesong joined	23:02
	→ clemf joined	23:04
	← stamina left	23:04
	← ahr3n left	23:05
	← dopesong left	23:07
	← hhee left	23:08
	→ dopesong joined	23:09
	→ mcint joined	23:09
	← s00pcan left	23:10
	→ italoacasas joined	23:10
	← fahadash left	23:11
	→ s00pcan joined	23:12
	→ dopesong_ joined	23:17
	← dopesong left	23:17
	→ ash_workz joined	23:17
	→ frsk joined	23:18
	→ cagmz joined	23:19
	← Tryop88 left	23:19
	← gaen left	23:21
	→ gaen joined	23:21
	→ Evidlo joined	23:24
Evidlo	I submitted a pull request, but I need to make a change to it. Is the right way to make a new commit and rebase it onto the original pull request commit?	23:25
	← m0viefreak left	23:27
	→ m0viefreak joined	23:27
	← clemf left	23:27
	→ arescorpio joined	23:27
	← sulky left	23:27
	→ spykins joined	23:31
	→ oojacoboo joined	23:33
	→ clemf joined	23:33
	← LeBlaaanc left	23:33
	→ daito joined	23:34
	→ graSP joined	23:36
	← t0by left	23:36
	→ jottr joined	23:36
	→ jottr_ joined	23:38
	← daito left	23:39
	← jottr left	23:41
	← ciampix left	23:43
	← s00pcan left	23:43
	← lg188 left	23:44
	→ daito joined	23:45
	→ s00pcan joined	23:45
	← Burgerz left	23:48
	← Noldorin left	23:49
	← daito left	23:51
	→ dsdeiz joined	23:53
	→ jeffreylevesque joined	23:56
	← graSP left	23:57
	→ cdg joined	23:58
	← cdg left	23:59
	← s00pcan left	23:59

Logs Search ←Prev date Next date→

Channels Documentation