IRCloggy #git 2016-12-28

Provider of IRC logs since 2005.

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

	2016-12-28
martinjlowm	rizonz: say, merge x commits into one. Could be a number of commits on a feature branch that you want to merge or rebase onto the production branch	00:00
kadoban	dshap: Might be .git/objects/pack/ though IIRC they're much less easily edited/seen in there. I don't recall the format.	00:01
martinjlowm	instead of having many small commits that describe a subset of a larger change, you can squash them into one commit describing all the changes in detail	00:01
	← Rodya_ left	00:01
dshap	kadoban: roger that. thx!	00:01
	→ bronson joined	00:01
	← tyreld left	00:02
	← Sasazuka left	00:03
rizonz	martinjlowm: yap, but I need to look more into branches, now I mostly let my app update it;s code from trunk when using SVN but I think I can use versions/branches now	00:03
	I deploy my app from my repos	00:03
	← howitdo left	00:04
	→ psyb0t joined	00:04
	→ cdown joined	00:04
	→ Sasazuka joined	00:05
martinjlowm	sure :)	00:05
rizonz	martinjlowm: some people think it's stupid but I think it's ideal!	00:05
	why have some deploy management when git or SVN could do as well	00:06
	→ Noldorin joined	00:06
	← bronson left	00:06
	→ toothe joined	00:06
	→ jimi_ joined	00:07
toothe	are there any extensions I can add to my shell (ksh) to show what branch I am in?	00:07
	→ marcogmonteiro joined	00:07
	→ meadmoon joined	00:07
ertes	rizonz: good enough for simple scenarios, but it's not necessarily ideal if you have dependencies, target-specific peculiarities, parametric deployment, etc.	00:07
	← Schrostfutz left	00:07
	← meadmoon left	00:07
	← finalbeta left	00:10
	← GavinMagnus left	00:10
	→ joki joined	00:10
	← Emperor_Earth left	00:10
martinjlowm	toothe: are you forced to use ksh?	00:10
rizonz	ertes: how so ? I use pull it using puppet and go from there	00:11
	done	00:11
	→ howitdo joined	00:11
ertes	rizonz: ok then; i thought you use only git =)	00:11
rizonz	ertes: no!	00:11
	haha	00:11
	sorrry	00:11
	I can't manage 300 servers without foreman/puppet	00:12
	← tmsmith left	00:13
martinjlowm	toothe: otherwise, there are plenty of options for zsh	00:13
	→ rtm1046 joined	00:13
martinjlowm	maybe liquidprompt works for ksh, I'm not sure though. You can check that out	00:14
	← marcogmonteiro left	00:15
	→ askb joined	00:16
toothe	no, I am not.	00:16
	I just happened to be using it on FreeBSD. I could always switch to bash.	00:16
	→ kyan joined	00:16
	← metachr0n left	00:17
	→ metachr0n joined	00:17
martinjlowm	okay, at least, liquidprompt works for bash. You can see how it looks on its github page	00:18
toothe	what are the options?	00:18
	oh, liquidprompt.	00:19
	okay!	00:19
	thank you	00:19
	← t0by left	00:19
	← rivarun left	00:20
	→ rivarun joined	00:20
	→ musicmatze1 joined	00:21
	← Guest98878 left	00:22
	← BSAlb left	00:22
	→ BSaboia joined	00:22
	→ Padawan joined	00:23
	→ dsdeiz joined	00:25
	← dsdeiz left	00:25
	→ dsdeiz joined	00:25
	→ nuck joined	00:25
	→ Rodya_ joined	00:25
	← cyrus_mc left	00:26
dshap	Hmm, does anyone know -- I used the BFG repo cleaner to remove all traces of a file and I pushed to Github per the instructions, but now I'm trying to see how a copy of that file could still be accessed via the read-only pull request refs that Github maintains. I tried checking out an old pull request, back when the (now deleted) file existed, but it's not showing up. Does that file actually have to be modified in the pull request for this issue	00:26
	apply?	00:26
	→ austin987 joined	00:27
bakers	dshap, What are you trying to do? Remove all traces a file existed in the repo?	00:28
	I had to do that once (had passwords in a file)... fixing the repo locally by doing a rebase, and then a git push --force worked for me	00:28
dshap	bakers: Yep, which I believe I did, but then I read about a caveat about these pull request refs and I'm trying to verify that it's an issue. I'm trying to verify that I have to contact Github support to delete my pull requests	00:28
	← dreiss left	00:28
dshap	bakers: since those refs are read-only	00:29
	→ tmsmith joined	00:29
bakers	Is this your repo, or a remote repo?	00:29
	Where do the pull requests live	00:29
	← dsdeiz left	00:30
	← dar123 left	00:31
dshap	pull requests live on Github	00:31
	it's a Github thing	00:31
	I'm chatting with someone in #github, which might be more appropriate for this	00:31
	← systemovich left	00:32
dshap	basically they are read-only refs	00:32
bakers	Ah ok... probably	00:32
	→ dirtyroshi joined	00:32
dshap	so once I use BFG locally, i can't push to them on my remote	00:32
	like i can with all other branches/refs	00:32
	→ watabou joined	00:32
	← tmsmith left	00:32
	← courrier left	00:33
	→ cqi joined	00:34
	→ tmsmith joined	00:34
	← Lyqyd left	00:35
	← Rodya_ left	00:39
	→ Lyqyd joined	00:39
	→ Sasazuka_ joined	00:39
	← Sasazuka_ left	00:39
	→ Rodya_ joined	00:39
	← fstd left	00:40
	→ fstd joined	00:40
	← Starky left	00:41
	← Sasazuka left	00:41
	→ dling` joined	00:42
	← Raed left	00:43
	← dling left	00:43
	← iamtakingiteasy left	00:43
	← esc left	00:43
	← rawtaz left	00:43
	→ Raed joined	00:43
	→ esc joined	00:43
	← kexmex left	00:43
	→ HelloShitty joined	00:44
	→ hramrach joined	00:44
	→ Spinkzeit joined	00:44
	→ iamtakingiteasy joined	00:44
	→ rawtaz joined	00:44
	→ quite joined	00:44
	→ denimsoft joined	00:45
	← jimi_ left	00:45
	→ nettoweb joined	00:46
	→ dreiss joined	00:47
	→ Isla_de_Muerte joined	00:50
	← nettoweb left	00:51
	← NwS left	00:52
Padawan	I have this local repo which has some submodules of github projects. Now, i need to make changes on one of these submodules, i can do that, but when i try to push my local to remote and clone it to another machine... the submodule doesnt get in, and i get errors. What am i missing	00:53
	← cdown left	00:54
	← theskillwithin left	00:54
	→ jimi_ joined	00:55
	← bakers left	00:55
	→ arescorpio joined	00:56
	← satbyy left	00:56
	→ AciD` joined	00:56
	← dreiss left	01:01
	→ bronson joined	01:02
	← NimeshNeema left	01:03
	→ Mathieu_Du joined	01:03
sbeller	Padawan: the superproject needs to have an updated pointer to the submodule, i.e. in the superproject: git add <submodule> (with the correct new sha1 checked out in the submodule)	01:06
	→ rwb joined	01:07
	← bronson left	01:07
	← Rodya_ left	01:09
	→ moei joined	01:09
	← shgysk8zer0 left	01:10
	← arescorpio left	01:15
	→ dodobrain joined	01:18
	→ dsdeiz joined	01:20
	← dsdeiz left	01:20
	→ dsdeiz joined	01:20
	→ Rodya_ joined	01:21
	→ endiruna joined	01:21
	→ dar123 joined	01:26
	→ theskillwithin joined	01:28
	← leeN left	01:29
	→ tmcmahon joined	01:29
	← WaReZ left	01:30
	← [log] left	01:30
	→ [log] joined	01:30
	→ nickabbey joined	01:32
	→ arescorpio joined	01:33
	← endiruna left	01:34
	→ endiruna joined	01:35
	→ a_thakur joined	01:37
	← nckpz left	01:38
	→ Sasazuka joined	01:38
	← joshszep left	01:39
	← endiruna left	01:40
	← a_thakur left	01:42
	→ a_thakur joined	01:43
	→ JamesBaxter joined	01:46
	→ fahadash joined	01:46
	← a_thakur left	01:48
	← aw1 left	01:56
	← YuGiOhJCJ left	01:59
	→ Sasazuka_ joined	02:00
	← Sasazuka left	02:00
	← joki left	02:03
	→ bronson joined	02:03
	← rtm1046 left	02:04
	← Lyqyd left	02:05
	← cagedwisdom left	02:06
	→ finalbeta joined	02:06
	← bronson left	02:08
	→ unreal_ joined	02:08
	→ aw1 joined	02:09
	← Sasazuka_ left	02:10
	← unreal left	02:11
	← manuelschneid3r left	02:11
	→ endiruna joined	02:12
	→ rtm1046 joined	02:12
	→ andrew710 joined	02:12
	← NeverDie left	02:13
	→ Rodya__ joined	02:14
	← rtm1046 left	02:15
	→ grumble joined	02:15
	← Rodya_ left	02:16
	→ NeverDie joined	02:17
	→ cagedwisdom joined	02:18
	← netj left	02:18
	→ netj joined	02:18
	← pks left	02:20
	← sdothum left	02:20
	→ pks joined	02:23
	→ muuse joined	02:23
	← tvw left	02:24
	→ sdothum joined	02:24
	← cyphase left	02:27
	← d^sh_ left	02:28
	→ manuelmrtz joined	02:29
	→ d^sh joined	02:29
	← looper left	02:30
	← metachr0n left	02:30
	← cqi left	02:30
	→ metachr0n joined	02:32
	→ cyphase joined	02:32
	→ looper joined	02:33
	← tmcmahon left	02:34
	→ jw4242 joined	02:35
	← endiruna left	02:36
	→ marlinc joined	02:37
	→ Vampire0 joined	02:40
	→ franks-reich joined	02:41
	← manuelmrtz left	02:41
	→ cqi joined	02:43
	← Vampire0_ left	02:43
	→ manuelmrtz joined	02:45
	← [0xAA] left	02:46
	← ilbot3 left	02:46
	← manuelmrtz left	02:48
	→ ilbot3 joined	02:48
	→ Goplat joined	02:52
	→ aavrug joined	02:52
	← looper left	02:53
ayjay_t	omg ntfs folders showing up as 0 bytes and giving me weird permissions, what do	02:54
	git no work	02:54
	← _rht left	02:56
	← moestevens left	02:58
	→ beecushm_ joined	03:02
	← beecushm_ left	03:02
	← NeverDie left	03:02
	→ moestevens joined	03:03
	← chachasmooth left	03:04
	→ bronson joined	03:04
	→ NeverDie joined	03:06
	→ chachasmooth joined	03:07
	← newbie1 left	03:07
	← crayon left	03:08
	← thiago left	03:08
	← bronson left	03:09
	← bannakaffalatta left	03:17
	← kyan left	03:19
	← justanotheruser left	03:21
	← jimi_ left	03:23
	→ unreal joined	03:26
	← tmsmith left	03:27
	← paws_ left	03:27
	→ Vortex35 joined	03:28
	← unreal_ left	03:29
	→ Nilesh_ joined	03:29
	→ fk joined	03:32
	← Vortex34 left	03:32
	← hexagoxel left	03:34
	→ justanotheruser joined	03:34
	→ jstimm joined	03:36
	← ayjay_t left	03:40
	→ ayjay_t joined	03:40
	→ hexagoxel joined	03:41
	→ raedah joined	03:41
raedah	I have serveral branches that each contain a patch I am submitting upstream as an individual pull request. How do I make a new branch that has the changes from all of my branches so that I can run it and test it?	03:42
	→ Lyqyd joined	03:43
phroa	man git-cherry-pick to copy each commit, then optionally squish them together with man git-rebase /INTERACTIVE	03:45
gitinfo	the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html	03:45
	the git-rebase manpage is available at http://jk.gs/git-rebase.html	03:45
	← cqi left	03:45
	← Noldorin left	03:46
	→ tmsmith joined	03:47
	← sunri5e left	03:50
	← justanotheruser left	03:51
	→ sunri5e joined	03:51
	→ Emperor_Earth joined	03:51
	→ a_thakur joined	03:54
	→ meloc joined	03:54
	→ ToBeCloud joined	03:54
	gitinfo set mode: +v	03:54
	→ mizu_no_oto joined	03:55
