IRCloggy #git 2013-12-03

Provider of IRC logs since 2005.

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

	2013-12-03
	→ Kayra joined	00:01
	→ SocalNick joined	00:04
	← richwestcoast left	00:04
	← Kayra left	00:05
	← dort left	00:07
	← calamari left	00:08
	← jkremser left	00:09
BlaDe^	so our flow is typically to work in a dev branch and merge into master	00:09
	we never rebase in this direction, and now a developer just merged master into devel and it's ruined the history tree: http://i.imgur.com/9UJvhEP.png	00:09
	← hochmeister left	00:09
BlaDe^	is tehre a way to fix this or should I just revert it and have him cherrypick the hotfixes in?	00:10
	← rlubke left	00:10
	→ atomx joined	00:11
	→ Imagineer joined	00:11
	← primitive left	00:12
	← hyperair left	00:13
	→ threesome joined	00:13
	→ PaulCapestany joined	00:14
	← masak left	00:15
	→ masak joined	00:15
	← aspiers left	00:16
BlaDe^	revert doesn't fix it (duh)	00:17
	← pbrobst left	00:19
	→ pbrobst joined	00:19
	← snql\|badinternet left	00:19
	→ woollyams joined	00:20
	← tjbiddle left	00:22
	→ jkremser joined	00:22
	← jkremser left	00:22
	→ jkremser joined	00:22
	→ Orbitrix joined	00:22
	← Orbitrix left	00:22
	→ Orbitrix joined	00:23
	← freestyl3r left	00:23
	→ aspiers joined	00:24
fahadash	How do I undo my local changes for only one file ?	00:25
jrnieder	fahadash: git checkout HEAD -- <file>	00:25
fahadash	checkout or reset ?	00:25
jrnieder	fahadash: I assume you want to overwrite the file in your working directory, right?	00:25
	fahadash: then checkout	00:25
fahadash	yes	00:25
	It worked. Thanks	00:26
	← VictorCL left	00:26
jrnieder	sure thing	00:27
	→ mitz joined	00:27
	← Error_998 left	00:28
	← threesome left	00:29
	← Zarthus left	00:29
	← boombatower left	00:31
	→ nwertman joined	00:31
	→ petey joined	00:32
	← treaki_ left	00:32
	→ Kayra joined	00:32
	→ JohnRobert joined	00:32
	→ eletuchy joined	00:32
	← pbrobst left	00:34
	→ pbrobst joined	00:34
	← pbrobst left	00:35
	→ dyng joined	00:35
	← Cassiel left	00:36
	← JohnRobert left	00:37
	→ nephyrin joined	00:38
	→ RaceCondition joined	00:38
	→ DolphinDream joined	00:39
	→ zumba_addict joined	00:40
	← gordian left	00:41
	→ marhaban1 joined	00:41
	→ Starcraftmazter joined	00:42
Starcraftmazter	hi i keep getting this error	00:42
	error: bad index file sha1 signature	00:42
	fatal: index file corrupt	00:42
	fatal: git status --porcelain failed	00:42
	← RaceCondition left	00:42
	← teran left	00:42
	← marhaban left	00:42
	→ pbrobst joined	00:43
Starcraftmazter	i tried this stuff http://holarails.wordpress.com/2013/07/02/git-error-bad-index-file-sha1-signature-fatal-index-file-corrupt/	00:43
	but it didnt resolve the error	00:44
	→ RaceCondition joined	00:44
	← rafaqueque left	00:44
jrnieder	Starcraftmazter: what does "ls -l .git/index" say?	00:45
	← pbrobst left	00:45
	→ hochmeister joined	00:45
	gitinfo set mode: +v	00:45
hochmeister	what is the best way to remove a file from my local branch and the same branch on a remote? I have a binary file that was added two commits ago and pushed to a remote. I'd like to remove the file from my local repo and the remote one.	00:45
jrnieder	hochmeister: remove = avoid wasting disk space on?	00:45
	hochmeister: or just not have it show up in the checkout?	00:46
	← valgrind left	00:46
Starcraftmazter	jrnieder: -rw-r--r-- 1 stgcontainaway stgcontainaway 263104 Dec 3 11:45 .git/index	00:46
		00:46
jrnieder	Starcraftmazter: ok, that's good	00:46
	Starcraftmazter: I was worried that it might be a zero-length file	00:46
hochmeister	jrnieder: the first I guess. I'm less concerned with others seeing my "error".	00:46
	→ treaki_ joined	00:47
	→ tjbiddle joined	00:47
jrnieder	Starcraftmazter: which was irrational of me now that I think a little more	00:47
hochmeister	I found this http://stackoverflow.com/a/1186549 but I'm not sure if that's the best approach.	00:47
jrnieder	Starcraftmazter: anyway, my advice is to run "git reset"	00:47
	← Kayra left	00:47
jrnieder	Starcraftmazter: it will forget what changes you had staged for the next commit	00:47
Starcraftmazter	jrnieder: yeh still	00:47
	still happens	00:47
jrnieder	Starcraftmazter: but that's kind of unavoidable since the index file is corrupt	00:47
Starcraftmazter	ive ran git reset like 10 times now	00:48
jrnieder	Starcraftmazter: mm	00:48
	Starcraftmazter: is this repo something you can share?	00:48
Starcraftmazter	not really	00:48
	← RaceCondition left	00:48
jrnieder	Starcraftmazter: drat. "rm .git/index" and then "git reset"?	00:49
	Starcraftmazter: if that produces the same result, then the corruption is probably deeper :/	00:49
	Starcraftmazter: if on the other hand it works, it's a sign of something that could be improved in git	00:49
	Starcraftmazter: oh, an !backup	00:50
gitinfo	Starcraftmazter: Worried about your data while trying out stuff in your repo? To back up commit history on all branches/tags: `git clone --mirror`. To backup everything, including work tree and staging area: `tar cf repo-backup.tar repodir`. Or do your experiment in a throwaway clone instead. See also http://sethrobertson.github.com/GitBestPractices/#backups	00:50
jrnieder	*and	00:50
	that automated response is less helpful than I would like. I meant that "cp -a" or tar is a good thing to do before experimenting, especially with a corrupt repo	00:51
	since once you've found a possible cause, having a backup means it's possible to check whether the guess was right	00:51
	→ codeman joined	00:51
hochmeister	jrnieder: would it be better to just remove the file, commit, then push? Or to use git ammend/rebase? Consider, there is a pull request pending...	00:52
jrnieder	hochmeister: depends on the nature of the project and your relationship to it :)	00:53
	hochmeister: if no one else is building on this branch, then the rebase/amend method is good	00:53
	hochmeister: if other people are building on top of your work, then they would be disrupted: see 'Recovering from upstream rebase' in man git-rebase	00:53
gitinfo	hochmeister: the git-rebase manpage is available at http://jk.gs/git-rebase.html	00:53
	← endiruna left	00:53
Starcraftmazter	jrnieder: ive just commited that data to git actually	00:54
	like a new import	00:54
	all i did since them is git rm .htaccess.backup	00:54
	→ hyperair joined	00:54
	← decotii left	00:54
	← Noldorin left	00:55
hochmeister	jrnieder: it's a puppet module for a java project, the file in question is a jar. Others will be building upon this branch once the pull request is approved and merged into master.	00:55
jrnieder	hochmeister: then yeah, I'd rebase	00:55
	→ iamjarvo joined	00:55
jrnieder	hochmeister: since no one is building on it yet	00:56
	Starcraftmazter: weird?	00:56
	Starcraftmazter: if you can reproduce it with an artificial repo that you can share, I'd be interested	00:56
	← iamjarvo left	00:56
jrnieder	Starcraftmazter: did you try the "rm .git/index && git reset" thing?	00:57
hochmeister	jrnieder: ok. How would I propagate that rebasing to the remote branch?	00:57
jrnieder	hochmeister: 'git push origin +<branchname>'	00:58
	hochmeister: the "+" means "yes, I mean it"	00:58
	hochmeister: you can try without the "+" first if you want	00:58
hochmeister	ahh ok. Thanks jrnieder	00:58
jrnieder	sure thing	00:58
	← harish left	00:59
Geo	ok, I've gotten rebase to 'start' working, but it gave me an error that said 'could not apply XXXXX' ...	01:01
	what is my next step on that? Does that imply there is a conflict?	01:01
imachuchu	Geo: what's the whole output, does it say that there was a conflict?	01:01
Geo	no	01:01
	← l0cust left	01:02
Geo	hang on	01:02
	ah, didnt read up	01:02
	ok, it holds my hand on this :)	01:02
	thanks	01:03
imachuchu	Geo: np ;)	01:04
	← akiva left	01:08
	→ marlboromoo joined	01:08
	← SocalNick left	01:09
	← MetalMatze left	01:10
	→ michael_lee joined	01:10
	→ SocalNick joined	01:10
	→ Noldorin joined	01:11
	← maqr left	01:11
	← nwertman left	01:12
	← bwreilly left	01:13
	← AaronMT left	01:13
Starcraftmazter	jrnieder: like 100 times	01:14
	i just checked out the repo clean	01:14
	→ Dougie187 joined	01:14
Starcraftmazter	destroyed entire directory for it	01:14
	← kirin` left	01:14
	← CheckDavid left	01:18
	← atomx left	01:18
jrnieder	Starcraftmazter: 100 times is not interesting	01:18
	Starcraftmazter: one time is interesting	01:18
	→ weiyang joined	01:18
	→ kirin` joined	01:19
jrnieder	Starcraftmazter: a way to make people happy when they give suggestions on IRC is to make a pastebin with what happened when you tried the suggestion	01:19
	Starcraftmazter: oh well	01:19
	→ jaseem joined	01:19
	→ ezio joined	01:19
	→ dhruvasagar joined	01:20
Starcraftmazter	jrnieder: the very first thing i did when describing the issue, is link to a page saying the same thing you suggested, and said ive done that	01:21
	anyway, i gotta go to lunch	01:21
	← jaseem left	01:22
	← michael_lee left	01:22
	→ root_empire joined	01:23
	→ jaseemabid_ joined	01:24
	← root_empire left	01:24
	→ erichynds joined	01:25
	← Gamecubic left	01:25
	→ root_empire joined	01:28
	← sohail left	01:29
	← hochmeister left	01:29
	← root_empire left	01:29
	← kermit left	01:29
	← varlog left	01:29
	→ esto joined	01:30
	→ varlog joined	01:30
	→ kermit joined	01:32
	← imachuchu left	01:32
	← trusktr left	01:34
	← redrocket left	01:35
	→ mizu_no_oto joined	01:35
	→ FortySix2 joined	01:37
	← joshbetz left	01:37
	← delasteve left	01:37
	→ delasteve joined	01:38
	→ johndundu joined	01:38
	← nnyk left	01:41
	← dhruvasagar left	01:41
	← FortySix2 left	01:42
	← tjbiddle left	01:42
	← johndundu left	01:43
	→ teran joined	01:43
	← Sylario left	01:43
	← skorgon left	01:43
	→ Pyrogerg joined	01:44
	← zumba_addict left	01:46
	← petey left	01:46
	→ r00tWearsRedHats joined	01:46
	→ petey joined	01:46
Geo	and now the common, horrible, dumb sounding question... whats the best way to detect conflicts? "Automatic cherry-pick failed. After resolving the conflicts,..."	01:48
	→ l0cust joined	01:49
	→ root_empire joined	01:49
	→ tatka_1094 joined	01:49
	← teran left	01:49
	← dsdeiz left	01:50
	← root_empire left	01:51
	← petey left	01:51
tatka_1094	can someone look at my terminal history and help me figure out what is going on? Basically, I git status which returned clean HEAD, but then did a git pull origin master and am now ahead of the master repo by 41 commits. I definitely am not ahead.	01:52
	← marhaban1 left	01:52
	← erichynds left	01:53
tatka_1094	Here is a gist listing my history https://gist.github.com/anonymous/7762608	01:53
	← varlog left	01:53
	← joaoh82 left	01:53
	→ joaoh82 joined	01:54
	→ varlog joined	01:54
	→ root_empire joined	01:54
	← raonyguimaraes left	01:55
	→ Watabou joined	01:55
	← ErKa left	01:57
	→ Kayra joined	01:58
	← Pyrogerg left	01:58
	→ Dougie2187 joined	01:59
	→ tjbiddle joined	01:59
	← angelsl left	02:01
	← varlog left	02:02
	← PaulCapestany left	02:03
	← Kayra left	02:03
	→ luc_ joined	02:04
	← joaoh82 left	02:05
	→ dsdeiz joined	02:05
	→ joaoh82 joined	02:05
	→ saorge_ joined	02:06
	← jayrobot left	02:06
	← root_empire left	02:06
	→ michael_lee joined	02:06
	→ harish joined	02:07
	→ yuwang joined	02:08
	← ianmcorvidae left	02:09
	→ zumba_addict joined	02:09
	← saorge left	02:09
	← michael_lee left	02:10
	→ ianmcorvidae joined	02:11
tatka_1094	I "git reset --hard master@{1}" and then did a "git pull" whereas before I did "git pull origin master" which said something about Fetch_Head. I think I fixed my own issue.	02:11
	← psyl0n left	02:12
	→ michael_lee joined	02:13
	→ therealGent joined	02:13
	→ apipkin_ joined	02:13
	← gnoel left	02:14
	→ pbrobst joined	02:14
	← michael_lee left	02:15
	← apipkin_ left	02:15
	→ PaulCapestany joined	02:16
	→ dharrigan joined	02:17
	← codeman left	02:17
	← tjbiddle left	02:18
	→ michael_lee joined	02:18
	→ CKyle joined	02:19
	→ Matt_R joined	02:20
	← michael_lee left	02:20
	← yhager_ left	02:21
	→ yhager joined	02:23
	→ Goplat joined	02:23
	→ teran joined	02:23
	← AWinterman left	02:24
	← matanya left	02:26
	→ michael_lee joined	02:27
	→ Gamecubic joined	02:30
	← hwrd\|work left	02:30
	← arosenberg left	02:31
	← Mars__ left	02:33
	→ Mars__ joined	02:33
	→ undecim joined	02:33
	← WaReZ left	02:34
	← Matt_R left	02:35
	← ojacobson left	02:35
	← dyng left	02:36
	→ dyng joined	02:36
	← PeterBooker left	02:37
	→ skorgon joined	02:37
	← Mars__ left	02:38
	→ Vampire0 joined	02:38
	← SocalNick left	02:39
	← michael_lee left	02:39
	→ JohnRobert joined	02:40
	← Vampire0_ left	02:41
	→ michael_lee joined	02:42
	← Georg3 left	02:42
	← hahuang61 left	02:45
	← JohnRobert left	02:46
	← BiggFREE left	02:46
	→ ewnd9 joined	02:48
	→ john2x_ joined	02:49
	← carbon2 left	02:50
	← john2x left	02:50
	→ dhruvasagar joined	02:50
	← tatka_1094 left	02:50
	→ nnyk_ joined	02:50
	← liamkeily left	02:51
	→ h0bbit_ joined	02:54
	← jkremser left	02:54
	← john2x_ left	02:54
	← pbrobst left	02:56
	→ daito joined	02:57
	← mitz left	02:57
	← ewnd9 left	02:58
Geo	my file has lots of >>>>>>>HEAD notations in it, along with commit numbers... I assume this is from a conflict- how do I pick the 'version' of the file I want?	02:58
	→ mitz joined	02:58
Hello71	use the edit commands.	02:58
	→ sgambino joined	02:58
	→ zophy joined	02:58
	← alvaro_o left	03:00
imMute	Geo: edit the file to how you want it to look, the >>>>>, <<<<<<, and ===== delineate different parents	03:00
	← cjsarette left	03:00
imMute	sometimes you pick one or the other, sometimes you have to use a little from both - it all depends on what is being merged.	03:00
	→ cjsarette joined	03:01
	← coldie left	03:01
	← Noldorin left	03:01
	← mitz left	03:01
	→ silviof1 joined	03:02
	→ mitz joined	03:02
	← geomyidae_ left	03:03
	← silviof left	03:03
	→ maslowbeer_ joined	03:04
	← cenuij left	03:05
	← bdav\|away left	03:05
	← danmackay left	03:05
	← acharlieh left	03:06
	→ danmackay joined	03:06
Geo	ok	03:07
	there's no command to select everything from one parent?	03:07
	→ bdav\|away joined	03:08
	← mitz left	03:10
	→ geomyidae joined	03:10
	→ tatka_1094 joined	03:12
	← tatka_1094 left	03:13
	→ hwrd\|work joined	03:15
Hello71	man git-mergetool	03:15
gitinfo	the git-mergetool manpage is available at http://jk.gs/git-mergetool.html	03:15
	→ mdhopkins joined	03:15
	← mdhopkins left	03:16
Geo	I don't see an answer to my question in that	03:16
	am I missing something?	03:16
	← maslowbeer_ left	03:17
	← l0cust left	03:17
	← mmcdaris left	03:17
	← h0bbit_ left	03:17
	→ jkremser joined	03:20
	← jkremser left	03:20
	→ jkremser joined	03:20
	→ el3ctron4 joined	03:20
	← el3ctron2 left	03:21
	← el3ctron left	03:21
	→ el3ctron joined	03:22
	← undecim left	03:24
	→ hobodave joined	03:24
	→ pbrobst joined	03:25
	← PaulCapestany left	03:25
	← el3ctron4 left	03:27
	← groglogic left	03:27
	← el3ctron left	03:27
	→ sohail joined	03:28
	← sohail left	03:28
	→ sohail joined	03:28
	← dkpi left	03:28
	← dhruvasagar left	03:28
	→ matanya joined	03:28
	← dyng left	03:29
	→ dhruvasagar joined	03:30
	→ maslowbeer_ joined	03:30
	→ el3ctron joined	03:31
	← mizu_no_oto left	03:35
	← skorgon left	03:35
	← dsdeiz left	03:35
	→ skorgon joined	03:36
	→ gnoel joined	03:36
	→ gnoel_ joined	03:36
	→ roscius joined	03:37
	← cjsarette left	03:37
	← mdiers left	03:37
	→ mdiers joined	03:38
	→ tatka_1094 joined	03:39
milki	hm, theres no git native way to "mark" a tag as 'bad"	03:40
	← tatka_1094 left	03:40
	← michael_lee left	03:41
	← pr0ton left	03:41
	← Droolio left	03:41
	→ rurufufuss joined	03:42
	→ Mars__ joined	03:44
	← jhulten left	03:45
	← CKyle left	03:47
	← nnyk_ left	03:48
	→ Mars___ joined	03:48
	← Mars__ left	03:48
mattcen	milki: Delete it?	03:49
	Or use a heavyweight tag and put that in the description; or just put it in the name	03:49
milki	tags arent supposed to be modified	03:50
	!	03:50
	→ ochoZero9 joined	03:50
	→ petey joined	03:50
	→ tmcmahon joined	03:52
	→ johnkevi_ joined	03:53
mattcen	milki: delete it and create a new one	03:53
	→ MrMonkey31 joined	03:53
	← johnkevinmbasco left	03:54
	← pbrobst left	03:59
	→ Pullphinger joined	03:59
milki	thats the same thing as modifying if its published already	03:59
	-.-	03:59
	← ezio left	04:00
	← Wulf left	04:00
	→ ezio joined	04:01
	→ pbrobst joined	04:01
	← hwrd\|work left	04:02
	→ Wulf joined	04:02
	← marlboromoo left	04:04
	→ john2x joined	04:04
	→ PaddyPatPat joined	04:04
	→ hahuang61 joined	04:05
	← dhruvasagar left	04:05
	→ tatka_1094 joined	04:06
	← tatka_1094 left	04:07
	← kukks left	04:07
	→ Kabaka joined	04:08
	← Dougie2187 left	04:09
	→ sword joined	04:12
	← g0bl1n left	04:12
	← tmcmahon left	04:15
	← pbrobst left	04:16
	← yacks left	04:17
	→ jhulten joined	04:20
	← r00tWearsRedHats left	04:20
	bdav\|away → bdavenport	04:21
	→ yacks joined	04:21
	← Mars___ left	04:23
	← johnkevi_ left	04:24
	→ dyng joined	04:24
	→ jaseemabid joined	04:24
	→ CKyle joined	04:24
	← SleePy left	04:24
	← daito left	04:25
	→ SleePy joined	04:27
	← MrMonkey31 left	04:27
	← CKyle left	04:28
	← Dougie187 left	04:28
	← danmackay left	04:30
	→ danmackay joined	04:31
	→ kukks joined	04:32
	→ tatka_1094 joined	04:33
el3ctron	ey	04:33
	← tatka_1094 left	04:34
	← yhager left	04:36
	← Geo left	04:37
	← dyng left	04:38
	→ katterstrophe joined	04:41
	← therealGent left	04:43
	← sgambino left	04:44
	← katterstrophe left	04:45
	← purpleidea left	04:45
	→ bwreilly joined	04:45
	→ JohnRobert joined	04:47
	→ dyng joined	04:47
	→ purpleidea joined	04:47
	← thiago left	04:48
	← bwreilly left	04:48
	→ asparagui joined	04:48
	← Starcraftmazter left	04:49
	← mdiers left	04:49
	→ jerius joined	04:50
	← Skrypter left	04:50
	→ johnkevinmbasco joined	04:51
	→ liamkeily joined	04:51
	→ preflex_ joined	04:52
	← JohnRobert left	04:52
	← sohail left	04:52
	← preflex left	04:53
	→ mitz joined	04:53
	preflex_ → preflex	04:53
	→ PaulCapestany joined	04:57
	→ CKyle joined	04:58
	← jerius left	04:59
	← donmichelangelo left	05:00
	→ tatka_1094 joined	05:00
	→ donmichelangelo joined	05:00
	← jaseemabid left	05:01
	→ jazz264 joined	05:01
	← kukks left	05:02
	← tatka_1094 left	05:02
	→ Mars__ joined	05:02
	→ jayawant joined	05:02
	← LBV_User left	05:03
	← woollyams left	05:03
	← Soliton left	05:03
	→ Soliton joined	05:04
	← yuwang left	05:07
	← hobodave left	05:09
	← PaulCapestany left	05:10
	→ hahuang65 joined	05:12
	← Sadeukko left	05:13
	→ hwrd\|work joined	05:13
	← matanya left	05:14
	← hahuang61 left	05:14
	← teran left	05:14
	← gnoel_ left	05:15
	← gnoel left	05:15
	← m0viefreak left	05:15
	← diget left	05:17
	→ sabgenton joined	05:17
	→ ewnd9 joined	05:18
	→ JustinMac joined	05:19
	← Mars__ left	05:19
