IRCloggy #git 2015-08-21

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-08-21
	← Bootinbull left	00:00
bodom	ojacobson: thank you. Is there a command to "see" if a file in the repo is CRLF or LF?	00:00
	← gopar left	00:01
	→ EduardoMartins joined	00:01
ojacobson	sure. `git cat-file blob <blob-ish>` will spew the blob verbatim to stdout; you can pass that through hexdump, or a windows-aware editor	00:01
	→ mizu_no_oto joined	00:01
ojacobson	blob-ish can be a sha, or anything else that resolves to a blob, like commit-ish:path/to/file	00:02
	← imachuchu left	00:02
	→ dopie joined	00:02
	→ nb_bez___ joined	00:03
	← Ahmed90 left	00:04
bodom	ojacobson: thank you!	00:05
	← DolphinDream left	00:05
	→ frozen3 joined	00:05
	← tristanp left	00:05
	← yqt left	00:06
	→ kadoban joined	00:06
	← crazyagile left	00:06
	← Henry_Jia_T60 left	00:08
	← jstimm left	00:08
	← greymeister left	00:08
	→ tristanp joined	00:08
	← frozen3 left	00:09
	→ elv joined	00:09
	← Silox\| left	00:10
	← michael_mbp left	00:10
	← enitiz left	00:11
	→ enitiz joined	00:12
	← d10n-work left	00:12
	→ sdegutis_ joined	00:12
sdegutis_	help	00:12
	→ crazyagile joined	00:12
sdegutis_	I just did a rebase and need the SHA that used to be HEAD just before it	00:12
	← tristanp left	00:12
sdegutis_	Is this possible?	00:12
	← rubie left	00:13
	→ tristanp joined	00:14
Eugene	offby1 - you have Sunday plans? Doing what, if I might ask?	00:14
sdegutis_	offby1: fwiw Eugene is asking you out on a date	00:14
Eugene	I've not seen much in the way of Nerd Gatherings.... besides the really weird ones	00:14
	← elv left	00:14
	← nfk left	00:14
	→ michael_mbp joined	00:15
	← AaronMT left	00:15
	← Nikhil_D left	00:16
	→ Nikhil_D joined	00:16
	← kukks left	00:16
	← _Atom_ left	00:16
	← crazyagile left	00:18
	← gutocarvalho left	00:19
	→ slick joined	00:19
	→ pecg joined	00:20
	pecg → Guest3844	00:20
	→ DolphinDream joined	00:22
	← cagedwisdom left	00:24
	← enitiz left	00:25
	← irc-5225225 left	00:25
	← sparetire_ left	00:26
	← mizu_no_oto left	00:28
	→ devoldmx joined	00:28
	← under_zero left	00:28
	← jonno11 left	00:28
	→ jonno11 joined	00:29
	→ uber joined	00:29
sdegutis_	found it	00:31
	← sdegutis_ left	00:31
	→ jking joined	00:31
	→ whomp joined	00:31
	← jking left	00:32
	→ bronson joined	00:32
	→ mizu_no_oto joined	00:32
whomp	hi, i branched off a co-workers branch and then they merged that work into master. i want to rebase just what i branched off of their branch onto master. how can i do this?	00:32
	← devoldmx left	00:32
	← jonno11 left	00:33
	← harish left	00:34
	← jteneyck left	00:34
	→ rnat joined	00:34
	← bodom left	00:36
	← bronson left	00:36
	→ cagedwisdom joined	00:37
	→ enitiz joined	00:39
	← CheckDavid left	00:39
	→ irc-5225225 joined	00:39
	→ jteneyck joined	00:40
	→ tmager joined	00:40
	→ under_zero joined	00:42
	← dreiss left	00:43
	← Sasazuka left	00:45
	→ bb010g joined	00:45
	gitinfo set mode: +v	00:45
	→ Sasazuka joined	00:46
	→ Lyqyd joined	00:46
	→ checkItOut joined	00:46
	← t0by left	00:48
	← leeN left	00:48
	← ncthom91 left	00:49
	← maletor left	00:51
	→ enitiz_ joined	00:51
	← tristanp left	00:51
	→ macabre joined	00:52
	← enitiz left	00:52
	← drodger left	00:52
	← SimonNa left	00:52
	→ theCole joined	00:53
	→ drodger joined	00:53
	→ juvenal joined	00:54
	← sargas left	00:55
	← enitiz_ left	00:57
	→ hmsimha_ joined	00:59
	← mizu_no_oto left	01:00
	→ Oecc joined	01:01
	← fracting left	01:01
	→ diegoviola joined	01:01
	← Oecc left	01:01
	← ssarah left	01:01
	← theCole left	01:01
	← cbonobo left	01:02
	← diggle left	01:02
	→ dgutierrez1287 joined	01:04
	→ frozen3 joined	01:05
	← irc-5225225 left	01:07
	← kfoonamalik left	01:07
	← maestrojed left	01:08
	← dgutierrez1287 left	01:08
	→ maestrojed joined	01:08
	→ jon-mac_ joined	01:09
	← thiago left	01:11
	← juvenal left	01:11
	← Sasazuka left	01:12
	→ warrickFL joined	01:12
	→ juvenal joined	01:15
	← rally left	01:15
	← warrickFL left	01:16
	← brucelee left	01:16
	→ warrickFL joined	01:16
	→ corey84__ joined	01:16
	← Corey84 left	01:17
	corey84__ → Corey84	01:18
	← blackwind_123 left	01:18
	→ theCole joined	01:19
	→ irc-5225225 joined	01:21
	← pks left	01:21
	→ fracting joined	01:21
	→ keroro520 joined	01:21
offby1	whomp: I'd try just rebasing my branch onto master -- I suspect that will do what you want	01:22
	and if not, just reset the branch back to where it was	01:22
	→ pks joined	01:23
	→ tkau joined	01:23
	← tkau left	01:23
	→ forsil joined	01:24
	→ mizu_no_oto joined	01:26
	→ devoldmx joined	01:29
	→ Vinnie_win joined	01:29
	→ jonno11 joined	01:29
	→ rchavik joined	01:29
	← Vinnie_win_u left	01:30
	→ robbyoconnor joined	01:31
	← dsilva left	01:31
	← mizu_no_oto left	01:32
	→ daito joined	01:32
	→ profsimm joined	01:33
	← devoldmx left	01:33
	→ bronson joined	01:33
	→ dopieee joined	01:33
	← irc-5225225 left	01:33
	← Geisted_ left	01:34
profsimm	I'm used to organizing my repositories as /sources and /products, where /sources contain files not needed for operation. When I need to use a library or deploy, I only need something in /products. This works in SVN as I can checkout one folder. But in Git it's all or nothing. Where do you folks keep source files?	01:34
	← warrickFL left	01:34
	← FernandoBasso left	01:35
	← dopie left	01:35
	→ pm90_ joined	01:36
	→ harish joined	01:36
	← bronson left	01:37
preaction	source files go in the repo. compiled files, bundled libraries, or otherwise are downloaded by a script in the repo	01:38
	→ Vampire0_ joined	01:39
preaction	the repo tracks the source. deployment is something else entirely	01:39
	→ looper joined	01:39
	← tvw left	01:41
profsimm	preaction: yeah. Thing is, it gets a bit confusing with scripts. Say, I have TypeScript sources, which compile to JS assets, in a PHP app.	01:41
	preaction: PHP has a package manager, like NPM, which downloads the whole git repository, with the TypeScript sources and everything. Which is undesirable.	01:41
preaction	you track the source. it's not confusing at all. part of the deploy process is building the executables from the source	01:41
	git is not a !deploy	01:42
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	01:42
	← Vampire0 left	01:42
	← dopieee left	01:42
preaction	using a git repository as the installable bundle is not useful. committing build artifacts is generally a bad thing	01:42
profsimm	preaction: have you used Composer in PHP	01:43
	← looper_ left	01:43
preaction	why does that matter?	01:43
profsimm	preaction: well it matters because Composer takes the whole repository as the package.	01:43
	→ blackwind_123 joined	01:43
preaction	i'm not an expert in composer, but in all my projects, there is a build step that happens to create the installable whatever. those installable whatevers are not committed to or part of the repository	01:44
	→ diego2 joined	01:45
	← ShapeShifter499 left	01:45
	← frozen3 left	01:45
preaction	you might want to ask the php channel how you can make the installable whatever contain the compiled source without having to commit it to git	01:45
	← diego2 left	01:46
	→ diego2 joined	01:46
profsimm	preaction: unfortunately there's no build step in composer. There is an optional install script, but it still puts the entire repository contents int the project's /vendor directory.	01:46
	preaction: how do other package managers deal with this any idea? Maven? NPM?	01:46
preaction	i can't help you with composer	01:46
	→ irc-5225225 joined	01:46
	→ User458764 joined	01:46
	diegoviola → Guest99161	01:46
	← Guest99161 left	01:46
	diego2 → diegoviola	01:47
preaction	i'm not that familiar, but i'm 100% certain that Maven does not store the source files. you upload the compiled, complete JAR file	01:47
	← msonntag left	01:47
preaction	NPM, no idea. CPAN, you upload a tar.gz file	01:47
profsimm	preaction: thanks, I get the overall idea now.	01:48
	→ msonntag joined	01:49
preaction	looks like npm accepts tarballs as well	01:49
	→ ShapeShifter499 joined	01:50
profsimm	preaction: all right, thanks	01:51
preaction	yep. packagist is a mistake	01:51
profsimm	preaction: it's a mistake :)?	01:52
preaction	it appears that you must have a vcs, and that is the only way to submit packages. that is a mistake, yes, because it conflates the source, the stuff you edit, with the installable/deliverable, the stuff other people use	01:52
	→ dadamssg joined	01:52
preaction	even in interpreted language, that's often not the case	01:53
profsimm	preaction: I take it that's not how most package repositories work	01:53
preaction	the other three we've just discussed, that is not the case, no	01:54
profsimm	preaction: well the PHP ecosystem has a habit of doing things almost right, but not quite, as long as it's easier.	01:54
	preaction: funny thing is PEAR, the previous popular solution, had it right	01:54
	→ aduh joined	01:54
	← aduh left	01:55
preaction	ruby: upload tarballs using the gem push command	01:55
	golang... they look to be punting on the centralized place to put things	01:55
	← Corey84 left	01:56
	← dadamssg left	01:57
	→ thiago joined	01:57
	→ Geisted_ joined	01:59
	→ rubie joined	02:01
	→ frozen3 joined	02:01
	← theCole left	02:05
	← d2dchat left	02:06
	← ManneW left	02:07
	← beckyconning_ left	02:08
	← harish left	02:08
	→ dopie joined	02:10
	→ mizu_no_oto joined	02:10
	← irc-5225225 left	02:14
	← hmsimha_ left	02:14
	→ hmsimha_ joined	02:14
	→ bronson joined	02:16
	← clarkpan left	02:16
	← MattMaker left	02:16
	→ ManneW joined	02:21
	← ShapeShifter499 left	02:22
	← rubie left	02:22
	→ gfixler joined	02:23
	← bitkiller left	02:24
	→ penna_ joined	02:24
	← nb_bez___ left	02:25
	→ ome joined	02:26
	→ harish joined	02:27
	→ ShapeShifter499 joined	02:27
	← penna left	02:28
	→ irc-5225225 joined	02:28
	← sdothum left	02:29
	→ terminal_echo joined	02:30
	→ CKyle joined	02:32
	← bronson left	02:32
	← Vinnie_win left	02:32
	→ Vinnie_win joined	02:33
	← blimpse left	02:34
	← mizu_no_oto left	02:34
	→ mizu_no_oto joined	02:35
	→ gambl0re joined	02:37
	→ Ljpi joined	02:38
	← Ljpi left	02:38
	→ vsmi joined	02:42
	→ Pseudocrat joined	02:43
	← Pseudocrat left	02:43
	→ Pseudocrat joined	02:43
	← vsmi left	02:43
	→ Goplat joined	02:44
	→ keaa joined	02:45
	← frozen3 left	02:46
	← keaa left	02:46
	← jteneyck left	02:48
	← pm90_ left	02:50
	→ xudongz joined	02:51
	← profsimm left	02:52
	→ zni joined	02:52
	← zni left	02:52
	→ CMOTD joined	02:53
	← hmsimha_ left	02:53
	→ gnoel joined	02:53
	→ dsdeiz joined	02:53
	← CMOTD left	02:54
	← shinnya left	02:54
	← tmager left	02:54
	← Phoenixz left	02:55
	→ Vfenm joined	02:55
	← Vfenm left	02:56
	→ Phoenixz joined	02:56
	← harish left	02:58
	→ Uylhu joined	02:58
	← Uylhu left	02:59
	→ jteneyck joined	03:00
	← irc-5225225 left	03:03
	← jteneyck left	03:05
	← beco left	03:07
	→ cyphase_ joined	03:08
	← cyphase left	03:08
	cyphase_ → Guest17635	03:08
	→ lykinsbd joined	03:09
	→ elv joined	03:09
	→ harish joined	03:11
	→ User4587_ joined	03:12
	← mizu_no_oto left	03:12
	← darkbasic_ left	03:13
	→ darkbasic joined	03:13
	← elv left	03:14
	← User458764 left	03:15
	→ ArchStacker joined	03:16
