IRCloggy #git 2013-07-04

Provider of IRC logs since 2005.

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

	2013-07-04
	→ ktosiek joined	00:00
	→ devth joined	00:01
	← tvw left	00:01
	→ tvw joined	00:01
	← lindenle left	00:03
	← maddenwg left	00:03
	← arkore left	00:04
	← Kakera left	00:04
psofa	lets say i have multiple remotes.How does git figure which parts of them are common? or does it download every remote wholly?	00:04
	← juliohm left	00:04
	← hellopat left	00:04
	→ maddenwg joined	00:05
milki	the latter	00:05
	→ TheFuzzball joined	00:05
milki	o	00:05
	hm	00:05
	← TheFuzzball left	00:06
	← v0n left	00:06
milki	it compares the git objects to the local object datastore i guess	00:06
ojacobson	psofa: by knowing what objects are reachable locally	00:06
	→ TheFuzzball joined	00:06
cmn	the server does the comparing, but it's essencially it	00:06
	← simesy left	00:07
milki	client sends local reachable objects	00:07
ojacobson	gory details: https://www.kernel.org/pub/software/scm/git/docs/v1.7.0.5/technical/pack-protocol.txt	00:07
cmn	but they only ever talk about commit, never lower levels	00:07
milki	server compares and decides what to send back	00:07
	→ krsree joined	00:08
	← nbouscal left	00:09
	← MistuhKurtz left	00:11
	← danishkhan left	00:11
psofa	lets say i have a project B on github which is a fork of A.Now i clone B on my pc and do some commits and then fetch A.Will A be somehow automagically mounted on the current tree and reuse the objects that are common?	00:11
	ojacobson, ^ this	00:12
	← tjbiddle left	00:12
ojacobson	"mounted on the current tree" isn't a thing, but yes, it will reuse at least most of the objects in common.	00:12
	With A, B, and your local repo.	00:12
	In the common case, all of.	00:12
psofa	so that i can git rebase A/master and then push to github and it will somehow do the right thing and not reupload the whole A	00:14
	but reuse what A and B have in common	00:15
	runningskull → zz_runningskull	00:16
	→ babilen_ joined	00:17
	← towski left	00:18
	→ towski joined	00:18
	→ Masu joined	00:18
ojacobson	psofa: if it didn't do that, it'd be a pretty shit dscm	00:18
	→ curvedmark joined	00:19
	→ AWinterman joined	00:19
	← AWinterman left	00:19
	← babilen left	00:19
Masu	Good morning.	00:20
	← pencilcheck left	00:20
Masu	Here is my situation: http://pbrd.co/1cSP1vS	00:20
	→ AWinterman joined	00:20
ojacobson	Okay..?	00:20
psofa	ojacobson, sorry i have no real experience with vc it seems magic :) Especially git rebase	00:21
Masu	I wanted f797b64 to be pushed to upstream. So I checked out upstream/master and did I "git cherry-pick f797b64", but ended up with where I am. I'm not sure if that is the right way to push commits from fork to upstream. How should I proceed?	00:21
ojacobson	psofa: well, rebase is a purely local operation	00:21
	git fetch and git push, and things built on top of them, are the points at which you copy things to or from another repo	00:21
psofa	yeah got that	00:21
ojacobson	Masu: you're in a detached state: no current branch, just some random commit checked out	00:22
	that's not necessarily bad, but it does take some care	00:22
	'git push upstream HEAD:master' will set upstream's 'master' branch to fbe9e90…	00:22
Masu	ojacobson: I'm not sure what "detached state" is.	00:22
ojacobson	!detached	00:22
gitinfo	A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach	00:22
	← odra left	00:23
	← Davey left	00:23
Masu	Awesome. :D	00:23
	← towski left	00:23
Masu	What is a better way to do what I tried to do?	00:24
ojacobson	'git checkout upstream/master -b some-name'	00:24
	(I would say -b master, but you already have a local branch named master)	00:24
	then, later, 'git push origin some-name:master'	00:24
	→ Droolio joined	00:24
	→ w0ng joined	00:24
ojacobson	er, upstream, not origin	00:24
Masu	I remember making a branch for each thing you need to push to upstream. But I cannot remember what was the steps that need to be taken.	00:24
	← amcsi left	00:26
Masu	So ... instead of detached state ... I could have just created branch for upstream ... cherry pick to that and push that?	00:26
	← devth left	00:26
	→ Lulzon joined	00:26
ojacobson	You'd've ended up with the same graph	00:26
	but instead of having an anonymous, transient branch like you have now, you'd have a branch with a name	00:27
	← Mars` left	00:27
	→ freestyl3r joined	00:28
	← Nicholas_Rishel left	00:28
psofa	uhm so git-cherry-pick is a rebase for individual commits, no?	00:29
	← AWinterman left	00:29
ojacobson	other way around	00:29
	git rebase is implemented in terms of git cherry-pick, for the common cases.	00:30
	← bipolar_ left	00:30
	→ nbouscal joined	00:31
	← adamben left	00:32
	← hwrd\|work left	00:33
	← axsuul left	00:35
	→ barneybook joined	00:35
	→ mattcen_ joined	00:35
	← scrollback left	00:36
	→ scrollback joined	00:36
	→ babilen joined	00:37
	← babilen_ left	00:38
	← penk left	00:40
	→ adamben joined	00:41
	← adamben left	00:41
	→ ErKa joined	00:41
	→ adamben joined	00:41
	← adamben left	00:41
	→ zacts joined	00:41
	→ adamben joined	00:42
	← adamben left	00:42
	→ Fernandos joined	00:42
Fernandos	hi	00:42
gitinfo	Fernandos: 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.	00:42
	→ adamben joined	00:42
	← adamben left	00:42
Fernandos	how do I sync a bitbucket hg repo with github?	00:43
	// not my own bitbuck repo	00:43
	→ adamben joined	00:43
	← belak left	00:43
	← guitarro left	00:44
	→ jeremyheiler joined	00:45
	→ bigkm joined	00:45
	← bigkm left	00:45
	→ hwrd\|work joined	00:46
	← devoldmx left	00:46
	→ Monticello joined	00:47
	← krsree left	00:47
	← DonRichie left	00:47
	→ devoldmx joined	00:47
	→ DonRichie joined	00:47
	← midnightmagic left	00:48
	→ midnightmagic joined	00:49
	→ buzzybron joined	00:49
	→ krsree joined	00:49
	→ dsdeiz joined	00:49
	← krsree left	00:49
	← ffio left	00:50
	→ JGarrido joined	00:51
	← thiago left	00:52
	← devoldmx left	00:52
	zz_runningskull → runningskull	00:52
	← LuxuryMode left	00:52
	← redrocket left	00:53
	→ foozle joined	00:53
	← mckendricks left	00:54
	→ LuxuryMode joined	00:54
	← Monticello left	00:54
	→ Goplat joined	00:55
	← Sadeukko left	00:55
	← RavenHursT left	00:55
	← hwrd\|work left	00:55
	→ AWinterman joined	00:56
	→ Bassam joined	00:58
	← setmeaway2 left	00:58
	→ InvidFlower joined	00:58
	← skorgon left	01:00
	← maestrojed left	01:00
	→ bmac joined	01:00
	→ skorgon joined	01:01
	← dsdeiz left	01:01
	← rakl left	01:01
	→ kpreid joined	01:02
	→ yshh joined	01:02
	→ bigkm joined	01:02
	→ pen joined	01:03
	→ Davey joined	01:04
	→ ffio joined	01:05
	← danillonunes left	01:05
	← AWinterman left	01:05
	→ aberrant joined	01:06
	→ bytephilia joined	01:06
	→ jefflyne joined	01:07
	← goshawk left	01:07
	→ vorsorken joined	01:08
	← yshh left	01:09
	← Fernandos left	01:09
	→ erkules_ joined	01:11
	← nbouscal left	01:11
	← scorphus left	01:11
	→ Vampire0_ joined	01:11
	→ axsuul joined	01:11
peteyg	\q	01:12
	← peteyg left	01:12
	→ k_sze[work] joined	01:12
	← erkules left	01:13
	SeoZ-work[AWAY] → SeoZ-work	01:14
	← Vampire0 left	01:14
	→ Milianovic joined	01:14
	→ bipolar_ joined	01:16
	← Milianovic_ left	01:17
	→ CodeShark joined	01:18
	← dijonyummy left	01:19
	← tvw left	01:19
	rohan32\|afk → rohan32	01:19
	← mehwork left	01:20
	→ simesy joined	01:21
	← knite left	01:24
	← FernandoBasso left	01:24
	← axsuul left	01:24
	→ AWinterman joined	01:25
	← simesy left	01:26
	← Masu left	01:26
	→ simesy joined	01:27
	← shentino left	01:27
	← simesy left	01:28
	→ towski joined	01:28
	→ shentino joined	01:28
	← shentino left	01:28
	→ shentino joined	01:28
	→ simesy joined	01:28
	→ babilen_ joined	01:29
	← harish left	01:30
	→ fridim_ joined	01:31
	← babilen left	01:32
	→ knite joined	01:32
	→ SilverKey joined	01:33
	← Bassam left	01:35
	← ecube left	01:36
	→ danishkhan joined	01:37
	← aberrant left	01:38
	→ ISF joined	01:39
	← Davey left	01:40
	← LuxuryMode left	01:41
	← AWinterman left	01:42
	→ Bassam joined	01:42
	→ ProLoser joined	01:44
ProLoser	hallo	01:44
	git won't let me stash or reset a file cuz of the stupid line endings	01:44
	i've tried deleiting the file and rechecking it out	01:44
	it's completely blocking everything	01:44
	how the fuck do i fix it?	01:45
	← Artpicre left	01:45
	← vorsorken left	01:46
	← danishkhan left	01:46
	← Bassam left	01:47
	→ intripoon_ joined	01:47
milki	ProLoser: !crlf is all i know	01:47
gitinfo	ProLoser: to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/	01:47
	→ Bassam joined	01:48
	→ yshh joined	01:48
	→ jalama joined	01:48
	→ Davey joined	01:48
ProLoser	i gave up and committed the bitch	01:48
	← ProLoser left	01:48
	← intripoon left	01:51
	→ tplaner joined	01:51
	→ danishkhan joined	01:51
	← bmac left	01:52
	→ iliketurtles joined	01:57
	→ dsdeiz joined	01:58
	← SilverKey left	02:00
	← spaceonline left	02:01
	→ luc__ joined	02:03
	← mattcen left	02:04
	→ fairuz joined	02:04
	→ scorphus joined	02:05
	← maddenwg left	02:06
	→ bombsite joined	02:06
	← jefflyne left	02:08
	→ harish joined	02:09
	← freestyl3r left	02:10
	← jalama left	02:12
	→ echo-area joined	02:12
	runningskull → zz_runningskull	02:12
	→ AWinterman joined	02:12
	→ devoldmx joined	02:12
	← AWinterman left	02:13
	→ LuxuryMode joined	02:13
	→ AWinterman joined	02:13
	→ mckendricks joined	02:13
	← BitPuffin left	02:13
	← knite left	02:14
	← pen left	02:14
	→ mmitchell joined	02:16
	→ R1KRDO joined	02:17
	rohan32 → rohan32\|afk	02:18
	→ devoldmx_ joined	02:18
	← adamben left	02:18
	mattcen_ → mattcen	02:19
	→ devoldm__ joined	02:19
	→ engkur joined	02:20
	← ojacobson left	02:21
	← harish left	02:22
	→ tmcmahon joined	02:22
	← devoldmx_ left	02:22
	← AWinterman left	02:23
	← devoldm__ left	02:24
	← hyperair left	02:26
	← chrob left	02:27
	← mmitchell left	02:28
	← towski left	02:28
	← bytephilia left	02:28
	JakeSays2 → JakeSays	02:28
	zz_runningskull → runningskull	02:28
	← ErKa left	02:29
	← deuterium left	02:31
	→ _BJFreeman joined	02:31
	← lifelike left	02:31
	← Noldorin left	02:31
	→ knite joined	02:32
	_BJFreeman → BJfreeman	02:32
	→ pen joined	02:32
	← R1KRDO left	02:34
	→ Noldorin joined	02:34
	← mdiers left	02:36
	→ diegoviola joined	02:37
	← Noldorin left	02:37
	→ harish joined	02:37
	← Bassam left	02:38
	→ Saby joined	02:38
	← Saby left	02:38
	→ Saby joined	02:38
	→ mdiers joined	02:40
	→ thiago joined	02:40
	→ Noldorin joined	02:40
	← madewokherd left	02:40
	→ setmeaway2 joined	02:41
	→ Nicholas_Rishel joined	02:41
	runningskull → zz_runningskull	02:41
	← InvidFlower left	02:43
	← JGarrido left	02:43
	← Saby left	02:44
	→ kanibe joined	02:44
	→ JGarrido joined	02:45
	→ ryez joined	02:47
	← Baribal_ left	02:47
	← engkur left	02:49
	→ AWinterman joined	02:49
	→ madewokherd joined	02:49
	→ FrodoTheHobbit1 joined	02:52
	← FrodoTheHobbit left	02:52
	→ umib0zu joined	02:53
	← dreiss left	02:54
	← guampa left	02:56
	→ jefflyne joined	02:57
	→ aspect joined	02:57
aspect	I have a feature branch with about 20 commits on it, of which I want to merge only the first 5 into master (the rest later). Is cherry-pick the right strategy for this?	02:58
thiago	no, merge	02:59
	merge the last of the commits you want merged	02:59
	← AWinterman left	02:59
	← scorphus left	02:59
	← JGarrido left	02:59
aspect	thanks	02:59
	→ Baribal_ joined	03:00
	→ ErKa joined	03:02
	← umib0zu left	03:02
	→ otherj joined	03:03
	→ jcromartie joined	03:03
	zz_runningskull → runningskull	03:03
	← donmichelangelo left	03:04
	→ donmichelangelo joined	03:04
	← m0viefreak left	03:05
bombsite	thiago, you know what I hate	03:06
	I hate headless branches.	03:06
thiago	what do you mean by headless branches?	03:07
	you can't mean the tip of the branch, since all branches have a tip	03:07
	it can't be HEAD, because HEAD doesn't belong to a specific branch	03:07
	← joelpittet left	03:07
	← zacts left	03:09
bombsite	don't worry about it	03:10
	I'm just really bad at git	03:10
	if it works	03:10
	I will find a way to make something not work	03:10
	D:	03:10
	← TomyLobo left	03:10
	→ jackdempsey joined	03:12
	→ avinashrbhat joined	03:13
	← avinashrbhat left	03:14
	→ Bassam joined	03:15
	← salamanderrake left	03:16
	→ salamanderrake joined	03:18
	→ hahuang65 joined	03:18
	← ErKa left	03:19
	→ ErKa joined	03:19
	← Bassam left	03:21
	← jjr left	03:21
	← dsdeiz left	03:21
	rohan32\|afk → rohan32	03:22
	← tmcmahon left	03:23
	← tinti left	03:24
	→ Bassam joined	03:24
	runningskull → zz_runningskull	03:25
	→ towski joined	03:25
	→ lordflapjack joined	03:25
	← Chillance left	03:25
	→ AWinterman joined	03:25
	→ nafg joined	03:26
	← curvedmark left	03:27
	← otherj left	03:27
	← towski left	03:28
	← FreezingCold left	03:28
	→ _BJFreeman joined	03:29
	← __main__ left	03:30
	→ scarabx_ joined	03:30
	BJfreeman → Guest17598	03:30
	_BJFreeman → BJfreeman	03:30
	← Guest17598 left	03:30
	→ __main__ joined	03:31
lordflapjack	hello test	03:31
gitinfo	lordflapjack: 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.	03:31
	← dkpi left	03:31
lordflapjack	can you read this?	03:31
bremner	lordflapjack: you didn't see the 10 line reply from the bot?	03:31
	← Bassam left	03:31
	← kanibe left	03:31
	→ devoldmx_ joined	03:31
lordflapjack	yes haha	03:31
	← simesy left	03:32
	← lordflapjack left	03:32
	→ log_keeper joined	03:32
bremner	!next	03:32
gitinfo	Another satisfied customer. NEXT!	03:32
	→ pencilcheck joined	03:33
	← bombsite left	03:33
	← yshh left	03:33
	← AWinterman left	03:35
	← LuxuryMode left	03:36
	← devoldmx_ left	03:36
	← pen left	03:36
	← deckTrout left	03:37
	→ yshh joined	03:38
	→ nafg___ joined	03:38
	→ curvedmark joined	03:38
	← nafg left	03:38
	← knite left	03:39
	→ JGarrido joined	03:40
	→ scorphus joined	03:40
	offby1 pours syrup	03:41
	→ AWinterman joined	03:42
	← Noldorin left	03:42
	← danishkhan left	03:42
	→ danishkhan joined	03:43
	zz_runningskull → runningskull	03:43
	← ffio left	03:44
	← averell left	03:44
	← Weiss left	03:45
	→ Weiss joined	03:45
	→ devoldmx_ joined	03:46
	← AlexandreMBM left	03:46
	→ averell joined	03:47
	← danishkhan left	03:47
	→ simesy joined	03:48
	← preflex left	03:48
	→ stliu joined	03:49
	→ ffio joined	03:49
	← tplaner left	03:50
	← setmeaway2 left	03:51
	← BJfreeman left	03:52
	→ delinquentme joined	03:54
	→ _BJFreeman joined	03:56
	_BJFreeman → BJfreeman	03:57
	← JGarrido left	03:57
	← averell left	03:57
	← w0ng left	03:58
	→ averell joined	03:59
	← donmichelangelo left	04:00
	→ donmichelangelo joined	04:01
	→ AWinterm_ joined	04:01
	→ shrekting joined	04:04
	→ danishkhan joined	04:04
	→ codeshah joined	04:05
	← danishkhan left	04:06
	→ dreiss joined	04:07
	← unreal left	04:09
	← shrekting left	04:09
delinquentme	attempting to ssh pull from github on a server I'm sshed into.... Ive just generated the ssh key pairs	04:09
	and place the public up on github	04:10
	once back on (sshd) the test server I run	04:10
	$ ssh -T [email@hidden.address]	04:10
	everything is happy	04:10
	→ unreal joined	04:10
delinquentme	however git clone [email@hidden.address] is mad at me	04:11
	y?	04:11
	← AWinterm_ left	04:11
	← hahuang65 left	04:12
SamB	maybe ask in #github	04:13
	→ h0bbit joined	04:13
frogonwheels__	delinquentme: !doesn'twork	04:13
gitinfo	delinquentme: [!doesntwork] We're sorry it doesn't work, but "it doesn't work" is about the worst problem description possible. Please give us some details, what exactly are you doing, what are you expecting to and what are you seeing instead?	04:13
delinquentme	im sorry frogonwheels__ but im not an idiot. I'm attempting to run git clone	04:14
	what do you think i'm after?	04:14
	← yshh left	04:14
delinquentme	Theres a permission issue on the git clone ... I cannot figure out why	04:14
frogonwheels__	delinquentme: 'is mad at me' is not a description of an error.	04:14
	→ Lyn joined	04:15
	frogonwheels__ → frogonwheels	04:15
delinquentme	Permission denied ... public key	04:15
frogonwheels	is PecanProject one of yours?	04:15
	I mean is that your username?	04:15
delinquentme	no	04:15
SamB	use http[s] then	04:16
frogonwheels	delinquentme: if you want a writeable version of it, you need to fork it.	04:16
delinquentme	does https support pushes?	04:16
frogonwheels	delinquentme: if you want a writeable version of it, you need to fork it.	04:16
delinquentme	or I can get the owner of that repo to add my public key no?	04:16
SamB	did PecanProject give you push access?	04:16
	← scarabx_ left	04:16
delinquentme	yeap	04:17
	SamB, I do have push access	04:17
frogonwheels	ask on #github delinquentme	04:17
delinquentme	ahh!	04:17
	→ beautifulmind joined	04:17
	← scorphus left	04:18
	← ErKa left	04:20
	→ otherj joined	04:21
	→ doener joined	04:22
	← Lyn left	04:23
	← the_cybersphinx left	04:24
	→ JGarrido joined	04:25
	runningskull → zz_runningskull	04:27
	→ krsree joined	04:27
	← iliketurtles left	04:27
	← joki left	04:28
	← fluxdude left	04:28
	→ iliketurtles joined	04:30
	← undecim left	04:31
	→ kpreid_ joined	04:32
	→ joki joined	04:33
	← kpreid_ left	04:34
	← kpreid left	04:35
	→ rurufufuss joined	04:36
	→ danishkhan joined	04:36
	← BJfreeman left	04:36
	→ dhruvasagar joined	04:36
	← kukks left	04:37
	← AlbireoX left	04:37
	→ AWinterm_ joined	04:38
	← sect0r left	04:41
	→ sect0r joined	04:43
	→ engkur joined	04:43
	→ mfulz joined	04:43
	← h0bbit left	04:44
	← simesy left	04:44
	→ leeN joined	04:45
	← otherj left	04:45
	← AWinterm_ left	04:45
	← danishkhan left	04:48
	← mattcen left	04:49
	→ mencito joined	04:50
	← delinquentme left	04:50
	← oojacoboo left	04:50
	→ mattcen joined	04:51
	→ simesy joined	04:52
	→ undecim joined	04:53
	→ delinquentme joined	04:53
	← simesy left	04:53
	→ simesy_ joined	04:53
	→ rabellamy joined	04:54
	→ Bassam joined	04:56
	jackdempsey → jackdempsey-afk	04:56
	rohan32 → rohan32\|afk	04:58
	→ agu10^_ joined	04:58
	→ tadasZ joined	05:00
	← rabellamy left	05:02
	→ jarkinox joined	05:02
	← agu10^ left	05:02
	→ longbeach joined	05:04
	← agu10^_ left	05:04
	gitinfo set mode: +v	05:04
jarkinox	hello	05:04
	→ wrouesnel1 joined	05:05
	← cannonball left	05:07
	← maslowbeer left	05:08
	→ lifelike joined	05:10
	← rurufufuss left	05:12
	← delinquentme left	05:12
	→ AWinterm_ joined	05:14
	→ danishkhan joined	05:14
	→ delinquentme joined	05:14
	→ simesy joined	05:15
	← simesy_ left	05:15
	← uidzer0 left	05:18
	→ uidzer0 joined	05:19
	→ w0ng joined	05:19
	→ deckTrout joined	05:20
	→ pretty_function joined	05:21
	→ ThomasLocke joined	05:21
	← danishkhan left	05:22
	→ yshh joined	05:23
	← AWinterm_ left	05:24
	← nafg___ left	05:24
	→ rurufufuss joined	05:24
	→ macmartine joined	05:24
	→ rchavik joined	05:25
	← vipzrx left	05:27
	→ vipzrx joined	05:29
	→ nafg_ joined	05:29
	← mfulz left	05:30
	→ fluxbox joined	05:30
	← nicedice_ left	05:31
offby1	so they say	05:31
	← fluxbox left	05:32
	→ v0n joined	05:33
	→ fluxbox_ joined	05:34
Remram	?	05:35
	→ Wulf joined	05:35
	zz_runningskull → runningskull	05:36
	→ nilg joined	05:36
	← fridim_ left	05:36
	← amjam left	05:36
	← delinquentme left	05:36
EugeneKay	I said nothing	05:37
SamB	EugeneKay: I guess you must not be one of them	05:38
	→ jceb_ joined	05:38
	← AWinterman left	05:38
Sajbar	EugeneKay: that's bad enough!	05:39
	→ vkz joined	05:39
	← macmartine left	05:39
	← JGarrido left	05:39
	← huoxito left	05:40
	→ marthinal joined	05:40
jarkinox	anyone around to answer a git/apache question?	05:40
	→ jetech joined	05:41
Remram	yes	05:41
	→ engkur_ joined	05:41
Remram	this is #git	05:41
	well done, you found us	05:41
jarkinox	I'm developing a site on my local machine	05:41
	and was thinking of creating a repo in my htdocs folder	05:42
	still on the same machine	05:42
	does that make sense?	05:42
	Is it advisable?	05:42
	← mitz_ left	05:42
	← solrize_ left	05:42
	→ ksinkar joined	05:43
	← devoldmx_ left	05:43
	← Davey left	05:43
	← Goplat left	05:43
iveqy	jarkinox: !deploy !bare	05:43
gitinfo	jarkinox: Git is not a deployment tool, but you can build one around it(in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/the-list-and-irc/deploy.html	05:43
	jarkinox: an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/	05:43
	← skorgon left	05:43
EugeneKay	You want to make a repo available via http? Or you want to develop a site, with the data stored in git, and then make it available via http?	05:44
	← engkur left	05:44
jarkinox	thanks EugeneKay	05:44
	right now everything is on my local machine	05:44
EugeneKay	I'm guessing the second thing, in which case read the deploy link c/o iveqy.	05:44
jarkinox	i have my work in one folder, and want to basically copy everything into htdocs to run and test on the server	05:44
EugeneKay	Yup, that's a textbook deploy secnario	05:45
jarkinox	but it's still on my machine	05:45
	i don't want to go public	05:45
	← jackdempsey-afk left	05:45
jarkinox	just test	05:45
EugeneKay	Locally?	05:45
jarkinox	I suppose I could drag and drop, but I caught the git bug, and would like to keep working with it	05:45
	yeah	05:45
EugeneKay	Either make your git working directory the same place as your DocumentRoot of the test virtualhost, or deploy via a bare repo per aboe	05:46
jarkinox	ok	05:46
	thanks	05:46
	→ skorgon joined	05:47
jarkinox	so then next logical question…is there a better tool for deploying? FTP?	05:47
EugeneKay	FTP is old and antique and dead and I will bitchslap anybody still using it.	05:47
jarkinox	haha	05:47
	ok	05:47
	well that's what I've read here and there	05:47
EugeneKay	Read the deploy link for the dirt, really ;-)	05:47
jarkinox	ok, thanks	05:48
EugeneKay	I'm partial to method #6 in there(because I wrote the script it refers to)	05:48
	→ AWinterman joined	05:50
Remram	if this is your own local test server	05:50
	why don't you develop on these files directly?	05:50
EugeneKay	That's the thing I said	05:50
Remram	yeah	05:51
	is it copyright?	05:51
	← w0ng left	05:51
EugeneKay	Which	05:51
jarkinox	because I downloaded MAMP	05:51
	after I started working on my project	05:52
Remram	wth is MAMP?	05:52
jarkinox	and I kinda want to not be committed to it	05:52
	http://www.mamp.info/en/index.html	05:52
Remram	MAMP uses files doesn't it?	05:52
jarkinox	it's a bundled solution	05:52
Remram	it still serves files	05:52
	→ Davey joined	05:52
jarkinox	and I want to get to the point of having more control over my project	05:53
	→ tg joined	05:53
jarkinox	but i'm not there yet, and want to know how to properly move stuff around when i'm ready	05:53
Remram	modifying the files is having less control?	05:53
	the proper way is to not move stuff	05:53
	→ AWinterm_ joined	05:53
jarkinox	right	05:53
	so i don't want to do all my editing in the MAMP directories and then have to move to another server	05:54
Remram	you might want a deployment tool to push from your development machine to your production server	05:54
	← vipzrx left	05:54
Remram	do your files have to be in the "MAMP directories"?	05:54
jarkinox	i guess that's what i'm looking for, but not sure what that tool is	05:54
Remram	for MAMP to serve them?	05:54
jarkinox	yes	05:54
Remram	I doubt that	05:54
jarkinox	believe it ;-)	05:55
	→ vipzrx joined	05:55
jarkinox	do files need to be on a server for that server to run them?	05:55
Remram	on the machine? yes	05:55
	but that's it	05:55
	← PaulCapestany left	05:55
	← t-mart left	05:55
iveqy	jarkinox: no? That's what network filesystem is for...	05:55
	→ r0bby joined	05:55
Remram	you wouldn't serve files from a network filesystem	05:55
jarkinox	I mean unless I want to go in and edit config files then i guess not	05:55
	but i don't want to do that	05:56
iveqy	Remram: no, it would be pretty stupid	05:56
	← skorgon left	05:56
	← jjasinski left	05:56
Remram	oh so you want to "setup" stuff but not "edit config files"	05:56
	→ jjasinski joined	05:56
jarkinox	at this moment in time	05:56
	eventually	05:56
	i can't drink from a firehose	05:56
iveqy	jarkinox: you want your .git-dir in you htdocs dir in your case. You do not want to have to commit each time you want to see how something looks	05:56
	← iron_hou1 left	05:56
	→ wanglong joined	05:56
	← kermit left	05:57
	← robbyoconnor left	05:57
Remram	you're going the wrong way knowingly	05:57
	we can help you with that, but can't make it the right way	05:57
	← jetech left	05:57
	→ t-mart joined	05:57
Remram	you really should have your development server serve your development files	05:57
	← pencilcheck left	05:57
	← wting left	05:57
jarkinox	i'm going the wrong way? how?	05:57
	all i've got is my local machine	05:58
Remram	yes	05:58
	have it serve the files	05:58
	← salamanderrake left	05:58
	→ wting joined	05:58
jarkinox	you're saying i should configure MAMP to serve the files where they currently are?	05:58
Remram	yes	05:58
	← pretty_function left	05:58
	→ iron_hou1 joined	05:58
	→ salamanderrake joined	05:59
	→ devoldmx_ joined	05:59
	← AWinterman left	05:59
	→ pretty_function joined	05:59
	→ daanavitch joined	06:00
jarkinox	ok	06:02
	→ dsdeiz joined	06:02
	→ Sigma joined	06:03
	← fluxbox_ left	06:03
	→ jetech joined	06:03
	→ aberrant joined	06:04
	→ mitz_ joined	06:05
	→ papegaaij joined	06:05
	→ pantsman joined	06:06
	→ fluxbox_ joined	06:07
	← madewokherd left	06:07
	→ skorgon joined	06:08
	→ rath joined	06:09
	r04r\|away → r04r	06:09
	→ avinashrbhat joined	06:10
	← avinashrbhat left	06:10
	→ hoyang joined	06:10
	← konundra left	06:11
	← uidzer0 left	06:11
	→ _iron joined	06:11
	← dreiss left	06:12
	→ beneggett joined	06:13
	runningskull → zz_runningskull	06:14
	← fluxbox_ left	06:15
	→ soee joined	06:15
	→ fluxbox_ joined	06:16
	→ threesome joined	06:16
	← jetech left	06:17
	→ jetech joined	06:17
	→ kcj joined	06:17
	→ cbreak-work joined	06:18
	← v0n left	06:18
	→ j0ran joined	06:18
	← mckendricks left	06:19
	← skorgon left	06:19
	→ fragje joined	06:21
	→ mckendricks joined	06:21
	→ lb1a joined	06:23
	← lb1a left	06:23
	→ lb1a joined	06:23
	← pantsman left	06:24
	→ Lyn joined	06:26
	← longbeach left	06:26
	← Davey left	06:26
	→ skorgon joined	06:26
	→ AWinterman joined	06:26
	← simesy left	06:27
	→ fRAiLtY- joined	06:28
	→ netiul joined	06:28
	→ simesy joined	06:28
	← foozle left	06:28
	→ jackdempsey joined	06:29
	→ Reuzenwolf joined	06:30
	← zbcm left	06:30
	← jceb_ left	06:30
	→ rob_w joined	06:31
	→ VoidAtValhalla joined	06:32
	→ _goTAN joined	06:33
	→ w0ng joined	06:33
	→ Jackneill joined	06:34
	← Jackneill left	06:34
	→ Jackneill joined	06:34
	→ boblu joined	06:34
	→ samuel02 joined	06:35
	← yshh left	06:35
	← Reuzenwolf left	06:36
	← AWinterman left	06:36
	← comps left	06:36
	← skorgon left	06:37
	→ bombsitee joined	06:37
bombsitee	hey	06:37
gitinfo	bombsitee: 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.	06:37
bombsitee	cherry pick	06:37
	→ rickruby joined	06:37
Wulf	bombsitee: is that your favourite git command?	06:38
	← Bassam left	06:38
	r04r → r04r\|away	06:38
bombsitee	:( trying to figure out how it works	06:38
	→ rudak joined	06:38
iveqy	bombsitee: man git cherry-pick	06:38
gitinfo	bombsitee: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html	06:38
bombsitee	man grep	06:39
	man git reset	06:39
gitinfo	the git-reset manpage is available at http://jk.gs/git-reset.html	06:39
	← fluxbox_ left	06:39
	→ suy_ joined	06:39
iveqy	those commands also work in your terminal...	06:39
bombsitee	My home laptop is in windows :D	06:40
	and I'm off work til monday	06:40
iveqy	bombsitee: doesnt msysgit come with manpages?	06:41
	← Jackneill left	06:41
	← Sigma left	06:43
Nevik	iveqy: it does, though in html format	06:43
	i think it doesnt bring the "man" command, so you have to go "git <subcommand> --help"	06:43
	→ sr78ger joined	06:43
	→ FreezingCold joined	06:44
buzzybron	how can i undo a git reset --soft	06:44
EugeneKay	C:\Program Files (x86)\Git\doc\git\html\	06:44
	Present in both .html and .txt formats	06:45
buzzybron	and what does git reset --soft does anyway? i know changes are left alone right	06:45
EugeneKay	!resets	06:45
gitinfo	tl;dr of man git-reset: --soft moves HEAD, --mixed moves HEAD+index, --hard moves HEAD+index+work-tree, -- foo.txt will !unstage	06:45
EugeneKay	Consult the !reflog to find out where you reset'ed from, then reset --soft back there	06:45
gitinfo	The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	06:45
	← whowantstolivefo left	06:46
	← bombsitee left	06:46
	← j416 left	06:47
	← beautifulmind left	06:47
	→ simesy_ joined	06:48
	← simesy left	06:48
	→ jnavila joined	06:49
	← diegoviola left	06:49
	→ skorgon joined	06:50
	→ j416 joined	06:50
	← jackdempsey left	06:50
	→ ayaz joined	06:50
	← rchavik left	06:50
	→ pduin joined	06:51
	← hesco left	06:51
	← St_Marx left	06:52
	← AWinterm_ left	06:52
	← Rix left	06:53
	→ vorsorken joined	06:53
	← nilg left	06:54
	→ nilg` joined	06:54
	→ Bassam joined	06:55