raedah	cool, thats working	03:57
	← denimsoft left	04:00
	→ denimsoft joined	04:00
	← robattila256 left	04:01
	← Rodya__ left	04:02
	→ looper joined	04:02
	← chachasmooth left	04:02
	→ bronson joined	04:05
	→ justanotheruser joined	04:05
	← Lyqyd left	04:05
	← Anja left	04:06
	→ rtm1046 joined	04:07
	→ chachasmooth joined	04:08
	→ nd joined	04:08
	← bronson left	04:10
raedah	how do I remove a cherry-pick I dont want anymore? delete a commit	04:10
	← nd_ left	04:11
	← [log] left	04:12
	→ [log] joined	04:12
raedah	delete the branch and start over maybe	04:13
	← tmsmith left	04:17
	← dsdeiz left	04:18
	→ fstd_ joined	04:18
	→ xall joined	04:18
	← cagedwisdom left	04:20
	← cyphase left	04:21
	← fstd left	04:22
	fstd_ → fstd	04:22
phroa	raedah: git rebase -i	04:23
	man git-rebase	04:23
gitinfo	the git-rebase manpage is available at http://jk.gs/git-rebase.html	04:23
	← dave0x6d left	04:23
	→ JanC_ joined	04:25
	→ nowhere_man joined	04:25
	← JanC left	04:25
	→ dsdeiz joined	04:25
	JanC_ → JanC	04:26
	→ cyphase joined	04:26
	→ dave0x6d joined	04:27
	← kulelu88 left	04:28
	← dsdeiz left	04:31
	← mizu_no_oto left	04:32
	→ fatalhalt joined	04:33
	← fatalhalt left	04:33
	← netj left	04:38
	→ netj joined	04:38
	→ subhojit777 joined	04:46
	← jw4242 left	04:47
	→ slash_ joined	04:48
	gitinfo set mode: +v	04:49
slash_	Hey guys, what would happen if I pull a feature branch1 to local, rebase feature branch2 on top of feature branch 2 and try to push it?	04:49
	← dshap left	04:49
slash_	*on top of feature branch 1	04:49
preaction	try to push it where?	04:49
	→ ayogi joined	04:50
kadoban	slash_: It's unclear what you're asking exactly, but ... not much interesting?	04:50
preaction	you'd have rewritten feature branch 2, causing it to have all new commits in it, which means if you pushed the old fb2 anywhere, you'd have to force-push the new fb2 there if you wanted to push it	04:50
slash_	preaction: I've never pushed fb2 previously. This is only on local.	04:51
preaction	then you'd push fb2	04:51
slash_	kadoban: I'm sorry if it's not interesting enough for you.	04:51
	preaction: Is that the recommended workflow if I had to work on top of an existing feature branch?	04:51
preaction	that isn't what kadoban meant, i'm sure.	04:52
kadoban	(it's not)	04:52
preaction	also, as far as i know, it's the only way to work "on top" of an existing feature branch, unless you meant merging the branches instead, at which point it's up to your team	04:52
	i prefer to keep a linear history, so i rebase often (and force-push often). other teams prefer to merge instead	04:53
slash_	kadoban: Sorry for the abrasiveness then :)	04:57
	preaction: I prefer linear history as well. So since I'd be working on fb2 alone, would what I've done currently work fine	04:58
kadoban	No worries, sorry for giving the wrong impression	04:58
preaction	i mean, if you want to know if you like how the history looks, use git log and look at the history	04:58
	consider using the --one-line and --graph options if you want to see if it's linear or not	04:58
	rebasing in this way will create a linear history, if that's what you're asking	05:00
slash_	I see a really long lie when I use --graph. That's linear? How would branched history look?	05:01
	← aarobc left	05:02
slash_	*line	05:02
	← dviola left	05:04
	← m0viefreak left	05:04
	→ bronson joined	05:06
	→ dreiss joined	05:09
	← bronson left	05:11
	→ duderonomy joined	05:11
	→ holodoc joined	05:12
	← Cabanossi left	05:13
	→ Cabanossi joined	05:14
holodoc	I remember being able to clone a git repo into a file and then unpack it on another location. Could anyone point me in the right direction what I might have used back then? I don't think it was git-archive.	05:14
	← slash_ left	05:14
kadoban	holodoc: Sounds like git bundle	05:15
holodoc	kadoban, Yes! git bundle!	05:16
kadoban	:)	05:16
holodoc	Can't believe I wasn't able to remember that effing name	05:17
kadoban	It doesn't get used too much, heh.	05:17
holodoc	Thanks kadoban!	05:17
kadoban	Though when you need it, it works great. Anytime.	05:17
holodoc	I need it to move a large repo	05:17
	And I don't have many other options to do it	05:17
	So I remembered using git bundle for that a long time ago	05:17
	← duderonomy left	05:19
	→ svm_invictvs joined	05:25
	→ duderonomy joined	05:26
	← nowhere_man left	05:27
	→ nowhere_man joined	05:27
	← howitdo left	05:28
	→ Mowgli joined	05:29
	← nickabbey left	05:29
	← nowhere_man left	05:31
	→ sbulage joined	05:32
	→ nowhere_man joined	05:32
	← armyriad left	05:32
	→ Limes_ joined	05:33
	← jason237 left	05:38
	→ bocaneri joined	05:38
	→ jon-mac joined	05:39
	← nowhere_man left	05:40
	→ nowhere_man joined	05:40
	→ shubhnik joined	05:44
	← Limes_ left	05:45
	← duderonomy left	05:46
	← doener left	05:50
	→ fatalhalt joined	05:53
	← fatalhalt left	05:53
	← nowhere_man left	05:53
	← [log] left	05:57
	→ [log] joined	05:57
	→ bannakaffalatta joined	05:59
	→ weckstrom joined	05:59
	← justanotheruser left	05:59
	→ zefferno joined	06:01
	← dreiss left	06:03
	← ToBeCloud left	06:06
	→ bronson joined	06:07
	← NeverDie left	06:07
	→ NeverDi__ joined	06:08
	→ ogny joined	06:10
	← bronson left	06:12
	→ justanotheruser joined	06:12
	→ duderonomy joined	06:12
	← arescorpio left	06:13
	→ BrianJ joined	06:15
	→ cagedwisdom joined	06:15
	→ cyan__ joined	06:19
	← sdothum left	06:20
	→ clemf joined	06:21
	← pks left	06:32
	→ pks joined	06:32
	← svm_invictvs left	06:33
	→ Tobarja joined	06:34
	→ freimatz joined	06:36
	→ overlord_tm joined	06:39
	← askb left	06:41
	→ DonqKonq joined	06:43
	← xall left	06:44
	→ wcpan joined	06:49
	← netj left	06:49
	→ netj joined	06:49
	← wcpan left	06:49
	→ wcpan joined	06:50
	→ ThomasLocke joined	06:53
	← ThomasLocke left	06:53
	→ ThomasLocke joined	06:53
	→ Ozymandy joined	06:53
	← cyan__ left	06:56
	← DonqKonq left	07:00
	→ dminuoso joined	07:01
	← dminuoso left	07:02
	→ dminuoso joined	07:02
dminuoso	Hi, I have some github repository that I want to fork for a small modification - however I don't want to be bothered to constantly pay attention to any commits from upstream.	07:02
kadoban	Why would you be bothered? I have several forks that I don't use for anything anymore, github doesn't seem to care.	07:03
dminuoso	kadoban: Because I still want updates as they come in.	07:03
	→ Sircle_ joined	07:04
Sircle_	Hi	07:04
	I had a working git with bitbucket. I just added my new gitlab remote by 'git remote add localOrigin Http://path/to/gitlab/localrepo.git'. I see commits in 'activity' page but none in tree/master page or commits/master or /project page. Why is that?	07:04
	I still see git instructions on the project page	07:04
dminuoso	kadoban: My dependency tool accepts github repositories, so if I specified by own fork I would not get upstream updates unless I merged them myself all the time. If I specified the upstream I would not get my own modification.	07:04
	← JamesBaxter left	07:05
kadoban	dminuoso: Then get upstream to take your change and maintain it, otherwise what you want doesn't sound possible, or sensible in the git model.	07:05
	← boombatower left	07:06
dminuoso	kadoban: That would be interesting - the change is a little extreme (I essentially castrate a library to mock out half of its features to dramatically speed things up) so Ill see how it goes.	07:06
	Haven't even considered sending the change upstream.	07:06
	→ bronson joined	07:08
	→ Anja joined	07:08
	Sircle_ snores	07:09
	→ basiclaser joined	07:10
	← Anja left	07:12
	← bronson left	07:13
	← Ozymandy left	07:14
	← snowkidind left	07:16
	← diogenese left	07:21
prawnzy	I'm oversimplifying but if the singularity happens and whole-body gene therapies become a thing you can reset to whatever you are now	07:23
	or when you iced your cells	07:23
	oops wrong channel	07:23
	← aavrug left	07:24
	← dirtyroshi left	07:24
	→ diogenese joined	07:24
ayogi	what's the difference between "git pull" and "git pull origin master"	07:25
	→ GT4066 joined	07:25
ayogi	what should be used to deploy in production master branch	07:25
	→ JeroenT joined	07:25
dminuoso	ayogi: git should not be used for deployment directly at all.	07:25
	It is not a deployment tool.	07:25
	!deploy	07:25
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:25
ayogi	dminuoso: i mean i am updating the code in the production	07:26
	how do i update code, i need to do pull?	07:26
dminuoso	ayogi: Again, it is not a deployment tool.	07:26
	← lacour left	07:27
kadoban	ayogi: Certainly anything that involves a pull into production code sounds insane.	07:27
dminuoso	ayogi: We are running a setup that for each deployment run checks out the entire application into a separate directory with a unique name, and then use symlinks to switch between releases.	07:27
kadoban	If this is a website for instance, that's just going to break things all the time ...	07:27
	← davideb left	07:27
dminuoso	We then keep the last 5 deployed versions around, allowing us to instantly roll back between versions.	07:27
	→ davideb joined	07:28
ayogi	dminuoso: okay. but for now please tell me what's the difference	07:28
	→ navidr joined	07:28
dminuoso	ayogi: You mean the difference between using a knife and scissors to cut paper? They are different things.	07:28
	← duderonomy left	07:29
ayogi	dminuoso: yeah, what's the difference and efficient	07:31
prawnzy	In the analogy one is better suited for the task, safer, much more efficient, more can go wrong with the other one	07:31
	not just efficiency	07:32
	if you don't care about the trade-offs and just want to cut paper, keep using the knife, but know the scissor exists and you should probably use it	07:32
dminuoso	ayogi: git is in no way designed to facilitate deployment. You will just get conflicts and issues. Just imagine at some point you decide to rewrite history for whatever reason.	07:32
	It is really easy to build a simplistic deployment tool around git.	07:32
	even if its a small bash script akin to what we do	07:32
	→ howitdo joined	07:34
	← howitdo left	07:34
	→ howitdo joined	07:34
ayogi	dminuoso: i can not find any difference between "git pull" and "git pull origin master" after reading: http://stackoverflow.com/questions/23953125/difference-between-git-pull-and-git-pull-origin-master	07:36
	if default is set	07:36
	→ skered joined	07:36
	→ aavrug joined	07:36
skered	Can git-format-patch generate a patch that isn't/won't be used for email submission or would that just be git-diff output?	07:37
	ex: can git-format-patch generate a patch minus the email headers. Bugzilla recognize git-format-match attachments as mbox files.	07:38
	→ Junior joined	07:38
skered	recognizes*	07:38
	→ duderonomy joined	07:40
	← a_thakur left	07:43
	→ xall joined	07:44