ArchStacker	Can I find any better way to do it? http://stackoverflow.com/a/2989613/3935403	03:16
	← cynicaljoy left	03:16
	→ clarkpan joined	03:16
	← harish left	03:17
	→ irc-5225225 joined	03:17
	→ harish joined	03:17
	← diegoviola left	03:18
	→ diego3 joined	03:18
	← diego3 left	03:18
	→ diego3 joined	03:18
	diego3 → diegoviola	03:18
	← gnoel left	03:18
	→ bronson joined	03:19
	← lykinsbd left	03:21
	→ gopar joined	03:22
	← EduardoMartins left	03:22
	→ qfwuu joined	03:23
	← rnat left	03:23
	← qfwuu left	03:24
	← knownasilya left	03:25
	→ Eryn_1983_FL joined	03:28
	→ MattMaker joined	03:28
	→ Goplat` joined	03:28
	← Goplat left	03:28
	→ devoldmx joined	03:29
	← CKyle left	03:29
	← Geisted_ left	03:30
	← forsil left	03:31
	→ dgutierrez1287 joined	03:31
	← fracting left	03:33
	← MattMaker left	03:34
	← devoldmx left	03:34
	→ rvalue joined	03:35
	← dgutierrez1287 left	03:35
	→ dreiss joined	03:37
	→ brucelee joined	03:38
	→ jseplae joined	03:40
	← dreiss left	03:41
	← daito left	03:42
	→ daito joined	03:42
	→ Geisted_ joined	03:43
	← bronson left	03:44
	→ Technocrat786 joined	03:45
	← gdogs left	03:45
	→ fracting joined	03:46
	→ Corey84 joined	03:46
	← daito left	03:46
	← jrahmy left	03:47
	→ bronson joined	03:47
	→ sheilong joined	03:48
	← Technocrat786 left	03:50
	← robbyoconnor left	03:50
	← ArchStacker left	03:50
	→ mehola joined	03:51
	→ jrahmy joined	03:52
	→ dadamssg joined	03:53
	← Guest17635 left	03:53
	→ cyphase joined	03:54
	→ theCole joined	03:54
	← MZAWeb left	03:54
	→ MZAWeb joined	03:55
	← macabre left	03:56
	→ kejoma_ joined	03:57
	← dadamssg left	03:58
	→ gdogs joined	03:59
	← gdogs left	03:59
	← checkItOut left	03:59
	→ forsil joined	04:00
	→ gdogs joined	04:00
	← gdogs left	04:00
	→ checkItOut joined	04:00
	→ gdogs joined	04:00
	← forsil left	04:01
	← gdogs left	04:01
	→ jteneyck joined	04:01
	→ gdogs joined	04:01
	→ kkspy joined	04:03
	→ jacaballero joined	04:04
	← jacaballero left	04:06
	← Chunk2 left	04:06
	← jteneyck left	04:06
	← Geisted_ left	04:06
	→ jstimm joined	04:07
	→ pwnz0r joined	04:07
	← MZAWeb left	04:08
	→ MZAWeb_ joined	04:10
	→ Chunk2 joined	04:11
	→ fedexo joined	04:11
	← Phoenixz left	04:11
	→ daito joined	04:13
	← keroro520 left	04:13
	→ joe9 joined	04:14
	→ Phoenixz joined	04:15
joe9	Hello, I am trying to figure out how to add files using the command: "git add subdir/*.vg", http://codepad.org/QHb5T08x	04:15
	I just added a bunch of files to the working tree and want to add them to the index.	04:15
	"Nothing specified, nothing added" -- is what git says.	04:16
	sorry, figured it out. wrong permissions on that directory.	04:16
	← joe9 left	04:17
	→ crazyagile joined	04:17
	← gdogs left	04:18
	← theCole left	04:19
	← xudongz left	04:19
	← daito left	04:21
	→ EduardoMartins joined	04:23
	← madewokherd left	04:23
	→ gutocarvalho joined	04:23
	→ Geisted_ joined	04:24
	← maestrojed left	04:24
	← theskillwithin left	04:26
	← snthsnth left	04:27
	← User4587_ left	04:27
	→ daito joined	04:28
	← pwnz0r left	04:29
	→ keroro520 joined	04:31
	← madrugs_ left	04:31
	← fedexo left	04:35
	← keroro520 left	04:35
	→ uve joined	04:40
	→ hmsimha_ joined	04:41
	→ snthsnth joined	04:41
	← uve left	04:41
	→ n00bdev joined	04:42
	← under_zero left	04:47
	← EduardoMartins left	04:49
	← NeverDie left	04:49
	← Geisted_ left	04:50
	→ MechtiIde joined	04:54
	← kadoban left	04:55
	→ dreiss joined	04:56
	→ robbyoconnor joined	04:58
	← terminal_echo left	05:00
	→ under_zero joined	05:01
	← under_zero left	05:02
	→ noyb joined	05:02
	→ jteneyck joined	05:03
	→ under_zero joined	05:03
	← jteneyck left	05:03
	→ jteneyck joined	05:03
	→ forsil joined	05:03
	← hmsimha_ left	05:04
	← under_zero left	05:04
	← jrahmy left	05:05
	← dreiss left	05:05
	← n00bdev left	05:05
	→ dreiss joined	05:05
	→ under_zero joined	05:05
	→ n00bdev joined	05:06
	← MechtiIde left	05:07
	← under_zero left	05:07
	← daito left	05:07
	← gutocarvalho left	05:07
	→ daito joined	05:08
	→ Sazhen86 joined	05:08
	← bronson left	05:08
	→ under_zero joined	05:08
	← jteneyck left	05:08
	← under_zero left	05:09
	→ MechtiIde joined	05:09
	→ under_zero joined	05:10
	← under_zero left	05:12
	← daito left	05:12
	→ under_zero joined	05:13
	← n00bdev left	05:13
	← under_zero left	05:14
	← kkspy left	05:14
	→ under_zero joined	05:15
	← under_zero left	05:16
	→ nilg joined	05:17
	← dreiss left	05:18
	→ dreiss joined	05:20
	← checkItOut left	05:20
	→ zanzibizarre joined	05:20
zanzibizarre	I'm so gitty!	05:20
	→ checkItOut joined	05:20
	zanzibizarre → gitty	05:20
	gitty dances	05:20
	← dsdeiz left	05:21
	→ daito joined	05:21
	← ItSANgo left	05:22
	← sgambino_ left	05:22
	→ howdoi joined	05:23
	← ishler left	05:24
	← gitty left	05:25
	← checkItOut left	05:25
	→ checkItOut joined	05:26
	→ gutocarvalho joined	05:28
	← Gamecubic left	05:28
	→ watabou joined	05:30
	→ devoldmx joined	05:30
	→ zoso joined	05:30
	→ pm90_ joined	05:33
	← Lyqyd left	05:34
	→ keroro520 joined	05:34
	← dreiss left	05:34
	← devoldmx left	05:34
	← ahr3n left	05:36
	→ elv joined	05:36
	← Pseudocrat left	05:38
	← dougsland left	05:38
	→ diego2 joined	05:38
	→ Douhan joined	05:39
	← snthsnth left	05:39
	← diegoviola left	05:40
	→ elv_ joined	05:40
	← m0viefreak left	05:41
	← elv left	05:42
	→ jeadre joined	05:43
	← diego2 left	05:43
	← Corey84 left	05:45
	→ User458764 joined	05:45
	→ kriskropd joined	05:46
	→ dreiss joined	05:46
	→ v0n joined	05:47
	→ moL-Ou joined	05:48
	← ronskisika left	05:49
	← aretecode left	05:49
	→ dougsland joined	05:53
	→ fullstack joined	05:54
	→ dadamssg joined	05:54
	← watabou left	05:55
	→ snthsnth joined	05:58
	→ bhws joined	05:59
	← dadamssg left	05:59
	→ jokester joined	06:00
	← robbyoconnor left	06:00
	→ Geisted_ joined	06:01
	→ goTAN joined	06:02
	← goTAN left	06:02
	→ User4587_ joined	06:02
	→ lunwang joined	06:02
lunwang	fatal: protocol error: bad line length character: <br	06:02
	anybody knows this ?	06:02
	→ Oog_ joined	06:03
	→ Raging_Hog joined	06:04
	→ jteneyck joined	06:04
	← forsil left	06:04
	← irc-5225225 left	06:07
	← freeze left	06:08
	← jteneyck left	06:08
	→ bronson joined	06:09
	→ freeze joined	06:10
	← MechtiIde left	06:10
	→ PCatinean joined	06:11
	→ Amandil joined	06:12
	← bronson left	06:13
	→ jrahmy joined	06:14
	← keroro520 left	06:14
	→ pstodulk joined	06:14
	← pstodulk left	06:15
	→ keroro520 joined	06:15
	→ MechtiIde joined	06:17
	← freeze left	06:18
	→ acolson joined	06:18
	→ sinkensabe joined	06:18
DrSlony	lunwang lmgtfy	06:18
lunwang	?	06:19
	what’s the meaning	06:19
	← gopar left	06:19
	→ freeze joined	06:19
	→ themiddleman_ joined	06:19
DrSlony	lunwang http://lmgtfy.com/?q=%22bad+line+length+character%22	06:20
	→ arup_r joined	06:20
	← Motoko left	06:21
	← themiddleman_ left	06:21
	→ irc-5225225 joined	06:21
	→ MasterPiece joined	06:22
	← Oog_ left	06:23
	→ arup_r_ joined	06:23
	← dougsland left	06:23
	→ David__ joined	06:24
	David__ → David	06:24
	→ tureba joined	06:24
	← crazyagile left	06:25
	→ lunwang_ joined	06:25
	→ crazyagile joined	06:25
	← lunwang left	06:26
	lunwang_ → lunwang	06:26
	← Amandil left	06:27
	← User4587_ left	06:27
	← arup_r left	06:27
	← FunkyAss left	06:27
lunwang	how can I let the debug info print out	06:28
	fatal: protocol error: bad line length character: <br	06:29
	fatal: The remote end hung up unexpectedly	06:29
	→ Steadfast joined	06:30
	→ leTali joined	06:34
	← arup_r_ left	06:37
	→ wilornel joined	06:37
	← brucelee left	06:38
	→ pm90__ joined	06:39
	→ arup_r joined	06:40
	→ salparadise joined	06:40
	→ rsmarshall joined	06:41
	← pm90_ left	06:42
	← Geisted_ left	06:42
	→ pantsman- joined	06:43
	→ ubuntu joined	06:43
	→ fairuz joined	06:43
	ubuntu → Guest8787	06:43
	→ darkbasic_ joined	06:44
	→ jagob joined	06:45
	← darkbasic left	06:45
	→ Sceorem joined	06:45
	← irc-5225225 left	06:47
	← dreiss left	06:50
	← michael_mbp left	06:51
	Xe → CAVESSH_JOSHNOV	06:52
	→ r0bby_ joined	06:53
	→ dionysus69 joined	06:54
	→ michael_mbp joined	06:55
	← thiago left	06:57
	→ Balliad joined	06:57
	← Steadfast left	07:00
	→ jteneyck joined	07:00
	← jteneyck left	07:00
	→ jteneyck joined	07:00
	→ dreiss joined	07:01
	CAVESSH_JOSHNOV → Xe	07:01
	← wowaname left	07:01
	→ irc-5225225 joined	07:01
	← bhws left	07:03
	← stevenm left	07:04
	← RTG` left	07:05
	→ Meow-J joined	07:05
	← jteneyck left	07:06
	→ RTG` joined	07:06
	→ Silmarilion joined	07:08
	→ cdown joined	07:08
	→ a-l-e joined	07:13
	→ Jackneill joined	07:14
	→ fairuz1 joined	07:14
	→ bvi joined	07:15
	→ PHPanos joined	07:15
	← bvi left	07:16
	← fairuz left	07:17
	← fairuz1 left	07:17
	→ tumulte joined	07:18
	← mostlybadfly left	07:18
	→ brucelee joined	07:20
	→ lb1a joined	07:22
	← jrahmy left	07:23
	→ rally joined	07:23
	← MZAWeb_ left	07:25
	→ fairuz joined	07:25
	← multi_io left	07:28
	← snthsnth left	07:28
	← MasterPiece left	07:28
	→ multi_io joined	07:29
	← User458764 left	07:29
	→ devoldmx joined	07:31
	→ terminal_echo joined	07:31
	→ doener joined	07:31
	← clarkpan left	07:33
	→ Xethron joined	07:35
	← devoldmx left	07:35
	Fissure1 → Fissure	07:36
	→ kukks joined	07:38
	→ dougsland joined	07:38
	← dreiss left	07:40
	← David left	07:40
	→ David joined	07:41
	→ fooforge joined	07:42
	← jonno11 left	07:43
	→ jonno11 joined	07:44
	← rvalue left	07:45
	← gutocarvalho left	07:46
	← sheilong left	07:47
	→ snthsnth joined	07:48
	← alip left	07:48
	← heroux left	07:48
	→ heroux joined	07:49
	← Junior left	07:49
	→ kloeri joined	07:49
	→ dc5ala joined	07:52
	← Goplat` left	07:52
	← pm90__ left	07:52
	→ alip joined	07:53
	→ jost joined	07:53
	← cannonball left	07:53
	→ dadamssg joined	07:55
	→ dvaske joined	07:56
	← cdown left	07:56
	→ yn5 joined	07:56
	→ ayaz joined	07:56
	→ ciaranm joined	07:56
	← reim left	07:57
	← brucelee left	07:57
	→ brucelee joined	07:58
	→ mikecmpbll joined	07:58
	→ cdown joined	07:58
	← dadamssg left	08:00
	→ jteneyck joined	08:01
meteorhead	I have git 1.8 and want to ignore deleted files shown in status but git add --update	08:02
	doesnt work	08:02
	→ Alienpruts joined	08:02
meteorhead	tried this command too git ls-files --deleted -z \| xargs -0 git rm	08:02
	same result	08:02
	→ Gama11 joined	08:02
	→ cannonball joined	08:03
	← gbit86 left	08:03
	→ rnat joined	08:04
	→ gbit86 joined	08:05
	← Xethron left	08:06
	→ barduck joined	08:07
	← jteneyck left	08:07
jast	that's because you told it to delete them again	08:07
	← brucelee left	08:07
	→ psoo joined	08:07
	→ bongjovi joined	08:08
	→ Xethron joined	08:08
meteorhead	okay so how to remove them from status :) ?	08:08
	→ bronson joined	08:09
	→ CodingFree joined	08:10
	← cdown left	08:11
	→ SLY1986 joined	08:11
CodingFree	hi guys, how to diff a file between two specific commits	08:11
	→ Gama11_ joined	08:12
	→ Junior joined	08:12
	← Gama11 left	08:12
	← bronson left	08:13
	→ brucelee joined	08:14
	→ circ-user-LiKpY joined	08:14
	← snthsnth left	08:16
tobiasvl	CodingFree: man git diff	08:16
gitinfo	CodingFree: the git-diff manpage is available at http://jk.gs/git-diff.html	08:16
tobiasvl	it should be as easy as `git diff SHA1 SHA2`…	08:16
CodingFree	okay, adding two slashes somewhere	08:17
	I think I didn't fetch the repo, soy that may have failed	08:17
	→ m8 joined	08:17
	← pantsman- left	08:18
	← joo-_ left	08:18
	← m8 left	08:18
	→ m8 joined	08:20
	← lunwang left	08:20
	← SLY1986 left	08:20
	→ lunwang joined	08:21
	→ veganista joined	08:21
	→ marcogmonteiro joined	08:23
osse	meteorhead: where do they appear in status?	08:25
	→ p4trix joined	08:25
	← fahadash left	08:26
	r0bby_ → robbyoconnor	08:27
	← jstimm left	08:27
meteorhead	osse: thanks for the reply, under changes not staged to commit, git add -u works :)	08:28
	← Sleepy63 left	08:28
meteorhead	I ofteb confused it with git add -A, it's the chance to understand it properly haha	08:28
	often*	08:28
	← Sazhen86 left	08:31
	→ Sazhen86 joined	08:33
	→ mingwandroid joined	08:34
	→ howlymowly joined	08:34
osse	nedbat: AFAIK your xargs thigny should have worked also	08:35
	→ tanuck joined	08:35
	→ tanuck_ joined	08:37
	→ denimsoft joined	08:37
	→ cdown joined	08:38
	← tanuck left	08:40
	→ Sleepy63 joined	08:41
	← fooforge left	08:41
	→ weiyang joined	08:41
meteorhead	doesn't have something to do with git version? i thought it was for git 2	08:41
	← Gama11_ left	08:42
	→ fooforge joined	08:42
	← Douhan left	08:43
	→ Gama11 joined	08:43
	→ Dragooon joined	08:43
	← cdown left	08:44
	→ ams__ joined	08:45
	→ Zariel joined	08:46
	→ Gama11_ joined	08:47
	← Gama11 left	08:48
	← jeffmjack left	08:49
	← keroro520 left	08:49
	← weiyang left	08:50
	← michael_mbp left	08:50
	← mehola left	08:50
	← dionysus69 left	08:50
	→ keroro520 joined	08:50
	→ Polyatomic joined	08:51
	← fooforge left	08:51
	→ michael_mbp joined	08:54
	← arup_r left	08:55
	→ skullcrasher joined	08:57
	→ arup_r joined	08:57
	← MechtiIde left	08:58
	→ sazed joined	08:59
	→ tomboy64 joined	09:00
tomboy64	hello folks	09:00
	→ ifra201 joined	09:00
tomboy64	i'm starting to learn a bit more about git, but i can't seem to wrap my head around this thing	09:00
	→ SLY1986 joined	09:00
	→ bronson joined	09:00
tomboy64	i have a repo on my little server machine at home, which gets regularly sync'd to upstream	09:01
	and i have 3 other machines which essentially just replicate that repo	09:01
	→ jteneyck joined	09:02
	→ MechtiIde joined	09:02
	→ nnyk_ joined	09:03
tomboy64	but now i want a part of the server-machine repo contain a couple of directories (which do not get synced to upstream) contain a directory, that gets synced only between the server machine and the 3 clients, with every client and the server being able to make updates to that	09:03
	← nnyk_ left	09:03
	→ nnyk_ joined	09:03
tomboy64	i'm not at all sure about how to accomplish this with branching	09:04
	← bronson left	09:06
	← Kulrak left	09:06
	→ jost_ joined	09:06
	→ pi- joined	09:06
	← circ-user-LiKpY left	09:07
	← jteneyck left	09:07
pi-	Is there some way I can directly unpack https://github.com/brython-dev/brython into my remote filesystem?	09:07
	← nnyk_ left	09:09
tomboy64	curl https://github.com/brython-dev/brython/archive/master.zip \| unzip -	09:10
	?	09:10
	← jost left	09:10