buzzybron	hmm what if i did a > git reset HEAD@{1}	06:55
	← suy_ left	06:55
EugeneKay	Should work.	06:56
	I think :-p	06:56
	← threesome left	06:56
	→ vedant joined	06:57
	→ jackdempsey joined	06:58
	← skorgon left	07:00
	→ yshh joined	07:01
buzzybron	so wait soft reset just roll back 1 commit?	07:01
	nkambo → nkambo-afk	07:02
	→ harobed_ joined	07:02
	→ AWinterman joined	07:02
	← thiago left	07:04
	→ pen joined	07:05
	→ skorgon joined	07:05
	← alunduil left	07:05
	← el3ctron_ left	07:06
	→ mishok13 joined	07:06
	← aberrant left	07:07
	→ exoon joined	07:08
	← exoon left	07:09
	← jackdempsey left	07:10
	nkambo-afk → nkambo	07:11
	← AWinterman left	07:12
	← iliketurtles left	07:12
	→ jceb joined	07:12
	→ Sigma joined	07:13
	→ bvi joined	07:13
	← Sigma left	07:14
	→ Sigma joined	07:15
	→ danishkhan joined	07:15
	← cheater__ left	07:15
	→ psoo joined	07:15
	← leeN left	07:16
	← skorgon left	07:17
	→ danishkh_ joined	07:17
	← devoldmx_ left	07:17
	← bvi left	07:20
	← danishkhan left	07:20
	← heroux left	07:21
	→ skorgon joined	07:22
	→ pantsman joined	07:22
	← pantsman left	07:22
	→ pantsman joined	07:22
	→ heroux joined	07:23
	→ AWinterman joined	07:23
	← jefflyne left	07:23
	← danishkh_ left	07:23
	zz_runningskull → runningskull	07:24
	→ Reuzenwolf joined	07:24
	→ Bartzy joined	07:25
	→ Balliad joined	07:26
	← jeremyheiler left	07:26
	→ alorence joined	07:27
	← bacilla left	07:27
	→ Balliad_ joined	07:28
jast	RichiH: fixed	07:28
	runningskull → zz_runningskull	07:28
	→ introom joined	07:29
	→ metts joined	07:29
	← Reuzenwolf left	07:30
	← Balliad left	07:30
	← axis_ left	07:30
	← psoo left	07:31
	→ psoo joined	07:31
	← AWinterman left	07:32
	→ Plummer joined	07:33
	r0bby → robbyoconnor	07:33
	r04r\|away → r04r	07:34
	← metts left	07:34
	← pantsman left	07:36
	→ danicampa901 joined	07:36
	← Bassam left	07:36
	→ zbcm joined	07:37
	← jarkinox left	07:38
	← yacks left	07:38
	→ alkino joined	07:38
	→ AWinterman joined	07:39
	→ fluxbox joined	07:39
	→ metts joined	07:41
	→ hoschi joined	07:42
	→ yacks joined	07:43
	← beneggett left	07:45
	→ threesome joined	07:45
	← AWinterman left	07:48
	→ YoMomma joined	07:50
	→ franckbenoit joined	07:52
	← rickruby left	07:54
	→ axis_ joined	07:55
	← metts left	07:56
iveqy	buzzybron: no... it rolls back to where you specify, and it doesn't roll back the index or work tree	07:57
	→ iliketurtles joined	07:58
	→ Asenar joined	07:58
	→ LimeBlast joined	08:01
	nkambo → nkambo-afk	08:03
	→ eijk joined	08:04
	→ cheater__ joined	08:04
	← fragje left	08:04
	→ onats joined	08:05
	→ fragje joined	08:05
	→ babilen joined	08:05
	← babilen_ left	08:06
	→ vigintas joined	08:08
	→ Joost joined	08:09
	→ Kad-- joined	08:09
	← YoungFrog left	08:10
	→ Bassam joined	08:11
	← RobertLaptop left	08:12
	← amirite left	08:12
	← jetech left	08:13
	← sect0r left	08:13
	→ amirite joined	08:13
	← Pengoo left	08:14
	→ ichoyjx joined	08:14
	→ elixir_ joined	08:14
	gitinfo set mode: +v	08:15
	→ AWinterman joined	08:15
	← harish left	08:15
	← shentino left	08:16
	→ Pengoo joined	08:17
	← amirite left	08:18
	→ _Qman joined	08:18
	→ amirite joined	08:18
	→ RobertLaptop joined	08:20
	→ sect0r joined	08:21
	nkambo-afk → nkambo	08:22
	→ charliesome joined	08:23
	← iliketurtles left	08:23
	→ tatsuya_o joined	08:23
	→ iliketurtles joined	08:23
	← AWinterman left	08:24
	→ YoungFrog joined	08:25
	← Bassam left	08:27
	← bigkm left	08:28
	← span left	08:28
	→ endiruna joined	08:28
	→ PaulCapestany joined	08:31
	← ferdev left	08:32
	← pen left	08:33
	→ oscarvarto joined	08:33
	→ imanc joined	08:33
	← Balliad_ left	08:34
imanc	how does someone create a situation where git is saying "non fast forward rejected" using only basic commands - git pull, git push, git commit, git add ?	08:34
	← noneo1 left	08:35
dr_lepper	git commit --amend	08:35
	(for example)	08:35
luto	or just create a conflict using two clients	08:35
	or clones	08:35
imanc	there's a guy in our office who has continual problems with it - and i can't figure out what steps he's taking to cause it. But he only ever uses those commands… w	08:36
dr_lepper	or git push HEAD^:master	08:36
	the possibilities are endless	08:36
	← scrollback left	08:36
dr_lepper	imanc: sit with him and watch	08:36
	→ franckbe` joined	08:36
	→ scrollback joined	08:36
dr_lepper	or ask for a shell transcript	08:37
imanc	yeh, i'm goign to have to … before he has a mental breakdown	08:37
luto	imanc: does he pull before he pushes?	08:37
fairuz	maybe he's pulling without --rebase	08:37
	Which can cause a merge	08:37
	→ noname001 joined	08:37
	← franckbenoit left	08:38
	→ tvale joined	08:38
imanc	luto: yes, i think he always pulls before pushes	08:38
	he won't be using any swtiches … apart from -am on the commit	08:38
	→ kermit joined	08:38
imanc	e.g. h'ell be doing git commit -am, git pull, git push	08:39
	then boom non fastforward..	08:39
	→ tvw joined	08:39
imanc	then lots of shouting and keyboard slamming	08:39
	→ Bassam joined	08:40
	→ chuck8 joined	08:40
imanc	soooo… likely a git pull —rebase would have sorted it	08:41
	→ OOPMan joined	08:42
	→ danishkhan joined	08:42
	→ Balliad joined	08:43
	← Balliad left	08:43
	→ SergeyPenkin joined	08:43
	→ Balliad joined	08:43
	← Balliad left	08:43
	→ Balliad joined	08:44
	→ zacts joined	08:46
	← danishkhan left	08:47
	→ marhaban joined	08:47
	← PaulCapestany left	08:48
	→ Raging_Hog joined	08:49
	→ AlbireoX joined	08:49
	r04r → r04r\|away	08:49
	→ noneo joined	08:50
	← iliketurtles left	08:50
	→ dharrigan joined	08:50
	← dharrigan left	08:50
	→ dharrigan joined	08:50
	→ cedeon joined	08:50
	→ harish joined	08:51
	→ AWinterman joined	08:51
	→ ferdev joined	08:52
	→ mikewintermute joined	08:53
	→ mklappstuhl joined	08:54
	→ pen joined	08:54
	← pen left	08:54
	← oscarvarto left	08:55
	← ferdev left	08:55
	← echo-area left	08:55
	→ pen joined	08:55
	← _iron left	08:55
	→ echo-area joined	08:56
	→ setmeaway2 joined	08:57
	→ kewah joined	08:58
charon	imanc: are you sure that a) it's about the branch he's pushing (push by default pushes all sorts of things, see push.default in git-config(1)) and b) that he's pulling from the same branch as he's pushing to (again, push.default, but also see branch.<name>.merge)	08:58
	→ rchavik joined	08:59
	→ kesha_ joined	08:59
	← kesha_ left	08:59
imanc	he checked out the branch with git checkout -b localbranchname origin/remotebranchname … maybe it's not tracking correctly	08:59
	← donmichelangelo left	09:00
	→ Piggy_ joined	09:00
charon	my point is that push.default=matching by default, which means it matches them up by name on push, but by tracking config on pull	09:00
	so they may be different	09:00
	→ _iron joined	09:00
imanc	got it	09:00
	well we have local branch sp6, remote branch sp6_it1_dev … so this probably explains it	09:00
	→ donmichelangelo joined	09:01
	← AWinterman left	09:01
	← YoMomma left	09:01
	← rurufufuss left	09:02
	→ crane_work joined	09:04
	→ pdx joined	09:05
	← simesy_ left	09:06
	← deckTrout left	09:07
	← yshh left	09:07
	← nafg_ left	09:08
	← rackesis left	09:10
	← pen left	09:12
	→ ShiningThrough joined	09:13
	→ pen joined	09:13
	→ avinashrbhat joined	09:14
	← avinashrbhat left	09:14
	← dsdeiz left	09:14
	→ dsdeiz joined	09:15
	→ rurufufuss joined	09:15
	→ deuterium joined	09:15
	→ ntus1017 joined	09:16
	← Raging_Hog left	09:17
imanc	git config push.default is empty	09:18
	← onats left	09:19
charon	that means it is at the default (matching)	09:19
	← amirite left	09:19
	→ GarethAdams joined	09:19
	→ Wh1plash joined	09:20
	← marhaban left	09:21
	→ CodeShar_ joined	09:23
	→ fairuz1 joined	09:23
	→ FrodoTheHobbit joined	09:24
	→ fRAiLtY-_ joined	09:24
	→ mklappst_ joined	09:24
	→ introom_ joined	09:24
	→ fragje_ joined	09:24
	→ Andre_work joined	09:25
	→ wagle_ joined	09:25
	→ ch3mical joined	09:25
	→ jnavila_ joined	09:25
	→ nilg`` joined	09:25
	→ jefflyne joined	09:25
	→ cehteh_ joined	09:26
	→ onats joined	09:26
	← w0ng left	09:26
	← fairuz1 left	09:26
	← KBme left	09:26
	← Orphis left	09:26
	→ muep joined	09:26
	→ Kuukunen joined	09:27
	→ unreal_ joined	09:27
	→ scelesti1 joined	09:27
	→ sr78ger_ joined	09:27
	→ cbreak-w_ joined	09:27
	→ stack_ joined	09:27
	→ rkunde_ joined	09:27
	→ hyperbor1ean joined	09:27
	← sr78ger_ left	09:27
	→ Kwpolska_ joined	09:27
	→ colona_ joined	09:27
	← alorence left	09:28
	→ Someguy1234 joined	09:28
	→ AWinterman joined	09:28
imanc	is there a way to find out what remote branch a local branch is tracking?	09:29
	→ pkrzywicki joined	09:29
	← curvedmark left	09:30
Sp4rKy	git branch -vv	09:30
	→ alorence joined	09:30
	→ dsdeiz_ joined	09:30
	← ebouchut left	09:30
	→ crazed- joined	09:30
	→ Devels_ joined	09:30
	→ Pio` joined	09:31
	→ nanashiRei joined	09:31
	← fluxbox left	09:31
	← onats left	09:31
	← mklappstuhl left	09:32
	← noname001 left	09:32
	← Pengoo left	09:32
	← fragje left	09:32
	← threesome left	09:32
	← introom left	09:32
	← nilg` left	09:32
	← jnavila left	09:32
	← sr78ger left	09:32
	← fRAiLtY- left	09:32
	← cbreak-work left	09:32
	← unreal left	09:32
	← FrodoTheHobbit1 left	09:32
	← fairuz left	09:32
	← CodeShark left	09:32
	← Vampire0_ left	09:32
	← Khisanth left	09:32
	← Pio left	09:32
	← else- left	09:32
	← zmo left	09:32
	← jstemmer left	09:32
	← shadok left	09:32
	← chrisirc left	09:32
	← Kwpolska left	09:32
	← cehteh left	09:32
	← Devels left	09:32
	← qwertz_ left	09:32
	← hyperboreean left	09:32
	← stack left	09:32
	← tchan left	09:32
	← murr4y left	09:32
	← therealklanni left	09:32
	← wagle left	09:32
	← rkunde left	09:32
	← scelestic left	09:32
	← osse left	09:32
	← nanashiReii left	09:32
	← AndreSomers left	09:32
	← sjohnson left	09:32
	← Kuukunen- left	09:32
	← muep_ left	09:32
	← crazedpsyc left	09:32
	← Someguy123 left	09:32
	← colona left	09:32
	Someguy1234 → Someguy123	09:32
	→ khushildep joined	09:32
	cbreak-w_ → cbreak-work	09:32
	Devels_ → Devels	09:32
	← Devels left	09:32
	→ Devels joined	09:32
	→ jatt joined	09:32
	→ saurabh joined	09:32
	← dsdeiz left	09:33
	← cheater__ left	09:33
	← crazed- left	09:33
	→ knite joined	09:33
	fRAiLtY-_ → fRAiLtY-	09:33
	→ crazedpsyc joined	09:33
	← FreezingCold left	09:34
	← sh4rm4 left	09:34
	→ St_Marx joined	09:34
	→ sh4rm4 joined	09:35
	→ swair joined	09:37
	← AWinterman left	09:38
	→ chrisirc joined	09:38
	→ qwertz_ joined	09:38
	→ else- joined	09:38
	→ osse joined	09:38
	→ Vampire0_ joined	09:38
	→ murr4y joined	09:39
	← p3lim left	09:39
	→ threesome joined	09:39
	→ Pengoo joined	09:39
	→ sjohnson joined	09:39
	→ tchan joined	09:40
	→ cheater__ joined	09:40
	← ShiningThrough left	09:40
	→ Khisanth joined	09:41
	← mckendricks left	09:41
	← Bassam left	09:41
	→ pen9u1n joined	09:43
	→ ebouchut joined	09:44
	→ Dr3amc0d3r_ joined	09:46
	→ nilg``` joined	09:46
	→ h0bbit joined	09:47
	← nilg`` left	09:47
	← h0bbit left	09:48
	← vedant left	09:48
	← rasto left	09:49
	→ j`ey joined	09:49
	→ Kakera joined	09:49
	← franckbe` left	09:50
	← babilen left	09:51
	→ curvedmark joined	09:51
	Dr3amc0d3r_ → Dr3amc0d3r	09:51
	← curvedmark left	09:51
buzzybron	meh	09:51
	→ Industrial joined	09:51
Industrial	git push pushes all branches right? Can I get an overview of things to be pushed?	09:52
	→ p3lim joined	09:52
Industrial	(I'd really like it if only the currently checked out branch would be pushed, and I didnt have to specify the name of the branch nor the name of the remote)	09:52
buzzybron	when i switch branches, i often get new files that are there which are not added in to git, why is that so? i've checked, these are not generated by codes or anything	09:52
_ikke_	Industrial: It depends on a setting called push.default	09:52
buzzybron	Industrial : you want to push only current branch?	09:52
	→ babilen joined	09:52
Industrial	yes	09:53
buzzybron	you can actually specify right?	09:53
_ikke_	Industrial: git config --global push.default simple	09:53
Industrial	ty	09:53
	I'll take a look at the rest of the options before asking again :X	09:53
_ikke_	man git config	09:54
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	09:54
	→ h0bbit joined	09:55
GarethAdams	just noticed my push.default is set to `tracking` but that's not listed in the config options	09:55
	← juanmabc left	09:56
	← deuterium left	09:56
	→ deckTrout joined	09:57
jast	GarethAdams: "(tracking is a deprecated synonym for this)"	09:57
buzzybron	when i switch branches, i sometimes get new files that are there which are not added in to git, why is that so? i've checked, these are not generated by codes or anything	09:57
	← introom_ left	09:58
	→ sr78ger joined	09:58
charon	buzzybron: can you !repro a concrete example of this?	09:59
gitinfo	buzzybron: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	09:59
	← harobed_ left	09:59
GarethAdams	jast: I think I need to upgrade, I don't have that notice :)	09:59
	← h0bbit left	09:59
	→ arvind_khadri joined	10:00
	→ beautifulmind joined	10:00
	← knite left	10:00
	→ \|Freeman\| joined	10:01
	→ h0bbit joined	10:01
	← alorence left	10:02
	→ vedant joined	10:02
	← babilen left	10:03
	→ leehambley joined	10:04
	→ AWinterman joined	10:04
	→ franckbe` joined	10:05
	→ Thra11 joined	10:06
	→ BitPuffin joined	10:06
	← pen left	10:06
	franckbe` → franckbenoit	10:06
	→ pen joined	10:07
	← ntus1017 left	10:08
	→ ferdev joined	10:08
	← rudak left	10:09
	→ rudak joined	10:10
	→ Artpicre joined	10:12
	← AWinterman left	10:13
	→ PigeonFriend joined	10:14
	→ Mikicacarica joined	10:15
	→ rking1 joined	10:15
	← rking1 left	10:15
Mikicacarica	FREE BRAZZERS ACCOUNTS EVERYDAY HERE ---> http://gratisbrazzers.blogspot.com	10:16
	← Mikicacarica left	10:16
	→ chichou joined	10:17
	← zoresvit left	10:19
	→ armin_w joined	10:19
	← pen left	10:20
	← vkz left	10:20
	→ shadok joined	10:20
	← shadok left	10:20
	→ shadok joined	10:20
	→ tsdh joined	10:20
	→ zoresvit joined	10:22
	→ siprbaum joined	10:22
	→ the_cybersphinx joined	10:22
	→ Spikyvins joined	10:22
Spikyvins	hello	10:22
	I need to merge files, but can't understand how it works...	10:22
	→ introom joined	10:23
	← kewah left	10:23
iveqy	Spikyvins: you don't merge files, you merge commits, that's at least the way git want you to think about it	10:23
	Spikyvins: so what's your problem?	10:23
	← harish left	10:24
	→ v0n joined	10:24
Spikyvins	hum...	10:24
	first, I don't understand the difference between checkout master, and checout origin	10:25
	← fragje_ left	10:25
	→ deuterium joined	10:26
Spikyvins	then, I don't understand, if I commit the changes would affect the remote version	10:26
	← jefflyne left	10:27
_ikke_	Spikyvins: origin is not a branch, it's a remote (a name for another repository)	10:27
	Spikyvins: And comitting is a local operation	10:27
	Only when you push branches a remote repository will be affected	10:28
	→ axrfnu joined	10:28
	gitinfo set mode: +v	10:29
Spikyvins	so now, I want to keep my persion without pushing it	10:29
	is it git stash ?	10:30
	← eijk left	10:30
	→ RonScagz joined	10:30
	← echo-area left	10:31
iveqy	what's a persion?	10:31
_ikke_	versio I guess ;-)	10:31
	← chuck8 left	10:31
