IRCloggy #git 2015-10-07

Provider of IRC logs since 2005.

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

	2015-10-07
	→ m0ltar joined	00:00
calamari	but it doesnt push the change	00:00
	→ cspotcode joined	00:00
	→ andersoldahl joined	00:00
calamari	ah I found a stackoverflow.. git push --delete is the only option for now	00:00
	or git push origin :branchname	00:01
	← cdg left	00:01
Eugene	That's what the bot factoid says, too ;-)	00:01
	And :branch is just a cheaty non-obvious syntax	00:02
	→ cdg joined	00:02
calamari	ah -rd is just deleting the tracking branch	00:02
	that makes sense	00:02
	→ howitdo joined	00:02
	← howitdo left	00:02
	→ howitdo joined	00:02
	← m0ltar left	00:02
	← howitdo left	00:03
calamari	well bummer, this means I need to support auth in my app, was hoping to avoid it :)	00:03
	→ howitdo joined	00:03
	← Oog left	00:04
	← oojacoboo left	00:05
	← sfan786 left	00:06
	→ d4rklit3 joined	00:06
d4rklit3	hi	00:06
	what is the command to push to a remote and completely nuke whats there	00:06
	and replace it with my local repo	00:06
	← cdg left	00:07
	→ oojacoboo joined	00:07
ojacobson	There isn't exactly one	00:08
	→ strayPuppy joined	00:08
ojacobson	You can approximate it by force-pushing with --mirror, but read man git-push _in detail_ first	00:08
gitinfo	the git-push manpage is available at http://jk.gs/git-push.html	00:08
	strayPuppy → Guest78831	00:08
	← Guest78831 left	00:09
	← oojacoboo left	00:09
	← andersoldahl left	00:09
	← AaronMT left	00:09
	← jteneyck left	00:09
	→ andersoldahl joined	00:09
	→ oojacoboo joined	00:11
	→ m0ltar joined	00:11
	← s8321414 left	00:11
	← whitby left	00:11
	→ lewellyn joined	00:11
	→ mingwandroid_ joined	00:12
	→ sulky joined	00:13
	← oojacoboo left	00:14
	← mingwandroid left	00:14
	→ skasturi joined	00:14
	→ oojacoboo joined	00:15
	← andersoldahl left	00:15
	← lewellyn left	00:16
	← paulweb515 left	00:16
	→ zumba_ad_ joined	00:17
	← Padawan left	00:17
	← zumba_ad_ left	00:17
	→ daito joined	00:17
Celelibi	Is there a syntax to denote the descendent commit of a given commit?	00:18
	→ eka joined	00:22
	← daito left	00:22
	← anth0ny left	00:22
	→ anth0ny joined	00:23
	← dreiss left	00:23
calamari	Celelibi: what do you mean by denote? do you mean tag?	00:23
	→ Padawan joined	00:23
Celelibi	I mean HEAD~ is the ancestor of HEAD.	00:24
	I would like to do the opposite.	00:24
	→ fordcars joined	00:24
	← jonmorehouse left	00:26
	→ lewellyn joined	00:26
calamari	see if this gets you close: git branch --contains COMMIT	00:26
	← wymillerlinux left	00:26
	← eka left	00:27
Celelibi	Not really.	00:27
	I want to compile and test every commit I made.	00:28
	→ modocache joined	00:28
Celelibi	I could do it by going backward in time. Always checking out HEAD~ but I prefer to do it the other way.	00:28
	← fordcars left	00:28
	← mwhooker_ left	00:29
	← nanga left	00:29
	← jmpp left	00:29
	← nicechap left	00:29
	→ nKulo joined	00:30
	→ sfan786 joined	00:30
	→ whomp joined	00:30
	→ royalty joined	00:31
	→ tomog999_ joined	00:31
royalty	hello	00:31
	→ nanga joined	00:32
	← nanga left	00:32
	→ nanga joined	00:32
	← sfan786 left	00:32
royalty	so me and a coworker both were working on the same thing, we had a remote repo we were both pulling from pushing to	00:32
	← modocache left	00:32
whomp	so i put a sensitive key into my code by accident, did a git add, then removed the key. now, when i do a git diff, it shows me some red lines with the key, indicating that i deleted it, but this file didn't exist in the previous commit! how does git store this information, and if i commit and push, will it cause problems?	00:32
	if i do a git rm, will that fix the issue?	00:32
	← lewellyn left	00:33
royalty	one time after pulling, i saw that a lot of changes of mine were undone	00:33
	← diogenese left	00:33
royalty	i know my changes were pushed remotely first though since there was record of it	00:33
	→ diogenese joined	00:33
royalty	it showed he had "merged" the remote repo with his	00:33
	← tomog999 left	00:34
royalty	in a merge what exactly happens	00:35
	if the merge had caused me to lose all my changes after a pull, what could that mean?	00:35
	i reverted my repo to an earlier commit but now am "2 commits behind origin/master"	00:36
	i got annoyed and created a new branch and force pushed my current repo there	00:36
	← wad left	00:36
	→ mwhooker joined	00:37
	→ jonmorehouse joined	00:37
	← znabavi left	00:37
	← hck89 left	00:37
	→ znabavi joined	00:38
	← stantonk left	00:41
	→ nicechap joined	00:42
	← Joseph_Silber left	00:44
	→ Joseph_Silber joined	00:45
	← mellernoia left	00:45
	← imachuchu left	00:46
	← mwhooker left	00:46
	← gopar left	00:46
	→ willardg joined	00:47
	→ boombatower joined	00:48
	← hyperair left	00:48
	→ sfan786 joined	00:49
	← Hello71 left	00:49
	← LaptopBrain left	00:49
	→ jteneyck joined	00:50
	← harish_ left	00:50
	← snthsnth left	00:51
	→ LaptopBrain joined	00:52
	→ Hello71 joined	00:52
	← d10n-work left	00:52
	→ linuxmint2 joined	00:52
	→ geek joined	00:53
geek	I changed my home username and now git says fatal: '/home/test/build/wine-git/wine-git' does not appear to be a git repository when (git pull origin), how can I update the user?	00:55
	← jonmorehouse left	00:55
	← duckmaestro left	00:56
	← whomp left	00:57
	→ eka joined	00:58
	← geek left	00:58
	← eka left	00:58
	← sfan786 left	00:59
	→ redabhr joined	01:01
	← jteneyck left	01:01
	← redabhr left	01:02
	→ whomp joined	01:02
	← gfixler left	01:02
whomp	so i put a sensitive key into my code by accident, did a git add, then removed the key. now, when i do a git diff, it shows me some red lines with the key, indicating that i deleted it, but this file didn't exist in the previous commit! how does git store this information, and if i commit and push, will it cause problems?	01:02
	further, i see that git seems to know about this key because it shows up in git diff, but when i grep for a section of the key in the .git folder, i don't get any matches. is this simply because git compresses things? is there any way to determine if a string exists in git history?	01:03
	→ Vampire0_ joined	01:03
	← royalty left	01:04
	← LaptopBrain left	01:04
	→ jonmorehouse joined	01:05
	→ hyperair joined	01:05
	→ andersoldahl joined	01:05
	← Vampire0 left	01:06
	→ ahr3n_ joined	01:09
	← LBV_User left	01:10
	→ Noldorin joined	01:10
	→ jmpp joined	01:11
	← maletor left	01:11
	→ maletor joined	01:11
	← jonmorehouse left	01:12
	← ahr3n left	01:12
	← leeN left	01:13
	→ User458764 joined	01:14
	→ heroux joined	01:14
	← m0ltar left	01:14
	← Remram left	01:14
	→ CMOTD joined	01:15
	← CMOTD left	01:15
	→ Atrumx joined	01:16
	← jmpp left	01:16
	→ Remram joined	01:16
	→ daito joined	01:16
	← Remram left	01:18
	← hyperair left	01:18
	→ rchavik joined	01:18
	← User458764 left	01:18
	← mingwandroid_ left	01:18
	← maletor left	01:19
	→ BullHorn joined	01:21
	→ harish_ joined	01:22
BullHorn	anyone got a guide on how to use git? what i mean is when to branch out, when/why to merge branches, whats the release feature and how to use it	01:22
	i usually just do basics of adding/committing/pushing/pullrequesting/fetching/merging	01:23
	→ sssilver joined	01:24
	→ Remram joined	01:24
	→ stantonk joined	01:25
	→ Motoko joined	01:26
	→ lewellyn joined	01:27
	→ dinobytes joined	01:27
ojacobson	!workflow !flow !githubflow	01:28
gitinfo	Finding the right workflow for you is critical for the success of any SCM project. Git is very flexible with respect to workflow. See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.	01:28
	[!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	01:28
	[!github_flow] This is the workflow followed by github: http://scottchacon.com/2011/08/31/github-flow.html	01:28
	→ SimonNa joined	01:29
	← mikeBr left	01:30
	← oojacoboo left	01:32
	→ jteneyck joined	01:33
	→ oojacoboo joined	01:33
	→ zumba_ad_ joined	01:33
	→ moreirapontocom joined	01:36
	→ vikas027 joined	01:38
	← harish_ left	01:38
	→ dstarh joined	01:39
	← moreirapontocom left	01:39
	→ bmilesp joined	01:41
	← yarnfive8 left	01:44
	← foul_owl left	01:45
	→ m0ltar joined	01:46
	→ Lyqyd joined	01:47
	← pks left	01:47
	← Wulf left	01:48
	→ pks joined	01:49
	← dstarh left	01:49
	→ jteneyck_ joined	01:50
	← D-Boy left	01:50
	← TomyLobo left	01:50
	← nKulo left	01:50
	← jteneyck left	01:52
	← d4rklit3 left	01:53
	→ harish joined	01:54
	→ Wulf joined	01:55
	← Thorax left	01:55
	→ devoldmx joined	01:55
	→ scarabx joined	01:57
	← msonntag left	01:57
	→ foul_owl joined	01:57
	← moei left	01:58
	→ msonntag joined	01:58
	← zumba_ad_ left	01:59
	→ nachoman joined	02:00
	← devoldmx left	02:00
	← leprechau left	02:03
	→ Goplat joined	02:04
	→ leprechau joined	02:04
	← ValicekB left	02:04
	← s00pcan left	02:05
	← dinobytes left	02:06
	← machan left	02:07
	← rodrigograca31 left	02:07
	→ ValicekB joined	02:09
	← cagedwisdom left	02:10
	← MarkyC left	02:12
	→ gfixler joined	02:12
	← m0ltar left	02:13
	→ m0ltar joined	02:14
	→ mizu_no_oto joined	02:14
	← johnnyfive left	02:18
	→ impliednude joined	02:19
	→ gunnaro joined	02:19
	→ snthsnth joined	02:19
impliednude	how do you update your local copy from a remote git or is there a FAQ in regards to this?	02:19
theskillwithin	is this a magento repo?	02:22
	be careful if you are using repo as files for local server, dont want to mess up local.xml and other things you may have done to get working on local vm/server so a reset might be harmful	02:23
	is your local copy a repo you cloned from the remote git?	02:23
	← tpollard left	02:23
theskillwithin	if not why not just do a new clone	02:24
	I recognize you impliednude	02:24
	→ showaz joined	02:24
theskillwithin	=]	02:24
	you probably know more than me	02:24
impliednude	nah theskillwithin and I was just looking to be lazy and not worry about conflicts	02:25
	→ Roger_ joined	02:25
	← SimonNa left	02:25
theskillwithin	sometimes I just reclone the whole repo if i get into too much trouble now	02:25
	→ dinobytes joined	02:25
theskillwithin	it used to be everything was soo touchy that i was afraid to do this because of so much setup, weather it be mamp or vagrant. cuz of special server shit	02:26
	→ hyperair joined	02:26
theskillwithin	but now it is getting better idk why haha	02:26
	← kgadek left	02:26
theskillwithin	so i just reclone sometimes	02:26
	rename old one, then copy over the files in a new commit	02:27
	→ johnnyfive joined	02:27
	← daivyk left	02:27
theskillwithin	rename old repo, reclone, copy files over from old repo to new and stagecommit*	02:27
	→ sagerdearia joined	02:28
	← gunnaro left	02:28
sagerdearia	How can I search through all commits looking for a specific string that was modified in any file?	02:29
	nm http://stackoverflow.com/questions/18749211/how-to-find-all-commits-with-a-specific-string-on-the-insertions-and-deletions	02:30
	→ \toothrot joined	02:30
	← murgi left	02:32
	→ samw joined	02:33
	← jalnt left	02:33
	← bitkiller left	02:35
	← stantonk left	02:38
	← thewoolsinator left	02:39
	← bmilesp left	02:40
	← jnewt left	02:42
	← FIQ left	02:42
	→ jmpp joined	02:43
	→ watabou joined	02:43
	← lewellyn left	02:44
	→ penna_ joined	02:47
	← jmpp left	02:48
	→ lewellyn joined	02:50
	← penna left	02:51
	← ajf- left	02:51
	→ sid281 joined	02:52
	→ Guest63277 joined	02:53
	← sid28 left	02:54
	→ marienz joined	02:54
	← watabou left	02:56
	→ ahr3n joined	02:58
	→ dEPy joined	02:58
	← nowhere_man left	03:00
	→ nowhereman joined	03:00
	→ indistylo joined	03:00
	→ LBV_User joined	03:00
	← ahr3n_ left	03:00
	← andersoldahl left	03:04
	← mizu_no_oto left	03:05
	→ skorgon joined	03:05
	→ andersoldahl joined	03:06
	← znabavi left	03:08
	← andersoldahl left	03:10
	→ znabavi joined	03:10
	← Maple__ left	03:11
	← dEPy left	03:12
	→ ome joined	03:13
	→ User458764 joined	03:14
	← SpeakerToMeat left	03:15
	← sparetire_ left	03:15
	→ Egyptian[Home] joined	03:15
Egyptian[Home]	hi - i am using git to backup my config files on my 2 servers. i am following the same process on both and one works but the other doesnt; i get "sh: 1: git-receive-pack: not found" - google gave me tips to try but none have worked.. any ideas on what i can try/	03:16
	?	03:16
	← nachoman left	03:17
	← User458764 left	03:18
	← sssilver left	03:19
	→ thewoolsinator joined	03:22
	← Diitto left	03:26
	→ jalnt joined	03:26
	→ xcesariox joined	03:26
	← darkbasic left	03:26
LBV_User	Egyptian[Home]: are you trying to push or to pull? seems like you have a broken installation	03:27
	← crisumi left	03:27
	← kegster left	03:27
	→ darkbasic joined	03:27
	← thewoolsinator left	03:28
	→ crisumi joined	03:28
Egyptian[Home]	LBV_User: i figured it out - after 2 hours - i notcied i had 2 ssh keys on my git account.	03:28
	→ Diitto joined	03:28
	→ kegster joined	03:28
Egyptian[Home]	in my .ssh/authorised_keys file	03:28
	thanks	03:28
	→ dreiss joined	03:29
LBV_User	;)	03:29
Egyptian[Home]	when i wake up i will come back and ask about fast forwards	03:29
	→ variable joined	03:31
	→ gopar joined	03:32
	← Sasazuka left	03:32
	← sagerdearia left	03:33
	← Egyptian[Home] left	03:34
	← m0ltar left	03:34
	→ howdoi joined	03:35
	← Padawan left	03:36
	→ Padawan_ joined	03:37
	← oojacoboo left	03:37
	→ oojacoboo joined	03:38
	→ elote joined	03:40
	← jalnt left	03:41
	← bap1313 left	03:42
	→ Xing joined	03:43
	→ SpeakerToMeat joined	03:43
	→ joako joined	03:43
	→ sagerdearia joined	03:46
	→ jonmorehouse joined	03:46
	← LBV_User left	03:46
	← Roger_ left	03:48
	→ stantonk joined	03:49
	→ smaudet joined	03:49
	→ durham joined	03:53
	→ xudongz joined	03:54
	→ strayPuppy joined	03:55
	→ thewoolsinator joined	03:55
	→ metaory joined	03:55
	← mezod left	03:55
	→ devoldmx joined	03:56
	← durham__ left	03:56
	← stantonk left	03:56
	← durham left	03:57
metaory	on an ubuntu server git not respecting the config file in .ssh/	03:59
	→ kp666 joined	04:00
	← devoldmx left	04:00
	→ Rym7 joined	04:00
	→ thiago joined	04:01
	→ devoldmx joined	04:01
	← kermit left	04:03
	← daito left	04:03
	→ dEPy joined	04:04
	← zacg left	04:07
	← snowcycle left	04:07
	← variable left	04:10
	→ suprano joined	04:10
	← jonmorehouse left	04:11
	→ durham joined	04:11
	← durham left	04:13
	← CheckDavid left	04:13
	→ durham joined	04:13
	← M4renz left	04:13
	← whomp left	04:14
	← knownasilya left	04:15
	← snthsnth left	04:16
	→ blackpajamas joined	04:19
	← ag4ve left	04:20
	← Rym7 left	04:20
	← elote left	04:20
	→ jonmorehouse joined	04:20
	→ elote joined	04:21
	→ joufflu joined	04:21
	← dreiss left	04:21
	← scarabx left	04:21
	→ ag4ve_ joined	04:22
	→ cagedwisdom joined	04:24
	← znabavi left	04:27
	→ znabavi joined	04:27
	→ dreiss joined	04:27
	← boombatower left	04:27
	← ahr3n left	04:28
	← jeffreylevesque left	04:28
	→ sssilver joined	04:29
	← cagedwisdom left	04:31
	← jonmorehouse left	04:32
	→ kermit joined	04:32
	← sssilver left	04:33
	→ jonmorehouse joined	04:33
	← faux___ left	04:36
	← ormaaj left	04:38
	tanath_ → tanath	04:38
	← lindenle left	04:40
	→ psk17_ joined	04:40
	← psk17_ left	04:40
	→ dr_bibble joined	04:40
	← sdothum left	04:42
	→ cagedwisdom joined	04:43
	← joufflu left	04:43
	→ faux___ joined	04:43
	← dr_bibble left	04:44
	→ mcbreez joined	04:45
	gitinfo set mode: +v	04:45
mcbreez	Is it difficult to get into git contributions? As in contributing to git itself?	04:46
	← jstimm left	04:46
mcbreez	.	04:47
	→ sssilver joined	04:47
milki	mcbreez: probably	04:47
	mcbreez: theres already a bar of submitting patches via mailing list	04:48
	>.>	04:48