sabgenton	Is there any way I can apply a smudge filter I just made on my history with git filter-branch?	05:19
	→ p3lim joined	05:19
	→ dhruvasagar joined	05:19
	→ Mars__ joined	05:20
p3lim	Is it possible to use submodules to only get a specific directory within the repository?	05:20
milki	p3lim: no	05:20
p3lim	Can I do it with clone?	05:20
milki	p3lim: nope	05:20
	→ Mars___ joined	05:20
p3lim	Gah	05:20
milki	sabgenton: that sounds like somethign that would confuse git when it tries to redo history	05:21
SamB	milki: what makes you think that?	05:21
	← lunarjar left	05:21
	← cjwelborn left	05:21
milki	smudging tends to be things that are only for the working dir rather than something that gets into history	05:22
p3lim	Basically I want to have some libraries within my repo, and I'd prefer them to be referenced to their source	05:22
milki	p3lim: does that _need_ to be in the repo as source when you check something out?	05:22
p3lim	But as with many libraries' repos they are filled with documents and tests and different versions etc	05:22
	→ kerrick joined	05:22
p3lim	Preferably, yes	05:23
milki	preferably why?	05:23
	← nicedice left	05:23
p3lim	Actually, no	05:23
milki	exactly!	05:24
p3lim	Just the reference is what I want	05:24
	← Mars__ left	05:24
	← dhruvasagar left	05:24
p3lim	But on my local dir the source has to be there	05:24
milki	why?	05:24
	→ diget joined	05:24
p3lim	Because I'm actually using it? :p	05:24
	→ Tommy[D] joined	05:24
milki	"using it"? in your _source_ directory?	05:24
	→ dhruvasagar joined	05:25
p3lim	Ok, let me explain it better	05:25
milki	these sound like "dependencies"	05:25
SamB	needz moar Debian?	05:25
milki	you never really _need_ to include actual dependencies in your _source_	05:25
	← Mars___ left	05:25
p3lim	I have a dev environment for a php project, a blog. I have libraries, or as most would call them, dependencies/includes within that project	05:26
milki	it is often the case that you use scripts to build an environment suitable for running/testing outside of your source	05:26
p3lim	Repo only needs to know the reference	05:26
	→ Mars__ joined	05:26
milki	which is what im trying to push you towards	05:26
p3lim	But the actual files has to be there, because I'm using it in my env	05:26
	← jhulten left	05:26
	← Tommy[D]_ left	05:27
p3lim	Probably not for web development, as there is no compiling or something	05:27
milki	that doesnt matter	05:27
	→ tatka_1094 joined	05:27
	→ RaceCondition joined	05:27
milki	compiling is only one way to prepare files	05:27
	just copying them somewhere else is fine	05:28
p3lim	Well I don't build anything	05:28
calmdev	bower + composer configs for php projects; avoid storing the actual "libraries" in the repo. that's what i'd do	05:28
	→ matanya joined	05:28
p3lim	Haven't touched composer or anything like it yet	05:28
	Just haven't had time	05:28
milki	dont ever think your git repo is going to be where you will run your project	05:28
	→ beautifulmind joined	05:29
calmdev	conforms to what milki is suggesting	05:29
	← tatka_1094 left	05:29
p3lim	I know	05:29
	← jrib left	05:29
milki	a simple script could copy your working direction to say, a build dir. and then pull in your dependencies and place them however you like in your build dir	05:29
	→ bandroidx joined	05:30
	→ alezost joined	05:30
	→ daito joined	05:31
	← Mars__ left	05:31
milki	these other tools calmdev mentioned probably give you a framework for this and make it easy	05:31
	milki shrugs	05:31
	← RaceCondition left	05:32
bandroidx	hi, is there a way to include part of a git repo in another git repo? from my research symlinks wont work but neither will submodules since i only want to include part of the other git repo into it	05:32
	→ lunarjar joined	05:32
milki	bandroidx: no, you cant include just a part of a repo	05:32
calmdev	not the build part....grunt tasks are all of that for. I'm suggestion just storing the config files which specify the dependencies (ie, like node's package.json); have your build script trigger the dependency installs.	05:32
	→ thiago joined	05:33
bandroidx	milki: there is no work around?	05:33
milki	bandroidx: not in git native. you would use scripts	05:33
bandroidx	i guess i could turn the part i want into a submodule of the main project its already in and then use that as sub module in the 2nd	05:33
milki	bandroidx: you should ask yourself _why_ you think you need a submodule first	05:34
bandroidx	well isnt this a classic need for a submodule?	05:34
milki	no, the classic case is you need the _entire_ repo	05:34
	→ gnoel joined	05:34
p3lim	calmdev: I'm gonna take a look into it, but why both bower and composer?	05:34
	Wouldn't composer be able to do it alone?	05:35
bandroidx	milki: but it seems the code i need should be in its own repo as its kind of a standalone system that needs reuse in other projects	05:35
	i dont want to maintain the code in 2 different projects	05:35
	→ cjwelborn joined	05:36
	← enape_101 left	05:36
milki	your suggestion - split out the part into a repo and have it be a submodule in both projects - is fine though	05:36
	but you just have submodule include a part of a repo	05:37
	er	05:37
	you cant just*	05:37
	← CKyle left	05:37
	← the_cybersphinx left	05:37
bandroidx	milki: i was looking at this http://stackoverflow.com/questions/12514197/convert-a-git-folder-to-a-submodule-retrospectively	05:37
	→ jayawant_ joined	05:37
milki	ok?	05:38
	← hwrd\|work left	05:38
	← alezost left	05:38
bandroidx	i guess easier would be to move the entire directory tree out of the project, commit the project with it removed, then make the tree i removed into its own new repo and then add that repo as a submodule	05:38
	i am not sure why they dont suggest that in this SO article	05:38
	← jayawant left	05:38
milki	ya, thats fine if you dont need history	05:38
bandroidx	i can live without it	05:39
milki	sounds like a plan then	05:39
bandroidx	cool thanks	05:39
	→ Guest100 joined	05:40
	← lindenle left	05:40
	→ alezost joined	05:40
calmdev	p3lim guess you don't need both. I tend to use bower for JS and composer for PHP.	05:41
	→ Hoksilato joined	05:41
	← jayawant_ left	05:42
	← Guest100 left	05:42
	← L8D left	05:43
	← revyd left	05:44
	→ revyd joined	05:44
	← revyd left	05:45
	→ fairuz joined	05:46
	→ h0bbit_ joined	05:47
	→ nnyk_ joined	05:48
	← Spyro left	05:49
	→ akiva joined	05:49
	→ Spyro joined	05:51
	→ jayawant joined	05:51
	← beautifulmind left	05:52
	← h0rrorvacui left	05:52
	← gnoel left	05:52
	→ Imagineer2 joined	05:53
	← Imagineer left	05:54
	→ tatka_1094 joined	05:55
	→ m0ltar joined	05:55
	← tatka_1094 left	05:56
	← h0rr0rvacui left	05:56
	→ h0rrorvacui joined	05:57
	→ ErKa joined	05:57
	→ chasep_work_ joined	05:57
	← kpreid left	05:59
	→ kpreid joined	05:59
	← chasep_work left	05:59
	chasep_work_ → chasep_work	05:59
	← matanya left	05:59
	→ rjhunter joined	06:01
	← Exdaix left	06:01
	→ hwrd\|work joined	06:03
	→ matanya joined	06:03
	→ revyd joined	06:03
	→ Skrypter joined	06:04
	← hwrd\|work left	06:04
	← ezio left	06:05
	← petey left	06:05
	→ Exdaix joined	06:05
	→ petey joined	06:06
	← rjhunter left	06:06
	→ rjhunter joined	06:07
	← alezost left	06:08
	← petey left	06:10
	← rjhunter left	06:11
bandroidx	milki: everything worked perfectly but now i just commited some changes in the submodule from one of the projects and it let me but when i try to push it, it says everything is up to date. i dont see a solution here though: http://git-scm.com/book/en/git-tools-submodules	06:12
	← mitz left	06:12
	→ mitz joined	06:12
	← nnyk_ left	06:13
milki	bandroidx: !repro, i dont quite underestand what you did	06:13
gitinfo	bandroidx: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	06:13
	→ ezio joined	06:13
	→ beautifulmind joined	06:16
	← roscius left	06:16
bandroidx	milki: https://gist.github.com/bandroidx/7764689	06:18
	i think the problem is i didnt make those changes on the master branch	06:19
	seems i was on (no branch)	06:19
	→ alezost joined	06:20
	← fairuz left	06:20
bandroidx	ive never worked with submodules before so i didnt expect the behavior of not being on the master branch	06:20
	→ tatka_1094 joined	06:22
	← tatka_1094 left	06:23
	→ trusktr joined	06:23
	→ jceb_ joined	06:23
	→ maleknet joined	06:24
	→ JohnRobert joined	06:24
	← jayawant left	06:24
	← asparagui left	06:26
	→ rethus joined	06:26
	→ jargon joined	06:26
bandroidx	milki: ok it was because i was not on a branch, that threw me at first, i checked out master and now its working as expected, thanks much	06:27
	← alezost left	06:27
	← ErKa left	06:29
	← JohnRobert left	06:29
	→ maroloccio joined	06:31
	→ teran joined	06:31
	→ arjun_ joined	06:32
	→ alezost joined	06:32
	→ potatoe joined	06:33
	← Goplat left	06:33
	← ezio left	06:35
	← Gitzilla left	06:35
	→ jhulten joined	06:35
	→ Gitzilla joined	06:35
	→ sr105\|away joined	06:39
	→ arvind_khadri joined	06:40
	← jhulten left	06:41
	→ User458764 joined	06:41
	→ ThomasLocke joined	06:42
Kartagis	back to my problem yesterday	06:43
	← Gamecubic left	06:47
	→ jayawant joined	06:48
	→ Rix joined	06:48
	→ L8D joined	06:48
	← tpollard left	06:48
	→ tatka_1094 joined	06:49
	← Norm_ left	06:50
	← tatka_1094 left	06:50
	→ pantsman joined	06:54
	← revyd left	06:56
	→ saurabh joined	06:57
	saurabh → Guest27032	06:57
	→ revyd joined	06:57
	← arjun_ left	06:58
	← revyd left	06:59
	← User458764 left	06:59
	← alezost left	07:01
	← rethus left	07:01
	→ marthinal joined	07:02
	→ rethus joined	07:02
	→ marlboromoo joined	07:02
	Keridos → Keridos_off	07:03
	→ crocket joined	07:03
	silviof1 → silviof	07:03
crocket	How do I apply a stash, which ignores conflicts?	07:04
	I know what I'm doing, and conflicts annoy me.	07:04
	→ rath joined	07:05
	→ pheaver joined	07:06
	→ stodan joined	07:06
	→ rjhunter joined	07:07
	→ lite_ joined	07:11
	→ arjun_ joined	07:11
	→ soee joined	07:12
	← rjhunter left	07:12
	→ user258467 joined	07:13
	→ cbreak-work joined	07:14
	→ h_kon joined	07:15
	→ yhager joined	07:16
	→ tatka_1094 joined	07:16
	→ hoschi joined	07:16
	← tatka_1094 left	07:17
	← Imagineer2 left	07:19
	→ TomyLobo joined	07:20
	← h0rrorvacui left	07:20
	→ bwreilly joined	07:20
	← thevishy left	07:21
Kartagis	if my origin url is like [email@hidden.address] , how can I make the http clone url similar, i.e. http://git.example.com/project/a.git ? I can currently clone using http://git.example.com/git/project/a.git	07:21
	← pantsman left	07:22
thiago	Kartagis: there's no Git built-in way to do that	07:23
	your question is not related to Git	07:23
	just text and URL processing, making assumptions that are valid to your site only	07:23
	→ zapb joined	07:23
thiago	they cannot be generalised	07:23
Kartagis	thiago: wanna see my git.conf of httpd?	07:24
thiago	Kartagis: no	07:24
SamB	Kartagis: you can get even closer if you use ssh:// URLs though	07:24
Kartagis	SamB: pushing?	07:24
thiago	Kartagis: what are y ou trying to do?	07:25
	→ Raging_Hog joined	07:25
	← jayawant left	07:26
Kartagis	thiago: I want to use similar URLs while pushing and cloning over http	07:26
thiago	Kartagis: ok	07:26
	I can't help you with that	07:26
	I do recommend you push and clone over SSH, though	07:26
	not HTTP	07:26
	→ Bosox20051 joined	07:27
	← Bosox20051 left	07:28
	→ jrib joined	07:28
Kartagis	hrm	07:29
	it's not anonymous then	07:29
thiago	right	07:29
	anonymous pushing is a really bad idea	07:30
	← kerrick left	07:30
	→ Bosox20051 joined	07:30
Kartagis	thiago: I mean anon clone	07:32
thiago	use the git-daemon	07:33
	easier	07:33
	it's simpler to set up and has less overhead	07:33
	← jorj left	07:33
	→ thevishy joined	07:34
	→ GeertV joined	07:34
SamB	thiago: keep in mind that some annoying proxies don't allow that through	07:35
	→ threesome joined	07:35
thiago	I know	07:35
	my position is that IT should fix it	07:35
SamB	or, um, firewalls I mean	07:35
	← kermit left	07:36
thiago	if you have to use Git for work and the service is available on port 9418 only, then IT should provide you with the access you need	07:36
	→ alezost joined	07:38
	→ FortySix2 joined	07:38
	← bwreilly left	07:39
	→ jorj joined	07:39
	→ bwreilly joined	07:39
	← akurilin left	07:40
	→ dsdeiz joined	07:40
	→ reydan joined	07:40
	← daito left	07:40
	← kalleth_ left	07:40
	← FortySix2 left	07:43
	→ tatka_1094 joined	07:43
	← tatka_1094 left	07:44
	→ kerrick joined	07:45
	→ kalleth joined	07:45
	→ Norm_ joined	07:46
	← Norm_ left	07:46
	→ j0ran1 joined	07:48
	→ mf_ joined	07:48
	← crocket left	07:49
	← L8D left	07:50
	← Raging_Hog left	07:50
	→ hwrd\|work joined	07:52
	→ jnavila joined	07:52
	→ nbrosnahan joined	07:53
	← pheaver left	07:54
sabgenton	milki: smuge and clean filters don't seem to have an affect on git filter-branch	07:55
	but I would like them to (for just one shot)	07:55
	← alezost left	07:56
	← TomyLobo left	07:56
	→ alezost joined	07:57
	→ kjellski joined	07:58
	→ Raccoon joined	07:58
Raccoon	how do I download these files?	07:58
	https://android.googlesource.com/platform/packages/inputmethods/LatinIME/+/master/dictionaries/	07:58
	→ daito joined	07:58
Kartagis	right click and save	07:59
	→ Raging_Hog joined	08:00
	→ koda joined	08:01
	← Rix left	08:01
	→ fRAiLtY- joined	08:01
	← yacks left	08:01
	← blahdodo_ left	08:02
	→ blahdodo joined	08:02
dr_lepper	wget -r	08:02
	← bwreilly left	08:03
	← j0ran1 left	08:04
	→ gua_ould joined	08:04
	→ rob_w joined	08:06
	← beautifulmind left	08:07
	→ j0ran1 joined	08:07
	→ eijk joined	08:08
	→ rjhunter joined	08:08
	→ Rix joined	08:08
	← hwrd\|work left	08:09
	→ juril joined	08:10
	→ tatka_1094 joined	08:10
	→ nemesit\|znc joined	08:10
	→ cebor joined	08:11
	← tatka_1094 left	08:11
	← j0ran1 left	08:12
	← rjhunter left	08:13
	← harish left	08:13
	← calmdev left	08:14
	← reydan left	08:14
alexander__b	is there a way to setup send-email to cooperate with thunderbird somehow	08:16
dr_lepper	in what way should it cooperate?	08:16
	← dhruvasagar left	08:17
alexander__b	dr_lepper: making it open the msg compose window would be useful	08:18
	→ dhruvasagar joined	08:18
dr_lepper	no, I don't think so	08:19
	send-email just sends e-mail	08:19
	← joaoh82 left	08:19
alexander__b	dr_lepper: so can it at least use my thunderbird email settings?	08:19
	→ joaoh82 joined	08:19
	← maslowbeer_ left	08:19
alexander__b	for smtp etc	08:19
	← maestrojed left	08:20
dr_lepper	no, you'll have to configure it separately	08:20
	if you want, you can use git-format-patch to create the messages	08:20
alexander__b	ugh	08:20
dr_lepper	and then mail them manually with thunderbird	08:20
alexander__b	dr_lepper: I use that 99% of the time, but someone whined about it on a project	08:20
dr_lepper	well, I personally can't see any reason why you would want to use thunderbird	08:20
	instead of just sending the patches	08:21
	→ alorence joined	08:21
alexander__b	I have a lot of email addresses and stuff, so thunderbird is nice because it deals with everything in a quite pleasant manner.	08:21
	→ Kayra joined	08:21
dr_lepper	if you send mail to a lot of people at the same time often, you should set up a mailing list	08:22
alexander__b	dr_lepper: what?	08:23
	I'm not sure how what you just said relates to anything I have said at all.	08:23
	← thevishy left	08:23
	← ecube left	08:23
dr_lepper	<alexander__b> I have a lot of email addresses <...>	08:24
osse	I wouldn't be surprised if Thunderbird has the possibility of taking a file as a mail end send it. So git format-patch and then right-click on it and "open in thunderbird" or something to that effect	08:24
	→ thierryp joined	08:24
alexander__b	dr_lepper: and this relates to what you suggested how?	08:24
	← arjun_ left	08:24
alexander__b	osse: right click? right clicking in my terminal doesn't do terribly much useful for this. :-P I'll try opening it in thunderbird as a "saved message" though	08:25
dr_lepper	it would be better if you described the problems you are solving with thunderbird	08:25
	I can't see any	08:26
alexander__b	having 5+ email addresses, and using different ones for different projects. I see no way of handling this gracefully in git.	08:26
	← ptmahent left	08:26
	→ echo-area joined	08:26
osse	alexander__b: yeah I just meant opening it in thunderbird. But since you use it I supposed you had a file manager too	08:26
	→ michael_lee joined	08:26
dr_lepper	you can configure each project to use different from address and smtp server	08:26
alexander__b	osse: implying BASH isn't a file manager? ;-)	08:27
	→ arjun_ joined	08:27
jast	it's not. it's a shell. :}	08:27
dr_lepper	alexander__b: implying thunderbird isn't a mail client, I guess :)	08:27
alexander__b	dr_lepper: having to set up the damn servers in the first place is a hassle, compared to just having one application do all email stuff. if I had to set up email in git and darcs and whatnot separately, I'd go mad. it's annoying enough to set it up that one place. and thunderbird even does it 99% automatically.	08:28
	← michael_lee left	08:28
dr_lepper	you can set up msmtp (once)	08:28
	and just specify a 'from' address for each project	08:29
alexander__b	what if I need to use a different smtp per project?	08:29
dr_lepper	msmtp handles that	08:30
osse	anyway, using git-format-patch and then NOT use git-send-email but use thunderbird to send it seems to be reasonable	08:30
	→ j0ran1 joined	08:30
	→ tSvendsen joined	08:30
dr_lepper	alternatively, you could patch thunderbird and have it provide an SMTP-server of its own	08:30
alexander__b	osse: yes. I usually attach it though, and I think that was the main complaint, so they couldn't just download the email itself.	08:30
dr_lepper	or sendmail interface	08:31
	seems reasonable, if you want one application to do _all_ "email stuff"	08:31
	→ sebhoss joined	08:31
	→ JohnRobert joined	08:31
	→ michael_lee joined	08:32
osse	alexander__b: just remember to turn off line wrapping and then sending it as text should work just fine	08:32
alexander__b	ouch forgot about autowrapping	08:32
	← jceb_ left	08:32
osse	man git-format-patch	08:33
gitinfo	the git-format-patch manpage is available at http://jk.gs/git-format-patch.html	08:33
osse	Search for thunderbird	08:33
alexander__b	osse: thanks	08:34
osse	alexander__b: maybe git-imap-send is interesting too	08:34
dr_lepper	oh my	08:34
	← rfree left	08:35
	← j0ran1 left	08:35
osse	oh your	08:35
	← trusktr left	08:35
alexander__b	osse: if I'm reading this manpage correctly, there still exists a way to use vim for writing messages? if so, that will make me very happy. the addon I used for that has been depracated since thunderbird 3 or so, lol	08:36
	→ thevishy joined	08:36
	→ nnyk_ joined	08:36
	← nnyk_ left	08:36
	→ nnyk_ joined	08:36
	MattMake_ → MattMaker	08:36
	→ mlechner joined	08:37
	→ tatka_1094 joined	08:37
	← JohnRobert left	08:37
	→ Plummer joined	08:37
	← TN_Jonesboro left	08:38
	← liamkeily left	08:38
	→ noyb joined	08:38
	← michael_lee left	08:38
	← jazz264 left	08:38
	← tatka_1094 left	08:38
	→ gasbakid joined	08:39
	→ jaseemabid joined	08:39
alexander__b	osse: oh right. the described process relies on thunderbird 1.5 at the newest, lol. might be time to get that out of the manpage.	08:40
	→ mishok13 joined	08:41
	→ denkr joined	08:41
	→ michael_lee joined	08:41
	→ acrocity joined	08:42
	← acrocity left	08:43
	→ rfree joined	08:44
	→ cff joined	08:44
	→ Misan joined	08:45
	→ TomyWork joined	08:47
	→ jceb_ joined	08:48
	→ pmahent joined	08:48