_ikke_	version*	10:31
iveqy	oh okay =)	10:32
	thought it was a new hype or something	10:32
	Spikyvins: commit your changes	10:32
imanc	why would i rebase over merge when fetching?	10:32
	→ babilen joined	10:33
	← kadmos left	10:33
	→ kadmos joined	10:33
sonOfRa	!rebase	10:33
gitinfo	[!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia	10:33
iveqy	imanc: I don't know, depends on your workflow	10:33
_ikke_	imanc: A matter of style	10:33
	← yuwang left	10:34
	→ hwrd\|work joined	10:34
imanc	thanks	10:34
_ikke_	imanc: If you are on a feature branch, and the only thing you want to do is to get the latest updates, using merge would create lots of unnecessary merge commits	10:35
	scelesti1 → scelestic	10:36
	← scelestic left	10:36
	→ scelestic joined	10:36
	→ w0ng joined	10:37
	← h0bbit left	10:37
	← VoidAtValhalla left	10:38
Spikyvins	I tried :p	10:39
imanc	_ikke_: got it. So the saner option is to use rebase. If you've edited your local repo and you want to pull changes and merge, then there's a legitimate merge operation needed there - so would git merge be the correct course of action or can rebase also manage the merge?	10:39
	← stliu left	10:39
_ikke_	imanc: Both tools can be used, it totally depends on how you want the end result to look	10:40
	→ eijk joined	10:40
imanc	'k.. i'm going to digest this document	10:40
	→ h0bbit joined	10:40
	→ fragje joined	10:40
imanc	i fee like i'm on the verge of knowing what the f*** is going on	10:40
alexander__b	what do I need to do when git push --force doesn't work?	10:40
	→ dkpi joined	10:40
alexander__b	remote: error: denying non-fast-forward refs/heads/master (you should pull first)	10:40
imanc	alexander__b: git pull?	10:41
_ikke_	alexander__b: Why do you want to push --force?	10:41
	alexander__b: The remote has disabled it	10:41
alexander__b	_ikke_: I want to change history.	10:41
_ikke_	alexander__b: You can't	10:41
	→ AWinterman joined	10:41
alexander__b	_ikke_: I am the one who set up the remote, so I can't change it back.	10:41
imanc	alexander__b: git branch -vv check that yoru local branch is correctly tracking the remote branch	10:41
alexander__b	imanc: pushing regularly works fine. the branch is OK.	10:41
_ikke_	alexander__b: have you setup denyNonFastForwards?	10:41
alexander__b	what I have done is do some stuff, commit it, rebase to move it between two commits on the server I want to push to, squash the new commit into one of those, then try to push.	10:42
	_ikke_: IDR. I'll check	10:42
	zz_runningskull → runningskull	10:43
alexander__b	_ikke_: yep. should I just put it to false (and back again) in config, or should I use git --something to do it?	10:43
imanc	https://coderwall.com/p/ny1hia	10:43
	wrong window	10:43
iveqy	alexander__b: doesn't matter	10:43
	alexander__b: however !public	10:43
gitinfo	alexander__b: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to). If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	10:43
alexander__b	iveqy: ok cool	10:43
	iveqy: yes yes yes I know this relax :-P	10:43
	I know #git is required to give that lecture to everyone though. you probably should too.	10:44
iveqy	alexander__b: good =). There's a huge difference about knowledge in here, so I just assume that everyone is stupid :)	10:44
alexander__b	iveqy: that's the only sane goto method for the Internet	10:44
iveqy	alexander__b: yeah, unfortunately. Does it work for you now?	10:45
alexander__b	iveqy: yep. should have checked this myself. sorry. :-)	10:45
Spikyvins	thanks ! bye	10:45
	← Spikyvins left	10:45
	← Wh1plash left	10:45
_ikke_	alexander__b: We are not required to do that, we just want to prevent people from coming back and asking us how to clean up the mess	10:46
	r04r\|away → r04r	10:46