mcbreez	milki: really?	04:48
	→ nerd joined	04:48
	← aesinv left	04:49
	← samw left	04:49
	← mcbreez left	04:50
	→ Kicer86 joined	04:51
	← Xing left	04:52
	→ Guest26865 joined	04:52
	→ MechtiIde joined	04:55
	→ snowcycle joined	04:56
	← ploopkazoo left	04:57
	→ daito joined	04:58
	→ jceb joined	04:58
	→ samw joined	04:59
	→ jmpp joined	05:00
	← snowcycle left	05:00
	← sssilver left	05:00
	→ bb010g joined	05:00
	gitinfo set mode: +v	05:00
	← metaory left	05:00
	→ sid28 joined	05:00
	→ ploopkazoo joined	05:01
	← sid281 left	05:02
	→ lolmac joined	05:02
	← fscala left	05:02
	→ ayaz joined	05:03
	→ jxete joined	05:03
	→ fedexo joined	05:03
	→ m0ltar joined	05:04
	← samw left	05:04
	← jxete left	05:04
	→ aesinv joined	05:04
	→ fscala joined	05:05
	→ devoldmx_ joined	05:05
	← jmpp left	05:05
	← devoldmx left	05:07
	← dreiss left	05:10
	← dEPy left	05:10
	← pR0Ps left	05:11
	← \toothrot left	05:13
	← nilg left	05:14
	→ _9dan joined	05:15
	→ User458764 joined	05:15
_9dan	Hello, is it actually possible to delete a commit? Basically I want to remove all commits, changes, ect after a certain point	05:16
	→ therealGent joined	05:17
	→ pR0Ps joined	05:17
	← tmokros left	05:18
	→ pantsman- joined	05:18
	← Phoenixz left	05:18
milki	_9dan: that sounds like just a regular git reset	05:19
	_9dan: !fixup	05:19
gitinfo	_9dan: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	05:19
	← User458764 left	05:20
	→ scarabx joined	05:20
	→ tmokros joined	05:20
	← dinobytes left	05:21
	→ eli joined	05:22
	→ nilg joined	05:22
	← Gamecubic left	05:23
_9dan	milki: I have tried doing git reset —hard 7a3521e, it seem like it reverted to 7a3521e but the changes are still there and there is still a “Detached HEAD” and “Pending Changes”	05:23
milki	_9dan: !detached	05:23
gitinfo	_9dan: 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	05:23
milki	_9dan: changes are different from commits	05:24
_9dan	What does !detached and !attached mean?	05:25
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	05:25
	→ metaory joined	05:25
	→ petersr joined	05:26
	← Lyqyd left	05:28
	→ modocache joined	05:30
	← jteneyck_ left	05:30
	← petersr left	05:30
	→ zhodge joined	05:31
	← strayPuppy left	05:31
	→ Raging_Hog joined	05:31
_9dan	milki: gitinfo: I don’t understand what you mean be either !detached or !attached	05:32
gitinfo	milki: 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	05:32
	→ strayPuppy joined	05:32
	← multi_io left	05:34
	← modocache left	05:34
	→ multi_io joined	05:36
	← willardg left	05:36
	← fracting left	05:36
	→ ilmgb joined	05:37
	→ jmpp joined	05:38
	← Junior left	05:38
	→ Junior joined	05:38
	← zhodge left	05:39
_9dan	milki: How would I remove pending changes	05:39
	← pantsman- left	05:40
	→ lindenle joined	05:40
	← happy-dude left	05:41
	→ Manikandan joined	05:41
	← Wetmelon left	05:41
milki	git status will probably tell you	05:41
	← znabavi left	05:43
_9dan	milki: git status just lists untracked files	05:43
	→ dreiss joined	05:44
milki	then theres no "pending changes"	05:44
	i dont know what you are referring to	05:44
	← bendangelo left	05:44
	→ znabavi joined	05:44
	← lindenle left	05:45
	→ willardg joined	05:46
	→ Nick-S joined	05:46
_9dan	I meant to say pending commits, i have its hash but i just cant figure out how to remove it	05:48
	← jrahmy left	05:48
	→ jrahmy joined	05:48
	← scarabx left	05:50
_9dan	Been at this for 3+ hours reading though the documentation	05:50
	→ ThomasLocke joined	05:51
milki	_9dan: if the hash has no references to it, then it will be deleted in the next gc. you can manually run git gc if you want	05:52
	_9dan: by default, objects dont get gc'ed for 2 weeks	05:53
_9dan	milki: git gc didnt remove it	05:54
milki	_9dan: you need to tweak the settings	05:55
	← showaz left	05:55
milki	_9dan: man git gc, see prune	05:55
gitinfo	_9dan: the git-gc manpage is available at http://jk.gs/git-gc.html	05:55
	→ sandGorgon joined	05:55
milki	_9dan: if its still reachable by other branches and tags, it wont be removed	05:55
	_9dan: and reflog	05:55
_9dan	Thank you for the help	05:56
	← aesinv left	05:57
milki	_9dan: an excert from !sensitive has the right flags	05:57
gitinfo	_9dan: [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/	05:57
milki	git reflog expire --expire=now --all	05:57
	git gc --prune=now	05:57
	from step 9	05:57
	→ eGGsha joined	05:57
	← thiago left	05:58
	← Ceber left	05:58
	→ neanderslob joined	05:59
	← mostlybadfly left	05:59
	→ fracting joined	05:59
_9dan	That worked	05:59
	← m0ltar left	05:59
	← skorgon left	06:00
	→ CalimeroTeknik joined	06:00
	→ thiago joined	06:00
	← sandGorgon left	06:00
	→ samw joined	06:00
	← gopar left	06:00
	← Motoko left	06:01
	→ Saturn812 joined	06:01
	← ilmgb left	06:02
	→ rscata joined	06:02
	→ neanderslob__ joined	06:02
	← neanderslob__ left	06:02
	→ ilmgb joined	06:04
	← Vgr left	06:04
	→ zoso joined	06:04
	← ilmgb left	06:04
	→ Vgr joined	06:04
	← Vgr left	06:04
	→ Vgr joined	06:04
	→ boombatower joined	06:05
	← samw left	06:05
	← willardg left	06:05
	← Pseudocrat left	06:05
	← fedexo left	06:05
	→ Ceber joined	06:07
	→ PCatinean joined	06:07
	← MechtiIde left	06:08
	← CEnnis91 left	06:08
	→ User458764 joined	06:09
	→ arup_r joined	06:09
	← [cust] left	06:09
	← pR0Ps left	06:11
	→ pR0Ps joined	06:12
	→ TomyLobo joined	06:12
	→ sandGorgon joined	06:12
	← foul_owl left	06:12
	← Ryanar left	06:12
	→ moei joined	06:13
	← thewoolsinator left	06:13
	→ ckruczek joined	06:13
	← therealGent left	06:13
	→ Vgr_ joined	06:13
	→ foul_owl joined	06:13
	← Vgr left	06:14
	→ ahr3n joined	06:16
	← calamari left	06:16
	→ acolson joined	06:16
	→ [cust] joined	06:16
	→ courrier_ joined	06:17
	← nerd left	06:17
	← ome left	06:20
	← courrier left	06:20
	→ eli` joined	06:21
	← eli` left	06:21
	→ freimatz joined	06:22
	← Guest63277 left	06:22
	→ Guest63277 joined	06:22
	Guest63277 → FIQ	06:22
	→ dionysus69 joined	06:22
	→ arunbhawna joined	06:22
	→ nerd joined	06:23
	← indistylo left	06:24
	→ aruns23 joined	06:26
	← arunbhawna left	06:29
	→ azuri5 joined	06:29
	← nnyk_ left	06:29
	← thiago left	06:31
	← znabavi left	06:33
	→ rubyonrailed joined	06:35
	→ leeN joined	06:38
	→ wwwald joined	06:39
	← benbergman left	06:40
	← rubyonrailed left	06:40
	→ benbergman joined	06:40
	← TomyLobo left	06:41
	← jceb left	06:41
	← dreiss left	06:44
	→ gfixler1 joined	06:45
	→ nnyk_ joined	06:45
	→ tuor joined	06:46
	← benbergman left	06:46
impliednude	shouldn't git add * actually add all files that were added to the project?	06:47
	→ benbergman joined	06:47
	→ IanV0rn2341 joined	06:48
	→ pm90_ joined	06:49
	← User458764 left	06:51
	→ goTAN joined	06:52
osse	impliednude: no. the shell takes care of turing * into a list of files.	06:53
	git adds those, if they're not ignored	06:53
milki	what does "added to the project" mean o.O	06:53
	→ Sceorem joined	06:55
	→ gua_ould joined	06:56
	← dionysus69 left	06:56
tuor	Where do I find documentation about 'HEAD^^' or 'HEAD..' or 'HEAD"whatever"'? I just want to know how this HEAD stuff works.	06:57
milki	tuor: thats man gitrevisions	06:57
gitinfo	tuor: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	06:57
	→ znabavi joined	06:58
	← _9dan left	06:58
tuor	milki, thx.	06:59
	→ shadej joined	06:59
	← nnyk_ left	06:59
	← lewellyn left	07:00
shadej	Hey guys	07:00
osse	tuor: pro-tip: most (if not all) of the "HEAD stuff" even works when it says something other than HEAD \o/	07:00
shadej	I create a tag on a branch and switched to a different branch but when run the "git tag" command I still see the new tag, is that expected?	07:00
osse	yes	07:00
	tags are "global" in that sense	07:00
	tags don't belong on branches	07:01
shadej	okay but I saw somewhere that states "tags are related with a specific commit unless you intentionally move them"	07:01
osse	that is also true	07:01
	← IanV0rn2341 left	07:01
tuor	osse, I don't understand what you meen. But maybe I should read the man doc first. :)	07:02
osse	tuor: yeah, do. What I mean is that the stuff you describe as "HEAD stuff" are more genereal/flexible than you maybe think	07:03
shadej	osse: if that is true, when I switched to a different branch the commit is not there why is the tag still showing?	07:03
	← znabavi left	07:03
osse	shadej: i think the misunderstanding is relatived to this: "the commit is not there". What do you mean?	07:03
shadej	By that I mean the commit is not on the new branch I switched into	07:04
	The commit the tag is pointing to is not on the current branch	07:04
	does that make sense?	07:04
	→ znabavi joined	07:04
osse	yup	07:04
	but it doesn't matter	07:05
	not sure how to explain it.	07:05
	← SuzieQueue left	07:05
	→ cdown joined	07:05
	→ arunbhawna joined	07:05
osse	git branch lists branches that point to commits that "are not there"	07:05
shadej	okay got it. :-) a new bee	07:06
	← aruns23 left	07:07
	← nilg left	07:07
shadej	so is there any "git tag branchname" command to show list of tag on a branch	07:08
	← durham left	07:08
osse	no	07:09
	but I think someone is working on it	07:09
	there are commands to do the opposite: list tags that contain a certain commit	07:10
	(to see which releases are affected by a certain bug for example)	07:10
	→ encod3 joined	07:10
	→ aruns23 joined	07:10
shadej	aha, ok thanks	07:11
	osse: I never used them, I am just starting to use them now	07:11
	← arunbhawna left	07:12
	← mac_ified left	07:13
	← jonmorehouse left	07:13
	→ D-Boy joined	07:14
	→ scarcry joined	07:16
	→ TomyWork joined	07:16
	→ nilg joined	07:16
	→ lewellyn joined	07:17
tuor	osse, I see now. There is lot more then only "HEAD stuff". I think I got the idea, but have to use it for realy understanding.	07:18
	→ grbe joined	07:19
	→ Vgr joined	07:20
	← Vgr left	07:20
	→ Vgr joined	07:20
	← pm90_ left	07:20
	← Vgr_ left	07:20
	→ codesing joined	07:20
	→ mark3 joined	07:21
	← moritz_s left	07:23
	→ bond joined	07:23
	→ eka joined	07:24
	← wwwald left	07:24
	→ wwwald joined	07:25
	→ jknetl joined	07:25
	← azuri5 left	07:26
	→ Balliad joined	07:27
	→ IanV0rn2341 joined	07:30
	→ modocache joined	07:31
	← Shentino left	07:31
	← maxorator left	07:32
	→ darkbasic_ joined	07:33
	← rishi left	07:33
	← darkbasic left	07:34
	← IanV0rn2341 left	07:34
	→ Shentino joined	07:34
	→ rishi joined	07:34
	→ maxorator joined	07:35
	← modocache left	07:35
	→ jceb joined	07:35
	→ IanV0rn2341 joined	07:35
	→ alienaut joined	07:37
	← jknetl left	07:38
	← darkbasic_ left	07:38
	→ darkbasic joined	07:40
	→ DWestCoast joined	07:41
	→ simesy joined	07:41
	→ lindenle joined	07:43
	← raven-au left	07:43
	→ syegres joined	07:43
	← simesy left	07:43
	← fracting left	07:45
	← cdown left	07:46
	← EXID123 left	07:46
	← weaksauce left	07:46
	← eka left	07:46
	← aruns23 left	07:46
	→ bonswouar joined	07:47
	← EXID123_ left	07:47
	← lindenle left	07:47
	→ eka joined	07:47
	← eka left	07:47
	← IanV0rn2341 left	07:47
	→ IanV0rn2341 joined	07:48
	→ KekSi joined	07:49
	← daito left	07:49
	→ raven-au joined	07:49
	→ nnyk_ joined	07:52
KekSi	hi, i'm a total newbie with git and here's my situation (i have no clue about git lingo so the correct words will probably help me a lot in googling): we're switching from svn to git and someone imported the most recent trunk into master - however my (svn) branch and the trunk both have a lot of changes since i branched it	07:52
	→ machan joined	07:52
KekSi	now i disconnected my svn branch and made a new git branch and committed & pushed my changes into it - how do i merge the differences between the two?	07:52
	→ kurkale6ka joined	07:52
	→ _9dan joined	07:53
