IRCloggy #git 2014-03-10

Provider of IRC logs since 2005.

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

	2014-03-10
Vampire0	Ah, I see Hello71, thx :-D	00:00
	→ jbalsano joined	00:01
TheMainFunction	skorgon: So in that case, by merely specifying the name of the non-existent remote branch, it becomes created when I push?	00:01
skorgon	yep	00:01
TheMainFunction	Vampire0: What you wrote will push, create, and set up remote, all in one command?	00:01
	skorgon: thank you.	00:01
	← anry left	00:01
	→ madewokherd joined	00:01
	← Brando753 left	00:02
	← johnkevinmbasco left	00:02
	← Nazca left	00:03
	← n-st left	00:03
Vampire0	TheMainFunction, If I'm not too tired, yes :-)	00:04
TheMainFunction	Vampire0: thanks!	00:04
	→ Axsuul_ joined	00:05
Vampire0	yw	00:05
TheMainFunction	Vampire0: are you in Europe then?	00:05
	← el3ctron left	00:06
	← Axsuul_ left	00:06
	← Sonderblade left	00:06
	→ johnkevinmbasco joined	00:06
	→ Axsuul_ joined	00:07
	→ Brando753 joined	00:07
	← dougsland left	00:07
	← axsuul left	00:08
	→ axsuul joined	00:08
	← axsuul left	00:08
	→ axsuul joined	00:09
Vampire0	TheMainFunction, yes, why?	00:10
	← kirbdee left	00:10
TheMainFunction	you said you were tired..... It indicates not US, which is 8 pm in Eastern time.	00:10
	→ simesy joined	00:10
Vampire0	You can also be tired at 8pm g	00:11
	→ sgambino joined	00:11
	← mizu_no_oto left	00:11
Vampire0	But yes, 1 am here	00:11
	← Axsuul_ left	00:12
	→ srji joined	00:13
	→ axl_ joined	00:13
	← Nicholas_Rishel left	00:14
	← Umschwung left	00:14
	← Silmarilion left	00:15
	← simesy left	00:15
	← trewe left	00:15
	→ snuffeluffegus joined	00:15
	← MattMaker left	00:15
	← srji_ left	00:16
	← dort left	00:16
	→ yhager joined	00:18
	→ Nazca joined	00:18
	→ DolphinDream joined	00:18
	→ Zebroid joined	00:18
	← hyperair left	00:18
	← axl_ left	00:19
	→ reskp joined	00:19
	← jbalsano left	00:19
	← axsuul left	00:19
	← asQuirreL left	00:20
	→ Watabou joined	00:20
	← Goplat left	00:20
	← dsantiago left	00:21
	→ reskp_ joined	00:21
	→ yosito joined	00:21
	← lifelike left	00:21
	→ lifelike joined	00:22
	← Watabou left	00:22
	→ dragon3_ joined	00:22
	← Zebroid left	00:23
	← lolmaus left	00:23
	→ Watabou joined	00:23
	← reskp left	00:23
	← neo1691 left	00:24
	← reskp_ left	00:25
	← oodavid left	00:26
	← Guest41671 left	00:26
	→ Guest41671 joined	00:26
	Guest41671 → kulp	00:26
	← cjsarette left	00:27
	→ asQuirreL joined	00:28
	→ cjsarette joined	00:28
	← asQuirreL left	00:30
	← dmnd left	00:30
	→ asQuirreL joined	00:31
	→ dsantiago joined	00:31
	← gebbione left	00:32
	→ armyriad joined	00:33
	→ joelrobichaud joined	00:34
	→ lindenle_ joined	00:34
	→ tokik joined	00:35
	← SilverBln left	00:35
	→ Spyro joined	00:37
	→ Nicholas_Rishel joined	00:37
	← Naoe-Kanno left	00:38
	→ kcj joined	00:39
	← asQuirreL left	00:39
	→ fletch49er joined	00:39
	→ bwreilly joined	00:40
	→ john2x joined	00:40
	→ jbalsano joined	00:40
	→ dmnd joined	00:41
	← lifelike left	00:41
	← lindenle_ left	00:41
	→ lifelike joined	00:41
	→ bitsandbooks joined	00:42
	→ reim_ joined	00:43
	← black_13 left	00:44
	← reim left	00:44
	← bwreilly left	00:44
	← AaronMT left	00:44
	← sdouglas left	00:45
	→ cagedwisdom joined	00:45
	→ simesy joined	00:46
	← ariscop left	00:46
	→ damccull joined	00:46
	→ DrShoggoth joined	00:46
	← WormDr1nk left	00:47
	→ Nazca__ joined	00:47
	← timewa1ker left	00:47
	← godgodgodgo left	00:47
	← Nazca left	00:48
	→ hyperair joined	00:48
	→ sdouglas joined	00:48
	→ timewa1ker joined	00:48
	→ sluther joined	00:48
	← mellernoia left	00:49
	→ mellernoia joined	00:49
	→ jgoss joined	00:49
	← yhager left	00:50
	← simesy left	00:50
	← harish_ left	00:51
	→ lolmaus joined	00:51
	→ neo1691 joined	00:52
	← noxd left	00:52
	← jimmyy left	00:53
	→ godgodgodgo joined	00:53
	← lifelike left	00:53
	← neo1691 left	00:53
	← treaki_ left	00:53
	→ lifelike joined	00:54
	→ marcjs joined	00:54
	← jbalsano left	00:55
	← Nicholas_Rishel left	00:56
	→ fatalhalt joined	00:58
	← dark_splinter left	00:58
	← godgodgodgo left	00:59
	→ b4rbz joined	00:59
	→ jimmyy joined	00:59
	← marcjs left	00:59
	→ neo1691 joined	01:00
	→ Zebroid joined	01:00
	→ LuxuryMode joined	01:01
	← hyperair left	01:02
	→ rgr joined	01:02
	→ ORiON-- joined	01:03
	← lifelike left	01:04
	← Zebroid left	01:05
	→ lifelike joined	01:05
	→ Sabbath joined	01:05
	→ yhager joined	01:05
	← TheFuzzball left	01:06
	→ BadProphet joined	01:07
	← robustus left	01:07
	→ treaki_ joined	01:07
	→ amikiri joined	01:07
	→ jcrubino joined	01:08
	← ErKa left	01:08
	→ akitada joined	01:08
	← mellernoia left	01:09
	→ axsuul joined	01:09
	→ robustus joined	01:11
	← jimmyy left	01:11
jcrubino	is there a git gui with code (not file) search for linux?	01:12
	→ jimmyy joined	01:12
	→ foredoomed joined	01:13
	→ weiyang joined	01:14
	→ ariscop joined	01:14
	← jimmyy left	01:15
	→ jimmyy joined	01:16
	← jimmyy left	01:16
	→ jimmyy joined	01:17
	← Nazca__ left	01:17
	← foredoomed left	01:17
	← jimmyy left	01:18
	← lifelike left	01:19
	→ jimmyy joined	01:19
	→ lifelike joined	01:19
	← jimmyy left	01:20
	← sohail left	01:20
	→ rchavik joined	01:20
kpreid	jcrubino: what do you mean by "code search"?	01:20
	→ jimmyy joined	01:20
	← tomengland left	01:21
jcrubino	I would like to seach within the lines of code without using regex is possible	01:21
	→ foredoomed joined	01:21
jcrubino	if possible	01:21
	← jimmyy left	01:21
	← snits left	01:21
	→ tomengland joined	01:21
	→ tmcmahon joined	01:22
	→ jimmyy joined	01:22
	→ reskp joined	01:22
	← kcj left	01:22
	← axsuul left	01:23
	→ Mackseraner joined	01:23
	→ snits joined	01:23
	← tmcmahon left	01:24
	→ atn34 joined	01:24
Mackseraner	hello, im sorry for this amateur question: using the terminal, i want to push changes to my private github repo but i get a 403 because i seem to be "logged in" with my university account. how do i authenticate with my other github account?	01:24
	← sdouglas left	01:25
	← foredoomed left	01:25
DrNick	well, step one would be asking in a github channel	01:25
	← tomengland left	01:26
	→ hyperair joined	01:26
	← dancat left	01:26
	← reskp left	01:26
Mackseraner	DrNick ok, thanks, will do!	01:26
	← jimmyy left	01:28
	→ jimmyy joined	01:30
	← yosito left	01:30
	→ jrahmy joined	01:31
	→ tomengland joined	01:31
	← hobodave left	01:31
	← SonicX left	01:31
	→ jimmyy_ joined	01:31
	← lifelike left	01:31
	← BadProphet left	01:31
	→ yosito joined	01:31
	→ emes joined	01:31
	→ lifelike joined	01:32
	← fletch49er left	01:32
	→ dagnachew joined	01:33
	← ArcTanSusan left	01:33
	→ Nazca__ joined	01:33
	← WaReZ left	01:33
	← DrShoggoth left	01:34
	← jimmyy left	01:34
	→ hobodave joined	01:35
	← dagnachew left	01:35
	→ dagnachew joined	01:35
	← jimmyy_ left	01:35
	→ axsuul joined	01:35
	← dagnachew left	01:37
	→ dancat joined	01:38
	→ Zifre joined	01:39
	← axsuul left	01:40
	← lifelike left	01:42
	← bitsandbooks left	01:42
	→ lifelike joined	01:43
	→ harish_ joined	01:43
	→ lindenle_ joined	01:43
	→ ethlor joined	01:44
	→ francisfish joined	01:44
	→ eletuchy joined	01:44
	← ethlor left	01:44
	← emes left	01:45
	→ ethlor joined	01:45
	← ethlor left	01:45
	→ ethlor joined	01:45
	← jrahmy left	01:46
	→ jrahmy joined	01:46
	→ bitsandbooks joined	01:46
	→ ErKa joined	01:46
	→ BiggFREE joined	01:47
	← lindenle_ left	01:47
	← francisfish left	01:49
	← Spyro left	01:49
	→ Spyro joined	01:50
	→ fletch49er joined	01:52
	→ dagnachew joined	01:53
	→ rewsky joined	01:53
	→ MattMaker joined	01:53
rewsky	I want to be able to make commits when commiting such as # this is my comment	01:53
	→ yosito_ joined	01:54
rewsky	i want the comment # to be able to come first, how can I do that?	01:54
thiago	rewsky: git commit --cleanup=verbatim	01:54
	← lifelike left	01:54
thiago	I'm not sure I understood you	01:54
	that will allow you to write # in your messages	01:54
	→ lifelike joined	01:55
	→ marcjs joined	01:55
	← yosito left	01:56
rewsky	thats what i want	01:58
	want to be able to have # be the first character on my commit lines	01:58
skorgon	rewsky: the comment character is configurable	01:59
	rewsky: you can change it to something else, then # would be a normal, valid char	01:59
TheMainFunction	can you just use an escape char?	02:00
	← marcjs left	02:00
skorgon	is there an escape char?	02:00
	→ jbalsano joined	02:00
thiago	no	02:01
	→ Zebroid joined	02:01
	→ nn0101 joined	02:02
	← tomengland left	02:02
	← bburky left	02:04
	← lifelike left	02:04
	→ daito joined	02:04
rewsky	how do I modify ut	02:05
	tried	02:05
	git commit --cleanup=verbatim	02:05
	but it doesn't commit	02:05
	→ luc_ joined	02:05
	→ lifelike joined	02:05
nn0101	hello. if i wanted to identify what changed in a src tree (which dir specifically) when a user pushes, which hook should i look at? i've got one git repo which couple of src tree under it. the goal is to notify jenkins to pull & build only the appropriate src tree	02:05
	← Zebroid left	02:05
	← fletch49er left	02:06
	→ whitby joined	02:06
thiago	rewsky: it does create a commit	02:06
	nn0101: pre-receive or post-update	02:06
	nn0101: both work	02:06
nn0101	thiago: oh. i was looking at post-receive. damn.	02:07
	→ pikaren joined	02:07
thiago	nn0101: that too	02:07
	nn0101: all the hooks work	02:08
nn0101	thiago: the trouble is though i can't get which src tree changed specifically.	02:08
	← felipewm left	02:08
rewsky	thiago it's not working for me, is there another way?	02:08
thiago	nn0101: then the problem is in your hook script	02:08
	rewsky: what did you expect to change?	02:08
rewsky	i made a small change	02:09
	→ hochmeister joined	02:09
rewsky	so basically i just want to be able to type in a # in the front of my commit messages	02:09
nn0101	thiago: ok. let me see	02:09
rewsky	when I do a git commit -a	02:09
thiago	rewsky: ok. So you did that git commit -a --cleanup=verbatim	02:09
	rewsky: what then?	02:09
	← pikaren left	02:09
rewsky	well you are right	02:10
	→ pikaren joined	02:10
	← jcrubino left	02:10
rewsky	it does make a commit	02:10
	but it doesn't post the # or anything following in th ecommit	02:10
	commit	02:10
	instead it post this	02:10
	forgive me if its spammy	02:10
thiago	rewsky: with --cleanup=verbatim?	02:10
	→ shinnya joined	02:10
	← pikaren left	02:10
thiago	don't paste more than 3 lines	02:10
	← shruggar left	02:10
	← dmnd left	02:10
rewsky	k	02:10
	ill pastebin	02:11
	http://pastebin.com/Hnf211QC	02:11
	that gets put in as my commit message	02:11
thiago	ok	02:11
nn0101	thiago: how would you identify what changed exactly? is there doc i can consult? thanks	02:11
thiago	what had you typed?	02:11
	nn0101: git diff on the previous and the now-current commit	02:11
	nn0101: you may want the --names-only option	02:12
	rewsky: did you save the file in your text editor?	02:12
rewsky	yes	02:12
skorgon	rewsky: well, verbatim does simply not clean up the commit message. apparently it still pastes the template in though	02:12
	rewsky: try changing the comment char. that should work better - i hope	02:13
	→ Vampire0_ joined	02:13
dglambert	is there an easy way to review the conflicts after attempting to merge	02:13
	← _5kg left	02:13
thiago	rewsky: I don't get what the problem is	02:13
rewsky	skorgon: how do I change the comment character?	02:13
skorgon	dglambert: open the conflicting file, it should have the conflict markers	02:13
nn0101	thiago: ok	02:14
thiago	rewsky: did you type something in the editor that isn't now in the commit message?	02:14
rewsky	thiago, simply I don't want # to be used as a comment character	02:14
skorgon	rewsky: man git config - i guess it's somewhere in there	02:14
gitinfo	rewsky: the git-config manpage is available at http://jk.gs/git-config.html	02:14
rewsky	thank you	02:14
dglambert	skorgon, is there a way to recall which files are conflicting?	02:14
skorgon	dglambert: git status	02:14
dglambert	ahh thanks	02:14
	→ sdouglas joined	02:15
	← sword left	02:16
	→ sohail joined	02:16
	← Vampire0 left	02:16
	→ _5kg joined	02:16
dglambert	So I did some renaming of files, and 2/3 conflicts are over a file name change. Should I be fine with it adding the latest version and think its deleting an old file? Or is there a way to have it recognize the rename?	02:17
	← dagnachew left	02:17
	→ dagnachew joined	02:18
Eugene	!rename	02:18
gitinfo	git does not support explicitly file renaming - the 'git mv' command is shorthand for 'git rm --cached; mv; git add'. All "rename" statistics are generated at runtime when examining history with git-log. See the -M option in the git-log manpage for more info. Also http://thread.gmane.org/gmane.comp.version-control.git/27/focus=217 and `diff.renames = true` in man git-config	02:18
skorgon	dglambert: a rename should not conflict, IMHO. the other side must have edited the file as well	02:18
	← b4rbz left	02:19
	← dagnachew left	02:19
	→ dagnachew joined	02:19
	← m0viefreak left	02:19
	→ el3ctron joined	02:19
	← kaictl left	02:20
	→ ippxs joined	02:21
	→ ArcTanSusan joined	02:21
	← LuxuryMode left	02:21
	← Hecter left	02:21
	→ kaictl joined	02:22
	← koda left	02:23
	← dagnachew left	02:24
	→ dagnachew joined	02:24
	← lindenle left	02:26
	← ariscop left	02:26
	← jrahmy left	02:27
	← sgambino left	02:29
	← snits left	02:30
dglambert	skorgon, yeah I had some differences in the files as well	02:30
	← yosito_ left	02:30
	← Lemony left	02:31
	→ Lemony joined	02:32
	← dagnachew left	02:33
	→ dagnachew joined	02:33
	← dreiss left	02:35
	← _ikke_ left	02:36
	← rewsky left	02:37
	→ scarabx joined	02:37
	→ _ikke_ joined	02:37
	→ vijay13 joined	02:39
	→ diegoviola joined	02:39
	→ tomengland joined	02:39
	→ SonicX joined	02:40
	→ Zifre_ joined	02:41
	← amikiri left	02:41
	← dagnachew left	02:42
	→ dagnachew joined	02:42
jon-mac	how does git handle file moves? is it based only on the hash of the entire file..?	02:42
	if so, I am wondering how it would handle stuff like Java, where if you move a file to a new package -- the file (package statement) changes at the same time	02:42
	← tomengland left	02:42
	→ axl_ joined	02:43
	→ snits joined	02:43
	→ lindenle joined	02:44
	→ ariscop joined	02:44
	← Zifre left	02:44
	→ ellie_fitzy joined	02:44
	← SonicX left	02:44
	→ SonicX joined	02:45
ellie_fitzy	is there any way to have a project on one machine and download it to another as the same person? Is this forking?	02:45
	→ shingshang joined	02:47
frogonwheels__	ellie_fitzy: Local clones of a projects are always, in effect, a 'branched' version of a project. You can certainly have multiple clones of the same project. Forking is more a GitHub concept as far as Git goes.	02:48
	frogonwheels__ → frogonwheels	02:49
	← dagnachew left	02:50
	→ dagnachew joined	02:50
	→ jrahmy joined	02:50
frogonwheels	ellie_fitzy: It depends a lot on the workflow model you are using, but generally you'll have one 'upstream' (bare) clone of a project that becomes the authorative server - or a sort of 'commit serialisation' point.	02:51
	← shinnya left	02:51
	← ariscop left	02:51
	→ ariscop joined	02:51
	→ Droolio joined	02:52
ellie_fitzy	frogonwheels__: thanks!	02:53
	→ LuxuryMode joined	02:54
	← ryanakca left	02:54
	→ dreiss joined	02:55
	→ marcjs joined	02:55
	→ tomengland joined	02:55
	← jrahmy left	02:55
	→ lindenle_ joined	02:57
	← ellie_fitzy left	02:57
	← Mackseraner left	02:58
	→ SorenHolm joined	02:59
	← marcjs left	02:59
	→ jrahmy joined	03:01
	← lindenle_ left	03:02
	← zajn left	03:02
	→ Zebroid joined	03:02
	→ NBhosting joined	03:04
	← amcsi_work left	03:04
	→ amcsi_work joined	03:04
	← sluther left	03:05
	← dagnachew left	03:06
	→ dagnachew joined	03:06
	← Zebroid left	03:06
offby1	It's a frog ... and it's on wheels!	03:08
nn0101	thiago: thanks. that worked perfectly.	03:08
	→ dmnd joined	03:11
	→ yosito joined	03:13
	← netcarver left	03:14
	← axl_ left	03:14
	← yosito left	03:15
	← dagnachew left	03:16
	→ dagnachew joined	03:17
	← bitsandbooks left	03:17
	← dagnachew left	03:20
	→ dagnachew joined	03:21
	→ Goplat joined	03:21
	→ foredoomed joined	03:22
	← LuxuryMode left	03:22
	→ Rex357 joined	03:23
	→ reskp joined	03:23
Rex357	Hi. Having trouble pulling the git repository from here:	03:23
	http://git.freescale.com/git/cgit.cgi/imx/uboot-imx.git	03:23
	← dmnd left	03:24
Rex357	Using command git clone git://git.freescale.com/git/cgit.cgi/imx/uboot-imx.git	03:24
	Am getting error: fatal: the remote end hung up unexpectedly	03:24
milki	Rex357: thats not a repo	03:25
	Rex357: look at the bottom of the page	03:26
	o wait..	03:26
	the click is different	03:26
	← dagnachew left	03:26
milki	o	03:26
	no	03:26
	← foredoomed left	03:26
milki	Rex357: look at teh bottom of the page	03:26
	and use the correct urls	03:26
	→ dagnachew joined	03:26
Rex357	Haaa	03:26
	Thanks.	03:26
	Working now	03:26
	← kukks left	03:27
TheMainFunction	heh	03:27
	That's a great problem/solution!	03:27
milki	?	03:28
	← reskp left	03:28
	→ lindenle_ joined	03:28
	← maestrojed left	03:29
TheMainFunction	milki: Easy to fix!	03:30
	← grep0r left	03:30
TheMainFunction	the best kind of problem to have.	03:30
	→ caption joined	03:33
caption	hey guys, i want to use beanstalkpp ftp for deployment on a wordpress site, but I update plugins through the website, how can I handle getting these changes commited, even though I'm deploying through ftp	03:33
	not sure how to go about handlign this	03:33
	← dagnachew left	03:34
	→ dagnachew joined	03:34
	← joelrobichaud left	03:35
	← stellarhopper left	03:37
BtbN	not using ftp sounds like a great solution	03:38
	→ javasox joined	03:38
	← zuzytel left	03:38
	→ stellarhopper joined	03:38
	← vijay13 left	03:38
	← lindenle left	03:38
	→ grep0r joined	03:39
caption	but im saying, when i make updates on wordpress	03:40
	which change files	03:40
	and i'm not sure how to track this back into beanstalkapp.com	03:40
thiago	how is that even a Git question?	03:40
	if you're uploading via FTP, that's not Git	03:40