alexander__b	_ikke_: I meant "required".	10:46
	→ amjam joined	10:46
	← j`ey left	10:46
alexander__b	_ikke_: and I have worked with people who have force pushed to a public repo, so I highly value people in here spamming newbs with that note.	10:46
	← k_sze[work] left	10:47
alexander__b	might prevent me from going through that stuff in the future. ;-)	10:47
	← ichoyjx left	10:47
	→ harobed_ joined	10:47
	runningskull → zz_runningskull	10:48
_ikke_	That's why you setup the denyNonFF?	10:49
alexander__b	_ikke_: probably. then I forgot about it. which is admittedly a bit embarrassing, hehe.	10:49
	I almost don't let the guys on my current team commit at all though. I just tell them to send me patches.	10:50
_ikke_	lol	10:50
	← AWinterman left	10:50
alexander__b	but then, one time, ONE time, I let my judgment slip, and think that "yes, this is probably OK, the patch is so small, how can they possibly f the program up?" then I push and go to lunch. then I get back from lunch... "oh... like that..."	10:51
	← amjam left	10:51
	← rurufufuss left	10:51
	← kadmos left	10:51
	→ kadmos joined	10:51
alexander__b	lesson: code reviews can never be strict enough.	10:51
	→ Rix joined	10:51
	← harobed_ left	10:51
_ikke_	Doesn't that create a big bottleneck on you	10:53
	?	10:53
	← luc__ left	10:53
	→ ozette joined	10:53
alexander__b	_ikke_: it's a tiny team, so not really. and I already spend half the day fixing their code, so it's better than me spending all my day fixing their code and broken commits. :-P	10:53
	→ _BJFreeman joined	10:53
_ikke_	whaha	10:53
	_BJFreeman → BJfreeman	10:54
	← lifelike left	10:54
	→ jalmeida joined	10:54
iveqy	alexander__b: fixing? Comment and send back for fixing? ;)	10:54
imanc	what is a "local feature branch" - is it just a branch that is not tracking something on a remote server?	10:56
iveqy	imanc: yes	10:56
imanc	great	10:56
	← leehambley left	10:57
alexander__b	imanc: if I had a team of competent/experienced programmers, then yes.	10:59
	imanc: what I do with bigger projects of which I am a maintainer is usually just say "no". if the patch is important, maybe "no. because:...". :-P	11:00
	→ freestyl3r joined	11:00
iveqy	alexander__b: but letting noobs fix their own errors is a way to make them become gurus	11:00
	oh okay	11:00
alexander__b	iveqy: not when you have six months of work and three weeks to do it :-P	11:01
imanc	you should see some of the git rants that have occured in this office… keyboard smashing and shouting	11:01
	← jalmeida left	11:01
imanc	and pleading for svn	11:01
alexander__b	haha	11:01
	→ lifelike joined	11:01
alexander__b	people whine and bitch about git a lot here too. then I walk up to their desk and do a line or two, and then it works. seriously, git is not only simple -- it's fun.	11:01
imanc	ha ha	11:01
iveqy	alexander__b: I feel sorry that your company have such short term goals, but I guess it's pretty common	11:02
imanc	i've just succeeded to using hte basics but with a sense of fear becuase I know I can head down an avenue I can't get out of easily. So I've decided to get my git-foo in order and resolve the underlying anxiety of things going wron	11:02
	→ kewah joined	11:04
	← mklappst_ left	11:04
alexander__b	iveqy: working with interns	11:04
	imanc: in my experience, it's really hard to f up git. worst case scenario is you lose work. worst case scenario with some other VCSs is you f up for everyone.	11:05
	→ chuck8 joined	11:06
	← joeytwiddle_ left	11:06
	← pretty_function left	11:09
	→ pretty_function joined	11:11
	← yacks left	11:12
	→ LuxuryMode joined	11:13
	← BJfreeman left	11:13
	erkules_ → erkules	11:14
	← elixir_ left	11:15
	← LuxuryMode left	11:15
	→ elixir_ joined	11:16
iveqy	alexander__b: oh. congrats =)	11:17
	→ spaceonline joined	11:17
	→ AWinterman joined	11:18
alexander__b	iveqy: I'm a full time student, so I only really work summers (some odd hours here and there when not studying), so I wasn't exactly surprised to be put on a team of summer interns, heh.	11:18
	→ Peaker joined	11:19
Peaker	is there a way to tell git that a bunch of historic commits should be skipped for bisect purposes, because they were broken states?	11:19
cheater__	hi guys	11:20
	hyperbor1ean → hyperboreean	11:20
cheater__	Peaker: i believe bisect has a hook which can do that, but i don't remember details, sorry	11:20
	can anyone tell me why doing git log some/file.jpg would show nothing, but "git status" shows "working directory clean" and doesn't show this file as unknown or added?	11:21
alexander__b	cheater__: is it in .gitignore?	11:22
cheater__	nope, gitignore only contains the line ".idea/**"	11:22
	looks like someone's been using non-free software	11:22
	→ rurufufuss joined	11:23
	← sr78ger left	11:23
_ikke_	cheater__: is the file actually there?	11:23
alexander__b	is the file in .idea/?	11:23
jast	:)	11:23
cheater__	yes ikke	11:23
	alexander no	11:23
	it's in some/file.jpg	11:23
jast	does some/ contain a .gitignore?	11:23
alexander__b	cheater__: is it in ./some/file.jpg?	11:23
	cheater__: is there a ./.gitignore?	11:23
cheater__	ahh yes	11:23
alexander__b	oh, jast covered that, heh	11:23
cheater__	it does	11:23
	there we go, that answers my questions	11:24
	thanks guys! you're great	11:24
	← jnavila_ left	11:24
	← mikewintermute left	11:26
cheater__	hmm. now i'm trying to use git ls-files -i to find all gitignored files, but that's failing.	11:27
	this shows no output, even though the files are in .gitignore: git ls-files --others -i --exclude-from=.gitignore --exclude-per-directory=.gitignore	11:27
	← AWinterman left	11:28
	← freestyl3r left	11:29
cheater__	git ls-files --others works though :)	11:30
jast	cheater__: --exclude-standard btw	11:30
	and you'll probably want -o -i	11:31
	→ freestyl3r joined	11:32
	← tatsuya_o left	11:34
	← krsree left	11:34
	→ maddenwg joined	11:35
	← DNS left	11:35
	→ g41n joined	11:37
cheater__	jast: well, -o -i says it needs an exclude pattern	11:37
	-o -i --exclude-standard produces no output	11:37
g41n	hi all, I've done a commit in a wrong branch... how can I "move" it to the right branch=	11:38
	?	11:38
luto	cherry-pick on new branch and reset on old branch	11:38
	oh and: did you push that already?	11:38
	← zbcm left	11:38
	← sect0r left	11:38
g41n	luto: not yet	11:38
luto	then it's all good. Don' re-write history once you pushed unless :)	11:39
g41n	luto: dunno what cerry-pick is... :(	11:39
	→ mikewintermute joined	11:39
_ikke_	man git cherry-pick	11:39
gitinfo	the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html	11:39
luto	and that!	11:39
	→ Reuzenwolf joined	11:40
	→ nardev joined	11:40
	→ netsroht joined	11:40
g41n	luto: cool, thanks	11:41
	← mikewintermute left	11:41
g41n	_ikke_: thanks 2 u too	11:41
Industrial	Where do I look for automatic bash completion of git command arguments, branch names, etc?	11:42
	→ harobed_ joined	11:42
_ikke_	What shell?	11:43
canton7	Industrial, if you installed git from a package, the package probably put it in /etc/git-completion.bash or so	11:43
	→ Kingsy joined	11:43
g41n	Industrial: a friend of mine suggested this link, but I haven't read it yet http://cakebaker.42dh.com/2011/04/06/bash-autocompletion-for-git/	11:43
Kingsy	guys, I have just done chmod -R 777 * on my working git dir. so it says every file in my project has been modified. I have not committed the branch yet or even staged them. how do I roll back the chmod ?	11:44
	→ devoldmx_ joined	11:44
iveqy	Kingsy: you can't roll back a chmod	11:44
Kingsy	I did the chmod by mistake btw :P	11:44
	you cant? damn	11:45
iveqy	Kingsy: you can do a git reset --hard HEAD that will replace all files in you working dir	11:45
	(all tracked files that is9	11:45
	→ angelsl joined	11:45
	← harobed_ left	11:45
iveqy	)	11:45
canton7	or you can undo changes on a per-file basis, see the output of 'git status'	11:45
Kingsy	perfect thats exactly what I wanted.	11:45
	rohan32\|afk → rohan32	11:46
canton7	Kingsy, be aware that git only tracks the executable bit, so that's the only bit it'll be able to restore	11:46
iveqy	or you can git add those files you want to commit, commit them and then do a reset --hard	11:46
	← hwrd\|work left	11:46
	← mishok13 left	11:46
	→ tatsuya_o joined	11:46
jast	reset --hard destroys changes in the file contents, too	11:46
Industrial	_ikke_: bash	11:47
Kingsy	yeah its fine. the last commit was all good	11:47
Industrial	canton7: didnf install anything	11:47
canton7	Industrial, where did you get git from?	11:48
Kingsy	also, how do you stop tracking of certain files? the reason I ask is I don't want to delete thefiles, just stop tracking them	11:48
	I am sure last time I tried it the files got deleted somehow	11:48
jast	git rm --cached	11:49
iveqy	Kingsy: git rm --cached	11:49
Industrial	canton7: archlinux repos :)	11:49
	← jatt left	11:49
Industrial	0.8.3.2	11:49
	← devoldmx_ left	11:49
Kingsy	iveqy: git rm --cached <file> ?	11:49
iveqy	Kingsy: yes	11:49
	Kingsy: but !backup and man git rm	11:49
gitinfo	Kingsy: the git-rm manpage is available at http://jk.gs/git-rm.html	11:49
	Kingsy: 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	11:49
	→ harobed joined	11:49
	← cenuij left	11:49
	→ zer0l1nk joined	11:49
	← devoldmx left	11:49
	→ ffio_ joined	11:50
	← ffio left	11:50
zer0l1nk	/msg gitinfo .voice	11:51
	hi	11:51
_ikke_	!hi	11:51
gitinfo	[!welcome] Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.	11:51
canton7	Industrial, pacman -S git? then it was installed by you :) it's in /usr/share/git/completion	11:52
	→ jnavila joined	11:52
Industrial	canton7: ah tyvm	11:53
zer0l1nk	quick question did a git reset 34k23f to revert back some file changes and I want to get back to the state I was before running the git reset command	11:53
	have I lost my previous "HEAD" state ?	11:53
_ikke_	zer0l1nk: Nope	11:53
iveqy	zer0l1nk: is it's lost, but you can find it again	11:54
	look at rev-list	11:54
	!rev-list	11:54
	=(	11:54
canton7	!reflog	11:54
gitinfo	The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	11:54
_ikke_	rev-list is something else	11:54
iveqy	my fault, I mixed up	11:54
alexander__b	reflog is a saviour at times.	11:54
_ikke_	git reset HEAD@{-1}	11:54
	← Industrial left	11:54
iveqy	no wonder there wasn't a !rev-list	11:54
_ikke_	man git rev-list	11:54
gitinfo	the git-rev-list manpage is available at http://jk.gs/git-rev-list.html	11:54
_ikke_	;-)	11:54
	→ AWinterman joined	11:55
canton7	(zer0l1nk, if you hadn't gathered, ignore the rev-list stuff ;))	11:55
amcsi_work	Hi, I want to upload the PHP files that have changed since the last time production was updated. How do I copy a list of git diff --name-only files into a directory, keeping the directory structure, or even better, to tar.gz it keeping the directory structures?	11:55
_ikke_	!deploy	11:55
gitinfo	Git is not a deployment tool, but you can build one around it(in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/the-list-and-irc/deploy.html	11:55
zer0l1nk	so should I go for the git reset HEAD@{-1} command ?	11:55
canton7	git reset HEAD@{1}	11:55
	provided you haven't done anything since the first reset	11:56
	check the output of 'git reflog'	11:56
	to see what you need to reset back to	11:56
alexander__b	zer0l1nk: there are no minuses	11:56
	→ alsu joined	11:56
cheater__	can anyone tell me why --exclude-standard doesn't pick up my ignored files?	11:56
iveqy	amcsi_work: with some shell scripting I suggest	11:56
alexander__b	zer0l1nk: HEAD@{0} is where you are now. HEAD@{1} would be the previous one.	11:56
alsu	git pull spewed a bunch of: warning: packfile /data/repositories/8/nw/83/72/65/1408622/network.git/objects/pack/pack-86824a5889cc7628f10ea174301b2be6648933e7.pack cannot be accessed	11:56
zer0l1nk	is the previous one the one before I run the git reset ?	11:57
iveqy	alsu: a permission error?	11:57
alsu	does that mean anything to anyone? that path name is not related to my machine	11:57
	→ mishok13 joined	11:57
canton7	alsu, permissions errors on the remote repo, on .git/objects or so	11:57
alsu	permission errors on github?	11:57
canton7	that's github?	11:57
	ouc	11:57
	*ouch	11:57
	← maddenwg left	11:57
alsu	so I should file a bug with them?	11:57
canton7	try again in a few minutes	11:58
	then [email@hidden.address]	11:58
amcsi_work	_ikke_: I don't remember saying I want to use git for it. I'm just saying git provides the list of files needed	11:58
alsu	it worked this time	11:58
amcsi_work	btw, I found the answer: cp --parents	11:58
alsu	canton7: you think they still don't want to hear about it even if I can't repro it?	11:58
canton7	alsu, your guess is as good as mine. No harm in mentioning it I suspect	11:59
	← Droolio left	11:59
iveqy	amcsi_work: git diff --name-only HEAD~2 \| while read filename; do cp --parents $filename diff; done	12:00
alexander__b	alsu: just send it if you want to. worst-case scenario is they don't care.	12:00
	← zer0l1nk left	12:00
psofa	when i want to sync with upstream whats the right thing to do: rebase over upstream or merge upstream?	12:00
amcsi_work	thx	12:00
grawity	psofa: Depends.	12:00
	→ amjam joined	12:00
	← vorsorken left	12:00
alexander__b	psofa: depends on so many things.	12:00
canton7	psofa, depends. the overriding rule is not to rebase published history. beyond that it depends on what you want your history to look like	12:00
alexander__b	I typically rebase when there is no concurrent branches that need merging.	12:01
	s/is/are	12:01
	I always do git fetch && git diff origin/master (or whatever) before I do pull at all though.	12:02
canton7	alexander__b, if you're fetching, why not just merge instead of pulling?	12:02
alexander__b	psofa: do you ever push upstream?	12:02
	→ chrob joined	12:02
alexander__b	canton7: well yes. I meant merge. or rebase.	12:02
canton7	cool	12:02
alexander__b	pull is a dangerous shortcut that I sometimes wish didn't exist. sometimes being whenever I have to deal with git newbies.	12:03
	rohan32 → rohan32\|afk	12:03
canton7	alexander__b, there's a lot of support behind the idea of making pull ff-only, then pull --merge and pull --rebase exists to, well, merge and rebase	12:03
alexander__b	canton7: "ff"?	12:04
canton7	fast-forward merge	12:04
	← saurabh left	12:04
alexander__b	ah	12:04
canton7	(a la merge --ff-only, --no-ff, etc)	12:04
	← AWinterman left	12:05
	rohan32\|afk → rohan32	12:06
alexander__b	canton7: I think that if the project is big and there is a lot of development on different things, --no-ff is a must.	12:07
canton7	alexander__b, are you talking about merging feature branches? sure, but that's a different issue	12:07
alexander__b	canton7: I'm just talking about that I think that --no-ff should be default for merge.	12:07
	← endiruna left	12:08
alexander__b	canton7: because in big projects with parallel development I like that. in tiny projects, I prefer rebase and ff merging if necessary.	12:08
canton7	alexander__b, if --no-ff is the default for merge, then 'git merge @{upstream}' instroduces merge commits far more often than it needs to, which is bad	12:08
	*introduces	12:08
alexander__b	I disagree	12:08
	→ mklappstuhl joined	12:09
alexander__b	the clarity it provides by making each feature branch explicit is such an advantage that the "empty commits" disadvantage is not even worth thinking about.	12:09
	→ KevinSjoberg joined	12:09
	← engkur_ left	12:09
canton7	alexander__b, you just said you weren't talking about feature branches specifically	12:09
_ikke_	alexander__b: It depends	12:09
	→ sgambino joined	12:09
canton7	I agree on the feature branch front	12:09
alexander__b	I din't say I wasn't talking about it	12:09
	didn't	12:09
	→ endiruna joined	12:09
canton7	Not on the updating-my-local-branch-with-the-latest-from-upstream front	12:09
alexander__b	but sorry for the confusion.	12:09
	canton7: for that it kind of depends. it's not a workflow I have a lot of experience with.	12:10
	I usually am upstream, heh.	12:10
	→ leehambley joined	12:10
alexander__b	but I set up a drupal workflow for a company. I think they just pull regularly from upstream iirc.	12:10
canton7	alexander__b, first thing in the morning, 'git merge @{upstream}' to grab the latest changes? I thought we were talking about large projects here :P	12:10
	← intripoon_ left	12:11
_ikke_	people tend to use git pull to get the latest changes, which will cause unnecessary merges	12:11
alexander__b	_ikke_: what's your suggestion?	12:11
canton7	(will cause unnecessary merges if merge defaults to --no-ff)	12:11
alexander__b	canton7: IIRC they use tags so they don't pull a lot	12:11
canton7	alexander__b, how are tags and pulling related?	12:11
_ikke_	canton7: even if it doesn'	12:12
alexander__b	canton7: they only pull new tags	12:12
	canton7: that they know they need/want	12:12
	they don't git pull every few minutes from drupal :-P	12:12
_ikke_	pull or fetch?	12:12
	pull == fetch + merge by default	12:12
alexander__b	IDR really	12:12
canton7	so they're merging random tags into their local branch? that sounds messy	12:12
	← leehambley left	12:12
alexander__b	yes, I know	12:12
	canton7: they aren't doing much development on the upstream stuff (if any at all)	12:12
	it's all in a submodule	12:13
	then the stuff for which they are upstream are in other submodules	12:13
	so actually, pulling should be clean all the time unless they have dun guufd. which happens, I guess. just not very often.	12:13
	rohan32 → rohan32\|afk	12:13
	← Dr3amc0d3r left	12:13
canton7	alexander__b, I think there's a cross in terminology here. I mean whenever they want to grab the latest changes from the shared repo to which their peers push	12:13
alexander__b	canton7: they have drupal in a submodule. they don't push anything to drupal. they only pull from drupal.	12:14
_ikke_	alexander__b: But do they create commits on the submodule?	12:14
alexander__b	and they only pull security fixes.	12:14
_ikke_	ok	12:14
alexander__b	_ikke_: no in the main repo afaik	12:14
canton7	alexander__b, lets's start from the beginning. you have a set of devs, working on something. right? so they're committing. those commits get pushed somewhere shared?	12:14
alexander__b	canton7: they have a repo in which they work. this repo has several submodules. one of them is drupal. they don't work in the drupal submodule. they just pull stuff in it. then they make a commit in their main repo with "update drupal for security fix blah".	12:15
canton7	then every so often, the devs have to merge in new commits from that shared location?	12:15
_ikke_	alexander__b: Then in principle they don't need to merge, everythign is just a ff	12:15
canton7	alexander__b, forget submodules, I'm not sure where that came from. But this 'main' repo - the devs merge from that every so often?	12:15
alexander__b	canton7: they push to their ssh+git and pull from it, yes.	12:15
	_ikke_: should be. almost always.	12:16
canton7	cool. right. so often they'll 'git pull' to get the latest changes from the 'main' repo?	12:16
alexander__b	oh yes they mess that up all the time.	12:16
	← Nicholas_Rishel left	12:16
_ikke_	That's where we are talking about	12:16
canton7	I'm saying history will get messy if that pull creates merge commits every time, rather than only when it needs to	12:16
_ikke_	alexander__b: do they use feature branches or not?	12:16
alexander__b	there should be only feature branches in the main repo	12:16
	except for stuff like "update drupal" maybe	12:17
canton7	alexander__b, what are the feature branches merged into?	12:17
alexander__b	at least I told them to use feature branches. but some of them are a bit lol.	12:17
	→ zhost joined	12:17
alexander__b	canton7: master. or am I misunderstanding again? :-P	12:17
	→ Cromulent joined	12:17
alexander__b	or actually, probably develop	12:17
canton7	alexander__b, no, that's cool. so say I have a feature branch I want to merge into master, so I update my local master to match the remote one. valid?	12:17
alexander__b	then develop is merged to master.	12:17
canton7	s/master/develop then, it doesn't matter	12:17
	← Silex left	12:17
alexander__b	canton7: depends on who you are. if you are a regular dev... then yes.	12:18
	← sgambino left	12:18
	→ mikecmpbll joined	12:18
	→ devoldmx joined	12:18
canton7	ok, so if merge --no-ffs, when I update my local develop branch, that creates a merge commit. then when I merge my feature in, that creates another merge commit.	12:18
	savvy?	12:18
	← threesome left	12:19
canton7	so develop has valid merge commits, from when each feature is merged in, then it also has a load of merge commits that do nothing, that were created when devs updated their local copies of develop	12:19
alexander__b	ohhhh no I wouldn't do --no-ffs on the former	12:19
canton7	then the default for 'merge' shouldn't be --no-ff	12:20
alexander__b	I still think it should be	12:20
canton7	which is the point I've been trying to make	12:20
alexander__b	I do --no-ff more often than not	12:20
canton7	but then you end up with the tons of merges on develop situation	12:20
Naeblis	Is there a way I can see "relative" diffs? If I do git diff <commit_hash>, that shows me ALL the changes b/w that commit and present, but I want to see what changes were make in that commit relative to the state of the repo at the time.	12:20
alexander__b	canton7: uhm no?	12:20
canton7	merge is used in two ways, one of which benifits from --no-ff, the other behifits from fast-forward merging if it can	12:20
	*benifits	12:20
	→ Silex joined	12:20
alexander__b	canton7: just like you can do --no-ff now, if --no-ff were default, you would be able to do --ff.	12:20
canton7	yeah, but people wouldn't	12:21
alexander__b	why not?	12:21
	I do --no-ff. I don't see why I wouldn't do --ff if it were reversed.	12:21
canton7	if they're too dumb to --no-ff now, they're too dumb to --ff-only now	12:21
	*--ff-only later	12:21
alexander__b	well OK then that's their problem. it would still benefit me if it were reversed. :-P	12:21
_ikke_	Naeblis: I'm not entirely sure, but it sounds like git show is what you want	12:21
	→ m0viefreak joined	12:21
alexander__b	should be a config option to set default behaviour at least.	12:21
_ikke_	Naeblis: Which is basically short for git diff commit^ commit	12:22
alexander__b	could make an alias I guess	12:22
canton7	alexander__b, man git config, see merge.ff	12:22
gitinfo	alexander__b: the git-config manpage is available at http://jk.gs/git-config.html	12:22
_ikke_	alexander__b: The gist is, you should only set no-ff for people who know what it does	12:22
	← devoldmx left	12:22
Naeblis	_ikke_: yeah, that's it. Thanks! :)	12:23
alexander__b	canton7: ohhh. I remember a bunch of people whining about it not being possible. maybe it's been implemented recently-ish?	12:23
canton7	alexander__b, a little while back, not too long ago	12:23
	there was a way of doing it before, too, but it wasn't as pretty	12:23
	← dougsland left	12:23
	→ mikewintermute joined	12:23
	→ cenuij joined	12:23
	← cenuij left	12:23
	→ cenuij joined	12:23
alexander__b	canton7: I use/used an alias	12:23
_ikke_	git diff <commit> compares to the working tree	12:23
	← mikewintermute left	12:24
	← surfdue left	12:25
	→ juliohm joined	12:25
	← Reuzenwolf left	12:25
alexander__b	canton7: yep. still have it. git noffmerge. :-P	12:25
canton7	that's almost longer than merge --no-ff :P	12:26
	→ VoidAtValhalla joined	12:26
	→ Nicholas_Rishel joined	12:27
	→ surfdue joined	12:27
	→ elauria joined	12:27
alexander__b	tab completion makes it a wee bit shorter at least :-P	12:27
canton7	git me<TAB><SPACE>--n<TAB>f<TAB> yeah point taken	12:28
	→ jefflyne joined	12:29
elauria	Q: after pull->resolved conflicts-> add&commit -> push (rejected) -> pull -> same conflicts. Over and over. Any idea how to get out of this hole?	12:29
	← tvale left	12:29
_ikke_	elauria: !repro	12:29
gitinfo	elauria: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	12:29
	→ maxmanders joined	12:30
	→ emergion joined	12:30
	→ satiricon joined	12:30
	← maxmanders left	12:31
psofa	can someone help me undo the last merge?https://github.com/gkranis/vdr4arch/commits/master i accidentally merged an already existing commit	12:32
	→ AWinterman joined	12:32
iveqy	psofa: !revert	12:32
gitinfo	psofa: 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]?	12:32
iveqy	psofa: you probably want e)	12:32
	however !rewrite	12:33
gitinfo	[!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to). If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	12:33
	→ threesome joined	12:33
emergion	Hey is it possible to do a merge but ignore any conflicts by having the remote changes overwrite antyhing on my local?	12:33
alexander__b	emergion: yes	12:33
	emergion: several ways even	12:33
_ikke_	emergion: git merge -Xtheirs	12:33
	→ ShiningThrough joined	12:33
	← fragje left	12:33
alexander__b	that's the easiest. I was looking that up in the man right now, because they changed those options some time ago and I always misremember.	12:34
	← Piggy_ left	12:34
psofa	yeah no one has pulled it as far as i know	12:34
alexander__b	you have no way of knowing	12:34
emergion	thanks guys, was wondering if you can just do it from the pull though	12:34
	would he be --strategy ?	12:34
alexander__b	force pushes should really only happen when you have licensing issues. and even those may be fixed in other ways.	12:34
_ikke_	emergion: the same	12:34
	pull also takes -X	12:35
alexander__b	emergion: _ikke_ just told you what to do.	12:35
emergion	Ah sorry	12:35
	-X = strategy	12:35
	thanks guys	12:35
_ikke_	no	12:35
alexander__b	emergion: no.	12:35
	→ mechanicalduck joined	12:35
_ikke_	-X is strategy option	12:35
alexander__b	emergion: -X is --strategy-option	12:35
emergion	alexander__b, that's what I meant :)	12:35
psofa	okay i understand e) but how would i do i do it with "git revert -m 1 HEAD" it seems to do nothing.i do git log and its the same	12:36
emergion	wow that was awesome, cheers guys	12:36
	→ otherj joined	12:36
iveqy	psofa: that's not the command in e)	12:37
	!revert	12:37
gitinfo	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]?	12:37
elauria	_ikke_: no idea how to reproduce this, no idea how we got into it. I could paste my terminal output but its the usual rejected message from git, then pull, then conflicts on same files i already resolved, over and over.	12:37
alexander__b	psofa: git revert HEAD^	12:37
elauria	could this behaviour be caused by someone forcing a push?	12:37
iveqy	alexander__b: no, git revert will create a new commit	12:38
	→ MADev joined	12:38
alexander__b	iveqy: yes. isn't that the point?	12:38
_ikke_	That doesn't really undo the merge	12:38
iveqy	alexander__b: no, he wants the "undo a merge"	12:38
alexander__b	oh	12:38
_ikke_	it only reverts the changes that were brought in with the merge	12:38
alexander__b	well they should have thought about that before they pushed ;-)	12:39
	← dhruvasagar left	12:39
iveqy	of course, the reset doesn't undo them either, but it will be forgotten	12:39
	→ fragje joined	12:39
alexander__b	the easiest is to git reset --hard HEAD^ && git push --force I guess	12:39
_ikke_	For all practical meanings, it's considered undone	12:39
alexander__b	though I wouldn't recommend it ever to a public repo.	12:39
iveqy	alexander__b: yes, I've told him. Twice...	12:39
	← salamanderrake left	12:40
_ikke_	elauria: Does the message say why it is rejected?	12:40
alexander__b	for a public repo I would do git revert HEAD^ though. that's nicer.	12:40
	→ guampa joined	12:41
	← AWinterman left	12:41
	→ Reuzenwolf joined	12:41
	→ DoniRS joined	12:42
	MrDHat\|afk → MrDHat	12:42
	→ leehambley joined	12:42
juliohm	Please follow my workflow...	12:43
	I cloned a Github repo that has only the master branch, suppose	12:43
	→ jbnicolai joined	12:43
juliohm	in my local clone i created a feature branch and did some commits	12:43
	the feature reached a state i want to share in Github	12:43
	then i Do...	12:44
	git fetch	12:44
_ikke_	!enter	12:44
gitinfo	The enter key is not a punctuation mark. Please use fewer lines, with complete sentences on them.	12:44
juliohm	to get all updates from the Github repo	12:44
	_ikke_, sorry	12:44
psofa	lol	12:44
juliohm	after getting the updates, I need to incorporate them to my local master, i do: git checkout master and git merge origin/master	12:45
	→ sander^work joined	12:45
	→ huoxito joined	12:45
juliohm	it'll always fast-forward, right?	12:45
_ikke_	which should be a fast-forward merge	12:45
	yes	12:45
alexander__b	juliohm: --no-ff	12:45
sander^work	Does github have email notifications on commits?	12:45
juliohm	thanks, let me continue	12:45
iveqy	juliohm: no it shouldn't	12:46
juliohm	alexander__b, good tip, i'm using it. :)	12:46
	iveqy, why not?	12:46
alexander__b	sander^work: they have on pull-requests at least, so I would expect.	12:46
_ikke_	iveqy: He uses topic branches	12:46
iveqy	juliohm: if the public repo has altered it's history it's not a fast forward	12:46
canton7	juliohm, no, you don't want to --no-ff that merge	12:46
	→ gregie156 joined	12:46
iveqy	however they should _never_ alter their history	12:46
	← gregie156 left	12:46
juliohm	canton7, the --no-ff will keep the virtual merge on the history, no?	12:46
iveqy	but some of them do anyway... As we see in this channel	12:46
sander^work	alexander__b, is there any reason to host the git repository at your own server, instead of github? If you dont count the price.	12:46
	← OOPMan left	12:47
canton7	juliohm, this is merging origin/master into master NOT the feature branch into master	12:47
juliohm	isn't good to se the merges even if they are fast-forward?	12:47
alexander__b	sander^work: github is gratis so that's not a reason	12:47
iveqy	sander^work: safety?	12:47
psofa	alexander__b, doesnt HEAD^ mean its parent?	12:47
juliohm	canton7, good point!	12:47
alexander__b	iveqy: github is rather safe	12:47
_ikke_	juliohm: Not if they are meaningless	12:47
juliohm	thanks, let me continue	12:47
sander^work	alexander__b, I guess your paying for private repositories.	12:47
alexander__b	psofa: ^ means previous. so HEAD^ is the previous HEAD. HEAD^^ would be HEAD two states ago.	12:47
	sander^work: are you developing proprietary software?	12:47
canton7	alexander__b, psofa, not quite. ^ means 'first parent of'	12:48
juliohm	suppose i have merged origin/master into master. It'll be a fast-forward unless something has changed in Github	12:48
iveqy	alexander__b: depends on your requirements. I my mind, nothing outside my LAN is to be considered safe	12:48
alexander__b	canton7: that is more precise, yes.	12:48
sander^work	iveqy, alexander__b: can I create hooks when someone deploy on github?	12:48
_ikke_	juliohm: correct	12:48
	→ tvale joined	12:48
canton7	alexander__b, psofa merge commits have two (or more!) parents. ^ means the first of these. ^2 means the second one	12:48
cce	sander^work: github has it's own forking/branching model, so I see it as an extension to git providing more classic central management features	12:48
_ikke_	well, changed means rewrote history in this case	12:48
sander^work	alexander__b, some, yes.	12:48
iveqy	sander^work: I think so	12:48
	unreal_ → unreal	12:48
juliohm	_ikke_, what kind of change will cause the merge to not be a simple fast-forward?	12:48
alexander__b	sander^work: then my conscience forbids me to help you.	12:48
dsdeiz_	hey all	12:49
gitinfo	dsdeiz_: 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.	12:49
_ikke_	juliohm: If they rewrote history by rebasing the master branch for example	12:49
iveqy	juliohm: or if they just removed the latest commit	12:49
	→ snearch joined	12:49
dsdeiz_	with git ls-files, is it possible to only list text files?	12:49
juliohm	hmmm, fair enough	12:49
canton7	sander^work, your own repo can be more configurable. better per-branch permissions, denying non-fast-forward pushes, etc	12:49
iveqy	juliohm: but as we said. !rewrite	12:49
gitinfo	juliohm: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to). If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	12:49
_ikke_	juliohm: Not something you should encounter in normal cases, unless upstream is ignorant / stupid	12:49
iveqy	juliohm: they should never do it. If they do, they are doing it wrong	12:49
	Kwpolska_ → Kwpolska	12:49
	← soee left	12:50
juliohm	understand	12:50
	continuing...	12:50
psofa	then why do i revert the merge's parent (revert HEAD^) and not the merge itself (revert -m1 HEAD)	12:50
elauria	_ikke_: just usual "error: failed to push some refs to 'git@github.com:zalando/[...]see the notes about fast forward"	12:50
alexander__b	dsdeiz_: what do you mean by "text files"?	12:50
ddv	never buy shoes from zalando	12:50
juliohm	now i have my local master merged with origin/master, everything works nicely if people don't mess up with the origin history. Next step is to share my feature...	12:50
iveqy	dsdeiz_: afaik, no. You've to parse the output, I suggest using file for checking the filetype	12:50
dsdeiz_	ah cool, thanks	12:51
alexander__b	psofa: you are reverting the changes from the previous commit to your current commit.	12:51
	→ rcu joined	12:51
cce	alexander__b: so, there's a big difference between developing proprietary software for your client (where they'll be the only user) and implementing proprietary software for sale, where you offer it yourself.	12:51
alexander__b	cce: no.	12:52
	well, yes. in many respects. but not the one I was thinking of.	12:52
juliohm	assume my feature branch is not complete yet, but i have some commits to share. Meaning i don't want to merge the feature branch back into master, but simply incorporate the commits into origin/master, how would you do that?	12:52
cce	alexander__b: we use private repositories for the former, work developed by and for a specific client	12:52
	→ devoldmx joined	12:52
cce	it's their stuff, we're not denying them their freedom, nor restricting the freedom of others	12:52
iveqy	juliohm: I would fork the project on github and push the featurebranch to a featurebranch on my github fork	12:53
juliohm	I want my Github (origin) to have only the master branch	12:53
alexander__b	cce: oh you mean that you do not distribute it, and they have all their four freedoms?	12:53
cce	that said, as much of their sofware that is generic/reusable we partition/document as free software ;)	12:53
	That's correct. It's still a private repository though.	12:53
	← hoschi left	12:53
alexander__b	cce: that's fine. a bit anti-social though. ;-)	12:53
iveqy	juliohm: why do you want that?	12:53
alexander__b	juliohm: so what?	12:53
	juliohm: rebase the ones you want into master	12:54
juliohm	iveqy, i don't want people to see lots of branches when they clone, just the master, possibly a release branch, feature branches should be local my work machine, no?	12:54
cce	alexander__b: just informing your blanket objection to private repositories	12:54
alexander__b	cce: not private repos. I asked specifically if they were making proprietary software.	12:54
	← crank1988 left	12:54
alexander__b	private repos are fine by me.	12:54
iveqy	juliohm: if you want to share them with others it's hard to keep them local	12:55
	cce nods.	12:55
	← RonScagz left	12:55
	→ tmcmahon joined	12:55
_ikke_	elauria: It's hard to tell what's going on without getting more details	12:55
	cce was very skeptical of free software years ago, I'm now a full-blown communist ;)	12:55
juliohm	iveqy, I want to share the changes, not the feature branches, is it possible?	12:55
_ikke_	elauria: Upstream rewriting of history should not cause this behaviour	12:55
iveqy	juliohm: the only solution I see is to merge with master and push that. But then you'll have a non-stable master and that would be bad	12:55
	← Nicholas_Rishel left	12:55
_ikke_	juliohm: What is the problem with sharing the feature branches?	12:56
	← vedant left	12:56
alexander__b	juliohm: yes. rebase the commits you want to rebase into master. then push.	12:56
	← devoldmx left	12:57
iveqy	juliohm: changes (or rather commits) you track with git need to be part of a branch if you want to share them. If you don't want a feature branch, master is the only option	12:57
_ikke_	But that basically undoes the benefit of feature branches	12:57
juliohm	_ikke_, i don't know, it seems like little feature branches shouldn't be shared, the history is different if we're doing a major feature with the help of others	12:57
psofa	HEAD is the merge itself HEAD^ is the mainline commit before the merge ,no?	12:57
iveqy	juliohm: this is a feature with help from others, because you're sharing it	12:57
	in my world master should always be stable	12:57
_ikke_	yes	12:57
	and only upstream should touch master	12:57
	→ coco joined	12:58
alexander__b	speaking of juliohm's scenario -- how common is it to push feature branches upstream before they are completed/merged into master?	12:58
iveqy	however, not everyone agrees with me. Having an unstable master is usual for people using expensive branches, like subversion and other stuff	12:58
alexander__b	all projects I've worked on typically only have master, and only merge feature branches to master when they are fully complete.	12:58
sonOfRa	depends on the size of the feature...	12:58
iveqy	alexander__b: we do it in git all the time	12:58
alexander__b	iveqy: I am with you. master should be correct always.	12:59
sonOfRa	if multiple people work on the feature, you have no choice other than publishing them	12:59
alexander__b	iveqy: isn't it messy?	12:59
_ikke_	alexander__b: It's only messy when you make it messy	12:59
alexander__b	iveqy: like if I push my branch "Add crap". what happens when people do git pull? do they get my branch automatically?	12:59
_ikke_	alexander__b: Only as remote tracking branch	12:59
iveqy	alexander__b: it is, but I'm not the maintainer so I don't really know/care. Junio keep tracks of the branches and I'm sure he has a system for it. I only need to keep track of his 3 important branches	12:59
alexander__b	_ikke_: but automatically?	13:00
juliohm	alexander__b, iveqy _ikke_ , I liked this git workflow: http://nvie.com/posts/a-successful-git-branching-model/	13:00
_ikke_	alexander__b: yes. git fetch fetches all refs	13:00
	juliohm: Yes	13:00
grawity	yes, if they have the default fetch refspec, the branch will be automatically fetched as a remote-tracking branch (e.g. origin/add-crap)	13:00
	but a local branch will not be created from it	13:00
alexander__b	iveqy: and they can do checkout origin "Add crap" and workworkwork commit & push to Add Crap?	13:00
iveqy	juliohm: you could also use git format-patch and distribute the patches as files on your webpage... That's ugly though...	13:00
_ikke_	juliohm: But that doesn't prevent pushing feature branches	13:00
juliohm	but for little projects i'm thinking in keep only master as the bleeding edge and features as other branches	13:00
alexander__b	sorry _ikke_ ? not iveqy	13:00
grawity	also, I'm quite sure you cannot use spaces in branch names	13:00
alexander__b	grawity: that's probably true	13:00
_ikke_	alexander__b: yes	13:00
sander^work	cce, Can I automaticly push code to a non-github repository when someone pushes to the github one?	13:01
alexander__b	_ikke_: ok well what about github scenario? will these branches be visible on github?	13:01
_ikke_	yes	13:01
grawity	if you push the branch to github, it will be visible on github...	13:01
alexander__b	I'd think it looked messy if a github project had a bunch of "add crap" branches with five commits that started to implement a feature.	13:01
juliohm	alexander__b, iveqy _ikke_ , so, what do you advise as the possible solutions for my problem?	13:01
alexander__b	grawity: that's what I assumed.	13:01
_ikke_	juliohm: What is the exact problem?	13:01
cce	sander^work: it's the pull-request model that is custom to github	13:01
alexander__b	juliohm: push the branch or rebase the commits you want and push them in master	13:01
_ikke_	If you want to collaborate with others, just push the feature branch	13:02
	← mechanicalduck left	13:02
dsdeiz_	heh, idk how to parse the output of git-ls-files.. i was hoping it was just like find	13:02
iveqy	juliohm: pretty common workflow. git.git uses it	13:02
juliohm	_ikke_, what is the best way of sharing commits without creating branches in origin?	13:02
_ikke_	juliohm: using patches	13:02
iveqy	juliohm: pu, next and master are the branchnames then. I think linux uses master and linux-next	13:03
	→ mechanicalduck joined	13:03
jbnicolai	Hi guys, I have a small problem I hope you could help me with.	13:03
sander^work	cce, WHere can I read about how that model works?	13:03
juliohm	alexander__b, with rebase I would lost my local feature branch, right?	13:03
_ikke_	juliohm: Are those changes ready to be on master?	13:03
	← tmcmahon left	13:03
alexander__b	_ikke_: so is it customary to delete remote branches when done fixing?	13:03
_ikke_	juliohm: No, you wouldn't loose them	13:03
jbnicolai	I made changes; pushed to github; made 1 local changed and committed with --amend; now the branches have diverged - what should I do?	13:03
_ikke_	alexander__b: Sure	13:03
iveqy	juliohm: the best way would be to make your featurebranch public	13:03
_ikke_	alexander__b: If they serve no purpose anymore, you can delete them	13:03
	← MADev left	13:04
juliohm	_ikke_, yes, i implemented a new function, but i plan to extend it in a future commit on the feature branch	13:04
charon	cce, sander^work: actually git itself also has a git-request-pull utility. what's custom about github is that you can handle them directly on the site, not involving a local clone at all.	13:04
cce	sander^work: https://github.com/torvalds/linux/pull/17	13:04
_ikke_	juliohm: If it is ready in it's current form, merge it back into master	13:04
alexander__b	_ikke_: and this works? I heard some people at this company complaining about how they were removed from server but not from the devs downstreams	13:04
juliohm	iveqy, _ikke_ , alexander__b , i think simply push the feature branch is the best option then. :)	13:04
_ikke_	alexander__b: You need to manually purge them	13:04
iveqy	jbnicolai: you should !revert and then you should not amed when you have published something because !rewrite is bad	13:04
gitinfo	jbnicolai: 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:04
	jbnicolai: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to). If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	13:04
alexander__b	juliohm: you would not lose the branches.	13:04
	juliohm: I think pushing the branches is the best option too.	13:04
	→ marhaban joined	13:05
_ikke_	juliohm: You can just merge the feature branch into master, and still work on it	13:05
alexander__b	_ikke_: exactly that was the problem I remembered.	13:05
_ikke_	alexander__b: Not a real problem imo	13:05
alexander__b	I think it is. you need to constantly remember to prune	13:05
iveqy	juliohm: yeah, if you don't want everyone to use this unfinished feature, then you can just push it on master. However IMHO master should be stable	13:05
alexander__b	if not you might work on non-existing branches	13:05
_ikke_	Not really.	13:05
juliohm	_ikke_, what will happen to the DAG after i merge feature into local master?	13:05
alexander__b	what do you mean? if it exists locally but not upstream, you can just git checkout thebranch	13:06
	← marhaban left	13:06
_ikke_	alexander__b: That's a communications problem	13:06
alexander__b	_ikke_: some projects have 5 commits per minute	13:06
	→ marhaban joined	13:06
alexander__b	and 100 devs	13:06
juliohm	_ikke_, the feature branch will be available later?	13:06
_ikke_	.digraph A->C; B->C	13:06
gitinfo	.digraph: http://g.jk.gs/de.png	13:06
_ikke_	juliohm: Sure	13:06
alexander__b	I think git should prune itself	13:06
	← leehambley left	13:06
alexander__b	if not, won't you end up with 50 branches?	13:07
	most of which are deleted	13:07
_ikke_	alexander__b: remote tracking branches, which you should not work directly with	13:07
	You only see them when you do git branch -r	13:07
alexander__b	_ikke_: well if my git checkout auto-completion had 100 branches, that would be really annoying	13:07
	why can't you just prune everytime you have fetched & merged/rebased?	13:08
	iveqy points out that git.git has 785 remote branches right now	13:08
juliohm	_ikke_, alexander__b iveqy , ok, so two scenarios to end this discussion.... First, i have a completed feature in a feature branch that i want to share on Github. I should merge feature into local master and then push master to origin/master?	13:08
alexander__b	and if that makes sense, why isn't it prune builtin to pull?	13:08
_ikke_	juliohm: It depends. If you control upstream, you can, if you don't you should not merge it back into master	13:08
	→ AWinterman joined	13:09
deuterium	hi. "svn update" displays a nice summary of what has been updated and changed. is there an option for git to do the same when executing "git pull" or so?	13:09
alexander__b	juliohm: you can merge or rebase a complete or incomplete feature branch. you can push it to master or its own branch.	13:09
	→ devoldmx joined	13:09
iveqy	juliohm: yes, IMHO you should	13:09
_ikke_	If you want to issue a pull request, you should not merge it yourself	13:09
iveqy	deuterium: it already does?	13:09
_ikke_	THe pull request will do the merge	13:09
alexander__b	juliohm: I think you should either a) finish the feature and merge it to master with --no-ff. or, you should push the branch as-is if you want others to collaborate on it.	13:09
juliohm	so, complete or incomplete feature does not play any difference in this context?	13:09
alexander__b	git doesn't care. it's up to you to make that decision.	13:10
iveqy	juliohm: incomplete features in master would make master unstable, and IMHO master should always be stable. You should always be able to release your software. But that's not a git question	13:10
	→ bytephilia joined	13:10
juliohm	i mean, i can continue working with the feature branch after merging it to master?	13:10
alexander__b	iveqy: not necessary	13:10
	iveqy: maybe it is incomplete as in you haven't implemented all of the things you want to implement yet, but there are no commits that break anything or make anything unstable.	13:11
iveqy	juliohm: yes you can with git. Not with svn (or many other SCM)	13:11
juliohm	ok, i'm fully understanding all, thank you for the help	13:11
	let me see...	13:11
alexander__b	juliohm: yes. but it's less of a headache to just push the branch.	13:11
deuterium	iveqy: it does?	13:11
iveqy	juliohm: you see, it's much a matter of taste	13:11
alexander__b	IMO at least	13:11
iveqy	deuterium: yes, it tell which branches are updated	13:12
m1sc	deuterium: https://git.wiki.kernel.org/index.php/Aliases#What.27s_new.3F	13:12
juliohm	pushing the branch will make it visible on Github so that others can contribute, right? And it's the best option when i don't have push access to upstream, correct?	13:12
iveqy	deavidsedice: and if you're on a tracking branch it shows you a summary	13:12
	→ AaronMT joined	13:12
alexander__b	juliohm: what is upstream in this case?	13:12
juliohm	i simply push the branch and do a pull request on Github	13:13
iveqy	juliohm: yes, yes	13:13
alexander__b	juliohm: oh ok you have forked something on github?	13:13
juliohm	upstream is the project i forked (PyMC)	13:13
	zz_runningskull → runningskull	13:13
alexander__b	juliohm: then yes, I think that is a good idea.	13:13
juliohm	alexander__b, yes	13:13
iveqy	alexander__b: Then I would say that the feature is too huge. If you halfway in your feature branch have something you can push to master and it make sense to have on master. I would say that that feature is complete	13:13
juliohm	so the final dumb question, what is the precise syntax for pushing changes across remotes?	13:14
	→ Jackneill joined	13:14
iveqy	juliohm: across?	13:14
juliohm	maybe i'm being too pedantic with nomenclature...	13:15
iveqy	juliohm: remotes? You've only one remote, yes?	13:15
juliohm	how to push a local branch to Github?	13:15
deuterium	m1sc: ah ok, that was what i was looking for. thanks :)	13:15
juliohm	i have upstream (original PyMC) and origin (my fork on Github)	13:15
iveqy	juliohm: checkout that branch and then git push origin remote_branchname	13:15
_ikke_	juliohm: git push <remote> <branch>	13:15
iveqy	man git push for details	13:15
gitinfo	the git-push manpage is available at http://jk.gs/git-push.html	13:15
_ikke_	iveqy: You don't have to check it out	13:16
	→ tplaner joined	13:16
iveqy	_ikke_: then you need more than just git push <remote> <branch>	13:16
juliohm	iveqy, _ikke_ alexander__b , thank you all for the help, the man pages are not that helpful for beginners.	13:16
_ikke_	iveqy: nope	13:16
alexander__b	juliohm: I think they are very helpful. but then again I'm maybe old-school in that regard. ;-)	13:17
juliohm	after we start learning Git, we see how great it is, but the learning curve is really a pain	13:17
bremner	juliohm: hopefully somebody pointed you to !book	13:17
gitinfo	juliohm: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	13:17
iveqy	_ikke_: oh, with the exception that the remote branchname should be the same..	13:17
alexander__b	oh yes, pro git is great	13:17
	and I also like http://nvie.com/posts/a-successful-git-branching-model/	13:17
juliohm	i have pro Git bookmarked, just had no time yet to read it	13:17
_ikke_	iveqy: git just assumes it has the same name, unless you provide another name	13:18
iveqy	juliohm: how much time do you have asking about stuff and doing stuff wrong just because you haven't red the book? ;)	13:18
	_ikke_: true	13:18
	← AWinterman left	13:18
juliohm	iveqy, i read lots of docs for asking this question here today, really	13:19
_ikke_	iveqy: the offical syntax is git push <remote> <refspec>; where <refspec> us [+][local_name][:remote_name]	13:19
juliohm	Read one more will help me, but i'm wasting too much time learning Gitology rather than working with my programming tasks	13:20
iveqy	juliohm: I can imagine that. I can't judge what's best for you, I can only suggest that you ask yourself the right questions. It's quite possible that the best thing for you is not to read but to program	13:20
deuterium	iveqy: https://git.wiki.kernel.org/index.php/Aliases#What.27s_new.3F is what i was looking for (by m1sc)	13:20
iveqy	_ikke_: I know, but thanks	13:20
	← robbyoconnor left	13:21
	← beautifulmind left	13:21
juliohm	time to send a pull request...	13:21
iveqy	_ikke_: when you and I diverged in our answers I looked up the man-page right away to see that I was wrong =)	13:21
	→ robbyoconnor joined	13:21
iveqy	deuterium: okay	13:21
	← pretty_function left	13:21
	← kewah left	13:22
	→ konundra joined	13:22
	← marhaban left	13:22
iveqy	.random	13:23
gitinfo	<cmn> all that memory and processing power was just gonna sit there unused, we're helping [8]	13:23
	← rob_w left	13:24
	← hoyang left	13:24
	→ Adlai joined	13:24
	← nilg``` left	13:25
	→ kewah joined	13:28
	← tvale left	13:30
	← jefflyne left	13:30
	← mechanicalduck left	13:31
	← DonRichie left	13:33
	→ gusnan joined	13:33
	→ mechanicalduck joined	13:33
	→ leehambley joined	13:33
	→ thehandler joined	13:34
	→ DonRichie joined	13:34