alexander__b	osse: nope. thunderbird is too much of a pita. guess I'll have to set up send-email.	08:48
	→ LimeBlast joined	08:49
dr_lepper	ditch thunderbird	08:49
	→ eletuchy_ joined	08:49
dr_lepper	set up a decent email system	08:50
	→ JohnRobert joined	08:50
alexander__b	too much work tbh. I tried mutt probably ten times at least.	08:50
dr_lepper	well, you can invest in some work to save time later	08:51
	but it's up to you of course	08:51
	← michael_lee left	08:51
alexander__b	thunderbird doesn't cost me any time	08:51
	osse just uses gmail because he's a n00b	08:51
alexander__b	I click "add server", type the addresses, and then it figures out 99% of the stuff automatically.	08:52
dr_lepper	you've been in this channel for 35 minutes now :)	08:52
	it costed you at least that	08:52
	← eletuchy left	08:52
alexander__b	I have not spent 35 minutes on email. furthermore, it's not exactly thunderbirds fault that I need to set up git config	08:52
	← jaseemabid left	08:53
KK4MGV	i've been looking for a decent mail system for some time now	08:53
	i started configuring mutt like two years ago and still don't have it how i want it, so i think it's not the solution for me	08:53
alexander__b	there is none. but thunderbird views and composes email correctly and is quick to set up, so it's good enough.	08:53
KK4MGV	anybody have any suggestions?	08:53
	← johnkevinmbasco left	08:53
moritz	abandom email	08:53
	*abandon	08:53
dr_lepper	KK4MGV: it depends on what you want from it	08:54
	← eletuchy_ left	08:54
	← thierryp left	08:54
	dr_lepper has mutt for composing and reading, getmail for retrieving, and msmtp for sending	08:54
KK4MGV	my requirements are: efficient interface, doesn't crash, and doesn't hog resources	08:54
	→ slassh joined	08:54
	→ michael_lee joined	08:54
	→ thierryp joined	08:54
KK4MGV	and gnupg hooks	08:55
	→ j0ran joined	08:55
dr_lepper	mutt seems to satisfy all of them	08:55
KK4MGV	on paper i agree	08:55
	idk... i just can't seem to get used to it	08:55
	also i've had a ton of issues with it and imap	08:55
	it appears most people must just use something else to fetch the mail and then point mutt to their local mbox or something	08:56
	→ BiggFREE joined	08:57
alexander__b	oh right, if I use git send-email I won't send via my proxy... so I guess I have to figure out how to use a proxy with send-email too.	08:57
	→ konadr joined	08:57
	← karavanjo left	08:57
	→ karavanjo joined	08:57
	→ boombatower joined	08:58
	→ lavong joined	08:58
alexander__b	also apparently something is worng, since Command unknown: 'AUTH' at /usr/libexec/git-core/git-send-email line 1231.	08:58
	← boombatower left	08:59
alexander__b	is "starttls" supported, and is that the correct way to write it?	08:59
	→ tufflax joined	09:00
alexander__b	and I just assume that "git send-email -1 --to=<my email address>" is correct	09:01
	Kamilion → Incorrect	09:02
	Incorrect → Kamilion	09:02
	→ YoungFrog joined	09:02
	← joaoh82 left	09:02
alexander__b	oh... ok, so I need to do "tls" not "starttls"	09:03
	→ joaoh82 joined	09:03
	→ CodeShar_ joined	09:03
	← CodeShark left	09:03
	→ halu joined	09:04
	→ tatka_1094 joined	09:04
alexander__b	«Please set SSL_verify_mode to SSL_VERIFY_PEER together with SSL_ca_file\|SSL_ca_path for verification.» -- ok, but where/how?	09:05
moritz	man git-config	09:06
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	09:06
	← tatka_1094 left	09:06
	← michael_lee left	09:06
	→ Norm_ joined	09:06
moritz	search for ssl	09:06
	← hahuang65 left	09:06
Kartagis	isn't it strange not receiving messages like http://paste.debian.net/69036/ ?	09:06
	→ hahuang65 joined	09:06
alexander__b	oh OK it's just the http.sslverify?	09:06
Kartagis	because I don't for my repos	09:06
	← grep0r left	09:07
	→ michael_lee joined	09:09
	→ CodeShark joined	09:09
	→ rjhunter joined	09:09
	← j0ran left	09:09
	→ j0ran2 joined	09:09
	← CodeShar_ left	09:10
	→ lb1a joined	09:10
	← j0ran2 left	09:11
	→ j0ran joined	09:11
	← j0ran left	09:12
	→ SADPGZR joined	09:12
alexander__b	moritz: I set it now but I still get the error -- do I need to set something else than http.sslVerify and http.sslCAPath?	09:14
moritz	alexander__b: I have no idea.	09:14
	← rjhunter left	09:14
	← lavong left	09:15
	→ dfanjul joined	09:15
	← michael_lee left	09:15
	→ lavong joined	09:16
	← m0ltar left	09:17
	→ beautifulmind joined	09:17
	→ eletuchy joined	09:17
	← Curtisbeef left	09:17
	← dsdeiz left	09:17
	← nilg left	09:18
	← daito left	09:18
	→ michael_lee joined	09:18
	← dhruvasagar left	09:19
	→ m0ltar joined	09:19
	→ kjellski_ joined	09:19
	→ j0ran1 joined	09:19
	→ enape_101 joined	09:19
	→ fairuz1 joined	09:19
	← donmichelangelo left	09:20
	← thiago left	09:20
	→ liamkeily joined	09:20
	← anli__ left	09:20
	→ djh joined	09:21
	← kjellski left	09:21
	kjellski_ → kjellski	09:21
	→ ollo joined	09:22
	← enape_101 left	09:24
	→ j0ran3 joined	09:24
	← j0ran1 left	09:24
	→ dhruvasagar joined	09:25
	→ grep0r joined	09:25
	→ nilg joined	09:25
	→ joel_falcou joined	09:25
	→ robbyoconnor joined	09:26
	← noyb left	09:27
	← michael_lee left	09:28
	→ jooools joined	09:28
	→ abelsiqueira joined	09:30
	→ hvbh83tht987 joined	09:31
	← m0ltar left	09:31
	→ michael_lee joined	09:31
	← Kayra left	09:31
	→ tatka_1094 joined	09:31
	→ blinkdesign joined	09:32
	← tatka_1094 left	09:33
	→ m0ltar joined	09:33
	← Hoksilato left	09:34
	← dyng left	09:34
	→ mdiers joined	09:34
	← hvbh83tht987 left	09:34
	→ Sylario joined	09:36
	← jceb_ left	09:37
	← guest7777 left	09:37
	← fairuz1 left	09:39
	← michael_lee left	09:43
	→ jayawant joined	09:43
	→ fairuz joined	09:43
	→ WaReZ joined	09:44
	→ dsdeiz joined	09:44
	→ atm1 joined	09:44
	← dhruvasagar left	09:45
	gitinfo set mode: +v	09:45
	atm1 → canton7-mac	09:45
	→ dhruvasagar joined	09:45
	← liamkeily left	09:45
	→ michael_lee joined	09:46
	→ psyl0n joined	09:47
	→ daito joined	09:48
	← veebers left	09:49
	→ jceb_ joined	09:52
	→ achadwick joined	09:53
	← Watabou left	09:54
	← joelrobichaud left	09:55
	→ harish joined	09:56
	→ DoniRS joined	09:57
	→ kodab joined	09:57
	← michael_lee left	09:58
	→ kodabb joined	09:58
	→ tatka_1094 joined	09:58
	→ during joined	09:59
	← during left	09:59
	→ during joined	09:59
	during → armin_w	09:59
	→ wrp6 joined	10:00
	← tatka_1094 left	10:00
	← arjun_ left	10:00
	→ raonyguimaraes joined	10:00
	→ jarr0dsz joined	10:01
	→ michael_lee joined	10:01
	→ arjun_ joined	10:01
	← koda left	10:01
	← kodab left	10:02
	← Skrypter left	10:02
	→ marhaban joined	10:03
	→ dyng joined	10:04
	← beautifulmind left	10:04
	→ Skrypter joined	10:04
	← Skrypter left	10:05
	→ beautifulmind joined	10:05
	← mue left	10:06
	← dyng left	10:06
	→ dyng joined	10:06
	→ mue joined	10:07
	→ Skrypter joined	10:07
	→ mklappstuhl joined	10:09
	→ dhilipsiva joined	10:09
	← mdiers left	10:10
	← michael_lee left	10:13
	← MissionCritical left	10:13
	← nilg left	10:13
	← denkr left	10:13
	← arjun_ left	10:13
	→ arjun_ joined	10:14
	→ liamkeily joined	10:14
	→ nilg joined	10:14
	→ Kayra joined	10:14
	→ ChrisAnn joined	10:15
	→ michael_lee joined	10:16
	← LimeBlast left	10:16
	← p3lim left	10:16
	→ snql joined	10:17
	→ rjc joined	10:19
	→ LimeBlast joined	10:20
	← liamkeily left	10:20
	→ ericy joined	10:20
	← dsdeiz left	10:20
	→ Mission-Critical joined	10:22
	← jayawant left	10:23
	→ EgS joined	10:24
	← PaddyPatPat left	10:25
	→ tatka_1094 joined	10:26
	← manithree left	10:26
	→ wrouesnel1 joined	10:27
	← michael_lee left	10:27
	← tatka_1094 left	10:27
	→ rafeca joined	10:29
	→ michael_lee joined	10:30
	← ericy left	10:32
	Mission-Critical → MissionCritical	10:33
	→ liamkeily joined	10:33
	← weiyang left	10:38
	← michael_lee left	10:38
	← liamkeily left	10:38
	← luc_ left	10:40
	→ michael_lee joined	10:41
	← JohnRobert left	10:41
	← michael_lee left	10:41
	← dhruvasagar left	10:41
	→ dhruvasagar joined	10:42
	← h_kon left	10:44
	→ Guest12540 joined	10:44
	→ papegaaij joined	10:44
	→ h_kon joined	10:44
	→ timthelion joined	10:46
	→ cilly joined	10:48
	← yhager left	10:48
	→ pengunix joined	10:48
	← nnyk_ left	10:49
	← hyperair left	10:50
	← cilly left	10:50
	← Raging_Hog left	10:52
	→ tatka_1094 joined	10:53
	← psyl0n left	10:53
	← tatka_1094 left	10:54
	→ reydan joined	10:55
	→ liamkeily joined	10:55
	← JustinMac left	10:55
	← rudi_s left	10:58
	← kerrick left	11:00
	→ rudi_s joined	11:01
	→ FerreusR joined	11:01
	← reydan left	11:04
	→ reydan joined	11:04
	← Skrypter left	11:08
	← sebhoss left	11:08
Kartagis	isn't it strange not receiving messages like http://paste.debian.net/69036/ ?	11:09
	because I don't for my repos	11:09
	→ rjhunter joined	11:12
	← dhruvasagar left	11:13
	→ dhruvasagar joined	11:14
	← Pullphinger left	11:15
	← ochoZero9 left	11:16
canton7	Kartagis, not over dumb http, no. The remote isn't doing anything - you're just fetching whatever happens to be on the remote	11:17
Kartagis	canoon: hrm, I'm on dumb http then	11:17
	← rjhunter left	11:17
	→ vtunka joined	11:18
	← liamkeily left	11:18
Kartagis	canton7*	11:19
	→ tatka_1094 joined	11:20
canton7	normally your git client and a git service on the remote have a little chat, see what needs to be transferred, then the remote creates a new custom packfile containing just that, and sends it over	11:20
	with dumb http, there's no service on the remote. so your client just has to fetch whatever packfiles are available. so you may well end up transferring the entire repo every time you need to get one tiny update	11:20
	→ Acidnerd1 joined	11:21
	← tatka_1094 left	11:21
	← Acidnerd left	11:21
	→ liamkeily joined	11:22
	← dhilipsiva left	11:23
	→ dhilipsiva joined	11:23
	← kcj left	11:25
	← Devastator left	11:27
	← oojacoboo left	11:28
	→ rwestphal joined	11:28
	← liamkeily left	11:30
	→ dsdeiz joined	11:30
	→ Devastator joined	11:30
	← fairuz left	11:32
Kartagis	http://git-scm.com/blog/2010/03/04/smart-http.html <--- I copied that LocationMatch but still no :S	11:32
	→ Layke joined	11:32
	→ cillybabe joined	11:32
	← gwb3 left	11:34
Layke	avar, Hey. I don't know perl.. But wanted to install https://github.com/git-deploy/git-deploy If I clone the repo, locally, what's the next step?	11:34
	→ tma996 joined	11:34
Layke	I can't remember what I did the first time I installed it :)	11:34
	→ liamkeily joined	11:34
	→ gwb3 joined	11:36
canoon	Layke, seems more like a perl issue no?	11:37
	→ Raging_Hog joined	11:37
	→ grilix joined	11:37
Layke	canoon, avar wrote it. Don't want to PM him unless he's around :)	11:37
	cillybabe → cilly	11:37
Layke	And he only hangs out in this channel. I'll be patient anyway. :) I think I just need to update my PATH vars.	11:38
	← gwb3 left	11:38
	→ gwb3 joined	11:40
	← marhaban left	11:40
	← reydan left	11:40
	← lavong left	11:41
	← liamkeily left	11:42
	← tma996 left	11:42
canton7-mac	+1 for ssh.net - I've barely had any problems with it	11:42
	ops, wrong chan	11:42
	→ tma996 joined	11:42
	← cilly left	11:43
	→ cilly joined	11:43
	→ dhilipsi_ joined	11:43
	→ Stygia joined	11:44
	← canoon left	11:44
	← dhilipsiva left	11:44
	← dhruvasagar left	11:45
	→ nnyk_ joined	11:45
	→ sebhoss joined	11:45
	→ dhruvasagar joined	11:46
	← tma996 left	11:46
	← dyng left	11:46
	→ L8D joined	11:46
	→ rjhunter joined	11:47
	→ tatka_1094 joined	11:47
avar	Layke: Just symlink something to bin/git-deploy, it should find the lib directory in lib/ and be ready to go	11:48
	Layke: We should really have a "install" section...	11:48
	→ tma996 joined	11:48
Layke	avar, Ah thanks :) I just added the /home/layke/git-deploy to my PATH	11:48
	Wasn't sure if that would be enough, but it was :)	11:48
	← tatka_1094 left	11:48
	← gwb3 left	11:49
	← gasbakid left	11:49
	→ gwb3 joined	11:50
	→ kiki67100 joined	11:51
kiki67100	Hello	11:51
	everybody	11:51
	I would to know if possible to delete a remote commit ? A just enter my personnal password in plain text..	11:51
	→ iksik__ joined	11:51
	← L8D left	11:51
	adhawkins-away → adhawkins	11:52
Guest12540	i think u can delete the remote brach with the sha-1 id of the commit	11:52
dr_lepper	kiki67100: delete it from the branch locally and force-push the update	11:52
	→ dkpi joined	11:52
kiki67100	how can i do delete from local?	11:52
	← Guest12540 left	11:53
	← gua_ould left	11:53
kiki67100	git reset --hard d416171	11:53
	git push -f ?	11:53
	← WaReZ left	11:53
	→ JohnBat26 joined	11:54
	← iksik_ left	11:54
moritz	or simply change your password :-)	11:54
	note that even if you remove the commit from the branch, it'll be kept in the server's object store for a few weeks	11:55
dr_lepper	if it is the latest commit, then git reset --hard HEAD^	11:55
	(warning, data loss possible)	11:55
	→ spaceonline joined	11:55
	→ denkr joined	11:55
	← matanya left	11:55
	→ GT4066 joined	11:55
kiki67100	moritz: Yes but it's very boring	11:55
	← mklappstuhl left	11:55
	← Kayra left	11:56
moritz	kiki67100: security is usually boring.	11:56
	getting hacked is exciting, kind of	11:56
kiki67100	moritz: it sure!	11:56
	moritz prefers boring	11:56
	← DolphinDream left	11:56
kiki67100	moritz: That's is human... ;)	11:57
	← cilly left	11:57
	→ cillybabe joined	11:57
	kiki67100 the French like me are more lazybones	11:58
Kartagis	http://git-scm.com/blog/2010/03/04/smart-http.html <--- I copied that LocationMatch but still no :S	11:58
	I'm trying to get smart http	11:58
kiki67100	moritz: how can delete object store from remote branch ?	11:58
	I reset head but i think object is always in server no ?	11:59
	→ gua_ould joined	11:59
moritz	kiki67100: can you ssh into the server?	12:00
	← paulweb515 left	12:00
kiki67100	moritz: yes	12:00
	← grilix left	12:00
kiki67100	i am the root user	12:00
moritz	kiki67100: then once you've done the force push, git gc with appropriate options	12:00
	→ grilix joined	12:01
kiki67100	moritz: git gc not delete files?	12:01
	cillybabe → cilly	12:01
moritz	kiki67100: sentence no verb!	12:01
	→ Kayra joined	12:03
kiki67100	moritz: i use gc auto its work fine	12:03
	thansk	12:03
	thanks	12:03
	← grilix left	12:05
	→ Sadeukko joined	12:07
	← tma996 left	12:08
	→ johnkevinmbasco joined	12:08
	← jarr0dsz left	12:08
	→ tma996 joined	12:08
	← nnyk_ left	12:08
	→ iamtakingiteasy joined	12:09
	→ grilix joined	12:09
	← compact left	12:09
	→ compact joined	12:09
	→ nnyk_ joined	12:10
	→ _goTAN joined	12:10
	← iamtakin1iteasy left	12:10
	← daito left	12:10
	← denkr left	12:11
sabgenton	Is this a good way to allter all your files? git filter-branch --tree-filter 'git diff-tree --name-only --diff-filter=AM -r --no-commit-id $GIT_COMMIT \| <do stuff to files here>' HEAD	12:12
	→ freestyl3r joined	12:12
	→ mwlang joined	12:12
	→ iokill joined	12:13
	← ewnd9 left	12:13
sabgenton	I put a while read bash loop in there seemed work but not on the branch head commit	12:13
mwlang	I just ran "git merge master development" and nothing further. I want to undo this and restore my development branch back to where it was just before this command.	12:13
	is that simply "git reset HEAD" to do so?	12:14
	→ tatka_1094 joined	12:14
	← cilly left	12:14
osse	mwlang: which branch were you on when you ran that command?	12:14
mwlang	development	12:14
	← lb1a left	12:14
osse	mwlang: git reset --hard development@{1}	12:15
	← rafeca left	12:15
	_goTAN → goTAN667	12:15
ohcibi	do I have to bang .gitignore, when doing a whitelist-.gitignore (e.g. * followed by !.gitignore) or is * not ignoring .gitignore?	12:15
	← tatka_1094 left	12:15
	goTAN667 → _goTAN	12:15
mwlang	osse: thanks -- gonna go look up that --hard flag, never used that one before.	12:16
	← lunarjar left	12:16
osse	ohcibi: as long as you've commited the .gitignore it doesn't matter. Files already tracked are not ignored even when they match patterns in .gitignore	12:16
	_goTAN → goTAN	12:17
ohcibi	osse: k.. thanks	12:17
	goTAN → _goTAN	12:17
	→ liamkeily joined	12:17
	→ rafeca joined	12:18
	→ cilly joined	12:18
mwlang	speaking of .gitignore -- I was recently trying to set it up so that our project's config file with template info for how to configure is checked in and tracked, but local changes by developer are ignored going forward unless explicitly added and committed -- is that possible?	12:18
	→ lunarjar joined	12:19
	→ CheckDavid joined	12:19
osse	mwlang: no. it's best to rename your config to config.template then ask the devs to make a copy of it to edit	12:20
mwlang	that's what I figured.	12:20
osse	ohcibi: as for your actual question, I think the * in .gitignores also matches dotfiles	12:21
	← dhruvasagar left	12:21
osse	mwlang: you can do something like git update-index --assume-unchanged or something, but it gets confusing fast (at least for me)	12:21
	← preflex left	12:21
	→ preflex_ joined	12:21
	← cilly left	12:21
ohcibi	osse: interesting point... this is the point where curiosity defeats lazyness	12:21
osse	curiosity++	12:22
	→ daito joined	12:22
mwlang	osse: interesting idea, but I think your right that its just best to give it an alternate name.	12:22
	→ DolphinDream joined	12:22
	preflex_ → preflex	12:22
	→ Xethron joined	12:22
osse	ohcibi: never mind, I was wrong. * doesn't match dotfiles	12:22
ohcibi	k, seems like .gitignore can ignore itself.. so gitignores * is more "powerful" then default shell's glob	12:22
	osse: no you were right... at least * in .gitignore	12:23
osse	ohcibi: ehh, never mind. It does :P	12:23
ohcibi	i knew that * doesnt match dotfiles in shell.. thats why I needed to try it out 8-)	12:23
	← lunarjar left	12:24
	← DolphinDream left	12:24
	_goTAN → goTAN	12:25
	← arjun_ left	12:26
	← joaoh82 left	12:26
	→ joaoh82 joined	12:27
	→ User458764 joined	12:27
	← robbyoconnor left	12:28
	→ mklappstuhl joined	12:28
	→ arjun_ joined	12:31
	→ piecu joined	12:32
piecu	hello everyone	12:32
gitinfo	piecu: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	12:32
	← mklappstuhl left	12:33
piecu	how can I revert a locally added tag, not pushed yet?	12:33
	git reset --hard doesn't do that	12:33
Silex	piecu: git tad -d or smth	12:34
moritz	piecu: you have to delete the tag	12:34
	piecu: man git tag	12:34
gitinfo	piecu: the git-tag manpage is available at http://jk.gs/git-tag.html	12:34
piecu	but can I delete all not pushed tags?	12:34
	I don't know the tag name	12:34