caption	u serious?	03:40
thiago	yes	03:41
caption	bad	03:41
	→ bwreilly joined	03:41
	← madewokherd left	03:42
	← ethlor left	03:44
	← yhager left	03:44
	← lifelike left	03:45
	→ francisfish joined	03:45
	→ yhager joined	03:45
	→ lifelike joined	03:46
	→ pheaver joined	03:46
	← bwreilly left	03:46
	← Wulf left	03:47
	← armyriad left	03:47
	→ lindenle joined	03:48
	cworth` → cworth	03:48
	← javasox left	03:48
	→ chernjie joined	03:48
	← hochmeister left	03:48
	← Zifre_ left	03:49
	→ Wulf joined	03:49
	→ axsuul joined	03:49
	← francisfish left	03:49
	→ yacks joined	03:51
	← rgr left	03:52
	← jimmyeatworld left	03:54
	← lindenle left	03:54
	← cads left	03:55
	← dancat left	03:55
	→ marcjs joined	03:55
	→ lindenle joined	03:56
	← Watabou left	03:58
	→ watabou joined	03:58
	← lifelike left	03:58
	→ delasteve joined	03:59
	→ lifelike joined	03:59
	← marcjs left	04:00
	← pwnz0r left	04:02
	← snuffeluffegus left	04:02
	← whitby left	04:02
	← tomengland left	04:02
	→ Zebroid joined	04:03
	→ tomengland joined	04:03
	← weiyang left	04:03
	← Dougie187 left	04:03
	→ Zebroid_ joined	04:04
	→ kcj joined	04:06
	← Zebroid left	04:07
	← tomengland left	04:07
	→ dmnd joined	04:07
	→ armyriad joined	04:08
	← Zebroid_ left	04:08
	← dreiss left	04:08
	← lifelike left	04:09
	→ lifelike joined	04:10
	← CheckDavid left	04:12
	→ axl_ joined	04:12
	chamunks → zz_chamunks	04:14
	← daito left	04:14
	← Noldorin left	04:15
	→ simesy joined	04:15
	→ LuxuryMode joined	04:16
	→ amikiri joined	04:16
	→ jimmyy joined	04:17
	← sohail left	04:18
diegoviola	is there a way to see what files were removed in a commit, not the actual changes?	04:18
	file names	04:18
someElise	git log --stat --diff-filter=D	04:18
Eugene	diegoviola - man git-diff; --name-only	04:18
gitinfo	diegoviola: the git-diff manpage is available at http://jk.gs/git-diff.html	04:18
	zumba_ad_ → zumba_addict	04:18
diegoviola	thanks	04:19
thiago	diegoviola: git whatchanged	04:19
	→ sohail joined	04:20
diegoviola	thanks	04:21
	:)	04:21
	← lifelike left	04:21
	→ lifelike joined	04:21
	← acidjnk left	04:21
	zz_chamunks → chamunks	04:22
	← axl_ left	04:23
	→ reskp joined	04:24
	→ jcvfen_ joined	04:25
	← jcvfen left	04:25
	→ reskp_ joined	04:26
	← WormDrink left	04:27
	← pfg left	04:27
	← reskp left	04:28
	→ pfg joined	04:28
	← CKyle left	04:28
	→ CKyle joined	04:29
	← CKyle left	04:29
	← LuxuryMode left	04:29
	← reskp_ left	04:30
	→ cads joined	04:31
	← akitada left	04:32
	→ saurabh joined	04:32
	saurabh → Guest7138	04:33
	← sohail left	04:34
	← yhager left	04:34
	← lifelike left	04:34
	→ lifelike joined	04:35
	← JSharpe_ left	04:35
	← craigp left	04:35
	→ polyzen joined	04:36
	← hiredman left	04:37
	← caption left	04:37
	→ hiredman joined	04:37
	→ unknwn- joined	04:37
	← unknwn- left	04:38
	← _iron left	04:39
	← chris_thomson left	04:40
	← delasteve left	04:41
	→ beautifulmind joined	04:42
	← JerryT left	04:45
	→ jalmeida joined	04:45
	← lifelike left	04:46
	← beautifulmind left	04:46
	← dagnachew left	04:47
	→ yhager joined	04:48
	→ kerrick joined	04:48
	← Lunatrius left	04:48
	→ dagnachew joined	04:50
	→ beautifulmind joined	04:50
	→ Lunatrius joined	04:52
	← jimmyy left	04:55
	→ marcjs joined	04:55
	← axsuul left	04:55
	→ jules__ joined	04:55
	← jalmeida left	04:56
	← cads left	04:56
jules__	hi, i'm trying to find history for a file but I moved the file so i'm not getting the whole history.	04:56
	→ lifelike joined	04:56
	← souther left	04:57
	→ john2x_ joined	04:57
	← marcjs left	04:57
	→ marcjs joined	04:57
	← john2x left	04:58
milki	hm, theres an option to follow rename	04:58
	s	04:58
	o	04:58
	jules__: --follow	04:58
jules__	okay, cool. thanks. I'm also using "gitblit" and it doesn't appear to be that smart	04:59
	once i have the commit id/hash is there an easy way to get the diff/more info about it	04:59
	← dagnachew left	05:00
jules__	git diff I gess	05:00
	← Fandekasp left	05:01
jules__	dang this is fconfusing	05:01
	← MindfulMonk left	05:01
	← marcjs left	05:02
	← lindenle left	05:04
	→ JerryT joined	05:04
	→ Generator_ joined	05:04
	→ Zebroid joined	05:05
	← sdouglas left	05:05
	→ sdouglas_ joined	05:07
Generator_	my git is having a silly problem, sometimes it just cannot push, waiting for long time and then prints this http://fpaste.org/83878/28086139/	05:08
	after I try 2 or 3 times or sometimes even more than that, It pushes the code	05:09
	→ Guest96490 joined	05:09
milki	since does work eventually, its not a problem with git	05:09
	← kerrick left	05:09
	← cillybabe left	05:09
milki	you shoudl debug your connection and your remote	05:09
	← Zebroid left	05:09
	← lifelike left	05:09
	→ mangesh joined	05:10
	← Guest96490 left	05:10
	→ lifelike joined	05:10
	→ archdori joined	05:10
Generator_	ok	05:11
	← armyriad left	05:12
	→ cilly joined	05:13
	→ zoso joined	05:14
	→ zajn joined	05:15
	← jaimef left	05:15
milki	Generator_: also, you can do GIT_TRACE=1 just to see what its doing	05:15
Generator_	ok	05:15
	→ jaimef joined	05:16
	→ khmarbaise joined	05:16
mangesh	do need to have ssh key to push in my remote repo?	05:18
	do I*	05:18
milki	mangesh: that depends on your remote repo	05:18
	← SamB left	05:18
mangesh	its on github	05:19
	← jcvfen_ left	05:19
	← lifelike left	05:19
mangesh	is there any other way for pushing?	05:19
	→ lifelike joined	05:19
	→ daito joined	05:20
mangesh	without the complications for generating ssh key	05:20
	→ And1 joined	05:20
milki	mangesh: theres github faqs for that. there are two ways to auth with github	05:20
mangesh	okay, will check faqs	05:21
And1	Good morning folks. I'm looking for a smart way of how to automatically do a git pull of my dotfile-bare-git-repo, before commiting anything new. Do you have any ideas on that?	05:21
	→ armyriad joined	05:21
milki	make a new git alias that does a pull before you commit	05:22
	make a shell function that makes a pull whenever you descend into a repo	05:22
	← SonicX left	05:22
milki	uh	05:22
	milki shrugs	05:22
	← khmarbaise left	05:22
	← amikiri left	05:23
And1	milki: If there are any unpulled changes and I would edit something and want to commit it then (with first pulling from git), won't my edited files be overwritten with the old version again?	05:23
	← pfg left	05:23
milki	pull will not overwrite things, only fail	05:24
And1	So I thought about pulling even before editing a file from my repo. But how.	05:25
	Executing a git pull whenever logging in to bash (or opening a new terminal/shell) is a bit too much I think. ; )	05:26
	→ mizu_no_oto joined	05:26
	→ reskp joined	05:26
	→ dougsland joined	05:27
	← ArcTanSusan left	05:28
	→ ArcTanSusan joined	05:28
	← neo1691 left	05:28
	← beautifulmind left	05:30
	← lifelike left	05:30
	← reskp left	05:30
	→ lifelike joined	05:31
	→ zumba_ad_ joined	05:31
milki	most people just remember to pull whenever they feel they need to	05:31
	milki shrugs	05:32
	← hahuang65 left	05:32
	← ScottE left	05:32
	← dglambert left	05:33
	→ jimmyy joined	05:33
	← zumba_addict left	05:33
	← SorenHolm left	05:34
	→ ScottE joined	05:35
	→ SorenHolm joined	05:35
	→ beautifulmind joined	05:35
	→ GT4066 joined	05:35
	← sdouglas_ left	05:36
	← ninsei left	05:37
	← tokik left	05:38
	→ pwnz0r joined	05:38
	→ sdouglas joined	05:39
	← Mitchbones left	05:42
	← dougsland left	05:42
	→ tgkokk joined	05:43
	→ axsuul joined	05:43
	← Rex357 left	05:43
	← DolphinDream left	05:44
	→ Tommy[D]_ joined	05:44
	← ArcTanSusan left	05:44
	← lifelike left	05:45
	→ francisfish joined	05:46
	← tgkokk left	05:47
	→ CorySimmons joined	05:48
	← Tommy[D] left	05:48
	→ Neozonz joined	05:49
	Neozonz → Guest31719	05:49
	← francisfish left	05:50
	← tpollard left	05:51
	→ jaequery joined	05:52
	→ goTAN joined	05:52
	← CorySimmons left	05:52
	← Guest31719 left	05:54
	→ Guest31719 joined	05:55
	→ marcjs joined	05:55
	← MattMaker left	06:00
	← marcjs left	06:00
	→ MattMaker joined	06:00
	← atn34 left	06:02
	→ ArcTanSusan joined	06:03
	→ cads joined	06:03
	← Sabbath left	06:03
	→ paolooo joined	06:03
	→ tomengland joined	06:05
	→ Zebroid joined	06:06
	→ JSharpe joined	06:06
	→ Sabbath joined	06:07
	← bobast left	06:07
	← diegoviola left	06:08
	← lindenle_ left	06:09
	← goTAN left	06:09
	← the_cybersphinx left	06:10
	← Zebroid left	06:11
	← Guest31719 left	06:11
	← hesco left	06:11
	→ lindenle joined	06:12
	← paolooo left	06:12
	→ Hecter joined	06:14
	← jimmyy left	06:14
	→ djapo joined	06:15
djapo	what happens if an app already exists in a project and is in version controll under it, how can i preserve the changes before i decide to brake it out into a submodule?	06:15
	← cads left	06:15
	→ craigp joined	06:16
frogonwheels	djapo: you can use git-filter-branch to break it out into the submodule - so all changes are there.. then you can just git rm --cached directory/ and add the submodule back - and commit that.	06:17
	djapo: it WILL be awkward if you want to checkout before that commit .. but the history is at least preserved.	06:17
	→ leeN joined	06:18
	→ crazydiamond joined	06:18
	→ weiyang joined	06:18
	← pheaver left	06:19
	← tomengland left	06:21
	← mizu_no_oto left	06:22
	← sdouglas left	06:22
	← crazydiamond left	06:24
	→ ninsei joined	06:25
	→ ferreum joined	06:26
djapo	frogonwheels: thanks! that clears things up	06:26
	← SorenHolm left	06:27
	→ reskp joined	06:27
	→ User458764 joined	06:29
	← User458764 left	06:29
	→ sdouglas joined	06:30
	→ mizu_no_oto joined	06:30
	← reskp left	06:32
	akher0n → akheron	06:32
	← thiago left	06:32
	← lolmaus left	06:32
	→ lolmaus joined	06:33
	→ jimmyy joined	06:33
	→ lite_ joined	06:33
	← yhager left	06:34
	← oojacoboo left	06:34
	← nnyk_ left	06:34
	→ ThomasLocke joined	06:35
	→ system64 joined	06:36
	← mangesh left	06:36
	← jaequery left	06:38
	← Hecter left	06:38
	← Sabbath left	06:38
	→ Sabbath joined	06:39
	→ jackneill joined	06:39
	← jackneill left	06:39
	→ jackneill joined	06:39
	← lindenle left	06:39
	← polyzen left	06:39
	→ crazydiamond joined	06:40
	→ _tpavel joined	06:40
	→ Hecter joined	06:41
	→ tomengland joined	06:41
	→ hoschi joined	06:42
	← Hecter left	06:42
	→ Raging_Hog joined	06:43
	→ m0ltar joined	06:44
	← mizu_no_oto left	06:44
	→ ghostlines joined	06:45
	← ghostlines left	06:45
	→ jaequery joined	06:47
	← jaequery left	06:47
	← ferreum left	06:47
	→ ferreum joined	06:47
	→ jaequery joined	06:47
	← ferreum left	06:48
	→ ferreum joined	06:48
	← ErKa left	06:49
	→ CorySimmons joined	06:49
	← Goplat left	06:52
	→ Kayra joined	06:52
	← pwnz0r left	06:52
	← CorySimmons left	06:54
	→ pheaver joined	06:55
	← TheMainFunction left	06:55
	→ marcjs joined	06:55
	← lolmaus left	06:56
	← djapo left	06:57
	← scarabx left	06:57
	→ lolmaus joined	06:58
	← marcjs left	07:00
	→ Umschwung joined	07:01
	→ reskp joined	07:02
	→ SamB joined	07:02
	→ ayaz joined	07:03
	→ tokik joined	07:03
	← starkhalo left	07:03
	← jbalsano left	07:04
	← snits left	07:05
	→ rath joined	07:06
	→ Zebroid joined	07:06
	← reskp left	07:07
	← Sabbath left	07:08
	→ Sabbath joined	07:09
	← Sabbath left	07:09
	← sdouglas left	07:09
	← watabou left	07:09
	← k4r1m left	07:09
	→ sdouglas joined	07:10
	← Zebroid left	07:11
	→ Naeb joined	07:12
	→ rethus joined	07:13
	→ Sabbath joined	07:14
	← johnkevinmbasco left	07:14
	← sdouglas left	07:14
	→ johnkevinmbasco joined	07:14
	→ marthinal joined	07:15
	← jimmyy left	07:16
	→ SorenHolm joined	07:17
	→ stodan joined	07:18
	→ ifdm_ joined	07:19
	← ifdm_ left	07:19
	→ ifdm_ joined	07:19
	→ WormDrink joined	07:21
	→ SonicX joined	07:21
	← ippxs left	07:21
	→ saorge joined	07:23
	← ORiON-- left	07:23
	→ Not_Whatever joined	07:24
	→ roelmonnens joined	07:25
	→ PeterBooker joined	07:25
	qknight_ → qknight	07:25
	→ ORiON-- joined	07:26
	← mishok13 left	07:26
	← saorge_ left	07:26
	← St_Marx left	07:28
	→ V__ joined	07:29
	← beautifulmind left	07:29
	→ rob_w joined	07:30
	← jrahmy left	07:31
	← eletuchy left	07:32
	→ m104 joined	07:33
	→ j0ran joined	07:33
	→ Gizburdt joined	07:34
	→ johnkevi_ joined	07:34
	→ beautifulmind joined	07:35
	← johnkevinmbasco left	07:35
	← V__ left	07:36
	← leeN left	07:36
	→ pduin joined	07:36
	← j0ran left	07:37
	← ArcTanSusan left	07:37
	→ jargon joined	07:38
	← Kayra left	07:38
	→ sdouglas joined	07:40
	→ dougsland joined	07:41
	← beautifulmind left	07:42
	← sdouglas left	07:45
	→ francisfish joined	07:47
	← m104 left	07:47
	→ St_Marx joined	07:48
	← Gaga left	07:49
	→ CorySimmons joined	07:50
	← axsuul left	07:50
	→ j0ran joined	07:51
	← francisfish left	07:51
	← sig left	07:52
	← robertnix left	07:52
	← njsg left	07:52
	→ Juri_Agarin joined	07:52
	→ njsg joined	07:53
	← njsg left	07:53
	→ njsg joined	07:53
	← CorySimmons left	07:54
	→ marcjs joined	07:55
	← j0ran left	07:56
	→ draftqin joined	07:56
	→ Kayra joined	07:56
	← marthinal left	07:56
	← draftqin left	07:56
	← luxgeek left	07:58
	← marcjs left	07:59
	← lite_ left	07:59
	→ jceb_ joined	08:01
	→ lite__ joined	08:01
	← m0ltar left	08:01
	→ harobed joined	08:02
	← harobed left	08:02
	← damccull left	08:02
	→ Gonzo89 joined	08:02
	→ harobed joined	08:02
	→ eletuchy joined	08:03
	→ jluc joined	08:03
	← yacks left	08:03
	→ robertnix joined	08:04
	← eletuchy left	08:04
	→ eletuchy joined	08:05
	→ Misan joined	08:06
	← dmnd left	08:06
	→ papegaaij joined	08:06
	→ Zebroid joined	08:07
	→ snql joined	08:08
	→ Macaveli joined	08:08
	← eletuchy left	08:09
	→ johnkevinmbasco joined	08:10
	→ mishok13 joined	08:10
	← el3ctron left	08:10
	→ j0ran joined	08:11
	← johnkevi_ left	08:11
	← Zebroid left	08:11
	→ Sicp joined	08:12
	← robertnix left	08:12
	→ axsuul joined	08:12
	← fatalhalt left	08:13
	← invinceable left	08:13
	→ bobkosse joined	08:14
	← pheaver left	08:14
	← nepochal left	08:15
	whowantstolivef1 → whowantstolivefo	08:16
	← zajn left	08:17
	← Naeb left	08:17
	← user258467_ left	08:17
	→ Naeb joined	08:17
	→ francisfish joined	08:17
	→ paolooo joined	08:17
	→ talios joined	08:19
	← Lemony left	08:19
	← francisfish left	08:19
	→ harobed_ joined	08:20
	→ Lemony joined	08:21
	→ francisfish joined	08:21
	← bobkosse left	08:22
	← axsuul left	08:22
	← harobed left	08:22
	→ _iron joined	08:22
	→ bobkosse joined	08:23
	← gv left	08:23
	← dougsland left	08:24
	← Lemony left	08:25
	← francisfish left	08:25
	→ Vivekananda joined	08:26
	→ rgr joined	08:26
	→ ghostlines joined	08:26
	→ yacks joined	08:26
	→ jnavila joined	08:26
	→ ItsMeLenny joined	08:27
ItsMeLenny	i'm having a problem; i want to update my fork using the master but i just want to master to override my changes i've done in one of the files	08:28
	how do i do that	08:28
	→ vurma joined	08:29
	→ lavong joined	08:29
_ikke_	'the master'?	08:29
osse	ItsMeLenny: depends, how do you intend to update your fork?	08:29
	→ marthinal joined	08:30
ItsMeLenny	in terminal, i cant just type; git pull upstream master	08:30
	because ive changed one of the files	08:30
_ikke_	You cannot selectively merge	08:31
	Just merge it, and then retrieve the changes to that file	08:31
	→ hkon__ joined	08:31
	→ sandorjanssen joined	08:31
ItsMeLenny	it wont merge	08:32
osse	git pull --no-commit ...; git checkout master -- file; git commit	08:32
ItsMeLenny	because there are changes	08:32
	→ gv joined	08:32
_ikke_	osse: ugh, evil merges :P	08:32
ItsMeLenny	is that git pull upstream master --no-commit?	08:32
_ikke_	!fetch5	08:32
	!fetch4	08:32
gitinfo	[!fetchfour] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).	08:32
	← talios left	08:32
osse	_ikke_: good point. I would do it after	08:33
	→ WormDr1nk joined	08:33
osse	unless those changes are the source of a merge conflict	08:33
	→ psoo joined	08:33
	→ goTAN joined	08:34
	→ blackmesa joined	08:35
	→ asQuirreL joined	08:35
	← veebers left	08:36
	← Umschwung left	08:36
	← asQuirreL left	08:36
ItsMeLenny	this is the problem:CONFLICT (content): Merge conflict in mlrawviewer.py	08:36
	Automatic merge failed; fix conflicts and then commit the result.	08:36
	→ asQuirreL joined	08:36
	→ johnkevi_ joined	08:36
nn0101	if i wanted to change a src to an earlier commit but didn't want to loose your all future commits from then, how would i go about that? Is there a better approach/	08:37
	?	08:37
	→ Anticom joined	08:37
_ikke_	ItsMeLenny: And you want to keep the file you had locally?	08:37
	→ nnyk_ joined	08:37
_ikke_	nn0101: "git checkout <hash> ." will change the file contents to the version of that commit	08:38
	nn0101: You can then commit it	08:38
	(note the . is required)	08:38
ItsMeLenny	_ikke_, no i want to get rid of the file, but the file exists in both repos, i want to write over the top of it	08:39
	← johnkevi_ left	08:39
nn0101	_ikke_: ok that'll get me a working dir at that particular commit. however then if i commit the code, i then need to merge right?	08:39
_ikke_	nn0101: no, for git, it's just another commit	08:39
nn0101	_ikke_: ahh	08:39
	← johnkevinmbasco left	08:40
_ikke_	nn0101: Note it wil fail if there are uncomitted changes which would have been overwritten	08:40
nn0101	_ikke_: ok	08:40
_ikke_	ItsMeLenny: Which version of the file do you want?	08:40
nn0101	thanks dude	08:40
ItsMeLenny	_ikke_, the upstream master	08:41
	← asQuirreL left	08:41
_ikke_	ItsMeLenny: git checkout --theirs <file>	08:42
	← j0ran left	08:43
ItsMeLenny	_ikke_, that seemed to work, but now i have error: 'merge' is not possible because you have unmerged files.	08:43
_ikke_	ItsMeLenny: just git commit	08:43
	→ dc5ala joined	08:44
_ikke_	that will finish the merge	08:44
	→ axsuul joined	08:44
ItsMeLenny	error: 'commit' is not possible because you have unmerged files.	08:44
	→ new2GIT joined	08:44
new2GIT	I am trying to store database versions in GIT any good way to do it?	08:44
	→ crater2150 joined	08:45
_ikke_	ItsMeLenny: Ah, git add <file> first	08:45
	→ netcarver joined	08:45
_ikke_	new2GIT: What do you mean with database versions/	08:45
	?	08:45
	→ jatt joined	08:46
new2GIT	Its like say I create tableA (10 cols) >> move it to UAT. then some days later add 2 more cols >> need to move them to UAT	08:46
	← jatt left	08:46
	→ jatt joined	08:46
new2GIT	my sql file would initially have a create, how do I manage an ALTER?	08:46
	→ dougsland joined	08:46
	→ arietis joined	08:46
ItsMeLenny	_ikke_, ah thanks!!! that has done what i want i'm pretty sure, thanks very much	08:47
	→ SilverBln joined	08:47
	← axsuul left	08:48
	← vurma left	08:49
_ikke_	new2GIT: That is not really a git problem. There are sql diff tools that will create them automatically, otherwise, you have to collect these alter statements yourself	08:50
	→ gebbione joined	08:50
	→ j0ran joined	08:50
new2GIT	I know about the paid tools, my point is after I have the alters in hand I cannot paste them in the create sql files ...	08:50
	how do I handle them?	08:51
	← BiggFREE left	08:51
new2GIT	any suggested folder-structure?	08:51
_ikke_	new2GIT: Just either date named or version named files	08:52
	→ LimeBlast joined	08:53
new2GIT	which is each time I create a new file.. but then versioning would not help as date would not allow me to know the contents or history.. version-named?	08:53
	→ lb1a joined	08:53
	← j0ran left	08:54
	→ marcjs joined	08:55
	→ nepochal joined	08:58
	→ xerxas joined	08:58
	→ marcjs_ joined	08:59
	← marcjs_ left	08:59
	← marcjs left	08:59
	← nfk left	09:00
	→ marcjs_ joined	09:01
	→ reskp joined	09:01
new2GIT	_ikke_ any hints?	09:02
	→ jasonroyle joined	09:02
	→ unek joined	09:03
unek	ok	09:03
	← unek left	09:03
	← ariscop left	09:04
	→ ariscop joined	09:04
	→ nfk joined	09:04
	← reskp left	09:05
	→ eletuchy joined	09:05
	→ shruggar joined	09:06
	← dougsland left	09:06
	← kcj left	09:06
	→ Druide_ joined	09:06
	← daito left	09:06
	← jaequery left	09:07
	→ phanimahesh joined	09:08
	gitinfo set mode: +v	09:08
	→ reskp joined	09:08
	→ Zebroid joined	09:08
	← snql left	09:09
	← reskp left	09:09
	← shingshang left	09:09
	← Kneferilis left	09:09
	→ j0ran joined	09:09
	→ reskp joined	09:09
	← arietis left	09:09
	← reskp left	09:09
	← blackmesa left	09:09
new2GIT	any good strategies to use GIT for DB version control?	09:10
	→ matteo` joined	09:10
	→ reskp joined	09:10
moritz	yes, there's a tool for that; let me look it up	09:10
	← eletuchy left	09:10
	← MattMaker left	09:11
	← reskp left	09:11
	→ foredoomed joined	09:11
	→ intellix joined	09:11
	← Gizburdt left	09:11
	→ reskp joined	09:12
moritz	new2GIT: look for squitch	09:12
	← reskp left	09:12
	→ Mindfart joined	09:13
	→ HSaka joined	09:13
	← Mindfart left	09:13
	→ Mindfart joined	09:13
	← Zebroid left	09:13
	→ cllamas joined	09:13
new2GIT	moritz, any link ?	09:13
	→ konadr joined	09:15
moritz	new2GIT: google.com/?q=squitch	09:15
	→ john2x joined	09:16
moritz	oh wait, it's spelled without u	09:16
	← foredoomed left	09:16
moritz	http://sqitch.org/	09:16
new2GIT	ahh	09:17
	Keridos_off → Keridos	09:17
	→ reskp joined	09:18
	→ ArSn joined	09:18
	→ moberberger joined	09:19
	← reskp left	09:19
	← Naeb left	09:19
	→ reskp joined	09:19
	← john2x_ left	09:19
	→ carbon joined	09:19
	→ mewm joined	09:21
	→ shingshang joined	09:22
	→ jagob joined	09:22
new2GIT	this too seems to be having the same concern which I am facing with GIT directly.. CREATE TABLE in sql1.sql & alter in sql2.sql I can't get a trace of when each column was added to the table ... any other suggestions	09:22
	→ foredoomed joined	09:22
osse	!GIT :p	09:23
gitinfo	Git is not an acronym. Writing it in all caps is heresy and will be punished by Subversion or SCCS for more grievous offences. It's "git" or "Git". Thank you for your help in making the world a better place. 48a8c26c625a4d3631c4f614bceb38933e741408	09:23
	→ francisfish joined	09:23
cbreak	new2GIT: SQL is not history aware?	09:23
	maybe with a transactional database you could keep a trace of the transactions?	09:23
	otherwise, log them yourself?	09:23
	doesn't sound like a git related problem at all though	09:24
moritz	new2GIT: if you simply have a DDL file under version control, you can use 'git blame' to find out when a line was added/changed	09:24
new2GIT	thats what I plan to use GIT for	09:24
_ikke_	cbreak: ddl statements are not part of transactions	09:24
new2GIT	but moritz, lines would be in different files	09:24
	→ arif-ali joined	09:25
jast	!GIT ;P	09:25
gitinfo	Git is not an acronym. Writing it in all caps is heresy and will be punished by Subversion or SCCS for more grievous offences. It's "git" or "Git". Thank you for your help in making the world a better place. 48a8c26c625a4d3631c4f614bceb38933e741408	09:25
	→ eletuchy joined	09:25
cbreak	_ikke_: why not?	09:25
osse	jast: haha, I beat you to it	09:25
	osse is best	09:25
jast	I realized two seconds after hitting enter	09:25
	but apparently the message didn't get across anyway ;)	09:25
new2GIT	I need to see it as CREATE (10 cols) on 1st March, 2 cols added on 3rd then 4 more on 5th .. all in 1 file so that I can revert a single file if ever needed...	09:26
moritz	so, do it	09:26
jast	I don't think git can help you achieve that in any reasonable way	09:26
	← SilverBln left	09:26
	→ blinkdesign joined	09:27
	→ m0ltar joined	09:27
jast	even for versioning database dumps git isn't really a good choice, and versioning the database itself is even worse	09:27
	not to mention the database ain't gonna notify git when a DBA alters the database schema	09:27
	→ Gizburdt joined	09:28
new2GIT	well ... how do I trace changes to my DDL's? if there are different files then each file would always be in version0.	09:28
	→ daito joined	09:28
cbreak	you could just forbid messing with the database.	09:28
	(without writing code to do that)	09:29
	then you can just track said code.	09:29
	← foredoomed left	09:29
new2GIT	cbreak, its a team on a single db..	09:29
cbreak	and you don't need to care about the database itself a single bit	09:29
moritz	new2GIT: depends on how you do the "different files" approach	09:29
new2GIT	any ideas?	09:29
cbreak	new2GIT: so, that makes it even easier	09:29
moritz	new2GIT: if you have one file per table, for example, that file won't always stay on version 0	09:29
new2GIT	but adding cols?	09:29
cbreak	don't add them.	09:30
	demand that people write code to create them	09:30
	→ tkissing joined	09:30
	← HSaka left	09:30
cbreak	git can track code :)	09:30
new2GIT	can't leave the alters in the same file ... else that would be saying CREATE + ALTER on an existing table with data .... prod ;)	09:30
	→ oodavid joined	09:31
	← oodavid left	09:31
moritz	new2GIT: but if you version-control the ALTER statements, you still see who added them, and when	09:31
cbreak	just create a new database	09:31
moritz	and you can still 'git grep' for columns when you want to find out where they were touched	09:31
cbreak	and them migrate the data over?	09:32
	→ oodavid joined	09:32
moritz	and 'git blame' and 'git log' for the details	09:32
	or keep both the current state AND the change files around, both under version control	09:32
	that's even easier to analyze later on	09:32
	and you can even auto-generate the change files with something like sql fairy	09:33
	or with apgdiff, if you're lucky enough to use postgres :-)	09:33
new2GIT	sorry, but I'm a bit off the mark .. when I exec the single file it would be running both the CREATE + ALTER which would be a prob on prod .... if I have different files then all would be in version0.	09:34
	→ Kneferilis joined	09:34
new2GIT	I am on Postgres :)	09:35
moritz	new2GIT: let's start slowly	09:35
	→ dort joined	09:35
moritz	new2GIT: you could do it the following way	09:35
	new2GIT: 1) you have a single file with the CREATE TABLE etc. statements	09:35
	← john2x left	09:36
moritz	new2GIT: 2) that file is under version control	09:36
	new2GIT: 3) whenever somebody wants to change the schema, they modify the CREAT TABLE ... statements in that file	09:36
	→ john2x joined	09:36
moritz	new2GIT: 4) when the changes are deployed, you dump the schema, do an SQL diff (with apgdiff) between the current state and your schema file, and run the resulting ALTER TABLE statements against the DB	09:37
	new2GIT: 5) if there are more involved migrations, they are checked in as separate files into git, and are run before step 4)	09:38
	→ Lemony joined	09:38
	← Lemony left	09:38
moritz	squitch can manage the whole process, including test and rollback scenarios; but you don't have to use it	09:39
	← lolmaus left	09:39
	← goTAN left	09:39
	← tkissing left	09:40
	→ anry joined	09:41
	→ lolmaus joined	09:41
new2GIT	a few concerns ... pt3) if we change the CREATE file (I guess you mean put the ALTER's too in it), when we run on UAT it might run top to bottom, so what happens to the creates? they would fire as exceptions ...p4) we unfortunately cant pulls UAT dumps so cant diff ...	09:42
moritz	what is UAT in this context?	09:43
	user acceptence tests?	09:43
	← yacks left	09:44
new2GIT	yup	09:44
moritz	why and what exactly would "fire as exceptions"?	09:44
	and if you can't pull dumps, you must simply store the last state in a file (though that's not as reliable)	09:45
	or simply modify the environment so that you can	09:45
new2GIT	the CREATE file would have ALTER's .. now when the complete file fires it would also fire the create ...	09:45
	← lite__ left	09:45
moritz	NO	09:45
	the CREATE file would NOT have alters	09:45
new2GIT	sorry, then ..	09:45
moritz	the ALTER TABLE statements come from the apgdiff (or whatever tool you use to generate SQL diffs)	09:46
	(step 4)	09:46
	→ achadwick joined	09:46
new2GIT	"last state" is what I am trying to get so that I can say dev in state1005, UAT in state700, BETA in ....... LIVE .......	09:46
moritz	well, with my scheme, you have it	09:47
	← weiyang left	09:47
new2GIT	sorry but I generally use ALTER TABLE .. to make db changes.. where do I put those?	09:47
moritz	if you know that version 2.34 of your software is installed in BETA, you simply look into the git repo to find the state of the CREATE file at that version	09:48
	new2GIT: you don't. You let them auto-generate.	09:48
torchie	is a subtree supposed to be like... an empty folder when you first try to make one	09:48
	moritz gives up	09:48
torchie	is it like a repo in the repo?	09:48
	djh_ → djh	09:48
cbreak	new2GIT: you take a hard look at them, and think long and intense about how you can express them with creates.	09:49
	← Devastator left	09:49
cbreak	torchie: it's like history from an other repository merged in	09:49
	→ r1tz joined	09:49
_ikke_	torchie: It's a subtree merge	09:49
torchie	oh so a subtree would include the history of commits you have on the repo as a whole?	09:50
_ikke_	You merge two repos, but the files from one repo end up in a folder in the other repo	09:50
cbreak	I wouldn't recommend subtree merging	09:50
torchie	I'm trying to figure out which thing to use to push only a subset of my repo to a remote	09:50
	→ SilverBln joined	09:50
cbreak	it's a very inseparable and inflexible strong bonding	09:50
	← frogonwheels left	09:50
cbreak	torchie: what point would that be?	09:50
	→ Devastator joined	09:50
cbreak	torchie: half of a project sounds quite worthless	09:50
	you can rewrite history with filter-branch to delete everything else though	09:51
torchie	partially closed source	09:51
cbreak	and then just push that rewritten history	09:51
	torchie: man git-filter-branch, look for subdirectory-filter	09:51