KekSi	what is it called (the two don't have any shared commit stamps/ids in their history)	07:54
	← mikiones left	07:57
	→ fracting joined	07:57
	← versa left	07:57
ckruczek	!merge	07:57
gitinfo	'git merge' takes two diverged lines of history (series of commits, e.g. on different branches), and recombines them with a "merge commit" on top. This creates an explicit record of you doing the merge, unless there were no local changes (which does a !fast_forward merge instead). If you don't need to keep a record like that, !rebase may produce easier-to-read history, but the two don't always mix well... see also !merge_vs_r	07:57
	→ wrouesnel joined	07:58
	← JanC left	07:58
	← DWestCoast left	07:59
	→ cust_ joined	07:59
	← [cust] left	07:59
	← darkbasic left	07:59
	→ DWestCoast joined	08:00
	← reim left	08:00
	→ m0ltar joined	08:00
	← strayPuppy left	08:01
	→ darkbasic joined	08:02
	← m0ltar left	08:02
	→ {0xc6} joined	08:04
	← nnyk_ left	08:05
	← alienaut left	08:07
	→ Anaunymau5 joined	08:07
	→ darkbasic_ joined	08:07
	→ marcogmonteiro joined	08:07
metaory	oh git oh git ,,, i have ssh-agent running, ssh-add rsa, ~/.ssh/config is set proparly ,	08:07
	→ tirengarfio_ joined	08:07
metaory	but it get permission denied	08:07
	is on remote ubuntu server that i ssh to	08:08
	gitinfo set mode: +v	08:08
	→ bongjovi joined	08:08
	← darkbasic left	08:08
Anaunymau5	hi everyone	08:08
gitinfo	Anaunymau5: 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.	08:08
	→ ilmgb joined	08:08
	← devoldmx_ left	08:08
	← ahr3n left	08:09
	← tirengarfio left	08:09
osse	metaory: does regular ssh work =	08:09
	→ alienaut joined	08:09
metaory	osse, yes	08:09
	→ daito joined	08:09
Anaunymau5	where do i get the github helmet? Just installed irc to ask that question :P	08:09
	← ilmgb left	08:09
metaory	same keys setup on my local works fine,	08:09
osse	metaory: how do you normally ssh? the command	08:09
	→ ilmgb_ joined	08:09
	← IanV0rn2341 left	08:09
	← penna_ left	08:10
metaory	ssh -i ~/.ssh/key	08:10
	ssh -i ~/.ssh/key user@ip	08:10
	→ penna joined	08:10
metaory	shoudl i do ssh -A to pass my agent	08:10
osse	so it doesn't say in .ssh/config that ~/.ssh/key should be used for ip ?	08:10
	→ filisko joined	08:10
	→ User458764 joined	08:10
metaory	yes config hv the key path	08:10
osse	so does 'ssh user@ip' work without the -i ?	08:11
	← darkbasic_ left	08:11
	→ ahr3n joined	08:11
Kartagis	Anaunymau5: #github	08:11
	← boombatower left	08:11
Anaunymau5	oops sry	08:11
metaory	no i hvnt setup my local.. the config is on remote server	08:11
	i want to setup config on server, for git actions	08:12
	on remote server: ssh -T [email@hidden.address] works fine	08:12
	→ darkbasic joined	08:12
	← Guest69018 left	08:12
	→ JanC joined	08:13
	→ cyphase joined	08:13
	→ versa joined	08:13
osse	if ssh works then git will work.	08:13
	← znabavi left	08:14
	→ User4587_ joined	08:14
	← grbe left	08:14
	→ znabavi joined	08:15
	← User458764 left	08:15
	→ IanV0rn2341 joined	08:17
	→ lg188 joined	08:19
	mquin → evilmquin	08:19
	← mkoskar left	08:19
jantje	any way I can get tag changes in (some) reflog?	08:20
	I just removed and re-added a bunch of tags, and it would have been nice if that was tracked	08:20
	→ groolot joined	08:23
	← groolot left	08:23
	→ Suzeanne joined	08:26
	→ p4trix joined	08:26
	← oojacoboo left	08:27
	→ reim joined	08:28
	→ Muntaner joined	08:28
Muntaner	hey guys	08:28
gitinfo	Muntaner: 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.	08:28
KekSi	!rebase	08:29
gitinfo	'git rebase' takes away your local commits, updates your branch with new stuff from <upstream> (argument), then re-applies your local commits on top. This makes it look like your commits were created "after" the new stuff, and it can look cleaner than doing a !merge. Beware of !rewriting_public_history, though. Not to be confused with !interactive_rebase.	08:29
	← FabTG_ left	08:30
KekSi	!rebase_vs_r	08:30
	!merge_vs_r	08:30
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 -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html	08:30
	← tristanp_ left	08:31
	→ Chill_Surf joined	08:31
	← vikas027 left	08:31
metaory	osse, i feel the config in ~/.ssh/config is not being load at all, the file authorized_keys could be culprit !? or /etc/ssh/ssh_config	08:32
	→ bvi joined	08:32
	← jmpp left	08:34
	→ adgtl joined	08:35
	→ soc42 joined	08:36
	← bvi left	08:37
	→ joseph_86 joined	08:37
	← BullHorn left	08:37
	→ shadej1 joined	08:38
	→ tvw joined	08:38
KekSi	!interactive_rebase	08:39
gitinfo	Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.	08:39
	← adgtl left	08:39
	→ jalnt joined	08:39
	← shadej left	08:40
metaory	!gitcredentials	08:40
	→ gunnaro joined	08:41
	→ achadwick joined	08:44
	← joseph_86 left	08:44
	→ joseph_86 joined	08:45
	→ keroro520 joined	08:45
	→ sid281 joined	08:46
	← sarri left	08:46
moritz	metaory: "man gitcredentials"?	08:47
gitinfo	metaory: the gitcredentials manpage is available at http://jk.gs/gitcredentials.html	08:47
	← sid28 left	08:47
	← Goplat left	08:47
	→ sarri joined	08:48
	← sarri left	08:48
	→ sarri joined	08:48
	← fandi left	08:49
qsuscs	Celelibi: not possible easily. each commit records its parents and that's it. to find the commits that have $foo as a parent, you just have to scan _all_ commits.	08:49
	→ bvi joined	08:49
qsuscs	if you want to do something on certain commits, man git rev-list	08:49
gitinfo	the git-rev-list manpage is available at http://jk.gs/git-rev-list.html	08:49
	← arup_r left	08:50
	← SpeakerToMeat left	08:50
	← leeN left	08:51
	→ jost joined	08:51
	→ subscope joined	08:51
	← drbean_ left	08:52
	→ onov joined	08:52
	→ drbean joined	08:53
	→ qwebirc45852 joined	08:54
	→ chris64_ joined	08:54
	← jalnt left	08:55
	gitinfo set mode: +v	08:57
qwebirc45852	hello	08:57
gitinfo	qwebirc45852: 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.	08:57
qwebirc45852	I have a quesion about git clean	08:57
ckruczek	DO IT	08:57
	I am sorry, I am kind of excited	08:58
qwebirc45852	according to manpage git clean: If an untracked directory is managed by a different git repository, it is not removed by default	08:58
	altough in my env subdir that contains different git repo is deleted if performing 'git clean -dxf' in rootdir that is also a subdir	08:59
	for now I do not want git submodules for this subrepo	08:59
	→ acolson_ joined	08:59
	← reim left	08:59
	→ siwyi joined	08:59
	← acolson left	08:59
	→ m0ltar joined	08:59
	← m0ltar left	08:59
qwebirc45852	correction: in rootdir that is also a subdir > in rootdir that is also a repo	09:01
	→ pluffsy joined	09:01
qwebirc45852	my setup toplevelrepo/.git ; toplevelrepo/src/subrepo/.git > git clean -dxf deletes 'toplevelrepo/src/subrepo' where according to manpage I wouldn't expect it	09:03
	→ saidi joined	09:03
	← saidi left	09:03
	→ saidi joined	09:03
	← ixian left	09:04
	→ sparetire_ joined	09:04
pluffsy	Hi! I understand this probably is very basic. I have just switched from hg to git and I have a merging problem. In hg if multiple people made changes in a file and hg couldn’t resolve it I got a merge conflict, now in git I just seem to get a random automatic merge where someones changes are removed. I have gotten a few merge conflicts in git, but more often than not it just make incorrect guesses of how to merge.	09:05
	→ fandi joined	09:05
	→ ixian joined	09:05
	← bond left	09:05
qsuscs	pluffsy: in doubt, you can always git merge --no-commit and inspect everything before you commit	09:06
	← neanderslob left	09:07
	→ Anticom joined	09:07
	→ tristanp joined	09:07
	→ sdsd joined	09:10
	← User4587_ left	09:10
sdsd	git branch -d the_local_branch // should i be standing on master or the locla branch when i do that?	09:10
qwebirc45852	you can only dlete branches where not not currently on	09:11
	so master	09:11
	and you can force deletion using '-D'-param see manpage git help branch	09:11
	→ mkoskar joined	09:12
	← jost left	09:12
	→ darkbasic_ joined	09:12
	← darkbasic left	09:12
	→ SimonNa joined	09:12
	← jrahmy left	09:13
qwebirc45852	according to manpage git clean: If an untracked directory is managed by a different git repository, it is not removed by default	09:13
	→ geoid joined	09:13
qwebirc45852	altough in my env subdir that contains different git repo is deleted if performing 'git clean -dxf' in rootdir that is also a subdir	09:13
	← alienaut left	09:13
	→ jonmorehouse joined	09:14
qwebirc45852	correction: in rootdir that is also a subdir > in rootdir that is also a repo	09:14
	← bvi left	09:14
	→ Godfather_ joined	09:14
Godfather_	hi	09:14
	← sdsd left	09:15
	← fscala left	09:15
Godfather_	I want as a default behaviour when i push (git push origin) push to the origin the current branch which matches the origin branch ( testing )	09:15
	i set "git config --global push.default simple"	09:16
	→ SpeakerToMeat joined	09:16
	← {0xc6} left	09:16
Godfather_	and now when i try "git push origin" in the testing branch i get "The current branch testing has no upstream branch"	09:16
	should i set also "git push --set-upstream origin testing" ?	09:17
	i don't want to mess it up	09:17
tobiasvl	yes, set that	09:17
	→ fscala joined	09:18
qwebirc45852	or initially use 'git push -u origin <local_branch_to_push_remote>'	09:18
	→ Zariel joined	09:19
Godfather_	qwebirc45852, -u means set as default upstream?	09:19
qwebirc45852	anyone who could answer my git clean problem ;-)	09:20
osse	Godfather_: -u and --set-upstream are the same	09:20
Godfather_	ok thx you all	09:20
	← _9dan left	09:22
	→ cdown joined	09:23
	→ arup_r joined	09:23
	← Muntaner left	09:25
	→ reim joined	09:25
	→ s8321414 joined	09:26
	→ mezod joined	09:27
	← linuxmint2 left	09:28
	← goTAN left	09:28
	→ User458764 joined	09:28
	← Padawan_ left	09:28
	← fandi left	09:29
	→ mikiones joined	09:29
	→ Padawan_ joined	09:29
	→ jalnt joined	09:29
	← Orbitrix left	09:30
	→ jost joined	09:30
	← keroro520 left	09:30
	→ jmpp joined	09:31
	→ fandi joined	09:31
	→ \toothrot joined	09:31
	→ modocache joined	09:32
	→ rodrigograca31 joined	09:32
	← IanV0rn2341 left	09:33
	→ nettoweb joined	09:33
	← daito left	09:34
	→ alienaut joined	09:34
	← faux___ left	09:35
	← gunnaro left	09:35
	→ vivp joined	09:35
	← jmpp left	09:35
	← modocache left	09:36
	← vivp left	09:36
	← codesing left	09:38
	← s8321414 left	09:38
	← cdown left	09:40
	→ s8321414 joined	09:40
	← siwyi left	09:41
	→ keroro520 joined	09:43
	→ lindenle joined	09:45
	← znabavi left	09:45
	→ kgadek joined	09:45
	← harish left	09:46
	← metaory left	09:46
	← jalnt left	09:47
	→ metaory joined	09:47
	← keroro520 left	09:47
	← subscope left	09:49
	→ znabavi joined	09:49
	→ troulouliou_div2 joined	09:50
	← lindenle left	09:50
	← ahr3n left	09:50
	← blahdodo left	09:51
	→ adv_ joined	09:51
adv_	looking for a git basics tutorial	09:51
	→ thiago joined	09:51
adv_	suggestions?	09:51
	← nydel07 left	09:51
	← Anaunymau5 left	09:54
	→ faux___ joined	09:55
Seveas	!book	09:56
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	09:56
	→ stamina joined	09:57
	← Suzeanne left	09:57
	← thiago left	09:58
	← saidi left	09:58
	← User458764 left	09:58
	→ saidi joined	09:58
	→ Zelest joined	09:59
	← faux___ left	09:59
Zelest	I think the guys/girls who added git-stash should be awared with the nobel-prize..	10:00
	← geoid left	10:00
	← maxorator left	10:00
	← jost left	10:00
	← reim left	10:00
	→ devoldmx joined	10:01
	→ simesy joined	10:01
	→ User458764 joined	10:01
	→ maxorator joined	10:01
	→ acetakwas joined	10:01
	→ Suzeanne joined	10:02
	→ acetakwas_ joined	10:02
	→ m0ltar joined	10:03
	← sandGorgon left	10:04
	→ Vile joined	10:05
	← devoldmx left	10:05
	← saidi left	10:07
	→ jost joined	10:07
	→ saidi joined	10:07
	← m0ltar left	10:07
	noteness → Universe	10:08
	→ reim joined	10:10
	← kgadek left	10:10
	\toothrot → toothrot	10:10
cbreak	Zelest: it's just a shortcut for a bunch of commits and reflog manipulation :)	10:11
	→ blahdodo joined	10:12
	→ _9dan joined	10:13
	→ dimi1947 joined	10:13
	← _9dan left	10:13
Zelest	cbreak, might be, but I love it! :D	10:14
	→ _9dan joined	10:14
	← _9dan left	10:14
	→ darkbasic joined	10:19
	← darkbasic_ left	10:20
	← nerd left	10:21
osse	Zelest: which nobel prize ?	10:26
_ikke_	peace	10:26
	← wrouesnel left	10:26
_ikke_	?	10:26
	→ subscope joined	10:26
	→ vurma joined	10:27
	→ lb1a joined	10:28
osse	why not the one in medecine	10:28
	→ darkbasic_ joined	10:30
	← darkbasic left	10:30
	→ ErKa joined	10:31
	← nilg left	10:31
	→ jmpp joined	10:32
	→ cdown joined	10:33
bremner	economics.	10:34
	→ daito joined	10:35
	← znabavi left	10:35
	→ znabavi joined	10:35
	→ denimsoft joined	10:35
	← Telvana left	10:36
	← jmpp left	10:36
	→ nilg joined	10:36
	→ faux___ joined	10:37
	→ User4587_ joined	10:37
	← metaory left	10:38
	→ Telvana joined	10:38
	← User458764 left	10:38
	← daito left	10:39
adv_	not book..	10:39
	tutorial	10:39
	→ rwb joined	10:40
bremner	not cryptic words, sentences.	10:41
	→ csdc joined	10:41
	← faux___ left	10:41
	← adv_ left	10:41
Anticom	Hi all. how do i set a default behaviour for "git add --<all\|ignore-removal> <path>" ?	10:41
	← csdc left	10:42
	→ adv_ joined	10:42
adv_	!designers	10:42
gitinfo	'Git for Web Designers' is a quick "Who why what when how" on VCS and git: http://www.webdesignerdepot.com/2009/03/intro-to-git-for-web-designers/	10:42
adv_	!tutorial	10:42
gitinfo	A list of interactive git tutorials: http://try.github.com	10:42
	→ geoid joined	10:42
bremner	adv_: man gittutorial	10:42
gitinfo	adv_: the gittutorial manpage is available at http://jk.gs/gittutorial.html	10:42
	← darkbasic_ left	10:43
adv_	nice	10:43
	thanks	10:43
Anticom	I couldn't find the appropriate configure option :/	10:43
lb1a	Anticom, i simply use an alias for thath	10:44
	that kind of stuff*	10:44
Anticom	can i alias an existing command? :>	10:44
	→ darkbasic joined	10:44
Anticom	to kind of overwrite `git add`	10:44
lb1a	Anticom, something along those lines git config --global alias.au 'add -u'	10:45
	← geoid left	10:45
lb1a	Anticom, no that is not possible	10:45
	Anticom, is search for the exact same thing :D	10:45
	i*	10:45
Anticom	why `-u` i want `-A` :p	10:45
lb1a	Anticom, just my example :P read between the lines	10:45
	Anticom, http://githowto.com/aliases	10:46
	→ dionysus69 joined	10:46
	→ Gonzo89 joined	10:46
Anticom	lb1a: well i kind of can't belive there's no configure option for that	10:46
	← Vile left	10:48
lb1a	Anticom, well you config that option in particular	10:48
	→ a_l_e joined	10:48
lb1a	Anticom, man git config -> search for add.IgnoreErrors	10:48
gitinfo	Anticom: the git-config manpage is available at http://jk.gs/git-config.html	10:48
	← acetakwas left	10:48
lb1a	Anticom, ah sorry misread, you wanted ignore-removals	10:48
	sorry	10:48
	← fandi left	10:49
	← acetakwas_ left	10:49
	→ platzhirsch joined	10:49
platzhirsch	Is there a way to print current repository name and or repository owner ?	10:49
	← chris64_ left	10:49
platzhirsch	I want to get <owner>/<repository> on command line without parsing git remote -v	10:49
osse	platzhirsch: there is no such thing	10:50
	ah	10:50
lb1a	platzhirsch, there is no such thing as a repository owner	10:50
	← CussBot left	10:50
platzhirsch	oh true	10:50
lb1a	platzhirsch, you mean remote name?	10:50
platzhirsch	sorry, I confused Github specific things with Git	10:50
	← antiatom left	10:50
	← reim left	10:50
platzhirsch	yes	10:50
osse	you can parse 'git config remote.origin.url' instead	10:50
	it will be easier	10:50
lb1a	platzhirsch, what about if there is more than one remote ?	10:50
platzhirsch	much easier! thanks a lot	10:51
	→ CussBot joined	10:51
platzhirsch	lb1a: problematic I guess, but doesn't apply in my case	10:51
lb1a	git config remote.origin.url	10:51
	ok	10:51
	sorry osse did it already	10:51
Anticom	lb1a: i want the --all option as default and not --ignore-removals. You are refering to --ignore-errors which is a different option i'm afraid	10:51
lb1a	Anticom, i said that above. sorry i misread ignore-*	10:51
	← gfixler1 left	10:52
Anticom	oh i see	10:52
	why does git want me to supply either of those flags every time i do git add... doesn't seem very git-like not being able to set a default in a config	10:52
	← albel727 left	10:53
	→ SuzieQueue joined	10:53
	← cdown left	10:55
_ikke_	Anticom: Options get added after people either use it theirselfs, or someone requests it and isn't found unreasonable	10:56
Anticom	_ikke_: but usually git tells you right away what option can be used to set a default value so you don't have to specify it every time	10:57
_ikke_	Anticom: And especially experienced people, rarely use git add --all	10:57
Anticom	that's how i remember new features being introduced in the past	10:57
	← Suzeanne left	10:57
_ikke_	Anticom: I think you can understand not every parameter has a config option	10:58
	→ Nizumzen joined	10:58
Anticom	_ikke_: because of eventual overhead?	10:58
	or what's the reason?	10:58
	→ goTAN joined	10:58
_ikke_	Development overhead, too many options to configure	10:58
	→ mizu_no_oto joined	10:58
	← dionysus69 left	10:59
Anticom	No offense but IMHO `git add` is probably one of the most frequently used git commands. So i figure it would be great being able to set a default value for --all\|--ignore-removal	10:59
osse	use commit -a and be happy	11:00
lb1a	Anticom, as i said, the alias offers a quite good workaround for that, but for obvious reasons it cannot override the git add command	11:00
osse	well, happy enough	11:00
lb1a	osse, have a cookie and be happy too :D	11:00
	→ lindenle joined	11:01
	→ m0ltar joined	11:01
	← m0ltar left	11:02
	→ acetakwas joined	11:03
	← lindenle left	11:05
	← denimsoft left	11:05
	← terminal_echo left	11:05
	→ CatKiller joined	11:06
	→ denimsoft joined	11:06
CatKiller	Hi! I have delete a branch on a remote repo. I had never checked out this branch locally, but I somehow can't delete it from the internal refs and it always shows if I use "git branch -a"	11:06
	Is there a way to delete an unchecked branch>?	11:07
lb1a	CatKiller, git branch -rd <branchname>	11:07
	-r for remote -d for delete	11:07
CatKiller	Ahhhh	11:07
osse	does that work? o_O	11:07
CatKiller	thanks, somehow this was hard to google as it kept giving me results for untracked changes	11:07
lb1a	osse, just the local ref	11:08
CatKiller	That works! :)	11:08
osse	lb1a: yeah that's the part I wondered about :P	11:08
	← acetakwas left	11:08
CatKiller	Yes of course it doesn't do anything on the remote (I haven't pushed)	11:08
	but that's great	11:08
osse	CatKiller: in general if you don't know whether one or more branches have been deleted, but you want them deleted locally if that's the case, then git fetch --prune	11:08
	← Godfather_ left	11:08
lb1a	osse, i read it like he already deleted it on the server, but wants to get rid of the local ref	11:08
CatKiller	I wonder if I had not deleted the branch on remote and I did "git brand -rd <branchname>; git push"	11:08
	whether it would then delete	11:09
osse	CatKiller: and of course you can use that if you deleted it yourself	11:09
CatKiller	lb1a: That's exactly what I wanted to do	11:09
lb1a	CatKiller, no it wouldn't	11:09
osse	CatKiller: it wouldn't	11:09
CatKiller	osse, lb1a: good to know	11:09
	← vurma left	11:09
lb1a	CatKiller, git push --delete <remote> <branch> would delete it	11:09
	← znabavi left	11:11
CatKiller	lb1a: Yep, it makes sense: it's not because I don't have a remote ref that it needs to be removed from the remote necessarily	11:11
	explicitely deleting remote is the only way to go	11:11
	And I doubt git even keeps track of what remote branches refs I deleted locally apart from just clearing it locally	11:12
	← Zariel left	11:12
CatKiller	it's well done :)	11:12
	→ antiatom joined	11:12
	→ chris64_ joined	11:13
osse	CatKiller: if you delete a remote ref locally then git fetch will bring it back	11:13
	CatKiller: if you delete a ref remote then git fetch --prune will get rid of it locally	11:13
	And that's all I have to say about that.	11:13
CatKiller	osse: Interesting. So --prune here will prune what I don't have	11:13
	Actually that's great to know	11:14
osse	no it prunes what you do have that you shouldn't have	11:14
	→ Zariel joined	11:14
