IRCloggy #git 2013-09-30

Provider of IRC logs since 2005.

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

	2013-09-30
	← goshawk left	00:00
	← cigarshark left	00:00
	← hyperair left	00:02
	→ carlos-huang joined	00:04
	→ kamikaz3 joined	00:04
	→ falconfox joined	00:04
	← kamikaz3 left	00:04
	← echo-area left	00:04
	→ torbjorn joined	00:05
	← svetlyak40wt left	00:06
	← raijin left	00:06
	→ svetlyak40wt joined	00:06
	→ hyperair joined	00:07
	← jstein left	00:08
	← svetlyak40wt left	00:10
	→ simesy joined	00:13
	← bodom left	00:15
	← FernandoBasso left	00:15
	← zarubin left	00:16
	→ raijin joined	00:16
	← mizu_no_oto left	00:16
	→ DolpheenDream joined	00:17
	← Sonderblade left	00:17
	← simesy left	00:18
	← Sysaxed left	00:19
	← Xiti` left	00:20
	→ Xiti joined	00:20
	→ zarubin joined	00:20
	→ ciampix joined	00:22
	← Swayz left	00:22
	→ chuckharmston joined	00:23
	→ wrouesnel joined	00:23
	← Davey left	00:24
	← jehaby left	00:24
	← Joshi3s` left	00:25
	← AWinterman left	00:25
	→ emergion joined	00:25
	→ breck7 joined	00:25
	← breck7 left	00:26
	← zarubin left	00:26
	→ causasui joined	00:26
	→ nox__ joined	00:28
	→ normanrichards joined	00:28
	→ curvedmark joined	00:29
	← curvedmark left	00:30
	→ acharlieh joined	00:39
	→ jasongeng joined	00:39
	→ Goplat joined	00:41
	← hyperair left	00:42
	→ rurufufuss joined	00:42
	← DonRichie left	00:43
	→ DonRichie joined	00:44
	← stamina left	00:45
	→ zarubin joined	00:47
	← travisstaton left	00:47
	← ciampix left	00:47
	← _nova left	00:48
	→ Swayz joined	00:49
	→ nafg_ joined	00:50
	← DolpheenDream left	00:55
	→ Norm__ joined	00:55
	← Norm_ left	00:55
	← osse left	00:56
	← nox__ left	00:56
	→ bwreilly joined	00:56
	← Swayz left	00:57
	← jason237 left	00:58
	→ osse joined	00:58
	→ rchavik joined	00:58
	→ breck7 joined	00:58
	→ dsdeiz joined	00:59
	→ alexander__b joined	00:59
	← apipkin left	00:59
	→ Sigma joined	01:00
	← petey left	01:01
	← breck7 left	01:01
	→ jason237 joined	01:04
	→ petey joined	01:05
	← shinnya left	01:05
	→ tmcmahon joined	01:05
	→ jayrobot joined	01:06
	← dsdeiz left	01:06
	← emergion left	01:07
	← chrisss404 left	01:07
	→ yhager joined	01:08
	→ outcoldman joined	01:08
	← outcoldman left	01:09
	← msheiny left	01:10
	→ dyng joined	01:11
	→ mribeirodantas joined	01:12
	→ simesy joined	01:14
	← tmcmahon left	01:15
	→ chrisss404 joined	01:15
	← Sigma left	01:17
	← wrouesnel left	01:17
	→ robbyoconnor joined	01:17
	→ dsantiago joined	01:18
	← simesy left	01:18
	→ pepper_chico joined	01:18
	← zarubin left	01:23
	← cads left	01:24
	← barneybook left	01:26
	→ Vampire0 joined	01:27
	→ luc__ joined	01:28
	→ echo-area joined	01:28
	← kukks left	01:29
	→ maqr joined	01:29
	← yhager left	01:29
	← Vampire0_ left	01:30
	← chuckharmston left	01:31
	→ chuckharmston joined	01:31
	← kalypso left	01:31
	← chuckharmston left	01:32
	→ hyperair joined	01:32
	→ Ephexeve joined	01:33
Ephexeve	Hey guys, when using git commit on a macos, I get this fatal: unable to auto-detect email address (got 'Ben@Ben-laptop.(none)')	01:33
	Any idea how to fix this?	01:33
	→ haarg joined	01:34
iveqy	Ephexeve: set the e-mail address for your user, man git conffig	01:34
gitinfo	Ephexeve: the git manpage is available at http://jk.gs/git.html	01:34
Ephexeve	iveqy: Yeah, I know, but I also wonder if there is any fix for this hostname thing	01:35
	any idea?	01:35
	→ AWinterman joined	01:35
	← PeterBooker left	01:36
grawity	I'm not sure if there is anything to fix – unless you have your own domain, in which case you could put it somewhere in the OS X IP/DNS configuration	01:36
	→ rakl joined	01:37
	← Orbitrix left	01:37
Andrevan	Ephexeve: there's nothing you can do about it, it's a holdover from the unix convention that your hostname would be running a mail server, but it doesn't	01:39
	← Ephexeve left	01:39
	← AWinterman left	01:40
	→ intripoon joined	01:40
SamB	grawity, Andrevan: wouldn't you fix that by specifying your email address explicitly in either the environment or your git config?	01:42
	→ Orbitrix joined	01:42
	← intripoon_ left	01:43
Andrevan	SamB: yep, someone said that, but he wanted to fix the auto-detection somehow	01:43
SamB	ah	01:43
Andrevan	I guess what I should have said was git config --email foo	01:44
	which is the command version of editing the config fil	01:44
	but I think that error tells you that	01:44
	← diegoviola left	01:44
	← petey left	01:45
	← haarg left	01:47
	← Davey__ left	01:48
	→ Davey joined	01:48
	← Davey left	01:48
	→ daito joined	01:48
	→ Davey joined	01:49
	→ Swayz joined	01:49
	→ Davey_ joined	01:51
	→ Guest82558 joined	01:54
	← CheckDavid left	01:54
	→ haarg joined	01:54
	← Swayz left	01:54
	Guest82558 → diegoviola	01:55
	← bunbury left	01:55
	→ _Norm_ joined	01:56
	← Norm__ left	01:56
	→ weiyang joined	01:57
	→ vishal joined	01:58
	→ Sigma joined	01:59
	→ spaceonline joined	01:59
	← pepper_chico left	01:59
	← rakl left	02:02
	→ AWinterman joined	02:10
	→ R1KRDO joined	02:11
	→ breck7 joined	02:12
	→ nilg joined	02:12
	← GT4066 left	02:13
	→ simesy joined	02:14
	← Sigma left	02:15
	← breck7 left	02:17
	→ rakl joined	02:17
	→ xjiujiu joined	02:18
	→ Sigma joined	02:18
	← rchavik left	02:18
	← simesy left	02:19
	→ harish_ joined	02:20
	→ breck7 joined	02:21
	→ petey joined	02:23
	→ rOOb joined	02:23
rOOb	hello all. I have a folder I dont want to track in git that contains a bunch of images. I had a gitignore setup to handle this but like a idiot I moved the folder and did not update my gitignore. I then did "git add ." which added the folder. I tried to do "git rm -r path/to/folder" to remove it...but git status still shows the files in the folder. How can I remove that folder from staged?	02:24
	← maroloccio left	02:25
	→ huoxito joined	02:28
BombStrike	what about "git reset path/to/folder" ?	02:28
rOOb	BombStrike I think I needed a --cached to my rm	02:28
	→ owen1 joined	02:28
rOOb	It seems like tha tworked	02:28
BombStrike	oh yeah	02:29
	← maqr left	02:29
	→ minim joined	02:29
	← rakl left	02:31
	← breck7 left	02:32
	← thierryp left	02:33
	← woollyams left	02:33
	→ breck7 joined	02:34
	← Dougie187 left	02:36
	→ woollyams joined	02:37
	← breck7 left	02:39
	← cmpera left	02:40
	→ pdurbin joined	02:41
	← spaceonline left	02:43
	→ Jayhawker07 joined	02:45
	→ breck7 joined	02:46
	→ PaulCapestany joined	02:47
	→ dsdeiz joined	02:48
	← Jayhawker07 left	02:48
	→ rchavik joined	02:49
	→ alexim joined	02:49
	← joki- left	02:49
	→ Swayz joined	02:50
	← minim left	02:54
	→ joki joined	02:54
	← Swayz left	02:54
	← tinti left	02:56
	← _Norm_ left	02:56
	→ _Norm_ joined	02:56
	← dsdeiz left	02:57
	← harish_ left	02:57
	→ harish joined	02:58
	→ dsdeiz joined	02:58
	← breck7 left	02:59
	← Devastator left	02:59
	← macabre left	02:59
	← owen1 left	03:00
	← ryez left	03:00
	→ _BJFreeman joined	03:01
	_BJFreeman → BJfreeman	03:02
	← donmichelangelo left	03:03
	→ donmichelangelo joined	03:04
	→ Lunatrius joined	03:04
	← ehmatthes left	03:06
	← Risto- left	03:07
	→ Devastator joined	03:07
	→ mintyFresh joined	03:07
	← mintyFresh left	03:08
	← preflex left	03:08
	→ preflex_ joined	03:08
	→ mintyFresh joined	03:08
	← mintyFresh left	03:08
	preflex_ → preflex	03:08
	← jason237 left	03:09
	→ Swayz joined	03:10
	← rchavik left	03:11
	→ JustinMac joined	03:15
	→ simesy joined	03:15
	→ breck7 joined	03:17
	→ maroloccio joined	03:18
	← AWinterman left	03:18
	← simesy left	03:19
	→ aldodelgado joined	03:21
	→ jason237 joined	03:22
	→ ewnd9 joined	03:23
	→ bruce-zu joined	03:24
	← breck7 left	03:25
	→ ryez joined	03:26
	→ Joellius joined	03:27
	← petey left	03:27
	→ thehodapp joined	03:28
	→ mj12albert joined	03:30
	← R1KRDO left	03:31
	→ petey joined	03:31
	→ cmpera joined	03:32
	← vigs left	03:32
	← mribeirodantas left	03:34
	→ Gamecubic joined	03:37
	← woollyams left	03:37
	← ewnd9 left	03:39
	→ ewnd9 joined	03:39
	→ woollyams joined	03:39
	← weiyang left	03:40
	← cmpera left	03:41
	← the_cybersphinx left	03:41
	→ jon_r joined	03:41
	→ Skrypter joined	03:41
	← Sigma left	03:41
	→ Sigma joined	03:42
	→ breck7 joined	03:42
	← Sigma left	03:46
	→ minim joined	03:47
	→ mizu_no_oto joined	03:48
	→ Sigma joined	03:49
	→ fairuz joined	03:50
	→ goshawk joined	03:50
	← Joellius left	03:51
	→ cmpera joined	03:51
	← cmpera left	03:53
	← jasongeng left	03:53
	← alexim left	03:54
	→ Norm__ joined	03:56
	← _Norm_ left	03:56
	← bmac left	03:57
	← Sigma left	03:57
	← acharlieh left	04:03
	← BJfreeman left	04:03
	← thehodapp left	04:05
	← Swayz left	04:08
	→ vigs joined	04:08
	→ rfoust joined	04:08
	→ Tommy[D] joined	04:08
	→ nitrix joined	04:10
	nitrix → Guest86095	04:10
	← Guest86095 left	04:11
	→ Guest86095 joined	04:11
	← Tommy[D]_ left	04:11
	← mizu_no_oto left	04:11
	→ GarethAdams joined	04:12
	Guest86095 → nitrix	04:12
	← Skrypter left	04:13
	→ mj12albe_ joined	04:14
	← mj12albert left	04:14
	← maroloccio left	04:14
	← Gamecubic left	04:15
	→ simesy joined	04:15
	→ Swayz joined	04:16
	← aldodelgado left	04:17
	→ aldodelgado joined	04:20
	→ cmpera joined	04:20
	← simesy left	04:20
	→ thehodapp joined	04:21
	→ dfanjul joined	04:27
	→ arvind_khadri joined	04:27
	← thehodapp left	04:28
	→ maleknet joined	04:28
	← daito left	04:29
	← cmpera left	04:29
	→ daito joined	04:30
	→ ehmatthes joined	04:32
	← ehmatthes left	04:32
	← daito left	04:34
	→ jehaby joined	04:34
	← CKyle left	04:37
	← breck7 left	04:39
	→ galaris joined	04:39
	→ JesseCW joined	04:40
	→ ndngvr` joined	04:41
	← carlos-huang left	04:41
	→ thehodapp joined	04:41
	← huoxito left	04:42
	→ graphitemaster joined	04:42
	→ Moult_ joined	04:42
	→ corsair__ joined	04:42
	→ georgl_ joined	04:42
	→ Davey__ joined	04:42
	→ iaj_ joined	04:43
	→ breck7 joined	04:43
	→ milieu_ joined	04:43
	→ BBonifield_ joined	04:43
	→ bede_ joined	04:43
	→ machouin1rd joined	04:43
	→ ivan\_ joined	04:43
	→ neobii_ joined	04:44
	→ meLon joined	04:44
	→ d1b_ joined	04:44
	→ weltall2 joined	04:44
	→ steme_jomps_ joined	04:44
	→ Kicer joined	04:44
	→ helgikrs joined	04:44
	→ BinGOs_ joined	04:44
	→ mitz__ joined	04:44
	→ dasrecht_ joined	04:44
	→ mrgrieve1 joined	04:44
	→ cagedwisdom_ joined	04:44
	→ asedeno_ joined	04:44
	→ turboroot_ joined	04:44
	→ revyd joined	04:44
	→ harish_ joined	04:44
	→ Borbus_ joined	04:44
	→ Pyrogerg_ joined	04:44
	→ chris2_ joined	04:44
	→ Fissure1 joined	04:44
	→ Kryigero1e joined	04:44
	→ Katafalkas joined	04:44
	→ babilen_ joined	04:44
	→ PaulePan1er joined	04:45
	→ ToxicFrog_ joined	04:45
	→ Kronuz_ joined	04:45
	→ paulweb5151 joined	04:45
	→ bbloom_ joined	04:45
	Fissure1 → Fissure	04:45
	→ ToothlessGear_ joined	04:48
	→ schlumpi_ joined	04:48
	→ cebor_ joined	04:48
	→ SeySayux_ joined	04:48
	← harish left	04:49
	← nilg left	04:49
	← Davey left	04:49
	← milieu left	04:49
	← cagedwisdom left	04:49
	← Pyrogerg left	04:49
	← homer91 left	04:49
	← bgerber left	04:49
	← twoface88 left	04:49
	← ToxicFrog left	04:49
	← BinGOs left	04:49
	← tirengarfio left	04:49
	← steme_jomps left	04:49
	← machouinard left	04:49
	← igalic left	04:49
	← Moult left	04:49
	← turboroot left	04:49
	Kronuz_ → Kronuz	04:49
	weltall2 → weltall	04:49
	ivan\_ → ivan\	04:49
	→ Bucciarati joined	04:49
	→ rchavik joined	04:49
	← raijin left	04:50
	→ WAA6I4Q joined	04:52
	→ iAsterisk joined	04:52
	→ dob joined	04:52
	→ igalic joined	04:52
	→ bgerber joined	04:52
	→ WAA6I4Q joined	04:52
	← iAsterisk left	04:56
	← dob left	04:56
	← igalic left	04:56
	← bgerber left	04:56
	← Norm__ left	04:56
	→ Norm__ joined	04:56
	→ farn joined	04:56
	→ daito joined	04:56
	→ covi joined	04:57
	→ tirengarfio joined	04:57
	→ stkrzysiak joined	04:57
	← Swayz left	04:57
covi	I am in a git repo initialized by a svn repo. Every time I do 'git checkout -', a SVN-style msg is displayed. And some git functionality seems to be missing. What's wrong?	04:57
	→ CKyle joined	04:59
milki	cant really tell what that means	04:59
	covi: !repro	04:59
gitinfo	covi: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	04:59
	← daito left	05:01
	→ DrZaius joined	05:02
	→ WAA6I4Q joined	05:02
	→ iAsterisk joined	05:02
	→ dob joined	05:02
	→ igalic joined	05:02
	→ bgerber joined	05:02
	→ h0bbit_ joined	05:02
	→ thierryp joined	05:06
	→ beautifulmind joined	05:07
	← SHyx0rmZ left	05:07
	← beautifulmind left	05:08
	← fridim_ left	05:09
	→ beautifulmind joined	05:09
	→ daito joined	05:10
covi	milki: http://pastebin.com/V8B6gUqa	05:10
	← thehodapp left	05:10
covi	milki: it really feels like a svn. but there's no .git/svn dir	05:11
	← breck7 left	05:11
	← chrisshattuck left	05:11
	→ thehodapp joined	05:11
	← petey left	05:11
	→ chrisshattuck joined	05:12
	← maestrojed left	05:12
thiago	covi: there's nothing wrong in that output	05:12
	covi: except for the non-standard shorthand for checkout. It's usually "co".	05:13
	← machouin1rd left	05:14
	← JustinMac left	05:14
	→ simesy joined	05:16
	← chrisshattuck left	05:16
	← nwertman_ left	05:16
covi	thiago: really?!	05:17
thiago	covi: really	05:17
	there's nothing wrong	05:17
covi	thiago: but if I had change some file in A, and I _did not_ commit it, then I immediately checkout to B, and the (tracked) file still has the uncommitted changes.	05:19
	→ jceb joined	05:20
	← simesy left	05:20
thiago	covi: right	05:20
covi	I thought git would warn me about this, or _at least_ display the B's version, without the changes?	05:20
thiago	covi: !float	05:22
gitinfo	covi: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	05:22
thiago	warn you about what?	05:23
	there's no point in warning about expected and correct behaviour	05:23
covi	thiago: I see	05:24
	thiago: I think it's because I haven't run into this scenario before and it challenged my intuition.	05:24
	That's very hepful, thansk.	05:24
	*helpful	05:24
	thanks*	05:24
	→ ThomasLocke joined	05:27
	← CKyle left	05:27
	← flippo left	05:29
	← thierryp left	05:32
	→ chairabanta joined	05:32
	← jehaby left	05:33
	← Vile left	05:34
	→ shuaib joined	05:34
	→ Vile joined	05:36
	→ longbeach joined	05:36
	← Vile left	05:37
	← m0viefreak left	05:38
covi	thiago: now that I run into it	05:38
	thiago: is there a doc for this behavior? also for the formats of the report? (M/D/A, etc)	05:38
	← revyd left	05:39
thiago	covi: man git-status	05:39
gitinfo	covi: the git-status manpage is available at http://jk.gs/git-status.html	05:39
thiago	see the part about the short output	05:39
	→ barneybook joined	05:39
	→ ciampix joined	05:39
	→ svetlyak40wt joined	05:39
	← dyng left	05:41
	← normanrichards left	05:41
	→ bousquet joined	05:43
	→ dyng joined	05:44
	← chairabanta left	05:49
	→ simesy_ joined	05:50
	→ jargon joined	05:51
	← ewnd9 left	05:52
	→ hoschi joined	05:53
	→ xxpor joined	05:54
	← zbcm left	05:55
	← Norm__ left	05:56
	→ _Norm_ joined	05:56
	→ GT4066 joined	05:57
	→ jaseemabid joined	05:58
	← Caritade left	05:58
	→ khurram joined	05:59
khurram	hi every one	05:59
	← rchavik left	06:00
bousquet	khurram: hi	06:00
	← chepre left	06:00
khurram	i have setup a git repository on my local computer from which my collegues are cloning and pushing the changes back . Every thing is working fine except i when login as git user do not see the repository files ? can some one please throw light where are they getting managed ?	06:00
_ikke_	khurram: It's probably a bare repository?	06:01
	→ quazimodo joined	06:01
	→ pantsman joined	06:01
khurram	_ikke_: yes it is	06:01
	← pantsman left	06:01
	→ pantsman joined	06:01
khurram	_ikke_: where the files of bare repository are stored ? so that if i need to resolve conflickts ?	06:02
bousquet	that would be my guess too. you shouldn't be working in that repo. you should clone it to your own machine and then push/pull changes	06:02
	the files of a bare repo are in .git like any other repo, just not checked out into a working dir	06:03
	← diegoviola left	06:03
khurram	bousquet: thanks , so i need to actually make a clone some where and then pull the changes into my local and resolve conflict and push them back right ?	06:04
	← daito left	06:04
	← jon_r left	06:05
_ikke_	khurram: You merge locally, yes.	06:05
bousquet	khurram: correct, that's usually how its' done. usually the bare repo is on a server everyone is accessing via the git user, not on your local machine	06:05
	when you clone that repo (to yourself), you should see it as a remote via: git remote -v	06:06
	→ TomyLobo joined	06:07
	← simesy_ left	06:08
	→ ayaz joined	06:08
	→ simesy joined	06:09
	← Milossh left	06:11
	← nicedice left	06:12
	← Goplat left	06:13
	← longbeach left	06:13
	→ mindriot101 joined	06:13
	← mindriot101 left	06:13
	← harish_ left	06:14
	→ carlos-huang joined	06:14
	← beautifulmind left	06:14
	→ Milossh joined	06:16
	← bwreilly left	06:17
	→ thehodapp1 joined	06:21
	→ breck7 joined	06:21
	→ soee joined	06:22
	→ beautifulmind joined	06:22
	→ zarubin joined	06:22
	← thehodapp left	06:23
	← pantsman left	06:24
	← breck7 left	06:26
	→ harish_ joined	06:27
	→ mindriot101 joined	06:28
	← akurilin left	06:30
	← mindriot101 left	06:31
	← tpollard left	06:33
	→ user258467 joined	06:33
	→ arjun_ joined	06:33
	← aldodelgado left	06:33
	← mishok13 left	06:34
	← simesy left	06:34
	← arjun_ left	06:34
	→ daito joined	06:34
	→ machouinard joined	06:35
	← daito left	06:36
	→ daito joined	06:36
	→ ewokchewy joined	06:37
	← ewokchewy left	06:38
	← babilen_ left	06:40
	→ fragje joined	06:40
	→ thierryp joined	06:41
	→ babilen joined	06:41
	← babilen left	06:41
	→ babilen joined	06:41
	→ ewokchewy joined	06:42
	← ewokchewy left	06:42
	→ rath joined	06:42
	→ Streward joined	06:43
	→ leeN joined	06:43
	→ GeertV joined	06:43
	→ papegaaij joined	06:45
	PaulePan1er → PaulePanter	06:47
	→ akiva joined	06:47
	→ fRAiLtY- joined	06:47
	→ simesy joined	06:47
	← PaulCapestany left	06:50
	→ alexbligh joined	06:50
	→ johnlcox joined	06:50
	→ SonicX joined	06:51
	← BinGOs_ left	06:53
	→ BinGOs joined	06:54
	→ hahuang61 joined	06:54
	← TomyLobo left	06:55
	→ Caritade joined	06:55
	← _Norm_ left	06:56
	→ _Norm_ joined	06:56
	← thehodapp1 left	06:57
	← dhruvasagar left	06:57
	→ netiul joined	06:58
	→ thehodapp joined	06:58
	→ mishok13 joined	06:58
	← Bosox20051 left	06:58
	→ Advocation joined	06:58
	→ dhruvasagar joined	06:59
	→ jnavila joined	07:00
	→ cbreak-work joined	07:00
	← vigs left	07:01
	← vishal left	07:02
	← Caritade left	07:02
	→ vishal joined	07:02
	← cbreak-work left	07:03
	→ kbart joined	07:03
	→ evg2108 joined	07:05
	→ Sirolf joined	07:05
Sirolf	Goodmorning	07:06
_ikke_	hello	07:07
Sirolf	is this the right channel to ask about branching an Android Project in eGit ?	07:07
	→ Squarism joined	07:07
	← _Norm_ left	07:08
jast	there's probably not a better channel... that said, most of us use the official git	07:08
	← geomyidae left	07:08
	→ druonysuse joined	07:09
	← beautifulmind left	07:10
	→ geomyidae joined	07:10
Sirolf	okay.. my simple question is that right now we're working together on one project an basicly just use the master branch. This is no problem as long as we communicate about who is working on what to keep things synchronised. If I start using a new branch and work on the MainActivity while someone else does .. will eGit be able to sync itself?	07:11
	→ rchavik joined	07:11
Sirolf	EGit is just the Eclipse pluging for normal/official git right?	07:12
moritz	Sirolf: if you edit the same lines in the same file, you'll have to resolve the resulting merge conflicts yourself	07:12
	→ h_kon joined	07:12
moritz	(or even adjacent lines in the same file)	07:13
	→ koda joined	07:13
Sirolf	moritz: okay, but what if I just edit a different method ... one that is untouched by others ?	07:13
moritz	Sirolf: then the merges go fine automatically	07:13
Sirolf	okay hmm	07:14
	thanks I'll try that then :-)	07:15
	← rchavik left	07:16
	← woollyams left	07:16
	→ babilen_ joined	07:18
MouseTheLuckyDog	Is there a way to "diff" two repositories?	07:19
	→ _nova joined	07:19
canton7	MouseTheLuckyDog fetch one into the other. diff as normal	07:19
MouseTheLuckyDog	canton7, ?	07:20
	→ rafeca joined	07:20
	← babilen left	07:20
	→ dreiss joined	07:20
	→ harobed_ joined	07:20
canton7	MouseTheLuckyDog, what sort of diff are you after? I'm assuming the repos are related, i.e. have a common root?	07:20
fairuz	MouseTheLuckyDog: Add repo B as a remote in repo A, fetch, then do normal diff	07:20
	→ arjun_ joined	07:21
	← arjun_ left	07:21
	→ OOPMan joined	07:21
	→ arjun_ joined	07:21
	← arjun_ left	07:22
	→ arjun_ joined	07:22
MouseTheLuckyDog	canton87, I'm looking for a diff of the revision structures not individual files.	07:23
	→ gua_ould joined	07:23
	← vishal left	07:23
canton7	MouseTheLuckyDog, what exactly do you mean by that? diff of directory structures?	07:23
khurram	i have a small confusion	07:23
	→ vishal joined	07:23
canton7	the difference between their history graphs?	07:23
	*between graphs of their histories	07:24
	← gua_ould left	07:25
	→ gua_ould joined	07:26
	→ cbreak-work joined	07:26
	← goshawk left	07:26
	← Katafalkas left	07:27
	← quazimodo left	07:27
	→ sqlnoob joined	07:27
	→ thehodapp1 joined	07:27
	← thehodapp left	07:29
	← cbreak-work left	07:29
	← carlos-huang left	07:29
	→ doev joined	07:30
	→ rchavik joined	07:30
	→ angelsl joined	07:30
	→ mdiers joined	07:32
	← nafg_ left	07:32
	→ carlos-huang joined	07:32
	→ freestyl3r joined	07:32
	→ ryxai joined	07:32
	← simesy left	07:35
	→ sparq_ joined	07:35
	← mdiers left	07:35
	→ nafg joined	07:36
	→ sidus joined	07:38
	← harish_ left	07:38
	← netiul left	07:39
	← jnavila left	07:40
	→ jnavila_ joined	07:40
	→ diverdude joined	07:40
	→ mindriot101 joined	07:40
diverdude	is it possible to havegit send an email whenever a push is madeto master?	07:40
_ikke_	diverdude: yes	07:41
	diverdude: man githooks	07:41
gitinfo	diverdude: the githooks manpage is available at http://jk.gs/githooks.html	07:41
	→ juril joined	07:41
	← nafg left	07:42
	→ alorence joined	07:42
	→ frgtn joined	07:43
	← bousquet left	07:44
	← D9_ left	07:44
	→ Misan joined	07:45
	← xjiujiu left	07:45
	→ babilen joined	07:46
	← mindriot101 left	07:46
	← minim left	07:46
	← svetlyak40wt left	07:46
	→ Asenar joined	07:46
	→ psoo joined	07:47
	→ simesy joined	07:47
	← druonysuse left	07:48
	← babilen_ left	07:48
	→ Soliton joined	07:49
	→ mindriot101 joined	07:50
	← dhruvasagar left	07:50
	→ harish_ joined	07:51
	→ dhruvasagar joined	07:52
	→ ndngvr joined	07:52
	← boudiccas left	07:52
	← sqlnoob left	07:53
	← ndngvr` left	07:53
	← arjun_ left	07:53
	→ arjun__ joined	07:53
	← arjun__ left	07:53
	← ismlages left	07:54
	← SonicX left	07:56
	← carlos-huang left	07:58