gitinfo	torchie: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	09:51
	matteo` → matteo	09:51
	→ CorySimmons joined	09:51
new2GIT	folks, just took a peep @ https://gitorious.org/testlink-ga/atisne-testlink-code/source/81fe9f55343a9785da9e637b3cfb6b981f6f1e2e:install/sql/alter_tables but here I can't compare the changes to each table as all would be in version0.	09:52
	→ goTAN joined	09:52
torchie	hmm cbreak thanks	09:52
	← CodeShar_ left	09:52
	→ CodeShark joined	09:52
moritz	new2GIT: we keep telling you not to do it that way; if you don't listen, we can't help you. Sorry.	09:54
	→ bliker joined	09:54
	→ arand joined	09:55
new2GIT	which way should I go abt, I'm eager to learn & change so that I can get thru	09:55
	→ MachineX joined	09:55
new2GIT	any pictorical rep for me to grasph	09:55
	← CorySimmons left	09:55
	→ cff joined	09:56
	→ lite_ joined	09:56
	← arif-ali left	09:56
	← jnavila left	09:57
	← nnyk_ left	09:59
	→ nnyk_ joined	10:00
	→ michael_lee joined	10:00
	← ItsMeLenny left	10:00
	← lite_ left	10:02
	→ lite_ joined	10:02
	← rchavik left	10:03
ggherdov_	hi. How do I get the hash of the commit I am currently sitting on?	10:04
	← simesy left	10:04
	→ gain joined	10:05
	→ dfanjul joined	10:05
Bombe	ggherdov_, git rev-parse HEAD.	10:05
ggherdov_	thanks Bombe	10:06
	→ arif-ali joined	10:06
	→ arnihr joined	10:07
	→ dougsland joined	10:08
	← SilverBln left	10:09
	→ Zebroid joined	10:09
	← netcarver left	10:10
	← hyperair left	10:10
	→ vurma joined	10:12
	→ tvw joined	10:12
	→ simesy joined	10:13
	← Zebroid left	10:13
	← SonicX left	10:14
	→ yacks joined	10:14
	→ Lemony joined	10:14
	→ makije joined	10:14
	← anry left	10:14
	→ root___ joined	10:15
root___	hi there	10:16
gitinfo	root___: 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.	10:16
	→ SonicX joined	10:16
	→ anry joined	10:16
	← Vinnie_win left	10:17
root___	Interested in the project: Pack bitmap support for libgit2 for this years gsoc. I am new in the open source world a 2nd year student of B eng in UB. Can some one direct me on how to start. I have already downloaded the source code of git but don't realy know from where to start studying.	10:18
	→ beautifulmind joined	10:19
	→ merica joined	10:20
	The-Mad-Pirate → The-Mad-Pirate\|U	10:21
	The-Mad-Pirate\|U → TMP\|Uni	10:21
	← jluc left	10:21
	→ jluc joined	10:23
	→ DanielHollands joined	10:23
torchie	can you push a subtree to remote if the repo it references is local	10:23
cbreak	history is history.	10:24
	← LimeBlast left	10:24
cbreak	it doesn't matter where it came from	10:24
osse	root___: hmm, wouldn't you need the libgit2 source for that?	10:25
	← harish_ left	10:25
	→ Exancillatus joined	10:25
	← Exancillatus left	10:26
	← marcjs_ left	10:26
	kalleth_ → kalleth	10:28
	← robinsmidsrod left	10:30
	→ robinsmidsrod joined	10:31
	← robinsmidsrod left	10:31
	← simesy left	10:32
	→ rchavik joined	10:32
	→ robinsmidsrod joined	10:32
	← hkon__ left	10:32
	← moberberger left	10:32
	→ dreiss joined	10:33
	→ daedeloth joined	10:33
	→ thevishy joined	10:34
	← lolmaus left	10:37
	→ Naeb joined	10:37
	→ lolmaus joined	10:37
	→ neo1691 joined	10:38
	→ nilg joined	10:38
	← tomengland left	10:39
	← neo1691 left	10:40
	→ tomengland joined	10:40
	→ Hounddog joined	10:42
	Keridos → Keridos_off	10:42
	→ sdouglas joined	10:43
	← goTAN left	10:44
	← oodavid left	10:44
	→ mellernoia joined	10:44
new2GIT	*	10:44
	← tomengland left	10:45
	← new2GIT left	10:45
	→ torste joined	10:46
	→ oodavid joined	10:47
	→ felixjet__ joined	10:47
	→ WaReZ joined	10:47
	→ jperry2 joined	10:47
torste	what is the correct way if I work on master and want to delete a few files, rename some and then make a new commit?	10:47
	← sdouglas left	10:47
	→ pduin_ joined	10:47
	→ JSharpe_ joined	10:47
	← jperry left	10:47
	jperry2 → jperry	10:47
	→ obert_ joined	10:47
	→ Kicer86 joined	10:47
	→ [1]JPeterson joined	10:48
	→ fuzzygeorge joined	10:48
moritz	you delete files with 'git rm', and rename them with 'git mv'	10:48
	→ skyUnical joined	10:48
torste	and if I remove 100 files?	10:49
	← JEEB left	10:49
	→ hkon__ joined	10:49
moritz	did you already remove them with normal 'rm'?	10:50
torste	yes	10:50
moritz	then git add -A	10:50
	← pduin left	10:50
	← obert left	10:50
	← felixjet_ left	10:50
	← JPeterson left	10:50
torste	ok, I did git add * , is that wrong?	10:50
	← shingshang left	10:51
	← skyUnical left	10:51
	→ JEEB joined	10:51
cbreak	it might be incomplete.	10:51
	← JSharpe left	10:51
	← rstritt left	10:51
cbreak	git status will tell	10:51
moritz	it might not pick up deletions	10:51
	because the shell expands the *, and when files are gone, they aren't included in that result list	10:52
	→ tgkokk joined	10:52
torste	ok, I will start over and try git add -A	10:52
cbreak	why start over?	10:52
torste	to learn the proper way	10:52
	→ skyUnical joined	10:52
cbreak	just git add -A now...	10:52
	then git status	10:52
	done.	10:52
	→ kongthap joined	10:53
	← Druide_ left	10:53
	→ tkissing joined	10:54
kongthap	hi, if i like to fix very small changes at for example 10 commits ago, is there any technique more suites this problem than git rebase interactive ? please advise	10:54
torste	no files in folder on latest commit, detached from head	10:54
cbreak	kongthap: public history?	10:54
kongthap	cbreak, no my private repo	10:55
cbreak	then just rebase -i	10:55
	← canton7 left	10:55
cbreak	you'll have to force push if you have a remote.	10:55
	→ canton7 joined	10:55
	← Not_Whatever left	10:57
	→ blackmesa joined	10:58
kongthap	cbreak, allow me to ask more specific step, right now my HEAD position the contents are quite different compare to were i wanna fix, the question is i must edit changes to what i want at the current HEAD position? or i can like checkout to HEAD~10 position and do the change there ? i meant i don't quite understand what to do	10:58
torste	now I copied the project to a folder, git init, git add -A, git commit -m "...", can I just remove and rename with linux 'rm'/'mv' and then do git add -A git commit -m?	10:58
	→ goTAN joined	10:59
	← daito left	10:59
torste	git status on master nothing to commit	10:59
	→ KimHansen joined	10:59
	→ TheFuzzball joined	11:01
	← GT4066 left	11:01
	→ mikecmpbll joined	11:01
	→ ZujkisNx_ joined	11:01
cbreak	kongthap: just git rebase -i HEAD~11 or so, then select edit for the commit you want to edit	11:02
	then perform your edit, git commit --amend	11:02
	then git rebase --continue	11:02
	← paulweb515 left	11:02
cbreak	done.	11:02
	kongthap: checkout is not involved.	11:02
	torste: sure.	11:02
	using normal means to modify files is totally fine.	11:03
kongthap	cbreak, ok i got it :)	11:03
	→ shingshang joined	11:04
kongthap	cbreak, when it "pauses" after my edit i must use commit --amend not normal commit ?	11:04
	← merica left	11:04
goTAN	so git push origin:newBranch creates a new branch on the remote and pushed the current state to it right?	11:04
bremner	that syntax is wrong	11:05
	← TheFuzzball left	11:05
bremner	man git push, see synopsis	11:05
gitinfo	the git-push manpage is available at http://jk.gs/git-push.html	11:05
bremner	you seem to have combined "repository" and "refspec"	11:06
	→ acidjnk22 joined	11:06
	acidjnk22 → acidjnk	11:06
	← neunon left	11:06
	→ z8z joined	11:07
	← pduin_ left	11:07
	← tkissing left	11:07
	→ TheFuzzball joined	11:07
	→ pduin joined	11:07
	→ neunon joined	11:07
goTAN	hm	11:07
	so its git push origin master:newbranch?	11:08
bremner	that should work. assuming you want the newbranch created from the local branch "master	11:08
	"	11:08
goTAN	yes but that means that I create this branch only on the remote right?	11:09
	not locally	11:09
bremner	correct	11:09
	→ Zebroid joined	11:09
torste	cbreak: thx, this time it worked fine	11:10
goTAN	and how do I get this branch also locally?	11:10
	after the next git pull origin?	11:10
cbreak	kongthap: yes	11:10
bremner	goTAN: in two steps. First create the local branch, then push it	11:10
cbreak	a normal commit would make a normal commit, and not edit the one you want to edit	11:10
goTAN	bremner: well but I already did git push origin master:newbranch	11:11
	→ takamich_ joined	11:11
	→ bafain joined	11:11
	→ rom1504 joined	11:12
goTAN	I basicallly did this only for "backup" but now I decided to have this a branch everyone can work on	11:12
bremner	goTAN: you will still need to create the local branch	11:12
	→ asQuirreL joined	11:13
	← Gizburdt left	11:13
	→ a_l_e joined	11:13
goTAN	bremner: really? so If I create a bunch of branches and push them everyone else which wants to work on those branches has to create them locally first?	11:14
	← Vivekananda left	11:14
bremner	yes	11:14
	well, the can create them from the remote branch	11:14
	← Zebroid left	11:14
	← takamichi left	11:14
bremner	!remote_branch	11:14
gitinfo	[!remote_branches] Remote branches are not created locally on clone. They show up as remote branches (git branch -r). To create local branches from them use git checkout -b local_name remote/branch_name or more recently git checkout -t remote/branch-name	11:14
	← lolmaus left	11:14
	← Naeb left	11:15
	→ lolmaus joined	11:15
goTAN	oh	11:15
	I really didnt know that	11:15
	→ Vivekananda joined	11:15
goTAN	so in my case with git push origin master:newbranch	11:16
	I just have to do git checkout -t remote/newbranch	11:17
	origin/newbranch I mean	11:17
	→ davividal joined	11:17
bremner	after either fetch or "git remote update origin"	11:17
	← reskp left	11:17
bremner	that's why it's a bit easier to create the local branch first	11:17
	← dougsland left	11:18
	← omegahm left	11:19
goTAN	hm yea but I sometimes have the need to just "backup" my current state (the remote gets backuped frequently)	11:20
	→ newbie999 joined	11:21
goTAN	so I thougth I just push my stuff to a new branch	11:21
	does this make sense?	11:21
	→ m0viefreak joined	11:21
bremner	sure	11:21
	← phanimahesh left	11:23
	→ foredoomed joined	11:25
	→ reskp joined	11:26
	← hobodave left	11:27
	← dreiss left	11:27
	→ netcarver joined	11:27
	← netcarver left	11:27
	← jatt left	11:28
	← bobkosse left	11:28
	→ ewet joined	11:28
	← ewet left	11:29
	→ ewet joined	11:30
	← foredoomed left	11:30
	→ the_cybersphinx joined	11:31
	→ pfg joined	11:31
	← asQuirreL left	11:31
	→ simesy joined	11:32
	← pfg left	11:33
	→ bobkosse joined	11:33
	← ferreum left	11:34
	← northfurr left	11:36
	→ omegahm joined	11:36
	← simesy left	11:37
	→ amikiri joined	11:37
	→ Gizburdt joined	11:38
	← binnisb left	11:39
	← nilg left	11:41
	← zumba_ad_ left	11:41
	← hkon__ left	11:42
	→ binnisb joined	11:43
	← Sicp left	11:43
	→ Sicp joined	11:45
	→ ferreum joined	11:47
	← leandrosansilva_ left	11:48
	← dragon3_ left	11:50
	→ Dudi joined	11:50
	← tokik left	11:50
	→ kesha joined	11:51
	→ _PN joined	11:53
	← shruggar left	11:54
	← binnisb left	11:54
goTAN	so there is a branch on remote but not locally. I do git fetch and then git checkout --track origin/thebranchIwantToHaveLocally	11:54
	→ shruggar joined	11:54
	→ binnisb joined	11:54
goTAN	which creates the new branch but when I do git branch -a Iit doesnt show me that this new created branch is tracked like remotes/origin/HEAD -> origin/master	11:55
	shouldnt there be something like: remotes/origin/newBranch -> origin/newBranch	11:55
	?	11:55
	← intellix left	11:56
bremner	no, those arrows are symbolic-refs, that's something different	11:56
	try git branch -vv	11:56
	→ foredoomed joined	11:57
	← foredoomed left	11:57
goTAN	ah ok	11:57
	→ goodwin joined	11:57
	← bliker left	11:58
goTAN	is there something better so view all local branches and commits? I only have git log --graph	11:58
	← carbon left	11:58
	→ LeMike joined	11:59
	← m0ltar left	12:00
bremner	gitk --all ?	12:00
	or tig for a similar curses tool	12:01
	← binnisb left	12:01
	→ cannonball joined	12:01
	→ binnisb joined	12:01
	← bafain left	12:02
goTAN	oh yea gitk is fine but maybe there is something nicer?	12:02
	I am checking out tig	12:02
j416	scenario: I create branch [topic] from branch [master], they both diverge. I create branch [topic_rebased] from [topic] and rebase that on the latest [master] and continue working on that. How can I at this stage find out what happened in [topic_rebased] since [topic], but ignoring all changes that occured in [master]? Here is a minimal working example of the scenario:	12:03
	http://pastebin.com/e6E5GZZT	12:03
	← anry left	12:03
	→ mourest joined	12:03
	← achadwick left	12:03
	← tgkokk left	12:03
	Keridos_off → Keridos	12:04
j416	I can achieve what I want by doing (after the above commands): git checkout -b x topic && git rebase master && git diff x topic_rebased	12:05
	← Sicp left	12:05
j416	can I somehow achieve it without doing a throw-away rebase?	12:05
	← amikiri left	12:06
	← yacks left	12:06
	← binnisb left	12:06
bremner	dunno. that is what I'd do (just did, yesterday)	12:06
	→ binnisb joined	12:07
	→ tokik joined	12:08
j416	I figured there may be some way to say like, git diff topic..topic_rebased ^master	12:08
	maybe there isn't	12:08
goTAN	ok I know how to difftool the current branch with the remote one but how can I diff with a specific commit? like git difftool master:HEAD origin/master:f423?	12:08
_ikke_	lol, 3 people speaking with the same color name :P	12:08
	→ m0ltar joined	12:09
j416	goTAN: if you have the commit sha1 that is all you have to specify	12:09
	goTAN: the sha1 is universally unique	12:09
	er, at least repo..ly unique	12:09
	universally unique in your repo (and perhaps universally, too) :)	12:10
goTAN	you mean git difftool master <SHA1>?	12:10
j416	yeah	12:10
	→ Zebroid joined	12:10
j416	the refs are just ways to refer to a specific sha1 without typing out that sha1	12:10
goTAN	hm that diesnt work	12:11
	→ doev joined	12:11
goTAN	but the SHA is a commit from the remote (which i get via git fetch)	12:11
	it sais: short SHA 3932 is ambiguous	12:11
osse	goTAN: provide more digits	12:12
j416	goTAN: that's because you have another sha that begins with that, add more digits	12:12
	← psoo left	12:12
	→ craigp_ joined	12:12
osse	digits. it needs moar!	12:12
	→ Sonderblade joined	12:12
	→ marcjs joined	12:12
goTAN	I did and the ahh	12:12
j416	goTAN: 6 or 7 usually works, just add more until it works. :)	12:12
goTAN	ok	12:12
j416	depends on the size of the repo	12:13
goTAN	yea ofcouse...	12:13
	I just misinterreted the error message	12:13
j416	bremner: thanks for confirming I'm not the only one doing it this way, anyway. :)	12:13
	→ noxd joined	12:15
	← Zebroid left	12:15
	← craigp left	12:15
grumbel_	j416: if topic does not change anymore, you could of course use a tag on topic_rebase	12:15
	→ Flowinho joined	12:16
	← jargon left	12:16
j416	grumbel_: I'm not sure what you're suggesting, in what way would that solve it?	12:17
	← dort left	12:17
	← Kayra left	12:17
	→ yacks joined	12:19
bremner	j416: I think "topic rebased" is too hard to calculation on the fly	12:19
	→ renatow joined	12:20
	→ DoniRS joined	12:20
j416	bremner: yeah, maybe it is.	12:20
	→ tgkokk joined	12:22
	→ ewet_ joined	12:22
	→ aarapov joined	12:22
	← ewet_ left	12:22
grumbel_	j416: Maybe I musunderstood; think of git checkout topic; git checkout -b topic_rebased; git rebase master; git tag orig_topic; <commit changes to topic rebased>; git diff orig_topic..HEAD	12:22
	→ dirte joined	12:22
	gitinfo set mode: +v	12:22
grumbel_	but that might be the completely wrong direction :)	12:23
j416	grumbel_: ah, I see what you mean.	12:23
	yeah, that could be an idea, saving the state along the way	12:23
	→ ewet_ joined	12:24
j416	if I rebase again on a new master though I'd still need to update that ref (be it a tag or a branch) to reflect	12:24
	← ewet left	12:24
j416	the use case is, I send [topic] for code review, while I continue working in [topic_rebased], then I want to say to the reviewer "here are my changes since I sent that branch to you for review"	12:25
	→ maroloccio2 joined	12:25
grumbel_	an alternative would be not to rebase, but to merge with master	12:25
	← jperry left	12:25
j416	yeah that's one alternative	12:25
bremner	using a new branch for rebasing the topic helps, if master does not move	12:26
j416	still I need to rebase it in the end though and handle the conflicts	12:26
	→ james_d_h joined	12:26
bremner	e.g. topic-v2	12:26
j416	yeah, been there heh	12:26
bremner	then git diff topic topic-v2	12:26
	→ jperry joined	12:26
	→ ninsei_ joined	12:26
grumbel_	j416: yeah, and the fact that you'd have to resolve conflicts twice does not help much in that kind of workflow	12:27
	← dytrivedi left	12:27
	jperry → Guest42686	12:27
j416	grumbel_: indeed, it's a bit silly. There's rerere of course but.	12:27
	still need to go through and check it twice.	12:27
	← skyUnical left	12:27
	← maroloccio left	12:27
grumbel_	bremner: but that would show all changes made in master as well, no?	12:28
	→ dytrivedi joined	12:28
	→ gua_ould joined	12:28
	← j0ran left	12:28
bremner	grumbel_: "if master does not move"	12:28
	← ninsei left	12:28
	← tokik left	12:29
	→ intellix joined	12:29
	← z8z left	12:29
	→ j0ran joined	12:29
j416	bremner: I assumed you meant create a branch, work on that, then create a new branch just for the rebase, right	12:29
	then the rebased one could be ignored until it's time for last review + deploy	12:30
	but it'd still be there, on the edge	12:30
	that's kind of how I'm working now	12:30
	← ewet_ left	12:30
	→ smashwilson joined	12:31
bremner	I mean every version you send for review, you keep. But that only works if nobody else is working on master (or whatever branch topic is based on)	12:31
j416	yeah, I do that	12:31
	I've topic_review_1, topic_review_2 etc.	12:31
	but master moves every day	12:31
	→ TD joined	12:32
j416	and I rebase on that, so I still need to find what changed between topic_review_2 and the new (rebased) topic_review_3 I'm sending	12:32
	back to square one. blergh. :)	12:32
TD	if i am on a detached branch, is there a way to merge that branch into another one without switching to it and losing my work? kind of like a "push merge"	12:32
	← bobkosse left	12:32
TD	i guess, can i do git push with a local branch?	12:32
	→ Xethron joined	12:32
j416	TD: you can merge it, just remember its sha1, _or_ create a branch from where you are and merge that	12:34
TD	ok	12:35
	← arif-ali left	12:35
j416	TD: but you need to switch to the branch you want to merge into.	12:35
	TD: merge is always "merge into where I am now"	12:36
TD	thanks	12:36
	← reskp left	12:36
	→ arif-ali joined	12:36
	→ reskp joined	12:37
j416	TD: and, as long as you have everything committed and you have that sha1, the commit won't go away even if you check something else out. Unreferenced commits will still hang around for.. I don't remember the number now but I think 90 days or so	12:37
	TD: (unless you try really hard to kill it, that is. 'git gc' won't cut it)	12:38
TD	ok	12:38
	interesting. i'd have assumed it would.	12:38
	didn't realise git had arbitrary timeouts in it	12:38
j416	git tries hard to protect your code. :)	12:38
	→ xsbeats joined	12:39
cbreak	TD: they are user configurable	12:39
	→ reskp_ joined	12:39
j416	TD: when 'git gc' is run (sometimes it will run automatically if there are too many loose objects), it'll check to see if you have any unreferenced objects (e.g. commits) that are old enough, and delete them	12:40
	← reskp_ left	12:40
j416	TD: however, unreferenced objects won't survive a clone, clone only takes referenced objects	12:41
	← Flowinho left	12:41
	← reskp left	12:41
	→ tokik joined	12:41
	→ Error404NotFound joined	12:41
	→ Flowinho joined	12:41
TD	thanks for the education :)	12:41
	← crazydiamond left	12:41
	j416 bows (15°)	12:42
	← arif-ali left	12:43
	→ reskp joined	12:43
	← kesha left	12:43
	→ LuxuryMode joined	12:44
	← reskp left	12:45
	← rfoust left	12:47
	→ HelperW joined	12:48
	→ Kayra joined	12:48
	→ jiku joined	12:48
	→ axsuul joined	12:48
	← LuxuryMode left	12:48
	← axsuul left	12:49
	→ paulweb515 joined	12:49
	→ bobkosse joined	12:49
	→ dbolser joined	12:50
dbolser	hello	12:50
	← luc_ left	12:50
	← a_l_e left	12:50
	→ northfurr joined	12:50
	← northfurr left	12:50
	→ northfurr joined	12:50
dbolser	is there some rule that says you should pull and then co vs. co and then pull (other than the fact that the refspec may not exists yet?	12:50
	→ hkon__ joined	12:51
cbreak	no.	12:51
	← eletuchy left	12:51
cbreak	dbolser: those two operations are unrelated	12:52
	→ eletuchy joined	12:52
cbreak	pull is a fetch + merge	12:52
_ikke_	dbolser: pull merges in the current branch	12:52
cbreak	so you'd do it if you want to merge something into the current branch after fetching it	12:52
	checkout just switches branches (in branch mode)	12:52
dbolser	I'm writing a quick script to update several repos (with identical branch names)	12:52
	→ dougsland joined	12:52
cbreak	update?	12:52
dbolser	pull and co	12:53
cbreak	why co?	12:53
dbolser	or co and pull....	12:53
cbreak	it has nothing to do with updating	12:53
	← Kayra left	12:53
dbolser	cbreak: because I want all repos on the same branch	12:53
_ikke_	!pitfalls	12:53
gitinfo	[!hook_pitfalls] Guidelines for writing hooks: 1. Consume all input (cat >/dev/null if you don't want it). 2. If you use any 'cd', also 'unset GIT_DIR'. 3. Don't git-pull in a hook (or any other script).	12:53
	→ pepijndevos joined	12:53
cbreak	dbolser: then switch to the branch before you pull, obviously	12:53
_ikke_	especialle #3	12:53
cbreak	dbolser: otherwise you'd pull in the other branch...	12:53
	← r1tz left	12:53
dbolser	cbreak: what if the branch I want doesnt exist locally yet?	12:54
	← Generator_ left	12:54
pepijndevos	Uhm, I attempted this, but I kind of messed up I think. https://git.wiki.kernel.org/index.php/GitSvnSwitch Unable to determine upstream SVN information from working tree history	12:54
cbreak	dbolser: doesn't matter	12:54
dbolser	so co just creates it?	12:54
cbreak	dbolser: if it exists on a remote, then you'll create it	12:54
	→ weiyang joined	12:54
cbreak	if not then you'll get an error and you can decide what to do	12:54
dbolser	I think I just had exactly that not happen	12:54
	git checkout release/75	12:55
	error: pathspec 'release/75' did not match any file(s) known to git.	12:55
cbreak	so?	12:55
	← paulweb515 left	12:55
cbreak	there's no such branch, locally or on a remote	12:55
	so you can't check it out, duh.	12:55
	create it yourself, or fetch first	12:55
dbolser	cbreak: after I pull I see that branch locally	12:56
	cbreak: that branch does exist on remote duh ;-)	12:56
cbreak	dbolser: you don't need to pull	12:56
	← j0ran left	12:56
dbolser	git version 1.7.1	12:56
cbreak	dbolser: read what I write please	12:56
	[13:55:42] <+cbreak> create it yourself, or fetch first	12:57
	→ reskp joined	12:57
dbolser	cbreak: I don't see what I'm missing... oh... so I should fetch then switch?	12:57
cbreak	if you want...	12:57
dbolser	pull seems the wrong thing to do here	12:57
cbreak	of course it's wrong.	12:57
	as I said above, it's fetch + merge	12:58
	do you have local history?	12:58
	→ jargon joined	12:58
	← jargon left	12:58
	→ jargon joined	12:58
cbreak	that you want to merge with the remote?	12:58
	then it's useful	12:58
	← jluc left	12:58
dbolser	cbreak: ultimately, I want multiple repos in an unknown state (but should be clean) to switch to a given branch (common to all repos) and to pull that branch.	12:58
cbreak	why pull?	12:58
	← KimHansen left	12:58
dbolser	cbreak: because I'm dumb :-)	12:58
cbreak	then don't pull	12:58
dbolser	ok	12:58
	→ j0ran joined	12:59
cbreak	first, fetch	12:59
	that'll give you the state on the remote	12:59
dbolser	so I'd cd repox, fetch branch r, checkout r, cd ..	12:59
cbreak	then check out the branch you want	12:59
	→ rudisimo joined	12:59
cbreak	then git reset --hard	12:59
dbolser	cbreak: oooh	12:59
cbreak	to the branch you want	12:59
dbolser	can't I try a merge first?	12:59
cbreak	that'll nuke all local changes away without a trace	12:59
	why waste time with a merge?	12:59
dbolser	I mean, I'm assuming the repo is clean... but who knwos what user x has been up to	13:00
cbreak	also, fetch is like "git fetch remotename"	13:00
	don't write a branch	13:00
dbolser	I'd rather try to merge, and if I can't, bail and suggest git reset --hard	13:00
	← SonicX left	13:00
	← TD left	13:00
cbreak	dbolser: if the user is dumb enough to have local changes, then he deserves to lose them when using such a script	13:00
	→ dort joined	13:00
	← roelmonnens left	13:00
dbolser	cbreak: yes in theory, but in practice that user could be me, so I'm not so harsh ...	13:00
cbreak	dbolser: merging is never something you should even think of trying to do automated, it is DESIGNED to fail	13:00
dbolser	cbreak: right	13:01
cbreak	the result MUST be verified by a human	13:01
	→ roelmonnens joined	13:01
dbolser	that's what I told my boss man	13:01
cbreak	(or unit tests)	13:01
dbolser	but he said ... meh...	13:01
	← CussBot left	13:01
	← mamarley left	13:01
cbreak	merges can silently fail, and git won't notice, but the result would be invalid code	13:01
	← gua_ould left	13:01
dbolser	cbreak: OK, basically I want to let the user know that merge failed... what will happen if I just fetch and co?	13:01
cbreak	no merge.	13:02
dbolser	(assuming that a merge would fail if I tried)	13:02
cbreak	fetch will get all remote history	13:02
	and checkout will switch to a branch	13:02
	→ sgambino joined	13:02
dbolser	cbreak: but what state is the workign directory?	13:02
cbreak	if it existed locally, then that'll be used	13:02
	→ CussBot joined	13:02
	→ mamarley joined	13:02
cbreak	the working directory state will not be changed by the fetch	13:02
	→ geekbri joined	13:02
cbreak	if the user was on a different branch, then checkout will change it	13:02
dbolser	yup	13:02
cbreak	if he was on that branch, then nothing will change	13:02
	no changes will be removed	13:02
	no remote changes will be added	13:03
	← Sabbath left	13:03
cbreak	that's what the reset --hard @{u} part will do	13:03
	it will nuke away all local commits	13:03
dbolser	cbreak: and if there are changes in the wd that would get clobbered by the checkout will fail?	13:03
cbreak	and all local uncommitted changes	13:03
	dbolser: yes	13:03
	the changes will just stay in the working dir	13:03
	until the reset --hard	13:03
	← aarapov left	13:04
	→ CorySimmons joined	13:04
	→ amikiri joined	13:04
	→ skyUnical joined	13:04
	→ jimmyy joined	13:04
	→ jluc joined	13:04
	→ SonicX joined	13:04
	→ aarapov joined	13:04
dbolser	cbreak: so my thought now is, ... for each repo r, cd r, git fetch branch/x, if git checkout branch/x is ok, cd .., else, barf ?	13:04
	← adyromantika\|AFK left	13:04
	← amikiri left	13:04
cbreak	no	13:04
	read what I wrote above :/	13:04
	→ ninsei joined	13:04
	← ninsei left	13:04
cbreak	fetch remotes, NOT branches	13:04
	checkout does NOT get remote history	13:05
	→ welly joined	13:05
	← tokik left	13:05
cbreak	reset/merge/rebase/... will get remote history into the local branch	13:05
	all in different ways	13:05
dbolser	ok, so fetch is called without any arguments	13:05
cbreak	no	13:05
	← tgkokk left	13:05
cbreak	it's called with the remote name as argument	13:05
dbolser	oh right ;-)	13:06
cbreak	probably origin, but it's user customizable	13:06
dbolser	sorry	13:06
	yes	13:06
	→ ninsei joined	13:06
cbreak	you can just git fetch --all	13:06
	← ninsei left	13:06
	→ dragon3_ joined	13:06
dbolser	so I fetch, attempt to switch, if switched, OK, else barf?	13:07
	← joki left	13:07
cbreak	switch?	13:07
	← ninsei_ left	13:07
dbolser	switch branch by calling checkout	13:07
cbreak	sure.	13:07
	← Internet13 left	13:07
cbreak	that will not give you any remote history though	13:07
	→ paulweb515 joined	13:07
	← nnyk_ left	13:08
	→ ninsei joined	13:08
dbolser	because I haven't merged?	13:08
cbreak	(unless the branch didn't exist, in which case it will be created from the remote history)	13:08
	[14:05:13] <+cbreak> checkout does NOT get remote history	13:08
	[14:05:40] <+cbreak> reset/merge/rebase/... will get remote history into the local branch	13:08
dbolser	cbreak: when you said that, I thought you meant that so long as I didn't fetch first, co wont get remote history, but if I fetch then co, I'm good (ovbs. I read wrong)	13:09
	→ nnyk_ joined	13:09
dbolser	ok, when (if at all) can a merge fail silently?	13:09
	or will it always barf if there are conflicts?	13:09
	← binnisb left	13:09
dbolser	exit non 0	13:09
cbreak	when the merge result is a failure	13:09
	and git doesn't notice	13:09
	→ cjwilburn joined	13:09
dbolser	oh, failed code?	13:09
cbreak	because git doesn't care about the semantics of the code	13:10
	→ tmcmahon joined	13:10
dbolser	that I'm putting back on the user ;-)	13:10
	→ Internet13 joined	13:10
cbreak	conflicts are never silent	13:10
	incorrect results are.	13:10
dbolser	cbreak: ty	13:10
	I'll paste my script in a minute if you don't mind	13:10
cbreak	if you paste into this channel, I'll kick you :)	13:10
	use a pastebin :D	13:10
dbolser	haha	13:10
	→ Zebroid joined	13:11
	→ binnisb joined	13:11
dbolser	User reg. : Nov 01 09:07:11 2004 (9 years, 18 weeks, 5 days, 04:04:39 ago)	13:12
	dbolser pastes in chan anyway	13:12
cbreak	you never know... :)	13:12
	← noxd left	13:12
dbolser	;-)	13:12
grumbel_	dbolser, be aware that git reset --hard will not remove untracked files / directories though	13:12
	→ decotii joined	13:13
	→ joki joined	13:13
	← jimmyy left	13:13
	← omegahm left	13:13
moritz	git clean does that, with the appropriate options	13:14
	← Flowinho left	13:15
	← roelmonnens left	13:15
	→ dreiss joined	13:15
	← Zebroid left	13:16
	→ polyzen joined	13:16
	→ dik_dak joined	13:16
	← ZujkisNx_ left	13:17
	→ rfoust joined	13:17
	← SonicX left	13:17
	→ chris_thomson joined	13:18
	→ crazydiamond joined	13:18
	← paolooo left	13:19
	← nnyk_ left	13:19
	← tmcmahon left	13:21
	→ bwaxxl joined	13:22
	→ Gavrisimo joined	13:22
	bwaxxl → bwaxxlo	13:22
bwaxxlo	Would anyone recommend on using git for a static website?	13:23
bremner	bwaxxlo: well, as long as you understand the limitations. see !deploy	13:24
gitinfo	bwaxxlo: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	13:24
cbreak	as long as it's mostly code.	13:24
bwaxxlo	bremner: mostly for a simple website for one of our clients	13:24
	they update it constantly. We have numerous folders for backups, etc etc	13:25
	I don't think it's an efficient way to manage the site's data	13:25
	← gnugnu9 left	13:26
	→ Sly1986 joined	13:26
	← chris_thomson left	13:26
bremner	bwaxxlo: also be aware of !binaries	13:26
	err, whatever the bot trigger is, git is not so good at versioning large binary blobs (nothing is _really_ good at it, afaik)	13:27
bwaxxlo	cheers, trying to check this out	13:27
	← JerryT left	13:27
	→ foredoomed joined	13:27
bwaxxlo	Oh, so if I'm managing static html sites, it's probably not good?	13:27
	→ gnugnu9 joined	13:28
bremner	html is fine. e.g. large video files not so much	13:28
	→ achadwick joined	13:28
dbolser	It's so ugly, I'm afraid to paste... https://gist.github.com/dbolser/9464909	13:28
grumbel_	bwaxxlo: you should also take care to not accidently expose the .git directory	13:28
	→ luxgeek joined	13:29
bwaxxlo	grumbel_: to avoid people copying it?	13:29
grumbel_	yes, or to access sensitive data with http://yoursite/.git/...	13:30
	← _tpavel left	13:30
	→ gua_ould joined	13:31
	← sparr left	13:31
dbolser	should I use GIT_DIR in my script, or just check it's unset?	13:32
	→ Vinnie_win joined	13:32
	→ simesy joined	13:33
	→ knownasilya joined	13:33
	→ jonatasnona joined	13:33
	→ asQuirreL joined	13:34
	→ sdouglas joined	13:34
	← drodger left	13:34
	← Error404NotFound left	13:34
	→ drodger joined	13:34
	→ binnisb_ joined	13:35
	← m0ltar left	13:35
	← binnisb left	13:35
	← binnisb_ left	13:35
	→ omegahm joined	13:35
	→ edgy360 joined	13:35
	← Nazca__ left	13:35
	→ binnisb joined	13:35
	→ AaronMT joined	13:36
	→ Error404NotFound joined	13:36
torste	are git add * and git add . the same?	13:36
	→ shuaib joined	13:36
	← Gizburdt left	13:37
dbolser	torste: I think . will recurse	13:37
	← nixfloyd left	13:37
dbolser	* prolly won't	13:37
	my script is buggy...	13:37
	← simesy left	13:37
	← mourest left	13:38
	→ Nazca__ joined	13:38
	→ Foldager joined	13:39
	← CorySimmons left	13:39
	Vampire0_ → Vampire0	13:39
	→ Gizburdt joined	13:39
	→ acidjnk22 joined	13:40
	← acidjnk left	13:40
	→ IrishPrime joined	13:40
	acidjnk22 → acidjnk	13:40
Vampire0	dbolser, torste: also * will not catch files starting with . because Bash expansion skips dot-files for *	13:40
	Not sure if . will skip them also, I don't think so	13:40
	← binnisb left	13:41
	→ andr3a joined	13:41
	→ binnisb joined	13:41
	→ mepl joined	13:42
	Guest41699 → ozymandias	13:42
	← matteo left	13:42
	← ozymandias left	13:43
	→ ozymandias joined	13:43
	→ buffal0 joined	13:43
	← rchavik left	13:43
	← buffal0 left	13:43
mepl	can I specify a user name when I commit or push?	13:43
	→ buffal0 joined	13:44
	→ hyperair joined	13:44
ToxicFrog	mepl: those are two very different things.	13:44
	mepl: when commiting, it takes the username from your git configuration, or (if you are amending) from the commit that you are amending.	13:44
	→ arietis joined	13:44
ToxicFrog	When pushing, it takes it from the URL of the remote you're pushing to, if applicable, but this is used only for authentication - it doesn't affect authorship of the commits you're pushing.	13:45
	← hydrajump left	13:45
	→ LuxuryMode joined	13:45
	→ Dougie187 joined	13:45
torste	what is the safest way to delete a commit?	13:45
	→ souther joined	13:46
ToxicFrog	torste: what do you mean by "delete"?	13:46
	→ MindfulMonk joined	13:46
ToxicFrog	torste: !revert might be helpful to you.	13:46
gitinfo	torste: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	13:46
	← Guest7138 left	13:46
lov	torste: orbital bombardment	13:47
	I suppose it depends on who you are making safe	13:47
	→ matteo joined	13:48
lov	are you making the surviving population safe from your commit?	13:48
	← matteo left	13:48
	→ matteo joined	13:48
	→ m0ltar joined	13:48
mepl	ToxicFrog: thank you but I do not believe you answered my question, can I change the name that is being used?	13:48
ToxicFrog	mepl: being used for what?	13:48
	You asked about two totally different things.	13:48
mepl	my commit	13:49
	← Error404NotFound left	13:49
	← Guest42686 left	13:49
mepl	git commit --author="Martin" -m "comment", is this the proper way to go?	13:49
	→ Kayra joined	13:49
	→ jperry joined	13:49
moritz	no, author should be of the form Firstname Lastname [email@hidden.address]	13:50
	→ livingstn joined	13:50
ToxicFrog	mepl: there is no --author option, unless that was added in a more recent version than I have - it takes authorship information from the user.name and user.email settings.	13:50
moritz	--author has existed for ages	13:51
ToxicFrog	Then I have a bug to file against the documentation.	13:51
	→ neo1691 joined	13:51
ToxicFrog	...or perhaps I'm just an idiot this morning.	13:51
	← reskp left	13:51
ToxicFrog	I blame DST.	13:51
mepl	Ok, excellent. ToxicFrog: no worries, were all human	13:52
ToxicFrog	mepl: ignore everything I said and listen to moritz	13:52
	← skorgon left	13:52
torste	ToxicFrog: lets say I do a commit -m "main function done", then I realize I have missed one line, so I change that too, how do I proceed, I dont want two commits that are identical (not a practical example)	13:52
moritz	torste: you 'git add' your changes, and then type git commit --amend -C HEAD	13:52
	← vmiklos left	13:52
moritz	that rewrites the commit, so only do that if you haven't pushed it yet	13:53
	← jperry left	13:53
mepl	can I change username of a pushed commit? Or is it to late	13:53
	→ jimmyy joined	13:53
torste	moritz: ok, good	13:53
	thx	13:53
	→ zumba_addict joined	13:53
	→ mourest joined	13:54
	→ dglambert joined	13:54
	← Kayra left	13:54
	← jimmyy left	13:54
moritz	mepl: if others have pulled that commit, rewriting public history is a huge hassle	13:54
	!rewrite	13:54
gitinfo	Rewriting public history is not recommended. 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 <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	13:54
	→ vmiklos joined	13:54
	→ ni__ joined	13:54
	→ reskp joined	13:54
	→ jperry joined	13:54
	← dort left	13:55
	→ jimmyy joined	13:55
	← Raging_Hog left	13:55
	jperry → Guest38177	13:55
	← edgy360 left	13:55
	→ noxd joined	13:55
	→ lindenle joined	13:56
	← dsdeiz left	13:56
	→ arif-ali joined	13:57
	→ skorgon joined	14:00
mepl	moritz: can I block a name for being used as author?	14:00
	← crazydiamond left	14:00
	← arietis left	14:01
	→ ethlor joined	14:01
	→ mizu_no_oto joined	14:01
moritz	mepl: you could reject pushes with specific author names in a hook	14:01
_ikke_	That's the only way	14:01
	→ arietis joined	14:02
	→ thierryp joined	14:02
	→ adac joined	14:03
adac	how can I clone the latest tag guys?	14:03
	← aarapov left	14:03
Dougie187	adac: clone the repo. And checkout the latest tag.	14:03
adac	Dougie187, ok I see	14:04
	← yacks left	14:04
_ikke_	git clone -b <tag> for short	14:04
adac	thanks guys	14:04
_ikke_	Note this will land you in a detached HEAD	14:04
	← SorenHolm left	14:05
	← eletuchy left	14:05
	→ eletuchy joined	14:05
	← mizu_no_oto left	14:05
	→ tmcmahon joined	14:06
	→ craigp joined	14:06
	→ silverstripe joined	14:06
	← ni__ left	14:07
	→ ni__ joined	14:08
	← tmcmahon left	14:08
	→ el3ctron joined	14:08
	→ grohne joined	14:08
	← grohne left	14:08
	→ afuentes joined	14:09
	→ JerryT joined	14:09
	← lindenle left	14:09
	→ binnisb_ joined	14:09
	← craigp_ left	14:09
	→ crazydiamond joined	14:09
	← polyzen left	14:09
	← eletuchy left	14:10
	→ tokik joined	14:11
	→ Zebroid joined	14:12
	← binnisb left	14:12
	→ aarapov joined	14:13
	← Parnic left	14:13
	← shuaib left	14:14
	→ harish_ joined	14:14
	→ jaequery joined	14:15
	→ delboy1978uk joined	14:15
kongthap	if i used "git rebase -i" and i wanna cancel (exit from the edit screen without re-apply) how to do that?	14:15
	← aarapov left	14:15
	→ tomengland joined	14:16
	→ Parnic joined	14:16
	← Zebroid left	14:16
kongthap	i type :q git still re-apply all commits	14:16
	← el3ctron left	14:17
	→ mizu_no_oto joined	14:17
delboy1978uk	i seem to have a submodule which isnt installing, [submodule "jquery-browser-fingerprint"] path = /js/jquery-browser-fingerprint url = git://github.com/carlo/jquery-browser-fingerprint.git. i should theoretically just git submodule init and git sobmodule update, right?	14:17
	→ sparr joined	14:18
	→ GoZoner joined	14:18
	← skyUnical left	14:19
bremner	kongthap: delete all the lines	14:20
	→ hesco joined	14:20
	← tomengland left	14:20
	→ Patrouss joined	14:21
	→ bwreilly joined	14:21
	← thierryp left	14:22
	→ ojacobson joined	14:22
	→ thierryp_ joined	14:22
Patrouss	Hi there, I'm experiencing a strange issue with gitolite. Is this a good place to ask help about gitolite configuration on my server?	14:23
kongthap	bremner, i thought delete all the lines mean to drop those commits	14:23
ojacobson	Patrouss: here, #gitolite; !ask	14:24
gitinfo	Patrouss: 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.	14:24
	← binnisb_ left	14:24
	→ delboy1978uk1 joined	14:25
kongthap	after rebasing with -i, and use "edit" option, this is result http://pastie.org/8903784 is it normal ?	14:25
bremner	kongthap: read the full text in the git-rebase-todo buffer	14:25
Patrouss	Thx I'll ask here and see if I can get an answer :)	14:25
kongthap	bremner, ok	14:25
	← bwreilly left	14:26
	← beautifulmind left	14:26
	→ n-st joined	14:26
moritz	kongthap: looks like a pretty normal conflict to me	14:26
	!eek	14:26
gitinfo	[!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	14:26
moritz	(though in a rebase, you do git rebase --continue instead of git commit after you've resolved them)	14:26
	← delboy1978uk left	14:26
	→ _echelon_ joined	14:27
Patrouss	So my git server is working great, I also have gitolite installed on the server to manage the configuration via a local repository. Everything was going fine until we changed the user git on the server on another partition to get more space for the repos. With users that were previously added, everything is still working well. But the issue is taht now when I push the gitolite repository, the public keys are still going in the good fo	14:27
kongthap	moritz, i use "edit" on only one line i did commit --amend and rebase --continue but seems like my last two commits have not been re-applied, what's wrong?	14:28
	← jagob left	14:28
	→ binnisb_ joined	14:28
Patrouss	arren't added in the .ssh/authorized_keys anymore in the # gitolite start #gitolite end section!	14:28
_ikke_	seems something wrong with the hooks	14:29
moritz	kongthap: dunno	14:29
	→ renatow_ joined	14:29
moritz	kongthap: it might help if I saw more output (like git log before and after the rebase, and the commands you actually typed, in correct order), though I can't guarantuee it	14:29
_echelon_	hi there. I will like to take part in this year gsoc 2014: Pack bitmap support for libgit2. i have already downloaded the source code and gone via some of them but don't know how to continue. Please can anyone help me with direction?	14:29
moritz	kongthap: are you on the branch that you wanted to end up in? or rather in a detached head?	14:30
Patrouss	_ikke_: I'll look at what I can get from the hooks directory in the .gitolite directoy	14:30
moritz	_echelon_: maybe ask the libgit2 developers?	14:30
	← Purveyor left	14:30
	← Dudi left	14:30
delboy1978uk1	whebn using git submodule add [URL], is there a way to say where to put the submodule? it dumped it in my site root	14:30
	→ EminenceHC joined	14:31
	→ Dudi joined	14:31
	← goTAN left	14:31
moritz	delboy1978uk1: yes. man git-submodule	14:31
gitinfo	delboy1978uk1: the git-submodule manpage is available at http://jk.gs/git-submodule.html	14:31
	→ becks__ joined	14:31
_echelon_	please moritz, how do i get in contact with them cos i just saw their names on the project list but dont know how to get to them.	14:31
kongthap	moritz, i got merge conflic, so must edit the file again, but i don't understand the system message "make them as resolved using git add" just edit the conflic then use git add filename, then commit --amend again as normal or what else to do ?	14:31
delboy1978uk1	thanks guys :-)	14:31
ojacobson	Patrouss: how, exactly (commands, diffs) did you change the git user?	14:32
	→ binnisb joined	14:32
	← sdouglas left	14:32
	→ gumnos joined	14:32
	← renatow left	14:32
Patrouss	ojacobson: good question, it's the network admin who made the changes ;)	14:32
ojacobson	gitolite largely uses $HOME to find its own brains, so if you moved the user's homedir and updated passwd to match (usermod, etc) then the change should have been transparent	14:32
	Do you have a non-gitolite user on the same host?	14:32
moritz	_echelon_: I typed 'libgit2' into the search engine of my choice (duckduckgo.com), and the very first hit is a mailing list	14:32
Patrouss	ojacobson: yes I do, i'm logged on the server via Putty with my own user	14:33
gumnos	Is there an easy way to remember the last branch I was on? I find myself on a given branch, flipping over to master and then wanting to merge with the one I was just on. Vim uses the "#" filename to refer to the previous file. Any analog in git?	14:33
delboy1978uk1	awesome that worked perfect :-D	14:33
moritz	kongthap: no, after the 'git add' you run 'git rebase --continue', not 'git commit ...'	14:33
_echelon_	thanks moritz	14:33
moritz	gumnos: iirc there's git checkout -	14:33
	or you can look into the reflog	14:34
	→ simesy joined	14:34
moritz	dunno if git-merge also understands -	14:34
gumnos	hm...is there a name for "-"? (searching "git help checkout" has a bajillion "-" characters in it)	14:34
ojacobson	moritz: it does	14:34
	gumnos: man git-merge, man git-checkout	14:34
gitinfo	gumnos: the git-merge manpage is available at http://jk.gs/git-merge.html	14:34
	gumnos: the git-checkout manpage is available at http://jk.gs/git-checkout.html	14:34
	← raccoon_ left	14:35
ojacobson	it doesn't have a name of its own, \b-\b is a good approximation though	14:35
	like so much of git's UI, it's special cased in some commands, rather than being part of git's revision language	14:35
	→ raccoon_ joined	14:35
	→ Leoneof joined	14:35
	→ thiago joined	14:35
	→ BadProphet joined	14:35
	→ eletuchy joined	14:36
	← binnisb_ left	14:36
	→ Ozch joined	14:37
Patrouss	ojacobson: what do you exactly mean by updated passwd to match (usermod, etc) ?	14:37
	← jaequery left	14:37
	← rgr left	14:37
ojacobson	Patrouss: the $HOME env var is initialized by ssh using pam, which looks in your user database to figure out what value it should have. Conventionally, that's /etc/passwd, which can be edited with `usermod`.	14:37
gumnos	hrm. Was this (semi)recently added? My 1.7.10.4 on Debian doesn't seem to list that "-" feature	14:37
ojacobson	On linux, getent passwd <username> will return the entire user record	14:38
	→ ErKa joined	14:38
ojacobson	which should tell you what the user's homedir actually is	14:38
	← simesy left	14:38
	← blackmesa left	14:39
	→ agenteo joined	14:39
JakePee	From the command line how do I only display the overview of a commit	14:39
	← agenteo left	14:39
osse	JakePee: git show -s commit	14:40
_ikke_	JakePee: git show <hash>	14:40
osse	JakePee: or git log -1	14:40
	→ elbeardmorez joined	14:40
osse	hmm	14:40
JakePee	Sorry, particularly looking for a filediff overview	14:40
gumnos	but at least those online pages that ojacobson had gitinfo show specify that I can use "@{-1}" instead.	14:40
_ikke_	git show -p <commit>	14:40
	→ hobodave joined	14:40
	→ nnyk_ joined	14:41
	← eletuchy left	14:41
Patrouss	ojacobson: getent passwd git returns me : "git:x:108:116:git version control,,,:/home/git:/bin/bash" I don't know if this can helps?	14:41
ojacobson	So is /home/git where gitolite's brains actually are, now?	14:41
JakePee	e.g. YourFirstChangedFile +++-------- +20 -50	14:41
osse	JakePee: git diff --name-only	14:41
ojacobson	Or are they somewhere else	14:41
osse	ehh, now I'm confused	14:41
ToxicFrog	JakePee: git diff --stat	14:41
Patrouss	ojacobson: yes the folder .gitolite is within /home/git	14:41
gumnos	even more strange, I just tested "git checkout -", and it works, it just wasn't in Debian's git man pages. Thanks, as that solves my troubles.	14:42
JakePee	Ah, there we go. Thanks ToxicFrog	14:42
	← mizu_no_oto left	14:42
	← hobodave left	14:44
	→ kinigitz joined	14:44
	→ it_tard joined	14:45
	← crazydiamond left	14:45
_ikke_	osse: It's where you install gitolite	14:46
	← reskp left	14:46
_ikke_	osse: But by default it installs in the homedir of the user you create	14:46
	→ gabedain_ joined	14:47
	→ dsdeiz joined	14:48
	→ _ikke__ joined	14:48
	→ allouis___ joined	14:48
	→ obert joined	14:48
	→ mribeirodantas joined	14:49
osse	FW: ojacobson	14:49
_ikke_	arg, autocomplete fail again	14:49
	← JTF195 left	14:49
	← ahammond left	14:49
	← nfk left	14:49
	← knigitz left	14:49
	→ goTAN joined	14:49
	← tmart left	14:49
	← Klumben left	14:49
	← dserodio left	14:49
	← ConstantineXVI left	14:49
	← raz left	14:49
osse	JakePee: if you want the diff associated with a particular commit then git show <commit> is what you want	14:49
	← souther left	14:49
	← gabedain left	14:49
	← AlexanderS left	14:49
	← simpleminds left	14:49
	← pinage404 left	14:49
	← stealthii left	14:49
	← joelsmith left	14:49
	← allouis__ left	14:49
	← kini left	14:49
	← MindfulMonk left	14:49
	← xsbeats left	14:49
	← nanotech left	14:49
	← cephalostrum left	14:49
	← Okaria_ left	14:49
	→ souther joined	14:49
	← _ikke_ left	14:49
	← neal__ left	14:49
	← offbyone left	14:49
	→ simpleminds joined	14:49
	→ stealthii joined	14:49
	← amcsi_work left	14:49
	← relipse left	14:49
	← jaeckel left	14:49
	← mutex left	14:49
	← rath left	14:49
	→ Okaria_ joined	14:49
	→ dserodio joined	14:49
	→ lopezt joined	14:49
lopezt	hi guys	14:49
	anyone familar with git submodules and merging?	14:49
	← coasterz left	14:49
	→ koda joined	14:49
	→ homer91 joined	14:49
ojacobson	Patrouss: so what does "changed the git user" actually mean, then?	14:49
	→ mutex_ joined	14:49
	← twisted` left	14:49
	← danemacmillan left	14:49
	→ Klumben joined	14:49
	← chriswk___ left	14:49
	→ sohail joined	14:49
	← stealthii left	14:49
	→ stealthii joined	14:49
	← Okaria_ left	14:49
	→ Okaria_ joined	14:49
	← stealthii left	14:49
	→ stealthii joined	14:49
	← sohail left	14:49
	→ sohail joined	14:49
	← dserodio left	14:49
	→ dserodio joined	14:49
	← stealthii left	14:49
	→ stealthii joined	14:49
	← syst3mw0rm left	14:49
	allouis___ → allouis__	14:49
	← johntitor2036 left	14:49
	→ ConstantineXVI joined	14:49
	→ MindfulMonk joined	14:49
	→ neal__ joined	14:49
	→ syst3mw0rm joined	14:49
	→ nanotech joined	14:50
	→ johntitor2036 joined	14:50
	→ AlexanderS joined	14:50
	→ chriswk___ joined	14:50
	→ sdouglas joined	14:50
	→ matheus23 joined	14:50
	← Kneferilis left	14:50
	→ bambams_ joined	14:50
	→ felixjet joined	14:50
	→ offbyone joined	14:50
	← homer91 left	14:51