juliohm	just to be sure, i should do a pull request from my feature branch to the upstream master branch, right?	13:34
	→ Christi123 joined	13:35
juliohm	so the author will be able to import the changes from my branch to the master project, ok, i think it's right.	13:35
alexander__b	juliohm: maybe	13:35
	← thehandler left	13:35
alexander__b	juliohm: ask the author	13:35
juliohm	time to proceed. :)	13:35
alexander__b	juliohm: some dislike pull requests and prefer you to email patches.	13:35
	→ thehandler joined	13:35
	← introom left	13:36
	→ TheBrainWork joined	13:36
	→ introom joined	13:36
	→ LuxuryMode joined	13:36
alexander__b	juliohm: some have their own review tools where you upload your patches and use github only for hosting (or mirroring even)	13:37
	→ kpreid joined	13:37
	→ salamanderrake joined	13:38
	← Peaker left	13:38
	→ bartek_ joined	13:40
	← arvind_khadri left	13:40
	→ m0ltar joined	13:40
	→ hoyang joined	13:40
	→ mr_mustard joined	13:41
	→ InvidFlower joined	13:41
	← hoyang left	13:41
	→ hoyang joined	13:42
juliohm	alexander__b, i understand, i contacted the author yesterday. :)	13:43
	→ gregie156 joined	13:44
	← gregie156 left	13:45
	→ hellopat joined	13:45
	→ AWinterman joined	13:45
	→ dc5ala joined	13:46
	← dsdeiz_ left	13:47
	→ dsdeiz joined	13:47
	← leehambley left	13:48
	→ tatsuya__ joined	13:49
	→ msch joined	13:50
shadok	juliohm: Here is a good read for repo owners on github: https://github.com/blog/1184-contributing-guidelines	13:51
	→ TomyLobo joined	13:52
	← kewah left	13:53
	← tatsuya_o left	13:53
msch	is there a good tutorial on resolving merge conflicts?	13:53
juliohm	thank you shadok , i'll take a look. :)	13:54
	→ vigintas_ joined	13:54
	← vigintas left	13:55
	← mechanicalduck left	13:56
	→ arvind_khadri joined	13:56
	← introom left	13:56
	← AWinterman left	13:56
	→ mechanicalduck joined	13:57
	← vigintas_ left	13:57
juliohm	Why I need to create an account on this Gravatar thing to add a profile picture, this is so restrictive	13:57
	No way of simply uploading a jpg?	13:58
	:(	13:58
grawity	on the other hand, if you create an account on Gravatar, it works on many websites automatically	13:58
	runningskull → zz_runningskull	13:58
bremner	or, you could just ignore the whole thing	13:58
grawity	uploading jpgs to every single website is so restrictive :\|	13:58
juliohm	grawity, it requires i to create a wordpress account?	13:58
_ikke_	Hmm, no?	13:58
juliohm	_ikke_, let me retry it again...	13:59
	→ tatsuy___ joined	13:59
grawity	I think they use a single account db now... I haven't seen the current signup process tbh. But it's still only one signup, as far as I know.	13:59
juliohm	but i remember i was asked to create one	13:59
	← alsu left	13:59
grawity	I don't think creating a Wordpress.com blog or anything is actually required, but I may be wrong.	13:59
sonOfRa	not a blog, but an account	13:59
	gravatar accounts are wordpress accounts	13:59
	zz_runningskull → runningskull	13:59
	← donmichelangelo left	14:00
_ikke_	I never made wordpress account	14:00
	Must have changed it	14:00
juliohm	yes, i have to create a wordpress account to simply add a profile picture. :(	14:00
	→ JoelMcCracken joined	14:00
juliohm	so, no profile picture	14:00
	→ andref_dias joined	14:00
grawity	sonOfRa: yes, I don't know if those two signups are tied together or if they can be done separately	14:00
	juliohm: how much information does it ask?	14:01
	→ donmichelangelo joined	14:01
	→ vigintas joined	14:01
juliohm	grawity, click here to create a wordpress account... i stopped there	14:01
	i don't want a new account on some website to upload a picture	14:02
JoelMcCracken	I'm interested in adding some "metadata" to my git repository -- such as branch links, ticket numbers, branch "state", etc. Is there some way to already handle this? If not, what would be a good way to approach the problem?	14:02
	← tatsuya__ left	14:02
	→ raf joined	14:02
grawity	JoelMcCracken: commits can be annotated using git-notes	14:02
	→ Chillance joined	14:02
	→ Nicholas_Rishel joined	14:02
	→ bklane joined	14:02
	→ rabellamy joined	14:02
JoelMcCracken	are these notes shared, such as when you push?	14:03
grawity	juliohm: I think of it as "one account to upload a picture to ~40 different sites at once", but maybe that's just me	14:03
	JoelMcCracken: not by default, but they can be pushed – they have refs under refs/notes/	14:03
JoelMcCracken	interesting!	14:03
	← KevinSjoberg left	14:03
	→ aberrant joined	14:03
JoelMcCracken	thanks; i'll read into this	14:03
	← samuel02 left	14:04
iveqy	JoelMcCracken: however notes tracks commits and not branches afaik	14:04
juliohm	grawity, we already have the stackexchange universal account, i forget the name, it should be used instead	14:04
grawity	juliohm: stackexchange, the site that uses gravatars? :P	14:04
iveqy	JoelMcCracken: nvm	14:05
JoelMcCracken	so it does for branches?	14:05
	← boblu left	14:05
grawity	basically, `git notes` annotates objects (by their hash), and branches are not objects – they are refs	14:06
	→ tang^ joined	14:06
	← chuckhar_ left	14:06
juliohm	grawity, stackexchange uses gravatars?	14:06
grawity	juliohm: yes	14:06
_ikke_	yes	14:06
juliohm	Let me see if i have set up a profile picture... hahahaha	14:06
grawity	well, they did add an "upload picture" option by popular request	14:07
	just like they added their own account system	14:07
	but from the beginning, they used Gravatar and OpenID	14:07
juliohm	that is why i have no profile on stackexchange too, hahaha	14:07
	→ sampiero_ joined	14:07
juliohm	i have to create this gravatar thing then	14:07
	OpenID!	14:07
	that is the name	14:07
	→ dsdeiz_ joined	14:08
iveqy	JoelMcCracken: man git notes	14:08
gitinfo	JoelMcCracken: the git-notes manpage is available at http://jk.gs/git-notes.html	14:08
juliohm	grawity, how does openID differs from gravatars?	14:08
	← rabellamy left	14:08
	← dsdeiz left	14:08
	→ juanmabc joined	14:08
grawity	juliohm: openid is a global account system, gravatar is just a website that hosts avatars	14:09
	→ rabellamy joined	14:09
JoelMcCracken	hmm	14:09
juliohm	understand	14:09
	SeoZ-work → SeoZ-work[AWAY]	14:11
	→ rnsanchez joined	14:11
iveqy	JoelMcCracken: The usal way to solve this is to add information in the commit message and have a seperate ticket system etc.	14:11
	→ jeremyheiler joined	14:12
iveqy	JoelMcCracken: there's solutions with all this integrated (like fossil-scm.org) but those a not as good scm systems as git..	14:12
	it all depends on your needs	14:12
grawity	it is of course possible to build something like git-notes for branches, too	14:12
JoelMcCracken	yeah.	14:12
	basically i just want to be able to add arbirary metadata to branches, commits	14:13
iveqy	JoelMcCracken: yeah, or you can just add branchdata to a note to the first ocmmit in a branch	14:13
	→ chuckharmston joined	14:14
	← mklappstuhl left	14:14
iveqy	well, a branch is a reference to a commit	14:14
	← Adlai left	14:14
JoelMcCracken	iveqy: the only problem I see with that is a trunk branch	14:14
iveqy	so there isn't really a thing called "branch"	14:14
	trunk branch?	14:14
	are we talking svn here?	14:14
cbreak-work	trunk branch sounds thick	14:14
JoelMcCracken	ha, no. I just mean any branch into which feature branches are merged	14:15
	→ diegoviola joined	14:15
JoelMcCracken	master, or review, maybe dev	14:15
iveqy	JoelMcCracken: okay, and you want what there?	14:15
cbreak-work	for get, all branches are the same	14:15
	in general :)	14:15
iveqy	is it so that you might need a merge-commit to solve this?	14:15
	← FrodoTheHobbit left	14:16
	→ FrodoTheHobbit joined	14:16
	→ nicknisi joined	14:16
iveqy	JoelMcCracken: the --no-ff option	14:16
	← zhost left	14:16
	→ Phoenixz joined	14:16
JoelMcCracken	the problem is metadata from a feature branch might not be applicable to master	14:17
	← mechanicalduck left	14:17
cbreak-work	git has commit messages, and notes, there's not much other meta data	14:17
	→ yshh joined	14:17
	← v0n left	14:18
iveqy	JoelMcCracken: why is that a problem? The notes follows the commits	14:18
	→ murnieza joined	14:18
iveqy	however if you add rebase to this, it can be really tricky	14:18
	→ marhaban joined	14:18
	← mikecmpbll left	14:18
JoelMcCracken	maybe it isn't? i'm not sure	14:18
	yeah, rebase =-\	14:18
	→ mechanicalduck joined	14:19
JoelMcCracken	noticed the "See the "notes.rewrite.<command>" configuration for a way to carry notes across commands that rewrite commits."	14:19
	← bklane left	14:20
iveqy	JoelMcCracken: yeah. However your request is a bit unusual here. Are you sure you're using git "the right way"? It can be wrong if you try to appliciate a workflow from an other SCM on git	14:20
	→ teuf joined	14:20
JoelMcCracken	I believe i am =)	14:20
iveqy	JoelMcCracken: good :). I've no idea so it's better to ask than to not	14:21
	← teuf left	14:21
	→ teuf joined	14:21
JoelMcCracken	my workflow is to check out a branch for a feature	14:21
	→ dhruvasagar joined	14:21
	← elixir_ left	14:21
JoelMcCracken	I'd like to be able to easily "tag" relevant issue tracker numbers and urls to branches	14:22
	→ marhaban1 joined	14:22
	← Reuzenwolf left	14:22
	← wrouesnel1 left	14:22
	→ AWinterman joined	14:22
	← marhaban left	14:22
iveqy	JoelMcCracken: oh I see	14:22
JoelMcCracken	it would be fine for this data to get back into master, except probably not fine for master to think that it, specifically, has an issue tracker number	14:23
	because it doesn't, of course	14:23
	→ revane joined	14:23
iveqy	JoelMcCracken: my advice for that would be a note or commit message on the first commit in that branch	14:23
cbreak-work	JoelMcCracken: it does	14:23
JoelMcCracken	it seems like I could hack something together with git commit hooks or something to make this all work the way I want it to	14:23
iveqy	however when you merge, there's really no branch anymore	14:24
cbreak-work	JoelMcCracken: after merging, the destination branch has everything the source branch had	14:24
	→ wrouesnel1 joined	14:24
JoelMcCracken	indeed	14:24
	← ksinkar left	14:24
revane	What does "git status" look at to determine what it should display? Apparently it doesn't look at only the index because the index has a conflict and yet git status shows no conflict.	14:24
cbreak-work	so it has all the issue numbers you've ever merged	14:24
iveqy	JoelMcCracken: the master branch (or trunk) and the topic branch can even be in the same "line" so to speak	14:24
	← rabellamy left	14:24
	nkambo → nkambo-afk	14:25
iveqy	revane: how do you know that the index has a conflic?	14:25
	revane: I don't think the index even can have a conflict.... Are you talking about your work tree?	14:25
	← Cromulent left	14:25
revane	iveqy: I use git ls-files -s.	14:25
	← deckTrout left	14:25
revane	iveqy: This is a work tree.	14:25
iveqy	revane: okay so git ls-files -s shows you a conflict?	14:26
revane	iveqy: I'm possibly doing bad things to git with libgit2. I'm just trying to figure out what I should do with the lib to make git status behave.	14:26
	← tga left	14:26
revane	iveqy: yup. Shows me stages 0-3 for a given file.	14:26
JoelMcCracken	I guess I could always attach metadata which is tagged with the branch name, and so it knows if it is applicable or not... hmm	14:26
	→ bklane joined	14:26
iveqy	JoelMcCracken: look at how notes is implemented in a sepereate branch in git. It will easily help you build your own metadata system if you want	14:27
	← arvind_khadri left	14:27
iveqy	revane: !repro?	14:27
gitinfo	revane: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	14:27
JoelMcCracken	cool, makes sense	14:28
	=-D thanks guys	14:28
	iveqy: you mean actually looking at the git souce right?	14:29
	→ manishjain joined	14:29
iveqy	JoelMcCracken: nah, I think you can come a long way with just reading the manpage and understand how it's built	14:29
revane	iveqy: The repro requires this little program written with libgit2 though. Clearly I'm doing something wrong with the lib. I'll provide source and terminal output.	14:29
	← Christi123 left	14:29
	← donmichelangelo left	14:30
	→ mklappstuhl joined	14:30
iveqy	JoelMcCracken: and make a few notes and inspect the notes tree	14:30
JoelMcCracken	icic	14:30
charon	revane: ah, you also asked here. your mistake is here: "Shows me stages 0-3 for a given file." a conflicted file must not have stage 0, only 1-3 (or some subset)	14:30
	→ donmichelangelo joined	14:31
