IRCloggy #git 2015-01-07

Provider of IRC logs since 2005.

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

	2015-01-07
	← barduck left	00:00
	← andi3 left	00:00
	← licnep left	00:00
	← baweaver left	00:00
	→ aidalgol joined	00:00
	→ baweaver joined	00:01
	→ Gitzilla joined	00:01
	→ robbyoconnor joined	00:02
	→ duderonomy joined	00:02
	← baweaver left	00:03
	← bgerber left	00:04
	→ tomaw joined	00:06
	← mezod_ left	00:08
	→ geomyidae_ joined	00:08
	→ bg__ joined	00:08
	→ teran joined	00:10
	→ pm90_ joined	00:10
	→ raub joined	00:11
	→ nuk3` joined	00:11
	← raub left	00:11
	← creep left	00:12
	← nuk3 left	00:12
	→ asakura joined	00:13
	← jagob left	00:13
	→ St_Marx joined	00:13
	→ otter768 joined	00:14
	← leeN left	00:14
	← iamshercoder left	00:15
	← teran left	00:15
	← konr left	00:15
	→ madewokherd joined	00:15
	→ cdown joined	00:15
	← nuk3` left	00:15
	→ baweaver joined	00:15
	← Matulis left	00:16
	→ bgerber joined	00:17
	← otter768 left	00:19
	← baweaver left	00:19
	→ wowaname joined	00:20
	→ setuid joined	00:20
	← caipora_ left	00:20
	→ raub joined	00:22
	← raub left	00:22
	→ wedgie joined	00:22
	← th3fallen left	00:24
	← SonikBoom left	00:24
	← intransit left	00:25
	→ th3fallen joined	00:25
	→ checkItOut joined	00:25
	← kpease left	00:26
	← Zamyatin left	00:26
	← luriv left	00:27
	← th3fallen left	00:28
	← checkItOut left	00:28
	→ SFLimey joined	00:29
	→ checkItOut joined	00:29
	→ intransit joined	00:30
	← zarubin_ left	00:31
	← pacbard left	00:31
	← opdavies left	00:32
	→ raub joined	00:32
	→ Zamyatin joined	00:32
	← raub left	00:33
	← mchvs left	00:34
	← WaReZ left	00:36
	→ baweaver joined	00:37
	→ bannakaffalatta joined	00:37
	← Etheco- left	00:40
	→ Etheco joined	00:41
	→ bobmarchman joined	00:41
	→ opdavies joined	00:41
	→ johtso joined	00:43
	← SpeedyGhost left	00:44
	← checkItOut left	00:46
	→ checkItOut joined	00:46
	→ teran joined	00:48
	← hcc23 left	00:48
	→ hcc23 joined	00:49
	← hyperair left	00:49
	→ medgno joined	00:49
	← opdavies left	00:50
	← s8321414 left	00:50
	← EvilPenguin left	00:51
	← tarkus_ left	00:51
	← mspo left	00:52
	→ teran_ joined	00:53
	→ raub joined	00:53
	← alvaro_o left	00:53
	← raub left	00:54
	← teran left	00:55
	→ valeriansaliou joined	00:55
	→ hahuang65 joined	00:55
	→ ohseap joined	00:56
	← bannakaffalatta left	00:59
	← dsirijus left	00:59
	← hcc23 left	00:59
	← jrahmy left	00:59
	← s00pcan_ left	00:59
	← echo-are` left	01:00
	← valeriansaliou left	01:00
	← fstd left	01:00
	→ hcc23 joined	01:00
	→ ag4ve_ joined	01:00
	→ fstd joined	01:00
	→ cagedwisdom joined	01:01
	→ pacbard joined	01:01
	→ nginx77 joined	01:01
	← n-st left	01:02
	← jazzzu left	01:03
	→ s00pcan_ joined	01:03
	← bgerber left	01:03
	← harish left	01:04
	→ law joined	01:04
	← law left	01:04
	→ mmoretti joined	01:05
	→ kukks joined	01:06
	← pm90_ left	01:06
	→ Drakevr joined	01:07
	← sbogg left	01:08
	→ bronson joined	01:10
	→ d4ryus joined	01:10
	← imachuchu left	01:11
	← baweaver left	01:11
	← Drakevr left	01:11
	→ Drakevr joined	01:11
	← basiclaser_ left	01:12
	→ eburcat joined	01:12
	→ sgen_ joined	01:12
	→ sburgess joined	01:13
	→ bpousland joined	01:13
d4ryus	hi, is there a way to run 'git stage --edit' with the configured difftool?	01:14
	← Zamyatin left	01:14
	← bronson left	01:14
	→ Asiajey joined	01:14
	→ AmR\|EiSa_ joined	01:14
	← txomon\|home left	01:15
	← dreiss left	01:16
	← daedeloth_ left	01:16
	← AmR\|EiSa left	01:17
	← eburcat left	01:17
	← myyst left	01:17
	← checkItOut left	01:18
	→ myyst joined	01:18
	→ checkItOut joined	01:18
	→ noriakioji joined	01:18
	→ johnkevinmbasco joined	01:18
	← ag4ve_ left	01:19
	← noriakioji left	01:19
	→ hfp_ joined	01:19
	← hfp left	01:20
	← checkItOut left	01:20
	hfp_ → hfp	01:20
	→ checkItOut joined	01:20
	← hfp_work left	01:20
	← myyst left	01:21
	→ myyst joined	01:21
	→ lululo joined	01:21
	→ hfp_work joined	01:21
	gitinfo set mode: +v	01:22
	← Sasazuka_ left	01:22
	← t0th_-_ left	01:22
	→ ag4ve_ joined	01:22
	← zumba_ad_ left	01:22
	← jerius left	01:23
	← shinnya_ left	01:23
	→ zumba_addict joined	01:23
	← checkItOut left	01:23
	→ raub joined	01:24
	← myyst left	01:24
	← raub left	01:24
	→ myyst joined	01:25
	→ akiva joined	01:25
	← mmoretti left	01:25
	→ Sasazuka_ joined	01:25
	→ Zamyatin joined	01:27
	← myyst left	01:27
	→ baweaver joined	01:28
	→ myyst joined	01:28
lululo	Question: I have two branches, call them `dev` and `prod`. Dev is sort of a staging/testing branch to build from, and when a release is ready we merge from dev to prod (there's a release in the middle, but it's the same concept). I'd like to consolidate the commits into a single new commit, which appears to be what `git merge --squash` is for. However, `--squash` seems to show every commit to `dev`, not just the new ones since the last	01:28
	What should i be using, to achieve the desired squash and shorter commit message?	01:29
	→ t0th_-_ joined	01:29
	← liamkeily left	01:29
lululo	In case this isn't clear. Add 5 commits to dev, merge squash shows 5 commits. This is good. Add another 5 commits to dev, merge squash now shows 10 commits.. but only 5 of those are new.	01:30
	← myyst left	01:31
	→ myyst joined	01:31
	← ohseap left	01:32
	← Zamyatin left	01:32
	← EminenceHC left	01:34
	← myyst left	01:34
	→ myyst joined	01:35
	← baweaver left	01:35
	← nikio_ left	01:36
	→ Guest38649 joined	01:36
	Sasazuka_ → Sasazuka_1234	01:36
	Sasazuka_1234 → Sasazuka_5678	01:37
aberrant	lululo: in dev, can you do a git rebase -i HEAD~n where n is the number of commits you want to squash?	01:37
	Sasazuka_5678 → Sasazuka_	01:37
	← robustus left	01:37
aberrant	then follow the instructions in your editor re: squashing	01:37
	← myyst left	01:37
lululo	aberrant: Probably, i'm new to modifying the history - I had believed squash was the solution to my needs. Is rebase where i should focus my attention then?	01:38
	→ myyst joined	01:38
aberrant	rebase -i will bring up your commits in an editor, then you change “pick” to “squash” for the ones you want to squash	01:38
Guest38649	fatal: unable to auto-detect email adress (got 'computer@user.none')	01:38
	how can I solve this?	01:38
aberrant	Guest38649: use a real email address?	01:38
	→ robustus joined	01:38
	← herrbischoff left	01:38
Guest38649	aberrant, I am using my real email adresss	01:39
lululo	I had hoped there was a simple "merge squash since last merge" style command, it seems that squash is intended for feature branches that should be thrown away after	01:39
	← rcampbel3 left	01:39
aberrant	git config —global user.email [email@hidden.address]	01:39
	Guest38649 → _Mateo_W	01:39
	← pipegeek left	01:40
	→ herrbischoff joined	01:40
_Mateo_W	aberrant, I did that command and then I checked with git config --list	01:40
aberrant	_Mateo_W: …and?	01:40
_Mateo_W	it appears that my email is correctly set up but then I get this error when i try to commit	01:40
	→ jon-mac joined	01:41
aberrant	you might have it set locally.	01:41
	← ag4ve_ left	01:41
	← myyst left	01:41
aberrant	do a git config user.email [email@hidden.address] in the repo itself.	01:41
	→ myyst joined	01:41
	Guest78789 → greves	01:41
	← greves left	01:42
aberrant	_Mateo_W: also, is it an error on commit, or on push?	01:42
_Mateo_W	on commit	01:42
aberrant	hm.	01:42
	← snits left	01:43
	→ dannymichel joined	01:43
aberrant	_Mateo_W: do a git config --local -l in the repo also to make sure	01:43
	← sburgess left	01:44
	← phos1 left	01:44
	← myyst left	01:44
_Mateo_W	it showed something different after doing the previous command CRLF will be replaced by LF in program.java	01:44
	so it commited correctly this time	01:44
aberrant	ok	01:44
_Mateo_W	what is what message?	01:44
	→ myyst joined	01:44
_Mateo_W	CRLF...	01:44
aberrant	it means you haven’t set your handling of crlf	01:45
	google the error for the options.	01:45
	→ raub joined	01:45
_Mateo_W	yep doing it	01:45
	thanks for help	01:45
	→ k_sze[work] joined	01:46
aberrant	np	01:46
	← andschwa_ left	01:46
	→ andschwa_ joined	01:46
	← bpousland left	01:46
	andschwa_ → andschwa	01:46
	→ daito joined	01:47
	← myyst left	01:47
	→ [cust] joined	01:47
	→ myyst joined	01:48
	← bitkiller left	01:49
_Mateo_W	aberrant, so what was the problem tho? why does it work for current directory but not when you add global to it?	01:49
	→ fairuz joined	01:49
aberrant	_Mateo_W: because your local git config is overriding the global settings	01:49
	you can see it in .git/config at the base of your repo	01:49
	← checkit left	01:50
	→ barduck joined	01:50
	← myyst left	01:51
	→ myyst joined	01:51
	→ EminenceHC joined	01:51
_Mateo_W	I see	01:51
	→ Zamyatin joined	01:52
	→ bsm117532 joined	01:52
	← yaymukund left	01:52
	← Zamyatin left	01:53
	← myyst left	01:54
	→ myyst joined	01:54
	← brucelee left	01:55
	→ smccarthy joined	01:56
	← EminenceHC left	01:56
	← ajustrun left	01:57
	← zivester left	01:57
	← myyst left	01:57
	→ myyst joined	01:58
	→ zivester joined	01:58
	← myyst left	02:00
	← Sasazuka_ left	02:01
	→ myyst joined	02:01
	← intransit left	02:02
	→ harish joined	02:03
	← myyst left	02:04
	→ myyst joined	02:04
	→ intransit joined	02:05
	→ tachoknight joined	02:06
	← fairuz left	02:06
	← Takle left	02:06
	→ fairuz joined	02:06
	→ Akagi201 joined	02:07
	← myyst left	02:07
	← nfk left	02:08
	→ myyst joined	02:08
	→ qwebirc92123 joined	02:08
	→ hyperair joined	02:08
	← devoldmx left	02:08
	← lululo left	02:09
	← bsm117532 left	02:10
	← myyst left	02:11
	→ myyst joined	02:11
	→ wakd joined	02:12
	← pheaver left	02:13
	← myyst left	02:14
	← PrasangChhetri left	02:14
	→ myyst joined	02:14
	→ otter768 joined	02:15
	→ hafeez3000 joined	02:15
	→ echo-area joined	02:15
	← akushner left	02:17
	← myyst left	02:17
	← tachoknight left	02:18
	→ myyst joined	02:18
	→ devoldmx joined	02:18
	← otter768 left	02:20
	← gsingh93 left	02:20
	← myyst left	02:20
	→ orafu joined	02:21
	→ pm90_ joined	02:21
	→ myyst joined	02:21
	← myyst left	02:24
	→ myyst joined	02:24
	→ Consuela joined	02:24
	→ Vampire0_ joined	02:25
	→ Goplat joined	02:25
	← myyst left	02:27
	→ tachoknight joined	02:27
	← pm90_ left	02:28
	→ myyst joined	02:28
	← Vampire0 left	02:29
	← Caius left	02:29
	← myyst left	02:30
	← nginx77 left	02:31
	← johnkevinmbasco left	02:31
	→ myyst joined	02:31
	← tachoknight left	02:32
	← myyst left	02:34
	→ lachm joined	02:34
	→ Lyqyd joined	02:34
	→ myyst joined	02:34
	← looper left	02:34
	→ Caius joined	02:35
	→ devoldmx3 joined	02:35
	→ looper joined	02:36
	→ dreiss joined	02:36
	← myyst left	02:37
	→ tachoknight joined	02:38
	→ myyst joined	02:38
	← Walex left	02:38
	→ yaymukund joined	02:39
	← smccarthy left	02:39
	→ johnkevinmbasco joined	02:39
	← devoldmx left	02:39
	← tieTYT2 left	02:40
	→ Walex joined	02:40
	← Wulf left	02:40
	← myyst left	02:40
	→ myyst joined	02:41
	← johnny2600 left	02:42
	→ Wulf joined	02:42
	→ ohseap joined	02:43
	→ bgerber joined	02:43
	→ srcerer joined	02:43
	← myyst left	02:44
	→ valeriansaliou joined	02:44
	→ UKn0Me joined	02:44
	→ myyst joined	02:44
	→ weiyang joined	02:45
	← hafeez3000 left	02:46
	→ Malsasa joined	02:46
	← lachm left	02:46
	← qwebirc92123 left	02:46
	→ lachm joined	02:46
	← myyst left	02:47
	→ myyst joined	02:47
	← ohseap left	02:47
	→ d10n-work joined	02:48
	← nowhere_man left	02:48
	→ nowhereman joined	02:48
	← valeriansaliou left	02:49
	→ luc_ joined	02:49
	← barduck left	02:50
	← myyst left	02:50
	← pandeiro left	02:51
	← Malsasa left	02:51
	→ myyst joined	02:51
	← omosoj left	02:52
	← geomyidae_ left	02:52
	← medgno left	02:53
	← lachm left	02:53
	→ jottr joined	02:53
	→ EminenceHC joined	02:53
	← myyst left	02:54
	→ myyst joined	02:54
	→ tmcmahon joined	02:55
	← tachoknight left	02:56
	← doev left	02:56
	→ doev joined	02:56
	← dreiss left	02:56
	→ rchavik joined	02:57
	← myyst left	02:57
	→ bannakaffalatta joined	02:57
	← yaymukund left	02:57
	→ myyst joined	02:57
	← jottr left	02:57
	nowhereman → nowhere_man	02:58
	→ tachoknight joined	02:58
	← EminenceHC left	02:58
	← xp_prg left	02:59
	→ bronson joined	02:59
	→ xp_prg joined	02:59
	← rchavik left	02:59
	→ rchavik joined	02:59
	← russt left	03:00
	← sgen_ left	03:00
	← scriptThis left	03:00
	← myyst left	03:00
	← mnml left	03:01
	→ myyst joined	03:01
	← robbyoconnor left	03:01
	← tachoknight left	03:01
	← dannymichel left	03:02
	← bronson left	03:03
	→ eslbaer__ joined	03:03
	← myyst left	03:03
	← orafu left	03:04
	→ nickpresta joined	03:04
	→ myyst joined	03:04
	→ brucelee joined	03:04
	← bgerber left	03:05
	← zumba_addict left	03:06
	← dm7freek left	03:06
	→ zumba_addict joined	03:06
	← eslbaer_ left	03:06
	← myyst left	03:07
	← raven-au left	03:07
	→ myyst joined	03:07
	→ george88_ joined	03:08
	→ devoldmx joined	03:09
	← brucelee left	03:09
	← nickpresta left	03:10
	← myyst left	03:10
	→ raven-au joined	03:11
	→ myyst joined	03:11
	→ pwnz0r joined	03:13
	→ nginx77 joined	03:13
	← myyst left	03:13
	← devoldmx left	03:13
	→ myyst joined	03:14
	→ smccarthy joined	03:14
	← myyst left	03:17
	→ myyst joined	03:17
	← Noldorin left	03:18
	← lindenle left	03:18
	← msonntag left	03:18
	← Akagi201 left	03:18
	→ Akagi201 joined	03:19
	→ msonntag joined	03:19
	← myyst left	03:20
	→ myyst joined	03:20
	→ bgerber joined	03:21
	→ cannonball joined	03:22
	→ jrahmy joined	03:23
	← fandi left	03:23
	← myyst left	03:23
	→ dreiss joined	03:24
	→ myyst joined	03:24
	← FreezingCold left	03:25
	← myyst left	03:27
	→ myyst joined	03:27
	← githogori left	03:28
	← darkbasic left	03:28
	→ darkbasic joined	03:29
	→ dm7freek joined	03:29
	← myyst left	03:30
	→ myyst joined	03:30
	→ rcampbel3 joined	03:30
	→ s8321414 joined	03:31
	→ dik_dak joined	03:31
	→ skorgon joined	03:33
	← myyst left	03:33
	→ myyst joined	03:34
	→ Dougie187 joined	03:34
	← myyst left	03:36
	→ myyst joined	03:37
	← daito left	03:37
	→ daito joined	03:38
	← t0th_-_ left	03:38
	→ t0th_-_ joined	03:39
	← jmpp left	03:40
	← myyst left	03:40
	→ myyst joined	03:40
	← daito left	03:42
	← myyst left	03:43
	→ jmpp joined	03:43
	← t0th_-_ left	03:44
	→ myyst joined	03:44
	→ sword joined	03:45
	_Mateo_W → Mateo	03:46
	Mateo → Guest71214	03:46
	← myyst left	03:46
	Guest71214 → _Mateo_W	03:47
	→ myyst joined	03:47
	← luc_ left	03:47
	→ scriptThis joined	03:48
	← jmpp left	03:48
	→ Malsasa joined	03:49
	← myyst left	03:50
	→ myyst joined	03:50
	← UKn0Me left	03:51
	← s8321414 left	03:53
	← myyst left	03:53
	→ nikio_ joined	03:53
	→ myyst joined	03:53
	→ SmileyChris joined	03:53
	→ s8321414 joined	03:53
overyander	does anyone know if bitbucket git repos are bare?	03:54
	→ mookins joined	03:54
SmileyChris	hi hi, if I have some staged files, how can I change the working files back to they are in the stage (i.e. drop the un-staged changes)?	03:54
mookins	Hi, I have a question regarding a method of maintaining a project using Git. I want to use Apache OfBiz, then develop custom code and modify some code, but also be able to keep up to date with the codebase coming from upstream for the base.	03:55
	Is there any recommended method for going about this?	03:55
	← myyst left	03:55
	→ myyst joined	03:56
	→ tokik joined	03:56
	→ Anon126 joined	03:57
SmileyChris	ah, it's just git checkout :P	03:57
J1G\|Anon126	overyander: I don't see why it matters...	03:57
	→ EminenceHC joined	03:57
J1G\|Anon126	mookins: the way I would suggest is to commit the upstream version first, then make a separate branch for upstream updates	03:58
	← myyst left	03:58
	→ FAMAS joined	03:58
	← FAMAS left	03:58
	← rcampbel3 left	03:59
	→ myyst joined	03:59
	→ FAMAS joined	03:59
	← FAMAS left	03:59
	→ consti joined	03:59
	← consti left	03:59
mookins	So a branch for upstream, which I keep in sync with upstream, then merge that back into my codebase ?	03:59
J1G\|Anon126	right	03:59
mookins	ah yeah that makes sense. Thanks	04:00
	→ FAMAS joined	04:00
	→ FreezingCold joined	04:00
	← FAMAS left	04:00
	→ pipegeek joined	04:01
	← EminenceHC left	04:01
	→ consti joined	04:01
	← consti left	04:01
	→ FAMAS joined	04:01
	← FAMAS left	04:01
	← pipegeek left	04:01
	← SmileyChris left	04:01
	→ daito joined	04:02
	→ FAMAS joined	04:02
	← FAMAS left	04:02
	← myyst left	04:02
	→ FAMAS joined	04:02
	← FAMAS left	04:02
	→ myyst joined	04:02
	← myyst left	04:05
	→ myyst joined	04:05
	→ qwebirc92123 joined	04:05
	→ FAMAS joined	04:07
	→ The_Phoenix joined	04:07
	→ APerson_ joined	04:08
	← myyst left	04:08
	→ Unopoo joined	04:09
	→ myyst joined	04:09
	← _Mateo_W left	04:10
	→ subhojit777 joined	04:10
	← Unopoo left	04:12
	← myyst left	04:12
	→ myyst joined	04:12
	← myyst left	04:15
	→ larzen joined	04:15
larzen	I have a question..how do i undo a merge?	04:15
	→ otter768 joined	04:15
	→ myyst joined	04:15
larzen	someone just merged a tonne of old garbage.. now I need to undo it	04:16
	← enitiz left	04:17
larzen	anyone?	04:18
	→ beautifulmind joined	04:18
	→ lindenle joined	04:18
J1G\|Anon126	larzen: is it the last commit on the current branch?	04:18
	← myyst left	04:19
	← Asiajey left	04:19
	→ myyst joined	04:19
	→ Asiajey joined	04:20
	← otter768 left	04:20
	← APerson_ left	04:20
	→ jitendravyas joined	04:21
	← myyst left	04:21
	→ myyst joined	04:22
larzen	J1G\|Anon126: yes it is	04:22
	J1G\|Anon126: i looked at some tutorials, but I am not that well versed with git	04:23
J1G\|Anon126	larzen: essentially you are resetting to a prior commit	04:23
	*you can reset	04:23
	git reset --hard [old commit]	04:23
larzen	and then push?	04:23
	← lindenle left	04:23
	← kukks left	04:23
larzen	J1G\|Anon126: yes, I did that...now I need make that change permanent for everyone else	04:24
J1G\|Anon126	yes, but you need to "force push" by adding a + before the branch name	04:24
	git push origin +branch	04:24
	→ gfixler joined	04:24
larzen	what is +branch?	04:24
	← myyst left	04:25
larzen	'master' ?	04:25
J1G\|Anon126	larzen: the branch that has the merge	04:25
	→ myyst joined	04:25
larzen	J1G\|Anon126: its all in the 'master' branch	04:26
	so its giving me an error	04:27
	remote: error: denying non-fast-forward refs/heads/master (you should pull first)	04:27
J1G\|Anon126	larzen: add the plus sign: +master	04:27
	← myyst left	04:27
	→ johnny2600 joined	04:27
	← aliteralmind left	04:27
	→ myyst joined	04:27
larzen	git reset --hard <sha> and then git push origin +master	04:28
J1G\|Anon126	right	04:28
larzen	this is the error I get: remote: error: denying non-fast-forward refs/heads/master (you should pull first)	04:28
	then when I pull, I am back at the bad marge again, on top	04:28
J1G\|Anon126	larzen: some sites don't allow them...	04:29
larzen	oh this is our own repo	04:30
J1G\|Anon126	larzen: in that case, you need to configure it to allow force pushes	04:30
	I'm not sure what application you use to provide it, so you would need to check	04:30
larzen	just running git on linux on both ends	04:30
	← myyst left	04:31
	← smccarthy left	04:31
	→ myyst joined	04:31
	→ hafeez3000 joined	04:32
	→ valeriansaliou joined	04:33
	← J1G\|Anon126 left	04:33
	Anon126 → J1G\|Anon126	04:33
	← myyst left	04:33
	→ myyst joined	04:34
larzen	J1G\|Anon126: ah.. got it..	04:34
	denyNonFastforwards = true was int he config	04:35
J1G\|Anon126	I see	04:35
larzen	ok =) I think I got it	04:35
	so where did this bad merge go now? was it expunged?	04:35
	→ ag4ve_ joined	04:36
J1G\|Anon126	larzen: it'll stay for about 2 weeks in case you want it, but it's not "publicly visible"	04:36
	→ phantomtiger joined	04:36
larzen	oh perfect	04:36
	its basically garbage	04:36
	→ UKn0Me joined	04:37
	← myyst left	04:37
	← aidalgol left	04:37
	← devoldmx3 left	04:37
	→ myyst joined	04:37
	← valeriansaliou left	04:38
	→ dik_dak_ joined	04:38
	→ bhws joined	04:38
	← dik_dak_ left	04:39
	→ huglester_ joined	04:40
	← dreiss left	04:40
	← myyst left	04:40
	→ myyst joined	04:41
	→ ReekenX joined	04:41
	← ReekenX left	04:41
	→ russt joined	04:41
	← dik_dak left	04:42
	← huglester left	04:42
	→ cods joined	04:43
	← jitendravyas left	04:43
	← myyst left	04:43
	→ jitendravyas joined	04:44
	→ myyst joined	04:44
	← hcc23 left	04:45
	→ aesinv joined	04:45
	← c0ded left	04:46
	← Dougie187 left	04:46
	← myyst left	04:47
	← tmcmahon left	04:47
	→ myyst joined	04:47
	← Milk_weed left	04:48
	→ bronson joined	04:48
	← Akagi201 left	04:49
	← Consuela left	04:49
	→ irqq joined	04:50
	← myyst left	04:50
	→ arnaud__ joined	04:51
	→ myyst joined	04:51
	→ saurabh joined	04:52
	← bronson left	04:52
	saurabh → Guest60159	04:52
	← myyst left	04:53
	→ dreiss joined	04:54
	→ myyst joined	04:54
	← jstimm left	04:54
	→ proteneer joined	04:54
proteneer	HEAD detached from 32af433	04:54
	what the bloody fuck?	04:55
J1G\|Anon126	proteneer: it means you are not on any branch. git checkout [some branch] to "reattach"	04:55
	← myyst left	04:57
	→ myyst joined	04:58
	→ devoldmx joined	04:58
	→ EminenceHC joined	04:58
	→ bheesham joined	04:58
	← myyst left	05:00
	→ myyst joined	05:00
	→ zumba_ad_ joined	05:01
	→ apurcell joined	05:01
	← g3danken left	05:01
	← jitendravyas left	05:02
	← devoldmx left	05:02
	→ akushner joined	05:02
	→ jitendravyas joined	05:02
	← EminenceHC left	05:03
	← nikio_ left	05:03
	← zumba_addict left	05:03
	← myyst left	05:03
	→ jstimm joined	05:04
	← bgerber left	05:04
	→ myyst joined	05:04
offby1	seek medical attention immediately	05:04
	→ dik_dak joined	05:06
	← bhws left	05:06
	← apurcell left	05:06
	→ EspadaV8 joined	05:06
	← myyst left	05:07
	→ kukks joined	05:07
	→ SwedFTP joined	05:07
	→ myyst joined	05:07
	← m0viefreak left	05:09
	← cannonball left	05:09
	← myyst left	05:10
	→ myyst joined	05:11
	← akushner left	05:11
	→ Tommy[D]_ joined	05:11
	← johnny2600 left	05:11
	← george88_ left	05:11
	→ bhws joined	05:11
	← aesinv left	05:11
	→ pheaver joined	05:12
	← myyst left	05:13
	→ myyst joined	05:13
	← Tommy[D] left	05:14
	← jitendravyas left	05:16
	← irqq left	05:16
	← myyst left	05:16
	→ myyst joined	05:17
	← pwnz0r left	05:18
	← The_Phoenix left	05:19
	← ag4ve_ left	05:19
	→ ManikM joined	05:19
	→ jitendravyas joined	05:19
	← myyst left	05:20
	← Sleepy63 left	05:20
	→ myyst joined	05:20
	← jitendravyas left	05:21
	← myyst left	05:23
	→ myyst joined	05:23
	← phantomtiger left	05:25
	← myyst left	05:26
	→ myyst joined	05:27
	← myyst left	05:29
	→ devoldmx joined	05:29
	→ myyst joined	05:30
	← thiago left	05:30
	→ zoso joined	05:30
	← mookins left	05:33
	← myyst left	05:33
	→ ag4ve_ joined	05:33
	→ myyst joined	05:34
	→ devoldmx_ joined	05:34
	← devoldmx left	05:34
	→ jitendravyas joined	05:36
	← myyst left	05:37
	→ myyst joined	05:37
	← jitendravyas left	05:39
	→ jitendravyas joined	05:39
	← s8321414 left	05:39
	← myyst left	05:39
	→ myyst joined	05:40
	→ bgerber joined	05:41
	AmR\|EiSa_ → AmR\|EiSa	05:41
	← kukks left	05:43
	→ jnavila joined	05:43
	← zivester left	05:43
	← myyst left	05:43
	← madewokherd left	05:44
	→ myyst joined	05:44
	→ jmpp joined	05:45
	← myyst left	05:46
	→ myyst joined	05:47
	→ nikio_ joined	05:47
	← FreezingCold left	05:49
	→ watabou joined	05:49
	← intransit left	05:49
	← johnkevinmbasco left	05:50
	← hafeez3000 left	05:50
	← jmpp left	05:51
	← mkoskar left	05:51
	→ ckruczek joined	05:52
	→ hafeez3000 joined	05:52
	← myyst left	05:54
	← joelm left	05:54
	← scientes left	05:54
	→ myyst joined	05:54
	← bhws left	05:58
	← J1G\|Anon126 left	05:59
	→ J1G\|Anon126 joined	06:00
	← skorgon left	06:01
	→ EminenceHC joined	06:02
	→ Error404NotFound joined	06:02
	← J1G\|Anon126 left	06:04
	→ J1G\|Anon126 joined	06:04
	→ luriv joined	06:04
	→ apurcell joined	06:05
	← FAMAS left	06:05
	→ FAMAS joined	06:05
	← Tuna-Fish left	06:06
	→ Anon126 joined	06:06
	← EminenceHC left	06:06
	← Anon126 left	06:07
	← J1G\|Anon126 left	06:07
	← apurcell left	06:09
	← eslbaer__ left	06:09
	→ J1G\|Anon126 joined	06:10
	→ RustyBakra joined	06:10
	→ wachterjohannes joined	06:13
	← UKn0Me left	06:13
	← beautifulmind left	06:14
	→ thiago joined	06:14
	→ bhws joined	06:16
	← Fretta_ left	06:16
	← RustyBakra left	06:16
	→ Fretta joined	06:16
	→ otter768 joined	06:16
	← Fretta left	06:17
	→ Tuna-Fish joined	06:17
	→ RustyBakra joined	06:18
	← polyzen left	06:18
	→ beautifulmind joined	06:19
	→ bronson joined	06:19
	← dreiss left	06:20
	→ lindenle joined	06:20
	← otter768 left	06:21
	→ ehmatthes joined	06:21
	→ intransit joined	06:21
	→ valeriansaliou joined	06:22
	→ Consuela joined	06:22
	← bronson left	06:23
	← dik_dak left	06:23
	→ licnep joined	06:24
	← lindenle left	06:25
	→ mkoskar joined	06:26
	→ Raging_Hog joined	06:26
	← valeriansaliou left	06:26
	← Consuela left	06:26
	← jnavila left	06:28
	→ aswen joined	06:28
	→ flugo joined	06:29
	→ zumba_addict joined	06:29
	← J1G\|Anon126 left	06:30
	ChanServ set mode: +o	06:31
	Eugene changed the topic to: Welcome to #git, the place for git help and illegal rebases \| Current stable version: 2.2.1 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| git commit crim PUT DOWN THAT GUN AND HANDS UP IN THE AIR!	06:31
milki	the e doesnt render for me o.O	06:31
Eugene	That's because it's an ellipsis	06:32
milki	aw	06:32
	Eugene changed the topic to: Welcome to #git, the place for git help and illegal rebases \| Current stable version: 2.2.1 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| git commit crim... PUT DOWN THAT GUN AND HANDS UP IN THE AIR!	06:32
	Eugene set mode: -o	06:32
milki	maybe i just have the wrong font	06:32
	→ tarkus joined	06:33
	← zumba_ad_ left	06:33
CareBear\	Eugene set it in latin1 instead of utf8	06:34
	← aswen left	06:34
Eugene	I'd have to care	06:34
milki	i think it shoudl be an em-dash	06:34
CareBear\	Eugene : you american?	06:34
	→ apurcell joined	06:35
	→ pantsman- joined	06:35
	→ barduck joined	06:35
	← russt left	06:36
	→ joo-_ joined	06:37
	← intransit left	06:37
	→ irqq joined	06:38
	← apurcell left	06:39
	← KevinMGranger left	06:42
	← joo-_ left	06:42
	→ ThomasLocke joined	06:43
	→ mikiones_ joined	06:43
	→ intransit joined	06:44
	← hvxgr left	06:44
	← licnep left	06:44
	← mikiones left	06:46
	→ J1G\|Anon126 joined	06:47
	→ pwnz0r joined	06:47
	← nofxx left	06:48
	→ KevinMGranger joined	06:48
	← jitendravyas left	06:48
	← bhws left	06:50
	← govg left	06:50
	→ jnavila joined	06:50
	← nginx77 left	06:51
	→ nginx77 joined	06:52
	← nginx77 left	06:52
	→ govg joined	06:52
	← frdmn left	06:52
	→ rom1504 joined	06:54
	→ apurcell joined	06:54
	← raven-au left	06:54
	← pantsman- left	06:54
	→ nisseni joined	06:55
	→ brucelee joined	06:55
	→ raven-au joined	06:56
	→ tgkokk joined	06:56
	→ rishabh__ joined	06:57
	← bobmarchman left	06:57
	← J1G\|Anon126 left	06:57
	← beautifulmind left	06:57
	→ thevishy joined	06:57
	→ Sammy8806 joined	06:57
	→ jitendravyas joined	06:58
	→ EminenceHC joined	06:58
	→ alanwill_ joined	06:58
	← ThomasLocke left	06:59
	← apurcell left	06:59
	→ frdmn joined	06:59
	→ J1G\|Anon126 joined	06:59
	← alanwill left	07:00
	← jon-mac left	07:00
	← EminenceHC left	07:03
	← jnavila left	07:04
	→ freimatz joined	07:05
	← thevishy left	07:05
	→ Marcus___ joined	07:05
	← jaydubya left	07:06
	→ jaydubya joined	07:06
	→ bluesm joined	07:06
	→ EminenceHC joined	07:07
bluesm	Does „.git” extension have any meaning ?	07:07
	→ k4rtik joined	07:09
	→ zivester joined	07:09
	← johtso left	07:10
	← alanwill_ left	07:10
	→ alanwill joined	07:10
	← jaydubya left	07:11
	→ settermjd joined	07:11
	← EminenceHC left	07:11
	→ HelloShitty joined	07:11
	→ apurcell joined	07:12
	→ hvxgr joined	07:14
	→ sinkensabe joined	07:14
ckruczek	its THE git directory	07:15
	← Lyqyd left	07:15
	→ wrouesnel joined	07:15
	← apurcell left	07:16
	→ thevishy joined	07:18
	→ Manny joined	07:19
	← ManikM left	07:19
	→ alip joined	07:19
	← Goplat left	07:19
	→ acolson joined	07:21
	← alip left	07:21
	← eightyeight left	07:22
	← settermjd left	07:23
	← jitendravyas left	07:23
	← HelloShitty left	07:23
	→ szx joined	07:23
	→ Sleepy63 joined	07:24
	→ alip joined	07:25
	← doev left	07:25
	→ eightyeight joined	07:26
	← alip left	07:27
	→ Kicer86 joined	07:27
	← luriv left	07:27
	← intransit left	07:27
	← fairuz left	07:27
	→ eburcat joined	07:27
	→ bronson joined	07:27
	→ alip joined	07:28
	→ AmR\|EiSa_ joined	07:28
	→ fairuz joined	07:28
	→ rasto joined	07:28
	→ Gizburdt joined	07:28
	→ PCatinean joined	07:28
	→ luriv joined	07:28
	← Asiajey left	07:29
	← AmR\|EiSa left	07:30
	← Gizburdt left	07:30
	← ome left	07:31
	← sinkensabe left	07:31
	→ sebhoss joined	07:32
	→ Gizburdt joined	07:32
	← bronson left	07:32
	→ Asiajey joined	07:32
	← luriv left	07:34
	→ lyang0 joined	07:34
	→ jitendravyas joined	07:35
	← ehmatthes left	07:37
	← tgunr left	07:37
	→ thierryp joined	07:37
	← thevishy left	07:38
	→ Takle joined	07:39
RustyBakra	Can a git repository have a name? like bar.git .	07:40
	→ marthinal joined	07:40
	→ rjc joined	07:40
	← Marcus___ left	07:41
	← bheesham left	07:41
	→ asdpew joined	07:41
	→ Macaveli joined	07:41
	← Asiajey left	07:42
RustyBakra	Can a git repository have a name? like bar.git .If so how to do that ? may be git init <repository name >??	07:42
	→ nilg joined	07:43
	→ anybroad_ joined	07:43
RustyBakra	Can a git repository have a name? like bar.git .If so how to do that ? may be git init <repository name >??	07:43
	← arnaud__ left	07:43
	← Takle left	07:44
	→ sinkensabe joined	07:44
	← foulou left	07:44
	→ arnaud__ joined	07:44
bremner	RustyBakra: repeating yourself is not helping.	07:44
ckruczek	RustyBakra: repeating your question does not speed up the answers	07:44
	← tpollard left	07:45
ckruczek	just name your directory bar.git and make a git init	07:45
	→ Asiajey joined	07:45
	← Asiajey left	07:45
	→ Asiajey joined	07:45
	← anybroad left	07:45
bremner	RustyBakra: or indeed "git init bar.git" ; note that .git is usually used for bare repositories. See !bare for more	07:45
gitinfo	RustyBakra: an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/	07:45
	← zivester left	07:46
	← D-Boy left	07:47
	→ D-Boy joined	07:47
	→ VimFleed joined	07:48
	← mkoskar left	07:48
	← arnaud__ left	07:48
RustyBakra	bremner: ckruczek : gitinfo : Thank you	07:48
gitinfo	RustyBakra: you're welcome, but please note that I'm a bot. I'm not programmed to care.	07:48
	← Asiajey left	07:49
	→ opdavies joined	07:49
	→ Xethron joined	07:50
	← Xethron left	07:50
	→ Xethron joined	07:50
	→ Asiajey joined	07:51
	← Asiajey left	07:51
	→ Asiajey joined	07:51
	→ tjm_jimmy joined	07:52
	← tjm_jimmy left	07:52
	← sinkensabe left	07:53
	→ tjm_jimmy joined	07:53
	→ Amandil joined	07:53
	← nisseni left	07:53
	← tjm_jimmy left	07:53
	→ tjm_jimmy joined	07:54
	← Asiajey left	07:55
	→ sinkensabe joined	07:56
	← sinkensabe left	07:56
	→ Asiajey joined	07:56
	← Asiajey left	07:56
	→ Asiajey joined	07:56
	→ sinkensabe joined	07:56
	← qwebirc92123 left	07:57
	→ bobmarchman joined	07:57
	← sinkensabe left	07:58
	→ surs joined	07:58
	← szx left	07:58
	→ sinkensabe joined	07:58
	← watabou left	07:58
	→ c0ded joined	07:59
	→ fandi joined	08:00
	← sinkensabe left	08:00
cbreak	RustyBakra: you can rename repositories as much as you want	08:01
	→ rafaelcpalmeida joined	08:01
	← asdpew left	08:01
	← opdavies left	08:02
	→ asdpew joined	08:02
	→ sinkensabe joined	08:02
	← bobmarchman left	08:02
	→ Nizumzen joined	08:03
	← surs left	08:03
	→ surs joined	08:04
	→ robbyoconnor joined	08:04
	← robbyoconnor left	08:04
	→ robbyoconnor joined	08:04
	→ sgen__ joined	08:04
	→ EminenceHC joined	08:04
	← sebhoss left	08:05
	→ wcpan joined	08:05
	← tgkokk left	08:05
	→ hebz0rl joined	08:05
	← rafaelcpalmeida left	08:06
	flugo → bhavul	08:07
	→ Marcus___ joined	08:07
	→ attile_the_hun joined	08:07
	← pwnz0r left	08:08
	→ tjm_jimm_ joined	08:08
	← sgen__ left	08:09
	← EminenceHC left	08:09
	→ lindenle joined	08:09
	← Asiajey left	08:10
	← MLM left	08:10
	← surs left	08:10
	→ valeriansaliou joined	08:10
	← sinkensabe left	08:11
	→ Asiajey joined	08:11
	← Asiajey left	08:11
	→ Asiajey joined	08:11
	→ sinkensabe joined	08:11
	→ surs joined	08:11
	← attile_the_hun left	08:12
	→ attile_the_hun joined	08:12
	→ EminenceHC joined	08:12
	← tjm_jimmy left	08:13
	← attile_the_hun left	08:13
	→ regan joined	08:13
	→ Xiti` joined	08:13
	→ omosoj joined	08:13
	→ attila_the_hun joined	08:13