ojacobson	"I don't know what changed, but now it doesn't work" is singularly difficult to diagnose over the internet :)	14:51
	→ VaticanCameos joined	14:51
VaticanCameos	Is it possible to clone a github wiki page if I have forked the repository?	14:51
	→ ahammond joined	14:51
Patrouss	ojacobson: By "changed git user" I mean that we moved it from /dev/sda1 ti /dev/sdb1 to get more space for the repertories	14:51
	← obert_ left	14:51
	← felixjet__ left	14:51
	→ yacks joined	14:51
	→ cephalostrum_ joined	14:51
	→ razZzz joined	14:51
	razZzz → raz	14:51
	→ joelsmith joined	14:51
	→ blackmesa joined	14:51
	→ rath_ joined	14:51
	rath_ → rath	14:51
	← j0ran left	14:52
	→ Kayra joined	14:52
	← ArSn left	14:52
ojacobson	moved it how?	14:52
	Is /home/git now a mount point?	14:52
	Is there a symlink somewhere?	14:52
	Did you move the whole of /home?	14:52
	→ observ3r joined	14:52
	← decotii left	14:52
	→ bwreilly joined	14:52
	→ decotii joined	14:53
	flazz → flazz_gone	14:53
	→ jaeckel joined	14:53
	→ twisted` joined	14:53
	← raz left	14:53
	→ raz joined	14:53
	← gumnos left	14:53
	→ amcsi_work joined	14:53
	→ fr33 joined	14:53
	→ xsbeats joined	14:53
	← DoniRS left	14:53
	← Kayra left	14:53
	→ kini joined	14:54
	→ skyUnical joined	14:54
	→ tmart joined	14:54
	→ ArSn joined	14:54
	→ DoniRS joined	14:54
	→ relipse joined	14:54
	→ godgodgodgo joined	14:54
Patrouss	ojacobson: It doesn't seem to be a symlink	14:55
	ojacobson: If we have changed the git user password, may it have cause this issue?	14:56
ojacobson	Given that gitolite doesn't use password authentication, it's unlikely	14:56
	→ pinpin404 joined	14:56
	→ reskp joined	14:57
	← binnisb left	14:58
_ikke__	the gitolite command has options to fix the hooks	14:58
	→ cvanball joined	14:58
Patrouss	_ikke__: Do you have an idea of what it looks like?	14:58
	→ thedodd joined	14:58
	← OnkelTem left	14:59
	← nnyk_ left	14:59
	→ sburgess joined	15:00
	→ rgr joined	15:00
	→ OnkelTem joined	15:00
	→ binnisb joined	15:00
	→ jaequery joined	15:03
	← jaequery left	15:03
	→ jaequery joined	15:04
	← jaequery left	15:04
	→ shinnya joined	15:04
	→ SorenHolm joined	15:04
	→ infynyxx joined	15:04
_ikke__	Patrouss: gitolite setup	15:04
	→ j0ran joined	15:04
	→ jaequery joined	15:04
	→ nnyk_ joined	15:04
	← _echelon_ left	15:04
	→ crazydiamond joined	15:05
	← weiyang left	15:05
	← pduin left	15:05
	→ roelmonnens joined	15:05
	← root___ left	15:05
	→ starkhalo joined	15:06
	← bobkosse left	15:06
	→ pduin joined	15:06
	→ _echelon_ joined	15:07
	← tokik left	15:07
	→ ciampix joined	15:07
	← silverstripe left	15:07
	← cjwilburn left	15:08
	← reskp left	15:09
	→ senj joined	15:10
Patrouss	_ikke__: gitolite is setup on the server but I don't have access to gitolite command. I verified that it is well install by doint sudo apt-get install gitolite and it says it is already isntalled	15:11
	← Dudi left	15:11
	→ reskp joined	15:12
_ikke__	gitolite setup also fixes hooks on repos	15:12
	← _echelon_ left	15:12
	→ Zebroid joined	15:12
_ikke__	And other things	15:12
	Patrouss: can you login as the git user?	15:13
	ie, su - git?	15:13
Patrouss	_ikke__: yes	15:13
	← jaequery left	15:13
	← stodan left	15:13
_ikke__	Then login as git, you should be able to execute the gitolite command there	15:13
Patrouss	_ikke__: I'm now as git@	15:13
_ikke__	ok	15:14
	try gitolite	15:14
Patrouss	gitolite: command not found	15:14
_ikke__	hmm	15:14
	ok	15:14
	If you check the homedir of the git user, do you see any gitolite specific files?	15:15
	← ni__ left	15:15
Patrouss	_ikke__: It's the network admin who installed gitolite and I think he run the setup from its own account on the server	15:15
	flazz_gone → flazz	15:15
Patrouss	in this guy user files I can see some .gitolite installation specific files	15:15
	← binnisb left	15:16
	← john2x left	15:16
bremner	the gitolite would be installed in e.g. /usr/bin by linux distros	15:16
	← Zebroid left	15:17
	← dglambert left	15:17
	→ binnisb joined	15:17
	→ john2x joined	15:17
Patrouss	bremner: I can't see anything specific to gitolite in /usr/bin	15:18
	→ jds joined	15:18
bremner	Patrouss: do you know how gitolite was installed?	15:18
Patrouss	1 sec	15:18
	→ bliker joined	15:18
	perlpilot → PerlJam	15:19
	← cvanball left	15:19
	→ mizu_no_oto joined	15:19
Patrouss	bremer: the person who isntalled gitolite followed these steps : http://kaibehrends.org/ubuntu-git-server-setup/#setting-up-the-server	15:19
	← cff left	15:19
	← lite_ left	15:20
	← hkon__ left	15:20
moritz	maybe that person should be asking the questions here :-)	15:20
	→ maestrojed joined	15:21
	→ GT4066 joined	15:21
bremner	Patrouss: it's probably gitolite-v2, so work from the gitolite v2 docs	15:21
	← maestrojed left	15:21
	← goTAN left	15:22
Patrouss	bremner: thx I will try to do something with the doc ;)	15:22
	→ CorySimmons joined	15:22
	→ axsuul joined	15:23
	← Xethron left	15:23
	← Nickeeh left	15:23
	← foredoomed left	15:23
	→ Nickeeh joined	15:24
Patrouss	Just a last question in witch chmod should i put .ssh folder on git user?	15:24
bremner	0700	15:25
Patrouss	ok thx	15:25
	← m0ltar left	15:25
	← srji left	15:25
	→ hholtmann joined	15:26
	→ srji joined	15:26
	← dougsland left	15:26
	→ maestrojed joined	15:27
	← SorenHolm left	15:27
	← rath left	15:27
	→ rath joined	15:28
	← rath left	15:28
	→ dogarrhea_ joined	15:29
dogarrhea_	'merge' is not possible because you have unmerged files.	15:29
	lol i'm tired of git error messages.	15:29
	← blackmesa left	15:29
	← nnyk_ left	15:29
	Forkk_ → Forkk	15:29
	← GoZoner left	15:29
_ikke__	dogarrhea_: You are already in a merge	15:29
	← dsdeiz left	15:29
	← hholtmann left	15:31
	→ foist joined	15:31
	← omegahm left	15:32
	→ Kneferilis joined	15:32
	→ aarapov joined	15:32
foist	Any idea why this doesn’t work? ’git submodule add https://bitbucket.org/ns9tks/vim-l9 _vim bundle/vim-l9/‘ It says repo not found.	15:32
	← sdouglas left	15:33
	← armyriad left	15:33
ojacobson	foist: the URL is not a git repo: $ git ls-remote https://bitbucket.org/ns9tks/vim-l9	15:33
	fatal: repository 'https://bitbucket.org/ns9tks/vim-l9/' not found	15:33
	→ cvanball joined	15:33
ojacobson	dig around the bitbucket UI, the correct repo URL is somewhere in there	15:33
	(the web UI is a view of the repo, not the repo itself)	15:33
	→ armyriad joined	15:33
_ikke__	git submodule add takes two parameters, not 3	15:34
	(two positional arguments)	15:34
	→ simesy joined	15:34
	→ kballou joined	15:34
	→ ni__ joined	15:35
foist	_ikke__: woops, that was a typo.	15:35
_ikke__	usually the repository urls and with .git	15:36
Patrouss	Little question about linux in general, in my .gitolite.rc I can see than some local variable are defined based on $ENV{HOME} but if I do echo $ENV{HOME} in my terminal, this var seems to be null. echo $HOME is allthough pointing on /home/git, can it be a base of the issue you think?	15:36
foist	ojacobson: Is it possible they only have hg on, and not git?	15:36
	→ _echelon_ joined	15:36
ojacobson	Patrouss: .gitolite.rc is perl	15:36
moritz	that would just be $HOME on your shell	15:36
ojacobson	$ENV is a perl hash containing all the environment vars; in bash, those vars are exposed as normal vars	15:36
Patrouss	Ok I understand	15:36
	→ eletuchy joined	15:36
	← jiku left	15:36
ojacobson	foist: It is nearly certain that they do	15:37
foist	ojacobson: because I only see hg repo URLs	15:37
	→ hholtmann joined	15:37
_ikke__	That's possible	15:37
ojacobson	if the project is using mercurial it's nearly definitionally not using git	15:37
	and vice versa	15:37
_ikke__	It's either a git repo, or a hg repo	15:37
	← gabedain_ left	15:37
	→ sdouglas_ joined	15:37
ojacobson	You can map from one to the other, but neither git, hg, nor bitbucket does that automatically	15:37
foist	Can I get that repo to play nice with my submodules?	15:37
	→ goTAN joined	15:38
	→ jcvfen joined	15:38
	→ cjwilburn joined	15:38
foist	Ah, it's on GH anyways. Thanks, guys.	15:38
ojacobson	The git-remote-hg helper may be able to do something	15:38
	→ hobodave joined	15:38
	← simesy left	15:39
	→ MattMaker joined	15:39
	← Gizburdt left	15:40
	→ el3ctron joined	15:40
	→ adamm_ joined	15:40
	← eletuchy left	15:41
	← adamm_ left	15:42
	→ adamm_ joined	15:42
	→ jperry joined	15:42
	← adamm left	15:42
	← noxd left	15:42
	adamm_ → adamm	15:42
	← yacks left	15:43
	→ Raging_Hog joined	15:43
	← Parnic left	15:44
	→ Mitchbones joined	15:45
	← jimmyy left	15:45
goTAN	ok so when I create a new branch via git checkout -b mybranch and change some data and then push it via git push origin. does this mean that now there is a new branch on the remote other people can use?	15:45
	→ torjus joined	15:46
	→ Trudko joined	15:46
	→ jaequery joined	15:46
	← LuxuryMode left	15:46
thiago	goTAN: if git push told you that it created a new branch, that means there's a new branch	15:46
goTAN	well I am scared to do it so I thought its better to ask first	15:47
	→ axl_ joined	15:47
sburgess	goTAN: yes, but if you want to be more specific, qualify the branch you are pusing via git pus origin mybranch:mybranch	15:47
	← zoso left	15:47
sburgess	then you know other people should be able to see origin/mybranch	15:48
goTAN	ok so when pther people do a git fetch they also can see the created branch?	15:48
	← acidjnk left	15:48
	→ pikaren joined	15:48
sburgess	if they do a git fetch on the remote that is your repo	15:48
	→ pfg joined	15:48
sburgess	git fetch --all #gets all remotes	15:48
	→ chuck54 joined	15:48
	← sdouglas_ left	15:48
	← jperry left	15:48
goTAN	uh ok	15:48
sburgess	they might have multiple remotes, one for your repo, one for theirs	15:49
	→ sdouglas joined	15:49
	← mribeirodantas left	15:49
	← axsuul left	15:49
	→ LuxuryMode joined	15:50
goTAN	but what does this mybranch:mybranch mean?	15:50
	→ xlinkz0 joined	15:50
goTAN	it creates the branch under origin	15:50
	?	15:50
thiago	goTAN: that pushes mybranch to the remote named mybranch	15:50
	I mean, to the remote, with a branch named "mybranch"	15:50
sburgess	Yeah, it specified the local and remote names for the branch	15:50
	git push REMOTE localname:remotename	15:51
	← rgr left	15:51
goTAN	well but I just created the local branch, I just want to move it not the remote	15:51
	ahh	15:51
	I got it	15:51
	damn the name convetion are a bit confusing	15:51
	← aarapov left	15:51
	← Ozch left	15:51
	← jargon left	15:52
	→ whitby joined	15:52
goTAN	but I am getting close to get all the branching stuff ;)	15:52
	← sdouglas left	15:54
_ikke__	goTAN: git push origin, depending on the push.default setting, only pushes existing branches	15:54
	→ joelm joined	15:54
	← GT4066 left	15:54
	← markovh left	15:55
	← jaequery left	15:56
	→ saikrishna_ joined	15:56
	→ lpapp joined	15:56
lpapp	hi, what is the best way of squashing certain commits in a feature branch for inclusion into another, like the main?	15:57
	the commits do not come in a series because I kept merging back from the main branch, so there are gaps among them.	15:57
	← neo1691 left	15:57
	← hyperair left	15:57
osse	lpapp: rebase -i, then reorder the commits	15:57
lpapp	is that the only way or there is a more convenient squash option for it?	15:58
	→ sdouglas joined	15:58
sburgess	and you can leave out the ones you dont want with git rebase -i	15:58
_ikke__	lpapp: Not when they are not consecutive	15:59
	← Misan left	15:59
lpapp	:-(	15:59
osse	lpapp: you have to tell git which commits you want to move. Git will not detect it for you. rebase -i is the only way I know	15:59
	→ jbalsano joined	15:59
_ikke__	lpapp: What is wrong with rebase?	15:59
	"I want to drive in this nail. Is there any other way then using a hammer?"	15:59
thiago	nailgun	16:00
	:-)	16:00
	→ dort joined	16:00
osse	thiago: then you have to use a different nail	16:00
	← ehmatthes left	16:00
	→ joemcgill joined	16:00
	← rob_w left	16:00
osse	unless the nail you already have fits the nailgun	16:00
	← roelmonnens left	16:00
	→ Parnic joined	16:01
	← vurma left	16:01
	→ roelmonnens joined	16:01
lpapp	_ikke__: I would prefer an option for enumerating the commits, and then I would get a commit message session.	16:01
ojacobson	You could do it with git cherry-pick --no-commit but that's more or less what git rebase -i uses anyways so	16:01
lpapp	_ikke__: all this without the workaround of "re-ordering". It should be unnecessary.	16:01
	← Guest84615 left	16:02
lpapp	it is a workaround extra step, which should not be logically compulsory.	16:02
	← ORiON-- left	16:02
osse	lpapp: that's basically what rebase does. you can re order and squash in one operator	16:02
	operation	16:02
	→ Gizburdt joined	16:02
lpapp	osse: yes, rebase does in two steps what an option could do.	16:02
	(in one step)	16:02
	→ cronin joined	16:02
cronin	is there a way to show the date with git fsck?	16:03
osse	lpapp: how is it two steps?	16:03
ojacobson	lpapp: is the point of this "someone should write this for me" or is the point of this "how do I solve my problem" ?	16:03
	← ni__ left	16:03
lpapp	osse: reorder + squashing. reordering is a fully extra step with the current feature set.	16:03
ojacobson	if the latter, talking about how much you don't like the solution is only going to drive people to ignore you	16:03
osse	lpapp: you only have to run rebase once	16:03
ojacobson	if the former, well, patches welcome. Try the !list. :)	16:03
gitinfo	[!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	16:03
	← lb1a left	16:03
_ikke__	lpapp: You have to rewrite the history, otherwise those commits would just stay part of it	16:04
lpapp	ojacobson: I already know about git rebase, etc. I was specifically asking for a more convenient method as written.	16:04
	← pduin left	16:04
	flazz → flazz_gone	16:04
_ikke__	rebase is the tool for that	16:04
lpapp	_ikke__: I really do not see how	16:04
ojacobson	lpapp: why would you ask here? Not too many git core developers bother with this channel.	16:04
	Try the !list.	16:04
gitinfo	[!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	16:04
osse	I would be impressed to see an --option=foo,bar,baz,lol that would be more convenient than moving lines around in a file	16:04
	→ quetz joined	16:04
lpapp	git "squash" sha1 sha2 -m "Done, cool". -> done.	16:04
	← WormDrink left	16:04
ojacobson	If you don't mind two commands, 'squash' is 'cherry-pick --no-commit'	16:05
	→ rgr joined	16:05
ojacobson	which is what git-rebase uses under the hood anyways	16:05
	(for squash and fixup, anyways)	16:05
	← chuck54 left	16:05
	← roelmonnens left	16:05
osse	lpapp: anyway, the way you do it now is: rebase -i, in the editor find the commit you want to move and squash. move the line up to below the other commit. change 'pick' to 'squash' and then you're done.	16:05
	← arietis left	16:06
	→ ORiON-- joined	16:06
lpapp	osse: ojacobson you are saying features cannot be discussed in here?	16:06
	-osse	16:06
_ikke__	lpapp: Can you explain in a bit more detail what you want to achieve?	16:06
	→ Neozonz\|Disc joined	16:06
	← pfg left	16:06
_ikke__	I mean, what the situation is and what the result is you want?	16:06
goles	Hello, I'm trying to do a subtree pull, (git subtree pull --prefix External/APIClient master --squash) however I'm getting "fatal: 'master' does not appear to be a git repository". What could be going on here? (haven't done this in a while :S)	16:06
	Neozonz\|Disc → Guest279	16:06
	← Macaveli left	16:07
	← Gizburdt left	16:07
goTAN	so I have a origin/master and a origin/develop. now someone added a origin/update. I want to merge this branch into origin/develop and delete it... can I just do git checkout develop; git merge origin/update; git push?	16:07
cbreak	goTAN: sure.	16:07
lpapp	osse: I am not asking for that as written.	16:07
goTAN	cbreak: seriously? so when I am on develop branch the remote branch is origin/develop?	16:08
	I dont have todo git push origin/develop?	16:08
	→ acharlieh joined	16:08
lpapp	osse: you might be impressed by automatically getting the sha1 by a very short script and supplying that to an option rather than finding 3-4 commits in a few hundred items in a list ...	16:08
cbreak	goTAN: yes.	16:08
	if it is auto created	16:09
	if you already have a develop, then who knows.	16:09
arand	goTAN: origin/develop is a local "remote tracking branch".	16:09
cbreak	goTAN: you can find out with git branch -vv	16:09
goTAN	its created vie git checkout -b branch and then push origin branch:branch	16:09
lpapp	especially when the list does not even contain author for easy finding, etc.	16:09
	→ lite_ joined	16:09
_ikke__	lpapp: then do: got cherry-pick -n <hash> <hash> <hash>	16:09
osse	lpapp: the list doesn't have to be hundreds of items long. it needs only be as long as the the number of the oldest commit you want to change.	16:10
	→ pfg joined	16:10
cronin	i'm trying to recover lost data that occurred yesterday. i had an urgent fix and apparently messed things up. My last commit was on 3/6 and I must have stashed the code or something, committed and then reverted. I'm not 100% sure. What steps can I take to see if I can restore the code that was written on 3/7?	16:10
	← ThomasLocke left	16:10
lpapp	_ikke__: cherry pick does not squash.	16:10
	→ rainmanjam joined	16:10
lpapp	osse: which is few hundred ...	16:10
_ikke__	lpapp: cherry-pick --no-commit does	16:10
	It applies the commits only to the working tree. You can then commit that, creating a squashed commit	16:11
osse	lpapp: using your hypothetical method. how would you find the SHAs ?	16:11
lpapp	osse: I understand you have not met this scenario yet, but I am.	16:11
	→ nnyk_ joined	16:11
lpapp	osse: that is really depending on the case, absolutely.	16:11
	in my case, it is a simple author check.	16:11
osse	also, for every squash you did you would have to re-find the SHAs since they would change.	16:11
lpapp	_ikke__: ok, thanks, will try.	16:11
ojacobson	lpapp: less "cannot"	16:12
atrus	cronin: 'git reflog' may help.	16:12
ojacobson	more "unlikely to lead to any satisfying outcomes"	16:12
lpapp	seems almost what I was looking for.	16:12
cbreak	cronin: did you commit the changes you seek?	16:12
	→ Gizburdt joined	16:12
lpapp	the only missing thing about it is inline commit message in the command.	16:13
	or "in place".	16:13
ojacobson	lpapp: adding a new git command that wraps cherry-pick and commit is "easy" up to shell scripting, tbh	16:13
	← jceb_ left	16:13
	→ Zebroid joined	16:13
ojacobson	in the time you've spent complaining that git's UI doesn't work the way you want here, you could probably have written the command	16:13
	→ ehmatthes joined	16:13
ojacobson	added it to $PATH	16:13
	and moved on with life :)	16:13
	(git's UI is terrible)	16:14
cronin	atrus: reflag shows my commit on 3/6 and then a commit on 3/9 and a reset shortly after. the commit on 3/9 doesn't show the lost code. cbreak it's possible i stashed it and then lost it somehow during a rest	16:14
	reset*	16:14
	← Packardnode left	16:14
cbreak	no	16:14
	stashes are not lost due to resets	16:14
lpapp	ojacobson: that is not quite fair...	16:14
cbreak	they are listed with git stash list	16:14
lpapp	it is not a one person thing.	16:14
	← tg left	16:14
xsbeats	is there a way to git clone withouth cd'ing into the directory i want the repo to be cloned it, while also eliminating the need to specify the name of the repo?	16:14
ojacobson	lpapp: Okay, true, I'm assuming you already know how to write shell scripts (and parse arguments sanely)	16:14
lpapp	in fact, if you work in a feature branch, and you keep merging back to remain up to date, it is pretty much what anyone needs.	16:14
cbreak	cronin: if you haven't committed the changes you seek, then you are out of luck, and git can not help you.	16:14
ojacobson	(that second thing is kind of a question, since shell arg parsing is >_<)	16:14
xsbeats	s/cloned it/cloned in	16:15
lpapp	ojacobson: nah, it is not about that.	16:15
cronin	cbreak: oh i found it! i used gitk --all $( git fsck --no-reflog \| awk '/dangling commit/ {print $3}' )	16:15
lpapp	I am telling you this is not a one-person operation.	16:15
cronin	wow what a relief	16:15
lpapp	surely, people should not write the same all around for the same scenario.	16:15
ojacobson	Ah, I see	16:15
lpapp	of course, anything can be made "work".	16:15
ojacobson	I'm sorry, I mistook you for someone I could help. I apologize for wasting your time and attention.	16:15
cbreak	then you did commit it and it should be in the reflog	16:15
	← pfg left	16:15
lpapp	but if we worked like that, we would get much less thing done in the long run.	16:15
Patrouss	Little question here, if another user on the git server setup gitolite on its own session in /usr/local/gitolite and I'm administrator on the server, is there a way to aceed to this specific user /usr/local/ folder without having its password?	16:16
	→ dmnd joined	16:16
lpapp	ojacobson: when meeting such scenarios, I usually know how to work it around, but why I come here is to ask if I need the workaround, and if I do, whether it makes sense to make it friendlier.	16:16
	either way, I will use cherry-pick and commit for now.	16:16
cbreak	Patrouss: if you're an admin, then you can do anything on that computer without password	16:16
	without any password other than your own.	16:16
Patrouss	cbreak: ok but does the folder /usr/local change in function of the user that is logged on?	16:17
cbreak	Patrouss: but if you're an admin on a computer and normal users can mess up /usr/local, then you should be ashamed of yourself.	16:17
	← lite_ left	16:17
cbreak	of course not.	16:17
ojacobson	/usr/local is a normal directory	16:17
cbreak	the /usr/local directory is one like every other	16:17
	← Zebroid left	16:17
Patrouss	ok thx ;)	16:18
cbreak	typically a place where you can install stuff as admin	16:18
	→ lite_ joined	16:18
lpapp	_ikke__: thanks for the no commit hint.	16:18
cbreak	without overwriting system things that are in /usr/	16:18
	← Exio4 left	16:18
	← LeMike left	16:18
	→ aarapov joined	16:18
lpapp	perhaps I will ask the mailing list about a squash option for cherry-pick.	16:18
	← cvanball left	16:18
	→ atn34 joined	16:18
	← skyUnical left	16:19
	← joemcgill left	16:19
	← adac left	16:19
	→ neo1691 joined	16:20
	→ pfg joined	16:20
cbreak	it does have -n	16:20
Patrouss	allright! I'm having an hard time trying to find where gitolite is really setup on the server, when we setup it, we can chose 3 options as cited here : http://stackoverflow.com/questions/13645190/bash-gitolite-command-not-found (changing the way we can acceed to gitolite command after the install) I think I need to say the full installation path to use the gitolite command on my server. i made a locate on gitolite and I found some thi	16:20
	but I still can't find how to execute gitolite	16:21
cbreak	Patrouss: why do you want to execute it?	16:21
Patrouss	cbreak: I would like the repair the hooks	16:21
	→ Zebroid joined	16:21
	← srji left	16:21
cbreak	then you'll have to know how it was installed	16:21
	← atn34 left	16:21
cbreak	typically, a user is the gitolite user	16:22
	→ pheaver joined	16:22
	→ atn34 joined	16:22
cbreak	that user has a ~username/.ssh/authorized_keys file	16:22
	← qsuscs left	16:22
cbreak	in that file, the required access permissions and the path to the binary is available	16:22
	← lite_ left	16:22
	← papegaaij left	16:22
lpapp	cbreak: -n is no commit, but I wish to do a squashed commit.	16:22
cbreak	lpapp: if you cherry pick a bunch with -n, you can then commit all at once, squashing them.	16:23
	→ jaequery joined	16:23
Patrouss	yes I know wich user has setuped it on the server and where is its public key, but as I don't know its password is there a way to still access to the binary ?	16:23
	→ dougsland_ joined	16:23
lpapp	cbreak: yeah, but that is two steps instead of one.	16:23
	← mewm left	16:23
cbreak	Patrouss: the password is irrelevant	16:23
	you're admin	16:24
	← WormDr1nk left	16:24
cbreak	you can use sudo su username	16:24
bremner	"admin"	16:24
cbreak	lpapp: correct	16:24
	lpapp: it can be even more than two steps if you want to cherry-pick a lot	16:24
	and fix up cherry pick conflicts	16:24
	and so on	16:24
	→ omegahm joined	16:25
	← dragon3_ left	16:25
lpapp	http://pastebin.kde.org/pqayzub2u	16:25
	that looks bizarre...	16:25
	as the end result of the experiment ...	16:25
cronin	okay, i found my lost code in a commit called "temp commit" but it's apparently not attached to a branch. or at least "branches" is blank in gitk. it has a parent commit though and i have this commits sha1 id. how can i safely apply the code? do i just do git checkout sha1?	16:25
	← Nickeeh left	16:26
	← Zebroid left	16:26
	← arand left	16:26
	← fr33 left	16:26
	→ arietis joined	16:27
cbreak	cronin: just cherry-pick it	16:27
	cronin: checking it out is not a good idea	16:27
	cronin: you probably made it, then reset it away or something	16:28
	it will show up in the reflog too	16:28
	→ guzzlefry joined	16:28
	→ ngladitz joined	16:28
	→ qsuscs joined	16:28
cronin	cbreak: i see it in reflog. never used cherry-pick... is it just git cherry-pick sha1?	16:29
	→ DrShoggoth joined	16:29
cbreak	yes	16:29
	← Guest279 left	16:29
	→ imachuchu joined	16:29
	→ lite_ joined	16:29
	← _echelon_ left	16:30
	← aarapov left	16:30
	→ yhager joined	16:30
lpapp	hmm, it seems cherry-pick totally broke the stuff... for instance, I get the "old" .cc suffixes for the files rather than the new .cpp	16:31
goTAN	is git case sensitive?	16:31
lpapp	it was renamed during the feature development... I wonder why it gets confused? It happened properly in chronological roder.	16:31
	← shingshang left	16:31
cbreak	goTAN: yes	16:31
	→ neurodrone_ joined	16:31
lpapp	goTAN: in what sense?	16:31
cbreak	lpapp: in which order did you cherry-pick?	16:31
	← saikrishna_ left	16:31
goTAN	strange because I changes a filename from Test.txt to test.txt and there are no changes shown	16:31
	→ prophile joined	16:32
cbreak	lpapp: I am not sure if cherry-pick handles renames... I'd expect it to.	16:32
lpapp	cbreak: chronological.	16:32
cbreak	goTAN: it's probably that your filesystem doesn't support it	16:32
	goTAN: git rm --cached that file, then add it again	16:32
lpapp	shalatest shamiddle shanewest	16:32
cbreak	lpapp: in which order?	16:32
	← shinnya left	16:32
lpapp	sorry, I do not understand the question.	16:32
cbreak	you should pick the oldest first	16:32
	did you pick the newest first?	16:32
bambams_	goTAN: As a rule on case-insensitive file systems you need to do a double move: Test.txt => test2.txt => test.txt.	16:32
cbreak	(in topographical order)	16:33
lpapp	have you seen this post? 16:26 < lpapp> shalatest shamiddle shanewest	16:33
guzzlefry	if I'm on a branch other than master, and I do git push origin master, does that push the current branch's code to the remote master branch?	16:33
cbreak	lpapp: nope, never seen. Who's that?	16:33
goTAN	bambams_: but that doesnt solve the problem in general right?	16:33
	← craigp left	16:33
	← HelperW left	16:33
cbreak	guzzlefry: no	16:33
bambams_	goTAN: Define "the problem"?	16:33
lpapp	and git status does not show the .cpp files either	16:34
cbreak	guzzlefry: it pushes the local master to the master on origin	16:34
guzzlefry	ok, good :)	16:34
lpapp	this cherry-pick is a nightmare experience so far.	16:34
guzzlefry	thanks cbreak	16:34
lpapp	it might be easier to get around to it with git rebase -i	16:34
cbreak	lpapp: are the files in the working dir?	16:34
	← senj left	16:34
lpapp	hopefully that preserves renaming properly.	16:34
	← lite_ left	16:34
cbreak	lpapp: rebase uses cherry-pick under the hood (sometimes)	16:34
Patrouss	Is that normal that the user git doesnt have acces on mkdir in its own ~ folder?	16:34
cbreak	it's easier to use for large-scale operations	16:34
bambams_	lpapp: Git doesn't do any magic, or guess what you're trying to do. It does what you tell it to. You need to understand what you're doing for it to make any sense.	16:34
	→ senj joined	16:34
goTAN	bambams_: well there is somewhere changing letters like that and I want to have that tracked	16:34
cbreak	if you want to copy a simple range, cherry-pick will do fine	16:34
	→ lite_ joined	16:35
lpapp	bambams_: that statement does not bring any information for us.	16:35
cbreak	goTAN: the problem is that you have wrong names	16:35
	← Gizburdt left	16:35
cbreak	goTAN: so fix them as we told you above	16:35
	or live with them.	16:35
	lpapp will try rebase	16:35
lpapp	I am disappointed cherry-pick cannot get it right	16:35
goTAN	well I dont have a case sensitive filesystem	16:35
cbreak	lpapp: It can get it right, probably :)	16:36
bambams_	git read-my-mind	16:36
cbreak	lpapp: chances are you did it wrong	16:36
lpapp	what is the best way to drop the ongoing cherry-pick?	16:36
cbreak	but since you didn't tell us what you did, we can only speculate	16:36
lpapp	git reset --hard HEAD or --abort?	16:36
	or checkout lastsha1, etc?	16:36
	cbreak: there is not much to do wrong about it really	16:36
cbreak	lpapp: you can reset --hard to where you want your current branch to be	16:36
lpapp	git cherry-pick -n sha1 sha2 sha3	16:36
	and then solve the conflict in the files, and then commit	16:36
cbreak	lpapp: it's not a contiguous range?	16:37
lpapp	it is not.	16:37
	→ werlley joined	16:37
cbreak	then it'll be tricky to do that	16:37
lpapp	that is what I am saying.	16:37
cbreak	if the commits in between contain the renames	16:37
lpapp	no	16:37
	→ GoZoner joined	16:37
lpapp	my commits contain the renames.	16:37
	but cherry-pick just did not get it right, sadly.	16:37
	→ eletuchy joined	16:37
	← gua_ould left	16:37
cbreak	then copying them should copy the rename too, if they are detected	16:37
lpapp	(and eventually I can reproduce this failure)	16:37
cbreak	I can recommend that you git config diff.renames copies	16:38
	that'll tell git to try quite hard finding renames	16:38
lpapp	the problem is not necessarily that it cannot find the renames.	16:39
	the problem is that it does not care to ask.	16:39
	← lite_ left	16:39
	← dmnd left	16:39
guzzlefry	Is there a way to see if git is tracking a directory or it's contents?	16:39
	s/it's/its	16:39
	← bwreilly left	16:39
cbreak	care to ask?	16:39
lpapp	or to be fair, even if it does not ask, it should ship both .cc and .cpp	16:39
	← axl_ left	16:39
cbreak	why should it ask about anything?	16:39
	→ lite_ joined	16:39
lpapp	but just shipping the old .cc, that is super odd.	16:40
cbreak	if it detects them, it will perform the rename	16:40
	if it doesn't detect them, then it doesn't perform it	16:40
	easy.	16:40
	it won't ship anything?	16:40
	what do you mean with ship?	16:40
lpapp	easily crappy. :-)	16:40
	ship to the local changes.	16:40
cbreak	copy?	16:40
	→ axl_ joined	16:40
cbreak	it should do what I told you above	16:40
	did you have conflicts?	16:40
	if you have changed the files that were renamed, you will have rename-change conflicts	16:41
	→ Guest279 joined	16:41
	← sdouglas left	16:41
cbreak	so you have to tell git which of the two things you want	16:41
	→ hochmeister joined	16:41
	← hochmeister left	16:41
lpapp	that is the thing, git did not ask for telling.	16:41
cbreak	(if you want the rename and the change, you have to tell git too)	16:41
lpapp	as in really.	16:41
cbreak	ask?	16:41
	so there were no conflicts?	16:41
Patrouss	GOT IT!	16:41
bambams_	I think he already said there were conflicts.	16:41
cbreak	so then that explains it.	16:41
	→ hochmeister joined	16:41
cbreak	you just didn't want to keep the renames	16:42
	(probably)	16:42
	git status should tell you what kind of conflict it is	16:42
Patrouss	The user git wasn't the owner of its own ~ folder so doing a chown to give him back resolved the gitolite issue :)	16:42
	← eletuchy left	16:42
	← paulweb515 left	16:43
	→ JTF195 joined	16:43
	→ paolooo joined	16:43
	← gebbione left	16:43
cbreak	Patrouss: wonder how that happened.	16:44
	← xlinkz0 left	16:44
	→ skyUnical joined	16:44
Patrouss	cbreak: I really don't know! that is strange	16:44
	← thierryp_ left	16:45
	→ ShooterMG joined	16:45
	← ghostlines left	16:45
Patrouss	Anyway, thank you very much for you time and support :)	16:45
	← Guest279 left	16:45
Patrouss	Have a good day!	16:46
	← CorySimmons left	16:46
	→ danemacmillan joined	16:46
	→ athorp joined	16:46
lpapp	cbreak: as already written a few times, it did not.	16:46
	and yes, there were conflicts.	16:46
cbreak	so, what did it do?	16:46
lpapp	seems the whole cherry-pick stuff is in its childhood for this.	16:46
cbreak	nah	16:46
	→ sdouglas joined	16:46
cbreak	it works fine for me :)	16:46
	maybe git just hates you ... :P	16:46
	← Patrouss left	16:46
	← andr3a left	16:46
lpapp	you mean you renamed files like I do, etc?	16:47
	→ atomx joined	16:47
	← pfg left	16:48
	→ coasterz joined	16:48
	← ferreum left	16:48
cbreak	once to test	16:48
lpapp	I used my branch as a backup, so I did not just do a rename in one commit, but I made several other changes.	16:48
cbreak	I think I got a rename/change conflict	16:48
lpapp	still, it happened in chronological order, so git _should_ have this information.	16:48
	← mizu_no_oto left	16:48
	← GoZoner left	16:48
	chuckharmston_ → chuckharmston	16:49
cbreak	so I had to then resolve the conflict by renaming the file	16:49
	and committing	16:49
	(after git adding the rename)	16:49
	but it's been quite some time, so maybe I am forgetting details	16:49
	← Gonzo89 left	16:49
lpapp	I definitely cannot reproduce that behavior.	16:49
	→ Noldorin joined	16:50
	→ lindenle joined	16:50
lpapp	I will go the nasty way, and drop the history altogether	16:50
	and I will merge files manually ...	16:50
	→ dmnd joined	16:50
lpapp	i.e. I will ignore git.	16:51
	→ Nicholas_Rishel joined	16:51
	→ Umschwung joined	16:51
	← sdouglas left	16:52
	→ saikrishna_ joined	16:52
	→ GoZoner joined	16:52
	← crazydiamond left	16:53
	→ ninsei_ joined	16:53
cbreak	works for me	16:53
	Just tested it.	16:53
	← thevishy left	16:54
lpapp	show me the test case	16:54
bambams_	lpapp: cherry-pick works similarly to a merge. If your current working tree is sufficiently different than the base of the commit you're trying to merge then Git won't be sure what to do. The context surrounding the patches won't line up. You will get conflicts. i.e., I don't know, "fix it yourself."	16:55
	→ dmarkham joined	16:55
	← nnyk_ left	16:55
	→ dragon3_ joined	16:55
lpapp	the problem is not for asking resolving conflicts	16:55
	the problem is that there was no request from git for that.	16:55
	it took the old file suffices.	16:55
	← Raging_Hog left	16:56
	→ hyperair joined	16:56
	← Lemony left	16:56
	← ninsei left	16:56
bambams_	I can see Git being unable to do anything if you try to cherry-pick a commit that modifies a file that doesn't even exist in your current tree. I don't know what it does then. If it will checkout the full file from the cherry-picked commit or do nothing.	16:57
cbreak	lpapp: http://the-color-black.net/dl/temp/git.zip	16:57
	→ CorySimmons joined	16:57
	→ pfg joined	16:57
cbreak	lpapp: when I cherry-pick the test branch, the rename gets correctly performed	16:58
	← jbalsano left	16:58
	→ hahuang65 joined	16:58
	→ mizu_no_oto joined	16:58
	← JosephFerano left	16:58
cbreak	doesn't even give a conflict	16:58
lpapp	right, so you did something different than I did.	16:59
	← neo1691 left	16:59
	← lindenle left	17:00
lpapp	probably the changes are important factors in this scenario	17:00
cbreak	as I said above: configure rename detection	17:00
	and watch for conflicts	17:00
lpapp	as I really only ran git cherry-pick -n sha1 sha2 sha3 \| solve conflicts \| git add \| git status	17:01
	← dragon3_ left	17:01
cbreak	those are two factors that can make it more complicated	17:01
	← jaequery left	17:01
	← cronin left	17:01
bambams_	Interestingly, I renamed, then I changed the file, and then I cherry-picked the change. The change got properly applied to the original file name. No conflicts. O_o	17:01
lpapp	"original file name"	17:01
cbreak	lpapp: you have to type git status before solving conflicts	17:01
lpapp	and that is exactly what you do not want, really.	17:01
	you want the renamed file.	17:01
cbreak	otherwise you just ignore the renames if you have conflicts	17:01
bambams_	lpapp: In my case, I didn't cherry-pick the rename, so not I didn't.	17:01
	← Devastator left	17:01
	→ Devastator joined	17:01
	← jasonroyle left	17:01
	← saikrishna_ left	17:01
	← thiago left	17:02
lpapp	why are you doing something different than the scenario? :D	17:02
	← yhager left	17:02
	→ aarapov joined	17:02
	→ bwreilly joined	17:02
	→ ZujkisNx_ joined	17:02
cbreak	bambams_: rename detection needs context, if you change too much in a file (line wise), then it looks like a new file to git	17:02
	← foist left	17:03
ojacobson	This is one of the ways that purely snapshot-based version control falls over :)	17:03
bambams_	cbreak: Yeah, I tried after changing the file and instead got a "deleted by us" conflict.	17:03
ojacobson	There are known techniques for addressing it deterministically, but linus & friends decided that SCM is a problem worth solving from first principles, so here we are	17:03
	← gain left	17:03
	← aarapov left	17:03
cbreak	I like how it's solved in git	17:03
	→ Gizburdt joined	17:04
bambams_	Yes, SCMs that think they're too smart usually end up silently breaking things on me. >:(	17:04
	→ beyondcreed joined	17:04
	← beyondcreed left	17:04
	→ beyondcreed joined	17:04
cbreak	it doesn't require complicated change tracking that is also error prone	17:04
ojacobson	hg has the same solution, except it supports writing down the results in the changeset	17:04
cbreak	changesets?	17:04
	results?	17:04
bambams_	That is what hg calls "commits".	17:04
ojacobson	"file B is the result of moving file A" is a result of rename detection	17:04
bambams_	In my experience, Mercurial does a worse job with renames/moves.	17:04
cbreak	if it uses change sets, then it works completely different from git	17:04
ojacobson	bambams_: the detection algorithm is jankier but the metadata is better	17:05
	I don't see a reason git couldn't, _in principle_, also store some diff-ish metadata for each commit	17:05
cbreak	and if they use rename detection, then what they store is worthless	17:05
ojacobson	where it would be possible to store, rather than compute, renames	17:05
	→ ter0 joined	17:05
cbreak	since you can perform that detection when ever you want on snapshots too	17:05
ojacobson	cbreak: rename detection is _an option_ in hg; you can also be explicit about it	17:05
cbreak	(which is what git does)	17:05
	← johntitor2036 left	17:05
ojacobson	but the results are consistent either way, rather than being sensitive to each user's rename threshold the way git's are	17:05
cbreak	ojacobson: no, they are sensitive to the committer's threshold	17:06
	→ jaequery joined	17:06
	← jaequery left	17:06
	→ johntitor2036 joined	17:06
cbreak	instead of being sensitive to the git log users/cherry-pickers/...	17:06
bambams_	I think it's useful to draw user attention to it when somebody else renames something you've been working on. Probably is something you should be aware of.	17:06
ojacobson	cbreak: that can't possibly be true in git, since there's nowhere in a commit where the committer's threshold is stored	17:06
	it is true in hg, unless the committer uses `hg mv` and friends to spell it out	17:06
cbreak	ojacobson: yes, that's what I said.	17:06
ojacobson	either way it's up to the committer to author sane commits	17:07
lpapp	I am not sure why you discuss the detection algorithm.	17:07
	→ jaequery joined	17:07
	← jaequery left	17:07
lpapp	my issue has nothing to do with that.	17:07
ojacobson	That two different git configs can come to different conclusions about the same sequence of commits is a design wart	17:07
cbreak	lpapp: it probably has.	17:07
lpapp	so it is probably a separate discussion.	17:07
cbreak	lpapp: about 25% probability	17:07
lpapp	no, it does not.	17:07
	all the facts show that.	17:07
cbreak	there are no facts :)	17:07
lpapp	there are.	17:07
	1) Tried what you say.	17:07
cbreak	all we've heard so far is your moaning	17:07
	→ jaequery joined	17:07
lpapp	2) It kept the old file with the old changes _without_ offering the new as new files.	17:07
cbreak	and as I proved above, it works for me	17:07
	so you must do something different	17:07
lpapp	if it really was a detection issue, both statements would collapse abruptly.	17:07
cbreak	what? Rename detection is one of the things that could be.	17:08
bambams_	ojacobson: I'd say it is indeed a feature, not a bug. The SCM is a tool. It should do what is right for you, not what the developers thought was universally right. :)	17:08
	→ saikrishna_ joined	17:08
bambams_	If there's one universal truth, it's that the developers don't know what's better for the users. :P	17:08
lpapp	rename detection is one of the things that can be locked out due to the experiments and results.	17:08
	← Umschwung left	17:09
bambams_	lpapp: Can you reset back to the beginning, try again, and pastebin a log of what you do? Make sure to show the git status after the cherry-pick.	17:09
lpapp	no, it is a proprietary project, sorry.	17:09
	← reskp left	17:10
	← ayaz left	17:10
	→ phantomtiger joined	17:11
bambams_	We can't try to help you if you can't show us what is happening, or reproduce the problem with a test repository.	17:11
	Reason # 2381 why proprietary software is harmful.	17:12
	flazz_gone → flazz	17:12
cbreak	I guess we can file that with 75% probability for user error :)	17:12
	but who knows.	17:12
	← michael_lee left	17:13
	← rethus left	17:14
	→ axsuul joined	17:14
	→ a_ joined	17:14
	→ a joined	17:14
	→ catsup joined	17:14
	→ a__ joined	17:14
	→ a_____ joined	17:14
	→ a______ joined	17:14
	a → Guest30932	17:15
	a_ → Guest99351	17:15
	← j0ran left	17:15
	→ a_______ joined	17:15
	→ neo1691 joined	17:15
	← rainmanjam left	17:16
	← Guest30932 left	17:16
	← a__ left	17:16
	← Guest99351 left	17:16
	← a_____ left	17:16
	← catsup left	17:16
	← a______ left	17:16
	← a_______ left	17:16
	← dfanjul left	17:16
	→ rainmanjam joined	17:16
	→ a__ joined	17:16
	→ catsup joined	17:16
	→ a_____ joined	17:16
	→ a______ joined	17:16
	→ a_______ joined	17:16
	→ a________ joined	17:16
	← GoZoner left	17:16
	→ reskp joined	17:16
lewellyn	catsup: fix your client(s) :P	17:16
	← takamich_ left	17:17
	→ whitemoustache joined	17:17
	→ a_______1 joined	17:17
	← atn34 left	17:18
	← rjc left	17:18
	← a_______1 left	17:18
	← a__ left	17:18
	← a______ left	17:18
	← catsup left	17:18
	← a_______ left	17:18
	← a_____ left	17:18
	← a________ left	17:18
	→ ezekielnoob2 joined	17:18
ezekielnoob2	hello guys	17:18
gitinfo	ezekielnoob2: 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.	17:18
	→ CheckDavid joined	17:19
	← arif-ali left	17:19
ezekielnoob2	that's a nice bot	17:19
	← blinkdesign left	17:19
	→ catsup joined	17:19
	→ blinkdesign joined	17:19
	← mizu_no_oto left	17:19
ezekielnoob2	i just want to ask on how would your approach be: we're building a REST API system and we wanted to include a client system for it, should this thing be a separate project? i'm thinking that is it possible to have nested repositories in a single GIT folder?	17:20
sburgess	!backup	17:21
gitinfo	Worried about your data while trying out stuff in your repo? To back up commit history on all branches/tags: `git clone --mirror`. To backup everything, including work tree and staging area: `tar cf repo-backup.tar repodir`. Or do your experiment in a throwaway clone instead. See also http://sethrobertson.github.com/GitBestPractices/#backups	17:21
	← goodwin left	17:21
	← catsup left	17:21
ezekielnoob2	i suppose that message was for me?	17:21
	→ tripwired joined	17:21
sburgess	no it was not, I just saw that on the bot there	17:21
cbreak	ezekielnoob2: you can have them separate	17:21
sburgess	thought I would give it a go	17:21
	← Tobarja left	17:21
	→ catsup joined	17:22
cbreak	but if the client and server belong closely together, it might be enough to just use one repo	17:22
	(but remember that splitting it afterwards is hard)	17:22
ezekielnoob2	i see	17:22
	thanks	17:22
	i'll have it in a separate thing	17:22
	← tripwired left	17:22
ezekielnoob2	maybe even make it opensource	17:22
	somewhat like what Paypal does for its API classes	17:23
	← Leoneof left	17:23
ezekielnoob2	thanks again! o/	17:23
	→ Leoneof joined	17:23
	← blinkdesign left	17:24
cbreak	if you want to keep them separate, you could use submodules	17:24
	→ Tobarja joined	17:24
ezekielnoob2	hmmm	17:24
	but they're not exactly part of the system	17:24
	← jules__ left	17:24
ezekielnoob2	when's the time that you use submodules as opposed to separate?	17:24
cbreak	I'd use submodules if I have code that depends on the submodule's code	17:25
	like libraries	17:25
	← konadr left	17:25
ezekielnoob2	hmm	17:25
	← axl_ left	17:26
ezekielnoob2	okay :D	17:26
	← lite_ left	17:26
	→ robarell_ joined	17:26
	← sburgess left	17:27
	→ Kayra joined	17:27
	← catsup left	17:27
	→ catsup joined	17:27
	→ Ziber joined	17:27
	→ arif-ali joined	17:28
	← catsup left	17:28
	← ezekielnoob2 left	17:28
	→ GoZoner joined	17:28
	← Sly1986 left	17:28
	← paolooo left	17:29
	← cagedwisdom left	17:29
	→ mizu_no_oto joined	17:30
	← GoZoner left	17:31
	→ WormDrink joined	17:31
	→ sburgess joined	17:32
	→ hhuuggoo joined	17:33
	→ herdingcat joined	17:35
	← sgambino left	17:35
	← shruggar left	17:36
	→ phox joined	17:36
	→ CKyle joined	17:36
	← Ziber left	17:36
	→ jnavila joined	17:36
	→ anry joined	17:36
	→ Ziber joined	17:36
	← mikecmpbll left	17:37
	→ Lemony joined	17:37
	→ ninsei joined	17:38
	→ tummy joined	17:38
	← goTAN left	17:38
	→ eletuchy joined	17:38
	→ torjus_ joined	17:38
	← cjsarette left	17:39
	← neo1691 left	17:39
	→ cjsarette joined	17:39
	← qsuscs left	17:39
	← marcjs left	17:40
	← infynyxx left	17:40
	→ neo1691 joined	17:40
	→ qsuscs joined	17:40
	← torjus left	17:40
	→ ferreum joined	17:40
	→ fr33 joined	17:40
	← ninsei_ left	17:41
	→ catsup joined	17:41
	→ axl_ joined	17:42
	→ aarapov joined	17:42
	← eletuchy left	17:43
	→ infynyxx joined	17:43
	← ezakimak_work left	17:44
	← Anticom left	17:44
	→ ncthom91 joined	17:44
	→ RofricTheBearded joined	17:44
	← CKyle left	17:45
	← pheaver left	17:46
	→ pierre1_ joined	17:46
	← aarapov left	17:47
	→ CKyle joined	17:47
ojacobson	I enjoy the UI differences between "git rebase --abort" and "git bisect reset"	17:47
Corey	I'm giving a talk on Git to my company next week; I'm looking to create a sane merge conflict to demonstrate how to resolve one. Anyone have any suggestions as to how to create one for a lab environment?	17:47
	← cllamas left	17:48
ojacobson	Corey: github.com/ojacobson/conflicts	17:49
	← cjsarette left	17:49
	← WormDrink left	17:49
Corey	Ooh. Thaks.	17:49
	Thanks*	17:49
	→ lindenle joined	17:49
	→ goTAN joined	17:49
	→ m8 joined	17:50
cbreak	ojacobson: that's because bisect has sub commands, and rebase doesn't.	17:50
	→ tg joined	17:50
cbreak	... it seems :)	17:50
	← CorySimmons left	17:50
	→ SocalNick joined	17:50
	→ atn34 joined	17:50
	← cjwilburn left	17:50
	→ diegoviola joined	17:51
	→ Neozonz\|Disc joined	17:51
	← luxgeek left	17:51
	Neozonz\|Disc → Guest45785	17:51
	→ noxd joined	17:52
	→ cjsarette joined	17:52
	→ luxgeek joined	17:52
	← Ziber left	17:53
	← lavong left	17:54
	→ Ziber joined	17:54
	→ WormDrink joined	17:54
	← lindenle left	17:54
	← jaimef left	17:55
n-st	what commands can produce the error "fatal: This operation must be run in a work tree"?	17:55
	→ dglambert joined	17:56
	→ at7 joined	17:56
	→ jaimef joined	17:56
ojacobson	n-st: 'git checkout', trivially	17:56
	← lpapp left	17:56
	→ shawndumas joined	17:56
ojacobson	whose job is exactly "copy files from the revision graph to the staging area and work tree"	17:57
	→ dragon3_ joined	17:57
n-st	i'm using oh-my-zsh and it's prints that above my prompt when i'm in a git-annex directory. i've grepped for git commands in oh-my-zsh and i can't seem to find one whose output isn't redirected to /dev/null...	17:57
	→ ncthom91_ joined	17:57
	← saikrishna_ left	17:57
n-st	s/it's/it/	17:57
ojacobson	That message arises on stderr, not stdout	17:58
	→ CorySimmons joined	17:58
ojacobson	'git status' will also complain if there's no work tree for the current repo	17:58
	which is a more likely candidate for oh-my-zsh	17:58
n-st	i know, but every command i've found is invoked with either &> /dev/null or 2> /dev/null, so that should be covered, right?	17:58
	← reskp left	17:58
	← WormDrink left	17:59
	→ LBV_User joined	17:59
	→ lindenle joined	17:59
	← nicedice left	17:59
	→ WormDrink joined	18:00
	← ncthom91 left	18:00
	← mishok13 left	18:00
	→ nicedice joined	18:00
n-st	ojacobson: grep -r 'git status' .oh-my-zsh only finds occurences in comments and ones with 2> /dev/null...	18:00
	← CorySimmons left	18:00
	← tvw left	18:01
	← dragon3_ left	18:01
ojacobson	Presumably zsh has something analogous to sh's 'set -x' for tracing execution	18:01
	→ paulweb515 joined	18:01
ojacobson	That'd be where I'd look: have your shell trace the commands it's running and see which one runs right before the offending message	18:01
	→ cvanball joined	18:01
ojacobson	then work backwards until you find the place in the script the command originates from	18:02
	(the -x tracing mode replaces variables with their expansion, so it's not as simple as grep)	18:02
	← cvanball left	18:02
	→ yhager joined	18:02
n-st	holy cow! no wonder oh-my-zsh is so slow!	18:02
	i got half a second worth of command trace just by changing directory...	18:03
	← francisfish left	18:03
n-st	+VCS_INFO_get_data_git:119> git diff --no-ext-diff --ignore-submodules --quiet --exit-code	18:03
	fatal: This operation must be run in a work tree	18:03
	→ takamichi joined	18:03
	← jnavila left	18:03
	← lindenle left	18:04
	→ CorySimmons joined	18:04
	→ ZaeDrake joined	18:04
	← mourest left	18:05
dglambert	Hey so I have a branching scenario I have a question about	18:06
ojacobson	n-st: it'll be slower when every command has to wait for a terminal write :)	18:07
dglambert	I created a branch, did some work on it and then merged it and then deleted it	18:07
	← WormDrink left	18:07
	← CorySimmons left	18:07
	→ tomengland joined	18:07
ojacobson	n-st: if I had to guess, that check is probably "are there unstaged changes in the work tree"	18:07
dglambert	What I didnt realize, two other were also working on the branch and it is still alive	18:07
	→ rjc joined	18:07
	→ snql joined	18:08
	← herdingcat left	18:08
	← snql left	18:08
	→ snql joined	18:08
	→ kriks joined	18:08
dglambert	So there is a underlying conceptual problem I guess with how we are working, should only one person work on a branch at a time?	18:09
	← atn34 left	18:09
ojacobson	dglambert: critically, "the same" branch in three repos is actually three branches	18:09
	← ZaeDrake left	18:09
ojacobson	only one person can be working on a branch at a time, in that sense :)	18:09
	(up to sharing a work tree, which: don't)	18:10
	it's up to you to decide how all the people sharing the same conceptual branch should be collaborating on it; git is not a replacement for communicatoin	18:10
n-st	ojacobson: indeed. but it's a bug in zsh itself, not oh-my-zsh	18:10
	→ felipewm joined	18:10
n-st	the offending line is /usr/share/zsh/functions/VCS_Info/Backends/VCS_INFO_get_data_git:119	18:10
	← felipewm left	18:10
	← lopezt left	18:10
	← koda left	18:11
	→ retnuh joined	18:11
	→ ZaeDrake joined	18:12
	← dmarkham left	18:12
dglambert	so we should decide as a group when a branch is dead, and then one of us merges, and then we each individually delete them in our own repos	18:12
	→ koda joined	18:13
	→ joelm_ joined	18:13
	← ArSn left	18:14
	← goTAN left	18:14
	← intellix left	18:14
bambams_	dglambert: Is it really a problem for the branch to come back? If people are still using it then it isn't really "dead". :) Of course, you don't need to share all branches you use. You can keep branches locally if nobody else needs them.	18:14
	→ dmarkham joined	18:15
	→ blackmesa joined	18:15
	→ NimeshNeema joined	18:15
	← nephyrin left	18:15
	← jaimef left	18:15
	← jaequery left	18:15
	→ nephyrin joined	18:16
	→ jaimef joined	18:16
	→ Hecter joined	18:16
	← joelm left	18:16
	← dmnd left	18:16
	← salamanderrake left	18:16
	→ primitive joined	18:17
n-st	ojacobson: alright, i've fixed it locally and will report it to the zsh developers. thanks for the hints! :)	18:18
	→ WormDrink joined	18:18
	← whitemoustache left	18:19
	← noxd left	18:19
	→ demiurgo joined	18:20
	← dougsland_ left	18:20
	← neurodrone_ left	18:21
	→ CorySimmons joined	18:22
	← demiurgo left	18:22
	→ salamanderrake joined	18:23
dglambert	is it bad practice to have multiple people working on one branch	18:23
	→ demiurgo joined	18:23
	← demiurgo left	18:24
	→ demiurgo joined	18:24
	→ InvidFlower joined	18:24
	← LuxuryMode left	18:25
	← demiurgo left	18:25
bambams_	dglambert: No.	18:25
	→ demiurgo joined	18:25
	← welly left	18:25
bambams_	dglambert: It is bad practice to develop different concepts on one branch.	18:25
gnugnu9	hi	18:25
	← ZaeDrake left	18:25
bambams_	dglambert: If your work doesn't depend on the work your colleagues are doing then you should be developing on a separate branch until you're ready to merge.	18:25
	← demiurgo left	18:26
	→ ZaeDrake joined	18:26
bambams_	(Or rebase, as the case may be)	18:26
	→ demiurgo joined	18:26
gnugnu9	So when I want to create a patch on a cloned git repository, I often read one should create a new branch for the patch, is that better?	18:26
	← kongthap left	18:26
	→ kukks\|2 joined	18:27
bambams_	gnugnu9: The reason for that is probably to keep your changes distinct from the upstream changes. Just makes it easier to understand for yourself and others.	18:27
	← zequence left	18:27
guzzlefry	Could someone pop-up the link from the bot regarding deployment with git?	18:28
	→ leeN joined	18:28
bambams_	!deploy	18:28
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	18:28
	→ craigp joined	18:28
guzzlefry	thanks :)	18:28
	← craigp left	18:28
	→ craigp joined	18:28
	← atomx left	18:29
gnugnu9	bambams_: ah	18:29
	→ _brett_ joined	18:31
	← _brett_ left	18:31
	← yhager left	18:31
	← quetz left	18:32
	← pierre1_ left	18:33
	→ lindenle joined	18:33
bambams_	gnugnu9: Makes it cleaner to fetch upstream changes since you started your work, compare what they've changed since then, and rebase your work on top. Basically, branches in Git are cheap and mutable.	18:33
	gnugnu9: In the end there never needs to be any trace left behind that a branch ever existed. There can be if you choose. So by all means use them without regard! There's no harm in doing so.	18:33
	→ whitemoustache joined	18:33
	→ dougsland_ joined	18:33
	← v0n left	18:34
	→ jizanthapus joined	18:34
	→ zequence joined	18:34
	← Gizburdt left	18:35
gnugnu9	bambams_: ah, so after the patch is merged with upstream and no need of it anymore, one can simply delete the branch, right?	18:35
	← skyUnical left	18:35
	→ lite_ joined	18:37
	→ nilg joined	18:38
	← achadwick left	18:38
	→ eletuchy joined	18:39
	← SocalNick left	18:39
	gitinfo set mode: +v	18:39
skorgon	gnugnu9, sure, why not?	18:39
	→ carbon joined	18:39
	→ scarabx joined	18:40
	→ aard_ joined	18:40
	← lite_ left	18:41
	← Guest45785 left	18:42
	← VaticanCameos left	18:42
	← Hounddog left	18:42
gnugnu9	right	18:42
	→ pheaver joined	18:42
	→ Gizburdt joined	18:43
	→ codezomb joined	18:43
	← RofricTheBearded left	18:43
	→ agliodbs joined	18:43
	← WaReZ left	18:43
	← eletuchy left	18:44
	← Gavrisimo left	18:44
	→ WaReZ joined	18:44
	→ thevishy joined	18:44
	→ yhager joined	18:45
	← bartman`` left	18:45
	→ kcj joined	18:45
	→ Iconate joined	18:45
	→ dancat joined	18:47
	→ jsilver joined	18:48
	→ jbalsano joined	18:48
	→ thiago joined	18:49
	→ JoshDreamland joined	18:50
	← WormDrink left	18:50
	← whitemoustache left	18:51
	→ whitemoustache joined	18:51
	→ v0n joined	18:51
JoshDreamland	Hiya, I want to merge a pull request which contains an image of questionable copyright. I've informed the submitter it has to be replaced, and he did not object. If I pull his changes locally, and use git amend, will I have to force push to master, or will he just have to force pull?	18:52
	→ snits joined	18:52
	← Luke-Jr left	18:52
osse	JoshDreamland: both	18:52
JoshDreamland	meaning everyone will have to force pull, yes?	18:52
osse	there is no such thing as a force pull, btw. But yeah, he would have to do some magic	18:53
bambams_	JoshDreamland: If he has already pushed and you don't want it in your history then a !rewrite is necessary.	18:53
gitinfo	JoshDreamland: Rewriting public history is not recommended. 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 <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	18:53
	→ Luke-Jr joined	18:53
osse	yep	18:53
	← Luke-Jr left	18:53
	→ Luke-Jr joined	18:53
JoshDreamland	his changes have not been merged in, yet	18:53
grawity	If you do a local merge, and edit it, then --force will be completely unnecessary	18:53
osse	JoshDreamland: it would be easier if you made the submitter change the picture before you merge	18:53
JoshDreamland	yeah, that's what I was referring to, grawity	18:53
	← phantomtiger left	18:53
JoshDreamland	I want to keep the copyrighted material out of master's history (it isn't there, yet)	18:53
osse	ahh, ok then no force is necessary	18:53
	← asQuirreL left	18:54
JoshDreamland	great	18:54
	← robarell_ left	18:54
osse	well, when you merge it will become part of master's history	18:54
	→ nnyk_ joined	18:54
	→ aarapov joined	18:54
JoshDreamland	right	18:54
	but by then it won't have the icon	18:54
	← jsilver left	18:54
osse	true, but it will always be recoverable if you follow the breadcrumbs from master	18:54
JoshDreamland	well, when I merge it locally, it will; I'll rewrite my commits, but they'll all be ahead of master	18:55
	→ mikecmpbll joined	18:55
	→ felipewm joined	18:55
osse	imho. you should make your submitter rewrite his pull request replacing the image across all the commits. but you do as you like of course	18:55
	← pheaver left	18:56
JoshDreamland	I'll run your recommendation by him	18:56
	→ dmnd joined	18:56
	→ dragon3_ joined	18:56
	→ asQuirreL joined	18:56
	← CKyle left	18:56
	← jbalsano left	18:56
	→ mewm joined	18:57
	→ atn34 joined	18:57
	→ jperry joined	18:57
	→ frobware_ joined	18:57
	→ MrLovejoy joined	18:58
	← kballou left	18:58
	← dc5ala left	18:58
	← Guest38177 left	18:58
	← craigp left	18:59
	← pikaren left	18:59
	→ jbalsano joined	19:00
	← yhager left	19:00
MrLovejoy	hi	19:00
gitinfo	MrLovejoy: 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:00
MrLovejoy	does anyone know how to run a irc bot on a windows laptop? (sorry if its off topic)	19:01
	← dragon3_ left	19:01
	→ SonicX joined	19:02
guzzlefry	Say I don't want to have certain submodules pulled in during `git submodule update`, can I simply remove them in .gitmodules on my branch?	19:02
	← neo1691 left	19:02
	→ neo1691 joined	19:03
	→ torjus joined	19:03
bremner	MrLovejoy: yes, it's offtopic.	19:04
MrLovejoy	ok sorry bremner	19:04
	← dfarler left	19:04
	← neo1691 left	19:04
	→ Umschwung joined	19:04
	← Umschwung left	19:04
	→ Jon-Desktop joined	19:05
	→ Umschwung joined	19:05
	← Umschwung left	19:05
	→ foo joined	19:06
	→ Umschwung joined	19:06
	← Umschwung left	19:06
	→ yhager joined	19:06
	← torjus_ left	19:06
	Jon-Desktop → yazug	19:06
	→ Patrouss joined	19:07
	← arif-ali left	19:07
	→ oracal joined	19:07
	→ yosito joined	19:07
	← infynyxx left	19:07
	→ WormDrink joined	19:08
	← WormDrink left	19:08
	→ WormDrink joined	19:08
Patrouss	Hi, I have a little question about deamon. When should we give access R permission to daemon on a repo?	19:08
	→ pheaver joined	19:08
	→ akiva joined	19:09
Iconate	Has anyone experiences Double Lines when performing a git pull? I have a particular project which when I pull, all the files are double spaces	19:09
bremner	Patrouss: this is covered in the gitolite docs.	19:09
Iconate	double spaced*	19:09
	→ thierryp joined	19:10
	← yosito left	19:10
	→ Umschwung joined	19:11
	→ firc joined	19:11
firc	Hi	19:11
gitinfo	firc: 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:11
firc	!backup	19:12
gitinfo	Worried about your data while trying out stuff in your repo? To back up commit history on all branches/tags: `git clone --mirror`. To backup everything, including work tree and staging area: `tar cf repo-backup.tar repodir`. Or do your experiment in a throwaway clone instead. See also http://sethrobertson.github.com/GitBestPractices/#backups	19:12
	← lolmaus left	19:12
	→ lolmaus joined	19:12
	→ yosito joined	19:12
	← gnugnu9 left	19:12
	→ neo1691 joined	19:13
	← thiago left	19:13
	← And1 left	19:13
firc	Allright, I have a rebase related question. I made a branch off a master branch at commit A, say branch foo. Now, I made commits to foo, B,C,D. and pushed it. So now, branch foo is at D. Meanwhile, other people made commits to master, E,F,G. So master is at G. Now, on my branch foo, I did git rebase master.	19:13
	→ infynyxx joined	19:14
firc	After that, a git status (on my branch) shows your branch and origin/foo differ by X commits ,etc.	19:14
	→ gusnan joined	19:14
osse	so far, so good	19:14
firc	Is it safe to do a git push? Does it mean my branch is upto date with the latest from master?	19:14
osse	if you push you will have to push --force	19:15
	→ gnugnu9 joined	19:15
	→ Gavrisimo joined	19:15
firc	it will push to my branch, right?	19:15
osse	if this is a "private" branch that noone else is supposed to work on top of then you can push	19:15
firc	Will it alter history?	19:15
osse	yes	19:15
firc	Yeah, nobody else is using it. So it should be fine?	19:15
osse	well, you've already altered it locally. you just need to alter it on the remote too	19:15
firc	ok	19:16
	Is this the right way to go? Or should have I done merge instead?	19:16
osse	depends on who you ask	19:16
guzzlefry	Is it possible to have submodules on a branch such as staging, but merge those files into a master branch for deployment?	19:16
Patrouss	bremner: I just read the doc, it says that when using daemon, it should give public read access on the repository. But isn't the same thing as gitweb Read access?	19:17
firc	Hmm ok. So, is it recommended that I take a backup before I push since I'm altering history?	19:17
bremner	Patrouss: git-daemon and gitweb are completely independent	19:17
	→ AhabsBeard joined	19:17
	→ zajn joined	19:17
	→ RofricTheBearded joined	19:17
	← EminenceHC left	19:18
osse	firc: as I said you've already altered it. If you are happy with the result then it's fine	19:18
	→ EminenceHC joined	19:18
	→ Guest45785 joined	19:18
firc	cool!, thanks osse.	19:18
osse	firc: the history rewriting happens when you rebase, not when you push	19:19
	← MrLovejoy left	19:19
	→ SilverBln joined	19:19
	← Gavrisimo left	19:20
	→ oojacoboo joined	19:20
	→ sgambino joined	19:21
	← retnuh left	19:23
	← Kayra left	19:23
	← EminenceHC left	19:23
	→ votyx joined	19:24
	→ LuxuryMode joined	19:24
gusnan	Is Git ever written like GIT?	19:24
bremner	only by gits	19:24
gusnan	hehehe	19:24
	← dort left	19:24
osse	gusnan: it was, but not anymore	19:24
votyx	I made a commit, changed some stuff but now realized I want to commit th changes in a new branch, how do I do that?	19:24
	→ invinceable joined	19:24
	→ dort joined	19:24
cbreak	votyx: the already existing commit?	19:24
	votyx: git checkout -b newbranchname	19:25
	then commit the new changes.	19:25
	then remove the commit from the old branch, with a git checkout oldbranch && git reset --hard HEAD~1 or similar.	19:25
	← kukks\|2 left	19:25
votyx	wont checking out a new branch discard the changes?	19:25
cbreak	votyx: be sure you know what you're doing :D	19:25
	nope	19:25
	changes are in the working dir	19:25
	they are not on a branch until you commit them	19:26
osse	!float > votyx	19:26
gitinfo	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.	19:26
	← athorp left	19:26
	← lolmaus left	19:26
	→ lolmaus joined	19:26
	→ sdouglas joined	19:27
votyx	git checkout oldbranch && git reset --hard HEAD~1 or similar.	19:27
	uh?	19:27
	i can do that exactly or not?	19:27
PerlJam	votyx: reset --hard will destroy stuff in your working dir.	19:28
cbreak	votyx: you can do it if your branch is called oldbranch	19:28
osse	votyx: something's not clear here: you said you've made a commit and some uncommited changes. Is it only the uncommited changes you want to move to a new branch? Or the commit you made as well?	19:28
cbreak	and if you want to nuke away exactly one commit	19:28
	← doev left	19:29
cbreak	if you want to nuke away more, change the number	19:29
	→ athorp joined	19:29
cbreak	if you want to nuke away less, then don't reset	19:29
	→ jaequery joined	19:29
votyx	what, now one commit disappeared on main...	19:29
cbreak	reset nukes away things.	19:29
votyx	how much?	19:30
	← mizu_no_oto left	19:30
cbreak	how much you want.	19:30
	as I said above.	19:30
	→ teran joined	19:30
cbreak	a reset to HEAD~1 removes the newest commit.	19:30
	if you don't want to remove a commit, then don't reset	19:30
	as I said above :)	19:31
firc	osse: so if I am unhappy after i did git push --force, i can still revert to an older working commit, right?	19:31
votyx	ok now my master is 1 behind origin /master, how do I fast-forward it?	19:31
cbreak	votyx: you didn't want to remove that commit?	19:31
votyx	nope	19:31
	← jonatasnona left	19:31
cbreak	then you should not have done the reset...	19:31
	you can merge it again	19:32
	→ snollux joined	19:32
osse	firc: revert however you like using your local repo and then force push again	19:32
cbreak	probably git pull is the easiest.	19:32
	← kcj left	19:32
osse	firc: if you want to exactly undo the rebase you need to look into the reflog	19:32
firc	osse: cool, I can undo the rebase locally ?	19:32
	ah ok	19:32
	← Guest45785 left	19:32
snollux	Hello! I accidentally included some irrelevant files I'd like to ignore in a git push.. how can I just remove those from the list of files to change? Essentially, to un-add them	19:33
	→ reskp joined	19:33
osse	snollux: git rm --cached	19:33
	snollux: ehh, have you commited yet? or just run git-add ?	19:33
	← shawndumas left	19:33
snollux	I have committed and pushed	19:33
	stupidly	19:33
	nothing is merged yet though and its on its own branch	19:33
osse	then git rm --cached (or just git rm if you want to delete the actual files on disk too)	19:34
	and then commit -m 'Fixed snafu'	19:34
	→ Zifre joined	19:34
firc	weird, even with git push --force i couldn't push	19:34
osse	... or commit --amend and then push --force	19:34
snollux	git rm cached will do what, exactly? Remove all of my changes or just the ones I didn't mean to specifically add?	19:35
	← joelm_ left	19:35
firc	says "remote: To prevent you from losing history, non-fast-forward updates were rejected."	19:35
snollux	ah I need to specify them	19:35
cbreak	it will remove the file from git.	19:35
	it will not remove changes.	19:35
osse	snollux: you need to give filenames	19:35
firc	and " ! [remote rejected] foo -> foo (pre-receive hook declined)	19:35
	→ Destos joined	19:35
cbreak	that's what force is for.	19:35
	→ joelm joined	19:35
cbreak	but remotes can reject force pushes	19:36
	→ simesy joined	19:36
cbreak	if they do, talk to an admin.	19:36
	→ MrLovejoy joined	19:36
cbreak	or find an alternative :)	19:36
osse	firc: then someone set a hook up on the remote.	19:36
	firc: no clue what it does. It should produce some output	19:36
	← Patrouss left	19:36
firc	whats a hook up?	19:36
MrLovejoy	may i ask what this channel is for?	19:37
osse	firc: not a hook up. a hook	19:37
firc	can I remove it?	19:37
cbreak	MrLovejoy: http://git-scm.com/	19:37
osse	firc: it's something that Git is configured to execute whenever something happens.	19:37
firc	Ah, ok	19:37
	→ steps0x29a joined	19:38
firc	Then how do I get my changes in?	19:38
osse	firc: eg. you can create a hook so that whenever you checkout something the code is recompiled. and you can create a hook on the server so that when you push then the web server restarts or whatever. this particular hook rejected your push. I have no idea why. Talk to whoever configured the repo you're pushing to	19:38
	← Vivekananda left	19:38
	→ salah joined	19:39
salah	join github	19:39
	← steps0x29a left	19:39
firc	osse: http://paste.ubuntu.com/7069530/	19:39
	← Octalot left	19:39
	← arietis left	19:39
	→ eletuchy joined	19:39
firc	osse: Hmm, ok.	19:40
osse	firc: and this was even with --force?	19:40
	← buffal0 left	19:40
MrLovejoy	so can i use it to back up my bot?	19:40
firc	osse: yep	19:40
	← simesy left	19:41
osse	firc: then the admin of the repo as configured the repo in that way	19:41
	← LBV_User left	19:41
cbreak	MrLovejoy: it's not a backup tool, so no.	19:41
firc	that means I cannot rebase?	19:41
osse	firc: weird that it said "pre-receive hook declined". Can you give me the FULL output of git push --force foo ?	19:41
cbreak	firc: you can always push to a new branch	19:41
	firc: (after deleting the old one :D)	19:41
votyx	having a static reference to a class and then everytime a certain fragment is created, you set this reference to a new instance. will the old ones be gc.ed?	19:42
	gc:ed	19:42
firc	ok. hang on	19:42
osse	firc: and you wrote 'git push --force foo' and not just 'git push --force' right?	19:42
cbreak	votyx: no	19:42
	← MrLovejoy left	19:42
	← d33tah left	19:42
ojacobson	votyx: did you mean to ask this in another channel	19:42
cbreak	votyx: gcing only happens sometimes, you can expect things to live at least 30 days	19:43
	votyx: probably 90 days or more if they are in the reflog	19:43
offby1	"git checkout" isn't doing what I'd expect (probably a line ending thing) -- anyone got a suggestion? https://gist.github.com/9472732	19:43
firc	osse: nope, I did git push --force	19:43
	→ rTeapot joined	19:43
firc	osse: http://paste.ubuntu.com/7069543/	19:44
osse	firc: then you try to force push all the branches you have (by default anyway)'	19:44
votyx	ojacobson: yes ty :). +cbreak: are you serious? the old instances wont be gc:ed?	19:44
	(java)	19:44
ojacobson	votyx: cbreak'	19:44
firc	ok, then I should try --force foo	19:44
ojacobson	votyx: cbreak's answer was specific to git	19:44
	→ phantomtiger joined	19:44
	← eletuchy left	19:44
ojacobson	where the minimum gc interval is measurable in weeks by default	19:44
	← hahuang65 left	19:44
firc	hmm, nope	19:45
	← jgornick left	19:45
osse	firc: ugh, I meant git push --force origin foo	19:46
	→ jgornick joined	19:46
offby1	I've got core.autocrlf set to "input" fwiw	19:46
osse	but I assume it won't work	19:46
firc	yeah, it doesn't work	19:46
osse	firc: same thing?	19:46
firc	same error	19:46
	yep	19:46
osse	firc: try git push origin foo:replacementfoo (no --force)	19:47
firc	replacementfoo?	19:47
osse	firc: yeap, a different branch new	19:47
	name,	19:47
	← rTeapot left	19:47
firc	oh you mean a new branch?	19:47
	← Droolio left	19:47
osse	yeap	19:47
cbreak	votyx: in git it'll take weeks	19:47
	in java, who knows.	19:48
	→ g0z joined	19:48
cbreak	garbage collection isn't known for being deterministic or reliable :)	19:48
firc	osse: yes, I created the new branch	19:48
osse	firc: hooray	19:49
firc	and should I delte old branches?	19:49
	← harobed_ left	19:49
osse	firc: did you run my command exactly or did you do some voodoo I don't know about?	19:49
	← jluc left	19:49
firc	osse: exactly what you said, git push origin foo:newfoo	19:50
	→ veebers joined	19:50
	→ thiago joined	19:51
osse	firc: what is right to do from now on I don't know. Do you expect to rebase foo again?	19:51
	← CorySimmons left	19:51
	← sandorjanssen left	19:51
osse	then you'll have the exact same issue and need foo:newfoo2	19:51
	→ multiverse joined	19:51
	→ Gavrisimo joined	19:51
firc	Hmm. Yeah. At some point I would want foo to merge back into master	19:52
	→ CorySimmons joined	19:52
g0z	is there any kind of script to show what would be ignored with .gitignore(s)? I can't upgrade the version of git I have to get `git check-ignore` command ...	19:52
	→ Bodger joined	19:52
firc	I'm currently working on a feature, i just wanted my branch to have the latest master changes, so I need not worry about a lot of changes when i do actually merge back to master	19:52
osse	firc: the simplest solution is to simply not push it	19:53
	← yosito left	19:53
	→ Not_Whatever joined	19:53
firc	hmm yeah I guess. I had to push to foo, because others needed the change. But I see what you mean	19:53
	→ dfarler joined	19:53
cbreak	g0z: man git ls-files	19:54
gitinfo	g0z: the git-ls-files manpage is available at http://jk.gs/git-ls-files.html	19:54
cbreak	g0z: it can show ignored files	19:54
	→ sardoniks joined	19:54
	← axl_ left	19:54
osse	firc: so people have based their work on foo? then they would have been screwed if your push succeeded	19:54
	→ hahuang65 joined	19:54
	← jaimef left	19:55
osse	firc: there are several solutions: 1) Create a "scratch repo" somewhere else, a different one from the official repo, where you're allowed to do whatever you want 2) Talk to someone to get them to allow nonfastforwards	19:55
	→ d33tah joined	19:55
	→ rTeapot joined	19:55
	→ jaimef joined	19:55
	← rTeapot left	19:55
	← armyriad left	19:55
cbreak	in repositories I administrate, I sometimes give people private branch namespaces where they can ff as much as they want	19:56
	← kemist left	19:56
	← codezomb left	19:56
cbreak	so foo is not rewritable, but firc/foo would be (by firc only though)	19:56
	→ dragon3_ joined	19:56
firc	hmm. thanks for the help osse!	19:56
	→ shawndumas joined	19:57
	→ jimmyeatworld joined	19:57
osse	cbreak: then I assume you have an unwritten (or written!) rule saying "please don't merge <otherguy>/foo"? Or would other people have to do refspec magic to fetch them in the first place?	19:57
	← n-st left	19:58
	← yhager left	19:58
	← aarapov left	19:59
	← jbalsano left	19:59
	← matteo left	20:00
	→ yhager joined	20:00
cbreak	osse: no, if they base their changes on other people's private branches then it's their own fault.	20:00
	but honestly, I only set it up that way.	20:00
	everyone actually works on master.	20:00
	← prophile left	20:01
atrus	here, nobody pushes to "master". the code-review tool merges the review branches into the appropriate branch only once everybody's signed off, and checkin-time testing has passed :)	20:01
	← jackneill left	20:01
atrus	i don't know how people work in a large group without that sort of arrangement.	20:02
	← hyperboreean left	20:03
	→ adac joined	20:03
	→ damccull joined	20:03
	← dragon3_ left	20:04
cbreak	atrus: it's easier to work on master if most projects are single-person :)	20:04
	→ boboc joined	20:04
Bodger	Howdy, folks. I'm trying to do an interactive add and getting "Can't locate Git.pm in @INC". I'm pretty sure -i worked last time I used it and I haven't changed anything since then, but it's been long enough I can't swear to it. (1). Help? (2) what version/system info should I be gathering first?	20:04
	← IrishPrime left	20:04
	← m8 left	20:04
	← ethlor left	20:04
	← demiurgo left	20:04
	→ jbalsano joined	20:05
	← CorySimmons left	20:05
	→ Macaveli joined	20:05
	→ CKyle joined	20:05
	← ncthom91_ left	20:06
	← nnyk_ left	20:06
	← hahuang65 left	20:06
	← thiago left	20:07
	← jbalsano left	20:07
	→ LBV_User joined	20:08
	← kriks left	20:08
osse	Bodger: does eg. 'git difftool' work? That too is written in Perl	20:08
	→ chiromante joined	20:09
	→ EminenceHC joined	20:09
Bodger	Looks like no. Same error.	20:09
	← sdouglas left	20:10
osse	Bodger: some distros package Git in a weird way. Do you have a 'git-all' package or something similar?	20:10
	→ hahuang65 joined	20:10
thegorn	Bodger: better question, which distribution of linux :)	20:10
	← at7 left	20:10
	→ Xethron joined	20:11
	← Xethron left	20:11
	→ Xethron joined	20:11
Bodger	OS X 10.8.5	20:11
bambams_	xD	20:11
cbreak	Bodger: git 1.9 seems to have broken on OS X	20:11
	I noticed that with git svn	20:11
thegorn	Bodger: official installer or .. ?	20:11
cbreak	haven't bothered finding the reason yet though.	20:11
	(on 10.9.2)	20:12
	→ n-st joined	20:12
Bodger	git 1.8.3.1, I think I used the official installer.	20:12
	← reskp left	20:12
	← sohail left	20:13
thegorn	Bodger: do you have xcode installed?	20:13
Bodger	Yeah.	20:13
	← whitemoustache left	20:13
	→ ghostlines joined	20:13
	thegorn logs into his mac	20:13
	← diegoviola left	20:13
	→ prophile joined	20:13
	→ nicxvan joined	20:14
	← yhager left	20:14
thegorn	yea, git add -i works fine for me on OS X 10.9.x I think (Mavericks, right?)	20:14
Bodger	Hang on, xcode just offered to install command-line tools on launch. I could have sworn I had them already, but if not there's a likely culprit.	20:14
	→ yhager joined	20:14
	← boboc left	20:14
thegorn	Bodger: that's probably it	20:14
	→ SocalNick joined	20:15
	→ boboc joined	20:15
thegorn	or at least I have xcode + command line tools + flawlessly working git	20:15
nicxvan	how do I force files to show up in a repository, I added some files, but they don't show up under git status, but they show up in the file directory	20:15
	I have moved them to several places and checked all .gitignore files too	20:15
thegorn	nicxvan: that means that you have them ignored	20:15
Bodger	I bet I updated xcode but not command line tools. sonuva.	20:16
	← rgr left	20:16
Bodger	Downloading now, will report back.	20:16
	→ sohail joined	20:16
	← sohail left	20:16
	→ sohail joined	20:16
nicxvan	thegorn: how do I see if they are ignored other than with the .gitignore file?	20:16
thegorn	nicxvan: git --version?	20:17
	→ sdouglas joined	20:17
thegorn	nicxvan: if you have a git new enough, git check-ignore -v <file>	20:17
	← prophile left	20:17
	← Gizburdt left	20:17
thegorn	looks like 1.8.2	20:18
cbreak	nicxvan: maybe they are already tracked	20:18
nicxvan	thegorn: I just figured it out, some of the folders are empty for some reason	20:18
cbreak	nicxvan: do they show up in git ls-files?	20:18
	→ fowl joined	20:19
fowl	i hate you	20:19
thegorn	ah, you didn't say they were empty directories :-P	20:19
	fowl: i hate you too	20:19
nicxvan	thegorn: they weren't supposed to be	20:19
	another developer apparently emptied them	20:19
thegorn	oh, gotcha	20:19
nicxvan	time to see who	20:19
fowl	thegorn, if you speak for git then i hope you die	20:19
	in a slow fire	20:20
	ChanServ set mode: +o	20:20
fowl	and not of suffocation	20:20
	← fowl left	20:20
	→ toralf joined	20:20
	ChanServ set mode: +o	20:20
lov	well that was neat.	20:20
thegorn	very	20:21
guzzlefry	Can you track files in a submodule in the containing repo without any issues?	20:21
	_ikke__ set mode: +q	20:21
	→ marcjs joined	20:21
	→ axl_ joined	20:21
toralf	why does a "git pull; echo; git remote update stable" not pull v3.12.14 into my local repo using this .git/config : http://bpaste.net/show/187321/ ?? (worked fine for years before...)	20:21
cbreak	guzzlefry: no.	20:21
	guzzlefry: you can not track anything in submodules, only the submodules themselves	20:22
	→ ayaka joined	20:22
cbreak	they are opaque as far as the outer repo is concerned	20:22
	_ikke__ set mode: -o	20:22
Bodger	thegorn: no change after installing. Do I need to reboot or some such?	20:22
	_ikke__ → _ikke_	20:22
thegorn	Bodger: i have no idea :-/	20:22
	let me look where my Git.pm is	20:22
cbreak	Bodger: no reboot needed	20:23
	← snollux left	20:23
ayaka	I have problem with git apply with the patch, if I want to apply the patch from a mail, shall I just copy the main content of that mail?	20:23
	→ francisfish joined	20:23
ayaka	or saving that mail with its header and then apply it	20:23
	← fr33 left	20:23
cbreak	ayaka: save the whole e-mail	20:23
grawity	ayaka: usually `git am` is more apropriate for that – it'll also get the subject/author from mail headers	20:23
	→ demiurgo joined	20:23
cbreak	(if it was made with git send-email or git format-patch)	20:23
_ikke_	thegorn, did you know him?	20:23
thegorn	_ikke_: nope	20:23
	just seemed like an appropriate response	20:24
guzzlefry	ah okay, that's affecting our deployment process. We need a single step to pull in code from origin, including specific submodules. Any suggestions?	20:24
	→ cpb joined	20:24
ayaka	cbreak, grawity I see thank you	20:24
guzzlefry	Can I exclude submodules on a specific branch by editing .gitmodule?	20:24
	← InvidFlower left	20:24
thegorn	Bodger: i would just do a bit of debugging	20:24
	which git	20:24
_ikke_	random spammer probably	20:24
	← sdouglas left	20:24
thegorn	should be /usr/local/git/bin/git	20:24
	← ayaka left	20:24
	→ prophile joined	20:25
cbreak	guzzlefry: deploying with pull is braindead.	20:25
	→ alvaro_o joined	20:25
thegorn	if you open /usr/local/git/libexec/git-add--interactive	20:25
cbreak	guzzlefry: you should think if you can find something that is not designed to fail	20:25
thegorn	you should see where it adds to the perl path, which should contain Git.pm	20:25
guzzlefry	Any suggestions?	20:25
	← mellernoia left	20:25
cpb	is it possible (or advised against / recommended) to have a 'dev' branch that has all the micro commits, and another branch where those commits are 'squashed' into fewer larger commits?	20:25
cbreak	guzzlefry: maybe deploying with a script?	20:25
	← pfg left	20:25
thegorn	cpb: why the heck would you destroy history?	20:25
cbreak	guzzlefry: one involving reset --hard and submodule update might work	20:25
Bodger	which git => /usr/local/bin/git	20:26
_ikke_	cpb, sounds impractical	20:26
thegorn	Bodger: that isn't where the git installer puts it	20:26
	do you have /usr/local/git	20:26
torste	how can I add the "date" string from git log to 'git log --pretty=oneline'?	20:26
	← salah left	20:26
Bodger	Yes, I do.	20:26
	→ sambae joined	20:26
	← sardoniks left	20:26
	→ noxd joined	20:27
Bodger	I must have installed once with the installer and once some...other way? What a mess.	20:27
thegorn	Bodger: ok, you probably have an old version of git stuck around	20:27
	just remove /usr/local/bin/git*	20:27
	and it will be fine	20:27
	flazz → flazz_gone	20:27
guzzlefry	cbreak: I think we're using checkout -f master right now. Will removing specific modules from .gitmodule on the production branch effectively stop them from being pulled in by git submodule update?	20:27
thegorn	and then you need /usr/local/git/bin in your path	20:27
cpb	thegorn: cleanliness? sometimes a commit is a line or two, and it doesn't solve the problem, and it'd be better to wrap them into one commit?	20:27
Bodger	Yep, /usr/local/bin/git --version ==> 1.7.6.1.	20:28
	← ariscop left	20:28
thegorn	cpb: in that case it isn't necessarily useful, I'm thinking more along the line of linux kernel where by the time it gets put in the public repo it basically works	20:28
	but keep in mind if those commits are public	20:28
	→ simesy joined	20:28
thegorn	you can't really squash them anymore	20:28
	you are kinda stuck with them	20:28
cpb	_ikke_: i figured, i was checking, i'd seen references before for squashing commits before pushing upstream, and i'd like to preserve my personal history, but still contribute with more succinct commits.	20:29
	hfp → hfp`away	20:29
	flazz_gone → flazz	20:29
	← hobodave left	20:29