Sircle_	I had a working git with bitbucket. I just added my new gitlab remote by 'git remote add localOrigin Http://path/to/gitlab/localrepo.git'. I see commits in 'activity' page but none in tree/master page or commits/master or /project page. Why is that? I still see git instructions on the project page	07:46
	← duderonomy left	07:46
	← davideb left	07:46
	← freimatz left	07:48
	← dar123 left	07:50
	← dave0x6d left	07:53
	→ lu_zero joined	07:53
	→ Mannn joined	07:54
	← nidr0x left	07:55
	→ dave0x6d joined	07:56
	← lu_zero left	07:56
	→ lu_zero joined	07:57
	← lu_zero left	07:57
	→ lu_zero joined	07:57
	← theskillwithin left	07:57
	← Mannn left	07:58
	← clemf left	08:02
	→ a_thakur joined	08:02
	← somaReverse left	08:05
	→ bronson joined	08:09
	→ freimatz joined	08:10
	→ lordjancso joined	08:11
	← bronson left	08:13
	→ somaReverse joined	08:13
	← howitdo left	08:15
	→ PCatinean joined	08:15
	→ _rht joined	08:17
	→ nidr0x joined	08:17
grawity	skered: does that actually cause problems with bugzilla?	08:17
	the format happens to be the same as consumed by `git am`	08:17
	← shubhnik left	08:19
	→ sarbs joined	08:22
	→ Anja joined	08:22
	→ aidalgol joined	08:22
	← cagedwisdom left	08:26
	← Anja left	08:28
	→ Anja joined	08:29
	← Anja left	08:30
	← Goplat left	08:31
	→ shubhnik joined	08:31
	→ mattp_ joined	08:33
	→ Sadeukko joined	08:35
	→ cagedwisdom joined	08:40
	← aidalgol left	08:41
	← shubhnik left	08:42
	→ Balliad joined	08:45
	← Balliad left	08:45
	→ Panacea joined	08:45
	→ Balliad joined	08:45
	← Junior left	08:46
	→ SteffanW joined	08:46
	← overlord_tm left	08:48
	→ overlord_tm joined	08:49
skered	grawity: No, because you just change it to be a patch	08:50
	But I would suspect if it didn't have the email headers it would auto detech it as a patch.	08:50
	Just added extra step if you attach a patch when you create a bug	08:50
	→ Silox\| joined	08:51
	→ tvw joined	08:51
bremner	Sircle_: I guess you need to find a gitlab specific support channel/forum/mailing-list	08:51
skered	But if I could get that same output minus the headers via a simple flag to format-patch or via a .gitconfig alias I would use that instead of git-format-patch	08:52
	← Panacea left	08:53
	← ayjay_t left	08:54
	← xall left	08:54
	← LiMp^ left	09:00
	← fbwnd left	09:05
	→ NimeshNeema joined	09:05
	→ cqi joined	09:06
	→ LarArT joined	09:07
	→ jnavila_ joined	09:07
	→ clmsy joined	09:07
	← LarArT left	09:09
	→ bronson joined	09:09
	→ marcogmonteiro joined	09:14
	← bronson left	09:14
	→ robattila256 joined	09:17
	→ fbwnd joined	09:18
	→ t0by joined	09:18
	→ danslo joined	09:19
osse	skered: won't that be the same as git show?	09:26
	hmm, never mind. but i think a custom --format to git show/log is the way to go	09:26
	→ cartman joined	09:30
	← cartman left	09:32
	→ Macaveli joined	09:32
grawity	skered: but then the committer would need to do extra steps to copy the message/authorship/etc.	09:34
	→ jstein_ joined	09:38
	jstein_ → jstein	09:40
	→ Junior joined	09:41
	→ MrLawrence joined	09:42
skered	grawity: Well for this case I don't think it's git on the otherside.	09:43
	→ Panacea joined	09:43
skered	So losing the meta data isn't that big of a deal.	09:43
	I think I might bark up the bugzilla tree to see what can be done to understand a git-format-patch patch or better options during bug creation.	09:45
	→ ferr1 joined	09:45
	→ nisseni joined	09:47
	→ robotroll joined	09:51
anddam	I have a project remote called 'upstream' and a copy of mine at origin, 'git log upstream/master..master' shows only one log that means that if I push on upstream I'm only pushing that one commit, is that right?	09:52
	that's my understanding but I'm asking as double check since last time I messed up big time	09:53
	← Mowgli left	09:54
selckin	git push --dry-run	09:54
	gitk <copy paste hashes it shows>	09:54
	thats what it'll do	09:54
	← jnavila_ left	09:55
skered	osse: git show -u --format=full ...	09:55
	→ kurkale6ka joined	09:55
skered	Appears nice.	09:55
	→ jnavila_ joined	09:57
	→ YuGiOhJCJ joined	09:57
	← aw1 left	09:57
skered	I think with some shell scripting it could also generate directly to a file.	09:57
	It good I might have a alterative but I'd like to see if Bugzilla could better support format-patch output.	09:58
	We'll see what they have to say.	09:58
	→ cdown joined	09:58
skered	I'd guess the only argument might be that they can't tell the difference between an mbox file and a format-patch file.	09:59
	Only because they're the samethign.	10:00
	→ nettoweb joined	10:01
	→ cdown_ joined	10:01
	← cdown left	10:04
	cdown_ → cdown	10:04
	→ dubing joined	10:05
anddam	selckin: I see, what's 'gitk'?	10:07
	→ Jebs joined	10:07
	gitinfo set mode: +v	10:09
	gitinfo set mode: +v	10:09
Jebs	Hi ALl	10:09
gitinfo	Jebs: 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.	10:09
	→ chll_ joined	10:10
	→ bronson joined	10:10
	→ aw1 joined	10:11
	→ shiriru joined	10:14
	← Jebs left	10:14
	← jnavila_ left	10:15
	← bronson left	10:15
	← watabou left	10:16
	→ howitdo joined	10:16
	→ tojo joined	10:18
	← tojo left	10:18
	→ absence joined	10:22
	→ PtxDK joined	10:24
	← basiclaser left	10:24
absence	https://github.com/julien-truffaut/Monocle/tree/v1.3.2 <- this repo seems to have a tag called v1.3.2, but when i do git tag -l (after git fetch to get the latest changes), v1.3.2 isn't in the list, and i can't do git checkout v1.3.2 either. what could be wrong?	10:25
selckin	git fetch --tags	10:25
absence	selckin: ah, thanks. why was that necessary? it seems to have fetched all the other tags before i did that	10:26
selckin	afaik its not default to fetch them, can be configured	10:27
anddam	selckin: was gitk a typo?	10:29
absence	weird, i've never done anything explicitly to get tags, and yet i had most of them	10:29
	oh well, file under "yet another git mystery" :)	10:29
	← muuse left	10:29
selckin	i don't know	10:29
	← GT4066 left	10:31
mgedmin	the original git clone gets the tags that existed when you cloned, iirc	10:31
	wait, I'm overthinking this	10:32
	→ jnavila_ joined	10:32
mgedmin	"By default, any tag that points into the histories being fetched is also fetched"	10:32
	← Macaveli left	10:32
mgedmin	so, if v1.3.2 points to a commit that's not part of the master branch (assuming you fetched the master branch), it wouldn't get fetched	10:32
	→ Macaveli joined	10:33
	jnavila_ → jnavila__	10:33
	jnavila__ → jnavila	10:33
	→ dimi1947 joined	10:35
	→ acetakwas joined	10:36
	→ DieguezZ joined	10:40
	← nisseni left	10:41
	← a_thakur left	10:43
	→ a_thakur joined	10:43
watmm	Anyone know why a git merge might introduce special characters to filenames/paths that aren't decoded properly (e.g. German letters with umlauts being translated as '\220'), when the characters aren't visible on the source repository?	10:45
selckin	because the pc you're running the merge on can't handle them?	10:46
watmm	I can't find where they come from though, they don't appear to be intentional	10:48
	→ Jackneill joined	10:48
	→ Mowgli joined	10:50
	← bket left	10:55
	→ bket joined	10:58
	← d0nn1e left	11:00
	→ d0nn1e joined	11:02
	← JeroenT left	11:04
	← Atm0spher1c left	11:04
	→ JeroenT joined	11:04
	← rtm1046 left	11:04
	→ rtm1046 joined	11:06
	← msonntag left	11:06
	← bmahe left	11:07
	← rtm1046 left	11:08
	← JeroenT left	11:08
	→ DrRobotic joined	11:09
	→ oaao joined	11:11
	→ bronson joined	11:11
	← iamtakingiteasy left	11:14
	→ msonntag joined	11:14
	→ cmn_ joined	11:15
	← bronson left	11:16
	← Silox\| left	11:16
	← cmn_ left	11:18
	→ cmn_ joined	11:19
	← netj left	11:20
	→ netj joined	11:21
	→ davimore joined	11:24
	← dimi1947 left	11:24
	← g__k__ left	11:25
	← davimore__ left	11:25
	→ manuelschneid3r joined	11:26
	→ Greg364 joined	11:32
	← Panacea left	11:35
Seveas	which os are you on, and which filesystem is teh repo on?	11:36
	→ JeroenT joined	11:37
	← Greg364 left	11:38
Seveas	also, are these characters part of the path, or part of the output of git command?	11:38
	→ m0viefreak joined	11:39
	→ rahtgaz joined	11:39
	← fbwnd left	11:42
	→ ok91 joined	11:43
	→ leeN joined	11:43
	← cqi left	11:47
	cmn_ → cmn	11:48
	→ cmn_ joined	11:50
	→ ertesx joined	11:51
	→ xaa joined	11:52
absence	mgedmin: i guess that's it. useful to know, thanks!	11:53
	→ sostenuto joined	11:53
	← ertes left	11:54
	ertesx → ertes	11:54
	→ fbwnd joined	11:54
	← somaReverse left	11:55
	gitinfo set mode: +v	11:59
	← Tobarja left	11:59
Nitesh	I sent a patch using git send-mail and then another patch with the same Subject but a v2. i.e. the only difference between the subject lines of two patches was "v2". Still when I sent the second patch, it came in the mailing list as one below the other as if it were the same messages sent twice	11:59
	Not sure why this happened, also the subject lines came as same for both the patches in the mailing list. Am I missing something/doing something wrong	12:00
	→ kpraveen joined	12:01
	→ SwingShock joined	12:01
	→ thiago joined	12:01
	← JeroenT left	12:03
	← jnavila left	12:03
	→ pixaal joined	12:03
SwingShock	Hi. I was trying to get rid of a commit i did earlier and go back to the commit before it and set it as the master. I tried to use revert <commit> to that commit and i am now stuck at (master\|REVERTING). What can i do next ?	12:03
	→ rnsanchez joined	12:04
	← YuGiOhJCJ left	12:04
pixaal	hey all, i'm having a bit of trouble authenticating to github. trying to clone one of my repos gives a 'Permission denied (publickey)' error, even though i've added the contents of id_rsa.pub to github and doing 'ssh -T [email@hidden.address] shows "Hi <username>! You've successfully authenticated..."	12:05
	← Sadeukko left	12:05
	→ JeroenT joined	12:06
osse	pixaal: what is the URL you're trying to use=	12:06
pixaal	[email@hidden.address]	12:07
	→ MenoPiu joined	12:07
	← MenoPiu left	12:08
osse	pixaal: what does 'git config core.sshCommand' say?	12:08
	and env \| grep GIT	12:08
	→ maialino4 joined	12:08
	→ donught joined	12:08
maialino4	hey, how can I rebase commits with empty message?	12:08
	→ somaReverse joined	12:08
	← donught left	12:09
	→ donught joined	12:09
pixaal	osse, doesn't show anything, but neither does my other pc where it is working fine	12:09
osse	pixaal: does git clone https://github.com/gregzaal/Gaffer.git work ?	12:10
	and show the output of ''GIT_TRACE=1 git clone git@github...''	12:10
pixaal	probably, but i'd rather not have to type in my username & password every time	12:10
SwingShock	I learned to reset instead. It is risky but it worked for now. Bye.	12:10
	pixaal will try	12:11
	← SwingShock left	12:11
maialino4	osse: yep it works	12:11
pixaal	osse, https://hastebin.com/imelujatef.pas	12:12
	→ bronson joined	12:12
pixaal	cloning https does work	12:13
	← subhojit777 left	12:13
	← Jackneill left	12:14
	→ Jackneill_ joined	12:14
	← Nilesh_ left	12:14
	← kpraveen left	12:15
	← bronson left	12:17
osse	pixaal: well that looks suspicious	12:19
	← lordjancso left	12:19