CatKiller	when pulling the Linux Kernel I usually only want a few branches and it keeps polluting my branches after a pull	11:14
	Thanks for the tip	11:14
	it will be useful	11:14
	:)	11:14
	→ malukenho joined	11:16
	→ cavallari joined	11:16
	← User4587_ left	11:16
	→ znabavi joined	11:17
	→ PsuzeannePsy joined	11:17
	← ErKa left	11:19
	→ harish_ joined	11:19
	jokajak` → jokajak	11:20
	→ jeffreylevesque joined	11:20
	← dsdeiz left	11:21
	← SuzieQueue left	11:21
	← ggVGc left	11:21
	→ albel727 joined	11:22
	← a_l_e left	11:22
	→ rnsanchez joined	11:24
	→ dionysus69 joined	11:27
	← arup_r left	11:28
	← jeffreylevesque left	11:29
	→ ErKa joined	11:30
	→ arup_r joined	11:30
	← Raging_Hog left	11:31
	← chris64_ left	11:32
	→ modocache joined	11:33
platzhirsch	So this alias opens nicely the latest commit in GitHub alias clc="git show && sensible-browser https://github.com/$(git config remote.origin.url \| awk -F '(:\|\\.git)' '{ print $2 }')/commit/$(git rev-parse HEAD)" but I am getting now warnings in non-git direcotires	11:33
	fatal: Not a git repository, any ideas how to wrap this in a check or so?	11:33
_rgn	platzhirsch: have you tried hub?	11:33
	https://github.com/github/hub	11:33
	→ Suzeanne joined	11:33
	← arup_r left	11:34
_rgn	hub browse -- commit/HEAD	11:34
platzhirsch	ah interesting	11:34
	oh :)	11:34
_rgn	hub pull-request is also very useful	11:35
	→ thiago joined	11:35
	→ Dro__ joined	11:35
	→ m0ltar joined	11:37
	→ Fingolfin joined	11:37
	← modocache left	11:37
	← Fingolfin left	11:37
	← simesy left	11:37
	→ arup_r joined	11:37
	← subscope left	11:37
	→ simesy joined	11:37
	→ arup_r_ joined	11:38
	← Sceorem left	11:38
	→ chris64_ joined	11:39
	← Zariel left	11:39
	→ cdown joined	11:40
	→ Vile joined	11:40
	→ thiago_ joined	11:41
	← arup_r left	11:42
	→ Zariel joined	11:42
	← goTAN left	11:43
	→ saidi_ joined	11:43
	← thiago left	11:44
	→ mostlybadfly joined	11:45
	← saidi left	11:45
	← affa09 left	11:45
	→ LBV_User joined	11:46
	← dionysus69 left	11:46
	→ Maple__ joined	11:46
	→ devoldmx joined	11:47
	→ dionysus69 joined	11:47
	→ saidi__ joined	11:47
	← saidi_ left	11:50
	← alienaut left	11:50
Anticom	Concerning git submodules: I'm having kind of a wrapper project which has its own repo and i've added openntp as submodule. now i want to modify the openntpd sources. i created and checked out a new branch for it and did some modifications	11:50
	question now is: do i have to add+commit the changes in the submodule seperatley or is it sufficient to add+commit in my "wrapper project"?	11:50
	→ nnyk_ joined	11:51
	← devoldmx left	11:51
LBV_User	Anticom: you need add and commit in both	11:53
	Anticom: in the submodule path to commit you changes to the source code	11:53
Anticom	LBV_User: okay thank's. Do i need to familiarize myself with "git submodule <...>" aswell in order to work properly with it?	11:53
LBV_User	and in the master repository to update which commit that submodule must use	11:53
	→ sdothum joined	11:53
	→ reim joined	11:53
Anticom	or is this considered "advanced stuff" ?	11:53
	← denimsoft left	11:54
	← lolmac left	11:54
LBV_User	Anticom: I've been using submodules for 2 years, and add, foreach and update --init are the only commands I had to use so far	11:54
	→ bitkiller joined	11:56
	← Zariel left	11:56
	→ bijan_ joined	11:57
	← dimi1947 left	11:58
bijan_	Hi I want my ubuntu server to push to a git repo in a script. Unfrotunately the script runs as superuser. How to tell git push to user a specific ssh key?	11:58
	Hi I want my ubuntu server to push to a git repo in a script. Unfrotunately the script runs as superuser. How to tell git push to use a specific ssh key?	11:59
	← fstd left	11:59
bijan_	user should mean use	11:59
	sry	11:59
lb1a	bijan_, use a host entry in the ~/.ssh/config file ?	11:59
	← tvw left	11:59
	→ fstd joined	11:59
bijan_	lb1a: but then it is depending on the host and not on the user on the server, right?	11:59
	→ Godfather_ joined	12:00
	→ Sceorem joined	12:00
bijan_	Do I have to create a ssh key for root?	12:00
	→ kgadek joined	12:00
	→ bvi_ joined	12:00
	← bvi_ left	12:00
Anticom	bijan_: i guess you could prefix the "git push" with su / sudo <user> ?	12:00
	just as an alternative	12:00
bijan_	I also tried to switch to https but I enabled two factor auth on bitbucket and it wants ssh	12:00
Anticom	assuming it's a shell script of course :)	12:01
bijan_	Anticom: yes it is a shell script that is run as a cron job as root	12:01
lb1a	bijan_, ? you have a script that should push to a bitbucket repo?	12:01
	→ RaceCondition joined	12:01
bijan_	lb1a: yes it makes sql backups	12:01
	and the sql files are versioned	12:02
Anticom	bijan_: "sudo -u <user> git push"	12:02
bijan_	Anticom: I guess that is the solution!	12:02
Anticom	just try it. if it fails come back :)	12:02
lb1a	bijan_, either what Anticom said, or write the bitbucket credentials (username keyfile) in the ~root/.ssh/config	12:02
	bijan_, like that : https://paste.fedoraproject.org/275826/21925114/	12:02
bijan_	Anticom: yeees works	12:03
Anticom	bijan_: sometimes comming up with simple/obvious solutions is a real art ;)	12:03
lb1a	Anticom, do you use cron for that?	12:03
Anticom	i've found myself often enough spinning arround and going further and further down the rabbit hole	12:03
lb1a	ah i meant bijan_	12:03
bijan_	Anticom: yes indeed... I slapped myself because this was supposed to be obvious :D	12:04
	→ {0xc6} joined	12:04
Anticom	you're welcome :>	12:04
lb1a	bijan_, the /etc/crontab enables you to specify the username that should be used to execute the script ...if you're using cron	12:04
	→ subscope joined	12:05
	← xcesariox left	12:06
bijan_	lb1a: good point but I wanted the script to run as root cause I access stuff like /etc/mysql/debian.cnf	12:06
lb1a	bijan_, i see. i hope you have an errorhandling in place, if the push fails ;)	12:06
bijan_	lb1a: not yet	12:07
	→ tvw joined	12:07
lb1a	bijan_, maybe have a look at bup. a backup tool that uses the git packformat	12:08
bijan_	this is the script: https://gist.github.com/tschundeee/f1910dbb6500d7d7d21d	12:08
	→ Stummi joined	12:08
	→ darkbasic_ joined	12:09
	← darkbasic left	12:10
qsuscs	platzhirsch: try https://github.com/seveas/git-spindle instead. it’s better.	12:10
	→ noisebleed_ joined	12:10
lb1a	bijan_, yeah it's a simple straight forward approach. used such things myself. but the stuff that applies to deployment in some cases apply to backup as well. i mean the parts where you cannot determine the state of the repo if something to push in a script	12:11
	← {0xc6} left	12:11
lb1a	maybe have a look at the !deploy comments	12:11
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	12:11
	→ geoid joined	12:12
bijan_	lb1a: cool	12:12
	→ jeffreylevesque joined	12:12
	← nilg left	12:13
bijan_	lb1a: I see the script still has problems with the ssh password prompt	12:13
alcohol	who uses ssh password prompts, lel	12:13
lb1a	bijan_, scripts with human interactions is a common fail ;)	12:13
bijan_	I used yes password \| git push	12:14
	← cagedwisdom left	12:14
bijan_	but somehow it still asks GGRRR	12:14
alcohol	why do you assume that would work?	12:14
lb1a	bijan_, create a seperate keypair for the backup script, add it to the bitbucket repo with push rights and leave it without a password...	12:15
	← elote left	12:15
lb1a	ah no, you are using the same user for the push, that wont work -.-	12:15
bijan_	lb1a: so I create a keypair without password for root?	12:16
	← qwebirc45852 left	12:16
lb1a	bijan_, i'd do so, and you could avoid the sudo part for the push as well	12:16
	→ youngbaks joined	12:16
lb1a	bijan_, but i'm not sure if that's a good way	12:16
bijan_	lb1a: at least sounds good	12:17
lb1a	bijan_, not really. if the root user creates new stuff in your local repo (maybe new refs or something like that) your normal user probably will fail to read/edit that because of permissions issues	12:18
bijan_	normal user doesn't have to read the sql backups	12:18
	just dumb backup files stored in /var/backup/mysql/..	12:18
lb1a	bijan_, then why the sudo in the first place? only for the github credentials?	12:18
	→ Ryanar joined	12:18
lb1a	s/github/bitbucket/	12:19
bijan_	:)	12:19
	← chris64_ left	12:19
	→ denimsoft joined	12:19
	→ dsdeiz joined	12:19
	→ s00pcan joined	12:20
	→ astrofog joined	12:20
	← kgadek left	12:20
bijan_	lb1a: you mean the script doesn't have to run on root level?	12:20
	→ jmpp joined	12:21
	← saidi__ left	12:21
	← thiago_ left	12:21
	→ saidi__ joined	12:22
platzhirsch	qsuscs: really nice, if you make full use of it	12:24
	← mizu_no_oto left	12:24
	← jmpp left	12:26
	→ jalnt joined	12:26
	← Dro__ left	12:27
	← smaudet left	12:27
	→ xcesariox joined	12:28
	→ Gamecubic joined	12:28
	← rasto left	12:29
	→ nerd joined	12:31
	→ thiago joined	12:33
	← MaceBewley left	12:34
	← the_cybersphinx left	12:35
	→ Anxi80 joined	12:35
	→ CEnnis91 joined	12:36
lb1a	bijan_, no i meant the part where you called the git push with the sudo gituser thing is kind of strange if the gituser doesn't has access to the repo	12:36
	(local repo)	12:36
	← fracting left	12:37
	← eliasp left	12:37
	← astrofog left	12:37
bijan_	lb1a: yes I removed it and added ssh certs to root user. now it is not necessary	12:37
lb1a	bijan_, ok	12:37
	→ sgambino joined	12:37
	← Ryanar left	12:38
	→ aesinv joined	12:38
	→ the_cybersphinx joined	12:39
	→ MarkyC joined	12:39
	← youngbaks left	12:39
	→ alienaut joined	12:39
	→ eliasp joined	12:39
	→ mellernoia joined	12:40
	→ mbrzuzy joined	12:41
	→ murgi joined	12:41
	← Manikandan left	12:41
	→ Zariel joined	12:42
	→ macabre joined	12:42
	← Zariel left	12:42
	→ rasto joined	12:42
	→ Zariel joined	12:42
	← Zariel left	12:43
	→ tinajohnson joined	12:43
	→ islalobo joined	12:43
	→ Zariel joined	12:43
	← Anxi80 left	12:44
	→ darkbasic joined	12:44
	→ Anxi80 joined	12:44
	← philophil left	12:44
	← darkbasic_ left	12:44
	→ lindenle joined	12:44
	→ dstarh joined	12:45
	→ paulweb515 joined	12:46
	→ philophil joined	12:47
	→ siwyi joined	12:49
	← DWestCoast left	12:49
	→ devoldmx joined	12:50
	→ d0p joined	12:51
	← machan left	12:52
	→ pluffsy_ joined	12:52
	← pluffsy left	12:52
	pluffsy_ → pluffsy	12:52
	→ fracting joined	12:53
	→ nerd_ joined	12:53
	← nerd left	12:53
	← jalnt left	12:53
	→ moritz_s joined	12:53
	← eliasp left	12:53
	← jost left	12:54
	← devoldmx left	12:55
	→ ss1891 joined	12:55
	← fracting left	12:55
	← Gitzilla left	12:55
	← paulweb515 left	12:56
	→ eliasp joined	12:56
	→ paulweb515 joined	12:56
	→ fracting joined	12:56
ilmari	!book	12:58
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	12:58
	→ halas joined	12:58
	→ kgadek joined	12:58
	← nnyk_ left	12:58
	← kgadek left	12:59
	← cdown left	12:59
	← soc42 left	12:59
	→ King_Hual joined	13:00
	→ tier joined	13:00
	→ krawchyk joined	13:00
	→ kgadek joined	13:00
	← cbreak left	13:01
	→ chris64_ joined	13:01
	← arup_r_ left	13:02
	→ cbreak joined	13:03
	→ rclanan joined	13:04
	← bsanford_ left	13:05
	← paulweb515 left	13:05
	gitinfo set mode: +v	13:05
	→ adgtl joined	13:06
	← bsanford left	13:06
	← adgtl left	13:06
	→ daito joined	13:06
	→ smaudet joined	13:06
	→ cdg joined	13:06
	← cdg left	13:06
	→ cdg joined	13:06
rclanan	Does anyone have have a good solution or could point me in a good direction on how to checkout the latest tagged commit following semver? For example, say you wanted to check out the latest alpha tag, 1.0.0-alpha	13:07
	→ Jackneill joined	13:08
	→ liamonade joined	13:09
	→ deryni joined	13:10
	← daito left	13:11
	← afuentes left	13:11
	→ shambat joined	13:12
	← murgi left	13:12
	→ User458764 joined	13:12
shambat	I have two branches, master and myBranch. I have some new files in master that I want to merge into myBranch, how can I do this?	13:12
	→ paulweb515 joined	13:13
	← thiago left	13:13
	→ nnyk_ joined	13:14
rclanan	shambat: git checkout myBranch git merge master	13:16
	← florian^ left	13:16
	← User458764 left	13:16
	→ Manikandan joined	13:17
	→ darkbasic_ joined	13:17
	← p4trix left	13:17
	← darkbasic left	13:18
	→ fxddf joined	13:18
	→ florian^ joined	13:18
	← florian^ left	13:19
	→ afuentes joined	13:20
	→ dimi1947 joined	13:20
	← tristanp left	13:20
	→ florian^ joined	13:20
	← florian^ left	13:20
	→ florian^ joined	13:20
	← fxddf left	13:21
	→ tristanp joined	13:21
	← florian^ left	13:21
	← islalobo left	13:21
	← Anticom left	13:22
	← paulweb515 left	13:23
	← dstarh left	13:23
	→ wrouesnel1 joined	13:24
	← rasto left	13:24
	→ shinnya joined	13:24
	→ machan joined	13:24
	→ jackeroo_marc joined	13:24
	← sagerdearia left	13:25
	→ florian^ joined	13:25
	→ Spacew00t joined	13:25
	→ anuvrat joined	13:27
	← MarkyC left	13:27
ckruczek	I think this autocrlf feature should get deleted in git...i fucking hate this issue maker.	13:27
Wulf	ckruczek: the whatß	13:27
	?	13:27
	← nnyk_ left	13:28
anuvrat	I can clone this private github org repo, but can't run ls-remote on it ... any ideas? https://dpaste.de/zA11	13:28
ckruczek	Wulf:autocrlf...well actually its not git's fault	13:28
	I just think, git shouldnt care about this problem.	13:28
	→ MarkyC joined	13:29
	→ nnyk_ joined	13:29
	← Spacew00t left	13:29
Wulf	ckruczek: yep, would be better if git wouldn't do any auto conversions...	13:30
	→ sagerdearia joined	13:30
	← liamonade left	13:30
ckruczek	Wulf, My oppinion is, that you/me as a developer should take care of the line-ending problem. so if there are teams with different OS they should configure their IDE to use a common lineending and everything is fine.	13:31
	or a better option, everybody should use a *nix system :P	13:31
Wulf	anuvrat: remove trailing /	13:31
	← znabavi left	13:32
anuvrat	Wulf: okay ...	13:32
	→ znabavi joined	13:33
	→ genera joined	13:33
	→ keroro520 joined	13:33
	→ modocache joined	13:33
	← flaguy48 left	13:34
anuvrat	Wulf: thanks a ton	13:34
	→ kaak joined	13:34
anuvrat	the simplest mistakes are the most irritating ones	13:35
	:(	13:35
	← scarcry left	13:36
	→ algae joined	13:36
kaak	I'd like to mirror the linux-stable git repository on Bitbucket, but I'm running into size overages (the repo is about 1.2GB).	13:36
	← aesinv left	13:36
	→ scarcry joined	13:36
kaak	What are my options for trimming size if long-term history is not much of a concern	13:36
	→ rasto joined	13:36
grawity	pretty much none	13:37
	← ckruczek left	13:37
	← antiatom left	13:37
grawity	though you could fork https://bitbucket.org/mirror/linux and see if that still gets rejected by quota	13:37
	uploading just -stable shouldn't add much	13:37
	→ paulweb515 joined	13:37
	← Ankhers left	13:38
	← modocache left	13:38
kaak	The problem is that I want linux-stable, not the mainline ... I need the bug/security fixes from stable	13:38
	← bijan_ left	13:38
	→ Ankhers joined	13:38
	→ ilmgb joined	13:38
	→ antiatom joined	13:38
kaak	But I also maintain a very few, small configuration changes. (defconfigs, device tree sources, small changes to the debpackage Makefile)	13:39
	← fracting left	13:39
	→ faux___ joined	13:39
	← machan left	13:39
	→ davispuh joined	13:39
	← platzhirsch left	13:40
kaak	So I'm trying to work my way towards a solution that gives me something I can work with.	13:40
	← MarkyC left	13:41
	→ ilmgb__ joined	13:41
	← ilmgb_ left	13:41
	→ zumba_ad_ joined	13:41
	→ whitby joined	13:41
	← Ankhers left	13:41
	→ ProbabilityMoon joined	13:41
kaak	It also feels a bit wonkey and awkward maintaining such a thin layer of changes ontop of such a huge project. Perhaps I'm going about it the wrong way with a fork?	13:41
	→ Ankhers joined	13:41
	← tyreld left	13:42
	→ ilmgb_ joined	13:42
	← znabavi left	13:42
	→ liamonade joined	13:43
	← liamonade left	13:43
	← geoid left	13:43
phroa	kaak: you could place patchfiles in a repo and apply them to a locally downloaded copy of linux-stable when you need to	13:43
	← faux___ left	13:43
	← Ankhers left	13:44
	← ilmgb left	13:44
	→ MarkyC joined	13:44
	← scarcry left	13:44
	→ Ankhers joined	13:44
	→ geoid joined	13:44
	→ scarcry joined	13:45
	florian^ → fk	13:45
	→ Al1ve joined	13:45
	→ dickdaley joined	13:45
	← zumba_ad_ left	13:46
	← ilmgb__ left	13:46
	→ ilmgb joined	13:46
	← juril left	13:47
	← dsdeiz left	13:48
	→ flaguy48 joined	13:48
	→ AaronMT joined	13:49
	← ilmgb_ left	13:49
	→ Gitzilla joined	13:50
	→ uoi joined	13:50
	← ilmgb left	13:51
	← uoi left	13:51
	← mbrzuzy left	13:51
	→ ilmgb joined	13:51
	→ fracting joined	13:52
	→ chitopunk joined	13:53
	→ machan joined	13:53
	→ editshare-ericf joined	13:54
	← nerd_ left	13:54
	→ nilg joined	13:54
	→ azuri5 joined	13:54
	→ ixwn joined	13:55
	→ cbonobo joined	13:55
	← ixwn left	13:55
	← Milos left	13:56
	→ rubyonrailed joined	13:56
	→ crose joined	13:57
	← s8321414 left	13:57
	→ xtgt joined	13:57
	← bambams left	13:58
	→ bambams joined	13:58
	→ s8321414 joined	13:58
	→ cdown joined	13:58
	→ aesinv joined	13:59
	← xcesariox left	14:00
	← xtgt left	14:00
	→ bsanford joined	14:00
	→ znabavi joined	14:00
	→ bsanford_ joined	14:00
	→ let joined	14:01
	← krawchyk left	14:01
	← let left	14:02
	→ mbrzuzy joined	14:02
	→ lfeon joined	14:03
	← lfeon left	14:05
	← znabavi left	14:05
	→ vikas027 joined	14:05
	← nilg left	14:05
	← eGGsha left	14:06
	→ NotBobDole joined	14:07
	→ Leuxo joined	14:07
	← Leuxo left	14:07
	→ ozvh joined	14:08
	← ozvh left	14:08
	→ linuxmint2 joined	14:09
	→ Not_Whatever joined	14:09
	← linuxmint2 left	14:10
	← bsanford_ left	14:10
	← bsanford left	14:11
	← cdown left	14:11
	→ jnewt joined	14:11
	→ _9dan joined	14:11
	→ cdown joined	14:12
	← jnewt left	14:12
	← s8321414 left	14:12
	→ jnewt joined	14:12
	→ Aioa joined	14:12
	→ Dougie187 joined	14:12
	← Aioa left	14:13
	← keroro520 left	14:14
	→ keroro520 joined	14:14
	← chris64_ left	14:15
ag4ve_	how do i disable the pager in an alias?	14:15
	← cdown left	14:15
	← Noldorin left	14:15
	→ zackiv31 joined	14:16
	→ cdown joined	14:16
	→ User458764 joined	14:16
	→ HenriettaSalt joined	14:17
	→ Rodya_ joined	14:17
	← MarkyC left	14:17
	← CussBot left	14:18
	→ stantonk joined	14:18
	→ axl_ joined	14:18
	→ chris64 joined	14:18
	← chris64 left	14:18
	→ chris64 joined	14:18
	→ CussBot joined	14:18
	← Ankhers left	14:18
heftig	ag4ve_: e.g. git config alias.diffstat "!git --no-pager diff --stat"	14:18
	→ Ankhers joined	14:19
	→ Sejgd joined	14:20
	← Sejgd left	14:20
	→ faux___ joined	14:21
	→ m1h4 joined	14:21
	← m1h4 left	14:21
	← keroro520 left	14:21
ag4ve_	so ! in alias runs a full command?	14:22
	→ codeurge joined	14:22
	← ss1891 left	14:22
	→ BBBThunda joined	14:23
	→ highcup joined	14:23
	← nnyk_ left	14:25
	← faux___ left	14:25
	→ Iuu joined	14:25
	→ affa09 joined	14:26
	← Iuu left	14:27
	← davispuh left	14:27
	← chris64 left	14:28
	→ WizJin joined	14:28
	→ azuri5_ joined	14:29
	← azuri5_ left	14:30
	→ victortyau joined	14:30
	→ hlwe joined	14:31
	→ IrishPrime joined	14:31
	→ sanketdg joined	14:31
	← cdown left	14:31
	← azuri5 left	14:32
	← hlwe left	14:32
	← ProbabilityMoon left	14:33
	→ pm90_ joined	14:33
	← denimsoft left	14:34
	→ denimsoft joined	14:35
	→ ncthom91 joined	14:35
	← ncthom91 left	14:36
	→ ncthom91 joined	14:36
	← ncthom91 left	14:36
	← noisebleed_ left	14:36
	→ ncthom91 joined	14:37
	← ncthom91 left	14:37
	→ faux___ joined	14:37
	→ tvhf joined	14:37
	→ modocache joined	14:37
	← tvhf left	14:37
	→ pm90__ joined	14:38
	→ moldy joined	14:38
moldy	hey	14:38
	https://dpaste.de/RVtw i pulled those 707 commits by accident. how can i throw them away?	14:39
phroa	git reset --hard origin/master	14:39
	→ davispuh joined	14:39
	← Saturn812 left	14:39
	← Godfather_ left	14:39
	← zoso left	14:40
	→ noisebleed_ joined	14:40
	→ MarkyC joined	14:40
moldy	phroa: thanks :)	14:40
phroa	o7	14:40
	→ dinobytes joined	14:40
phroa	p.s. that's a lot of unwanted commits	14:40
	← pm90_ left	14:40
moldy	phroa: it's a project that uses another branch than master as the default branch	14:41
	→ acetakwas joined	14:41
	→ tiuv joined	14:41
	← faux___ left	14:41
	← tiuv left	14:41
	← acetakwas left	14:41
	→ acetakwas joined	14:42
phroa	mmm	14:42
	← acetakwas left	14:42
	→ Alienpruts joined	14:42
	→ aard_ joined	14:42
	→ Bzwp joined	14:42
	→ acetakwas joined	14:42
	→ ProbabilityMoon joined	14:43
	→ arup_r joined	14:43
	← Bzwp left	14:43
	→ xender joined	14:43
	← sid281 left	14:44
	← geoid left	14:45
shambat	rclanan: thanks!	14:45
	→ Milos joined	14:45
	→ sid28 joined	14:45
	→ geoid joined	14:46
	← dionysus69 left	14:46
	→ Walex2 joined	14:46
	← HenriettaSalt left	14:46
	→ chris64_ joined	14:47
	→ Probabil_ joined	14:47
	→ AnalogSuzen joined	14:47
	→ Es0teric joined	14:47
	← alienaut left	14:47
	→ cbonobo_ joined	14:47
	→ aard__ joined	14:47
	→ bl4ckpajamas joined	14:47
	← geoid left	14:48
	→ rwb1 joined	14:48
	→ editshare-ericf_ joined	14:49
	← ProbabilityMoon left	14:49
	→ andyrr joined	14:49
	← aard_ left	14:49
	← cbonobo left	14:49
	← theskillwithin left	14:49
	← codeurge left	14:49
	← editshare-ericf left	14:49
	← rwb left	14:49
	← zacts left	14:49
	← andyr left	14:49
	rwb1 → rwb	14:49
	← joelsmith left	14:49
	← Uptime left	14:49
	← blackpajamas left	14:49
	← nitrix left	14:49
	← martinklepsch left	14:49
	← dlitz left	14:49
	← Walex left	14:49
	→ Eq joined	14:49
	← sid28 left	14:50
	← infiniteturtles left	14:50
	← FIQ left	14:50
	→ dreiss joined	14:50
	← machan left	14:50
	→ FIQ joined	14:50
	→ infiniteturtles joined	14:50
	→ zacts` joined	14:51
	← Suzeanne left	14:51
	→ devoldmx joined	14:51
	→ martinklepsch joined	14:51