thegorn	cpb: oh, for pushing upstream, i would definitely rebase into logical commits	20:29
	but once they are public you're just out of luck	20:29
	→ ezekielnoob joined	20:29
thegorn	well, at least I would, some might not	20:29
	→ doener joined	20:29
cpb	thegorn: but can you preserve the 'micro' commits when doing that, or do you necessarily need to mirror the commits upstream?	20:30
Bodger	Aha! /usr/local/bin/git is linked to the git that Github.app provides.	20:30
	→ g1 joined	20:30
	← adac left	20:30
	← geekbri left	20:30
thegorn	cpb: not really, i mean, you can make a branch like git branch push_20140310	20:30
_ikke_	cpb, the problem is you have no connection betwewn those commits	20:30
cpb	the practicality of having a dozen commits, just for myself isn't too strong, so i'm not opposed to squashing my personal fork/branches, but ... i figured i'd check with people more knowledgeable.	20:31
thegorn	and then rebase, and then push, and you'll have the history in your branch	20:31
	→ pantsman joined	20:31
	← pantsman left	20:31
	→ pantsman joined	20:31
cbreak	guzzlefry: if they aren't there already.	20:31
	guzzlefry: but the .gitmodules thing is one part	20:31
guzzlefry	ah	20:31
cpb	_ikke_: yeah, that's what i noticed... heh... makes further contribution and keeping in sync with upstream much harder...	20:31
cbreak	guzzlefry: the actual submodule entry is the thing that's relevant	20:31
	guzzlefry: if you want to remove a submodule, do it with git rm --cached submodule	20:32