tomboy64	(provided you're using *nix)	09:10
	← Polyatomic left	09:12
	→ kkspy joined	09:12
	← Kaisyu left	09:12
	← arup_r left	09:12
pi-	Thanks!	09:13
tomboy64	did it work?	09:13
	→ ssarah joined	09:13
	← fairuz left	09:14
	→ harel_f joined	09:16
	harel_f → Guest7423	09:17
	← kukks left	09:17
	→ mrkake joined	09:17
	← Sazhen86 left	09:18
	→ lucha joined	09:18
	← ssarah left	09:19
	tomboy64 sighs	09:19
	← kkspy left	09:19
tomboy64	wham bam, thank you ma'am :-D	09:19
	→ ssarah joined	09:19
	→ Kulrak joined	09:19
	← Kulrak left	09:19
	→ Kulrak joined	09:19
	→ sparetire_ joined	09:20
	← Guest7423 left	09:22
	← davetarmac left	09:23
pi-	Sorry, scrambling here	09:23
	I had already downloaded it, I will try doing it properly when I get a moment	09:24
	← lucha left	09:24
	→ Sazhen86 joined	09:24
	← denimsoft left	09:25
	→ nettoweb joined	09:26
	→ Hounddog joined	09:26
	→ denimsoft joined	09:26
	→ zack_s_ joined	09:27
	← sazed left	09:27
	→ Henry_Jia_T60 joined	09:28
	→ kkspy joined	09:28
	← CodingFree left	09:30
	→ lucha joined	09:30
	← kkspy left	09:30
	→ ohpesky joined	09:30
	← Henry_Jia_T60 left	09:30
	← Hounddog left	09:31
ohpesky	I want to ignore all subdirs in one dir, but not files in it, is there a way to specify that in .gitignore?	09:31
	→ Hounddog joined	09:31
	→ joo-_ joined	09:32
	→ devoldmx joined	09:32
	→ moosbart joined	09:32
jast	a pattern that ends in / matches only directories	09:32
	← harish left	09:34
	→ arup_r joined	09:34
	→ g105b joined	09:35
tomboy64	ohpesky: man gitignore gives further insight on the patterns.	09:35
gitinfo	ohpesky: the gitignore manpage is available at http://jk.gs/gitignore.html	09:35
tomboy64	gitinfo: what did i just say?	09:35
	← Zariel left	09:35
	→ arup_r_ joined	09:35
	← arup_r_ left	09:36
	← rsmarshall left	09:36
	→ arup_r_ joined	09:36
	← devoldmx left	09:37
ohpesky	jast, tomboy64, @gitinfo: thanks!	09:37
gitinfo	ohpesky: you're welcome, but please note that I'm a bot. I'm not programmed to care.	09:37
	← noyb left	09:37
ohpesky	ha	09:37
tomboy64	he's lying	09:37
	he's just modest :p	09:37
	← arup_r_ left	09:37
	→ tumeric joined	09:38
	→ hmsimha_ joined	09:39
	→ arup_r_ joined	09:39
	← arup_r left	09:39
	← arup_r_ left	09:40
	→ arup_r joined	09:41
	→ Hicham125 joined	09:42
	← moosbart left	09:42
	→ sazed joined	09:43
	← zoso left	09:44
	→ nfk joined	09:44
	→ CustosLimen joined	09:44
	→ cdown joined	09:45
	→ haaja joined	09:46
	← grawity left	09:46
	← terminal_echo left	09:47
	→ Ragnor joined	09:47
	← daito left	09:48
	← oojacoboo left	09:48
	→ grawity joined	09:49
	→ daito joined	09:49
	← lucha left	09:49
zack_s_	I have created a branch on svn and want to check it out in git, but I only get the message: fatal: Cannot update paths and switch to branch	09:50
	→ lucha joined	09:50
zack_s_	"git branch -r" will also not list the branch	09:51
	but with svn I can check it out	09:51
	→ mehola joined	09:51
	→ SimonNa joined	09:51
	→ MaceBewley joined	09:52
pi-	tomboy64: I just tried it and it failed: http://hastebin.com/nenugimiyu.coffee	09:52
	← daito left	09:53
	← juvenal left	09:53
	← frem left	09:53
	→ Corey84 joined	09:55
	← jantje left	09:55
jast	unzip doesn't actually support extracting a piped archive	09:56
	← mehola left	09:56
	→ dadamssg joined	09:56
	← Ragnor left	09:57
	← sazed left	09:59
	→ zoso joined	09:59
	← dadamssg left	10:01
	← brucelee left	10:01
	→ jteneyck joined	10:03
	← jteneyck left	10:03
	→ jteneyck joined	10:03
	→ Strat joined	10:04
	→ Danjo1 joined	10:05
	→ nnyk_ joined	10:06
	← Hicham125 left	10:06
	→ jantje joined	10:06
	← jonno11 left	10:06
	← tumeric left	10:06
	→ jonno11 joined	10:07
	← jteneyck left	10:08
	→ Zariel joined	10:11
	← jonno11 left	10:11
	→ MasterPiece joined	10:12
	← grawity left	10:12
	→ Hicham125 joined	10:13
	→ moosbart joined	10:13
	→ grawity joined	10:14
	→ roelmonnens joined	10:14
	→ fahadash joined	10:14
	← fahadash left	10:14
	→ fahadash joined	10:14
	← fahadash left	10:14
	→ fahadash joined	10:14
	← moosbart left	10:14
	← cagedwisdom left	10:17
	→ daito joined	10:19
	← jpnurmi left	10:19
	→ jpnurmi joined	10:20
	← bongjovi left	10:20
	→ moosbart joined	10:20
	← moosbart left	10:20
	→ PeterBooker joined	10:21
	← tgunr left	10:24
	← cyphase left	10:25
	→ notebox joined	10:26
	→ dsdeiz joined	10:26
	← daito left	10:28
	← ohpesky left	10:30
	→ Douglas joined	10:30
	→ mizu_no_oto joined	10:33
	← ssarah left	10:33
	→ CMOTD joined	10:33
	→ ssarah joined	10:34
	← ssarah left	10:34
	← Sazhen86 left	10:37
	→ cyphase joined	10:37
	← MaceBewley left	10:39
	→ MaceBewley joined	10:41
	← Hicham125 left	10:44
	→ Vtec234 joined	10:45
	← yn5 left	10:45
	gitinfo set mode: +v	10:45
Vtec234	is it possible to merge open pull requests made to the original repo into my local clone of that repo?	10:46
	→ simesy joined	10:46
tobiasvl	you need to do it manually	10:47
	← MechtiIde left	10:48
tobiasvl	http://stackoverflow.com/questions/6022302/how-to-apply-unmerged-upstream-pull-requests-from-other-forks-into-my-fork	10:48
Vtec234	thanks	10:50
	→ squeakytoy2 joined	10:51
	→ mehola joined	10:51
	→ m0viefreak joined	10:53
	→ stamina joined	10:53
	← mehola left	10:56
	← Kulrak left	10:58
	← veganista left	11:01
	→ bronson joined	11:02
	← SLY1986 left	11:02
	→ jteneyck joined	11:04
	← Phoenixz left	11:04
	→ freestyl3r joined	11:04
	← notebox left	11:05
	→ kukks joined	11:06
	← kukks left	11:06
	→ kukks joined	11:06
	← bronson left	11:07
	→ turtleding joined	11:07
	← jteneyck left	11:08
	← ayaz left	11:10
	→ gutocarvalho joined	11:10
	→ LordLeBrand joined	11:11
	← crazyagile left	11:11
	Vampire0_ → Vampire0	11:12
	→ Kulrak joined	11:12
	← Kulrak left	11:12
	→ Kulrak joined	11:12
	← MaceBewley left	11:14
	→ cavallari joined	11:14
	→ crazyagile joined	11:15
	← keroro520 left	11:15
	→ dgutierrez1287 joined	11:15
	← OnkelTem left	11:15
	← LordLeBrand left	11:15
	← lucha left	11:16
	→ OnkelTem joined	11:16
	→ EduardoMartins joined	11:17
	← tcurdt left	11:19
	→ tcurdt joined	11:19
	← Corey84 left	11:19
	→ rnsanchez joined	11:23
	→ daito joined	11:24
	→ forsil joined	11:25
	→ droid909 joined	11:26
droid909	guys, i have a repo , and for example the last commit is 2222 and i want to remove everything above 2200 and make it the last commit, how do i do that?	11:26
	→ Fakeboost joined	11:27
	→ m0ltar joined	11:27
osse	droid909: so that the repo appears as if the latest 22 commits were never made?	11:27
	← m0ltar left	11:27
	→ m0ltar joined	11:28
	→ mostlybadfly joined	11:28
	← tinanoo left	11:28
	← daito left	11:29
droid909	osse: yes	11:29
	osse: so that other developers don't add	11:30
	osse: to the 2222	11:30
	osse: and add to 2200	11:30
osse	droid909: git reset --hard X where X is the sha1 of commit 2200	11:30
	and push -f	11:30
	→ ranguli joined	11:30
droid909	osse: thank you, gonna read about it right now	11:30
	← Kulrak left	11:32
	→ devoldmx joined	11:32
	← potteratt left	11:33
	← g105b left	11:33
	← Zariel left	11:34
	→ g105b joined	11:36
	← devoldmx left	11:37
	→ ayaz joined	11:38
	→ Darcidride joined	11:38
	→ MechtiIde joined	11:39
	→ Amandil joined	11:39
	→ Zariel joined	11:40
	← Zariel left	11:40
	→ CEnnis91 joined	11:40
	→ Zariel joined	11:41
	→ Kulrak joined	11:45
	← Kulrak left	11:45
	→ Kulrak joined	11:45
	← DolphinDream left	11:45
	→ Juzzika joined	11:46
	← Amandil left	11:46
	← zoso left	11:48
	← mizu_no_oto left	11:49
	← ScottE left	11:49
	→ notebox joined	11:50
	→ _Atom_ joined	11:50
	← Juzzika left	11:51
	→ jteneyck joined	11:51
	← rchavik left	11:52
	→ tinanoo joined	11:53
	→ rchavik joined	11:53
	→ CodingFree joined	11:54
	← Kulrak left	11:55
	← Zariel left	11:57
	→ dadamssg joined	11:57
	← fstd left	11:59
	→ fstd joined	11:59
	← denimsoft left	11:59
	← turtleding left	12:00
	→ ScottE joined	12:02
	← dadamssg left	12:02
	← dc5ala left	12:03
	← ayaz left	12:05
	→ ItSANgo joined	12:06
	→ Dorf joined	12:06
	← simesy left	12:06
	← przemoc left	12:07
	→ flashpoint9 joined	12:07
	← forsil left	12:08
	→ Kulrak joined	12:08
	← Kulrak left	12:08
	→ Kulrak joined	12:08
	→ przemoc joined	12:09
	→ rMdes joined	12:12
	← jteneyck left	12:12
	→ krawchyk joined	12:12
	← ranguli left	12:13
	← rnat left	12:13
	← Raging_Hog left	12:16
	← Douglas left	12:18
	→ dcpc007 joined	12:19
	→ rwb joined	12:20
	→ CheckDavid joined	12:22
	← dgutierrez1287 left	12:23
	→ LBV_User joined	12:25
	→ daito joined	12:25
	→ martiis joined	12:27
	→ Raging_Hog joined	12:27
	→ mizu_no_oto joined	12:28
	→ kanzure joined	12:29
	→ moosbart joined	12:29
	← daito left	12:29
	→ reim joined	12:29
	→ xudongz joined	12:31
	→ bongjovi joined	12:33
	← foolstack left	12:33
	→ sburgess joined	12:33
	→ GT4066 joined	12:34
	← moosbart left	12:36
	← rMdes left	12:38
	← Nothing4You left	12:39
	← weyer left	12:39
	→ MrC joined	12:39
	→ rwb1 joined	12:39
	→ juvenal joined	12:40
	→ knownasilya joined	12:40
	← Dragooon left	12:40
	← rwb left	12:40
	rwb1 → rwb	12:40
	→ Nothing4You joined	12:40
	→ Gamecubic joined	12:41
	→ weyer joined	12:41
	→ Dragooon joined	12:41
	→ Zariel joined	12:42
	← kukks left	12:43
	→ rMdes joined	12:43
	← Zariel left	12:44
	→ MindSpark joined	12:44
	← CodingFree left	12:45
	→ rwb1 joined	12:47
	→ Zariel joined	12:48
	← toothrot left	12:48
	→ PasiFist joined	12:49
	→ sfeinste joined	12:50
	→ sanketdg joined	12:51
	← PHPanos left	12:51
	← rwb left	12:51
	← rwb1 left	12:51
	→ Cyclohexane joined	12:52
Cyclohexane	How do I download a git repository? (I just want the files, no .git/ tracking etc)	12:52
BtbN	clone it and delete .git	12:52
	Or see if there's a webinterface that offers tarballs	12:53
tobiasvl	some hosting sites, like github and bitbucket, let you download an archive of the repo	12:53
	yes that ^	12:53
_rgn	git clone --depth 1 will probably be faster if it's a big repo	12:53
	→ rwb joined	12:54
	→ Raansu joined	12:54
	← rMdes left	12:54
	← BlackJackAc3 left	12:55
	→ c0mrad3 joined	12:56
	→ sgambino joined	12:56
	← mizu_no_oto left	12:57
	← ShapeShifter499 left	12:57
qsuscs	Cyclohexane: man git archive, look for remote archive. but e.g. github doesn't support it	12:57
gitinfo	Cyclohexane: the git-archive manpage is available at http://jk.gs/git-archive.html	12:57
	→ Douglas_ joined	12:58
	← Douglas_ left	12:58
	→ BlackJackAc3 joined	12:59
	→ dsilva joined	12:59
	← sanketdg left	13:00
	← barduck left	13:01
	← MasterPiece left	13:02
	← Raansu left	13:02
Cyclohexane	qsuscs: ok thanks :) - I'm using my own repo (not github)	13:03
	→ denimsoft joined	13:03
	→ DolphinDream joined	13:03
	→ bronson joined	13:03
	→ beckyconning_ joined	13:04
	→ theCole joined	13:04
osse	Cyclohexane: do you have a web interface for it?	13:05
	alternatively, do you have shell access from where you want to download it?	13:05
Cyclohexane	osse: yeah I have shell access	13:06
	→ buffal0 joined	13:06
osse	Cyclohexane: ssh user@host 'cd repo && git archive HEAD' \| tar -C destination -xf -	13:06
	BAM!	13:06
qsuscs	osse: git -C	13:07
	→ mellernoia joined	13:07
	→ ShapeShifter499 joined	13:07
osse	No.	13:07
qsuscs	why not?	13:07
osse	because I don't want to	13:08
qsuscs		13:08
	← bronson left	13:08
	→ d2dchat joined	13:09
	← reim left	13:09
osse	it will shorten the command by 3 characters. so that's good	13:09
	← Dragooon left	13:09
	→ Raansu joined	13:10
	← howlymowly left	13:10
osse	but it's super brand new!!111	13:10
	→ howlymowly joined	13:11
	← theCole left	13:11
	← fracting left	13:11
	← martiis left	13:11
	→ harish joined	13:11
	← BlackJackAc3 left	13:12
	← acolson left	13:12
	← roelmonnens left	13:12
	→ roelmonnens joined	13:12
	← Raansu left	13:12
	→ acolson joined	13:12
	→ chitopunk joined	13:14
	← ShapeShifter499 left	13:15
	→ macabre joined	13:15
	→ pm90_ joined	13:16
	→ pm90__ joined	13:17
	→ Dragooon joined	13:17
	→ kkspy joined	13:17
	← elv_ left	13:18
	→ victortyau joined	13:18
	→ BlackJackAc3 joined	13:18
	→ theCole_ joined	13:19
	→ MarkyC joined	13:20
	← pm90_ left	13:21
	→ cvanball joined	13:22
	← Gianormagantrous left	13:22
	→ subhojit777 joined	13:23
	← lb1a left	13:23
	← BlackJackAc3 left	13:24
	→ Gianormagantrous joined	13:24
	→ ikane joined	13:26
	← Dragooon left	13:26
	→ BlackJackAc3 joined	13:26
	→ ohpesky joined	13:26
	→ Dragooon joined	13:27
	→ fracting joined	13:28
	→ LordLeBrand joined	13:28
	← krawchyk left	13:30
	→ astrofog joined	13:30
	← ikane left	13:31
	→ jerius joined	13:31
	← Gianormagantrous left	13:31
	← ohpesky left	13:31
	→ krawchyk joined	13:32
	← cvanball left	13:32
	→ devoldmx joined	13:33
	→ unreal_ joined	13:34
	→ Gianormagantrous joined	13:34
	← BlackJackAc3 left	13:35
	→ BlackJackAc3 joined	13:36
	→ AaronMT joined	13:37
	→ bitkiller joined	13:37
	→ tchan joined	13:37
	← devoldmx left	13:38
	← theCole_ left	13:38
	→ Guest80460 joined	13:39
	Guest80460 → jayunit100	13:39
jayunit100	hi git	13:39
	I have a bunch of commits, to 30 files. I need to reorg them so that all commits to files a,b,c,d,e,.... are in COMMIT1, and f,g,h,i.j,k are in COMMIT2. The changes to both sets of files are spread across all 30 commits. Any idea how to do that?	13:40
	← fracting left	13:40
	→ ShapeShifter499 joined	13:40
	→ theCole joined	13:41
	← Gianormagantrous left	13:41
	→ eka joined	13:42
iveqy	jayunit100: man git rebase look at -i	13:42
gitinfo	jayunit100: the git-rebase manpage is available at http://jk.gs/git-rebase.html	13:42
jayunit100	-i, as i thought, only did by file. maybe im wrong. ill take a look.	13:43
	→ CKyle joined	13:43
