IRCloggy #git 2015-03-30

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-03-30
	← fstd left	00:00
	→ fstd joined	00:00
	← scientes_ left	00:01
	→ skorgon joined	00:01
	→ scientes_ joined	00:01
	← scientes_ left	00:01
	→ scientes_ joined	00:01
	← cbonobo left	00:02
	← jagob left	00:03
	→ clarkpan joined	00:03
	← jds left	00:05
	← tmager left	00:07
	→ ivan_on_trac joined	00:07
	→ ottanta joined	00:07
ivan_on_trac	toggle features and flag features. are synonymous?	00:08
	← intellix left	00:08
	→ nyexpress joined	00:09
deltab	ivan_on_trac: in what context?	00:09
	→ cbonobo joined	00:09
	← nyexpress left	00:09
ivan_on_trac	deltab: Git perhaps, continuous integration	00:10
	→ gbit86 joined	00:10
deltab	ah, http://stackoverflow.com/questions/19434222/feature-toggles-vs-feature-branches	00:10
	→ reaverb joined	00:10
	→ kadoban joined	00:10
	← scientes_ left	00:10
	→ Seikho_ joined	00:10
deltab	sounds like toggles and flags would be the same thing	00:10
	→ scientes_ joined	00:10
	→ tier joined	00:11
	→ madewokherd joined	00:11
	→ bronson joined	00:11
ottanta	hey, so a friend recommended I rebase my feature branch against the master branch of the tree I'm basing my patch off of	00:11
	← MattMaker left	00:12
	← tomasm- left	00:13
	← CheckDavid left	00:13
	← cbonobo left	00:14
	← scientes_ left	00:14
	→ tmager joined	00:14
ivan_on_trac	deltab: ok	00:14
	→ scientes_ joined	00:14
	← scientes_ left	00:14
	→ scientes_ joined	00:14
	→ makepkgn_ joined	00:15
	← bronson left	00:16
	← WaReZ left	00:16
	← mezod left	00:17
	← scientes_ left	00:17
	← makepkgn_ left	00:17
	← HelloATMega left	00:18
	← diegoviola left	00:18
	→ scientes_ joined	00:18
	← scientes_ left	00:18
	→ scientes_ joined	00:18
	→ makepkgn_ joined	00:19
	← reaverb left	00:19
	→ reaverb joined	00:20
	← madewokherd left	00:20
	← gopar left	00:21
	← scientes_ left	00:21
	→ madewokherd joined	00:21
	→ Corey84 joined	00:23
	→ macabre joined	00:23
deltab	ivan_on_trac: "feature bits, flags, flippers, switches and the like. There seems no generally accepted name yet". — http://martinfowler.com/bliki/FeatureToggle.html	00:24
	← Sonicbit left	00:26
ivan_on_trac	deltab: Martin Flower. Where is he. I hope he's always right.	00:26
	← mikiones left	00:27
	→ nnyk_ joined	00:27
	→ Charlie_WONG_Sup joined	00:27
	→ iml joined	00:27
	← _Cyclone_ left	00:28
	→ AmR\|EiSa joined	00:28
	→ cbonobo joined	00:28
	→ dreiss joined	00:28
	← robustus left	00:30
	← neunon left	00:31
	← madewokherd left	00:31
	→ bluesm joined	00:31
	← Charlie_WONG_Sup left	00:32
	← nnyk_ left	00:32
	→ Charlie_WONG_Sup joined	00:32
	→ martinbmadsen joined	00:33
	→ robustus joined	00:34
	← tmager left	00:34
	→ neunon joined	00:34
	→ unixpro1970 joined	00:35
	← ottanta left	00:35
	← Charlie_WONG_Sup left	00:36
	→ Charlie_WONG_Sup joined	00:36
	← ManikM left	00:37
	← cdown left	00:37
	← tomtclai left	00:38
	→ dougsland joined	00:38
	→ arnaud__ joined	00:38
	← martinbmadsen left	00:39
	→ KEN_403 joined	00:39
	← kadoban left	00:39
	← vreo left	00:40
	→ madewokherd joined	00:40
	← s8321414 left	00:41
	→ tmoor joined	00:42
	← daedeloth left	00:43
	→ toothrot joined	00:44
	← dreiss left	00:45
	→ effi joined	00:45
	→ CheckDavid joined	00:45
	→ cdown joined	00:46
	→ tomtclai joined	00:47
	→ daito joined	00:47
	→ theme2 joined	00:47
	← smccully left	00:48
	← ropav_ left	00:48
	← theme2 left	00:49
	← macabre left	00:49
	← tmoor left	00:50
	→ tmoor joined	00:50
	← frivol left	00:51
	→ DrNick joined	00:51
	← Corey84 left	00:53
	→ zacts joined	00:53
	← effi left	00:53
	→ ace1 joined	00:53
	← cdown left	00:54
	← madewokherd left	00:55
	→ senkin joined	00:55
	← happy-dude left	00:56
	← fserb left	00:56
	← reaverb left	00:56
	→ fserb joined	00:57
	← fserb left	00:57
	← Takle left	00:57
	→ fserb joined	00:57
	← whitby left	00:58
	← AmR\|EiSa left	00:59
	← skorgon left	00:59
	← clarkpan left	00:59
	→ richarddoyle joined	00:59
	← harish left	00:59
	← richarddoyle left	01:00
	→ richarddoyle joined	01:00
	← richarddoyle left	01:00
	→ clarkpan joined	01:01
	→ LikiLiki joined	01:02
	← _Atom_ left	01:02
	← LikiLiki left	01:03
	gitinfo set mode: +v	01:03
ace1	hi	01:04
gitinfo	ace1: 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.	01:04
	grepper back	01:04
ace1	Hey, is there something wrong with using Apple's Git instead of Git from the main website?	01:04
	→ jerematic joined	01:05
	→ _Atom_ joined	01:06
fserb	Apple's git is usually outdated (and they lack some extra stuff).	01:06
	(you can also uso git from homebrew on mac, which is usually better than downloading the one form git site)	01:06
	→ eletuchy joined	01:09
	← jerematic left	01:10
	→ jaznow_ joined	01:10
	← unixpro1970 left	01:10
	→ happy-dude joined	01:12
	→ bronson joined	01:12
	→ AmR\|EiSa joined	01:12
	← denete left	01:13
	→ Sonicbit joined	01:13
	→ Gamecubic joined	01:14
	← jaznow_ left	01:14
	← eletuchy left	01:14
	Vgr_ → Vgr	01:15
	→ reaverb joined	01:16
ace1	Thanks fserb	01:16
	← bronson left	01:17
	→ macabre joined	01:17
	→ EminenceHC joined	01:19
grepper	qsuscs: around ? Still trying to figure out why 'git descibe' doesn't work as you think it should.	01:20
	← Consuela left	01:21
	← reaverb left	01:21
	← pks left	01:21
	→ pks joined	01:22
	→ madewokherd joined	01:23
	← Floatingman left	01:23
	→ Vampire0_ joined	01:23
	← netj left	01:23
	→ netj joined	01:23
	← EminenceHC left	01:23
	→ ashokrajar joined	01:25
	← Vampire0 left	01:26
	→ Floatingman joined	01:26
	nkouevda_ → nkouevda	01:28
	← ashokrajar left	01:29
	← sgen left	01:30
	← bgerber left	01:31
	← madewokherd left	01:31
	← MadsRC left	01:32
	← Rastus_Vernon left	01:32
	← rgp100 left	01:33
	→ AustinTheGrey joined	01:33
	→ gopar joined	01:34
	← _Atom_ left	01:34
	← arnaud__ left	01:35
	→ Es0teric joined	01:35
	→ bgerber joined	01:35
	→ MadsRC joined	01:35
	→ chrisgeorge joined	01:37
	→ GinoMan joined	01:38
	← Asiajey left	01:39
	← AustinTheGrey left	01:39
	← daftano_ left	01:39
	← goldstar_ left	01:40
	← Es0teric left	01:40
	← chrisgeorge_ left	01:41
	→ Es0teric joined	01:43
	← AmR\|EiSa left	01:43
	→ daftano joined	01:44
	← imMute left	01:44
	→ dreiss joined	01:47
luaboy	how to git add all modified files in subdirs ?	01:47
meaneye	git add .	01:48
	?	01:48
luaboy	meaneye:are you sure?	01:48
	← chrisgeorge left	01:48
meaneye	Well, that will add all the modified files.	01:48
	→ chrisgeorge_ joined	01:48
rkazak_	try it out in a test repos.	01:48
meaneye	Are you talking about few or specific subdirectories?	01:48
	→ skorgon joined	01:49
	→ sgen joined	01:49
	← sgen left	01:49
	→ martinbmadsen joined	01:49
luaboy	if I want to add all the .py file recursively,how is that?	01:49
	→ _2_4251202106 joined	01:50
	← _2_4251202106 left	01:50
	← SoFLy left	01:51