osse	that thingy before git@	12:19
	nuke it from orbit	12:19
	← cmn_ left	12:20
pixaal	indeed	12:21
	but how	12:21
	→ JamesBaxter joined	12:22
osse	maybe you accidentially typed AltGr-Shift-Escape-ASpace-Ctrl as you were typing "git" then just used "up and enter" ever since	12:22
mgedmin	copy/paste error? one half of a UTF-8 sequence for NO-BREAK-SPACE?	12:22
pixaal	ahhhhh	12:22
	yes	12:22
	the old copypasta	12:23
mgedmin	which is \xC2\xA0 in UTF-8, but \xA0 in Latin-1	12:23
osse	but there is a regular space there too... otherwise he'd get "clone git@..." not a git command	12:23
	← sbulage left	12:23
pixaal	yes the must've been some encoding screwup with copy paste, thanks guys o/	12:24
	← somaReverse left	12:24
pixaal	working now	12:24
	strange that it didn't screw up the https too tho	12:24
	← aavrug left	12:26
osse	it can happen to the worst of us. my bet is a pebcak and that it has nothing to do with actual copy-pasting.	12:27
mgedmin	as a linux user, I forget that there are ways to input no-break spaces that do not involve copy-pasting	12:28
	← oskarkv left	12:28
osse	Alt-Space is one I think, at least in gnome. I usually change the keyboard layout to let Space produce a Space no matter what keys I may be pressing at the same time... The amount of time spent on fixing nbsp bugs in latex when typing $ ... GRRRR	12:29
grawity	alt-space is the system menu	12:29
	shift-space might be NBSP?	12:29
	I keep forgetting too	12:29
mgedmin	alt-space opens the window menu in gnome	12:30
osse	hmm, then it's AltGr-Space	12:30
	(I belong to the AltGr cult)	12:30
	← ok91 left	12:30
mgedmin	altgr-space is just plain space in my Lithuanian layout, but this is getting off topic and I'm sorry	12:30
grawity	osse: heathen	12:31
	grawity : Compose user	12:31
grawity	ahhh here it is	12:31
	there's a whole ton of Xkb options for it: https://i.imgur.com/j6dsfeG.png	12:31
osse	Anything an op wishes to discuss is on topic by definition!	12:32
	← Jackneill_ left	12:33
pixaal	i'm using git bash on windows. never really trusted copy-pasting with terminals on windows in general, but it's gotten better in win10	12:34
	→ uskerine joined	12:34
uskerine	hi, I am new to git. I have created my repo in bitbucket. I have installed SourceTree and succesfully see my new repo. I added my first source files to that repo and I can see them in SourceTree. I have "Staged" all them. Now what do I have to do?	12:36
selckin	commit	12:36
uskerine	selckin, I press commit and nothing happens	12:36
selckin	read some documentation	12:36
	!gui	12:37
gitinfo	Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.	12:37
	→ somaReverse joined	12:38
uskerine	I am asking about conceptual issues of git	12:38
	not about the gui	12:38
thiago	uskerine: once you stage, you commit	12:39
	or unstage	12:39
	after you commit, you can push. Or not.	12:39
selckin	which is the first thing any doc/tutorial will go over, you are trying to guess how it works from the gui	12:40
	← andrew710 left	12:40
	→ oskarkv joined	12:40
	→ andrew710 joined	12:41
uskerine	thanks thiago	12:43
	maialino4 → Makko_fR	12:43
uskerine	what does stage/unstage mean?	12:43
	→ ToBeCloud joined	12:43
	gitinfo set mode: +v	12:43
selckin	its not very efficient for us to type out the entire documetnation, read one and then come with specific questions	12:44
thiago	uskerine: to put them into the staging area for the next commit or to remove from it	12:44
uskerine	understood	12:45
osse	pixaal: I definitely suggest you use the mintty and not the regular cmd window thingy	12:45
	Padawan → Guest88813	12:46
	→ Padawan_ joined	12:46
	← JeroenT left	12:48
	← jeffreylevesque left	12:48
	← Guest88813 left	12:49
	← ojdo left	12:49
pixaal	osse, i use the git bash thing, not the normal cmd thing	12:51
	→ Panacea joined	12:52
	← Mowgli left	12:53
	→ OnceMe joined	12:54
OnceMe	hello, can someone help me with git?	12:54
	→ Muzer joined	12:54
OnceMe	Im not sure should I checkout new branch	12:54
mgedmin	I love mintty except it badly breaks python repl :'-(	12:54
OnceMe	because I just have cloned it from github	12:54
pixaal	git bash comes with some bash commands to, maybe from cygwin idk.	12:55
thiago	from cygwin, correct	12:55
	OnceMe: do you want to check out a new branch?	12:55
mgedmin	msys2 rather than cygwin these days, afaiu	12:55
OnceMe	I dont know	12:55
	← tvw left	12:56
	→ ojdo joined	12:56
OnceMe	thiago: I just want to push it	12:56
	→ JeroenT joined	12:56
OnceMe	but I cloned main git repo, and I have my branch on github which is under blah/tree/myusername	12:57
	so when I did git add . -A and git commit -m "m"	12:57
	I did git push origin myusername but it fails	12:57
	→ shams joined	12:57
	← JamesBaxter left	12:57
thiago	OnceMe: push what?	12:58
	ah	12:58
	you cloned from the main repo and that's where you've tried to push back to	12:58
	I assume you don't have the rights to do that	12:58
OnceMe	well I tried with git push origin myusername	12:59
	I guess it can push only to master, so I need to swtch branches if I'm right?	12:59
shams	how to bring changes in a file back?	12:59
thiago	you need to first git remote add -f personal [email@hidden.address]	12:59
	then you can do: git push perosnal master	12:59
	shams: explain more, please	12:59
OnceMe	thiago: I dont want to push on remote	12:59
	and I already have my tree, Im added into project	13:00
	basically I thikn I need to checkuot the branch	13:00
	I get non-fast forward thing	13:00
thiago	OnceMe: you don't need to change your local branch, but you can	13:00
shams	thiago, i changed a .c file then did git add,commit,now i want my file should be same as previous	13:00
	→ synthroid joined	13:01
thiago	you don't need to change branches to push to a different branch	13:01
	anyway, your problem is that your local copy is old and doesn't have the latest from upstream. Taht's the "non-fast-forward" thing (which you should have mentioned before).	13:01
	git pull again	13:01
	shams: do you want to remove the commit you've made?	13:01
	musicmatze1 → musicmatze	13:01
	← finalbeta left	13:02
thiago	shams: or do you want to just rollback the changes to the file? Temporarily or permanently?	13:02
shams	thiago, i created a patch but i don't want to send it	13:02
	→ finalbeta joined	13:02
OnceMe	thiago: didnt fix	13:02
shams	i want my .c file as previous	13:02
	← rwb left	13:02
shams	permanently	13:02
	thiago, are there two methods for doing this temp and permanent?	13:03
thiago	shams: yes	13:04
OnceMe	thiago: what to do?	13:04
thiago	shams: do you want to remove the commit from existence?	13:04
shams	yes	13:04
OnceMe	do I commit to my branch as git push origin/mybranchusername or?	13:04
thiago	OnceMe: obviously something you didn't tell me is not working properly.	13:04
	→ Jackneill joined	13:05
thiago	OnceMe: what is your local branch called?	13:05
OnceMe	how do I find that?	13:05
thiago	shams: have you pushed this commit anywhere other people can see?	13:05
	OnceMe: git branch	13:05
	← uskerine left	13:05
shams	thiago, no its in my local	13:05
OnceMe	onceme	13:06
thiago	shams: git reset --hard HEAD~	13:06
	shams: this will remove the current commit from existence	13:06
	shams: and remove any changes in the work tree	13:06
shams	thiago , and what about my .c file?	13:06
thiago	OnceMe: git push -u origin onceme:remotebranchname	13:06
	shams: what about it?	13:06
	shams: the reset --hard command will make your work tree look exactly like the commit second to last (which will be the last & current after the command)	13:07
	← andrew710 left	13:07
shams	thiago,this --reset command will also make my .c file as earlier?	13:08
thiago	shams: it will make all your files look like as they were in HEAD~	13:08
OnceMe	thiago: can we do it step by step	13:08
	so I clone: git clone https://git.com/.../blah.git	13:08
	cd blah	13:09
	I make change to one file, so how can I see all available remote branches?	13:09
thiago	OnceMe: git branch -r	13:09
shams	thiago, but when i type git status ,it says HEAD detached	13:09
thiago	shams: that's not the reset command. Something else did it.	13:09
	→ rtm1046 joined	13:09
OnceMe	thanks	13:09
	I know whats the issue	13:09
	I tried git push origin myusername when I needed git push origin/myusername	13:10
	← a_thakur left	13:10
thiago	OnceMe: that's not your issue	13:10
shams	thiago, yeah i did previously git checkout <commit_id>	13:10
OnceMe	thiago: maybe I need to switch to my branch first?	13:10
	how can I do that?	13:10
thiago	OnceMe: I know that because the second command is incorrect, therefore cannot be the solution	13:10
	OnceMe: git checkout otherbranchname	13:10
	shams: that does detaching	13:10
OnceMe	git checkout origin/myusername ?	13:11
thiago	shams: check out your regular branch first, then reset	13:11
	→ stamina joined	13:11
thiago	OnceMe: no, git checkout myusername	13:11
OnceMe	ok Im on it	13:11
	← rtm1046 left	13:11
OnceMe	now I make changes and then what? git add . -A ?	13:12
thiago	yes	13:12
shams	thiago, how do i bring back the head to commit_id?	13:12
OnceMe	and then git commit -m "All good"	13:13
thiago	shams: git reset --hard commit_id	13:13
OnceMe	and then git push origin myusername ?	13:13
thiago	shams: --hard will check out after bringing HEAD to commit_id	13:13
OnceMe	is that all good commands?	13:13
thiago	OnceMe: yes	13:13
	→ bronson joined	13:13
shams	thiago, i didn't get you	13:15
	← Isla_de_Muerte left	13:15
	← Makko_fR left	13:15
	← SteffanW left	13:18
	← bronson left	13:18
	→ CheckDavid joined	13:19
	→ mindfart joined	13:19
	← pixaal left	13:20
	→ SteffanW joined	13:22
	← shiriru left	13:24
	← SteffanW left	13:24
	→ SteffanW joined	13:25
	→ plos1 joined	13:25
	→ pixaal joined	13:25
shams	thiago, done	13:26
	thiago, one more question	13:27
	→ sdothum joined	13:29
shams	what is better to follow- to remove your commits permanently and do it again correctly or make you r changes in a file and do commit again without removing the previous commit in you local	13:30
	← pixaal left	13:30
	→ narendraj9 joined	13:32
	→ linuxdaemon joined	13:33
	← danslo left	13:34
	← JeroenT left	13:35
	→ JeroenT joined	13:35
	→ danslo joined	13:35
	→ jeffreylevesque joined	13:35
shams	thiago, which approach you used while contributing upstream?	13:36
	→ desertSniper87 joined	13:38
OnceMe	how can I avoid commiting/pushing .metadata dir changes in Eclipse from terminal?	13:38
grawity	remove the directory from the repo (git rm -rf --cached .metadata), add it to gitignore (echo .metadata >> .gitignore), then add&commit the .gitignore file	13:38
	→ troulouliou_div2 joined	13:39
OnceMe	so basically: echo ".metadata" > .gitignore && git add . -A && git commit -m "ok" && git push origin username?	13:40
grawity	assuming .metadata isn't yet tracked by the repo	13:42
OnceMe	it is	13:42
grawity	then untrack it using the command given above	13:43
	→ Jackneill_ joined	13:43
	→ masuberu joined	13:44
	← Jackneill left	13:44
	→ sobersabre joined	13:44
sobersabre	hi. is there some kind of version related change that happened and I missed it or is there a default config that changed in how git handles staged vs non-staged changes to a file ?	13:45
	← JeroenT left	13:45
sobersabre	I remember I could interactively add only selected changes to a file	13:45
	→ JeroenT joined	13:45
sobersabre	then commit, and the non-staged changes would remain unstaged and uncommitted.	13:45
grawity	you used `git add -p` or `git add -i` for that	13:45
Seveas	sobersabre: git add -p (or --interactive)	13:45
sobersabre	Seveas: I'm talking about how commit behaves...	13:45
	Something is weird	13:45