thegorn	Bodger: ah, ok, they probably didn't have their installation setup for perl stuff	20:32
	← mikecmpbll left	20:32
	→ skyUnical joined	20:32
cpb	thegorn: so if i /really/ want to preserve all my 'clever' commit messages, save the feature branches, but compress the master branch, eh?	20:32
	→ ncthom91 joined	20:32
	flazz → flazz_gone	20:32
	← hfp`away left	20:32
	flazz_gone → flazz	20:32
	← jaimef left	20:33
thegorn	cpb: yea, i don't think it is a bad idea to make a local tag/branch before a bunch of rebasing anyway	20:33
	you can get it all back via reflog in your local repo for the next 30 days	20:33
cbreak	cpb: git log --first-parent	20:33
	← simesy left	20:33
thegorn	but it is a lot easier if you make a temp commit/branch first	20:33
	→ simesy_ joined	20:33
cbreak	rewriting history before merging isn't bad, but completely discarding it sounds very stupid.	20:33
	depends on the granularity of your commits though.	20:33
	← frobware_ left	20:33
	→ jaimef joined	20:33
Bodger	Reckon I'll try moving usr/local/git/bin earlier in my path than /usr/local/bin.	20:34
thegorn	Bodger: good idea, that's probably all you need	20:34
cpb	cbreak: cool, thank you	20:34
	← NimeshNeema left	20:34
	→ jbalsano joined	20:34
	← smashwilson left	20:35
	→ lekare_ joined	20:35
cpb	i should be doing way more 'development' in feature branches. still learning a lot about how to properly use git, for my needs.	20:35
	flazz → flazz_gone	20:35
Bodger	And it works. Thanks for the help... now to see what else breaks from using git 1.7 by default.	20:35
	← damccull left	20:36
	flazz_gone → flazz	20:36
	→ rgr joined	20:37
cbreak	http://blog.victorquinn.com/fix-git-svn-in-mountain-lion :( ah well (	20:37
	→ pfg joined	20:37
cbreak	Bodger: you should get xcode	20:37
	Bodger: xcode has its own git :)	20:37
	← CKyle left	20:37
cbreak	(1.8.3 at the moment)	20:38
Bodger	I have xcode, but ~never launch it.	20:38
cbreak	it's part of the command line tools	20:38
	you'll find it in /usr/bin/git and co	20:39
	→ eletuchy joined	20:40
Bodger	So I will. Woo, competing versions!	20:40
	→ conan_ joined	20:41
	→ ariscop joined	20:42
	→ nnyk_ joined	20:42
	← observ3r left	20:43
	→ adac joined	20:43
	→ reskp joined	20:43
	← james_d_h left	20:43
	→ SHyx0rmZ joined	20:43
	→ CKyle joined	20:44
	→ roymiloh joined	20:44
	← axsuul left	20:45
	→ pawprint joined	20:45
	← eletuchy left	20:45
	→ mizu_no_oto joined	20:45
pawprint	i just did a "git merge --no-commit", so that i can view and approve or deny any changes that were made during the merge, rather than just blindly committing	20:46
	but how can i actually see what changes were made?	20:47
	"git diff" doesn't show anything	20:47
	← hoschi left	20:47
pawprint	(to give a bit more context, i was on a branch and did a "git merge --no-commit master" to merge from the master in to my branch)	20:47
	← Bodger left	20:49
	→ harobed joined	20:50
pawprint	nevermind.. looks like all i had to do was specify the hash of the last commit, when i did a git diff	20:50
	← rfoust left	20:50
pawprint	so "git diff abc123" (where "abc123" is the hash of the last commit)	20:50
	← dort left	20:50
	← zajn left	20:51
ojacobson	'git diff --staged'	20:52
	← neo1691 left	20:52
ojacobson	(git merge stages the results, even in --no-commit mode)	20:52
	the diffs wrt each parent are also interesting	20:52
	→ whitemoustache joined	20:52
torste	how can I show 20 last commits in branch?	20:53
Dougie187	torste: `git log -n 20`	20:53
	or, if you're not on that branch	20:53
	`git log -n 20 <branch_name>`	20:53
	→ bodom joined	20:53
	→ hobodave joined	20:54
torste	thx, read almost all from the manual under commit limiting but missed the first line :)	20:54
	← chiromante left	20:54
	← n-st left	20:55
	← agliodbs left	20:55
torste	Dougie187: how can I add that to my config?	20:56
	→ tpollard joined	20:56
Dougie187	torste: `git config --global alias.log20 log -n 20`	20:56
	← cannonball left	20:56
	→ dragon3_ joined	20:56
	← rudisimo left	20:57
	← DoniRS left	20:58
pawprint	hmm.. another problem: i just pushed my commit to a remote git repo, but then i decided to amend that commit's message, which i did.. but when i tried to push the amended commit, git thinks my local repo has diverged from the remote repo and won't let me push here's the error i get: http://bpaste.net/show/187331/	20:58
	→ mikecmpbll joined	20:58
pawprint	but they really haven't diverged.. only the commit comment is different	20:59
	how do i fix this?	20:59
	→ CorySimmons joined	20:59
sburgess	It has diverged, you are pushing a different commit with the same parent as the last commit	20:59
	← reskp left	20:59
torste	Dougie187: that doesnt seem to work?	20:59
sburgess	git push -f will make it do it any ways	20:59
pawprint	well, i'm not even really pushing a commit per se.. i'm just trying to change the comment	21:00
	→ agliodbs joined	21:00
ojacobson	pawprint: everything in git is immutable	21:00
	things that "edit" commits actually operate by creating new commits and swizzling branches.	21:00
	← gnugnu9 left	21:00
ojacobson	"everything in git" er everything in git's object store, hello ambiguous statement	21:00
	refs (branches, etc) obviously aren't immutable	21:00
	it diverged because you created a new commit with the same parent as the original commit, and then pointed your branch at it. 'git push --force' will effectively remove the original commit from the remote repo; be aware that this is kind of ugly for anyone else using the same remote branch	21:01
pawprint	well, how do i fix it without screwing up my branch or creating a new branch?	21:01
	← dragon3_ left	21:01
	← boboc left	21:01
	→ shawndum_ joined	21:02
	→ n-st joined	21:03
	← ariscop left	21:03
	← WormDrink left	21:04
	← agliodbs left	21:04
	← shawndumas left	21:04
	← SocalNick left	21:05
	← shawndum_ left	21:05
	← el3ctron left	21:05
	→ SocalNick joined	21:05
	← Iconate left	21:06
	→ CreativeEmbassy joined	21:06
	← Xethron left	21:06
	← axl_ left	21:06
	← CKyle left	21:06
guzzlefry	Say I want to revert gitlab/gitolite/etc, whatever origin is, to a state that I have a local pull of. Can I simply move the files from local to remote via rsync, or would git pull origin master not pull everything from origin?	21:07
	← Noldorin left	21:07
	← hobodave left	21:08
ojacobson	guzzlefry: jargon abuse; can't figure out what you're trying to ask	21:08
	you have a remote named 'origin' that points to some hosted repo and you have some code in your local repo	21:08
guzzlefry	I'm bad about that.	21:08
ojacobson	what do you want to change in which repos?	21:08
	→ chiromante joined	21:09
	→ agliodbs joined	21:09
guzzlefry	ojacobson: I did `git pull origin master` before I made a mess with submodules and pushed it all to origin. Can I simply copy the .git/ from my local copy to the repo handled by gitlab to revert?	21:09
	→ jnavila joined	21:09
	← Mekkis left	21:10
	← Nicholas_Rishel left	21:10
	→ Mekkis joined	21:10
ojacobson	Probably not, no.	21:10
torste	how do I format git log so I get like columns? instead of my tabs, pretty = format:%C(yellow)%H %C(white)%ad%Creset\t\t%C(white)%s%Creset	21:10
ojacobson	Use the git protocol to transfer the desired state to gitlab, instead.	21:10
	← system64 left	21:10
guzzlefry	okay, thanks	21:10
ojacobson	'git push' and 'git fetch' do nothing but copy refs (branches) and objects (commits, trees, file blobs) around.	21:10
	← marthinal left	21:11
	← CorySimmons left	21:11
ojacobson	'git pull' is 'git fetch; git merge', more or less, so avoid that until you've sorted this out	21:11
	→ CKyle joined	21:11
	→ Noldorin joined	21:11
	→ mrstocks joined	21:11
mrstocks	hello im have a problem with git on github	21:12
	how do i revert to the first version?	21:12
	← nilg left	21:13
	→ WormDrink joined	21:13
	← Foldager left	21:13
	← Zifre left	21:13
	← werlley left	21:14
	→ zajn joined	21:14
	← simesy_ left	21:14
	← skyUnical left	21:14
rawtaz	revert?	21:14
	← Trudko left	21:14
rawtaz	which first version?	21:14
mrstocks	im not really shure i made a website with admin them i removed it	21:15
	→ skyweb joined	21:15
rawtaz	i have no idea what you are trying to say	21:15
	seriously	21:15
	do you think anyone understand what you mean with "i made a website with admin"?	21:15
mrstocks	nop :(	21:15
rawtaz	then try to rephrase ;)	21:16
mrstocks	im sortof flying (since 2009)	21:16
rawtaz	haha	21:16
mrstocks	i will try revert hang on	21:16
	← carbon left	21:16
	← salamanderrake left	21:16
	→ polyzen joined	21:16
	→ armyriad joined	21:16
	← roymiloh left	21:16
	→ SocalNick_ joined	21:16
mrstocks	ok have a website on github	21:17
	← Hello71 left	21:17
	→ CorySimmons joined	21:17
mrstocks	my previous version (i don't know what versions)	21:17
	have a admin folder	21:17
	and im trying to get it back	21:17
	← scarabx left	21:17
mrstocks	https://github.com/mrstocks/secret-ninja	21:17
	← JTF195 left	21:17
mrstocks	thats the url	21:17
	← SocalNick left	21:18
rawtaz	there's 233 commits in that repository, so you might want to specify what you want to revert to	21:19
	also i guess that by "revert" you mean "go back to how things were at that point in time?	21:19
	→ ariscop joined	21:19
mrstocks	yes i do!!	21:20
	← ZaeDrake left	21:20
mrstocks	i would like like a git clone <url.git> 2F343DF	21:20
	2F323DF is a random string but thats what i want	21:21
	→ SocalNick joined	21:21
	← CorySimmons left	21:21
	← SocalNick_ left	21:21
rawtaz	mrstocks: i think there's a bit too much ambiguity here, and that i should not answer because i might give you the wrong answer. i'll let pro's deal with this one	21:22
	← Destos left	21:23
	← ghostlines left	21:23
	→ Freeman42 joined	21:23
	→ SorenHolm joined	21:24
mrstocks	i breed dogs, im seriously not ready for it	21:24
	i found the admin https://github.com/mrstocks/secret-ninja/tree/4d6f31cb91e832be17d642461ddba29639e3b4aa/admin	21:24
	i would like do get that	21:24
	← ojacobson left	21:24
rawtaz	the thing is that you get "get" that in so many different ways	21:24
	→ tvw joined	21:25
bambams_	mrstocks: What are you trying to do with that directory?	21:25
	→ reskp joined	21:25
mrstocks	let say the first that come into your mined and i give a discount when you want a great dane	21:25
rawtaz	this guy is amazing :)	21:25
mrstocks	:D	21:26
	→ mishok13 joined	21:26
	← lekare_ left	21:26
bambams_	French is your native tongue?	21:26
	← JerryT left	21:26
bambams_	mrstocks: Do you know exactly when you removed that admin directory from the repository?	21:27
	mrstocks: Or are you sure that you want the version at 4d6f31?	21:27
	→ salamanderrake joined	21:27
	← prophile left	21:28
	← aard_ left	21:28
mrstocks	well noy really, i was adopted when i was 6 by some french people so english is my native language but..	21:28
	bambams_: well i don't know i don't know it's there so...	21:28
bambams_	mrstocks: git checkout 4d6f31cb91e832be17d642461ddba29639e3b4aa -- admin/	21:29
	← conan_ left	21:29
bambams_	mrstocks: That should allow you to checkout that particular version of that directory. Whether that's what you want or not I can't tell.	21:29
	→ Kayra joined	21:29
	→ sjokkis joined	21:29
bambams_	mrstocks: !revert	21:29
gitinfo	mrstocks: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	21:29
	← it_tard left	21:29
	← sambae left	21:30
	← davividal left	21:30
sjokkis	hi. i've set "git config --global core.whitespace trailing-space,space-before-tab", but git still doesn't complain if i commit things with trailing whitespace. am i doing it wrong?	21:30
	← torjus left	21:30
bambams_	sjokkis: I'm not familiar with that option. Which version of git are you running?	21:30
mrstocks	oohh that work, even with my poor english! And i didn't even have to sell a dog	21:31
bambams_	mrstocks: That comes with absolutely no guarantee that it did what you really wanted. ;)	21:31
votyx	how do i discard all changes? just do a pull?	21:31
	→ not_a_guest joined	21:32
sjokkis	bambams_: 1.8.5.3	21:32
	← jaimef left	21:32
	→ nobitanobi joined	21:32
	← bliker left	21:32
rawtaz	votyx: what changes?	21:32
	← toralf left	21:32
nobitanobi	Hi guys. I did a git stash pop, and some files were modified, accidentally I did ' git checkout . ' so I lost all those changes. Any way to do a git stash pop again, or undo the 'git checkout .'?	21:33
	→ jaimef joined	21:33
sjokkis	votyx: if you want to discard changes you have made to files you can use "git checkout -- filename"	21:33
osse	nobitanobi: see the very bottom of man git-stash	21:33
gitinfo	nobitanobi: the git-stash manpage is available at http://jk.gs/git-stash.html	21:33
votyx	+rawtaz: changes after commit in several files	21:34
mrstocks	http://www.btc-fr.org/	21:34
	works perfect	21:34
bambams_	sjokkis: It sounds to me like that config option only warns by default. You may need to set apply.whitespace to something to have it error.	21:34
sjokkis	bambams_: it doesn't even warn	21:34
	→ CorySimmons joined	21:35
	← cpb left	21:35
mrstocks	thx so much rawtaz & bambams_	21:35
	← dougsland_ left	21:35
nobitanobi	osse: I see a commit there, but I am unsure how to redo the git stash pop	21:35
osse	nobitanobi: if you have sha you get git ch-erry-pick --no-commit SHA	21:36
	← CorySimmons left	21:36
	← LuxuryMode left	21:37
nobitanobi	osse: ok lets see	21:37
rawtaz	votyx: !revert	21:37
gitinfo	votyx: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	21:37
	← chiromante left	21:37
nobitanobi	osse: I see this: error: Commit c68abd52e6ea1eb8f70ebea31297e4032e4bc79f is a merge but no -m option was given.	21:37
osse	nobitanobi: try git cherry-pick -m 1	21:38
	→ axl_ joined	21:38
nobitanobi	osse: without the SHA1?	21:39
osse	no	21:39
nobitanobi	ok	21:39
	osse	21:40
	it worked	21:40
	thank god.	21:40
	→ OrpheusP joined	21:40
	← dancat left	21:40
nobitanobi	well thank you.	21:40
osse	hooray	21:40
	now read up on what -m means to know what you did	21:41
	→ Gavrisimooo joined	21:41
nobitanobi	going to	21:41
	thanks	21:41
pawprint	can i do a "git reset --hard" to get back to the state before i did my "git commit --amend" ?	21:41
	→ eletuchy joined	21:41
	← jast left	21:41
	← livingstn left	21:41
osse	pawprint: use the reflog. if you have done literally nothing since doing the --amend it should be git reset --hard branch@{1}	21:41
	→ dougsland joined	21:42
	← axl_ left	21:42
guzzlefry	I want to get rid of the last few commits/merges. Is git reset --hard <commit_id> the best way?	21:42
pawprint	osse, is "branch" the literal word "branch"? or the name of the branch i'm on?	21:42
	← SocalNick left	21:42
	→ SocalNick_ joined	21:42
osse	pawprint: the latter	21:42
skorgon	guzzlefry, well, !rewrite applies	21:42
gitinfo	guzzlefry: Rewriting public history is not recommended. 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 <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	21:42
	→ Nicholas_Rishel joined	21:43
	→ jast joined	21:43
	→ sdouglas joined	21:43
	mehdi__ → mehdi	21:43
	← Gavrisimo left	21:44
bambams_	pawprint: Also acceptable would probably be HEAD (which I think is also default so just @{1} should work, AFAIK).	21:44
	← aberrant left	21:44
	← CKyle left	21:45
	→ tyreld joined	21:45
	← JoshDreamland left	21:45
osse	bambams_: true, but it's every so slightly more "vulnerable". If he has checked out other branches for example	21:46
	bambams_: then branch@{1} would be the same but HEAD@{1} not	21:46
	← eletuchy left	21:46
	← sdouglas left	21:47
guzzlefry	error: 'module/achievements' appears as both a file and as a directory <-- So, I think I've broken things.	21:47
	← whitemoustache left	21:47
guzzlefry	How can I just reset everything back to HEAD?	21:48
rawtaz	maybe git reset --hard HEAD	21:48
guzzlefry	That's the source of the error.	21:49
	← tyreld left	21:49
rawtaz	well, that if anything really resets stuff afaik	21:49
	so what else do you mean?	21:49
guzzlefry	ah, had to use sudo.	21:50
	← Dougie187 left	21:50
	→ aberrant joined	21:50
	→ CorySimmons joined	21:50
bambams_	osse: Sure, but $branch@{1} still hinges on the assumption that he hasn't done anything that would affect $branch. More than likely, HEAD@{1} is right, and if it's not then we should probably confirm first that $branch@{1} would be. :)	21:50
	→ mellernoia joined	21:50
	← CorySimmons left	21:50
	← maroloccio2 left	21:50
osse	heh yeah	21:50
	well, I said "use the reflog" :P	21:50
	→ CorySimmons joined	21:50
bambams_	Does Git track the reflog for branches by default?	21:51
	← sgambino left	21:51
osse	bambams_: yes	21:51
	otherwise foo@{1} wouldn't have worked	21:51
	hmm, maybe it's disabled by default for bare repos. not sure	21:51
	→ tyreld joined	21:52
bambams_	Yep.	21:52
	Unless you set the core.logAllRefUpdates bare repos won't log them unless the file exists.	21:52
	← zumba_addict left	21:53
	← CorySimmons left	21:53
	← thevishy left	21:53
bambams_	guzzlefry: Eeek, ideally you should never need root privileges when using Git. :)	21:54
guzzlefry	I probably shouldn't be working with a fever either. >_>	21:55
	← francisfish left	21:55
	← adac left	21:55
	→ SocalNick joined	21:55
	← tyreld left	21:56
	→ dragon3_ joined	21:56
	← SocalNick_ left	21:57
	→ matt_ joined	21:57
	matt_ → Guest14583	21:58
	← jnavila left	21:58
	→ tyreld joined	21:58
	→ CKyle joined	21:58
	→ Naoe-Kanno joined	21:58
	← zajn left	21:58
	← SHyx0rmZ left	21:58
	→ bobkosse joined	21:59
Guest14583	Hi everyone. Would anyone be able to answer a quick question for me please?	21:59
	← pawprint left	21:59
Guest14583	I just installed git in cygwin, from the repo on git-scm.com, but when I do git --version	22:00
	I get "git version 1.9.0.152.g6ab4ae2" instead of "git version 1.9.0"	22:00
	← oodavid left	22:00
Guest14583	is this normal?	22:01
	← dragon3_ left	22:01
cbreak	Guest14583: sure.	22:01
	← tieTYT left	22:01
_ikke_	yes, I think so	22:01
cbreak	you have a newer version.	22:01
	(it's from commit 6ab4ae2 in git.git)	22:01
	← whitby left	22:01
	← mizu_no_oto left	22:02
Guest14583	ah, okay... I see. thank you so much	22:02
_ikke_	I guess some windows specific patches	22:02
	→ Zifre joined	22:02
cbreak	maybe.	22:02
	← Umschwung left	22:02
	← LBV_User left	22:03
	→ ninsei_ joined	22:04
	← ninsei_ left	22:04
	→ shawndumas joined	22:04
	→ arif-ali joined	22:04
	→ ninsei_ joined	22:04
	← ninsei_ left	22:05
	→ Hello71 joined	22:05
sjokkis	i added a pre-commit hook in .git/hooks/ but it doesn't show up as an edited file with "git status" and i get an error when i try to add it with "git add". how am i supposed to be doing this?	22:06
	→ ninsei_ joined	22:06
	← Guest14583 left	22:06
bambams_	sjokkis: You do not track hooks. Anything inside of the repo (.git/) is not tracked.	22:06
	← ninsei left	22:06
	→ jluc joined	22:06
bambams_	sjokkis: If you wanted to hack it perhaps you could make .git/hooks/pre-commit a symlink that pointed up into your repo. Not sure if Git would like that or not.	22:06
	← jizanthapus left	22:07
	→ erikruthven joined	22:07
bambams_	sjokkis: If you want for everybody using the repo to automatically have that hook installed it doesn't work that way. :)	22:07
sjokkis	bambams_: how are you supposed to enforce certain things (no trailing whitespace in this instance) if you can't track commit hooks?	22:07
	→ james_d_h joined	22:08
skorgon	don't give everybody push permissions and review code?	22:08
	→ riceandbeans joined	22:08
bambams_	sjokkis: You do that at some boundary. Perhaps a centralized repo that everybody pushes to, or perhaps whoever is responsible for accepting changes and merging them in needs to enforce this at their repo.	22:08
	→ ZaeDrake joined	22:08
sjokkis	we use github. not sure if it's possible	22:09
riceandbeans	I have a submodule that I added locally, I pushed to my server, and on another machine doing the pull, it doesn't get the contents of the submodule	22:09
bambams_	sjokkis: Check if GitHub supports hooks (I think it does) and install a hook there.	22:09
riceandbeans	can anyone help me figure out how to get the contents or what I'm doing wrong?	22:09
skorgon	sjokkis, sure it is, let everybody work in a fork and let them open pull requests	22:09
	those can be reviewed and you merge them only if they comply to your coding standards	22:09
sjokkis	skorgon: that is our current workflow	22:10
	skorgon: i guess trailing whitespace just slips through sometimes	22:10
skorgon	sjokkis, then your review process is broken :P	22:10
riceandbeans	sjokkis: do you use vim?	22:10
bambams_	sjokkis: You can't catch it at commit time. That is a client-side operation. The client must be considered hostile. :)	22:10
riceandbeans	sjokkis: I have some code you might like if you do	22:10
	← AhabsBeard left	22:10
	→ Destos joined	22:11
	← Macaveli left	22:11
sjokkis	riceandbeans: i already use the commit hook that catches trailing whitespace	22:11
riceandbeans	add this to your .vimrc	22:11
	" Delete trailing white space on save, useful for Python and CoffeeScript ;)	22:11
	func! DeleteTrailingWS() exe "normal mz" %s/\s\+$//ge exe "normal `z"	22:11
	endfunc	22:11
	autocmd BufWrite * :call DeleteTrailingWS()	22:11
	→ boombatower joined	22:11
	→ The-Mad-Pirate-2 joined	22:11