jayunit100	sorry, i mean, -i (as i always use is, at lease) is by commit hash....	13:43
osse	jayunit100: git reset HEAD~n; git add a b c d e; git commit -m Foo; git add f g h i; git commit -m bar	13:43
	jayunit100: where n is the numerical value of "a bunch"	13:44
	→ raakesh joined	13:44
	← courrier_ left	13:44
jayunit100	yup , I was thinking to do that. figured there might be a more declarative way. but yup, reset HEAD will and re-adding them will work just fine.	13:44
	→ courrier_ joined	13:44
	← irwiss left	13:45
	→ NoiseEee joined	13:45
jayunit100	thanks osse for spelling it all out. i didn't really think carefully about how easy it would be.	13:45
	:)	13:45
osse	jayunit100:you need reset HEAD~n	13:45
	reset HEAD does nothing	13:45
	→ darkbasic joined	13:46
	← darkbasic_ left	13:46
	← BlackJackAc3 left	13:46
jayunit100	yup, -n	13:46
osse	jayunit100: no... :p	13:46
	← FreezingCold left	13:46
jayunit100	reset HEAD rewides the commits, right?	13:46
NoiseEee	hi folks... i've got a new major-release dev branch that needs to be worked into master. we've just completed it after a few months of development, and I'd like to merge it in a single commit (without all the commits of that dev branch) so that I can easily get to a state of 'before major release' and 'after major release' ... should i be looking at a merge squash?	13:46
osse	jayunit100: no	13:47
	reset HEAD~n does	13:47
	where n is a number	13:47
	or reset SHA1	13:47
jayunit100	yeah thats what , was just being imprecise .	13:48
	→ fracting joined	13:48
	→ Gianormagantrous joined	13:48
	→ rockstar_ joined	13:48
	→ kermit joined	13:48
	→ kevwil joined	13:48
jayunit100	ohh i see the typo i did - instead of ~. thats why i confused you . my fault :)	13:49
	← theCole left	13:49
	→ darkbasic_ joined	13:50
	→ jteneyck joined	13:50
	← darkbasic left	13:50
	→ aretecode joined	13:51
	→ BlackJackAc3 joined	13:51
	→ irwiss joined	13:51
	→ CodingFree joined	13:51
milki	NoiseEee: yes, or squash before merging	13:51
	NoiseEee: !perfect	13:51
gitinfo	NoiseEee: [!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.	13:51
	→ rockstar__ joined	13:51
	← dopie left	13:51
NoiseEee	thanks milki!	13:52
	→ MZAWeb_ joined	13:52
	← jteneyck left	13:52
	→ PPpyg2 joined	13:52
	→ tristanp joined	13:52
	← BlackJackAc3 left	13:53
	← fracting left	13:53
	→ rvalue joined	13:53
	→ rMdes joined	13:55
	→ DolphinDreamm joined	13:55
	← rMdes left	13:56
	→ turtleding joined	13:57
	← CKyle left	13:57
	→ dadamssg joined	13:58
	← AaronMT left	13:59
	→ Spacew00t joined	13:59
	→ AaronMT joined	13:59
dropdrive	Is there a git-rebase invocation that is equivalent to "git rebase -i but I only want to edit the first commit and nothing else"?	13:59
	→ leeN joined	14:00
	← DolphinDream left	14:00
	→ jteneyck joined	14:00
	← jteneyck left	14:00
	→ jteneyck joined	14:00
moritz	dropdrive: git commit --amend	14:00
tobiasvl	if you mean the LAST commit that is	14:01
	the tip	14:01
moritz	oh	14:01
tobiasvl	HEAD	14:01
moritz	right	14:01
	← nilg left	14:01
dropdrive	moritz: I meant not the tip, the first "chronologically", sorry	14:01
moritz	then I'm not aware of anything :(	14:01
dropdrive	moritz: Basically I just want to edit a commit's message, then rebase as usual (and there should never be a failure... right?)	14:02
	← dadamssg left	14:02
	→ dadamssg joined	14:02
dropdrive	(Trying to write a subcommand for it)	14:02
	→ Geisted_ joined	14:02
	→ nilg joined	14:03
	← Raging_Hog left	14:03
	→ nosmelc joined	14:03
	→ dstarh joined	14:04
	→ bronson joined	14:04
	→ gamename joined	14:04
	← darkbasic_ left	14:04
	← howitdo left	14:04
	→ darkbasic joined	14:05
	→ dsdeiz_ joined	14:05
	→ IrishPrime joined	14:05
	→ fracting joined	14:05
	← dadamssg left	14:05
	← PCatinean left	14:06
	← dsdeiz left	14:06
	→ PCatinean_ joined	14:06
	← fracting left	14:07
	→ Dougie187 joined	14:07
	→ fracting joined	14:07
	← freestyl3r left	14:08
	→ CKyle joined	14:08
	← bronson left	14:09
	→ theCole joined	14:09
	← sinkensabe left	14:09
	← fracting left	14:10
	→ fracting joined	14:10
	← fracting left	14:12
	→ fracting joined	14:13
	← fracting left	14:14
	→ axl_ joined	14:14
	← gamename left	14:14
	→ fracting joined	14:14
	→ gamename joined	14:15
	→ callback joined	14:15
	← fracting left	14:16
	→ fracting joined	14:16
	→ sinkensabe joined	14:16
	← gamename left	14:17
	→ gamename joined	14:17
	→ t2mkn joined	14:18
	← _Atom_ left	14:18
	← CKyle left	14:18
	← fracting left	14:18
	← sinkensabe left	14:19
	→ fracting joined	14:19
	→ happy-dude joined	14:19
	→ howitdo joined	14:19
	← winegoddess left	14:20
	← fracting left	14:21
	→ ehmatthes joined	14:21
	→ TomyLobo joined	14:21
	→ Corey84 joined	14:21
	→ fracting joined	14:21
	← dvaske left	14:23
	→ mehola joined	14:23
	← fracting left	14:24
	← Hounddog left	14:24
	← aqd left	14:24
	→ fracting joined	14:24
	← IrishPrime left	14:25
	→ IrishPrime joined	14:25
	→ fooforge joined	14:26
	→ kpease joined	14:26
	← nettoweb left	14:26
	← Vtec234 left	14:26
	← fracting left	14:26
	← kpease left	14:27
	→ fracting joined	14:27
	← mehola left	14:28
	← fracting left	14:28
	→ fracting joined	14:28
	← Gianormagantrous left	14:29
	→ kpease joined	14:29
	← acolson left	14:30
	← kpease left	14:30
	← fracting left	14:30
	→ kpease joined	14:31
	→ fracting joined	14:31
	← Geisted_ left	14:31
	← fracting left	14:33
	← axl_ left	14:33
	← roelmonnens left	14:33
	→ njbair joined	14:33
	→ fracting joined	14:33
	→ Geisted_ joined	14:34
	← jagob left	14:34
	→ dgutierrez1287 joined	14:35
	→ Gianormagantrous joined	14:35
	→ mbrzuzy joined	14:35
	← fracting left	14:35
	→ fracting joined	14:36
	← rchavik left	14:36
	→ dopie joined	14:36
	← theCole left	14:36
	→ jonno11 joined	14:37
	→ kukks joined	14:37
	← kukks left	14:37
	→ kukks joined	14:37
	← fracting left	14:37
	← jonno11 left	14:37
	→ fracting joined	14:38
	→ sazed joined	14:38
	← Gianormagantrous left	14:38
	← dgutierrez1287 left	14:39
	← juvenal left	14:40
	← fracting left	14:40
	← Fakeboost left	14:40
	→ fracting joined	14:41
	← CodingFree left	14:41
	→ axl_ joined	14:41
	→ aqd joined	14:42
	← fracting left	14:42
	← axl_ left	14:43
	→ basiclaser joined	14:43
osse	dropdrive: do you mean the initial commit?	14:43
	→ fracting joined	14:43
dropdrive	Yep	14:44
osse	git rebase -i --root	14:44
	← NoiseEee left	14:44
	→ sl33k joined	14:44
	→ ckinniburgh joined	14:45
	← fracting left	14:45
	→ fracting joined	14:45
osse	GIT_SEQUENCE_EDITOR='sed -i 1s/pick/reword/' git rebase -i --root	14:45
	→ bustrarm joined	14:46
	→ tgunr joined	14:46
	→ theCole joined	14:47
sl33k	hi guys. i'm having a problem where i have an account on two different git servers with different email addresses but git config seems to allow for only ONE address	14:47
	← fracting left	14:47
sl33k	Now that I need to clone a new project from my company private repos, my github ssh seems to be on the way	14:48
	← mingwandroid left	14:48
	→ CKyle joined	14:48
	→ fracting joined	14:48
	← busterarm left	14:48
	← jteneyck left	14:49
	→ tempname11 joined	14:49
	← Alienpruts left	14:49
	→ jstimm joined	14:49
	← fracting left	14:50
	← bipolar left	14:50
	← Balliad left	14:50
	→ sfan786 joined	14:50
	→ fracting joined	14:50
	→ beco joined	14:51
	← notebox left	14:51
	→ axl_ joined	14:51
	→ bipolar joined	14:52
	← rockstar_ left	14:52
	← fracting left	14:52
	→ fracting joined	14:53
	← michael_mbp left	14:54
	← rockstar__ left	14:54
	← callback left	14:54
	← fracting left	14:54
	→ fracting joined	14:55
	→ crose joined	14:55
	→ Industrial joined	14:55
Industrial	Hi.	14:55
	← victortyau left	14:55
Industrial	Has anyone heard of this:	14:55
	← kpease left	14:56
	→ forsil joined	14:56
osse	sl33k: you can set the address per-repo	14:56
	→ michael_mbp joined	14:57
	← fracting left	14:57
osse	cd workrepo; git config user.email 'name@company.com'; cd personalrepo; git config user.email 'termin4t0r@hotmail.com'	14:57
	→ jurcz91 joined	14:57
Industrial	A git branching model where you branch off your 'feature' from 'develop' and when your feature is done and ready for testing/QA you deploy that feature by itself.	14:57
	so instead of merging it back to develop and deploying many features at once for testing, you deploy every feature by itself	14:58
sl33k	osse: does this work on windows? it seems to require ssh agent running. I havent cloned the repos yet because of permission issues	14:58
	so how do i even set it per repos when i havent cloned the repos?	14:58
Industrial	This seemed like a cool idea to me but I have no idea how I'd get that to work/run. I'm wondering if anyone else has thought of this.	14:58
osse	sl33k: your email config has nothing to do with ssh or authentication	14:58
	you can't	14:58
sl33k	oh, my question has to do with ssh/authentication issues	14:58
dopie	after I git stash what do ido to apply the stash?	14:59
jast	Industrial: so you'd have a different install of the project for each new feature? won't that get a little complex for users after a while? :)	14:59
sl33k	i have my work computer configured to work with my github account/personal email address and now need that to work with company gitlab and company email. vpn	14:59
	← dsdeiz_ left	14:59
sl33k	osse: got clues?	14:59
	← Strat left	14:59
jayunit100	does force pushing a branch screw up the content of the branche's children ?	15:00
	→ Bootinbull joined	15:00
sl33k	what i find out is i would need to do a ssh-add which fails on windows gitbash cmd	15:00
osse	sl33k: git doesn't realy care.	15:00
Industrial	jast: Right now we have trouble with deploying too many features at once for testing. What if I could test a feature branch BEFORE it has anything to do with other code/branches in the project?	15:00
	← Sceorem left	15:00
jast	jayunit100: branches don't really have children as such... generally speaking, updating one branch doesn't update any other branch, so if you force push on one branch, all other branches will keep their old contents	15:00
sl33k	osse: i can't authenticate	15:00
osse	sl33k: maybe ssh-add fails because you didn't select to use OpenSSH when you installed it	15:00
jayunit100	ok	15:01
Industrial	jast: but then I'd need something like a subdomain handling like http://FEATURE-123.mytestserver	15:01
	← MZAWeb_ left	15:01
jast	Industrial: oh, so just testing. yeah, we have infrastructure in place here at work to test branches individually.	15:01
	→ dsdeiz joined	15:01
jayunit100	i guess thats true, because ive force pushed things andthen noticed that the repo still rememebers their contents.	15:01
Industrial	jast: I'm trying to write a proposition for such a system atm :)	15:01
jast	but that's pretty much your job, writing the scripts required for that	15:01
jayunit100	if you go deep into the refs	15:01
osse	sl33k: the email in git config certainly has nothing to do with it. so disregard that for the moment.	15:01
	← joo-_ left	15:02
	← temmi_hoo left	15:03
	→ The_Phoenix joined	15:03
	← The_Phoenix left	15:04
	→ jteneyck joined	15:04
sl33k	osse: waiting for the part that fixes my problem ^_^	15:04
osse	sl33k: i need more info for that	15:04
	← mbrzuzy left	15:04
	← jurcz91 left	15:04
	→ victortyau joined	15:04
	→ The_Phoenix joined	15:04
osse	what are the urls you're trying to connect to?	15:05
	← The_Phoenix left	15:05
	→ jurcz91 joined	15:05
	← Corey84 left	15:05
	→ sanketdg joined	15:05
	→ chandlerbing joined	15:05
	→ jagob joined	15:05
sl33k	i found something: http://stackoverflow.com/questions/18404272/running-ssh-agent-when-starting-git-bash-on-windows	15:05
	← MechtiIde left	15:05
	→ The_Phoenix joined	15:05
	← jurcz91 left	15:06
	→ kpease joined	15:06
	→ jeffmjack joined	15:06
	← The_Phoenix left	15:06
	→ _Atom_ joined	15:06
	→ jurcz91 joined	15:06
	← blackjid left	15:06
osse	hmm, i've never had that problem :S	15:07
	← kpease left	15:07
	→ raymond joined	15:07
	→ blackjid joined	15:07
	→ kpease joined	15:07
	→ MZAWeb_ joined	15:07
	→ The_Phoenix joined	15:07
	← CKyle left	15:07
sl33k	Windows	15:08
	← jurcz91 left	15:08
	← The_Phoenix left	15:08
	→ Technocrat7 joined	15:08
Industrial	jast: Right. There's no system out there that can already do this?	15:08
	I was thking about using Docker :-)	15:08
	→ jurcz91 joined	15:09
	← JanC left	15:09
osse	hmm, i've never had that problem on Windows :S	15:09
	→ dfaught joined	15:09
	← arup_r left	15:10
jast	Industrial: it very much depends on your app. there's probably something ready-made for your use case, but there wasn't for ours. our system is a little complex. :)	15:10
	← beco left	15:11
jast	our scripts for setting up an instance come out to 468 KB.	15:12
	→ jteneyck_ joined	15:12
	← chandlerbing left	15:12
bremner	does git itself access $HOME/.config/git/attributes ? I	15:14
	am getting odd messages in an ikiwiki setup.	15:14
	← jseplae left	15:15
	→ blimpse joined	15:15
	← jteneyck left	15:15
	← sarri left	15:15
	→ The_Phoenix joined	15:15
	→ sarri joined	15:16
	← The_Phoenix left	15:16
osse	yes	15:16
	→ The_Phoenix joined	15:17
	← The_Phoenix left	15:17
	→ GyrosGeier joined	15:17