diverdude	when i do git status, will it also check if local master is behind origin master?	08:01
	→ G0re joined	08:02
_ikke_	diverdude: It will check against your local remote tracking branch, it will not contact the remote	08:03
diverdude	_ikke_, ah ok...is there a way to see if anything has been pushed to origin?	08:03
	→ dc5ala joined	08:04
_ikke_	just git fetch	08:04
	→ babilen_ joined	08:05
	← TDJACR left	08:05
	→ sqlnoob joined	08:05
	← babilen left	08:06
	→ _Qman joined	08:07
	← harish_ left	08:07
	→ jave joined	08:07
diverdude	_ikke_, but then it will also actually download the changes	08:07
	would it be possible to just peek?	08:07
_ikke_	yes, is that a problem?	08:07
	← h0bbit_ left	08:07
_ikke_	It's usually fast enough	08:07
	← Milossh left	08:07
diverdude	_ikke_, true	08:09
_ikke_	git ls-remote can peek, but you have to compare the hashes yourself	08:09
	← dsdeiz left	08:09
	→ dsdeiz joined	08:10
diverdude	yeah i think fetch is great..it does not merge automatically...so it will have the effect that iwanted..namely to look through the changes before i apply them	08:10
	→ h0bbit_ joined	08:11
	← sqlnoob left	08:11
diverdude	but what happens if i do fetch and then fetch again assuming 2 updates were pushed without merging manually. Are the 2 fetches then merged first or will i have to merge first fetch #1 and then fetch #2?	08:11
	→ sqlnoob joined	08:11
	← alexander__b left	08:12
	→ alexander__b joined	08:12
	← nemesit\|znc left	08:13
	← jiangenj left	08:14
	→ twoface88 joined	08:14
	→ konadr joined	08:14
	← dreiss left	08:15
_ikke_	It just needs to append the new changes to the old changes, nothing needs to be merged	08:16
	→ kewah joined	08:16
	→ nemesit\|znc joined	08:17
	← twoface88 left	08:17
	→ Sonderblade joined	08:18
	→ carlos-huang joined	08:18
	→ iokill joined	08:19
	← nemesit\|znc left	08:21
	← konadr left	08:22
	→ konadr joined	08:22
	→ yezariaely joined	08:25
	→ cilly joined	08:26
	← Sonderblade left	08:26
	→ mikecmpbll joined	08:26
	→ titosemi4 joined	08:26
	← mindriot101 left	08:27
	→ nemesit\|znc joined	08:27
	← dhruvasagar left	08:28
	← nemesit\|znc left	08:28
	→ nemesit\|znc joined	08:28
	→ dhruvasagar joined	08:29
	→ mindriot101 joined	08:30
	→ subhojit777 joined	08:31
	→ Slush- joined	08:31
	→ noname001 joined	08:32
	→ jasonroyle joined	08:32
	→ Norm_ joined	08:33
	→ Plummer joined	08:34
	← zarubin left	08:35
	→ noname001__ joined	08:37
	← noname001 left	08:37
	← sparq_ left	08:37
	→ twoface88 joined	08:38
	← thiago left	08:39
	← twoface88 left	08:40
	→ simesy_ joined	08:42
	→ gua_ould_ joined	08:43
	→ tatsuya_o joined	08:43
	→ papegaaij_ joined	08:43
	→ rath_ joined	08:44
	← rath_ left	08:44
	→ rath_ joined	08:44
	→ sqlnoobmode joined	08:44
	← sqlnoob left	08:44
	← dc5ala left	08:44
	← simesy left	08:44
	← alorence left	08:44
	← gua_ould left	08:44
	← mishok13 left	08:44
	← papegaaij left	08:44
	← rath left	08:44
	← jceb left	08:44
	← DrZaius left	08:44
	← iAsterisk left	08:44
	← dob left	08:44
	← igalic left	08:44
	← bgerber left	08:44
	gua_ould_ → gua_ould	08:44
	→ gerberb joined	08:45
	→ jceb joined	08:45
	→ igalic joined	08:45
	→ mishok13 joined	08:45
	→ DrZaius joined	08:46
	→ dob joined	08:46
	← Asenar left	08:46
	→ menace joined	08:47
	→ howlymowly joined	08:47
	← jaseemabid left	08:47
	→ Katafalkas joined	08:47
	→ curvedmark joined	08:48
	← curvedmark left	08:48
	→ kerrick joined	08:49
	→ alorence joined	08:49
	→ iAsterisk joined	08:49
	→ Joellius joined	08:52
	→ lb1a joined	08:53
	chris2_ → chris2	08:53
	← nemesit\|znc left	08:54
	→ jkremser joined	08:54
	← jkremser left	08:54
	→ jkremser joined	08:54
	→ ewnd9 joined	08:54
	← evg2108 left	08:54
	→ matteo joined	08:55
	→ maroloccio joined	08:55
	← jnavila_ left	08:55
	→ jnavila_ joined	08:56
	← cilly left	08:56
	→ nemesit\|znc joined	08:56
	← gerberb left	08:57
	→ gerberb joined	08:58
	→ dc5ala joined	08:58
	→ Asenar joined	08:59
	← simesy_ left	08:59
	→ netiul joined	09:01
	← dhruvasagar left	09:01
	← Advocation left	09:02
	→ fairuz1 joined	09:03
	← fairuz1 left	09:03
	→ dhruvasagar joined	09:03
	← fairuz left	09:05
	→ khushildep joined	09:07
	→ cbreak-work joined	09:07
	→ rudak joined	09:08
	→ RaceCondition joined	09:08
	← sqlnoobmode left	09:08
	← nutron left	09:09
	→ simesy joined	09:10
	← rchavik left	09:11
	→ LimeBlast joined	09:11
	→ pfFredd joined	09:12
	→ Stygia joined	09:12
	→ irqq_ joined	09:12
	→ fragje_ joined	09:12
	→ sqlnoobmode joined	09:13
	← irqq left	09:13
	→ LLckfan joined	09:13
LLckfan	I am trying to reconnect my Magnavox MBP 5120 blu-ray player to my Linksys routers wifi (which I have done before without trouble) and I am getting DHCP cannot be acquired. I have change the IP Address to manual on the blu-ray player without changing the IP address itself and no error. I have checked the routers settings and DHCP is enabled. Is there a way to fix this?	09:13
	← fragje left	09:15
	→ nbrosnahan joined	09:18
	← nbrosnahan left	09:18
_ikke_	LLckfan: You are in #git	09:18
LLckfan	So	09:22
	← Georg3 left	09:22
	← frgtn left	09:22
jast	have you tried turning it off and on again?	09:23
LLckfan	yes	09:23
jast	seriously, though. most wi-fi implementations are seriously buggy and hardly compatible	09:23
	not getting two devices connected via wi-fi is pretty much normal	09:23
LLckfan	It has been connected	09:24
jast	not to the point you can actually use it, obviously	09:24
LLckfan	I could use it	09:24
	As a matter of fact I ented and watched a movie though it	09:24
	→ threesome joined	09:24
jast	so it's just DHCP issues?	09:25
	doesn't sound particularly serious... annoying at most	09:25
	some kind of bug in one of the two devices... not unusual either	09:25
	you could try looking for firmware updates, of course	09:26
	→ beautifulmind joined	09:26
	← beautifulmind left	09:26
lb1a	i bet this is an emergency case of https://en.wikipedia.org/wiki/Troll_%28Internet%29	09:26
LLckfan	I have motre then two device	09:26
	_ikke_ looks confused to channel topic	09:28
	→ stamina joined	09:28
	→ nbrosnahan joined	09:28
	→ barneybook\|2 joined	09:28
	→ beautifulmind joined	09:28
	← barneybook left	09:30
	→ chronossc joined	09:31
	→ beepbeep_ joined	09:32
niko	LLckfan: do you think #git and #bitcoin are accurate channel for your question ? i doubt.	09:32
	→ VictorCL joined	09:33
iveqy	LLckfan: !smart_q	09:33
gitinfo	LLckfan: [!smart_questions] You should read http://www.catb.org/esr/faqs/smart-questions.html on how to improve asking and recieving help from the open source community. It will greatly benefit you and you'll get results faster.	09:33
beepbeep_	Workflow kind of question. I have two feature branches both created from the develop branch. Now one feature relies on the second feature. I want to merge one feature branch in the other. At the end of the road, both feature branches will be merged back into develop. Will this cause problems?	09:33
_ikke_	No, this should not cause any problems	09:34
beepbeep_	great! :)	09:34
_ikke_	though, you only need to merge one branch into master	09:34
beepbeep_	well no, after I merge one feature in the other, both features will still be further developed	09:35
	→ asQuirreL joined	09:35
_ikke_	right, well, it should not cause problems	09:35
beepbeep_	cool :)	09:36
_ikke_	It might be that history looks a little weird though	09:36
beepbeep_	Is there a better way to do these kind of things?	09:37
	← rudak left	09:38
	→ Django23 joined	09:38
	← khurram left	09:38
	← GT4066 left	09:38
	← babilen_ left	09:39
lb1a	beepbeep_, merge only when the feature is complete. after that create new branches if there are further improvments?	09:39
Django23	Hello everyone. I need to remove the history of my GIT repo. I used http://git-scm.com/book/ch6-4.html and other solution, but it lose the commit dates because of the rebase. Is there a way to truncate the history? Or to Squash all old commits without rebase?	09:40
	← carlos-huang left	09:41
iveqy	Django23: do you want to remove your history or squash your history?	09:41
Django23	One of both will work	09:41
lb1a	iveqy, maybe he want's to get ridd of the commit messages only. then truncate or squash would help.	09:41
	← jnavila_ left	09:42
iveqy	Django23: you can either delete the .git-directory, all your history and your git repo would be lost.	09:42
lb1a	Django23, but since a git commit always represents the whole history that lead to this status quo, no you cant change the history without affecting the current commit	09:42
iveqy	Django23: or you can do a rebase and squash them. You can alter the commit date with man git commit, however, why is a new commit-date a problem?	09:42
gitinfo	Django23: the git-commit manpage is available at http://jk.gs/git-commit.html	09:42
Django23	iveqy: I needed to be more specific. I need to remove/squash all commits prior to date X	09:42
hyperair	graft that commit to nothing	09:43
	→ Xethron joined	09:43
iveqy	Django23: then use git rebase	09:43
	→ jnavila_ joined	09:43
Django23	ivan: It's what i thought. I need to rebase 1600+ commits, and it is giving me tons of merge conflicts	09:43
ivan	iveqy: ^	09:44
	← mindriot101 left	09:44
Django23	And wrong commit dates	09:44
_ikke_	grafting is easiest, but it still involves rewriting history	09:45
hyperair	Django23: do you have any specific commit you can cutoff at?	09:45
	Django23: if you have, try echoing the commit hash into .git/info/grafts	09:45
	just that	09:45
	and then git log	09:45
	if you like that history, run git filter-branch --tag-filter cat	09:45
iveqy	Django23: and how many "new commit" do you have?	09:45
hyperair	and then remove .git/info/grafts	09:45
Django23	hyperair: Thats interesting. I'm gonna try that	09:46
iveqy	Django23: out of curiousity, why are you doing this? It sounds really stupid to throw away history	09:46
	→ TDJACR joined	09:46
Django23	So it just hides it, but it's still there ;)	09:46
hyperair	Django23: graft changes the parentage of a commit	09:46
	← thierryp left	09:46
_ikke_	Django23: Yes, but that only works for the local repository (until you filter branch it)	09:47
	← Pyrogerg_ left	09:47
hyperair	Django23: each line in the grafts file looks like: <commit-to-change> <parent1> <parent2> <parent3>	09:47
	→ thierryp joined	09:47
Django23	iveqy: Let's say I need to show that we used git only since last year	09:47
hyperair	Django23: by omitting the parents, you've made it the root commit	09:47
	Django23: and by filter-branch'ing, it makes the change permanent	09:47
Django23	hyperair: I will try your solution right away	09:48
	← echo-area left	09:48
iveqy	Django23: sounds like yet an other case of stupid management issues =(, well good luck. If you've a straigth line git history there's other ways to do this if you fail with hyperair's suggestion	09:49
_ikke_	hyperair: does --tag-filter exist?	09:49
	hyperair: my man doesn't mention it	09:49
hyperair	_ikke_: doesn't it?	09:49
_ikke_	only --tag-name-filter	09:49
hyperair	whoops	09:49
	--tag-name-filter	09:50
	hyperair just typed it from memory	09:50
hyperair	and filter-branch is ridiculously unhelpful with invalid command line options	09:50
_ikke_	--tag-name-filter cat	09:50
hyperair	yeah that	09:50
	if you try to get smart using --tag-name-filter=cat, it fails with no error messages	09:50
	wonderful	09:50
	hyperair wants further	09:50
hyperair	s/wants/rants/	09:51
Django23	iveqy: It is definetly stupid management issue. Sometimes I just can;t persuade by.	09:51
	them*	09:51
hyperair	lol	09:51
	Django23: by the way, rebase deals very badly with merges. it tends to linearize your history	09:52
	Django23: and even if you use -p, you usually have to fix your merge conflicts	09:52
	and good luck to you if you accidentally broke rerere but committing a wrong merge conflict resolution	09:52
	=p	09:52
	← simesy left	09:53
	→ frgtn joined	09:54
	← maleknet left	09:55
	→ jaseemabid joined	09:56
	→ arjun_ joined	09:56
	← Sirolf left	09:57
	→ Pyrogerg joined	09:57
	→ fffelix joined	09:59
	← thierryp left	09:59
	→ thierryp joined	09:59
Django23	hyperair: It works great	10:01
	→ the_cybersphinx joined	10:01
hyperair	great :)	10:01
Django23	hyperair: Is did not follow your explanation to make in permanent	10:02
hyperair	Django23: erm then your history will stick around and you won't be able to push it properly	10:02
	Django23: if you don't run filter-branch, your history's just hidden, and only on the local repository	10:03
	→ ph88 joined	10:03
Django23	Oh, i got i	10:03
	it	10:03
ph88	when i type my commit message on the command line, how do i make a new line in the message ?	10:03
_ikke_	the grafts file will not get pushed	10:03
Django23	Perfect. I have it like i want it.	10:03
	Thanks a lot	10:03
hyperair	heh okay	10:04
_ikke_	ph88: If you wrap your message around quotes, just press enter	10:04
Django23	Thanks to hyperair, iveqy and _ikke_	10:04
	→ sr78ger joined	10:04