riceandbeans	so, if you ever open a file in vim from now on, and write, it deletes all trailing whitespace in the whole file	22:11
	anyway	22:12
	← TMP\|Uni left	22:12
riceandbeans	can anyone help me with my submodule issue?	22:12
skorgon	so don't program in whitespace :P	22:12
	← reskp left	22:12
riceandbeans	skorgon: I hate python	22:13
skorgon	riceandbeans, you did git submodule init and git submodule update?	22:13
	← pantsman left	22:13
skorgon	riceandbeans, not python, http://en.wikipedia.org/wiki/Whitespace_%28programming_language%29	22:13
	← ZaeDrake left	22:14
	→ sgen joined	22:14
	→ xaq joined	22:14
riceandbeans	skorgon: no, I did git submodule add https://github..... localname	22:15
	git add localname	22:15
	git commit	22:15
	git push	22:15
	on the other end	22:15
	git pull	22:15
	other end didn't get contents of the cloned repo	22:15
	← Tabmow left	22:15
	→ reskp joined	22:15
	→ Tabmow joined	22:16
skorgon	riceandbeans, i'm not fully sure, but i'm pretty sure you need to do git submodule init and update (or one of them at least, and i don't know the order either), but simply pulling doesn't fetch submodules, I think.	22:16
	→ SocalNick_ joined	22:16
skorgon	wait, it got nothing? or just not the contents of the submodule?	22:17
	← SilverBln left	22:18
	→ ojacobson joined	22:18
	← SocalNick left	22:18
	SocalNick_ → SocalNick	22:18
riceandbeans	skorgon: not the contents of it	22:19
	let's go this way, A, B, C	22:19
	A is my, B is server, C is another client	22:19
	with me so far?	22:19
	← dirte left	22:19
bambams_	riceandbeans: Try git submodule update --init. ;)	22:19
	→ dirte joined	22:19