zumba_addict	is it possible to show when we created a local branch?	08:14
	← bhavul left	08:14
	← attila_the_hun left	08:14
zumba_addict	I would like to show them from oldest to newest	08:14
	→ bhavul joined	08:14
	← sinkensabe left	08:14
	← lindenle left	08:14
zumba_addict	i mean, i would like the output of git branch to be in order from oldest to newest	08:14
	← Gizburdt left	08:14
	→ sinkensabe joined	08:15
	→ psoo joined	08:15
	← sinkensabe left	08:15
	→ sinkensabe joined	08:15
	← proteneer left	08:15
zumba_addict	found the command, ignore please. thanks	08:16
grawity	Git does not store that information	08:16
	→ Gizburdt joined	08:16
	← Asiajey left	08:16
	→ otter768 joined	08:17
	→ Asiajey joined	08:17
	← Asiajey left	08:17
	→ Asiajey joined	08:17
	← EminenceHC left	08:17
	→ vurma joined	08:17
	→ dreiss joined	08:18
omosoj	how do i remove the changes i make to one particular file from a commit?	08:18
	(creation of hte file, actually)	08:18
grawity	omosoj: is it the latest commit?	08:18
omosoj	no, modification, sorry	08:18
	no	08:18
	wait - yes	08:18
osse	omosoj: undo the changes you made; git add file; git commit --amend	08:19
omosoj	sorry, i'm not sure i understand teh question	08:20
ckruczek	is the commit already pushed ?	08:20
omosoj	no	08:20
	→ aliouii_ joined	08:20
omosoj	but the file existed in the earlier commit	08:20
	→ ThomasLocke joined	08:20
ckruczek	so you want undo the changes of one particular file of the last commit you made, right?	08:21
	← otter768 left	08:22
osse	git checkout HEAD~1 -- file; git commit --amend	08:23
	→ Pixi_ joined	08:23
ckruczek	yep exactly	08:23
osse	That's the "fully automatic" way to make it as if the latest commit didn't touch file	08:23
omosoj	ok, i see.	08:23
	← Asiajey left	08:24
omosoj	hmm, still learning git :) very interesting stuff	08:24
	→ Takle joined	08:24
omosoj	is there a way to view the changes made to a particular file? git diff shows the files changed...	08:24
	→ nour joined	08:25
	→ Asiajey joined	08:25