bremner	so, it seems weird to me that it tries that for the the $HOME of the user owning the repo (or at least that's what it looks like)	15:18
	→ mbrzuzy joined	15:18
	→ tinajohnson joined	15:18
	→ The_Phoenix joined	15:18
	← The_Phoenix left	15:19
osse	i summe it uses $HOME of the users that executes git	15:19
	← jokester left	15:19
bremner	yeah, I would too, but some other user is getting complaints about my homedir	15:19
osse	have you thoroughly effed up XDG_CONFIG_HOME ?	15:20
	→ The_Phoenix joined	15:20
	← Kulrak left	15:20
	← The_Phoenix left	15:20
	← MZAWeb_ left	15:20
	→ jokester joined	15:21
	→ The_Phoenix joined	15:21
	← raakesh left	15:22
	← The_Phoenix left	15:22
	← clobrano left	15:22
	→ MZAWeb_ joined	15:22
bremner	don't think so. It's not set in my env.	15:23
	→ The_Phoenix joined	15:23
bremner	of course I'd need to check the other user's env.	15:23
	← The_Phoenix left	15:23
	← fooforge left	15:24
	→ JanC joined	15:24
	→ The_Phoenix joined	15:24
	← The_Phoenix left	15:24
	← tumulte left	15:25
	→ yosito joined	15:25
	→ The_Phoenix joined	15:25
	← The_Phoenix left	15:25
	← d2dchat left	15:26
	→ The_Phoenix joined	15:26
	← The_Phoenix left	15:27
	→ Strat joined	15:27
	← MistahKurtz left	15:27
	→ nettoweb joined	15:28
	→ Sasazuka joined	15:28
	→ The_Phoenix joined	15:28
	→ rubie joined	15:28
	← The_Phoenix left	15:28
	→ raakesh joined	15:29
	→ The_Phoenix joined	15:29
	→ elv joined	15:29
	← The_Phoenix left	15:30
	← Zariel left	15:30
	→ The_Phoenix joined	15:30
	← The_Phoenix left	15:31
	→ abacuspowers joined	15:32
	→ The_Phoenix joined	15:32
	← jstimm left	15:32
	← The_Phoenix left	15:32
	→ sssilver joined	15:32
	→ Zariel joined	15:33
	← Zariel left	15:33
	← Sasazuka left	15:33
	→ The_Phoenix joined	15:33
	→ Kulrak joined	15:33
	← The_Phoenix left	15:33
	← Kulrak left	15:33
	→ Kulrak joined	15:33
	→ Zariel joined	15:33
	→ krawchyk_ joined	15:33
	← Zariel left	15:33
	← moL-Ou left	15:34
	← elv left	15:34
	→ devoldmx joined	15:34
	→ The_Phoenix joined	15:34
	→ Zariel joined	15:34
	← The_Phoenix left	15:34
	→ wrouesnel1 joined	15:35
	← MZAWeb_ left	15:35
	← meteorhead left	15:35
	→ The_Phoenix joined	15:35
	← The_Phoenix left	15:36
	← krawchyk left	15:37
	← bipolar left	15:38
	→ Pseudocrat joined	15:38
	← Pseudocrat left	15:38
	→ Pseudocrat joined	15:38
	→ thiago joined	15:38
	← devoldmx left	15:38
	← phantombeta left	15:38
	→ war_pigs joined	15:38
	← flashpoint9 left	15:41
	→ madewokherd joined	15:42
	← sfeinste left	15:42
	← hmsimha_ left	15:42
	← _Atom_ left	15:44
	← rvalue left	15:44
	→ phantombeta joined	15:44
	← ifra201 left	15:44
	← t2mkn left	15:45
	→ MZAWeb_ joined	15:46
	← sl33k left	15:47
	← nettoweb left	15:48
	→ elv joined	15:48
	← kpease left	15:48
	→ kpease_ joined	15:48
	← theCole left	15:50
	← ehmatthes left	15:53
	← elv left	15:54
	← Zariel left	15:54
	← sfan786 left	15:56
	→ MechtiIde joined	15:56
	← Industrial left	15:58
	→ maletor joined	15:59
	← Silmarilion left	15:59
	← zumba_addict left	16:00
	← mikecmpbll left	16:00
	← Shentino left	16:02
	← Darcidride left	16:02
	→ Corey84 joined	16:02
	← Corey84 left	16:03
	← MechtiIde left	16:04
	→ nettoweb joined	16:04
	→ bipolar joined	16:04
	← psoo left	16:05
	→ bronson joined	16:05
	← Omnipotent left	16:05
	← zack_s_ left	16:05
	→ freeone3000 joined	16:06
	← p4trix left	16:07
freeone3000	I have a file which is checked into remote as 755. I'm using git on windows on NTFS, where ACL permissions are used. I've tried `git config --global core.fileMode false` but I'm still seeing files which differ only in mode as changed. How can I fix this?	16:07
	← bronson left	16:08
	→ dreiss joined	16:08
	→ bronson joined	16:08
	→ maestrojed joined	16:09
	← Vgr left	16:10
	→ SubZeroFX joined	16:10
	← kukks left	16:10
	← bronson left	16:10
	→ pantsman- joined	16:10
	← Kulrak left	16:10
	← tanuck_ left	16:11
qsuscs	"checked into remote"	16:11
	uh.	16:11
	← krawchyk_ left	16:12
qsuscs	1) the term "check in" does not exist within git, 2) you commit locally and push your commits to a remote (or they fetch, or format-patch and send-email, or ...)	16:12
	and 3) git does not store permissions except one executable bit	16:12
	hm, i wonder what that config flag does, man git config	16:13
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	16:13
freeone3000	qsuscs: Okay. Well, that's set on the copy in the repository referred to as origin/master, and is not set on local/master for some reason, and I cannot revert to it because git seems unable to set that bit through `git reset`	16:13
	→ arnaud joined	16:14
	← arnaud left	16:14
qsuscs	freeone3000: almost correct, origin/master is only a branch of a remote. anyways, what if you "git checkout -- :/", what kind of permission changes does "git diff" report?	16:14
	→ Fissure1 joined	16:15
	→ elv joined	16:15
	→ MechtiIde joined	16:15
freeone3000	qsuscs: old mode 100755 new mode 100644	16:15
	← Fissure left	16:16
	→ Juzzika joined	16:17
qsuscs	shrug tbh i have no idea. if this is msysgit/git-for-windows, try asking on https://groups.google.com/forum/#!forum/git-for-windows	16:17
	→ Shentino joined	16:17
freeone3000	Alright, thanks.	16:18
	← freeone3000 left	16:18
	← Shentino left	16:18
	← turtleding left	16:18
	← CustosLimen left	16:18
	← MZAWeb_ left	16:19
	→ Shentino joined	16:19
	→ turtleding joined	16:20
qsuscs	oh, git for windows 2.5, nice	16:20
	← yosito left	16:23
	← elv left	16:23
	→ greymeister joined	16:23
	→ _Atom_ joined	16:23
	→ ranguli joined	16:24
	→ brucelee joined	16:25
	← Asenar left	16:25
	← war_pigs left	16:26
	→ cerkauskas joined	16:26
	← nettoweb left	16:26
osse	still no ^C fix. Booo	16:26
	→ Kulrak joined	16:27
	← Kulrak left	16:27
	→ Kulrak joined	16:27
	→ {0xc6} joined	16:28
	← CheckDavid left	16:29
qsuscs	git's just too unixy for windows	16:31
	← jtb___ left	16:31
	← howdoi left	16:31
	← MindSpark left	16:32
	← jteneyck_ left	16:32
	← MarkyC left	16:32
	← dsdeiz left	16:33
osse	works in 1.9.5 :p	16:34
	← MechtiIde left	16:34
	← ranguli left	16:35
	→ kukks joined	16:35
	← kukks left	16:35
	→ kukks joined	16:35
	→ NeverDie joined	16:35
	← Technocrat7 left	16:35
	← brucelee left	16:36
	← tempname11 left	16:36
	→ jonno11 joined	16:37
	← marcogmonteiro left	16:37
	← cdown left	16:38
	→ ranguli joined	16:39
	→ fracting joined	16:39
	→ Motoko joined	16:39
	← fracting left	16:41
	→ krawchyk joined	16:41
	← krawchyk left	16:41
	→ MarkyC joined	16:42
	→ akiva joined	16:42
	← SubZeroFX left	16:43
	← fullstack left	16:45
	→ fullstack joined	16:45
	← Shentino left	16:45
	→ Technocrat7 joined	16:47
	← jonno11 left	16:48
	← denimsoft left	16:48
	← hahuang65 left	16:49
	→ hahuang65 joined	16:49
	→ Shentino joined	16:50
	← dfaught left	16:51
	← skullcrasher left	16:51
	→ theCole joined	16:51
drakino	Ooo, good reminder to go file a cert issue against git for windows.	16:51
	→ CKyle joined	16:51
	→ jollygood joined	16:52
	← m0ltar left	16:52
	← jollygood left	16:53
	← bongjovi left	16:54
	→ m0ltar joined	16:54
	← Kulrak left	16:54
	← theCole left	16:56
	→ temmi_hoo joined	16:58
	→ frem joined	16:58
	→ nettoweb joined	16:58
	→ tomog999_ joined	16:59
	← kukks left	16:59
	← BBBThunda left	17:00
	← PCatinean_ left	17:00
	→ MattMaker joined	17:01
	← tomog999 left	17:02
	→ Phoenixz joined	17:02
	offby1 tries GitUp	17:03
	← CKyle left	17:03
Nevik	offby1, bless you	17:04
	← dreiss left	17:04
	→ tempname11 joined	17:05
	← Shentino left	17:06
	→ dfaught joined	17:07
	→ MZAWeb_ joined	17:08
	← kkspy left	17:08
	→ dgutierrez1287 joined	17:08
	← phantombeta left	17:08
	→ Kulrak joined	17:09
	← Kulrak left	17:09
	→ Kulrak joined	17:09
	→ flashpoint9 joined	17:10
	→ fooforge joined	17:10
	→ nodiscc joined	17:11
	← nettoweb left	17:11
	← Xethron left	17:11
	← mbrzuzy left	17:11
	← Technocrat7 left	17:11
	→ dsdeiz joined	17:12
	→ Nizumzen joined	17:13
	→ gopar joined	17:15
	← thiago left	17:16
	→ yosito joined	17:18
	← nnyk_ left	17:19
	→ theCole joined	17:19
	→ nb_bez___ joined	17:19
	→ Shentino joined	17:19
	← IrishPrime left	17:21
	← theCole left	17:21
	→ mehola joined	17:21
	→ MechtiIde joined	17:21
	→ reim joined	17:22
	→ mbrzuzy joined	17:25
	→ cluelesscoder joined	17:25
	→ IrishPrime joined	17:25
whomp	offby1, thanks for the answer last night. as a reminder, i was trying to merge just the commits from where my branch diverged off of my co-workers branch, which has been merged into master already. if i just do `git rebase master`, i get merge conflicts. how can i fix this?	17:25
cluelesscoder	so on OSX, I have XDG_CONFIG_HOME set and per http://git-scm.com/docs/git-config git should be reading from it - but it is in one repository and not another	17:26
	→ theCole joined	17:26
cluelesscoder	anyone have any clues as to why this would happen?	17:26
	→ nettoweb joined	17:26
	← nanga left	17:26
	→ jteneyck joined	17:26
	← jteneyck left	17:26
	→ jteneyck joined	17:26
	← mehola left	17:27
	← gfixler left	17:27
	→ Sieigeie joined	17:27
	← mbrzuzy left	17:27
	→ nanga joined	17:27
offby1	whomp: I can't really picture your situation :-\|	17:27
	Nevik: GitUp is intriguing ... but pretty beach-bally :-\|	17:28
whomp	offby1, my co-worker branches off of master, makes some commits. i make a new branch off of that branch, make some commits. my co-worker merges their branch into master. now i want to merge my branch into master, but i don't want to replay the commits from my co-workers branch, or else i get issues.	17:29
	← _Atom_ left	17:29
whomp	i just want to replay the commits that i did	17:29
	→ nerd joined	17:30
phroa	cluelesscoder: try exporting GIT_CONFIG=$XDG_CONFIG_HOME/git/config	17:30
qsuscs	offby1: this? http://gitup.co/	17:30
	cluelesscoder: well, XDG is X desktop group. os x does not use X. i wouldn't be surprised if git ignored that on OS X altogether	17:31
	→ BlackJackAc3 joined	17:32
phroa	cluelesscoder: erm, wait, now that I look at the actual docs, that variable isn't the target of --global, it's a repo-specific config. never mind.	17:32
	→ bronson joined	17:32
cluelesscoder	+qsuscs: I already know it works - I've been using it for a couple months and it works in one repo	17:32
phroa	cluelesscoder: try symlinking ~/.gitconfig to $XDG_CONFIG_HOME/git/config?	17:32
	← David left	17:32
cluelesscoder	I mean it actually probably works in most repos	17:32
	← jeadre left	17:32
	→ d2dchat joined	17:33
	→ shinnya joined	17:33
	← PPpyg2 left	17:33
	← bronson left	17:33
phroa	cluelesscoder: out of curiousity is there anything special about the repos it doesn't work in? perhaps, you're using xcode with those repos but not with the ones they work in?, etc	17:33
cluelesscoder	phroa: that's a workaround...	17:33
phroa	I know xcode ships something like 1.9 last I checked, it might not have added support for XDG	17:33
cluelesscoder	phroa: nothing so far, but I just cloned down the new repo	17:33
offby1	qsuscs: yep, that's what I was poking at	17:33
	whomp: _at worst_ you can individually cherry-pick each of your commits	17:34
	→ qpdb joined	17:34
	→ petersr joined	17:34
offby1	whomp: if there are only a few, that might be a perfectly fine thing to do	17:34
qsuscs	offby1: and what do you mean by "beach-bally"?	17:34
	→ Technocrat7 joined	17:34
	→ jeadre joined	17:34
	→ devoldmx joined	17:35
offby1	qsuscs: I meant "slow" -- on OS X, when an app is busy and not servicing GUI interrupts, the OS turns the mouse pointer to a colorful thing called a "beach ball"	17:35
qsuscs	i see	17:35
	← Kulrak left	17:35
qsuscs	offby1: use the shell :p	17:35
	← BlackJackAc3 left	17:35
offby1	qsuscs: the app might benefit from some redesign, whereby they have a separate thread that simply displays the progress of long-running operations. I wouldn't be surprised if they do that sometime soon	17:35
	→ winegoddess joined	17:35
cluelesscoder	phroa: I really, really appreciate the input - I've been looking at this new repo to see if it has some specific configuration, but I'll keep exploring	17:36
offby1	qsuscs: well, I'm a command-line zealot, so you don't need to tell me to use the shell. But I do like to keep an eye on what's going on in GUI-land	17:36
	← m0viefreak left	17:36
	→ Amandil joined	17:36
offby1	whomp: I probably don't understand your situation perfectly, but it _sounds_ like you ought to be able to "git checkout master ; git merge your-own-branch" without any trouble	17:36
whomp	offby1, i got it, it's just `git rebase --onto master co-workers-branch my-branch`	17:36
offby1	whomp: good for you -- I've used git for years and can never remember what --onto does	17:37
	don't think I've ever used it	17:37
	← MattMaker left	17:37
qsuscs	offby1: i, too, often use the visual studio git integration, but that simply lacks some features i often use (e.g. add -p, in fact, VS sorta ignores the index and only supports all-or-nothing staging in its own XML config), so -> shell	17:37
	→ MattMaker joined	17:38
offby1	qsuscs: I generally distrust git integration in any IDE-like thing	17:38
whomp	offby1, haha yeah i'll probably forget by next week :)	17:38
offby1	I certainly wouldn't trust MS to do git right, unless they've been doing it for five years or more	17:38
whomp	offby1, thoughts on GitUp?	17:38
qsuscs	offby1: it's in fact quite nice, but simply lacks many features	17:38
offby1	whomp: my thoughts are: it's intriguing, but beach-bally.	17:39
whomp	what does that mean?	17:39
offby1	sigh	17:39
qsuscs	m)	17:39
offby1	whomp: I meant "slow" -- on OS X, when an app is busy and not servicing GUI interrupts, the OS turns the mouse pointer to a colorful thing called a "beach ball"	17:39
	offby1 whistles innocently	17:39
qsuscs	19:35 CEST	17:39
	← devoldmx left	17:39
offby1	https://en.wikipedia.org/wiki/Spinning_pinwheel	17:40
	→ terminal_echo joined	17:41
	← MattMaker left	17:42
	→ btree joined	17:42
	→ Kallis joined	17:44
	← Technocrat7 left	17:44
	→ X67r joined	17:44
	← btree left	17:44
	← Kallis left	17:44
	→ dreiss joined	17:44
	→ Kallis joined	17:45
	→ BlackJackAc3 joined	17:45
	← systmkor left	17:46
	→ SubZeroFX joined	17:46
whomp	ahh i see	17:46
	→ bronson joined	17:47
	→ jonno11 joined	17:47
	→ Auv joined	17:47
	← nosmelc left	17:48
	→ nnyk_ joined	17:48
	→ Kulrak joined	17:50
	← Kulrak left	17:50
	→ Kulrak joined	17:50
	← Phoenixz left	17:51
	← bronson left	17:51
	→ warrickFL joined	17:53
	→ LaptopBrain joined	17:53
	← GT4066 left	17:54
	← BlackJackAc3 left	17:55
	← Nizumzen left	17:56
	← ELFrederich left	17:56
	→ ilmgb joined	17:56
	← Motoko left	17:56
	→ ELFrederich joined	17:56
	→ Motoko joined	17:56
	← ilmgb left	17:58
	→ ilmgb joined	17:59
	→ thiago joined	17:59
	← sazed left	17:59
	← Motoko left	18:00
	→ Motoko joined	18:00
	→ frii joined	18:01
	← joki left	18:01
	← Juzzika left	18:02
	← frii left	18:03
	← ciampix left	18:05
	→ druidd joined	18:06
	→ joki joined	18:06
	← tanath left	18:06
	→ systmkor joined	18:07
	→ phantombeta joined	18:08
	← nettoweb left	18:08
	← Auv left	18:08
	→ s5s joined	18:09