fffelix	Hi, I've got a best practice question: I want to fork a github repository and add some changes and a feature from another gh repository. Do I just clone rep2 into rep1 or do I create a fork of rep2 as well?	10:06
	→ mchqwerty joined	10:06
ph88	thx _ikke_	10:07
fffelix	The feature I want to use from repo2 is basically just a validator	10:07
_ikke_	fffelix: Are those two repo's related?	10:07
	→ maleknet joined	10:07
fffelix	_ikke_: no, they're not	10:08
	← jaseemabid left	10:08
fffelix	They both handle geojson objects	10:08
_ikke_	You don't need to fork unless you want to make pull requests. So if you only want changes from the other github project, you don't need to fork	10:08
ph88	i have forker a project and now made a patch on my version ... how can i make the PR on the original project (not mine) when i click new pull request i get a screen to compare branches ??	10:08
fffelix	_ikke_: great, thanks!	10:09
	→ svetlyak40wt joined	10:09
	→ aChatir joined	10:09
	← aChatir left	10:09
	→ masteews joined	10:09
	← masteews left	10:09
ph88	oh i found it	10:10
	there is a link for forks !	10:10
	← mchqwerty left	10:13
	← Kulrak left	10:14
	← asQuirreL left	10:14
	← svetlyak40wt left	10:16
	→ babilen joined	10:16
	→ Kulrak joined	10:16
	→ chairabanta joined	10:17
	← h_kon left	10:17
	← Kulrak left	10:18
	← maroloccio left	10:19
	→ asQuirreL joined	10:21
	→ svetlyak40wt joined	10:22
	→ cads joined	10:22
	→ Kulrak joined	10:22
	← Kulrak left	10:22
	→ Kulrak joined	10:22
	→ maroloccio joined	10:23
	← fffelix left	10:25
	← fragje_ left	10:25
	← mikecmpbll left	10:26
	→ mizu_no_oto joined	10:26
	← arjun_ left	10:26
	→ tinti joined	10:29
	← thehodapp1 left	10:30
	← svetlyak40wt left	10:33
	← konadr left	10:33
	← rurufufuss left	10:33
	→ JosephFerano joined	10:33
	→ konadr joined	10:34
	← PParth left	10:34
	→ svetlyak40wt joined	10:34
	← dharriga1 left	10:36
	→ dharriga1 joined	10:36
	→ Kabaka joined	10:36
	dharriga1 → dharrigan	10:36
	← sqlnoobmode left	10:37
	→ fragje joined	10:37
	→ deuterium joined	10:37
	← fragje left	10:37
	→ arjun_ joined	10:38
	← Misan left	10:38
	→ mikecmpbll joined	10:41
	← svetlyak40wt left	10:42
	← hyperair left	10:43
	→ rurufufuss joined	10:46
	→ Misan joined	10:47
	→ HenryG joined	10:47
	→ Element9 joined	10:48
	← vishal left	10:49
	← konadr left	10:49
	→ konadr joined	10:50
	← Squarism left	10:51
	→ sqlnoobmode joined	10:52
	← sqlnoobmode left	10:52
	← Element9 left	10:53
	← Joellius left	10:53
	← earny left	10:53
	→ earny joined	10:53
	→ sqlnoobmode joined	10:53
	← maroloccio left	10:53
	← konadr left	10:53
	→ maroloccio joined	10:53
	→ normanrichards joined	10:54
	→ konadr joined	10:54
	→ mklappstuhl joined	10:54
	→ Element9 joined	10:54
	← igalic left	10:56
	→ igalic joined	10:56
	← paulweb5151 left	10:56
	← konadr left	10:56
	→ konadr joined	10:57
	→ khurram joined	10:57
	→ cff joined	10:58
	← konadr left	10:59
	→ konadr joined	11:00
	→ mdiers joined	11:00
	← OOPMan left	11:00
	rath_ → rath	11:01
khurram	hi	11:02
	← sqlnoobmode left	11:02
_ikke_	hello	11:03
khurram	how can i force the master to get updated with the code from my local repository and don''t complain about any conflicts ?	11:03
	→ simesy joined	11:03
	→ huoxito joined	11:03
_ikke_	Which master?	11:03
khurram	_ikke_: i cloned and fetch the code from repository A, i have repository B created with --bare option and all the collegues are fetching and pushing to repository B, I want to update repository B with the latest changes from repository A without any complains is it possible ?	11:04
_ikke_	khurram: You can't without potentially overwriting history from you colleagues	11:05
	Can you explain what you want to achieve?	11:05
iveqy	khurram: !public	11:05
gitinfo	khurram: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	11:05
	← Asenar left	11:05
	→ Asenar joined	11:05
	→ tsdh joined	11:06
khurram	iveqy: actually the Repository B with the --bare option is just there for pulling the code there is nothing going to be pushed back	11:06
iveqy	khurram: you just said that you collegues are fetching and pushing from/to B	11:07
	khurram: listen to _ikke_, what do you want to achieve?	11:07
khurram	_ikke_: my collegues will be making patches on their local and they need a public place to pull only , no merging of code, no commits	11:07
	→ Squarism joined	11:07
khurram	iveqy: yeah they did it for testing but they wont be pushing instead making a git patch	11:07
iveqy	khurram: however to do what you ask for you just go into your clone of repo B, add repo A as a remote (man git remote) and then push that to A (man git push)	11:07
gitinfo	khurram: the git-remote manpage is available at http://jk.gs/git-remote.html	11:07
	khurram: the git-push manpage is available at http://jk.gs/git-push.html	11:07
	← simesy left	11:08
iveqy	khurram: making a git patch? What is that? And where will this patch be sent?	11:08
	← chairabanta left	11:09
khurram	But i do not want my Repository A to get any changes from Repository B either , i did not wanted to give access directly to Repository A. So i have created repository B with --bare option , so i want to pull from Repository A into Repository B everyday for the collegues to pull the fresh code	11:09
	← beautifulmind left	11:10
khurram	iveqy: patches will be sent by email	11:10
iveqy	khurram: why don't you just give read accress to repo A?	11:11
	access*	11:11
khurram	repo A is working through my private keypair and i do not want anyone to pull or push back to Repo A because that is client's repository ,	11:12
	iveqy: so for safety reasons i wanted to clone repo A into repo B and allow access to repo B only for pulling the code	11:12
	← diverdude left	11:13
	← kcj left	11:13
iveqy	khurram: look at clone --mirror (man git clone)	11:14
gitinfo	khurram: the git-clone manpage is available at http://jk.gs/git-clone.html	11:14
	→ Milossh joined	11:14
	← Milossh left	11:14
	→ Milossh joined	11:14
khurram	iveqy: can i clone from two different sources ?	11:15
iveqy	khurram: no	11:15
khurram	iveqy: i am confused with the repository i created with --bare option . This repository should be clone of repository A but how do i clone into it ?	11:15
iveqy	khurram: you can fetch from two different sources	11:16
khurram	iveqy: ok lemme try	11:16
iveqy	khurram: and you should clone A direct to create B	11:16
	→ spaceonline joined	11:18
khurram	iveqy: how to do that	11:18
	← jkremser left	11:18
	→ kalypso joined	11:19
	← Milossh left	11:19
	→ malkomalko joined	11:19
	← daito left	11:20
	→ echo-area joined	11:21
	→ OOPMan joined	11:21
	← luc__ left	11:21
	→ Milossh joined	11:21
	→ hyperair joined	11:21
	← Milossh left	11:22
	→ Milossh joined	11:22
iveqy	khurram: git clone --mirror B	11:23
	or I mean A	11:23
	→ sqlnoobmode joined	11:23
khurram	iveqy: i do git fetch/pull inside RepositoryA and can i push the updated things to RepositoryB from A ?	11:24
iveqy	khurram: no	11:25
	khurram: let's say you've a repo A that you want to have a mirror of. Just do git clone --mirror A to get a mirror of it called B	11:25
	and then you're done	11:25
khurram	iveqy: thanks, ok so i need to be inside RepositoryB and then from there i need command git clone --mirror RepositoryA right ?	11:25
iveqy	khurram: repo B doesn't exists before you've done the clone	11:26
khurram	iveqy: i need to have the updates reflected in RepositoryB which every collegue is accessing	11:26
	→ PeterBooker joined	11:27
	← sqlnoobmode left	11:28
	→ chairabanta joined	11:28
	← Riz__ left	11:30
	← dc5ala left	11:30
	→ mindriot101 joined	11:32
	← ewnd9 left	11:34
iveqy	khurram: then goto repo B and fetch from repo A	11:34
	khurram: or wait, I think you can solve it with:	11:35
	git remote update	11:35
	→ cmpera joined	11:36
	← Devastator left	11:36
	→ Devastator joined	11:37
	← ciampix left	11:37
	← jcromart_ left	11:37
	→ starfox21 joined	11:38
	→ herdingcat joined	11:38
starfox21	hey guys, I am not sure what I did but today git started asking me for the passphrase for my rsa key every time I push or pull to my repo on github. Any clue why this is happening?	11:39
	← barneybook\|2 left	11:40
	← chairabanta left	11:40
moritz	starfox21: probably your ssh-agent died	11:40
cbreak-work	starfox21: can you not ssh-add it?	11:40
sonOfRa	^	11:40
moritz	starfox21: to an 'ssh-add -l' on the command line	11:40
	starfox21: what does it say?	11:40
starfox21	moritz: ssh-add -l says "Could not open a connection to your authentication agent."	11:41
	→ kukks joined	11:41
	← kukks left	11:41
	→ kukks joined	11:41
	← Entomo left	11:41
	→ Risto- joined	11:42
moritz	starfox21: then you have two options: 1) log out, and log in again (will most likely restart an ssh-agent for you)	11:43
	2)	11:43
	run 'ssh-agent', and copy&paste its output into all terminals you use	11:44
	→ svetlyak40wt joined	11:44
	← svetlyak40wt left	11:44
	← mklappstuhl left	11:44
starfox21	moritz: why did this happen? this is a tmux session that has been open for a while now (thought this could be relevant)	11:44
moritz	starfox21: no idea; maybe some process gobbled up all memory, and the OOM killer took ssh-agent to its grave	11:46
	← asQuirreL left	11:46
moritz	or ssh-agent had a bug which made it die	11:46
	or a stray 'killall' killed it	11:46
starfox21	moritz: thanks	11:47
	→ kwmiebach joined	11:47
	→ jaseemabid joined	11:47
khurram	iveqy: git remote update ? is thats all ?	11:48
	← Stygia left	11:51
	→ emmajane joined	11:52
	← netiul left	11:53
	→ shinnya joined	11:53
	→ srji joined	11:53
	← doev left	11:53
	→ doev joined	11:54
	→ introom joined	11:54
	← maleknet left	11:55
	→ netiul joined	11:55
	→ adex_ joined	11:56
	→ cannonball joined	11:57
	→ YoungFrog joined	11:57
	→ carlos-huang joined	11:59
	→ Expi1 joined	11:59
	→ Stygia joined	12:00
	← Kabaka left	12:01
	← Expi1 left	12:01
	← pfFredd left	12:01
	→ Expi1 joined	12:01
iveqy	khurram: I'm not 100% sure about that one, !tyit	12:02
	← carlos-huang left	12:03
	→ carlos-huang joined	12:03
	← Devastator left	12:03
	→ Devastator joined	12:03
moritz	!tias ?	12:03
gitinfo	Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/1-basic-usage/tias.html may help with git-specific TIAS.	12:03
ph88	hey i make my commit with --author and i see in the git log it's the right auther ... but when i push my commit i suddenly see my global set name (on travis-ci) ... why is that ??	12:04
iveqy	moritz: thanks	12:04
_ikke_	ph88: There are two author fields on a commit: committer and author	12:04
	ph88: try git log --format=full	12:04
ph88	how do i change the commiter ?	12:04
	← rafeca left	12:05
moritz	by being somebody else	12:05
masak	harder than it sounds	12:05
	→ tvw joined	12:05
	→ dachary joined	12:05
iveqy	masak: what?	12:06
	ph88: look at the enviroment variables in man git	12:06
gitinfo	ph88: the git manpage is available at http://jk.gs/git.html	12:06
	← harobed_ left	12:06
_ikke_	One way is: git -c user.name=<name> -c user.email=<mai> git commit --amend	12:06
	← LLckfan left	12:06
iveqy	ph88: however, it sounds strange to try to be someone else	12:06
	→ rafeca joined	12:07
_ikke_	If you want to change more then one commit, git filter-branch should be used	12:07
	iveqy: One person could have multiple identities (personal and work) for example	12:07
ph88	is git -c an alias for git config ??	12:07
	→ LLckfan joined	12:07
	→ IrishPrime joined	12:07
_ikke_	No	12:07
	→ raijin joined	12:07
iveqy	ph88: no, see man git for what -c is	12:07
gitinfo	ph88: the git manpage is available at http://jk.gs/git.html	12:07
_ikke_	It just sets it for that specific command	12:07
	← LLckfan left	12:08
iveqy	_ikke_: that's true,	12:08
	_ikke_: however, isn't it unusual to have different identities onthe same project?	12:08
	_ikke_: it is possible to set an identity in the projects config	12:08
	→ Sirolf joined	12:09
_ikke_	sure	12:09
	But ph88 probably didn't know that	12:09
	→ tdm00 joined	12:09
	← Expi1 left	12:10
	→ harobed_ joined	12:10
	→ jkremser joined	12:10
	← jkremser left	12:10
	→ jkremser joined	12:10
iveqy	_ikke_: that's probably also true :)	12:10
	← khurram left	12:10
	→ Expi1 joined	12:11
YoungFrog	_ikke_: isn't the second "git" too much in your command (git -c ...) ?	12:11
	← mindriot101 left	12:11
	→ maleknet joined	12:11
	← mizu_no_oto left	12:11
ph88	thx guys :)	12:11
	→ mklappstuhl joined	12:11
	← Expi1 left	12:11
	← robbyoconnor left	12:12
	→ mizu_no_oto joined	12:13
	→ h_kon joined	12:13
	→ Kabaka joined	12:13
	← normanrichards left	12:16
_ikke_	YoungFrog: Yeah, my fingers sometimes do things on their own	12:17
	← malkomalko left	12:17
iveqy	_ikke_: so are we going to credit you or your fingers when you give good advice? ;)	12:18
	→ xobb joined	12:18
YoungFrog	yeah, have eyes+brain to control what hands do is time consuming. It's a pity we can't assume that hands to whatever we ask them. Let's request CCTV for supervising hands !	12:19
	← h_kon left	12:19
_ikke_	whaha	12:19
	iveqy: They're at least part of speed which I answer questions	12:19
	← dyng left	12:20
	→ ewnd9 joined	12:20
	← mklappstuhl left	12:20
_ikke_	But they're also responsible for the typo's	12:20
	← raijin left	12:21
	→ diverdude joined	12:21
	→ g0bl1n joined	12:22
	← Tuna-Fish left	12:25
	→ sqlnoob joined	12:25
	→ rudak joined	12:26
	← gerberb left	12:26
	→ tmcmahon joined	12:27
	← mizu_no_oto left	12:27
	→ pareidolia joined	12:27
	→ bgerber joined	12:27
	→ cmpera_ joined	12:28
	← cmpera left	12:28
	cmpera_ → cmpera	12:28
pareidolia	Hi all! I have one remote repo, but I can access it from two hostnames (LAN and from outside), only one works at a time. Is it wise to define two remotes for them? Is there another solution?	12:28
	→ Tuna-Fish joined	12:28
_ikke_	git does not care about hostnames	12:29
	What do you mean with only one working at a time?	12:30
	← tmcmahon left	12:30
	→ rnsanchez joined	12:31
	→ dougsland_ joined	12:32
	→ Fingolfin joined	12:33
	→ drager joined	12:33
cmn	you mean you can only access through one of the URLs depending on where you sit?	12:33
	you might want to set multiple urls for the remote	12:33
	→ simesy joined	12:34
cmn	pareidolia: ^^	12:35
	→ marhaban joined	12:35
	← hyperair left	12:36
	← lu_zero left	12:37
	→ lu_zero joined	12:37
	← lu_zero left	12:37
	→ lu_zero joined	12:37
Asenar	Hi, how can I get the content of "myfile.txt" from the sha1 32b4878 (I don't want to change the current file, something like "git cat <sha1> path/to/file"	12:38
iveqy	Asenar: man git show ?	12:39
gitinfo	Asenar: the git-show manpage is available at http://jk.gs/git-show.html	12:39
Asenar	git-show only show the diff	12:39
	← simesy left	12:39
Asenar	or maybe I will check the man page ...	12:39
	← rafeca left	12:39
moritz	Asenar: git show 32b4878:myfile.txt	12:40
Asenar	great ! thanks you	12:40
	where did you find that ?	12:40
	→ juniorsilva7 joined	12:40
	← mikecmpbll left	12:41
cmn	it should be in that manpage, or check man gitrevisions for the general document	12:41
gitinfo	the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	12:41
Asenar	I didn't see it in the man	12:41
pareidolia	cmn: Thanks, but i experimented with that a bit	12:41
	→ rchavik joined	12:41
	→ mikecmpbll joined	12:41
pareidolia	cmn: I might be doing something wrong, but it seems that one address not being accessible halts the whole show	12:41
	→ TheBrainWork joined	12:41
	← TheBrainWork left	12:41
	→ TheBrainWork joined	12:41
pareidolia	cmn: And I would need it to try the LAN address first	12:42
	← Django23 left	12:42
Asenar	ok, it's present at the end, in the EXAMPLES	12:42
cmn	I don't recall git stopping at the first bad one, but I haven't tried to use it in quite a while	12:42
	then you'll just have to use multiple remotes	12:43
echo-area	Does anyone use magit here? Can magit only annotate (blame) a file using git gui?	12:43
	← introom left	12:43
_ikke_	!gui	12:43
gitinfo	Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.	12:43
	→ simesy joined	12:43
	→ h_kon joined	12:44
	→ rafeca joined	12:44
echo-area	Okay.	12:44
	→ feorex joined	12:46
	→ Sysaxed joined	12:46
YoungFrog	echo-area: magit offers M-x magit-blame-mode	12:46
	← maleknet left	12:46
echo-area	YoungFrog: Thanks, lemme try	12:47
	→ paulweb515 joined	12:49
	→ Guest85894 joined	12:49
	← paulweb515 left	12:49
	→ schemanic joined	12:49
	→ CheckDavid joined	12:50
	← selckin left	12:50
	→ fluxdude joined	12:50
	→ geak joined	12:52
	← schemanic left	12:52
	← geak left	12:52
	→ xpe joined	12:52
	→ scampbell joined	12:53
	← cads left	12:53
	→ paulweb515 joined	12:54
	→ normanrichards joined	12:55
	← Fritz7 left	12:57
	→ ojacobson joined	12:57
	→ Fritz7 joined	12:57
	← pdurbin left	12:57
	→ kaosx joined	12:58
	→ geak joined	12:59
	→ macabre joined	12:59
	→ chuckharmston joined	13:00
	→ msafi joined	13:01
msafi	Can I delete things from a branch, but then when I pull it from my production server not have those things deleted?	13:02
_ikke_	nope	13:02
	← marhaban left	13:02
_ikke_	If you merge changes, you merge everything	13:02
	otherwise it's considered an 'evil' merge	13:02
	→ marhaban joined	13:03
	→ jnavila__ joined	13:03
	→ breakingthings joined	13:04
	← thierryp left	13:04
iveqy	msafi: why would you do that? Maybe there's an other way to achieve what you want	13:05
	← jnavila_ left	13:06
	→ barneybook\|2 joined	13:06
msafi	iveqy, I uploaded my generated documentation to my GitHub repo, which inflated my language stats. I want to now delete the docs folder from the repo, but I don't want it deleted from production	13:07
	← barneybook\|2 left	13:07
	→ pbujok joined	13:07
	→ raijin joined	13:07
	→ barneybook joined	13:08
	← barneybook left	13:08
bsdbandit	good morning all	13:08
	→ barneybook joined	13:09
iveqy	msafi: it's generally a bad idea to track genereted content. I don't think there's a way to manipulate github language stats	13:09
	→ robinsmidsrod joined	13:09
iveqy	you could of course have a branch without those docs that you push to the github repo	13:09
msafi	iveqy, yes, I made the mistake of tracking them. I'm thinking I will delete the files, pull, then generate them again on production.	13:10
	→ amcsi_work joined	13:10
_ikke_	That's the best option imo	13:10
	→ rchavik_ joined	13:11
	← rchavik left	13:11
	← jday_ left	13:11
msafi	Okay, I'll try that.	13:11
	rchavik_ → rchavik	13:11
	→ jerius joined	13:11
	→ harish_ joined	13:12
	← gitpicker left	13:12
	← raijin left	13:13
	→ raijin joined	13:13
	→ cmpera_ joined	13:14
	→ matanya joined	13:15
	→ hyperair joined	13:15
	← cmpera left	13:15
	cmpera_ → cmpera	13:15
	→ marthinal joined	13:15
	→ marjorip joined	13:15
	→ curvedmark joined	13:16
	← fuzzybunny69y left	13:16
	→ renumi joined	13:16
	← rfoust left	13:17
	← normanrichards left	13:18
	→ bmac joined	13:18
	← echo-area left	13:20
	→ dsdeiz_ joined	13:20
	← konadr left	13:20
	← raijin left	13:20
	→ mizu_no_oto joined	13:20
	→ eletuchy joined	13:20
	← Devastator left	13:20
	← Fingolfin left	13:21
	← shuaib left	13:21
	→ raijin joined	13:21
	→ Devastator joined	13:21
	→ konadr joined	13:21
	→ marhaban1 joined	13:21
	← xobb left	13:21
	← dsdeiz left	13:21
	→ xobb_ joined	13:21
	← tobscore left	13:22
	→ echo-area joined	13:22
	← marhaban left	13:22
	← menace left	13:22
	← konadr left	13:22
	← hyperair left	13:23
	→ konadr joined	13:23
	← dsdeiz_ left	13:24
	← yezariaely left	13:25
	← JosephFerano left	13:26
	→ fuzzybunny69y joined	13:27
	← fuzzybunny69y left	13:27
	→ fuzzybunny69y joined	13:27
	→ AaronMT joined	13:28
	→ CKyle joined	13:29
	← CKyle left	13:29
	← harish_ left	13:29
	← h0bbit_ left	13:29
	→ gitpicker joined	13:29
	→ travisstaton joined	13:29
	← travisstaton left	13:30
	→ Sonderblade joined	13:30
	→ mindriot101 joined	13:30
	→ magu\|q_ joined	13:30
	← Sonderblade left	13:30
	→ Sonderblade joined	13:31
	→ nailora joined	13:31
	← akiva left	13:31
	→ _goTAN joined	13:32
	← mindriot101 left	13:32
	→ pepper_chico joined	13:32
	→ tobscore joined	13:32
	← magu\|q left	13:33
	→ jophish joined	13:36
jophish	Yo yo yo	13:37
	→ thierryp joined	13:37
jophish	If I had a function which looks at a repository and returns true of false depending on whether the code passes all unit tests compiles without warnings, whatever...	13:38
	What's the standard procedure of making sure that code isn't checked in if it fails the script?	13:38
	→ nutron joined	13:38
jophish	have some kind of staging branch, and a script which continuously merges to the main branch as long as everything's ok?	13:39
iveqy	jophish: a pre-commit hook at the commiter side and a pre-recieve hook at the remote repo	13:39
	→ CKyle joined	13:39
	→ mmitchell joined	13:39
cmn	if anything, a hook in the main repo, but you probably don't want to make the devs keep work uncommitted just because it doesn't pass the tests	13:39
	→ iamjarvo joined	13:40
moritz	that's what branches are for, no?	13:40
	→ phile joined	13:40
	← iamjarvo left	13:41
	→ iamjarvo joined	13:41
	→ Destos joined	13:41
	→ gotogit joined	13:42
	gitinfo set mode: +v	13:42
gotogit	Hi all	13:43
	← mmitchell left	13:43
gitinfo	gotogit: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	13:43
gotogit	I need some help with git settings	13:43
	→ mmitchell joined	13:43
lov	that is unfortunate!	13:44
iveqy	gotogit: !ask	13:44
gitinfo	gotogit: Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.	13:44
	HicksD_ → HicksD	13:46
	→ Wolfspyre joined	13:46
	← fuzzybunny69y left	13:46
lb1a	!just_ask	13:46
gitinfo	You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)	13:46
	→ Jackneill joined	13:46
	← Jackneill left	13:46
	→ Jackneill joined	13:46
	← sqlnoob left	13:47
	← tango_ left	13:47
	→ GT4066 joined	13:47
	→ tango_ joined	13:47
	→ normanrichards joined	13:47
	← rchavik left	13:47
	← koda left	13:47
	→ sqlnoob joined	13:49
	→ saml joined	13:49
	← blindingdawn left	13:50