omosoj	hm, --cached did the job	08:25
	← c0ded left	08:25
	→ sebhoss joined	08:26
	→ ome joined	08:26
	→ hexagoxel joined	08:26
	→ joo-_ joined	08:26
	← Xiti` left	08:26
osse	that's not what --cached does. if it works it means you staged the file	08:26
	(ie. git add)	08:26
	→ seschwar joined	08:27
omosoj	yeah i did that :\|	08:27
	← vurma left	08:28
osse	that's not a bad thing in itself	08:28
	→ c0ded joined	08:28
omosoj	(and btw when i wrote git diff above, i meant git status)	08:28
	(but did do git diff --cached)	08:28
	is pushing to a remote repo nervewracking for everyone? i'm afriad i'm going to screw something up and the entire company is going to collapse :/	08:29
osse	git diff shows changes that are not yet staged. git diff --cached shows changes that have been staged.	08:29
	← Bryzzle left	08:29
	→ Lefter1s joined	08:29
omosoj	i see, thank you.	08:29
	← joo-_ left	08:29
ckruczek	omosoj: yes it can be if you are doing bad stuff, like rewriting history without knowing about it and forcing a push :D	08:30
	← tjm_jimm_ left	08:30
	→ thevishy joined	08:30
	→ GGflags joined	08:31
omosoj	git push origin <newbranchname> <- will upload a new branch to the remote repo, right?	08:31
osse	yes	08:31
	you might want to add -u to that command. that means in the future you only need to type git push	08:31
	→ The_Phoenix joined	08:32
	← harish left	08:32
	← Nikoli left	08:32
	→ mlechner joined	08:32
	← pheaver left	08:33
omosoj	k, ty	08:33
	→ BlaXpirit joined	08:34
	→ liamkeily joined	08:34
	← robbyoconnor left	08:35
	→ jmpp joined	08:35
omosoj	ok, i think that went okay, lol	08:35
	→ machbio joined	08:35
omosoj	thanks guys	08:35
	→ Radivarig joined	08:36
	← omosoj left	08:37
	← Asiajey left	08:37
	→ andi3 joined	08:37
	→ Trudko joined	08:38
	→ rsv joined	08:38
	→ nnyk joined	08:38
	→ Asiajey joined	08:39
	← Asiajey left	08:39
	→ Asiajey joined	08:39
	← c0ded left	08:39
	→ c0ded joined	08:39
rsv	i have a directory which contains a git repo	08:39
	how can i import that repo into existing; i want to do git cherry-pick	08:40
	← jmpp left	08:40
	← Amandil left	08:41
j416	rsv: git remote add foo path/to/foo	08:41
	rsv: where foo is the other repo	08:41
	→ jceb joined	08:42
	← fairuz left	08:42
	→ szx joined	08:42
	→ Amandil joined	08:42
	← thiago left	08:43
	← mikiones_ left	08:43
	← jitendravyas left	08:44
rsv	j416: i get the error foo is not a valid remote name	08:44
osse	change foo into bar	08:45
	→ robbyoconnor joined	08:45
iveqy	rsv: !repro	08:45
gitinfo	rsv: [!transcript] 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 raise the odds of getting your problem fixed from about 30% to about 90%.	08:45
	→ nagromlt joined	08:46
	→ jottr joined	08:46
	← Amandil left	08:47
	→ Asenar joined	08:48
	← tarkus left	08:49
	← CustosL1men left	08:49
	← rjc left	08:50
	← brucelee left	08:50
	→ rjc joined	08:51
	→ jaydubya joined	08:54
	← Takle left	08:55
	→ lb1a joined	08:55
	← jottr left	08:57
	← rsv left	08:58
	← valeriansaliou left	08:58
	→ bobmarchman joined	08:59
	← jaydubya left	08:59
	→ encod3 joined	08:59
	← akiva left	09:00
	← szx left	09:01
	→ fairuz joined	09:01
	← aliouii_ left	09:02
	← Asiajey left	09:02
	← Gamecubic left	09:03
	← bobmarchman left	09:03
	→ Asiajey joined	09:04
	→ jatt joined	09:04
	← Asiajey left	09:04
	→ Asiajey joined	09:04
	← VimFleed left	09:04
	← jatt left	09:04
	→ jatt joined	09:04
	→ rath joined	09:05
	→ petersr joined	09:07
	→ ishi joined	09:08
ishi	Hi all	09:08
ckruczek	hi	09:08
	← petersr left	09:08
ishi	Can some one please tell me how to push from a different directory ?	09:09
	→ Jackneill joined	09:09
	← sinkensabe left	09:09
	← liamkeily left	09:09
tobiasvl	ishi: what do you mean?	09:09
ishi	i mean , give the path to the push command	09:09
	→ Amandil joined	09:09
osse	ishi: git -C path push	09:09
ishi	i am at c:\ and i want to push the content of c:\test1\	09:09
	Thanks :)	09:09
	at linux to ?	09:09
	→ sinkensabe joined	09:10
	→ jazzzu joined	09:10
ishi	Thanks a lot	09:10
iveqy	ishi: yes, however why don't you just change dir to test?	09:10
ishi	i'm trying to Automate a script and its suppose to run in windows and in linux as well	09:11
	a process*	09:11
	← sinkensabe left	09:11
ishi	i prefer not to start using chdir	09:12
	Thanks all for you help	09:12
	→ sinkensabe joined	09:12
osse	yes	09:12
	← bgerber left	09:12
	→ Nothing4You joined	09:12
	← nardev left	09:13
	→ King_Hual joined	09:14
	← King_Hual left	09:14
	→ King_Hual joined	09:14
	← RustyBakra left	09:14
	→ CustosL1men joined	09:15
	→ caipora_ joined	09:15
	→ netcarver joined	09:15
	← Asiajey left	09:16
	→ EminenceHC joined	09:16
	→ bronson joined	09:16
	→ bgerber joined	09:17
	→ Asiajey joined	09:17
	← Asiajey left	09:17
	→ Asiajey joined	09:17
	← ishi left	09:17
	→ joo-_ joined	09:18
	← osse left	09:18
	← kjelle left	09:18
	← Manny left	09:19
	→ osse joined	09:19
	→ kjelle joined	09:19
	→ ManikM joined	09:19
	← osse left	09:19
	→ osse joined	09:19
	→ Takle joined	09:19
	→ pacon joined	09:19
	→ jagob joined	09:20
	→ marcogmonteiro joined	09:20
	← joo-_ left	09:20
	→ vurma joined	09:21
	← bronson left	09:21
	→ JoshLopes joined	09:21
	← Asiajey left	09:21
	→ rejuvyesh joined	09:21
	← EminenceHC left	09:21
	→ sigv joined	09:21
	← cobakobodob left	09:22
	→ zadock joined	09:22
	→ Asiajey joined	09:22
	← Asiajey left	09:22
	→ Asiajey joined	09:22
	→ joo-_ joined	09:23
	→ mnml joined	09:24
	← hexagoxel left	09:25
	← Gizburdt left	09:28
	→ UKn0Me joined	09:28
	← weiyang left	09:28
	→ gsingh93 joined	09:30
	→ twoface88 joined	09:30
	→ Gizburdt joined	09:31
	→ mikecmpbll joined	09:31
	→ alekks joined	09:32
	← alekks left	09:37
	← andi3 left	09:38
	→ mikiones joined	09:39
	← tyreld left	09:39
	→ mezod joined	09:41
	← dreiss left	09:41
	→ hexagoxel joined	09:41
	← ManikM left	09:42
	← howlymowly left	09:42
	← kcj left	09:44
	→ tyreld joined	09:44
	→ howlymowly joined	09:44
	→ jitendravyas joined	09:45
	← caipora_ left	09:46
	← The_Phoenix left	09:47
	← Amandil left	09:48
	← Asiajey left	09:49
	← infernix left	09:49
	→ The_Phoenix joined	09:49
	→ ManikM joined	09:49
	→ cobakobodob joined	09:49
	→ Asiajey joined	09:50
	← twoface88 left	09:50
	AmR\|EiSa_ → AmR\|EiSa	09:51
	← machbio left	09:51
	→ adzynia joined	09:52
surs	hi, how can I push to a remote repository? I am getting fatal does not appear to be a remote repository, all though I was able to check out the project	09:53
osse	surs: what does git remote -v say	09:54
j416	surs: what did you type?	09:54
	← kadoban left	09:54
surs	osse: origin <ip> (fetch)	09:54
	osse: origin <ip> (push)	09:55
	← glandium left	09:55
osse	surs: I want to know the <ip> part	09:55
	http? ssh? git?	09:55
surs	j416: git push --set-upstream origin master	09:55
	just an ip, no protocol	09:55
j416	surs: that part looks good	09:55
	← tobiasvl left	09:56
osse	and fetch works?	09:56
surs	well... I got the whole project directory into my local directory	09:56
	I was hoping for just the code files	09:56
	so something is not right	09:56
	→ infernix joined	09:57
osse	you did a clone at some point right?	09:57
	→ wakd_ joined	09:57
surs	the command I used was git clone user@<ip>:/srv/git/proj.git	09:57
	← Mogget left	09:57
osse	that's SSH	09:58
surs	right, and I provided a pw	09:58
osse	As far as I know then git push should work and ask you for the pw	09:58
	← wakd left	09:58
	← lb1a left	09:58
surs	ok, I created a directory, wrote some code, saved it in said direcctory and now want it to push to an existing remote repository, what is the preferred way to do that?	09:59
osse	this directory is somewhere inside the project you cloned right?	09:59
surs	I initiated a local repo (first mistake?) and then git added the files, committed, cloned and then pushed. Now I have a mess	10:00
	→ beautifulmind joined	10:00
osse	init and then cloned?	10:00
	seems to me you have a repo inside a repo then	10:00
surs	yes, init locally	10:00
	yep, I already removed the inside repo. So I do it without locally initiating?	10:00
osse	yes	10:01
	← ManikM left	10:01
surs	ok, now I have my initial local status. my code files, nothin else in the local directory	10:01
osse	what does git remote -v say now?	10:01
surs	I also remove the local .git?	10:01
	→ lb1a joined	10:01
surs	as in to start over completely	10:02
osse	ok, this is a mess. I don't know what you want to do. Do you wnat to contribute to the project at <ip>? Or do you want to create a new project ?	10:02
surs	I want to contribute to the existing project and obtain what's already up there	10:02
	← lb1a left	10:03
osse	git clone user@<ip>:/srv/git/proj.git; cd proj; do you work; git add new stuff; git commit; git push	10:03
	→ achadwick joined	10:03
	← Asiajey left	10:04
	← adzynia left	10:04
	← thevishy left	10:04
	→ glandium joined	10:05
	→ Asiajey joined	10:05
	← Asiajey left	10:05
	→ Asiajey joined	10:05
CareBear\	surs : the way git works (and probably any other vcs too) is that you first acquire a working set of files from the common server, and then make local changes.	10:05
	→ ManikM joined	10:07
	← glandium left	10:07
surs	CareBear\: yes that makes sense	10:08
	thanks osse	10:08
	→ RaceCondition joined	10:09
	← joo-_ left	10:10
	→ adzynia joined	10:10
	← Asiajey left	10:11
	→ rglarsen joined	10:11
	→ teran joined	10:11
	→ Asiajey joined	10:12
	← Asiajey left	10:12
	→ Asiajey joined	10:12
	← teran_ left	10:14
	← Klumben left	10:14
	← FAMAS left	10:15
	→ FAMAS joined	10:16
	→ opdavies joined	10:16
	← Asiajey left	10:17
	→ llakey joined	10:17
	→ Asiajey joined	10:18
	→ otter768 joined	10:18
	→ tvl joined	10:18
	→ joo-_ joined	10:18
	tvl → tobiasvl	10:18
	← ruukasu left	10:19
	→ EminenceHC joined	10:19
	→ chiemseesurfer joined	10:20
	→ teran_ joined	10:20
	→ okanck joined	10:20
	→ thevishy joined	10:20
	← daito left	10:21
	→ Amandil joined	10:21
	← cdown left	10:21
	→ daito joined	10:21
	← barduck left	10:22
	← teran left	10:23
	← otter768 left	10:23
	→ vtunka joined	10:23
	→ Klumben joined	10:24
	← EminenceHC left	10:24
	→ cdown joined	10:24
	← daito left	10:26
	→ murph joined	10:26
	→ d4ryus___ joined	10:26
	murph → Guest48713	10:27
	→ harish joined	10:27
	→ lb1a joined	10:27
	→ jds joined	10:28
	→ jost joined	10:28
	← hafeez3000 left	10:29
	← d4ryus left	10:29
	→ hafeez3000 joined	10:29
	← asdpew left	10:31
	← okanck left	10:31
	← Asiajey left	10:31
	← opdavies left	10:31
	→ Asiajey joined	10:33
	← Asiajey left	10:33
	→ Asiajey joined	10:33
	→ gccostabr joined	10:35
	→ opdavies joined	10:37
	← cdown left	10:38
	→ eslbaer__ joined	10:38
	← Asiajey left	10:38
	← FAMAS left	10:39
	→ Asiajey joined	10:39
	← Asiajey left	10:39
	→ Asiajey joined	10:39
	← awkwardusername left	10:40
	→ glandium joined	10:40
	→ rendar joined	10:40
	← fairuz left	10:43
	→ dannymichel joined	10:43
	→ jaydubya joined	10:43
	← thierryp left	10:44
	← Amandil left	10:44
	← flughafen left	10:44
	← joel_falcou left	10:45
	→ thierryp joined	10:45
	→ thierryp_ joined	10:46
	← thierryp left	10:46
	← jazzzu left	10:46
	→ ruukasu joined	10:46
	→ valeriansaliou joined	10:47
	→ bobmarchman joined	10:48
	← jaydubya left	10:48
	→ roelmonnens joined	10:48
	→ qwebirc92123 joined	10:49
	← opdavies left	10:50
	→ musician2000 joined	10:51
	← valeriansaliou left	10:52
	← bobmarchman left	10:52
	→ kcj joined	10:55
	→ ecky--ptang-zoob joined	10:55
	← kcj left	10:56
	← thierryp_ left	10:57
	← beautifulmind left	10:57
	← Asiajey left	10:57
	← vurma left	10:57
	→ G1eb joined	10:58
G1eb	is there an intelligent way of generating a gitignore file?	10:58
	→ thierryp joined	10:58
G1eb	for instance, when scaffolding projects with yeoman gitignore is not generated automatically	10:58
	→ Asiajey joined	10:58
bremner	sounds more like a yeoman (whatever that is) question	10:59
	← ManikM left	10:59
bremner	I guess the short answer is no, although many people have written various ad hoc scripts.	10:59
	→ LeMike joined	10:59
	← qwebirc92123 left	10:59
	← thierryp left	10:59
	← echo-area left	10:59
	← nagromlt left	10:59
	→ qwebirc92123 joined	10:59
	← joo-_ left	11:00
	→ SpeedyGhost joined	11:01
	← SpeedyGhost left	11:01
	→ SpeedyGhost joined	11:01
	→ joo-_ joined	11:01
G1eb	bremner i see	11:02
	→ beautifulmind joined	11:02
	→ DevAntoine joined	11:03
DevAntoine	hi	11:03
bremner	G1eb: git doesn't really know about <your favourite programming language/build system>; it basically things everything is text files.	11:04
	← Asiajey left	11:04
DevAntoine	how do I specify the remote from which I want to checkout?	11:04
bremner	or worse, binary blobs that it doesn't even diff	11:04
	→ s8321414 joined	11:04
DevAntoine	I thought it was "git checkout remote branch"?	11:04
	→ mkoskar joined	11:04
	→ sq-one joined	11:05
	← k_sze[work] left	11:05
	→ Asiajey joined	11:05
	← Asiajey left	11:05
	→ Asiajey joined	11:05
	→ bronson joined	11:05
	→ Solid1 joined	11:05
	← joo-_ left	11:06
	→ t0th_-_ joined	11:07
	→ Mogget joined	11:08
	→ bandroidx joined	11:08
	← bronson left	11:09
	→ joo-_ joined	11:10
G1eb	yeah	11:10
	← Asiajey left	11:12
bremner	DevAntoine: are you making a new local branch?	11:12
	→ Asiajey joined	11:13
	← Asiajey left	11:13
	→ Asiajey joined	11:13
	← wachterjohannes left	11:14
	→ cdown joined	11:16
	← Takle left	11:16
	← joo-_ left	11:16
osse	git clean -fdx; make/build/whatever; git ls-files --others > .gitignore \o/	11:16
	← Asiajey left	11:17
	← PCatinean left	11:17
	→ bitkiller joined	11:17
	← paulweb515 left	11:18
	→ Asiajey joined	11:18
	← Asiajey left	11:18
	→ Asiajey joined	11:18
	← dannymichel left	11:20
	→ joo-_ joined	11:20
	→ vurma joined	11:21
	→ teran joined	11:21
	→ ManikM joined	11:21
osse	G1eb: behold the genious	11:22
	ehh, genius	11:22
	whatever	11:22
	← rejuvyesh left	11:22
	→ EminenceHC joined	11:23
	→ hichamat joined	11:23
	→ Takle joined	11:23
	← bhavul left	11:23
	← qwebirc92123 left	11:24
	← teran_ left	11:24
hichamat	Hi, I'm looking for a free Git repository that support private repo, I don't care about number of users limit. GitHub did not allow private repo when free	11:24
	← tirengarfio left	11:25
canton7	hichamat, bitbucket?	11:25
	→ tirengarfio joined	11:25
	← mkoskar left	11:25
osse	s/\?$/./	11:26
hichamat	canton7 yes thank you	11:26
	→ KeelOfSteel joined	11:26
hichamat	canton7 what about gitlab and TFS	11:27
	← Malsasa left	11:27
canton7	gitlab don't provide free hosted I don't think?	11:27
osse	hichamat: gitlab is a host software. they don't offer actual hosting	11:27
	← ManikM left	11:27
	→ ManikM joined	11:27
canton7	not sure about TFS, but I'd be surprised if they offered free hosted	11:27
osse	oh, maybe they do	11:27
	← EminenceHC left	11:28
	← Gitzilla left	11:28
canton7	not sure whether they provide hosting or not... trying to determine from their website	11:28
	→ valeriansaliou joined	11:28
canton7	ooh, this is new one me: https://about.gitlab.com/gitlab-com/	11:28
	*on me	11:29
	→ paul424 joined	11:29
	← ruukasu left	11:29
	← Asiajey left	11:29
	→ checkItOut joined	11:29
osse	inteledasting	11:30
	→ Nikoli joined	11:30
	← joo-_ left	11:30
	→ Asiajey joined	11:31
	→ creep joined	11:31
	→ Gama11 joined	11:31
	← valeriansaliou left	11:31
	← ManikM left	11:31
	→ joo-_ joined	11:32
	← veebers left	11:33
	← teran left	11:34
	→ french joined	11:34
	← joo-_ left	11:34
	→ joo-_ joined	11:35
	← jagob left	11:35
	← checkItOut left	11:36
jaeckel	I have a diff of a file in a git repository from a specific commit, does someone know how to determine if this diff somehow corresponds to a future commit?	11:36
	→ asdpew joined	11:37
osse	jaeckel: does the diff include something like "index be54f03..71785fe 100644"	11:37
	?	11:37
jaeckel	no it's only a modified version of the file	11:37
osse	oh	11:38
	← eslbaer__ left	11:38
osse	I know of a way to do it, but that will only search for commits that only modify that file and nothing else	11:38
	← Nikoli left	11:38
osse	ie. the diff is the entire commit	11:38
jaeckel	mh, that could already be a good starting point	11:39
hichamat	canton7 osse thank you, bitbucket is good	11:39
osse	jaeckel: commit the modified version of the file, then use git cherry to search for that commit in other branches	11:40
	→ dv^laptop joined	11:40
jaeckel	nice	11:40
	I'll try that after lunch :)	11:40
	→ opdavies joined	11:40
	← joo-_ left	11:42
	← Asiajey left	11:43
	→ joo-_ joined	11:43
	rishabh__ → rishabh	11:43
	← sebhoss left	11:43
	→ sebhoss joined	11:43
	→ Asiajey joined	11:44
	→ t0th_-__ joined	11:44
	← Asiajey left	11:44
	→ Asiajey joined	11:44
	→ checkItOut joined	11:44
	→ listochkin joined	11:44
	→ jagob joined	11:46
	→ thierryp joined	11:46
	→ brucelee joined	11:46
	← hichamat left	11:46
	← t0th_-_ left	11:47
	→ bhavul joined	11:47
	→ dannymichel joined	11:47
	→ lindenle joined	11:47
	← joo-_ left	11:48
	← dannymichel left	11:49
	← purpleidea left	11:50
	← brucelee left	11:50
	← gsingh93 left	11:50
	→ Nikoli joined	11:51
	← Asiajey left	11:51
	← lindenle left	11:51
	→ purpleidea joined	11:52
	← purpleidea left	11:52
	→ purpleidea joined	11:52
	→ Asiajey joined	11:53
	← Asiajey left	11:53
	→ Asiajey joined	11:53
	← checkItOut left	11:53
	→ liamkeily joined	11:54
	← rjc left	11:54
	→ checkItOut joined	11:55
	← liamkeily left	11:55
	→ liamkeily joined	11:55
	→ Dunks joined	11:55
	→ valeriansaliou joined	11:55
	← checkItOut left	11:56
	→ autochthon joined	11:56
	→ autochthon_ joined	11:56
	← sebhoss left	11:56
	← purpleidea left	11:57
	→ dougsland joined	11:57
	← Takle left	11:58
	→ purpleidea joined	11:58
	← Nizumzen left	11:59
	→ eslbaer joined	12:01
	← purpleidea left	12:02
	← hafeez3000 left	12:02
	← Asiajey left	12:03
	← bgerber left	12:03
	← jitendravyas left	12:03
	→ dannymichel joined	12:04
	→ Asiajey joined	12:04
	← Gizburdt left	12:04
	← Asiajey left	12:04
	→ Asiajey joined	12:04
	→ jaydubya joined	12:04
	← valeriansaliou left	12:05
	→ silverfix joined	12:05
	→ VictorBjelkholm joined	12:05
	→ nofxx joined	12:05
	← nofxx left	12:05
	→ nofxx joined	12:05
silverfix	hello	12:05
osse	silverfix: I agree	12:06
	← autochthon left	12:07
	← autochthon_ left	12:07
regan	O.o	12:07
VictorBjelkholm	Hey folks! Quick question, I have two branches, "A" and "B". At one point, someone merged "A" into "B" and I would like to have a easy way of finding that commit of the merge. Imagine there is 100 commits that have been merged. How can I do it? Any tips/tricks?	12:08
	→ purpleidea joined	12:08
	← liamkeily left	12:08
	← fandi left	12:08
	← Asiajey left	12:09
silverfix	osse: ahahaH	12:09
	→ mkoskar joined	12:09
	→ Asiajey joined	12:10
	← Asiajey left	12:10
	→ Asiajey joined	12:10
	← jatt left	12:10
osse	VictorBjelkholm: "that commit" = the commit A was at, or the merge itself?	12:11
	as both A and B moved on since ?	12:11
	*has	12:11
	→ valeriansaliou joined	12:11
	← listochkin left	12:11
	→ liamkeily joined	12:12
	← valeriansaliou left	12:12
	→ jmpp joined	12:12
	← jagob left	12:12
	→ johnkevinmbasco joined	12:13
	← Pixi_ left	12:13
	→ roycuneo joined	12:14
	← warthog9 left	12:14
VictorBjelkholm	osse, "that commit" = the commit where "A" was merged into "B"	12:14
	→ Pixi_ joined	12:14
VictorBjelkholm	merge itself I guess	12:14
	→ nisseni joined	12:15
	→ ckruczek2 joined	12:15
	← roycuneo left	12:15
osse	VictorBjelkholm: hmm... I think I'd do git log --merges --grep=A B	12:15
	→ RahulAN joined	12:16
RahulAN	hiii all	12:16
ckruczek2	hi	12:16
	→ warthog9 joined	12:16
RahulAN	github.com says server not found??	12:16
	→ valeriansaliou joined	12:16
	→ Takle joined	12:16
j416	RahulAN: http://www.downforeveryoneorjustme.com/github.com	12:16
	→ mizu_no_oto joined	12:17
	→ wachterjohannes joined	12:17
	← jmpp left	12:17
silverfix	is there a way to merge 2 branch only for one basedir ?	12:17
RahulAN	Why for me only??	12:18
moritz	silverfix: what does "only for one basedir" mean?	12:18
	RahulAN: DNS problems?	12:18
	RahulAN: try to ping 192.30.252.129 (that's what github.com resolves to)	12:18
	← valeriansaliou left	12:19
RahulAN	it pings..	12:19
	→ otter768 joined	12:19
silverfix	moritz: i've a webapp that has the following directory structure: src/, src/backend/, src/frontend/ . I'm developing the 2.0 version of the frontend, so when I've finished I would like to merge only src/frontend/ and not src/	12:19
RahulAN	but it is not invoking.. on firefox	12:19
bremner	silverfix: make a branch that has only the changes you want to merge.	12:20
	→ freestyl3r joined	12:20
bremner	e.g. by rewriting.	12:20
	← RahulAN left	12:21
	← Takle left	12:21
PaulePanter	Hi. Is git 1.7.10.4 unable to handle incremental bundle updates?	12:21
	… created with git 2.1.4?	12:22
	`git fetch` does not do anything.	12:22
	← sq-one left	12:23
osse	PaulePanter: if everything is up-to-date then git fetch doesn't print anything at all	12:23
	← elcheckito left	12:23
	← otter768 left	12:23
PaulePanter	osse: Yes, but unfortunately it is not up to date.	12:24
osse	try GIT_TRACE=1 git fetch	12:24
PaulePanter	Reading the man page of 1.7.10.4 suggests it should be supported.	12:24
	osse: Will do.	12:24
	→ joo-_ joined	12:25
	← bhavul left	12:25
PaulePanter	$ GIT_TRACE=1 git fetch	12:25
	trace: built-in: git 'fetch'	12:25
	→ EminenceHC joined	12:25
	→ Takle joined	12:25
	← liamkeily left	12:26
	→ bgerber joined	12:26
	← joo-_ left	12:27
	← tokik left	12:28
	→ Gizburdt joined	12:28
PaulePanter	`git ls-remote ../my.bundle` and `git verify` show the required commit hash.	12:29
	→ jagob joined	12:29
	← EminenceHC left	12:30
	← Takle left	12:30
	← ecky--ptang-zoob left	12:30
	← Asiajey left	12:30
osse	That was all the output?	12:31
	← vurma left	12:31
PaulePanter	osse: Yes, that was all the output.	12:31
	← encod3 left	12:31
PaulePanter	I know copied the whole branch and not just the cut-off. That worked last time.	12:32
osse	Hmm, are you supposed to be able to use fetch to grab stuff from a bundle?	12:32
	→ Asiajey joined	12:32
	→ encod3 joined	12:32
osse	man page says 'git bundle unbundle'	12:32
	→ astrofog joined	12:32
PaulePanter	osse: Yes, if it is the path for `url` in a remote.	12:33
VictorBjelkholm	osse, I'll try that, thanks	12:33
	→ liamkeily joined	12:35
	→ teran joined	12:35
	→ deciph3r joined	12:35
PaulePanter	osse: The man page also says, this is just plumbing and only to be used by `git fetch`.	12:35
osse	PaulePanter: so you do 'git fetch ../my.bundle' ? Did you GIT_TRACE=1 that?	12:36
	→ listochkin joined	12:36
	→ Takle joined	12:36
	→ bobmarchman joined	12:36
	← encod3 left	12:36
	→ jitendravyas joined	12:37
	← warthog9 left	12:37
	→ fairuz joined	12:37
	→ warthog9 joined	12:38
	← dsdeiz left	12:38
PaulePanter	osse: No, as its path is in `.git/config` for remote `origin`.	12:39
	← teran left	12:39
PaulePanter	osse: `git bundle unbundle` did the job. No idea why `git fetch` failed.	12:40
	← Asiajey left	12:41
osse	cool	12:41
	I didn't know fetch could do that :P	12:41
	← bobmarchman left	12:41
osse	but from what I can tell from the logs that feature has been around for a long time	12:41
	→ PCatinean joined	12:41
PaulePanter	osse: Indeed. Let’s see if I can debug that another time.	12:41
	→ Asiajey joined	12:42
	← harish left	12:43
	→ kukks joined	12:43
	→ vurma joined	12:44
	→ claudio_ joined	12:44
	→ flowinho joined	12:45
	← roelmonnens left	12:47
	→ roelmonnens joined	12:47
claudio_	when deletes all the local project, which the basic commands to reconnect the project to the remote repository?	12:47
	← listochkin left	12:47
osse	claudio_: git clone	12:48
	← learner left	12:48
	→ paulweb515 joined	12:49
	← paulweb515 left	12:49
	→ paulweb515 joined	12:49
	→ learner joined	12:49
	← Asiajey left	12:49
	→ VimFleed joined	12:50
	→ fandi joined	12:50
claudio_	but it will not replace my local project so this remote repository?	12:51
	→ Asiajey joined	12:51
	← Asiajey left	12:51
	→ Asiajey joined	12:51
ckruczek2	if you deleted everything and newly clone, you will get the remote repository. all your stuff you didnt pushed before you deleted is lost.	12:52
	← paulweb515 left	12:53
	→ sburgess joined	12:53
	← warthog9 left	12:54
	→ hafeez3000 joined	12:54
	→ bronson joined	12:54
	→ lpapp joined	12:55
	→ lsiv568 joined	12:55
	→ daedeloth joined	12:56
	← lpapp left	12:56
	→ jorj joined	12:56
	→ warthog9 joined	12:56
	← pacon left	12:57
	← loglaunch left	12:57
	← Asiajey left	12:58
	← sburgess left	12:58
	← beautifulmind left	12:59
	← mezod left	12:59
	← bronson left	12:59
AmR\|EiSa	Can I change svn rev in head files or Mastar files by hande to get it back to old rev ?	12:59
	← liamkeily left	12:59
	→ Asiajey joined	12:59
	← fstd left	13:00
	→ enzo123456 joined	13:00
	← freimatz left	13:00
	→ fstd joined	13:00
enzo123456	hey guys. I'm looking for a way to get the git installation path through the console, do you have any idea on how to do that?	13:01
claudio_	i did : git init / git remote add origin repo / git clone repo / git add . git commit -m "operation" / and git push, but dont works. what's wrong ?	13:01
canton7	enzo123456, not sure exactly which path you mean	13:01
moritz	enzo123456: 'which git' should give you the path to the binary	13:01
canton7	enzo123456, try 'which git' and 'git --exec-path'	13:01
	→ aswen joined	13:01
enzo123456	canton7: ohh nice, I think I can do something with 'git --exec-path', thanks!	13:03
canton7	what are you trying to do? sounds dangerous...	13:03
	→ joel_falcou joined	13:03
qsuscs	enzo123456: !xy	13:03
gitinfo	enzo123456: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...	13:03
enzo123456	canton7: I'm creating a setup.bat file (windows) for my project which references the git shell to run bash commands without leaving the cmd	13:04
	← Asiajey left	13:05
cbreak	claudio_: git will tell you.	13:05
enzo123456	so I need the installation path to be able to find sh.exe	13:05
cbreak	enzo123456: git is in path? :)	13:05
	← k4rtik left	13:05
canton7	enzo123456, I think git-shell installs into your PATH?	13:05
	not git --exec-dir	13:05
	→ encod3 joined	13:06
	→ Asiajey joined	13:06
	← Asiajey left	13:06
	→ Asiajey joined	13:06
	→ liamkeily joined	13:06
enzo123456	yeah, but you can only run git commands, I need instead to reference the gi shell so I can make the "bash" command available through the cmd	13:07
ckruczek2	claudio_: what exactly is 'not working'	13:07
enzo123456	(windows cmd doesn't support the "bash" command)	13:07
	← jitendravyas left	13:07
	→ jitendravyas joined	13:08
	← jitendravyas left	13:08
	→ paulweb515 joined	13:08
	→ sburgess joined	13:08
enzo123456	I mean, I don't wan´t to run "git init", I want to run "bash setup.sh" I can' do that using what git adds to the windows PATH variable...	13:09
claudio_	ckruczek2 :not going to the committee for the remote repository	13:09
canton7	enzo123456, aaaah so you're not interested in 'git shell'. you're interested in bash	13:10
	man git-shell	13:10
gitinfo	the git-shell manpage is available at http://jk.gs/git-shell.html	13:10
	← wrouesnel left	13:10
	← nofxx left	13:11
	← ap0c left	13:11
ckruczek2	claudio_: maybe you dont have rights for pushing? and maybe you are pushing over http and its not configured on the remote?	13:11
	→ jazzzu joined	13:11
	→ Joel_ joined	13:12
enzo123456	canton7: hmmm is "git shell" a git command?	13:12
	→ wakd joined	13:13
bremner	enzo123456: did you see the link above to it's man page?	13:13
	← creep left	13:14
	→ nofxx joined	13:14
	← nofxx left	13:14
	→ nofxx joined	13:14
	← wakd_ left	13:14
claudio_	on the remote already have the design, what happens' and I deleted all the version of the local project, reinstalled the project locally, and now need to restart the remote repository to update it.	13:14
	← joel_falcou left	13:14
	← Asiajey left	13:14
	→ Joel__ joined	13:15
	→ Skapadapaduu joined	13:15
	→ johtso joined	13:15
	← bg__ left	13:15
	← Joel_ left	13:16
	→ Asiajey joined	13:16
	← Asiajey left	13:16
	→ Asiajey joined	13:16
ckruczek2	claudio_: sorry, but i dont really get what you mean. just clone from the remote again after you deleted everything: git clone ssh-url	13:16
DevAntoine	bremner: yes, I'm making a new local branch (2h later)	13:17
canton7	enzo123456, no, but 'git-shell' is a utility (I don't think it's shipped on windows?)	13:18
	→ nikio__ joined	13:18
claudio_	for this I did: git init / git remote add origin https: //claudiomf@bitbucket.org/claudiomf/preferenciakids.git; git clone https: //claudiomf@bitbucket.org/claudiomf/preferenciakids.git; git add. ; git push	13:18
ckruczek2	you dont need to do the init and remote add stuff. just clone the bitbucket stuff..	13:19
	← rglarsen left	13:19
ckruczek2	but wait, bitbucket hosts git project? i thought they only host mercurial projects?	13:19
	← musician2000 left	13:19
tobiasvl	git too	13:20
qsuscs	ckruczek2: they began hosting git some years ago	13:20
	← Anders_J left	13:20
DevAntoine	bremner: yes, I'm making a new local branch (2h later)	13:20
	← subhojit777 left	13:20
	← Joel__ left	13:20
	← Asiajey left	13:21
	← nikio_ left	13:21
	← brandonw left	13:22
	→ ruukasu joined	13:22
	→ Asiajey joined	13:22
	← hebz0rl left	13:23
bremner	DevAntoine: try git checkout -t localname remote/branch	13:23
	← Dunks left	13:24
	→ russt joined	13:25
	← russt left	13:25
DevAntoine	bremner: I thought specifying the branch name wasn't necessary anymore since git 1.6?	13:25
	I'm digging into -t, don't know this option	13:25
	← vurma left	13:27
	→ Doomb joined	13:27
	→ brandonw joined	13:27
canton7	DevAntoine, !local_branch_from_remote	13:28
gitinfo	DevAntoine: The following commands are all equivalent, assuming <branch> doesn't yet exist: 'git checkout -b <branch> <remote>/<branch>', 'git checkout -t <remote>/<branch>', 'git checkout <branch>'. The latter invokes some magic.	13:28
canton7	basically, -b has magic to add -t where appropriate, and -t has magic to add -b when appropriate	13:28
	it's a complex little mess	13:28
	← ckruczek2 left	13:28
DevAntoine	:D	13:29
	→ cavallari joined	13:29
DevAntoine	canton7: so, if I want to use a given remote, I should use -t?	13:29
canton7	either 'git checkout -t remote/branch' or 'git checkout -b branch remote/branch'	13:29
	the latter is more popular/common	13:29
	→ ohseap joined	13:30
	← VimFleed left	13:30
	← fairuz left	13:30
	→ EminenceHC joined	13:30
	← nofxx left	13:31
	← Asiajey left	13:31
	→ HoMM joined	13:32
	→ Asiajey joined	13:33
	← Asiajey left	13:33
	→ Asiajey joined	13:33
	← opdavies left	13:33
	← EminenceHC left	13:35
	→ teran joined	13:36
	← mizu_no_oto left	13:39
	→ apurcell joined	13:39
	← Asiajey left	13:40
	← Gizburdt left	13:40
	→ AciD` joined	13:40
	→ _0xAX joined	13:40
	→ nofxx joined	13:40
	← teran left	13:41
	→ Asiajey joined	13:41
	← Asiajey left	13:41
	→ Asiajey joined	13:41
	← sburgess left	13:41