s5s	Hi guys, some time ago I was able to set up a local directory and ran a git command to host this on localhost. Could you point me what this git command could have been. Can't remember and google doesn't help me so far	18:10
	← ilmgb left	18:10
	→ ilmgb joined	18:11
	← Geisted_ left	18:11
	ChanServ set mode: +o	18:11
	→ BlackJackAc3 joined	18:11
	← rally left	18:12
	→ war_pigs joined	18:12
	→ Geisted_ joined	18:12
offby1	s5s: sounds like "git daemon"	18:12
	... which i just apparently made up	18:12
	s5s: https://git-scm.com/book/en/v2/Git-on-the-Server-Git-Daemon	18:13
	← jonno11 left	18:13
	→ ketul joined	18:13
Motoko	Host on localhost?	18:13
	Like how? SSH, Git, HTTP?	18:13
	→ jeffklex joined	18:13
ketul	Hello . I want to combine my all patches in the single patch. How can I proceed ?	18:14
	→ sazed joined	18:14
	← jeffklex left	18:15
offby1	ketul: git rebase --interactive	18:15
	← crayon left	18:15
	← ilmgb left	18:15
ketul	kk offby1 Thanks. Let me do it a try :)	18:15
	→ jeffklex joined	18:15
	← dgutierrez1287 left	18:15
	← jeffklex left	18:16
	→ dgutierrez1287 joined	18:17
s5s	offby1: ah, yeah - it is git daemon	18:17
	→ jeffklex joined	18:17
s5s	Motoko: yes, git:// on localhost	18:17
	I just got it working	18:17
	→ bgerber joined	18:17
	← BlackJackAc3 left	18:18
ketul	offby1: I am getting :- noop	18:18
	# Rebase d1599a8..d1599a8 onto d1599a8	18:18
	#	18:18
	# Commands:	18:18
	# p, pick = use commit	18:18
	# r, reword = use commit, but edit the commit message	18:18
	# e, edit = use commit, b	18:18
	→ BlackJackAc3 joined	18:19
	→ MattMaker joined	18:19
offby1	ketul: you're doing it wrong :)	18:19
	ketul: check out _your_ branch	18:19
phroa	ketul: are you deleting all the "pick" lines in there? if so, that's going to noop. replace "pick" with "fixup" or "squash" as per the docs underneath the list	18:19
	→ cbonobo joined	18:19
	→ C1V0 joined	18:19
phroa	ketul: oh never mind, sorry :3	18:19
offby1	ketul: the do "git rebase -i $(git merge-base their-branch HEAD)"	18:19
	s/the/then/	18:20
	→ tanath joined	18:20
ketul	ok..	18:20
offby1	ketul: you might want to back everything up first, or do this work in a fresh clone	18:20
	!backup	18:20
gitinfo	Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	18:20
ketul	offby1: aha. It is safe on github.com	18:21
	← dgutierrez1287 left	18:21
	← hahuang65 left	18:21
ketul	offby1: Can I use any easy approach like using git diff -- -- . Then can I convert that .difference file to .patch ?	18:22
	→ mehola joined	18:22
	← MZAWeb_ left	18:22
offby1	ketul: you could do that, but the patch is probably not very useful	18:23
	you might also try "git format-patch", which is similar, but more useful	18:23
ketul	offby1: git-format-patch is applied on the commits only. right ? I want to submit my patch	18:24
	→ rijm joined	18:24
offby1	ketul: sorry, Id didn't understand that at all.	18:25
	ketus: git-format-patch -- and its close cousin, "git send-email" -- are specifically intended to prepare a patch for submission, so they're almost certainly what you want	18:25
	ketul: ^^	18:25
	offby1 's network is swamped by a large download, so typing is kinda tricky	18:26
ketul	offby1: :) . Ya so I did many commits on my repo. Now I want to combine all of them and want to submit in a single patch	18:26
	Your help is appreciated ..	18:26
offby1	then "git rebase -i" is what you need. Have you tried it?	18:27
	← mehola left	18:27
ketul	now trying :)	18:27
offby1	You run "git rebase -i" to "squash" all your commits together, _then_ you run "git send-email" or "git format-patch" to make that big commit into a patch	18:27
	← jeadre left	18:27
	→ mingwandroid joined	18:28
ketul	git rebase -i gives me noop :(	18:28
	offby1: ^	18:28
	offby1: git rebase -i branch-name . Am I doing right ?	18:29
	← nodiscc left	18:29
offby1	no	18:29
	rtfm	18:29
	I am too lazy to digest and summarize the man page for you	18:29
	← whomp left	18:29
ketul	;)	18:29
	← Kulrak left	18:30
	Eugene swamps offby1	18:31
	Eugene set mode: +o	18:31
	Eugene set mode: -o	18:31
	→ jeadre joined	18:31
	← druidd left	18:33
	→ magesing joined	18:34
	← astrofog left	18:34
	→ sfeinste joined	18:37
	← theCole left	18:37
	← rijm left	18:38
	→ theCole joined	18:38
	← shinnya left	18:38
	← theCole left	18:38
	→ theCole joined	18:38
qsuscs	offby1: weren't you the one with the crappy 5MBit/s DSL?	18:39
offby1	yep	18:39
	← ome left	18:39
	offby1 set mode: -o	18:39
qsuscs	:>	18:40
	no other provider, maybe DOCSIS?	18:40
offby1	especially compared to Eugene, whose entire block gets about 1,000,000 GB/µs if I recall correctly.	18:40
	qsuscs: there are plenty of other providers, but I'm too lazy and cheap to switch.	18:40
qsuscs	wtf.	18:40
	FFS DO IT	18:41
offby1	and in fact it almost never really matters	18:41
	→ nodiscc joined	18:41
offby1	qsuscs: easy for you to say.	18:41
qsuscs	well	18:41
Eugene	The building has 2x1Gbit fibers to downtown, plus 2x1Gbit microwave on the roof to downtown & Bellevue as backups	18:41
qsuscs	the US is pretty much the only "developed" country where communication infrastructure is worse	18:41
	than germany, that is	18:41
	but it can't be that hard to switch	18:41
	→ snthsnth joined	18:41
Eugene	I have a GbE handoff in the closet	18:42
	→ jeffklex_ joined	18:42
qsuscs	the only alternative to DSL here would be LTE	18:42
offby1	qsuscs: it's probably not that hard to switch, but you seem to not understand: I don't care enough	18:42
qsuscs	but that'd mean either only LTE -- shared bandwith, only 10GiB/month, ... -- or telekom hybrid, DSL+LTE, which is actually nice, except for the pure crap of modem+router	18:43
	offby1: you are weird	18:43
offby1	no argument	18:43
	Eugene can confirm	18:43
Nevik	qsuscs, there's Kabel in most places	18:43
	← jeffklex left	18:43
	← theCole left	18:43
	← tyreld left	18:43
	→ theCole joined	18:43
offby1	if I need to download something big on my phone, I turn off wifi -- the cellular network is faster :)	18:43
	← SubZeroFX left	18:44
qsuscs	Nevik: we have DSL since 2010, before that only ISDN. certainly no cable.	18:44
	← MarkyC left	18:44
Nevik	where are you, in east germany? :D	18:44
ketul	offby1: sorry for interrupt. Can I convert .diff file (generated by git diff) to .patch as .diff don't have 81+++++-- and all. So I think that is required for submission	18:44
qsuscs	(though there is indeed cable in the neighbour village … i wonder why there, it’s not exactly larger)	18:44
	→ MarkyC joined	18:45
	→ SubZeroFX joined	18:45
offby1	ketul: it's probably a bad idea.	18:45
Nevik	probably just proximity to an uplink	18:45
ketul	ok.	18:45
qsuscs	ketul: the output of git-format-patch respectively the file it creates is a valid file to git-am, git-apply and patch(1)	18:45
	← nodiscc left	18:45
	→ elv joined	18:45
qsuscs	Nevik: i think rather the lack of empty tubes in the streets here	18:45
Nevik	or that	18:46
qsuscs	that’s why there isn’t more DSL either	18:46
	→ Qeea joined	18:46
Nevik	infrastructure is so expensive rly	18:46
qsuscs	no	18:46
ketul	gah.. OK thanks all. as git rebase -i always giving me noop	18:46
qsuscs	the IDIOTS in the 70s	18:46
	← BlackJackAc3 left	18:46
	→ Kulrak joined	18:46
	← Kulrak left	18:46
	→ Kulrak joined	18:46
	← ItSANgo left	18:47
	→ cagedwisdom joined	18:47
	→ BlackJackAc3 joined	18:47
qsuscs	municipal service come, open up the streat, put water and crap tubes in there, close the street	18:47
	→ snthsnth_ joined	18:47
qsuscs	badenwerk comes, opens up the street, put energy cables in there, closes the street	18:47
	← snthsnth left	18:47
qsuscs	federal post comes, opens up the streets, puts telephone lines in there, closes the street	18:48
	← checkItOut left	18:48
qsuscs	they couldn’t even just do that together, not to mention put in empty tubes (just in case 30 years later they have the same idea again)	18:48
Eugene	Why can't they do it the easy way, like we have in the US? Just hang everything from a wire	18:49
	It totally won't all fall over any time it freezes	18:49
offby1	oh it never freezes here, Jerry	18:50
	← elv left	18:50
qsuscs	Eugene: exactly.	18:50
	← Dragooon left	18:50
	← {0xc6} left	18:50
	← IrishPrime left	18:50
Eugene	They're actually doing the tear-up-the-sidewalk routing outside my building right now	18:50
qsuscs	some old power lines are still over the roofs, but they’ll be put in the streets some time soon™	18:51
Eugene	New condos are going up next door, so there's no longer any buildings that need stuff hung.... so they're burying all the electrical, phone, etc lines and tearing out the poles	18:51
	← Kallis left	18:52
	← luksaur left	18:52
	→ {0xc6} joined	18:55
	← jagob left	18:55
	← NeverDie left	18:55
	← stamina left	18:57
	← LBV_User left	18:58
	← jost_ left	18:59
	← eka left	19:00
	← Amandil left	19:00
	← Qeea left	19:00
	← dsdeiz left	19:02
	→ tm512 joined	19:03
	→ MasterPiece joined	19:03
	→ Nizumzen joined	19:04
	← SubZeroFX left	19:04
	← BlackJackAc3 left	19:04
	→ CustosLimen joined	19:05
	→ BlackJackAc3 joined	19:05
	← snthsnth_ left	19:05
	→ Amandil joined	19:07
	← BlackJackAc3 left	19:08
	→ pullphinger15 joined	19:09
	→ keiiq joined	19:09
	→ Sazhen86 joined	19:09
	→ snthsnth joined	19:10
	← pullphinger15 left	19:13
	← keiiq left	19:13
	→ User458764 joined	19:13
	→ MinetestForFun joined	19:14
	→ pullphinger joined	19:14
	← pullphinger left	19:14
	→ pullphinger joined	19:14
	← pullphinger left	19:14
	→ pullphinger joined	19:14
	← pullphinger left	19:14
	→ pullphinger joined	19:14
	← pullphinger left	19:14
	→ wezi joined	19:15
	← sburgess left	19:15
	→ pullphinger joined	19:15
	← pullphinger left	19:15
	← Sieigeie left	19:16
	→ pullphinger joined	19:16
	← pullphinger left	19:16
	→ luksaur joined	19:16
ketul	offby1: I got msg "Successfully rebased and updated refs/heads/"	19:16
	← snthsnth left	19:16
ketul	now what should be done to generate patch of combined commit ?	19:17
	ok got. offby1 Thanks :)	19:17
	→ BlackJackAc3 joined	19:17
	kpease_ → kpease	19:17
	→ snthsnth joined	19:18
	→ pullphinger joined	19:18
	← pullphinger left	19:18
	→ pullphinger joined	19:19
	← pullphinger left	19:19
	← cyphase left	19:19
	→ cyphase joined	19:19
	← {0xc6} left	19:19
	→ {0xc6} joined	19:20
	cyphase → Guest21878	19:20
	← Amandil left	19:20
	→ PPpyg2 joined	19:21
	← xudongz left	19:23
	← magesing left	19:23
	→ mehola joined	19:23
	← BlackJackAc3 left	19:24
	← wezi left	19:27
	→ BlackJackAc3 joined	19:27
	← mehola left	19:27
offby1	\o/	19:28
	~	19:28
	/ \	19:28
	← ketul left	19:28
	→ linuxboy_ joined	19:28
	← PPpyg2 left	19:29
	→ PPpyg2 joined	19:30
	← BlackJackAc3 left	19:31
	← linuxboytoo left	19:31
	→ jienahma joined	19:32
	← jienahma left	19:32
	→ jienahma joined	19:32
	← jienahma left	19:32
	→ iok joined	19:32
	→ SeeThruHead joined	19:33
	→ devoldmx joined	19:35
	gitinfo set mode: +v	19:36
SeeThruHead	if i make a commit for just bumping my version number, how can i refer to the commit that caused the version bump in my commit message?	19:36
	← fahadash left	19:36
	← crazyagile left	19:36
	← ranguli left	19:37
	← Guest21878 left	19:37
	→ zumba_addict joined	19:38
	← EduardoMartins left	19:38
	← devoldmx left	19:40
atrus	SeeThruHead: i'm not clear on your question. maybe explaining why you want that would help?	19:40
	→ saphafee joined	19:40
	← EsoRotica left	19:40
blimpse	What would be the best way to undo changes made a few commits ago without undoing changes from the commits between then and now?	19:41
	→ mbrzuzy joined	19:41
atrus	blimpse: has anybody other than you seed the changes you want to undo?	19:41
phroa	blimpse: man git revert	19:41
gitinfo	blimpse: the git-revert manpage is available at http://jk.gs/git-revert.html	19:41
atrus	s/seed/seen/	19:41
blimpse	atrus: Yes.	19:41
	← saphafee left	19:42
	→ bket joined	19:42
atrus	blimpse: see what phroa called up then :)	19:42
phroa	blimpse: then !rewrite applies unless you use git revert, which does not rewrite history. revert inverts diffs	19:42
gitinfo	blimpse: 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	19:42
	← iok left	19:43
	→ strype joined	19:43
blimpse	Ok, revert sounds like what I need. I don't want to rewrite.	19:43
	Thanks. :)	19:44
	kpease → kpease_	19:45
	→ douw joined	19:45
	← pm90__ left	19:46
	← rnsanchez left	19:46
	← raakesh left	19:46
	→ pm90_ joined	19:46
	← douw left	19:47
	→ dgutierrez1287 joined	19:47
	← strype left	19:47
	← madewokherd left	19:47
	→ madewokherd joined	19:47
	→ Tfx joined	19:48
	← dgutierrez1287 left	19:48
	→ dgutierrez1287 joined	19:49
	→ elux joined	19:49
elux	hi	19:49
gitinfo	elux: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	19:49
jason237	thinking about merging vs squashing/rebasing for integrating topic branches, I wonder if squash/rebase followed by merge -s ours would avoid the trickiness with git bisect while preserving history	19:49
	← kevwil left	19:49
elux	i have a vendor/ folder in my repo where i copy other repos in there which I'd like to verson control.. right now Im just copying the full sub-repo in there.. but of the sub-repo they contain `.git/` folders which Id like to ignore..	19:50
	what can i put in the .gitignore to ignore those folders ... ? i tried: vendor/**/.git which sorta works, but still leaves those repos looking like submobules or something	19:51
Algebr	I deleted a branch on remote and local. Can the reflog save me	19:51
	← Tfx left	19:51
	→ ItSANgo joined	19:52
phroa	Algebr: you can certainly try to find it. $ man git reflog	19:52
gitinfo	Algebr: the git-reflog manpage is available at http://jk.gs/git-reflog.html	19:52
	→ bstrarm joined	19:52
	→ CKyle joined	19:52
phroa	elux: man git submodule	19:52
gitinfo	elux: the git-submodule manpage is available at http://jk.gs/git-submodule.html	19:52
	← bustrarm left	19:52
elux	id rather it not be a submodule tho.. id like to copy the files	19:52
	← mbrzuzy left	19:52
phroa	elux: then remove the .git folder when you copy the files	19:53
	→ hahuang65 joined	19:53
elux	the vendoring tool i am using doesnt do that unfortunately.. i was hoping i could do it with gitignore so it would just skip those	19:53
	→ Ttyr joined	19:53
	← Ttyr left	19:54
	→ cmsz joined	19:55
	← CKyle left	19:56
	→ Technocrat7 joined	19:56