meaneye	git add dir/*.py	01:51
	c74d → Guest7872	01:51
	← Guest7872 left	01:51
meaneye	Or git add *.py	01:51
	Or git add *.py	01:51
	Sorry for repeating :D	01:52
	→ mizu_no_oto joined	01:52
luaboy	git add *.py just woking for the .py in current dir	01:52
	→ c74d joined	01:52
	→ ghostpl_ joined	01:53
meaneye	Ah, sorry	01:53
	You have to escape the *	01:53
	So it's	01:53
	dig add \*.py	01:53
	Because shell expands it.	01:53
	Dig lol. Too tired.	01:53
	Also for subdirectories: git add dir/\*.py	01:54
	→ imMute joined	01:54
	← martinbmadsen left	01:55
	→ harish joined	01:56
	← tier left	01:58
	→ madewokherd joined	01:58
luaboy	git push or git push origin master for upload modification	01:58
meaneye	Well, they might behave the same. Depending on configuration. Default is to behave the same.	01:59
	If I remember correctly it should push to the same branch you are on.	01:59
	I always specify remote and branch just to make sure.	01:59
	So git push origin master.	01:59
luaboy	all right	02:00
	← ghostpl_ left	02:00
	→ AmR\|EiSa joined	02:00
luaboy	meaneye:Thanks a lot	02:00
meaneye	You are welcome.	02:00
	→ Goplat joined	02:01
	← mizu_no_oto left	02:01
	← berz3rk left	02:02
	← oriba left	02:02
	← _X_C_V_B_ left	02:02
	← madewokherd left	02:02
	→ reaverb joined	02:02
	→ lvegerano joined	02:03
	→ mizu_no_oto joined	02:04
	← Charlie_WONG_Sup left	02:06
	→ Charlie_WONG_Sup joined	02:06
	→ asflex joined	02:07
	→ echo-area joined	02:07
	← jrahmy left	02:07
	← yahoshi left	02:08
	← Dorf left	02:09
	→ maqr joined	02:10
	→ joetam joined	02:10
	→ eletuchy joined	02:10
	← Zamyatin left	02:11
	← netj left	02:11
	→ netj joined	02:12
	← Charlie_WONG_Sup left	02:13
	→ Charlie_WONG_Sup joined	02:13
	← Es0teric left	02:13
	← Goopyo left	02:13
	→ bleb joined	02:13
	→ bronson joined	02:13
	← sdothum left	02:13
	← clarkpan left	02:15
	← eletuchy left	02:15
	← toothrot left	02:15
	→ devll joined	02:15
bleb	git status says master is ahead of origin/master by 22 commits... but on github the most recent commits are the same as my most recent commits in master branch. How do I get my origin/master consistent with the master branch on github? (which is also consistent with my master branch)	02:16
	→ ropav_ joined	02:16
	→ clarkpan joined	02:16
meaneye	Isn't origin/master on github?	02:17
	← TheNet left	02:17
	← jorj left	02:17
	← ropav left	02:17
	← bronson left	02:17
	← clarkpan left	02:18
	→ jorj joined	02:18
bleb	I would expect origin/master to be the same as what's on github, but that's not the case	02:18
	→ madewokherd joined	02:18
bleb	I've been able to pull and everything too	02:18
meaneye	Are you sure changes are the same?	02:19
	→ clarkpan joined	02:20
	← LucasTT left	02:20
meaneye	Try git fetch origin	02:20
	And see if that clears up the message.	02:20
	← AmR\|EiSa left	02:22
	← livingstn left	02:22
	← madewokherd left	02:23
	→ livingstn joined	02:24
	← neonKow left	02:24
	← zacts left	02:25
	← yqt left	02:26
	→ martinbmadsen joined	02:26
	← lvegerano left	02:27
	→ neonKow joined	02:29
	← oojacoboo left	02:29
	→ MattMaker joined	02:29
	→ michelangelo joined	02:29
	← zapb_ left	02:31
	→ Es0teric joined	02:31
	→ jsilver_ joined	02:31
	← joetam left	02:33
	← donmichelangelo left	02:33
	← darkbasic left	02:33
	→ darkbasic joined	02:34
	← jonmorehouse left	02:34
	← msonntag left	02:36
	→ ben____ joined	02:36
	← DuckMaestro left	02:36
	→ zapb_ joined	02:37
	→ msonntag joined	02:37
	→ zacts joined	02:37
bleb	meaneye: yeah that did it! Its funny because I tried git fetch master, git fetch origin/master, and git fetch origin master; none of those work. What would I do if I only wanted to fetch the master branch?	02:39
ojacobson	'git fetch origin'	02:39
	(i.e., stop wanting that, it doesn't help as much as you might think)	02:39
	if you _really_ want to do that have a look at git remote's set-branch subcommand	02:39
	→ madewokherd joined	02:40
meaneye	bleb, as far as I know this issue should not happen often.	02:40
bleb	thats chill, I guess there isn't really any reason not to fetch everything	02:41
meaneye	Well, pull and push do that for you anyway. I don't know how you ended up with that situation.	02:41
	← hcc23 left	02:41
	← jsolano left	02:42
	→ sgen_ joined	02:43
	← CheckDavid left	02:43
	→ jsolano joined	02:44
	→ effi joined	02:44
	← devll left	02:44
	→ devll joined	02:44
	← fserb left	02:45
	← Es0teric left	02:46
	← makepkgn_ left	02:47
	← Charlie_WONG_Sup left	02:47
	→ Charlie_WONG_Sup joined	02:47
	← macabre left	02:48
	← effi left	02:48
	→ jstimm joined	02:48
	← cbonobo left	02:48
	→ IIT joined	02:50
	→ Es0teric joined	02:50
	← cromero left	02:51
	→ toothrot joined	02:52
	→ nsev joined	02:53
	← Charlie_WONG_Sup left	02:54
	→ jerematic joined	02:54
	→ Charlie_WONG_Sup joined	02:54
	← nsev left	02:54
	→ uaenb joined	02:55
	← livingstn left	02:55
	← mizu_no_oto left	02:56
	← uaenb left	02:56
	← meaneye left	02:56
	← bleb left	02:56
	← Dougie187 left	02:57
	→ Eein joined	02:57
	→ axs221 joined	02:57
	← dougsland left	02:57
	← Eein left	02:58
	← jerematic left	02:58
	→ Wgse joined	02:59
	← Sonicbit left	02:59
	← Es0teric left	03:00
	← neonKow left	03:00
	→ OutofControl joined	03:00
	→ luc_ joined	03:00
	← Wgse left	03:00
	→ neonKow joined	03:00
	→ cbonobo joined	03:01
	→ rchavik joined	03:01
	→ viyy joined	03:01
	← c74d left	03:02
	← viyy left	03:02
	← bluesm left	03:03
	→ lfau joined	03:03
	← ropav_ left	03:04
	→ meoblast001 joined	03:04
	→ cromero joined	03:04
	→ c74d joined	03:04
meoblast001	is it generally safe to package something with a ".git" directory in it to pass to someone else? i'd just like to make sure there's no sensitive user-specific data in there	03:04
	← Charlie_WONG_Sup left	03:04
	→ Charlie_WONG_Sup joined	03:05
	→ APerson_ joined	03:05
	→ ropav joined	03:05
	← bernalex left	03:06
	→ EminenceHC joined	03:07
	→ ashokrajar joined	03:10
	← gargola left	03:10
	← cbonobo left	03:10
	→ Goopyo joined	03:10
	→ Asiajey joined	03:10
	→ cbonobo joined	03:11
	→ makepkgnotwar joined	03:12
	← EminenceHC left	03:12
	← makepkgnotwar left	03:13
kpreid	meoblast001: pretty much depends on what you've put in	03:13
	for example, it can contain usernames for remotes, which you might or might not consider sensitive	03:13
	← MattMaker left	03:13
	→ makepkgnotwar joined	03:13
meoblast001	hm.. i just cloned it from my public github	03:13
	nothing else	03:13
	← Charlie_WONG_Sup left	03:13
kpreid	I'd suggest just poking around (skip the 'objects' directory) and see what's there	03:14
	→ Charlie_WONG_Sup joined	03:14
meoblast001	the few things i poked at seemed to have nothing	03:14
	→ gargola joined	03:14
kpreid	if you've done work you don't want to share, there might be remnants, and a fresh clone woul be better	03:14
	→ bronson joined	03:14
	← rdbell left	03:14
	→ metastableb joined	03:14
deltab	meoblast001: names and email addresses of authors and committers; hostnames and directory paths of remote repos; deleted branches and stashes, unless garbage collected	03:14
meoblast001	deltab: hm. that doesn't seem that bad	03:15
	← ashokrajar left	03:15
meoblast001	kpreid: yeah. totally fresh clone	03:15
	→ iamjarvo joined	03:15
	→ Goopyo_ joined	03:16
	← Goopyo left	03:16
	← mr-kyd left	03:16
	Goopyo_ → Goopyo	03:16
	← iamjarvo left	03:16
	→ chrisgeorge joined	03:16
	← chrisgeorge left	03:16
	→ hahuang61 joined	03:17
	← bronson left	03:19
	← clarkpan left	03:19
	← ef5c_ef5c left	03:20
	← chrisgeorge_ left	03:20
	← axs221 left	03:20
	← SleePy left	03:22
	→ SleePy joined	03:23
	→ arnaud__ joined	03:24
	→ iamjarvo joined	03:24
ivan_on_trac	Do you keep the source of the applications in a different location from the database schema? Repo different.	03:25
	← meoblast001 left	03:25
	← bitkiller left	03:25
	← Vgr left	03:27
	← SimonNa left	03:28
	← arnaud__ left	03:28
	← cbonobo left	03:31
	← makepkgnotwar left	03:31
	→ zacts` joined	03:34
	→ cbonobo joined	03:34
	→ raymond joined	03:34
	← zacts left	03:35
	← zacts` left	03:37
	← otter768 left	03:38
	← Charlie_WONG_Sup left	03:38
	← hahuang61 left	03:39
	→ hahuang61 joined	03:40
	→ zacts joined	03:40
	→ ancientcc12 joined	03:41
	← Gamecubic left	03:41
	→ ManikM joined	03:42
	→ jonmorehouse joined	03:43
	← neonKow left	03:43
	→ ghostpl_ joined	03:43
	→ makepkgnotwar joined	03:44
	← Seikho_ left	03:44
	→ Seikho_ joined	03:44
	→ in3xes joined	03:45
	→ effi joined	03:45
	→ MattMaker joined	03:46
	← iamjarvo left	03:47
	← ghostpl_ left	03:48
	← effi left	03:50
	← MasterPiece left	03:51
	← zapb_ left	03:52
	← cromero left	03:52
	→ clarkpan joined	03:52
	← harish left	03:53
	→ DuckMaestro joined	03:53
grepper	how can I get 'git describe' to output something like v0.35.0-0xxxx ? I have a tag v0.35.0 but perhaps it is seen only in branch, if that makes sense. Right now 'git describe' doesn't output anything unless I use --always.	03:54
	← daito left	03:54
	→ harish joined	03:56
	→ cromero joined	03:56
	← devoldmx left	03:57
	→ devoldmx3 joined	03:57
	→ zapb_ joined	03:58
	→ Charlie_WONG_Sup joined	03:58
	→ kadoban joined	03:59
	→ eletuchy joined	03:59
	← m0viefreak left	04:00
	→ dsdeiz joined	04:02
	← eletuchy left	04:04
	→ lvegerano joined	04:05
thiago	grepper: first of all, are you sure that the tag can describe that commit?	04:07
	grepper: git log <thatcommit>..v0.35.0	04:07
	anything printed?	04:07
grepper	not sure I understand. What is <thatcommit> here? The tag points to the correct commit right now.	04:09
	I just want it to show up in master when I do git describe	04:09
	→ ranchodev joined	04:10
grepper	actually both branch "tovid-0.35.0" and the tag v0.35.0 point at the same commit	04:10
thiago	you want to describe a commit	04:10
	replace <thatcommit> with the commit you want described	04:10
grepper	well, I want 'git describe' in master to show the tag followed by the current commit in master, like v0.35.0-9d12e2	04:11
	isn't that the way 'git describe' is supposed work ?	04:11
thiago	ok, so the commit is HEAD	04:11
	do what I asked and tell me if it prints anything	04:11
grepper	actually, I think the problem is the commit was made in branch, and isn't in master	04:12
	so the tag points to the commit and to the branch, but it doesn't affect 'git describe' in master branch	04:13
	(if that makes any sense), Sorry, 1st week with git coming from SVN	04:13
	$ git describe 9d12e2c v0.35.0	04:14
	v0.35.0	04:14
	v0.35.0	04:14
thiago	ok, as expected	04:14
	→ bronson joined	04:15
	→ k_sze[work] joined	04:16
	→ metts joined	04:16
	← ancientcc12 left	04:18
	→ cagedwisdom joined	04:18
	← bronson left	04:19
	→ alokbeniwal joined	04:22
	← makepkgnotwar left	04:22
grepper	thiago: so any idea what I can do to get the expected behavior of 'git describe' in master ?	04:23
	git rev-parse HEAD in master shows f2d20b8.... so shouldn't 'git describe' output v0.35.0-f2d20b or somesuch ?	04:24
	→ arnaud__ joined	04:24
	→ subhojit777 joined	04:24
	← howitdo left	04:25
	→ Sonicbit joined	04:25
kadoban	grepper: Is v0.35.0 even reachable from the tip of master?	04:27
	← ace1 left	04:27
grepper	I can do 'git checkout v0.35.0' if that is what you mean	04:27
	→ mikiones joined	04:28
kadoban	grepper: It's not. Also, you know git describe only uses annotated tags by default, right?	04:28
grepper	kadoban: yes, I found out about that - how do I know if it is 'annotated' ?	04:29
	← arnaud__ left	04:29
kadoban	grepper: For 'git describe' to use v0.35.0 to describe the commit you're talking about, the commit would have to have v0.35.0 as an ancestor. Hmm, how did you tag? If you used -a or -s it's annotated, if not, not. I'm sure there's a way to check … I'm not terribly sure what it is though, I /always/ use annotated tags so I have little experience with non.	04:30
grepper	I think its important that if I do git log --pretty=format:'%H %ae %an' \|grep 9d12e2c (9d12e2c is the tag hash), it comes up empty	04:30
kadoban	Then that's probably why it's not using that tag to describe your current. How could it?	04:30
grepper	is it one that shows up with a second tag with {} somethink appended ?	04:30
	→ ashu11 joined	04:31
	→ arnaud__ joined	04:31
grepper	kadoban: yep, I think that is the problem too. How can I change this ?	04:31
kadoban	grepper: I'm not sure what you mean by "change this" what do you want to happen?	04:31
grepper	I'd like 'git describe' to print v0.35.0-f2d20b	04:32
kadoban	grepper: Well, I'm not sure how it'd make sense at all for it to do that.	04:32
grepper	where f2d20b is the 'git rev-parse HEAD' output	04:32
	well, I was told that was a good way to go about getting output for my program's --version switch	04:33
	← mikiones left	04:33
	← APerson_ left	04:33
grepper	so it will show the last release, followed by the present commit in master, which is what they checked out	04:33
	for the release version it is already solved, this is for those doing a 'git clone'	04:34
	← aerth left	04:34
kadoban	grepper: It may be, when it actually makes any sense. What you have though, is a master which is basically unrelated to the tag you're trying to use to describe it, which … doesn't make any sense? What's it supposed to say, "uhm, well you take tag W go back X commits, then you follow a different branch, then you go Y more commits?" Seems a bit odd to expect that.	04:34
	That's not really what describe does at all, as far as I understand. All it does it find the most recent tag that's /reachable/ from the commit you're trying to describe, essentially. Your tag isn't reachable from the commit you're talking about.	04:35
grepper	yeah, it was a mistake commiting that in branch and pointing to it	04:35
	I guess they only way out would be to move the tag back one commit, which is also in master	04:36
	though that isn't a great solution	04:36
thiago	grepper: I asked you to run a command for me half an hour ago. You still haven't done it.	04:36
grepper	I thought I did	04:36
	you said the output was as expected	04:36
thiago	21:07 < thiago> grepper: git log <thatcommit>..v0.35.0	04:37
	you never ran the git log	04:37
	→ beautifulmind joined	04:37
grepper	shit, I must have read that as 'git describe <thatcommit> .... sorry	04:38
	sec	04:38
thiago	we know it won't be empty	04:38
	→ howitdo joined	04:39
grepper	yeah, it prints that commit at the top of the list	04:39
	→ CalrikAakiwa joined	04:39
thiago	so the tag isn't reachable from that commit	04:39
	the tag cannot be used to describe the commit in question	04:39
	→ z8z joined	04:39
	→ tekbasse joined	04:39
	→ aerth joined	04:40
	→ Peasley joined	04:40
grepper	hm, I don't know where to go from here with it then	04:40
thiago	nowhere	04:40
	← madewokherd left	04:40
thiago	we've reached a conclusion	04:40
	← maqr left	04:40
grepper	heh	04:40
kadoban	What is the tag, and why is it separate from master? What's on master?	04:41
	← lvegerano left	04:41
grepper	everything but that one commit, unfortunately	04:41
kadoban	Perhaps you should merge it into master? (wild-ass guess)	04:41
thiago	you branched off master and then tagged it	04:41
	so the tag is not in master	04:41
grepper	which I made and tagged in branch	04:41
	yep	04:41
thiago	have you considered merging the branch back into master?	04:41
grepper	not the way I wanted it, but it was all new to me	04:41
	← beautifulmind left	04:42
grepper	not sure how to do that, it will keep the same hashes and keep all my changes in master since then ?	04:42
	→ maqr joined	04:42
	→ jerematic joined	04:43
thiago	yes	04:43
grepper	then I can recreate the branch and the tag ?	04:44
	or I guess the branch will still be there...	04:44
kadoban	So will the tag	04:44
thiago	just merge	04:44
grepper	okay, so that is the solution then it seems	04:44
thiago	you can delete the branch after that	04:44
	→ ahr3n joined	04:45
	→ einmalfel joined	04:45
grepper	but the branch will still stop at the commit/tag, ie. it will be only one way?	04:45
	→ beautifulmind joined	04:45
	← lfau left	04:46
	→ tristanp joined	04:46
	→ effi joined	04:46
	→ pm90_ joined	04:47
	← bgerber left	04:47
grepper	sorry for all the dumb seeming questions, I learn by getting totally confused first, then sorting it out :P	04:47
	← jerematic left	04:47
	← CalrikAakiwa left	04:49
	← skorgon left	04:49
	← toothrot left	04:50
	← Nizumzen left	04:50
	← tristanp left	04:50
	→ bgerber joined	04:50
	→ Tommy[D]_ joined	04:51
	← effi left	04:51
	← ashu11 left	04:51
	→ ckruczek joined	04:52
	→ Consuela joined	04:52
	→ jambocomp joined	04:52
	gitinfo set mode: +v	04:52
	← beautifulmind left	04:53
	→ beautifulmind joined	04:54
	← Tommy[D] left	04:55
	← metts left	04:55
	← cbonobo left	04:56
	← clarkpan left	04:56
	→ EminenceHC joined	04:56
	← dreiss left	04:57
	← tekbasse left	04:57
	→ uojks joined	04:57
	→ clarkpan joined	04:57
	→ devoldmx joined	04:58
kadoban	grepper: No need to apologize, didn't seem like a dumb question.	04:58
	← uojks left	04:58
	← aerth left	04:59
grepper	kadoban: so the answer is 'yes' ?	04:59
	← devoldmx3 left	04:59
	→ aerth joined	04:59
	→ sjow joined	04:59
kadoban	grepper: Oh the last question? Uhm, I don't really understand what you're asking.	04:59
grepper	well, the branch was static and the last commit (and the tag) is the point of the 0.35.0 release	05:00
kadoban	grepper: Oh are you asking if merging branch 'blah' into 'master' will affect branch 'blah'? It won't, it only modifies 'master'	05:00
grepper	yep, cool thanks	05:00
	so just 'git merge tovid-0.35.0' ?	05:01
	← EminenceHC left	05:01
	→ daito joined	05:01
grepper	(using the branch name)	05:01
	← rchavik left	05:01
kadoban	Yep. You can actually merge tags commits, whatever. Make sure you're on 'master' first.	05:01
grepper	heh, yeah, going to make sure this time	05:01
	← Noldorin left	05:02
	← aerth left	05:03
grepper	hm, it doesn't like what I am trying to do, lots of conflicts. Some of those files have been removed in master since the release, or renamed/moved	05:03
	can I merge only that single commit ?	05:04
	→ aerth joined	05:04
	→ Polyatomic joined	05:05
kadoban	grepper: I think that's what you're doing now. If lots has happened on master since that commit, and the changes affect the same areas that the tagged commit does, conflicts are expected.	05:06
	!eek might help	05:06
gitinfo	[!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	05:06
grepper	okay, thanks	05:07
	→ jiku joined	05:07
	→ eletuchy joined	05:08
	→ pobivan joined	05:08
	→ ascarter joined	05:08
	← anaran left	05:08
	← Goopyo left	05:09
	← eletuchy left	05:13
	← pm90_ left	05:13
	→ MechtiIde joined	05:14
	← dsdeiz left	05:14
	← alokbeniwal left	05:15
	→ alokbeniwal joined	05:16
grepper	uf, I think this is too much work to do just to have 'git describe' do what I want. Going to do a 'git reset --hard'	05:19
	→ DuckMaestro_ joined	05:19
grepper	lesson learned, I'll know better next time I tag a release	05:19
	→ ottanta joined	05:20
	→ arnaud___ joined	05:20
	← alokbeniwal left	05:20
	→ ropav_ joined	05:20
	← ScottE left	05:21
	← kossy left	05:21
	← ivan_on_trac left	05:21
	← rsvp left	05:21
	← arnaud__ left	05:21
	← hahuang61 left	05:22
	→ sandr8_ joined	05:22
	← DuckMaestro left	05:22
	← zacts left	05:22
	← ropav left	05:22
	← Lyqyd left	05:22
	→ zacts` joined	05:22
	← gopar left	05:22
	← nkouevda left	05:22
	← sandr8 left	05:22
	← hahuang65 left	05:22
	→ Joel__ joined	05:22
	← JargonNode left	05:22
	→ kossy joined	05:23
	← akushner left	05:23
	← Joel__ left	05:23
	← duderonomy left	05:23
	← __main__ left	05:23
	← tmoor left	05:23
	← jonmorehouse left	05:23
	→ hahuang61 joined	05:24
	← aerth left	05:25
	← arnaud___ left	05:25
	← ottanta left	05:25
	→ __main__ joined	05:26
	← ascarter left	05:27
	→ ehmatthes joined	05:27
	→ aerth joined	05:28
	→ ScottE joined	05:29
	→ theme2 joined	05:29
	← hahuang61 left	05:29
	→ Junior joined	05:29
	← fahadash left	05:30
	→ akushner joined	05:31
	← zacts` left	05:31
	→ dreiss joined	05:31
	→ ghostpl_ joined	05:32
	→ hahuang61 joined	05:33
	→ Raging_Hog joined	05:33
	→ a-l-e joined	05:35
	→ linoge joined	05:36
	← michael_mbp left	05:36
	← sjow left	05:36
	→ michael_mbp joined	05:37
	→ JargonNode joined	05:37
	→ KaZeR_ joined	05:37
	→ gopar joined	05:37
linoge	If I'm working on a topic branch but I do some minor changes in master, and I want those changes to appear in my topic branch, what is the best way to do it?	05:37
	checkout topic branch and merge with master?	05:37
	← ghostpl_ left	05:37
	← tzero left	05:37
preaction	rebase your topic branch, probably	05:38
	→ ashu11 joined	05:38
kadoban	linoge: If you want (new) stuff from master in your topic branch, you either rebase the topic, or you merge in master. It depends what you want history to look like. If you've published/shared 'topic', you probably want to lean more towards merge, otherwise it's up to you.	05:38
	← harish left	05:39
Seveas	linoge: merge, cherry-pick or rebase, depending on your project's normal policy.	05:39
	→ otter768 joined	05:39
kadoban	Or cherry-pick, yeah	05:39
preaction	cherry-pick might end up badly if the topic will ever be merged back into master	05:39
	→ Uuo joined	05:39
	→ pantsman- joined	05:39
Seveas	not really	05:39
linoge	Mmm... I'll try with the rebasing, it's just I'm trying git (first time with a cvs) :)	05:40
Seveas	don't call git a cvs, that's an insult :)	05:40
	you probably mean vcs :)	05:40
	← Uuo left	05:40
linoge	lol	05:40
	Right ;)	05:41
	← aerth left	05:41
	← hahuang61 left	05:41
	← ManikM left	05:41
	→ Manny joined	05:41
	→ aerth joined	05:41
	→ Puaar joined	05:42
	← Puaar left	05:43
	← otter768 left	05:43
	← clarkpan left	05:44
	→ fiu joined	05:45
	→ thebrush joined	05:45
	← mkoskar left	05:45
	← fiu left	05:46
	→ aauns joined	05:47
	→ Silmarilion joined	05:47
	← cagedwisdom left	05:48
	← ben____ left	05:48
	→ jakke joined	05:48
	→ twoface88 joined	05:49
	→ chiemseesurfer_ joined	05:49
	← aerth left	05:49
	→ aerth joined	05:50
	→ lamppid joined	05:51
	→ johannes_ joined	05:51
	→ cagedwisdom joined	05:52
	← ashu11 left	05:52
	→ cvanball joined	05:53
	→ stickperson joined	05:54
	← twoface88 left	05:54
	← tpollard left	05:55
stickperson	i created a branch and pushed some changes to that branch. after pushing, some changes from a separate branch (which did not change any of my branch’s files) were pushed into master. after making further changes in my branch, i can’t push to that branch any longer	05:55
	→ jonmorehouse joined	05:55
stickperson	because my branch is behind its remote counterpart	05:56
thiago	why not?	05:56
	→ harish joined	05:56
thiago	start over	05:56
	talk about one branch only	05:56
stickperson	sure	05:56
thiago	what have you done since the past push that succeeded to that branch?	05:56
	→ ronskisika joined	05:56
	→ tzero joined	05:57
stickperson	i had to make a couple additional changes, so i did (on the same branch)	05:57
	← Raging_Hog left	05:57
stickperson	during that time	05:57
thiago	more commits?	05:57
	← pantsman- left	05:57
stickperson	i made the changes and would like to commit and then push them	05:57
	make sense?	05:57
thiago	yes	05:57
	but what else have you done?	05:57
stickperson	cool	05:57
thiago	besides git add and git commit	05:58
stickperson	me personally, only git push origin mybranch	05:58
	but someone else was working on a separate part of the code	05:58
linoge	Hey, rebase was exactly what I was looking for thanks :)	05:58
thiago	so someone else pushed there?	05:58
stickperson	not there, no. someone else pushed to the master branch	05:58
thiago	but have they pushed to this branch?	05:58
	← cvanball left	05:58
stickperson	nope	05:59
thiago	are you sure?	05:59
stickperson	yes	05:59
	→ devoldmx3 joined	05:59
thiago	ok	05:59
	so no one has pushed since you last pushed, correct?	05:59
stickperson	no one has pushed to this branch since i last did	05:59
thiago	are you sure you have not done git rebase or git reset?	05:59
	← devoldmx left	06:00
	← linoge left	06:00
stickperson	i don’t know what they are, so no i haven’t done them	06:00
	← aerth left	06:00
thiago	ok	06:00
	so git push works	06:00
stickperson	somebody else (the project owner) added some stuff to the master branch	06:00
	git push isn’t working though	06:00
thiago	we're not talking about master	06:00
stickperson	right	06:00
	ok	06:00
thiago	you're pushing to this branch only	06:00
	so this push must work	06:00
stickperson	here’s the message: “Updates were rejected because the tip of your current branch is behind its remote counterpart”	06:01
	→ aerth joined	06:01
stickperson	which i don’t understand. only i pushed to that branch.	06:01
	→ lqi joined	06:01
thiago	so we conclude some part of your story is wrong	06:02
	either you've done a reset or rebase, or you or someone else pushed to that branch	06:02
	git fetch from the server and then do: git log ..origin/branchname	06:02
	does it print anything?	06:03
	← MechtiIde left	06:03
	→ ashokrajar joined	06:03
	← gopar left	06:03
stickperson	so just type “git fetch” when i’m on my branch?	06:03
thiago	yes	06:04
	→ jceb joined	06:04
	→ Zifre joined	06:05
stickperson	ok	06:05
	when i do “git log mybranch"	06:05
	→ cvanball joined	06:05
thiago	that's not what I asked	06:05
stickperson	oh, do “git log origin/mybranch"	06:06
thiago	no	06:06
	git log ..origin/branchname	06:06
	the .. is important	06:06
stickperson	oh, ok	06:06
thiago	do you see any commits?	06:06
stickperson	just the commit i did the other day	06:06
	← aerth left	06:07
thiago	just the one?	06:07
stickperson	yup	06:07
	so	06:07
thiago	ok, now git log mybranch	06:07
stickperson	ok	06:07
thiago	do you see that commit somewhere?	06:07
stickperson	let’s see...	06:07
	→ aerth joined	06:07
stickperson	nope	06:08
	→ nnyk_ joined	06:08
	← cromero left	06:08
thiago	stickperson: and it's your commit?	06:09
	→ eletuchy joined	06:09
stickperson	not following what you’re asking	06:09
	← heroux left	06:09
thiago	you remember making that commit?	06:09
stickperson	the one that i got in “git log ..origin/mybranch”? yep, i remember making that commit	06:10
thiago	did you make it in another computer?	06:10
stickperson	nope	06:11
	→ twoface88 joined	06:11
thiago	well, you somehow pushed it but you don't have it in this commit	06:11
	sorry, in this branch	06:11
	can you think of a reason why that might be?	06:11
	→ heroux joined	06:11
stickperson	hm	06:11
	after pushing to my branch originally and then after making changes, i did a “git add file” then “git commit file”	06:12
	and then realized i wanted to change one more thing in the file	06:12
	→ kcj joined	06:12
stickperson	so i did “git reset --soft HEAD~1”	06:12
	then “git reset HEAD file"	06:13
	← nnyk_ left	06:13
	← Guest11351 left	06:13
	→ Guest11351 joined	06:13
stickperson	what if i do this..	06:13
thiago	22:59 < thiago> are you sure you have not done git rebase or git reset?	06:13
	23:00 < stickperson> i don’t know what they are, so no i haven’t done them	06:13
stickperson	oh fuck me	06:13
	→ eddyp joined	06:14
stickperson	sorry	06:14
	Guest11351 → Cork	06:14
thiago	like I said, there was a problem with your story	06:14
	→ robarelli joined	06:14
thiago	do you want to discard this commit?	06:14
	the one that is in the remote but not in your local branch?	06:14
stickperson	the one in the remote branch is good	06:15
	i committed something locally but wanted to undo it	06:15
thiago	git pull --rebase then	06:15
stickperson	what does that do exactly?	06:15
	→ Ancchi joined	06:16
thiago	it does a git fetch, then git rebase	06:16
	the rebase will take all commits that aren't in the remote and will re-apply them on top of that remote	06:16
	on top of the new base ==> rebase	06:16
	← aerth left	06:16
	→ aerth joined	06:17
	→ bronson joined	06:17
stickperson	ok, so let me make sure that’s what i want to do	06:17
	i pushed some stuff to my branch a couple days ago. that’s all fine and good.	06:18
	← zivester left	06:18
stickperson	afterwards, i made a change to file1. i did “git add file1” “git commit -m …”	06:18
	then thought “crap, i actaully forgot to do something in file 1. “git reset —soft HEAD~1” “git reset HEAD file1”	06:19
	→ fahadash joined	06:19
	← blr left	06:19
stickperson	so at the moment my changes in file1 are unstaged	06:20
	→ nnyk_ joined	06:20
	→ pwnz0r joined	06:21
	← in3xes left	06:21
	→ sculley joined	06:21
	← bronson left	06:21
	→ roelmonnens joined	06:22
	→ Errorical joined	06:22
	← circ-user-jdqwJ left	06:25
	→ zacts joined	06:25
	→ alokbeniwal joined	06:26
	← yvan1 left	06:26
	→ jagob joined	06:27
	→ acolson joined	06:27
	← Asiajey left	06:27
	← jceb left	06:27
	← fahadash left	06:28
	→ fahadash joined	06:28
	← fahadash left	06:29
	→ fahadash joined	06:29
	← aerth left	06:29
	← beautifulmind left	06:30
	→ PCatinean joined	06:30
	→ aerth joined	06:30
	← alokbeniwal left	06:31
	→ jerematic joined	06:31
	→ Lingo___ joined	06:32
	→ effi joined	06:32
	→ in3xes joined	06:33
	→ noyb joined	06:34
	→ thierryp joined	06:35
cbreak	stickperson: you should have used git commit --amend	06:35
	way more convenient :)	06:35
	← thierryp left	06:35
	→ rchavik joined	06:35
	← aauns left	06:35
stickperson	cbreak: damnit, that looks so much nicer	06:36
	→ thierryp joined	06:36
	← aerth left	06:36
stickperson	i just shouldn’t mess around when it comes to git	06:36
	← subhojit777 left	06:36
	→ aerth joined	06:36
	← jerematic left	06:36
	← effi left	06:37
	→ settermjd joined	06:37
	← pheaver left	06:37
	→ Eoo joined	06:37
	→ tomog999_ joined	06:37
	→ nfk joined	06:38
	← mostlybadfly left	06:38
	← Eoo left	06:38
	← loz-- left	06:38
	← vstoniest left	06:39
	← netj left	06:39
	→ loz-- joined	06:40
	→ Alienpruts joined	06:40
	→ elementalest_dc joined	06:40
	→ netj joined	06:40
	← tomog999 left	06:40
	← noyb left	06:40
	→ vstoniest joined	06:40
	→ Qrror joined	06:40
	← pingupingu left	06:40
	→ hebz0rl joined	06:41
	← jstimm left	06:41
	← Qrror left	06:41
	→ nilg joined	06:41
	→ jstimm joined	06:42
	← sgen_ left	06:42
	← johannes_ left	06:43
	← elementalest_ left	06:43
	→ Guest50661 joined	06:43
	← a-l-e left	06:43
	← Goplat left	06:44
	→ EminenceHC joined	06:45
	→ lindenle joined	06:45
	→ Gizburdt joined	06:45
	← zadock left	06:46
	← nfk left	06:46
	← hebz0rl left	06:46
	→ hebz0rl joined	06:47
	← robarelli left	06:48
	← luc_ left	06:49
	← lindenle left	06:49
	← ahr3n left	06:49
	← EminenceHC left	06:49
	→ dprophit joined	06:50
	← Zifre left	06:50
	→ subhojit777 joined	06:51
	→ vixterra joined	06:52
	← thiago left	06:53
	← kadoban left	06:54
	→ ashu11 joined	06:55
	← aerth left	06:56
	← Lingo___ left	06:56
	→ Lingo___ joined	06:56
	→ frox joined	06:57
	→ thevishy joined	06:57
	← heroux left	07:00
	→ duderonomy joined	07:00
	→ aerth joined	07:01
	→ heroux joined	07:02
	← JanC left	07:04
	→ ayaz joined	07:04
	→ bonswouar joined	07:04
	← reaverb left	07:06
	gitinfo set mode: +v	07:07
	← aerth left	07:07
	→ King_Hual joined	07:07
	← King_Hual left	07:07
	→ King_Hual joined	07:07
	→ taruner joined	07:08
	← sudshekhar left	07:08
	← Gizburdt left	07:08
	→ aerth joined	07:08
	← heroux left	07:08
	→ heroux joined	07:09
	→ diosmiux joined	07:13
	← MattMaker left	07:13
	→ pm90_ joined	07:14
	← devll left	07:14
	← diosmiux left	07:16
	→ MasterPiece joined	07:16
	← Tuna-Fish left	07:17
	→ diosmiux joined	07:17
	→ Gizburdt joined	07:18
	→ JanC joined	07:18
	→ King_Hual` joined	07:20
	→ basiclaser joined	07:20
	← King_Hual left	07:21
	← ErKa left	07:21
	→ ghostpl_ joined	07:21
	→ Adib joined	07:21
	← aerth left	07:22
	← daito left	07:22
	← pm90_ left	07:23
	→ aerth joined	07:23
	← dreiss left	07:24
	→ jaznow_ joined	07:24
	← pwnz0r left	07:25
	→ pwnz0r joined	07:25
	→ Joel__ joined	07:26
	→ intellix joined	07:26
	→ blr joined	07:26
	← heroux left	07:26
	→ Takle joined	07:27
	→ craigp joined	07:28
	→ Tuna-Fish joined	07:28
	← nnyk_ left	07:28
	← ghostpl_ left	07:28
	→ heroux joined	07:28
	← Ancchi left	07:29
	← evie_hammond left	07:29
	→ psoo joined	07:29
	← pwnz0r left	07:30
	→ Balliad joined	07:30
	→ jrahmy joined	07:31
	← harish left	07:32
	→ daito joined	07:32
	→ seschwar joined	07:32
	→ jerematic joined	07:32
	← Sonicbit left	07:33
	→ Sonicbit joined	07:33
	← jiku left	07:34
	← subhojit777 left	07:35
	→ ki0 joined	07:35
	→ sCiphre joined	07:35
	→ lb1a joined	07:36
	→ unixpro1970 joined	07:36
	← ctag left	07:36
	→ jiku joined	07:36
	→ hans_s joined	07:36
	← jerematic left	07:36
	→ creep joined	07:37
	← govg left	07:38
	← bhldev left	07:39
	→ skylite joined	07:39
	→ bhldev joined	07:39
	→ otter768 joined	07:39
	← lb1a left	07:41
	← Manny left	07:41
	→ ManikM joined	07:41
	← raven-au left	07:41
Kartagis	git update-index --assume-unchanged robots.txt .htaccess	07:42
	fatal: Unable to mark file robots.txt <--- why?	07:42
	→ potteratt joined	07:44
	← otter768 left	07:44
	← eddyp left	07:45
	← Charlie_WONG_Sup left	07:46
_ikke_	git ls-files	07:46
	→ Charlie_WONG_Sup joined	07:46
_ikke_	does that return robots.txt?	07:46
	→ subhojit777 joined	07:46
	→ ome joined	07:47
	← wrouesnel1 left	07:48
	→ Gama11 joined	07:49
	← noname left	07:49
	← Charlie_WONG_Sup left	07:49
	← potteratt left	07:49
	→ Hounddog joined	07:50
	→ MattMaker joined	07:50
	→ PeterBooker joined	07:50
	← ehmatthes left	07:50
	→ nnyk_ joined	07:50
	→ zadock joined	07:51
	→ MattMake_ joined	07:52
	→ Charlie_WONG_Sup joined	07:52
	← DuckMaestro_ left	07:52
	→ ThomasLocke joined	07:53
	← ashu11 left	07:53
	← MattMaker left	07:54
Kartagis	_ikke_: nope. I removed it from .gitignore, and still same	07:54
_ikke_	And did you git add it?	07:55
	← craigp left	07:55
Kartagis	nope. I want to stop tracking it completely	07:56
Seveas	git rm --cached	07:56
Kartagis	Seveas: that also removed the file from the server I perform git pull	07:56
_ikke_	yes, once	07:56
Seveas	well, yes.	07:56
	!deploy	07:57
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	07:57
	→ nowhere_man joined	07:57
	← sparetire left	07:57
_ikke_	Kartagis: but, if ls-files didn't return that file, it means the file wasn't tracked in the first place	07:57
	→ leeN joined	07:57
Kartagis	_ikke_: hrm	07:57
_ikke_	(and assume unchanged has nothing to do with tracking or untracking a file)	07:57
	→ devoldmx joined	07:57
Kartagis	brb, meeting	07:58
	← devoldmx3 left	07:58
	← nowhere_man left	07:59
	→ mylord joined	07:59
	→ nowhere_man joined	07:59
	← Takle left	07:59
	← jiku left	08:00
	← _5kg left	08:02
	→ effi joined	08:03
	→ pm90_ joined	08:04
	← cvanball left	08:04
	← stickperson left	08:05
	← dprophit left	08:05
	→ aidalgol joined	08:06
	→ jiku joined	08:06
	→ Grimlock1 joined	08:06
	← thierryp left	08:07
	← neunon left	08:08
	← effi left	08:08
	← aerth left	08:08
	→ morois joined	08:09
	→ nour joined	08:09
	→ aerth joined	08:09
	→ marcogmonteiro joined	08:10
	→ Ancchi joined	08:12
	← shinnya left	08:12
	← pm90_ left	08:12
	← Ancchi left	08:13
	→ jost joined	08:14
	← aerth left	08:15
	→ zoso joined	08:15
	→ FreezingCold joined	08:16
	→ Takle joined	08:18
	→ shinnya joined	08:18
	← unixpro1970 left	08:18
	→ bronson joined	08:19
	→ jargon joined	08:19
	→ howlymowly joined	08:20
frox	hey, i'm new to git. how can i pull a specific branch?	08:21
iveqy	frox: you can't	08:21
	frox: sorry, slipped on the keys	08:21
grawity	you can, sure, it's generally just not needed...	08:21
iveqy	frox: does man git pull help you?	08:21
gitinfo	frox: the git-pull manpage is available at http://jk.gs/git-pull.html	08:21
grawity	frox: try `git fetch && git checkout <somebranch>` if I guessed your question right	08:21
	→ aerth joined	08:21
	← Agusanz left	08:22
	→ tristanp joined	08:23
	← f3lp left	08:23
	← bronson left	08:24
	← nnyk_ left	08:24
	→ raven-au joined	08:24
	→ BlaXpirit joined	08:25
frox	if i want to pull the testing branch, i have to do: git pull origin testing, right?	08:27
	← zarac left	08:27
	→ zarac joined	08:27
	→ tjm_jimm_ joined	08:27
	← aerth left	08:27
grawity	what do you mean by 'pull' the branch, anyway?	08:28
	← tristanp left	08:28
grawity	what result do you expect?	08:28
	→ alokbeniwal joined	08:28
grawity	I mean, it doesn't look like 'pull' means what you think it means	08:28
	→ aerth joined	08:28
	→ lb1a joined	08:29
_ikke_	pull == fetch + merge, so it downloads the history for that branch, and merges it into the current branch	08:29
	← maqr left	08:31
	→ ciampix joined	08:31
	← slax0r left	08:31
	→ cllamas joined	08:32
	→ maqr joined	08:32
frox	+grawity: i like to have 3 folders. one, that holds the bare repository, one that represents the testing environment and one that represents the stable environment (web development). in the repository, there are 2 branches: testing and master. developers should commit to testing. if everything is fine, testing can be merged to master. thats is my plan.	08:33
	← alokbeniwal left	08:33
	→ alokbeniwal joined	08:33
	→ joo-_ joined	08:33
	← Guest50661 left	08:33
	← jagob left	08:33
	← settermjd left	08:34
	← blr left	08:34
	→ jagob joined	08:34
	← Charlie_WONG_Sup left	08:34
	← teran left	08:34
	← aerth left	08:35
	→ qgeh joined	08:36
	→ settermjd joined	08:36
	→ aerth joined	08:36
	← jambocomp left	08:36
	→ Marc_C_ joined	08:37
	← CustosL1m3n left	08:37
	→ Ancchi joined	08:37
	← alokbeniwal left	08:38
	→ ghostpl_ joined	08:38
	← fahadash left	08:38
	→ harish joined	08:39
	gitinfo set mode: +v	08:40
Marc_C_	hi everyone, i try to use git clone a non interactive way but git ask me to check the fingerprint of my git server. But	08:40
	← qgeh left	08:40
Marc_C_	I try to use it with systemd so I can't use the knowhost file nor StrictHostKeyChecking no	08:41
	I ask systemd chat and they said it was a git issue	08:41
	← martinbmadsen left	08:41
Marc_C_	can someone help me ?	08:41
	→ Eipg joined	08:42
	← aerth left	08:42
	← Eipg left	08:42
	← Gizburdt left	08:43
	→ s5s joined	08:43
_ikke_	What version of git do you have?	08:43
	→ Igfc joined	08:44
	→ inamoriti joined	08:44
s5s	Hi guys, I used git rebase to update to lastest master. I stayed on my branch then did some more work and then did a git rebase. The new rebase asked me to redo the same merging that the first rebase asked me to do so I did a git pull which merged cleanly automatically. Now I want to commit to master. How can I do this without screwing everyone else?	08:45
Marc_C_	GitLab 7.9.1	08:45
	← Igfc left	08:45
_ikke_	git version, gitlab != git	08:45
	← aidalgol left	08:45
Marc_C_	oh sorry, git 2.0.4	08:46
	→ uzpf joined	08:46
	← tjm_jimm_ left	08:46
	→ Gizburdt joined	08:46
	→ lindenle joined	08:47
	← ghostpl_ left	08:47
	← echo-area left	08:47
	← uzpf left	08:47
	← ktosiek left	08:47
	→ echo-area joined	08:48
grawity	Marc_C_: you can still use known_hosts with systemd...	08:48
	→ aerth joined	08:48
grawity	I mean, what's stopping you from doing so	08:48
	→ dvdq joined	08:48
grawity	frox: so really you're looking for "git checkout testing" then	08:49
	← nilg left	08:49
	← echo-area left	08:49
	→ pm90_ joined	08:49
Marc_C_	grawity, how can I do that ? where do I put the knownhosts file ?	08:50
grawity	ssh always looks in the same place, $HOME/.ssh/known_hosts	08:50
	→ ktosiek joined	08:50
grawity	or, if you want, /etc/ssh/ssh_known_hosts for system-wide ones	08:50
	→ BlaXpirit-UA joined	08:50
	← lindenle left	08:51
	→ yvan1 joined	08:51
Marc_C_	so if I use systemd I must place it in /etc/ssh/ssh_known_hosts because systemd doesn't have $HOME, I will try it thank you	08:52
	→ nilg joined	08:52
grawity	users have $HOME; if the service has User=marc, it will have marc's $HOME	08:53
	← BlaXpirit left	08:53
	← Sleepy63 left	08:53
frox	i have had problem with git push to. after compressing ne next process stops at about 7% and says "error: index-pack died of signal 9" some threads in forums says, it is an issue of memory so i looked at meminfo:	08:55
	$ cat /proc/meminfo	08:55
	MemTotal: 16155788 kB	08:55
	MemFree: 158504 kB	08:55
	Cached: 9416636 kB	08:55
	← morois left	08:56
cbreak	Marc_C_: systemd doesn't matter	08:56
frox	i wondered, why memfree isso low and asked my provider. he sayed, tha cached shows the memory and memfree can bee ignored. that sounds strange to me	08:56
	→ wrouesnel1 joined	08:56
cbreak	Marc_C_: known_hosts is for clients	08:56
	← devoldmx left	08:56
	→ devoldmx joined	08:56
frox	memfree is that low all the time	08:56
	→ Oebele joined	08:57
	← hmsimha left	08:57
	→ skullcrasher joined	08:57
	→ morois joined	08:58
cbreak	frox: free memory is wasted memory	08:58
	modern operating systems, like Mac OS X, will not let too much free memory go to waste	08:58
	they will be used for file system caches and so on	08:58
	→ mikiones joined	08:59
frox	cbreak, oh yes, that makes sense.	08:59
	← Adib left	08:59
	→ ZJvandeWeg joined	09:00
	→ Pr0Wolf29 joined	09:01
	→ ashu11 joined	09:02
	→ thierryp joined	09:02
	← aerth left	09:02
	← wrouesnel1 left	09:03
	← Akagi201_ left	09:04
	→ Akagi201 joined	09:04
	← Takle left	09:05
	← morois left	09:06
	→ petersr joined	09:06
frox	15 minutes ago i moved a magento-folder to the development repo an called git add * . i'm still waiting for that. is this the noraml behavior?	09:06
ohcibi	frox: add is the operation that takes the most time	09:06
	i dont know if 15 minutes is appropriate actually but if you have MANY files, add can take quite a while	09:07
	→ cdown joined	09:07
ohcibi	(if they didnt improved that in the last 4 years 8-))	09:07
frox	ohcibi. ah ok. there are about 25000 files in that folder	09:07
	→ CustosL1m3n joined	09:08
ohcibi	heh	09:08
cbreak	that shouldn't take too long	09:08
	or are those big files?	09:08
	→ aerth joined	09:08
ohcibi	frox: again, i dont know if 15 minutes is appropriate then, its just said that it'll take longer to add those files than to e.g. checkout em	09:08
frox	cbreak: $ du -hs	09:09
	3.9G	09:09
cbreak	frox: yeah, that's going to take ages	09:09
	← Seikho_ left	09:10
cbreak	probably not a good idea to put stuff like that into git	09:10
ohcibi	frox: what are those files actually?	09:10
	→ Adib joined	09:10
frox	ohcibi: it is a magento shop	09:10
	← abrrs left	09:11
ohcibi	whats uses 3,9G in a shop that should be versioned?	09:11
	→ Akagi201_ joined	09:11
osse	ohcibi: King Kong rendering	09:12
	← MLM left	09:13
frox	ohcibi i think the log files...i should put them into .gitignore, than there are images	09:13
	← z8z left	09:14
	← Akagi201 left	09:14
	→ wrouesnel1 joined	09:15
ohcibi	frox: you shouldnt version control logfiles... if those images are the assets of the shopitems, then you should simply backup and not scm them	09:15
frox	ohcibi, yes aou are right. is it possible to git pull into a folde, where other date is located?	09:16
	← Gizburdt left	09:16
	← aerth left	09:16
	→ TomyLobo joined	09:17
ohcibi	I assume you mean clone instead of pull, and no its not, if a directory exists and is not empty, git won't clone into that directory	09:17
	telling you it wont clone because the directory exist and is not empty	09:17
	→ morois joined	09:17
	→ LikiLiki joined	09:17
	← petersr left	09:17
frox	ohcibi lcone will create a new folder. when done, can i write some more data to tha new folder which will be ignored by git?	09:18
	→ bernalex joined	09:18
frox	lcone=clone	09:18
	→ tvw joined	09:19
cbreak	sure	09:19
	→ Tennis joined	09:19
	→ aerth joined	09:19
ohcibi	not sure what you mean, but you can add new stuff to .gitignore after you have cloned a repository.. git won't ignore files that are already tracked though	09:19
frox	for example whe i dont call git add * in that folder	09:19
cbreak	frox: if that other data is in .gitignore or similar	09:19
	→ JR___ joined	09:19
	← bernalex left	09:19
	→ bernalex joined	09:19
	→ KamalKaur joined	09:20
	← LikiLiki left	09:20
	→ jerematic joined	09:21
	→ Vigmo joined	09:21
	→ LikiLiki joined	09:21
	→ aswen joined	09:23
frox	in the magento-folder, there are just 3 subfolders, that should be versioned, but the other folders and files are needed to run the application. does that meen, i had to put alle the other files and folders to .gitignore?	09:24
	← JR___ left	09:24
	← Lingo___ left	09:24
cbreak	sure.	09:24
	* to ignore everything	09:24
	!foo to unignore foo	09:24
gitinfo	bar	09:24
	→ Lingo___ joined	09:24
frox	ok	09:24
	→ encod3 joined	09:25
	← jerematic left	09:25
	→ nnyk_ joined	09:25
	← aerth left	09:26
	→ smccully joined	09:26
	← twoface88 left	09:27
	→ aerth joined	09:27
	→ ghostpl_ joined	09:27
	→ cvanball joined	09:27
	← jstimm left	09:28
	← cdown left	09:29
	→ s8321414 joined	09:29
	← pm90_ left	09:30
	→ cdown joined	09:30
_ikke_	lol	09:30
	← wrouesnel1 left	09:31
	← KamalKaur left	09:33
	← aerth left	09:34
	← ag4ve left	09:34
	→ Takle joined	09:36
	← cdown left	09:39
	← jonmorehouse left	09:39
frox	to unignore a folder in .gitignore, do i have to write !foo/* or just !foo	09:40
gitinfo	bar	09:40
	← daftano left	09:40
	→ otter768 joined	09:40
	← Joel__ left	09:40
	← ManikM left	09:41
	→ ManikM joined	09:41
	← jrahmy left	09:41
	→ daftano joined	09:43
	← KEN_403 left	09:44
	→ pm90_ joined	09:44
	→ aerth joined	09:45
	← Adib left	09:45
	← otter768 left	09:45
	← joki left	09:47
	→ lindenle joined	09:48
	← Vigmo left	09:48
	→ effi joined	09:49
	→ Gizburdt joined	09:50
	→ teran joined	09:50
	← tokik left	09:51
	← ashu11 left	09:51
	→ tokik joined	09:52
	← aerth left	09:52
	← lindenle left	09:52
	← dvdq left	09:52
	→ joki joined	09:53
	→ Adib joined	09:54
	← effi left	09:54
	→ teran_ joined	09:54
	→ pyokagan joined	09:55
	← ManikM left	09:56
	← devoldmx left	09:56
	→ devoldmx joined	09:56
	← devoldmx left	09:56
	→ devoldmx joined	09:56
	← teran left	09:57
	→ Dzt joined	09:58
	← Dzt left	09:58
	→ aerth joined	09:59
	← senkin left	09:59
	→ Opmn joined	10:00
	← theme2 left	10:00
	← Opmn left	10:00
	← FreezingCold left	10:01
	→ ArchRogem joined	10:02
	← jagob left	10:02
	→ lxu joined	10:03
	← lxu left	10:03
	→ Zumnw joined	10:05
	← Zumnw left	10:05
	← acolson left	10:05
	→ acolson joined	10:05
	→ Sghkc joined	10:06
	→ meaneye joined	10:06
	→ jagob joined	10:07
	← Sghkc left	10:07
	→ ashu11 joined	10:07
	← Gitzilla left	10:07
	← aerth left	10:07
	→ wvxu joined	10:08
	→ aerth joined	10:08
	← wvxu left	10:09
	← LikiLiki left	10:10
	→ Tioes joined	10:11
	← Tioes left	10:12
	→ Qitt joined	10:13
	← Qitt left	10:13
	→ govg joined	10:14
	→ Lancien joined	10:14
	← aerth left	10:14
	→ Vigmo joined	10:14
	→ ckruczek2 joined	10:15
	→ Hrj joined	10:15
	gitinfo set mode: +v	10:15
	→ aerth joined	10:15
	→ endiruna joined	10:15
	← Gizburdt left	10:15
	→ LikiLiki joined	10:16
	← Vigmo left	10:19
	→ groton joined	10:19
	← aerth left	10:20
	→ aerth joined	10:20
	← keksike- left	10:20
	→ bronson joined	10:21
	→ NetStorm joined	10:21
	← NetStorm left	10:21
	← eletuchy left	10:21
	→ liamkeily joined	10:21
	→ eletuchy joined	10:22
	← pm90_ left	10:22
	→ EminenceHC joined	10:22
	← daito left	10:23
	→ Dragooon joined	10:23
	→ effi joined	10:24
	→ hs366 joined	10:25
	← Lancien left	10:25
	← bronson left	10:26
	→ eletuchy_ joined	10:26
	← eletuchy left	10:27
	← EminenceHC left	10:27
	← aerth left	10:27
	→ goldstar_ joined	10:28
	→ lucianangelus joined	10:28
	→ devll joined	10:28
	← paulweb515 left	10:28
	→ bluesm joined	10:29
	→ _1_vikas joined	10:29
	← Kronuz left	10:30
	→ sdothum joined	10:30
	← Dragooon left	10:31
	← Arsonide left	10:31
	← ome left	10:33
	← kcj left	10:34
	← aswen left	10:35
	← settermjd left	10:38
	← devll left	10:38
	→ fabio_p joined	10:38
	→ misha_hell joined	10:39
	→ Gizburdt joined	10:39
	→ Kicer86 joined	10:40
	→ GT joined	10:40
	→ settermjd joined	10:42
	← cvanball left	10:43
	→ raven-au_ joined	10:43
	→ aerth joined	10:44
	← raven-au left	10:45
	raven-au_ → raven-au	10:45
	→ iamjarvo joined	10:46
	← eletuchy_ left	10:47
	→ eletuchy joined	10:47
	← jost left	10:47
	← taruner left	10:48
	→ lindenle joined	10:48
	← metastableb left	10:49
	→ alokbeniwal joined	10:51
	← eletuchy left	10:52
	← lindenle left	10:53
	← Adib left	10:53
	→ z8z joined	10:54
	← aerth left	10:54
	→ aerth joined	10:55
	→ arup_r joined	10:56
	← Walex left	10:57
	← cagedwisdom left	10:58
	← asflex left	10:58
	← seschwar left	10:58
	→ seschwar joined	10:58
	← joo-_ left	10:58
	→ Walex joined	10:58
	← Vile left	10:59
	→ cagedwisdom joined	10:59
	→ mojibake joined	10:59
	→ BuenGenio joined	11:00
	← goldstar_ left	11:01
	← tzero left	11:01
	→ twoface88 joined	11:01
	→ mizu_no_oto joined	11:01
	→ stamina joined	11:02
	← _1_vikas left	11:03
	← thevishy left	11:03
	→ ePax joined	11:04
	→ evie_hammond joined	11:04
	→ yqt joined	11:06
	→ cdown joined	11:07
	← liamkeily left	11:08
	→ tzero joined	11:09
	← misha_hell left	11:09
	→ jerematic joined	11:10
	→ misha_hell joined	11:11
	← BuenGenio left	11:12
	→ Adib joined	11:12
	← Hrj left	11:14
	gitinfo set mode: +v	11:14
	← jerematic left	11:14
	← ashokrajar left	11:14
	→ Uoi joined	11:15
	→ ashokrajar joined	11:15
	← Uoi left	11:16
	→ thevishy joined	11:16
	← groton left	11:16
	→ Juzzika joined	11:16
frox	can someone help me to interprete that?	11:16
	$ git clone ../repository/ b	11:16
	Cloning into 'b'...	11:16
	done.	11:16
	warning: remote HEAD refers to nonexistent ref, unable to checkout.	11:16
	→ rnsanchez joined	11:16
	→ Hrk joined	11:17
	→ SimonNa joined	11:17
	← Takle left	11:17
	← Walex left	11:17
	← Hrk left	11:18
	← Ancchi left	11:18
	→ Takle joined	11:18
	→ Walex joined	11:18
	→ wwxu joined	11:19
tobiasvl	what's the default branch in the repo?	11:19
frox	tobiasvl i think it is master.	11:19
	← wwxu left	11:20
frox	tobiasvl i just init a bare repo there and commit some data to a testing branch	11:20
tobiasvl	ok, and HEAD in the bare repo points to what?	11:21
	→ Ranai joined	11:21
	→ BuenGenio joined	11:21
	→ bronson joined	11:22
	→ threedot joined	11:22
	← aerth left	11:23
	→ d10n-work joined	11:24
	→ anaran joined	11:24
	→ achadwick joined	11:24
	→ aerth joined	11:24
tobiasvl	when cloning a bare repo, the clone attempts to checkout what HEAD points to in the bare	11:24
	→ mezod joined	11:25
	← bronson left	11:26
	→ crestbook joined	11:27
	→ joo-_ joined	11:28
	← zoso left	11:28
	← GinoMan left	11:28
	→ jstimm joined	11:29
	← bumbar_ left	11:29
	→ dsdeiz joined	11:29
	→ Lunatrius` joined	11:30
	→ mingwandroid joined	11:30
	← Lunatrius left	11:30
	← aerth left	11:31
	← Polyatomic left	11:31
	Lunatrius` → Lunatrius	11:31
frox	tobiasvl $ cat ../repository/HEAD	11:31
	ref: refs/heads/master	11:31
	→ Ephexeve joined	11:32
Ephexeve	Hey guys, I have two remotes, one pointing to Github and another one pointing to Gitlab. I have some files that I don't want to commit to github, though, I do fully want in Gitlab (since it's private.)	11:33
	→ skylite_ joined	11:33
Ephexeve	Is there a way I can commit to one, but not to other?	11:34
mgedmin	not really	11:34
	→ ABarroso joined	11:35
	← ABarroso left	11:35
	→ abarroso joined	11:35
mgedmin	one way of approaching this would be to create a separate private gitlab repo containing just those files	11:35
	and check it out in a subdirectory, that's .gitignored in your github repo	11:35
	← ashu11 left	11:35
	← effi left	11:35
	← cllamas left	11:35
	← skylite left	11:36
	← Errorical left	11:37
	→ cdown_ joined	11:37
Ephexeve	mgedmin: Hmm, but I think this is an ugly approach, right? Better just keep two different repo and that's that	11:37
	am I right?	11:37
	→ CheckDavid joined	11:37
	← iamjarvo left	11:37
mgedmin	I've no idea what your use-case is	11:37
Ephexeve	mgedmin: dotfiles	11:38
mgedmin	ah	11:38
	→ martinbmadsen joined	11:38
mgedmin	hm	11:38
	→ effi joined	11:39
	→ rcn joined	11:39
mgedmin	how about: two separate dotfile repos, one public, one private; both checked out somewhere (~/dotfiles, ~/private-dotfiles), with symlinks pointing to individual dotfiles from wherever they are	11:39
	← cdown left	11:39
	→ FreezingCold joined	11:39
Ephexeve	mgedmin: Yup, sounds better than my aproach. Nice, thanks buddy	11:40
	← BuenGenio left	11:40
mgedmin	I currently have only public dotfiles, but I use the symlink scheme	11:40
	→ omario joined	11:40
mgedmin	my ~/dotfiles/install.sh is very careful about not overwriting dotfiles I may have modified locally: https://github.com/mgedmin/dotfiles/blob/master/install.sh	11:41
Ephexeve	mgedmin: Yeah, thought I have some files with GPG keys, passwords, and others :(	11:41
	let me see	11:41
	Ah	11:41
	→ otter768 joined	11:41
Ephexeve	but for keeping track of symlinks and mods, I am using mackup, familiar with it?	11:41
mgedmin	no	11:41
	mgedmin googles	11:41
Ephexeve	https://github.com/lra/mackup	11:42
	mgedmin: ^	11:42
	It's nice, easier and really not painfull at all	11:42
	if you need custom config, create some new config, and use it. Good stuff	11:42
	→ bitkiller joined	11:42
	← omario left	11:42
	→ freestyl3r joined	11:43
mgedmin	sounds nice!	11:43
	← Lingo___ left	11:43
Ephexeve	Yeah	11:43
	→ Lingo___ joined	11:43
Ephexeve	I've been using it for a few months now, no regrets	11:43
	← martinbmadsen left	11:43
	← threedot left	11:45
	← otter768 left	11:46
	→ iamjarvo joined	11:47
	→ aerth joined	11:48
	← Lingo___ left	11:48
	→ threedot joined	11:48
	→ cavallari joined	11:48
	← Ranai left	11:48
	→ lindenle joined	11:49
	→ aswen joined	11:49
	→ Zez joined	11:50
	← Zez left	11:50
	→ Caroi joined	11:51
	→ mostlybadfly joined	11:52
	← aerth left	11:52
	→ Vigmo joined	11:52
	← ValicekB left	11:53
	→ aerth joined	11:53
	→ Vile joined	11:53
	← lindenle left	11:54
	← IIT left	11:54
	→ Uiaku joined	11:54
	→ Zifre joined	11:55
	← Uiaku left	11:55
	→ richarddoyle joined	11:55
	← Ephexeve left	11:56
	← richarddoyle left	11:56
	← misha_hell left	11:56
	→ IIT joined	11:57
	← ckruczek2 left	11:57
	→ Hxtu joined	11:57
	→ richarddoyle joined	11:57
	← richarddoyle left	11:57
	← devoldmx left	11:57
	→ devoldmx joined	11:57
	← iamjarvo left	11:57
	← Caroi left	11:58
	← Takle left	11:58
	← fstd left	11:59
	→ Takle joined	11:59
	→ fstd joined	11:59
	← Akagi201_ left	11:59
hs366	is it important which branch i should checkout before running git mergetool ?	11:59
	→ richarddoyle joined	12:00
	← richarddoyle left	12:00
	→ Akagi201 joined	12:00
	← ronskisika left	12:00
	← SIGKILLer left	12:00
	→ Segfault_ joined	12:01
	→ tristanp joined	12:01
	→ joetam joined	12:01
	→ Akagi201_ joined	12:01
bremner	hs366: normally you run mergetool in the middle of a conflicted merge	12:02
hs366	ok	12:02
	→ ronskisika joined	12:02
	← Tennis left	12:02
hs366	thx i'll try it	12:02
	← Adib left	12:03
	→ nikio__ joined	12:04
	← alokbeniwal left	12:04
	← aerth left	12:05
	← Vigmo left	12:05
	← Akagi201 left	12:05
	→ aerth joined	12:06
	← tristanp left	12:06
	← cdown_ left	12:06
Kartagis	what do I do if I want git to stop tracking a file?	12:07
tobiasvl	Kartagis: !untrack	12:07
gitinfo	Kartagis: 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	12:07
	→ cdown joined	12:07
	→ CodeBot3000 joined	12:08
	← jaznow_ left	12:08
	← nikio_ left	12:08
Kartagis	tobiasvl: oh, after I do git checkout HEAD@{1} file, it will not be deleted again, right?	12:08
	even if I pull	12:08
	→ Vgr joined	12:08
	→ Dorf joined	12:09
	← ronskisika left	12:09
	→ alokbeniwal joined	12:09
tobiasvl	correct. git will tell you in status that it's not tracked. you can then ignore it if you want	12:09
Kartagis	okay, thanks	12:10
	← aerth left	12:10
	→ jerematic joined	12:10
	→ Lancien joined	12:11
	→ EminenceHC joined	12:12
	← jagob left	12:12
	→ jagob joined	12:12
	→ nikio___ joined	12:13
	→ tier joined	12:13
	← jerematic left	12:15
	← acolson left	12:16
	← nikio__ left	12:16
	← EminenceHC left	12:16
	← yqt left	12:16
	→ _1_Matureguy joined	12:17
	← BombStrike left	12:17
	← alokbeniwal left	12:17
	→ ValicekB joined	12:17
	→ richarddoyle joined	12:17
	→ StuartMI joined	12:17
	→ alokbeniwal joined	12:17
	← Gizburdt left	12:18
	→ acolson joined	12:19
	← KaZeR_ left	12:19
	→ paulweb515 joined	12:19
	← BtbN left	12:20
	← sonOfRa left	12:20
	→ BtbN joined	12:20
	← _1_Matureguy left	12:20
	→ sonOfRa joined	12:20
hs366	in git diff <<<<HEAD is latest changes ?	12:21
	← alokbeniwal left	12:22
hs366	i mean is there any definition for this symbols	12:22
	→ bronson joined	12:23
	← Marc_C_ left	12:23
	→ boblee joined	12:23
mgedmin	HEAD refers to the currently checked out branch	12:23
	← richarddoyle left	12:23
	← boblee left	12:24
	→ boblee joined	12:24
mgedmin	<<<<< looks like a conflict marker to me	12:24
	← paulweb515 left	12:24
tobiasvl	!eek	12:24
gitinfo	[!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	12:24
mgedmin	git diff doesn't add those; git merge writes them to the files in the working tree when it gets a merge conflict	12:24
tobiasvl	the first link explains conflict markers	12:24
	→ d0nkeyBOB joined	12:24
	← moparisthebest left	12:24
	← Peasley left	12:25
	→ berz3rk joined	12:26
	→ Peasley joined	12:26
hs366	mgedmin, thx alot	12:27
	← bronson left	12:27
hs366	tobiasvl, thx	12:27
	→ _Cyclone_ joined	12:28
hs366	when i get mergeconflict . should i fix the conflict at that stage or git rebase --abort then fix the conflict ?	12:28
mgedmin	fix it at that stage	12:28
	→ Gizburdt joined	12:28
canton7	if you abort, you won't have a conflict any more ;	12:28
	* ;)	12:29
hs366	git branch => *(no branch, rebasing mybranchname)	12:29
	← Guest61386 left	12:29
hs366	ok i think i understand the concept	12:29
mgedmin	that just means you're in the middle of a git rebase	12:29
	everything's paused now until you resolve the conflict	12:30
	(or decide to abort)	12:30
hs366	then when i fix the conflict , i should git add, git commit and git rebase --continue	12:30
	yes	12:30
	?	12:30
	← threedot left	12:30
	→ ronskisika joined	12:31
	← smccully left	12:31
	← Guest61456 left	12:32
	→ Guest61456 joined	12:32
	→ neunon joined	12:32
	→ moparisthebest joined	12:33
	← GT left	12:34
	→ metastableb joined	12:34
	→ gv joined	12:34
	gv → Guest30453	12:34
	← D-Boy left	12:34
	→ ruby_on_tails joined	12:37
ruby_on_tails	how can i check for a commit based on a specific line of code which was added months ago?	12:37
	→ mellernoia joined	12:37
	→ opdavies joined	12:37
osse	ruby_on_tails: git blame thatfile.cpp	12:38
	→ Adib joined	12:38
	← Walex left	12:38
	→ D-Boy joined	12:39
	→ paulweb515 joined	12:39
ruby_on_tails	osse: very weird kind of an output i see	12:39
osse	ruby_on_tails: commits on the left. lines of the file on the right	12:40
	← govg left	12:40
	→ Walex joined	12:40
	← Gizburdt left	12:40
	canton7 finds 'git gui blame' clearer	12:40
ruby_on_tails	canton7: git: 'gui' is not a git command. See 'git --help'.	12:41
canton7	probably not installed by default by your distro's 'git' package	12:41
	find 'git-gui' or similar	12:41
ruby_on_tails	hmm	12:41
	i use gitk	12:41
	Guest61456 → guyz	12:41
osse	ruby_on_tails: find the line of the file you're looking for. the SHA of that commit is to the left on that line.	12:42
canton7	gitk might be separate?	12:42
drathir	git gui need installed somethin in os to workin...	12:42
canton7	"in os"?	12:42
	tachoknight_ → tachoknight	12:42
drathir	in operating system	12:42
canton7	why would git gui need os support?	12:42
	← rchavik left	12:43
	→ jtrag joined	12:43
osse	mouse, keyboard, disk IO	12:43
canton7	apart from those :P	12:43
osse	display :P	12:44
	← Hxtu left	12:45
	→ nisseni joined	12:46
	→ toothrot joined	12:46
	→ ome joined	12:47
	← heroux left	12:47
nisseni	Me and a co-worker are having a problem with sass and git. When committing it says something about a "No new line at the end of the file" and something about merging... Anyone experienced this?	12:48
osse	nisseni: "No new line at the end of the file" is just for you information. doesn't matter	12:48
	← cagedwisdom left	12:48
nisseni	Ok, but what should I set when it wants to merge?	12:49
	How do I resolve the merge, rather...	12:49
	→ heroux joined	12:49
osse	!conflict	12:49
gitinfo	[!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	12:49
	→ Asiajey joined	12:49
	← Nikhil_D left	12:49
	← neunon left	12:50
	→ lindenle joined	12:50
	→ Nikhil_D joined	12:50
	→ neunon joined	12:51
mgedmin	pedantically, all text files on Unix systems are supposed to have trailing newlines	12:51
	if they don't fix your editor so it adds one	12:51
	← ruby_on_tails left	12:51
mgedmin	or add a blank line at the end of the file by hand	12:51
	→ astrofog joined	12:51
	← KennyRayFL left	12:52
	→ Gizburdt joined	12:53
	← Oebele left	12:53
	← astrofog left	12:54
	→ jerius joined	12:54
	← daftano left	12:54
	← Guest30453 left	12:54
	→ sahil1 joined	12:55
	← Gizburdt left	12:55
	← lindenle left	12:55
	→ gv_ joined	12:55
	→ groton joined	12:56
	← devoldmx left	12:56
	→ govg joined	12:56
	→ devoldmx joined	12:56
	← ValicekB left	12:57
	→ knownasilya joined	12:57
	→ iamjarvo joined	12:59
	← jerius left	13:00
	← mizu_no_oto left	13:01
	← fabio_p left	13:02
	→ jayeshsolanki joined	13:02
	→ jerius joined	13:02
	← bluesm left	13:03
	→ Ragnar_ joined	13:03
	→ jerematic joined	13:03
	← ropav_ left	13:04
	← Takle left	13:04
	→ ropav joined	13:04
	→ zivester joined	13:04
	→ Gizburdt joined	13:05
	→ KennyRayFL joined	13:06
	→ mkoskar joined	13:08
moritz	how can I get a list of all files in a tree in a bare repo?	13:08
	→ Takle joined	13:09
	→ Granitosaurus joined	13:09
lb1a	moritz, git ls-tree ?	13:09
	← iamjarvo left	13:09
osse	s/\?$/./	13:09
_ikke_	git ls-tree HEAD	13:09
	→ macabre joined	13:09
Granitosaurus	I've forked a repo on github and would like to pull original repo updated contents into my fork, how do I do that?	13:09
tobiasvl	Granitosaurus: !sync	13:10
gitinfo	Granitosaurus: [!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	13:10
moritz	thanks lb1a, osse, _ikke_	13:10
Granitosaurus	thanks guys !	13:10
	← Gizburdt left	13:10
lb1a	moritz, perhaps with --full-tree	13:10
	for subfolders	13:10
moritz	lb1a: I used -r	13:11
	→ Agusanz joined	13:11
	← Agusanz left	13:11
	→ Agusanz joined	13:11
	→ zenith_ joined	13:11
	← Agusanz left	13:14
	→ Tennis joined	13:14
	→ livingstn joined	13:14
	← livingstn left	13:14
	→ livingstn joined	13:15
	← stamina left	13:15
	← ghostpl_ left	13:15
	← jerius left	13:15
	→ hcc23 joined	13:16
moritz	<rant>some idiot cow-orker created a repo that is 2GB in bare form, full of binary debian packages and tar balls</rant>	13:16
	→ rnat joined	13:17
PerlJam	moritz: come on now, that's perfectly fine ... if you're never going to commit to the repo again. ;)	13:18
moritz	PerlJam: I'm writing a tool that crawls through our repos in order to find which versions of which software we have in there	13:19
	PerlJam: and stumbling over a 2GB repo in that process is no fun	13:20
crestbook	seen a repo with 3gb worth of pdfs and video files bundled with code, awesome stuff.. "allright, I'll just clone the repo.. oh.. this is slow.."	13:20
	← bernalex left	13:21
moritz	PerlJam: and that repo hasn't been touched for 3 years; it's likely that we can simply dispose of it	13:21
qsuscs	i’ve seen a repo with the source for android, ios, posix, windows and what you imagine, alongside binaries	13:21
	crestbook runs off to buy ifoundthisrepo.com	13:22
PerlJam	moritz: see?!? it's all good. You discovered something you can improve by throwing things away	13:22
	PerlJam is having a glass-half-full day today	13:22
	← toothrot left	13:22
	→ KennyRay_ joined	13:22
	← LikiLiki left	13:23
bremner	so far.	13:23
	← subhojit777 left	13:23
moritz	:-)	13:23
	→ bronson joined	13:24
	→ lvegerano joined	13:24
	← KennyRayFL left	13:24
PerlJam	bremner: you are clearly wise :)	13:24
	→ ErKa joined	13:25
	← bannakaffalatta left	13:26
	→ Ugjk joined	13:26
	→ jerius joined	13:26
	jtrag → jtrag[Away]	13:26
	← Adib left	13:26
	→ jaznow_ joined	13:26
	→ bannakaffalatta joined	13:26
	→ cjwilburn joined	13:26
	← Ugjk left	13:27
	→ mdhopkins joined	13:27
	← crestbook left	13:28
	← bronson left	13:28
	→ mtakkman joined	13:29
	→ cxee joined	13:29
	→ jwhisnant joined	13:30
	← govg left	13:30
	← bannakaffalatta left	13:31
	← Takle left	13:31
	← cxee left	13:31
	→ denete joined	13:32
	← denete left	13:32
	← jakke left	13:32
	→ tristanp joined	13:32
	← KennyRay_ left	13:32
	→ Wteal joined	13:33
	→ skylite joined	13:33
	→ JDHawke joined	13:33
	→ Goopyo joined	13:34
	→ KennyRayFL joined	13:34
	← Wteal left	13:34
	→ Gizburdt joined	13:36
	← skylite_ left	13:36
	← KennyRayFL left	13:37
	→ Esri joined	13:37
	→ sbogg joined	13:37
	→ pretodor joined	13:38
	← lvegerano left	13:38
	→ KennyRayFL joined	13:38
	← Gizburdt left	13:38
	→ Gizburdt_ joined	13:38
	→ BuenGenio joined	13:38
	← Esri left	13:39
	→ denete joined	13:39
	→ zly joined	13:39
	← zly left	13:40
	← d0nkeyBOB left	13:40
	← goldstar left	13:40
	→ goldstar joined	13:40
	→ yqt joined	13:40
	→ ashu11 joined	13:40
	→ Takle joined	13:41
	→ doizq joined	13:41
	← venmx left	13:41
	→ sagittarian\|2 joined	13:42
	→ IrishPrime joined	13:42
	→ otter768 joined	13:42
	→ fabio_p joined	13:42
	← pretodor left	13:43
	→ ehynds joined	13:46
	→ groton_ joined	13:46
	→ Dragooon joined	13:46
	→ Es0teric joined	13:47
	→ Gamecubic joined	13:47
	← otter768 left	13:47
	→ Raging_Hog joined	13:48
	← groton left	13:48
	groton_ → groton	13:48
	→ Adib joined	13:48
	→ sgen_ joined	13:48
	← ronskisika left	13:48
	→ mekhami joined	13:49
	← CussBot left	13:49
	→ Dougie187 joined	13:49
	→ CussBot joined	13:49
	→ lindenle joined	13:50
	→ ghostpl_ joined	13:51
	→ ckruczek2 joined	13:51
	← BuenGenio left	13:51
	← lindenle left	13:51
	← erichf left	13:52
	← thebrush left	13:53
	← joo-_ left	13:53
	→ erichf joined	13:53
	→ joo-_ joined	13:53
	→ tnkhanh joined	13:54
	← joo-_ left	13:55
	→ Agusanz joined	13:56
	← Agusanz left	13:56
	→ Agusanz joined	13:56
	→ Spacew00t joined	13:56
	← Walex left	13:57
	→ joo-_ joined	13:57
	← ckruczek2 left	13:57
	← mp4 left	13:57
	← Consuela left	13:57
	→ Walex joined	13:57
	← settermjd left	13:57
	→ AaronMT joined	13:58
	← s8321414 left	13:58
	→ pm90_ joined	14:00
	→ EminenceHC joined	14:00
	← pm90_ left	14:02
	→ Zamyatin joined	14:02
	→ pm90_ joined	14:02
	← Es0teric left	14:04
	→ Es0teric joined	14:04
	← EminenceHC left	14:05
	← morois left	14:05
	← ReScO left	14:05
	→ ReScO joined	14:06
	→ tmager joined	14:09
	← tmager left	14:10
	← doizq left	14:12
	→ tanjia joined	14:14
	→ steele joined	14:15
	← jstimm left	14:15
	→ Susq joined	14:15
	← Susq left	14:16
	← zivester left	14:16
	← arup_r left	14:16
	← sbogg left	14:16
	← chiemseesurfer_ left	14:17
	→ Acidnerd joined	14:18
	← tanjia left	14:18
	→ _Atom_ joined	14:19
	→ mquin_ joined	14:19
	→ GinoMan joined	14:22
	→ highcup joined	14:22
	← mquin left	14:22
	→ Henryabcd joined	14:23
	← aswen left	14:23
	→ teufelChiCoder joined	14:24
	← Walex left	14:24
	→ bronson joined	14:25
	← gargola left	14:26
	→ Walex joined	14:26
	→ ignas joined	14:26
	← msonntag left	14:27
	→ editshare-ericf joined	14:28
	← ghostpl_ left	14:28
	← hebz0rl left	14:29
	→ ghostpl_ joined	14:29
	→ stickperson joined	14:29
	→ msonntag joined	14:29
	→ cbonobo joined	14:29
	← bronson left	14:29
	← vmiklos left	14:29
	← sarri left	14:29
	← cbonobo left	14:29
	→ cbonobo joined	14:30
	→ sarri joined	14:31
	→ settermjd joined	14:31
	→ Neozonz\|Disc joined	14:31
	← Neozonz\|Disc left	14:31
	→ Neozonz\|Disc joined	14:31
	→ aswen joined	14:32
	→ GoddeR joined	14:33
	→ Ancchi joined	14:34
	← bsanford left	14:34
	→ Arsonide joined	14:34
	→ skorgon joined	14:34
	← skorgon left	14:34
	→ skorgon joined	14:34
	← ghostpl_ left	14:34
	← skul left	14:35
	→ scientes joined	14:35
	← scientes left	14:35
	→ scientes joined	14:35
	→ ghostpl_ joined	14:35
	→ tmager joined	14:36
	→ m0viefreak joined	14:36
	← tmager left	14:36
	→ mizu_no_oto joined	14:36
	→ tmager joined	14:37
	← ghostpl_ left	14:37
	→ ascarter joined	14:37
	← aswen left	14:38
	→ devoldmx3 joined	14:38
	→ ghostpl_ joined	14:38
	→ chitopunk joined	14:38
	← cmoneylulz left	14:38
	→ cmoneylulz joined	14:38
	← devoldmx left	14:39
	→ devoldmx27 joined	14:39
	← Goopyo left	14:39
	← msonntag left	14:40
	→ bernalex joined	14:40
	← Gizburdt_ left	14:41
	← mizu_no_oto left	14:41
	→ BuenGenio joined	14:41
	← ghostpl_ left	14:41
	→ skul joined	14:42
	→ vmiklos joined	14:42
	← Adib left	14:42
	→ msonntag joined	14:43
	← devoldmx3 left	14:43
	→ nezZario joined	14:43
	→ ghostpl_ joined	14:43
	← cpt_yossarian left	14:43
	← zenith_ left	14:43
	→ Lovich joined	14:43
	→ nfk joined	14:44
	← _Atom_ left	14:44
	→ mizu_no_oto joined	14:45
	← mquin_ left	14:45
	→ im8bit joined	14:45
	→ mquin joined	14:46
	→ gargola joined	14:46
	← ayaz left	14:46
	→ Gizburdt joined	14:46
	→ _Atom_ joined	14:46
	← jagob left	14:47
	→ devoldmx joined	14:47
	→ fg3 joined	14:48
	→ hmsimha joined	14:49
	← devoldmx27 left	14:49
	← MasterPiece left	14:50
	← joo-_ left	14:50
	→ xolubi joined	14:52
	→ chiemseesurfer_ joined	14:52
	→ dvaske joined	14:52
	→ lindenle joined	14:52
	→ bsanford joined	14:52
	← tmager left	14:53
	← dsdeiz left	14:54
	← ashu11 left	14:55
	← BuenGenio left	14:55
	→ zenith_ joined	14:55
	→ tak30 joined	14:55
	← ascarter left	14:55
	→ EminenceHC joined	14:56
	→ thedodd joined	14:56
	← frostyfrog left	14:56
	← groton left	14:56
	← tak30 left	14:56
	← lindenle left	14:57
	→ _1_Qutaiba joined	14:57
	→ zackiv31 joined	14:57
	→ subhojit777 joined	14:57
	← _Atom_ left	14:57
	← Gizburdt left	14:58
	→ Goopyo joined	14:59
	← _1_Qutaiba left	14:59
	← OutofControl left	15:00
	← chiemseesurfer_ left	15:00
	→ dreiss joined	15:00
	→ Gizburdt joined	15:00
	← Silmarilion left	15:01
	→ pheaver joined	15:01
	← creep left	15:01
	← devoldmx left	15:01
	→ Hestil joined	15:01
	→ jagob joined	15:01
	← stickperson left	15:02
	← zadock left	15:02
	→ govg joined	15:02
	→ Amandil joined	15:02
	← shinnya left	15:02
	← acolson left	15:03
	→ oakdog8 joined	15:03
	→ relipse joined	15:03
	← Gizburdt left	15:03
	→ iamjarvo joined	15:03
	→ Gizburdt joined	15:04
	← z8z left	15:04
	← dvaske left	15:06
	→ Bootinbull joined	15:06
	← roelmonnens left	15:06
	→ oojacoboo joined	15:06
	← jargon left	15:06
	← msonntag left	15:08
	→ rcn_ joined	15:09
	← FreezingCold left	15:09
	→ bb010g joined	15:09
	← pyokagan left	15:09
	← Gizburdt left	15:10
	← crose left	15:10
	→ crose joined	15:10
canton7	heh, http://dir.gmane.org/gmane.comp.version-control.git is failing badly	15:10
	→ smccully joined	15:11
	→ Charlie_WONG_Sup joined	15:11
	→ ashu11 joined	15:11
	→ FreezingCold joined	15:12
	← rcn left	15:12
	→ chiemseesurfer_ joined	15:13
	→ aartist joined	15:13
iveqy	canton7: infinit loop! :D	15:13
	Briman\|off → Briman	15:13
	← Hestil left	15:14
	← Ancchi left	15:14
	← rkazak_ left	15:14
	→ lsiv568 joined	15:14
	→ dougsland joined	15:15
	← Alienpruts left	15:15
	← Amandil left	15:16
	← JargonNode left	15:17
	← yvan1 left	15:17
	← Goopyo left	15:17
	→ Amandil joined	15:17
qsuscs	> PHP	15:18
	→ Gizburdt joined	15:18
	→ mr-kyd joined	15:19
	← Amandil left	15:19
	→ _Atom_ joined	15:19
	← hs366 left	15:20
	← skorgon left	15:20
	← nisseni left	15:20
	→ Amandil joined	15:20
	← rnat left	15:22
	→ MLM joined	15:22
	← chiemseesurfer_ left	15:22
	→ JargonNode joined	15:23
	← b0ne_ left	15:23
	← Juzzika left	15:24
	← Dragooon left	15:24
	→ Amandil\|2 joined	15:25
	← Gizburdt left	15:25
	← jiku left	15:25
	← Amandil left	15:25
	→ bronson joined	15:25
	← Amandil\|2 left	15:26
	← lsiv568 left	15:26
	→ lsiv568 joined	15:27
	← dreiss left	15:27
	← Xiti left	15:28
	→ kpease joined	15:28
	← hans_s left	15:28
	→ thiago joined	15:30
	← bronson left	15:30
	← effi left	15:31
	→ Dragooon joined	15:31
	← frox left	15:31
	← lsiv568 left	15:32
	← reim left	15:32
	← endiruna left	15:32
	← Walex left	15:32
	→ Walex joined	15:33
	→ reim joined	15:33
	→ axs221 joined	15:34
	→ Sleepy63 joined	15:34
	→ msonntag joined	15:34
	→ endiruna joined	15:34
	← sagittarian\|2 left	15:34
	→ stamina joined	15:34
	← ghostpl_ left	15:35
	→ Xiti joined	15:35
	→ reim_ joined	15:35
	→ sagittarian\|2 joined	15:35
	← lamppid left	15:35
	→ ghostpl_ joined	15:36
	← michael_mbp left	15:36
	← ReScO left	15:36
	→ michael_mbp joined	15:37
	→ ReScO joined	15:37
	→ effi joined	15:38
	← lb1a left	15:38
	← ciampix left	15:38
	← reim left	15:38
	← Arsonide left	15:40
	← reim_ left	15:41
	← IIT left	15:41
	← Balliad left	15:42
	→ jstimm joined	15:42
	← pobivan left	15:42
	→ pobivan_ joined	15:42
	← zenith_ left	15:42
	← stamina left	15:42
	→ otter768 joined	15:43
	→ Balliad joined	15:44
	→ Goopyo joined	15:44
	← Charlie_WONG_Sup left	15:45
	← jtrag[Away] left	15:46
	→ circ-user-jdqwJ joined	15:46
	→ jtPretzel80 joined	15:46
	→ reim_ joined	15:46
	→ bluesm joined	15:46
	← yqt left	15:47
	← bonswouar left	15:47
	← abarroso left	15:47
	← otter768 left	15:48
	← Balliad left	15:48
	→ abarroso joined	15:48
	→ abarroso_ joined	15:49
	← abarroso left	15:49
	→ hugo_moss joined	15:49
	→ skorgon joined	15:49
	→ Neozonz\|Disc2 joined	15:49
	← thierryp left	15:49
	→ thierryp joined	15:50
	← Neozonz\|Disc left	15:50
	← thierryp left	15:50
	→ lsiv568 joined	15:50
	← psoo left	15:51
	→ MechtiIde joined	15:51
	← iamjarvo left	15:52
	→ Corey84 joined	15:54
	← endiruna left	15:54
	→ sentriz joined	15:55
	← fooforge left	15:55
	← sahil1 left	15:55
	→ IIT joined	15:55
	← circ-user-jdqwJ left	15:55
	→ metts joined	15:56
	← Corey84 left	15:56
	← dougsland left	15:56
	→ fooforge joined	15:57
	khisanth_ → Khisanth	15:58
	← pheaver left	15:58
	← filcab left	15:59
	← ashu11 left	15:59
	→ Corey84 joined	15:59
	→ p3lim joined	15:59
p3lim	When I clone a repository and then want to add another push remote, the first time it runs it replaces the original remote's push url, even if it doesn't match	16:00
	Is this a bug or intentional?	16:00
	← Takle left	16:00
qsuscs	!www	16:00
gitinfo	What did you do (which commands?), what happened as a result (any messages?), and what was the result you expected instead?	16:00
	→ Takle joined	16:01
	→ filcab joined	16:01
p3lim	I first do `git clone [email@hidden.address] then I follow with `git remote set-url origin --push --add [email@hidden.address]	16:01
	→ jtxve joined	16:01
p3lim	I expect that the second url to be added to the remote's url list, instead it replaces the original	16:02
	Basically, I think the "--add" part is broken on first run	16:02
qsuscs	p3lim: git remote add otherrepo [email@hidden.address] is what you want.	16:02
p3lim	no, I want to add the url, not a different remote	16:03
	That way when I push to origin, it pushes to multiple urls	16:03
	Essentially, it achieves mirroring	16:03
	→ paulweb5151 joined	16:04
	→ hobodave joined	16:04
	← jtPretzel80 left	16:04
	→ PigeonFriend joined	16:05
	→ mkjgore joined	16:05
	← zapb_ left	16:05
	← hugo_moss left	16:06
	← paulweb515 left	16:06
	← achadwick left	16:06
mkjgore	hey folks, so I accidentally added a wrong remote to my local repo (tried to add a fork to my local and instead now have two repos in one)	16:06
	← FreezingCold left	16:06
mkjgore	I removed the remote but it seems that the commits are still in my local repo	16:06
	I've tried git gc and git prune but it seems the data is still there :-/	16:07
	← reim_ left	16:07
mkjgore	the remote seems to be gone (doesn't show when I do git remotes -v) and there are no reference branches (git branch -a)… not really sure where to turn	16:07
	→ BSaboia joined	16:08
	← jtxve left	16:08
	← paulweb5151 left	16:08
	← skorgon left	16:08
	← metastableb left	16:09
	← thedodd left	16:10
	→ zapb_ joined	16:11
	← Gamecubic left	16:13
	→ Gamecubic joined	16:13
	← KennyRayFL left	16:13
	→ cromero joined	16:13
	← cromero left	16:13
	→ cromero joined	16:14
	→ Quevin joined	16:14
	← lsiv568 left	16:14
	→ Wrav joined	16:14
	→ lsiv568 joined	16:15
	→ reim joined	16:15
	→ KennyRayFL joined	16:16
	← Wrav left	16:16
	← Takle left	16:16
	← axs221 left	16:17
	→ Takle joined	16:17
	← Takle left	16:17
	→ Ivai joined	16:17
	← seschwar left	16:18
	→ thebrush joined	16:18
	Briman → Briman\|off	16:19
	← lsiv568 left	16:19
mkjgore	sigh… nm folks, turns out there were some tags still waiting to be killed	16:19
	thx anyways	16:19
	→ nettoweb joined	16:19
	← howlymowly left	16:19
	→ Sasazuka joined	16:20
	→ alokbeniwal joined	16:21
	← thevishy left	16:21
	→ Takle_ joined	16:21
	← hmsimha left	16:21
	← Lancien left	16:21
	→ paulweb515 joined	16:22
	→ _2_Hotblonde2 joined	16:23
	← Takle_ left	16:23
	← nettoweb left	16:24
	← sCiphre left	16:24
	→ nettoweb joined	16:25
	→ ejd joined	16:25
	← alokbeniwal left	16:25
	→ paulweb5151 joined	16:26
	→ circ-user-jdqwJ joined	16:26
	→ lindenle joined	16:26
	→ bronson joined	16:26
	← JEEB left	16:27
	← Ivai left	16:27
	← _2_Hotblonde2 left	16:27
ojacobson	p3lim: design wart I suspect	16:27
	← Es0teric left	16:27
ojacobson	on a newly-created remote there are zero push URLs	16:27
	← Bootinbull left	16:28
ojacobson	you are, in fact, adding one... which also suppresses the default behaviour when there are none at all	16:28
p3lim	on a freshly cloned repo there is	16:28
	→ eup joined	16:28
ojacobson	(i.e., the default is not "one push url and one fetch url", it's "one fetch url and no push url")	16:28
	← lindenle left	16:28
ojacobson	the resulting UI is surprising, and that's probably bad; raise it on the !list	16:28
gitinfo	[!official] Some official resources for git. Homepage: http://git-scm.com/ \| Source repo: https://www.kernel.org/pub/scm/git/git.git/ (Mirrrored: https://github.com/git/git/) \| IRC channel: You're in it. \| Mailing list: http://vger.kernel.org/vger-lists.html#git (git@vger.kernel.org, subscription optional)	16:28
	→ Bootinbull joined	16:28
	Briman\|off → Briman	16:29
	← paulweb515 left	16:29
ojacobson	The 'git remote -v' UI should probably not claim that there's a push URL when in that state	16:29
	(if you look at the underlying data in .git/config, there's no push URL)	16:29
	→ zenith_ joined	16:29
	← eup left	16:29
	→ lindenle joined	16:30
p3lim	Either way, there is a bug	16:30
ojacobson	> the resulting UI is surprising, and that's probably bad; raise it on the !list	16:30
gitinfo	[!official] Some official resources for git. Homepage: http://git-scm.com/ \| Source repo: https://www.kernel.org/pub/scm/git/git.git/ (Mirrrored: https://github.com/git/git/) \| IRC channel: You're in it. \| Mailing list: http://vger.kernel.org/vger-lists.html#git (git@vger.kernel.org, subscription optional)	16:30
	← michael_mbp left	16:30
p3lim	Although when you clone a repo, the expected result would be having a remote with both fetch and push urls	16:31
	← bronson left	16:31
p3lim	Yeah I'll report it	16:31
	← Vinnie_win left	16:31
	→ Vinnie_win joined	16:31
	← Lovich left	16:32
	→ daftano joined	16:32
	→ liamkeily joined	16:32
	← reim left	16:32
	→ Dbog joined	16:33
	← CheckDavid left	16:33
	→ michael_mbp joined	16:34
	← mkjgore left	16:34
	← PCatinean left	16:35
	← liamkeily left	16:36
	→ Es0teric joined	16:36
	→ akushner_ joined	16:36
	← inamoriti left	16:36
	→ a-l-e joined	16:37
	→ iliketurtles joined	16:37
	→ jessec joined	16:37
	← intellix left	16:37
	→ justtobe joined	16:38
	→ yvan1 joined	16:39
	← freimatz left	16:39
	rcn_ → rcn	16:39
	→ ciampix joined	16:39
	← abarroso_ left	16:40
	← mikiones left	16:40
	→ lsiv568 joined	16:41
	→ sparetire joined	16:41
	→ abrrs joined	16:41
	← elementalest_dc left	16:41
	← Tennis left	16:41
	← ghostpl_ left	16:42
	← ome left	16:43
	→ Bruno_ joined	16:43
	← rcn left	16:43
	Briman → Briman\|off	16:44
	← basiclaser left	16:44
	→ nisseni joined	16:44
	← mizu_no_oto left	16:45
	← BSaboia left	16:45
	→ reim joined	16:45
	→ rez joined	16:45
	rez → Guest59035	16:45
	← KennyRayFL left	16:45
	← govg left	16:46
	→ ghostpl_ joined	16:46
	→ akiva joined	16:46
	← pm90_ left	16:47
	→ ashu11 joined	16:47
	← Dbog left	16:48
	← akushner_ left	16:48
	← hyperair left	16:49
	← CustosL1m3n left	16:49
	← ashu11 left	16:49
	→ matthewhill joined	16:50
	→ hyperair joined	16:50
	← matthewhill left	16:50
	→ Aygm joined	16:50
	→ zadock joined	16:50
	→ Hestil joined	16:51
	← justtobe left	16:51
	→ axs221 joined	16:51
	← gfixler left	16:52
	← nikio___ left	16:52
	→ gopar joined	16:52
	← ePax left	16:52
	→ KennyRayFL joined	16:53
	→ unixpro1970 joined	16:53
	← Grimlock1 left	16:53
	← blackwind_123 left	16:54
	← Zamyatin left	16:54
	← ashokrajar left	16:55
	→ Lancien joined	16:55
	→ Grimlock1 joined	16:55
	→ ashokrajar joined	16:55
	→ blackwind_123 joined	16:56
	← effi left	16:57
	→ RLa joined	16:57
RLa	is it possible to keep git repo nested inside another git repo?	16:57
grawity	yes and no	16:58
	→ tirengarfio joined	16:58
	→ wicope joined	16:58
	← wicope left	16:58
grawity	you can use submodules, or directly track the subrepo's working tree, but Git will refuse to add the ".git" directory	16:58
RLa	i'm working on a project that mocks git over http	16:58
	→ wicope joined	16:58
	→ Zamyatin joined	16:58
	→ ncd\|leeN joined	16:59
RLa	easiest way seems to be serving bare repo over http	16:59
	→ Arsonide joined	16:59
RLa	but i would have to store the repo somewhere	16:59
grawity	that's the old way, yes	16:59
	anyway, you can add 'bare' repos	16:59
	and generally anything that's not named ".git"	16:59
RLa	nice	16:59
	← kevireilly left	17:00
RLa	i only need read-only repo, so plain http file serving should work	17:00
	← michael_mbp left	17:00
grawity	it works, but it's not very efficient	17:00
	→ effi joined	17:00
	→ michael_mbp joined	17:00
RLa	it's for testing a package manager that can use http git urls	17:00
	→ pheaver joined	17:00
grawity	(on most Git hosting sites, "git over HTTP" means git-http-backend)	17:00
RLa	real git http access uses webdav?	17:01
	→ MarkyC joined	17:01
grawity	no	17:01
	← lsiv568 left	17:01
	→ ashokraj_ joined	17:01
	→ lsiv568 joined	17:01
	← reim left	17:01
grawity	it uses git-http-backend; i.e. talking to the actual Git, over CGI	17:01
	← nour left	17:02
	→ zenith__ joined	17:02
	← leeN left	17:02
qsuscs	webdav was the old way	17:02
RLa	does it actually require web server?	17:02
	→ reim joined	17:02
RLa	the new way	17:02
grawity	if you want HTTP, then yes	17:02
qsuscs	no, git-http-backend uses rsync, as the name suggests.	17:03
	Seveas slaps qsuscs	17:03
qsuscs	:>	17:03
	← thiago left	17:03
	→ xolubi_ joined	17:03
	← xolubi_ left	17:03
grawity	RLa: the "new way" meaning Git packfile protocol, usually runs either over raw TCP (git://, served by git-daemon), or over SSH (ssh:// or user@host:, no special server), or over HTTP(S) (using the git-http-backend CGI program)	17:04
	→ durham joined	17:04
	← zenith_ left	17:04
grawity	the old transports still work, including "dumb HTTP", and I gues they can sometimes be useful, but... don't rely on them for serious repo usage	17:05
	actually	17:05
	← Aygm left	17:05
qsuscs	grawity: do you know whether git over webdav is smart? i mean, it’s definitely more than dumb static HTTP	17:05
	← effi left	17:05
grawity	I'm curious why `git instaweb` can configure Gitweb but not git-http-backend	17:05
	qsuscs: it's not more, is it?	17:05
	← ashokrajar left	17:05
RLa	i go with easiest and most portable solution first	17:05
grawity	qsuscs: it cannot create packfiles on demand the way git-upload-pack does.	17:05
qsuscs	RLa: that would be SSH and/or git://	17:05
	grawity: yet it’s obviously more than dumb HTTP	17:05
grawity	(which is the difference between 'smart' transports, which can do that, vs 'dumb' ones, which only serve static files)	17:06
	→ effi joined	17:06
grawity	qsuscs: how exactly more is it then?	17:06
qsuscs	grawity: i don’t know, that’s what i’m asking	17:06
grawity	qsuscs: well you said "obviously"	17:06
	→ akushner_ joined	17:06
	← lsiv568 left	17:06
	← Zamyatin left	17:07
qsuscs	grawity: why should you use webdav for dumb transport if simple HTTP is enough?	17:07
	→ lsiv568 joined	17:07
	→ gebjgd joined	17:07
grawity	qsuscs: it adds proper file uploading and other filesystem-like stuff	17:07
	← Bruno_ left	17:07
	← xolubi left	17:07
RLa	qsuscs, nope, http must be involved	17:08
qsuscs	RLa: man git http-backend then.	17:08
gitinfo	RLa: the git-http-backend manpage is available at http://jk.gs/git-http-backend.html	17:08
RLa	do i need directory listing support?	17:08
grawity	qsuscs: and I guess in the case of SVN (where each file has its own URL, etc) it lets you use a svn-specific DAV backend that serves the magic stuff	17:08
	RLa: no	17:08
	← sgen_ left	17:08
grawity	regular HTTP directory listing isn't standard enough to be useful	17:08
	→ danzilio joined	17:09
grawity	Git only uses the file generated by git-update-server-info, and continues from there	17:10
	guyz → daynaskully	17:10
	→ Sbab joined	17:10
qsuscs	!svn2git	17:10
gitinfo	For a one-time conversion of SVN to git, svn2git should be used instead of git-svn. There are many tools with this name. Probably the best is the KDE one at https://gitorious.org/svn2git. To analyze the SVN repo history upfront for building up proper rules for svn2git, you might use svneverever from here: http://blog.hartwork.org/?p=763	17:10
qsuscs	hmm that’s quite long	17:11
	← Sbab left	17:11
	→ Zamyatin joined	17:12
qsuscs	anyways, i mirrored it at https://git.qsuscs.de/cgit/svn2git.git/ in case gitorious goes down and the owner did not migrate to github	17:13
	← Gamecubic left	17:13
	← effi left	17:13
	→ Gamecubic joined	17:13
	→ stickperson joined	17:14
	← fabio_p left	17:14
	← ashokraj_ left	17:14
	→ moeu joined	17:14
	→ LikiLiki joined	17:14
	← crose left	17:15
	→ effi joined	17:15
	← nnyk_ left	17:15
	← moeu left	17:15
	← ranchodev left	17:15
	← nisseni left	17:16
	→ sgen_ joined	17:16
	← wicope left	17:17
	→ wicope joined	17:17
	→ Dudi joined	17:17
	→ liri joined	17:17
	← jaznow_ left	17:17
	→ pm90_ joined	17:18
	← jayeshsolanki left	17:19
tnkhanh	what does mirror mean?	17:19
	← lucianangelus left	17:19
tnkhanh	is it just copy to another serverr	17:19
	→ MasterPiece joined	17:20
	→ mkjgore joined	17:20
	→ lucianangelus joined	17:20
	← pm90_ left	17:20
qsuscs	clone --mirror and, in this case, also the wiki	17:20
	→ pm90_ joined	17:20
	→ aswen joined	17:21
	← Zamyatin left	17:21
	→ Zamyatin joined	17:22
	→ HelloShitty joined	17:22
	HelloShitty → HelloATMega1	17:23
	→ LBV_User joined	17:23
	→ mizu_no_oto joined	17:23
	→ Tomdarkness joined	17:24
	← diosmiux left	17:24
	HelloATMega1 → HelloATMega	17:25
	← halfline left	17:25
	→ iamjarvo joined	17:26
	→ halfline joined	17:26
	← zenith__ left	17:26
	→ crose joined	17:26
	← halfline left	17:26
	→ gnqc joined	17:27
	→ bronson joined	17:27
	→ dreiss joined	17:27
	→ KennyRay_ joined	17:27
	← gnqc left	17:28
	← duderonomy left	17:28
	← lucianangelus left	17:28
	→ gsingh93 joined	17:28
	← Lancien left	17:29
	← KennyRayFL left	17:29
	→ halfline joined	17:29
	→ lucianangelus joined	17:29
	← KennyRay_ left	17:29
	← bronson left	17:30
	→ bronson joined	17:30
	← Tomdarkness left	17:30
	← ki0 left	17:31
	← abrrs left	17:31
	→ b0ne_ joined	17:31
	→ pantsman- joined	17:31
	→ jonmorehouse joined	17:32
	← Peasley left	17:33
	← lucianangelus left	17:34
	→ drocsid joined	17:34
	← ghostpl_ left	17:34
	← Vile left	17:34
	→ szymek joined	17:35
	← netj left	17:36
RLa	nice, got bare repo serving over http working	17:36
	→ netj joined	17:36
	→ KennyRayFL joined	17:36
	→ nour joined	17:36
	→ yqt joined	17:36
RLa	had to run git update-server-info in bare repo for correct stuff to be generated	17:37
grawity	there's an example hook for that	17:37
	← LikiLiki left	17:37
RLa	yes, but i have 5-line http server that does not run hooks	17:37
	→ LikiLiki joined	17:37
grawity	they're not meant to be run by the http server	17:38
	← mkjgore left	17:38
	→ mafrasi2 joined	17:38
	← mafrasi2 left	17:39
RLa	with http serving, who should be run them?	17:39
	→ mafrasi2 joined	17:39
RLa	cron? :)	17:39
	→ nisseni joined	17:40
	→ groton joined	17:40
	→ ashu11 joined	17:41
	→ demifuror joined	17:41
demifuror	hi guys. has anyone experienced git not sending authorization headers with its server requests, for things like clone, ls-remote etc?	17:42
	← lsiv568 left	17:43
	→ lsiv568 joined	17:43
	← unreal left	17:43
	→ Ancchi joined	17:44
	→ otter768 joined	17:44
iveqy	demifuror: what protocoll? Git doesn't do authorization	17:44
	← demifuror left	17:44
	← wicope left	17:44
	→ thiago joined	17:44
	← Dragooon left	17:44
	← drocsid left	17:45
	→ drocsid joined	17:45
drocsid	how do I view a list of all files modified after a particular commit? I saw this list when using git pull, but lost it from my terminal buffer.	17:45
	← bsanford left	17:45
	← paulweb5151 left	17:45
	← MarkyC left	17:46
iveqy	drocsid: man git diff, look at --numstat	17:46
gitinfo	drocsid: the git-diff manpage is available at http://jk.gs/git-diff.html	17:46
	→ wicope joined	17:46
	← wicope left	17:46
drocsid	thanks, will have a look	17:46
	iveqy: thanks	17:47
	← mtakkman left	17:47
	→ lsiv568_ joined	17:47
	→ Evii joined	17:47
	→ MarkyC joined	17:47
	← lsiv568 left	17:48
	← KennyRayFL left	17:48
	← otter768 left	17:48
	← iamjarvo left	17:49
	→ OnkelTem joined	17:50
	gitinfo set mode: +v	17:50
OnkelTem	Hi. How to interactively join two commits? I git rebase -i ... now what? How to take say TWO commits?	17:51
grawity	there are instructions at the bottom of the todo list.	17:51
	← Sonicbit left	17:52
	← jonmorehouse left	17:52
	← dreiss left	17:52
	→ tyreld joined	17:52
	→ dreiss joined	17:53
	← bluesm left	17:53
	→ sahil1 joined	17:53
	← yqt left	17:54
	→ KennyRayFL joined	17:54
cbreak	I'd do it with git checkout -p	17:54
	← marcogmonteiro left	17:55
	← denete left	17:56
	→ denete joined	17:56
	→ ParsectiX joined	17:56
	← ashu11 left	17:57
	← GoddeR left	17:57
	← phantombeta left	17:57
	← aswen left	17:57
	→ ashu11 joined	17:58
	← sahil1 left	17:58
	→ endiruna joined	17:58
	← dreiss left	17:59
	← LikiLiki left	17:59
	→ ranchodev joined	18:00
	← ArchRogem left	18:01
	← nisseni left	18:01
	→ jerius_ joined	18:01
	← jerius left	18:01
	→ bluesm joined	18:01
	→ ashokrajar joined	18:01
	→ Nizumzen joined	18:02
	→ Gama11_ joined	18:02
	→ Liran joined	18:02
	← Liran left	18:03
	→ ghostpl_ joined	18:03
	→ FreezingCold joined	18:03
	← ejnahc left	18:03
	← effi left	18:04
	← skullcrasher left	18:04
	← teran_ left	18:04
	← zadock left	18:04
	← Gama11 left	18:04
	→ teran joined	18:04
	→ Lmw joined	18:05
	→ ejnahc joined	18:05
	→ dougsland joined	18:05
	→ hahuang65 joined	18:05
	← thebrush left	18:06
	← groton left	18:06
	→ effi joined	18:06
	← joetam left	18:08
	→ joetam joined	18:08
	← teran left	18:09
	→ oakdog8_afk joined	18:09
	← Lmw left	18:10
	← bb010g left	18:10
	→ sudshekhar joined	18:10
	→ aswen joined	18:10
	← Dudi left	18:10
	→ sburgess joined	18:11
	→ duderonomy joined	18:11
	→ jonmorehouse joined	18:11
	← dougsland left	18:11
	→ MacWinner joined	18:11
	→ dougsland joined	18:11
	→ Advocation joined	18:12
	← MarkyC left	18:12
	→ arez joined	18:12
	← nilg left	18:13
	← oakdog8 left	18:13
	→ baweaver joined	18:13
	← Grimlock1 left	18:13
	→ pstodulk joined	18:14
	← pstodulk left	18:14
	→ f3lp joined	18:15
	← Evii left	18:15
	← settermjd left	18:15
	→ chiemseesurfer joined	18:16
	← Hounddog left	18:16
	→ eddyp joined	18:17
	→ zadock joined	18:17
	→ eletuchy joined	18:17
	→ dreiss joined	18:18
	← Advocation left	18:19
	← opdavies left	18:20
	→ iik joined	18:20
	→ zenith_ joined	18:21
romanovic	for those of you who self-host gitlab or another repo management system, what do you use for github gists or pastebin-like functionality?	18:21
	← ehynds left	18:21
	← mylord left	18:22
	← eletuchy left	18:22
	→ jottr joined	18:23
	← iik left	18:23
osse	I use github gists or pastebin	18:24
	→ tonyj joined	18:24
romanovic	key here is being able to self host	18:24
	← Acidnerd left	18:25
	→ metastableb joined	18:25
romanovic	I would love to use github and pastebin at work, but the thought police would descend and take me away for posting code in public	18:25
osse	hmm there seems to be several self-hosted pastebins outhere	18:25
	→ acosonic joined	18:25
osse	romanovic: you can mark gists as private	18:25
romanovic	osse: yeah, they don't care.	18:26
Seveas	romanovic: an old pztme (now apparently called Knoxious-Open-Pastebin) instance	18:26
acosonic	Hi everyone, I'm trying to run some git post-commit or update hook, but nothing gets fired, I've put whoami > /tmp/gittest.txt but nothing... 0 response from hook	18:26
	← endiruna left	18:26
	→ boombatower joined	18:26
	← boombatower left	18:26
	→ boombatower joined	18:26
iveqy	romanovic: I can imagine that there's plenty of pastebins implementations out there. So the question is, what requirements do you've of a pastebin?	18:26
	→ ivan_on_trac joined	18:26
	← ashokrajar left	18:26
iveqy	acosonic: what happens when you manually tries to run that hook?	18:27
acosonic	iveqy: it works	18:27
	I've even tried 777 on them, still 0	18:27
	← pluc_pilou left	18:27
iveqy	acosonic: what about permissions and file mode?	18:27
romanovic	iveqy: I've used Stikked before and it has worked quite well, but I'd rather have a non-PHP option if possible. the only requirements really are that it is FOSS and has excellent syntax highlighting support	18:28
	← subhojit777 left	18:28
	→ Pyoo joined	18:28
osse	this is supposedly the full source of ix.io: https://bitbucket.org/resi/ix.io/raw/0fa9c75138d0599f04cf227a861555cbca1f75f4/ix.io	18:28
	→ groton joined	18:29
	→ LikiLiki joined	18:29
	← encod3 left	18:29
	→ Gianormagantrous joined	18:29
acosonic	iveq: nothing, 777 git push still nothing	18:30
	← Zamyatin left	18:31
	→ bsanford joined	18:31
	→ Ryanar joined	18:31
	← lsiv568_ left	18:31
iveqy	acosonic: what's the name of your post-commit hook?	18:31
	→ nnyk_ joined	18:32
	→ Zamyatin joined	18:33
	← gopar left	18:33
	→ incredible joined	18:34
Seveas	osse: of the cli client, yes.	18:34
	not the server side	18:34
	← LikiLiki left	18:35
osse	Seveas: that's what I thought too. And then I read somewhere that it's the server.	18:35
acosonic	iveqy: http://paste.ubuntu.com/10708406/	18:35
osse	Seveas: but now I think it's the client again	18:35
acosonic	I tried all names :(	18:35
	→ jottr_ joined	18:35
	← jottr left	18:35
Seveas	I don't know where you read that, but it's definitely not the server :)	18:36
	← meLon left	18:36
Seveas	acosonic: post-commit only is called after commit, not after/during push.	18:36
	→ Vile joined	18:36
	→ Acidnerd joined	18:37
Seveas	update, post-update and post-receive are called on the receiving end in various stages of receiving a push	18:37
	→ micechal__ joined	18:38
	→ meLon joined	18:38
Seveas	so, let's do an !xy	18:38
gitinfo	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...	18:38
	→ ashu_ joined	18:39
	← ashu11 left	18:40
	← micechal_ left	18:40
acosonic	ok, but update is not called also...	18:40
	→ clrg_ joined	18:41
	→ opdavies joined	18:41
acosonic	I just need something called when push is received on remote server...	18:41
	→ thebrush joined	18:41
	→ eletuchy joined	18:42
	→ apdapreturns joined	18:42
Seveas	so you're editing hooks on that remote server?	18:42
apdapreturns	How can I do a git repo update without overwriting my changes?	18:42
Seveas	apdapreturns: "update" is not a git thing, what are you trying to achieve?	18:42
apdapreturns	when I sync, it opens diff/merge, then moves on when I save the compatible file	18:42
Seveas	"sync" is also not a git thing, what are you actually doing?	18:43
	← APK left	18:43
	→ AKPWD joined	18:43
apdapreturns	I want to update the repositories without overwriting my changes	18:43
	→ AnimalFarmPig joined	18:43
	→ gopar joined	18:44
apdapreturns	I'm using Google's Repo utility (which uses Git), Seveas	18:44
Seveas	oh. that. We don't support that :)	18:44
apdapreturns	I can use normal Git	18:44
	tho	18:44
Seveas	just commit uncommitted changes and do a normal fetch+merge (aka pull)	18:45
apdapreturns	ok	18:45
	→ ki0 joined	18:46
	← clrg_ left	18:46
	→ hegge joined	18:46
AnimalFarmPig	I'm a terrible person, and I think I've thoroughly screwed up this repository. First time using git outside of small projects with friends, and first week at a new job. Can someone do a bit of hand holding? Slightly stressed out	18:46
Seveas	AnimalFarmPig: sure. First get a coffee and stop stressing out. Git makes it very hard to lose data you committed, so unless you wiped the entire repo or lost uncommitted changes, we can probably sort out whatever the problem is.	18:47
	AnimalFarmPig: can you describe the mess you created? Maybe pastebin some relevant !lol output	18:48
gitinfo	AnimalFarmPig: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	18:48
AnimalFarmPig	Yeah, trying to figure out how to explain this...	18:48
	← heroux left	18:48
AnimalFarmPig	I think I know where I went wrong	18:48
	← mojibake left	18:49
	→ circ-user-jdqwJ_ joined	18:49
AnimalFarmPig	Okay, so, instead of just pushing to a repo at work, we use pull requests using a web interface called stash	18:50
	← oakdog8_afk left	18:50
AnimalFarmPig	it also lets us do branching, etc.	18:50
	→ heroux joined	18:50
	→ capt-rogers joined	18:50
	→ thierryp joined	18:50
	→ BlaXpirit_UA joined	18:51
	→ krabat joined	18:51
AnimalFarmPig	What I think happenned is this-- I was asked to make some changes in a project. I branched off of the dev branch, made my changes, pushed back to my new branch, submitted a pull request	18:51
	→ iamjarvo joined	18:51
krabat	hi guys	18:51
gitinfo	krabat: 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.	18:51
	→ phoenixz joined	18:51
	← iamjarvo left	18:51
AnimalFarmPig	I was then asked to make some other larger changes	18:52
	→ iamjarvo joined	18:52
	← BlaXpirit-UA left	18:52
AnimalFarmPig	I made a new branch (I thought from dev, but maybe not), made the changes (which basically clobbered the original changes)	18:52
	→ LikiLiki joined	18:52
AnimalFarmPig	I think I branched before the pull request was approved and my initial small changes were made	18:53
	← circ-user-jdqwJ left	18:53
	← scientes left	18:54
AnimalFarmPig	now, I push my changes back to my new changes branch, and I submit my pull request for dev	18:54
	but it says that my local branch is out of date	18:54
	then, I accidentally pushed to master	18:54
	← ParsectiX left	18:54
krabat	while working on my master thesis I came across some weird behaviour of git. is it common practice to allow an email like '@example'?	18:54
AnimalFarmPig	so, I need to do two things	18:55
	→ ParsectiX joined	18:55
	← ParsectiX left	18:55
AnimalFarmPig	get my branch to a state where I can submit a pull request to dev and not have it fail	18:55
	← thierryp left	18:55
AnimalFarmPig	and undo my push to master	18:55
sorenb	krabat, no. and many projects require you to use real name and email address	18:56
AnimalFarmPig	oh, also, not lose a few days of work	18:56
	← jerius_ left	18:56
_ikke_	krabat: I'm not sure in what matter git does any e-mail validation though	18:56
Seveas	let's start with undoing the push.	18:56
	actually, let's start with a !backup :)	18:56
gitinfo	Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	18:56
AnimalFarmPig	okay, that would be good	18:56
	← mdhopkins left	18:56
	→ yqt joined	18:57
Seveas	your second batch of changes are not on the 'master' branch locally?	18:57
AnimalFarmPig	okay, I've already backed up, so that's good	18:57
	→ taruner joined	18:57
krabat	_ikke_: I'm close to writing a patch that does exactly that :/	18:57
Remram	Can I get a single commit?	18:57
	→ mdhopkins joined	18:57
AnimalFarmPig	I think the second batch of changes are on my local (dev workstation) master :\|	18:57
Remram	`git fetch --depth=1 someurl somecommitsha1` doesn't seem to work	18:57
	← nettoweb left	18:57
	← _Atom_ left	18:58
	← baweaver left	18:58
	→ anchorite joined	18:58
Seveas	AnimalFarmPig: do a !lol to confirm. If so: git checkout master; git branch second-batch	18:59
gitinfo	AnimalFarmPig: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	18:59
	→ Trudko_ joined	18:59
AnimalFarmPig	actually, I have an instance where I do have the changes in the correct branch, I think	18:59
Seveas	then do a git pull to make sure your local and remote master agree on what master is.	18:59
	← ashu_ left	18:59
	→ Zupoman joined	19:00
	← jstimm left	19:00
krabat	_ikke_: thanks, I'll try to find some time while writing my thesis to fix this. I think this is not that much of an issue, but some people take advantage of this 'feature'.	19:00
	→ Sonicbit joined	19:00
	→ anoyes_ joined	19:01
AnimalFarmPig	Seveas: http://pastebin.com/3CMEsqua	19:01
	→ ottanta_ joined	19:01
	← EminenceHC left	19:01
	← RLa left	19:01
	→ jerius joined	19:01
	← anoyes_ left	19:01
	→ liamkeily joined	19:01
	← u1106 left	19:01
Seveas	AnimalFarmPig: 31c2feb is the accidental push?	19:02
	→ u1106 joined	19:02
AnimalFarmPig	Seveas: yes, accidental push to master	19:02
krabat	sorenb: yes. some do, but there are some GitHub repositories, where users use different computers and therefore different emails (nothing wrong with that), but also invalid emails like '@<insert chars here>'	19:02
	→ kadoban joined	19:03
Seveas	AnimalFarmPig: easiest is to just revert it. git checkout master; git revert 31c2feb; git push	19:03
	then you can work on sorting out your local branches	19:03
	→ GoddeR joined	19:04
acosonic	Seveas: yes, I am editing hooks on remote server	19:04
	→ karrtmomil joined	19:04
	← karrtmomil left	19:04
acosonic	Seveas: I want to have git auto-deploy when I commit to production branch to auto-update www-root on another server... I did that with svn now I want to use git...	19:05
	← danzilio left	19:06
	→ Gizburdt joined	19:06
	→ ParsectiX joined	19:06
AnimalFarmPig	oops, meeting, thanks for the help Seveas. I'll be back in a bit	19:07
Seveas	acosonic: obligatory !deploy trigger goes here. That said, here's a post-receive hook that does something like that: https://gist.github.com/seveas/35a86ee2b0ba7a9ad24c	19:07
gitinfo	acosonic: 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	19:07
	← kadoban left	19:07
acosonic	Well anyway I need any of he hooks do the whoami > /tmp/test.txt	19:08
	← ntio left	19:08
	→ steele_ joined	19:08
	← iliketurtles left	19:09
	→ danzilio joined	19:09
	← steele left	19:09
	← u1106 left	19:09
	→ blr joined	19:10
	← blr left	19:11
	→ blr joined	19:11
acosonic	is there anything that I need to do on the server in order to have hook fired?	19:11
AnimalFarmPig	okay, wasn't a mandatory meeting	19:11
	alright, got the changes reverted, thanks, Seveas	19:12
	← Corey84 left	19:13
AnimalFarmPig	Seveas: so, now if I check out "develop", I can then branch, copy in my changed files, and push the branch, yeah?	19:14
acosonic	It required git update-server-info ...	19:14
	→ bannakaffalatta joined	19:14
	→ encod3 joined	19:15
	→ u1106 joined	19:15
	→ sbimike joined	19:16
	→ iliketurtles joined	19:16
Seveas	AnimalFarmPig: even better. git checkout develop, git checkout -b your-branch-name-here, git cherry-pick sha1-of-commit-that-should-be-on-this-branch	19:16
	AnimalFarmPig: and repeat for the second change. Do a !lol to confirm they're all right now	19:16
gitinfo	AnimalFarmPig: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	19:16
acosonic	Anyway thanks LD	19:16
	:D	19:16
	← acosonic left	19:16
	→ shinnya joined	19:18
	← iamjarvo left	19:18
	→ Lovich joined	19:18
AnimalFarmPig	Seveas: http://pastebin.com/PZFC9VQJ	19:19
sbimike	i want to make branch A match branch B exactly, but i cannot use rebase and i cannot rename the branch.	19:19
	because force-pushing is not allowed for this branch	19:20
	→ ePax joined	19:20
AnimalFarmPig	31c2feb has the changes I want	19:20
sbimike	its easy to use merge to add the changes i want from B to A, but how can i revert the changes that were removed using `git reset --hard` on B	19:20
Seveas	AnimalFarmPig: master looks good on that one. To create a branch for 31c2feb based on develop: git checkout develop; git checkout -b give-your-branch-a-name-here; git cherry-pick 31c2feb	19:21
	← ParsectiX left	19:21
	← mizu_no_oto left	19:23
AnimalFarmPig	oh my, this is so frustrating. http://pastebin.com/3cbkyhvv	19:24
	I apologize. Thank you so much for patience	19:24
	← jonmorehouse left	19:24
	→ ParsectiX joined	19:25
	← cdown left	19:26
	← danzilio left	19:26
	→ _Atom_ joined	19:26
	← thebrush left	19:26
	→ unreal joined	19:27
	→ thebrush joined	19:27
	← ePax left	19:27
	→ Trow joined	19:29
	→ codetroll joined	19:29
	→ thierryp joined	19:29
	← gv_ left	19:31
	→ Balliad joined	19:31
	→ paulweb515 joined	19:31
	→ CustosL1m3n joined	19:32
	→ gv joined	19:33
	gv → Guest83259	19:33
	← akushner_ left	19:34
	→ phantombeta joined	19:35
	← thebrush left	19:35
	→ naftilos76 joined	19:36
	← FreezingCold left	19:36
	→ thebrush joined	19:37
	← sbimike left	19:37
	← liamkeily left	19:38
	← daftano left	19:38
	← bronson left	19:39
	→ scientes joined	19:40
	← scientes left	19:40
	→ scientes joined	19:40
	← ottanta_ left	19:40
	→ beneggett joined	19:41
	→ settermjd joined	19:41
	← cmoneylulz left	19:42
	→ dvaske joined	19:42
	← ParsectiX left	19:43
	→ jonmorehouse joined	19:43
	→ daftano joined	19:44
	← Gizburdt left	19:44
	→ zumba_addict joined	19:44
	→ Thorax15 joined	19:44
	→ baweaver joined	19:44
	← zumba_addict left	19:45
	→ otter768 joined	19:45
	→ zumba_a__ joined	19:45
	← scientes left	19:46
	→ cpt_yossarian joined	19:46
	← zumba_ad_ left	19:47
	→ groton_ joined	19:47
	→ bronson joined	19:47
	← Balliad left	19:47
	← bannakaffalatta left	19:48
	← groton left	19:48
	groton_ → groton	19:48
	→ tmager joined	19:48
	← Guest59035 left	19:49
	← otter768 left	19:49
	← zumba_a__ left	19:49
	← tmager left	19:50
	← tvw left	19:50
	→ zumba_addict joined	19:50
	← zumba_addict left	19:51
	→ zumba_ad_ joined	19:51
	← tmz left	19:52
	→ tmz joined	19:53
	→ iamjarvo joined	19:54
	→ Guest38709 joined	19:56
	← MechtiIde left	19:56
	→ Gizburdt joined	19:56
	← jagob left	19:57
	→ jottr joined	19:57
	→ liamkeily joined	19:58
	← liri left	19:58
	← zumba_ad_ left	19:59
	← jottr_ left	19:59
	→ zumba_addict joined	20:00
	Guest38709 → rezzrov	20:00
	← baweaver left	20:00
	← lqi left	20:00
	→ benegget_ joined	20:01
	← IrishPrime left	20:01
	→ durham_ joined	20:01
	← Zamyatin left	20:02
	← beneggett left	20:02
	← chiemseesurfer left	20:03
	→ chiemseesurfer joined	20:03
	→ baweaver joined	20:03
	→ bannakaffalatta joined	20:03
	→ MarkyC joined	20:03
	→ lqi joined	20:04
	→ cagedwisdom joined	20:04
	← zumba_addict left	20:04
	→ zumba_addict joined	20:05
	← durham left	20:05
	← zumba_addict left	20:05
	← opdavies left	20:05
	← iamjarvo left	20:06
	→ zumba_addict joined	20:07
	← groton left	20:09
	→ pfilyk joined	20:09
	← zumba_addict left	20:09
	→ mizu_no_oto joined	20:09
	→ martinbmadsen joined	20:10
	← ignas left	20:10
	→ groton joined	20:11
	← tristanp left	20:11
	← dvaske left	20:11
	→ thevishy joined	20:12
	→ danguafer joined	20:12
	← u1106 left	20:12
	→ zumba_addict joined	20:13
	← pfilyk left	20:13
	← zumba_addict left	20:13
	→ ahr3n joined	20:13
	→ shaunoo joined	20:13
	Briman\|off → Briman	20:15
qsuscs	!stats	20:16
gitinfo	[!irclog] Public logs of #git are kept at: http://colabti.org/irclogger/irclogger_log/git or look at stats for the last 30 days: http://itvends.com/irc/git.html or since Jan 1, 2012: http://itvends.com/irc/git-all.html	20:16
	→ Regency joined	20:16
qsuscs	Eugene: your cronjob is broken and btw i adjusted the config a bit.	20:17
	← einmalfel left	20:17
	← spb left	20:17
	→ spb joined	20:17
	→ kadoban joined	20:19
	← _Atom_ left	20:20
	← LikiLiki left	20:20
	→ einmalfel joined	20:21
	→ FreezingCold joined	20:21
	← rezzrov left	20:23
	→ Zamyatin joined	20:23
	→ ascarter joined	20:23
	→ paddymahoney joined	20:23
	← paddymahoney left	20:23
	← faheem_ left	20:24
	← ki0 left	20:25
	← Zamyatin left	20:25
	← bronson left	20:25
	← AnimalFarmPig left	20:26
	← benegget_ left	20:26
	→ nisseni joined	20:26
	→ ahr3n_ joined	20:27
	← ahr3n left	20:28
	→ cdown joined	20:28
	→ bronson joined	20:28
	→ zumba_addict joined	20:29
	← pm90_ left	20:29
	→ u1106 joined	20:29
jumpman	So this morning I was getting non-fast-forward errors	20:29
	→ ValicekB joined	20:29
jumpman	Knowing that I needed to push the exact status of the production server to the master branch I did a +master push to force it through	20:30
	but that commit didn't wind up in our commit history	20:30
	→ nettoweb joined	20:30
jumpman	so while I try to pull master into a feature branch (to get the changes I had force-pushed) I'm told everything is up to date	20:30
	however, from the master branch I can't push the changes again because they're up to date	20:30
	which makes me feel like I have two different versions of 'master' telling me that they're up to date	20:31
	← tmz left	20:31
	← zumba_addict left	20:31
_ikke_	jumpman: git pull = git fetch + git merge	20:31
	→ _X_C_V_B_ joined	20:32
_ikke_	git fetch fetches new history	20:32
	← cdown left	20:32
	→ tmz joined	20:32
	→ _Atom_ joined	20:32
	→ morois joined	20:32
_ikke_	if no new history is to be fetched, no merge happens either	20:32
	→ cdown_ joined	20:32
_ikke_	jumpman: Seems you just want to merge in master	20:32
jumpman	right - the new history, in this case, being the commit I had to force-push to get around the fast-forward errors	20:32
	yeah, I think so	20:33
	> git pull origin master	20:33
	?	20:33
	← Dorf left	20:33
jumpman	or do you think maybe > git rebase master < might make more sense?	20:34
_ikke_	either rebase or merge	20:34
	→ dsc_ joined	20:35
	→ mikiones joined	20:35
dsc_	Even though .git/config has the correct username it still uses the global git settings (another user)	20:35
	now I cannot push to my repo :( halp	20:35
	← ascarter left	20:36
jumpman	_ikke_: it's just telling me that I'm 'Already up to date' :l	20:36
_ikke_	dsc_: What error do you get?	20:37
	jumpman: !situation	20:37
gitinfo	jumpman: Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)	20:37
	← settermjd left	20:37
	→ rez joined	20:38
dsc_	_ikke_: http://pastie.org/pastes/10063500/text?key=byy3jwizjx5wd0equas4q	20:38
	rez → Guest38567	20:38
	Guest38567 → rezzrov	20:38
	← fg3 left	20:39
_ikke_	and smlo is the wrong username?	20:39
jumpman	http://hastebin.com/ofuteyopus.1c	20:39
	I'm fairly certain that our branches are a mess :p	20:39
	← einmalfel left	20:40
dsc_	_ikke_: correct	20:40
	it is the username i use for work	20:40
jumpman	i adopted this project only recently from a macedonian team	20:40
	→ jtPretzel80 joined	20:40
	→ nuk3 joined	20:40
	→ soman joined	20:40
	← IIT left	20:40
_ikke_	hmm, master is missing here	20:40
	→ tvw joined	20:40
	→ Takle joined	20:40
	→ robarelli joined	20:40
jumpman	i did this log from the feature branch i'm trying to merge master in to	20:40
_ikke_	right	20:40
soman	When I clone bare repo from server will I have two master branches? master and origin/master	20:41
jumpman	should I produce another one from master perhaps?	20:41
_ikke_	sure	20:41
dsc_	_ikke_: .git/config should be picked up right	20:41
_ikke_	soman: yes, origin/master is a so called remote tracking branch	20:41
dsc_	_ikke_: instead of my global config...	20:41
_ikke_	dsc_: What username did you change?	20:41
	→ gunnaro joined	20:41
jumpman	:( output is the same	20:42
	← bronson left	20:42
	← incredible left	20:42
_ikke_	user.name is only used for committing	20:42
dsc_	_ikke_: from 'smlo' (work account) to 'nattewasbeer'	20:42
	_ikke_: i see	20:42
	im trying git push origin master	20:42
_ikke_	jumpman: instead of --all, just put master	20:42
dsc_	but it does it with the wrong command	20:42
	uh	20:42
	wrong user account	20:42
	I want to push as user account 'nattewasbeer'	20:42
	not 'smlo'	20:42
	→ odin22 joined	20:43
jumpman	http://hastebin.com/maratepohe.1c.	20:43
	→ bronson joined	20:43
grawity	dsc_: wait, are you expecting the "user.name" parameter to configure this	20:43
	because it doesn't	20:43
	← nuk3 left	20:43
dsc_	grawity: how can I push my repo as the username I want?	20:43
grawity	change the URL to https://nattewasbeer@github.com/…	20:44
_ikke_	jumpman: Those branches seem quite diverged	20:44
soman	_ikke_: whe I do push can I select both branches my and remote which will be merged? I want my team develop in 2 branches and as I understand I cannot create the branches at the remote repo.	20:44
_ikke_	I don't see anything in common	20:44
dsc_	grawity: change what URL? 'git push origin master'	20:44
jumpman	yeahhhh...	20:44
dsc_	gravity: i dont see an URL in there	20:44
_ikke_	dsc_: git remote show -v	20:44
dsc_	error: unknown switch `v'	20:44
grawity	the one configured for the 'origin' remote, https://a.pomf.se/ycxuxl.png	20:44
	→ oriba joined	20:44
	← mariuscc left	20:45
	→ XCVB joined	20:45
	→ iv4nnunes joined	20:45
_ikke_	jumpman: What if you do git merge master in your feature branch?	20:45
	→ hmmwhatsthisdo joined	20:45
	← crose left	20:45
dsc_	grawity: my remote is fine. I just cant push with the user account 'smlo' to a repo owned by 'nattewasbeer'	20:45
	So I need to push as nattewasbeer	20:45
hmmwhatsthisdo	Does anyone have experience with using Git in VS2013?	20:45
grawity	dsc_: yes, I got that part	20:46
	dsc_: that's exactly why I'm telling you to change the URL – so that the username will be in it	20:46
	← _X_C_V_B_ left	20:46
dsc_	grawity: im confused as to what URL to change	20:46
_ikke_	dsc_: The username can be part of the remote url	20:46
dsc_	I see	20:46
jumpman	_ikke_: Already up-to-date	20:46
hmmwhatsthisdo	like, with the built-in Git tools	20:46
	→ crose joined	20:46
	← bannakaffalatta left	20:46
_ikke_	jumpman: aparently, master is a descendant from feature	20:47
hmmwhatsthisdo	...trying to figure out how to resolve conflicts and merge changes in one commit	20:47
dsc_	gravity: 'git remote set-url https://nattewasbeer@github.com/dushi.py-web.git/'	20:47
	?	20:47
	XCVB → _X_C_V_B_	20:47
_ikke_	jumpman: So feature already has everyting master has	20:47
jumpman	uh oh	20:47
_ikke_	git remote set-url origin <url>	20:47
	← cavallari left	20:47
jumpman	but the two locations, both saying they're up to date with master, have different versions of files	20:47
grawity	dsc_: https://nattewasbeer@github.com/nattewasbeer/dushi.py-web.git	20:48
	dsc_: don't remove random parts, just add the username	20:48
_ikke_	jumpman: The branches can still have changes master doesn't have	20:48
	← zenith_ left	20:48
dsc_	grawity: thx, got it	20:48
	_ikke_: thanks	20:48
	← ivan_on_trac left	20:48
	← Neozonz\|Disc2 left	20:48
	← robarelli left	20:49
	→ Neozonz\|Disc joined	20:49
	← Neozonz\|Disc left	20:49
	→ Neozonz\|Disc joined	20:49
jumpman	I don't really understand what the implications of that are	20:49
	→ modocache joined	20:49
	→ EminenceHC joined	20:49
	→ robzilla joined	20:50
	→ zumba_addict joined	20:50
	← editshare-ericf left	20:50
jumpman	:( i just want these 3 file changes that are correct on the production server (up-to-date with master) on my feature branch (up-to-date with master)	20:50
	← zumba_addict left	20:50
	← dsc_ left	20:50
	→ XCVB joined	20:50
_ikke_	jumpman: to verify: what does git log feature..master return (feature replaced with the name of the feature branch)	20:51
	← Lovich left	20:52
	← Gizburdt left	20:52
	← _X_C_V_B_ left	20:53
	→ cocodys_ joined	20:53
	XCVB → _X_C_V_B_	20:53
_ikke_	jumpman: It seems that the feature branch modified those files into a state you don't want. Merging master back in doesn't fix that (and there is nothing to merge in anyway)	20:54
	← EminenceHC left	20:54
	← sharkz left	20:54
	← gebjgd left	20:54
	← OnkelTem left	20:54
jumpman	locally, nothing. on the production server it is telling me that my arguments are ambiguous	20:55
	→ tpollard joined	20:55
	→ sharkz joined	20:55
	→ delinquentme joined	20:55
jumpman	hu	20:55
	h	20:55
	← HelloATMega left	20:55
jumpman	i can't find the feature branch from master at all is why	20:55
	er, s/from master/on the production server/	20:56
	→ kpease_ joined	20:56
_ikke_	has it even been pushed?	20:56
jumpman	certainly, several times, and likely merged into master several times	20:56
	← kpease left	20:56
_ikke_	Are you looking at the correct repository? (repositories you push to are usually bare repositories)	20:57
	← mellernoia left	20:57
	← GinoMan left	20:57
	← hobodave left	20:57
	← mr-kyd left	20:58
jumpman	uhmmm I don't know?	20:58
	→ HelloATMega joined	20:58
jumpman	i haven't really changed anything myself	20:58
	← cdown_ left	20:59
	← StuartMI left	20:59
	← mekhami left	20:59
	← baweaver left	20:59
jumpman	as far as i can tell, there's only one git repository?	20:59
	when I use git status on prod I get: HEAD detached from release-v1.3.7	20:59
	← thierryp left	21:00
jumpman	release-v1.3.7 being a tag	21:00
	← codetroll left	21:01
	← apdapreturns left	21:01
	→ cdown joined	21:01
	→ zumba_addict joined	21:02
	→ pm90_ joined	21:02
	← pm90_ left	21:02
	→ Alienpruts joined	21:02
	← cdown left	21:02
	← jamesbdev left	21:02
	→ pm90_ joined	21:02
	→ apdapreturns joined	21:03
	→ Consuela joined	21:03
	→ gfixler joined	21:03
	apdapreturns → Guest43118	21:03
	→ hobodave joined	21:03
	← zumba_addict left	21:03
	← hobodave left	21:03
	→ hobodave joined	21:03
	→ beneggett joined	21:03
	→ cdown joined	21:03
	→ jamesbdev joined	21:04
	← stickperson left	21:04
	→ zumba_addict joined	21:05
	→ tomnor joined	21:05
	← rnsanchez left	21:05
	← nettoweb left	21:05
	→ nettoweb joined	21:06
	← jtPretzel80 left	21:06
	← robzilla left	21:06
	← jwhisnant left	21:06
	← zadock left	21:07
iv4nnunes	In a context of "delivery/integration" continuous. Should I use a repository for applications and other repository for database schema?	21:07
	← tomnor left	21:08
	→ obee joined	21:08
	← groton left	21:09
	→ secrettriangle joined	21:10
secrettriangle	Hey, why is my git cloning with \r\n?	21:10
	← pobivan_ left	21:11
	← Pyoo left	21:11
	← ThomasLocke left	21:11
	← zumba_addict left	21:13
	→ Lovich joined	21:13
bremner	!line-endings	21:14
gitinfo	[!crlf] to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/	21:14
	→ lsiv568 joined	21:16
	→ zumba_addict joined	21:18
	← zumba_addict left	21:18
	← obee left	21:18
	← a-l-e left	21:18
	→ circ-user-jdqwJ joined	21:18
	← tier left	21:18
Eugene	qsuscs - s/broken/nonexistant	21:20
	And link	21:20
	→ gunnaro_ joined	21:20
	← Tuna-Fish left	21:20
	→ ascarter joined	21:21
qsuscs	Eugene: to my config? give me a link to the repo :>	21:21
	← metts left	21:21
Eugene	I haven't bothered commiting it	21:21
	Got distracted with work and stuff	21:21
	I'd commit it now, but technically I'm on the clock	21:22
	← circ-user-jdqwJ_ left	21:22
	→ jaznow_ joined	21:22
	← gunnaro left	21:22
	← cocodys_ left	21:22
	→ Uoen joined	21:22
	→ akushner_ joined	21:22
	← ranchodev left	21:23
	← BytesAndCoffee left	21:24
	→ yazdmich joined	21:25
	← cdown left	21:25
	← mizu_no_oto left	21:25
	← vixterra left	21:26
	← Henryabcd left	21:26
	→ Henryabcd joined	21:27
secrettriangle	bremner: except I'm on OSX	21:27
	← arez left	21:27
	← Ancchi left	21:27
	← anchorite left	21:28
	→ lrvick joined	21:28
	← lqi left	21:29
	← beneggett left	21:29
	→ baweaver joined	21:30
	→ bannakaffalatta joined	21:30
	yazdmich → BytesAndCoffee	21:30
	→ skylite_ joined	21:30
	← hobodave left	21:30
	→ zumba_addict joined	21:30
	← zumba_addict left	21:30
	← LBV_User left	21:31
	→ cdown joined	21:31
	← sharkz left	21:31
	→ Tuna-Fish joined	21:31
	→ Mannequin joined	21:31
	← skylite left	21:32
	← tmz left	21:32
	← denete left	21:32
	→ tmz joined	21:32
	→ sharkz joined	21:32
	→ skylite joined	21:33
	← nisseni left	21:33
	← aswen left	21:34
	→ zumba_addict joined	21:35
	← skylite_ left	21:36
	← freestyl3r left	21:36
	← baweaver left	21:36
	← martinbmadsen left	21:36
	← jerius left	21:38
	← Asiajey left	21:38
jfive	hello all	21:40
	i'm having a really weird issue atm	21:40
	i've made changes to a file, in this case header.php	21:41
	but "git status" says everything's up to date	21:41
	← Henryabcd left	21:42
Korvin	jfive is that file tracked?	21:42
jfive	it was before... how could i check?	21:42
Korvin	you could make a change to it and see if git status reports it :)	21:43
jfive	i see it in github and it has the line i've deleted there in header.php	21:43
Korvin	what?	21:43
jfive	i've tried that haha	21:43
	← skylite left	21:43
Korvin	if the changes are on github, then what would you expect git status to say?	21:43
jfive	i'm just trying to remove one line, a <script> tag in <head>	21:43
	no the line i am trying to remove shows in github	21:43
	so the file must be tracked, was all i was sayin	21:44
	← phantombeta left	21:44
jfive	how could i determine if i'm working with a detached head?	21:44
Korvin	so you remove the line and run git status, can you paste the full output of that command?	21:44
	→ pm90__ joined	21:44
	→ hobodave joined	21:44
Korvin	jfive, if your HEAD is not a branch, you're detached	21:44
	← pm90__ left	21:44
qsuscs	… which git status also reports	21:44
jfive	http://hastebin.com/vopesujife.vbs	21:45
Korvin	jfive, I'd make sure that you're actually making the changes to the correct root.	21:45
	→ pm90__ joined	21:45
Korvin	jfive, that shows you haven't made changes	21:45
	← sgen_ left	21:45
jfive	exactly, but i have in fact made changes	21:45
Korvin	are you certain that it's the correct root?	21:45
	edit the file through the terminal	21:46
	→ otter768 joined	21:46
Korvin	see if it's really editied	21:46
	edited*	21:46
jfive	ahhhh cr$p	21:46
	you're right	21:46
	i'm editing the wrong project =/	21:46
	thanks man haha	21:46
	jfive kicks himself	21:46
Korvin	:D	21:46
	that's how it goes	21:46
	git status is very informative, I've never seen it say things are okay when they arent	21:46
	→ phantombeta joined	21:47
	← jaznow_ left	21:47
	→ vreo joined	21:47
jfive	yeah i'd never seen that either thats why i was like wth	21:47
	← ciampix left	21:48
	← pm90_ left	21:48
	← cdown left	21:49
	Briman → Briman\|off	21:50
deltab	I use git log filename to check whether a file is tracked	21:50
	→ whitby joined	21:51
	← otter768 left	21:51
	← MasterPiece left	21:51
	← Mannequin left	21:51
	← vreo left	21:52
jfive	deltab: thanks i'll try that next time	21:52
	→ inad922 joined	21:52
inad922	Hi	21:52
	→ baweaver joined	21:53
	← King_Hual` left	21:53
	← sharkz left	21:53
	← _Atom_ left	21:53
	← hobodave left	21:53
	← Kicer86 left	21:53
	→ sharkz joined	21:53
inad922	If I managed to figure out who removed a row from a file with "git diff <old_commit_hash> HEAD <some_file_path>" how can I find with blame who removed that line?	21:53
	→ sbogg joined	21:54
	← zumba_addict left	21:56
	→ cdown joined	21:56
	← kpease_ left	21:56
kadoban	inad922: I think I'd use the pickaxe functionality of 'git log' look up -S -G and all of the --pickaxe-* stuff	21:56
	→ ejd_ joined	21:57
	kbni → AC\DC-GAMER	21:57
	→ kpease joined	21:57
inad922	kadoban: Yep, I found the -S suggestion for log on stackoverflow as well	21:57
	AC\DC-GAMER → kbni	21:57
inad922	That seem to work fine	21:57
	← lsiv568 left	21:58
	← secrettriangle left	21:58
	→ lsiv568 joined	21:58
kadoban	inad922: Hmm, 'git blame --reverse' might work too. I didn't know that existed, heh.	21:59
	← pantsman- left	21:59
	← hxm left	21:59
	← ejd left	21:59
	→ pingupingu joined	22:00
	← crose left	22:00
inad922	kadoban: Wow. That's so much better	22:00
	← cdown left	22:01
	→ saint_ joined	22:01
	← nezZario left	22:01
	→ hxm- joined	22:02
inad922	This is really good	22:02
	← hxm- left	22:02
	→ hxm- joined	22:02
	hxm- → hxm	22:02
	→ martinbmadsen joined	22:02
	← lsiv568 left	22:03
kadoban	Yeah, some cool stuff in here that I never use, heh.	22:03
	← blackwind_123 left	22:03
	← mdhopkins left	22:03
	← cjwilburn left	22:03
	← jonmorehouse left	22:03
	← Gama11_ left	22:03
	← Regency left	22:04
	→ zumba_addict joined	22:04
	→ lsiv568 joined	22:04
	→ blackwind_123 joined	22:04
	← zumba_addict left	22:04
	→ drfoo joined	22:04
	← lsiv568 left	22:05
	→ zumba_addict joined	22:06
	← nour left	22:06
	→ lsiv568 joined	22:06
	← berz3rk left	22:06
	← Neozonz\|Disc left	22:07
	← naftilos76 left	22:07
	← fstd left	22:07
	→ m_zr0 joined	22:07
	← Nizumzen left	22:07
	← Zupoman left	22:07
	← zumba_addict left	22:07
	← macabre left	22:07
	← Dougie187 left	22:08
	← saint_ left	22:08
	→ goldstar_ joined	22:09
	→ _Atom_ joined	22:09
	→ zumba_addict joined	22:09
	→ opdavies joined	22:09
	← zumba_addict left	22:09
	← ncd\|leeN left	22:10
	→ Lancien joined	22:10
	→ zumba_addict joined	22:10
	← zumba_addict left	22:10
	← _Atom_ left	22:10
	← Alienpruts left	22:10
	← lsiv568 left	22:11
	← nettoweb left	22:11
	← Hestil left	22:13
	→ zadock joined	22:16
	→ jgardella joined	22:17
	Briman\|off → Briman	22:17
	← iv4nnunes left	22:18
	→ nilg joined	22:20
	→ s8321414 joined	22:20
	← modocache left	22:20
	← baweaver left	22:21
	← bronson left	22:22
	→ ottanta joined	22:22
	← Trow left	22:22
	← Lancien left	22:23
	→ baweaver joined	22:24
	← nfk left	22:25
	→ _Atom_ joined	22:26
	→ ParsectiX joined	22:26
	← johtso_ left	22:26
	← moei left	22:26
	→ johtso_ joined	22:26
	→ cavallari joined	22:28
	→ Lancien_ joined	22:28
	→ Lancien joined	22:28
	← Lancien_ left	22:28
	→ modocache joined	22:29
	← modocache left	22:29
	→ neonKow joined	22:29
	→ maletor joined	22:29
	→ modocache joined	22:29
	← baweaver left	22:30
	← PeterBooker left	22:31
	← Pr0Wolf29 left	22:31
	→ zumba_addict joined	22:33
	← mattcen left	22:33
	← Spacew00t left	22:33
	← the_cybersphinx left	22:33
	→ mattcen joined	22:34
	→ Noldorin joined	22:35
	← mafrasi2 left	22:35
	← joetam left	22:36
	→ moei joined	22:36
	→ reaverb joined	22:37
	← zacts left	22:37
	← cbonobo left	22:38
	← pm90__ left	22:38
	→ iamjarvo joined	22:38
	→ baweaver joined	22:38
	→ cbonobo joined	22:38
	← iamjarvo left	22:38
	→ EminenceHC joined	22:39
	→ _2_ joined	22:39
	← steele_ left	22:39
	← mattcen left	22:39
	→ iamjarvo joined	22:39
ottanta	so, in man git-config under branch.<name>.merge it makes no reference to the syntax which eventually results in things like /refs/heads/master	22:39
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	22:39
	← Tuna-Fish left	22:41
	→ Prke joined	22:41
	← Takle left	22:41
	← cbonobo left	22:42
	← smccully left	22:43
	→ stickperson joined	22:43
	← codejunky left	22:43
	← Uoen left	22:43
	← EminenceHC left	22:43
	← stickperson left	22:43
	→ codejunky joined	22:44
	← zumba_addict left	22:44
	← _2_ left	22:45
	← bannakaffalatta left	22:45
	→ nettoweb joined	22:46
	→ Cust0sL1men joined	22:46
	→ web joined	22:46
	← thevishy left	22:46
	→ Gitzilla joined	22:47
	→ AustinTheGrey joined	22:48
	← CustosL1m3n left	22:50
	← szymek left	22:50
	← soman left	22:50
	gitinfo set mode: +v	22:51
web	I have a branch that I am cloning but my submodule information isn't. Am I using it incorrectly? git clone https://github.com/BClark-Grad-Project/site-template.git --branch gradproject --single-branch gradproject && cd gradproject && git submodule update --init --recursive	22:51
	← sburgess left	22:52
	→ Tuna-Fish joined	22:52
	Briman → Briman\|off	22:52
ottanta	single-branch doesn't take an arg	22:53
	→ hellome joined	22:53
web	that isn't an arg thats a directory	22:53
	→ mattcen joined	22:54
	← Goopyo left	22:54
ottanta	oh ok	22:54
web	ottanta: you are talking about the gradproject after it correct	22:54
ottanta	yeah that makes sense	22:55
	← Thorax15 left	22:55
web	the branch folder is showing in github. Is this a service issue maybe	22:55
ottanta	your submodules aren't in your git config, are you sure you added them	22:57
	'branch folder'?	22:57
	← Guest43118 left	22:57
	Briman\|off → Briman	22:57
web	hmm. MAybe not I thought I did	22:57
	→ zumba_addict joined	22:57
	→ bronson joined	22:57
web	first time doing submodules	22:57
	→ zumba_ad_ joined	22:59
	← odin22 left	22:59
	→ joetam joined	22:59
	← danguafer left	23:01
	→ fstd joined	23:01
web	ottanta: wouldn't this be adding it: git submodule add -b gradproject https://github.com/BClark-Grad-Project/site-template.git local && git commit -m "Added" && git push origin gradproject	23:01
	→ geomyidae_ joined	23:01
web	oops left out the git add .	23:01
	but it was there	23:01
	← Granitosaurus left	23:02
	← zumba_addict left	23:02
web	git submodule add -b gradproject https://github.com/BClark-Grad-Project/site-template.git local && git add . && git commit -m "Added" && git push origin gradproject	23:02
	maybe I am missing a step	23:02
	← nettoweb left	23:02
	← baweaver left	23:03
	→ baweaver joined	23:04
	← jerematic left	23:04
	← phoenixz left	23:04
	← baweaver left	23:05
	→ baweaver joined	23:05
	→ blubberbop joined	23:07
	← zumba_ad_ left	23:07
	← chitopunk left	23:07
	→ zumba_addict joined	23:08
	→ MarkyC_ joined	23:09
	← baweaver left	23:10
	← daftano left	23:11
	→ baweaver joined	23:11
	← MarkyC left	23:11
	→ tmager joined	23:12
	← tmager left	23:12
web	Am i doing something wrong when I add my submodule from branch: git submodule add -b gradproject https://github.com/BClark-Grad-Project/site-template.git local && git add . && git commit -m "Added" && git push origin gradproject	23:12
	← KennyRayFL left	23:12
web	Because when I clone with submodule it doesn't work: git clone https://github.com/BClark-Grad-Project/site-template.git --branch gradproject --single-branch gradproject && cd gradproject && git submodule update --init --recursive	23:13
	← mikiones left	23:13
web	ask it a different way :)	23:13
	← baweaver left	23:15
	→ daftano joined	23:16
	→ endiruna joined	23:16
	→ ska joined	23:16
ska	Im working on a feature branch.. I've messed up the remote branch, but I was able to rewind my local branch correctly. Can I remote my remote branch and push up my local again?	23:17
	← nilg left	23:17
ska	can one just delete the branch on github and push up the local again?	23:18
	→ stickperson joined	23:18
qsuscs	ska: !force_push !rewrite	23:18
gitinfo	ska: If you need to overwrite the history of a remote git repository (very bad idea, see !rewrite), you can do so with `git push -f`. Note the remote server may reject this. See man git-config and search for receive.denyNonFastForwards. Best practice is for upstream servers to denyNonFastForwards.	23:18
	ska: 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	23:18
ottanta	git push origin --delete <branch>	23:18
	qsuscs's suggestion is probably better	23:19
	← hexagoxel left	23:19
	← ascarter left	23:19
	← f3lp left	23:19
	→ hexagoxel joined	23:19
ska	Its a small branch that I control, nobody else is branching from it.	23:19
	← morois left	23:20
web	okay give on using submodule. This seemed straight forward but it aint working.	23:20
	→ ascarter joined	23:21
	→ shpoont joined	23:22
	← bluesm left	23:23
	→ madewokherd joined	23:24
	← bronson left	23:24
	← Arsonide left	23:25
web	oh boy I need to pull away can't believe I was pulling the wrong repo	23:27
	I am starting to make stupied overlooks	23:28
	yeah submodules, yeah nap!	23:28
	← joetam left	23:29
	web slaps the back of his head since he is his own boss	23:29
	→ the_cybersphinx joined	23:30
	← ghostpl_ left	23:30
	← modocache left	23:30
	← opdavies left	23:31
	→ modocache joined	23:31
	← knownasilya left	23:31
	→ f3lp joined	23:32
	← MarkyC_ left	23:34
	← _Cyclone_ left	23:34
delinquentme	how do: remove single commit from history ?	23:36
deltab	is it the most recent one?	23:36
	if so, git reset HEAD^	23:37
	→ bronson joined	23:38
	← ascarter left	23:39
	← iamjarvo left	23:39
	→ steele joined	23:39
	← FreezingCold left	23:39
	→ MarkyC joined	23:40
	→ cdown joined	23:40
	→ lvegerano joined	23:40
	→ ottanta_ joined	23:41
	← lvegerano left	23:42
	← aartist left	23:42
	→ hmmmm joined	23:43
	← ErKa left	23:43
	← GoddeR left	23:43
	→ ehmatthes joined	23:44
hmmmm	hi i have this odd problem with tabs	23:44
	i just migrated to a new installation and i copied over my git repositories just fine	23:45
	now when I go to edit some files with a different text editor, tabs are showing up as spaces in git diff	23:45
	however!! this is where it gets interesting	23:45
	← cdown left	23:45
hmmmm	i compared both versions of the file in a hex editor and there is literally no difference, they're both the same \x09 character	23:45
	has anybody experienced an issue like this and might know what it's caused by?	23:46
	← steele left	23:46
	→ The_Phoenix joined	23:46
	→ otter768 joined	23:46
hmmmm	I guess what I should ask is if there's a way to show a git binary diff	23:47
delinquentme	deltab:nah I have one thats 4 commits back	23:47
	← akiva left	23:48
	← ottanta_ left	23:48
	← AaronMT left	23:48
delinquentme	git rebase --onto <commit-id>^ <commit-id> HEAD	23:48
	?	23:48
	→ baweaver joined	23:48
	← livingstn left	23:49
	← axs221 left	23:49
	→ tier joined	23:50
	→ opdavies joined	23:50
deltab	hmmmm: how do you mean "showing up as spaces"?	23:51
	← Trudko_ left	23:51
	← otter768 left	23:51
deltab	delinquentme: do you want to remove the change that commit made?	23:51
	← relipse left	23:51
deltab	or make the change part of another commit?	23:52
	← Prke left	23:52
	→ CheckDavid joined	23:52
	→ ghostpl_ joined	23:53
	→ ottanta_ joined	23:53
	→ Gizburdt joined	23:53
	→ ica joined	23:54
hmmmm	deltab, maybe this helps illustrate it better: http://s15.postimg.org/r202ju4kb/snapshot1.png	23:55
	← boombatower left	23:55
	← mingwandroid left	23:55
	→ brandon joined	23:56
	brandon → Guest58519	23:56
	← ica left	23:56
	← ParsectiX left	23:56
	→ iamjarvo joined	23:56
	→ lsiv568 joined	23:57
	← iamjarvo left	23:57
	→ toothrot joined	23:57
	→ iamjarvo joined	23:57
	→ pvoho joined	23:57
	← pvoho left	23:57
	← Gizburdt left	23:57
	← ghostpl_ left	23:58
	→ uog joined	23:58
	← uog left	23:59

Logs Search ←Prev date Next date→

Channels Documentation