DevAntoine	canton7: -t doesn't work	13:42
	← Solid1 left	13:42
canton7	!doesntwork	13:42
gitinfo	Sorry to hear it doesn't work, but how about some details? At this point we don't even know whether it did nothing, spit out an error message, or abducted your pet unicorn in a flying saucer. That makes it hard to troubleshoot – unicorn abduction requires a completely different solution than an error message, for instance. So, please be specific...	13:42
claudio_	with -u git push origin master ', results in: error: src refspec master does not match any. What could be wrong?	13:42
canton7	there's no local master branch	13:42
	(or there is, but it doesn't have commits on it ("unborn"))	13:42
DevAntoine	fatal: git checkout: updating paths is incompatible with switching branches. Did you intend to checkout 'origin/branch' which can not be resolved as commit?	13:43
	(I was looking for the error message in english on google ;))	13:43
	→ bg__ joined	13:43
	← AciD` left	13:43
	→ AciD` joined	13:43
	← apurcell left	13:44
	→ Gizburdt joined	13:44
canton7	DevAntoine, iirc that horrible mess of a message means "remote branch doesn't exist"	13:44
	DevAntoine, pastie your exact checkout command, and the output of 'git branch -a'	13:44
	→ encod3_ joined	13:45
	→ sq-one joined	13:47
	→ Solid1 joined	13:47
DevAntoine	canton7: well, right, this branch didn't exsist :\|	13:47
	← ruukasu left	13:47
DevAntoine	-t works	13:47
	indeed	13:47
	thanks	13:47
	← lsiv568 left	13:47
	← Takle left	13:47
	← roelmonnens left	13:47
canton7	:)	13:48
	someone needs to fix that error message really...	13:48
	→ ruukasu joined	13:48
DevAntoine	canton7: yeah, that means nothing	13:48
	← encod3 left	13:48
	← Guest60159 left	13:48
	→ gregsmith joined	13:49
	→ islalobo joined	13:50
canton7	checkout can be used to switch branches or update paths (e.g. git checkout HEAD^^ -- SomeFolder) - I think it's failing the branch mode, failing, trying the path mode, failing, and spitting out a message relating to the path mode	13:50
	→ DrSkyLizard joined	13:50
	← netcarver left	13:50
	→ lsiv568 joined	13:50
	← vtunka left	13:51
islalobo	Hello, I just merged my dev environment up to staging and master branches. Both dev and staging environments the site works fine, but the master branch is giving a wsod death. I can't fathom how if all branches should be the same at this moment after merge	13:51
	Is there a way to debug such a situation?	13:51
	→ nardev joined	13:51
	→ vurma joined	13:52
moritz	sure	13:52
	use whatever debugging tools your platform provides	13:52
enzo123456	canton7: do you know if there's a way to get the git installation path, but to the root directory? I tried "git --exec-path" but it goes to the core dir...	13:52
	→ mizu_no_oto joined	13:52
	→ sebhoss joined	13:53
	→ harish joined	13:53
	→ vtunka joined	13:54
	→ intransit joined	13:55
	← Asiajey left	13:57
	← aboudreault left	13:57
	→ Takle joined	13:57
	→ Asiajey joined	13:58
	← Doomb left	13:59
	← Tuna-Fish left	14:00
	→ medgno joined	14:00
	→ Tuna-Fish joined	14:00
	→ phos1 joined	14:00
	→ rglarsen joined	14:01
	← Solid1 left	14:01
iveqy	islalobo: does all branches point to the same commit (sha1?) and are your worktree dirty at any location?	14:01
	← Asiajey left	14:01
	← intransit left	14:01
iveqy	enzo123456: The git installation path?	14:02
	enzo123456: do you mean the location of the git binary?	14:02
osse	enzo123456: It won't be perfect but in all cases I know of it's the exec path with the two last components removed	14:02
	→ Asiajey joined	14:03
	← Asiajey left	14:03
	→ Asiajey joined	14:03
	← rglarsen left	14:03
	→ aboudreault joined	14:03
	← cavallari left	14:03
islalobo	iveqy: not sure what you mean by dirty. and I guess they all point to the same commit? I just did 'git checkout master' 'git merge dev'	14:04
	← jgardella left	14:04
iveqy	islalobo: that files are edited in your work tree. a git reset --hard HEAD will remove all edits and make sure your worktree is the same as your commit	14:04
	→ cannonball joined	14:05
	→ GODDOG joined	14:05
	← GODDOG left	14:05
iveqy	islalobo: does git rev-parse HEAD give you the same output at all locations?	14:05
islalobo	iveqy: I'll check	14:05
	→ opdavies joined	14:05
islalobo	iveqy: no it doesn't	14:06
	← mikecmpbll left	14:06
	→ GODDOG joined	14:06
islalobo	both staging and dev are the same, but master is something different	14:06
	→ Solid1 joined	14:06
osse	enzo123456: execpath=$(git --exec-path); prefix="${execpath%//}"; echo "$prefix"	14:07
iveqy	then staging and dev are not the same code as master and that's probably your problem	14:07
	→ staafl joined	14:07
	→ bobmarchman joined	14:07
	→ valeriansaliou joined	14:07
	→ mikecmpbll joined	14:08
	→ th3fallen joined	14:08
	← bannakaffalatta left	14:08
	→ lachm joined	14:08
islalobo	iveqy: I'm fairly new to git so I don't understand how that could happen if I was merging the branches from one environment to the other. Wouldn't that ensurre that all branches have the same code?	14:08
	← lachm left	14:08
	← ruukasu left	14:09
	← phos1 left	14:09
iveqy	islalobo: no, that would merge two codebases together. If you have repo A with the change a and you have a repo B with the change b and you merge A into B, B will contain both a and b	14:10
	← nardev left	14:10
	→ Shurakai joined	14:10
	→ smccarthy joined	14:10
	← Shurakai left	14:10
	← lsiv568 left	14:11
	← bobmarchman left	14:11
	← Solid1 left	14:12
	→ ecoury joined	14:12
	← valeriansaliou left	14:12
enzo123456	osse: that looks like what I need, but I need to run something like that on windows... :S	14:12
	ecoury → EvanDotPro	14:12
	→ ruukasu joined	14:13
AmR\|EiSa	Can I change svn rev in head files or Mastar files by hande to get it back to old rev ?	14:13
osse	enzo123456: yes it's good. During compilation the exec path is determined from the prefix initially, so it should be correct.	14:13
iveqy	enzo123456: with msysgit you do have msys with bash already installed, correct?	14:13
	AmR\|EiSa: I don't understand what you mean, could your try to explain again?	14:14
osse	enzo123456: ifyou have git then you have bash. Anyway, removing two occurrences of / in a string is feasible everywhere, I should think.	14:14
	→ majoh joined	14:15
	→ Solid1 joined	14:15
	← mizu_no_oto left	14:16
AmR\|EiSa	iveqy: I have 2 server svn I working with, I lost the most updated one, the backup server have rev 31 and my master have rev 41.	14:16
	iveqy: So if I can change that by hande to set rev 31 back as start point in git-svn.	14:17
	← ruukasu left	14:17
iveqy	AmR\|EiSa: and you're using git as a svn client and want to push your changes to your backup server?	14:17
	→ gniourf joined	14:17
islalobo	iveqy: how can I make the branches the same?	14:17
	→ mellernoia joined	14:17
	→ tesaf joined	14:18
AmR\|EiSa	yes, but backup server have old rev	14:18
	→ lsiv568 joined	14:18
	→ lpax joined	14:18
	→ m1911star joined	14:18
iveqy	islalobo: with git reset, but I suspect that you're doing something wrong here. I suggest you do a !repro and try to get help here.	14:18
gitinfo	islalobo: [!transcript] 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 raise the odds of getting your problem fixed from about 30% to about 90%.	14:18
iveqy	AmR\|EiSa: that's a tricky one. I don't know. Maybe this will help you?	14:19
	https://www.redlab.be/blog/2012/git-svn-with-multiple-svn-repositories/	14:19
	→ otter768 joined	14:20
islalobo	ivegy what is !repro	14:20
gitinfo	[!transcript] 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 raise the odds of getting your problem fixed from about 30% to about 90%.	14:20
	← zadock left	14:20
islalobo	oh	14:20
	← Asiajey left	14:20
iveqy	AmR\|EiSa: I do believe it's better to threat them as two seperate servers than try to trick git into that the svn server changed it's state. However !tias since you have nothing to loose with git	14:21
gitinfo	AmR\|EiSa: 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/tias.html may help with git-specific TIAS.	14:21
	← DrSkyLizard left	14:22
	→ Asiajey joined	14:22
AmR\|EiSa	lvh: OK, Thanks :)	14:22
	← GODDOG left	14:22
AmR\|EiSa	gitinfo: Thanks for tip :)	14:22
gitinfo	AmR\|EiSa: you're welcome, but please note that I'm a bot. I'm not programmed to care.	14:22
	← s8321414 left	14:22
	← sq-one left	14:22
	← _0xAX left	14:22
	→ ehmatthes joined	14:22
	→ basiclaser_ joined	14:23
AmR\|EiSa	gitinfo: I care :P	14:23
	→ tranzfuse joined	14:23
	→ GODDOG joined	14:23
	→ Matulis joined	14:23
	← eletuchy left	14:23
	← melter left	14:23
	← m1911star left	14:23
	→ knownasilya joined	14:24
	← smccarthy left	14:24
	→ smccarthy joined	14:25
	→ ignas joined	14:25
	← otter768 left	14:25
	← larzen left	14:26
	→ ruukasu joined	14:26
	→ melter joined	14:26
	→ doev joined	14:27
	→ Zupoman joined	14:28
	→ yannick_gagnon joined	14:28
	← jstimm left	14:28
gitinfo	AmR\|EiSa: but you should ;)	14:29
	→ phantomtiger joined	14:29
esc_	what would you say, when was the first usable public release of git?	14:29
	2005?	14:29
moritz	2020? :-)	14:29
	it really depends on your definition of "usable"	14:30
esc_	usable by kernel hackers	14:30
	→ freimatz joined	14:30
	→ Nizumzen joined	14:30
	→ heftig joined	14:30
	← heftig_ left	14:31
	→ Juzzika joined	14:31
esc_	or let's say, when did the Kernel start being developed with git?	14:31
	← overyander left	14:31
	← claudio_ left	14:31
	← pacbard left	14:31
	→ twoface88 joined	14:31
esc_	wikipedia says 7 April 2005	14:31
qsuscs	Date: Sat Apr 16 15:20:36 2005 -0700	14:31
esc_	so, apprx 10 years...	14:31
	← lhunath left	14:32
	→ EminenceHC joined	14:32
	← mikecmpbll left	14:33
	← Asiajey left	14:34
	← frdmn left	14:35
	→ Asiajey joined	14:35
	← Takle left	14:36
	→ teran joined	14:37
	← Zupoman left	14:37
	← EminenceHC left	14:37
	→ Techn0mag joined	14:37
	← Techn0mag left	14:37
	→ Techn0mag joined	14:37
	→ russt joined	14:37
	→ frdmn joined	14:38
	← Techn0mag left	14:38
	→ Zupoman joined	14:38
	← smccarthy left	14:38
AmR\|EiSa	iveqy: sorry for that. It's for you	14:39
	→ CheckDavid joined	14:39
AmR\|EiSa	iveqy: Where git but svn rev mark ?	14:39
	Zupoman → Techn0mag	14:39
	→ sburgess joined	14:40
	← Asiajey left	14:40
	→ jitendravyas joined	14:41
	→ Asiajey joined	14:41
	→ zivester joined	14:41
	← teran left	14:42
	→ macabre joined	14:42
	← Gizburdt left	14:42
	← Solid1 left	14:42
jaeckel	osse: do you have an example usage of the git cherry approach you proposed?	14:42
	→ Takle joined	14:43
	→ intransit joined	14:43
	→ phos1 joined	14:44
	→ mezod joined	14:44
	→ Gizburdt joined	14:44
	→ joel_falcou joined	14:44
	← yannick_gagnon left	14:45
	→ nardev joined	14:45
	→ jerius joined	14:45
phos1	I’m new to GIT, and I am confused on how some aspects work. I am using coda and it is allowing me to commit to my local repository (in MAMP), but when someone else made changes to the server nothing is coming up to show me changes. Do i also need to setup a repository on the server and work from it rather then the local one?	14:45
	← bluesm left	14:45
	→ dangerousdave joined	14:46
iveqy	AmR\|EiSa: ? I don't understand, where git? If I where you I would do a git rebase -i and reword all commit messages, removing the git-svn line in	14:46
	← Asiajey left	14:46
	→ Solid1 joined	14:46
moritz	phos1: git has explicit steps for collaborating with remote repos	14:46
	← Raging_Hog left	14:46
iveqy	phos1: no but you need to fetch and merge the changes from the server. Maybe you should read the !book and get some basic concepts?	14:46
gitinfo	phos1: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	14:46
moritz	phos1: on the command line (I assume "coda" is a GUI tool?) that's 'git pull' and 'git push'	14:47
	→ AaronMT joined	14:47
	→ Asiajey joined	14:47
	→ joo-_ joined	14:47
	← Matulis left	14:47
moritz	also !gui	14:47
gitinfo	Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.	14:47
	← GODDOG left	14:48
	→ GODDOG joined	14:48
	→ listochkin joined	14:48
	← ruukasu left	14:48
qsuscs	phos1: and stop saying !GIT	14:48
gitinfo	phos1: Git is not an acronym. Writing it in all caps is heresy and will be punished by Subversion or SCCS for more grievous offences. It's "git" or "Git". Thank you for your help in making the world a better place. 48a8c26c625a4d3631c4f614bceb38933e741408	14:48
	← GODDOG left	14:48