iveqy	elux: yes you can do it with gitignore if they aren't already tracked	19:58
	← Kulrak left	19:58
elux	awesome, they aren't tracked.. how? :)	19:58
iveqy	however, submodules is the correct tool for this. Assume that you want to use an old version of your code, then you need to know which older version of the vendor tools that code are using	19:58
	your solution won't cover that case and will made it impossible for you to recompile an old solution	19:59
	← Geisted_ left	19:59
elux	yea, the vendor tool has a manifest and will resync that folder outside of it	19:59
	→ shinnya joined	19:59
elux	then the commits at any instant will have all the vendor code already	19:59
iveqy	elux: just putting the vendor directory in gitignore should do	20:00
elux	well... i want to commit the vendor directory, just not any .git/ folders in child folders in vendor/	20:00
iveqy	elux: that you can't do, afaik.	20:01
elux	ok thanks, yea, doesnt seem to work..	20:01
	→ The_Phoenix joined	20:01
phroa	what is this vendor tool doing to the checked out repos?	20:01
	I'm just curious why you're against submodules	20:01
iveqy	elux: why don't you like submodules? Have you looked at subtree? Maybe that will suit you better	20:01
elux	well.. ie. permissions.. managing ssh keys etc.	20:01
	← Technocrat7 left	20:01
	← dgutierrez1287 left	20:01
	← cmsz left	20:01
elux	and, some dependencies are git repos not managed by me.. referenced to servers outside of github, sometimes are unreliable.. so id like a copy of them	20:02
iveqy	elux: a submodule is a full copy...	20:02
	elux: !subtree	20:02
gitinfo	elux: The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stich-repo.	20:02
	← MechtiIde left	20:02
	← jerius left	20:02
iveqy	elux: subtree is more what you are asking for.	20:02
elux	i see..	20:03
	→ Phoenixz joined	20:03
elux	does it come with all the version history of those other subpackages.. cuz id rather it didnt	20:03
	it will just bloat my repo	20:03
	← flashpoint9 left	20:04
	← subhojit777 left	20:04
	→ nettoweb joined	20:04
	← theCole left	20:04
	→ macrover joined	20:04
	← The_Phoenix left	20:05
	→ Naiu joined	20:06
	← Danjo1 left	20:06
	→ pullphinger joined	20:06
	← pullphinger left	20:06
iveqy	elux: it does if you want it to. There's a --depth option.	20:07
	← Naiu left	20:07
elux	nice	20:07
	→ theCole joined	20:08
	→ diegoviola joined	20:08
	← turtleding left	20:10
	← nilg left	20:12
	→ bap1313 joined	20:12
	← sazed left	20:13
	→ darkbasic_ joined	20:13
	← darkbasic left	20:13
	← Phoenixz left	20:13
	→ oocf joined	20:14
	→ Phoenixz joined	20:14
	→ trang joined	20:15
	→ moldy joined	20:15
moldy	hi	20:15
phroa	!hi !	20:15
gitinfo	[!welcome] Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.	20:15
trang	my coworker and i have been making commits to same branch. how do I remove my last 2 commits (while keeping his)	20:16
phroa	trang: if you're not concerned about !rewrite, man git rebase and use --interactive. if you care about rewriting, use man git revert	20:16
gitinfo	trang: 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	20:16
	trang: the git-rebase manpage is available at http://jk.gs/git-rebase.html	20:16
	trang: the git-revert manpage is available at http://jk.gs/git-revert.html	20:16
	→ Kulrak joined	20:16
	← Kulrak left	20:16
	→ Kulrak joined	20:16
Algebr	reset then cherry-pick his?	20:16
	← jeffklex_ left	20:17
	→ anchorite joined	20:17
	→ brucelee joined	20:17
moldy	i ran git branch -u origin/serverfix; now i want to switch my current branch to the state origin/serverfix. i don't care about my previous changes to that branch. how do i tell git to perform a merge that just takes the changes from the remote branch?	20:18
	→ pm90__ joined	20:18
qsuscs	moldy: perhaps you want to reset (--hard) you branch?	20:18
	moldy: the exact same state or really a merge? because the latter would simply be git merge	20:19
	→ flashpoint9 joined	20:19
	→ jeffklex joined	20:19
	← sanketdg left	20:20
moldy	qsuscs: i want to contribute to foo/repo in the future. i have changes against bar/repo that i don't care about. they can stay in the history, but i don't want to merge them.	20:21
	qsuscs: foo/repo is itself a fork of bar/repo	20:21
	← pm90_ left	20:21
	← MinetestForFun left	20:22
qsuscs	moldy: well do you want to keep them or do you want to abandom them? git reset --hard $branch brings your current branch and working directory to the same state as $branch, so you would abandon your changes	20:23
moldy	qsuscs: i don't care, whatever is easier ;)	20:23
	qsuscs: https://dpaste.de/HaKV	20:23
phroa	ha, Hak5	20:24
	→ mehola joined	20:24
moldy	qsuscs: now i want to say "ok, give me jrief's stuff and let me continue work from there."	20:24
	→ oojacoboo joined	20:24
	→ Danjo1 joined	20:24
moldy	qsuscs: i don't want to merge with my 14 changes, i want only the 542 changes from him.	20:24
	← yosito left	20:25
	← m0ltar left	20:25
qsuscs	moldy: git reset --hard @{u} (@{u} aka @{upstream} aka HEAD@{upstream} aka master@{upstream} is jrief/0.3.0.dev)	20:25
	← oocf left	20:26
	→ tang^ joined	20:26
moldy	qsuscs: ah, thanks	20:26
	← tgunr left	20:27
	← rwb left	20:28
	← mehola left	20:28
	→ sazed joined	20:29
	← flashpoint9 left	20:29
	← war_pigs left	20:29
	→ Jcr joined	20:29
	→ tgunr joined	20:30
	← AaronMT left	20:30
	← nerd left	20:31
	← gamename left	20:31
	← jteneyck left	20:31
	← Jcr left	20:32
	→ gamename joined	20:32
	← Nizumzen left	20:32
	→ elv joined	20:32
	← gamename left	20:32
	← User458764 left	20:34
	← maletor left	20:34
	→ flashpoint9 joined	20:35
	← darkbasic_ left	20:35
	← tinajohnson left	20:35
	← causasui left	20:36
	→ causasui joined	20:36
	→ darkbasic joined	20:36
	← socketguru left	20:36
	← crose left	20:37
	← nettoweb left	20:38
	→ DolphinDream joined	20:39
	→ mizu_no_oto joined	20:40
	← petersr left	20:41
	← trang left	20:41
	→ chrisgeorge joined	20:42
	→ ohpesky joined	20:42
	→ SubZeroFX joined	20:42
	← elv left	20:42
	→ trang joined	20:43
	← flashpoint9 left	20:45
	→ nettoweb joined	20:45
	→ Axhy joined	20:46
	← ohpesky left	20:46
	→ _Atom_ joined	20:48
	← tomboy64 left	20:49
	→ war_pigs joined	20:50
	→ jonno11 joined	20:50
	← Axhy left	20:50
	← jonno11 left	20:50
	← buffal0 left	20:51
	← jeffklex left	20:52
	→ cvanball joined	20:52
	← temmi_hoo left	20:53
	→ jonno11 joined	20:53
	← nettoweb left	20:54
	← dsilva left	20:55
	→ MaceBewley joined	20:55
	← cavallari left	20:55
	← jonno11 left	20:56
	→ nettoweb joined	20:56
	← Jackneill left	20:56
	← madewokherd left	20:58
	← theCole left	20:59
	← sfeinste left	20:59
	→ Xjsq joined	20:59
	← tang^ left	21:00
	← Xjsq left	21:00
	→ CKyle joined	21:01
	→ MZAWeb_ joined	21:03
	→ Pogdp joined	21:03
	← gutocarvalho left	21:03
	← Pogdp left	21:03
	← axl_ left	21:03
	← ygeLN left	21:03
	← nnyk_ left	21:04
	→ axl_ joined	21:04
	→ gutocarvalho joined	21:04
	← dstarh left	21:04
	← DolphinDream left	21:06
	→ crazyagile joined	21:07
	← trang left	21:09
	→ yqt joined	21:09
	← moldy left	21:09
	winegoddess → winegoddess-away	21:09
	→ Ynopi joined	21:09
	← Ynopi left	21:10
	→ kadoban joined	21:10
	← cvanball left	21:10
	→ gjaj joined	21:11
	← gjaj left	21:11
	← SeeThruHead left	21:12
	← CMOTD left	21:12
	→ Zpvmk joined	21:13
	← Zpvmk left	21:13
	← MattMaker left	21:13
	← macrover left	21:14
	→ acaf joined	21:14
	→ elv joined	21:14
	← acaf left	21:15
	→ legeb joined	21:17
	← legeb left	21:18
	← pantsman- left	21:20
	← elv left	21:20
	→ Lekv joined	21:21
	→ EsoRotica joined	21:21
	← Lekv left	21:21
	→ bpop joined	21:22
	← sazed left	21:22
	← bpop left	21:22
	→ MZAWeb joined	21:23
	← MZAWeb_ left	21:23
	← macabre left	21:23
	← axl_ left	21:23
	→ macabre joined	21:23
	→ oud joined	21:24
	← oud left	21:24
	→ elv joined	21:24
	→ Oez joined	21:25
	← Oez left	21:25
	→ t4nk288 joined	21:27
	← nettoweb left	21:27
	→ Nizumzen joined	21:27
diegoviola	"Of course, I'd also suggest that whoever was the genius who thought it was a good idea to read things ONE FCKING BYTE AT A TIME with system calls for each byte should be retroactively aborted. Who the fck does idiotic things like that? How did they noty die as babies, considering that they were likely too stupid to find a tit to suck on?" -- Linus Torvalds	21:27
	→ ehmatthes joined	21:27
	gitinfo set mode: +v	21:28
	→ madewokherd joined	21:28
t4nk288	Hello, I was wondering how I could get old git colors	21:28
	← anchorite left	21:28
ojacobson	diegoviola: yes, yes, Linus is an intolerable arse who should be ejected from polite society, we know already	21:29
	→ bronson joined	21:29
qsuscs	ojacobson: yet he is capable in what he does	21:29
ojacobson	qsuscs: So are lots of people we shouldn't put up with	21:29
	← elv left	21:30
ojacobson	So are lots of people who _don't_ feel the need to systematically abuse and belittle anyone who doesn't do things their way	21:30
	← bronson left	21:30
	→ spdrf joined	21:30
	← spdrf left	21:31
	→ bronson joined	21:31
	→ Mipx joined	21:32
	← Mipx left	21:32
	← fooforge left	21:32
	← bronson left	21:32
	← dopie left	21:32
	→ qosa joined	21:33
diegoviola	ojacobson: Linus wrote git	21:33
	← MZAWeb left	21:33
	← qosa left	21:33
	→ bronson joined	21:33
qsuscs	diegoviola: amongst others	21:34
	← Dougie187 left	21:34
	→ Dowz joined	21:34
	← Dowz left	21:35
diegoviola	I agree some of his language is unnecessary and he needs to grow up	21:35
	→ maletor joined	21:35
qsuscs	1322 people wrote git	21:35
	← chrisgeorge left	21:35
ojacobson	At what point would it go from "needs to grow up" to "refuses to grow up"? He's been at this for most of his adult life, and he's been told, asked, begged, advised, yada yada to knock it off for most of that time. When do we stop tolerating it?	21:35
	← bronson left	21:35
qsuscs	1109 out of 40530 commits are from linus	21:36
	← andschwa left	21:36
qsuscs	ojacobson: how do you want to stop tolerating it? fork linux or what?	21:36
	→ bronson joined	21:36
	→ devoldmx joined	21:36
diegoviola	Linux has been forked multiples times, Android, Linux-libre	21:37
ojacobson	-Personally- I'd like the LKML moderators to start aggressively rejecting Linus' emails until he treats people like people	21:37
	→ Rvw joined	21:37
	→ nettoweb joined	21:37
	← bronson left	21:37
	← Rvw left	21:37
ojacobson	And for the LKML group collectively to reject his attitude -- maybe form a group without him in it, maybe convince him to go, maybe successfully get him to clean up his act and stay	21:37
diegoviola	qsuscs: sorry about that, I know there are many more contributors to Git and Linux	21:37
	→ taru joined	21:38
ojacobson	Git, thankfully, is in Junio's hands, not Linus', so #git and the git mailing list see a lot less abuse from mr torvalds	21:38
	→ bronson joined	21:38
	→ ril joined	21:38
	→ Ies joined	21:38
	→ andschwa joined	21:39
	← Ies left	21:39
	← t4nk288 left	21:39
	→ Es0teric joined	21:39
ojacobson	I'd also like to see people (looking at you here, qsusc :) stop excusing his behaviour in his absence with "but his skills!"	21:39
	← Sazhen86 left	21:39
	← bronson left	21:39
ojacobson	it's a meme at this point :)	21:39
diegoviola	Linus was nicer and more humble when he was younger	21:39
qsuscs	ojacobson: it's not an excuse, however i do want to "keep him" because of his skills	21:40
	→ bronson joined	21:40
qsuscs	and i think linux wouldn't be where it is today without linus as a person	21:40
ojacobson	Then I must reject you, as well.	21:40
	← c0mrad3 left	21:40
	← devoldmx left	21:40
diegoviola	https://www.youtube.com/watch?v=qaDpjlFpbfo	21:41
	→ beefcakeba joined	21:41
	← bronson left	21:41
Motoko	I do think Linus has changed a bit. Become much more of an asshole.	21:41
	← bstrarm left	21:41
Motoko	The problem is that everyone tolerates it.	21:41
	→ Clmx383 joined	21:42
diegoviola	he's been doing the linux thing for a long time	21:42
	→ Tdde joined	21:42
	→ nadim joined	21:42
	→ bronson joined	21:42
	← Tdde left	21:42
Motoko	Yes, he has.	21:42
grawity	Everyone eventually becomes more of an asshole if they have to deal with stupider people for a long time	21:42
diegoviola	it's not an excuse to treat people like shit though	21:42
grawity	Speaking from experience	21:42
diegoviola	there's no excuses for that	21:42
qsuscs	grawity: can confirm	21:42
Motoko	grawity, I've dealt with helpdesk stuff for years. I have stories.	21:42
	I still treat people with what respect I can.	21:43
	← bronson left	21:43
Motoko	Even if I'm a little short, I do my best to not attack others.	21:43
	→ Uiaau joined	21:43
	← gbit86 left	21:43
grawity	so do I, but after ~12 years on Linux IRC channels the "with what respect I can" part has been slowly shrinking	21:43
	← Uiaau left	21:44
qsuscs	oh well	21:44
	→ bronson joined	21:44
diegoviola	"I like offending people, because I think people who get offended should be offended." -- Linus Torvalds	21:44
qsuscs	usually the idiots are kicked by eugene before i can really explode and rage	21:44
diegoviola	isn't he saying he just enjoys treating people like shit in this quote?	21:44
	"I don't respect people unless I think they deserve the respect. There are people who think that respect is something that should be given, and I happen to be one of the people who is perfectly happy saying no; respect should be earned. And without being earned, you don't get it. It's really that simple." -- Linus Torvalds	21:44
qsuscs	i partly agree with the last quote	21:45
	← nb_bez___ left	21:45