moritz	how about finding the tag name? :-)	12:34
	← tma996 left	12:34
moritz	'git tag' lists them	12:34
	→ juliohm joined	12:34
	→ fdel joined	12:34
	→ tma996 joined	12:35
	→ shwaiil joined	12:35
piecu	but I'm trying to automate some process and want to delete all not pushed tags	12:35
bremner	piecu: you can use git ls-remote	12:35
	← Raging_Hog left	12:35
bremner	(to find the pushed tags)	12:35
	← jrib left	12:36
	← tma996 left	12:36
	→ tma996 joined	12:36
fdel	Is there an easy way to use 'git grep' to search for multiline patterns (like 'foo\nbar')? "grep -Pzo" works, but I couldn't find the equivalent using "git grep"	12:37
	→ denkr joined	12:37
	← denkr left	12:37
piecu	so there is now easy way to delete ALL not pushed tags? preferrably one command...	12:37
	← zapb left	12:37
moritz	I'm not aware of one	12:38
	→ tma996_ joined	12:38
john2x	is it possible to "remove" a commit from history?	12:39
fdel	john2x: yes, using 'git rebase' for instance	12:40
	→ Pullphinger joined	12:40
john2x	fdel: how would that work? I tried rebase -i, but there's no option to remove a commit	12:41
	→ tatka_1094 joined	12:41
moritz	john2x: you can simply remove the line with that commit	12:41
fdel	just delete the commit line	12:41
	← tma996 left	12:41
	← User458764 left	12:41
	→ lvella joined	12:42
	← zmansiv left	12:42
	→ sephii joined	12:42
	← tatka_1094 left	12:42
john2x	oh, that part was just below the fold. thanks	12:43
	← rafeca left	12:43
	→ zmansiv joined	12:43
sephii	hey there, I recently upgraded git and now each untracked file in the output of the "status" command starts with a tab character, which is very annoying when copy-pasting (by double-clicking it and then middle-click) because it pastes the tab character which gets interpreted by the shell and the final path is wrong	12:44
	→ htux joined	12:44
	→ erichynds joined	12:44
	← lazers left	12:44
	← snql left	12:44
	→ rafeca joined	12:44
sephii	any idea what's going on? I'm using git 1.8.4.3 on Debian	12:45
	→ cannonball joined	12:46
htux	I'm doing a school project and I want to version manage it with git. I want to share the project so I can work on it at home too. I don't have a server that I can use for it at the moment (but I could set one up if it's worth it) and I don't want to share my code with anyone else (github free won't suffice). What are my options in order of "ease"?	12:46
	→ snql joined	12:46
moritz	htux: bitbucket offers free, private git repos, iirc	12:48
	https://bitbucket.org/plans	12:49
htux	moritz: I know. Not sure if I want to put my code on there though. But maybe I should stop thinking like that. My project is not like a famous proprietary software	12:49
piecu	htux: check assembla.com	12:49
htux	piecu: Same principle, assembla and bitbucket	12:50
moritz	htux: well, if you don't trust some random organization on the internet, you'll have to carry it around on a USB stick	12:50
	htux: or find a random company on the internet you trust	12:50
htux	moritz: Oh well, maybe it's worth it setting up a server at home then	12:50
moritz	but do you trust yourself? :-)	12:51
htux	moritz: Good point :)	12:51
	→ lazers joined	12:51
	qsusOFFcs → qsuscs	12:51
htux	moritz: Perhaps if I set up as simple of a system as possible and double check everything	12:51
	→ smashwilson joined	12:51
	→ hyperair joined	12:52
moritz	... and write all the software from scratch, including OS and compiler	12:52
	→ y_nk joined	12:52
sephii	htux: what makes you reluctant of putting your project on bitbucket?	12:52
	moritz shuts up now.	12:52
	→ WaReZ joined	12:52
	← y_nk left	12:53
	→ fairuz joined	12:53
	→ y_nk joined	12:53
htux	sephii: It's just that I'm giving code that is not open source to another company. I know I am probably not going to profit from my code and that I can probably trust BitBucket, but "the principle!!!"	12:54
nevyn	htux: do you have a server?	12:54
	htux: run gitolite on a vps	12:55
moritz	htux: do you have the same principles for emails? HTTP traffic?	12:55
	nevyn: then htux would have to trust the VPS provider. Why trust them, and not bitbucket?	12:55
htux	moritz: Hmm yeah, you're right	12:55
	← m0ltar left	12:55
nevyn	right.	12:55
	← beautifulmind left	12:55
shwaiil	Q: Can I create a hook, that executes a given script that I've created to deploy to staging, etc, that should be exec whenever I push to the master branch ? Thanks	12:56
htux	moritz: I don't know, some part of me wants to draw the line between emails/HTTP traffic and vps/version control	12:56
	moritz: Not even sure why	12:56
	← snql left	12:56
sephii	htux: I don't think hosting your code on Bitbucket grants them the right to use it	12:56
nevyn	it's more directly work product.	12:56
sephii	htux: you should read the privacy policy and then decide if it's worth to use your own server	12:56
nevyn	we need an encrypted git hosting tor hidden service.	12:56
	moritz finds his emails more worthy of protection than his code	12:56
htux	nevyn: Wow, never thought of that!	12:57
nevyn	htux: I was kidding.	12:57
	→ ewnd9 joined	12:58
htux	nevyn: Seriously though	12:58
nevyn	no.	12:58
	→ m0ltar joined	12:58
nevyn	it's a terrible idea.	12:58
htux	nevyn: why?	12:58
nevyn	latency mostly	12:58
	and the fact that tor is based around dumb http	12:59
	→ karavanjo_ joined	12:59
	← karavanjo left	12:59
	← lvella left	13:00
	→ lvella joined	13:00
	← y_nk left	13:00
	← thierryp left	13:00
	→ _toordog joined	13:00
	← Mapley left	13:00
	← nnyk_ left	13:02
	← fdel left	13:03
	→ snql joined	13:03
	← snql left	13:03
	→ Mapley joined	13:03
	→ grilix_ joined	13:03
	→ thierryp_ joined	13:04
	→ Exio4 joined	13:05
	← piecu left	13:05
	← grilix left	13:06
htux	I think I will use bitbucket	13:07
	→ nnyk_ joined	13:08
	→ tatka_1094 joined	13:08
	→ echo-are` joined	13:09
	← sabgenton left	13:09
	→ L8D joined	13:09
	← tatka_1094 left	13:10
	→ mklappstuhl joined	13:10
	→ txomon\|fon joined	13:10
txomon\|fon	hi, I am having some doubts with git branching stuff	13:10
	→ PeterBooker joined	13:10
txomon\|fon	I have been regularly merging some feature branches into a master branch, and now I would like to revert thos merges	13:10
	from an specific branch	13:11
	← Sadeukko left	13:11
	← echo-area left	13:11
	→ samskiter joined	13:11
txomon\|fon	but they are tons of merges	13:11
	← j0ran3 left	13:11
txomon\|fon	s/they/there/	13:11
samskiter	hi, using git submodule add in my repo root will create a folder with the name of the repo i want to clone. how do i go the same in a subdirectory of my repo	13:12
canton7	txomon\|fon, so you're been working on branch foo, merging it into master, doing some more work on branch foo, merging it into master again?	13:12
	→ Sadeukko joined	13:13
	← echo-are` left	13:13
	→ echo-area joined	13:13
	← rjhunter left	13:14
samskiter	e.g. if the submodule I'm adding is called 'SubmLib', doing a git submodule add to my root yields ./SubmLib which contains the cloned files. but doing it to ./libs results in 'libs already in index' error message	13:14
txomon\|fon	Something like the rever in here http://git-scm.com/blog/2010/03/02/undoing-merges.html	13:14
	but for several commits	13:14
	→ j0ran joined	13:15
txomon\|fon	canton7, yeah	13:15
	that's my problem	13:15
	← HicksD left	13:15