moritz	is there a gitinfo trigger to throw all triggers at somebody? :-)	14:49
jast	!triggers	14:49
gitinfo	Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.	14:49
phos1	Thanks, I will look at those links hopefully that gets me going. Thanks	14:49
iveqy	phos1: good luck and welcome back	14:50
	AmR\|EiSa: and if that works, please let me know...	14:50
	→ redbaritone_ joined	14:51
	← redbaritone_ left	14:51
	→ redbaritone_ joined	14:51
	← SpeedyGhost left	14:51
	← KevinMGranger left	14:51
	→ Dougie187 joined	14:51
	← medgno left	14:51
	← jitendravyas left	14:51
	← darkbasic left	14:52
	→ polyzen joined	14:52
	→ IrishPrime joined	14:53
	← joel_falcou left	14:53
	← listochkin left	14:53
	← AmR\|EiSa left	14:53
	→ KevinMGranger joined	14:54
	→ AmR\|EiSa joined	14:54
	← opdavies left	14:54
	→ cwillu_at_work joined	14:55
	→ denete joined	14:55
	→ tmcmahon joined	14:56
	→ subhojit777 joined	14:57
	→ aesinv joined	14:58
	→ felipedvorak joined	14:58
	→ shinnya_ joined	14:58
	→ autochthon_ joined	14:58
	→ autochthon joined	14:58
	→ darkbasic joined	14:58
	← tmcmahon left	14:59
	→ SpeedyGhost joined	15:00
	→ bobmarchman joined	15:00
	← bobmarchman left	15:01
	← phantomtiger left	15:01
	→ bobmarchman joined	15:01
	← aesinv left	15:01
	← SpeedyGhost left	15:02
	→ Ankhers joined	15:02
	← Solid1 left	15:03
	→ leeN joined	15:03
	→ aesinv joined	15:03
	← Lefter1s left	15:03
	→ SpeedyGhost joined	15:03
	→ jgardella joined	15:03
	→ joel_falcou joined	15:03
	← kermit left	15:03
	→ tgkokk joined	15:03
	→ ruukasu joined	15:04
	→ Lefter1s joined	15:05
	← Lefter1s left	15:05
	→ Lefter1s joined	15:05
	← Lefter1s left	15:05
	→ Dorf joined	15:05
	→ Lefter1s joined	15:05
	← Lefter1s left	15:05
	→ kermit joined	15:05
	← Asiajey left	15:05
	→ valeriansaliou joined	15:05
	→ Lefter1s joined	15:05
	← Lefter1s left	15:05
	→ Lefter1s joined	15:06
	← Lefter1s left	15:06
	→ Solid1 joined	15:06
	→ Lefter1s joined	15:06
	← Lefter1s left	15:06
	← thierryp left	15:06
	← enzo123456 left	15:06
	→ mizu_no_oto joined	15:06
	→ Lefter1s joined	15:06
	← Lefter1s left	15:06
	→ liamkeily1 joined	15:07
	→ Asiajey joined	15:07
	← Asiajey left	15:07
	→ Asiajey joined	15:07
	← dangerousdave left	15:07
	→ Lefter1s joined	15:07
	← Lefter1s left	15:07
	→ Lefter1s joined	15:07
	← Lefter1s left	15:07
	→ Lefter1s joined	15:07
	← Lefter1s left	15:07
	→ Lefter1s joined	15:08
	← ruukasu left	15:08
	← SpeedyGhost left	15:08
	← liamkeily left	15:08
	← SFLimey left	15:09
	→ thierryp joined	15:10
	→ bauruine joined	15:10
	← zoso left	15:10
	→ kadoban joined	15:11
	← Asiajey left	15:11
	← sinkensabe left	15:11
nedbat	I see that some repos on GitHub are "mirrors", like this one: https://github.com/apache/any23 How do I create a mirror repo?	15:12
canton7	nedbat, email support, iirc	15:12
	→ SpeedyGhost joined	15:12
	← valeriansaliou left	15:12
	→ Asiajey joined	15:12
nedbat	canton7: thanks. The "about mirrors" page makes no mention of how they come to be: https://help.github.com/articles/about-github-mirrors/	15:13
	← Bombe left	15:13
canton7	nedbat, http://stackoverflow.com/questions/11370239/creating-an-official-github-mirror	15:13
	→ eletuchy joined	15:14
nedbat	canton7: thanks	15:14
	→ jmpp joined	15:17
	→ jstimm joined	15:17
	→ wiherek joined	15:17
wiherek	hi	15:17
	this is about CI with codeship / heroku	15:18
	→ ruukasu joined	15:18
	→ nikio_ joined	15:18
wiherek	is there some standard way to build an app on a CI server	15:18
	then push the new build to heroku?	15:19
	← aesinv left	15:19
wiherek	what I mean is, the current flow is like this: push to git —> CI server —> heroku	15:19
qsuscs	wiherek: !config !deploy	15:19
gitinfo	wiherek: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	15:19
	wiherek: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	15:19
wiherek	thats not it unfortunately	15:20
	I would simply like to avoid having to build before I push	15:20
	delegate the build to the CI server	15:20
	but of course, it needs to be included in some commit at some point before going to heroku	15:20
iveqy	wiherek: why don't your buildserver push the build to heroku_	15:21
	?	15:21
wiherek	i could of course commit from codeship and push the commit ONLY to heroku, but that would require to —force it every time	15:21
	as the last commit would be ONLY on heroku (the build commit)	15:21
	→ valeriansaliou joined	15:21
	→ joelm joined	15:21
	← valeriansaliou left	15:21
	← nikio__ left	15:21
wiherek	iveqy: it does, but it does not commit it’s changes at the moment	15:21
	← jmpp left	15:21
	→ valeriansaliou joined	15:22
wiherek	it pushes to heroku the last commit (if it passes tests and builds correctly), but the actual build data is lost	15:22
iveqy	so make it? And why would it require a force push? I don't follow that part.	15:22
	why can't your buildserver commit the build data and then push it/	15:23
wiherek	it could	15:23
	but then should it push the commit to github?	15:23
	← redbaritone_ left	15:24
wiherek	that would cause a loop	15:24
	however if it only pushes to heroku	15:24
	→ redbaritone_ joined	15:24
wiherek	then that build commit is not in the repo on github, ONLY on heroku	15:24
	→ lindenle joined	15:24
wiherek	so heroku has changes which are can not be included in the next push	15:24
	← Nizumzen left	15:25
wiherek	thats why —force will be required - I think.	15:25
iveqy	the --force will be require when you push to your buildserver yes	15:25
	→ bannakaffalatta joined	15:25
	← thierryp left	15:26
	→ thierryp joined	15:26
	← Marcus___ left	15:26
wiherek	no, the build server does not persist any data at all	15:26
	→ phantomtiger joined	15:26
wiherek	but yes, it must commit the changes	15:27
	← thierryp left	15:27
iveqy	wiherek: I see.	15:27
	→ opdavies joined	15:27
	← codeFiend left	15:27
	→ pm90_ joined	15:27
iveqy	wiherek: so I guess the question you've to ask yourself is, is the buildata commited by your CI important enough to store as history?	15:27
	← Sleepy63 left	15:28
wiherek	ok, so if it were - how can I proceed?	15:28
	→ apurcell joined	15:28
	← tgkokk left	15:28
	→ MLM joined	15:28
wiherek	codeship is connected to github	15:28
	← lsiv568 left	15:28
	← Asiajey left	15:28
	→ chrisgeo joined	15:28
	← lindenle left	15:29
iveqy	I guess it doesn't help if I say that I think heroku is stupid in this sense? ;). Anyway, the only way I can see it is if your github rebase onto heroku (or your CI)	15:29
wiherek	ok	15:30
	→ luriv joined	15:30
wiherek	well, I dont think it must persist in the repo	15:30
	so Ill just force	15:30
iveqy	you can't push from CI to github since there can be changes commited to github during the build in your CI	15:30
	→ tgkokk joined	15:30
	← nofxx left	15:30
wiherek	yes	15:30
	→ herdingcat joined	15:31
	← asakura left	15:31
	← tgkokk left	15:32
	← redbaritone_ left	15:32
	→ tgkokk joined	15:32
	→ asakura joined	15:32
	← herdingcat left	15:32
	→ redbaritone joined	15:32
	← joel_falcou left	15:32
	← apurcell left	15:32
	→ DrSkyLizard joined	15:33
	← mlechner left	15:34
	→ x1f496 joined	15:34
	→ herdingcat joined	15:34
	→ nikio__ joined	15:34
	← wiherek left	15:35
	→ EminenceHC joined	15:35
	← redbaritone left	15:36
	← paul424 left	15:36
	→ nikio___ joined	15:37
	→ Asiajey joined	15:37
	← Asiajey left	15:37
	→ Asiajey joined	15:37
	→ VimFleed joined	15:37
	← nikio_ left	15:37
	← Trudko left	15:37
	→ teran joined	15:38
	→ wiherek joined	15:38
	→ redbaritone joined	15:38
	→ pacbard joined	15:38
	← herdingcat left	15:38
	← seschwar left	15:39
	→ seschwar joined	15:40
jaeckel	I try my luck again, probably now there's someone who knows...	15:40
	I have a diff of a file in a git repository from a specific commit, does someone know how to determine if this diff somehow corresponds to a future commit?	15:40
	→ Sleepy63 joined	15:40
	→ hcc23 joined	15:40
	← nikio__ left	15:40
	← flowinho left	15:40
jaeckel	and I have only the file, no full git diff....	15:40
	← EminenceHC left	15:40
	→ Milkweed joined	15:41
	← hafeez3000 left	15:41
iveqy	jaeckel: why is this important? Is it so that you want to see if the changes are incorporated in the tip of master?	15:41
jaeckel	yes	15:41
osse	jaeckel: incidentally, I just sat my sexy ass down in front of the computer again just now. What I'd do is commit the file as I mentioned in a seperate branch, then do git cherry origin/master HEAD \| grep '^-'. Substitute origin/master for whatever fits the bill.	15:42
	← tgkokk left	15:42
iveqy	why don't you just checkout master, apply the patch and see if you have any changes made to your worktree (i.e. with git diff)?	15:42
	← teran left	15:42
	→ SeanMoe joined	15:42
osse	that's even better	15:43
jaeckel	iveqy: because I have the linux kernel in a modified version that has several hand-selected patches applied PLUS some custom modifications and I only know that it has been originally based on 3.12.15	15:43
	→ mikecmpbll joined	15:44
iveqy	jaeckel: so you're afraid that this patch you've might be modified by a later patch?	15:44
PerlWebDev	well, you know the name of the file that the patch came from	15:44
	→ n-st joined	15:45
PerlWebDev	so you can get the patch history of that file	15:45
	→ proteneer joined	15:45
jaeckel	PerlWebDev: yes by hand, I could do that, but I prefer to let someone do that who is good at automation (a PC)	15:45
PerlWebDev	git log --follow -p file	15:45
	← Asiajey left	15:45
PerlWebDev	then just do a compare of that log history with the patch file you have	15:46
	→ ferr joined	15:46
	→ skylite joined	15:46
	→ dAnjou joined	15:47
	→ Asiajey joined	15:47
	→ SumDude joined	15:47
	→ PragCypher joined	15:47
	← Dorf left	15:47
	→ stamina joined	15:47
	← islalobo left	15:48
dAnjou	hi, when I've force-pushed my branch (i know the implications and that it is generally a bad idea) is it then possible to force an "update" somewhere where i've pulled the branch already?	15:49
	→ learner1 joined	15:49
dAnjou	i hope it's clear what i mean :/	15:49
	→ tgkokk joined	15:49
	← rasto left	15:49
osse	dAnjou: you haved to fetch and reset or rebase	15:50
	← tgkokk left	15:50
iveqy	dAnjou: yes, do a git fetch follow by a git reset	15:50
	osse: :)	15:50
	→ ehynds joined	15:50
	→ smccarthy joined	15:50
	→ tgkokk joined	15:50
	← ruukasu left	15:50
jaeckel	iveqy: basically I want to find out what the custom modifications are	15:51
dAnjou	ah, thank you very much. i saw this on SO already but the question was kinda different.	15:51
	→ ruukasu joined	15:51
	← tgkokk left	15:51
iveqy	jaeckel: just read the diff file then? Or what am I m issing?	15:52
osse	jaeckel: then I would try to apply the complete set of custom mods on top of the latest release. And see what you get.	15:52
	→ tgkokk joined	15:52
	← learner left	15:52
jaeckel	well I've only the plain files	15:52
	only tree, no repo, no patch files	15:52
iveqy	jaeckel: oh, I thought you'd a patch.	15:53
	→ bsanford joined	15:53
iveqy	jaeckel: do as osse said	15:53
PerlWebDev	then how are you expecting to find this "future" commit?	15:53
	← Takle left	15:53
osse	jaeckel: then you need to get the source of 3.12.15 and produce a diff.	15:53
	→ Takle joined	15:54
jaeckel	that's what I did	15:54
	← Xethron left	15:54
	→ Lazarus_ joined	15:54
	← Lazarus_ left	15:54
	→ nfk joined	15:54
osse	then you have a patch file :-)	15:54
jaeckel	I created a branch on the v3.12.15 tag	15:54
	→ Bootinbull joined	15:54
jaeckel	copied over the tree I have	15:54
	→ alexisabril joined	15:55
jaeckel	and fits pretty well	15:55
	← wachterjohannes left	15:55
	→ nginx77 joined	15:55
jaeckel	a bunch of modifications, but less than when compared to v3.12.16	15:55
	← alexisabril left	15:55
osse	cool	15:55
	← nginx77 left	15:56
	→ saurabh joined	15:56
osse	and that modification is the sum of a couple of hand-picked patches from later releases + something custom, and you want to separate the two, right?	15:56
jaeckel	now I thought I could somehow find out the patches that were already somewhere floating around that were not in 3.12.15, but got applied by hand	15:56
	saurabh → Guest98661	15:56
	→ zumba_ad_ joined	15:56
	→ nginx77 joined	15:56
jaeckel	yes	15:56
	← nginx77 left	15:57
osse	jaeckel: get the latest release of the kernel and try to apply the diff of 3.12.15 and your branch	15:57
	← n-st left	15:57
	→ nginx77 joined	15:57
	← nardev left	15:57
	← redbaritone left	15:57
	← King_Hual left	15:58
	← nginx77 left	15:58
	← DrSkyLizard left	15:58
	→ King_Hual joined	15:58
	→ nginx77 joined	15:58
	← nginx77 left	15:59
t0th_-__	hi	15:59
gitinfo	t0th_-__: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	15:59
osse	jaeckel: if nothing conflicts, then whatever got applied is your custom stuff and the rest that was "already applied" are the patches that were hand-picked	15:59
	← bobmarchman left	15:59
t0th_-__	i created a tag how i can commit and push it to repository?	15:59
soerenb	git push <remote> <tag>	15:59
	← Macaveli left	15:59
	→ bobmarchman joined	15:59
	→ nginx77 joined	15:59
	← PragCypher left	15:59
t0th_-__	thanks	15:59
	← nisseni left	16:00
	← nginx77 left	16:00
	← dAnjou left	16:00
	← zumba_addict left	16:00
	→ kristofferR joined	16:00
	→ redbaritone joined	16:00
	→ nginx77 joined	16:01
	← rath left	16:01
	← redbaritone left	16:01
	→ bhavul joined	16:01
	→ nikio__ joined	16:01
	→ redbaritone joined	16:01
jaeckel	osse: that was a nice move	16:03
	→ rasto joined	16:03
	← Asiajey left	16:03
	→ rafaelcpalmeida joined	16:04
	← johnkevinmbasco left	16:04
osse	jaeckel: did it work?	16:04
	← acolson left	16:04
	← nikio___ left	16:04
	→ intransi_ joined	16:04
	→ Asiajey joined	16:04
	→ [H]unt3r joined	16:05
	→ Matulis_ joined	16:05
frew	hey guys, I am getting errors like: fatal: loose object 064f6b00cb418724a4c42be3b81a5ea2cf4e20e2 (stored in .git/objects/06/4f6b00cb418724a4c42be3b81a5ea2cf4e20e2) is corrupt	16:05
	I can reclone the repo, but is there anythign else I might be able to do?	16:05
	I tried git fsck and got htis error	16:05
	← jceb left	16:06
	→ saint-ron joined	16:06
	← pm90_ left	16:06
jaeckel	looks not that bad, but how do I now determine which were legitimate patches on the same files?	16:06
grawity	frew: reclone it, or otherwise obtain a copy of that file from someone else's .git/objects/	16:07
frew	ok	16:07
	→ jitendravyas joined	16:07
	← intransit left	16:07
	→ treehug88 joined	16:07
	← Asiajey left	16:08
	← tgkokk left	16:08
	← d10n-work left	16:08
karstensrage	why does git branch -r not see all the remote branches?	16:08
	← twoface88 left	16:08
	← mellernoia left	16:08
osse	that's a loaded question	16:09
	→ EminenceHC joined	16:09
	← EminenceHC left	16:09
karstensrage	how can i unload it, i see all the branches on github	16:09
	→ EminenceHC joined	16:09
	→ Asiajey joined	16:09
	← Asiajey left	16:09
	→ Asiajey joined	16:09
grawity	perhaps you haven't 'git fetch'ed since the new branches were created	16:09
osse	karstensrage: is it a public repo? if yes can you link to it and show us the complete output of git branch -r ?	16:10
	← seschwar left	16:10
	← wiherek left	16:10
	← JanC left	16:10
karstensrage	local git repo doesnt have a branch i want, git branch -r doesnt show it	16:10
	ive git pulled? isnt that merge and fetch?	16:10
	fetch and merge i mean	16:10
	← Lefter1s left	16:10
	→ Bombe joined	16:10
	→ tgkokk joined	16:11
	→ pheaver joined	16:11
osse	karstensrage: yes that's right. if git fetch doesn't get it, what does 'git config remote.origin.fetch' say? (assuming origin is correct, change if needed)	16:11
	← eburcat left	16:11
	→ codeFiend joined	16:11
	← tranzfuse left	16:12
RichiH	i factored out debian/ into a debian branch and deleted debian/ in master. now when i merge master into debian, it deletes the debian/ branch as well. other than reverting that commit, or editing history to remove that commit, how can i merge cleanly?	16:12
	yes, i know it's a one-off, but i would rather do it right	16:12
	← VimFleed left	16:13
	→ dreiss joined	16:13
	← Asiajey left	16:13
osse	RichiH: git merge --no-commit; resurrect the debian dir; git commit	16:13
	← Gizburdt left	16:13
RichiH	hmm	16:13
	→ Lefter1s joined	16:14
	← Lefter1s left	16:14
	→ Asiajey joined	16:14
	← ferr left	16:14
	→ Lefter1s joined	16:14
	← Asiajey left	16:14
	→ Asiajey joined	16:14
	→ zadock joined	16:14
	← kYuZz left	16:15
	← AmR\|EiSa left	16:15
RichiH	osse: that's basically a revert of said commit, though	16:15
	→ PragCypher joined	16:15
RichiH	in that case, it's prolly cleaner to merge up to that commit, revert, and then merge the rest	16:15
	← rchavik left	16:16
	← sebhoss left	16:16
osse	RichiH: well, anything at all you do that keeps the debian/ dir is basically a revert of said commit	16:16
	the idea behind my solution is that you fix it as if it was a merge conflict.	16:16
	← Takle left	16:16
	← pheaver left	16:17
	→ ferr joined	16:17
RichiH	osse: true	16:17
	→ jmpp joined	16:18
	← nilg left	16:18
	RichiH will do both and look at it later to see which he thinsk is cleaner :)	16:18
	← jstimm left	16:18
	← Asiajey left	16:18
	← nginx77 left	16:19
	→ Chilley joined	16:19
	→ Asiajey joined	16:20
	← Asiajey left	16:20
	→ Asiajey joined	16:20
	→ wiherek joined	16:20
	← Bombe left	16:20
	← ThomasLocke left	16:20
	→ Takle joined	16:21
	← joo-_ left	16:21
	→ otter768 joined	16:21
	← lb1a left	16:21
	→ Bombe joined	16:21
	→ irqq_ joined	16:21
	← Juzzika left	16:22
	← jmpp left	16:22
	← wiherek left	16:23
	← ferr left	16:23
	→ lsiv568 joined	16:23
treehug88	Git question: how can I see all of one person's branches' merges into master on a certain date?	16:23
	→ twoface88 joined	16:24
	← saint-ron left	16:24
	← irqq left	16:24
	→ JanC joined	16:24
	irqq_ → irqq	16:24
	← Asiajey left	16:24
	← thevishy left	16:24
	← otter768 left	16:25
	→ rsal joined	16:25
Chilley	i organized my java source files into packages and now when i try to commit them with IntelliJ i'm getting pathspec error saying did not match any file(s) known to git, is there any easy solution to fix this?	16:25
	robustus → robustus\|Off	16:26
	→ jasabella joined	16:26
	→ tranzfuse joined	16:26
j416	osse, RichiH: fwiw I second osse's solution. I did something similar not too long ago where I wanted to merge a project into a subdir (think subtree merge but without it having been merged before); git merge --no-commit, then I moved things into the right place and committed. Works nicely except for git blame not working well without perhaps additional flags; but it's easy to follow the history and blame the	16:26
	commit before the merge if needed.	16:26
jasabella	hi	16:26
gitinfo	jasabella: 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.	16:26
	← ehmatthes left	16:26
osse	treehug88: git log --merges --author=Jack --after=date1 --before=date2	16:26
	← opdavies left	16:26
	← PCatinean left	16:27
jasabella	i'm trying to push some files into github via android studio and it says 'push rejected master: rejected', is this a git problem or android one? :)	16:27
	→ tang^ joined	16:27
osse	jasabella: does it give a reason?	16:27
jasabella	nope	16:27
	← jitendravyas left	16:27
bremner	try pushing from the CLI	16:28
	← Matulis_ left	16:28
bremner	it probably gives better error messages.	16:28
	most like upstream has changes you need to merge/rebase over	16:28
jasabella	but it's my first push	16:28
	← intransi_ left	16:28
jasabella	i'm goin gthrough the android programming tutorial	16:28
	i'm new to git as well :\|	16:28
bremner	yeah, unfortunately we don't know this particular UI, snarkily summarized in !gui	16:29
gitinfo	Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.	16:29
Chilley	okay i committed from CLI and it worked fine weird	16:29
jasabella	so i have git bash open	16:29
	→ flughafe1 joined	16:29
jasabella	i'm trying to push to a github if i didnt say this already	16:29
	not a local git	16:29
	← tgkokk left	16:30
jasabella	i gave it my log in credentials so it shouldnt be a problem	16:30
	← PragCypher left	16:31
	→ Spacew00t joined	16:31
	→ Marcio_Moreira joined	16:31
jasabella	i didi get a 'nothing to push' very early on but it hasnt shown up again	16:31
treehug88	thanks osse	16:32
	→ opdavies joined	16:32
	← adzynia left	16:32
	← irqq left	16:32
	→ v0n joined	16:32
	← vurma left	16:32
	→ bronson joined	16:32
jasabella	thx anyways :)	16:33
osse	treehug88: the author doesn't have to be the full name. it basically does a string match. and git has various "do what I mean" ways of interpreting the date. you can write 'two weeks ago' and 'last thursday' for example.	16:33
	→ jitendravyas joined	16:33
	← CustosL1men left	16:33
	← netj left	16:34
	← dv^laptop left	16:34
	→ netj joined	16:34
	→ arnaud__ joined	16:34
	→ tgkokk joined	16:35
	→ bheesham joined	16:35
	→ iamshercoder joined	16:36
	→ livingstn joined	16:36
	→ affa09 joined	16:36
	← dreiss left	16:36
	← SpeedyGhost left	16:37
	← bronson left	16:37
	Marcio_Moreira → arq_eco	16:37
	← asdpew left	16:38
	→ teran joined	16:38
	← flughafe1 left	16:40
	→ kke joined	16:40
	→ intransit joined	16:41
	← Takle left	16:42
	← teran left	16:43
	← vtunka left	16:43
	→ petersr joined	16:43
	→ lindenle joined	16:45
	→ Intensity joined	16:46
	→ Matulis_ joined	16:47
	← lsiv568 left	16:47
Matulis_	whats the recommended workflow for branching when you have subtrees?	16:47
	→ Juxtapositional joined	16:48
Matulis_	like if I have a submodule that is a subtree and I want to try something out with a different branch, most of the stuff I have read seems to point to deleting the subtree, commiting, and re-adding it	16:48
	→ tgunr joined	16:49
iveqy	Matulis_: do you have a subtree or a submodule?	16:49
Matulis_	subtree	16:49
arq_eco	Good afternoon	16:49
	← ELFrederich_ left	16:49
Matulis_	initially started with submodules, which seemed to work fine, but then if your library submodules change rapidly, it can become a hassle trying to keep track of everything	16:50
iveqy	Matulis_: what's the problem with just do a branch? git checkout -b test?	16:50
	→ kpease joined	16:50
Matulis_	how do you get your subtree to checkout a branch?	16:50
	← petersr left	16:50
	← nour left	16:51