diegoviola	sorry about the offtopic anyway	21:45
	ChanServ set mode: +o	21:45
	Eugene kicked qsuscs (Shh, I'm working)	21:45
	← bronson left	21:45
	→ qsuscs joined	21:45
	→ gbit86 joined	21:45
	Eugene set mode: -o	21:45
	ChanServ set mode: +o	21:45
	qsuscs kicked Eugene (back to work)	21:45
	qsuscs set mode: -o	21:45
	→ Eugene joined	21:45
	← brucelee left	21:45
	→ bronson joined	21:46
qsuscs	where did i stop	21:46
	ah	21:46
Motoko	Nothing new since your part	21:46
	← bronson left	21:47
qsuscs	i do partly agree with that quote, but every human being deserves some respect for being a human	21:47
	however, that's basic respect. all the other one gotta earn	21:47
Motoko	In general, I give a default bit of respect by default. The person's behavior toward me will adjust from that baseline.	21:47
	→ bronson joined	21:47
ojacobson	If my code isn't up to some arbitrary standard, should I be told I should've starved in infanthood?	21:48
Motoko	If they are awful and keep being awful, they lose that respect.	21:48
ojacobson	Is that an okay way to treat people, if you're good enough at what you do?	21:48
qsuscs	Motoko: yes, but i keep it to at least a minimum level. linus ... doesn't.	21:48
Motoko	Exactly.	21:48
	← MasterPiece left	21:48
	← bronson left	21:49
	→ bronson joined	21:49
qsuscs	ojacobson: i think on places like LKML you gotta stay hard. if people's code is utter crap, tell them it's utter crap. but tell them _their code_ is utter crap, not themselves, like linus does	21:49
	or stay abstract enough	21:50
	like "fuck you, nvidia"	21:50
ojacobson	Well, Linus has convinced a lot of folks, myself included, that he's not going to stop telling people that -they- are utter crap, so what now?	21:50
	← bronson left	21:51
	→ bronson joined	21:51
phroa	this is a strange alternate reality from reddit (I think) where everyone justifies his behaviour by saying "no, no, he's not saying YOU are a dumbass, your CODE is dumb. he never insults people specifically!"	21:51
qsuscs	maybe he does, respectively he thinks he does	21:52
ojacobson	phroa: It's very hard to fit that interpretation -- that it's about the code -- to remarks about someone being too stupid to breastfeed.	21:52
	I mean, I bet redditors would find a way, but	21:52
	← bronson left	21:52
qsuscs	but he should have noticed by now that _people_ feel deeply offended, insulted, hurt, and even if you wanted to say something else, you should notice that it#s probably constantly misunderstood and thus you're communicating it wrong	21:53
	← JanC left	21:53
	→ nadirvardar joined	21:53
	→ bronson joined	21:53
phroa	I don't subscribe to LKMLs so I really can't judge his behaviour but I find the difference to be quite funny :P	21:54
	→ Ragnor joined	21:54
phroa	*difference in how people say he acts	21:54
	← bronson left	21:54
	← cbonobo left	21:55
	→ edlo joined	21:55
	→ bronson joined	21:55
	← edlo left	21:55
	← s00pcan left	21:55
	→ fiuyi joined	21:56
	← fiuyi left	21:56
	→ ciampix joined	21:56
	← bronson left	21:57
	← macabre left	21:57
	→ bronson joined	21:57
	→ ygeLN joined	21:58
	← LordLeBrand left	21:58
	← bronson left	21:58
	→ rockstar_ joined	21:59
	→ rockstar__ joined	21:59
	→ bronson joined	21:59
	← CKyle left	21:59
	← victortyau left	22:00
	← bronson left	22:00
Motoko	I agree with what qsuscs said.	22:00
	→ Iemt joined	22:00
	← Iemt left	22:00
Motoko	If you think you're saying the _code_ sucks, but everyone is thinking you're saying the _person_ sucks, maybe you're being unclear.	22:01
	→ bronson joined	22:01
	← bronson left	22:02
qsuscs	unclear, lol.	22:02
Motoko	I'm trying to be nice.	22:02
	→ bronson joined	22:03
	→ diegoksp joined	22:03
	← Spacew00t left	22:04
	← bronson left	22:04
	→ frulr joined	22:04
	← MarkyC left	22:04
	← chitopunk left	22:04
	→ Sasazuka joined	22:04
	← frulr left	22:05
	→ bronson joined	22:05
	← sgambino left	22:05
	→ CBX joined	22:05
	→ Corey84 joined	22:06
	→ sgambino joined	22:06
	← bronson left	22:06
	→ MarkyC joined	22:06
	→ brucelee joined	22:06
	→ bronson joined	22:07
	← MarkyC left	22:07
	← Corey84 left	22:07
	→ Zpiim joined	22:07
	→ MarkyC joined	22:07
	← Zpiim left	22:07
	→ JanC joined	22:08
	← bronson left	22:08
	→ sfz joined	22:08
	← sfz left	22:09
	→ bronson joined	22:09
	→ Corey84 joined	22:09
	← CBX left	22:09
	← bronson left	22:10
	→ vwaw joined	22:10
	← d2dchat left	22:10
	← vwaw left	22:10
	← gutocarvalho left	22:10
	→ AaronMT joined	22:10
	← a-l-e left	22:10
	← sgambino left	22:10
	← Guest19103 left	22:10
	→ bronson joined	22:11
	→ flaguy48 joined	22:11
	→ mikecmpbll joined	22:11
	→ Rene joined	22:11
	← mizu_no_oto left	22:11
	← bronson left	22:12
	→ sarrri joined	22:12
	← sarrri left	22:12
	→ sarrri joined	22:12
	← kadoban left	22:12
	→ bronson joined	22:12
	→ Ampt joined	22:12
	← Ampt left	22:13
	← bb010g left	22:13
	→ dgutierrez1287 joined	22:13
	← bronson left	22:14
	→ ymg joined	22:14
	← ymg left	22:14
	← MarkyC left	22:14
	→ bronson joined	22:14
	← luksaur left	22:14
	→ Kvix joined	22:15
	← Kvix left	22:15
	← bronson left	22:15
	→ bronson joined	22:16
	← bronson left	22:17
	← dgutierrez1287 left	22:18
	→ xifi joined	22:18
	← xifi left	22:18
	→ nnyk_ joined	22:18
	← m8 left	22:18
	→ bronson joined	22:18
	→ Yut joined	22:19
	← Yut left	22:19
	← bronson left	22:19
	→ MistahKurtz joined	22:19
	← Rene left	22:19
	→ arez joined	22:20
	→ bronson joined	22:20
	← tristanp left	22:21
	→ hfp joined	22:21
	← bronson left	22:21
	→ bronson joined	22:22
	← TomyLobo left	22:22
	← bronson left	22:23
	→ tristanp joined	22:23
multi_io	on git push, does the target repo automatically verify all new incoming SHA1s?	22:23
	→ bronson joined	22:24
	→ elv joined	22:24
	← bronson left	22:25
	→ mehola joined	22:25
	→ bronson joined	22:26
	← bronson left	22:27
	→ bronson joined	22:28
	← abacuspowers left	22:28
	→ atmosx joined	22:28
atmosx	hello	22:28
phroa	!hi atmosx.	22:28
gitinfo	[!welcome] Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.	22:28
	← bronson left	22:29
	← dserodio left	22:29
	← elv left	22:29
	← elux left	22:29
	→ bronson joined	22:29
	← Corey84 left	22:29
atmosx	I'm using BitBucket. On BB I can browse a file's history and see how the file was before any number of commits.	22:30
	Is there a GUI tool that could do that localy for me?	22:30
	→ ckinniburgh_ joined	22:30
Motoko	git log, git diff.	22:30
	← mehola left	22:30
	← X67r left	22:30
atmosx	I tried SourceTree but doesn't show files apparently.	22:30
Motoko	Or any one of the many git GUIs.	22:30
	← bronson left	22:31
atmosx	Which one?	22:31
	← Bootinbull left	22:31
	→ bronson joined	22:31
phroa	sourcetree absolutely shows files...	22:31
	→ elv joined	22:31
	→ gaii joined	22:32
	← gaii left	22:32
phroa	are you in the "history" tab? it should show a graph and a list of changes at the bottom, with diffs on the right	22:32
	if you want to show the file at any point right click its name in the list and use "open selected version"	22:32
	← bronson left	22:32
	→ Nukj joined	22:33
	← ril left	22:33
hfp	Hi, I'm using this: http://stackoverflow.com/questions/7291186/git-warn-before-committing-if-string-appears-in-source-or-diff to setup a pre-commit hook that will check for a string and block the commit if it is present. I have two questions: is it possible to add the file name and line numbers for the offending matches when it blocks a commit? How?	22:33
	← Nukj left	22:33
	→ mikeBr joined	22:33
	← ckinniburgh left	22:33
	→ bronson joined	22:33
	← Clmx383 left	22:34
phroa	hfp: just capture the grep output	22:34
	→ Geisted_ joined	22:34
	← tristanp left	22:34
	→ Ugv joined	22:34
	← Ugv left	22:34
	← bronson left	22:35
	→ tristanp joined	22:35
	← ckinniburgh_ left	22:35
	→ bronson joined	22:35
	→ aizrh joined	22:35
	← aizrh left	22:35
	← Nizumzen left	22:35
	← blimpse left	22:36
	← maletor left	22:36
	← bronson left	22:36
	← guampa left	22:37
	← elv left	22:37
	→ bronson joined	22:37
	← hahuang65 left	22:38
	← bronson left	22:38
	→ zgaw joined	22:38
	← zgaw left	22:38
	→ bronson joined	22:39
	← tristanp left	22:39
	← bronson left	22:40
	→ bronson joined	22:41
	← bronson left	22:42
	← tempname11 left	22:42
qsuscs	atmosx: gitk -- $file	22:42
	→ bronson joined	22:43
	← Gama11_ left	22:43
	→ maletor joined	22:43
	← bronson left	22:44
	→ bronson joined	22:45
	← knownasilya left	22:45
	← bronson left	22:46
	→ bronson joined	22:47
	← Danjo1 left	22:47
	← Sasazuka left	22:47
	→ elv joined	22:47
	← bronson left	22:48
hfp	phroa: Well I tried entering the command at the prompt but `git-diff-index` is an unknown command for my terminal. What gives?	22:48
	→ trang joined	22:48
	→ bronson joined	22:48
phroa	hfp: honestly I haven't the foggiest. man git diff-index	22:49
gitinfo	hfp: the git-diff-index manpage is available at http://jk.gs/git-diff-index.html	22:49
phroa	well, it exists	22:49
	so I think that's your issue =)	22:49
	update your git, maybe?	22:49
	← bronson left	22:50
phroa	what's the version you're on	22:50
	← SubZeroFX left	22:50
	→ bronson joined	22:50
qsuscs	hfp: try git diff-index instead of git-diff-index	22:51
	→ Gfxh joined	22:51
hfp	phroa: 2.5.0	22:51
	← Gfxh left	22:51
phroa	well, I'm out of ideas	22:51
qsuscs	the commands used to be in /usr/bin, but nowadays git-* is hidden in /usr/libexec/git-core or so, and called from /usr/bin/git	22:51
hfp	qsuscs: The hook works as is, using `git-diff-index` but the command line doesn't know it. `git diff-index` doesn't register either	22:51
phroa	tbh after looking in to it, diff-index seems like it would be quite an essential command. versions may not be your issue :P	22:51
	→ dopie joined	22:51
	← bronson left	22:52
qsuscs	hfp: what does "git diff-index" print?	22:52
osse	!list	22:52
gitinfo	[!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	22:52
hfp	qsuscs: my bad, I mistyped. git diff-index works, it prints the usage for it	22:52
qsuscs	see.	22:52
	← war_pigs left	22:52
	→ bronson joined	22:52
	→ war_pigs joined	22:53
	← bronson left	22:53
	← Dorf left	22:53
hfp	It doesn't look like diff-index has an option to show line numbers. too bad	22:54
	→ bronson joined	22:54
phroa	grep does	22:54
	← ehmatthes left	22:55
hfp	right, but grep will count the lines based on the diff which is part of the original file so the line count might be off compared to the actual line count in the source file, no?	22:55
	← bronson left	22:55
	← trang left	22:55
	→ beco joined	22:56
	→ bronson joined	22:56
	← brucelee left	22:56
phroa	mhm	22:57
	← bronson left	22:57
	→ Zadruga joined	22:58
	→ bronson joined	22:58
	→ trang joined	22:58
	← bronson left	22:59
	→ Matrixiumn joined	22:59
	→ bronson joined	23:00
	→ ril joined	23:01
	→ MZAWeb joined	23:01
	→ dfkv joined	23:01
	← bronson left	23:01
	← dfkv left	23:01
	→ bronson joined	23:02
	← yqt left	23:02
	← bronson left	23:03
	→ bronson joined	23:04
	← bronson left	23:05
	→ gkrkz joined	23:05
	← gkrkz left	23:05
	← akiva left	23:05
	← rubie left	23:05
	→ bronson joined	23:05
	→ ahp joined	23:06
	← ahp left	23:06
	← SimonNa left	23:06
	← bronson left	23:07
	← _Atom_ left	23:07
	→ Dorf joined	23:07
	→ bronson joined	23:07
	← bronson left	23:09
	→ gutoccarvalho joined	23:09
	→ bronson joined	23:09
	→ uwgg joined	23:10
	← hexagoxel left	23:10
	← uwgg left	23:10
	→ hexagoxel_ joined	23:10
	hexagoxel_ → hexagoxel	23:10
	← bronson left	23:10
	← sssilver left	23:11
	→ bronson joined	23:11
	→ wsdek joined	23:12
	← wsdek left	23:12
	← elv left	23:12
	← Es0teric left	23:12
	→ MattMaker joined	23:12
	← bronson left	23:12
	→ bronson joined	23:13
	← arez left	23:14
	← beco left	23:14
	← bronson left	23:14
	→ ueel joined	23:15
	← ueel left	23:15
	→ bronson joined	23:15
sjohnson	hey dudes. has anyone ever noticed how --ignore-space-at-eol doesn't have a "sol" / start of line counterpart?	23:15
	for git diff. many people suggest to use -b or -w, but they don't behave 100% exactly as one would expect if the --sol idea was implemented.	23:16
	← bronson left	23:16
	→ bronson joined	23:17
	→ tristanp joined	23:17
	← {0xc6} left	23:18
	← PeterBooker left	23:18
	← bronson left	23:18
	← MistahKurtz left	23:18
	← gbit86 left	23:18
	→ bronson joined	23:19
	→ idue joined	23:19
	← idue left	23:19
	← bronson left	23:20
	← MZAWeb left	23:20
	→ fedexo joined	23:20
	→ bronson joined	23:21
	→ elv joined	23:21
	← bronson left	23:22
	→ Ynoi joined	23:22
	← Ynoi left	23:22
	→ bronson joined	23:22
	← bronson left	23:24
	→ bronson joined	23:24
cbreak	the space at end of line thing is for crappy CRLF	23:25
	← bronson left	23:25
	→ bronson joined	23:26
	← elv left	23:26
	→ MZAWeb joined	23:26
	→ nnyk joined	23:26
	← nnyk_ left	23:27
	← bronson left	23:27
	← crazyagile left	23:28
	→ bronson joined	23:28
	← bronson left	23:29
	→ kqa joined	23:29
	← kqa left	23:29
	→ bronson joined	23:30
	← happy-dude left	23:31
	← bronson left	23:31
	→ bronson joined	23:32
	← ShapeShifter499 left	23:32
	← bronson left	23:33
	→ bronson joined	23:34
sjohnson	cbreak: i don't think it's only for that though.	23:34
	you can have trailing whitespace that some people aren't that sensitive about.	23:34
	aside from CRLF.	23:34
	→ toothrot joined	23:35
	→ rubie joined	23:35
	← bronson left	23:35
	← gutoccarvalho left	23:35
	→ bronson joined	23:36
	← trang left	23:36
	← bronson left	23:37
	→ devoldmx joined	23:37
	← greymeister left	23:37
	← C1V0 left	23:37
	→ bronson joined	23:37
	→ gutocarvalho joined	23:38
	← bronson left	23:39
	← basiclaser left	23:39
	→ Duiho joined	23:39
	→ bronson joined	23:39
	← Duiho left	23:39
	← bronson left	23:41
	→ bronson joined	23:41
	← devoldmx left	23:42
	→ trang joined	23:42
	← bronson left	23:42
	→ bronson joined	23:43
	← bronson left	23:44
	→ bronson joined	23:45
	← bronson left	23:46
	← tristanp left	23:47
	→ bronson joined	23:47
	→ tristanp joined	23:47
	← bronson left	23:48
	→ bronson joined	23:49
	← terminal_echo left	23:49
diegoviola	qsuscs: when you said "1322 people wrote git" where did you get that number btw?	23:49
qsuscs	diegoviola: git shortlog -s	23:49
	\|wc -l	23:50
	→ Qio joined	23:50
	← Qio left	23:50
	← bronson left	23:50
qsuscs	one patch by me	23:50
diegoviola	qsuscs: ok ty	23:50
	→ bronson joined	23:51
diegoviola	was just curious, thanks	23:51
	← Meow-J left	23:51
diegoviola	sorry to all the people who contributed to git for saying "Linus wrote git"	23:51
	← bronson left	23:52
	← tristanp left	23:52
	→ bronson joined	23:53
	← bronson left	23:54
	→ bronson joined	23:54
	← Dorf left	23:55
	← gutocarvalho left	23:55
	← bronson left	23:56
	→ bronson joined	23:56
	← ril left	23:57
	→ Danjo1 joined	23:58
	← bronson left	23:58
	→ bronson joined	23:58
	← fstd left	23:59
	← dreiss left	23:59
	→ fstd joined	23:59
	← bronson left	23:59

Logs Search ←Prev date Next date→

Channels Documentation