j416	sobersabre: what is weird, specifically?	13:46
grawity	commit always commits everything that is staged	13:46
Seveas	git commit -p :) (which is really add -p + commit)	13:46
grawity	well, you can tell it to commit specific files bypassing the staging area	13:46
	but I don't think you can do the same at -p level	13:46
	← _rht left	13:46
Seveas	correct, -p manipulates the index	13:46
	← leeN left	13:47
grawity	the whole idea of committing individual chunks seems to kinda require a staging area	13:47
sobersabre	j416: when I ran "git commit -s ." I did not see unstaged changes in a file.	13:48
	when I ran now "git commit -s", I saw only staged changes.	13:48
	so if I say git commit ., it takes all files not even staged?!	13:48
grawity	the former is a case of `git commit <file>`	13:48
	which bypasses the staging area	13:48
j416	^	13:48
sobersabre	grawity: I remember it used not to bypass.	13:48
	→ systemovich joined	13:48
grawity	I don't remember it having ever done so	13:48
Seveas	sobersabre: your memory is faulty.	13:49
grawity	in fact I think that always has been the whole point of this mode?	13:49
sobersabre	Seveas: I now understand what's the mystery, this is already a plus	13:49
	I am thinking I mentally remember this to work in the past.	13:49
j416	how can you remember something if not mentally?	13:49
sobersabre	maybe the change crawled up slowly, and I didn't notice.	13:49
	j416 ponders	13:49
sobersabre	I could record a session, or video, and remember having it, that is with a hard copy.	13:50
Seveas	j416: well, some people think with other parts than their brain :)	13:50
j416	Seveas: lol	13:50
sobersabre	Seveas: that too, aren't we all sometimes?	13:50
j416	sobersabre: fair point	13:50
	sobersabre: not Seveas.	13:50
	→ astrofog joined	13:50
sobersabre	j416: you can't think with what you don't have.	13:50
j416	sobersabre: Seveas is practically made out of brain tissue.	13:51
	j416 runs	13:51
sobersabre	j416: you made me this mental(again) image of a certains scene of "Starship Troopers". clearly made by a biased person...	13:52
Seveas	/nick Krang	13:52
sobersabre	:))))	13:52
j416	heh. I don't think I have seen that.	13:52
Seveas	I've only read starship troopers, never seen the movie	13:52
j416	or read it.	13:52
Seveas	I've heard the movie described as "so unlike the book, that's it's best described as 'being inspired by the cover of the book'"	13:53
osse	Seveas: is the book satirical and a bit black comedy-ish? The movie is like Robocop, basically. dark satire all the way	13:53
	→ wogi joined	13:53
Seveas	no	13:53
	→ rwb joined	13:54
osse	i remember thinking it was a bad movie when i was younger. but now i think i've missed much of the point. i need to watch it again	13:54
	so that I can grok it.	13:54
sobersabre	Seveas: starship troopers is one of the books I haven't read b/c the movie was too weird. Generally I do like Heinlein.	13:54
Seveas	Read the book	13:54
sobersabre	Seveas: +1 thanks.	13:55
	← acetakwas left	13:55
	← nettoweb left	13:56
osse	"While the original novel has been accused of promoting militarism, fascism and military rule, the film satirizes these concepts by featuring grandiose displays of nationalism as well as news reports that are intensely fascist, xenophobic, and propagandistic" this surely wooshed by my 15 year old head	13:57
	→ synthroi_ joined	13:58
grawity	osse: I wonder if nowadays it'd be written "...attempts to satirize these concepts by featuring grandiose displays of nationalism as well as news reports that are intensely fascist, xenophobic, and propagandistic, but falls short due to Poe's law"	13:59
	→ afuentes joined	13:59
osse	haha, could be	13:59
	→ SwingShock joined	14:00
osse	But Robocop still holds its ground, and it's the same director.	14:00
	→ leeN joined	14:00
	→ shinnya joined	14:01
	← synthroid left	14:01
SwingShock	When i opened the git folder with git gui after a long time since i been using bash the whole time, it shows there are lots of loose objects and it needs to be compressed to maintain optimal performance. Is this adivasable to do ?	14:01
osse	SwingShock: you can do it, but git usually does it by itself	14:02
SwingShock	can it be checked and done from time to time with git bash instead ?	14:02
	→ rnsanchez_ joined	14:04
Seveas	SwingShock: just run 'git gc'	14:05
	→ Asenar joined	14:06
SwingShock	That worked nice. It didn't ask any confirmations too.	14:06
osse	git runs git gc --auto by itself sometimes. that's usually more than enough	14:07
	when you see that message you mentioned that usually means git does it then and there	14:07
SwingShock	I had 320 loose objects.	14:07
	← rnsanchez left	14:07
osse	i think the automatic gc only kicks in after passing 5000	14:08
	→ acetakwas joined	14:08
	← Jackneill_ left	14:08
SwingShock	So it's really unnecessary to do. Then it was shown in git gui maybe due to it's lower check limit there.	14:09
	← cdown left	14:10
	← plos1 left	14:11
	← NeverDi__ left	14:11
	← Macaveli left	14:11
	→ Jackneill_ joined	14:11
	→ NeverDie joined	14:12
	→ khfeng_ joined	14:12
	→ cdg joined	14:13
	← cagedwisdom left	14:13
	← shams left	14:14
	→ bronson joined	14:14
	→ synthroid joined	14:14
	← SwingShock left	14:15
	→ HoierM joined	14:15
	← dubing left	14:16
	→ cdown joined	14:16
	→ plos1 joined	14:18
	← Jackneill_ left	14:18
	← synthroi_ left	14:18
	← bronson left	14:19
	← skered left	14:20
	← glebihan left	14:24
	→ dynamic joined	14:25
	← dynamic left	14:26
	→ pbrewczynski joined	14:26
	→ ShekharReddy joined	14:26
	→ glebihan joined	14:27
	← nidr0x left	14:27
	→ treehug88 joined	14:27
	→ Spascho joined	14:28
	→ al-damiri joined	14:28
	→ jimi_ joined	14:28
	→ nidr0x joined	14:28
	← Spascho left	14:29
	→ ExoUNX joined	14:29
	→ Jackneill_ joined	14:30
	← nidr0x left	14:30
	← cdg left	14:30
	→ AlineGomes joined	14:31
	→ nidr0x joined	14:31
	← cyphase left	14:32
	← cdown left	14:32
	→ relipse joined	14:33
	→ Es0teric joined	14:33
relipse	I deleted a whole directory, how do I tell git to restore all the deleted files "Not staged for commit"	14:33
	→ xall joined	14:34
	→ cyphase joined	14:36
	→ f3r70rr35f joined	14:36
	→ nowhere_man joined	14:37
	← wogi left	14:38
	← ShekharReddy left	14:39
	← ayogi left	14:39
systemovich	`git checkout -- directory/`	14:42
	← Panacea left	14:43
	→ denisMone joined	14:43
	← acetakwas left	14:45
	→ ac3takwas joined	14:45
	← glebihan left	14:45
	← sostenuto left	14:45
	→ sostenuto joined	14:45
	← ToBeCloud left	14:46
	→ glebihan joined	14:46
	← OnceMe left	14:47
	← zefferno left	14:47
	→ JamesBaxter joined	14:47
	← sostenuto left	14:47
	→ cdown joined	14:48
	→ sostenuto joined	14:48
	← denisMone left	14:48
	← denimsoft left	14:49
	→ Panacea joined	14:50
	→ delboy1978uk joined	14:50
delboy1978uk	hi everyone, some work got pushed to the wrong branch, and otrhers have since committed. whats the easiest way to remove a branch that was merged?	14:50
selckin	!revert_merge	14:51
gitinfo	[!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt	14:51
	→ sharpy joined	14:53
	→ ispn joined	14:54
	→ rtm1046 joined	14:55
	← Oatmeal left	14:56
	← rtm1046 left	14:57
	→ ThomasTang joined	14:58
	→ Lyqyd joined	14:58
	→ cfoch joined	14:59
cfoch	Hi. If I restore a file using "git checkout 45343^ -- path/to/file" and then I commit it, will blame tell that the author of all the lines was the previous original authors or I?	15:01
selckin	i	15:01
	← Padawan_ left	15:01
cfoch	selckin: is there a way to recover the file but keeping the original authors	15:02
	?	15:02
delboy1978uk	selckin: thanks very much for that, highly informative	15:02
	→ zefferno joined	15:02
	← ThomasTang left	15:03
selckin	cfoch: its generally not usefull to look at blame without context	15:03
delboy1978uk	cfoch: if you commit it, you ae now responsible.	15:03
	→ Rapture joined	15:03
selckin	delboy1978uk: no.	15:03
delboy1978uk	wont it show him in blame?	15:04
	→ ThomasTang joined	15:04
selckin	that does not make you responsible	15:04
delboy1978uk	hmm, could disagree with that. guess it depends on office protocol	15:05
selckin	if you rename a method, are you responsible for every usage of it?	15:05
delboy1978uk	theoretically though, if the code has your name on it..	15:05
selckin	the team owns the project	15:05
delboy1978uk	selckin: then you'd be responsible for line x	15:06
selckin	having code that is owned by a person is the biggest sign of a disfunctional org	15:06
	→ cdown_ joined	15:06
delboy1978uk	i totally get you	15:06
	→ newbie1 joined	15:06
	→ Noldorin joined	15:06
delboy1978uk	but git blame helps show who committed the code, then you can speak to team member x and ask why	15:06
	→ NeverDie_ joined	15:07
delboy1978uk	thats all my point is	15:07
selckin	and you look at the commit mesage and see "revert x", and blame the parent commit	15:07
	or "rename x"	15:07
	you know generally be a functional person	15:07
delboy1978uk	lol	15:07
cfoch	How can I revert an old file from a previous commit but keeping the authors for each line?	15:08
selckin	you can't	15:08
	← ThomasTang left	15:08
	← cdown left	15:08
	cdown_ → cdown	15:08
delboy1978uk	unless... could he rewind to a point where it was still in existance? then branch off, and cherry pick in the new stuff?	15:09
selckin	you can rewrite history to anything you want	15:09
delboy1978uk	then merge that in the branch that doesnt have the file?	15:09
	→ ThomasTang joined	15:09
delboy1978uk	wouldnt that keep the blame history?	15:09
selckin	if you rewrite history as if the commit never happened yes offcourse	15:10
	← NeverDie left	15:10
	→ aavrug joined	15:10
	← ferr1 left	15:12
	← ogny left	15:13
	→ ogny joined	15:14
	→ bronson joined	15:15
	← aavrug left	15:16
	← glebihan left	15:17
	→ glebihan joined	15:18
	← ogny left	15:19
	← bronson left	15:20
	→ dsdeiz joined	15:20
	→ aavrug joined	15:20
ertes	can't you revert deletes?	15:21
	← f3r70rr35f left	15:21
Seveas	anything you commit can be reverted	15:21
	→ synthroi_ joined	15:23
	→ shams joined	15:23
Seveas	cfoch, this may work, but is untested. Do it in a scratch copy of the repo and make sure you understand what the commands do before trying them: git checkout -b temp-branch last-commit-that-had-the-file; git checkout master -- .; git checkout HEAD -- path/to/file-to-restore; git commit -m "Restore path/to/file"; git checkout master; git merge temp-branch	15:24
	← algun left	15:24
	← danslo left	15:25
Seveas	i.e., create temporary branch at the point the file existed, then copy the contents of master into it, but keeping the deleted file, then merge that temporary branch into master.	15:25
	← synthroid left	15:25
	→ hashpuppy joined	15:25
	← delboy1978uk left	15:25
selckin	thats gonna be your name	15:26
	→ snowkidind joined	15:27
	← Jackneill_ left	15:27
Seveas	git reset --hard selckin	15:28
selckin	its gonna show what committer/author is when you commit in that flow	15:28
	your 5th command	15:28
	→ danslo joined	15:29
	← danslo left	15:29
	→ aavrug_ joined	15:31
Seveas	the commit we create changes all files (potentially). Except the one we're restoring, as it's been reset to the current contents	15:31
	so it shouldn't affect blame	15:31
	but as I said, it's untested. And I can't test it now as I need to run to a train :)	15:31
	← aavrug left	15:31
	← shinnya left	15:32