Matulis_	or do you mean, branch the main project, delete subtree, pull the new subtree branch, then test?	16:51
iveqy	Matulis_: you want the subtree to checkout an other branch from the origin subtree repo?	16:51
Matulis_	yep	16:51
	→ pm90_ joined	16:52
	← ohseap left	16:52
	← eslbaer left	16:52
	→ Takle joined	16:53
iveqy	Matulis_: well then just merge an other branch of the subtree module, have you read http://git-scm.com/book/en/v1/Git-Tools-Subtree-Merging	16:54
Matulis_	yeah, so I was trying to use the git subtree command as opposed to the subtree merging strategy	16:55
	← tgkokk left	16:56
	→ lsiv568 joined	16:56
	→ tgkokk joined	16:56
	→ jj995 joined	16:56
arq_eco	I have a question. We here work with CAD files around 15-30 Mb each.	16:56
	It´s very important to us keep old versions of our works.	16:56
	We use to add a number to each CAD file, like project01.01, project01.02, etc,	16:56
	representing the version of that file. On each project folder, on our server, there are dozens of versions of each project file.	16:56
	We use to work accessing the files directly from our local file server (samba on debian).	16:56
	The CAD itself provides a file lock, so there is no problem with simulataneous access.	16:56
	I have tried to use GIT on one of these projects. My problem is when I access the server from a workstation to do ´git status´ or similar command. Git performs very slowly when using a GUI for it, maybe because GIT it is trying to do diff, on the binary CAD files, bringing data from the server to check on the workstation. I don´t know.	16:56
	When I access GIT directly on the server via ssh it works very fast.	16:56
	But the GUI is important because people here use Windows workstations and don´t know to use the command line.	16:56
	Is GIT appropriate for this kind of version control????	16:56
	- Mainly binary files are used, stored on a local file server.	16:56
	- Only one person works on a file at the same time (thanks to CAD file lock).	16:56
	- A serious NEED to control versions.	16:56
	← kukks left	16:57
	← zadock left	16:57
jj995	"git push --set-upstream origin foo" leads to "error: failed to push some refs to" -- how can I fix this? how can I troubleshoot this? is there a way to get more detailed error information?	16:57
soerenb	binaries and git are not a good idea, IMHO	16:57
tang^	arq_eco: what CAD application are you using?	16:57
arq_eco	Archicad	16:57
	→ Nizumzen joined	16:58
	← kpreid left	16:58
tang^	you might want to look into !binary solutions	16:58
gitinfo	Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions	16:58
javaJake	arq_eco: git doesn't like binaries. This channel will be biased, of course, but imo if you're only dealing with binaries don't use git.	16:58
j416	arq_eco: if you have a lot of ram and the files delta compress well, it may work, but large binary files and git are usually not a very good combination. Moreover, yes, I suspect the performance issue is the network there. You would be better off cloning and doing things locally -- but you would lose the lock.	16:59
kadoban	It depends what you're doing with them and how big they are...but yeah git doesn't help much with binaries.	16:59
tang^	if you were using AutoCAD, I'd suggest you look at Autodesk Vault as it's designed exactly for that	16:59
jj995	arq_eco: a non-distributed version control system (e.g. svn) is better for binary files, because you will end up having every copy of every binary file ever modified on every workstation (instead of just on the central server)	16:59
iveqy	Matulis_: in that case I guess(!) that it's easiest to just add that branch as a new subtree. as you said before	16:59
	→ nrsk joined	16:59
j416	arq_eco: I'd have to second jj995 on this one, as much as I dislike svn, in this particular case it may very well beat git.	17:00
arq_eco	ok	17:00
j416	arq_eco: that said, if your files are small enough and you have enough memory, you _might_ get away with git, anyway.	17:00
	← VictorBjelkholm left	17:00
j416	arq_eco: but use it in a distributed manner and handle locking in some way manually	17:00
iveqy	arq_eco: it's slow since you're using git over samba (I guess). Git is a local program and don't work well over network shares	17:00
jj995	CAD files are unlikely to be really small	17:00
	← tgkokk left	17:01
j416	jj995: I've no experience.	17:01
iveqy	arq_eco: and handling CAD files is not a task suited for git imho	17:01
kadoban	svn sounds kind of terrible to me too, honestly. You get all the minuses of doing svn, the only bonus is...the repos are smaller. Woo :-/	17:01
arq_eco	Our files are around 15 to 30 Mb average	17:01
j416	something tells me cad files could be huge text files, and git could handle that well	17:01
	but perhaps these are binary	17:01
	← basiclaser_ left	17:02
javaJake	kadoban: svn will be more efficient for disk space, and will use the same amount of network bandwidth, as long as no one wants to dance between versions.	17:02
tang^	depends... DXF (Drawing eXchange Format) are text files that get rather huge, but that's only useful for moving between CAD systems	17:02
jj995	lets not be afraid to admit that git isn't superior to every other version control system in every way. svn wins for binary files. it is ok	17:02
	← jitendravyas left	17:02
iveqy	j416: if the cad format i open it's of course possible to write a plugin for git. However it's hard to do automatic merges...	17:02
	← leeN left	17:02
javaJake	kadoban: also, git won't merge binaries any better than svn :)	17:03
kadoban	I'm not saying git is good at binary files, I'm saying svn kinda seems like it'll suck at them too.	17:03
arq_eco	For us automatic diff are not important.	17:03
	→ Sasazuka_ joined	17:03
javaJake	Binaries are a pain period	17:03
osse	javaJake: How can you say that! git is a binary!	17:03
	← rafaelcpalmeida left	17:04
javaJake	osse: but I use Gentoo and compile it from source so it's all ok ;)	17:04
	→ tgkokk joined	17:04
iveqy	arq_eco: the point beeing that git might be overkill and that you could use RCS or something other stupid for this.	17:04
arq_eco	We just need a way to store versions. The system does´t need to know by itself the differences. The log history is enough.	17:04
jj995	is there any way to get more detailed error information from "error: failed to push some refs to"? I have no idea what is causing this and don't know where to start in troubleshooting this	17:04
	osse tries to make git merge two "text files" that have a single null byte at byte no. 8001	17:04
	→ rafaelcpalmeida joined	17:04
	→ Gamecubic joined	17:04
iveqy	arq_eco: git tracks changes to text between textfiles. For starter you don't have a relation between your CAD files so you want a file centric system (think CVS)	17:05
kadoban	jj995: There's no other output?	17:05
osse	javaJake: there we go... compilation is evil.	17:05
	javaJake: we need a scripted C interpreter	17:05
	javaJake shakes head and moves on	17:05
iveqy	arq_eco: there's tools for this, commersial for example meridian that deals with just file versioning. However I don't know enough about this to be able to give you a good recommend	17:05
Chilley	wow the intelliJ git plugin seems to break when you change letter case in folder names	17:06
arq_eco	iveqy: what is RCS?	17:06
	← autochthon left	17:06
	← autochthon_ left	17:06
	→ medgno joined	17:06
iveqy	arq_eco: an old simple source control system	17:06
PerlJam	arq_eco: RCS == Revision Control System, a precursor to CVS	17:06
tang^	Chilley: git breaks when you change case on non case sensitive file systems	17:06
	← mizu_no_oto left	17:06
tang^	or rather, the OS gets confused when git does what it knows	17:06
Chilley	took me one hour to figure that out :P	17:06
	← mikecmpbll left	17:07
arq_eco	iveqy: I will look for it	17:07
j416	tang^: git doesn't break, it does the right thing and assumes you want the two separate files :P	17:07
iveqy	arq_eco: no you shouldn't	17:07
tang^	j416: that's why I corrected it with "OS gets confused"	17:07
j416	tang^: :)	17:07
jj995	kadoban: nevermind, I just found that my pre-push script was bogus	17:07
iveqy	arq_eco: you should look for something similair. I doubt that RCS will handle binary files that well	17:07
kadoban	Ah, glad you figured it out	17:08
iveqy	arq_eco: sorry for misleading you on that point. You wan't a tool like meridian	17:08
	arq_eco: so look at meridian and its competitors	17:08
arq_eco	:-)	17:08
j416	arq_eco: if your files are organised in such a way that one or a handful of files belong to a project and you don't store dozens of large binary files in the same repo, git may very well work for you	17:08
Chilley	well the git plugin for intelliJ made it a bigger mess since it doesnt want to commit when you change folder structure(or change folder name)	17:08
j416	arq_eco: but then there's the locking problem, still	17:08
tang^	I keep a linux box around to fix case issues when my colleagues try to 'fix' things	17:08
	← rsal left	17:08
j416	arq_eco: if you're doing cad I'm assuming you have a huge amount of ram and cpu available anyway, so delta compression _could_ work	17:09
iveqy	j416: there's an add on for git for file looking I believe. But it's not standard and probably won't be supported by a gui	17:09
j416	arq_eco: or, you could optionally turn delta compression off.	17:09
	iveqy: interesting, how would that work?	17:09
arq_eco	Usually, our projects consist of only one CAD file. Rarely, two or three. Besides, on the folder some XLS and TXT files	17:09
PerlJam	arq_eco: if you really want to use git, store everything as DXF files and only convert to DWG to make changes.	17:10
jj995	arq_eco: suggesting RCS, which was initially released in 1982 instead of a later version control system is insane. you could probably get better assistance from another channel, since git doesn't seem like a good fit for you	17:10
j416	jj995: git might work quite well for such few files, given they are not huge.	17:11
	← tgkokk left	17:11
iveqy	j416: you've a central lock server that just contains locking information. And before you editing a file you've to manually lock it. And then your central server that you push to examine your push and the files locked so that you can't push a file that is locked by someone else	17:11
j416	arq_eco: why don't you try it out for just one typical project and see for yourself?	17:11
	iveqy: that's a nice idea, indeed	17:12
	iveqy: if you find that again I'd be interested	17:12
	← AciD` left	17:12
	→ chrisgeorge_ joined	17:12
	→ xp_prg2 joined	17:12
iveqy	jj995: ? Maybe you should read my comments again, I never suggested RCS for him. But an RCS like system (since I doubt RCS works well with binary files). Please explain to me why thata was a bad suggestion	17:13
	← xp_prg left	17:13
	→ zumba_addict joined	17:13
	chrisgeorge_ → chrisgeo_	17:13
	→ Marcio_Moreira joined	17:13
j416	iveqy: I'd assume it takes a file path and a commit hash and returns whether in that state the file should not be edited	17:13
	→ kotk joined	17:13
j416	iveqy: could very well work!	17:13
	← chrisgeo left	17:14
	chrisgeo_ → chrisgeo	17:14
jj995	iveqy: sorry, I thought you were suggesting RCS	17:14
	← arq_eco left	17:14
	← andres left	17:14
	→ andres joined	17:14
Marcio_Moreira	Friends, I would like thank you for your advice.	17:14
	← opdavies left	17:14
iveqy	j416: I don't see why the commit hash should be used? Either the file are locked or not?	17:15
j416	iveqy: is it what is described by this? http://gitolite.com/gitolite/locking.html	17:15
	← kotk_ left	17:15
	→ AciD` joined	17:15
	→ autochthon joined	17:15
	← gfixler left	17:15
	← Vampire0_ left	17:15
	→ autochthon_ joined	17:15
iveqy	j416: yes, nice catch :)	17:15
	j416: and cool that it was gitolite already implementing it. Kudos to sitaram I guess	17:16
	← zumba_ad_ left	17:16
	→ Vampire0_ joined	17:16
j416	iveqy: because if someone else modified a file and commited+pushed but you don't have their history yet, it will say that it's not locked anymore but you'd still have an outdated version which would conflict. So the system would need to be able to verify that your version of the file is identical to the current version of the file, or else it will have to report it locked	17:16
	(or, out of date)	17:16
	→ apurcell joined	17:17
	← lsiv568 left	17:17
	← valeriansaliou left	17:17
	← AciD` left	17:18
	→ AciD` joined	17:18
	← pm90_ left	17:18
	→ delboy1978uk joined	17:18
iveqy	j416: no, that's not how it works. When I lock a file and then someone else tries to lock it too to work on it, he get's denied since I already have it. If I've locked a file noone else can update it	17:18
	→ pm90_ joined	17:18
j416	iveqy: yes, I read that now	17:18
iveqy	your version would require that files can be merged, and that's not always the case	17:19
j416	no	17:19
	the opposite	17:19
delboy1978uk	quick question. my server has bare repository, my dev has a new repo with files i'd like to push to server	17:19
	→ imachuchu joined	17:19
delboy1978uk	git add remote something? then push?	17:19
	→ jitendravyas joined	17:19
iveqy	delboy1978uk: yes	17:19
	delboy1978uk: or rather git remote add and then git push	17:19
j416	iveqy: 1) Alice locks foo, edits, commits, pushes. 2) Bob does _not_ fetch; locks foo (because it is now unlocked), commits -- now, there are two diverged versions of foo	17:20
	→ SFLimey joined	17:21
	← apurcell left	17:21
iveqy	j416: oh, I missed that case. :(	17:21
delboy1978uk	git remote add origin {URL} ?	17:21
j416	iveqy: as also noted by the fourth paragraph on sitaram's page	17:22
	→ thevishy joined	17:22
j416	iveqy: but noting the commit hash might solve that issue	17:22
	← x1f496 left	17:22
	← ORiON-- left	17:22
j416	iveqy: but that also means there has to be a way to determine which version is to be considered the official current version	17:22
	→ ORiON-- joined	17:22
	← Takle left	17:22
j416	iveqy: (if there are several)	17:22
	→ x1f496 joined	17:22
iveqy	delboy1978uk: maybe, if you wan't to name your remote origin. You do know about man git remote for the specific syntax?	17:22
gitinfo	delboy1978uk: the git-remote manpage is available at http://jk.gs/git-remote.html	17:22
	→ mistertim joined	17:23
delboy1978uk	thanks! :-D	17:23
j416	iveqy: anyway, thank you for the info! very useful to know this exists.	17:23
iveqy	j416: yes, that's correct. Does gitolite handle this at all?	17:23
	← tgunr left	17:23
j416	iveqy: judging from that page only I would assume it does not	17:23
	iveqy: but I don't know.	17:23
iveqy	your design with sha1 seems to solve that	17:23
j416	mm	17:23
iveqy	maybe it need an patch ;)	17:23
j416	heh maybe	17:23
	I'll add this to my reading list even though I've read it; I might revisit the topic one day.	17:24
	← dm7freek left	17:24
	← x1f496 left	17:24
mistertim	Hey all - got a rather confusing problem: getting the 'git-upload-pack: command not found' error on attempting to git clone - but git-upload-pack is verifiably on my path! Also, pointing it at the location with the -u option gives a 'no such file' error, despite the fact that I can see it on the filesystem. Any idea what I might be doing wrong? Thanks.	17:25
	→ x1f496 joined	17:26
	← delboy1978uk left	17:26
	← x1f496 left	17:26
j416	mistertim: I would've assumed that's builtin nowadays, it isn't? o_O	17:26
	← jitendravyas left	17:26
j416	apparently it's both	17:26
	interesting	17:27
mistertim	j416: aah, interesting point. It's not my box, so it might have a very old version of git	17:27
j416	mistertim: what user is the remote executing it as and does that have it on its PATH?	17:27
	→ islalobo joined	17:27
	→ tgunr joined	17:28
	→ nofxx joined	17:28
	← nofxx left	17:28
	→ nofxx joined	17:28
mistertim	j416: the remote user, as in the user on the machine I'm attempting to clone from?	17:28
	→ opdavies joined	17:28
	← iamshercoder left	17:28
j416	mistertim: it seems even the latest git builds that as a binary	17:28
	although I may be mistaken	17:28
	→ valeriansaliou joined	17:28
j416	mistertim: yeah	17:29
	mistertim: or rather, the shell and what is being set I suppose	17:29
	→ fabio_p joined	17:30
	← codeFiend left	17:31
	→ Fretta joined	17:31
	→ HelloShitty joined	17:32
mistertim	aah sorry, I'm not sure I fully understand (which I suspect is the root of my problems here ;-)) - if I am attempting to do, say, 'git clone [email@hidden.address] then should git-upload-pack be on the $PATH for 'user' on the 'example.com' machine?	17:32
	← bhavul left	17:33
j416	mistertim: yeah, I'm no expert in this field but that seems right to me	17:33
	→ bronson joined	17:33
j416	mistertim: try ssh:ing to that machine as that user and see what you get	17:33
	→ tgkokk joined	17:34
	← CheckDavid left	17:34
mistertim	j416: that's just the thing - I do that, and there's nothing git related on the path at all!	17:35
	← beneggett left	17:35
mistertim	j416: which is doubly weird, as I can still clone the repository from there successfully from another machine	17:35
	← tgkokk left	17:35
j416	mistertim: I see.	17:35
mistertim	...which suggests that the problem is on the machine on which I'm running the clone command	17:35
j416	mhm	17:35
	→ PragCypher joined	17:35
j416	this is beyond my knowledge I'm afraid. It usually 'just works'. :)	17:36
mistertim	aah, no worries, thanks for trying!	17:36
	→ tgkokk joined	17:36
mistertim	first time I've come across this too	17:36
j416	mistertim: note however that even though there is nothing "git related" on your PATH, you might have /usr/local/bin/ or the like that has the git binary in it..	17:36
	→ Quevin_ joined	17:36
j416	mistertim: I would also compare the versions of git on the different machines, just to rule that out	17:36
	→ cavallari joined	17:36
mistertim	j416: ah, yes very true. Thanks!	17:37
	← liamkeily1 left	17:37
j416	mistertim: "which git" and "which git-upload-pack" should tell you if it's on the PATH	17:37
	(by showing you the path to it)	17:37
	→ EvilPenguin joined	17:37
	← bronson left	17:38
	→ teran joined	17:39
	← valeriansaliou left	17:40
	→ dreiss joined	17:41
mistertim	j416: aaah! found the problem (and sorry, it was stupid, and nothing anyone here could have helped with)	17:41
	→ bhavul joined	17:41
	→ valeriansaliou joined	17:41
mistertim	j416: someone's monkeyed about with the DNS entry for the server I was trying to clone from on the box I was working on	17:41
	I wasn't actually cloning from the server I should have been	17:42
	Sorry for wasting your time, and thanks again for the help!	17:42
j416	mistertim: aah hehe	17:43
	← bobmarchman left	17:44
j416	mistertim: no problem. I got wiser as well :)	17:44
	thanks for clarifying	17:44
	← tranzfuse left	17:44
	← teran left	17:44
	→ joo-_ joined	17:44
	→ bobmarchman joined	17:44
	→ Takle joined	17:45
	→ apurcell joined	17:46
	← PragCypher left	17:46
	→ pwnz0r joined	17:48
	← pm90_ left	17:48
	→ Juxtapoe joined	17:48
	→ claudio joined	17:48
	← tgkokk left	17:49
	→ akushner joined	17:49
	→ rcampbel3 joined	17:49
	← valeriansaliou left	17:49
	← c74d left	17:50
	← Juxtapositional left	17:50
	→ mizu_no_oto joined	17:50
claudio	Is there any command that finds all that's different between this site and what is on the server and makes an updating on the server?	17:51
	→ valeriansaliou joined	17:51
J1G\|Anon126	claudio: git push? I think I'm not understanding fully, though	17:51
	→ c74d joined	17:52
j416	claudio: you need to understand that git history is in the form of commits, not files	17:52
	→ Marcio_Moreira1 joined	17:52
	→ jwmann joined	17:52
claudio	Some file was to back, without being updated on the server, the git push not solving this because git push so updated that was committed.	17:53
	← daurn left	17:53
	← Cryp71c left	17:53
j416	claudio: keep things you want to keep committed.	17:53
	→ hoijui_ joined	17:54
	← kristofferR left	17:54
claudio	?	17:54
	→ daurnimator joined	17:55
	← freestyl3r left	17:55
j416	claudio: sounds like you want !book	17:55
gitinfo	claudio: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	17:55
	← Marcio_Moreira left	17:55
	→ codeFiend joined	17:55
	← myyst left	17:55
	← fabio_p left	17:56
	→ myyst joined	17:56
	→ Eins_ joined	17:56
	← nnyk left	17:57
	← Juxtapoe left	17:57
	j416 afk	17:57
	→ pm90_ joined	17:57
claudio	Is there any command that knife one kind of diff between the local version and the version that the server, and realize the difference update server?	17:57
	→ txomon\|home joined	17:57
	→ tieTYT2 joined	17:57
codeFiend	@claudio what do you mean?	17:57
	→ ocp_sc joined	17:57
	← cagedwisdom left	17:58
	← Pixi_ left	17:59
PerlJam	claudio: "git push" :-)	17:59
	→ Xiti joined	17:59
	← Xiti left	17:59
	→ Xiti joined	17:59
claudio	I'm doing git push. looking overall the system is up, but some file is lagging behind because the version that is in production server that is showing different	17:59
	→ iamshercoder joined	18:00
	→ smccarthy2 joined	18:00
	← Eins_ left	18:00
	→ ecky--ptang-zoob joined	18:00
PerlJam	claudio: git will only push commits, have the local changes been committed?	18:01
	← bb010g left	18:01
claudio	yes	18:01
	→ pheaver joined	18:01
	← smccarthy2 left	18:01
PerlJam	claudio: also, when you say "production server", how do you deploy to that server? IS there some hook that does it when you push to a certain repo?	18:01
	← ome left	18:01
	→ Juxtapositional joined	18:01
PerlJam	claudio: also ... are you sure your local branch and what's on production are the same?	18:02
	→ smccarthy2 joined	18:02
	← phantomtiger left	18:02
	→ Lewix joined	18:02
	→ dm7freek joined	18:02
Lewix	so i have a merge conflict, fixed it then commited again	18:02
	so i made two commits	18:02
	now im trying to squash them together	18:03
PerlJam	claudio: I mean "are the same branch"	18:03
	← smccarthy left	18:03
	← Juxtapositional left	18:03
	← apurcell left	18:04
	← rafaelcpalmeida left	18:04
	Guest48713 → murph	18:04
	→ Juxtapositional joined	18:04
	→ tgkokk joined	18:04
	→ rafaelcpalmeida joined	18:04
	→ baweaver joined	18:05
	← opdavies left	18:05
Lewix	PerlJam: yes	18:05
	the same branch of course	18:05
	→ sbogg joined	18:06
	← Juxtapositional left	18:06
	→ opdavies joined	18:06
	→ Juxtapositional joined	18:06
	→ alakra joined	18:07
	→ tranzfuse joined	18:07
	← Juxtapositional left	18:07
	← aswen left	18:08
	← psoo left	18:08
	← Radivarig left	18:08
	→ thedodd joined	18:08
ecky--ptang-zoob	I keep getting this: Pull is not possible because you have unmerged files.	18:09
	→ Radivarig joined	18:09
ecky--ptang-zoob	I don't care about unmerged files, just need to pull and overwrite anything local	18:09
	possible?	18:09
claudio	yes.. the same	18:09
RichiH	j416, osse: i went with revert as that makes it painfully clear what happened	18:09
	→ apurcell joined	18:10
	← mikiones left	18:10
RichiH	j416, osse: mainly for the benefit of the others in the project; they don't really know git and are confused as it is	18:10
	but i will keep that in mind for my own stuff in the future	18:11
J1G\|Anon126	ecky--ptang-zoob: try git checkout --theirs .	18:11
	then git add .	18:11
	and merge	18:11
	this should overwrite all the local files	18:11
ecky--ptang-zoob	--theirs?	18:12
J1G\|Anon126	ecky--ptang-zoob: that basically tells git to just take the version being merged in	18:12
	and ignore the local version	18:12
ecky--ptang-zoob	ok	18:13
	→ lsiv568 joined	18:13
	← stamina left	18:13
ecky--ptang-zoob	i have added this line in gitignore: bootstrap/start.php - but it keeps committing it	18:13
	how do I stop git from tracking it permanently	18:13
	?	18:13