xender	Hi. Is there some guide to efficient and elegant "history post-processing"? :>	14:51
	→ joelsmith joined	14:51
	→ lvh joined	14:51
	→ dlitz joined	14:51
	← _9dan left	14:51
xender	That is, I have created a lot of commits on a branch named "wip" with intention of cleaning it up later.	14:52
	And "later" came today.	14:52
phroa	!sausage and !perfect	14:52
gitinfo	[!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect	14:52
	[!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.	14:52
phroa	!rewrite applies to both, of course	14:52
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	14:52
	← rchavik left	14:52
phroa	though I suspect you don't care about rewriting history on a wip branch :3	14:52
	← simesy left	14:52
xender	phroa: Thanks!	14:52
	→ xcesariox joined	14:53
	← gua_ould left	14:53
xender	Currently one co-worker is working on project and has been warned about my post-processing intentions, so no worries about rewriting :)	14:53
	→ Guest6328 joined	14:54
	← aesinv left	14:54
	← rscata left	14:55
	→ znabavi joined	14:55
	→ gua_ould joined	14:55
	→ aesinv joined	14:55
	← devoldmx left	14:55
	← quadz left	14:55
	→ keroro520 joined	14:55
	→ Noldorin joined	14:56
	← acolson_ left	14:56
	← keroro520 left	14:56
	← Puffball left	14:56
	→ Puffball joined	14:57
	→ keroro520 joined	14:57
	→ aesinv_ joined	14:58
	→ akiva joined	14:58
	→ quadz joined	14:58
	→ sid28 joined	14:59
	← znabavi left	14:59
	← gua_ould left	15:00
	← jonmorehouse left	15:00
	← aesinv left	15:00
	→ fedexo joined	15:03
xender	Hm, does git gc look at object's creation date when determining grace period? Or only on reachability data? (Which of course includes reflog entries with their own expiration date.)	15:03
	→ dionysus69 joined	15:04
	→ snowcycl_ joined	15:04
	→ Thorax joined	15:06
	→ daivyk joined	15:06
	→ daito joined	15:07
	→ bango2 joined	15:08
	← bango2 left	15:08
rclanan	Does anyone have have a good solution or could point me in a good direction on how to checkout the latest tagged commit following semver? For example, say you wanted to check out the latest alpha tag, 1.0.0-alpha	15:08
	← Sceorem left	15:09
	→ bango2 joined	15:09
	→ Raging_Hog joined	15:09
	→ bond joined	15:10
	→ flashpoint9 joined	15:10
ojacobson	xender: object age for loose objects (see --prune), reflog age and reachability for all objects, and ref reachability for all objects.	15:10
	← Vile left	15:11
	← Raging_Hog left	15:11
	← daito left	15:11
	→ machan joined	15:11
xender	ojacobson: Thank you	15:12
	← denimsoft left	15:12
xender	So it's 3 months for reflog entries and 2 weeks for dangling loose objects?	15:12
	→ denimsoft joined	15:12
	→ tier_ joined	15:13
ojacobson	the defaults are 30 days for reflog entries not reachable from the current value of the ref, 90 days for reflog entries reachable from the current value, 2 weeks for loose objects	15:13
	→ The_Phoenix joined	15:13
	← D-Boy left	15:13
ojacobson	at least as I read it	15:13
	← Manikandan left	15:14
angular_mike_	Is there a way to list all tracked files in the order they were changed?	15:15
	order of files changed in same commits doesn't matter	15:15
	← Zariel left	15:15
xender	ojacobson: What is the definition of reachability in "reflog entries reachable from current value of ref"?	15:16
	← tier left	15:16
grawity	the usual one (history DAG), I'd assume	15:16
ojacobson	yep	15:17
	→ krawchyk joined	15:17
xender	Hm, this way...	15:17
ojacobson	for the reflog of refs/heads/master, each row is either reachable (if you can find it by walking parents from refs/heads/master) or not (if you can't)	15:17
xender	So it's mostly for making older reflog entries cleaner or what?	15:18
	← subscope left	15:18
	← rclanan left	15:19
xender	It seems to be redundant for recovery purposes, because on resetting ref to some random place, all reachable reflog entries with 90 days grace period would degrade to non-reachable ones with 30 days grace period	15:20
	→ jonmorehouse joined	15:20
xender	Then, does git gc autoatically clean up reflog entries themselves or only uses them to determine objects reachability?	15:21
	← onov left	15:21
	← dimi1947 left	15:21
	→ znabavi joined	15:22
	→ eGGsha joined	15:23
	← noisebleed_ left	15:23
	← snowcycl_ left	15:23
	→ pluffsy_ joined	15:24
	← pluffsy left	15:24
	pluffsy_ → pluffsy	15:24
	← keroro520 left	15:25
	→ jmpp joined	15:25
	← mbrzuzy left	15:26
	← malukenho left	15:26
	→ D-Boy joined	15:26
	← znabavi left	15:26
	→ dimi1947 joined	15:27
	→ settermjd joined	15:27
	→ theskillwithin joined	15:27
	← Balliad left	15:27
	→ keroro520 joined	15:28
	→ subscope joined	15:28
	→ dv_ joined	15:28
	← infernix left	15:29
	← lb1a left	15:29
	← ThomasLocke left	15:29
	→ scarabx joined	15:30
	← jmpp left	15:30
	← d0p left	15:31
	→ sfan786 joined	15:31
	→ thinkxl joined	15:33
	→ Karkus joined	15:34
	→ AAoK joined	15:35
	→ malukenho joined	15:35
	← reim left	15:36
	→ acetakwas_ joined	15:36
	→ mbrzuzy joined	15:36
	← ItSANgo left	15:37
	← The_Phoenix left	15:38
	→ Zamyatin joined	15:39
	← settermjd left	15:39
	← antiatom left	15:39
	→ islalobo joined	15:39
	→ s00pcan_ joined	15:40
	← pluffsy left	15:40
	→ fsda joined	15:41
	→ The_Phoenix joined	15:42
	→ antiatom joined	15:42
	→ stickperson joined	15:42
	← PCatinean left	15:42
	gitinfo set mode: +v	15:43
fsda	Hi?	15:43
gitinfo	fsda: 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.	15:43
	→ nfk joined	15:43
	← ayaz left	15:43
	→ jost_ joined	15:44
fsda	Is there anyone who help me?	15:44
milki	fsda: !ask	15:44
gitinfo	fsda: Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.	15:44
fsda	I'm going to update some program in linux	15:44
	← s00pcan_ left	15:44
fsda	but I'm in introductory level ㅠㅠ	15:45
	Do you know some plasma simulation code, WARP?	15:46
	→ Spacew00t joined	15:46
bremner	I guess you should ask some scientists about that?	15:46
	← moldy left	15:46
fsda	But it is some technical problem	15:46
	→ ItSANgo joined	15:47
fsda	in terms of git	15:47
	→ skylite joined	15:47
bremner	ok. then hopefully it doesn't matter what the software does...	15:47
	→ jmpp joined	15:47
fsda	I should update the program	15:47
	→ MechtiIde joined	15:48
	← madewokherd left	15:48
fsda	By the way, I don't know why it don't work in the way indicated by manual	15:49
bremner	you're not making it easy to help you.	15:49
	← Karkus left	15:49
	← saidi__ left	15:49
	→ geoid joined	15:49
	← Probabil_ left	15:50
fsda	Yes I know	15:50
	In the manual, written, type 'git pull'	15:50
	→ sid281 joined	15:51
fsda	in some directory indicated	15:51
	← islalobo left	15:51
	← jceb left	15:51
fsda	but the answer returned is 'error: The requested URL returned error: 403 Forbidden while accessing http://portal.nersc.gov/project/warp/git/warp.git/info/refs'	15:53
	→ blackpajamas joined	15:53
	→ faux___ joined	15:53
	← sid28 left	15:53
fsda	Do you know the mean of this comment?	15:53
	Actually I'm not familiar with both Linux kernel and Git	15:54
bremner	is that last ' a typo?	15:55
fsda	Ah	15:56
	apostrophe ' is not contained in this comment	15:57
	Actually,	15:57
	← gfixler left	15:58
fsda	jus	15:58
	just	15:58
	→ WellSaggy joined	15:58
fsda	error: The requested URL returned error: 403 Forbidden while accessing http://portal.nersc.gov/project/warp/git/warp.git/info/refs	15:58
	← faux___ left	15:58
fsda	It is the answer of command	15:58
	← wwwald left	15:58
fsda	command was	15:58
	git pull	15:58
	← WellSaggy left	15:58
bremner	and are you certain you have the correct url?	15:58
	← TomyWork left	15:59
milki	http://portal.nersc.gov/project/warp/git/	15:59
	→ islalobo joined	15:59
milki	theres no warp.git	15:59
	← subscope left	15:59
fsda	This url is from the developer's repository, bitbucket	15:59
	→ ruuda joined	15:59
milki	should probably be using the bitbucket repository	16:00
	← antiatom left	16:00
fsda	Is not there?	16:00
milki	which, in fact, is a git repo	16:00
	→ mwhooker joined	16:00
	← mwhooker left	16:00
milki	fsda: whats not there?	16:00
	← krawchyk left	16:00
	← sfan786 left	16:00
	→ rgenito joined	16:01
fsda	You said to me that theres no warp.git	16:01
	→ Alexander123123 joined	16:01
fsda	Wahts the mean	16:01
	→ krawchyk joined	16:01
	← denimsoft left	16:01
	← Alexander123123 left	16:01
	→ Psychiatrist joined	16:02
milki	fsda: i posted a url	16:02
	← bond left	16:02
milki	fsda: and if you click on it, you'll see warp.git isnt listed	16:02
	→ Karkus joined	16:02
	→ denimsoft joined	16:02
	→ Alexander123123 joined	16:02
fsda	I see your words	16:02
milki	fsda: which means the url you posted, isnt a valid url	16:03
	→ nasomi joined	16:03
	← bb010g left	16:03
	← ruuda left	16:03
	← syegres left	16:03
nasomi	could someone tell me the #gitforretards channel	16:03
	→ aquiles joined	16:04
	→ nKulo joined	16:04
	← acetakwas left	16:04
	← pm90__ left	16:04
	→ acetakwas joined	16:04
fsda	milki: Can you see the page, https://sites.google.com/a/lbl.gov/warp/home/how-to-s/installation ?	16:04
	← acetakwas left	16:04
	→ acetakwas joined	16:05
	← acetakwas left	16:05
fsda	In this page, the part of installing warp, the way of updating warp is listed	16:05
	← zackiv31 left	16:06
	← Noldorin left	16:06
	← chris64_ left	16:06
	→ avichalp joined	16:07
	← Gonzo89 left	16:08
	→ sssilver joined	16:08
	← sssilver left	16:08
	← stickperson left	16:09
	← editshare-ericf_ left	16:09
	→ Noldorin joined	16:09
	→ acetakwas__ joined	16:10
	← mikiones left	16:11
	← acetakwas__ left	16:12
	→ acetakwas__ joined	16:12
ojacobson	fsda: the tarball they have you download contains a git repository	16:12
	← acetakwas__ left	16:12
ojacobson	that repository has a remote (probably "origin", but check git remote -v in that repository) configured	16:12
	that remote is configured to point to something that's either not a git repo, or a git repo so old modern git can't talk to it	16:12
	← geoid left	16:13
ojacobson	talk to the people who distribute the software and get them to fix it :)	16:13
	→ acetakwas__ joined	16:13
fsda	Thank you	16:13
	← krawchyk left	16:13
milki	the remote url in the release points to the bitbucket repo	16:13
	← howdoi left	16:13
	← acetakwas__ left	16:14
milki	fsda: you should start over from the download step and try again	16:14
	→ saidi__ joined	16:14
milki	fsda: it does say the most recent release	16:14
	← bonswouar left	16:14
milki	fsda: maybe the older releases arent valid	16:14
	→ samw joined	16:14
milki	fsda: you might be able to just switch the remote	16:15
	fsda: git remote set-url origin https://bitbucket.org/berkeleylab/warp.git	16:15
	fsda: git pull	16:15
	→ imachuchu joined	16:15
	→ madewokherd joined	16:16
milki	all their releases point to bitbucket	16:16
	which means they've been on bitbuck for 2 years already	16:16
fsda	Thank you so much ㅠㅠ	16:16
milki	either your repo is really old or you changed it	16:17
	← islalobo left	16:17
	→ krawchyk joined	16:17
	← Rodya_ left	16:18
fsda	Oh my god..	16:18
	It is working !!	16:18
	← Spacew00t left	16:19
	← dimi1947 left	16:19
	→ rwb1 joined	16:21
	← aquiles left	16:21
	→ chris64 joined	16:22
	← eGGsha left	16:22
	← jmpp left	16:22
	← rwb left	16:23
	rwb1 → rwb	16:23
	← droid909 left	16:23
	← achadwick left	16:24
	→ faux___ joined	16:24
	→ zumba_addict joined	16:25
zumba_addict	what error did I make? I was in a fix-branch. git stash save "fix" && git checkout master && git pull && git checkout fix-branch && git merge origin/master	16:25
	→ w00tner joined	16:25
zumba_addict	i got a CONFLICT	16:26
	← freimatz left	16:26
	→ royalty joined	16:26
w00tner	hello. i have a repository i want to reuse in a diferent server. i will change some configs like dbs and alter some tables also. Is FORKING the best approach ?	16:26
	← Alexander123123 left	16:26
w00tner	fork the original project, change name and work there for the other project?	16:26
	← faux___ left	16:28
	→ editshare-ericf joined	16:30
	← jackeroo_marc left	16:30
	← keroro520 left	16:30
Eugene	Sounds like a textbook fork case	16:30
	ChanServ set mode: +o	16:30
	← avichalp left	16:30
	← kurkale6ka left	16:30
	→ yarnfive8 joined	16:31
	Eugene changed the topic to: Welcome to #git, the place for git help and Yaky Puffs \| Current stable version: 2.6.0 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| git-fetch: no training required	16:31
	Eugene set mode: -o	16:31
CareBear\	can i haz puffs plz	16:31
	→ Spacew00t joined	16:31
w00tner	no	16:31
CareBear\	i sed plz!!	16:31
phroa	huh?	16:31
CareBear\	I am just being noisy	16:32
	actually I should eat. later!	16:32
zumba_addict	so I fixed the conflict but now I cannot stash pop it	16:33
	the file that I fixed is being said as "needs merge"	16:33
	← marcogmonteiro left	16:36
	← scarabx left	16:36
	→ faux___ joined	16:36
_ikke_	zumba_addict: git add <file>	16:36
zumba_addict	i did git merge --abort then pop it	16:37
	now I did the git merge again	16:37
	fixing conflict now	16:37
	that should also work right?	16:37
	i see my changes too	16:37
	← acetakwas_ left	16:38
	→ Wetmelon joined	16:40
	→ durham joined	16:40
	← faux___ left	16:40
	← durham left	16:41
	← dreiss left	16:41
	← vikas027 left	16:41
	→ durham joined	16:41
	→ NeckBeardPrince joined	16:42
	→ jceb joined	16:43
	→ reim joined	16:43
	← whitby left	16:44
	→ pm90_ joined	16:44
	← Alienpruts left	16:44
	→ aquiles joined	16:45
	← sQVe left	16:46
	→ sQVe joined	16:46
	← foul_owl left	16:47
	← reim left	16:48
	← jost_ left	16:49
	→ foul_owl joined	16:49
	→ pm90__ joined	16:49
	→ thomasreggi joined	16:49
	← halas left	16:49
	→ keroro520 joined	16:50
	← dinobytes left	16:51
	→ devoldmx joined	16:51
	← pm90_ left	16:52
	← zumba_addict left	16:52
	→ simesy joined	16:53
	→ Darcidride joined	16:55
	← saidi__ left	16:55
	→ saidi__ joined	16:56
	← devoldmx left	16:56
	→ durham_ joined	16:56
	→ duckmaestro joined	16:57
	← stamina left	16:57
	← wrouesnel1 left	16:57
	→ odizeuz joined	16:58
	← simesy left	16:58
	→ m0viefreak joined	16:59
	→ jigjug joined	16:59
	← jigjug left	16:59
	→ durham__ joined	16:59
	← durham_ left	16:59
	← durham left	16:59
	→ zumba_addict joined	17:01
	→ reim joined	17:01
	→ d4rklit3 joined	17:04
	← NeverDie left	17:04
	→ settermjd joined	17:04
	← saidi__ left	17:04
	← kp666 left	17:05
	→ whomp joined	17:05
johnnyfive	Ok, i'm at a loss. I need a solution to locally cache all repos pulled from outside our company. What solutions come to mind?	17:07
milki	johnnyfive: clone them?	17:07
	→ faux___ joined	17:07
	← reim left	17:07
milki	johnnyfive: mirror them?	17:07
	→ daito joined	17:08
	← FIQ left	17:08
	← encod3 left	17:08
	← aard__ left	17:08
	← denimsoft left	17:08
	← samw left	17:08
	← The_Phoenix left	17:08
	→ aard_ joined	17:08
	→ geoid joined	17:09
	→ Guest87868 joined	17:09
	← aard_ left	17:09
	→ kgirthofer joined	17:09
	← settermjd left	17:09
johnnyfive	Ok, I guess I mean something more transparent. If a dev clones a repo on his box, makes a project, and we deploy said project.. but the git repo it depends on for some reason disappears, and so does his dev copy, we're screwed. I'm trying to create a workflow for making sure that never happens..	17:10
	← Karkus left	17:10
fsda	I have a question	17:11
	← faux___ left	17:11
	→ dinobytes joined	17:12
johnnyfive	Answers exist	17:12
bremner	johnnyfive: don't let people deploy from their copies.	17:12
	← daito left	17:12
fsda	if the command 'git remote set-url origin https://~' don't affect to default set	17:12
	← Psychiatrist left	17:13
	→ ankurk joined	17:13
johnnyfive	bremner\| that's not really relevant, since that's not what I said. but ty	17:13
	→ snowcycle joined	17:13
bremner	johnnyfive: why don't you already have the repos that are being deployed?	17:14
	how is stuff being lost? or how is it possible to lose stuff?	17:14
	→ gfixler1 joined	17:14
johnnyfive	exactly what I said, sometimes repos disappear from github. People delete stuff. It happens	17:14
	→ jmpp joined	17:15
bremner	ah. ok. I missed the external part. sorry.	17:15
	that's just madness ;).	17:15
johnnyfive	yes, it's happened a couple times, hence trying to find a solution	17:16
bremner	so force devs to only use submodules from repos you control?	17:17
	← Guest87868 left	17:17
	→ Guest87868 joined	17:17
	Guest87868 → FIQ	17:17
	→ saidi__ joined	17:17
johnnyfive	well i'm one of said devs, and we have a solution now. it requires manually mirroring repos in our local git server.. but devs forget.. Dependencies for dependencies change.. etc.. it's just not manageable manually	17:18
	→ pantsman- joined	17:18
	Guest55465 → tobias	17:18
johnnyfive	I mean I can't be the only one trying to do this, I get the feeling nobody has a real solution that is automatic	17:19
Nevik	johnnyfive, so use a caching server?	17:19
johnnyfive	Nevik\| like what? squid?	17:19
Nevik	no, a git-specific cache	17:19
bremner	dunno. I'd be freaked if my devs were pulling random stuff from github without any QA or license analysis.	17:19
Nevik	like a local maven repository	17:19
	that too	17:19
bremner	I guess I'm just old fashioned.	17:19
Nevik	bremner, no you're sane :P	17:20
	← jmpp left	17:21
johnnyfive	Well I don't live in that world, and even then that doesn't solve the problem.. what if they did it without you knowing? what if it was critical? what if the repo disappeared? that's still not a solution to the problem that exists. That's what i'm getting at	17:21
Nevik	well, for one thing, everyone who has a clone of said repo has the entire repo	17:21
	→ stickperson joined	17:21
	→ samw joined	17:21
Nevik	so if it disappears, just push that clone somewhere and you're good	17:21
johnnyfive	Ok, ty for your time, we're just talking in circles now	17:21
Nevik	(minus fixing all the urls)	17:21
	→ Anxi80_ joined	17:21
	← saidi__ left	17:22
Nevik	not quite, i dont think. you're talking of disappearing repos, which is a thing the distributed nature of git expressly works against	17:22
	→ saidi__ joined	17:22
	→ noisebleed_ joined	17:22
	→ huglester joined	17:23
	← samw left	17:23
Nevik	johnnyfive, so there are thigns like https://github.com/sitaramc/gitpod and git's --reference support (e.g. see http://randyfay.com/content/reference-cache-repositories-speed-clones-git-clone-reference )	17:23
	→ nnyk_ joined	17:23
johnnyfive	my original question answered your point exactly. What if the dev machine dies? or the dev moves on? or the repo gets deleted on accident on his computer? If you work with data you know that "it's fine if there's a single copy out there" is a bad policy	17:23
	← w00tner left	17:23
Nevik	(searching for "git caching server" or proxy or something will give you more results)	17:23
	johnnyfive, buy as a company, you should have a working backup scheme of important data. if your external dependencies are important because you deploy them, they should be part of that	17:24
	but* as a company	17:24
johnnyfive	yea, ty Nevik, that was what I was getting at, i've already looked at gitpod and as you can see it was last updated 4 years ago.. which it may or may not work, however I was hoping that there was a more git-specific way to handle this.	17:24
	What does it look like i'm trying to do...	17:24
Nevik	hm i thought there was a more ready-made solution for this, but i cant find it right now	17:24
johnnyfive	Neither can I, hence asking	17:25
Nevik	basically any big company does this (it's the same idea how maven uses caching proxy repositories)	17:25
	possibly lots of custom-made solutions	17:25
milki	sitaram_: johnnyfive thinks gitpod doesnt work because it hasnt gotten updates	17:25
johnnyfive	Well I am part of a "big" company and we haven't found any solutions that don't require a lot of work on the devs part, which I can't believe.	17:25
	← Anxi80 left	17:26
johnnyfive	milki\| I did not say that	17:26
Nevik	tbh i dont know how much work it would take, but if it's really that critical to you, you should explore building your own in more detail	17:26
_ikke_	johnnyfive: The mailing list has some topics about other big companies running into similar issues	17:26
	johnnyfive: The git devs know about it, and work for it slowly gets integrated	17:26
Nevik	it would be mostly setting up a git server in your network, that just clones any repo it doesnt have upon request from github	17:26
milki	johnnyfive: at $job, we use gitolite and its upstream trigger to mirror all external repos in house	17:26
johnnyfive	Nevik\| we may, it's something we've been thinking about writing if we can't find a solution	17:27
milki	johnnyfive: and we expressively ensure that all repos point to our mirrors	17:27
Nevik	milki, i'd be interested in how you check/enforce that	17:27
	→ Manikandan joined	17:28
	← fsda left	17:28
milki	Nevik: nothing literally enforced. we simply dont guarantee it will work if you use an external dependency	17:28
Nevik	ah	17:28
	sounds reasonable	17:28
milki	Nevik: we rely mostly on packaging to pypi and apt repos rather than git checkouts directly	17:28
	← bongjovi left	17:28
Nevik	ah	17:28
	i guess that's how i've started to really like using maven	17:29
	dependency management that works is such a blessing, really	17:29
	→ dreiss joined	17:29
milki	Nevik: luckilly most everyone uses git urls for git repos	17:29
	→ kpease joined	17:30
milki	Nevik: er, ssh urls	17:30
Nevik	ha	17:30
milki	Nevik: so our build servers use a key which has limited access	17:30
Nevik	ah, nice	17:30
milki	if you touch an external repo, no access!	17:30
	and then they cry to us -.-	17:30
Nevik	so the build would fail. nice solution.	17:30
	and then you point to your guidelines document? :D	17:30
milki	good point, should write one...	17:31
	← machan left	17:31
Nevik	"[milki] closed your ticket. Reason: PEBKAC"	17:31
	→ samw joined	17:31
	← nnyk_ left	17:32
	← Nizumzen left	17:33
milki	:P	17:33
	→ TomyLobo joined	17:33
	→ gancl joined	17:34
	← rubyonrailed left	17:34
	← kpease left	17:34
	→ dm7freek joined	17:35
	→ Sasazuka joined	17:35
	→ smurfsicle joined	17:35
	→ monster_ joined	17:36
	← Spacew00t left	17:36
	→ kpease joined	17:36
monster_	yo bros	17:36
	time to noob this place up	17:36
	→ faux___ joined	17:36
dm7freek	I made 2 branches off of master: foo and bar. In foo, I made commits A and B, and in bar, I made commits C and D. I want foo's history to look like I did C, D, A, then B. How?	17:36
monster_	doing my first pull request,	17:36
	git request-pull v0.1 https://github.com/OpenBazaar/OpenBazaar-Server.git master	17:37
	fatal: Not a valid revision: v0.1	17:37
	not sure where I am suppose to get the revision from.	17:37
	← mezod left	17:37
dm7freek	monster_: probably a tag?	17:37
monster_	there is no tags in the project, only master branch	17:37
	← geoid left	17:37
dm7freek	monster_: use a commit hash?	17:38
	honestly, i didnt even realize you could start a pr from the cli	17:38
	thought PRs were a github thing	17:38
dzho	:)	17:38
	this is why I tried to learn git before using github	17:39
	→ Spacew00t joined	17:39
	→ knownasilya joined	17:39
dzho	so I'd have a better idea as to what comes from which	17:39
	← Milos left	17:40
	← faux___ left	17:41
	← mbrzuzy left	17:42
dm7freek	monster_: https://git-scm.com/docs/git-request-pull	17:42
cbreak	a pull request is a request for someone to pull	17:42
	← afuentes left	17:42
cbreak	a simple "hey, can you pull?" is a pull request	17:42
	→ fred1807 joined	17:43
dm7freek	monster_: "The upstream project is expected to have the commit named by <start>" (i.e. v0.1)	17:43
qsuscs	though if it's github you may want a github pull request	17:43
	→ afuentes joined	17:43
fred1807	git's github git https://github.com/git/git	17:43
	→ pluffsy joined	17:43
qsuscs	-> webinterface or e.g. https://github.com/seveas/git-spindle	17:43
	fred1807: DOES NOT COMPUTE	17:44
xcesariox	if you wanna learn git the right way, use gitflow, monster_ learn from here https://gist.github.com/shaunstanislaus/622f970ee3589995e76f, dzho .	17:45
qsuscs	xcesariox: there is no "right way"	17:46
xcesariox	qsuscs: erm, i beg to differ.	17:46
	← tzero left	17:46
xcesariox	qsuscs: work flow exist for a reason.	17:46
qsuscs	xcesariox: !best	17:46
gitinfo	xcesariox: [!bestway] You want to know the best way to do X? If you can give us a proper definition of "best", we'll give you a proper way to do X ;)	17:46
qsuscs	xcesariox: gitflow is not bad, but it's certainly not "the right way"	17:47
cbreak	it's a stupid way that makes stupid assumptions	17:47
dzho	yeah, I'd avoid git flow early on for the same reason I'd avoid github early on--to steer clear of what I learn being dependent on something that is an extension to git rather than just git itself.	17:47
xcesariox	cbreak, qsuscs : its a start for novice to try to understand git.	17:47
cbreak	xcesariox: nah	17:47
	novices don't need it	17:47
qsuscs	xcesariox: no. they should learn git first.	17:47
	→ Milos joined	17:48
cbreak	git flow is for teams that work on projects that have a release based workflow (as opposed to CI)	17:48
	← crose left	17:49
	→ tzero joined	17:49
	← nfk left	17:49
	→ Limes_ joined	17:49
	← troulouliou_div2 left	17:50
	← saidi__ left	17:50
	← King_Hual left	17:52
	→ mbrzuzy joined	17:52
	→ Orbitrix joined	17:53
	→ King_Hual joined	17:53
	← grilled-cheese left	17:54
	← Chill_Surf left	17:54
	→ ajf- joined	17:55
ajf-	Can I exclude a file or pattern from a git diff ?	17:55
	← keroro520 left	17:55
	← malukenho left	17:56
	→ malukenho joined	17:56
	← mark3 left	17:57
	← kgadek left	17:58
dm7freek	I made 2 branches off of master: foo and bar. In foo, I made commits A and B, and in bar, I made commits C and D. I want foo's history to look like I did C, D, A, then B. How?	17:58
	→ dspirito joined	17:59
matthiaskrgr	you can make a new branch and cherry-pick the commits into your target branch one by one	18:00
	← snowcycle left	18:00
dm7freek	huh... duh! thanks	18:00
	→ kpease_ joined	18:00
	← UukGoblin left	18:00
	→ UukGoblin joined	18:00
matthiaskrgr	np :)	18:00
dm7freek	followup Q: can 2 local branches track the same remote branch?	18:00
	dm7freek guesses yes	18:01