charon	revane: i'm a bit surprised this isn't enforced somewhere, i don't think an index entry can meaningfully have both stage 0 and some nonzero stage.	14:31
	(actually those are separate entries, but that's a tangent)	14:31
	← lb1a left	14:31
	← amjam left	14:32
revane	charon: Hmm ok. I'll do a bit of digging and get back to you. Not sure how I got a stage 0 as well.	14:32
	← AWinterman left	14:32
	← manishjain left	14:32
	→ amjam joined	14:32
charon	revane: note that the REUC extension keeps track of stages 1-3 if you add (and thereby resolve) a conflicted file; the adding automatically removes stages 1-3 and adds the new content at stage 0	14:32
	← rchavik left	14:32
	← bytephilia left	14:33
charon	revane: git checkout -m can then be used to dig up the unresolved entries from REUC and reconstruct the conflict	14:33
	see Documentation/technical/index-format.txt for more information on that REUC thingy	14:33
revane	charon: I'm not doing anything quite so fancy. I'm using libgit2 calls to merge two branches. The result is a conflicted index. I copy all the entries into the repo's index and then write the index to disk followed by git_checkout_index.	14:34
charon	revane: sounds like you need to clean the index first, or some such. i haven't done much libgit2 yet, and no merging, so i don't know.	14:34
	← YoungFrog left	14:34
charon	in any case, you need to get rid of stage 0 entries for all conflicts somehow	14:35
	→ tinti joined	14:35
juliohm	Where i can see my pull requests on Github? I can't find the one i just created	14:35
revane	charon: ok. That was what I was going to check now: the cleanliness of the Repo Index before I copy entries into it.	14:35
	→ Christi123 joined	14:35
	→ Reuzenwolf joined	14:36
grawity	juliohm: they're in the original repository's "issues" or "pull requests" pages	14:36
	(that is, not in your fork's "issues")	14:36
juliohm	oh, i see. :p	14:36
	→ bytephilia joined	14:36
juliohm	that makes sense	14:36
grawity	you also have https://github.com/dashboard/pulls	14:37
juliohm	Github and Git are becoming nicer and nicer	14:37
	I now have a profile picture. :)	14:37
	→ v0n joined	14:38
	→ JGarrido joined	14:38
	wagle_ → wagle	14:39
	← sxc left	14:43
	→ arvind_khadri joined	14:43
	← devoldmx left	14:43
	← mechanicalduck left	14:44
	→ deckTrout joined	14:44
	← mtk left	14:45
	← mr_mustard left	14:45
	→ mechanicalduck joined	14:46
	→ _BJFreeman joined	14:47
cbreak-work	profile?	14:47
	ah, github	14:47
	_BJFreeman → BJfreeman	14:48
	← ThomasLocke left	14:48
	← BitPuffin left	14:48
	← LuxuryMode left	14:48
	→ BitPuffin_ joined	14:48
	→ quazimodo joined	14:48
	→ hyperair joined	14:49
	→ skylamer` joined	14:50
	← ayaz left	14:50
	← marhaban1 left	14:51
	→ devoldmx joined	14:51
	← Wulf left	14:52
	→ mikecmpbll joined	14:52
	→ mr_mustard joined	14:53
	→ Vile joined	14:55
	← Vile left	14:57
	→ Vile joined	14:57
	← Vile left	14:58
	→ Sigma[Mtp] joined	14:58
	BitPuffin_ → BitPuffin	14:59
	← armin_w left	14:59
	→ Guest9857 joined	14:59
	→ AWinterman joined	14:59
Guest9857	any body here	14:59
	← Sigma left	15:00
charon	!hi	15:00
iveqy	Guest9857: !anybody	15:00
gitinfo	[!welcome] Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.	15:00
	Guest9857: [!just_ask] You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)	15:00
grawity	nope, it is only our minds	15:00
	welcome to the git-matrix.	15:00
	Sigma[Mtp] → Sigma	15:00
	← Guest9857 left	15:01
	← netiul left	15:01
	→ armin_w joined	15:01
alexander__b	grawity: hope it's the first matrix. the other two weren't as good.	15:02
	← armin_w left	15:02
iveqy	I think we scared him away	15:02
	or her	15:02
	or it	15:02
alexander__b	!next	15:02
gitinfo	Another satisfied customer. NEXT!	15:02
	← tsdh left	15:03
	→ insejn_ joined	15:04
	← fragje left	15:05
	← Kad-- left	15:05
Jobbe	Is there a GIT command for getting a pizza? :P	15:05
	← insejn left	15:06
	insejn_ → insejn	15:06
	← Phoenixz left	15:06
bremner	!pizza	15:06
	→ LuxuryMode joined	15:06
	← charliesome left	15:06
luto	git add pizza	15:07
	← bytephilia left	15:07
	→ charliesome joined	15:07
	Nothing4You → N4Y	15:07
	N4Y → Nothing4You	15:08
	← TheFuzzball left	15:08
	→ Phoenixz joined	15:08
	← mechanicalduck left	15:08
iveqy	Jobbe: http://www.youtube.com/watch?v=x7pPajOvQGo	15:08
	→ pdurbin joined	15:08
	→ mikewintermute joined	15:09
	← charliesome left	15:09
	← Christi123 left	15:09
	→ fragje joined	15:09
	← AWinterman left	15:09
	← otherj left	15:09
	→ Goplat joined	15:10
	→ Christi123 joined	15:10
	← mnathani left	15:10
	→ mnathani joined	15:11
	→ mechanicalduck joined	15:11
grawity	git fetch --pizza	15:11
	← ryanakca left	15:12
	← cbreak-work left	15:12
	→ TheFuzzball joined	15:13
	→ sven_oostenbrink joined	15:14
	← Phoenixz left	15:14
	← daanavitch left	15:15
	← threesome left	15:16
	→ OOPMan joined	15:16
	→ tinti_ joined	15:17
	r04r → r04r\|away	15:17
	← log_keeper left	15:18
	← pduin left	15:18
	→ sebrock joined	15:18
	→ jefflyne joined	15:18
	← ferdev left	15:19
	← LuxuryMode left	15:19
	← diegoviola left	15:20
	← rudak left	15:20
	→ ryanakca joined	15:20
EugeneKay	!jokes	15:20
gitinfo	A complete listing of the git-jokes used in the /topic can be found at https://madeitwor.se/git-jokes (patches welcome)	15:20
	→ ngladitz joined	15:20
	← ngladitz left	15:20
	→ ngladitz joined	15:20
	ChanServ set mode: +o	15:20
	← Sigma left	15:21
	← arvind_khadri left	15:21
	dean → dean\|away	15:22
	→ mribeirodantas joined	15:22
	← rath left	15:22
	→ oriba joined	15:23
	← ShiningThrough left	15:23
	← squentin left	15:23
	EugeneKay changed the topic to: Welcome to #git, home of unofficial support for most things git. \| Current stable vesion: 1.8.3.2 \| Start here: http://jk.gs/git \| Seeing "Cannot send to channel" or unable to change nick? /msg gitinfo .voice \| Happy forks of July!	15:23
EugeneKay	Somebody let me know if you come up with anything better.	15:23
	EugeneKay set mode: -o	15:23
	← dhruvasagar left	15:23
	→ YoMomma joined	15:24
	→ rabellamy joined	15:24
	← emergion left	15:24
	← Balliad left	15:24
iveqy	oh, that's why it's so quite today	15:25
	← oso96_2000 left	15:25
	→ elixir_ joined	15:25
ToxicFrog	iveqy: why?	15:26
	← cheater__ left	15:26
alexander__b	ToxicFrog: the Americans are celebrating themselves (extra hard) today	15:27
iveqy	ToxicFrog: 4 july is a special day for USA	15:27
	→ thiago joined	15:28
ToxicFrog	Oh right	15:28
iveqy	alexander__b: it's also the liberation day of Rwanda	15:28
ToxicFrog	I didn't realize it was 07-04	15:28
	→ ErKa joined	15:29
	← jceb left	15:29
	← snearch left	15:29
	← konundra left	15:30
	← cagedwisdom left	15:30
Jobbe	nice iveqy	15:32
	→ squentin joined	15:32
	← squentin left	15:32
	→ squentin joined	15:32
	← gusnan left	15:32
	← psoo left	15:32
	→ ntus1017 joined	15:32
	← thiago left	15:33
	← _Qman left	15:33
	→ YoungFrog joined	15:35
	→ AWinterman joined	15:36
	→ oso96_2000 joined	15:37
	→ dreiss joined	15:37
	→ engkur joined	15:37
	← mechanicalduck left	15:37
	→ konundra joined	15:37
	← mr_mustard left	15:37
	← harobed left	15:38
	→ thiago joined	15:38
	→ mechanicalduck joined	15:39
	→ leehambley joined	15:39
	→ Tommis_work joined	15:40
	← DoniRS left	15:40
	← InvidFlower left	15:41
pdurbin	yep. just posted a picture of my kid with an American flag: https://plus.google.com/109940583958656614840/posts/Y79v1W64jcx :)	15:41
	→ mckendricks joined	15:42
	→ arkore joined	15:44
	← buzzybron left	15:44
imanc	what is a refspec?	15:44
EugeneKay	!refspec	15:45
gitinfo	[!refspecs] Refspecs are used by fetch/push to specify which refs to transmit where. They have the form "source:destination". They can be prefixed with a "+" to force the update, possibly displacing existing history. More info: http://jk.gs/git-fetch.html or http://i.qkme.me/3tke7r.jpg	15:45
	← coco left	15:45
	← rabellamy left	15:45
	→ mr_mustard joined	15:46
canton7	also used by fetch, which that trigger omits to mention	15:46
	← engkur left	15:46
EugeneKay	Patches welcome.	15:46
	And yes it does	15:46
jast	canton7: it doesn't	15:46
	← chrob left	15:46
canton7	oops	15:46
	my bad	15:46
	← Joost left	15:46
EugeneKay	In fact, it mentions fetch BEFORE push	15:46
canton7	I swear I'm going blind...	15:46
EugeneKay	The acid won't be needed then.	15:47
	→ dhruvasagar joined	15:47
	← AWinterman left	15:47
	← BitPuffin left	15:48
jast	and it has a great visual explanation	15:48
GarethAdams	a surprisingly tall one, since my client displays image links inline	15:49
jast	your client might need a cluebat to the head	15:49
EugeneKay	It's never a good idea to tell people that in public.	15:49
	Never.	15:49
jast	letssee, what's the tallest image I have online	15:49
	→ Cromulent joined	15:49
GarethAdams	oh it's not displayed full size	15:50
	but the aspect ratio makes it look weird	15:50
charon	GarethAdams: let's try and see if we can crash your client with an image bigger than 32kpx on one axis (you wouldn't believe how many programs refuse to work with that)	15:50
	nkambo-afk → nkambo	15:50
GarethAdams	charon: feel free to try ;) in PM if you want	15:51
	away_sondr3 → sondr3	15:51
	← raf left	15:51
jast	meanwhile, http://gg.jk.gs/d7k-triple.jpg	15:52
	← wrouesnel1 left	15:53
imanc	http://bestofmeanwhilein.com/wp-content/uploads/2011/02/meanwhile-in-australia-car.jpg	15:53
	→ Mode-M joined	15:54
	← j0ran left	15:54
	→ molavy joined	15:54
EugeneKay	http://eugenekay.com/img/meanwhileinfinland.jpg	15:54
molavy	hi	15:54
	← moondoggy left	15:54
molavy	i have merge problem git status return : both added: images/load_please_wait.gif	15:55
charon	GarethAdams: http://thomasrast.ch/download/schilt.jpg is a pretty decent one and slightly over 34k horizontally	15:55
	← franckbenoit left	15:55
molavy	i used this command : git checkout --theirs images/load_please_wait.gif	15:55
	→ tvale joined	15:56
GarethAdams	All of those were fine - http://i.imgur.com/kpEovjS.png	15:56
molavy	but when in git status has both added: images/load_please_wait.gif	15:56
	how can i solve this issue	15:56
	← todd_dsm left	15:57
molavy	any idea?	15:57
	→ todd_dsm joined	15:57
EugeneKay	Impressive.	15:57
	→ blase joined	15:58
	blase → Guest99027	15:58
molavy	no idea?	15:58
	← imanc left	15:59
	→ emergion joined	15:59
charon	molavy: checkout --theirs only puts it in the worktree, you still need to add it to mark as resolved	15:59
	→ rickruby joined	16:00
	→ TheNotary joined	16:00
molavy	how can i do this	16:00
	← netsroht left	16:00
EugeneKay	man git-add	16:00
gitinfo	the git-add manpage is available at http://jk.gs/git-add.html	16:00
	← satiricon left	16:00
	← Reuzenwolf left	16:01
	← arkore left	16:01
	← Milianovic left	16:02
	← jnavila left	16:03
	← HenryG left	16:03
	← leehambley left	16:03
	sondr3 → away_sondr3	16:07
molavy	that means just use this command : git add images/load_please_wait.gif	16:07
	?	16:07
	→ scorphus joined	16:07
EugeneKay	Yes.	16:08
	→ charley joined	16:08
	→ jceb_ joined	16:08
molavy	EugeneKay,gitinfo , thanks	16:08
gitinfo	molavy: you're welcome, but please note that I'm a bot. I'm not programmed to care.	16:08
	← AlbireoX left	16:09
	→ tatsuya_o joined	16:09
molavy	yes, smart bot	16:09
pdurbin	charon: https://github.com/blog/1547-release-your-software is awesome but at https://plus.google.com/105944382060485784655/posts/HahiQSay4Wi I ask if 65 MB worth of binaries is too much	16:09
	← dsdeiz_ left	16:09
molavy	charon, thanks	16:09
charon	pdurbin: and that has what to do with me? :)	16:10
	→ LuxuryMode joined	16:10
	← YoungFrog left	16:10
	← chuck8 left	16:10
	→ YoungFrog joined	16:10
	← mechanicalduck left	16:10
	← nfroidure left	16:11
	← tatsuy___ left	16:12
pdurbin	charon: oh... maybe I have the wrong guy. I'm thinking of https://github.com/schacon ... sorry!	16:12
	→ nfroidure joined	16:12
charon	pdurbin: ah, no problem. his irc nick is also schacon, but i haven't seen him here in approximately forever	16:12
	→ vorsorken joined	16:12
	→ mechanicalduck joined	16:13
	→ rudak joined	16:13
	→ AWinterman joined	16:13
pdurbin	charon: oh. the other day you said to me, "congratulations, you've reinvented subversion" and I thought you were him ;)	16:13
	← g41n left	16:15
	← angelsl left	16:16
	← h0bbit left	16:16
	→ Reuzenwolf joined	16:16
	→ ferdev joined	16:16
	← LimeBlast left	16:16
	← JGarrido left	16:17
	← fRAiLtY- left	16:18
	colona_ → colona	16:18
	→ devoldmx3 joined	16:19
	← dhruvasagar left	16:20
	← jbnicolai left	16:20
	→ zhost joined	16:21
	→ rchavik joined	16:21
	← devoldmx left	16:22
	→ Davey joined	16:22
	← pkrzywicki left	16:22
	→ LuxuryMo_ joined	16:23
	← AWinterman left	16:23
	← skorgon left	16:23
	→ s2013 joined	16:23
	→ threesome joined	16:23
s2013	i deleted a folder, then commited that, then regnerated that folder and its contents but when i add it and commit, nothing is changed	16:24
	→ DoniRS joined	16:24
EugeneKay	!repro	16:24
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	16:24
	→ jwmann joined	16:25
	→ el3ctron_ joined	16:25
	← LuxuryMode left	16:26
s2013	https://gist.github.com/ss2k/d828ad99e6df63a53d4d	16:26
	← sebrock left	16:27
iveqy	s2013: you haven't staged the deletions	16:27
s2013	how would i do that?	16:27
iveqy	s2013: use git rm	16:28
s2013	just git rm?	16:28
iveqy	or in this case git commit -a	16:28
s2013	i did commit it	16:28
iveqy	-a?	16:28
s2013	oh whats the difference between -a and -m?	16:28
iveqy	s2013: man git commit	16:28
gitinfo	s2013: the git-commit manpage is available at http://jk.gs/git-commit.html	16:28
	→ LuxuryMode joined	16:28
	→ shentino joined	16:28
s2013	fatal: Paths with -a does not make sense.	16:28
iveqy	s2013: it certainly doesn't	16:29
	s2013: man git commit	16:29
gitinfo	s2013: the git-commit manpage is available at http://jk.gs/git-commit.html	16:29
	← mikecmpbll left	16:29
	→ skorgon joined	16:29
	← mklappstuhl left	16:29
	runningskull → zz_runningskull	16:31
	← LuxuryMo_ left	16:31
	← Cromulent left	16:34
	← oriba left	16:34
	→ dhruvasagar joined	16:34
	← skorgon left	16:34
	→ red_5 joined	16:35
	→ Noldorin joined	16:35
	→ shaek joined	16:35
	→ otherj joined	16:36
	← scrollback left	16:36
	→ scrollback joined	16:36
	→ sebrock joined	16:39
	→ ojacobson joined	16:39
	← undecim left	16:39
	← tvale left	16:40
	→ undecim joined	16:40
	→ sgambino joined	16:41
	→ bytephilia joined	16:41
	← ozette left	16:42
	← mechanicalduck left	16:43
	← sgambino left	16:43
	← sh4rm4 left	16:44
	→ FalsAlarm joined	16:44
	← mishok13 left	16:45
	→ sh4rm4 joined	16:45
	→ skorgon joined	16:45
	→ nicedice_ joined	16:47
	← TheFuzzball left	16:48
	← cedeon left	16:49
	← neuro_sys left	16:50
	← tplaner left	16:50
	→ AWinterman joined	16:50
	→ tatsuya__ joined	16:50
	→ mechanicalduck joined	16:51
	→ sebastia joined	16:51
	← Christi123 left	16:51
	← tatsuya_o left	16:51
	← dreiss left	16:51
	← eijk left	16:51
	← crane_work left	16:52
	→ neuro_sys joined	16:52
	← molavy left	16:53
	← sebastia left	16:53
	→ TheFuzzball joined	16:53
	→ PaulCapestany joined	16:53
	← mckendricks left	16:53
	→ JGarrido joined	16:53
	← sebrock left	16:54
	→ sebrock joined	16:54
	← sebrock left	16:55
	→ sebrock joined	16:55
	← sebrock left	16:55
	← dsantiago left	16:55
	→ chrob joined	16:55
	← JoelMcCracken left	16:56
	← Plummer left	16:56
	← skorgon left	16:56
	→ InvidFlower joined	16:57
	← deuterium left	16:57
	← _goTAN left	16:58
	r04r\|away → r04r	16:59
	← AWinterman left	16:59
	← babilen left	17:00
	→ dsdeiz joined	17:00
	← tianon left	17:01
	Pio` → Pio	17:01
	→ dreiss joined	17:03
	← wagle left	17:05
	← ErKa left	17:05
	← TheFuzzball left	17:05
	→ ErKa joined	17:06
	→ sect0r joined	17:07
	← zoresvit left	17:07
	→ Element9 joined	17:07
	→ skorgon joined	17:07
	→ ShiningThrough joined	17:08
	← chrob left	17:09
	→ knite joined	17:09
	→ metts joined	17:09
	← zhost left	17:10
	→ tianon joined	17:10
	← hyperair left	17:10
	← bytephilia left	17:11
	→ AlbireoX joined	17:11
	→ thecommongeek joined	17:11
	→ HenryG joined	17:12
	← axis_ left	17:12
	→ TheFuzzball joined	17:12
	← ojacobson left	17:12
	→ ojacobson_ joined	17:12
	← segher left	17:12
	← DoniRS left	17:14
	← fragje left	17:14
	→ api joined	17:14
	→ segher joined	17:15
	← segher left	17:15
	→ eijk joined	17:15
	→ zhost joined	17:16
	ojacobson_ → ojacobson	17:16
	← JGarrido left	17:16
	→ segher joined	17:17
	← amcsi_work left	17:18
	← thecommongeek left	17:18
	← PigeonFriend left	17:18
	→ rath joined	17:19
	→ diegoviola joined	17:19
	← \|Freeman\| left	17:19
	← LuxuryMode left	17:20
	← eijk left	17:20
	← undecim left	17:20
	← skylamer` left	17:21
	← skorgon left	17:21
	← thiago left	17:22
	→ Siecje joined	17:22
Siecje	how can I update a repo when the code structure has changed a lot	17:22
	→ undecim joined	17:23
	→ LuxuryMode joined	17:23
	→ mklappstuhl joined	17:24
	→ wagle joined	17:24
	→ AWinterman joined	17:24
	→ eijk joined	17:25
	← rchavik left	17:25
	← FrodoTheHobbit left	17:26
Siecje	Is there a way to update a repo with a new repo?	17:27
	← metts left	17:27
	→ DoniRS joined	17:27
	→ AWinterm_ joined	17:27
	→ metts joined	17:28
	← otherj left	17:28
	← eijk left	17:28
	← pdx left	17:29
	← AlbireoX left	17:29
	→ iliketurtles joined	17:29
	→ eijk joined	17:29
	← nicknisi left	17:29
	← GarethAdams left	17:31
	→ FrodoTheHobbit joined	17:32
	← aartist left	17:33
grawity	I'm not sure what's stopping you from just "updating" it the same way you do it usually	17:33
	Doesn't matter how much of the code has changed.	17:33
	← mribeirodantas left	17:34
	← dreiss left	17:35
	→ g105b joined	17:35
	→ imanc joined	17:35
	← AWinterman left	17:35
g105b	I've done a pull, and the automatic merge failed. I know I want 'their' code rather than 'mine', what do I need to do (with merge conflicts in the files) to use theirs?	17:35
	← zhost left	17:37
	← vigintas left	17:37
	→ fragje joined	17:37
	← AWinterm_ left	17:37
grawity	merge --abort, then retry with `git merge -X theirs <branch>`	17:38
	note that it will still perform an actual merge of the two histories	17:38
	← knite left	17:38
	→ infynyxx joined	17:38
grawity	(that is, you'll still have your own commits too)	17:38
	→ zhost joined	17:39
alexander__b	I never knew that "-X theirs" is the same as "-Xtheirs". I always used the latter.	17:39
grawity	in case you actually want to discard your local commits, you'd use `git reset --hard <branch>`	17:39
	→ axis_ joined	17:39
g105b	Hmm, well I haven't made any commits myself... it's just a branch that hasn't been fetched for a while, now being merged with the master	17:39
grawity	then I guess you're looking for 'reset' :/	17:40
	← zhost left	17:40
	zz_runningskull → runningskull	17:40
	→ cr3 joined	17:40
	← s2013 left	17:40
g105b	since trying to do this myself unsuccessfully, I've managed to keep some of the files - they are untracked and generally in the way ... what's the best way to remove them all so I can merge again?	17:41
cr3	is there a way to diff between an earlier revision all the way to the current changes I've made (not committed)?	17:41
grawity	cr3: git diff <commit>	17:41
	← dc5ala left	17:42
cr3	grawity: wow, thanks!	17:42
	← metts left	17:42
	→ zhost joined	17:42
	← swair left	17:43
	← Thra11 left	17:43
	← infynyxx left	17:44
	← rcu left	17:44
	← spaceonline left	17:44
	→ skorgon joined	17:44
	→ psoo joined	17:44
g105b	thanks Linus, you mean?	17:44
	← Vampire0_ left	17:44
	→ hyperair joined	17:44
	→ babilen joined	17:46
	→ arkore joined	17:46
	→ mckendricks joined	17:47
	← dhruvasagar left	17:48
	← psoo left	17:49
	← rickruby left	17:49
	← hyperair left	17:50
	← pdurbin left	17:50
	→ rednaks joined	17:50
	← Asenar left	17:51
	← api left	17:52
	→ jarkinox joined	17:52
	→ comps joined	17:53
g105b	Something I've never known how to do... once adding something with git add, how to remove it from the repo without removing it from your local machine?	17:53
	→ api joined	17:53
	← diegoviola left	17:53
	→ revyd joined	17:53
canton7	g105b, git rm --cached	17:53
g105b	aha ok thank you	17:54
	← sven_oostenbrink left	17:54
	← dsdeiz left	17:55
	→ btree joined	17:55
	← skorgon left	17:55
	← red_5 left	17:56
	← btree left	17:56
Siecje	So I have a working git repo but it is really old. so I delete everything (except .git/) and I paste all the new code, then I add and commit but git status sayss not staged for commit all the deleted files	17:56
	← mklappstuhl left	17:56
	← mikewintermute left	17:56
canton7	did you 'git rm' those files, or just 'rm' them?	17:57
	anyway, 'git add -A' to stage all deletions and new fiels	17:57
	← tatsuya__ left	17:58
	→ metts joined	17:58
	→ mklappstuhl joined	17:58
	← babilen left	17:58
Siecje	then commit then push right?	17:59
	when I push I get "Everything up-to-date"	17:59
canton7	then git status to make sure it looks right	17:59
	→ Thra11 joined	18:00
	→ Vampire0_ joined	18:00
	→ babilen joined	18:00
Siecje	right	18:00
	→ moondoggy joined	18:00
	→ Phoenixz joined	18:00
	← Phoenixz left	18:00
	→ Phoenixz joined	18:00
	← axis_ left	18:00
canton7	then commit, yeah. look at the output to make sure that looks right :P	18:01
	then if 'git push' still says 'up to date', pastie the output of all of the above	18:01
	→ skorgon joined	18:02
Siecje	git status has nothing	18:02
	so it is all comitted locally right?	18:02
canton7	probably	18:02
	'git show' can make sure	18:02
	→ swair joined	18:02
Siecje	there is only one delete file mode	18:03
	in the status there were more	18:03
canton7	very hard to know what's going on - you just said "git status has nothing", now "in the status there are more"?	18:04
	→ Adlai joined	18:04
Siecje	nvm git show had a lot more to scroll through	18:04
	→ h0bbit joined	18:04
Siecje	canton7: ok so assuming my local repo is up to date and correct	18:04
	→ AWinterman joined	18:04
canton7	looks like the commit went through fine, cool	18:05
	← melee left	18:05
canton7	is it just 'git push' you're doing? no other arguments?	18:05
	→ mloskot joined	18:05
Siecje	I have a local git server so I do	18:06
	git push ssh://user@git-server.com/path/to/project/name.git master	18:06
	→ hwrd\|work joined	18:06
canton7	why not add it as a remote?	18:06
Siecje	ok I have that	18:07
canton7	anyway, full output of your push command?	18:07
Siecje	err no nvm I don't	18:07
	← undecim left	18:07
	→ bmac joined	18:07
Siecje	after the push it just says "Everything up to date"	18:07
	→ harobed joined	18:08
	← g105b left	18:08
	→ vkz joined	18:08
	→ leeN joined	18:08
canton7	outputs of 'git push', 'git ls-remote <url>' and 'git rev-parse master'?	18:09
	oops, 'git branch' not 'git push'	18:09
	→ nbouscal joined	18:09
Siecje	https://dpaste.de/C1nC3/	18:09
	→ api_ joined	18:09
canton7	so you committed those changes to the redlines branch	18:09
	then pushed the master branch	18:10
	→ whowantstolivefo joined	18:10
	← api_ left	18:10
canton7	and git told you that master was up to date... all fine	18:10
	← juliohm left	18:10
	→ maarek joined	18:10
Siecje	relines is local?	18:11
canton7	yup	18:11
	you just made a commit on it	18:11
Siecje	even though I put in the git server after push?	18:11
canton7	hmm?	18:11
	you told git to push the master branch	18:11
	you have the redlines branch, and committed your changes to the redlines branch	18:12
Siecje	git push ssh://username1@git-server.wrs.com/path/to/project/project.git master	18:12
	that is what I did	18:12
canton7	yes	18:12
	the 'master' at the end	18:12
	tells git to push the 'master' branch	18:12
	← api left	18:12
Siecje	push "to" the master branch?	18:12
canton7	push the local master branch to the remote master branch	18:13
	← deckTrout left	18:13
canton7	'master' is short for 'master:master' which is short for 'refs/heads/master:refs/heads/master', i.e. 'push master to master'	18:13
	→ r0bby joined	18:13
Siecje	and my local master is the same as the server's master	18:13
canton7	correct	18:13
Siecje	I need to push redlines to server master	18:13
canton7	hence git's message of 'up to date'	18:14
Siecje	how do I do that?	18:14
canton7	then make your local master look how you want it to look, then push it	18:14
	(or git push <url> redlines:master)	18:14
Siecje	looks promising	18:15
	← Davey left	18:15
	← skorgon left	18:15
	← AWinterman left	18:15
Siecje	I have a remote but the username is wrong, git remote remove is not working	18:16
grawity	It used to be `git remote rm` in earlier git versions.	18:16
	→ AWinterman joined	18:16
canton7	Siecje, man git remote	18:16
gitinfo	Siecje: the git-remote manpage is available at http://jk.gs/git-remote.html	18:16
canton7	also see set-url	18:16
Siecje	I got the command from help 1.7.9.5 here	18:16
	← cr3 left	18:17
canton7	when you say 'not working', what exactly does that mean?	18:17
	← robbyoconnor left	18:17
	canton7 wants to ban the phrases "not working" and "doesn't work"	18:17
Siecje	https://dpaste.de/6APOY/	18:17
	← ShiningThrough left	18:18
canton7	yeah, too old to have 'remove'	18:18
ToxicFrog	canton7: you hold them down, I'll bring the chainsaw	18:18
canton7	but like the help you pastied says, there's rm'	18:18
	ToxicFrog, deal!	18:18
Siecje	I got remove from the help though	18:18
	→ ShiningThrough joined	18:18
	→ solrize_ joined	18:18
Siecje	git version 1.7.9.5	18:18
canton7	Siecje, so there might have been a documentation bug? Not sure. I can't be bothered to search git's history	18:19
	anyways, like your pastie says, 'rm'	18:19
Siecje	ok now how do I remove my username from remote fetch?	18:20
canton7	hmm?	18:20
	the username's in the url?	18:20
	→ api joined	18:20
canton7	git remote set-url git-server <actual url with proper username>	18:21
	← heinrich5991 left	18:21
Siecje	https://dpaste.de/nw6sn/	18:22
canton7	yeah?	18:22
Siecje	I would like to remove the username from fetch	18:22
	← emergion left	18:22
	→ daanavitch joined	18:22
Siecje	I need to use a username and password to push but not to fetch	18:22
	← OOPMan left	18:22
	→ cheater__ joined	18:22
canton7	and you fetch using ssh?	18:23
	→ rednaks_ joined	18:23
Siecje	I think	18:23
	→ skorgon joined	18:23
canton7	you... can't connect over ssh without a username	18:23
	← api left	18:23
canton7	(it defaults to your local username if you don't give one)	18:23
	→ Sam_OTnosc joined	18:23
	→ GarethAdams joined	18:24
	→ heinrich5991 joined	18:24
Siecje	I also have a git:// path	18:24
	→ Reuzenwo_ joined	18:24
Siecje	can I use that?	18:24
	← rednaks left	18:24
canton7	if you wan't. If fetch over ssh works, though, why not just use that?	18:24
Siecje	ok ty one more question	18:25
canton7	*want	18:25
	← papegaaij left	18:25
Siecje	how / should I remove redlines	18:25
	→ deuterium joined	18:25
canton7	(see remote.<name>.url and pushurl in man git config)	18:25
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	18:25
	→ pantsman joined	18:25
	← pantsman left	18:25
	→ pantsman joined	18:25
canton7	Siecje, I can't answer that question for you. Do you want the redlines branch?	18:26
	← Reuzenwolf left	18:26
	→ amcsi joined	18:26
	→ jnavila joined	18:26
	← YoMomma left	18:26
	← elixir_ left	18:27
Siecje	I don't think I do	18:27
	← fragje left	18:27
Siecje	I know how to work around it now with relines:master	18:27
	→ dhruvasagar joined	18:27
canton7	bear in mind you just made that big commit on it	18:28
	man git branch if you want to delete it, anyway	18:28
gitinfo	the git-branch manpage is available at http://jk.gs/git-branch.html	18:28
Siecje	I pushed it to master though	18:28
	or it goes by git repo (folder) I could do a fresh clone?	18:29
canton7	cool, then delete it if you want to	18:29
	→ markfull joined	18:30
	← LuxuryMode left	18:30
	← tadasZ left	18:31
	← skorgon left	18:32
	← jceb_ left	18:32
	← alkino left	18:32
Siecje	so with remote you just do git push remote?	18:33
canton7	aye	18:33
	or 'git push' if git's configured correctly	18:33
	→ gusnan joined	18:35
Siecje	fatal: 'remote' does not appear to be a git repository	18:35
sonOfRa	is your remote named remote?	18:35
	it's probably named origin	18:35
	← Mode-M left	18:35
Siecje	oh ok ty	18:36
	It is starting to make sense now	18:36
canton7	!book	18:36
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	18:36
Siecje	canton7: you would make a great detective	18:36
	I have you no information and you figured it out	18:36
canton7	detecting's got nothing on manning this channel	18:36
Siecje	well no usefull information I told you "it no work good"	18:37
	:)	18:37
canton7	it was sonOfRa who figured that one out, though	18:37
	← bklane left	18:37
Siecje	yeah sonOfRa thanks	18:37
	but canton7 you discovered I had a relines repo	18:37
canton7	tbh I was expecting a detached HEAD - that's the normal cause of 'push' saying up-to-date when you expect something to happen	18:37
	and redlines was a branch, not a repo	18:37
	← hwrd\|work left	18:38
	→ elixir_ joined	18:38
	→ KevinSjoberg joined	18:39
	→ DrShoggoth joined	18:40
	← Amadiro left	18:41
	← amjam left	18:42
	→ elichai2 joined	18:42
	→ AWinterm_ joined	18:42
elichai2	i've a question	18:42
	i was using TortoiseSVN	18:42
	→ fragje joined	18:42
elichai2	and now i want to move to TortoiseGIt	18:42
	← revyd left	18:42
elichai2	now, i know that making non-bare repo's is'nt good	18:42
	so i maked a bare repo, and i couldn't find out how can i now add my project folder to it...	18:43
	→ tadasZ joined	18:43
canton7	elichai2, do you know what a bare repo is?	18:43
	→ Droolio joined	18:43
elichai2	(in TortoiseSVN i just entered "Repo-Browser" and click right click+add)	18:43
	ammm... it's a local repo that you commit into it	18:43
canton7	no	18:44
elichai2	and then you push from it to the server....(git server)	18:44
canton7	a bare repo is a repo with no working tree - there are no checked-out files. they're used on servers - you can push to bare repos, but not to non-bare repos	18:44
elichai2	canton7, so what the diffrent between bare repo to non-bare repo, and why bare is more good?	18:45
	→ Amadiro joined	18:45
canton7	bare isn't 'more good'! non-bare repos are used for working in. you can add files to them, etc	18:45
elichai2	canton7, ammm... i want to commint my project-code and push it to my git server	18:45
canton7	bare repos are used for pushing to	18:45
	so on your git server you'll have a bare repo, then on your local computer, where you work, you'll have a non-bare repo	18:46
	Have you been reading !blogs ?	18:46
gitinfo	[!blog] Blog posts, while helpful and informative, are quite often outdated, give bad advice, or are just plain wrong. Please don't rely solely upon them, or treat them as authoritative.	18:46
elichai2	i've read this: http://stackoverflow.com/questions/1698552/tortoisegit-push-successfully-but-no-new-files/1698657#1698657	18:46
	and he said "It is highly recommended that you never push to a non-bare repository"	18:47
canton7	Yes!	18:47
elichai2	so i figure out i need an bare repo :)	18:47
canton7	you PUSH TO BARE repos	18:47
	you WORK IN non-bare repos	18:47
	→ fragje__ joined	18:47
canton7	it's like saying "I created an svn server locally, but I can't add my files to it"	18:47
	← daanavitch left	18:48
	← fragje__ left	18:48
elichai2	canton7, but at SVN you do have "bare repo folder" and from "repo browser" you add you'r prokect folder into it...	18:48
	*project	18:48
	→ skorgon joined	18:48
canton7	I've no idea what that sentence means. In svn, you have a server, and a client	18:49
	← fragje left	18:49
canton7	the server runs server software, and the client runs client software, like tortoisesvn	18:49
	do you recognise that distinction?	18:49
elichai2	canton7, ok, so i want to work on a project into my pc and commit it and then push it into the github. what i need?	18:49
canton7	answer my question	18:49
elichai2	yes	18:50
canton7	cool. now it's not quite the same in git, but there's still a distinction between 'server' and 'client'	18:50
	servers use bare repos	18:50
	→ rickruby joined	18:50
canton7	clients use non-bare repos	18:50
	got that?	18:50
elichai2	canton7, ok, what i thought is that i kind of have two servers	18:51
	← TheNotary left	18:51
elichai2	the local one and the gitHub one	18:51
canton7	local server?	18:51
elichai2	yes...(that what i thought)	18:51
iveqy	elichai2: you've two repositories	18:51
canton7	what do you mean by 'local server'?	18:51
elichai2	the local-server is the bare....	18:51
canton7	why do you want a 'local server'?	18:52
	→ stamina joined	18:52
ToxicFrog	elichai2: so...you have three repos? The one on the github server, the one on the local server, and the one you actually work from?	18:52
	← tadasZ left	18:52
	← leeN left	18:52
	← AWinterm_ left	18:52
elichai2	ammm.... that my all commits history will be saved in my pc, even i have no internet	18:52
	← Bartzy left	18:52
	← aberrant left	18:52
ToxicFrog	elichai2: but it's already saved in the repo you work in.	18:53
canton7	if you just have a local git project, that keeps all of your commits	18:53
elichai2	and, lets say i want the whole git work without internet(except pull and push)	18:53
canton7	it's how git works	18:53
ToxicFrog	Any git repo, bare or full, stores the entire history.	18:53
iveqy	elichai2: every git repo is a complete repo, however you should not push to a non-bare repo and you cannot work in a bare repo since it has not work tree	18:53
elichai2	so why everyone say " you should create a bare repository that is a clone of your remote repository"	18:53
	← Nicholas_Rishel left	18:53
ToxicFrog	elichai2: they don't, you're misreading something.	18:54
canton7	they're talking about creating a server. like github	18:54
elichai2	ohhh a actual "remote" server?!	18:54
canton7	probably. I've no idea what you've been reading	18:54
	← sect0r left	18:54
elichai2	here: http://stackoverflow.com/questions/1698552/tortoisegit-push-successfully-but-no-new-files/1698657#1698657	18:54
	→ jceb joined	18:54
Siecje	what is #egg?	18:54
	← khushildep left	18:55
iveqy	elichai2: there's actually systems that requires a "local server" the way you think. Like plastic scm for example. However git does not.	18:55
canton7	elichai2, yes, he's talking about creating somewhere you can push to	18:55
	Siecje, no idea	18:55
elichai2	canton7, ok sorry....	18:56
Siecje	I am trying to get the lastest commit of this repo on github but I don't always want the latest I always what the version that is the latest now	18:56
	← InvidFlower left	18:56
	→ kukks joined	18:57
	← kukks left	18:57
	→ kukks joined	18:57
iveqy	Siecje: come again?	18:57
elichai2	so i just need to right-click my Code folder and press "Create Repositry here"?(and select non-bare)	18:57
	→ leeN joined	18:57
canton7	Siecje, ask better questions. try reading your questions back to yourself, pretending that you don't know the context	18:57
	→ Sigma joined	18:57
canton7	elichai2, no idea. we don't use tortoisegit. last time I touched it, it was an absolute pile of shit	18:57
	(though that was a while back)	18:57
iveqy	Siecje: (there's no such thing as "latest" commit (or well there's but git doesn't know which one))	18:58
elichai2	canton7, i need to create the repo at the project folder, right?	18:58
iveqy	elichai2: !gui	18:58
gitinfo	elichai2: Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.	18:58
canton7	elichai2, probably	18:58
Siecje	iveqy: I have a commit number	18:58
	← rurufufuss left	18:58
	← oso96_2000 left	18:58
elichai2	canton7, ok, thanks :)	18:58
iveqy	elichai2: and you probably want to clone your github repository, not create a new one (well a clone will create a new one for you automatic)	18:58
	← rickruby left	18:58
iveqy	Siecje: you have a sha1 yes	18:59
	← skorgon left	18:59
	← squentin left	18:59
elichai2	iveqy, i want to push my code project there...(excisting code)	18:59
ToxicFrog	Is the existing code already under git?	18:59
iveqy	elichai2: you want to push your code to a commit?	18:59
	→ squentin joined	18:59
elichai2	commit and then push into GitHub	19:00
	→ oso96_2000 joined	19:00
iveqy	elichai2: okay?	19:00
elichai2	iveqy, what okay?	19:01
iveqy	elichai2: you want to clone your github repo, do you changes, add them, commit them and then push them	19:01
	where are you stuck?	19:01
	← h0bbit left	19:01
elichai2	iveqy, dosen't matter, i don't stuck i just want to know i'm doing every-thing all right	19:02
	← marthinal left	19:02
elichai2	gitinfo, so if i will have trouble to merge my TortoiseSVN Histroy with the TortoiseGit to which channel i need to go?	19:02
	→ TheNotary joined	19:03
	← rudak left	19:03
iveqy	elichai2: !bot	19:03
gitinfo	elichai2: [!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans. Please see http://jk.gs/git/bot for more information about how to use me.	19:03
	→ rudak joined	19:03
iveqy	elichai2: I suggest you look at tortoisesvn/git's homepage to see if they have a maillist or irc-channel	19:04
elichai2	lol	19:04
iveqy	elichai2: we here will help you as good as we can but afaik none of us use tortoise git	19:04
	there's also a #svn channel but the responses there are slow, seems like noone uses svn anymore =)	19:04
	← iliketurtles left	19:04
	→ yacks joined	19:06
	→ wdroberts joined	19:09
	→ mtk joined	19:09
	← wdroberts left	19:10
	← chichou left	19:10
	→ wr joined	19:10
	← tystr left	19:10
	← jwmann left	19:10
	→ jwmann joined	19:11
	→ jackdempsey joined	19:11
	→ tystr joined	19:13
tang^	I'm doing up some documentation for the office… we have a few people using tortoisegit	19:13
	← jnavila left	19:13
	→ paul424 joined	19:14
	← dkpi left	19:15
	← mckendricks left	19:15
	→ daanavitch joined	19:15
	→ jceb_ joined	19:15
	→ BSaboia joined	19:16
	→ skorgon joined	19:17
	→ hwrd\|work joined	19:18
	← jceb left	19:19
	→ AWinterm_ joined	19:19
	→ spaceonline joined	19:20
	→ Guest44672 joined	19:20
	→ mckendricks joined	19:20
	← elichai2 left	19:20
	→ FreezingCold joined	19:20
	← mckendricks left	19:21
	→ elichai2 joined	19:21
	→ raf joined	19:22
elichai2	sorry, but one last question	19:22
	i'm trying to do this guid:	19:22
	http://jimmykeen.net/articles/03-nov-2012/how-migrate-from-svn-to-git-windows-using-tortoise-clients	19:22
	(don't worry the question isn't abou UI)	19:22
	(or specific program)	19:22
	and at the last part he saying how to export it to a bare repo,	19:23
	i need to do the same just to the GitHub repo?	19:23
canton7	if you want	19:23
dr_lepper	elichai2: yeah, you can push to github repo instead of creating a local bare repo	19:24
	← jceb_ left	19:24
	← skorgon left	19:24
iveqy	elichai2: as you can see tang^ has experience with gui, so if you have a question ask here and you might get lucky. We don't bann asking question we just don't promise an answer =)	19:25
	← paul424 left	19:26
	← Akufen left	19:26
	← mechanicalduck left	19:26
tang^	looks like this boils down to adding a github repo as a remote and pushing	19:27
	Guest44672 → diegoviola	19:28
elichai2	tang^ you have more useful way to move from tortoiseSVN to tortoiseGIT?	19:28
	← sampiero_ left	19:28
canton7	that way is sensible	19:29
	(using git-svn)	19:29
	rohan32\|afk → rohan32	19:29
	← AWinterm_ left	19:29
	← Rix left	19:30
elichai2	canton7, yes, but in the last part he explain how to get red of the SVN and use GIT only...but it's not really working for me...	19:30
tang^	elichai2: the tutorial you're following looks good. If you're stuck at the point of a remote repository and want to use GitHub as that remote...	19:30
canton7	elichai2, again, specific questions please	19:30
	otherwise no-one can help you	19:30
tang^	hang on. I need to clone one of my svn repos as a test	19:30
elichai2	canton7, tang^ understanded me pretty well :)	19:31
	← Adlai left	19:31
canton7	even he won't be able to solve "not really working for me" without more info ;)_	19:32
	← raf left	19:32
	→ boblu joined	19:32
	→ mfulz joined	19:33
elichai2	canton7, i didn't understand how to do the same he did to import to the bare repo, just to the GitHub repo...	19:33
	→ Mode-M joined	19:33
	→ rudak1 joined	19:33
	→ whowantstolivef1 joined	19:33
	rohan32 → rohan32\|afk	19:33
	→ paul424 joined	19:34
	→ Bruno__ joined	19:34
	→ Rix joined	19:34
	→ JakeSays2 joined	19:34
elichai2	lol in #svn channel they trying to convince me to stay at SVN.... Quote:	19:34
	"elichai2: What is your motiviation to consider moving away from svn?"	19:35
canton7	lol, thought that could happen	19:35
	→ Shusshu joined	19:35
	← Shusshu left	19:35
	→ _grawity joined	19:35
	→ rue_XIV joined	19:35
	→ yshh_ joined	19:36
	→ martinjlowm_ joined	19:36
	→ adhawkinz joined	19:36
	adhawkinz → adhawkins	19:36
	← adhawkins left	19:36
	→ adhawkins joined	19:36
	→ raf joined	19:36
	→ Klowner_ joined	19:36
	→ mutex_ joined	19:36
	→ mfilipe_ joined	19:36
	→ twem2_ joined	19:37
	→ BinGOs_ joined	19:37
	← boblu left	19:37
	← vorsorken left	19:37
	→ yo61_ joined	19:38
	→ ozzloy_ joined	19:38
	→ TheMoonMaster_ joined	19:38
	→ wereHamster joined	19:38
	→ rockfrui1 joined	19:38
	→ zequence_ joined	19:38
	→ SaCu joined	19:38
	← Sp4rKy left	19:38
	→ chronos joined	19:38
	→ tazle__ joined	19:38
	→ sunny256_ joined	19:38
	← raf left	19:38
	→ sneakret_ joined	19:38
	← rudak left	19:39
	← ben_alman left	19:39
elichai2	tang^, just remind you to don't forget me :)	19:39
	→ sqz joined	19:39
	→ sir_lewk_ joined	19:39
	← daanavitch left	19:39
	→ wolog_ joined	19:39
	← vmiklos left	19:39
	→ cb_ joined	19:39
	→ Tabstar joined	19:39
	→ vmiklos joined	19:39
	→ isomorph1smes joined	19:39
	→ rndbit` joined	19:39
	← TheMoonMaster left	19:39
tang^	elichai2: basically, once you create a GitHub repository for your project, get the URL for it and do a Git Sync and go into Manage the remotes.	19:39
	TheMoonMaster_ → TheMoonMaster	19:39
	→ malesca_ joined	19:39
	→ jave_ joined	19:39
	→ rblackwe joined	19:40
	← elixir_ left	19:40
	← martinjlowm left	19:40
	← adhawkins-away left	19:40
	← AWinterman left	19:40
	← Pengoo left	19:40
	← Klowner left	19:40
elichai2	iveqy, don't bother join to #svn one of them took me to a query chat to explain me why i need to stay at SVN :)	19:40
tang^	I think you'll be looking at CLI editing the config (or manually) to remove the svn-remote settings	19:40
	→ AWinterman joined	19:40
	← wereHams1er left	19:40
	← yo61 left	19:40
	← s0x left	19:40
	← schlumpi left	19:40
	← ozzloy left	19:40
	← sunny256 left	19:40
	← zequence left	19:40
	← tazle_ left	19:40
	← Gizmokid2005 left	19:40
	← tr4656_ left	19:40
	← twem2 left	19:40
	← rockfruit left	19:40
	← yshh left	19:40
	→ schlumpi_ joined	19:40
elichai2	WTF all that quit's are?!	19:40
	→ rednaks__ joined	19:40
	→ THE_BOULDER joined	19:40
	→ raf joined	19:41
	← Someguy123 left	19:41
	← sniffells left	19:41
	← wolog left	19:41
	← milki left	19:41
	← dermoth\|home left	19:41
	← Tritania left	19:41
	← dytrivedi left	19:41
	← JPT left	19:41
	← malesca left	19:41
	← sqz_ left	19:41
	← BinGOs left	19:41
	← grawity left	19:41
	← sir_lewk left	19:41
	← Caelum left	19:41
	← strictlyb left	19:41
	← rphillips left	19:41
	← Derega left	19:41
	← sneakret left	19:41
	← notbenh left	19:41
	← mutex left	19:41
	← _SaCu_ left	19:41
	← BSaboia left	19:41
	← rednaks_ left	19:41
	← whowantstolivefo left	19:41
	← bluj left	19:41
	← esto left	19:41
	← JakeSays left	19:41
	← rue left	19:41
	← nutron left	19:41
	← rndbit left	19:41
	← kaictl left	19:41
	← chronossc left	19:41
	← jave left	19:41
	← totte left	19:41
	rndbit` → rndbit	19:41
	← mfilipe left	19:41
	← jojva left	19:41
	← m1sc left	19:41
	← rblackwe_ left	19:41
	← xoebus left	19:41
	← ruskie left	19:41
	→ Caelum joined	19:41
	← Tabmow left	19:41
	← shentino left	19:41
	← devoldmx3 left	19:41
	← r0bby left	19:41
	← isomorphismes left	19:41
	← danielbw left	19:41
	← andref_dias left	19:41
iveqy	I sense a netsplit	19:41
	→ danielbw joined	19:41
	→ jojva joined	19:41
	→ r0bby joined	19:41
	THE_BOULDER → kaictl	19:41
	→ milki joined	19:41
	→ rphillips joined	19:42
	_grawity → grawity	19:42
	→ strictlyb joined	19:42
	→ skorgon joined	19:42
	→ fly9 joined	19:42
	→ thlteam joined	19:42
	→ Gizmokid2005 joined	19:42
tang^	oh I see… push to a remote clone and reclone it back without the SVN stuff	19:42
	→ Tommy[D] joined	19:42
elichai2	tang^, how do i do that?	19:42
	← thlteam left	19:42
	BinGOs_ → BinGOs	19:42
	← D4N3 left	19:43
	→ fragje joined	19:43
	← DonRichie left	19:43
	wolog_ → wolog	19:43
	← BinGOs left	19:43
	→ BinGOs joined	19:43
	→ dytrivedi joined	19:43
	→ bluj joined	19:43
elichai2	lol"	19:43
	:	19:43
	tacit> Sure. Would you pay to just get it done?	19:43
	<elichai2> not really...	19:43
	<tacit> Okay no problem. See you around.	19:43
	← SergeyPenkin left	19:43
	→ JPT joined	19:43
	→ tr4656 joined	19:44
	→ ncd\|leeN joined	19:44
	→ Sp4rKy joined	19:44
	→ Tritania joined	19:44
tang^	can I take this PM?	19:44
	→ notbenh joined	19:44
	→ m1sc joined	19:45
	→ sguselnikov joined	19:45
	→ sniffells joined	19:45
	← sguselnikov left	19:45
	→ esto joined	19:45
elichai2	tang^, what do you mean "take it"(you mean PM=private Message, right?)	19:45
	← diegoviola left	19:45
	← heinrich5991 left	19:45
	← ickyb0d left	19:45
	← candlejackson left	19:45
	← ismlages left	19:45
	← pilif left	19:45
	→ pdx joined	19:45
	← whowantstolivef1 left	19:45
	→ jalmeida joined	19:46
	→ dermoth\|home joined	19:46
	→ chuckhar_ joined	19:46
	→ s0x joined	19:46
	← mklappstuhl left	19:46
	→ Pengoo joined	19:46
	← Mpenzi left	19:46
	← nbouscal left	19:46
	← dean\|away left	19:46
	← Chryyz left	19:46
	→ Mpenzi joined	19:47
	← pdx left	19:47
	→ diegoviola joined	19:47
	→ ben_alman joined	19:47
	← leeN left	19:47
	← harobed left	19:47
	← lifelike left	19:47
	← erkules left	19:47
	← Remram left	19:47
	← kerrick left	19:47
	→ D4N3 joined	19:48
	→ pdx joined	19:48
	← Twey left	19:48
	→ pilif joined	19:48
	→ kerrick joined	19:48
	→ heinrich5991 joined	19:48
	→ candlejackson joined	19:48
	→ nutron joined	19:48
	→ harobed joined	19:48
	→ erkules joined	19:48
	→ Remram joined	19:48
	← doener left	19:48
	→ doener_ joined	19:49
	← chuckharmston left	19:49
	← jjasinski left	19:49
	→ dreiss joined	19:49
	→ _ffio_ joined	19:49
	→ dean joined	19:49
	← ffio_ left	19:49
	← arkore left	19:49
	→ wagle_ joined	19:49
	→ Hamled\|Erp joined	19:49
	← wagle left	19:49
	← Hamled left	19:49
	→ Derega joined	19:50
	→ shentino joined	19:50
	→ Joost joined	19:50
	→ elixir_ joined	19:51
	→ arietis joined	19:51
	→ bartzy joined	19:52
	← raf left	19:52
	← jave_ left	19:52
	← Naeblis left	19:52
	→ mikef_ joined	19:52
	→ ickyb0d joined	19:52
	→ totte joined	19:52
	→ squentin_ joined	19:52
	← squentin_ left	19:52
	→ squentin_ joined	19:52
	→ mikewintermute joined	19:52
	→ Naeblis joined	19:53
	→ Someguy123 joined	19:53
	← skorgon left	19:53
	← Sigma left	19:53
	→ spb_ joined	19:53
	← AWinterman left	19:54
	→ reikalus2kka joined	19:54
	→ BinGOs_ joined	19:54
	→ arkore joined	19:54
	← rudak1 left	19:54
	→ rudak joined	19:54
	← arietis left	19:54
	→ thiago joined	19:55
	→ rakl joined	19:56
	→ rickruby joined	19:56
	→ AWinterman joined	19:56
	→ halfie_ joined	19:56
	→ kukks1 joined	19:57
	← babilen left	19:57
	→ jave joined	19:57
	← D4N3 left	19:57
	← BinGOs left	19:57
	← squentin left	19:57
	← kukks left	19:57
	← reikalusikka left	19:57
	← moonkey_ left	19:57
	← spb left	19:57
	← hoyang left	19:57
	← jdav_gone left	19:57
	← Mpenzi left	19:57
	← halfie left	19:57
	← afuentes left	19:57
	→ Mpenzi joined	19:57
	squentin_ → squentin	19:57
	→ afuentes_ joined	19:57
	halfie_ → halfie	19:57
	spb_ → spb	19:57
	← j416 left	19:58
	BinGOs_ → BinGOs	19:58
	← teuf left	19:58
elichai2	can someone stop this Fucking quit's plauge!!	19:58
	→ jdav_gone joined	19:58
	→ D4N3 joined	19:58
	← BinGOs left	19:58
	→ BinGOs joined	19:58
	→ hoyang joined	19:58
elichai2	*plague	19:58
	→ moonkey_ joined	19:58
	→ babilen joined	19:59
	→ j416 joined	19:59
	→ Twey joined	19:59
tang^	that's a network problem	19:59
	Naeblis → Naeblis_	20:00
	← Siecje left	20:02
cbreak	you should just disable displaying of join/leaves	20:03
	→ joelpittet joined	20:03
	← ngladitz left	20:04
	→ vedant joined	20:05
	→ Sigma joined	20:06
shentino	Is there a way to clone a repo and copy its remotes as well?	20:06
	I'm migrating a local clone into a shared cache and wish to preserve the upstream pointers	20:06
ojacobson	shentino: broadly no	20:06
	→ devoldmx joined	20:06
grawity	No, unless you grab them from .git/config directly	20:06
	→ amjam joined	20:06
ojacobson	all of that information is in .git/config though	20:06
	→ kiten joined	20:06
	← AWinterman left	20:06
	← jeremyheiler left	20:07
	← dreiss left	20:07
	← paulweb515 left	20:07
shentino	ok thanks	20:07
	→ aberrant joined	20:07
iveqy	shentino: rsync =)	20:07
	→ dreiss joined	20:08
cbreak	shared cache?	20:08
tang^	probably server repo	20:08
cbreak	bare repositories with remotes? Hmm.	20:09
	rsync should work just fine	20:09
	or just mv if it's on the same filesystem	20:09
	→ ruskie joined	20:09
	→ sq-one joined	20:10
	→ skorgon joined	20:10
	→ revyd joined	20:10
	→ mechanicalduck joined	20:10
	← rakl left	20:12
	→ sobersabre joined	20:14
sobersabre	hi. need some advice on dev process workflow (with git)	20:14
	→ fiyawerx joined	20:14
sobersabre	we've got several components currently developed in separated git repos.	20:14
	← dreiss left	20:15
sobersabre	and we want to establish a release cycle.	20:15
EugeneKay	!flow	20:15
gitinfo	[!gitflow] The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references	20:15
	← doener_ left	20:15
EugeneKay	!subrepos	20:15
gitinfo	[!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.	20:15
	→ Sigma[Mtp] joined	20:15
EugeneKay	Combine as needed.	20:16
	← Sigma left	20:16
EugeneKay	Bake at 350F for two hours	20:16
	Release as 1.0.0	20:16
sobersabre	but the dilemma is whether to somehow to continue to have multitude of git repos, tagging specific commit OR to reorg it into one big repo...	20:16
	← sniffells left	20:16
EugeneKay	If the parts exist and build logically as separate parts, keep them separate.	20:16
	If they don't; don't.	20:17
sobersabre	it's: backend, utils, frontend and deployment script. backend needs utils, fronted doesn't need anything.	20:17
	→ AWinterman joined	20:17
EugeneKay	Then I'd keep them separate.	20:17
sobersabre	I don't understand the benefit of either way.	20:17
	← Sigma[Mtp] left	20:18
	← mfulz left	20:18
sobersabre	traditionally release is a 1 semantic thingie on the whole product.	20:18
	→ juliohm joined	20:18
EugeneKay	Keeping the indepdent parts independent simplifies git history & management when you approach it from the angle of doing multiple independent changes on the overall codebase	20:18
	← skorgon left	20:18
juliohm	Is it possible to get a patch file and apply only parts of it?	20:18
	← cheater__ left	20:18
juliohm	Only the parts related to a specific file?	20:18
EugeneKay	The pain is, as you suspect, that you have to tag releases 4 times. The benefit is that you don't have to release, eg, Utils and Deployment scripts every time you change your Frontend, or even the Backend; only when a change becemes necessary to them	20:19
sobersabre	juliohm: --interactive	20:19
	← aberrant left	20:19
	← hwrd\|work left	20:19
EugeneKay	IOW, drop the requirement that everything have the same version number and you'll be much happier.	20:19
juliohm	sobersabre, what is the full command? Sorry, never applied a patch before.	20:19
EugeneKay	The only thing that you might want to tihgtly couple would be the Front & Back.	20:19
	→ tatsuya_o joined	20:19
cbreak	juliohm: just git apply it and git checkout -p HEAD the rest away	20:20
sobersabre	EugeneKay: you seem to be in the direction.	20:20
	← Lyn left	20:20
sobersabre	I am thinking of things like regressions... if I have multitude of repos, it'd be harder to track down the blame (I'm not sure, just a feeling)	20:21
	→ sniffells joined	20:21
sobersabre	if it's in 1 repo, it'd be relatively simple to pinpoint specific merge that caused the regression.	20:21
EugeneKay	Depends upon the bug, but IMO not really.	20:21
sobersabre	ok.	20:21
juliohm	cbreak, that's is also good :)	20:21
EugeneKay	I'd say that it simplifies the problem because you can more easily discard irrelevant stuff if you know it's a Server bug	20:22
sobersabre	I guess it's more of the novelty difficulty :)	20:22
	thanks.	20:22
EugeneKay	Any time.	20:22
sobersabre	the real story has more components, but I get the general idea :)	20:22
elichai2	How can i make my client to dismiss join/leaves alerts?(HexChat)	20:23
	← imanc left	20:23
sobersabre	elichai2: what client are you on ?	20:23
EugeneKay	Not really a #git question, but it's under Settings, Text Events	20:23
grawity	no it's not there >_>	20:23
	→ hwrd\|work joined	20:24
elichai2	hexchat (same as Xchat)	20:24
EugeneKay	Yes it is. Set the field to blank.	20:24
juliohm	cbreak, git apply creates a commit or juts changes the working tree?	20:24
grawity	Which is kind of a ... stupid way to do it, honestly	20:24
_ikke_	juliohm: the latter	20:24
EugeneKay	You're stupid.	20:24
juliohm	_ikke_, nice. :)	20:24
ToxicFrog	elichai2: alternately, right-click the channel tab, settings, hide join/part messagse	20:24
elichai2	don't have this option :(	20:25
EugeneKay	You end up having to do that for /every/ channel, and you don't get to hide op messages either	20:25
elichai2	ok, i asked #hexchat channel	20:25
EugeneKay	Yes you do, unless they've changed it radically sicne a week ago	20:25
	← fragje left	20:25
	← sobersabre left	20:25
	→ fragje joined	20:26
	→ _md joined	20:26
	← mechanicalduck left	20:27
	← thehandler left	20:27
	→ mfulz joined	20:27
	← vedant left	20:27
	← Pengoo left	20:27
	→ Pengoo joined	20:28
	→ dreiss joined	20:28
	→ ecube_ joined	20:28
	← bmac left	20:28
_ikke_	WeeChat + smart filter ftw	20:28
	→ mechanicalduck joined	20:28
	runningskull → zz_runningskull	20:28
EugeneKay	/j ##distrowars	20:28
	← mfulz left	20:29
_ikke_	lol	20:29
	is that a thing/	20:29
	?	20:29
	ecube_ → ecube	20:29
	→ mishok13 joined	20:29
	← maarek left	20:29
	← freestyl3r left	20:29
	→ mfulz joined	20:30
	→ skorgon joined	20:30
	← fragje left	20:30
	← TheBrainWork left	20:31
	← TheNotary left	20:31
EugeneKay	!tryit	20:31
gitinfo	[!tias] Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/1-basic-usage/tias.html may help with git-specific TIAS.	20:31
	→ mckendricks joined	20:32
	→ amjam_ joined	20:32
	← ojacobson left	20:32
	→ ojacobson_ joined	20:32
	→ AWinterm_ joined	20:33
juliohm	Ok, i have a huge patch i did some months ago, but it's failing to apply to a repo i just cloned	20:34
	how to solve this issue?	20:34
	The repo tree is now different	20:34
	How to produce plain diffs from this patch to apply by hand?	20:34
	ojacobson_ → ojacobson	20:35
_ikke_	juliohm: What format is the patch in?	20:35
	→ ozette joined	20:35
_ikke_	How were they produced?	20:35
	→ chrob joined	20:35
	← amjam left	20:35
	→ drizzd joined	20:36
	← tatsuya_o left	20:36
juliohm	_ikke_, if i remember i produced with git format-patch	20:36
aspect	there's a better !backup strategy than just copying trees around? hmm ..	20:36
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	20:36
_ikke_	juliohm: So you got mail files?	20:36
	mailbox format or something?	20:37
iveqy	EugeneKay: sobersabre should use a superproject, in that way he'd always had a release and just had to tag the superproject. Seems like he had four seperate repos. To bad he left	20:37
juliohm	_ikke_, http://pastebin.com/RyWA8Np1	20:37
	← mikef_ left	20:37
EugeneKay	I presented that option too, but I disagree with it.	20:38
	→ mikef_ joined	20:38
	← amjam_ left	20:38
jast	yeah, you're a submodule hater	20:38
_ikke_	juliohm: If you have a recent version of git, you might want to try git apply -3 <patch>	20:38
	← kiten left	20:38
iveqy	juliohm: checkout the commit you had for a month ago when you did the patch in a new branch, apply the patch, and merge and welcome to mergehell.	20:39
	← elichai2 left	20:39
	→ kiten joined	20:39
iveqy	EugeneKay: I know, I don't think he got that as an option. Why don't you like that? The 4 repos have a relation, it should be kept track of in some way	20:39
juliohm	_ikke_, what is the -3 there?	20:39
iveqy	juliohm: man git apply	20:40
gitinfo	juliohm: the git-apply manpage is available at http://jk.gs/git-apply.html	20:40
EugeneKay	There are better ways to indicate the relationship, such as a dependency flag	20:40
	$PACKAGE_MANAGER does this great	20:40
_ikke_	juliohm: It falls back to a 3 way merge if all information is available	20:40
EugeneKay	With subrepos you're just shifting the pain of merging from code-time to release-tim	20:40
	← ozette left	20:40
	← danicampa901 left	20:41
	← skorgon left	20:41
juliohm	_ikke_, iveqy , it won't actually merge anything, right? just change my working tree?	20:41
iveqy	EugeneKay: now I don't follow you. A superproject just track 4 repos, each developer continue to work on 1 repo. The release manager does a configuration of the 4 subrepos and commit that configuration to the superproejct	20:41
_ikke_	"git-apply - Apply a patch to files and/or to the index"	20:42
juliohm	otherwise i prefer to add the feature manually by hand, i don't have enough expertise to deal with conflicts yet	20:42
iveqy	juliohm: there won't be less or more conflicts if you do it by hand or with git or with patch	20:42
juliohm	iveqy, by hand i mean, reproduce the changes manually with a text editor	20:43
EugeneKay	Yup, you have to sit and make sure they all play nicely when you make a monolithic tag	20:43
iveqy	EugeneKay: and I'm not really interested in getting a consensus in what's "best". I just want to understand your opinion	20:43
juliohm	i think is safe to simply try the -3 option, right?	20:43
	← AWinterm_ left	20:43
iveqy	juliohm: I know	20:43
	← fiyawerx left	20:43
iveqy	juliohm: you will still have as many merge conflicts to solve as if you use apply	20:43
EugeneKay	Then there's the fun of "what if RepoC didn't change any?" "TOO BAD, UPDATE BECAUSE VERSIONS"	20:43
juliohm	iveqy, _ikke_ I think is safe to simply try the -3 option, right? since it won't affect the repo, it's just changing the working tree and the index which can be reverted with a git checkout HEAD	20:44
	← AWinterman left	20:44
_ikke_	juliohm: Even if it did a commit, it would be trivial to undo	20:44
iveqy	EugeneKay: yeah, but that's common, the git version raises everytime even if it depends on libraries that doesn't	20:44
juliohm	_ikke_, ok, i'll see here how things go. thanks to all. :)	20:45
EugeneKay	In his scenario, the libraries WOULD increase version. ;-)	20:45
	That's silly.	20:45
	EugeneKay goes to hunt a cheezburger	20:45
	→ maxmanders joined	20:45
_ikke_	You can haz cheezburger?	20:45
	← eijk left	20:46
	← mechanicalduck left	20:47
	← mr_mustard left	20:47
	→ mechanicalduck joined	20:48
	→ skorgon joined	20:48
rudi_s	!doc	20:49
gitinfo	A list of useful documentation of all kinds is here: http://git-scm.com/documentation -- or try the wiki at http://git.wiki.kernel.org/. Also try typing "!book" "!cs" "!bottomup" "!parable" "!best_practices" or "!vcbe" or "!designers" here in IRC. !book is probably the most helpful.	20:49
	→ mr_mustard joined	20:49
rudi_s	!bottomup	20:49
gitinfo	'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf	20:49
rudi_s	!cs	20:49
gitinfo	"Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup	20:49
	→ mklappstuhl joined	20:49
	→ madewokherd joined	20:49
	← mikef_ left	20:50
	→ alunduil joined	20:50
	→ raf joined	20:51
_ikke_	!privmsg	20:51
gitinfo	You can get gitinfo keyword expansion (e.g. !doc or this one) sent directly to you by sending a private message to me: /msg gitinfo !doc. This avoids spamming the channel. Also see http://jk.gs/git/bot/trigger.php	20:51
	→ elichai2 joined	20:51
elichai2	back :)	20:51
	← mfulz left	20:51
	← ncd\|leeN left	20:52
	← bartzy left	20:52
tang^	apparently I need to add an alias get='git' :-/	20:53
	← dreiss left	20:53
	→ nilg joined	20:53
	→ LuxuryMode joined	20:53
	→ andref_dias joined	20:54
_ikke_	"Gotta git get"	20:55
	← spaceonline left	20:55
	→ bytephilia joined	20:57
	← bytephilia left	20:57
	← jarkinox left	20:58
	← raf left	20:58
	zz_runningskull → runningskull	20:58
	← KillYourTV left	21:00
	→ chrisss404 joined	21:01
	← skorgon left	21:01
	→ preflex joined	21:02
	← stamina left	21:02
	← elixir_ left	21:02
	→ elixir__ joined	21:02
	runningskull → zz_runningskull	21:03
	← mklappstuhl left	21:03
	→ KillYourTV joined	21:03
	→ bartzy joined	21:03
	→ Siecje joined	21:04
Siecje	Can you have an empty folder in git?	21:05
_ikke_	Siecje: git doesn't track folders	21:05
	← LuxuryMode left	21:05
_ikke_	Siecje: So, git won't track the folder if there are no files in it that are tracked	21:05
grawity	it's technically possible to have one in the data structures, it's probably not going to last long though since git won't add it in future commits	21:06
	→ BSaboia joined	21:08
	← sq-one left	21:08
	→ skorgon joined	21:09
	← chrisss404 left	21:09
Siecje	so just put a file in there?	21:09
	→ chrisss404 joined	21:09
	← mechanicalduck left	21:09
Siecje	.gitdontignore	21:09
	← D4N3 left	21:10
	→ AWinterman joined	21:10
grawity	Or .gitignore	21:11
	Or .empty or .keep	21:11
	← ShiningThrough left	21:11
	← Bruno__ left	21:11
	→ tadasZ joined	21:13
	← Thra11 left	21:14
	← skorgon left	21:16
	← Siecje left	21:17
	→ mechanicalduck joined	21:19
	→ Yakko joined	21:19
	→ raf joined	21:19
	_ffio_ → ffio	21:20
	← AWinterman left	21:21
	← mishok13 left	21:23
	← diegoviola left	21:24
	← ojacobson left	21:25
	← hwrd\|work left	21:25
	→ ojacobson_ joined	21:25
	ojacobson_ → ojacobson	21:26
	← devoldmx left	21:27
	← todd_dsm left	21:27
	→ devoldmx joined	21:27
	→ todd_dsm joined	21:27
	← revyd left	21:28
	← oonska left	21:29
	← donmichelangelo left	21:30
	← Mode-M left	21:30
	→ donmichelangelo joined	21:30
	← raf left	21:31
	← chrisss404 left	21:32
elichai2	i've got a question	21:32
	→ mfulz joined	21:32
elichai2	after i did a commit&push all my commits gone	21:32
	any idea?	21:32
	→ kreantos joined	21:32
	→ maestrojed joined	21:32
	← elixir__ left	21:33
	→ skorgon joined	21:33
_ikke_	define gone	21:33
tang^	that would be because you forced the push	21:33
elichai2	:(	21:33
	← jackdempsey left	21:33
elichai2	ok, that was enuogh for one day :)	21:33
	i will continue tomorrow :)	21:34
	← todd_dsm left	21:35
	← KevinSjoberg left	21:35
	→ todd_dsm joined	21:36
iveqy	elichai2: well, they aren't gone for real (or at least won't be for 14 days)	21:38
	← v0n left	21:40
	← Jackneill left	21:40
	← elichai2 left	21:40
	← nilg left	21:41
	→ raf joined	21:41
	→ tjbiddle joined	21:41
	→ danishkhan joined	21:43
	→ elixir__ joined	21:44
	→ honschu joined	21:45
	← honschu left	21:45
	→ honschu joined	21:45
	← skorgon left	21:45
	← maestrojed left	21:45
	→ Chryyz joined	21:46
	← markfull left	21:46
	→ AWinterman joined	21:47
	← honschu_ left	21:48
	→ cagedwisdom joined	21:48
	→ cilly joined	21:48
	← DoniRS left	21:48
	← raf left	21:48
	← KillYourTV left	21:49
	→ raf joined	21:50
	← Joost left	21:51
	→ skorgon joined	21:52
	→ KillYourTV joined	21:54
	← kiten left	21:54
	← kreantos left	21:55
	→ AWinterm_ joined	21:55
	← swair left	21:55
	← danishkhan left	21:55
	← mikewintermute left	21:55
	→ v0n joined	21:57
	→ danishkhan joined	21:57
	← arkore left	21:57
	← mfulz left	21:57
	← AWinterman left	21:58
	→ Balliad joined	21:59
	zz_runningskull → runningskull	21:59
	← AWinterm_ left	21:59
	→ kreantos joined	21:59
	← kreantos left	21:59
	← JakePee left	22:00
	→ kiten joined	22:00
	→ sven_oostenbrink joined	22:01
	→ arkore joined	22:01
	← cilly left	22:02
	← Element9 left	22:02
	runningskull → zz_runningskull	22:03
	← Phoenixz left	22:03
	← shentino left	22:04
	JakeSays2 → JakeSays	22:05
	← skorgon left	22:05
	← bdavenport left	22:05
	→ shentino joined	22:06
	← harobed left	22:06
juliohm	When we fork on Github we can't change the name of the repo?	22:06
	We can edit the description, but the name of the repo is fixed?	22:06
	← rednaks__ left	22:06
	→ hwrd\|work joined	22:06
	→ rednaks joined	22:06
	← paul424 left	22:07
	← raf left	22:07
	→ bdavenport joined	22:08
	→ YammYcoding joined	22:08
YammYcoding	guys, how i find in site all issues opened by me?	22:08
thiago	what site?	22:09
YammYcoding	github	22:09
thiago	please ask in #github	22:09
YammYcoding	okey	22:09
	← YammYcoding left	22:09
	← rudak left	22:09
juliohm	oh there is a channel for github. :)	22:10
	← ojacobson left	22:11
	→ MetalMatze joined	22:11
	→ lacrymology joined	22:12
	zz_runningskull → runningskull	22:13
	→ fragje joined	22:14
juliohm	github has more than 400 members and no one answers. :(	22:14
	i mean #github	22:15
	← rath left	22:15
thiago	they might be out frying burgers or sleeping	22:15
	← rednaks left	22:15
thiago	if they're in Europe, it's midnight	22:15
	if they're in the US, it's a holiday	22:15
	→ rednaks joined	22:15
	← bdavenport left	22:15
iveqy	juliohm: wouldn't it be really confusing to fork and change name?	22:16
	or well, maybe not..	22:16
	← m0ltar left	22:17
	→ rednaks_ joined	22:17
	r04r → r04r\|away	22:18
	← fragje left	22:18
	→ fluxdude joined	22:18
	← rednaks left	22:19
	← rednaks_ left	22:20
	→ skorgon joined	22:20
juliohm	iveqy, Github keep track of the original name anyways. :)	22:21
EugeneKay	juliohm - blind leading the deaf ;-)	22:21
	→ bdavenport joined	22:21
	→ kreantos joined	22:21
juliohm	Is the .rst extension the same as Markdown .md?	22:21
thiago	I've never heard of either	22:22
	Git doesn't care about file extensions	22:22
	← saintcajetan left	22:22
juliohm	thiago, Markdown is the way we see ASCII text as HTML	22:22
	Github uses it for showing the README nicier	22:22
	→ rednaks_ joined	22:22
thiago	maybe, but Git doesn't care	22:22
	Git treats everything as simple binary data, except in two conditions:	22:23
juliohm	thiago, see: https://github.com/pymc-devs/pymc	22:23
thiago	1) if you tell it to do CRLF conversion	22:23
	or 2) when doing git diff or show, if a heuristic algorithm determines that the file isn't text, it won't display anything	22:23
	← zacts left	22:24
cbreak	there's the text attribute	22:24
	← Sam_OTnosc left	22:24
	← hwrd\|work left	22:24
	→ AWinterman joined	22:24
	← tvw left	22:25
juliohm	thiago, what you're talking about?! o.O	22:25
thiago	file types	22:25
	you were asking about extensions	22:25
	Git doesn't care about extensions	22:26
	← amcsi left	22:26
juliohm	Ok, we all know that.	22:26
cbreak	juliohm: man gitattributes, you can make it care	22:26
gitinfo	juliohm: the gitattributes manpage is available at http://jk.gs/gitattributes.html	22:26
	← fluxdude left	22:26
juliohm	thanks cbreak, good to know, but my question was just about the difference on the file extensions. :)	22:27
cbreak	there should be no significance to any extension by defaul	22:28
	← mr_mustard left	22:28
	← Balliad left	22:29
	→ mribeirodantas joined	22:29
	← hellopat left	22:29
	← skorgon left	22:29
	← tjbiddle left	22:33
	← Droolio left	22:33
	← maxmanders left	22:34
	← SeySayux left	22:34
	← AWinterman left	22:35
	← GarethAdams left	22:35
	← Villadelfia left	22:35
	→ nbouscal joined	22:35
	→ Octalot joined	22:36
	← vkz left	22:37
	→ jaimef joined	22:37
	→ skorgon joined	22:37
	→ LuxuryMode joined	22:38
	← jaimef left	22:40
	← pdx left	22:41
	→ zbcm joined	22:41
	→ SeySayux joined	22:41
	→ Villadelfia joined	22:42
	← todd_dsm left	22:42
	→ negative273 joined	22:42
	→ todd_dsm joined	22:42
	→ dsdeiz joined	22:42
	r04r\|away → r04r	22:43
	← zhost left	22:43
	← Goplat left	22:43
	r04r → r04r\|away	22:43
	← crankharder left	22:43
	← yshh_ left	22:44
	→ jaimef joined	22:46
	runningskull → zz_runningskull	22:47
	← Reuzenwo_ left	22:47
	→ eijk joined	22:47
	← skorgon left	22:48
	← bartzy left	22:48
	→ \|Freeman\| joined	22:49
	← pantsman left	22:50
	→ jtbandes joined	22:52
	← jtbandes left	22:52
	→ jtbandes joined	22:52
jtbandes	is "alias" a command or not a command? I've used git and had "git alias" work before, but on my current install it doesn't work yet alias config settings still work.	22:52
	← andref_dias left	22:53
	→ fluxdude joined	22:53
	→ simesy joined	22:53
	← madewokherd left	22:54
	← danishkhan left	22:54
	→ bigkm joined	22:54
	← ErKa left	22:54
iveqy	jtbandes: maybe you'd an alias for alias before?	22:54
thiago	"alias" is not a command, just a setting	22:54
	← LuxuryMode left	22:55
jtbandes	iveqy: wow, so meta. perhaps I did and didn't know it	22:55
	→ hwrd\|work joined	22:55
	→ skorgon joined	22:56
	← simesy left	22:58
jtbandes	aha https://git.wiki.kernel.org/index.php/Aliases#alias	22:59
	cool	22:59
	→ Joshi3s` joined	23:00
	← todd_dsm left	23:00
juliohm	.digraph A->B->C->D, A->D	23:00
gitinfo	juliohm: .digraph error processing the definition: Error: <stdin>:2: syntax error near line 2 \| context: >>> A->B->C->D, <<< A->D	23:00
juliohm	.digraph --help	23:01
gitinfo	juliohm: .digraph error processing the definition: Error: <stdin>:2: syntax error near line 2 \| context: >>> - <<< -help	23:01
	→ todd_dsm joined	23:01
juliohm	someone please?	23:01
	→ LuxuryMode joined	23:01
juliohm	where i can find the syntax?	23:01
	→ simesy joined	23:01
	→ AWinterman joined	23:01
	← fluxdude left	23:01
EugeneKay	!bot	23:02
gitinfo	[!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans. Please see http://jk.gs/git/bot for more information about how to use me.	23:02
EugeneKay	Should be a link in there.	23:02
juliohm	EugeneKay, i can't find any	23:03
	→ dannymcc joined	23:03
	← Huevos left	23:03
	← skorgon left	23:03
juliohm	also, do you know a website for uploading images? i have one of my current DAG i want to ask you	23:03
EugeneKay	Read harder.	23:03
iveqy	juliohm: look harder...	23:03
EugeneKay	http://imgur.com/	23:03
iveqy	.digraph A->B->C->D; A->D	23:03
gitinfo	.digraph: http://g.jk.gs/dg.png	23:03
juliohm	imgur is not working here, after i upload it don't stop loading	23:04
	thanks iveqy :)	23:04
EugeneKay	Sounds like a personal problem.	23:04
juliohm	now, let me ask you about that DAG	23:04
iveqy	juliohm: it's the dot languages, you can read more about it om wikipedia	23:04
	← kreantos left	23:05
	← rnsanchez left	23:05
	→ Orbitrix joined	23:05
juliohm	suppose C = (HEAD,master,origin/master), and D=the merge accepted by the original author on upstream, that is, D=(upstream/master)	23:05
	← dannymcc left	23:05
	← mechanicalduck left	23:05
	← _md left	23:06
juliohm	How do I update my master and origin/master to incorporate the upstream/master? simply git checkout master and git merge upstream/master?	23:06
	it will do a fast-forward?	23:06
	← unreal left	23:06
EugeneKay	.digraph G->D->B->A; H->D; E->B; I->F->B; J->F->C->A	23:06
gitinfo	.digraph: http://g.jk.gs/dh.png	23:06
EugeneKay	Nifty.	23:06
juliohm	oh, sorry, i think i'm inverting the arros	23:06
	→ skorgon joined	23:07
juliohm	the lastest commit for me is D	23:07
iveqy	juliohm: it doesn't make sense.	23:08
EugeneKay	(thats' the graph from the rev-parse man page, in case anybody's curious)	23:08
iveqy	.digraph A-> B->C->D	23:08
gitinfo	.digraph: http://g.jk.gs/di.png	23:08
EugeneKay	juliohm - `git merge upstream/master; git push`	23:08
iveqy	juliohm: I don't get where A->D comes from	23:08
	→ revyd joined	23:09
EugeneKay	Assuming you have "upstream" as a remote	23:09
	← huoxito left	23:09
	Tabstar → Tabmow	23:09
juliohm	iveqy, A is simply the common base i put there for clarifying the graph	23:09
iveqy	juliohm: yes but why A->D?	23:10
juliohm	EugeneKay, yeah, i was thinking that	23:10
EugeneKay	iveqy - because whe nyou use Github's Pull Requests it does `git merge --no-ff`	23:10
	Unless you use the special !github_pull refspec and do it manually	23:10
gitinfo	To easily see Github Pull Requests in your local repo, use this fetchspec trick: https://gist.github.com/piscisaureus/3342247	23:10
iveqy	EugeneKay: oh okay	23:10
juliohm	iveqy, i would like send you an image, but imgur is lagging here. :((	23:10
EugeneKay	(which I do)	23:10
	iveqy don't use github for interaction	23:11
juliohm	iveqy, A common base, B and C my commits, D the merge	23:11
EugeneKay	It's the least painful solution I've found.	23:11
juliohm	my master is currently at C together with origin/master	23:11
iveqy	EugeneKay: github?	23:11
EugeneKay	Yeah	23:11
	← AWinterman left	23:12
EugeneKay	I disable all of their Issues garbage, and just barely deal with PRs	23:12
iveqy	EugeneKay: well, I don't have a choice, I collab only with git.git at the moment and they have choosen [email@hidden.address] instead of github	23:12
EugeneKay	The markdown generators are nice for READMEs	23:12
	← FreezingCold left	23:12
EugeneKay	git.git is a pretty large project; enough so to justify running their own git server	23:13
	→ unreal joined	23:13
EugeneKay	My random collection of bash scripts, not so much.	23:13
	→ jbnicolai joined	23:13
iveqy	jbnicolai: !rewrite	23:13
gitinfo	jbnicolai: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to). If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	23:13
iveqy	jbnicolai: !revert	23:13
gitinfo	jbnicolai: 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]?	23:13
EugeneKay	I run work proejcts off gitolite(and the canon copies of my personal stuff), but public repos are mirrored to github for publishing.	23:13
iveqy	jbnicolai: you want e) and then git push -f	23:13
	← jtbandes left	23:13