soerenb	!untrack	18:14
gitinfo	To remove a file from git's tracking, without deleting it from your working tree, `git rm --cached <file>`. Note that any repo which pulls this change will delete their local copy of that file. You can "bring it back" using `git checkout HEAD@{1} file` immediately after pulling / merging	18:14
	← Guest98661 left	18:14
	← s00pcan_ left	18:15
ecky--ptang-zoob	tx	18:15
	Marcio_Moreira1 → arqe_eco	18:15
	→ pantsman- joined	18:15
arqe_eco	Friends, I would like to thank you for your advice	18:16
	→ Juxtapositional joined	18:16
arqe_eco	I have just found this. Maybe it´s a last chance for Git in this case: http://git-annex.branchable.com/	18:16
	→ beneggett joined	18:17
arqe_eco	git-annex allows managing files with git, without checking the file contents into git. While that may seem paradoxical, it is useful when dealing with files larger than git can currently easily handle, whether due to limitations in memory, time, or disk space.	18:17
	→ rafaelcp_ joined	18:17
	← JoshLopes left	18:17
	← codeFiend left	18:19
	→ s00pcan_ joined	18:19
	← hoijui_ left	18:20
	← thedodd left	18:20
	← rafaelcpalmeida left	18:20
raub	Is there any info on using the GIT_SSH variable?	18:20
	I tried to use it to get the private key, GIT_SSH='ssh -i /home/raub/.ssh/gitadmin'	18:21
	→ ssarah joined	18:21
	→ serum joined	18:21
raub	Which led to error: cannot run ssh -i /home/raub/.ssh/gitadmin: no such file or directory	18:21
	→ asdofindia joined	18:21
	← asdofindia left	18:21
	→ codeFiend joined	18:22
ssarah	hei guys how you doing. I'm working on a branch and i was thinking i should git rebase master to get whatever was changed in master (aka, moving my branch ot the tip of master). So i just do git rebase master?	18:22
	→ otter768 joined	18:22
	→ asdofindia joined	18:22
J1G\|Anon126	ssarah: that's it	18:22
ssarah	(i was asking this here the other day didnt work so well. im using github, if that's relevant)	18:22
	← s00pcan_ left	18:22
	← asdofindia left	18:22
	→ s00pcan_ joined	18:22
	→ Marcio_Moreira joined	18:23
ssarah	Ok, so then I created a file, added that, and performed a commit, then a push master branchname and it got rejected	18:23
	=/	18:23
	→ thedodd joined	18:23
ssarah	some other info there, if you need it, but that's all i did	18:23
	→ asdofindia joined	18:23
	← arqe_eco left	18:23
	← achadwick left	18:23
	← lsiv568 left	18:23
J1G\|Anon126	ssarah: rebasing doesn't change master; it only changes the branch you have checked out	18:23
ssarah	yeh, but then i want to commit the fact that it was rebased to github, right?	18:24
	← asdofindia left	18:24
ssarah	sorry, i should have said push instead of commited, just now	18:24
	→ Takle_ joined	18:24
J1G\|Anon126	ssarah: yes, so you would push your other branch	18:24
soerenb	ssarah, when you rebase you !rewrite history	18:24
gitinfo	ssarah: Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	18:24
	← thedodd left	18:24
	→ rjc joined	18:24
	→ beckyconning_ joined	18:24
	→ thedodd joined	18:25
	→ Amandil joined	18:25
	← Takle left	18:25
	→ freestyl3r joined	18:26
	→ liamkeily joined	18:26
	→ Jakex10sen joined	18:26
	← otter768 left	18:26
ssarah	You think I shouldn't rebase then? I was just trying to mantain a linear project history, and it seemed easier to do than to keep merging new changes from the master into the branch. Also, it's my own personal branch, no one elese's.	18:26
soerenb	no, it's probably fine in your workflow, but you will have to --force the push if you update your remote branch	18:27
J1G\|Anon126	ssarah: in that case it's fine, but in order to push, you need to add a +	18:27
	git push origin +my_branch	18:27
	that forces it as soerenb describes	18:27
	→ thierryp joined	18:27
	→ nour joined	18:28
	← Jakex10sen left	18:29
	← ruukasu left	18:29
	← jost left	18:30
	→ mikecmpbll joined	18:30
	→ tastycode joined	18:30
	← s00pcan_ left	18:30
	→ ruukasu joined	18:30
	→ s00pcan_ joined	18:31
	← s00pcan_ left	18:31
	→ s00pcan_ joined	18:31
	← thierryp left	18:31
	→ thierryp joined	18:32
	← [H]unt3r left	18:32
	← Nizumzen left	18:32
	← GGflags left	18:32
tastycode	I think my understanding of git is patently broken or git has a very obvious bug. I’m trying to rebase, and then i get a conflict. I resolve the conflict then try “git rebase —continue” and get a “hey did you forget to use git add”.. i use git add on the files that had conflicts, then i try “git rebase —continue” again. and get the same message ?? https://gist.github.com/tastycode/33a765082354230c9aa6	18:33
	← encod3_ left	18:34
tastycode	The strange thing is that “git status” changes on the last “git rebase —continue” attempt, no longer showing the files i had resolved conflicts on	18:34
	→ lachm joined	18:35
soerenb	tastycode, "No changes - did you forget to use 'git add'?"	18:35
	← LeMike left	18:35
	→ leeN joined	18:35
	← thierryp left	18:35
soerenb	use git rebase --skip	18:35
	← tgkokk left	18:35
	→ encod3 joined	18:35
soerenb	git is actually telling you that	18:35
tastycode	I think i understand, when I resolved the merge conflicts i ended up making the code “exactly” like origin/develop.. so there were no changes between what i was rebasing and the changes i made	18:36
	← Spacew00t left	18:36
tastycode	i tried git rebase —skip just now, and then looked at one of the “conflicts” and git did exactly what i would have done.. just accept origin/develop’s copy	18:36
	← marcogmonteiro left	18:37
	← beneggett left	18:37
	→ [H]unt3r joined	18:37
tastycode	i think i got this.. thanks for your help..	18:37
	← encod3 left	18:38
	→ jnavila joined	18:38
	← tang^ left	18:39
	→ teran joined	18:40
	← alakra left	18:40
	→ beneggett joined	18:41
	→ Juxtapoe joined	18:41
ssarah	thank you guys, trying it now	18:42
	→ jplussier joined	18:42
	← liamkeily left	18:42
	→ ojacobson joined	18:44
	← Juxtapositional left	18:44
	← teran left	18:44
	← bobmarchman left	18:45
	gitinfo set mode: +v	18:45
	→ Spacew00t joined	18:46
	→ bobmarchman joined	18:47
	← lachm left	18:48
	→ kukks joined	18:48
	→ lsiv568 joined	18:49
	← freimatz left	18:49
	→ codetroll joined	18:49
	← Marcio_Moreira left	18:50
	→ lachm joined	18:51
	→ neocraft232 joined	18:51
	→ weeb1e_ joined	18:51
	→ loglaunch joined	18:52
	← weeb1e left	18:52
	→ aidalgol joined	18:52
	→ a-l-e joined	18:53
	← ssarah left	18:53
	← Takle_ left	18:53
	← neocraft232 left	18:54
	← Amandil left	18:55
	← unreal left	18:56
	→ donmichelangelo joined	18:56
	→ unreal joined	18:56
	→ Amandil joined	18:57
	→ FroMaster joined	18:57
	← ehynds left	18:57
FroMaster	Got a question about a git workflow and don't quite know what to use to google for examples...	18:58
	← michelangelo left	18:58
J1G\|Anon126	FroMaster: what is it?	18:59
FroMaster	I want to fork several github repos into a private repo (seems like a submodule) but then need to make changes and/or reference the code in the submodules	18:59
	→ brucelee joined	18:59
FroMaster	That way when there's an upstream change I can pull it down and figure out the merge conflicts as necessary	19:00
	→ githogori joined	19:00
FroMaster	The upstream repos won't accept my pull requests as they are specific to my environment	19:00
	← baweaver left	19:00
	→ chiromante joined	19:00
	→ d10n-work joined	19:00
FroMaster	I used to do a smilar workflow using CVS but trying to adapt it to git is puzzling me	19:01
	← subhojit777 left	19:01
	← joo-_ left	19:01
	← codeFiend left	19:01
J1G\|Anon126	I think someone else will need to answer this, as I'm not very well-versed in submodules :(	19:02
	→ omosoj joined	19:02
	→ Bryzzle joined	19:02
	← bobmarchman left	19:02
	→ bobmarch_ joined	19:02
	← rafaelcp_ left	19:02
FroMaster	Not sure if submodule is even the right function/feature. i've done some reading about git and git+submodules and it looks close to what I'm trying to do but still unsure	19:02
	→ bb010g joined	19:03
omosoj	i created a new branch off the development branch and made some changes, but now i'm behind the development branch (which has since been updated to solve a few problems) is there a way to update my local branch to the updates on the development branch?	19:03
	→ ssarah joined	19:04
	← joki left	19:04
	→ liamkeily joined	19:04
J1G\|Anon126	omosoj: yes, you can merge the dev branch into yours	19:04
kadoban	omosoj: Merge or rebase, depending on if you've published/shared your branch and also depending on what you want history to look like	19:04
	→ bronson joined	19:04
ssarah	wow... i think rebase worked. so now basically it remade all my commits to be after the tip of master	19:04
PerlJam	FroMaster: in the 3 times I've tried to use submodules, each time, they weren't quite the right fit after all. You might also want to look at gitslave or using git subtree	19:04
ssarah	and it's lying about the times they were made?	19:05
	← lsiv568 left	19:05
J1G\|Anon126	ssarah: every commit has 2 timestamps: authored and committed. normally, the authored time is preserved, but committed time is changed to when you rebased	19:05
	Github shows the authored timestamp on its site if I'm not mistaken	19:06
	→ nisseni joined	19:06
	→ hohum joined	19:07
omosoj	ok - so i pulled changes to the development branch to my local machine. if i want to update my new local branch (branch2) to the changes, i should do 'git rebase development'?	19:07
J1G\|Anon126	omosoj: that would be the rebase method, yes	19:07
	→ Xz joined	19:08
omosoj	J1G\|Anon126, what are the pros/cons of merge vs rebase?	19:08
	i think rebase seems more like what i'm looking for, but not sure	19:08
Xz	hi guys, I just created a repo on my localhost. I'm trying to git clone it using: git://localhost:9418/home/path/to/git/repo	19:08
	no luck, anybody knows how to export my local repo to be availabe for others to be cloned?	19:08
J1G\|Anon126	pros of rebasing: linear history, cons: trouble when you rebase things that have been pushed, possibility of breaking things	19:09
	← bronson left	19:09
J1G\|Anon126	pros of merging: simpler, okay for history that's been pushed; cons: can make history hard to understand	19:09
Xz	I'm getting 'connection refused'	19:09
	→ mikiones joined	19:10
PerlJam	Xz: probably more work than you'd like, but I'd just use gitolite.	19:10
	→ codeFiend joined	19:10
	→ joki joined	19:10
	← HelloShitty left	19:10
ssarah	J1G\|Anon126: sweet	19:10
Xz	PerlJam: do I need to create git bare repo? or what?	19:10
	← lachm left	19:10
PerlJam	Xz: If you're going to share, you should be sharing a bare repo	19:11
Xz	PerlJam: I have stuff that's not to be released to the world yet	19:11
offby1	Xz: sounds like you need to run "git-daemon" but haven't yet	19:11
Xz	PerlJam: well, it's just for a code review - not a long term repo	19:11
	← jason237 left	19:11
PerlJam	Xz: and what offby1 said	19:11
	← pheaver left	19:12
	→ Takle joined	19:12
omosoj	J1g\|Anon126, i see, thank you.	19:12
Xz	PerlJam: offby1 ok, so after installing git-daemon I have 'access denied or repo not exported'	19:13
	→ joo-_ joined	19:13
kadoban	Xz: gitolite doesn't assume you're sharing with the world. Using git over SSH tends to be better than using the actual git daemon, regardless of if you use gitolite or not.	19:13
Xz	PerlJam: offby1 does that mean lack of bare-repo ?	19:13
	kadoban: I will have a closer look at gitolite, thanks	19:13
	← bgerber left	19:13
	→ joel_falcou joined	19:14
	← dreiss left	19:14
	→ jceb joined	19:14
omosoj	i tried to rebase and got this error: https://gist.github.com/josomo/3fb62bc6996e0e7943b6 looks like it went to merge it	19:14
offby1	Xz: sounds like you haven't actually _run_ git-daemon	19:14
	← Quevin_ left	19:14
offby1	merely installing it is unlikely to suffice	19:14
	although I suppose that depends on how you installed it	19:14
omosoj	a line in db/schema.rb was not updated, too. so i guess the merge didn't work either?	19:15
	← hexagoxel left	19:15
Xz	offby1: it did run by default - it's showing up in 'ps aux'	19:15
	offby1: I use debian and it got installed as a service	19:15
	← UKn0Me left	19:15
J1G\|Anon126	omosoj: no, it says "merging" but it is really being rebased	19:15
	omosoj: you say a line was bad?	19:16
	← jnavila left	19:16
PerlJam	Xz: and your repo is where ever git daemon expects it to be? (And is being exported?)?	19:16
offby1	Xz: at this point you need to !repro	19:16
gitinfo	Xz: [!transcript] 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 raise the odds of getting your problem fixed from about 30% to about 90%.	19:16
	→ brotherBox joined	19:16
omosoj	J1G\|Anon126, yes :\|	19:16
	← skylite left	19:17
Xz	offby1: PerlJam ok, thanks - I will refer to git-daemon manual	19:17
brotherBox	Hi, I have found nothing on this topic and can't think of anything myself: is there any way to implicitly blacklist any __pycache__ folder in all subfolders?	19:17
	doing just __pycache__ only blacklists it in the dir as the .gitignore file is.	19:18
PerlJam	Xz: git daemon can use any path ... find out which one(s) your debian package expects.	19:18
	→ lsiv568 joined	19:19
offby1	brotherBox: I'm almost certain it can be done, but I can't remember the syntax :-\|	19:19
	brotherBox: I'd take a long, careful look at the man page	19:19
	man .gitignore	19:19
	hmph	19:19
brotherBox	I did not know .gitignore had its own man page. Will take a look, thanks!	19:19
javaJake	brotherBox: if the file you're trying to ignore is already in your repo, gitignore has no effect.	19:20
	← silverfix left	19:20
	→ jmpp joined	19:20
J1G\|Anon126	omosoj: interesting... in that case you might as well make a new commit with the updated line	19:20
	→ nnyk joined	19:21
omosoj	J1G\|Anon126, hm, ok. thanks for the help	19:21
	← [H]unt3r left	19:22
	→ [H]unt3r joined	19:22
	← redbaritone left	19:22
	→ redbaritone joined	19:22
	xp_prg2 → xp_prg	19:22
	← cobakobodob left	19:23
	→ pheaver joined	19:24
	← opdavies left	19:24
	← jmpp left	19:25
	← paulweb515 left	19:25
	→ bgerber joined	19:25
	← nisseni left	19:26
	→ veebers joined	19:26
offby1	javaJake: that's certainly true, but it's unlikely that brotherBox has added __pycache__ to his repo	19:27
brotherBox	I removed all instances of __pycache__ and added **__pycache__ to the gitignore	19:28
	Now it works perfectly. Thanks a bunch!	19:28
	→ atomx joined	19:29
	→ settermjd joined	19:30
	→ FreezingCold joined	19:31
	← kukks left	19:31
	→ Bass10 joined	19:31
	← RaceCondition left	19:31
	→ irqq joined	19:32
	→ tgkokk joined	19:32
	← Bass10 left	19:33
	← astrofog left	19:33
	← liamkeily left	19:33
	← nrsk left	19:34
	← s00pcan_ left	19:34
	→ jmpp joined	19:34
	→ s00pcan_ joined	19:35
	← joo-_ left	19:36
	← lsiv568 left	19:36
	← tgkokk left	19:37
	← tranzfuse left	19:38
	→ baweaver joined	19:38
	→ joo-_ joined	19:39
	→ andi3 joined	19:39
	→ Bass10 joined	19:39
	→ teran joined	19:41
	← RichiH left	19:41
	→ lhunath joined	19:41
	← codeFiend left	19:42
	← thedodd left	19:43
	← jaydubya left	19:43
lhunath	I have a line-based list of file paths, relative to my git working directory. I want git to behave as though it ignores everything in the workdir except for the listed files. how would I do that?	19:43
	→ jaydubya joined	19:44
	← claudio left	19:44
	← wodim left	19:44
	→ gsingh93 joined	19:45
iveqy	lhunath: if you have added all the files in the list, just tell git to ignore everything since git don't ignore already tracked files	19:45
	← teran left	19:46
	→ VimFleed joined	19:46
lhunath	so, just use a .gitignore of * and add the files with -f?	19:47
iveqy	lhunath: there's more ways to do it. But I'm not sure they are suitable if you're new to git (and I've no idea what your skill level is so I tell you the basic approach)	19:47
lhunath	or don't use a gitignore at all and don't look at untracked files in the repo	19:47
iveqy	lhunath: yes, that would be my solution.	19:47
	→ psoo joined	19:47
	← bannakaffalatta left	19:48
	← cavallari left	19:48
	← jaydubya left	19:48
	→ nrsk joined	19:48
iveqy	lhunath: that's one of the more advanced ways to do it, and it's a bit better but a bit more unusual.	19:48
	← Bryzzle left	19:49
	t0th_-__ → t0th_-	19:49
	t0th_- → t0th_--	19:50
	← mizu_no_oto left	19:50
	→ cobakobodob joined	19:50
	← brucelee left	19:50
	→ nuk3 joined	19:51
	← jplussier left	19:51
	← baweaver left	19:51
	→ mizu_no_oto joined	19:51
	← joo-_ left	19:51
	→ tgkokk joined	19:53
redbaritone	lhunath: Can you not segregate the files into different folders?	19:54
	← tgkokk left	19:54
	← howlymowly left	19:54
	→ tgkokk joined	19:54
	→ lsiv568 joined	19:55
	← nnyk left	19:55
	← setuid left	19:56
	→ Orbitrix joined	19:56
	← Orbitrix left	19:56
	→ Orbitrix joined	19:57
	→ creep joined	19:58
	→ PragCypher joined	19:59
	← creep left	19:59
	→ wodim joined	19:59
	→ BlaXpirit_ joined	19:59
	→ codeFiend joined	19:59
	→ creep joined	19:59
	→ paulweb515 joined	20:00
	→ thedodd joined	20:00
	← codeFiend left	20:00
Xz	ok, git daemon sucks	20:00
	I cannot even get it to work on localhost	20:00
	it always says the same 'access denied or repository not exported'	20:01
	I tried with --bare, not bare	20:01
	with git-daemon-export-ok, without it	20:01
	← EminenceHC left	20:01
Xz	I obviously put my stuff under git-daemon wants that (/var/cache/git on debian)	20:01
	← FroMaster left	20:02
	→ phantomtiger joined	20:02
	→ bluesm joined	20:02
	← BlaXpirit left	20:02
	→ scroteau joined	20:02
kadoban	Xz: IMO git daemon is outdated and useless on anything approaching a normal setup. I really don't know what real-world use-case it's supposed to be useful for.	20:04
	← jmpp left	20:04
	→ kukks joined	20:04
	← kukks left	20:04
	→ kukks joined	20:04
	← regan left	20:04
	← ssarah left	20:05
ojacobson	kadoban: it works okay for reasonably fast read-only access, with less configuration effort than smart http	20:05
	→ tranzfuse joined	20:05
	← iamshercoder left	20:06
kadoban	Ah, I see.	20:08
	→ jaydubya joined	20:08
	← lsiv568 left	20:08
Xz	ojacobson: not for me :\	20:08
	← scroteau left	20:08
	→ WaReZ joined	20:09
ojacobson	Xz: I'm not inclined to help people who start with "Well, ___ is stupid". Come back when you've vented and !repro, though, and let's talk.	20:09
gitinfo	Xz: [!transcript] 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 raise the odds of getting your problem fixed from about 30% to about 90%.	20:09
ojacobson	I know you're frustrated, but I have shit to do :D	20:09
	→ brucelee joined	20:09
Xz	ojacobson: what are you talking about?	20:09
	→ scroteau joined	20:09
Xz	ojacobson: I pasted exactly what I did and exactly what's the error	20:09
	ojacobson: slow down dude	20:10
	← Matulis_ left	20:10
	→ akiva joined	20:10
	← s00pcan_ left	20:10
	→ Bryzzle joined	20:11
	→ s00pcan_ joined	20:11
	→ nour_ joined	20:11
	← gccostabr left	20:11
	← french left	20:11
	← ruukasu left	20:11
	← pm90_ left	20:11
	→ lsiv568 joined	20:13
	← redbaritone left	20:14
	→ studmuf joined	20:14
	← nour left	20:14
	← james__ left	20:15
	→ konr joined	20:15
	→ chrisshattuck joined	20:16
	→ jason237 joined	20:16
	← fandi left	20:17
	→ nnyk joined	20:18
	← atomx left	20:19
	→ jdo_dk joined	20:19
	→ FAMAS joined	20:20
	← FAMAS left	20:20
	→ FAMAS joined	20:21
	← tgkokk left	20:22
	→ aswen joined	20:22
	→ otter768 joined	20:22
	→ cavallari joined	20:23
	→ chrisgeorge_ joined	20:23
	← ignas left	20:23
	→ boombatower joined	20:24
	← FAMAS left	20:25
	← chrisgeo left	20:25
	chrisgeorge_ → chrisgeo	20:25
	← cdown left	20:25
	→ FAMAS joined	20:25
	← jdo_dk left	20:26
	→ tang^ joined	20:26
	← lpax left	20:27
	→ dreiss joined	20:27
	← Jackneill left	20:27
	→ eburcat joined	20:27
	← otter768 left	20:27
	→ jnavila joined	20:28
	← ecky--ptang-zoob left	20:29
	← githogori left	20:29
	← Lewix left	20:29
	→ CustosL1men joined	20:29
	→ Neptu joined	20:30
	→ sonOfRa_ joined	20:30
	→ Bilge- joined	20:30
	→ MSeven joined	20:30
	← sigv left	20:30
	→ monte joined	20:30
	← bobmarch_ left	20:30
	→ biertie_ joined	20:30
	← s00pcan_ left	20:31
	← [M7] left	20:31
	← dr_lepper left	20:31
	← nrsk left	20:31
	biertie_ → biertie	20:31
	→ barmaglot\|2 joined	20:31
	← Nothing4You left	20:31
	← sonOfRa left	20:31
	← barmaglot left	20:31
	→ nrsk joined	20:31
	→ Arokh joined	20:31
	Bilge- → Bilge	20:31
	→ s00pcan_ joined	20:31
	→ bobmarchman joined	20:31
	→ dr_lepper joined	20:31
	→ midnightmagic joined	20:31
	→ Gege joined	20:32
	→ zack6849 joined	20:32
	← zack6849 left	20:32
	→ zack6849 joined	20:32
	monte → monty	20:32
	← mkoskar left	20:32
	← valeriansaliou left	20:33
	← Lefter1s left	20:33
	← nikio__ left	20:33
	→ valeriansaliou joined	20:33
	→ sigv joined	20:33
	→ nikio_ joined	20:34
	→ Nothing4You joined	20:34
	→ fandi joined	20:36
	← scroteau left	20:37
	← pheaver left	20:37
	← bobmarchman left	20:37
	→ bobmarchman joined	20:38
	→ stiffi joined	20:38
nofxx	If I proposed a pull request from master, it will (only github?) continue to add commits from that branch to the pull request. Is there some way to politely move this to a branch so I can work on master? Will need to close the pull request?	20:38
	Sorry if its only github related, but I hope gitlab works the same, haven't tested pull requests tbh	20:39
preaction	yes, you would need to close the PR, make a branch, and open a new PR for that branch. PRs are tied to branches in github	20:40
	learner1 → learner	20:40