canton7	txomon\|fon, yeah, that's not a good branching strategy	13:15
txomon\|fon	I have seen so ;(	13:16
	which would be better?	13:16
canton7	git revert takes a --no-commit flag. do a ton of --no-commit reverts, one for each merge	13:16
	that should work	13:16
	branches normally represent features. when a feature is complete, merge it in, and delete its branch	13:16
txomon\|fon	oh... pfff	13:16
	yeah the problem is that..	13:17
	→ yargy joined	13:17
txomon\|fon	let me give you a image	13:17
	https://github.com/txomon/mopidy/network	13:17
	branch develop is mopidy's project master one	13:17
	for which I want to propose the PR	13:17
	and master is my master, where I work on features and have all my features merged in one branch	13:18
	in order to test stability between them etc.	13:18
canton7	cool, makes sense so far	13:18
txomon\|fon	yeah	13:19
	but now, I found that one of the features is breaking badly my branches	13:19
	see feature/audio-volume-and-mute-updates	13:19
	← Fandekasp left	13:20
txomon\|fon	so I did a git diff develop feature/audio-volume-and-mute-updates	13:20
	← Sadeukko left	13:20
txomon\|fon	and applied as reverted patch	13:20
canton7	it does look like git-revert takes a range actually	13:20
txomon\|fon	it does	13:20
	I will be switching to a method on rebasing my feature branches on develop	13:21
	for the feature branches	13:21
	but no idea on what to do with my master one	13:21
	→ harobed joined	13:22
canton7	might be worth asking the !list for general solutions - I know quite a few of them do what you do	13:23
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	13:23
	← _Vi left	13:23
txomon\|fon	canton7, ok,. I just wanted to know if that wasn't as crazy as it seemed to my colleages =) I will be mailing it now	13:23
canton7	txomon\|fon, my suspicious might be that a general strategy would be to merge the features into master, but revert the previous merge and re-merge if modifications are made to the feature?	13:24
	← samskiter left	13:24
	→ freeed joined	13:26
	← maleknet left	13:26
	← jkremser left	13:27
	→ HicksD joined	13:27
txomon\|fon	canton7, then I should be doing some sort of strange rebase/merge	13:27
	something smarter may exist	13:27
canton7	personally I'd stave off the rebase until you create the pull request	13:27
txomon\|fon	the problem is that i work with master	13:28
	and that I can't now re-merge the feature branch ;(	13:28
	→ Gavrisimo joined	13:28
txomon\|fon	I am going afk, will come back when I arrive home	13:29
	← fuzzybunny69y left	13:31
	→ fuzzybunny69y joined	13:32
	→ samskiter joined	13:32
samskiter	hi. i can't add a submodule to git without getting an error: already exists in index	13:33
Sonderblade	what do you do with old branches upstream has merged? can you archive them or something?	13:33
moritz	just delete them	13:35
	← Devastator left	13:35
	→ Devastator joined	13:35
	→ tatka_1094 joined	13:35
	← harobed left	13:35
	← tatka_1094 left	13:37
	→ DaisyTheCow joined	13:38
	← DaisyTheCow left	13:38
	→ lb1a joined	13:38
	→ FortySix2 joined	13:39
	← hyperair left	13:40
	→ paulweb515 joined	13:40
	→ hyperair joined	13:41
	→ jonatasnona joined	13:41
	→ harobed joined	13:43
	← FortySix2 left	13:43
	← harobed left	13:43
	← Grum left	13:43
	→ harobed joined	13:44
	→ Grum joined	13:45
Sonderblade	moritz: how can i verify that all commits in the branch has been merged?	13:45
samskiter	can anyone help out with the submodule issue i mentioned	13:45
	is there no way to add a submodule as another folder in an existing subdirectory	13:45
	→ sgambino joined	13:45
	← lvella left	13:46
samskiter	ach. never mind. as usual git is inconsistent	13:46
	← paulweb515 left	13:46
	→ Sendoushi joined	13:47
canton7-mac	samskiter, so submodule within a submodule? you have to cd into the first submodule, probably	13:47
	← thierryp_ left	13:47
samskiter	no canton. submodule within root project. the command syntax confused me	13:47
moritz	Sonderblade: git automatically checks if a branch has been merged when you run 'git branch -d <branchname>'	13:47
	→ thierryp joined	13:47
	→ redrocket joined	13:47
	→ DaisyTheCow joined	13:48
	← dfanjul left	13:48
samskiter	canton7-mac: git submodule add url/to/subm.git . will create a directory 'subj' to my repo root. BUT 'git submodule add url/to/subm.git libs' will complain that libs is already in the repo	13:48
	← DaisyTheCow left	13:48
samskiter	so the correct command was 'git submodule add url/to/subm.git libs/subm'	13:49
Sonderblade	moritz: no. it deletes it anyway	13:49
canton7-mac	samskiter, yeah, looks sensible to me	13:49
	← htux left	13:49
moritz	Sonderblade: it doesn't for me (git version 1.7.10.4)	13:50
	← hyperair left	13:50
Sonderblade	moritz: 1.7.9: warning: deleting branch 'map-image-funcs' that has been merged to 'refs/remotes/origin/map-image-funcs', but not yet merged to HEAD. Deleted branch map-image-funcs (was e1f3faa).	13:50
samskiter	canton7-mac: it's confusing as I'm used to git creating the directory for me when i clone a new repo...	13:51
	canton7-mac: thanks	13:51
	→ _Vi joined	13:51
canton7-mac	if you had a dir called 'repo', and you said 'git clone ..../repo.git', git wouldn't complain	13:52
	ignore that. true but irrelevant	13:52
	← s_e left	13:52
	← nbrosnahan left	13:52
canton7-mac	if you had a dir called 'libs' and you said 'git clone ..../repo.git libs', git would complain iirc	13:53
samskiter	canton7-mac: i guess the difference is i would just cd into libs and do a git clone, but you can't do that with submodule add	13:53
	→ dort joined	13:53
mwlang	is there a difference between "get reset HEAD" and "git reset HEAD~1" ?	13:54
	→ lvella joined	13:55
	→ ni_ joined	13:55
	← dsdeiz left	13:55
canton7-mac	mwlang, yes. one resets to HEAD, one resets to HEAD~1	13:55
	→ dsdeiz_ joined	13:55
canton7-mac	samskiter, yeah, figures :P	13:55
	← dort left	13:55
	→ breakingthings joined	13:55
	→ s_e joined	13:56
	→ hyperair joined	13:56
	bdavenport → bdav\|away	13:57
	← flaguy48 left	13:57
	→ aChatir joined	13:57
mwlang	canton7-mac: reminds me of that engineering joke -- "A man is flying in a hot air balloon…."	13:57
	I guess the real question is what does the ~1 do?	13:58
canton7-mac	HEAD~1 is the first parent of HEAD	13:58
	← Kayra left	13:59
canton7-mac	HEAD~2 is the first parent of the first parent of HEAD (i.e. HEAD's grandparent)	13:59
	similarly, HEAD^ is the first parent of HEAD, but HEAD^2 is the second parent of HEAD (only applicable with merge commits)	13:59
	so HEAD^^ is the same as HEAD~2	13:59
	crash course :P make sense?	13:59
	→ j0ran2 joined	13:59
	→ Kayra joined	14:00
	← j0ran left	14:00
	→ decotii joined	14:00
	← j0ran2 left	14:00
	→ j0ran joined	14:00
mwlang	so basically walks backwards in the chain by X commits?	14:00
	← nnyk_ left	14:01
canton7-mac	yup	14:01
Sonderblade	yes, except it's a tree :)	14:01
canton7-mac	following the first parent each time	14:01
	→ PaulCapestany joined	14:01
	→ cn28h joined	14:02
	→ nnyk_ joined	14:02
	← nnyk_ left	14:02
	→ nnyk_ joined	14:02
	→ michael_lee joined	14:02
	← arjun_ left	14:02
	→ tatka_1094 joined	14:02
	→ ezio joined	14:02
	← ezio left	14:02
	→ ezio joined	14:02
	→ hellopat joined	14:03
	← pasky left	14:04
	← tatka_1094 left	14:04
	→ gregsmith joined	14:04
	← Kayra left	14:04
	← zumba_addict left	14:05
	→ lavong joined	14:06
	→ dsdeiz joined	14:06
	← Layke left	14:07
	← dsdeiz_ left	14:07
	→ Kayra joined	14:08
	← troyt left	14:09
	→ [emmajane] joined	14:09
	→ paulweb515 joined	14:10
	← Guest27032 left	14:11
	← johnkevinmbasco left	14:12
	→ jerius joined	14:12
	→ troyt joined	14:13
	→ sohail joined	14:13
	← sohail left	14:13
	→ sohail joined	14:13
	→ Matt_R joined	14:14
	← hyperair left	14:14
	→ mmitchell joined	14:14
	→ hyperair joined	14:15
	adhawkins → adhawkins-away	14:16
	→ flaguy48 joined	14:16
	← ni_ left	14:16
	→ ni_ joined	14:17
	← jizanthapus left	14:17
	← yargy left	14:17
	→ jizanthapus joined	14:18
	← delasteve left	14:18
	→ jkremser joined	14:18
	← jkremser left	14:18
	→ jkremser joined	14:18
	→ DaisyTheCow joined	14:19
	← DaisyTheCow left	14:19
	→ the_cybersphinx joined	14:19
	→ dhruvasagar joined	14:19
	→ aartist joined	14:19
	← Gavrisimo left	14:20
	→ Gavrisimo joined	14:21
	← daito left	14:21
	→ gnoel joined	14:21
	→ gnoel_ joined	14:21
	→ nbrosnahan joined	14:24
	← takamichi left	14:24
	→ scampbell joined	14:25
	← scampbell left	14:25
	→ rjhunter joined	14:25
	← Gavrisimo left	14:25
	← dkpi left	14:25
	→ AaronMT joined	14:25
	→ takamichi joined	14:26
	→ pasky joined	14:27
	← treaki_ left	14:28
	← b3tamax left	14:29
samskiter	is it possible to 'check in' a remote that a repo should track (i.e. i'd like it to be that anyone who checks out this repo automatically has the github remote from which it was pulled)	14:29
	or maybe automatically configure git to set up that remote	14:29
	→ FortySix2 joined	14:29
	→ Dougie187 joined	14:29
	→ b3tamax joined	14:29
	← el3ctron left	14:29
	← hyperair left	14:29
	→ Zarthus joined	14:29
	← rjhunter left	14:29
	→ tatka_1094 joined	14:30
samskiter	looks like it isn't: http://superuser.com/questions/383787/saving-git-remotes-inside-the-git-repository-itself	14:30
	→ hyperair joined	14:30
	← hyperair left	14:30
	→ hyperair joined	14:30
	→ treaki_ joined	14:30
	← tatka_1094 left	14:31
	→ v0n joined	14:31
	← h_kon left	14:32
	← ezio left	14:32
	→ jrib joined	14:33
	← konadr left	14:34
	→ Destos joined	14:34
	→ chuckharmston joined	14:35
	→ Gamecubic joined	14:37
	→ meLon joined	14:39
	→ DaisyTheCow joined	14:40
	← DaisyTheCow left	14:40
	→ davividal joined	14:41
	← timthelion left	14:41
	→ kukks joined	14:42
	→ shadok joined	14:43
	← shadok left	14:43
	→ shadok joined	14:43
Stygia	Hey.	14:44
	Anyone use vi(m) as their editor for git commits?	14:44
dr_lepper	sure	14:44
Stygia	I'm trying, but when I wq it says "error: There was a problem with the editor 'vi'" and does not add my message to log nor commit my changes.	14:44
	bdav\|away → bdavenport	14:45
dr_lepper	there's something wrong with your setup	14:45
	← hyperair left	14:45
Stygia	Hmm.	14:47
	→ matanya joined	14:47
Stygia	Weirdly enough, it worked when I set it to /usr/bin/vim instead of vim.	14:47
	Weird, but now it at least works.	14:47
	→ GODDOG joined	14:47
	← Kayra left	14:47
	→ hyperair joined	14:48
	→ bastian_b joined	14:50
	← cagedwisdom left	14:50
	→ phile joined	14:50
	→ gnoel__ joined	14:51
bastian_b	Hello, does "git push --mirror" also mirros reflogs please?	14:51
dr_lepper	no	14:52
	reflog is local	14:52
	→ manithree joined	14:52
	← gnoel left	14:52
	← gnoel_ left	14:52
	← gnoel__ left	14:52
	→ LAANIW9 joined	14:52
	→ WABUJTX joined	14:52
	← tma996_ left	14:53
	← WaReZ left	14:53
	→ tma996 joined	14:53
	← soee left	14:54
	→ angelsl joined	14:54
	→ rubatdub joined	14:54
	← GODDOG left	14:55
	← tma996 left	14:55
	→ tma996 joined	14:55
	← Forkk13 left	14:55
	→ bar338 joined	14:57
	→ tatka_1094 joined	14:57
	→ whitby joined	14:57
	← hyperair left	14:57
	← tatka_1094 left	14:58
	← armin_w left	14:59
	→ epta joined	15:00
bar338	I recently migrated my git repo from one remote to another (replacing the old git server). I am now seeing some unexpected behavior I hope someone can help me understand. http://paste.laravel.com/1bJM specifically in the paste I am confused by "this is not the default configured remote	15:00
	for your current branch,"	15:00
epta	Is there a way to check that branch A have nothing that doesn't exist in branch B? In other words, that `git diff A B' has no `-'ses	15:01
	→ beepbeep_ joined	15:01
	← PeterBooker left	15:02
bar338	Here is the script I used to migrate the repo: http://paste.laravel.com/1bJP	15:02
moritz	epta: you can diff --shortstat and check that there are no deletions	15:02
beepbeep_	I have a commit that was made about a year ago. I'd like to see a list of commits before and after that commit (let's say 20 commits after that commit and 20 commits before that commit), how do I approach that?	15:02
	← lvella left	15:02
	→ hyperair joined	15:03
	← bar338 left	15:03
	← john2x left	15:03
	→ john2x joined	15:04
	→ amortimer_mbp joined	15:04
moritz	beepbeep_: before is easy, git log <commit>~20..<commit>	15:04
	→ omarek joined	15:04
moritz	beepbeep_: after is harder, because with branches, there can be many different after's	15:04
	← mwlang left	15:04
beepbeep_	moritz, only on current selected branch	15:04
	→ hholtmann joined	15:05
moritz	no idea how to do that, except parsing 'git log'	15:06
	← liamkeily left	15:06
beepbeep_	I could ofcourse just view all commits of that week, perhaps.	15:07
	→ angasulino joined	15:07
	← john2x left	15:08
	→ griotspeak joined	15:08
	→ arand joined	15:08
	← griotspeak left	15:08
	→ ErKa joined	15:10
	← arand left	15:12
epta	moritz: it not actually what I want	15:12
moritz	epta: then describe what you want	15:13
	→ arand joined	15:14
	← arand left	15:14
	→ Forkk joined	15:15
	→ gnoel joined	15:16
	← thierryp left	15:16
	→ thierryp_ joined	15:16
	→ arand joined	15:16
	→ hholtmann_ joined	15:17
	← hholtmann left	15:17
	hholtmann_ → hholtmann	15:17
	← hyperair left	15:18
	→ hyperair joined	15:19
	← Xethron left	15:21
	← stodan left	15:22
	← arvind_khadri left	15:22
	→ rouf joined	15:22
	→ kevwil joined	15:23
	→ ezio joined	15:23
	← dhruvasagar left	15:24
	→ tatka_1094 joined	15:24
	← rob_w left	15:24
	← slassh left	15:24
	→ Noldorin joined	15:24
	[emmajane] → emmajane	15:24
	← takamichi left	15:25
	← tatka_1094 left	15:25
	→ takamichi joined	15:26
	← Forkk left	15:27
	← ezio left	15:28
	→ johnnyfuchs joined	15:28
	← mmattice left	15:28
	→ PeterBooker joined	15:28
	← ni_ left	15:28
	→ ni__ joined	15:28
	emmajane → [emmajane]	15:28
epta	moritz: it seems to be that git-diff shows diff between diffs, what I want is just diff between all files in two revisions	15:28
	→ ojacobson joined	15:29
canton7-mac	epta, so 'git diff commit1 commit2'?	15:29
	← sohail left	15:30
canton7-mac	oops, bad syntax	15:30
	or not, no, that's fine	15:30
moritz	epta: what do you mean by 'diff between diffs'?	15:30
canton7-mac	I though for a minute you had to use range syntax there	15:30
	[emmajane] → emmajane	15:32
	→ ehmatthes joined	15:32
	← beepbeep_ left	15:32
	← Gamecubic left	15:32
	→ sohail joined	15:32
	→ timthelion joined	15:33
	→ Forkk joined	15:33
	← ewnd9 left	15:33
	→ delasteve joined	15:33
	← delasteve left	15:33
	→ delasteve joined	15:34
	→ ezio joined	15:34
	→ wooy joined	15:34
	← hyperair left	15:35
	← vtunka left	15:35
	← rurufufuss left	15:36
	→ hyperair joined	15:36
	→ iamjarvo joined	15:37
	← Forkk left	15:37
	→ scampbell joined	15:37
	← nnyk_ left	15:38
	→ bwreilly joined	15:39
	→ treaki__ joined	15:40
	→ Raging_Hog joined	15:41
	← ezio left	15:41
	← treaki_ left	15:41
	← scampbell left	15:41
	→ acharlieh joined	15:42
	→ ezio joined	15:43
	→ Advocation joined	15:43
	← marthinal left	15:44
	→ Gonzo89 joined	15:45
	→ Gamecubic joined	15:45
	← jceb_ left	15:46
	← joaoh82 left	15:46
	→ joaoh82 joined	15:47
	→ marthinal joined	15:49
	→ thiago joined	15:50
	→ cwillu_at_work joined	15:51
	→ tatka_1094 joined	15:51
	→ dhruvasagar joined	15:51
	emmajane → [emmajane]	15:52
	→ mizu_no_oto joined	15:52
	← tatka_1094 left	15:52
	→ Cromulent joined	15:52
	→ Forkk joined	15:53
	← Norm_ left	15:53
	→ primitive joined	15:54
	← lite_ left	15:54
	← Krewie left	15:54
	← hyperair left	15:55
	→ hyperair joined	15:56
	→ DolphinDream joined	15:58
	← DolphinDream left	15:58
	← jooools left	15:58
	← jason237 left	15:58
	← thierryp_ left	15:59
	→ jooools joined	15:59
	← ezio left	16:01
	← DoniRS left	16:01
	→ jason237 joined	16:02
	← netiul left	16:03
	← johnnyfuchs left	16:04
	← omarek left	16:04
	← jargon left	16:05
	← hyperair left	16:05
	← FortySix2 left	16:05
	← cbreak-work left	16:07
	→ FortySix2 joined	16:08
	→ str joined	16:09
	→ DaisyTheCow joined	16:10
	→ tony_lechner joined	16:10
tony_lechner	Kind of an odd question, but I have a rather large repo (many binary assets to a game) that if I clone on Windows, it will actually cause my router to crash after awhile. Anyone seen anything like this?	16:11
	← GeertV left	16:11
tony_lechner	Clones fine on my debian box	16:11
	→ nwertman joined	16:12
	← arand left	16:14
	← aChatir left	16:14
	← TomyWork left	16:15
	→ arand joined	16:15
	→ WaReZ joined	16:16
	← Gonzo89 left	16:16
	← ThomasLocke left	16:17
	← tma996 left	16:18
	← iokill left	16:18
	→ tatka_1094 joined	16:18
	→ hwrd\|work joined	16:18
offby1	one would think that'd be a fault in the router	16:19
	→ Moo joined	16:19
	← tatka_1094 left	16:19
	Moo → Guest57800	16:20
	→ snql joined	16:20
	→ CKyle joined	16:20
	← dhruvasagar left	16:21
	← PaulCapestany left	16:21
	← rath left	16:22
	← marlboromoo left	16:23
	→ nicedice joined	16:23
	→ zumba_addict joined	16:24
	← papegaaij left	16:24
	← Misan left	16:24
	→ shinnya joined	16:24
	← mklappstuhl left	16:24
	[emmajane] → emmajane	16:24
	← snql left	16:25
	→ lavaman joined	16:25
	→ PaulCapestany joined	16:26
	→ zapb_ joined	16:27
	← teran left	16:27
	emmajane → [emmajane]	16:28
	→ konadr joined	16:28
	← aartist left	16:29
	← ni__ left	16:29
	← timthelion left	16:30
	← eletuchy left	16:30
	← sebhoss left	16:31
	→ eletuchy joined	16:31
	→ enape_101 joined	16:32
bastian_b	When doing a git push and assuming I do it in a bash script, If push is rejected, is there a way to have an error code or exit code in order to know that there was an issue in the script?	16:33
	← WaReZ left	16:33
	→ mklappstuhl joined	16:33
Asenar	Hi, I have that repository /main/subdir and I would like to extract the subdir to make it an other repository (and keeping the logs). Is that possible ?	16:33
	→ King_Hual joined	16:34
	← delasteve left	16:34
	← gua_ould left	16:34
osse	Asenar: man git-filter-branch, look for subtree	16:35
gitinfo	Asenar: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	16:35
	← eletuchy left	16:35
osse	Asenar: oops, I mean subdir	16:36
	← enape_101 left	16:36
Asenar	thanks you !	16:36
	→ dp joined	16:36
dp	is there a way to delete local branches that haven't been pushed to a remote?	16:37
Asenar	git branch -D	16:37
	→ Kayra joined	16:37
	→ SHyx0rmZ joined	16:38
	→ sebhoss joined	16:38
ojacobson	bastian_b: most git commands, including git-push, respect the usual exit status convention	16:38
	zero for success, non-zero for failure	16:38
	→ petey joined	16:38
	→ Pyrogerg joined	16:38
bastian_b	Great, thank you	16:38
	← str left	16:39
dp	Asenar: I was thinking similar to git remote prune origin... something that doesn't require me to inspect every branch first	16:39
	→ lite_ joined	16:39
	← bwreilly left	16:40
	← mlechner left	16:41
	→ TomyLobo joined	16:42
	→ g3orge joined	16:43
	← blinkdesign left	16:45
	← amortimer_mbp left	16:45
	→ tatka_1094 joined	16:45
	[emmajane] → emmajane	16:45
	← matanya left	16:46
	← Grant484 left	16:46
	← tatka_1094 left	16:47
	→ amortimer_mbp joined	16:47
	← tufflax left	16:47
	→ Grant484 joined	16:48
	← Kayra left	16:48
	← konadr left	16:49
Pyrogerg	I'm new to git. I've been using it locally for several projects and now I need to use one of those projects (a bunch of scripts) on a remote server. I'll keep developing the project locally and pushing to the remote, but in spite of having read the documentation I don't clearly understand how to start and push to that remote.	16:49
	→ tma996 joined	16:49
	← Stygia left	16:49
	→ m8 joined	16:49
	→ petey_ joined	16:50
Pyrogerg	Do I just use 'git remote add servername serveraddress'?	16:50
	← ehmatthes left	16:50
	← petey left	16:50
Pyrogerg	'git push servername master'?	16:50
	← kodabb left	16:50
	→ enape_101 joined	16:51
Pyrogerg	I keep seeing the command 'git add origin address', but it's not clear to me what the name origin represents.	16:51
	→ royho joined	16:51
	→ matanya joined	16:52
	→ LBV_User joined	16:52
tony_lechner	Pyrogerg: origin is just the "default" name given if you clone a repo	16:53
	→ daito joined	16:53
	← petey_ left	16:54
tony_lechner	typically you'll do git push -u remotename remotebranchname, this sets the "default", so you can just do "git push" to update that remote repo going forward	16:54
	→ petey joined	16:54
	→ maestrojed joined	16:55
	emmajane → [emmajane]	16:55
	→ bwreilly joined	16:55
	← jonatasnona left	16:55
	← hwrd\|work left	16:55
	→ jonatasnona joined	16:56
	← SporkWitch left	16:56
	← dp left	16:56
	→ VictorCL joined	16:58
	→ petey_ joined	16:58
	→ ngladitz joined	16:58
	← daito left	16:58
	← petey left	16:58
	← m8 left	16:58
	← tma996 left	16:59
	[emmajane] → emmajane	16:59
	← SHyx0rmZ left	16:59
	→ nico3 joined	17:00
	← iamjarvo left	17:00
	→ str joined	17:00
Pyrogerg	tony_lechner: Thanks. That cleared it up for me.	17:00
	nico3 is NicoSa	17:00
	→ iamjarvo joined	17:01
	← maestrojed left	17:01
	← jnavila left	17:01
	← nico3 left	17:01
	→ yhager joined	17:01
	→ eletuchy joined	17:01
	→ timthelion joined	17:02
	→ irqq joined	17:03
	← sebhoss left	17:03
	→ h0rrorvacui joined	17:04
	→ SHyx0rmZ joined	17:04
	← harobed left	17:04
	→ johnnyfuchs joined	17:04
	→ NicoSa joined	17:04
	→ rainbyte joined	17:04
	→ devbug joined	17:05
	← iamjarvo left	17:05
	← alorence left	17:05
	← NicoSa left	17:05
	→ ShooterMG joined	17:06
	→ iamjarvo joined	17:06
	→ maestrojed joined	17:07
	→ Albania joined	17:07
Albania	AAA_awright	17:07
	ku je re ropqiro	17:07
	ca bone	17:07
	:D	17:07
	→ tatka_1094 joined	17:07
	→ Shqiperia joined	17:07
Shqiperia	Gitinfo	17:07
	O Moter Qir	17:07
	Ku Je Re	17:07
	Te Qifsha Robt	17:07
	Albania → hax0r	17:08
Shqiperia	Hax0r Lol	17:08
hax0r	lol	17:08
	hax0r → Guest40429	17:08
	→ ni__ joined	17:08
milki	wat	17:08
	Guest40429 → Ic3	17:08
Shqiperia	Milki	17:09
	Ku Je Mer	17:09
	Te	17:09
	Qifsha Fiset	17:09
	emmajane → [emmajane]	17:09
Ic3	[emmajane]	17:09
	ku je mi	17:09
	kurve	17:09
	← mklappstuhl left	17:09
Ic3	qe qihesh me lek	17:09
Shqiperia	Ic3	17:09
	Shqiperia LoL	17:09
	Ic3 → R8	17:09
R8	o abelsiqueira	17:10
	o ropsho	17:10
	ca bohet mer	17:10
	← lavong left	17:10
	Shqiperia → FeRRaRi	17:10
	→ SocalNick joined	17:10
FeRRaRi	SocalNick	17:11
	→ txomon\|home joined	17:11
FeRRaRi	O Ropsho	17:11
JesseC	I have a user that's doing a pull on a repo and after the pull there are several files that show up as changed directly after the pull	17:11
FeRRaRi	Ku Je Mer	17:11
	Ta Qi 1 Her Fisin	17:11
	Fiqdekqir	17:11
txomon\|home	canton7, I came back, I will be writting now the email	17:12
	→ Norm_ joined	17:12
	← Imdsm left	17:12
R8	JesseC	17:12
	o ropsho	17:12
	urt ti mer	17:12
	← johnnyfuchs left	17:13
	← b3tamax left	17:13
	→ dkpi joined	17:14
	→ sayd joined	17:14
	← m0ltar left	17:15
	← ngladitz left	17:15
	→ Gavrisimo joined	17:15
	← Sendoushi left	17:15
	← bastian_b left	17:15
	→ Imdsm joined	17:16
	← lb1a left	17:16
	→ imachuchu joined	17:16
FeRRaRi	O Robqiraaaaaaaaaaaaa	17:16
	Ku Jeni	17:16
	Gitinfo Te Qifsha Motren	17:17
	← FeRRaRi left	17:17
	→ hwrd\|work joined	17:17
	← Gavrisimo left	17:17
	R8 HaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHaHa	17:17
	← yhager left	17:17
	→ snql joined	17:17
	← R8 left	17:17
	→ Gavrisimo joined	17:17
	ChanServ set mode: +o	17:17
	→ dhruvasagar joined	17:17
zumba_addict	hey folks, I checked out a branch that I made a month ago. I forgot the files I updated. How do I display them? git log doesn't show	17:18
	← snql left	17:18
	→ lestrb joined	17:18
	← fRAiLtY- left	17:18
	→ Matrixiumn joined	17:20
ToxicFrog	zumba_addict: git diff <other-branch>... --stat ?	17:20
	(that's a literal '...' there)	17:20
zumba_addict	ok	17:20
ToxicFrog	E.g., git checkout feature; git diff master... --stat will show you what files are changed in feature relative to the point where feature diverged from master.	17:20
	← joaoh82 left	17:20
	← juliohm left	17:20
zumba_addict	I remember when I was using svn, I only had to type git log -v something	17:21
	→ joaoh82 joined	17:21
zumba_addict	then it would show the files that I updated	17:21
	i'll try git diff master... --stat	17:21
ToxicFrog	relative to what?	17:21
	I mean, do you want the files updated...since the branch divergence point? Since your last push? In the most recent commit?	17:21
	← rfree left	17:22
zumba_addict	none, it will just show the files that have been commited	17:22
	maybe my question was misleading	17:22
	← gnoel left	17:22
zumba_addict	i wanted to know what files have been committed for that push	17:22
	or what files have been pushed for that push	17:23
	← JohnBat26 left	17:23
	→ b3tamax joined	17:23
ToxicFrog	zumba_addict: what is "that push"?	17:23
	← hwrd\|work left	17:23
zumba_addict	when you do a git log on a branch, you'll see all	17:23
	← juril left	17:24
ToxicFrog	If you just want 'git log' but also showing what files were changed in each commit individually, try 'git log --stat'	17:24
zumba_addict	you'll see all hashes for that commit	17:24
	ah	17:24
	trying that now	17:24
	→ b3tamax_ joined	17:24
	→ Silmarilion joined	17:24
	→ rfree joined	17:24
zumba_addict	perfect! That's what I want :)	17:24
	← petey_ left	17:24
ToxicFrog	Er...no, I see the hash for each commit in that branch's history. Commits only have one hash.	17:24
	→ gnoel joined	17:24
zumba_addict	Thanks	17:24
ToxicFrog	Awesome.	17:24
	← zapb_ left	17:24
ToxicFrog	(more generally, git log can also take any options git diff does, to add/control diff output)	17:25
zumba_addict	got it	17:25
	← tSvendsen left	17:25
ToxicFrog	For a super concise output: git log --pretty=oneline --stat	17:25
	Shows you sha + first line of commit message + diffstat for each commit.	17:25
j416	or even git log --oneline --stat	17:26
	→ AWinterman joined	17:26
ToxicFrog	Even better.	17:26
	Replace --stat with --name-status for something easier to parse.	17:26
	→ Guest27988 joined	17:27
	← goTAN left	17:28
	→ teran joined	17:28
	→ hyperair joined	17:28
	→ shuaib joined	17:28
shuaib	git rebase never seems to complete for me. I am stuck in an endless loop of rebase, where it tells me at some point that there is nothing to continue and whether I forgot to add, or I should skip. Since I just have added resolved files, I do git rebase --skip, and it starts to rebase older commits throwing older conflicts me again	17:30
	any ideas what am I doing wrong?	17:30
osse	shuaib: run git rebase --abort, relax for five minutes, then try again.	17:31
	→ tjj_lt joined	17:31
	→ trusktr joined	17:31
	→ Shusshu joined	17:31
shuaib	osse, I did	17:31
osse	shuaib: whiel you're relaxing can you explain what you're trying to do and how you did it?	17:31
shuaib	the second time, got trapped in same issues	17:31
epta	Is there a way to do `merge --squash' in --dry-run mode?	17:31
shuaib	epta, I guess so	17:32
	← CKyle left	17:32
	← Shusshu left	17:32
thiago	epta: git merge does not have a --dry-run mode	17:32
	→ ngladitz joined	17:32
canton7-mac	epta, you can't dry-run merges, for (hopefully) obvious reasons	17:32
	← lite_ left	17:32
epta	;_;	17:33
osse	epta: create a new branch identical to the one you want to merge into, and then actually merge into that and see how it goes	17:33
	→ lite_ joined	17:33
canton7-mac	or just try the merge. merge --abort if it conflicts	17:33
	canton7-mac isn't entirely* sure that that works with --squash, come to think*	17:33
	→ teran_ joined	17:33
thiago	epta: explain what you wanted to do	17:33
osse	epta: so assuming you're on the branch you want to run git merge in: git checkout -b test-throwaway-YOLO; git merge --squash	17:33
	→ petey joined	17:34
	← hahuang65 left	17:34
epta	Okey, let me try from another end. I want to verify that some old branch X has nothing important that doesn't exist in master (automatically)	17:34
canton7-mac	osse, no point. you have to abort the merge if it fails anyway, to restore the working copy. which restores the branch	17:34
epta	"Doesn't exist" has kinda blurry definition here	17:35
	← teran left	17:35
epta	But hope you're getting what I'm talking about	17:35
	→ JonnyNomad joined	17:35
osse	canton7-mac: yep, but it gives a perceived sense of safety :P	17:35
thiago	epta: git merge	17:35
	epta: if there's something important, you'll have it merged	17:35
canton7-mac	if you create a branch at some ancient commit, then try and merge it with a new commit, you're probably going to get a ton of conflicts	17:35
thiago	epta: if there's nothing important, then the merge will mark those commits as merged	17:35
canton7-mac	hmm not convinced I'm right	17:35
	→ Xethron joined	17:35
	← Xethron left	17:35
	→ Xethron joined	17:35
atrus	shuaib: after adding the resolved files, don't you need to do git rebase --continue?	17:36
	← Octalot left	17:36
epta	thiago: why should I merge that shit it current branch? I don't wanna do it. I just want to get like True or False - could I remove that branch or I should take a look at it.	17:36
	→ pandeiro joined	17:37
	← trusktr left	17:37
epta	For some easy cases there are --merged or something flag of `git branch'	17:37
shuaib	atrus, I do that. And it works, but some steps forward, it throws this other message	17:37
thiago	epta: right	17:37
epta	But it doesn't work when time goes on	17:37
shuaib	where it says I should git rebase --skip	17:37
osse	epta: either it has already been merged which is easy to find out, or it hasn't been merged, in which case I think you have to look at the diff manualy	17:37
thiago	epta: if there are commits, you merge them	17:37
	→ tvw joined	17:37
thiago	epta: worst case scenario, you merge, look at what got merged, and then discard the merge	17:37
shuaib	atrus, and when I --skip, it throws older commits at me for merge, yet again	17:37
thiago	epta: if you want to really discard the merge and mark it, you'll re-do the merge with -s ours	17:37
shuaib	I must have resolved this one file like a gazzilion times	17:38
	→ zapb_ joined	17:38
epta	thiago: I think you miss `automatically' part of all that	17:38
	→ diegoviola joined	17:38
	→ Imagineer joined	17:38
thiago	epta: no, not really. Merges are never automatic.	17:38
	shuaib doesn't like rebase	17:38
thiago	epta: it's always manual.	17:38
	shuaib prefers the good ol' merge	17:38
	→ Beliq joined	17:38
	→ wald0 joined	17:39
	→ infynyxx joined	17:39
osse	shuaib: maybe git-rerere can help	17:39
shuaib	osse, what's that	17:39
epta	Suppose branch could be safely deleted if `merge --squash' goes without conflicts and there are nothing to merge. How it can be done without touching tree and index?	17:39
	← Xethron left	17:39
wald0	how i can "duplicate" a branch history to be created/included in another point of the master branch ?	17:39
epta	wald0: git checkout -b ?	17:39
osse	shuaib: a tool to help you o that you don't have to repeat yourself when resolving conflicts	17:39
shuaib	osse, hmmm, going to check it out	17:40
	thanks	17:40
thiago	epta: are all your merges done with --squash?	17:40
osse	*so that	17:40
epta	thiago: yep	17:40
	Last 2 years	17:40
	→ Xethron joined	17:40
	← Xethron left	17:40
	→ Xethron joined	17:40
thiago	epta: ok, then git merge --squash, delete the branch. No further action is necessary.	17:40
wald0	sorry, by duplicating i mean to copy another branch history, lets say i have a branch with 3 commits made 1 month ago, and i want to open a new (different) branch on master including this branch again	17:41
thiago	epta: either merge --squash produced something, or there was nothing to be produced. Either way, the branch's contents are now merged.	17:41
	epta: you may want to keep all the branches around though. This will blow up in your face some time in the future.	17:41
epta	thiago: question was about "decide could this particular branch could be removed". Not to remove	17:41
thiago	epta: merges are never automatic. And squashes will cause trouble.	17:41
	epta: your condition for "can it be removed" was whether the squash produced content. If it produced content, it's now merged.	17:41
	epta: if it didn't produce content, it was merged before.	17:42
	→ carbon2 joined	17:42
thiago	epta: either way, after the merge, it's merged, so the branch can be discarded.	17:42
epta	thiago: this is npt my branch. I kinda have no "rights" to remove it remotely. It's kidna rude, you know	17:42
osse	I guess a "dry run squash" would be git diff $(git merge-base HEAD B) B \| patch -p1	17:43
epta	So I just wanna know could it be removed or no	17:43
	t	17:43
	osse: hmm	17:43
	→ trusktr joined	17:43
epta	osse: HEAD here is HEAD of master branch?	17:44
	And B is the name of candidate to removing branch?	17:44
	→ thierryp joined	17:44
thiago	epta: the output is the same. Do the squash merge, then look at whether it produced anything.	17:45
osse	epta: HEAD is whatever you have checked out at the moment. Yes.	17:45
	→ hobodave joined	17:46
epta	osse: nice, thanks	17:46
thiago	patch -p1 is interactive	17:46
	you need to add -N. In which case it will create rejects for any changes the conflict.	17:47
	Or that are already applied.	17:47
epta	I'll rather use some "Has this diff some '-'ses?" instead of `patch -p1'	17:47
wald0	if i have a branch that i want to rebase uppon new code of master, but i dont want to lose it, how i can do that? (like duplicating, instead of moving)	17:47
epta	But dunno how	17:47
	Oh, no, nevermind	17:48
osse	epta: in that case git diff $(git merge-base HEAD B) B \| grep '^-' :P	17:48
	← canton7-mac left	17:48
	← txomon\|home left	17:48
thiago	I don't see how having lines removed is an indication of anything	17:49
	→ EnderWiggin joined	17:49
thiago	and if it is, why aren't lines added an indication?	17:49
epta	thiago: that why there is "nevermind"	17:49
thiago	are you trying to verify whether the diff is empty?	17:49
	← Matt_R left	17:50
	→ WaReZ joined	17:50
	← petey left	17:50
	[emmajane] → emmajane	17:50
epta	thiago: yep	17:50
	← Guest27988 left	17:50
	→ petey joined	17:50
thiago	epta: again, just run git merge --squash and see what it produces. I don't know what it will do if no changes are necessary.	17:51
	→ arietis joined	17:51
thiago	epta: will it create an empty commit? Or will it create no commit?	17:51
	→ snql joined	17:51
thiago	epta: you should !tias	17:51
gitinfo	epta: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/1-basic-usage/tias.html may help with git-specific TIAS.	17:51
thiago	epta: either way, it will produce a result you can check. If it created a non-empty commit, then the branch contains changes that can be merged.	17:51
	← mizu_no_oto left	17:52
	→ hwrd\|work joined	17:52
	→ weltall joined	17:53
	→ asedeno joined	17:54
	→ Skrypter joined	17:54
	← Skrypter left	17:54
	→ kjellski_ joined	17:54
	→ yacks joined	17:54
	→ Skrypter joined	17:55
	← Skrypter left	17:55
	← petey left	17:55
	→ Skrypter joined	17:55
	← Skrypter left	17:55
	→ Skrypter joined	17:56
	→ yhager joined	17:56
	← kjellski left	17:57
	kjellski_ → kjellski	17:57
	→ leeN joined	17:57
	→ merlin83_ joined	17:57
	← merlin83_ left	17:57
	→ merlin83_ joined	17:57
	→ richwestcoast joined	17:58
	← bgy left	17:59
	→ grilix joined	17:59
	← grilix_ left	17:59
	→ aartist joined	18:00
	→ pr0ton joined	18:00
	← pr0ton left	18:01
	→ tSvendsen joined	18:02
	→ txomon\|home joined	18:02
sohail	what does it mean when git merge says that something was deleted in HEAD and renamed in my branch, but the file was actually not deleted...	18:02
	← wrouesnel1 left	18:02
	→ Watabou joined	18:02
	← tony_lechner left	18:02
	← thiago left	18:03
	→ _iron joined	18:03
	→ jhulten joined	18:03
	→ rednaks joined	18:03
	→ osmosis joined	18:03
	← arietis left	18:04
	← chuckharmston left	18:04
	← yhager left	18:04
	← AWinterman left	18:05
	→ chuckharmston joined	18:05
imachuchu	sohail: git tries to figure out renaming after the fact so it can be a bit off (but doesn't matter as git tracks data not files), what actually happened to the file?	18:05
	← chuckharmston left	18:05
	→ chuckharmston joined	18:05
	→ AWinterman joined	18:06
	← shuaib left	18:06
	→ yhager joined	18:06
	→ m0viefreak joined	18:06
	← FerreusR left	18:07
	← shinnya left	18:07
sohail	imachuchu, just regular changes	18:07
	→ Kaisyu joined	18:08
aartist	How I can find the files changed in a particular directory in last 10 days?	18:09
	← Advocation left	18:09
imachuchu	sohail: but if you look at HEAD does it show the file as deleted?	18:09
sohail	imachuchu, nope, the file is there!	18:09
	← snql left	18:09
osse	aartist: git log --since='10 days ago' -- dir/	18:10
	← rednaks left	18:10
	→ hahuang65 joined	18:10
	→ arietis joined	18:10
osse	aartist: add --name-only	18:11
	← takamichi left	18:11
	← Norm_ left	18:11
	→ Norm_ joined	18:11
	← surfdue left	18:12
	← rafeca left	18:12
	← franksta-imac left	18:12
	← eletuchy left	18:12
	→ petey joined	18:13
	→ marhaban joined	18:13
	→ ldiamond joined	18:13
imachuchu	sohail: ehh, do the merge and make sure the file is there. What you are saying sounds strange and somewhat contradictory (git is saying that a file is deleted and that it isn't in the same commit), but if everything is fine after the merge then it's not a problem	18:13
	← ldiamond left	18:13
	→ ldiamond joined	18:13
	← ChrisAnn left	18:14
	→ snql joined	18:15
	→ surfdue joined	18:15
	← surfdue left	18:15
	→ surfdue joined	18:15
	→ tubbo joined	18:16
ldiamond	I imported a p4 repository to git using git-p4. Now I have a bunch of remote branches with the file and history (I used @all). However, when it all finished, I had nothing in master (thought it would create local branches automatically) so I did git merge p4/trunk. I also brought down more branches using 'git branch --track branch remotebranch'. Now the problem that I see is that 'git log --oneline --graph' doesn't show branch	18:16
	es and merges, all the branches have linear history without interaction with master.	18:16
	Anyone know why that is and if there's a solution to that?	18:16
	→ snag_ joined	18:16
	← snag_ left	18:17
	← FortySix2 left	18:17
tubbo	hi guys, i'm having a problem merging in a pull request on github. i pushed the branch and github said it couldn't be automatically merged. so i rebased it over my local 'master' (which, i checked, had the same HEAD as github master), and tried both a force-push as well as a reset/rebase/regular push and i still can't get github to sense that it's at the right place.	18:17
	→ snag_ joined	18:17
tubbo	what i want to know is what is so wrong with this branch that git just can't figure it out?	18:17
	← merlin83_ left	18:17
	→ FortySix2 joined	18:18
	← Vinnie_win left	18:18
moritz	tubbo: sounds more like a github question to me, not a git question	18:18
tubbo	another thing is it seems to have "reversed" my commit order. the changes that were rebased into the branch actually appeared after the commits that i made, wherein the order should have been reversed...	18:18
	← olivvv left	18:18
	→ Vinnie_win joined	18:18
moritz	... or maybe not :-)	18:18
tubbo	moritz: not really, it's more to do with how git is rebasing over branches.	18:18
moritz	tubbo: !repro please	18:18
gitinfo	tubbo: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	18:18
tubbo	ugh	18:19
	← whitby left	18:19
sohail	imachuchu, looks like the developer cherry picked that change	18:19
moritz	anyway, I have to leave now; I just doubt that anyone can help you with such sparse/vague information	18:19
tubbo	moritz: i'm not sure what you want me to show you, but i'm gonna give this a shot and then i'll show you output if it fails: gonna make a new test-master branch and attempt a merge. if it fast-forwards, i'll raise an issue with Github	18:19
	moritz: yeah...i was thinking that.	18:20
	because if it fast-forwards locally but github won't fast-forward, then that's a problem on their side and not with git	18:20
	→ scampbell joined	18:20
	→ jnavila joined	18:21
	← michael_lee left	18:22
	← jooools left	18:22
	← kukks left	18:22
	→ dyng joined	18:23
	← AWinterman left	18:24
	→ iamjarvo_ joined	18:24
	→ AWinterman joined	18:24
	emmajane → [emmajane]	18:25
	← petey left	18:25
	→ petey joined	18:26
	← AWinterman left	18:26
	← Watabou left	18:26
	→ AWinterm_ joined	18:26
	← dyng left	18:27
	← iamjarvo left	18:27
	← kjellski left	18:28
	← Norm_ left	18:28
	→ lukeketley joined	18:28
	← iamjarvo_ left	18:29
	← AWinterm_ left	18:30
	← marhaban left	18:30
	← petey left	18:30
	→ AWinterman joined	18:30
	→ marhaban joined	18:30
	→ Norm_ joined	18:30
	← pandeiro left	18:31
	→ iamjarvo joined	18:32
	→ looper joined	18:32
	→ boombatower joined	18:32
Remram	how can I see which tags haven't been pushed yet?	18:32
	→ chuckhar_ joined	18:32
	→ Watabou joined	18:32
	← chuckharmston left	18:32
Hello71	git push --tags --dry-run	18:32
	→ calcifea joined	18:33
	← seanz left	18:34
	← AWinterman left	18:35
aartist	osse: Thanks that helps. How I can see just file listings?	18:35
	→ fmscode joined	18:36
	→ Georg3 joined	18:36
osse	aartist: the answer would be git diff --name-only foo bar, where foo is the earliest commit git-log found and bar is HEAD.	18:36
	aartist: but I don't know how to pack that power into one simple command	18:36
	→ tsunamie joined	18:36
	← iamjarvo left	18:37
osse	aartist: aoh, and add -- dir/ to the end	18:37
	← freeed left	18:38
	→ btree joined	18:38
	→ JustinMac joined	18:39
	→ seanz joined	18:39
	→ jfoy joined	18:40
	→ eletuchy joined	18:40
	→ lindenle joined	18:40
osse	aartist: I'm hoping there's a better way than this: git diff --name-only $(git rev-parse --since='10 days ago' \| tail -1) HEAD -- dir/	18:40
	→ denkr joined	18:41
	→ valgrind joined	18:41
	← Xethron left	18:43
	→ DolphinDream joined	18:44
	← rudi_s left	18:44
	→ jooools joined	18:44
	← jfoy left	18:45
	→ maslowbeer_ joined	18:46
	← arand left	18:46
	← b3tamax left	18:47
	← b3tamax_ left	18:47
	→ rudi_s joined	18:48
aartist	osse: Thanks, I am still learning git.	18:48
	→ cenuij joined	18:48
	→ kukks joined	18:48
	→ b3tamax joined	18:50
	→ freeed joined	18:51
	→ m8 joined	18:51
masak	aartist: as are we all :P	18:52
	← achadwick left	18:52
osse	aartist: if I were you I would do a plain 'git log' find the SHA1 of the earliest commit I was interested in, then do git diff --name-only <sha> HEAD	18:53
aartist	masak: Is there a GUI git command builder, on some website?, that can be useful.	18:54
osse	if I were me (which I am), I would spend a much longer time than how long the above would take me trying to find a way to do it faster :P	18:54
aartist	osse: That will be helpful.	18:54
	→ petey joined	18:54
	→ JesseCW joined	18:54
	JesseC → Guest6140	18:54
	← chris2 left	18:55
	← thierryp left	18:55
	→ HelloShitty joined	18:55
masak	aartist: you might be interested/thrilled by http://pcottle.github.io/learnGitBranching/	18:56
	→ tang^ joined	18:56
	← Guest6140 left	18:56
	← btree left	18:56
	→ AWinterman joined	18:57
	← ivan\ left	18:57
	→ papegaaij joined	18:57
	→ decimad joined	18:58
	→ jaseemabid joined	18:59
	← hwrd\|work left	19:00
	→ FerreusR joined	19:00
	← AWinterman left	19:00
	→ oojacoboo joined	19:01
	→ AWinterman joined	19:01
	← Gavrisimo left	19:01
	← g3orge left	19:02
	← Skrypter left	19:02
	→ mdiers joined	19:02
	→ thiago joined	19:02
	→ hwrd\|work joined	19:03
	← eletuchy left	19:03
	→ Skrypter joined	19:03
	← devbug left	19:04
	← rouf left	19:04
	← AWinterman left	19:05
	→ rouf joined	19:05
	→ maleknet joined	19:06
	← lestrb left	19:07
	→ CKyle joined	19:07
	← _5kg left	19:08
	← tvw left	19:08
	← trusktr left	19:10
	← jinjonBoo left	19:10
	← nbrosnahan left	19:10
	← SocalNick left	19:10
	→ mizu_no_oto joined	19:11
	← joaoh82 left	19:11
	→ nbrosnahan joined	19:12
	→ joaoh82 joined	19:12
	→ ericksonsce joined	19:12
	← kukks left	19:12
	← ericksonsce left	19:13
	he_re_ → here	19:13
	→ _5kg joined	19:13
	← dhilipsi_ left	19:14
	→ FabTG_ joined	19:15
	→ devbug joined	19:16
	← diegoviola left	19:16
	← fmscode left	19:16
	← lukeketley left	19:16
	→ fmscode joined	19:16
	→ chris2 joined	19:17
ldiamond	I imported a p4 repository to git using git-p4. Now I have a bunch of remote branches with the file and history (I used @all). However, when it all finished, I had nothing in master (thought it would create local branches automatically) so I did git merge p4/trunk. I also brought down more branches using 'git branch --track branch remotebranch'. Now the problem that I see is that 'git log --oneline --graph' doesn't show branch	19:18
	es and merges, all the branches have linear history without interaction with master.	19:18
	Anyone know why that is and if there's a solution to that?	19:18
	→ sq-one joined	19:18
	← FabTG left	19:18
	← arietis left	19:18
	→ AWinterman joined	19:18
	→ JohnBat26 joined	19:19
	← kevwil left	19:20
	← teran_ left	19:22
	→ h0v1g joined	19:23
	← h0v1g left	19:23
	→ pbrobst joined	19:23
	← ryez left	19:23
	← Noldorin left	19:23
	← fmscode left	19:24
	→ kevwil joined	19:24
	← dsdeiz left	19:25
	→ johnnyfuchs joined	19:26
	← johnnyfuchs left	19:27
	→ Gavrisimo joined	19:27
	→ thierryp joined	19:27
	← JohnBat26 left	19:28
	→ ericksonsce joined	19:28
	← ericksonsce left	19:28
	← jason237 left	19:29
	→ eletuchy joined	19:30
	← Vampire0 left	19:31
	→ darkmaster777 joined	19:32
	← darkmaster777 left	19:32
	→ darkmaster777 joined	19:32
	← Cromulent left	19:32
thiago	ldiamond: I don't think p4 merges are handled	19:32
	← tatka_1094 left	19:32
thiago	ldiamond: your main branch should be linear history and all other branches branch off from that	19:32
	← Nevik left	19:32
	→ Thra11 joined	19:33
	← kiki67100 left	19:33
	← thierryp left	19:33
	→ kermit joined	19:33
	→ tatka_1094 joined	19:33
	← Tommy[D] left	19:34
	← Watabou left	19:35
	← dkpi left	19:36
	← samskiter left	19:37
	← str left	19:37
	→ str joined	19:38
	→ wdkevin joined	19:38
	← infynyxx left	19:38
	← Beliq left	19:39
	← timthelion left	19:40
	→ Vampire0 joined	19:40
	← petey left	19:42
	→ infynyxx joined	19:42
	→ petey joined	19:42
	← cjwelborn left	19:43
	← cenuij left	19:44
	→ bamj0rb joined	19:44
	gitinfo set mode: +v	19:44
	← hoschi left	19:44
	← papegaaij left	19:45
	→ dhilipsiva joined	19:45
	← _Vi left	19:46
	← maleknet left	19:46
	← petey left	19:46
	← nbrosnahan left	19:46
	← enape_101 left	19:47
	→ petey joined	19:47
	ChanServ set mode: -o	19:47
	← str left	19:47
	← Gavrisimo left	19:48
	→ Mars__ joined	19:49
	→ Gavrisimo joined	19:49
	→ thegladiator_ joined	19:49
	→ thegladiator__ joined	19:49
	← przemkovv left	19:49
	← dhilipsiva left	19:50
	← thegladiator__ left	19:50
	← eletuchy left	19:50
	← thegladiator_ left	19:50
	→ whoami_ joined	19:50
	← whoami_ left	19:50
	→ whoami_ joined	19:50
ldiamond	thiago: That's the thing, the branches from p4 trunk show up as linear (with no link to master) in git log --graph	19:50
	→ nbrosnahan joined	19:50
ldiamond	however, the initial commit has the same hash and all	19:51
	← devbug left	19:51
	→ przemkovv joined	19:51
	→ Gavrisim_ joined	19:51
	→ Watabou joined	19:53
	→ enape_101 joined	19:53
	← kermit left	19:53
	← Gavrisimo left	19:53
	← shwaiil left	19:53
	← joki left	19:53
	→ Noldorin joined	19:54
	→ diegoviola joined	19:54
	← whoami left	19:55
	whoami_ → whoami	19:55
	→ rcu joined	19:56
	[emmajane] → emmajane	19:57
	→ kenperkins joined	19:57
	← FortySix2 left	19:57
	← jaseemabid left	19:58
	← petey left	19:58
	→ szx joined	19:58
	→ petey joined	19:59
	← clarkfischer left	19:59
	← petey left	19:59
	→ lfaraone joined	19:59
lfaraone	Can I dpush to a git repository on the local filesystem?	19:59
	→ petey joined	19:59
lfaraone	dput git+file:// isn't supported, it looks like	19:59
imachuchu	lfaraone:	20:00
	← rwestphal left	20:00
	→ joki joined	20:00
imachuchu	lfaraone: sorry, you can push to a different local repo just fine	20:00
	lfaraone: never heard of dput before though	20:00
	← Raging_Hog left	20:01
	→ timthelion joined	20:01
	→ haukur joined	20:01
ldiamond	lfaraone, why dput?	20:01
	← magu\|q left	20:01
ldiamond	you want 'git push'	20:01
lfaraone	sorry, dpush	20:02
	→ Tommy[D] joined	20:02
	← haukur left	20:02
ldiamond	what is dpush?	20:02
lfaraone	I have a bzr repository, and I want to push it to a git repository using "bzr dpush"	20:02
	http://doc.bazaar.canonical.com/migration/en/foreign/bzr-on-git-projects.html	20:02
	← petey left	20:02
	← rethus left	20:02
	→ magu\|q joined	20:03
	→ petey joined	20:03
	→ iamjarvo joined	20:04
	→ arosenberg joined	20:04
	← jkremser left	20:04
	→ ZujkisNx joined	20:04
	← ZujkisNx left	20:04
	← marhaban left	20:05
	→ veebers joined	20:05
	← jerius left	20:06
imachuchu	lfaraone: what error does it give?	20:06
	← jhulten left	20:07
	← petey left	20:07
	→ guns joined	20:08
thiago	lfaraone: that's not really a Git question...	20:09
	lfaraone: maybe you should ask in the bzr channel	20:09
	→ Exodist joined	20:09
lfaraone	Oh, well, damn, joined the wrong channel.	20:09
	That's awkward.	20:09
	← blahdodo left	20:09
	→ blahdodo_ joined	20:10
	← pbrobst left	20:10
	→ rafaqueque joined	20:10
	→ Kayra joined	20:10
	← Imagineer left	20:11
	→ lavong joined	20:12
	→ \|Freeman\| joined	20:12
	← fairuz left	20:12
	← przemkovv left	20:12
	→ roscius joined	20:12
	→ przemkovv joined	20:13
	→ shuaib joined	20:13
pengunix	lol	20:14
	→ kcj joined	20:14
	← hwrd\|work left	20:14
	→ clarkfischer joined	20:15
	→ Nevik joined	20:15
	← kenperkins left	20:16
	→ jerius joined	20:16
	← roscius left	20:16
	→ eletuchy joined	20:16
	← Silmarilion left	20:16
	emmajane → [emmajane]	20:16
	→ trusktr joined	20:18
	→ halu_ joined	20:18
	→ jerius_ joined	20:19
	→ kenperkins joined	20:19
	→ aard_ joined	20:19
	→ szx` joined	20:19
	→ petey joined	20:20
	← mizu_no_oto left	20:20
	← jerius left	20:21
	← halu left	20:21
	→ kjellski joined	20:21
	→ endiruna joined	20:22
	← szx left	20:22
	→ teran joined	20:23
	→ hwrd\|work joined	20:23
	→ dkpi joined	20:24
	← halu_ left	20:25
	→ jhulten joined	20:25
	→ Bass10 joined	20:26
	← sayd left	20:26
	→ aknewhope joined	20:26
	→ sayd joined	20:26
	← erichynds left	20:27
	→ thierryp joined	20:27
	← Gavrisim_ left	20:27
	→ Gavrisimo joined	20:28
	→ ncd\|leeN joined	20:29
	← teran left	20:29
	→ juvenal joined	20:31
	← kenperkins left	20:31
	← sayd left	20:31
	→ Serus joined	20:32
	← leeN left	20:32
	← Gavrisimo left	20:33
	→ sayd joined	20:33
	→ whitby joined	20:33
	← whitby left	20:33
	← lavaman left	20:33
	→ whitby joined	20:33
	→ kenperkins joined	20:34
	→ jason237 joined	20:34
	← whitby left	20:34
	→ lavaman joined	20:34
	← endiruna left	20:34
	← rainbyte left	20:35
	→ whitby joined	20:35
	← eletuchy left	20:36
	→ phy1729 joined	20:36
	← chuckhar_ left	20:36
phy1729	how can I specify in .gitignore to ignore any directory that's named secrets anywhere in the repo?	20:37
	→ chuckharmston joined	20:37
	→ LuxuryMode joined	20:37
Serus	phy1729: regex	20:37
	→ frankperez87 joined	20:38
Serus	You can test it here: http://gskinner.com/RegExr/	20:38
	→ alvaro_o joined	20:38
Serus	let me look what I had into my .gitignore	20:38
frankperez87	question, how can i make it so that when i use git push, it prompts for a username and password	20:39
	i do not want to set the username in the url, as i have multiple people editing the same files in the same location	20:39
Serus	[A-z0-9\-][Dd]ebug/ will ignore every folder / file with the word debug in it	20:39
tubbo	frankperez87: if your server supports it, use https:// to connect	20:39
	frankperez87: so git remote add https://frankperez:yourpassword@github.com/frankperez/my_awesome_code.git	20:40
	http basic auth	20:40
frankperez87	it does, but its still not prompting for some reason on 1 project	20:40
	← lite_ left	20:40
tubbo	frankperez87: oh wait n/m you don't want the 'frankperez:yourpassword@' :D	20:40
	if you remove that it should then prompt you each time	20:40
frankperez87	i get 401 aunauthorized while accessing	20:40
	its not prompting :(	20:40
	→ SocalNick joined	20:40
Serus	phy1729: well not every folder, but atleast a folder that applies to the regex	20:41
	→ ninjon joined	20:41
	← chuckharmston left	20:41
ninjon	is there a way other than grep "revert" that I can do a git log and get only reverts? something along the lines of "git log --merges" ?	20:42
Serus	frankperez87: You have multiple accounts accessing from the same computer?	20:42
	→ xpe joined	20:42
frankperez87	Serus: yes from the same computer, and same user	20:42
	← thierryp left	20:42
frankperez87	but i would like to push as different users	20:42
	← petey left	20:42
Serus	Hmmm, no idea. I never had the need for that.	20:43
	→ petey joined	20:43
frankperez87	Serus: the odd thing is that its not prompting for a username	20:43
	it does for another project	20:44
	just not this one	20:44
	both projects are located on the same server	20:44
Serus	Do you have SSH keys set up?	20:44
	← iamjarvo left	20:44
frankperez87	no this is more of a trial thing, so its through https	20:44
Serus	uhm	20:44
frankperez87	im trying to get our devs here to use git over svn	20:44
	but i need a way for this username thing to work	20:44
	→ iamjarvo joined	20:44
Serus	Haha, I hope you succeed	20:44
frankperez87	me too lol	20:44
Serus	frankperez87: let them read this: http://hginit.com/	20:45
	← breakingthings left	20:45
Serus	It's mercurial, but the principles are the same.	20:45
	← davividal left	20:45
frankperez87	Serus: will do, what would be the best way to have multiple devs fetch and merge the latest changes to the live program	20:46
	→ dhilipsiva joined	20:46
Serus	frankperez87: You might have the user in the .git/config file though	20:46
	← Mars__ left	20:46
	← angasulino left	20:46
	→ petey_ joined	20:47
	← petey left	20:47
	→ Mars__ joined	20:47
Serus	I'm not sure if it	20:47
	is a good idea to modify that file though, so make backups	20:47
	→ thierryp joined	20:48
imachuchu	frankperez87: why do you have multiple devs working on the same computer/same user using the same repo (what's your setup)?	20:49
frankperez87	Serus: ah, i see the issue i think. the server has git version 1.7.1 while my computer has git version 1.8.3.1, which is the only difference i can see as to why a username prompt is showing or not	20:49
zumba_addict	i created a new branch this morning. I would like to drop/delete it. I don't care about the changes I made. Is this enough since I didn't push it? git branch -D cssfixes	20:49
tang^	frankperez87: i'd suggest looking at !gitolite to manage your users	20:49
gitinfo	frankperez87: Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/	20:49
	→ iamjarvo_ joined	20:49
JesseCW	Is there a setting to make git not add the "\ No newline at end of file"?	20:49
frankperez87	gitinfo: im using gitlab right now, which is working nice	20:49
	← Grant484 left	20:50
	← iamjarvo left	20:50
JesseCW	I don't have this problem on 1.8, but the 1.7.9 version I have on another server has this issue.	20:50
	→ Grant484 joined	20:50
	← iamjarvo_ left	20:50
frankperez87	imachuchu: the devs ssh into a server and work over ssh on the files on a dev website. once changes are approved they are moved over from dev to live	20:50
	→ iamjarvo joined	20:50
tang^	frankperez87: then check the gitlab documentation on how to make https work	20:50
frankperez87	currently using svn, but i'd like to get over to git	20:50
	https is working	20:51
	← dhilipsiva left	20:51
	← ninjon left	20:51
frankperez87	the username is not prompting when attempting to push from the server	20:51
tang^	sorry, go get https user authentication working	20:51
frankperez87	to the remote gitlab server	20:51
	← petey_ left	20:51
frankperez87	but it prompts when trying to push from a computer	20:51
	← Mars__ left	20:51
	← lavong left	20:52
	→ peper joined	20:52
	← Thra11 left	20:53
	← BiggFREE left	20:53
	→ halu joined	20:54
	szx` → szx	20:54
	→ pbrobst joined	20:54
	→ Mars__ joined	20:54
Serus	zumba_addict: TIAF?	20:55
	← gkatsev left	20:55
zumba_addict	TIAF?	20:55
	but it worked	20:55
	← Exodist left	20:55
EugeneKay	Try It And Flee.	20:56
	As learned in locksmith and bomb defusal schools	20:56
	← mdiers left	20:56
	EugeneKay ducks	20:56
bremner	TIAYF	20:56
zumba_addict	and :D	20:56
Serus	Try it and find out	20:57
zumba_addict	awesome!	20:57
Serus	EugeneKay: lol	20:57
	← iamjarvo left	20:57
zumba_addict	not sure if i tell that to some friends of mine in facebook if they'll get offended	20:57
	i'm very used to irc :)	20:57
	→ teran joined	20:57
	→ iamjarvo joined	20:57
	→ tpollard joined	20:58
	← grilix left	20:58
	→ grilix joined	20:58
	→ Exodist joined	20:59
	← JustinMac left	20:59
imachuchu	frankperez87: wouldn't the developers constently be stepping on eachothers toes since they are all working on the same website, on the same box, all at the exact same time?	20:59
	← smashwilson left	20:59
Serus	imachuchu: but it's warm and cuddly	21:00
	→ mdhopkins joined	21:00
	← iamjarvo left	21:01
	← enape_101 left	21:01
	→ iamjarvo joined	21:01
	→ angasulino joined	21:01
	→ tvw joined	21:01
	← tvw left	21:01
Serus	Btw	21:02
	I love you all	21:02
	because git	21:02
	→ mage_ joined	21:02
mage_	hello	21:02
	→ mizu_no_oto joined	21:02
	← grilix left	21:03
	→ eletuchy joined	21:03
mage_	any idea in which century will it be possible to remove a submodule git a simple git submodule remove ?	21:03
	→ ecube joined	21:03
	← dhruvasagar left	21:03
shuaib	so if I am on a branch called mybranch, and I perform $git rebase master, will this take commits out of my branch and apply them to master, or the other way around?	21:04
imachuchu	Serus: I agree completely, git has made coding a lot easier and this channel has made using git a lot easier	21:04
	→ endiruna joined	21:04
	← endiruna left	21:05
	→ endiruna joined	21:05
	→ dangayle joined	21:05
	← Exodist left	21:05
imachuchu	shuaib: it will take commits out of your branch, apply them to master, then point your branch to the end of the new commit chain (note that master will not move)	21:05
Serus	imachuchu: Yeah, I haven't decided between git and mercurial completely though.	21:05
	Does anybody use atlassian sourcetree?	21:06
shuaib	imachuchu, but then doesn't that change master?	21:06
thegorn	Serus: i've got a guy here that uses it a lot	21:06
shuaib	I mean if I push master after that, won't it have new commits?	21:06
imachuchu	Serus: I don't know much about mercurial, I definetly want to learn more about it and Bazaar	21:06
dangayle	I seem to remember a collaborative content editing system for web publishers that uses git as a backend. Does anyone remember/know what I'm talking about? I can't seem to find what I need	21:06
	→ tony_lechner joined	21:07
	← karavanjo_ left	21:07
shuaib	hmmm	21:07
imachuchu	shuaib: nope! So a branch is just a pointer to a commit, and while you created new commits the old commits are still there, which is where master is still pointing	21:07
shuaib	imachuchu, right	21:07
	← guns left	21:07
shuaib	I think I understand now	21:07
	cool	21:07
Serus	imachuchu: I'll write you down, I'm going to write a guide on how to setup atlassian sourcetree with P4Merge and codecompare. It works for both Git and mercurial :)	21:07
	→ joelm joined	21:07
	→ karavanjo_ joined	21:07
Serus	imachuchu: So I'll send you a link when it's done.	21:08
shuaib	imachuchu, if I perform rebase again, will it have any effect?	21:08
	→ chuckharmston joined	21:09
imachuchu	shuaib: effectively? no. I know that sometimes rebase will create new commits (because the edit times have now changed), but I'm not sure if this is one of those time. !tias	21:09
gitinfo	shuaib: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/1-basic-usage/tias.html may help with git-specific TIAS.	21:09
	→ Exodist joined	21:10
	← GT4066 left	21:10
imachuchu	Serus: ok, there's a good chance I'll be here	21:10
Serus	Cool :)	21:11
	→ zsolti joined	21:12
	→ Octalot joined	21:12
	← rouf left	21:12
	← nwertman left	21:12
	← waaron left	21:12
	→ rouf joined	21:13
shuaib	If there is a conflict during rebasing, after resolving the conflict manually, do I need to commit again?	21:14
	← sephii left	21:14
shuaib	Before continuing with rebase?	21:14
	← jooools left	21:15
m0viefreak	you can just do rebase --continue	21:15
	(just 'git add' everything first)	21:15
shuaib	right, thanks	21:15
	→ AutruiP joined	21:16
	← tjj_lt left	21:17
	→ ohkay joined	21:17
	→ FortySix2 joined	21:17
	← DolphinDream left	21:17
	← rubatdub left	21:18
	→ dreiss joined	21:18
	→ nwertman joined	21:19
	→ mdiers joined	21:21
	→ dsdeiz joined	21:21
	← paulweb515 left	21:22
	← eletuchy left	21:22
	← thierryp left	21:22
	→ thierryp joined	21:22
	→ breakingthings joined	21:22
	← GodEater left	21:23
	→ grilix joined	21:23
	→ attermr joined	21:24
	← rouf left	21:24
	← attermr left	21:25
	← CKyle left	21:25
	← timthelion left	21:25
	← dsdeiz left	21:25
	→ rouf joined	21:26
	→ petey joined	21:26
	→ GodEater joined	21:26
	← GodEater left	21:26
	→ GodEater joined	21:26
	← thierryp left	21:27
	← teran left	21:27
	← Mars__ left	21:28
	→ el3ctron joined	21:28
Serus	geordi: { a* foo = new a(); b bar; bar.Foo(a); } class a{ public: a():x(0){} int x; }; class b{ public: b(){} void Foo(a* A){ A->x++; cout << A->x << endl; } };	21:28
	→ CKyle joined	21:29
	→ kukks joined	21:29
	→ Mars__ joined	21:29
Serus	geordi: class a{ public: a():x(0){} int x; }; class b{ public: b(){} void Foo(a* A){ A->x++; cout << A->x << endl; } }; { a* foo = new a(); b bar; bar.Foo(a); }	21:29
	→ jwmann joined	21:29
Serus	woops	21:29
	← Mars__ left	21:29
Serus	wrong channel	21:29
	← nwertman left	21:29
	→ Mars__ joined	21:30
	→ akurilin joined	21:30
	← iamjarvo left	21:30
	← jhulten left	21:30
	← hahuang65 left	21:30
	→ enape_101 joined	21:31
	→ iamjarvo joined	21:31
	← akurilin left	21:31
	→ nwertman joined	21:31
frankperez87	It looks like in version 1.7.1-3, it does not prompt for a username if none is specified. When i manually compiled the latest version on the server, it then started prompting.	21:31
	← halu left	21:32
	→ akurilin joined	21:32
jwmann	I have a grunt action that watches for changed files and then auto-minifies. Problem is, I get tons of conflicts when collaborating with my team through git.. Any ideas on avoiding this?	21:32
	← lavaman left	21:32
Serus	frankperez87: Why not use github or bitbucket/	21:32
	→ kermit joined	21:32
	← sq-one left	21:32
	← corygibbons left	21:33
	← akurilin left	21:33
	← alvaro_o left	21:33
	→ lavaman joined	21:33
	→ akurilin joined	21:33
ojacobson	jwmann: what is conflicting?	21:33
	← akurilin left	21:34
	← thomas_b left	21:34
jwmann	ojacobson: The grunt script generates a unique build number every time it minifies a script. So when I make a commit, I commit that unique number, but when I pull, I pull someone elses uniquely generated number and there's a conflict	21:35
	← kevwil left	21:35
	→ Zeedox joined	21:35
	← iamjarvo left	21:35
	→ J1mm joined	21:35
	→ akurilin joined	21:35
ojacobson	Given two clean trees in the same state, if you run grunt in both of them, would it do the same thing in both of them? Or would one come out differently?	21:35
	(Barring trivia like timestamps.)	21:35
	← przemkovv left	21:36
frankperez87	Serus: It's nice to have it all internal and we have the servers, so why not use them. This way we can also have all our projects private for our customers	21:36
	→ ZujkisNx joined	21:36
	→ hara_ joined	21:36
	→ Silmarilion joined	21:36
frankperez87	Serus: Honestly, i also just wanted to play with the different git server setups to see what i like best too	21:36
	← ZujkisNx left	21:36
Serus	frankperez87: ok	21:36
	fair enough	21:36
	← hara_ left	21:36
	← akurilin left	21:36
	→ Imagineer joined	21:37
	→ akurilin joined	21:37
	→ richgilbank joined	21:37
	← cn28h left	21:37
	← bwreilly left	21:37
	← rouf left	21:38
	→ bwreilly joined	21:38
	← akurilin left	21:38
	← marthinal left	21:38
	← freeed left	21:39
	→ rouf joined	21:39
	← hellopat left	21:39
	→ akurilin joined	21:39
	→ iamjarvo joined	21:40
	← akurilin left	21:40
	→ jhulten joined	21:40
	→ akurilin joined	21:41
	→ thomas_b joined	21:41
	← akurilin left	21:42
jwmann	ojacobson: I'm not sure but that's not quite the issue	21:42
	→ harobed_ joined	21:42
	← diegoviola left	21:43
jwmann	I think it's unique for each build	21:43
	→ akurilin joined	21:43
	← sohail left	21:43
ojacobson	then your project is lost; it cannot be made to do the same thing twice	21:43
	← akurilin left	21:43
	← rouf left	21:44
ojacobson	but let's suppose that your grunt script actually _is_ repeatable	21:44
	(other than minor and transient details of no importance, like timestamps)	21:44
	→ akurilin joined	21:44
ojacobson	What would be lost if you kept grunt's output outside of git?	21:45
	← akurilin left	21:45
	→ canton7-mac joined	21:46
	← kenperkins left	21:46
	→ _Vi joined	21:46
	→ akurilin joined	21:46
	← Kicer86 left	21:46
	← richwestcoast left	21:47
	→ dhilipsiva joined	21:47
	← akurilin left	21:47
	→ cff_ joined	21:47
	← jlebar left	21:47
	→ cagedwisdom joined	21:47
	→ akurilin joined	21:48
	→ eletuchy joined	21:48
	← akurilin left	21:49
	→ lavong joined	21:49
	→ przemkovv joined	21:49
	→ akurilin joined	21:49
	← canton7-mac left	21:50
	→ Fandekasp joined	21:50
	→ hahuang65 joined	21:50
	← akurilin left	21:50
	→ akurilin joined	21:51
	← dhilipsiva left	21:51
	← akurilin left	21:52
	→ akurilin joined	21:53
	→ paulweb515 joined	21:53
	← AaronMT left	21:54
jwmann	ojacobson: Hmm, well nothing much really however I use beanstalk for deployment and it wouldn't quite workout if I didn't have the file…. hmmm wait	21:54
	← akurilin left	21:54
	→ groglogic joined	21:55
jwmann	If I ignore the min files only within the master and then compile them in staging, it would work out I think...	21:55
	→ akurilin joined	21:55
	→ rouf joined	21:55
	← akurilin left	21:57
	→ mklappstuhl joined	21:57
	→ thierryp joined	21:57
	← darkmaster777 left	21:57
jwmann	Actually.. damn	21:57
	→ akurilin joined	21:57
	← karstensrage left	21:58
	moondoggy → Guest66748	21:58
	← pengunix left	21:58
jwmann	I could ignore the min files but the min files aren't the problem, it's the scripts.php file that has a random number injected into it..	21:58
	← hyperboreean left	21:58
	→ hyperboreean joined	21:58
shuaib	can I $git checkout --ours <multiple files here?>	21:59
	← akurilin left	21:59
	← przemkovv left	21:59
shuaib	rather, instead of multiple files, all files?	21:59
	git checkout --ours . ?	21:59
	→ petey_ joined	21:59
	← petey left	21:59
	→ akurilin joined	21:59
ldiamond	I imported a perforce project to git. I configured the branches and all seems to be imported properly in the ref branches	22:00
imachuchu	shuaib: ? are you trying to checkout files from a particular commit?	22:00
shuaib	imachuchu, I pulled, and had conflicts	22:00
ldiamond	however, when I track the ref branches, the log doesn't show branches/merges	22:00
shuaib	but I just want to keep local changes	22:00
ldiamond	all the branches have a linear history starting at the first commit	22:00
	← akurilin left	22:00
	→ przemkovv joined	22:01
	→ akurilin joined	22:01
ldiamond	Is there a way to import those links such that a branch starts only at the branching point rather than the first commit of the trunk branch	22:01
	← petey_ left	22:01
	← matanya left	22:02
	← b3tamax left	22:02
	→ b3tamax joined	22:02
	→ matanya joined	22:02
	→ petey joined	22:02
	← rouf left	22:02
milki	ldiamond: what did you use to import?	22:02
	← akurilin left	22:03
	→ aarwine joined	22:03
	← \|Freeman\| left	22:03
	← alezost left	22:03
	→ rouf joined	22:03
ldiamond	milki git p4	22:03
	← lavaman left	22:03
	→ akurilin joined	22:04
milki	does it have documentation?	22:04
ldiamond	"git p4"? yes	22:04
ojacobson	ldiamond: what do you mean "such that a branch starts"?	22:04
milki	how do you configure branches with it?	22:04
	→ dreiss_ joined	22:05
	← akurilin left	22:05
ojacobson	Let's suppose I have a repository with one branch ('master'); I run 'git branch ldiamond master'; where does the 'ldiamond' branch start?	22:05
	← matanya left	22:05
ldiamond	ojacobson, suppose my p4 history starts with trunk for commits 1 - 3. Commit 4 is a branch (integration) to b1, commit 5-6 are on b1.	22:05
shuaib	aaaaaah, finally! Seems like I have successfully rebased my first complicated rebase	22:06
	darn it	22:06
	→ akurilin joined	22:06
	→ qlkzy joined	22:06
ldiamond	When I import with git p4, I get the two branches in refs, but both of them start at commit 1	22:06
	git log --graph doesn't show their relation	22:06
	← cannonball left	22:06
ldiamond	i.e. both branch have their full history	22:06
	← dreiss left	22:06
imachuchu	shuaib: first, I personally don't like pull just because of this (pull = fetch + merge), try just aborting your in progress merge	22:06
	← trusktr left	22:06
	← Imdsm left	22:06
	→ karstensrage joined	22:06
	← kukks left	22:06
	← weltall left	22:06
	← bgerber left	22:06
	← nuck left	22:06
ojacobson	ldiamond: consider my second question, then.	22:06
	← petey left	22:06
	← scampbell left	22:06
	← JesseCW left	22:07
	→ weltall2 joined	22:07
	← akurilin left	22:07
	→ kukks joined	22:07
	← kukks left	22:07
	→ kukks joined	22:07
	→ bgerber joined	22:07
ldiamond	The branch starts at the master's head	22:07
	→ petey joined	22:07
ojacobson	What git commands would I used to observe that relationship?	22:07
	→ PLejeck joined	22:07
	← jnavila left	22:07
	→ matanya joined	22:07
	→ lavaman joined	22:07
	← matanya left	22:07
	→ akurilin2 joined	22:07
	→ Imdsm joined	22:08
	← kukks left	22:08
	weltall2 → weltall	22:08
ojacobson	"would I use", excuse me.	22:08
	→ JesseC joined	22:08
ldiamond	right after the branching?	22:08
	→ matanya joined	22:08
ojacobson	Right after branching.	22:08
	← matanya left	22:08
	→ kukks joined	22:08
	← kukks left	22:08
	→ kukks joined	22:08
	← abelsiqueira left	22:08
	karstensrage → Guest30022	22:08
	JesseC → Guest78437	22:08
	← akurilin2 left	22:08
	← WaReZ left	22:09
	← amortimer_mbp left	22:09
	← Kaisyu left	22:09
	→ matanya joined	22:09
	→ akurilin2 joined	22:09
ldiamond	not sure what you're looking for really	22:09
	show-ref would work from what I understand	22:09
ojacobson	You have told me that the ldiamond branch begins at master.	22:10
	← akurilin2 left	22:10
	← kukks left	22:10
ojacobson	I am asking how you know this; I think the answer will be useful in telling you how to get git-p4 to behave the way you would prefer.	22:10
	← Guest78437 left	22:10
	→ kukks joined	22:10
ojacobson	If what you tell me about the ldiamond branch is true, then there must be some sign of it inside of git.	22:11
	→ akurilin2 joined	22:11
ojacobson	Otherwise it would just be a convention, and only true "from a certain point of view".	22:11
	→ JesseCW joined	22:11
	← JesseCW left	22:11
	← akurilin2 left	22:12
	← mdhopkins left	22:12
	→ akurilin2 joined	22:12
	← eletuchy left	22:13
	← hwrd\|work left	22:13
	← rouf left	22:14
	← akurilin2 left	22:14
	→ kh0d joined	22:14
	→ takamichi joined	22:14
	→ rouf joined	22:15
	→ akurilin2 joined	22:15
	← threesome left	22:15
	→ mdhopkins joined	22:15
	→ hwrd\|work joined	22:15
	→ JesseC joined	22:15
	← akurilin2 left	22:16
	← whitby left	22:16
	← JesseC left	22:16
	← rouf left	22:16
	→ JesseC joined	22:16
	→ akurilin2 joined	22:16
	← Pullphinger left	22:16
	[emmajane] → emmajane	22:16
	→ rouf joined	22:17
ldiamond	ojacobson, not sure where you're getting at though	22:17
	← akurilin2 left	22:18
	← denkr left	22:18
	← bwreilly left	22:18
ldiamond	I was just expecting to see diverging branches in the log	22:18
	→ akurilin2 joined	22:18
	→ zerowaitstate joined	22:18
ojacobson	git init kwatz; cd kwatz; for commit in c1 c2 c3; do git commit --allow-empty -m "$commit"; done; git checkout -b integration; for commit in c4 c5 c6; do git commit --allow-empty -m "$commit"; done; git log --graph --all	22:19
	← akurilin2 left	22:19
	← szx left	22:20
	← rouf left	22:20
	← thierryp left	22:20
ojacobson	you may find that enlightening.	22:20
	→ akurilin2 joined	22:20
ldiamond	well, I'm importing history that includes merges.	22:20
	not everything is fast-forward	22:20
	→ rouf joined	22:21
	emmajane → [emmajane]	22:21
ojacobson	and yet your question is about branches	22:21
	and my example is about branches	22:21
	← akurilin2 left	22:21
ldiamond	What I mean by my question is that the log doesn't show the branching/merging	22:22
	→ akurilin2 joined	22:22
ldiamond	(maybe it's not supported by git p4, which is also part of the question)	22:22
	I run git log from master btw	22:23
	← petey left	22:23
	← akurilin2 left	22:24
	→ petey joined	22:24
	→ h0v1g1 joined	22:24
	→ akurilin2 joined	22:24
	← h0v1g1 left	22:25
ldiamond	Like this: https://gist.github.com/anonymous/7778709	22:26
	→ akurilin3 joined	22:26
	→ kukks\|2 joined	22:27
	← akurilin2 left	22:27
	← kukks left	22:27
	← grilix left	22:27
	← akurilin3 left	22:27
bamj0rb	ldiamond: The log will show branching/merging with --graph.	22:28
	ldiamond: By default, the log only shows ancestors of HEAD (or whatever ref you specify) though, so not all branches.	22:28
	← m8 left	22:28
	→ WaReZ joined	22:28
	← gnoel left	22:28
bamj0rb	ldiamond: If you use --all then it will show all.	22:28
	← petey left	22:28
	→ teran joined	22:28
	→ IsoLinCHiP joined	22:28
	→ akurilin3 joined	22:29
	← Sonderblade left	22:29
	← cff_ left	22:29
	← jason237 left	22:29
	← b3tamax left	22:30
	← akurilin3 left	22:30
IsoLinCHiP	Hi, is there a way to add a submodule without automatically imidiatly cloning the added repo?	22:30
	← breakingthings left	22:30
ldiamond	Maybe my question wasn't well stated. When a branch was merged back to trunk in p4, git doesn't show it as a merge, but rather an independent commit.	22:30
	→ akurilin3 joined	22:31
	← Watabou left	22:31
	→ Octalot_ joined	22:31
	← Octalot left	22:31
bamj0rb	ldiamond: Even with --graph?	22:31
ldiamond	yea	22:31
bamj0rb	Then as far as Git is cocerned it was not a merge.	22:32
ldiamond	branches only ever diverge, they don't converge	22:32
	← akurilin3 left	22:32
ldiamond	yea, I'm just wondering if git p4 supports that	22:32
	but I just found git-p4s which states it supports: "Merge detection"	22:32
bamj0rb	Hmmm, not sure. Does p4 support branches/merges properly?	22:32
	→ akurilin3 joined	22:32
ldiamond	might be worth a shot	22:32
	I don't know, p4 is a pile of ...	22:33
	→ farmanimal joined	22:33
bamj0rb	Sounds a bit like a hack to work around p4's limitations. I wouldn't hold my breath. :P	22:33
	→ cjwelborn joined	22:33
	← LuxuryMode left	22:33
ldiamond	Yea I'm starting not to like the idea to import the p4 history	22:33
	← visy left	22:33
	← akurilin3 left	22:33
	← nilg left	22:33
	→ akurilin3 joined	22:34
	← teran left	22:34
ldiamond	or I'll just keep it minimal and forget about that detail	22:34
jrnieder	bamj0rb: p4 keeps track of merges in a similar way to how svn does it	22:34
	bamj0rb: http://www.perforce.com/perforce/r12.1/manuals/cmdref/integrated.html#1040665	22:34
bamj0rb	facepalm	22:35
	← looper left	22:35
	← akurilin3 left	22:35
bamj0rb	You'd think that Git would be able to do a half decent job of recreating that history then. As long as the right information is fed into the tool.	22:35
jrnieder	maybe it's just a patch waiting to be written ;-)	22:36
	→ akurilin3 joined	22:36
ldiamond	I'll see if we want to invest time on that	22:36
	→ sohail joined	22:36
	← sohail left	22:36
	→ sohail joined	22:36
ldiamond	If so I'll suggest patching git-p4.py and ill submit a pull request if it works	22:36
	← lavong left	22:36
	← zumba_addict left	22:36
jrnieder	ldiamond: see Documentation/SubmittingPatches for more hints on patching	22:37
	← akurilin3 left	22:37
	→ visy joined	22:37
jrnieder	ldiamond: short answer is "put up your changes somewhere and let [email@hidden.address] and Pete Wyckoff [email@hidden.address] know about them"	22:37
	← farmanimal left	22:37
	← xpe left	22:37
bamj0rb	ldiamond: I wouldn't count out git-p4 yet. Did you look into its branch detection options? Perhaps you just haven't configured it properly yet.	22:38
	→ akurilin3 joined	22:38
	→ alvaro_o joined	22:38
ldiamond	yea, I used git-p4 branchList config to setup the branches I want to keep	22:38
	Those are picked up just fine and setup as ref branches	22:38
bamj0rb	It certainly sounds like it should support them. The interface looks quite similar to that of git-svn, and it can detect branches fine as log as you configure it properly.	22:39
ldiamond	it's only missing the merge part	22:39
	← akurilin3 left	22:39
ldiamond	Maybe I'll try with branch-specs	22:39
	→ akurilin3 joined	22:39
	→ eletuchy joined	22:40
	← sgambino left	22:40
	← akurilin3 left	22:40
	→ Watabou joined	22:41
bamj0rb	Perforce definitely sounds like garbage. I'd definitely adopt GIt, even if it meant losing what little merge information Perforce has...	22:41
	→ akurilin3 joined	22:41
	← joaoh82 left	22:42
	← AutruiP left	22:42
	→ joaoh82 joined	22:42
	← akurilin3 left	22:42
	→ akurilin3 joined	22:43
	← pbrobst left	22:43
	← akurilin3 left	22:44
ldiamond	yea we are moving to git, but we'd like to keep as much history as possible	22:44
	← osmosis left	22:44
	→ Khisanth joined	22:45
	→ akurilin3 joined	22:45
bamj0rb	Perforce is proprietary isn't it? Make the company responsible preserve your history! :D	22:45
ldiamond	they make something called git-fusion	22:45
	which may give us the entire history, it just seem like a pain to setup	22:46
	→ sgambino joined	22:46
	← akurilin3 left	22:46
	→ thierryp joined	22:46
ldiamond	at least they figured out that they were on the wrong track and they're trying to adopt the distributed model	22:46
	→ akurilin3 joined	22:47
	← groglogic left	22:47
	→ dhilipsiva joined	22:47
	→ petey joined	22:48
	← akurilin3 left	22:48
	→ akurilin3 joined	22:49
	← akurilin3 left	22:50
	← jerius_ left	22:50
	→ Gavrisimo joined	22:50
	→ akurilin3 joined	22:51
	← irqq left	22:51
	→ pbrobst joined	22:51
	← akurilin3 left	22:52
	← skorgon left	22:52
	← ojacobson left	22:52
	← dhilipsiva left	22:52
	→ akurilin3 joined	22:53
	← aard_ left	22:53
	← zapb_ left	22:53
	← akurilin3 left	22:54
	→ akurilin3 joined	22:54
	← harobed_ left	22:54
	→ lun__ joined	22:55
	← mishok13 left	22:55
epta	How git-blame works? How it actually get the last modification revision of one particular line of code?	22:55
	← akurilin3 left	22:56
	→ akurilin3 joined	22:56
	→ jerius joined	22:56
	← matanya left	22:57
	← akurilin3 left	22:58
	← snag_ left	22:58
bamj0rb	It has to crawl backwards through the history.	22:58
	→ snag_ joined	22:58
bamj0rb	AFAIK.	22:58
	← bamj0rb left	22:58
	→ akurilin3 joined	22:59
	← Exodist left	22:59
	← Noldorin left	23:00
	← akurilin3 left	23:00
	→ g3orge joined	23:00
	← eletuchy left	23:00
	→ akurilin3 joined	23:00
	← Dougie187 left	23:01
	→ Beliq joined	23:01
	← akurilin3 left	23:02
	← angasulino left	23:02
	← TomyLobo left	23:02
	→ Exodist joined	23:02
	→ akurilin3 joined	23:02
	← mizu_no_oto left	23:02
	← snag_ left	23:03
	← mklappstuhl left	23:03
	← kcj left	23:03
	← akurilin3 left	23:04
	← infynyxx left	23:04
	→ matanya joined	23:04
	→ akurilin3 joined	23:05
	← akurilin3 left	23:06
	← calcifea left	23:06
	← sohail left	23:06
	→ akurilin3 joined	23:06
	← phile left	23:07
	Keridos_off → Keridos	23:07
	← pbrobst left	23:08
	← akurilin3 left	23:08
	→ akurilin3 joined	23:08
	← Skrypter left	23:09
	← Kayra left	23:09
	→ infynyxx joined	23:09
	← EnderWiggin left	23:09
	→ corygibbons joined	23:09
	← akurilin3 left	23:10
	→ akurilin3 joined	23:11
	→ Skrypter joined	23:11
	← g3orge left	23:11
	← kjellski left	23:12
	← akurilin3 left	23:12
	qsuscs → qsusOFFcs	23:13
	→ akurilin3 joined	23:13
	→ shinnya joined	23:13
	← akurilin3 left	23:14
	← Silmarilion left	23:14
	→ pbrobst joined	23:14
	→ jshawl joined	23:15
jshawl	oh hey #git	23:15
	→ akurilin3 joined	23:15
jshawl	what is something really cool you've done with git lately?	23:16
	← valgrind left	23:16
	← akurilin3 left	23:16
txomon\|home	jshawl, just a remake of my repo	23:17
	9 feature branches	23:17
	and now creating a custom integration linear master branch	23:17
	→ akurilin3 joined	23:17
jshawl	oh nice	23:17
	would love to see a `git log --pretty --oneline --decorate --graph --all` of your project	23:18
txomon\|home	I am now going for a merge/rebase workflow	23:18
jshawl	it's like an art form	23:18
txomon\|home	pfff	23:18
jshawl	yeah that's cool	23:18
	I always rebase my feature branches	23:18
	then merge into maste	23:18
	← akurilin3 left	23:18
jshawl	my goal is 0 merge commits	23:18
	← KillYourTV left	23:18
txomon\|home	you can still see previous work... github.com:mopidy/txomon	23:18
	and do a gitk --all	23:18
epta	Suppose I have some blob object X. It can be unpacked with `git cat-file blob X'. How to do it manually without git?	23:18
txomon\|home	xD	23:18
	← King_Hual left	23:18
	← kpreid left	23:19
txomon\|home	jshawl, I need a special workflow	23:19
	→ akurilin3 joined	23:19
	→ kpreid joined	23:19
	← thierryp left	23:19
txomon\|home	I am using my master branch for making builds, and need to have a linear history. But it's a integration branch	23:19
	so I will have to create an integration branch, and make snapshot of it	23:19
	;(	23:19
	→ KillYourTV joined	23:20
txomon\|home	I am still trying to work out how to do it	23:20
	← akurilin3 left	23:20
kpreid	why do you need a linear history?	23:20
	← FortySix2 left	23:20
jshawl	hmm to be honest I have no idea what unpacking a blob object means	23:21
txomon\|home	kpreid, I have people that follows my master history	23:21
	← chuckharmston left	23:21
txomon\|home	and they need to go back in history	23:21
	to other integration point	23:21
	→ akurilin3 joined	23:21
	→ chuckharmston joined	23:21
txomon\|home	epta, you mean you want to learn how unpack stuff?	23:21
SamB	txomon\|home: merges don't prevent that ...	23:22
	← akurilin3 left	23:22
kpreid	txomon\|home: that doesn't need linear history -- just make sure that you always merge to it, and the history of the branch will always be the first parent, so e.g. master~N will always be something on master	23:22
epta	txomon\|home: I'm kinda found the answer. It's compressed with zlib, so it could be unpacked with zpipe -d	23:22
kpreid	(that is: git checkout master; git merge --no-ff otherbranch)	23:22
	← caseydriscoll left	23:23
	→ akurilin3 joined	23:23
	→ shruggar joined	23:23
	→ caseydriscoll joined	23:23
txomon\|home	yeah I will go something like that, thought once merged, I get totally nocked out as to achieve a revert	23:23
	that's my problem	23:23
	today I tried to make a revert	23:23
	and just all went nuts	23:23
	because I can't revert a branch merge	23:24
	I need to revert each time I have merged that branch	23:24
	← akurilin3 left	23:24
txomon\|home	that's why I will go for making snapshots of the integration branch through helper integration branch	23:24
	→ akurilin3 joined	23:25
SamB	why the heck would you need to revert every time?	23:25
kpreid	yeah, I'm wondering about what the need for reverts is	23:25
	← petey left	23:25
SamB	I can see why it might be wanted occasionally, if a problem cropped up ...	23:26
kpreid	I mean, if you were removing bad changes you'd create a revert of the original change on a fix branch, test it, and then merge the revert	23:26
	← akurilin3 left	23:26
	→ petey joined	23:26
	← chuckharmston left	23:26
kpreid	but it sounds like you're trying to revert a merge instead	23:26
osse	2	23:26
	oops	23:26
	← _iron left	23:26
	→ gkatsev joined	23:26
txomon\|home	yeah, but the problem comes with when changes aren't in a single merge	23:26
	If I can fix it in the branch, it's all ok	23:26
kpreid	that shouldn't matter	23:26
txomon\|home	but if I want to remove such feature	23:27
	→ akurilin3 joined	23:27
txomon\|home	all the branch's features	23:27
	then I would need to go one by one	23:27
	→ thierryp joined	23:27
SamB	wait, why do you want to remove features? shouldn't you be more interested in removing bugs?	23:27
	← gkatsev left	23:27
txomon\|home	SamB, nope, because those features are buggy	23:27
	← akurilin3 left	23:28
txomon\|home	I am obliged to create them, and they want to test them with everything else	23:28
	and then they say, hey! I don't want this...	23:28
	and I ... just ... hate them	23:28
	← carbon2 left	23:28
SamB	shouldn't the testing be done before the merge is pushed to master?	23:28
	→ akurilin3 joined	23:28
txomon\|home	so the problem comes when you try to get to an stable version without breaking master history	23:28
	master == integration != stable	23:29
	but they want master == integration == stable	23:29
	← hwrd\|work left	23:29
	← Forkk left	23:29
	← hholtmann left	23:29
	← kermit left	23:29
	← zerowaitstate left	23:29
txomon\|home	usually master == stable, and they need to get that point on history	23:29
	← infynyxx left	23:29
	← akurilin3 left	23:30
txomon\|home	but when it isn't stable, I need to revert entire branches for a release	23:30
	← hobodave left	23:30
	→ AaronMT joined	23:30
txomon\|home	so that's how I ended up with this strange and horrible workflow	23:30
	← petey left	23:30
	→ akurilin3 joined	23:30
txomon\|home	a branch for integration branch's snapshots	23:30
	← ncd\|leeN left	23:31
	← ngladitz left	23:31
SamB	txomon\|home: why don't you use some kind of "pu" branch for integration testing?	23:31
	← VictorCL left	23:32
	← akurilin3 left	23:32
	→ ncthom91 joined	23:32
	← endiruna left	23:32
	→ akurilin3 joined	23:32
txomon\|home	SamB, yeah, in the new workflow, I will be using so	23:33
	← FerreusR left	23:33
	→ kermit joined	23:33
	← aknewhope left	23:33
	← akurilin3 left	23:33
	← rouf left	23:33
ncthom91	hey all, is there a way to find a file by a specific name across any of my branches?	23:34
	→ akurilin3 joined	23:34
ncthom91	idk which branch it might be on, or where exactly it woudl be, but i know it's name	23:34
epta	ncthom91: try `git grep filename $(git rev-list --all)'	23:35
	← akurilin3 left	23:35
SamB	epta: I didn't think grep searched filenames?	23:35
txomon\|home	integration => merge all interested feature branches, rebase in one commit with references to each feature branch merged in and cherry pick to master	23:36
	→ akurilin3 joined	23:36
ncthom91	epta i get "fatal: unable to read tree"	23:36
SamB	txomon\|home: that still sounds crazy ...	23:36
txomon\|home	yeah	23:36
	it is	23:36
	it's a hidden pu	23:36
	← takamichi left	23:36
txomon\|home	just think of that	23:36
	← Pyrogerg left	23:37
txomon\|home	take into account that everything has to be in relation to develop branch	23:37
	← akurilin3 left	23:37
	← acharlieh left	23:37
txomon\|home	I push features to develop	23:37
	on the one hand	23:37
	← CKyle left	23:37
txomon\|home	and on the other hand, I have to maintain a custom linear integration branch	23:37
	→ akurilin3 joined	23:38
	→ mribeirodantas joined	23:39
	← jerius left	23:39
	← enape_101 left	23:39
	← akurilin3 left	23:39
	→ DrShoggoth joined	23:39
	→ Kayra joined	23:39
	→ akurilin3 joined	23:40
	→ Dougie187 joined	23:40
	← akurilin3 left	23:41
	→ akurilin3 joined	23:42
	← jshawl left	23:42
	← akurilin3 left	23:42
	→ akurilin3 joined	23:43
ncthom91	hm ok so I found a branch with a diff that touches the file I need, but the file doesn't exist?	23:44
	→ Forkk joined	23:44
	← Kayra left	23:44
ncthom91	how can i get that file back?	23:44
	← Serus left	23:44
	← akurilin3 left	23:44
	← shinnya left	23:45
txomon\|home	ncthom91, git checkout <branch-name-or-commit-hash-of-the-file-version-you-want> <file-path>	23:45
	→ akurilin3 joined	23:45
	← akurilin3 left	23:46
ncthom91	txomon\|home yes thank you!	23:46
	→ canton7-mac joined	23:46
	← Skrypter left	23:47
	→ akurilin3 joined	23:47
	→ master_j joined	23:47
	→ dhilipsiva joined	23:48
	← akurilin3 left	23:48
	→ marhaban joined	23:49
	→ jshawl joined	23:49
	← frankperez87 left	23:49
landypro	for the uber pedantic git checkout <ref> -- <filename>	23:49
	just incase your filename is a refname :P	23:49
	→ akurilin3 joined	23:49
	← Forkk left	23:49
	← rcu left	23:49
	→ Forkk joined	23:50
	→ gnoel joined	23:50
	← akurilin3 left	23:50
	→ akurilin3 joined	23:51
	← J1mm left	23:51
	← canton7-mac left	23:52
	← gregsmith left	23:52
	← akurilin3 left	23:52
	→ Skrypter joined	23:52
	→ trusktr joined	23:52
	→ akurilin3 joined	23:52
	← dhilipsiva left	23:53
	← snql left	23:53
	← akurilin3 left	23:53
	juvenal → juvenal_away	23:54
	← Destos left	23:54
	→ akurilin3 joined	23:54
	juvenal_away → juvenal	23:55
	← akurilin3 left	23:55
	→ gregsmith joined	23:55
	← eijk left	23:55
	→ akurilin3 joined	23:56
	← Forkk left	23:56
	→ frem joined	23:57
	→ eletuchy joined	23:57
	← akurilin3 left	23:57
	→ akurilin joined	23:57
	← jonatasnona left	23:57
	← Celelaptop left	23:57
	→ FortySix2 joined	23:58
	← akurilin left	23:58
	→ iamjarvo_ joined	23:58
frem	How does one undo an accidental `git merge --rebase`? I grabbed the wrong branch.	23:58
	→ Forkk joined	23:59
	← Gamecubic left	23:59
	← primitive left	23:59

Logs Search ←Prev date Next date→

Channels Documentation