iveqy	EugeneKay: they don't have their own git-server, they mainly use github...	23:14
jbnicolai	iveqy: perfect! Worked like a charm	23:14
iveqy	it's smart to have public repos on github for advertise and contribs	23:14
EugeneKay	Oh, you mean mailing lists? Ugh. I hate those sort of projects.	23:14
	→ dougsland joined	23:14
	← dougsland left	23:14
	→ dougsland joined	23:14
EugeneKay	Such is the old-fashioned life.	23:14
iveqy	jbnicolai: great	23:14
	← rednaks_ left	23:14
iveqy	EugeneKay: yeah, mailling list and patches to the list	23:14
EugeneKay	There's nothing wrong with communicating via a list, but patches are just annoying.	23:15
iveqy	EugeneKay: actually git has awesome support for it.	23:15
	EugeneKay: the reason the list is there is for code review	23:15
EugeneKay	sitaram's method of "post a git:// URL to the mailing list" is great.	23:15
	← Drone[02] left	23:15
	→ fluxdude joined	23:15
EugeneKay	gerrit is for code review ;-)	23:16
	← jbnicolai left	23:16
iveqy	EugeneKay: I don't agree. I think you should stick to the maillist if that's the projects way of doing code review (not saying it's the best way though)	23:16
	zz_runningskull → runningskull	23:16
iveqy	yeah, I'm really curious about gerrit but I haven't been in a large enough project with power enough to test it	23:17
EugeneKay	I was saying that gerrit > thunderbird for code reviewing	23:18
	Because mail.... sucks.	23:18
iveqy	EugeneKay: who said anything about thunderbird?	23:18
EugeneKay	$MAIL_CLIENT	23:18
iveqy	EugeneKay: mail sucks, but mutt sucks less ;)	23:18
EugeneKay	Get it spayed/neutered.	23:18
	← fly9 left	23:18
	← skorgon left	23:19