saml	git cherry is good. but there's no --stat (I want to list files in each commit). do I write a script?	13:50
gotogit	I have linux based distro and second person has windows. It is two different machines. Our small project is hosted on bitbucket. and something wrong with eol characters	13:50
saml	and do you rebase before publish your branch or before merge published feature branch (through github pull request)	13:51
iveqy	saml: git cherry isn't a git command. What's that? and isn't git log enough for a --stat?	13:51
	← VictorCL left	13:51
cmn	iveqy: yes, it is	13:51
	← msafi left	13:51
iveqy	cmn: wtf, you're right. How can I've missed that?	13:51
cmn	but what it does has nothing to do with diffstats; if you want to do also do that, then you'll need to parse the output and call show --stat or similar on each of the ones you want to look at	13:52
	← RaceCondition left	13:52
iveqy	gotogit: well, there's a lot of recommendations on how to use git to convert your lineendings. However I've never understood, that. Just configure your editors to use the correct lineendings you choose	13:52
	gotogit: otherwise see https://help.github.com/articles/dealing-with-line-endings	13:53
	→ TeckniX joined	13:53
saml	git cherry -v master dev \|grep DIG-22	13:54
	← soee left	13:54
	→ introom joined	13:54
saml	damn this cherry pick workflow	13:54
	→ Dougie187 joined	13:54
iveqy	saml: I've never seen cherry pick to be used in a workflow... What workflow are you using?	13:55
	maybe I can learn something more today =)	13:55
	← h_kon left	13:55
	→ nwertman joined	13:56
saml	push to dev. comment each commit with jira ticket number. when your ticket is accepted by product managers, cherry-pick those commits to master.	13:56
gotogit	+ivey: thank you! very helpful post	13:56
saml	not sure why product managers don't accept the entire dev branch including many features/bugfixes	13:56
	→ diegoviola joined	13:56
saml	another project does this: publish feature. set up a new integration environment. deploy the feature. wait until product mangers accept. merge the feature.	13:57
iveqy	saml: I would prefer you used a branch and when that branch got accepted, just merge that into master.	13:57
saml	and history looks awful to me	13:57
	← subhojit777 left	13:58
iveqy	I can't exactly say why you shouldn't use cherry-pick in your workflow, I've just heard a lot of people frustrating with it	13:58
	→ aChatir joined	13:58
saml	a lot of people is me	13:58
	i think it's waste of resource to spawn up a new environment per feature branch	13:58
iveqy	gotogit: still, look into your tools... If your editor open a file with \r\n and saves it with \n or just the other way around, you've a really crappy editor	13:59
	saml: why would that require a new enviroment?	13:59
saml	where would product managers accept my feature?	13:59
	→ eugenejen joined	13:59
	← sr78ger left	14:00
	← donmichelangelo left	14:00
	→ donmichelangelo joined	14:00
moritz	in their office?	14:03
	← Devastator left	14:03
iveqy	saml: instead of accepting a commit, they accept a branch which means all the commits, or they discard a whole branch because of one single commit	14:04
	a feature is often not correct or fully functional before all commits are applied	14:04
saml	they need a url to accept	14:04
	← GT4066 left	14:04
saml	it's web app	14:04
	→ masteews joined	14:05
	← huoxito left	14:05
iveqy	saml: well, then it depends on what webapp you're using of course	14:05
	→ tang^ joined	14:06
	← arand left	14:06
saml	we're using day cq5	14:06
	it's hard to start a new instance and migrate data	14:07
iveqy	saml: sorry to hear that. I don't have any advice for you on that, I've no experience in cq5	14:07
	→ caraconan joined	14:07
	← Pyrogerg left	14:07
	→ adac joined	14:07
	→ kcj joined	14:08
adac	this command does not write me out the newlines in the file: echo `git show "$commit":"Gemfile"` > "$file" Any ideas?	14:08
	→ petey joined	14:09
iveqy	adac: Gemfile does not has newlines?	14:09
	← Sysaxed left	14:09
	← sqlnoob left	14:09
	← caraconan left	14:09
adac	iveqy, it has	14:10
	← raijin left	14:10
	← petey left	14:10
	→ Chiko joined	14:10
	← spcshpopr8r left	14:11
	← tsdh left	14:11
	→ apipkin joined	14:12
	← matanya left	14:13
ojacobson	adac: the backticks spit out th econtents of $commit:Gemfile to bash, which then re-tokenizes them using $IFS to construct an argv for echo	14:14
	← kbart left	14:14
ojacobson	in the process, the newlines (which match $IFS) are discarded	14:15
	you wanted: git show "${commit}:Gemfile" > "${file}"	14:15
	→ GT4066 joined	14:15
onethfour	So i made the mistake of having a repository on production. Is there a way for me to merge the current branch into master without "leaving" the current branch (the moment i do a checkout master, the whole websit goes down)	14:15
	← CheckDavid left	14:15
	← CKyle left	14:16
muep	onethfour: copy the repository to some place that is not accessed by the web server, and then you are free to work on it however you want	14:16
	→ Swayz joined	14:16
	← Tuna-Fish left	14:18
	← tureba left	14:18
onethfour	that's a lot of bytes, the admin might be concerned....	14:18
	→ tureba joined	14:19
	→ acharlieh joined	14:19
onethfour	but to answer my question, couldn't I do 'git checkout master; git merge mybranch;' really quickly?	14:19
	← tang^ left	14:19
	→ petey joined	14:19
	→ harish_ joined	14:19
	→ tang^ joined	14:19
	← mmitchell left	14:19
moritz	and what do you do if there's a merge conflict?	14:20
	→ mmitchell joined	14:20
	→ rchavik joined	14:20
moritz	or if your ssh connection drops while you are at it?	14:20
onethfour	i'm pretty sure there won't be	14:20
moritz	can't you copy the repo to a different machine, and fix it there?	14:20
onethfour	maybe.... and then rsync it back?	14:20
	← boblee left	14:21
moritz	or push the merged master	14:21
	→ Pyrogerg joined	14:21
	→ Tuna-Fish joined	14:21
moritz	and then do a git remote update; git branch -D master; git checkout -b master origin/master	14:22
	which gives you the updated master in a single step	14:22
onethfour	oh i see, but right now there is no "remote"	14:22
moritz	uh	14:22
	so you develop on the production server?	14:23
	← adex_ left	14:23
	→ mindriot101 joined	14:23
tang^	!cs	14:23
gitinfo	"Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup	14:23
moritz	or where does the repo on the production server get its updates from?	14:23
	→ boblee joined	14:24
	→ Boohbah joined	14:24
onethfour	yeah i develop on production server	14:24
	thats why i said "i made the mistake of..."	14:24
	lol	14:24
	→ hholtmann joined	14:24
	← tureba left	14:24
	→ Entomo joined	14:24
	← hholtmann left	14:24
moritz	well, first step is to fix that	14:24
	← papegaaij_ left	14:24
	→ tureba joined	14:24
onethfour	i guess the problem is we don't have a dev. site	14:24
moritz	then the zeroth step is to fix THAT	14:25
onethfour	yeah that's true...its a pretty complex site it might be hard to do	14:26
	← Pyrogerg left	14:26
onethfour	ok how do i zip an entire github site?	14:26
	err i meant git	14:26
jeek	One tooth at a time.	14:27
onethfour	ok i think i'm going to go the easy rout	14:27
	← ayaz left	14:27
onethfour	and do git checkout master; git merge mybranch;	14:27
	does the site go down for a second or 2?	14:27
	while checking out?	14:27
	→ mike_af joined	14:28
pareidolia	q	14:28
	→ adex_ joined	14:28
	← pareidolia left	14:28
	→ mklappstuhl joined	14:28
	← OOPMan left	14:29
	← tureba left	14:29
	→ tureba joined	14:30
	→ boblee_ joined	14:30
YoungFrog	onethfour: I don't understand what you're saying. What is your exact setup ? What branch is the prod server on ? what other git repo do you have ?	14:30
moritz	onethfour: that pretty much depends on your site	14:30
	→ GODDOG joined	14:30
	→ LuxuryMode joined	14:30
moritz	onethfour: the more complex a site is, the more important it is to have multiple installations, so that when one breaks, you can still look at the setup of a working site to debug stuff	14:31
	onethfour: and of course automation becomes important	14:31
	→ matanya joined	14:32
	← marhaban1 left	14:33
	← boblee left	14:33
	← tureba left	14:35
onethfour	well i finally got the sysadmin to install git, so i made the entire production site a git repo, which i started creating a branch and modifying directly (to update the site live), but now i realize when i want to merge into master, the updates will go down for a few seconds while i checkout and merge	14:35
	→ tureba joined	14:35
	← nemesit\|znc left	14:36
	→ dsdeiz joined	14:36
onethfour	At this point......updating the site live is not a big deal as long as I know what I'm doing and I don't break anything	14:36
moritz	well, have fun with your fragile system	14:36
onethfour	i realize that is not the "right" way, but we have never gotten around to making another development site	14:37
	← rchavik left	14:37
	→ wdkevin joined	14:37
wdkevin	I was added to a project but I can't find where to assign milestones and/or labels to a project.	14:37
	← lb1a left	14:38
onethfour	wdkevin, this is #git, are you sure you didn't mean github?	14:38
	oh wait	14:38
	i guess there is tags	14:38
wdkevin	im sorry, i did mean github	14:38
	thank you onethfour	14:38
ohcibi	wdkevin: the issues tab is now on the right side of a repo	14:38
wdkevin	right. im looking at the issue i made. i just cant see where to assign a label to it.,	14:39
	← tureba left	14:40
	→ Devastator joined	14:40
	→ tureba joined	14:40
	→ Zarthus joined	14:41
	← GODDOG left	14:41
	← mikecmpbll left	14:41
	→ GODDOG joined	14:41
	→ DanielHollands joined	14:41
	← LimeBlast left	14:42
	→ hyperair joined	14:43
	← Squarism left	14:43
	→ buibex joined	14:43
	→ johnnyfuchs joined	14:43
	→ sabayonuser joined	14:45
	← tureba left	14:45
	→ tureba joined	14:45
	← sabayonuser left	14:46
	→ heeventuli joined	14:48
	← matanya left	14:49
iamtakingiteasy	hello, how it is possible to checkout to latest commit in master without local rebasing?	14:49
	i wish to take a look how master branch is seems from remtoe side	14:49
	← dsdeiz left	14:49
	← Norm_ left	14:49
onethfour	is there a way to set up any random machine as where we pull from/to?	14:49
iamtakingiteasy	i could fo corse just re-clone the repo in another dir	14:50
	but is there a better a way?	14:50
heeventuli	hey guys, i have a question about rebasing: i've a feature branch and we decided to do a rebase. i did a checkout of the fb, switched to it and did a "git rebase master"..had one conflict, solved it, pushed, everything nice and as expected. some hours later, an important change was pushed to master and we wanted to rebase again to get this change. now, if i do "git rebase master" again, i got a lot of conflicts, of almost all files that have been touched in	14:51
	the feature branch...am i doing anything stupid?	14:51
	→ Pyrogerg joined	14:51
	→ petey_ joined	14:52
	← arjun_ left	14:52
	← petey left	14:52
	← xpe left	14:53
	→ hholtmann joined	14:54
	→ arjun_ joined	14:54
	← dfanjul left	14:55
	← rue left	14:55
	← jceb left	14:56
	→ bwreilly joined	14:57
	→ RaceCondition joined	14:57
	← tureba left	14:57
	→ matanya joined	14:57
	→ milli joined	14:57
	→ tureba joined	14:57
	→ nemesit\|znc joined	14:57
	→ rue joined	14:58
	← dachary left	14:58
	→ taptapdan joined	15:00
	→ xpe joined	15:00
	→ ciampix joined	15:00
YoungFrog	do you rebase against your master or the remote master ?	15:01
	← adac left	15:01
	← w0ng left	15:01
YoungFrog	(probably a silly question, but since the chan looks otherwise silent...)	15:01
	← ciampix left	15:01
	← RaceCondition left	15:01
	→ ciampix joined	15:02
ojacobson	it depends on what you want the result to look like	15:02
	← Misan left	15:02
	→ King_Hual joined	15:02
	→ frankstallone joined	15:02
ojacobson	rebase operates on the commit graph, you use whichever name points to the part of the graph you care about.	15:02
	← nailora left	15:03
	← netiul left	15:03
	→ raijin joined	15:03
YoungFrog	ojacobson: I was trying to shed some light on heeventuli's problem (although in a not so efficient way)	15:04
	→ m0viefreak joined	15:04
ojacobson	oh, sorry	15:04
	I didn't scroll up, missed the context :)	15:04
	← ciampix left	15:04
ojacobson	mybad	15:04
	← beepbeep_ left	15:04
	→ robbyoconnor joined	15:07
	← ThomasLocke left	15:07
	→ dsdeiz joined	15:08
	→ Squarism joined	15:08
	← cff left	15:08
	← rafeca left	15:09
	→ ciampix joined	15:09
heeventuli	i used "git rebase master", but as i get the same conflicts when running "git rebase origin/master" ...here is what it looks like so far: http://pastebin.com/y0LymRHh	15:10
	→ RaceCondition joined	15:10
	→ CheckDavid joined	15:10
	← ciampix left	15:11
	→ marcio_ joined	15:11
	← petey_ left	15:11
	← adex_ left	15:11
	← LuxuryMode left	15:12
heeventuli	goes on with http://pastebin.com/4XFriruf ...some file, different conflict, i think that has to do with auto-merging fails..i can live with that, simple conflict	15:13
	→ petey joined	15:13
	← GeertV left	15:13
	← Xethron left	15:13
	← kpreid left	15:13
	← cbreak-work left	15:13
	→ abstrusenick joined	15:13
	→ kpreid joined	15:13
	→ LuxuryMode joined	15:13
	← spaceonline left	15:14
	→ CKyle joined	15:14
heeventuli	but after solving and "git rebase --continue", i get 4 conflicts that made no sense at all...like git is telling me that there is a conflict between the first version of the file in the feature branch and the head-version..	15:14
	→ thiago joined	15:15
	→ h34d3r joined	15:17
	← bmac left	15:17
	← Fandekasp left	15:17
	← ISF left	15:17
	← GT4066 left	15:17
	← juniorsilva7 left	15:17
	→ juniorsilva7 joined	15:18
ph88	how can you check if a patch already has been applied ?	15:18
	→ phile_ joined	15:19
HicksD	cherry	15:19
	https://www.kernel.org/pub/software/scm/git/docs/git-cherry.html	15:20
	→ dyng joined	15:20
	← mizu_no_oto left	15:20
	← phile left	15:21
	→ bmac joined	15:21
	← wdkevin left	15:21
	← iokill left	15:22
	→ emergion joined	15:23
	← phile_ left	15:23
	← chuckharmston left	15:23
	→ zsoc joined	15:23
	← Pyrogerg left	15:24
	← dyng left	15:24
zsoc	Hello. Version 1.7.1 - I have a git repo I just initiated on Server B. It's 'based' off code from Server A, but it was just FTP/copied there (instead of being cloned) by some doofus. Then it was edited (not heavily, but enough). So I initialized a repo there, added Server A as a remote, fetched. But Obviously I can't rebase because there's no history/common ancestry to rebase/merge based on (even tho 95% of the code base is identical). Should I be trying to graf	15:24
	t? Or git replace? Is there an easy fix for this I'm missing?	15:24
	→ queso joined	15:25
	→ jonnyro joined	15:25
jonnyro	When using submodules in git, do they all share a common blob store?	15:25
queso	How do I view a full file at a given hash instead of differences?	15:25
	→ phile joined	15:26
thegorn	queso: git show <sha1>:filename	15:26
queso	thegorn: Forgot the colon, thank you!	15:26
	← bmac left	15:26
zsoc	Wait, can I reset --soft to remote?	15:27
	→ mizu_no_oto joined	15:28
zsoc	No, I think that would overwrite all local changes.	15:28
	→ g41n joined	15:28
	→ infynyxx joined	15:28
milki	zsoc: you can git push to a remote. reset is a local only operation	15:29
	← kalypso left	15:29
	← _Qman left	15:29
	← RaceCondition left	15:29
zsoc	Hmm.. are you saying to add Repo B as a remote on Repo A? That seems backwards. I just tried a git reset --soft remote/A and it seemed to just overwrite all changes/make it match remote A	15:30
milki	zsoc: you should jsut make a new clone of server a. add the new tree from your server b	15:30
	commit	15:30
	→ dvor joined	15:30
milki	and then do !deploy instead	15:30
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/the-list-and-irc/deploy.html	15:30
	← dvor left	15:30
milki	because of !bare	15:30
gitinfo	an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/	15:30
zsoc	Make a new clone of server A. Add the new tree from server B. I'm not sure I follow that part.	15:30
milki	"add new tree" = cp files to the repo	15:31
	← arjun_ left	15:31
	← robbyoconnor left	15:31
	→ robbyoconnor joined	15:32
	← petey left	15:32
	→ lahwran joined	15:32
zsoc	milki, My "remote" (Server A) in this case is already a 'bare' 'deployment' repo. In the sense it's a hub repo that post-hooks to a webroot.	15:32
	→ petey joined	15:32
	← howlymowly left	15:33
	→ ciampix joined	15:33
zsoc	milki, Oh. So you're saying copy/overwrite these files to a new branch made on server A, so it'll have a common parent, and then clone it from there. That's too darn obvious.	15:33
	← Devastator left	15:33
	→ Devastator joined	15:33
	→ sr78ger joined	15:34
	← emergion left	15:34
	← sr78ger left	15:34
	← Devastator left	15:34
milki	that works. how you organize the repo is up to you. but you need to get your server b files in the repo somehow	15:34
	→ sr78ger joined	15:34