ertes	cfoch: perhaps reverting the commit that deleted the file could keep the authors	15:33
	← aavrug_ left	15:34
	→ nettoweb joined	15:38
	→ anonymuse joined	15:39
	→ YuGiOhJCJ joined	15:42
	← masuberu left	15:42
	← nettoweb left	15:44
	→ nettoweb joined	15:46
	→ Jackneill_ joined	15:46
	← narendraj9 left	15:48
	→ dviola joined	15:48
	→ cyan__ joined	15:48
	→ narendraj9 joined	15:49
	← stamina left	15:50
	← nettoweb left	15:51
	← shams left	15:51
	← ThomasTang left	15:51
	→ nettoweb1 joined	15:51
	← Shock- left	15:53
	→ shams joined	15:53
rts-sander	what do I do when a tag does not exist on a certain repository?	15:53
	← zefferno left	15:53
rts-sander	I pushed the tag, I pulled with fetch --tags but the tag is not there	15:54
	→ zefferno joined	15:54
	→ freimatz3 joined	15:55
	← narendraj9 left	15:55
grawity	check with `git ls-remote` whether it actually exists or not	15:56
	→ narendraj9 joined	15:56
rts-sander	it doesn't	15:56
	← JeroenT left	15:56
rts-sander	I removed a random tag and did git fetch --tags and it only retrieved that tag again	15:56
	→ subhojit777 joined	15:57
	→ Mowgli joined	15:58
	← synthroi_ left	15:58
	← nettoweb1 left	15:59
rts-sander	it's a problem with the remote, I got it	15:59
	← JamesBaxter left	15:59
grawity	well, if `git ls-remote` doesn't show it, then fetching isn't going to retrieve it either	15:59
	either you pushed it wrong, or the remote "forgot" it somehow	15:59
	maybe try pushing again, specifically to refs/tags/<thename>	16:00
	→ nettoweb joined	16:00
rts-sander	the remote points to a directory on the filesystem instead a server URI	16:00
grawity	shouldn't matter	16:00
	← ac3takwas left	16:00
rts-sander	why have a repository point to another repository on the filesystem that points to the actual server URI?	16:02
	→ jnavila joined	16:02
selckin	because thats what you did?	16:03
	← somaReverse left	16:03
	→ Cavallari joined	16:03
rts-sander	coworker, he's on vacation and I'm trying to reverse engineer his automatic deployment system because I broke it by force pushing	16:04
	but it's all good now	16:04
	→ Shock- joined	16:04
	← nowhere_man left	16:05
	← nettoweb left	16:05
grawity	sounds like !deploy recipe #4.2	16:06
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	16:06
	rnsanchez_ → rnsanchez	16:07
	→ a_thakur joined	16:07
	→ JamesBaxter joined	16:09
	→ adbjesus joined	16:10
	→ clemf joined	16:11
	← ThomasLocke left	16:11
	→ netcarver joined	16:11
	→ theskill_ joined	16:12
	→ nettoweb1 joined	16:12
	← m0viefreak left	16:12
	← nettoweb1 left	16:13
	← zefferno left	16:13
	→ shgysk8zer0 joined	16:15
	→ bronson joined	16:16
	← fbwnd left	16:16
	→ synthroid joined	16:18
	← Panacea left	16:19
	← plos1 left	16:20
	→ pcre joined	16:20
	← bronson left	16:21
	→ thebope joined	16:22
	→ Nerbrun joined	16:23
	← snowkidind left	16:25
	→ doener joined	16:25
	← a_thakur left	16:28
	← jnavila left	16:35
	→ jnavila joined	16:35
	→ Oatmeal joined	16:37
	← manuelschneid3r left	16:37
	← cdown left	16:38
	← astrofog left	16:38
	→ manuelschneid3r joined	16:39
	→ gtristan joined	16:39
	← Mowgli left	16:39
	→ Rr4sT joined	16:39
	→ dar123 joined	16:39
	→ snowkidind joined	16:40
	→ porsche944 joined	16:41
	← Balliad left	16:42
	→ shubhnik joined	16:43
	→ a_thakur joined	16:43
	← shgysk8zer0 left	16:43
	→ shgysk8zer0 joined	16:44
	← clmsy left	16:45
	← mmlb left	16:46
	← JamesBaxter left	16:51
	← Oatmeal left	16:52
	→ shgysk8zer0_ joined	16:53
	→ WayToDoor joined	16:53
	← dar123 left	16:53
RiPer	I have checked out a repo, updated a file, the push a pull request, but it is including 2 other commits that are not part of my edit. My branch and the branch I am pushing to are identical except for the single file I changed, thoughts on why it is including two other commits?	16:54
	checked out = forked oops	16:54
	← shgysk8zer0 left	16:54
	→ nicksloan joined	16:54
	→ cdown joined	16:55
	→ nowhere_man joined	16:55
	→ jccn joined	16:55
	← jccn left	16:56
	→ jccn joined	16:57
	← pks left	16:57
	→ zifnab joined	16:57
	← shubhnik left	16:57
	→ tmsmith joined	16:57
	→ pks joined	16:58
	→ svm_invictvs joined	16:58
	→ Darren_ joined	16:58
RiPer	ahh figured it out, I created a new branch with my commit, I have to merge to the branch I want to pull request with.	16:58
	← Rapture left	17:00
	← xall left	17:00
	→ mda1 joined	17:01
	← freimatz3 left	17:03
	→ freimatz3 joined	17:03
	→ xall joined	17:03
	← howitdo left	17:04
	→ sq-one joined	17:04
	← PCatinean left	17:04
	← jimi_ left	17:04
	← cyan__ left	17:05
	→ synthroi_ joined	17:05
	→ PCatinean joined	17:05
	← Sircle_ left	17:06
	→ HarryPothead joined	17:06
	← synthroid left	17:08
	→ Goplat joined	17:08
	← cdown left	17:08
	→ duderonomy joined	17:08
	→ shubhnik joined	17:09
	← duderonomy left	17:10
	→ howitdo joined	17:11
	→ boombatower joined	17:12
	← WayToDoor left	17:14
	→ slayerjain joined	17:14
	← meloc left	17:15
	→ meloc joined	17:15
	← narendraj9 left	17:15
	→ imachuchu joined	17:17
	→ bronson joined	17:17
	← Es0teric left	17:18
	→ cdown joined	17:19
	→ Rapture joined	17:19
	→ joki joined	17:20
	→ ResidentBiscuit joined	17:20
	→ Oebele joined	17:20
	← bronson left	17:21
	→ duderonomy joined	17:23
	→ Guest14887 joined	17:23
	← xall left	17:24
	→ sea-gull_ joined	17:25
	→ algun joined	17:26
	← mda1 left	17:27
	→ ac3takwas joined	17:27
	→ JanC_ joined	17:27
	→ Macaveli joined	17:28
	← jnavila left	17:28
	← a_thakur left	17:28
	JanC → Guest83509	17:28
	← Guest83509 left	17:28
	JanC_ → JanC	17:28
	→ prestorium joined	17:29
prestorium	I thought it would be worth to share	17:30
	A developer just did a merge of repo A into repo B.	17:30
	I was speechless	17:30
	→ xall joined	17:30
prestorium	I have absolutely no idea how he achieved that. :)	17:30
	fstd → fisted	17:30
prestorium	and I'm afraid to known	17:31
	→ a_thakur joined	17:31
	← kurkale6ka left	17:32
maxb	It's not that unusual	17:34
	← tmsmith left	17:34
grawity	probably just did `git pull <wrong_url>`	17:34
	Git only recently added a warning about that	17:34
maxb	Entirely reasonable if two projects merge into a single repo	17:34
	fisted → fstd	17:35
	→ Macaveli_ joined	17:35
	fstd → ftsd	17:35
	→ Torsho_ joined	17:35
	→ synthroid joined	17:36
	← shgysk8zer0_ left	17:36
	← duderonomy left	17:37
	← Macaveli left	17:37
	ftsd → fstd	17:38
	← synthroi_ left	17:38
	← Macaveli_ left	17:38
	← adbjesus left	17:39
	← desertSniper87 left	17:40
	← ResidentBiscuit left	17:41
	← synthroid left	17:46
	→ kyan joined	17:48
	→ jnavila joined	17:51
kyan	Hi! If I have a commit tagged, then delete that tag, and recreate the tag pointing to a different commit, how can I see the previous revision of the tag? It doesn't show up in the commit history... Thanks!	17:51
grawity	tags don't have "revisions"	17:52
	← nowhere_man left	17:52
grawity	more like the opposite, they're something holds revisions (like read-only branches)	17:52
	→ nettoweb joined	17:53
kyan	Ok... how can I see those changes, then?	17:53
	← Asenar left	17:54