iveqy	but I agree, mail isn't great. But sometimes you need to use non-great tools that have a wide adoption.	23:20
EugeneKay	Like a web browser?	23:20
iveqy	when you're in closed enviroments you can decide by yourself for the best tools instead	23:20
	→ GarethAdams joined	23:20
iveqy	EugeneKay: it's close... too slow for many people I'm afraid	23:21
EugeneKay	People are idiots.	23:21
iveqy	yeah, but github is actually painfully slow	23:21
	runningskull → zz_runningskull	23:21
EugeneKay	Never noticed a problem with it.	23:21
iveqy	EugeneKay: let's compare with libgit2, they have stopped using maillist and only use pullrequests and github tickets	23:22
EugeneKay	Yup. So? I've already said I hate their ticket system.	23:23
iveqy	EugeneKay: yeah but that's a replacement... well, open a ticket takes 2 seconds for me	23:23
	open an email taks 0.2 sekonds	23:23
EugeneKay	Any ticket you can write out in 2 seconds is not one I care to read.	23:24
	→ stamina joined	23:24
	→ danishkhan joined	23:24
iveqy	well, I care about speed a bit too much sometimes, but actually it does effect the way I'm working. gitk takes 1 s longer to start than tig. For a quick check, I use tig	23:25
EugeneKay	affect*	23:26
	← tang^ left	23:26
	← Kakera left	23:26
iveqy	thanks	23:26
	← _iron left	23:26
	← Milossh left	23:26
	→ FreezingCold joined	23:28
	→ skorgon joined	23:28
grawity	it's not just 1 second; it's 1 second every time you need to check something, and the annoyance that the tool is so slow to start	23:29
EugeneKay	You make it sound so stressful to code. Try drinking, it makes it lots more fun.	23:30
	← simesy left	23:30
	← drizzd left	23:31
iveqy	grawity: true	23:31
	← todd_dsm left	23:32
	→ todd_dsm joined	23:33
	← elixir__ left	23:33
	→ dkpi joined	23:33
	→ williamcotton joined	23:33
	← danishkhan left	23:33
	→ darknyan joined	23:34
	→ rabellamy joined	23:34
	← MetalMatze left	23:36
	→ Ralith joined	23:38
	→ AWinterman joined	23:39
	→ mr_mustard joined	23:39
	← stamina left	23:39
	← skorgon left	23:40
	← Etheco- left	23:41
	→ tekny joined	23:42
	→ Etheco joined	23:42
	→ fragamus joined	23:42
	← mr_mustard left	23:44
	← el3ctron_ left	23:45
	← donmichelangelo left	23:45
	← williamcotton left	23:45
	→ el3ctron joined	23:45
	→ donmichelangelo joined	23:45
	← darknyan left	23:48
	→ darknyan joined	23:49
	← AWinterman left	23:49
	← Joshi3s` left	23:52
	← el3ctron left	23:53
	← fragamus left	23:54
	→ skorgon joined	23:54
	← VoidAtValhalla left	23:55
	← eijk left	23:55
	→ TrentonDAdams joined	23:55
TrentonDAdams	Hello. I've done google searches, and can't find anything on retrieving the tags for the remote repo. All I want is to be able to see, and checkout, the remote tags. "git fetch --tags" does nothing. The tags are not shown.	23:56
	← rabellamy left	23:57
TrentonDAdams	Never mind, i'm insane. It's called "git tag -l"	23:57
	→ maarek joined	23:58
	← fluxdude left	23:59
	← quazimodo left	23:59
	← ktosiek left	23:59

Logs Search ←Prev date Next date→

Channels Documentation