zsoc	yeah, i was looking at it the wrong way I guess. It needs a common parent to rebase/merge so why not just create a new branch from the original repo. Thanks.	15:35
milki	np	15:35
	→ cmeow joined	15:36
	← Chiko left	15:36
	→ vince_prignano joined	15:36
	← Sirolf left	15:37
	← DanielHollands left	15:37
	← juril left	15:37
	→ howlymowly joined	15:37
	← gua_ould left	15:37
	→ quazimodo joined	15:37
	← herdingcat left	15:37
	→ Muad`Dib joined	15:38
	→ qt-x joined	15:39
	→ r0bby_ joined	15:42
	← mdiers left	15:42
	← robbyoconnor left	15:42
	← alorence left	15:42
	→ chrob joined	15:43
	← ciampix left	15:43
	→ Devastator joined	15:43
	← Risto- left	15:44
	→ Risto- joined	15:44
	→ titosemi joined	15:45
	← titosemi4 left	15:45
	← apipkin left	15:46
	← r0bby_ left	15:46
	← ology left	15:47
	→ r0bby_ joined	15:47
	← thierryp left	15:47
	← Stygia left	15:49
	← jnavila__ left	15:49
	← titosemi left	15:49
	→ Gamecubic joined	15:50
	→ apipkin joined	15:50
	← rurufufuss left	15:50
	→ rudak1 joined	15:50
	← r0bby_ left	15:51
	← destiny left	15:52
	← Entomo left	15:52
	→ paddymahoney joined	15:52
	→ chuckharmston joined	15:52
	→ r0bby_ joined	15:52
	→ chimay joined	15:53
	← tinti left	15:53
	← rudak left	15:53
	→ gusnan joined	15:54
	→ shadok_ joined	15:54
zsoc	milki, Ok.. i'm still missing something. Now just 1 branch is ahead of the other and it doesn't matter which direction i merge/rebase in. It's just overwriting, not merging.	15:54
	→ tinti joined	15:54
	→ dvide joined	15:54
	→ yezariaely joined	15:55
	← breakingthings left	15:55
	→ Cromulent joined	15:55
	← Muad`Dib left	15:56
	← bwreilly left	15:57
	← carlos-huang left	15:57
	→ geak_ joined	15:58
	← tinti left	15:58
	← jargon left	15:58
	→ breakingthings joined	15:58
	→ adex_ joined	15:59
	→ infynyxx_ joined	15:59
	→ tinti joined	15:59
	← gotogit left	16:00
	← geak left	16:00
	→ Skrypter joined	16:00
	→ AWinterman joined	16:01
	← g41n left	16:02
	← nbrosnahan left	16:02
	← infynyxx left	16:02
	← tvw left	16:02
	← tinti left	16:02
	→ galaris2 joined	16:03
	→ rudak joined	16:03
	→ ureshk joined	16:03
	→ tinti joined	16:04
	← CKyle left	16:04
	← yezariaely left	16:04
	← CheckDavid left	16:05
	← jasonroyle left	16:05
	→ a-l-e joined	16:05
	← galaris left	16:06
	← rudak1 left	16:07
	← machouinard left	16:07
	← mFacenet left	16:07
	→ CheckDavid joined	16:07
	→ machouinard joined	16:08
	← kewah left	16:08
	← adex_ left	16:08
	← r0bby_ left	16:08
	← Cromulent left	16:10
	← mishok13 left	16:10
	← xpe left	16:11
	← rath left	16:11
	→ CKyle joined	16:11
	→ Cromulent joined	16:11
	→ geekbri joined	16:11
	→ Octalot joined	16:11
	→ ej joined	16:12
	← sr78ger left	16:12
	→ melee joined	16:12
	← CKyle left	16:12
	→ goshawk joined	16:12
	← arvind_khadri left	16:13
	← mklappstuhl left	16:13
	← Targen_ left	16:14
	← Skrypter left	16:16
	→ shpoont joined	16:16
	← dsdeiz left	16:16
	→ yacks joined	16:16
	→ OOPMan joined	16:16
	← curvedmark left	16:16
	→ CKyle joined	16:17
	→ aard_ joined	16:18
	← infynyxx_ left	16:18
	→ Cromulent\|2 joined	16:18
	← tinti left	16:19
	← Cromulent left	16:19
	→ akiva joined	16:19
	← chrisss404 left	16:20
	→ Norm_ joined	16:20
	→ infynyxx joined	16:20
	→ chrisss404 joined	16:21
	← geak_ left	16:21
	→ maestrojed joined	16:22
	→ bwreilly joined	16:23
	← dhruvasagar left	16:24
	← babilen left	16:24
	→ ngladitz joined	16:24
	← aChatir left	16:24
	← abstrusenick left	16:25
	← undecim left	16:26
	→ geak joined	16:26
	← Wolfspyre left	16:26
	→ MO_Handes joined	16:26
	Davey__ → Davey	16:27
_ikke_	!repro	16:28
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	16:28
MouseTheLuckyDog	Is there a way to "diff" two repositories?	16:29
	→ arvind_khadri joined	16:29
	← arvind_khadri left	16:29
_ikke_	MouseTheLuckyDog: What does that even mean?	16:29
thegorn	MouseTheLuckyDog: just add one as a remote of the other, fetch it and you can use git diff-tree etc.	16:29
MouseTheLuckyDog	I'm looking for a diff of the revision structures not individual files.	16:29
thegorn	oh	16:29
	well, either way you can fetch the other one and then compare in gitk	16:30
	← donmichelangelo left	16:30
thegorn	but i don't know anything exactly like what you want	16:30
	→ arjun_ joined	16:30
	← frgtn left	16:30
	→ donmichelangelo joined	16:30
	← ureshk left	16:30
	→ yhager joined	16:31
_ikke_	The easiest I guess is to compare refs	16:31
	← jaseemabid left	16:31
	← srji left	16:31
_ikke_	If one is included in the other and not	16:31
	← barneybook left	16:31
_ikke_	But there is no off-the-shelve tool for that afaik	16:31
	→ barneybook joined	16:32
	← Octalot left	16:32
	→ iamjarvo_ joined	16:32
	← konadr left	16:34
	→ rakl joined	16:34
cannonball	Hello, if I have just the output of 'git diff' from someone that I want to apply and commit, how do I do this? 'git am' doesn't work because it doesn' thave all the extra info up front (From, Date, Subject, commit message, etc). I can't 'git merge' because it's not yet added/commited.	16:35
	← fRAiLtY- left	16:35
	→ Skrypter joined	16:35
	← Skrypter left	16:35
cannonball	I was able to do a 'patch -p1 < PATCH' and it didn't break anything. Is that where I start, then manually git add each file and commit?	16:35
	← iamjarvo left	16:35
jasom	cannonball git-apply	16:35
	← petey left	16:35
	→ Skrypter joined	16:35
	← Skrypter left	16:36
	→ gp5st joined	16:36
	→ Skrypter joined	16:36
	← noname001__ left	16:36
	← juniorsilva7 left	16:36
	← iamjarvo_ left	16:37
gp5st	hello. are there any applications that store data in commits and not in files?	16:37
	← tobscore left	16:37
	→ WarDekar joined	16:38
gp5st	I'm thinking it might be a good answer to something I'm trying to do, and am just curious if anyone else does	16:38
	← simesy left	16:38
WarDekar	hey so I'm new to git and having trouble figuring out how to do the basics, I do a commit on one server and want to pull the updates to another server, what's the command on the 2nd server to download and merge?	16:38
	← introom left	16:38
_ikke_	gp5st: One could use git notes to store data	16:39
	gp5st: signatures for example are stored in notes	16:39
	But what kind of data are you talking about?	16:39
	→ tobscore joined	16:39
gp5st	WarDekar: if server B is set up as remote (serverB) then git pull serverB <branch>	16:39
	_ikke_: oooo. I've seen notes but never used them before. I'll take a peek	16:39
	_ikke_: transaction information, for a ledger	16:40
WarDekar	gp5st: what do you mean set up as remote (serverB) ?	16:40
gp5st	WarDekar: you have 2 servers, right? serverA and serverB, right? how did you get the repo onto them?	16:41
WarDekar	Clone originally	16:41
	← hyperair left	16:41
	→ jfoy joined	16:42
gp5st	ok, so which did you clone from and to?	16:42
	← Katafalkas left	16:42
WarDekar	from A (orig repo) to B, now i changed some stuff on B, committed the changes	16:42
	and want to get the changes back to A	16:42
MO_Handes	Newbie here, how is it okay to manage documentations that are changed and completed by different developer during time? What format it should be in and how can it be handles?	16:43
WarDekar	the changes have been committed to the repo	16:43
	there are no branches other than "master" currently	16:43
	← hahuang61 left	16:43
	→ kwmiebach_ joined	16:43
gp5st	WarDekar: ok, so you've commited on B. now you would do a `git pull origin master` and then a `git push origin master` when you cloned it automatically created the remote `origin`	16:43
	WarDekar: a remote is just a reference to a repo on another machine	16:44
	← Skrypter left	16:44
	→ jaequery joined	16:44
WarDekar	so on A i want to run those 2 commands you mean	16:44
gp5st	MO_Handes: I don't think I understand the question	16:44
	no, on B, the machine you're currently on	16:44
	← chrisss404 left	16:45
	→ whunt joined	16:45
WarDekar	okay so i do that	16:45
gp5st	http://git-scm.com/book chapters 2 and 3 may be helpful and useful	16:45
	→ srji joined	16:45
WarDekar	then i want to do "git pull origin master" on A?	16:45
gp5st	no	16:45
	you never touch A	16:45
WarDekar	so how does A get updated	16:45
gp5st	push	16:46
	→ petey joined	16:46
gp5st	the origin on A could be different than the origin on B btw	16:46
MO_Handes	gp5st, what format should I use for my documentation files? I believe for example something like pdf can't be simply edited and updated by everybody.	16:46
	← jfoy left	16:46
WarDekar	well i'm looking on A and it def didn't change the files there	16:46
	→ boombatower joined	16:46
	→ chrisss404 joined	16:46
gp5st	a pull fetches the changes from the remote and then merges them in. a push takes your changes and pushes them to a remote	16:46
	WarDekar: you shouldn't push to a non-bare repo	16:47
	is A a server or a workstation?	16:47
	← kwmiebach left	16:47
WarDekar	server	16:47
gp5st	is the repo on A bare?	16:47
	← cmpera left	16:47
WarDekar	what do you mean bare	16:47
gp5st	(does it not have a working directory)	16:47
	→ masteews_ joined	16:47
gp5st	if you push to a repo that has a working directory, that working directory won't be updated	16:48
	you'll have to do a pull on that server or a merge if you've pushed by hand	16:48
	→ FabTG_ joined	16:48
gp5st	normally people don't push to non-bare repositories	16:48
WarDekar	a working directory howso?	16:48
gp5st	you always pull into a working directory, never push into it	16:48
WarDekar	okay well that's what i want to do that's why i'm confused why i wouldn't have to run something on server A	16:48
gp5st	normally there is a .git folder in your repository	16:48
	a bare repo is only the contents of that .git folder	16:49
WarDekar	yes there is a .git folder	16:49
gp5st	it doesn't have the files	16:49
	persay	16:49
	not in a form like on a workstation	16:49
WarDekar	it is non-bare	16:49
	so how do i pull the changes to server A?	16:49
gp5st	yes, you should always pull into a non-bare repo	16:49
	you would set up a remote for B and pull.	16:49
	however, if you pushed, do a git branch -a	16:49
	and pastebin the output	16:50
WarDekar	http://pastebin.com/fpFzNBD1	16:50
	← masteews left	16:50
	← Risto- left	16:50
gp5st	MO_Handes: you can use whatever you want? depends on what people can edit. some people use doc comments (as per their lang) or markdown or just text or restructuredtext	16:50
	→ jfoy joined	16:50
gp5st	where did the repo come from A	16:51
	→ petey_ joined	16:51
WarDekar	master	16:51
	→ breck7 joined	16:51
WarDekar	there is only 1 branch master	16:51
	← tureba left	16:51
WarDekar	i set it up on A, pushed	16:51
gp5st	where did the repo come from?	16:51
WarDekar	A	16:51
	i made the repo on A	16:51
	→ tureba joined	16:51
WarDekar	pushed it to github, cloned it to B	16:51
gp5st	on A, where did the repo come from	16:52
WarDekar	made the changes on B, pushed the changes back	16:52
	i made it on A	16:52
	→ chairabanta joined	16:52
gp5st	was that the output of git branch -a on machine A?	16:52
WarDekar	the repo originated on server A	16:52
	http://pastebin.com/fpFzNBD1	16:52
	← petey left	16:52
gp5st	ok	16:52
	the best practice would be to set up a remote for B and pull from it whenever you want to update it	16:53
WarDekar	isn't that the point of using github	16:53
gp5st	?	16:53
	← masteews_ left	16:53
gp5st	i mean...you can set up a remote for github and push/pull to it	16:53
WarDekar	why would i want to pull from a server of my own, i'm using github so wouldn't i want to push to GH, pull from GH	16:53
	that's what i'm trying to do	16:53
gp5st	but if you want to push/pull between A and B, then A needs to be a bare repo or you need to pull from one to the other	16:53
	→ sriracha joined	16:54
gp5st	WarDekar: because not once did you mention github. you were just trying to push/pull between A and B	16:54
	← MO_Handes left	16:54
WarDekar	i thought i did earlier sorry, that's what i'm trying to do	16:54
	→ chrisshattuck joined	16:54
gp5st	just set up github as a remote and push/pull to GH	16:54
sriracha	how do I go about changing the branch for a submodule?	16:55
	after I check it out will submodule sync then update do the trick?	16:55
	→ Pizentios joined	16:56
	← renumi left	16:56
	→ thierryp joined	16:57
sriracha	it doesn't seem to see that things are changed...	16:58
	→ cmpera joined	16:59
	→ huoxito joined	16:59
	← psoo left	17:00
	← angelsl left	17:00
	→ _iron joined	17:01
	→ Misan joined	17:01
	← ojacobson left	17:01
	← howlymowly left	17:02
	← maroloccio left	17:02
	→ tm512 joined	17:02
	→ maqr joined	17:02
	← thierryp left	17:02
	← huoxito left	17:03
	← GODDOG left	17:04
	→ mishok13 joined	17:05
	→ Pyrogerg joined	17:05
	← taptapdan left	17:06
	→ Advocation joined	17:06
	← buibex left	17:06
	→ staafl joined	17:07
	← mindriot101 left	17:09
	← JokerxHarley left	17:10
	→ JokerxHarley joined	17:10
	→ natechan joined	17:10
	JokerxHarley → No_One	17:10
	← Sonderblade left	17:10
	← tureba left	17:11
	→ tureba joined	17:11
	→ sfz joined	17:13
	→ petey joined	17:13
	← petey_ left	17:13
	→ Octalot joined	17:13
	← Davey left	17:15
	→ Davey joined	17:15
	→ jjasinski joined	17:16
	← Davey left	17:16
	← matanya left	17:16
	→ Davey joined	17:16
	← _goTAN left	17:16
	← tatsuya_o left	17:17
	→ dreiss joined	17:17
	← chairabanta left	17:18
	← thiago left	17:18
	← Dougie187 left	17:18
	→ Dougie187 joined	17:19
	→ GODDOG joined	17:21
	→ hahuang61 joined	17:21
	← Cromulent\|2 left	17:21
	← zsoc left	17:22
	← chrisshattuck left	17:23
	← deuterium left	17:23
	← marthinal left	17:23
sayd	im trying to run this script that deletes local branches that habe been merged upstream already. https://gist.github.com/marr/fd0d844f3aff26777a9a When I run it, I get error messages like: error: branch 'foo' not found.	17:24
	but if I run the command manually that it echoes out, the command runs fine	17:24
	→ deuterium joined	17:25
	→ bunbury joined	17:25
	boblee_ → boblee	17:26
	→ oonska joined	17:26
	← maqr left	17:26
	← khushildep left	17:27
	← mtk left	17:27
	→ shuaib joined	17:27
	← mizu_no_oto left	17:28
	← LuxuryMode left	17:29
	→ amcsi_work_ joined	17:29
	→ iamjarvo joined	17:29
	← ej left	17:30
	← GODDOG left	17:30
	← petey left	17:31
	→ TomyLobo joined	17:31
	→ Katafalkas joined	17:31
	← Advocation left	17:31
	→ styx_ joined	17:31
	→ petey joined	17:32
	→ bmac joined	17:32
	← amcsi_work left	17:33
	← amcsi_work_ left	17:33
	← chimay left	17:33
	→ amcsi_work_ joined	17:33
	→ jgornick joined	17:34
	→ ameoba joined	17:35
	← Davey left	17:36
	← arjun_ left	17:36
	→ Davey joined	17:37
	← tobscore left	17:37
	→ _BJFreeman joined	17:37
	→ Targen joined	17:37
	← infynyxx left	17:37
	_BJFreeman → BJfreeman	17:38
	→ marhaban joined	17:38
	→ tobscore joined	17:38
	→ infynyxx joined	17:39
	→ toralf joined	17:40
	← normanrichards left	17:41
	← tobscore left	17:41
	→ mtk joined	17:42
	← cmpera left	17:43
	← jason237 left	17:43
	→ ewokchewy joined	17:44
	← Pyrogerg left	17:44
	← ewokchewy left	17:45
	→ ewokchewy joined	17:46
	→ peroht joined	17:46
	← geak left	17:47
	← deuterium left	17:48
	→ thierryp joined	17:49
	→ cmpera joined	17:49
	← BiggFREE left	17:52
	→ destiny joined	17:52
	→ Mars` joined	17:53
	→ phile_ joined	17:53
	← ewnd9 left	17:54
	→ diego1 joined	17:55
	→ crankyadmin joined	17:55
	→ tinti joined	17:55
	→ adex_ joined	17:56
	← adex_ left	17:56
	← diegoviola left	17:56
	← phile left	17:56
	→ cmpera_ joined	17:56
	→ SHyx0rmZ joined	17:58
	← cmpera left	17:58
	cmpera_ → cmpera	17:58
	→ jnavila_ joined	17:58
osse	man git-branch	18:00
gitinfo	the git-branch manpage is available at http://jk.gs/git-branch.html	18:00
osse	oops	18:00
	sayd: do you have a branch called foo ?	18:00
sayd	yea	18:01
	→ thiago joined	18:02
	→ Sid-G joined	18:02
osse	I guess is something goes haywire in the word splitting	18:02
	what does the command inside the backticks output?	18:02
	→ gordian joined	18:02
sayd	osse: its somethign like Running: git branch -d comment-box-design fix-comment-tilters	18:04
	← peroht left	18:04
	diego1 → diegoviola	18:04
	← gordian left	18:04
osse	and copy pasting that command works?	18:05
sayd	then: error: branch ' comment-box-design fix-comment-tilters' not found	18:05
	yeah	18:05
osse	are you using zsh ?	18:05
sayd	no	18:05
	→ druonysuse joined	18:05
	← druonysuse left	18:05
	→ druonysuse joined	18:05
osse	have you quoted the BRANCHES variable or do you run it exactly like it is in the gist?	18:06
	← barneybook left	18:06
	→ hyperair joined	18:06
	← rudak left	18:06
	← petey left	18:06
sayd	im runing the function that gist defines	18:06
	→ schemanic joined	18:06
sayd	osse: maybe need some trimming?	18:06
osse	put set -x at the top of the function and set -x at the bottom, run it, and show me the output	18:07
	→ ErKa joined	18:07
osse	oooooops	18:08
	I meant set +x at the bottom	18:08
	→ barneybook joined	18:08
	→ \|Freeman\| joined	18:09
sayd	osse doh that failed because i already cleaned up the branches	18:10
	→ DrShoggoth joined	18:11
	→ petey joined	18:13
	← johnnyfuchs left	18:14
	← phile_ left	18:14
	← shuaib left	18:16
	→ emergion joined	18:16
	→ dsferreira joined	18:16
	← Katafalkas left	18:16
	← emergion left	18:18
	→ h0bbit_ joined	18:19
	→ phile joined	18:21
	← barneybook left	18:21
	→ petey_ joined	18:21
	→ emergion joined	18:22
	← petey left	18:22
	→ przemoc joined	18:22
	← Sid-G left	18:23
	→ howitdo joined	18:24
	→ tchan joined	18:24
	← BJfreeman left	18:24
	→ chrisshattuck joined	18:25
	→ pepijndevos joined	18:25
	→ johnnyfuchs joined	18:25
	→ rednaks joined	18:26
	→ Bosox20051 joined	18:26
	→ barneybook joined	18:26
	→ deuterium joined	18:26
	→ ojacobson joined	18:27
	→ m8 joined	18:28
	→ sparq_ joined	18:28
	← sparq_ left	18:28
	← Mars` left	18:28
	→ valtih joined	18:29
	→ Mars` joined	18:29
	→ chairabanta joined	18:29
valtih	git rebase -i HEAD~4 > "fatal: Needed a single revision, invalid upstream HEAD~4" for a branch that is 4 commits deep	18:29
	it works for git rebase -i HEAD~3	18:30
ojacobson	Yes, there's no HEAD~4 in a four-commit history	18:30
	There are HEAD, HEAD~1, HEAD~2, and HEAD~3	18:30
valtih	but I see it in gitk!	18:30
	← shinnya left	18:31
ojacobson	!lol perhaps?	18:31
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	18:31
ojacobson	Anyways, to rebase something from its root commit, there's an option	18:31
	man git-rebase	18:31
gitinfo	the git-rebase manpage is available at http://jk.gs/git-rebase.html	18:31
ojacobson	have a look at --root	18:31
	← phile left	18:31
onethfour	if i want to "update" a branch with the latest master, i would rebase, right? Can't I also do git merge master as well?	18:32
valtih	yes, --root shows all.	18:32
	← Mars` left	18:32
	→ minim joined	18:34
	Kicer → Kicer86	18:34
azyr	i just compiled git from sources and tried to compile the documentation as well	18:34
	→ LuxuryMode joined	18:34
azyr	"make install install-doc install-info"	18:35
	i got the man and info pages nicely on my installation directory now	18:35
	← chrisshattuck left	18:35
	← rednaks left	18:36
azyr	but when i open the info page "info git" i cannot search using "i" command of info-viewer	18:36
	← h0bbit_ left	18:36
azyr	it says "no indices found."	18:36
	← breck7 left	18:36
azyr	how do i get those indices?	18:36
	→ adex_ joined	18:37
	← infynyxx left	18:37
	← stamina left	18:38
	← apexskier_ left	18:38
	→ infynyxx joined	18:38
	→ apexskier joined	18:39
	← apexskier left	18:39
	→ mfulz joined	18:39
	→ mikef joined	18:39
pepper_chico	hey, I think it's more a git related question but, I use VAM for plugin management in VIM, and most plugins are just git repo, but, I'm inside a repo now and git log just show a single commit in the commit history, while on github I can see the history is longer, is that the manager is just fetching the last commit, what git command I do for the complete checkout?	18:40
	← mfulz left	18:40
	→ maroloccio joined	18:41
pepper_chico	I've tried git fetch, but it didn't work for getting all history into git log for master	18:41
	→ foist joined	18:41
foist	How do I get just the commit message of a certain commit?	18:42
jrnieder	pepper_chico: try "gitk --all"	18:42
pepper_chico	I've heard it should be a shallow copy, must read about this yet	18:42
	→ Katafalkas joined	18:42
cbreak	pepper_chico: maybe you've got sparse clones	18:42
grawity	foist: git log --format=...	18:42
	→ herpaderp1234 joined	18:42
	← herpaderp1234 left	18:42
cbreak	pepper_chico: you can deepen it with git fetch --unshallow	18:43
pepper_chico	ah	18:43
	→ mmathis joined	18:43
pepper_chico	that should work I think	18:43
jrnieder	foist: git diff-tree -s --format=%B <commit>	18:43
cbreak	pepper_chico: also, if those are submodules, the parent will want a specific commit, and you might not be on a branch	18:43
	check that with git branch	18:43
	← Pizentios left	18:44
	mmathis → ashooby	18:44
pepper_chico	cbreak, ok, no submodules here, and unshallow worked, thanks	18:44
cbreak	np.	18:45
ashooby	is there a way to make a combined patch of multiple commits?	18:45
	← starfox21 left	18:46
cbreak	ashooby: sure. make a branch	18:47
	ashooby: git rebase -i, squash/reorder as you want	18:47
	ashooby: then git format-patch	18:47
	→ rednaks joined	18:47
	← \|Freeman\| left	18:47
	→ Shusshu joined	18:47
	→ Risto- joined	18:48
	← Shusshu left	18:48
	→ NLZ13 joined	18:48
	→ \|Freeman\| joined	18:48
	→ infynyxx_ joined	18:48
	← emergion left	18:48
osse	if you only need the diff itself and don't need author/commit message etc, then a git diff <from> <to> will work too. The default output format works well as a patch	18:48
	← thomas_b left	18:49
foist	Thanks grawity and jrnieder.	18:49
	← Bosox20051 left	18:50
	→ kossy joined	18:50
	→ moondoggy joined	18:50
ashooby	ty cbreak, that's what I was thinking of doing just wanted to be sure I wasn't overlooking a flag	18:50
	← diegoviola left	18:50
	→ thomas_b joined	18:51
	→ crazydiamond joined	18:51
	← Droolio left	18:51
	← infynyxx left	18:51
	← marhaban left	18:53
	→ Mars` joined	18:54
	← vince_prignano left	18:54
	← kossy left	18:54
	← thomas_b left	18:55
	→ kossy joined	18:56
	→ mlechner joined	18:56
azyr	ls	18:56
	← toralf left	18:56
_ikke_	.	18:56
	..	18:57
	→ thomas_b joined	18:57
	→ marhaban joined	18:57
azyr	:) sorry i thought i was typing to terminal	18:57
_ikke_	Happens more often	18:57
	→ nwertman_ joined	18:58
	→ breck7 joined	18:59
	→ normanrichards joined	18:59
	← matteo left	19:00
	← kossy left	19:00
	← King_Hual left	19:00
	→ kossy joined	19:00
	→ blj joined	19:00
	→ King_Hual joined	19:01
	← blj left	19:01
	← bmac left	19:02
	← mikef left	19:02
	→ knuth joined	19:02
	← knuth left	19:02
	→ knuth joined	19:03
	→ cmpera_ joined	19:03
	← cmpera left	19:03
	← kossy left	19:03
	→ ejen joined	19:03
	← eugenejen left	19:04
	ejen → eugenejen	19:04
	cmpera_ → cmpera	19:04
	← minim left	19:04
	← gusnan left	19:04
	← yacks left	19:06
	← IrishPrime left	19:06
	← Squarism left	19:07
	→ kamikaz3 joined	19:07
	→ kossy joined	19:08
kamikaz3	hi	19:09
gitinfo	kamikaz3: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	19:09
	→ mikef joined	19:09
	→ minim joined	19:09
kamikaz3	when i created a bare repo i received an error "cannot be used without a working tree" when i tried to switch a branch	19:11
cbreak	kamikaz3: that's normal	19:11
kamikaz3	so i set the ENV variable , GIT_WORK_TREE and GIT_DIR to the right path	19:11
	← kossy left	19:11
cbreak	kamikaz3: you don't need to switch branches in a bare repository	19:11
_ikke_	kamikaz3: What do you want to achieve?	19:12
	→ bakers joined	19:12
cbreak	kamikaz3: if you want to switch branches, you can do with git symbolic-ref HEAD foobar or similar	19:12
kamikaz3	cbreak: i am trying to push to the repo which I am able to do but I can't view the changes on the frontend	19:12
cbreak	frontend?	19:12
bakers	if I do "git diff [hash]" that gives me a diff of that checkin compared to HEAD right?	19:12
	→ bmac joined	19:12
cbreak	what frontend?	19:12
bakers	is there a way to see JUST the diff for that checkin?	19:12
cbreak	bakers: no	19:13
_ikke_	kamikaz3: !deploy	19:13
gitinfo	kamikaz3: 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/the-list-and-irc/deploy.html	19:13
cbreak	bakers: it gives you the difference between that commit and the working directory	19:13
	→ Advocation joined	19:13
cbreak	bakers: you can diff commits with git diff A B	19:13
	bakers: also, see man git-show for a different perspective	19:13
gitinfo	bakers: the git-show manpage is available at http://jk.gs/git-show.html	19:13
kamikaz3	cbreak: i think GIT_WORK_TREE sets the directory to track any changes to the files in the dir	19:13
cbreak	kamikaz3: you don't need that	19:14
	kamikaz3: working directories are for working, not for bare repositories	19:14
	kamikaz3: if you want to work, just make a non-bare clone	19:14
	→ kossy joined	19:14
kamikaz3	cbreak: i need to read on the difference between bare and non-bare repos :( I am simply not able to understand through the man pages	19:15
cbreak	kamikaz3: bare: meant to push into and fetch from	19:15
	kamikaz3: nonbare: meant to commit in, diff in, merge in, and so on	19:15
	you get actual files in non-bare repositories :)	19:15
	← shpoont left	19:16
kamikaz3	cbreak: guess that is what I am looking for . Thanks ! let me read more about it now	19:16
	← kossy left	19:16
	← adex_ left	19:16
cbreak	you can't push into non-bare repositories though	19:17
	(not without lots of considerations)	19:17
	→ darvein joined	19:17
kamikaz3	so how do i connect the two ?	19:17
	the bare and the non bare ?	19:17
darvein	hello everybody! :)	19:17
cbreak	kamikaz3: by cloning	19:17
darvein	question: How can I quit a feature branch merged into a dev (development) branch ?	19:18
cbreak	kamikaz3: a normal repository is non-bare	19:18
ojacobson	kamikaz3: fetch (for getting changes), push (for sending changes), clone (which is init + fetch + checkout)	19:18
cbreak	darvein: quit?	19:18
	darvein: you can switch between branches with checkout	19:18
_ikke_	darvein: When merged the feature branch, you can either leave it be, or delete it	19:18
darvein	cbreak: ops, I mean unmerge or remove a branch merged into other branch	19:18
cbreak	darvein: you can't unmerge without rewriting history	19:19
	darvein: are you fine with rewriting history?	19:19
	→ sebersole joined	19:19
darvein	cbreak: yep, that is problem right?...	19:19
	→ adex_ joined	19:19
cbreak	it is.	19:19
	if you pushed already	19:19
	if you haven't pushed, it's fine.	19:20
darvein	cbreak: rewrite the history is a loot of work right?...	19:20
	already pushed.	19:20
	→ pantsman joined	19:20
	← pantsman left	19:20
	→ pantsman joined	19:20
sebersole	i need to "undo" a failed merge attempt	19:20
cbreak	darvein: nope, not much work	19:20
_ikke_	sebersole: git merge --abort	19:20
cbreak	darvein: unless you committed stuff after the merge?	19:20
_ikke_	darvein: Only consequences	19:20
ojacobson	You can use git-revert to reverse changes that have already been applied: it automates the process of writing and committing the reverse change. (The "bad" change remains in the history, along with another change to reverse it.)	19:20
	→ snql joined	19:20
sebersole	says there is no merge to abort	19:20
	i had since tried a reset	19:20
ojacobson	This works on merges, too, though if you ever want to repeat the merge life gets interesting.	19:20
cbreak	sebersole: reset aborts failed merges	19:21
	→ raupach joined	19:21
darvein	intersting	19:21
sebersole	i did git reset --hard	19:21
cbreak	darvein: revert won't undo merges	19:21
	darvein: it will undo the EFFECT of the merge	19:21
sebersole	it will not let me change branches	19:21
cbreak	the merge and all history will stay where it is	19:21
	sebersole: git status	19:21
darvein	The problem is, if I have Branch1, Branch2 and Branch3 pushed on DEV branch, and now I want remove Branch2 from DEV branch	19:21
cbreak	darvein: read what I wrote above	19:22
sebersole	shows a slew of untracked files	19:22
cbreak	darvein: and decide.	19:22
darvein	I think... I will need remove DEV branch and create a new DEV branch and after that, only push Branch1 and Branch3	19:22
cbreak	sebersole: read the error message when you attempt to switch branches	19:22
	→ Xethron joined	19:22
	← Xethron left	19:22
	→ Xethron joined	19:22
cbreak	darvein: nah.	19:22
	→ stamina joined	19:22
cbreak	darvein: that's also history rewriting	19:22
sebersole	error: The following untracked working tree files would be overwritten by checkout:	19:22
cbreak	it comes with the same problems.	19:22
sebersole	and then Aborting	19:22
cbreak	sebersole: well. Do you understand that?	19:22
sebersole	i understand and see that there are untracked files	19:23
cbreak	sebersole: you need to delete (or move) those untracked files	19:23
sebersole	sure	19:23
ojacobson	darvein: I'm starting to suspect that you are using git-related words to mean something other than what git means by them	19:23
sebersole	ok	19:23
	← darvein left	19:23
cbreak	hmm. Did he leave?	19:23
_ikke_	yes	19:23
	→ qsuscs joined	19:24
sebersole	thanks brainproxy	19:24
	grrr	19:24
	thanks cbreak	19:24
qsuscs	hi	19:24
gitinfo	qsuscs: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	19:24
	→ kossy joined	19:24
	← knuth left	19:24
	→ knuth joined	19:25
qsuscs	at my school, we only have a very old-fashioned network system, i.e. windows xp and some novell software	19:25
	← petey_ left	19:25
cbreak	people still use that stuff? :(	19:25
tang^	sadly	19:25
qsuscs	i only have write access tu H:\, which is "C:\Documents and Settings\$User\My Documents"	19:25
tang^	though I haven't seen Novell myself in a very long time	19:26
cbreak	I heard git will not work well at all on SMB shares.	19:26
qsuscs	yep, the admins think it's great, and it's the solution done by the ministery (how is it written o_O) of culture and education of the state of baden-württemberg	19:26
cbreak	I've only used it as bare repository there, and even that was not good	19:26
	→ mikef__ joined	19:26
	← LuxuryMode left	19:27
	← Katafalkas left	19:27
	cbreak would buy a bunch of USB Memory Sticks	19:27
qsuscs	well, and now i'd like to use git, but i can't even write to %HOMEPATH%, and the installation root of msvc-git is that H:\Git	19:27
	← sebersole left	19:27
iveqy	qsuscs: we have a similair setup at our school (although not novell but smb shares), some version of msysgit doesn't work at all, some do, but slow	19:27
qsuscs	additionally, git via http doesn't work due to a proxy, whose adress is invisible to me, and ssh doesn't work because i can't store the key there	19:27
	← kossy left	19:27
iveqy	qsuscs: isn't your %HOMEPATH% at H:\?	19:27
	that's the correct thing to do...	19:28
SamB	qsuscs: I assume you can write to more of %USERPROFILE% than that	19:28
qsuscs	nope	19:28
	%HOMEPATH\My Documents is H:	19:28
tang^	change %HOMEPATH% to H:	19:28
qsuscs	%HOMEPATH% is resetted every login, only H: is mounted via network	19:28
	→ mindriot101 joined	19:28
	← nwertman_ left	19:28
	→ kossy joined	19:28
iveqy	qsuscs: the best solution is to download putty and use ssh to do your development on an other machine	19:28
	← marhaban left	19:28
SamB	qsuscs: okay, so you CAN write to other paths but it doesn't take?	19:29
cbreak	the best solution is to download a linux, put it on an USB stick and boot that	19:29
	← raupach left	19:29
ojacobson	qsuscs: short of subverting the entire setup (which will, or at least should, get you fired), your best course of action may be to ask the administrators to install Git, and explain why you need it.	19:29
iveqy	qsuscs: you probably could use git on that machine, but the result will not be great	19:29
ojacobson	Work with the bureaucracy, not across it.	19:29
	← mikef left	19:29
qsuscs	not gonna work, we have to use lazarus, i'm not gonna install x11 on my server, and all of those won't work in the exams	19:29
	← TGiFallen left	19:29
	← quazimodo left	19:30
ojacobson	Especially if it's a gov't bureaucracy, as they tend to lack important things like a sense of proportion - "unauthorized software" is unauthorized regardless of whether it's a text editor or a rootkit	19:30
	→ chrisshattuck joined	19:30
SamB	lazarus is?	19:30
qsuscs	IDE for free pascal, like delphi in FOSS	19:30
	→ Pyrogerg joined	19:30
	→ LuxuryMode joined	19:30
qsuscs	mh i don't think they're too hard about unknown software, i usually always have putty and firefox or chrome somewhere (ie7 - no.), unless it's quake or so :>	19:32
	← Jackneill left	19:32
SamB	anyway, I used a flashdrive with some software for my last few semesters	19:32
qsuscs	i think what i'd need is a complete git system, including config and whatever, in one folder	19:33
SamB	before that I would just download putty every single time	19:33
	→ taptapdan joined	19:33
	← kossy left	19:33
qsuscs	i can keep putty, it's just a single binary after all	19:34
	→ darvein joined	19:35
SamB	my school's network was misconfigured such that I didn't actually have any quota I could use	19:35
cbreak	can't you install git on an usb drive?	19:35
	← a-l-e left	19:35
	→ petey joined	19:36
cbreak	maybe you have to recompile it to search configuration and other things in a relative path ot itself	19:36
qsuscs	i can, in fact it's already installed to "My Documents", but it doesn't keep the config files	19:36
cbreak	hmm...	19:36
	← Advocation left	19:36
cbreak	qsuscs: git can store configuration inside repositories	19:36
iveqy	qsuscs: you could always use the .git/config for all your config setting	19:37
cbreak	won't help with non-git things though	19:37
iveqy	cbreak: great minds think alike ;)	19:37
	→ jcrane joined	19:38
qsuscs	I know, but that doesn't work with the ssh keys, and I'd have to redo it for every repo, and that's kinda annoying	19:38
	← sidus left	19:38
SamB	I set HOME to point to a directory on my USB stick, which let me set lots of the unix-refugee software up sensibly	19:38
staafl	is there a way to push a conflict and let someone else resolve it?	19:38
	→ marlonlandaverde joined	19:38
	← Element9 left	19:38
_ikke_	staafl: Not in a way that is really trackable	19:39
	→ Skrypter joined	19:39
	→ nicedice joined	19:39
_ikke_	The conflict state will be gone	19:39
	← Skrypter left	19:39
	→ kossy joined	19:39
_ikke_	Conflicts only exist in the working tree and index	19:39
staafl	_ikke_, so one has to mark the file as resolved and push it in a broken state?	19:39
cbreak	staafl: they can make their own conflicts	19:39
	→ Skrypter joined	19:39
cbreak	staafl: nah, that'd be braindead	19:40
	either merge or don't merge.	19:40
staafl	cbreak, agreed	19:40
	hmm, can a temporary branch be used for the conflicted file?	19:40
_ikke_	Yes, but that won't solve anything	19:41
cbreak	staafl: just resolve everything	19:41
staafl	i.e. i open a new branch, mark the file as resolved and push it upstream	19:41
cbreak	or don't merge.	19:41
	← rednaks left	19:41
staafl	let the puller resolve it and then merge it back into the development branch	19:41
_ikke_	staafl: Or tell the puller to rebase his changes and let him fix the conflicts	19:42
	← kossy left	19:42
_ikke_	It's usually the one making the pull request that should make sure the pull request is mergeable	19:42
qsuscs	hmm, maybe it would be easier to convince the school admins of linux	19:42
	← Guest85894 left	19:42
staafl	_ikke_, or maybe he just wants to be able to get his own changes upstream	19:43
qsuscs	but unfortunately, the "sample solution of the department of education of the federal state of baden-württemberg" paedML version 6 (the one with a more recent linux than debian 5) is still beta :/	19:43
staafl	_ikke_, please tell me more about your rebasing idea	19:43
qsuscs	and they won't use anything else because it should be administratable for a non-nerd (i.e. they have no idea what they're doing)	19:44
_ikke_	staafl: The idea is that he rebases his changes onto the development branch. If there are any conflicts, he gets to solve those conflicts himself. After he then creates a pull request, you can cleanly merge it in	19:44
	→ kossy joined	19:44
	← mlechner left	19:44
_ikke_	staafl: He knows his changes best, so it's his task that it can be merged in properly	19:45
SamB	qsuscs: they should know better than to expect whatever to be administratable by non-nerds	19:45
	← queso left	19:45
SamB	unless you mean for like teachers' desktops or something?	19:45
	→ alvaro_o joined	19:46
	← AWinterman left	19:46
qsuscs	SamB, sorry, I don't understand what you want to say	19:46
staafl	_ikke_, I'm not talking about pull requests though	19:46
	← normanrichards left	19:46
staafl	the upstream repo is open for pushes	19:47
	scenario: A commits 1, A pushes 1, B commits 2, B pulls 1 and gets conflict	19:47
	← kossy left	19:47
staafl	any way for B to leave the resolution to A?	19:47
SamB	staafl: basically, if you want someone to help you resolve the conflict either ask him to do the merge himself, or invite him to help you on your system ...	19:47
staafl	SamB, ask him to do the merge himself?	19:48
_ikke_	staafl: From a history point of view, you are the one who creates the conflicts	19:48
grawity	staafl: B tries to push before pulling; the push gets rejected; B pushes to a temporary branch	19:48
staafl	the conflict is on my machine	19:48
	grawity, what if B is a noob and didn't branch between pulling?	19:48
	*before	19:48
_ikke_	staafl: Then teach the noob	19:48
	and benefit both	19:49
	← mikef__ left	19:49
staafl	_ikke_, we are all noobs sometimes	19:49
_ikke_	sure	19:49
	← \|Freeman\| left	19:49
SamB	anyway it's not that hard to make a branch after ...	19:49
grawity	staafl: then undo the pull (git reset)	19:49
_ikke_	And when no one teaches noobs, they stay noobs	19:49
	→ \|Freeman\| joined	19:49
staafl	_ikke_, sure, but I'd rather not have a strategy even in this case :-)	19:49
	→ cbreak joined	19:50
	← schemanic left	19:50
_ikke_	what?	19:50
staafl	grawity, yeah, that's right	19:50
	*rather have a strategy	19:50
	→ starsinmypockets joined	19:50
staafl	instead of saying, "you shouldn't have, now deal with it"	19:50
	→ fightback joined	19:50
_ikke_	No, that's one of gits tennents	19:50
starsinmypockets	how do I merge a previous commit hash to the current branch... I try git merge ##hash but get already up to date :/	19:51
grawity	this reminds me of http://tomayko.com/writings/the-thing-about-git	19:51
starsinmypockets	git checkout #has puts me in detached head	19:51
grawity	'Git means never having to say, "you should have"'	19:51
starsinmypockets	*#hash	19:51
ojacobson	starsinmypockets: if foo is a parent of HEAD, then there's nothing to merge -- it's already merged.	19:51
staafl	grawity, exactly, that's why I love it :-)	19:51
_ikke_	starsinmypockets: already up-to-date gives a clue	19:51
ojacobson	(This is true even if the current branch is completely linear.)	19:51
_ikke_	grawity: That's what I meant	19:51
starsinmypockets	I want to revert... If I checkout the previous commit there are changes...	19:51
staafl	_ikke_, grawity , SamB, cbreak, thanks for the input!	19:52
_ikke_	staafl: But like others said, you can push your changes to a temporary branch, which the other person then can merge in	19:52
	← chrisshattuck left	19:52
staafl	_ikke_, yeah, that's what I'll do, or rather, tell him to do	19:52
starsinmypockets	I guess I want to point head at the previous commit without losing the current commit...	19:52
	rebase?	19:52
	← Xethron left	19:52
_ikke_	starsinmypockets: that's what checkout does, but that's probably not what you want	19:53
	starsinmypockets: Why do you want / need this/	19:53
	Can you tell a bit more about what you want to achieve (and not about how you think to solve it)	19:53
	→ kossy joined	19:53
	← chairabanta left	19:53
	← SHyx0rmZ left	19:54
starsinmypockets	_ikke_ I'd like to move back to the previous working state without losing the current broken state	19:54
	→ chairabanta joined	19:54
ojacobson	git checkout <commit-ish> -b some-name	19:55
_ikke_	starsinmypockets: create a new temporary branch	19:55
ojacobson	which will create a new branch named "some-name" at the commit you wanted, and check it out	19:55
	(the current branch will be left as-is)	19:55
	→ ozette joined	19:55
starsinmypockets	OK, that makes sense... then merge that branch when I've got things where I want them?	19:55
	→ masteews joined	19:56
	← masteews left	19:56
	→ TGiFallen joined	19:57
	← kamikaz3 left	19:58
	← srji left	19:59
starsinmypockets	ojacobson - that works, but it's git checkout -b branchname <commit-ish> ;)	19:59
ojacobson	starsinmypockets: either/or, since at least 1.6.mumble	19:59
	git's largely not picky about option and argument ordering	19:59
starsinmypockets	hmm... it gave me some grief about it	19:59
_ikke_	except for file paths, which almost always go last	20:00
	← jkremser left	20:00
starsinmypockets	v1.7.04	20:00
	→ maqr joined	20:00
	← doev left	20:00
starsinmypockets	Yeah it thinks it's a file	20:00
	← hoschi left	20:01
starsinmypockets	And then to get the hotfix branch back to the tip of head, can I just merge?	20:01
	git checkout head / git merge hotfix	20:01
	← infynyxx_ left	20:02
	→ SHyx0rmZ joined	20:03
starsinmypockets	That's what I was looking for thanks folks	20:04
	→ PaulCapestany joined	20:04
	← Vampire0 left	20:05
ojacobson	HEAD is always the current branch	20:05
	→ Vampire0_ joined	20:05
ojacobson	when you check out 'hotfix', now HEAD is equal to 'hotfix'	20:05
	("always" the current commit, actually, but if you're working on branches it's also a pointer to the current branch)	20:05
	'git checkout HEAD' is close to being a no-op, other than detaching HEAD from any branch it might be on.	20:06
	← chairabanta left	20:06
	← chuckharmston left	20:06
cbreak	ojacobson: why would it detach?	20:06
ojacobson	hmm, on further investigation it appears not to. My mistake.	20:07
starsinmypockets	Then why does git branch show it as a separate branch?	20:08
	→ fightbac_ joined	20:09
	← fightback left	20:09
ojacobson	It'll show refs/heads/HEAD as a separate branch (because it is; the name 'HEAD' doesn't normally reside in the refs/ namespace, whereas branches do)	20:09
	and of course you can create a branch named 'head', 'HEAd', 'Head', or whetever, assuming your underlying FS is case-sensitive	20:09
_ikke_	It's more specifically a symbolic ref	20:09
	→ mizu_no_oto joined	20:09
ojacobson	It's unusual (and unnecessarily confusing) to have a branch named head though	20:10
	→ sq-one_ joined	20:10
	← cmpera left	20:10
_ikke_	And also anoying	20:10
	← mindriot101 left	20:11
ojacobson	in other words, !repro	20:12
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	20:12
	→ mindriot101 joined	20:12
	← fightbac_ left	20:13
	← goshawk left	20:13
	→ Element9 joined	20:14
	← mindriot101 left	20:14
	← irqq_ left	20:16
	← paulweb515 left	20:16
	← paddymahoney left	20:17
	→ rednaks joined	20:18
	→ cmpera joined	20:21
	→ srji joined	20:23
	← frogonwheels left	20:25
	← kossy left	20:26
	→ motto joined	20:26
	→ kossy joined	20:27
	← rednaks left	20:27
	→ lavaman joined	20:27
	← m8 left	20:27
	← valtih left	20:27
	→ rednaks joined	20:28
	← aard_ left	20:28
	← adex_ left	20:28
	← gp5st left	20:30
	→ shoshin joined	20:30
	← shoshin left	20:30
	← snql left	20:30
	→ chuckharmston joined	20:31
	→ tqrst joined	20:31
	← kossy left	20:31
	→ snql joined	20:32
	← snql left	20:33
	→ Sendoushi joined	20:33
starsinmypockets	Nah it's sorted thanks - I think I confused head with master somewhere along the way but it's all good	20:33
	← darvein left	20:34
	→ BiggFREE joined	20:34
	→ snql joined	20:35
	→ kossy joined	20:35
	← geekbri left	20:36
	← snql left	20:36
	→ Sonderblade joined	20:36
	→ goshawk joined	20:37
	→ snql joined	20:37
	ToxicFrog_ → ToxicFrog	20:39
	← diverdude left	20:39
	← kossy left	20:39
	← Zarthus left	20:39
	→ kossy joined	20:40
	← starsinmypockets left	20:40
	← snql left	20:41
	→ gp5st joined	20:41
	→ szoumon joined	20:41
	← scampbell left	20:42
	→ ej joined	20:42
	→ malkomalko joined	20:44
	→ rudak joined	20:45
	→ yacks joined	20:46
	← ej left	20:47
	← eugenejen left	20:47
	→ multiverse joined	20:48
	→ snql joined	20:48
	→ diego1 joined	20:48
	← _iron left	20:48
	← kaosx left	20:49
	diego1 → diegoviola	20:49
	→ Fingolfin joined	20:49
	→ darvein joined	20:49
	← harobed_ left	20:50
	← ryxai left	20:50
	→ marcio__ joined	20:50
	→ styles joined	20:50
styles	Hey guys I have 3 branches, dev, staging and prod. How can I make sure the db settings are changed per branch? Do I just ignore the config files?	20:51
	← TheBrainWork left	20:51
styles	Anyone have any best practices?	20:51
	← petey left	20:51
	← snql left	20:52
	→ paulweb515 joined	20:52
	→ tatsuya_o joined	20:52
	→ ej joined	20:52
	→ Advocation joined	20:53
	← marcio_ left	20:54
	→ petey joined	20:54
	→ fuzzybunny69y joined	20:54
	→ Squarism joined	20:55
	← jnavila_ left	20:56
	← frankstallone left	20:57
	← ej left	20:57
	← tureba left	20:57
	← Kabaka left	20:57
	→ tureba joined	20:57
	→ LBV_User joined	20:58
	← marcio__ left	20:59
LBV_User	Hi all. I have two repos, and I would like to move 2 files from one to another... there is a way I can do this keeping the history for these files?	20:59
	→ pr0t joined	20:59
SamB	LBV_User: there are things that you could do	21:00
	→ tpollard joined	21:00
SamB	question is, would it be more useful to have a random, disconnected history of those files in the new repository, or just include a concise explanation of where they came from in the commit message?	21:02
darvein	exit	21:02
	exit	21:02
SamB	(thus allowing the interested blamer to re-run blame in that other repository)	21:02
	← darvein left	21:02
	← Squarism left	21:03
	→ adex_ joined	21:03
	→ ewokchew_ joined	21:03
LBV_User	I was wondering if this would be possible... not the case here, but I have other projects with linked commit messages...	21:04
	the way if I could keep them, it would be nice...	21:04
	← druonysuse left	21:04
	← ewokchewy left	21:05
	→ cads joined	21:07
	← cannonball left	21:07
	← Kicer86 left	21:07
	← gp5st left	21:07
	→ stephCoue joined	21:09
	← Element9 left	21:10
	→ jkremser joined	21:11
	← jkremser left	21:11
	→ jkremser joined	21:11
	→ Kabaka joined	21:11
	→ marhaban joined	21:12
	→ jxpx777 joined	21:13
tqrst	when INSTALL says building with profile feedback takes "(much) longer" than just a regular build, how much longer are we talking about?	21:13
	→ mdiers joined	21:13
	→ gp5st joined	21:13
	← leeN left	21:14
iveqy	tqrst: not that long, the test-suite takes about 5min on my core2duo with flash-hdd	21:15
	→ ryxai joined	21:15
	← LBV_User left	21:15
	← ryxai left	21:15
	→ ryxai joined	21:16
	← g0bl1n left	21:16
	→ mikepack joined	21:16
iveqy	tqrst: I wouldn't bother though, the main bottleneck is still your harddisk	21:16
	← goshawk left	21:16
	← gp5st left	21:17
tqrst	iveqy: I just realized I was building on nfs; oops.	21:17
	(this had been running for a solid hour)	21:18
	← adex_ left	21:18
	→ starfox21 joined	21:19
iveqy	tqrst: oups	21:19
	well, nfs will slow down git a lot	21:19
	and you're running the test suite on nfs... that's slow	21:19
	← mizu_no_oto left	21:19
tqrst	tqrst: yeah, just started over on tmpfs	21:20
	erm, s/tqrst/iveqy	21:20
	← mishok13 left	21:20
cbreak	git builds in 28 seconds here.	21:20
iveqy	cbreak: that's because you've a machine from hell...	21:20
cbreak	a 5 year old machine from hell	21:21
	with an ssd! :D	21:21
iveqy	haha	21:21
	← Pyrogerg left	21:21
iveqy	I remember when I did GSoC with Jens as my mentor, he would run the test suite 5 times while I managed to run it once	21:21
	his computer was a bit better...	21:22
cbreak	well, make test takes a bit longer.	21:23
	→ infynyxx joined	21:24
	← Advocation left	21:24
	→ LBV_User joined	21:24
	→ zequence-work joined	21:24
	← jcrane left	21:24
	← kwmiebach_ left	21:25
	→ FernandoBasso joined	21:25
	→ kwmiebach_ joined	21:25
	← Mars` left	21:26
	→ aspires joined	21:26
	← kwmiebach_ left	21:26
	→ kwmiebach joined	21:26
iveqy	cbreak: yeah, the tests are really poorly written according to speed actually...	21:27
	← LuxuryMode left	21:27
tqrst	looks like they don't run in parallel either	21:27
kwmiebach	I am running a localized ubuntu. How can I configure git to give me the original messages?	21:27
cbreak	I so want one of those new Mac Pros... :(	21:28
	← ngladitz left	21:28
	← cmpera left	21:28
iveqy	tqrst: oh, you could. Just use make -j12 test (would run 12 threads at a time (suggesting you spawn 2 threads for each CPU you have))	21:28
grawity	kwmiebach: the "localization" is just determined by $LANG and $LC_* environment variables	21:28
cbreak	kwmiebach: man locale	21:28
tqrst	iveqy: neat, thanks!	21:28
	← srji left	21:28
	→ Ozch joined	21:29
iveqy	tqrst: however the test suite doesn't do any good error handling in multithreading, so if something fails I often end up with rerunning the test suite single threaded... but since the suite most often passes I usually run it multithreading first	21:29
osse	kwmiebach: hmm, maybe something like alias git='LANG=en_US.UTF-8 git'	21:29
iveqy	cbreak: and I want one of those thinkpad carbon x1...	21:29
	cbreak: it's actually cheaper for me to fly from sweden to the US, buy a thinkpad and fly back, than to just buy the thinkpad in sweden. The world is strange...	21:30
	← ewokchew_ left	21:30
cbreak	or ... order it on the internet?	21:30
	→ psoo joined	21:30
	← iamjarvo left	21:30
	← diegoviola left	21:30
	→ iamjarvo joined	21:31
	← iamjarvo left	21:31
iveqy	cbreak: no... then you've toll, taxes and need for international delivery...	21:31
cbreak	you have to pay that if you fly it in yourself too	21:31
	well, not the delivery... :)	21:31
	→ iamjarvo joined	21:32
tqrst	it's easier to dodge the tolls when you're carrying it yourself :)	21:32
	→ Mars` joined	21:32
	→ mribeirodantas joined	21:33
kwmiebach	osse, yes it works, thank you!	21:33
Dougie187	iveqy: or get someone here to buy it for you and ship it to you.	21:33
iveqy	cbreak: I really isn't that up to date with which toll laws applies. But here it's different tools on the use of the product. For example things sent gift-wrapped is often free from toll	21:33
cbreak	amazon supports gift wrapping. :)	21:33
iveqy	:)	21:33
tqrst	that would explain why all the packages I get from china are labeled as "gifts"	21:34
cbreak	maybe they speak german.	21:34
	← LBV_User left	21:34
cbreak	(badly :)	21:34
	← cads left	21:36
	← tang^ left	21:37
	← crass left	21:37
	→ goshawk joined	21:39
	→ crass joined	21:39
	→ shpoont joined	21:40
jab416171	how often does git in the ubuntu mirrors get updated?	21:44
	← CheckDavid left	21:44
	→ Joellius joined	21:44
	→ frogonwheels joined	21:44
jab416171	s/mirrors/repos/	21:44
	← Joellius left	21:46
	← TomyLobo left	21:46
iveqy	jab416171: I don't know. I believe it's once every release	21:47
jab416171	iveqy: I'm on 1.7.9.5	21:47
iveqy	git has a pretty rapid release rate so they really should shup a new version each release	21:47
	← rednaks left	21:47
jab416171	I'm running apt-get upgrade right now, so we'll see if it changes	21:47
iveqy	jab416171: okay? That's from 26 of mars 2012	21:47
	→ iamjarvo_ joined	21:48
iveqy	jab416171: does ubuntu still ship once every 6 months?	21:48
jab416171	yeah	21:48
iveqy	jab416171: then it should be updated... However it depends on if you've upgraded your ubuntu version or not...	21:48
jab416171	I'm on 12.04	21:48
	(released april 2012)	21:49
iveqy	jab416171: I'm just guessing here, but I think you need to upgrade your ubuntu version in order to get a new git version	21:49
jab416171	hmm	21:50
iveqy	you don't upgrade software in a release just because there's new software out there. You just do security upgrades	21:50
jab416171	I was hoping that I wouldn't have to do that	21:50
iveqy	jab416171: there's a reason they ship releases and not just "the latest of all software"	21:50
skorgon	jab416171, git is not that painful. you can easily compile it yourself	21:50
iveqy	jab416171: ubuntu has checked that git 1.7.9.5 works with your other software, that's why	21:51
jab416171	skorgon: I know, but I don't like installing stuff outside of the main repos	21:51
	→ tvw joined	21:51
	← iamjarvo left	21:51
jrnieder	iveqy: not really :) it's more that keeping track of all packages while they keep moving under your feet is too much work	21:51
skorgon	well, on ubuntu you're stuck then	21:51
iveqy	jab416171: you could compile it and install it with dpkg so that it's still tracked by dpkg	21:51
jrnieder	there's a ppa with reasonably recent git on ubuntu	21:51
	→ w0ng joined	21:51
jrnieder	https://launchpad.net/~git-core/+archive/ppa	21:52
	← iamjarvo_ left	21:52
iveqy	jrnieder: that's pretty easy to do automatically	21:52
jab416171	yeah, I'm aware jrnieder	21:52
jrnieder	iveqy: you mean with things like autopkgtest?	21:52
	→ aard_ joined	21:53
iveqy	jrnieder: no, I mean just finding new versions of a software is easy. Verify that it will work with the rest of your software is the hard part	21:53
	→ cads joined	21:53
	whunt → whorking	21:53
jrnieder	eh, verifying that it works at all is hard enough	21:53
jab416171	iveqy: what benefit would having dpkg track it be? does that mean if it's updated in apt it'll recognize that?	21:53
	it's a 3rd party application that isn't installed automatically, what's the harm in just keeping the latest in the repo?	21:54
jrnieder	jab416171: can you restate your question? I don't quite understand it	21:54
iveqy	jrnieder: true. If just all software would improve with each release and never regress, it would been so much easier =)	21:54
	← aspires left	21:55
skorgon	ditch ubuntu and use a distro with a more relaxed policy on these things	21:55
	← jerius left	21:55
jrnieder	or use https://launchpad.net/~git-core/+archive/ppa	21:55
	← crass left	21:55
jrnieder	or build your own git	21:55
jab416171	yeah, let me get right on that skorgon :P	21:55
jrnieder	or offer to help with maintenance of the git package on ubuntu	21:55
iveqy	jab416171: it's usually best to let the package manager in your system take care of all your software. For example it will be easier to uninstall it	21:56
jrnieder	or ... people have lots of options :)	21:56
	→ crass joined	21:56
	← sq-one_ left	21:56
	→ mcantor joined	21:56
	← aard_ left	21:57
iveqy	jab416171: 12.04 is a LTS release...	21:57
jab416171	iveqy: indeed it is	21:57
mcantor	Is there a way to grep the full file hierarchy of a specific commit without checking it out?	21:57
jrnieder	mcantor: yes, yes there is :)	21:57
mcantor	I thought something like "git grep 'pattern' -- branch:directory" would work, but it returned no results.	21:57
jrnieder	you were close	21:58
iveqy	well, git is new software that is still rapid in it's development. Actually some distros have problems with keeping up the pace	21:58
mcantor	jrnieder: what is the correct incantation?	21:58
	← macabre left	21:58
jrnieder	"git grep 'pattern' branch -- directory" should work	21:58
	← Dougie187 left	21:58
	← johnnyfuchs left	21:58
mcantor	Drat! I was so very close	21:58
jrnieder	in general, in git commands, "--" separates the branch/tag/other ref name from paths	21:58
onethfour	wouldn't it be cool if git had a read-only mode	21:58
jrnieder	"git grep 'pattern' branch:directory" would have worked too ;-)	21:58
iveqy	jab416171: by 2018 when it's time for you to upgrade your git version will be 4 years old. That's pretty old for a project that will be 13 years old at that time	21:59
mcantor	jrnieder: is that because 'branch:directory' constitutes a "tree-ish"?	21:59
jrnieder	yep, exactly. branch:directory names a tree	21:59
jab416171	iveqy: what's the harm in just keeping the latest version of git in the repos? or automatically updating the repos every month/6 months/whatever?	21:59
	← mmitchell left	21:59
jab416171	iveqy: and I'm going to update before 2018	21:59
jrnieder	jab416171: I think you're asking an Ubuntu question	21:59
	I'm not sure how it's relevant for #git.	21:59
mcantor	jrnieder: The man page says [<tree>] -- [<pathspec>]... do all trees constitute pathspecs? Conversely, is every pathspec the subset of a tree?	22:00
skorgon	jab416171, they actually think about migrating to rolling releases, iirc	22:00
jrnieder	no and no :)	22:00
	← breakingthings left	22:00
iveqy	jab416171: jrnieder is correct, that's a release decission from ubuntu. And why are you on a LTS if you're not going to stick with it? ;)	22:00
jrnieder	mcantor: <pathspec> is jargon for "path pattern"	22:00
	e.g., "*/.c"	22:00
skorgon	but for now, you can just upgrade the whole distro or roll your own git	22:00
iveqy	skorgon: that's cool!	22:00
jab416171	iveqy: I plan on getting a new computer next June, so it'll be a fresh install, and I don't know if I'll stick with Ubuntu	22:01
skorgon	iveqy, well, there was a discussion. i don't know whether they will really go that path	22:01
	→ Earnestly joined	22:01
	→ holomorph joined	22:01
mcantor	jrnieder: OK, so a pathspec is just a pathspec. and a tree does not constitute a pathspec unless you append one to it with ':'.	22:01
	← Sonderblade left	22:01
jrnieder	mcantor: even if you append ':', a tree is not a pathspec	22:01
mcantor	(is that freudian? "Sometimes a pathspec is just a pathspec.")	22:01
	ok, got it.	22:01
iveqy	jab416171: well, you see that there's a lot of pros and cons to consider when doing a distro. Most people with your problems simply install a new version of git in /usr/local/bin/	22:02
skorgon	jab416171, if you are willing to trade some stability and fancy UI tools for bleeding edge SW, then there are quite some alternatives	22:02
	← marlonlandaverde left	22:03
jrnieder	but afaict if you just want recent git on 12.04 and don't want to build it from source, the git-core PPA should Just Work	22:03
	← zequence-work left	22:03
jrnieder	so these are lovely and interesting questions about other software, but I don't see how they're relevant for git	22:03
	→ zequence-work joined	22:03
jab416171	skorgon: I like stability, and I don't have any fancy UI (I'm actually using xubuntu), and believe me, I know there's plenty of alternatives.	22:04
	← cads left	22:04
	← acharlieh left	22:05
	← stephCoue left	22:06
	← apipkin left	22:07
	→ acharlieh joined	22:07
	→ amcsi_work__ joined	22:09
	← f8l left	22:10
	→ Nicholas_Rishel joined	22:10
	→ ThomasKaufmann joined	22:10
	→ Neptu joined	22:10
	← dropdrive left	22:10
	← ToxicFrog left	22:10
	→ dropdrive joined	22:10
	→ ToxicFrog joined	22:10
	→ luminous joined	22:10
	→ f8l joined	22:11
	← marhaban left	22:11
	→ Rylee joined	22:11
	→ jojva joined	22:11
	← amcsi_work_ left	22:11
	← Luke-Jr left	22:12
	← acharlieh left	22:12
	→ quizzi joined	22:14
	→ madewokherd joined	22:14
	→ mizu_no_oto joined	22:14
	→ acharlieh joined	22:14
	← ryxai left	22:15
	→ quazimodo joined	22:15
	← mizu_no_oto left	22:16
	← King_Hual left	22:16
	← mike_af left	22:17
	→ mizu_no_oto joined	22:17
	→ mike_af joined	22:17
	← holomorph left	22:18
	← malkomalko left	22:18
	→ mike_af_ joined	22:20
	← quizzi left	22:21
	← mike_af_ left	22:21
	qsuscs → qsusOFFcs	22:21
	→ mike_af_ joined	22:21
	← mribeirodantas left	22:21
	→ mike_af__ joined	22:22
	← skered- left	22:22
	← Misan left	22:23
	← infynyxx left	22:23
	→ tureba_ joined	22:23
	← mike_af left	22:23
	← tureba left	22:24
	→ apipkin joined	22:24
	→ dsdeiz joined	22:25
	→ akurilin joined	22:25
	← mike_af__ left	22:25
	← mike_af_ left	22:26
	← apipkin left	22:27
	← \|Freeman\| left	22:28
	→ skered- joined	22:29
	→ \|Freeman\| joined	22:29
	← rnsanchez left	22:29
	→ Luke-Jr joined	22:30
	→ NeverCast[work] joined	22:30
	← mcantor left	22:31
	← bakers left	22:31
	gitinfo set mode: +v	22:31
NeverCast[work]	can --ff-only and --no-ff be used together?	22:31
	← TeckniX left	22:31
bremner	what would you expect that to do?	22:32
NeverCast[work]	Force a commit, but only if the HEAD can be fast-forwarded	22:32
SamB	I would kind of like it if the last one would override	22:32
NeverCast[work]	When you ff, there is no commit message right?	22:32
	← PaulCapestany left	22:32
bremner	NeverCast[work]: you seem confused between merging and committing	22:33
NeverCast[work]	Possibly	22:33
SamB	because then I could put the equivalent of --ff-only in my config file and override it when I want something else	22:33
NeverCast[work]	What is the correct interpretation?	22:33
	← Swayz left	22:34
NeverCast[work]	merge just merges the code right? Unless the HEAD can just be moved? In which case that is a fast-forward?	22:34
	→ LLckfan joined	22:34
	→ ryxai joined	22:34
	← quazimodo left	22:34
bremner	merge merges two histories which needs a new commit unless one is an ancestor of the other	22:35
	→ srji joined	22:35
	→ PaulCapestany joined	22:35
NeverCast[work]	Right, so if one branch was branched off another, and the branch was then several commits ahead.	22:35
	The original branch could be fast-forwarded to the forked branch	22:35
	Without a commit ?	22:35
bremner	yes.	22:36
NeverCast[work]	Could it be fast-forwarded with a message?	22:36
	( Which is what I assumed --no-ff would do )	22:36
bremner	no	22:36
	← petey left	22:36
NeverCast[work]	But could it be done as a commit anyway?	22:36
bremner	could what be done?	22:36
	← Davey left	22:36
NeverCast[work]	I guess this would create a new commit, meaning that the branches would diverge?	22:36
bremner	right	22:37
	← fluxdude left	22:37
NeverCast[work]	Then if the original branch was then to have another commit added on and become ahead of the forked branch.	22:37
	← crazydiamond left	22:37
NeverCast[work]	The forked branch could not fast-forward ever, and would also have to be merged with a new commit	22:37
	→ Davey joined	22:37
	← turboroot_ left	22:38
NeverCast[work]	The reason I wondered was because if I'm running a master branch with the latest stable, and a develop branch with dev code, and I would like to move the dev in to the master, and mark it with a commit, I would assume I'd use --no-ff..	22:38
bremner	probably	22:39
NeverCast[work]	Am I correct in thinking that squash works in this way? Creates a new commit with the changes?	22:39
	← \|Freeman\| left	22:39
LLckfan	I am trying to reconnect my Magnavox MBP 5120 blu-ray player to my Linksys routers wifi (which I have done before without trouble) and I am getting DHCP cannot be acquired. I have change the IP Address to manual on the blu-ray player without changing the IP address itself and no error. I have checked the routers settings and DHCP is enabled. Is there a way to fix this?	22:39
bremner	LLckfan: start by finding the correct channel?	22:39
NeverCast[work]	6	22:39
	*^	22:40
	← tureba_ left	22:40
	→ tureba joined	22:40
iveqy	/kickban LLckfan	22:41
	it's been several days with the same question here...	22:41
	← harish_ left	22:41
bremner	NeverCast[work]: basically. merge --squash is really not a merge. It's more like a rebase --squash followed by a cherrypick	22:41
iveqy	I'm starting to assume a bot	22:41
	← rudak left	22:41
NeverCast[work]	Like interactively rebasing, and picking out all the commits except the latest.	22:41
bremner	squashing them on the topic branch	22:42
	→ simesy joined	22:42
	← Sendoushi left	22:42
NeverCast[work]	What's the definition for the topic branch? The 'target' ?	22:42
bremner	dev in your case, I guess.	22:42
	← w0ng left	22:43
	→ hwrd\|work joined	22:43
	← simesy left	22:43
NeverCast[work]	From what I understand from a git merge --squash. It does nothing of a merge at all	22:44
	I guess that's what you said	22:44
bremner	yep	22:44
	← PeterBooker left	22:44
	← hholtmann left	22:45
	← tureba left	22:45
	→ cigarshark joined	22:45
	← Milossh left	22:45
bremner	LLckfan: care to explain yourself, or shall I just ban you as requested?	22:45
	→ tureba joined	22:45
	→ matanya joined	22:46
	→ normanrichards joined	22:48
NeverCast[work]	bremner: What is the 'index'. I don't think I fully understand what that is, but it's often referred to along with HEAD. Which I just thought was the hash of your current commit, a pointer to a place in time for that branch ( Or ancestors too I guess )	22:48
bremner	!index	22:49
gitinfo	The index (or cache, or staging area) is one of git's most central concepts. Read http://git-scm.com/book/en/Getting-Started-Git-Basics "The Three States", and e.g. http://tomayko.com/writings/the-thing-about-git for some cool things it can help you do.	22:49
	← natechan left	22:49
	ChanServ set mode: +o	22:49
	Eugennerz set mode: +b	22:49
NeverCast[work]	Thanks	22:49
	← dreiss left	22:49
	Eugennerz set mode: -o	22:49
	← pantsman left	22:49
bremner	steal my fun why don't ya	22:49
Eugennerz	Oh, you can still kick.	22:49
	→ infynyxx joined	22:49
Eugennerz	But I like getting my ban on.	22:50
bremner	you could shower more often	22:50
	← minim left	22:50
	→ salamanderrake joined	22:50
	→ Milossh joined	22:50
	ChanServ set mode: +o	22:50
	→ mvensky joined	22:50
	bremner kicked LLckfan (kthanxbye)	22:50
	← tureba left	22:50
	ChanServ set mode: -o	22:50
	→ VasionBot joined	22:50
	→ tureba joined	22:51
Eugennerz	!hose Eugennerz	22:51
	VasionBot hits Eugennerz with the hose!	22:51
Ozch	First time user here of git/github, I tried pushing my local repo to remote through ssh and I get this: "Permission denied (publickey)." How do I fix it?	22:51
	← VasionBot left	22:51
Eugennerz	Happy?	22:51
	← infynyxx left	22:51
Eugennerz	Ozch - !github_ssh	22:51
Ozch	!github_ssh	22:51
	Eugennerz, should I have gotten a reply from a bot or something? Nothing	22:52
Eugennerz	!ssh_github ?	22:52
gitinfo	If you are having problems accessing github repos over HTTPS you should switch to SSH (the default used by git, for many very good technical reasons): https://help.github.com/articles/generating-ssh-keys	22:52
Ozch	Eugennerz, cheers	22:52
	Eugennerz pokes bot with stick	22:52
	→ infynyxx joined	22:52
	← skered- left	22:53
	← pbujok left	22:53
Eugennerz	!bot	22:53
gitinfo	[!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans. Please see http://jk.gs/git/bot for more information about how to use me.	22:53
	→ ej joined	22:54
	→ jkyle joined	22:54
	← rakl left	22:55
NeverCast[work]	So git add, is adding to the 'staging area' correct?	22:55
	→ aspires joined	22:55
NeverCast[work]	Ah, or 'index'	22:56
	gotcha.	22:56
Eugennerz	!botsnack	22:56
gitinfo	Om nom nom	22:56
Eugennerz	.trigger_edit github_ssh @!ssh_github	22:56
gitinfo	Eugennerz: You must be logged into NickServ in order to use this command.	22:56
	NeverCast[work] hands gitinfo a donut for an after snack, snack.	22:56
Eugennerz	Oh, bah.	22:56
Eugene	.trigger_edit github_ssh @!ssh_github	22:56
gitinfo	Eugene: You must be logged into NickServ in order to use this command.	22:56
	← ej left	22:58
	← Destos left	22:59
	→ Joshi3s` joined	23:00
	← Joshi3s` left	23:00
	→ kazagistar joined	23:00
	→ SomeDamnBody joined	23:00
SomeDamnBody	hey, I have a repository	23:00
	repo A	23:00
	within that repo	23:00
	I want to use a submodule to manage a dependency	23:00
	repo B	23:01
	but I also want to edit that dependency	23:01
	so that, any time repo B receives new changes, I can pull them an integrate them with mine	23:01
	how do I commit to the submodule in order that it affects repo A which contains repo B in a way that repo B isn't touched?	23:01
	→ mvensky_ joined	23:02
	← motto left	23:02
SomeDamnBody	ok nevermind	23:02
NeverCast[work]	SomeDamnBody: I'm probably not the best for advice on this as I've only worked with submodules barely, and only once. But if you run repo B as another branch	23:02
SomeDamnBody	but can a submodule work from a specific directory of a certain repo	23:03
	→ ewnd9 joined	23:03
NeverCast[work]	You can work on it as much as you like	23:03
	SomeDamnBody: Yes	23:03
	it can	23:03
SomeDamnBody	ah ok	23:03
	thanks	23:03
	← SHyx0rmZ left	23:03
	← dsferreira left	23:03
	← Risto- left	23:04
	→ ej joined	23:04
	→ mribeirodantas joined	23:04
	← Mars` left	23:04
kazagistar	I am trying to figure out how to automate a particularly annoying part of our build process… can I create and push a branch where the only difference is a submodule revision, without having to pull the whole repo?	23:04
	→ Mars` joined	23:05
	← Mars` left	23:05
	← mvensky left	23:05
	mvensky_ → mvensky	23:05
NeverCast[work]	kazagistar: the submodule repo or the parent reop?	23:06
	*repo	23:06
	← infynyxx left	23:06
	← mvensky left	23:06
	← psoo left	23:06
	← mizu_no_oto left	23:06
NeverCast[work]	The parent only maintains a reference to the submodule from what I understand	23:06
	← tureba left	23:06
NeverCast[work]	Unless you use git submodule, it wont pull the submodule	23:06
	→ tureba joined	23:06
kazagistar	NeverCast[work]: I don't want to pull anything if I don't have to.	23:06
	→ mvensky joined	23:07
SomeDamnBody	how do I add a submodule from a specific directory within another repo	23:07
	I just did...	23:07
kazagistar	basically, we have 2 testing systems, one triggers automatically on pull requests and tests our submodule, and one does testing for the entire software, and we have to upload a git branch manually. Both ALWAYS pull the latest revision from scratch	23:07
SomeDamnBody	git submodule add https://user@host.org/user/reponame.git/foldername	23:07
	and it produced a dead link on the site, yet copied the entire repo of https://user@host.org/user/reponame	23:07
NeverCast[work]	SomeDamnBody: I would assume it takes a directory argument, or assumes that you want 'foldername' in your pwd	23:07
SomeDamnBody	.git	23:08
	→ Mars` joined	23:08
	→ PParth joined	23:08
	← ej left	23:08
	→ zbcm joined	23:08
	→ ColKurtz joined	23:08
NeverCast[work]	As stated before, my submodule experience is very limited, it's something I've not that the opportunity to use much.	23:08
	But it's sort of like cloning a repo inside another, but have their databases seperate	23:09
	The parent I believe holds a reference to the other, likely the url + current head or version or w/e	23:09
SomeDamnBody	right	23:09
	well I only want to clone a folder within another	23:09
	I'm having trouble removing the erroneous submodule now	23:10
NeverCast[work]	git submodule deinit submoduleNameHere	23:10
	← ozette left	23:10
NeverCast[work]	and then you might have to git rm submoduleNameHere	23:10
	to untrack the directory that may be laying around	23:10
	and then you can rm -r submoduleNameHere	23:11
	to clear it out of your directory	23:11
	← Luke-Jr left	23:11
	← szoumon left	23:11
	→ infynyxx joined	23:11
	NeverCast[work] politely gets the attention of Eugene	23:11
NeverCast[work]	Can you verify that I'm not feeding him false info?	23:11
SomeDamnBody	I found this: stackoverflow.com/questions/1260748/how-do-i-remove-a-git-submodule	23:13
	and that worked	23:13
NeverCast[work]	SomeDamnBody: That is exactly what I read before telling you :P	23:14
SomeDamnBody	now I just need the correct command to add only a folder within another repo	23:14
	lol ;)	23:14
	→ Curtisbeef joined	23:14
NeverCast[work]	Uhh	23:14
	You want to checkout just a folder from another repo?	23:14
	and put it in your current repo?	23:14
	I.. don't think you can do that	23:14
	git doesn't see files+folders	23:14
	I mean you can copy it in, but it wont hold a reference and wont update	23:15
	your other repo might have to make that 'folder' a submodule	23:15
SomeDamnBody	crap	23:15
NeverCast[work]	and both repo's use it as a submodule	23:15
SomeDamnBody	yeah I only...	23:15
	oh	23:15
	well basically	23:15
	here's why I want to do only a folder from another repo	23:15
	basically, it's actually 3 repos	23:15
	I have a third party library	23:15
	that's repo A	23:15
	I have repo B and C	23:16
	repo B already uses repo A as a submodule	23:16
	so repo B is good.	23:16
	But I make changes to the submodule in repo B, and commit to my repo with those changes	23:16
	this way any time repo A gets some changes, I can pull them into repo B	23:16
	← taptapdan left	23:16
SomeDamnBody	but I want repo C to work off of the version that I've put together in repo A	23:16
	i mean B	23:16
NeverCast[work]	branches	23:16
SomeDamnBody	that way, I don't have to repeat work or copy paste stuff	23:16
	branches?	23:17
NeverCast[work]	in repo A	23:17
SomeDamnBody	... not following you	23:17
NeverCast[work]	have a branch that is the current version for B and C	23:17
SomeDamnBody	I can't modify repo A	23:17
	oh	23:17
	← Davey left	23:17
SomeDamnBody	wait...	23:17
	I can check out repo A, put it in my own repo (D) as a submodule that references A	23:18
	→ Luke-Jr joined	23:18
	→ Swayz joined	23:18
SomeDamnBody	then I just add repo D as a submodule to B and C	23:18
NeverCast[work]	Yup	23:18
SomeDamnBody	ah ok	23:18
	I'll do this	23:18
NeverCast[work]	That'll work	23:18
	→ minim joined	23:18
	← infynyxx left	23:18
NeverCast[work]	and that's what I would've done to begin with, I prefer to always have commit access to any repo I use lol	23:18
	Otherwise this	23:18
	So I take it repo A is an external repo that you're just tracking from B?	23:19
SomeDamnBody	yeah	23:19
NeverCast[work]	Okay, yeah just clone it in to repo d as you said	23:19
SomeDamnBody	repo A is someone else's public github that I don't have write access to	23:19
NeverCast[work]	If it's on Github	23:19
	just Fork it	23:19
SomeDamnBody	I don't want to fork it on github, because I want my changes to remain private throughout the duration of my work until I publish	23:20
NeverCast[work]	I'm assuming you can just change the url on a submodule, like you can with remotes	23:20
SomeDamnBody	yeah	23:20
	I get what you're saying	23:20
	← ryxai left	23:20
SomeDamnBody	give the dependency it's own repo and reference the original as a submodule so you still get the updates and other goodies	23:20
NeverCast[work]	You don't have to reference the original as a submodule	23:21
	You just track it from the 'dependency' repo that you cloned	23:21
	git remote add upstream [email@hidden.address]	23:21
SomeDamnBody	oh	23:21
	add two remotes?	23:21
NeverCast[work]	Yup	23:21
	→ RaceCondition joined	23:22
SomeDamnBody	ah ok	23:22
NeverCast[work]	Then you can just pull from the other remote to update yours	23:22
	← boombatower left	23:22
	← srji left	23:22
	→ FatDarrel joined	23:22
SomeDamnBody	but what about B & C? wouldn't those still reference D as a submodule?	23:23
FatDarrel	Hey how do I squash a set of commits into one commit for a merge	23:23
SomeDamnBody	FatDarrel, rebase	23:23
FatDarrel	but rebase deletes changes?	23:23
NeverCast[work]	Changes are never deleted	23:23
SomeDamnBody	... no	23:23
NeverCast[work]	Provided they are commited	23:23
FatDarrel	everyone rebase?	23:24
NeverCast[work]	I tend to rebase when working with remotes	23:24
	← ewnd9 left	23:24
NeverCast[work]	you can merge --squash, or rebase --squash	23:24
	or even git squash	23:24
FatDarrel	ok let me see if I have it	23:24
	← Luke-Jr left	23:25
	← jaequery left	23:27
nevyn	!talks	23:27
gitinfo	Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)	23:27
nevyn	!factlist	23:27
	← oonska left	23:28
nevyn	!help	23:28
gitinfo	What do you need help with? Something with git? Tell us what's going on, and please be specific. For information on how to abuse me (I'm a bot!), see http://jk.gs/git/bot . Please be gentle.	23:28
	→ Luke-Jr joined	23:28
NeverCast[work]	afk\|lunch.	23:29
FatDarrel	Still need some Git help	23:29
	← mikepack left	23:31
	→ reim_ joined	23:31
	← tatsuya_o left	23:31
	← Nicholas_Rishel left	23:31
causasui	!ask	23:31
gitinfo	Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.	23:31
	← chrob left	23:32
	→ chrob joined	23:32
	← deuterium left	23:33
	→ srji joined	23:33
kazagistar	how about this: is it possible to use github remotely, as if it was local? I just want to create a branch, check out a particular branch for one of the submodules, and then push that change to a local repo… but I want to call this from an environment that gets cleared each time it is run, so I don't want to pull anything I can avoid	23:33
	← CKyle left	23:33
	← srji left	23:33
	→ nova_ joined	23:34
	→ Davey joined	23:34
	→ mikepack joined	23:34
kazagistar	I'm thinking I might be able to hack it up manually by just looking at hashes and file formats and whatnot, but I was wondering if there was an easier way beforehand	23:35
	← _nova left	23:35
	← Ozch left	23:35
	← aspires left	23:35
	→ boombatower joined	23:36
nevyn	kazagistar: that seems.. wrong but doable.	23:36
	← mikepack left	23:37
	← tureba left	23:37
	← qt-x left	23:38
	→ tureba joined	23:38
	← chrob left	23:38
kazagistar	nevyn: I need to create a parent repo branch that has my submodule branch, and push it to the parent Continuous Integration server for integration tests	23:39
	→ fridim_ joined	23:39
	← normanrichards left	23:40
	← kwmiebach left	23:40
	← Fingolfin left	23:40
	→ j4cbo joined	23:40
nevyn	kazagistar: I think it'd be easiest with an intermediat automation repo	23:40
j4cbo	anyone know if there's a way to cause push to invoke the remote post-receive hook with no changes? (i'm trying to test out a post-receive hook without making a bunch of dummy commits)	23:41
	← jkremser left	23:41
	← tureba left	23:43
	← qknight left	23:43
	→ tureba joined	23:43
	← bwreilly left	23:43
kazagistar	nevyn: not entirely sure what you mean… you mean another repo that the would be do the automation when requested by our local test machine, and push it to the CI server?	23:45
	← freestyl3r left	23:46
	→ jon_r joined	23:47
	→ m0ltar joined	23:47
	← threesome left	23:48
	← tureba left	23:48
	→ tureba joined	23:48
	← lavaman left	23:49
	→ belak joined	23:50
	← belak left	23:51
	→ ryxai joined	23:51
	← dsdeiz left	23:51
	← Octalot left	23:51
	← staafl left	23:53
	→ _nova joined	23:54
	← nova_ left	23:56
	→ ISF joined	23:57
	← Mars` left	23:58
	← maestrojed left	23:59
	→ Mars` joined	23:59
	← nicedice left	23:59
	← Mars` left	23:59

Logs Search ←Prev date Next date→

Channels Documentation