kyan	(Like, if I screw something up in the files in a repository, I can see what it used to be, and go back to it. I'd like to be able to fix similar screw-ups to the tags...)	17:54
	← shams left	17:54
grawity	well, tags are meant to never change in the first place	17:55
	← cdown left	17:55
kyan	Right, but if I (or someone with access to my comp) deletes one and create a new one with that name, it'd change it, I'd think, at least as far as downstream users are concerned	17:56
	← chll_ left	17:56
kyan	I could include a listing of tags in the repository	17:57
grawity	"someone with access to my computer" is a bigger problem...	17:57
	← aw1 left	17:58
grawity	for downstream users which already have the tag, Git won't update it (unless they delete the old one manually)	17:58
	← troulouliou_div2 left	17:58
	→ tvl joined	17:58
	← gtristan left	17:58
kyan	Oh, interesting	17:58
	tvl → tobiasvl	17:58
kyan	OHH, that's what it meant in the manual about how push --tags skips ones they have	17:58
	cool, thanks :D	17:59
grawity	well downstream users would be fetching them instead, but same general idea	17:59
	(and of course if you had a policy of always pgp-signing tags, then "someone"s fake tag would get noticed quicker)	17:59
kyan	mm	18:00
grawity	but anyway, going back to the original question	18:01
	tags are just names attached to a revision (commit)	18:01
	← subhojit777 left	18:02
grawity	they could in theory have a local reflog like branches do	18:02
	although Git deletes reflogs when you delete a ref, so that wouldn't help much	18:02
	logging ref updates on the server would help more	18:02
	or, for that matter, forbidding tag changes on the server	18:03
	← Rapture left	18:04
	← relipse left	18:04
	← dsdeiz left	18:04
kyan	thanks!	18:04
	→ BlackMaria joined	18:04
	← ac3takwas left	18:07
	← xall left	18:07
	← thebope left	18:08
	→ Rapture joined	18:09
	→ shgysk8zer0_ joined	18:09
	← shgysk8zer0_ left	18:09
	→ aw1 joined	18:10
	→ thebope joined	18:10
	← bocaneri left	18:12
	← HarryPothead left	18:13
	→ bronson joined	18:18
	→ ac3takwas joined	18:19
	→ duderonomy joined	18:20
	← nettoweb left	18:20
	← Oebele left	18:21
	→ mrnuke joined	18:21
	← bronson left	18:23
	← dsantiago left	18:23
	→ shams joined	18:24
	→ NeXTSUN joined	18:25
	← coasterz left	18:25
	→ Es0teric joined	18:27
	→ wogi joined	18:27
	→ nettoweb joined	18:27
	← duderonomy left	18:28
	→ aarobc joined	18:29
	→ morenoh149 joined	18:29
morenoh149	how do I checkout a file from a previous revision?	18:29
	→ Spec-Chum joined	18:31
rudi_s	morenoh149: git checkout id -- path	18:32
	man git-checkout	18:32
gitinfo	the git-checkout manpage is available at http://jk.gs/git-checkout.html	18:32
	← morenoh149 left	18:37
	← toothe left	18:38
	→ coasterz joined	18:39
	→ publio joined	18:39
	← Noldorin left	18:40
	← a_thakur left	18:42
	→ crayon joined	18:43
	→ madewokherd joined	18:43
	→ jimi_ joined	18:43
	→ zeroed joined	18:44
	← prestorium left	18:47
	← joki left	18:49
	→ sammyo joined	18:49
	→ Balliad joined	18:49
	NeverDie_ → NeverDie	18:49
	← weckstrom left	18:51
	→ Padawan joined	18:52
	← Padawan left	18:53
	→ ResidentBiscuit joined	18:53
	← sammyo left	18:54
	→ Salander27_ joined	18:56
	← Peuc left	18:56
	← Junior left	18:57
	← ResidentBiscuit left	18:58
	→ weckstrom joined	18:58
	→ todd_dsm joined	18:59
	→ prestorium joined	18:59
	→ Peuc joined	19:00
	→ Surfer2010 joined	19:01
	→ v-y joined	19:03
	→ joshszep joined	19:03
	← ac3takwas left	19:03
	→ Surfer2010_ joined	19:06
	→ dsantiago joined	19:06
	← Surfer2010 left	19:07
	→ ochorocho__ joined	19:07
	→ weckstro_ joined	19:09
	← weckstro_ left	19:09
	→ tyreld joined	19:10
	← weckstrom left	19:11
	← Rr4sT left	19:11
	→ weckstro_ joined	19:11
	← systemovich left	19:12
	→ Pulp joined	19:12
	→ rominronin joined	19:13
	← weckstro_ left	19:13
	← Surfer2010_ left	19:14
	→ Learath2 joined	19:14
	← languitar left	19:15
snowkidind	http://pastebin.com/DTsk0dkr	19:17
	i deleted a file on my server but the origin has the one i want to be there.	19:17
	→ desertSniper87 joined	19:17
	→ Panacea joined	19:18
snowkidind	and i edited my .gitignore file on the server but i want to sync that with the origin	19:18
	→ jknetl joined	19:18
	→ bronson joined	19:18
	← Torsho_ left	19:18
	← overlord_tm left	19:20
	→ Silenced joined	19:21
	← Silenced left	19:21
	→ Silenced joined	19:21
	→ Sasazuka joined	19:22
	→ guest joined	19:23
	← bronson left	19:23
	→ hahuang65 joined	19:25
	→ fission6 joined	19:26
fission6	how do i stash an untracked file	19:26
	→ dsdeiz joined	19:26
	← dsdeiz left	19:26
	→ dsdeiz joined	19:26
	→ tmsmith joined	19:29
hashpuppy	kind of confused. i'm trying to clean up my branches that have already been merged. i'm doing git push origin :feature1 and then git fetch origin -p and it still shows the upstream branch i deleted	19:29
	same thing when i try to git remote \| xargs -n 1 git remote prune	19:29
	→ joki joined	19:30
	→ duderonomy joined	19:30
hashpuppy	or what's the best way to delete both at once?	19:30
	← duderonomy left	19:31
	← dsdeiz left	19:31
	← freimatz left	19:31
	← wogi left	19:32
	→ freimatz joined	19:32
	← freimatz3 left	19:32
	→ cagedwisdom joined	19:34
	← YuGiOhJCJ left	19:34
	→ morenoh149 joined	19:35
	← PCatinean left	19:35
	← dodobrain left	19:35
	← marcogmonteiro left	19:37
	→ weckstrom joined	19:37
	→ GavinMagnus joined	19:37
	← neunon left	19:37
	→ ac3takwas joined	19:39
	→ neunon joined	19:40
	← Panacea left	19:40
	→ cyan__ joined	19:40
	← tmsmith left	19:40
	→ WaReZ joined	19:41
	← Guest14887 left	19:42
	→ watabou joined	19:42
	→ _czyzewski joined	19:44
	→ mda1 joined	19:44
	← _czyzewski left	19:44
	→ tvw joined	19:44
	← Goplat left	19:46
	→ neunon_ joined	19:46
	← guest left	19:47
	← BSaboia left	19:47
	← neunon left	19:48
	neunon_ → neunon	19:48
	→ Achylles joined	19:50
	← prestorium left	19:51
	← kyan left	19:53
	→ kyan joined	19:54
	→ Panacea joined	19:54
	→ ResidentBiscuit joined	19:55
	← desertSniper87 left	19:57
	← ResidentBiscuit left	19:59
	→ BlueProtoman joined	20:00
	← Cavallari left	20:01
	← bannakaffalatta left	20:03
	← grumble left	20:03
	→ idr0p joined	20:03
	→ grumble joined	20:05
	← dsantiago left	20:06
	← jknetl left	20:07
	→ Darcidride joined	20:07
	← DrRobotic left	20:10
	← kyan left	20:12
	→ Goplat joined	20:12
	← shubhnik left	20:14
	← Balliad left	20:14
	→ kyan joined	20:16
	← cyan__ left	20:16
	→ Oatmeal joined	20:17
	← Silenced left	20:17
	→ dirtyroshi joined	20:17
	→ bronson joined	20:19
	→ regedit joined	20:20
	→ WayToDoor joined	20:20
	← Peuc left	20:20
	→ Peuc joined	20:21
	→ windsurf_ joined	20:22
	→ PHPanos joined	20:23
windsurf_	project has two developers, each committed with different indentation (tabs/spaces). We want to fix indentation to tabs. If I reserve a commit for only whitespace fixes (change all indentation to tabs), and commit with ignore-space-change, then from then-on commit without ignore-space-change, will the history keep the tab fixes but not consider the whole file to have changed? History preserved elegantly?	20:23
	→ DrRobotic joined	20:24
	← bronson left	20:24
	→ Silenced joined	20:25
	→ dsantiago joined	20:26
	← BrianJ left	20:27
	← sea-gull_ left	20:32
rwp	windsurf_, Without answering your question (because I don't have a good answer) let me suggest trying what you want on a branch. Then poke around on it and see if the result is acceptable. If not then no problem just delete the experimental branch.	20:35
windsurf_	rwp good idea!	20:35
	← Rapture left	20:36
rwp	That is one of the features I like about git over many other systems. With git you can try it easily with no long term risk. Then decide later on keeping it or discarding it.	20:36
	→ kulelu88 joined	20:37
	← anonymuse left	20:37
	→ anonymuse joined	20:37
	← Darcidride left	20:39
	→ Darcidride joined	20:40
	← watmm left	20:40
	→ ToBeCloud joined	20:40
	gitinfo set mode: +v	20:40
	→ watmm1 joined	20:40
	← watabou left	20:41
	← robotroll left	20:43
rewt	commit with ignore-space-change would leave the existing whitespace in the file, resulting in not changing the committed state, and then the first commit without ignore-space-change will commit the whitespace changes	20:46
	→ [cust] joined	20:47
	← rnsanchez left	20:48
	→ Rapture joined	20:49
	← Achylles left	20:49
	← pcre left	20:50
	→ overlord_tm joined	20:50
windsurf_	rewt thank you. What's the best way to make my whitespace the same and preserve history elegantly? Is that even possible?	20:51
rewt	what do you mean by preserve history elegantly?	20:52
	just change the whitespace, commit, and done	20:52
	→ mdw joined	20:53
	← anonymuse left	20:53
	→ anonymuse joined	20:53
	→ BrianJ joined	20:54
	→ watabou joined	20:55
	← WayToDoor left	20:55
	→ shgysk8zer0_ joined	20:55
	← Goplat left	20:58
	→ jottr joined	21:00
	→ Tatou_ joined	21:01
Tatou_	Howdy	21:01
	I've got something I've commited to github - but there's a mistake on it	21:01
	Only the one commit. But what's the way I can silently re-write history here?	21:02
	← SteffanW left	21:02
tobiasvl	Tatou_: silently, not really. once history is made public, you should consider it public	21:02
	Tatou_: is there just a mistake or did you commit !sensitive data?	21:02
gitinfo	Tatou_: [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/	21:02
Tatou_	Just a mistake	21:03
tobiasvl	well, for one commit filter-branch is a bit overkill anyway	21:03
Tatou_	But I am choosing to learn how to rewrite history here	21:03
tobiasvl	Tatou_: !reewrite	21:03
	Tatou_: !rewrite	21:03
gitinfo	Tatou_: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	21:03
Tatou_	I'm still learning git, tobiasvl .. So I'm looking at my options	21:03
	← Zialus left	21:03
Tatou_	There's nothing sensitive or anything. I just want to see what git is capable of :)	21:04
	→ Zialus joined	21:04
	→ clemf_ joined	21:04
	← howitdo left	21:04
	← Panacea left	21:05
tobiasvl	Tatou_: well, if it's the latest commit, it's really simple. fix the mistake, add the file, run "git commit --amend", and then "git push --force-with-lease" to force github to update with the rewritten history	21:05
Tatou_	cool, let me try that!	21:06
	Damn I'm on the wrong laptop -_-	21:06
tobiasvl	wrong laptop? this is git, you can just clone :P	21:06
Tatou_	I know, I know..	21:07
	Sigh I'll not be lazy	21:07
	← clemf left	21:07
	→ Atm0spher1c joined	21:07
	← GavinMagnus left	21:08
	→ mp3 joined	21:10
	← Silenced left	21:10
	← shams left	21:10
	→ howitdo joined	21:10
	→ nowhere_man joined	21:10
	← navidr left	21:11
	→ unborn joined	21:11
	← mp3 left	21:11
	→ tmsmith joined	21:11
	← zeroed left	21:12
	← DrRobotic left	21:12
	← BlueProtoman left	21:13
	→ fatalhalt joined	21:14
	← fatalhalt left	21:14
	← cyphase left	21:14
	→ ok91 joined	21:14
	→ dsdeiz joined	21:15
	← Vortex35 left	21:16
	← Oatmeal left	21:17
	→ cyphase joined	21:18
	→ jknetl joined	21:20
	← dsdeiz left	21:20
	→ bronson joined	21:20
	→ askb joined	21:21
	→ Oatmeal joined	21:21
	← jccn left	21:23
	→ jccn joined	21:23
	← NeXTSUN left	21:24
	← jottr left	21:25
	← jstimm left	21:25
	← bronson left	21:25
	→ Rodya_ joined	21:25
	→ jottr joined	21:25
	← BrianJ left	21:27
windsurf_	rewt I mean, if I have commits A, B and C (chronologically), and B only fixes whitespace, then when diffing changes between B and A or C and A, it will look like almost the whole file has changed, so the history before B is impacted pretty significantly from a practical standpoint	21:28
	← rominronin left	21:28
	→ ResidentBiscuit joined	21:28
	← mdw left	21:29
rewt	well, if you change anything, including whitespace, it will be a change, no way around that... but you can diff ignoring whitespace and you won't see the whitespace changes	21:30
	i think it's -B, but check man git diff	21:30
gitinfo	the git-diff manpage is available at http://jk.gs/git-diff.html	21:30
rewt	-b	21:31
	← jeffreylevesque left	21:33
	→ Vortex35 joined	21:33
	← nettoweb left	21:33
	→ GavinMagnus joined	21:33
	← Es0teric left	21:34
	→ Es0teric joined	21:34
	← rwb left	21:36
	← cyphase left	21:36
	← Tatou_ left	21:38
	→ jagob joined	21:38
	→ cyphase joined	21:41
	← ok91 left	21:42
	→ mdw joined	21:43
	→ endiruna joined	21:43
	← GavinMagnus left	21:47
	← joki left	21:48
	→ satifant joined	21:48
windsurf_	rewt ok that's something	21:48
	thx	21:48
	← windsurf_ left	21:48
	← kulelu88 left	21:50
	→ jstein__ joined	21:51
	jstein → Guest18859	21:51
	→ jeffreylevesque joined	21:52
	→ evil-t0by joined	21:52
	jstein__ → jstein	21:53
	← jimi_ left	21:55
	→ sLite joined	21:55
	← Guest18859 left	21:55
	← jnavila left	21:56
	→ c^ joined	21:57
	→ drgeb joined	21:57
drgeb	Hi	21:57
gitinfo	drgeb: 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.	21:57
	← jottr left	21:58
	← endiruna left	21:59
drgeb	What is best way to deal with one git repo lets say the project is called DiscoverTheWorld but right now while I am starting I have many little pieces of the big puzzle that I neeed to Discover before I get there. My manager wants just one repo where as I would create as many as needed for each part of the puzzle that we are trying to solve and buildup the whole Architecture as we go. Any suggestions on this ???	21:59
	← pbrewczynski left	22:00
	→ BrianJ joined	22:00
	→ WayToDoor joined	22:01
	← Atrumx left	22:01
	← evil-t0by left	22:02
	← jknetl left	22:03
	← overlord_tm left	22:05
	← ResidentBiscuit left	22:05
	→ ResidentBiscuit joined	22:06
	→ YuGiOhJCJ joined	22:06
	← watabou left	22:07
	← ac3takwas left	22:07
	→ aidalgol joined	22:10
	← freimatz left	22:10
	← publio left	22:13
	→ Cassiopaya joined	22:14
	← ExoUNX left	22:14
	← Raed left	22:16
	→ iAmerikan joined	22:16
iAmerikan	is there any method faster than git pull to check if the remote has changes? fetch / pull --dry-run both appear to be slower	22:16
	→ uva joined	22:17
uva	How would I codify git diff "--no-prefix" into ~/.gitconfig?	22:17
	→ IlNominePatre joined	22:17
kadoban	ls-remote, it's not really user-friendly though in the slightest.	22:17
iAmerikan	then compare hashes?	22:18
	→ ac3takwas joined	22:19
kadoban	Yes	22:19
	→ bronson joined	22:21
	→ anli joined	22:22
iAmerikan	sweet, thanks	22:22
anli	With rabbitvcs, I miss one thing: "restore after commit", is it a hidden function by any chance?	22:23
	← jagob left	22:23
anli	Meaning that a file does not change, even if you edit the diff before committing it	22:23
	→ jagob joined	22:23
	← shgysk8zer0_ left	22:24
	← Es0teric left	22:24
kadoban	anli: What?	22:24
ResidentBiscuit	^	22:25
kadoban	I can't tell if you're using some other tool and looking for some feature from git, or using git and looking for some feature from some other tool, or ... something else, and the details of what you're looking for.	22:25
	← bronson left	22:26
iAmerikan	anyone have any lower level or more advanced git resource go-to's?	22:26
	← Darcidride left	22:28
llamapixel	packtpub books at the moment iAmerikan are $5	22:28
	If you want branching management concepts - http://nvie.com/posts/a-successful-git-branching-model/ \|\| https://gist.github.com/djspiewak/9f2f91085607a4859a66	22:29
	What specifically are you looking for?	22:30
	https://www.atlassian.com/git/tutorials/advanced-overview/	22:30
	← nicksloan left	22:30
iAmerikan	nothing specific. that atlassian tutorial has been my go to, was looking to keep going down the rabbit hole.	22:31
	→ kini joined	22:31
	→ helpD joined	22:31
	→ overlord_tm joined	22:31
rewt	anli, this was covered yesterday and the day before; when you do a partial commit, the file you had before the commit is the file you end up with after, with both the committed and uncommitted changes	22:31
	← helpD left	22:32
llamapixel	iAmerikan: and gitfu ? https://gitfu.wordpress.com/	22:33
	→ jimi_ joined	22:33
iAmerikan	these are all awesome links, thanks!	22:34
rewt	anli, git's staging is same as the copy you'd edit with rabbitcvs that you'd commit	22:34
llamapixel	https://www.packtpub.com/all?search=git	22:35
	np iAmerikan	22:35
	→ jottr joined	22:35
	→ Gianormagantrous joined	22:35
	← Gianormagantrous left	22:35
	→ Gianormagantrous joined	22:35
rewt	anli, this is the way git actually works; it's not a hidden feature at all	22:36
	← WaReZ left	22:37
	← jagob left	22:38
	→ jagob joined	22:38
	← ResidentBiscuit left	22:38
	← porsche944 left	22:39
	← aarobc left	22:40
	→ tang^ joined	22:42
	← jstein left	22:42
	→ roygbiv joined	22:43
	→ jw4242 joined	22:43
	→ Samual joined	22:44
	← nidr0x left	22:47
	← anli left	22:47
	→ WaReZ joined	22:48
	← Jackneill_ left	22:49
	→ masuberu joined	22:50
	→ gtristan joined	22:51
	← Samual left	22:51
	→ bekks joined	22:52
bekks	hi all	22:52
	← pks left	22:53
	← Rapture left	22:54
	→ pks joined	22:54
	← hashpuppy left	22:55
bekks	I've started learning git today, using gitlab and eclipse. Until now, I've used SVN. For a very small project (<50 files, <30 "releases" until now), I'm trying to "rebuild" that entire project and its releases using a git repo and tags (for the release versions). In SVN, I've used "x.y.z" in the file headers and replaced it with the according version string. How would I go about this using git? Basically I want to identify the release by some value in ...	22:55
	... the file header.	22:55
	← thebope left	22:56
bekks	I'd be glad for any hints please :)	22:57
	← PHPanos left	22:58
	← theskill_ left	22:59
	→ theskillwithin joined	23:00
	← fmeerkoetter left	23:01
	→ nidr0x joined	23:01
	→ fmeerkoetter joined	23:01
	← iAmerikan left	23:02
	→ dsdeiz joined	23:03
	→ anjen joined	23:04
	← theskillwithin left	23:04
	→ Electrometro joined	23:05
	← Electrometro left	23:06
	← sbeller left	23:07
	→ Electrometro joined	23:07
	→ theskillwithin joined	23:08
	← dsdeiz left	23:08
llamapixel	so you are looking to merge or migrate SVN to git bekks ? https://www.atlassian.com/git/tutorials/migrating-overview/ \|\| https://www.atlassian.com/git/tutorials/migrating-synchronize/	23:08
	→ PHPanos joined	23:08
bekks	llamapixel: No no no, I'm not looking for a migration tutorial, I will migrate the current SVN upstream to git. I am looking for on how to handle releases after that.	23:09
	→ nicksloan joined	23:10
	← PHPanos left	23:11
	← jagob left	23:13
	→ jagob joined	23:14
	→ PHPanos joined	23:15
	← satifant left	23:15
	← jagob left	23:16
	→ jagob joined	23:16
	← tmsmith left	23:16
	→ sbeller joined	23:16
	← masuberu left	23:19
	→ masuberu joined	23:21
	→ cdown joined	23:21
	→ Samual joined	23:21
	← t0by left	23:22
	→ bronson joined	23:22
	← afuentes left	23:25
	← cdown left	23:26
	← bronson left	23:27
	→ watabou joined	23:27
	→ denimsoft joined	23:29
	← Darren_ left	23:29
	← mdw left	23:30
	← Sasazuka left	23:30
	→ Sasazuka_ joined	23:30
	← pks left	23:31
	→ pks joined	23:32
	→ Sasazuka joined	23:35
	← Sasazuka_ left	23:35
imachuchu	bekks: With git you just tag the commit that the release is based off of with whatever version number you want and then deploy it however you do that. There isn't any standard format for versions, so you can make it whatever you want so like "Release v1.2.3"	23:36
bekks	Yeah.	23:36
unborn	hello guys, I have really idiotic question.. when I create git and push it to remote, everything works, now when I change anything in my code.. how to push updates to remote? is there any single command for this?	23:36
bekks	The only point I'm strugling with, is: having whatever crap in a git repo, can I just tag a few files, and not the whole repo?	23:37
	← jagob left	23:37
	→ jagob joined	23:38
imachuchu	unborn: yes/no. First you "add" the changes (to tell git you want it to store them), then "commit" the changes (to make the object it stores those changes in), then "push" to the remote (to give it the commit you made)	23:38
	← Rodya_ left	23:38
unborn	imachuchu: like git add * -m "changes" and then just git push? that is all? (I mean remote is in config already)	23:39
	← ac3takwas left	23:40
unborn	I mean git add * then git commit -m "commit message" and then just git push?	23:40
imachuchu	bekks: not really. Add the files you want in a commit and tag it, you can have other stuff uncommited, or on a different branch. Git thinks of a commit as a snapshot of workfolder at some point in time (at least the stuff you told it to snapshot). This means you can't tag just some files, but you can create a commit with them and tag it	23:40
	← Gianormagantrous left	23:40
unborn	or is it git push origin master? that is where I am confused	23:41
	← anonymuse left	23:41
	→ anonymuse joined	23:42
	← TomyLobo left	23:42
imachuchu	unborn: well.. they're the same thing. "git push" says "with the branch I've currently checkedout, push it to the remote I've said it's tracking", "git push origin master" says "push the branch master to the remote origin"	23:42
	→ Gianormagantrous joined	23:43
	← Gianormagantrous left	23:43
	→ Gianormagantrous joined	23:43
imachuchu	unborn: assuming that you've cloned from origin, then you're currently on the branch master and it's been setup to track origin, so the two commands do the same thing, just one is you specifying instead of going with it's defaults	23:43
bekks	imachuchu: So having my workfolder, I could change, commit and tag files A and C - how would I "add" file B to this tag then?	23:44
unborn	oh okay... but I do not have to check out every time do I? I mean I had issue to update one of my repos that is why I am asking what is the step by step with command line	23:44
	← PHPanos left	23:45
unborn	imachuchu: so it follows like this: git add * then git commit "commit msg" and lastly git push.. is that all?	23:45
	← anonymuse left	23:46
imachuchu	unborn: yes, to push your changes to remote. If there are other people working on the same remote repo then it gets a bit more complex, but that's a different bridge to cross	23:46
	→ FooMunki joined	23:47
imachuchu	(cause you have to integrate their changes with your code, and they might have pushed before you did, etc. Standard stuff, but a different topic)	23:47
bekks	imachuchu: So maybe I'm better off using a branch for every "release" then, and just transfer every file from my working state to that branch, then tag that branch, and release it?	23:48
FooMunki	Anyone know any reason why `git submodule [status \| init \| update]` are executing silently?	23:48
imachuchu	bekks: probably not. So why, say, do you want file x in release 1.2.3 but not in 1.2.4?	23:49
unborn	imachuchu: nah its just my private repos.. as I am webdev whole development gets really bad mess for me so I started using git couple months ago, however I was using those fancy tools aka smartgit but lately doing 60gb of repos is damn bad with any gui.. I wrote script which does init for me and create all repo however I was not sure how to simply push any changes to my remote	23:49
imachuchu	bekks: !xy	23:50
gitinfo	bekks: 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...	23:50
imachuchu	sorry, not bekks, that was for unborn	23:50
	→ rwb joined	23:50
	← jagob left	23:51
imachuchu	unborn: 60gb? It sounds like you're storing the wrong thing it git. Git's really great for code, really bad for binaries/images/blobs of any kind	23:51
BlessJah	unborn: how did you ended with 60GiB of stuff? you might be interested in !annex	23:51
gitinfo	unborn: git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs	23:51
unborn	imachuchu: ah no :) most repos are 15 megs max..	23:52
BlessJah	s/ended/end up/	23:52
	← rahtgaz left	23:52
unborn	but mostly very small.. like bash scripts and bunch of js and html and css scripts	23:52
	→ jagob joined	23:52
	← jottr left	23:53
bekks	imachuchu: So my overall objective is: I have project consisting of a bunch of files. I am constantly editing these files, and now and then I want to release a subset of these files as a tarball for "a new release". In addition, I want to have the tag name in the headers of these released files.	23:54
	← xaa left	23:54
BlessJah	bekks: why would you release just subset of files?	23:54
unborn	I do not use it for binary stuff and if I do, its only some gif or small zipped file occasionally BlessJah years of coding, backups and other projects I contributed to.. together its load	23:55
bekks	BlessJah: Because some of the unreleased files are like notes (long text) to a specific implementation, and such, which are irrelevant for the users of the release.	23:55
BlessJah	unborn: borg serves me well for backups	23:56
unborn	BlessJah: yeah I have normal backups - those are mods for configs for clients and friends or stuff like that..	23:56
	← jimi_ left	23:57
BlessJah	bekks: will users have access to said git repo? or just tarball releases?	23:57
unborn	is it possible to do git commands with && aka git add * && git commit "msg" && git push? possibly another idiotic question from me.. im sorry.	23:57
bekks	BlessJah: Users will have access to the tarballs only.	23:57
BlessJah	unborn: git is just an another command in your shell	23:58
unborn	that is brilliant!	23:58
	← Lyqyd left	23:59
BlessJah	unborn: also, there is git for windows bundled with bash (just in case you're on windoze)	23:59

Logs Search ←Prev date Next date→

Channels Documentation