matthiaskrgr	should work	18:01
	just try it :p	18:01
dm7freek	perfect, sounds like a plan :)	18:01
cbreak	dm7freek: just git rebase bar	18:01
	← kpease_ left	18:01
cbreak	(while on foo)	18:01
dm7freek	cbreak: that will figure it out? i thought that was a job for rebase, but ive only ever used rebase to clean history within one branch	18:01
	→ kpease_ joined	18:01
dm7freek	cool, will try tht first	18:02
	→ Amandil joined	18:02
	→ livingstn joined	18:02
	← kpease_ left	18:02
	← Nick-S left	18:02
	→ kpease_ joined	18:03
	→ saidi__ joined	18:03
dm7freek	beautiful	18:03
	← kpease left	18:03
	→ rwb1 joined	18:04
	→ znabavi joined	18:05
	← rwb left	18:05
	rwb1 → rwb	18:05
	→ Balliad joined	18:06
	→ faux___ joined	18:08
	→ slentzen joined	18:08
	→ fracting1 joined	18:08
	← znabavi left	18:09
	← saidi__ left	18:09
	→ jceb_ joined	18:09
	← fracting left	18:10
	→ rubyonrailed joined	18:11
	kpease_ → kpease	18:12
	← faux___ left	18:12
	← jceb left	18:12
	← rubyonrailed left	18:13
	→ btree joined	18:13
	← tvw left	18:13
	→ Rym7 joined	18:14
	→ weaksauce joined	18:14
	← dspirito left	18:15
	→ avichalp joined	18:15
	← durham__ left	18:15
	→ jackeroo_marc joined	18:16
	→ bb010g joined	18:16
	gitinfo set mode: +v	18:16
	← pluffsy left	18:17
	← AAoK left	18:17
	→ tyreld joined	18:18
	→ durham joined	18:18
	→ encod3 joined	18:19
	→ Limes__ joined	18:19
	→ mikiones joined	18:19
	← btree left	18:20
	← avichalp left	18:21
	← Limes_ left	18:21
	→ rwb1 joined	18:21
	← siwyi left	18:21
	→ saidi__ joined	18:22
	← noisebleed_ left	18:22