nofxx	preaction, thought so, ty	20:40
	← stiffi left	20:40
	→ teran joined	20:41
	→ baweaver joined	20:41
	← valeriansaliou left	20:42
	← kukks left	20:42
	← baweaver left	20:43
	← s00pcan_ left	20:44
	→ valeriansaliou joined	20:44
	→ s00pcan_ joined	20:44
	← jgardella left	20:44
	→ majuscule joined	20:45
	→ rafaelcpalmeida joined	20:45
	→ mkoskar joined	20:45
	→ netcarver joined	20:45
	← teran left	20:46
	← bobmarchman left	20:46
	→ orbisvicis joined	20:47
	→ bobmarchman joined	20:47
	← aswen left	20:47
	← PragCypher left	20:48
	← Tuna-Fish left	20:48
	→ pheaver joined	20:49
	← Acidnerd left	20:49
	← lsiv568 left	20:49
	← pwnz0r left	20:49
orbisvicis	given a remote repo and branch, how do I determine the latest commit/revision hash without creating any local files ?	20:49
	→ EminenceHC joined	20:50
J1G\|Anon126	orbisvicis: git show [remote]/[branch]	20:50
preaction	git ls-remote also, if you don't care to fetch	20:50
	→ FortySix2 joined	20:50
	→ ruukasu joined	20:51
	← phos1 left	20:51
	← a-l-e left	20:51
J1G\|Anon126	if fetching is what orbisvicis means by creating local files, then that would be better	20:52
majuscule	hi all, i'm a little unclear and want to get a definitive answer. does git use deltas to store changes to binary files? i'm aware that it can't diff them, but i want to know how they're stored	20:52
	← chiromante left	20:52
orbisvicis	J1G\|Anon126: yes, that's what I meant	20:52
	ls-remote is great	20:52
	← s00pcan_ left	20:53
J1G\|Anon126	majuscule: no, it does not store deltas	20:53
	← Takle left	20:53
majuscule	thanks J1G\|Anon126	20:53
	→ s00pcan_ joined	20:53
J1G\|Anon126	you're welcome	20:53
	→ bronson joined	20:53
majuscule	also just curious, is there an architectural reason for that?	20:53
	← valeriansaliou left	20:53
	→ g3danken joined	20:54
majuscule	seems like binary diffs could be used and it would be tremendously helpful for projects with significant binary assets	20:54
	→ Noldorin joined	20:54
majuscule	s/diffs/deltas	20:54
	→ valeriansaliou joined	20:55
J1G\|Anon126	majuscule: Git does not store any deltas (exception is when you are sending things over the network)	20:55
	← EminenceHC left	20:55
	← s00pcan_ left	20:56
	→ s00pcan_ joined	20:56
J1G\|Anon126	but the same object will be used if it is not changed	20:56
majuscule	oh interesting. i need to reread the plumbing docs to get a better handle on this	20:57
	← bronson left	20:57
majuscule	thanks again	20:57
	→ Takle joined	20:58
J1G\|Anon126	majuscule: try looking at some solutions for !binary files	20:58
gitinfo	majuscule: Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions	20:58
J1G\|Anon126	!annex	20:58
gitinfo	git-annex and git-media are two solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. See http://git-annex.branchable.com/ and https://github.com/schacon/git-media	20:58
	→ EminenceHC joined	20:58
asturel	anyone knows where should i put the ssh_config to pick up by github windows client?	20:58
	← s00pcan_ left	20:59
	← jceb left	20:59
	→ s00pcan_ joined	20:59
	→ Tuna-Fish joined	20:59
	→ bannakaffalatta joined	20:59
	→ codeFiend joined	21:00
	→ katherine__ joined	21:00
	→ PragCypher joined	21:00
	← nath_schwarz_ left	21:00
orbisvicis	what about the date of the latest commit (continuing with ls-remote) ?	21:01
	← PragCypher left	21:01
	← Ankhers left	21:01
	→ baweaver joined	21:01
	← codeFiend left	21:02
asturel	ah, it was just the ssh key	21:02
	← HoMM left	21:03
	→ hexagoxel joined	21:03
	← netcarver left	21:03
	← Juxtapoe left	21:04
	→ pm90_ joined	21:05
	→ netcarver joined	21:05
	→ JohnBat26 joined	21:05
katherine__	hi all. i'm looking for help getting git-http-backend working on my gerrit server	21:05
	← bsanford left	21:05
	← jazzzu left	21:05
	← pm90_ left	21:05
orbisvicis	actually, nevermind, I think the standard is to use the checkout date, not the commit date	21:05
	← nrsk left	21:05
katherine__	is anyone available who could help?	21:05
	← s00pcan_ left	21:06
	→ jantje joined	21:06
	→ s00pcan_ joined	21:06
	← jds left	21:06
	→ sgen__ joined	21:06
	→ Gizburdt joined	21:07
katherine__	git-http-backend, anyone?	21:08
majuscule	i just did that yesterday katherine__, if you have a specific question i might be able to help	21:08
	← s00pcan_ left	21:08
majuscule	(although not with gerrit)	21:09
katherine__	thanks, majuscule	21:09
	→ s00pcan_ joined	21:09
	→ eric_____ joined	21:09
katherine__	is there a good way to show what i have in my config file?	21:09
	i'm obviously missing something as i get a 401 trying to access my url	21:10
	→ buffal0 joined	21:10
	→ codeFiend joined	21:10
majuscule	sure, paste it somewhere	21:10
	but 401 is an auth problem, you should probably post your logs as well	21:10
	← oojacoboo left	21:11
	← akushner left	21:11
	→ Ankhers joined	21:11
katherine__	majuscule: this is the 443 portion of my conf file: http://jpst.it/vB2b	21:13
	working on the logs, now	21:13
	→ m0viefreak joined	21:13
katherine__	i realize it's an auth issue but have not been able to figure out where i've gone awry	21:13
	← s00pcan_ left	21:14
	→ s00pcan_ joined	21:14
	← marthinal left	21:15
katherine__	nothing in the httpd error_log and only this in the access_log: http://jpst.it/vB2C	21:16
	→ e-Flex joined	21:16
	→ Acidnerd joined	21:16
	← jnavila left	21:17
katherine__	majuscule: command line output:	21:17
	http://jpst.it/vB35	21:17
	sonOfRa_ → sonOfRa	21:18
	→ lsiv568 joined	21:18
majuscule	oh huh, so are you trying to do it with auth or just expose it over http	21:19
katherine__	trying to do it with auth	21:19
	i think that's what i want to do, no?	21:20
majuscule	i don't see anything about auth in your config?	21:20
	what kind of auth do you want to use, http basic?	21:20
	← s00pcan_ left	21:21
	→ s00pcan_ joined	21:21
	← psoo left	21:21
	→ iamshercoder joined	21:22
	← sburgess left	21:22
	→ jnavila joined	21:22
katherine__	you'll have to pardon my ignorance. this is my first time digging into apache and ssl	21:22
	i'm not sure how to determine the type of auth we're already using	21:22
	← freestyl3r left	21:23
	← islalobo left	21:23
	← dougsland left	21:23
	→ gfixler joined	21:23
	← donmichelangelo left	21:24
	← codetroll left	21:24
	← jnavila left	21:25
	→ Ankhers` joined	21:25
	← lsiv568 left	21:26
	← Ankhers left	21:26
	→ codetroll joined	21:27
	→ Juxtapositional joined	21:27
	← Techn0mag left	21:28
treehug88	Hi all, I'm trying to recreate ancient, two-year-old branches at my work's git repo. I have the information about a particular merge into master, and want to see just the diffs that were merged in that particular merge. Suppose the 'git log' output looks like: commit ad9b9da461ce42702266a26a80399bbf3da14b42 Merge: 025a71f 782d453 (more follows)	21:28
orbisvicis	what is the sorting for ls-remote -t ? (time)	21:29
majuscule	katherine__: sorry, i'm not sure how to help you figure that out.	21:29
treehug88	I thought 'git diff 025a71f..782d453' would show me ust those changes, but I'm seeing more than I expected. Can anyone assist please?	21:29
	→ sq-one joined	21:29
	← valeriansaliou left	21:29
	Ankhers` → Ankhers	21:30
	→ valeriansaliou joined	21:30
	→ akushner joined	21:30
	← ruukasu left	21:31
treehug88	got it. Three dots.	21:32
	← pheaver left	21:33
majuscule	lol, that's annoying	21:33
	→ thierryp joined	21:36
	→ tpollard joined	21:37
	← FortySix2 left	21:38
	← arnaud__ left	21:38
	→ arnaud__ joined	21:39
	→ claudio joined	21:39
	→ Polylith joined	21:39
	→ FortySix2 joined	21:39
	← twoface88 left	21:39
	→ jazzzu joined	21:40
	← thierryp left	21:40
	← mikecmpbll left	21:41
	→ dik_dak joined	21:42
ldlework	If there is a commit like 50 commits ago, in a public repo that we want to undo, is the correct thing to do to just make a new commit that undoes the work?	21:42
	→ teran joined	21:42
ldlework	Is there anyway to easily and automatically craft that new commit?	21:42
claudio	because git not updated in the repository files that I delete?	21:42
	why?	21:43
	← arnaud__ left	21:43
claudio	Why does this happen?	21:43
qsuscs	ldlework: man git revert	21:44
gitinfo	ldlework: the git-revert manpage is available at http://jk.gs/git-revert.html	21:44
ldlework	qsuscs: cool	21:44
	← IrishPrime left	21:45
	← FortySix2 left	21:45
	→ donmichelangelo joined	21:45
	← teran left	21:47
claudio	why git not updated in the repository files that I delete?	21:48
	→ pheaver joined	21:48
	← thevishy left	21:49
	← settermjd left	21:49
	→ ruukasu joined	21:51
	← mizu_no_oto left	21:51
	→ n-st joined	21:53
	→ rao joined	21:53
	← akushner left	21:54
	← brucelee left	21:54
rao	can a .gitignore file be added to any directory or only to the root dir of the repo?	21:55
	→ mchvs joined	21:55
bremner	any	21:55
	also, !tias	21:55
gitinfo	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/tias.html may help with git-specific TIAS.	21:55
bremner	although maybe with gitignore it's a bit tricky to test	21:56
	→ joo-_ joined	21:56
	← s00pcan_ left	21:57
	← mitzip left	21:57
	→ s00pcan_ joined	21:57
	← joo-_ left	21:57
	→ buck1 joined	21:57
buck1	so I have two long-lived branches, and i'd like to be able to pull back and forth between, without rejecting the same hunks over and over	21:58
	is there any support for this?	21:58
	→ dave_boling joined	21:58
	→ Consuela joined	21:58
	← d10n-work left	21:58
	→ metastableB joined	22:00
	Solid1 → Solid1_afk	22:00
	← dreiss left	22:00
	← medgno left	22:00
	← jerius left	22:00
	← saidelike_ left	22:00
	→ mitzip joined	22:00
	aidalgol → fsbot	22:01
	← learner left	22:01
	← PaulCapestany left	22:01
	← rcampbel3 left	22:01
	fsbot → Guest89914	22:01
	← irqq left	22:01
	Guest89914 → fsbot`	22:01
	fsbot` → aidalgol	22:02
	→ qwebirc92123 joined	22:02
	→ saidelike joined	22:02
	→ learner joined	22:03
	→ mikecmpbll joined	22:03
	← pheaver left	22:03
	← baweaver left	22:04
	← JohnBat26 left	22:04
	← th3fallen left	22:04
	← joel_falcou left	22:04
	→ RaceCondition joined	22:04
	→ shauna joined	22:04
	→ PaulCapestany joined	22:05
	→ DolphinDreamm joined	22:06
	← valeriansaliou left	22:06
	← beneggett left	22:07
	← DolphinDream left	22:07
	← bitkiller left	22:08
	→ valeriansaliou joined	22:08
	→ bitkiller joined	22:08
	← s00pcan_ left	22:08
	→ thiago joined	22:09
	← thiago left	22:09
	→ thiago joined	22:09
	→ Fissure1 joined	22:09
	→ akushner joined	22:10
	→ jaydubya_ joined	22:10
	← Milkweed left	22:11
osse	git rerere	22:11
	→ opdavies joined	22:12
	← Ankhers left	22:12
	← jaydubya left	22:12
	← mkoskar left	22:12
	← studmuf left	22:12
	← ocp_sc left	22:13
	→ studmuf joined	22:13
	← denete left	22:13
	← rishabh left	22:14
	→ s00pcan_ joined	22:14
	→ beneggett joined	22:14
	← valeriansaliou left	22:15
	→ aard_ joined	22:16
	→ valeriansaliou joined	22:17
	← charon left	22:17
	→ charon joined	22:17
	← Juxtapositional left	22:17
	→ ap0c joined	22:17
	← studmuf left	22:18
	→ oojacoboo joined	22:18
	← learner left	22:19
	← nuk3 left	22:19
	← s00pcan_ left	22:20
tieTYT2	i took a copy of the source code of a project, put it in its own repo, and started working on it. Now I have access to the remote repo but there’s no history that ties my root to the remote root. What I really want to do is move my changes on top of my local master. How do I do this?	22:23
	→ cdown joined	22:23
	← buffal0 left	22:23
	← iamshercoder left	22:23
osse	tieTYT2: EASY!!!	22:23
	→ otter768 joined	22:23
tieTYT2	that’s what a rebase with “onto” is for right?	22:24
osse	tieTYT2: fetch one repo into the other. so that you have two independent branches. then you can create a graft that stitches one on top of the other	22:24
	hmm, maybe you can use rebase with --onto actually	22:24
	→ iamshercoder joined	22:24
osse	--onto and --root	22:24
	worth a try	22:24
tieTYT2	can cherry pick be used to do this, too?	22:25
osse	not the first commit	22:25
tieTYT2	i want to throw away my original commit, that should be the same as the remote branch anyway	22:25
osse	oh right	22:25
	that makes it all much easier	22:25
	a git rebase is straight forward then	22:25
tieTYT2	good thing I made sure to commit that separately	22:25
	→ jerius joined	22:25
	→ s00pcan_ joined	22:26
osse	get the original repo. fetch yours into that. then checkout yours. rebase --onto origin/master first-commit-hash	22:26
Inv1s1ble	I'm really confused. In the following project: https://github.com/sumdog/ansible-jenkins it says I'm 7 commits behind the project I forked from, but when I do a compare or pull request, the diff is empty	22:26
tieTYT2	osse: thanks, I’ll give that a try	22:26
	← tranzfuse left	22:27
osse	Inv1s1ble: yes, because you're not ahead of it. everything you have they have also, so there's nothing to do	22:27
	← chrisgeo left	22:27
iveqy	Inv1s1ble: what you want is probably to pull from their project so that you get the new commits that you're behind	22:28
tieTYT2	osse: first-commit-hash means the first commit I want to keep, right?	22:28
	← otter768 left	22:28
osse	tieTYT2: no. that argument to rebase is the "base". so that is the last commit you don't want to keep	22:28
tieTYT2	oh ok	22:28
osse	which is the first one you made	22:28
Inv1s1ble	iveqy, so I should reverse the base/head forks? That's what I though; that I'm missing their newer commits	22:29
	→ mkoskar joined	22:29
osse	Inv1s1ble: that means you want to pull. a pull request is asking them to pull from you, ie. the opposite.	22:30
	← treehug88 left	22:30
tang^	sounds like you're really needing to !sync	22:30
gitinfo	[!fork_sync] You can read a nice guide on how to update your fork with the upstream repository here: https://help.github.com/articles/syncing-a-fork	22:30
iveqy	Inv1s1ble: I've no idea what you mean with reverse the base/head forks. Keep in mind that a fork isn't something git does (github does that, but github isn't git). To answer what I think you want to do, see tang^s link.	22:31
	→ sburgess joined	22:31
Inv1s1ble	iveqy, cool thanks	22:31
tieTYT2	osse: that didn’t make any noticable effect: output was: First, rewinding head to replay your work on top of it...Fast-forwarded master to origin/master.	22:32
	osse: oh I get it. I gotta have my change’s branch checked out	22:32
osse	yes	22:32
	← VimFleed left	22:33
tieTYT2	perfect, that’s awesome. Not even a conflict	22:33
	→ ocp_sc joined	22:33
iveqy	Inv1s1ble: good luck	22:34
	← sburgess left	22:35
Inv1s1ble	iveqy, thanks. :-P	22:35
	→ s8321414 joined	22:35
Inv1s1ble	iveqy, huh...I think my repo is screwy. I'm using it as a subtree in another project. I forked it from another project to add some features, but the upstream repo didn't/doesn't have a master branch. If I switch to my master branch and rebase of my origin, it tries to pull in all the commits from the original project it's a subtree of O_o	22:37
	← jason237 left	22:37
	← bannakaffalatta left	22:38
Inv1s1ble	yea I think I'm gonna give up for now. I've documented my crappy fixes in an issue; probably should get back to paid work for today :-P	22:39
	→ jas4711 joined	22:39
	→ setuid joined	22:40
	← duderonomy left	22:40
	→ jdv79 joined	22:40
jdv79	what's a good way to get the list of changed files in a pre-receive hook for a new branch?	22:40
	our existing thing is using the old ref of all zeroes git passed in the lhs in a range and git doesn't like that	22:41
	→ pheaver joined	22:41
	← Gizburdt left	22:41
	→ dougsland joined	22:42
	← kermit left	22:42
osse	you must decide what to compare it to	22:42
	→ kermit joined	22:42
iveqy	Inv1s1ble: sounds like you really have to keep track of branches and repos. Unfortunately I can't really help you that well there. I stick with submodules, a lot cleaner imho.	22:42
	→ teran joined	22:43
	← claudio left	22:44
	← cdown left	22:45
	→ cdown joined	22:45
Inv1s1ble	iveqy, no worries	22:45
mchvs	night o/	22:45
	← ojacobson left	22:46
	← dougsland left	22:47
	← teran left	22:48
	← autochthon left	22:49
	← valeriansaliou left	22:50
	← autochthon_ left	22:50
jdv79	i guess i want from the "fork point"	22:50
	→ valeriansaliou joined	22:50
	← bhavul left	22:50
	← jaydubya_ left	22:51
	→ jaydubya joined	22:51
osse	jdv79: the fork point of what? it's probably fair to assume master in most cases, but it doesn't have to be	22:51
	← Dougie187 left	22:51
	← cdown left	22:52
	→ cdown joined	22:52
	← s00pcan_ left	22:53
	→ mmoretti joined	22:53
	→ paritybit joined	22:54
	→ jaydubya_ joined	22:55
	← doev left	22:55
	← jerius left	22:55
	← affa09 left	22:55
	→ dreiss joined	22:57
	← jaydubya left	22:57
	→ Schrostfutz joined	22:59
	→ s00pcan_ joined	22:59
	← brotherBox left	22:59
Schrostfutz	how can I add a git repository to as subdirectory in another repository?	22:59
soerenb	!subprojects	22:59
gitinfo	So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.	22:59
	→ githogori joined	23:00
	← s00pcan_ left	23:01
	→ alekks joined	23:01
	← s00pcan left	23:01
	← pheaver left	23:01
	→ flaviocamilo joined	23:03
Schrostfutz	soerenb: thank you	23:03
	!subtree	23:03
gitinfo	The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/Git-Tools-Subtree-Merging for more info, see also !git-subtree and !git-stich-repo.	23:03
	→ shawndumas joined	23:04
	← dreiss left	23:05
	← biertie left	23:06
	→ biertie joined	23:06
	biertie → bdesmet	23:06
	→ baweaver joined	23:06
Schrostfutz	can I also use a non-empty prefix?	23:06
	← jagob left	23:06
	→ s00pcan joined	23:07
	← mmoretti left	23:07
	→ rcampbel3 joined	23:07
	→ mmoretti joined	23:08
	← shawndumas left	23:09
	→ hebz0rl joined	23:09
	← jaydubya_ left	23:09
	→ paul424 joined	23:10
	→ jaydubya joined	23:10
	← mmoretti left	23:11
	← codetroll left	23:11
	→ mmoretti joined	23:12
	← tinanoo left	23:12
	← Gama11 left	23:13
	← nour_ left	23:14
	← jaydubya left	23:14
	← cdown left	23:15
	← konr left	23:15
	→ cdown joined	23:15
	← WaReZ left	23:16
	→ dreiss joined	23:17
	← creep left	23:17
wowaname	hai	23:17
	← phantomtiger left	23:18
Schrostfutz	wowaname: helo	23:18
	→ pheaver joined	23:18
	← aard_ left	23:18
	← pantsman- left	23:19
	← s00pcan left	23:19
paritybit	Hey I need a bit of advice on a repo. I got this project that was originally developed in git. Then moved to perforce. Now we're moving it back to git but changes were made while it was in perforce. I need to maintain the perforce modified copy for backwards compatiblility sake, but I also need to maintain a current version where new features are added. What is possibly the best way of handling this? Using tags?	23:20
	Using separate branches? Two different repos?	23:20
	← Spacew00t left	23:21
	← katherine__ left	23:21
	← bobmarchman left	23:22
	→ FunkyAss joined	23:22
	→ pm90_ joined	23:23
	← jdv79 left	23:23
	← omosoj left	23:24
	→ s00pcan joined	23:24
	→ pwnz0r joined	23:24
	← dave_boling left	23:24
	→ s00pcan_ joined	23:24
	← dik_dak left	23:26
buck1	"a current version where new features are added" is usually a branched named master	23:27
	→ kukks joined	23:27
buck1	a branch named master*	23:28
	← leeN left	23:29
	→ foulou joined	23:30
	→ mjuszczak joined	23:30
	→ dsdeiz joined	23:30
	← mchvs left	23:31
	← rendar left	23:32
	← s00pcan_ left	23:32
	← s00pcan left	23:33
	← orbisvicis left	23:33
	→ jaydubya joined	23:34
	→ dik_dak joined	23:34
	← livingstn left	23:35
	← Skapadapaduu left	23:35
	← myyst left	23:37
	← eric_____ left	23:38
	→ s00pcan joined	23:38
	→ s00pcan_ joined	23:38
	→ myyst joined	23:38
	← boombatower left	23:38
	← smccarthy2 left	23:39
	← valeriansaliou left	23:41
	← AciD` left	23:42
	← pm90_ left	23:42
	← macabre left	23:42
	→ dave_boling joined	23:43
	← s00pcan left	23:43
	← s00pcan_ left	23:43
	→ AciD` joined	23:43
	→ teran joined	23:44
	→ duderonomy joined	23:44
	→ Gitzilla joined	23:44
	→ valeriansaliou joined	23:45
	→ Laurenceb__ joined	23:47
	← King_Hual left	23:48
	→ s00pcan joined	23:48
	→ s00pcan_ joined	23:49
	← teran left	23:49
	← Laurenceb_ left	23:49
	← hexagoxel left	23:50
	→ pm90_ joined	23:50
	← pm90_ left	23:51
	→ pm90__ joined	23:51
	← valeriansaliou left	23:51
	← EminenceHC left	23:52
	→ codetroll joined	23:53
	← Amandil left	23:54
	← AaronMT left	23:54
	→ Muchoz joined	23:56
	→ Miesco joined	23:56
	← luriv left	23:56
	→ valeriansaliou joined	23:56
Muchoz	Is there a way to execute this command: "git ls-tree --name-only -r master" and make it automatically detect the branch I'm on instead of giving it to it?	23:56
osse	Muchoz: use HEAD	23:57
	!HEAD	23:57
gitinfo	HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is not something that exists separately for every branch. It also is not necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)	23:57
	← mmoretti left	23:57
Muchoz	osse, I actually was. But then I need to commit in order to see it update.	23:57
	→ bronson joined	23:58
osse	Muchoz: that doesn't change if you use master	23:58
	← hebz0rl left	23:58
	← s00pcan_ left	23:58
Muchoz	osse, I'm retarded;	23:58
	→ s00pcan_ joined	23:59
	→ mmoretti joined	23:59
Muchoz	Any way to show all of the files without committing then?	23:59

Logs Search ←Prev date Next date→

Channels Documentation