riceandbeans	A does git submodule add repourl localname && git add localname && git commit && git push	22:19
	← russ_ left	22:20
skorgon	as i said, if you clone a repo with submodules you need the init and update stuff	22:20
riceandbeans	C does git pul	22:20
	gitinfo set mode: +v	22:20
bambams_	riceandbeans: I'm with skorgon. I don't think that submodules automatically clone. You need to explicit enable them in each clone.	22:20
riceandbeans	bambams_: on C or A	22:20
skorgon	C	22:20
riceandbeans	one sec	22:20
	git submodule update --init	22:21
	→ chris_thomson joined	22:21
riceandbeans	No submodule mapping found in .gitmodules for path 'cpan'	22:21
	← githogori left	22:21
	→ pantsman joined	22:23
	→ diegovio1 joined	22:24
	→ oodavid joined	22:24
	→ jimmyy joined	22:25
	← ezekielnoob left	22:25
	→ trusktr joined	22:25
	→ darnir_ joined	22:25
	← jimmyy left	22:25
	→ githogori joined	22:25
bambams_	riceandbeans: Does .gitmodules exist in C?	22:25
mrstocks	any linux peeps here?	22:25
	→ jimmyy joined	22:25
	← oracal left	22:26
bambams_	mrstocks: A stupid question, I'm sure.	22:26
	← jimmyy left	22:26
mrstocks	just wondering why you know what deomon "ArrGGgg" is runing on a certain port	22:26
	→ LeMike joined	22:26
	← dougsland left	22:26
mrstocks	i a netstat	22:27
	→ jimmyy joined	22:27
	→ axl_ joined	22:27
	← jimmyy left	22:27
	diegovio1 → diegoviola	22:27
	→ roymiloh joined	22:27
	→ jimmyy joined	22:27
	← jimmyy left	22:28
ojacobson	mrstocks: It's not something git-related, that's for sure	22:28
	← Freeman42 left	22:29
	→ jimmyy joined	22:29
mrstocks	nop four sure dawg	22:29
	← bwaxxlo left	22:29
guzzlefry	http://git-scm.com/book/en/Git-Internals <-- Can this chapter helpful to read through for the end-user?	22:29
	→ whitemoustache joined	22:29
	→ russ_ joined	22:29
	→ smrtz\|nix joined	22:29
	← jimmyy left	22:29
	← hholtmann left	22:29
	← reskp left	22:29
	← Luke-Jr left	22:30
	← bobkosse left	22:30
	→ jimmyy joined	22:30
	→ woollyams joined	22:30
smrtz\|nix	Hey, I'm trying to push, but I'm getting a remote rejected master -> master (pre-receive hook declined). Can someone tell me what that means please?	22:30
	← jimmyy left	22:30
	→ Luke-Jr joined	22:31
	← russ_ left	22:31
	→ jimmyy joined	22:31
	→ russ_ joined	22:31
	← jimmyy left	22:31
	← oodavid left	22:31
bambams_	riceandbeans: It worked for me just fine. Make sure that .gitmodules is tracked in A.	22:31
	← roymiloh left	22:32
	→ jimmyy joined	22:32
mrstocks	i guess you better ban me for asking simple question ;)	22:32
	sorry	22:32
	→ oodavid joined	22:32
mrstocks	but im happy with my simple questions	22:32
smrtz\|nix	mrstocks: if they did that, I've have been long gone..	22:32
	→ shruggar joined	22:33
	← Destos left	22:33
mrstocks	aaaaaaaah /slap/	22:33
	← multiverse left	22:33
smrtz\|nix	mrstocks: Any idea on that error I just posted??	22:33
	← misterpink left	22:34
bambams_	smrtz\|nix: A hook on the server doesn't like something about you pushing that master. If the hook is any good it should have told you what it didn't like.	22:35
	← pantsman left	22:35
riceandbeans	bambams_: it is, but the file didn't get pulled either	22:35
mrstocks	Sorry im a retarded user when it comes to git but there are really interesting people like bambams_ and rawtaz	22:35
	→ AhabsBeard joined	22:35
riceandbeans	bambams_: to make TOTALLY sure I even rm -rfv the directory on C and cloned all over again	22:35
	← thedodd left	22:35
	← doener left	22:35
smrtz\|nix	bambams Ok, I'll reread the error again.	22:35
riceandbeans	bambams_: I had to add the .gitmodule file manually on C with contents from A, then git submodule update --init	22:35
bambams_	riceandbeans: Either PEBKAC or you've found a bug. Make sure that B has the right history.	22:35
	→ deuti joined	22:36
	← githogori left	22:36
riceandbeans	bambams_: how would I do that?	22:36
	→ frogonwheels joined	22:36
riceandbeans	bambams_: I'm running gitolite on a VM in my cluster	22:36
	I spun it up as sort of a small thing to hold some of my code and now it's getting treated like production, which sucks because that wasn't my intent	22:37
bambams_	riceandbeans: Go to your A subdirectory, fetch, and compare. E.g., git log origin/master..master.	22:37
	← demiurgo left	22:37
	→ reskp joined	22:37
riceandbeans	bambams_: well it's not in master branch	22:37
bambams_	s/subdirectory/working tree/	22:37
	→ gnugnu9 joined	22:37
bambams_	riceandbeans: Well adjust the command accordingly for local and remote refs.	22:37
riceandbeans	A shouldn't need to fetch because it's the only one commiting and pushing	22:37
	→ robarell_ joined	22:38
bambams_	riceandbeans: Which branch is checked out in C?	22:38
	← ferreum left	22:38
riceandbeans	...	22:38
	crap	22:38
	riceandbeans starts over...	22:38
	← james_d_h left	22:38
	→ breakfast joined	22:39
	← nobitanobi left	22:39
	→ demiurgo joined	22:39
	← AaronMT left	22:39
riceandbeans	bambams_: :( I checked out the wrong branch after removal and clone	22:40
	so it kinda works now	22:40
	but still needed to run another command on client	22:40
	C	22:40
	→ Destos joined	22:40
riceandbeans	bambams_: so I have an hourly cron on C, because it has readonly access to the repo, to pull any changes	22:40
	if I add to that, git submodule update --merge, will that take care of the submodule too?	22:41
	← mf_ left	22:41
bambams_	riceandbeans: You know as much about submodules as I do.	22:41
	← ariscop left	22:41
	→ eletuchy joined	22:42
	← Kayra left	22:42
bambams_	riceandbeans: My intuition without checking the man page would be that --merge isn't necessary if C is read-only.	22:42
	← Kicer86 left	22:42
	← bambams_ left	22:42
	← smrtz\|nix left	22:43
ojacobson	git submodule sync && git submodule init --update	22:43
	→ mf_ joined	22:43
ojacobson	update --init, rather	22:43
	the sync is to update any modules whose URLs have changed	22:43
	the update is to fetch changes and check them out	22:43
	mf_ → Guest82460	22:43
ojacobson	(and set up any new submodules)	22:43
	← phantomtiger left	22:44
	← erikruthven left	22:44
riceandbeans	ojacobson: thanks	22:44
	← bwreilly left	22:45
	← matheus23 left	22:46
	← diegoviola left	22:46
	← demiurgo left	22:46
	← eletuchy left	22:46
	→ trewe joined	22:47
guzzlefry	Situation: I have been merging staging branch into master branch. Now I have a commit in master that needs to go into staging. What's the best route? Simply git checkout staging; git merge master? Or would something like rebase be more appropriate?	22:48
	→ diegoviola joined	22:48
	← g1 left	22:48
	→ demiurgo joined	22:48
	→ misterpink joined	22:49
	← OrpheusP left	22:49
	→ dsdeiz joined	22:50
grumbel_	guzzlefry: if there is only that one commit in master since you've merged feature, co staging; merge master would work; if not, you could cherry-pick that one commit	22:51
guzzlefry	grumbel_: Will that destroy any uncommitted changes or untracked files without warning?	22:52
	← shawndumas left	22:53
Corey	This is interesting. Git status shows a bunch of staged changes. "git commit" returns status code 0.	22:53
	Never seen this one before.	22:53
	← rainmanjam left	22:53
	→ dagnachew joined	22:54
guzzlefry	status code 0 usually means everything was fine, doesn't it?	22:54
Corey	guzzlefry: Yes. :-)	22:54
	→ rainmanjam joined	22:54
Corey	That's the point.	22:54
	→ erikruthven joined	22:54
guzzlefry	oh, I misread. :P	22:54
Corey	"git commit" doesn't drop me to an editor, nothing-- but there are many files under "Changes to be committed:"	22:54
	← ngladitz left	22:55
	→ scarabx joined	22:56
	← afuentes left	22:56
	← sohail left	22:56
Corey	git log shows the last change was six days ago.	22:56
	I'm really at a bit of a loss here.	22:56
	→ pierre1_ joined	22:56
	→ dragon3_ joined	22:56
grumbel_	guzzlefry: untracked files - no, unless they were tracked by the other commit; staged changes - yes; commit them to a new branch or stash them first	22:57
	← sburgess left	22:58
Corey	I'm wrong.	22:58
	git commit returns status code -1	22:58
	But no error message.	22:58
	→ ariscop joined	22:58
Corey	Hmm, maybe I can increase the verbosity.	22:59
	→ sdouglas joined	23:00
	→ ninsei joined	23:00
	← senj left	23:00
	→ Kayra joined	23:00
	← mishok13 left	23:01
	← dragon3_ left	23:01
	← firc left	23:01
	→ firc joined	23:01
	← firc left	23:01
	→ firc joined	23:01
	← ninsei_ left	23:01
Corey	Were this on Linux I could strace it, but it's OS X.	23:03
	← snql left	23:03
	← albel727 left	23:04
	← votyx left	23:04
	← sparr left	23:04
	← Gavrisimooo left	23:05
ojacobson	(env; git config --list) \| pbcopy # and paste into a gist	23:05
	← riceandbeans left	23:06
ojacobson	Then, while we read the entrails, consider the dtruss documentation.	23:06
	→ james_d_h joined	23:06
	→ Sabbath joined	23:06
mrstocks	`thx for all the fish	23:06
	← mrstocks left	23:06
	← torste left	23:07
	← mewm left	23:07
	← rainmanjam left	23:07
	→ sohail joined	23:07
	← sohail left	23:07
	→ sohail joined	23:07
	← sohail left	23:08
	→ sohail joined	23:08
	← sohail left	23:08
	→ sohail joined	23:08
	→ bwreilly joined	23:09
	← oodavid left	23:09
	→ sparr joined	23:10
	→ torste joined	23:11
	← Sabbath left	23:11
Corey	ojacobson: https://gist.github.com/KB1JWQ/6035c52b44bbf27a43ae	23:11
	ojacobson: Ugh, dtruss. :-)	23:11
	→ axsuul joined	23:12
Corey	Waiiiit a second.	23:13
	← SorenHolm left	23:13
	← sdouglas left	23:13
Corey	ojacobson: Found it.	23:13
	I've got a lame pre-commit hook.	23:13
	← RichardJ left	23:13
Corey	Remind me to strangle someone.	23:14
	Possibly me.	23:14
	→ sdouglas joined	23:14
	← CKyle left	23:15
	← n-st left	23:16
	→ RichardJ joined	23:17
	→ rfoust joined	23:17
	← sdouglas left	23:18
	← jluc left	23:19
	← primitive left	23:19
ojacobson	Surprised not to see core.editor or EDITOR or VISUAL or GIT_EDITOR set	23:21
Corey	ojacobson: % echo $EDITOR	23:21
	vim	23:21
	→ yoday joined	23:22
	← anry left	23:22
	← robarell_ left	23:22
Corey	ojacobson: But % env \|grep EDITOR doesn't display it. Is that a zsh strangeness I wonder?	23:22
	→ anry joined	23:22
ojacobson	possibly. Since the default editor is vi(m?) anyways, I doubt you'd notice.	23:23
guzzlefry	Is there anyway to do a 'test' merge?	23:23
	something completely non-destructive	23:23
ojacobson	guzzlefry: git checkout -b test-merge && git merge foo	23:23
	→ CKyle joined	23:23
cbreak	merges don't really destroy anything.	23:23
	← infynyxx left	23:23
	← armyriad left	23:23
guzzlefry	ah	23:24
	← sparr left	23:24
guzzlefry	so, I can just go ahead and try to merge.. :P	23:24
ojacobson	you'll still need a clean work tree, for conflict-resolution reasons	23:24
	← ncthom91 left	23:24
ojacobson	and you may be interested in man git-rerere	23:24
gitinfo	the git-rerere manpage is available at http://jk.gs/git-rerere.html	23:24
yoday	Hi. I wanted to know if it is possible to push your .git/conf to a git server. I have 2 remote entries in the config file and I want people to get them when they clone the repository.	23:24
ojacobson	no	23:24
	← freestyl3r left	23:25
ojacobson	you can include an example config in the repo, but git _intentionally_ won't respect it	23:25
skorgon	sure, but not as long as it is in .git	23:25
ojacobson	some config options are equivalent to being able to run commands, which would be a security risk if they could be provided by the internet	23:25
	← dagnachew left	23:25
	→ dagnachew joined	23:26
yoday	Got it! Thanks guys!	23:26
	← yoday left	23:26
guzzlefry	So I did a git fetch; to pull in changes on master, I want to merge master with staging but that doesn't seem to work. What am I doing dumb?	23:26
	I'm on the staging branch.	23:27
osse	guzzlefry: 'git merge master'	23:27
skorgon	guzzlefry, do you want to merge with master or origin/master?	23:27
guzzlefry	origin/master	23:27
osse	'git merge origin/master'	23:27
guzzlefry	oh wait, I can probably just...yeah that	23:27
	← hyperair left	23:27
guzzlefry	thanks	23:28
	← ariscop left	23:28
	← decotii left	23:29
	← LeMike left	23:29
	→ sparr joined	23:30
	→ dort joined	23:30
	→ GT4066 joined	23:30
osse	guzzlefry: when you do 'git fetch' only origin/master (and origin/foo and otherplace/bar) is updateed, not the local branches. But I suppose you could git checkout master; git merge origin/master; git checkout staging; git merge master	23:30
	→ torjus joined	23:30
	← rfoust left	23:31
osse	the only different would be the default commit message text	23:31
	*difference	23:31
guzzlefry	Is there a good way to handle this: error: The following untracked working tree files would be overwritten by merge:	23:31
osse	(assuming master would be FFed to origin/master)	23:31
	← Sonderblade left	23:31
guzzlefry	I'm guessing that error is due to the files being tracked in the branch I'm trying to merge?	23:31
osse	yep	23:31
skorgon	guzzlefry, commit or stash your changes	23:31
guzzlefry	They're not tracked.	23:31
skorgon	(doesn't git suggest that?)	23:31
	then they are tracked in the branch you merge with?	23:32
guzzlefry	yep	23:32
	suppose I could just delete them?	23:32
osse	guzzlefry: that they're untracked doesn't mean you can't commit them	23:32
	← AhabsBeard left	23:32
skorgon	if you don't need them anymore, sure	23:32
osse	but seeing as they are untracked I assume they're not important.	23:32
	→ thiago joined	23:32
osse	but you know the answer to that better than us	23:32
	← james_d_h left	23:33
	→ snuffeluffegus joined	23:33
	← Okaria_ left	23:33
	← dagnachew left	23:33
	→ dagnachew joined	23:34
ojacobson	asking the internet if you should "just delete" some files is a sure recipe for comedy	23:34
	→ Okaria joined	23:34
	← diegoviola left	23:34
guzzlefry	or despair in my case	23:34
osse	but it's suspicious: in one branch they are present but untracked. In the other branch they're tracked. Reminds me of the dude who had commited .class files	23:34
	← torjus left	23:35
	← sgen left	23:35
	← whitemoustache left	23:35
	← tapout left	23:36
guzzlefry	An update was done on staging and production, but 'mostly' reverted on staging. The changes on production were committed and pushed to origin/master.	23:36
	Pretty sure that's the reason why.	23:36
	← lagweezle left	23:36
	← dagnachew left	23:37
	→ dagnachew joined	23:37
	← ozymandias left	23:37
	→ madewokherd joined	23:37
	← dreiss left	23:37
	← Spamoi left	23:38
	← Noldorin left	23:38
	← thierryp left	23:39
	← JanC left	23:39
	→ thierryp joined	23:40
	→ Spamoi joined	23:41
	→ W0rmDr1nk joined	23:41
	→ ethlor joined	23:41
	→ tapout joined	23:41
	← CreativeEmbassy left	23:42
	→ eletuchy joined	23:43
	← MachineX left	23:43
	← tapout left	23:43
	← agliodbs left	23:43
	← PeterBooker left	23:44
	→ hyperair joined	23:44
	→ ozymandias joined	23:44
	← aberrant left	23:44
	← WormDrink left	23:44
	← thierryp left	23:45
	→ armyriad joined	23:45
	→ whitemoustache joined	23:45
	← dsdeiz left	23:45
	→ LBV_User joined	23:46
	← jaimef left	23:46
	← eletuchy left	23:47
	← demiurgo left	23:47
	→ jaimef joined	23:47
	← juril left	23:47
	→ agliodbs joined	23:48
	← dagnachew left	23:48
	← harobed left	23:48
	→ dagnachew joined	23:48
	← trusktr left	23:48
	→ zumba_addict joined	23:50
	→ lindenle_ joined	23:51
	← pinpin404 left	23:52
	→ JerryT joined	23:52
	← v0n left	23:52
	→ lifelike joined	23:52
	→ JanC joined	23:53
	← lindenle left	23:53
	← leeN left	23:53
	← Kayra left	23:54
	→ infynyxx joined	23:54
	← darnir_ left	23:54
	→ jimmyy_ joined	23:54
	← jimmyy_ left	23:55
	→ Kayra joined	23:55
	→ jimmyy_ joined	23:55
	← Kayra left	23:55
	← ozymandias left	23:55
	← jimmyy left	23:55
	→ diegoviola joined	23:56
	← jimmyy_ left	23:56
	← arif-ali left	23:56
	→ rfoust joined	23:56
	← axl_ left	23:56
	→ dragon3_ joined	23:56
	← Naoe-Kanno left	23:56
	→ jimmyy joined	23:56
	← Destos left	23:57
	← Leoneof left	23:57
	→ juril joined	23:58
	→ Leoneof joined	23:58

Logs Search ←Prev date Next date→

Channels Documentation