dm7freek	cbreak: i rebased, made an additional change on foo, then I did `git rebase -i HEAD~8` and squashed the latest 3 into 1. there are 8 commits listed on my PR now because the hashes changed for 5 common commits that are already in master. (1) why? (2) how do i prevent that? do i just have to do HEAD~3 next time?	18:22
	→ zeRez joined	18:23
cbreak	dm7freek: look at !lol	18:23
gitinfo	dm7freek: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	18:23
cbreak	and compare with upstream	18:23
	I don't know how your history looks.	18:23
moritz	dm7freek: it's possible that there was a merge commit in the last 8 commits, and a rebase flattened that out	18:23
cbreak	pastebin the output if you want to show it to me	18:23
	kpease → kpease_	18:23
moritz	dm7freek: which would explain the different sha1s	18:23
	← joki left	18:24
	← smurfsicle left	18:24
	← encod3 left	18:24
	← saidi__ left	18:24
	← zeRez left	18:24
	→ saidi__ joined	18:25
	← rwb left	18:25
impliednude	For some odd reason. I cloned a repository. Changed nothing with the original set except added some new files to the project. I went to merge staging and it said there are conflicts even though I never changed anything with the files they are pointing out.	18:25
cbreak	impliednude: why merge?	18:26
	← rwb1 left	18:26
moritz	impliednude: if the upstream project added some of the same files, you can still get a conflict	18:26
	→ daito joined	18:26
dm7freek	moritz: there was def a merge commit... i see now. next Q then: how do i tell git rebase to leave something alone in the editor? just comment out everything?	18:26
impliednude	nope, none of the same files. I was tasked with developing modules for the system. Which is what the new files were	18:26
cbreak	dm7freek: if you want to abort, delete every line	18:27
	dm7freek: if you don't want to change a commit, leave it at "pick"	18:27
	→ snthsnth joined	18:27
cbreak	(it will still change the sha if something before changes)	18:27
	← krawchyk left	18:27
	← Amandil left	18:27
madewokherd	impliednude: perhaps you're accidentally merging one upstream branch into a different upstream branch?	18:27
dm7freek	cbreak: ok... so i think at the point i was at the thing to do wouldve been abort and HEAD~3... ty	18:28
impliednude	maybe sighs	18:28
	→ Asiajey joined	18:28
	← Asiajey left	18:28
	→ Asiajey joined	18:28
	kpease_ → kpease	18:30
	→ denimsoft joined	18:30
	→ rwb joined	18:30
	→ joki joined	18:30
	← xcesariox left	18:30
	← chris64 left	18:31
	← Asiajey left	18:31
	→ Keridos joined	18:31
	← daito left	18:31
	← jackeroo_marc left	18:32
	→ znabavi joined	18:32
	→ krawchyk joined	18:32
	← dm7freek left	18:32
	→ nydel07 joined	18:32
moritz	impliednude: if you look at the conflicting files, it should be obvious where the conflicts come from	18:33
	→ mizu_no_oto joined	18:33
	→ cerkauskas joined	18:33
moritz	the conflict markers tell you which part conflicted	18:33
angular_mike_	Is there a way to list tracked files, ordering them by their last modification date?	18:33
	→ geoid joined	18:34
	→ pedahzur joined	18:34
	← dickdaley left	18:34
moritz	angular_mike_: git ls-files\|xargs ls -t	18:34
	→ daito joined	18:34
moritz	though that orders by last file system modification, not by last modification from git	18:34
	← denimsoft left	18:35
pedahzur	So, I have a file I committed without execute permissions. Now I want to add execute permissions. I tried git update-index --chmod=+x script.sh. It updates the file sitting in the working copy, but 'git status' doesn't show any changes, and 'git commit' says nothing to commit, directory clean. How do I commit the permission update?	18:35
angular_mike_	moritz: no, I meant the git modification	18:35
	← cdg left	18:35
	→ Garriel joined	18:35
angular_mike_	moritz: basically ordering by the date of last commit that modified it	18:35
	→ faux___ joined	18:36
	→ cdg joined	18:36
angular_mike_	pedahzur: changing the permission and performing `git add <file>; git commit` should work	18:36
	← znabavi left	18:36
pedahzur	angular_mike_: Yeah...tried that. Still says 'nothing to commit, working directory clean' :)	18:37
	← anth0ny left	18:38
	→ anth0ny joined	18:38
pedahzur	angular_mike_: OK, strange...looks like the file may have already been set as such in the repo. Another clone showed it properly. Something must have tweaked the perms in my working copy. Sorry for the noise.	18:39
	→ antiatom joined	18:40
	← faux___ left	18:40
	← Balliad left	18:40
	← cdg left	18:40
	← daito left	18:40
	→ jackeroo_marc joined	18:41
	← snthsnth left	18:42
	→ grilled-cheese joined	18:44
	← m0ltar left	18:45
	→ User4587_ joined	18:45
	← Manikandan left	18:46
	← jceb_ left	18:46
	→ jrahmy joined	18:47
	← saidi__ left	18:47
	← livingstn left	18:48
	→ diegoviola joined	18:49
	→ pluffsy joined	18:49
	← jonmorehouse left	18:49
	← sanketdg left	18:50
	← pluffsy left	18:50
	← User458764 left	18:50
	→ Phoenixz joined	18:51
	← MechtiIde left	18:51
	→ m0ltar joined	18:51
	← fred1807 left	18:52
	→ devoldmx joined	18:52
	→ blinkdesign joined	18:52
	← blinkdesign left	18:53
	→ cluelesscoder joined	18:53
	← kgirthofer left	18:53
cluelesscoder	is there a simple way to show the commits which come after a given commit? reading man git-log and I'm not seeing it	18:53
gitinfo	the git-log manpage is available at http://jk.gs/git-log.html	18:53
	← geoid left	18:54
	→ jarek joined	18:54
	→ simesy joined	18:54
	→ geoid joined	18:54
	← geoid left	18:55
	→ veverak joined	18:55
_ikke_	cluelesscoder: The problem is that each commit only points to it's parents, so it's easy to find which commits came before, but not easy which came after.	18:55
veverak	hi folks	18:55
	anybody experience with gitolite refusing to allow me to push	18:55
	while I have correct key?	18:55
	only difference from usual is that I am connecting over router that port-forwards it	18:56
_ikke_	veverak: What error are you getting?	18:56
cluelesscoder	+_ikke_: so I can use the date I suppose - what is the default date format for git log? the man page says " log.date config variable sets a default value for the log command’s --date option"	18:56
veverak	Permission denied (publickey).	18:56
	fatal: Could not read from remote repository.	18:56
bremner	veverak: also, does "ssh git@server info" work?	18:57
cluelesscoder	but when I check the git-config, it doesn't mention a default for log.date	18:57
	← nettoweb left	18:57
	→ bap1313 joined	18:57
veverak	bremner: permission denied	18:57
cluelesscoder	and actually log.date isn't what I'm looking for...	18:57
bremner	veverak: congrats, you have an ssh problem, not a gitolite problem ;)	18:57
	→ jonmorehouse joined	18:58
cluelesscoder	I'm looking for how I can make 'git log --after="August 12 2015"' work	18:58
	→ micah joined	18:58
veverak	bremner: ... :D	18:58
	it's virtual server behind router	18:58
	← stantonk left	18:58
veverak	i can freely ssh into that machine from my "console" that got ssh on the internetz	18:58
bremner	veverak: I guess try the ssh troubleshooting tips on gitolite.com	18:58
	← jarek left	18:59
veverak	it worked while I was in same network with the server	18:59
	and used it's local IP	18:59
	← simesy left	18:59
veverak	but now nah	18:59
	→ Manikandan joined	18:59
micah	how can I show the git log entries for only two remotes (not all of them)?	18:59
	→ stantonk joined	18:59
veverak	bremner: btw: my pubblic key md5sum and sum of admin key in gitolite-admin matches	19:00
	→ saidi__ joined	19:00
	→ dstarh joined	19:00
	← nKulo left	19:00
	→ Zuki joined	19:00
	← diegoviola left	19:00
	← Zuki left	19:01
dstarh	I have a file in git that's not ignored. I need to make temporary changes to it due to an OS upgrade that not everyone has made yet, is there any way to easily avoid checkin in my changes to the one file?	19:01
	← tier_ left	19:01
grawity	add other changes individually (`git add -p`)	19:01
	→ machan joined	19:02
cluelesscoder	is it possible to use something like 'git log --before="12/09/2015" --after="12/07/2015"'	19:02
	it is only respecting a single option	19:02
	→ Nizumzen joined	19:03
	← devoldmx left	19:03
dstarh	grawity i've been doing that but getting annoying, not expecting to be able to undo or commit the change for a few days	19:03
	← stantonk left	19:03
bremner	veverak: the page I mentioned is http://gitolite.com/gitolite/sts.html	19:03
cluelesscoder	well, reading the commit limiting section more carefully I guess not...	19:04
	→ tier joined	19:04
veverak	yeah	19:04
	bremner: read that, didn't noticed anything that should wnat	19:04
	*work, or describe my problem	19:04
bremner	veverak: I guess the next option is to bug #ssh (assuming that exists)	19:05
	← Sasazuka left	19:05
veverak	hmm	19:06
	hmmm	19:06
	veverak got soemthing	19:06
	→ Sasazuka joined	19:06
	← machan left	19:06
veverak	bremner: ssh git@server won't work because that aims at different machine	19:07
	git uses for this different port than 22 afaik	19:07
	→ anchorite joined	19:07
veverak	but ssh git@server -p 9418 info	19:07
	→ faux___ joined	19:07
	← majuscul1 left	19:07
veverak	reports connection refuset	19:07
	← __main__ left	19:07
bremner	well. nc, traceroute, etc... sounds like a firewall issue.	19:08
	→ chandlerbing joined	19:08
_ikke_	port 9418 is the git protocol, not ssh	19:09
bremner	also that ;)	19:10
pedahzur	_ikke_: and 29418 is the gerrit ssh server. :)	19:10
	→ __main__ joined	19:10
Eugene	9418 and 29418 are often co-opted by gerrit & friends	19:10
veverak	gerrit?	19:10
Eugene	!gerrit	19:10
gitinfo	Gerrit is a web-based code review system, built by Google. https://code.google.com/p/gerrit/	19:10
cluelesscoder	git log -n 5 --after="12/12/2015" sort of works (give me commits starting from August 5 or so), while git log -n 5 --after="12/13/2015" does not... is there any documentation on what format git expects these dates to be in?	19:10
veverak	ah	19:10
Eugene	It uses its own SSH daemon so it can do funny tricks for user auth	19:10
veverak	well, from inside the network, I can clone the repos	19:10
	→ youngbaks joined	19:11
cluelesscoder	git log -n 5 --after="12/13/2015" gives no output	19:11
	← Manikandan left	19:11
	→ mikecmpbll joined	19:11
Joseph_Silber	I have a file's changes staged. Now I want to reset the file's contents to HEAD, without affecting the index.	19:11
	How can I do this?	19:11
	← faux___ left	19:12
	→ stantonk joined	19:12
Joseph_Silber	`git checkout -- path/to/file` doesn't accomplish anything, since it fulls from the index. I want to apply HEAD's contents to the working directory.	19:12
cluelesscoder	eh, found it on Stackoverflow https://stackoverflow.com/questions/27313309/list-git-commits-to-master-branch-between-two-dates	19:12
veverak	ok	19:13
	I am missing this	19:13
	but git clone git@server -> this uses what port?	19:13
	→ jmpp joined	19:13
veverak	(using gitolite)	19:13
bremner	what did you really type?	19:13
	because that's not a valid url.	19:13
veverak	"veverak.org"	19:14
	→ Alienpruts joined	19:14
veverak	bremner: git clone using that servers name in that network (sshed into another machine)	19:14
	git clone [email@hidden.address]	19:14
	worked	19:14
	using git cloen [email@hidden.address]	19:14
	doesn't	19:14
bremner	ok. that's an ssh url	19:14
	in both cases.	19:15
veverak	so it uses 22?	19:15
	hmm	19:15
	← aquiles left	19:15
bremner	unless you reconfigure ssh.	19:15
	→ oojacoboo joined	19:15
	→ espindol_ joined	19:16
	→ sssilver joined	19:17
_ikke_	Joseph_Silber: easiest: git show :file > file	19:17
	soryr	19:17
	Joseph_Silber: easiest: git show HEAD:file > file	19:17
Joseph_Silber	This worked: git checkout HEAD file	19:18
	← tobyx left	19:18
_ikke_	yes, but that also updates index	19:18
	← malukenho left	19:18
Joseph_Silber	Oh! Ouch!	19:19
	No way to go back now?	19:19
	:(	19:19
	→ malukenho joined	19:19
	← krawchyk left	19:19
_ikke_	well, the object still exist in the repository	19:19
	← chandlerbing left	19:20
	← genera left	19:20
_ikke_	git fsck --lost-found	19:20
	← Milos left	19:20
_ikke_	then check .git/lost-found/other if you can find the contents	19:20
veverak	finally!	19:20
	bremner: thanks a lot!	19:21
	→ aquiles joined	19:21
	→ Milos joined	19:21
bremner	wrong port forwarded?	19:21
	← DeMiNe0 left	19:22
Joseph_Silber	_ikke_, that did it. Thanks!	19:22
	→ tobyx joined	19:22
	← __main__ left	19:22
Joseph_Silber	I should probably get more acquainted lost-found.	19:22
	No idea what all this dangling is.	19:22
	→ guardian joined	19:23
guardian	hello	19:23
_ikke_	Joseph_Silber: They are objects that most of the time are not needed any more	19:23
guardian	when logAllRefUpdates = true -- is there a way to know who pushed a tag to a remote?	19:23
_ikke_	Joseph_Silber: echo foo > bar; git add bar; echo foo >> bar; git add bar -> dangling object	19:24
	→ DeMiNe0 joined	19:24
Joseph_Silber	So dangling objects are things that have been added to the index but never committed?	19:24
	→ t-mart_ joined	19:25
_ikke_	for example	19:25
	Or commits that have been amended	19:25
	→ __main__ joined	19:25
Joseph_Silber	Those are available in reflog	19:25
_ikke_	yup	19:25
	→ ascarter_ joined	19:25
	→ blackpaj1 joined	19:25
Joseph_Silber	I guess dropped stashes	19:25
	→ dickdaley joined	19:25
	← ascarter left	19:25
	→ krawchyk joined	19:25
Joseph_Silber	Those aren't in reflog. Or are they?	19:25
	← msonntag left	19:25
	← frdmn left	19:25
	← Guest45384 left	19:25
_ikke_	Dropped stashes not anymore	19:26
	← Muzer left	19:26
Joseph_Silber	So those could be found in lost-found?	19:26
	→ znabavi joined	19:26
_ikke_	yes, I think so	19:26
	← LoganG left	19:26
	→ LoganG joined	19:26
	← gfixler1 left	19:27
	← blackpajamas left	19:27
	← macabre left	19:27
	← skylite left	19:27
	← Internet13 left	19:27
	← t-mart left	19:27
	← cerkauskas left	19:28
	→ Kamran joined	19:28
	→ frdmn joined	19:28
	← frdmn left	19:28
	→ frdmn joined	19:28
	→ cdown joined	19:28
	→ msonntag joined	19:28
	Kamran → Guest56459	19:28
	← MarkyC left	19:29
	→ MarkyC joined	19:29
	← __main__ left	19:30
	→ Internet13 joined	19:31
	← znabavi left	19:31
	→ __main__ joined	19:32
	← mp3 left	19:32
	→ JM_ joined	19:34
	→ Repox joined	19:35
	→ faux___ joined	19:35
	← __main__ left	19:35
	→ Muzer joined	19:37
	→ fred1807 joined	19:38
	← Repox left	19:38
	← saidi__ left	19:38
ankurk	What are some good Git workflows for small teams? I would love to know since my team is trying to set up a workflow from the ground up.	19:38
	← fred1807 left	19:38
	→ snthsnth joined	19:38
phroa	!workflows	19:38
gitinfo	[!workflow] Finding the right workflow for you is critical for the success of any SCM project. Git is very flexible with respect to workflow. See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.	19:38
	→ marc_v92 joined	19:39
	← jeffreylevesque left	19:39
	← marc_v92 left	19:39
	← blackpaj1 left	19:40
ankurk	Thanks @phroa	19:40
	← faux___ left	19:40
	vith1 → vith	19:40
ankurk	Should be a good read	19:40
	→ Asiajey joined	19:41
	← Asiajey left	19:42
	→ X67r joined	19:43
	→ otter768_ joined	19:44
	← otter768 left	19:44
	← snthsnth left	19:44
	→ livingstn joined	19:45
	→ espindola joined	19:45
	← pedahzur left	19:46
	← jnewt left	19:46
	← mbrzuzy left	19:46
	→ AlexMax_ joined	19:46
	← dustinm- left	19:47
	← krawchyk left	19:47
	← AlexMax left	19:47
	← tomek left	19:47
	← Hello71 left	19:47
	← slixpk left	19:47
	← halfline left	19:47
	← james3015 left	19:47
	→ Hello71_ joined	19:47
	→ halfline joined	19:47
	→ james3015 joined	19:47
	→ renoirb joined	19:47
	→ slixpk joined	19:47
	→ tomek joined	19:47
	→ mwhooker joined	19:47
	← Sasazuka left	19:48
	← espindol_ left	19:48
	→ machan joined	19:48
	→ dustinm joined	19:49
	→ jceb_ joined	19:49
	→ yqt joined	19:50
	← jonmorehouse left	19:50
	← aquiles left	19:51
	→ cdg joined	19:52
	← Xe left	19:52
	→ pedahzur joined	19:52
	→ znabavi joined	19:53
	→ Xe joined	19:53
	→ jagob joined	19:54
	← livingstn left	19:55
	→ mbrzuzy joined	19:57
	← znabavi left	19:57
	← kpease left	19:57
	→ saidi__ joined	19:57
	← Ceber left	19:58
	→ kpease joined	19:58
	→ mwhooker_ joined	19:58
	→ devoldmx joined	19:59
	← mwhooker left	20:00
	← ErKa left	20:00
	← Thorax left	20:00
	→ jonmorehouse joined	20:00
	→ Brain joined	20:01
	← tier left	20:01
	← mwhooker_ left	20:01
	→ tier joined	20:01
	← IrishPrime left	20:02
	← jceb_ left	20:03
	← stantonk left	20:04
	← devoldmx left	20:04
Joseph_Silber	I'm using `patch -p1 < file.patch` to apply a patch across two different repositories.	20:05
	→ wCPO joined	20:05
	→ stantonk joined	20:05
Joseph_Silber	For any conflicts, I get a new file `original-name.rej`	20:06
	But I also have `original-name.orig`	20:06
Seveas	Joseph_Silber: that's not bad, but try 'git format patch' and 'git apply' next time. Or simply add the second repo as a remote, and then fetch and cherry-pick	20:06
	format-patch*	20:06
Joseph_Silber	Didn't work for me.	20:06
	They share no heritage.	20:06
	← bap1313 left	20:07
_ikke_	Seveas: git format-patch -> git am	20:07
Joseph_Silber	Back to my patch... I'm trying to understand what those `original-name.orig` are for.	20:07
Seveas	Joseph_Silber: that shouldn't matter :)	20:07
Joseph_Silber	I get them for some files that have no conflict.	20:07
	But what are they for?	20:07
Seveas	the .orig is the unmodified file from before running patch	20:07
	← Rym7 left	20:07
Joseph_Silber	I only get it for a few files. Why?	20:07
_ikke_	It's a safety	20:08
	are the other files changed?	20:08
Joseph_Silber	Sure.	20:08
	→ mingwandroid joined	20:09
	→ gopar joined	20:09
	→ mwhooker joined	20:10
	← pm90__ left	20:11
	← jmpp left	20:11
	← zumba_addict left	20:12
	→ Suzeanne joined	20:14
	→ livingstn joined	20:14
	→ gfixler1 joined	20:14
	← darkbasic_ left	20:15
	→ jmpp joined	20:16
	→ darkbasic joined	20:16
	← PsuzeannePsy left	20:17
	← flashpoint9 left	20:18
	→ snthsnth joined	20:19
	← LBV_User left	20:19
	← mwhooker left	20:19
	→ cdown_ joined	20:20
	← cdown left	20:20
	→ cjohnson joined	20:20
	→ sid28 joined	20:21
cjohnson	I'm running git clean -df and I'm under the impression that as long as I don't use -x, it should leave ignored files alone	20:21
	← dstarh left	20:21
	→ ahr3n joined	20:21
cjohnson	but when I run it, it's removing a dir that I'm explicitly ignoring	20:21
j416	cjohnson: is it empty?	20:21
cjohnson	http://pastie.org/pastes/10466918/text	20:22
	j416: it's not	20:22
	← sid281 left	20:22
cjohnson	git status doesn't show it at all so I know it's being succesfully ignored	20:22
	→ cdown joined	20:22
	← algae left	20:22
Seveas	you're not ignoring that dir, only its contents	20:22
cjohnson	I thought git had no concept of dirs	20:23
Seveas	only when ignoring	20:23
cjohnson	or not in that way, anyway	20:23
grawity	it has no concept of /empty/ dirs	20:23
Seveas	only when ignoring it does have a concept of dirs	20:23
	← aesinv_ left	20:23
	← jonmorehouse left	20:23
	→ D-unit joined	20:24
	→ nessundorma joined	20:24
cjohnson	I took the empty dirs thing to mean that it just didn't have a concept of dirs period. so anyway I just need to ignore dev-tools/node_modules ?	20:24
	that will successfully ignore the dir and all its contents?	20:24
Seveas	yes	20:24
cjohnson	ok	20:24
	← D-unit left	20:24
cjohnson	but my question is, why doesn't it show up in git status?	20:24
j416	interesting corner-case nonetheless	20:24
cjohnson	not even as an untracked file	20:24
Seveas	or you could use git clean -dX	20:24
j416	cjohnson: probably because you are ignoring everything in it, and that makes it "empty"	20:25
	→ nettoweb joined	20:25
cjohnson	ahhh right	20:25
	git status only has concepts of dirs	20:25
	→ blimpse joined	20:25
cjohnson	er files	20:25
	that makes sense then	20:25
	Cool thanks folks	20:25
j416	o/	20:26
	← AaronMT left	20:26
	→ Karkus joined	20:26
	→ Sasazuka joined	20:26
	← rwb left	20:28
	← nessundorma left	20:30
	← nettoweb left	20:31
	→ troulouliou_dev joined	20:32
	← darkbasic left	20:32
	→ bendangelo joined	20:32
	→ whomp_ joined	20:32
	→ marc_v92 joined	20:32
	← cjohnson left	20:32
	← whomp left	20:33
	→ darkbasic joined	20:34
	← youngbaks left	20:34
	← wCPO left	20:34
	→ SuzieQueue joined	20:35
	→ Oog joined	20:36
	→ faux___ joined	20:36
	← madewokherd left	20:36
	→ daito joined	20:37
	← Suzeanne left	20:39
	→ whomp joined	20:40
	← marc_v92 left	20:40
	← anchorite left	20:40
	← faux___ left	20:40
	→ anth0ny_ joined	20:41
	← anth0ny left	20:41
	→ dgarzon joined	20:41
	← daito left	20:41
	← whomp_ left	20:41
	← Jackneill left	20:42
	← Milos left	20:42
	← Karkus left	20:42
	→ RockLee joined	20:43
	→ Milos joined	20:43
	→ thiago joined	20:45
	→ gdg joined	20:45
gdg	hi	20:45
gitinfo	gdg: 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.	20:45
gdg	I am in a detached branch	20:46
	→ NeverDie joined	20:46
gdg	how can I merge it back to a branch XY	20:46
	→ BlueProtoman joined	20:46
phroa	!merge	20:46
gitinfo	'git merge' takes two diverged lines of history (series of commits, e.g. on different branches), and recombines them with a "merge commit" on top. This creates an explicit record of you doing the merge, unless there were no local changes (which does a !fast_forward merge instead). If you don't need to keep a record like that, !rebase may produce easier-to-read history, but the two don't always mix well... see also !merge_vs_r	20:46
	→ nuck joined	20:46
	→ User458764 joined	20:47
	→ adgtl joined	20:47
	→ znabavi joined	20:47
	→ nettoweb joined	20:47
BlueProtoman	I have a repo on GitHub that I forked from another repo, but I accidentally diverged from the original repo, and didn't figure this out until after my changes were already on GitHub. How can I just reset my fork's master branch to the original repo's master?	20:47
	→ aesinv joined	20:47
	← jagob left	20:48
_ikke_	BlueProtoman: Do you know how to fix it in your local clone of your fork?	20:48
phroa	BlueProtoman: git reset --hard upstream/master ; git push -f origin master	20:48
	where upstream is the upstream, origin is your fork	20:48
	← Milos left	20:49
	→ Amandil joined	20:49
BlueProtoman	phroa: Thank you!	20:49
	→ hobodave joined	20:49
BlueProtoman	_ikke_: No, I don't. Just that I think I accidentally re-committed some changes, but that doesn't matter now	20:49
	→ Karkus joined	20:49
	← Nizumzen left	20:50
	→ flashpoint9 joined	20:51
	← mizu_no_oto left	20:51
	← User458764 left	20:51
	← znabavi left	20:52
	← saidi__ left	20:52
	← harish_ left	20:52
	→ Milos joined	20:52
	← mbrzuzy left	20:53
	→ boombatower joined	20:53
	← cavallari left	20:53
	← BlueProtoman left	20:53
	← Spacew00t left	20:53
	→ darkbasic_ joined	20:53
	← whomp left	20:54
	← Amandil left	20:54
	← darkbasic left	20:54
	→ bap1313 joined	20:55
	→ acetakwas joined	20:55
	← gdg left	20:55
	← livingstn left	20:55
	← AnalogSuzen left	20:55
	← Oog left	20:56
	→ arthurix joined	20:56
	← jrahmy left	20:56
	→ jonmorehouse joined	20:57
	← adgtl left	20:57
	← tier left	20:57
	→ adgtl joined	20:59
	← blimpse left	20:59
	← cdown left	20:59
	← boombatower left	21:00
	← shinnya left	21:01
	← stantonk left	21:01
	← oojacoboo left	21:01
	ChanServ set mode: -o	21:01
	← m0ltar left	21:01
	← SuzieQueue left	21:02
	→ MistahKurtz joined	21:02
	← darkbasic_ left	21:02
	→ tpollard joined	21:03
	→ darkbasic joined	21:03
	→ m0ltar joined	21:03
	← m0ltar left	21:03
	→ mbrzuzy joined	21:03
	← snthsnth left	21:03
	← dickdaley left	21:04
	→ madewokherd joined	21:04
	← NeckBeardPrince left	21:05
	→ stantonk joined	21:05
	← rnsanchez left	21:05
	→ pm90_ joined	21:05
	← mbrzuzy left	21:05
	← xudongz left	21:06
	← JM_ left	21:06
	← smaudet left	21:06
	→ kgadek joined	21:07
	← kgadek left	21:07
	→ dickdaley joined	21:08
	→ Rym7 joined	21:08
	→ kgadek joined	21:09
	← kgadek left	21:09
	← Karkus left	21:09
	← Anxi80_ left	21:09
	← flashpoint9 left	21:09
	→ alexsystemf joined	21:10
	→ oojacoboo joined	21:10
	← ankurk left	21:10
	→ ahr3n_ joined	21:10
	← anth0ny_ left	21:11
	→ anth0ny joined	21:11
	← Rym7 left	21:13
	← ahr3n left	21:13
	→ Suzeanne joined	21:14
	← jackeroo_marc left	21:14
	→ pm90__ joined	21:15
	← ploopkazoo left	21:15
	← BBBThunda left	21:16
	→ espindol_ joined	21:17
	← pm90_ left	21:17
	→ ColdKeyboard joined	21:19
	→ ploopkazoo joined	21:20
	→ xcesariox joined	21:20
	← micah left	21:20
	← espindola left	21:20
	→ espindola joined	21:21
	← mingwandroid left	21:22
	← oojacoboo left	21:23
	← espindol_ left	21:23
	← RaceCondition left	21:24
	→ macrover joined	21:25
	→ Vile joined	21:25
	← darkbasic left	21:26
	→ m0ltar joined	21:26
	→ linuxmint2 joined	21:26
	← ProfessorKaos64 left	21:26
	→ cagedwisdom joined	21:28
	→ eikood joined	21:28
	→ darkbasic joined	21:29
	← w00die left	21:29
	← arup_r left	21:29
	→ boombatower joined	21:29
	← askhl left	21:30
	→ anth0ny_ joined	21:31
	→ denimsoft joined	21:31
	← dgarzon left	21:32
	← anth0ny left	21:32
	← huglester left	21:32
	← impliednude left	21:32
	← affa09 left	21:34
	→ cdown joined	21:34
	← arthurix left	21:34
	← Alienpruts left	21:35
	← troulouliou_dev left	21:35
	→ darkbasic_ joined	21:36
	← denimsoft left	21:36
	← darkbasic left	21:37
	→ nnyk_ joined	21:37
	← ahr3n_ left	21:37
	→ dsdeiz joined	21:38
	← macrover left	21:38
	→ ahr3n joined	21:38
	← cagedwisdom left	21:39
	→ trv joined	21:40
	→ AnalogSuzen joined	21:40
	→ mezod joined	21:40
	→ ASOLAr joined	21:40
	← slentzen left	21:41
	← modocache left	21:41
	→ stamina joined	21:41
	← cdown left	21:41
	→ znabavi joined	21:42
	→ darkbasic joined	21:42
	→ hashtag_ joined	21:42
	← acetakwas left	21:42
	← darkbasic_ left	21:43
	← bb010g left	21:43
	← pedahzur left	21:44
	← Suzeanne left	21:44
	→ pedahzur joined	21:44
	← nemix__ left	21:44
	← RockLee left	21:44
	← Brain left	21:45
	← fscala left	21:45
	→ acetakwas joined	21:45
	← mellernoia left	21:45
	← hashtag_ left	21:46
	← skullcrasher left	21:46
	← znabavi left	21:46
	← durham left	21:46
	→ durham joined	21:47
	← lg188 left	21:47
	→ fscala joined	21:47
	→ Douhan joined	21:49
	→ pandeiro joined	21:49
	→ skullcrasher joined	21:50
	← dreiss left	21:50
	← ASOLAr left	21:51
	→ AaronMT joined	21:51
	→ cagedwisdom joined	21:52
	← AaronMT left	21:52
	← gopar left	21:52
	← darkbasic left	21:54
	→ darkbasic joined	21:54
	→ zet_013 joined	21:56
	← acetakwas left	21:56
	→ mizu_no_oto joined	21:57
	← ajf- left	21:57
	← AnalogSuzen left	21:57
	→ ajf- joined	21:57
	← Darcidride left	21:59
	← Dougie187 left	21:59
	← victortyau left	21:59
	← pantsman- left	21:59
	→ devoldmx joined	22:00
	← ajf- left	22:03
	← irc-5225225 left	22:04
	← devoldmx left	22:05
	→ delaytime0 joined	22:07
	← delaytime0 left	22:07
	→ delaytime0 joined	22:07
	→ treehug88 joined	22:09
	→ znabavi joined	22:09
	← adgtl left	22:09
	← User4587_ left	22:10
	← xcesariox left	22:10
	← znabavi left	22:10
	Hello71_ → Hello71	22:11
	→ znabavi joined	22:11
	← chitopunk left	22:11
	← zet_013 left	22:12
	→ slentzen joined	22:14
	← sgambino left	22:14
	← Es0teric left	22:15
	→ irc-5225225 joined	22:16
	← salamanderrake left	22:16
	→ jalnt joined	22:17
	← axl_ left	22:17
	← cdg left	22:18
	→ dreiss joined	22:18
	→ ASOLAr joined	22:19
	→ salamanderrake joined	22:19
	← dionysus69 left	22:19
	→ retyk joined	22:19
	→ dev3 joined	22:20
	→ infernix joined	22:20
	→ neanderslob joined	22:21
	→ _9dan joined	22:21
	gitinfo set mode: +v	22:22
dev3	is there a way to prevent a specific file that will always exist on a branch (master) from being merged into another branch (development) where it should never exist, preferably automatically	22:22
	← Guest82484 left	22:22
	← c74d3a left	22:23
	→ s8321414 joined	22:25
	← NotBobDole left	22:25
	← fracting1 left	22:25
	→ cdown joined	22:28
	← espindola left	22:28
	← jalnt left	22:28
	→ axl_ joined	22:30
	← mikiones left	22:31
	← axl_ left	22:31
	← thiago left	22:32
	← kpease left	22:33
	→ durham_ joined	22:34
qsuscs	dev3: no. sounds like !config	22:35
gitinfo	dev3: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	22:35
	← tinajohnson left	22:35
	← durham left	22:36
	← hobodave left	22:36
	← anth0ny_ left	22:36
	→ jalnt joined	22:36
	← dreiss left	22:37
	← ekleog left	22:37
	→ dreiss joined	22:37
	→ daito joined	22:38
	← dinobytes left	22:38
	← highcup left	22:38
	→ ekleog joined	22:38
	→ highcup joined	22:38
	← mizu_no_oto left	22:39
	← highcup left	22:39
	→ highcup joined	22:39
	← cdown left	22:41
	→ bollullera joined	22:41
	→ samw_ joined	22:42
	← fedexo left	22:42
	← daito left	22:42
	← highcup left	22:43
	← samw left	22:44
	← Limes__ left	22:44
	→ anth0ny joined	22:45
	← mattcen left	22:45
	→ acetakwas_ joined	22:46
	→ User458764 joined	22:47
	← editshare-ericf left	22:47
	← k_j left	22:48
	← samw_ left	22:48
	← cdown_ left	22:49
	← King_Hual left	22:51
	← User458764 left	22:52
	← flaguy48 left	22:53
	→ mattcen joined	22:53
	→ cdown joined	22:53
	← cbonobo_ left	22:54
	→ malukenh_ joined	22:55
	→ slentzen2 joined	22:55
	← Zamyatin left	22:55
	← pm90__ left	22:56
	← slentzen left	22:57
	← malukenho left	22:58
	← Kicer86 left	22:58
	→ pm90_ joined	22:59
	→ bond joined	22:59
	→ jteneyck joined	23:00
	← jteneyck left	23:00
	→ jteneyck joined	23:00
	← thinkxl left	23:01
	← yqt left	23:05
	← parasite left	23:08
	← durham_ left	23:08
	← znabavi left	23:09
	→ durham joined	23:09
	→ cdown_ joined	23:10
	← hexagoxel left	23:11
	→ hexagoxel_ joined	23:12
	← dsdeiz left	23:12
	hexagoxel_ → hexagoxel	23:12
	← dreiss left	23:13
	→ k_j joined	23:13
	← stantonk left	23:13
	→ znabavi joined	23:13
	← cdown left	23:14
	→ tjbp joined	23:15
	← filisko left	23:15
	← lindenle left	23:18
	← nnyk_ left	23:19
	→ jteneyck_ joined	23:22
	→ snowcycle joined	23:24
	→ dreiss joined	23:25
	← jteneyck left	23:25
	→ Gravitron joined	23:26
	→ samw joined	23:26
	→ Nizumzen joined	23:27
	→ diegoviola joined	23:27
	→ snthsnth joined	23:27
	← phantombeta left	23:30
	← jonmorehouse left	23:30
	→ Egyptian[Home] joined	23:30
	← Egyptian[Home] left	23:32
	← znabavi left	23:32
	← bango2 left	23:32
	→ phantombeta joined	23:33
	← grilled-cheese left	23:34
	← machan left	23:35
	← Not_Whatever left	23:35
	→ znabavi joined	23:35
	← Nikhil_D left	23:37
	→ Nikhil_D joined	23:38
	← boombatower left	23:38
	→ shinnya joined	23:38
	→ thinkxl joined	23:38
	← acetakwas_ left	23:39
	→ bango2 joined	23:40
	→ t4nk531 joined	23:41
	→ jonmorehouse joined	23:41
	→ dinobytes joined	23:42
	→ modocache joined	23:42
	← alexsystemf left	23:43
	→ zhiwliu joined	23:43
	→ stantonk joined	23:43
	← zhiwliu left	23:43
	→ sabgenton joined	23:44
	← Noldorin left	23:45
	← t4nk531 left	23:46
	→ Noldorin joined	23:46
	→ MihaiTodor joined	23:46
	→ dsdeiz joined	23:46
	← modocache left	23:46
sabgenton	AFAIK 'branch' constitutes all the branches that were also merged into it. But if I maintain a nice straight line that never changes what do I call that straight line part?	23:46
royalty	master?	23:48
	i just guessed	23:48
	probably incorrect	23:48
	← jteneyck_ left	23:48
	← stickperson left	23:49
	← bl4ckpajamas left	23:49
	→ blackpajamas joined	23:50
	→ meLon joined	23:50
	← stantonk left	23:51
	→ jteneyck joined	23:52
	→ zacg joined	23:53
sabgenton	royalty: as far as I understand master constitutes every chain underneath it spanning out from merge commits	23:53
	gitinfo set mode: +v	23:54
royalty	sabgenton, oh	23:54
	Eq → Uptime	23:55
sabgenton	royalty: but sometimes we use loosely say branch 2 mean just the first parent straight line part	23:56
	← dickdaley left	23:57
	← fstd left	23:59
	← m0viefreak left	23:59
	→ fstd joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation