IRCloggy #git 2016-09-15

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-09-15
	→ danslo joined	00:00
	← elsevero left	00:01
	← chartractegg left	00:02
	→ durham_ joined	00:03
	← vassagus left	00:04
	→ vassagus joined	00:05
	→ prawnzy joined	00:06
	← danslo left	00:06
	← crayon left	00:06
	→ crayon joined	00:07
	← durham left	00:07
	← harish left	00:07
	→ chartrac_ joined	00:07
	← durham_ left	00:08
	→ realz joined	00:08
	→ Vaelatern joined	00:09
	← yoh left	00:09
	← King_Hual left	00:10
	← Anthaas left	00:10
	← jerrcs left	00:11
	← netj left	00:11
	← prawnzy left	00:11
	← Mixologic left	00:11
	→ netj joined	00:11
	→ Mixologic joined	00:11
	→ energizer joined	00:11
energizer	In git annex, I just cloned a repo. The files aren't symlinks, but when I look inside them, they're just SHA numbers, not the real content of the files. How can I get the real content?	00:11
	← eycsigfy_ left	00:12
	→ jerrcs joined	00:12
	← crayon left	00:13
	→ BSab joined	00:13
	gitinfo set mode: +v	00:14
milki	theres probably a git anenx command you need to run	00:14
	→ eycsigfy joined	00:14
	← nitric left	00:14
	← clemf left	00:14
energizer	milki: i dont see anything like that in man git-annex	00:15
	→ tjone270 joined	00:15
	→ yoh joined	00:15
milki	!annex	00:15
gitinfo	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	00:15
	→ mingrammer joined	00:16
milki	https://git-annex.branchable.com/walkthrough/#index5h2	00:16
	try that	00:16
	→ dsdeiz joined	00:17
	← dsdeiz left	00:17
	→ dsdeiz joined	00:17
	← rubyonra_ left	00:17
	← BSAlb left	00:17
energizer	didnt work	00:17
	didnt do anything as far as i can tell	00:18
milki	maybe they really are just files with shas in them	00:18
energizer	they shouldnt be	00:18
	like	00:18
	→ mehola joined	00:19
energizer	i have the actual files on my local computer. sync --content them to git repo on second, ssh to third, git annex sync --content, and somehow it thinks the content is the hashes	00:19
	it thinks it did a good job getting the files because there's stuff in them, but its the wrong stuff	00:20
	fguillot → fguillot_afk	00:20
	← chartrac_ left	00:20
	← mingrammer left	00:20
	← fguillot_afk left	00:20
	← al-damiri left	00:21
	→ Anthaas joined	00:21
	← Gsham left	00:22
milki	sorry, im not familiar with annex workflow so i cant say whats missing	00:23
	← mehola left	00:24
	→ espindola joined	00:24
	→ ochorocho__ joined	00:26
	→ zivester joined	00:26
	→ therealGent joined	00:27
	→ tesuji joined	00:28
	← raijin left	00:29
	← tesuji_ left	00:29
	← ochorocho__ left	00:30
	→ SwiftMatt joined	00:31
	← nidr0x left	00:32
	→ rchavik joined	00:34
	→ anton-io joined	00:36
	gitinfo set mode: +v	00:36
anton-io	Hi! may I ask a newb question?	00:37
milki	!ask	00:37
gitinfo	Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.	00:37
	← yqt left	00:37
anton-io	I started a repository from an open source project by copying it (didn't clone it)	00:37
	And I have been making changes to the code for a while	00:38
	Now I want to merge changes from the official repository and what I did is add it as a new remote	00:38
	And merged from the version I took the copy of the code from	00:39
	So far so good, but when I want to merge from another commit it detects changes as conflicts	00:40
	→ brandonw joined	00:40
	→ raijin joined	00:40
anton-io	So I am sure I am doing it wrong... what's the procedure for that case? tl;dr started own repo from copy of code (not clone), now want to reintegrate changes from the original repo	00:40
	→ BSAlb joined	00:43
milki	have you been committing your changes locally?	00:43
	→ rominronin joined	00:43
	← johnmilton left	00:44
anton-io	Yes, and to another remote	00:44
	← dsdeiz left	00:44
milki	you should start with the original repo and move your commits to a branch of that repo	00:44
anton-io	So I clone the original	00:45
	and then add my own remote?	00:45
milki	yeah, you need some sort of common history to do the merging	00:45
	yeah that would work	00:45
	← therealGent left	00:45
milki	then you can try rebasing your branches	00:45
	→ dsdeiz joined	00:46
anton-io	Ok, I'll try that	00:46
	Thanks!	00:46
	→ fguillot joined	00:46
	← BSab left	00:46
	→ al-damiri joined	00:47
	← dsantiago left	00:47
	← VagabondAzulien left	00:47
	← rominronin left	00:48
	→ GT4066 joined	00:49
	← romerocesar left	00:50
	→ z8z joined	00:50
	→ romerocesar joined	00:52
	→ prawnzy joined	00:52
	← romerocesar left	00:52
	→ bob14 joined	00:54
	← ahr3n left	00:55
	← rjack2 left	00:57
	→ johnmilton joined	00:57
	← bob14 left	00:59
	→ bob14 joined	00:59
	→ arescorpio joined	01:00
	← actinide left	01:01
	→ danslo joined	01:02
	← Sadeukko left	01:04
	← rf__ left	01:04
	← vassagus left	01:04
	→ tesuji_ joined	01:04
	← tesuji left	01:04
	← theskillwithin left	01:05
	→ vassagus joined	01:05
	→ fahadash joined	01:05
	→ strugee joined	01:05
	← danslo left	01:06
	→ theskillwithin joined	01:07
	← Noldorin left	01:08
	← rgrinberg left	01:10
	→ mingrammer joined	01:10
	← pks left	01:10
	→ Ryanar joined	01:11
	→ clemf joined	01:12
	→ ResidentBiscuit joined	01:12
	→ pks joined	01:12
	← vassagus left	01:12
	← cagedwisdom left	01:13
	← newbiee left	01:13
	→ vassagus joined	01:13
	→ dsdeiz_ joined	01:13
	← duderono_ left	01:14
	← dsdeiz left	01:14
	← mingrammer left	01:15
	← e14 left	01:17
	← Emperor_Earth left	01:18
	Sasazuka__ → Sasazuka	01:18
	→ e14 joined	01:21
	← happy-dude left	01:22
	← bob14 left	01:24
	← dunpeal left	01:25
	→ finalbeta joined	01:25
	→ cagedwisdom joined	01:25
	← noidea left	01:26
	→ ochorocho__ joined	01:27
	→ \|ifei5g00d joined	01:27
	→ HoierM joined	01:28
	← HoierM left	01:28
	← Dazzyp left	01:29
	← espindola left	01:29
	← ochorocho__ left	01:31
	← dreiss left	01:31
	→ actinide joined	01:31
	→ cisco87 joined	01:34
	← cisco87 left	01:35
	→ cisco87 joined	01:35
	← d^sh left	01:35
	→ finalbeta1 joined	01:36
	← cisco87 left	01:36
	→ d^sh joined	01:36
	→ cisco87 joined	01:36
	← finalbeta left	01:37
	← actinide left	01:37
	← cisco87 left	01:37
	→ blackwind_123 joined	01:37
	← jeffreylevesque left	01:37
	→ cisco87 joined	01:38
	→ Vampire0 joined	01:38
	← cisco87 left	01:39
	→ HoierM joined	01:42
	→ BackEndCoder joined	01:43
	→ finalbeta joined	01:43
	McKraken_zzzzz → McKraken	01:44
	← Orion3k left	01:44
	→ rominronin joined	01:44
	← ilbot3 left	01:44
	← finalbeta1 left	01:44
	← Sasazuka left	01:47
	→ ilbot3 joined	01:48
	← rominronin left	01:50
	→ t-mart joined	01:52
	← e14 left	01:57
	← shinnya left	01:57
	→ e14 joined	01:58
	→ romerocesar joined	01:58
	→ Orion3k joined	02:00
	← prawnzy left	02:02
	← dtux left	02:03
	→ fstd_ joined	02:06
	→ lachm joined	02:07
	← tctara left	02:07
	→ rj1 joined	02:07
	← lachm left	02:08
	← dermoth left	02:08
	← thiago left	02:08
	← fstd left	02:10
	fstd_ → fstd	02:10
	→ rd4455 joined	02:13
	← rd4455 left	02:14
	← e14 left	02:14
	→ dunpeal joined	02:15
	← rafalcpp left	02:16
	→ rafalcpp joined	02:16
	→ e14 joined	02:17
	← dodobrain left	02:17
	→ duderonomy joined	02:17
	← ojdo left	02:18
	fguillot → fguillot_afk	02:19
	← fguillot_afk left	02:19
	→ mehola joined	02:20
	→ krs93 joined	02:20
	← rafalcpp left	02:23
	→ fguillot joined	02:23
	→ rafalcpp joined	02:24
	→ Goplat joined	02:24
	← mehola left	02:24
	← dviola left	02:24
	→ ojdo joined	02:25
	← ResidentBiscuit left	02:25
	→ lagothrix joined	02:26
	→ rgrinberg joined	02:28
	← lagothri1 left	02:30
	→ rewt joined	02:31
	← romerocesar left	02:31
	← HoierM left	02:32
	→ tctara joined	02:32
	→ greendo joined	02:33
	→ mehola joined	02:33
	→ mizu_no_oto joined	02:36
	← mehola left	02:38
	← e14 left	02:39
	→ e14 joined	02:40
	← mizu_no_oto left	02:45
	→ rominronin joined	02:45
	← ayjay_t left	02:48
	→ mizu_no_oto joined	02:48
	→ ayjay_t joined	02:48
	← clemf left	02:48
	→ finalbeta1 joined	02:49
	← finalbeta left	02:49
	← mizu_no_oto left	02:49
	→ harwood joined	02:50
	← mchelen2 left	02:51
	← rominronin left	02:51
	McKraken → McKraken_zzzzz	02:53
	→ Dougie187 joined	02:55
	→ thiago joined	02:56
	→ mizu_no_oto joined	02:56
	← dunpeal left	02:58
	→ ochorocho__ joined	02:58
	→ mingrammer joined	02:59
	← krs93 left	02:59
	← chachasmooth left	03:00
	← hexagoxel left	03:00
	→ hexagoxel joined	03:02
	← ochorocho__ left	03:03
	← tgunr left	03:03
	→ dodobrain joined	03:03
	← mingrammer left	03:04
	→ dunpeal joined	03:04
	→ aavrug joined	03:04
	← aavrug left	03:05
	→ aavrug joined	03:06
	→ chachasmooth joined	03:06
	→ YourTheBombNow23 joined	03:07
	→ snthsnth joined	03:09
	← troyt left	03:11
	← e14 left	03:12
	→ GandalfTheWizard joined	03:12
	→ e14 joined	03:14
	→ Vortex35 joined	03:14
	→ nevodka joined	03:16
	← Vortex34 left	03:17
	← snthsnth left	03:17
	← raijin left	03:17
	← mizu_no_oto left	03:19
	→ prawnzy joined	03:21
	→ mizu_no_oto joined	03:21
	← dunpeal left	03:21
	→ mycelium joined	03:22
	← pijiu left	03:22
	← sdothum left	03:23
	← mycelium left	03:23
	→ pijiu joined	03:26
	→ dreiss joined	03:26
	← m0viefreak left	03:27
	→ finalbeta joined	03:27
	← finalbeta1 left	03:28
	← raspado left	03:30
	→ raijin joined	03:30
	→ raspado joined	03:30
	← dreiss left	03:31
	→ pioiytr joined	03:32
	← CheckDavid left	03:33
	← fguillot left	03:33
	← raspado left	03:34
	← YourTheBombNow23 left	03:35
	→ safe joined	03:35
	← madewokherd left	03:35
	→ jon-mac joined	03:36
	→ snthsnth joined	03:37
	→ fakenerd joined	03:38
	← prawnzy left	03:39
	← nevodka left	03:39
	→ mmlb joined	03:39
	← e14 left	03:40
	← greendo left	03:43
	← mizu_no_oto left	03:44
	← dodobrain left	03:45
	→ romerocesar joined	03:45
	→ rominronin joined	03:47
	← kyan left	03:48
	← Dougie187 left	03:49
	← raijin left	03:49
	← finalbeta left	03:50
	→ finalbeta joined	03:50
	← rominronin left	03:52
	→ dreiss joined	03:52
	→ krs93 joined	03:54
	→ raijin joined	03:56
	← fahadash left	03:56
	← dreiss left	03:56
	← fakenerd left	03:57
	← arescorpio left	03:57
	→ dodobrain joined	03:58
	← romerocesar left	03:58
	← dodobrain left	03:58
	→ a_thakur joined	03:59
	→ robotroll joined	03:59
	← al-damiri left	04:01
	→ kyan joined	04:02
	→ madewokherd joined	04:03
	→ finalbeta1 joined	04:06
	← PioneerAxon_ left	04:06
	← finalbeta left	04:07
	→ dodobrain joined	04:07
	← JanC left	04:10
	← dendazen left	04:10
	→ vrishab joined	04:10
	→ PioneerAxon joined	04:11
	→ JanC joined	04:12
	← SwiftMatt left	04:12
	→ tgunr joined	04:14
	→ fakenerd joined	04:16
	← irqq left	04:20
	→ constant joined	04:20
	→ Woody_ joined	04:21
	→ pioiytr_ joined	04:21
	← sangy left	04:22
	← pioiytr left	04:25
	← lindenle left	04:26
	← robotroll left	04:26
	→ daey_ joined	04:27
aidalgol	is --first-parent redundant in `git log --first-parent --no-merges` ?	04:29
	← daey left	04:30
	daey_ → daey	04:30
	← madewokherd left	04:31
	← QwertyDragon left	04:31
	→ nonconvergent joined	04:32
	← somaReverse left	04:33
thiago	no	04:33
	→ nilg joined	04:33
	← boombatower left	04:34
	→ lindenle joined	04:36
ojacobson	That will include only commits reachable by first parent traversal, which are not merges	04:36
	leaving out --first-parent would also include non-merge commits reachable from other parents of merges	04:36
	← nonconvergent left	04:36
	← timothy left	04:37
	→ drizztbsd joined	04:37
	drizztbsd → timothy	04:37
	→ romerocesar joined	04:40
	← lindenle left	04:41
	← Woody_ left	04:42
	← Ryanar left	04:42
	→ Woody_ joined	04:42
	← Woody_ left	04:43
	← snthsnth left	04:43
	→ narkewoody joined	04:45
	→ Ryanar joined	04:45
	← Zamerick left	04:45
	→ SwiftMatt joined	04:45
	→ mingrammer joined	04:47
	← kyan left	04:47
aidalgol	OK, --first-parent --no-merges is definitely what I want, except that I want git log to also stop when it hits commit where the topic branch came off master.	04:47
	→ lindenle joined	04:48
	→ rominronin joined	04:48
	→ nonconvergent joined	04:48
aidalgol	So in the example http://stackoverflow.com/a/10248421 I would want to only see X Y Z, but not B and A.	04:48
	← narkewoody left	04:48
	→ narkewoody joined	04:48
	→ snthsnth joined	04:49
thiago	aidalgol: topicbranch..	04:49
	← Ryanar left	04:49
thiago	including the two dots after it	04:50
aidalgol	thiago: Now git log outputs nothing.	04:51
	← mingrammer left	04:51
thiago	sorry, master..	04:51
	→ subhojit777 joined	04:51
thiago	I misunderstood what you meant	04:52
	← rominronin left	04:52
	← nonconvergent left	04:52
clr	aidalgol: git log E^1..E^2	04:54
	→ overlord_tm joined	04:54
	→ eshlox joined	04:54
	→ ShapeShifter499 joined	04:55
	← lindenle left	04:56
clr	aidalgol: that shows everything merged into master by merge commit E (using the stackoverflow example) that was not already in master	04:56
	← Cabanossi left	04:57
	→ greendo joined	04:58
	→ romerocesar_ joined	04:58
	→ ochorocho__ joined	04:59
	→ Cabanossi joined	04:59
	→ gfixler joined	04:59
	→ elsevero joined	05:00
	→ dec0n joined	05:00
aidalgol	Sorry, I should clarify that I am interested in the branch's history only, not master.	05:00
	← romerocesar left	05:00
	→ kyan joined	05:00
aidalgol	it's end of the day here, though, and my brain is tired, so I'll tackle this later. :P	05:00
clr	aidalgol: that command should give you that	05:01
aidalgol	clr: But in my case, the branch has not yet been merged back to master.	05:02
	sorry, I should have stated that earlier. >_<	05:02
clr	aidalgol: oh, then the master..topicbranch should have worked	05:03
	← ochorocho__ left	05:03
aidalgol	Ah yes, master..topicbranch works. Just master.. or just topicbranch.. does not.	05:04
	thanks!	05:04
	← narkewoody left	05:04
thiago	master.. is the same as master..topicbranch if HEAD is topicbranch	05:05
	→ QwertyDragon joined	05:06
	→ dtux joined	05:06
aidalgol	oh, so it is. I must not have tried that, because I thought it gave nothing.	05:06
	← finalbeta1 left	05:09
	← tyreld left	05:09
	→ finalbeta1 joined	05:09
	← Mobutils left	05:09
	→ lindenle joined	05:12
	← snthsnth left	05:15
	→ ome joined	05:17
	← rgrinberg left	05:17
	← lindenle left	05:17
	← bobtherealbob left	05:18
	← aidalgol left	05:19
	→ mehola joined	05:20
	→ romerocesar joined	05:20
	→ Mobutils joined	05:21
	→ Akimb joined	05:22
	← romerocesar_ left	05:22
	← finalbeta1 left	05:22
	→ finalbeta1 joined	05:23
	→ romerocesar_ joined	05:24
	← overlord_tm left	05:24
	← zivester left	05:25
	← romerocesar left	05:25
	→ circ-user-KVqjt joined	05:26
	→ bocaneri joined	05:28
	← parsnip left	05:28
	← dreamyspell left	05:29
	← ayjay_t left	05:31
	→ ayjay_t joined	05:31
	→ bobtherealbob joined	05:31
	→ afuentes joined	05:32
	→ lindenle joined	05:33
	← ShapeShifter499 left	05:34
	← z8z left	05:35
	← GT4066 left	05:36
	← DolpheenDream left	05:36
	→ ShapeShifter499 joined	05:36
	← lindenle left	05:37
	← greendo left	05:39
	← constant left	05:39
	→ prawnzy joined	05:39
	→ mingrammer joined	05:41
	← timothy left	05:42
	→ drizztbsd joined	05:42
	→ romerocesar joined	05:43
	drizztbsd → timothy	05:43
	→ dreiss joined	05:43
	← prawnzy left	05:44
	← dreiss left	05:44
	← romerocesar_ left	05:46
	← mingrammer left	05:46
	→ _ng joined	05:47
	→ romerocesar_ joined	05:48
	← romerocesar left	05:48
	→ rominronin joined	05:49
	← meloc left	05:49
	→ ferr joined	05:49
	→ Macaveli joined	05:52
	← raijin left	05:53
	→ snthsnth joined	05:53
	← rominronin left	05:54
	→ psprint_ joined	05:55
	→ raijin joined	05:55
	→ dsantiago joined	05:56
	→ zeroed joined	05:57
	← zeroed left	05:57
	→ zeroed joined	05:57
	← psprint left	05:57
	← ShapeShifter499 left	05:58
	→ dweelie joined	05:59
	← safe left	05:59
	→ drizztbsd joined	06:00
	← timothy left	06:00
	drizztbsd → timothy	06:00
	← rom1504 left	06:03
	← Neico left	06:03
	← BlessJah left	06:03
	→ ShapeShifter499 joined	06:03
	→ Neico joined	06:03
	← dodobrain left	06:03
	← niax left	06:03
	← SenpaiSilver left	06:03
	→ ImNotQ009 joined	06:04
	gitinfo set mode: +v	06:04
ImNotQ009	Hello. How do I revert a pushed commit without losing its changes?	06:04
	→ BlessJah joined	06:04
ImNotQ009	Revert /locally/	06:05
	The commit shall stay on the remote repo	06:05
	→ lb1c joined	06:06
	← romerocesar_ left	06:08
	→ mohabaks joined	06:08
i7c	ImNotQ009, so you just want to undo it temporarily?	06:08
ImNotQ009	Yes	06:08
	Basically I want to split that commit. I want to modify the old one to have only have the changes and then push a new one	06:09
	→ chele joined	06:09
	→ romerocesar joined	06:09
i7c	Ah. Is it the most recent commit?	06:10
j416	ImNotQ009: you cannot modify a commit and push a new one, while keeping it on the remote	06:10
	→ eoli4n joined	06:10
i7c	And that.	06:10
eoli4n	hi	06:10
i7c	!rewrite	06:10
gitinfo	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	06:10
	→ lordjancso joined	06:10
	→ SenpaiSilver joined	06:10
eoli4n	i suppressed a file from master branch, so i git log, and then git checkout latest commit, but files still not here	06:10
	← elsevero left	06:10
eoli4n	i didnt push since the file is gone	06:10
	how to recover this file please ?	06:11
	→ ImNotQ009_ joined	06:11
i7c	What does "supress a file from a branch" mean exactly?	06:11
eoli4n	hm	06:12
	gitinfo set mode: +v	06:12
eoli4n	rm file ?	06:12
	and then not push	06:12
j416	eoli4n: what does git status say?	06:12
	it should give you some hints.	06:12
ImNotQ009_	i7c: not anymore. But I can cherry-pick it from remote into a new branch	06:12
eoli4n	#git deleted: push-pull.yml	06:12
i7c	If you haven't committed the deletion yet, git status tells you how to get it back.	06:12
	← cYmen left	06:13
i7c	git checkout HEAD -- that/file	06:13
	← ImNotQ009 left	06:13
eoli4n	yeah, thx i7c	06:13
	→ newbiee joined	06:13
	→ overlord_tm joined	06:14
	→ cYmen joined	06:15
	← dweelie left	06:16
ImNotQ009_	So yeah. I'll cherry-pick that commit into a new local branch. And from there I want to "revert" said commit in such a way that would let me keep the changes	06:16
	And them commit them again	06:16
i7c	git reset --soft HEAD~	06:17
	→ niax joined	06:17
i7c	then you can stage/unstage as you please	06:17
ImNotQ009_	Ah, great. Thanks	06:17
i7c	Note that after that, first everything will be staged	06:17
	→ dan2k3k4 joined	06:17
i7c	But you can just unstage everything and then start adding again	06:17
	→ rom1504 joined	06:17
ImNotQ009_	Yup	06:17
	→ rominronin joined	06:20
	← finalbeta1 left	06:21
	→ finalbeta1 joined	06:21
	psprint_ → psprint	06:21
	→ ochorocho__ joined	06:22
	→ JeroenT joined	06:24
	← ochorocho__ left	06:26
	← mohabaks left	06:26
	← romerocesar left	06:27
	→ durham joined	06:28
	→ romerocesar joined	06:28
	← durham left	06:29
	→ durham joined	06:29
	← ShapeShifter499 left	06:29
	← sbeller_ left	06:29
	← jaafar left	06:30
	→ jceb joined	06:30
	→ ProbabilityMoon joined	06:31
	→ troyt joined	06:31
	→ ShapeShifter499 joined	06:32
	← ShapeShifter499 left	06:32
	← JeroenT left	06:32
	→ ShapeShifter499 joined	06:33
	→ cyan__ joined	06:33
	← dtux left	06:34
	← SwiftMatt left	06:35
	→ tabrez joined	06:35
	← tabrez left	06:36
	→ dreiss joined	06:36
	← Mobutils left	06:37
	→ JeroenT joined	06:37
	→ prawnzy joined	06:38
	→ elsevero joined	06:39
	← circ-user-KVqjt left	06:41
	→ Sceorem joined	06:41
	→ ap0c joined	06:42
	← raijin left	06:44
	← romerocesar left	06:46
lb1c	!just_ask	06:48
gitinfo	You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)	06:48
	→ jknetl joined	06:49
	→ romerocesar joined	06:50
	← JeroenT left	06:51
	→ shams joined	06:51
i7c	(probably)	06:53
	→ JeroenT joined	06:53
i7c	(eventually)	06:53
Seveas	(call me maybe)	06:53
	→ eduardas_m joined	06:53
	← isysd left	06:54
	→ lahwran joined	06:54
	← mangolisk_ left	06:55
	→ laumann joined	06:55
	→ SwiftMatt joined	06:55
	← ProbabilityMoon left	06:55
	← dreiss left	06:56
	→ mangolisk joined	06:57
	← zeroed left	06:59
	→ elect joined	06:59
	← JeroenT left	06:59
	→ JeroenT joined	06:59
	→ nonconvergent joined	06:59
	← ap0c left	07:00
	→ ProbabilityMoon joined	07:00
	← durham left	07:01
	→ harish joined	07:01
	→ danslo joined	07:01
	→ submitnine joined	07:02
	← MattMaker left	07:03
	← diogenese left	07:03
	→ MattMaker joined	07:03
	← nonconvergent left	07:04
	← duderonomy left	07:04
	← ProbabilityMoon left	07:04
	→ diogenese joined	07:06
	← romerocesar left	07:06
	→ Raansu joined	07:06
	← Raansu left	07:07
	← ShapeShifter499 left	07:08
	← t0by left	07:08
	→ t0by joined	07:08
	← t0by left	07:08
	← dpower left	07:08
	← moop left	07:08
	← iota_pi left	07:08
	→ t0by joined	07:08
	→ dpower joined	07:09
	→ moop joined	07:09
	→ iota_pi joined	07:09
	→ MattMake_ joined	07:09
	→ aidalgol joined	07:10
	← elementalest left	07:10
	→ romerocesar joined	07:10
	← finalbeta1 left	07:12
	← MattMaker left	07:12
	→ finalbeta1 joined	07:12
	← a_thakur left	07:13
	← MattMake_ left	07:14
	→ MattMaker joined	07:14
	→ a_thakur joined	07:16
	→ TomyWork joined	07:17
	← MattMaker left	07:19
	→ MattMake_ joined	07:19
lb1c	(and this is crazy)	07:21
	→ Alienpruts joined	07:21
	← newbiee left	07:22
	← theskillwithin left	07:23
	→ ShapeShifter499 joined	07:23
	← MattMake_ left	07:24
	→ MattMaker joined	07:24
	← JeroenT left	07:25
	← jokajak left	07:25
	← ImNotQ009_ left	07:26
	→ JeroenT joined	07:27
	← romerocesar left	07:27
	→ romerocesar joined	07:29
	→ satya4ever joined	07:29
	← MattMaker left	07:29
	→ mingrammer joined	07:29
	→ MattMaker joined	07:29
	← ome left	07:30
	← bobtherealbob left	07:31
	→ jokajak joined	07:31
	→ encod3 joined	07:32
	osse waits for Seveas' number	07:32
	→ ProbabilityMoon joined	07:33
	← jceb left	07:34
	← mingrammer left	07:34
	← MattMaker left	07:34
	→ MattMaker joined	07:35
	→ lindenle joined	07:35
	← elect left	07:37
	→ ahmedelgabri joined	07:37
	→ Balliad joined	07:38
	→ stuh84 joined	07:38
	→ phanimahesh joined	07:39
	← stuh84 left	07:40
	← lindenle left	07:40
	→ stuh84 joined	07:40
	→ flaviodesousa joined	07:40
	← a_thakur left	07:40
	← prawnzy left	07:41
	← snthsnth left	07:42
	→ elect joined	07:42
	← MattMaker left	07:43
	→ MattMaker joined	07:44
	→ prawnzy joined	07:44
	← shams left	07:45
	← romerocesar left	07:46
	→ romerocesar joined	07:47
	← cyan__ left	07:48
	← MattMaker left	07:48
	→ thierryp joined	07:49
	← Vampire0 left	07:49
	← dan2k3k4 left	07:51
	← mangolisk left	07:52
	→ jceb joined	07:52
osse	Sometimes I'm so confident in my interactive rebases I do GIT_EDITOR=cat git rebase -i	07:53
	← thiago left	07:53
	→ MattMaker joined	07:53
_ikke_	osse: Do you use fixup commits? Because otherwise that wouldn't be different from a normal rebase	07:56
	→ romerocesar_ joined	07:56
osse	_ikke_: fixup all day every day	07:56
_ikke_	Rite	07:57
	Very nice feature	07:57
osse	now I even added "-f" to my rewrite alias that does the GIT_EDITOR thing \o/	07:57
_ikke_	cool	07:57
	← mjt left	07:57
osse	lias.rewrite ![ "$1" = -f ] && { export GIT_EDITOR=cat; shift; }; git rebase -i $(git merge-base HEAD ${1:-"@{u}"}) && :	07:58
	← romerocesar left	07:58
	← lss8 left	07:58
osse	But it's approaching ALIAS_LEN_MAX, so it'll go in a script soon	07:58
_ikke_	How long is that?	07:59
	ALIAS_LEN_MAX	07:59
	→ dan2k3k4 joined	07:59
_ikke_	why do you use merge base btw?	07:59
osse	Depends on my mood	07:59
	The limit is only in my head	07:59
_ikke_	ah ok\	07:59
osse	I use merge-base because I do not want to actually do a rebase. I want to do git rebase -i HEAD~n where n is some suitable number. rebasing on the merge-base is often Good Enough (tm)	08:00
	And git rebase is clever enough to skip directly ahead if the first few commits are only picks	08:00
	← heroux left	08:01
	→ qws-user-1228 joined	08:01
_ikke_	Ah right, makes sense	08:01
	← mkoskar left	08:01
	← armyriad left	08:02
	→ cilkay joined	08:02
	→ Vampire0 joined	08:02
	→ armyriad joined	08:03
	← MattMaker left	08:03
	← johnny56_ left	08:04
	← qws-user-1229 left	08:04
	← du left	08:05
	← finalbeta1 left	08:05
	→ mikecmpbll joined	08:05
	→ finalbeta1 joined	08:06
	→ du joined	08:06
	→ Dazzyp joined	08:06
	→ johnny56_ joined	08:07
	← d0nn1e left	08:07
	→ kurkale6ka joined	08:07
	→ djb-irc joined	08:07
osse	But isn't there some way to use .. or ... to do this directly? Seems weird to me to give a range to git-rebase, but we've talked about it beofre	08:07
	→ Lomex joined	08:08
	→ MattMaker joined	08:08
	→ d0nn1e joined	08:08
	← Goplat left	08:09
	→ Homerone joined	08:11
	← romerocesar_ left	08:11
	← djb-irc left	08:11
_ikke_	git diff also treats ranges differently	08:12
	→ lss8 joined	08:12
	← johnny56_ left	08:12
_ikke_	So rebase a...b would make sense to me in that case	08:13
	← bmahe left	08:14
	→ romerocesar joined	08:15
	→ bongjovi joined	08:15
osse	so what does it mean? git rebase $(git merge-base a b) b ?	08:16
_ikke_	git rebase $(git merge-base a b)	08:16
	← MattMaker left	08:16
_ikke_	So in that way, it would not make sense	08:17
	but with -i it does	08:17
	→ nilsi joined	08:17
	→ MattMaker joined	08:17
	← prawnzy left	08:19
	→ itosh joined	08:22
	← MattMaker left	08:22
	→ MattMaker joined	08:23
	→ ochorocho__ joined	08:23
	→ cdown joined	08:23
	→ heroux_ joined	08:24
	→ mingrammer joined	08:24
	heroux_ → heroux	08:24
	→ clmsy joined	08:25
	← BackEndCoder left	08:25
	← stuh84 left	08:26
	← fakenerd left	08:26
	← rory_ left	08:27
	→ rory joined	08:27
	← ochorocho__ left	08:27
rory	Hi. How can I squash all commits before a certain one? Preferably a nicer way than interactive rebase, since there's 100k+ commits	08:27
_ikke_	So you want truncate history?	08:28
rory	hard forked a project and don't care about its commit history. so yes I guess.	08:28
_ikke_	git replace + git filter-branch then	08:28
	git replace --graft	08:28
	← Lomex left	08:29
	← mingrammer left	08:29
selckin	git reset --hard <sha>, copy backup of workdir back in, git commit	08:29
	easy	08:29
	→ BackEndCoder joined	08:29
rory	that would work but ugly	08:29
	also using rebase -i would work, but slow and ugly	08:30
_ikke_	selckin: that's the opposite right?	08:30
selckin	same effect and deosn't require reading 6 manuals for the magic incantations	08:30
_ikke_	Ignore everything after the commit	08:30
	← mikecmpbll left	08:30
selckin	_ikke_: no? its all in the workdir	08:30
_ikke_	I mean, ignore every commit	08:30
selckin	lemme read q again	08:30
_ikke_	That does not truncate history before a specific commit	08:30
selckin	you are right, i misread the question, sorry	08:31
osse	TIL git replace can also create commits.	08:31
	_ikke_: i thought you had to create the new commit by hand, then graft it in place	08:31
	← phanimahesh left	08:32
_ikke_	You can just replace the parents of a commit	08:32
osse	seems like all rory needs to do is ''git replace --graft a_certain_one''	08:32
_ikke_	osse: exactly	08:32
	← MattMaker left	08:32
	→ MattMaker joined	08:33
	← grift left	08:34
_ikke_	this does require that all there are no other branches to older history	08:34
	← romerocesar left	08:35
	→ irco joined	08:35
	→ usm4n joined	08:35
	→ grift joined	08:36
	← usm4n left	08:36
	→ thadtheman joined	08:36
	← jceb left	08:37
	← ahmedelgabri left	08:37
	← JeroenT left	08:37
	→ JeroenT joined	08:37
thadtheman	How can I generate the hashes of every commit of every branch of a git repo?	08:37
	← cilkay left	08:37
osse	generate? Do you mean list them?	08:37
	git log --format='%H' --all	08:37
thadtheman	Oops,	08:37
grawity	git rev-list --all	08:37
	→ romerocesar joined	08:38
_ikke_	^	08:38
	→ phanimahesh joined	08:38
thadtheman	osse, sorry I meant "generate of list of the hashes"	08:38
	← ProbabilityMoon left	08:38
	← afuentes left	08:39
	→ usm4n joined	08:39
selckin	isn't that what his command does?	08:39
	← BadSnappa left	08:39
	← romerocesar left	08:39
osse	Go with rev-list --all. It's more suitable	08:40
	→ romerocesar joined	08:40
	→ ANTIsurveillance joined	08:40
	→ ap0c joined	08:40
	← boogibugs left	08:41
	→ boogibugs joined	08:41
	→ Lomex joined	08:42
	← yuhlw_ left	08:43
	→ leftriver05 joined	08:43
thadtheman	Oops, Thanks all.	08:43
	→ mikecmpbll joined	08:43
osse	I actually expected a bigger difference in speed between log and rev-list... Not that I'm disappointed	08:44
grawity	well, they both have to read the commit object (which is the slowest part)	08:44
	and really not much else besides pretty printing	08:45
	→ stamina joined	08:45
selckin	~10ms difference for me	08:45
osse	Yeah... log does stuff like parsing --format and is able to do diffing. but I suppose that overhead is constant.	08:45
	and there's no diff here	08:45
selckin	10%	08:45
	→ shams joined	08:45
grawity	parsing --format is next to nothing	08:46
	and diffs aren't requested in this case	08:46
	→ johnny56_ joined	08:46
	← usm4n left	08:46
	→ usm4n joined	08:47
	→ ahmedelgabri joined	08:47
	← spriz left	08:47
	← Lomex left	08:47
	← leftriver05 left	08:47
	← usm4n left	08:47
	→ cdown_ joined	08:47
	→ usm4n joined	08:48
	→ BadSnappa joined	08:48
	→ spriz joined	08:49
	← cdown left	08:50
	cdown_ → cdown	08:50
	← ANTIsurveillance left	08:50
	→ Lomex joined	08:50
	→ leftriver45 joined	08:50
	← usm4n left	08:50
	← MattMaker left	08:50
	← QwertyDragon left	08:50
osse	In a repo with only one branch and only one commit log is 200% slower!!!!1	08:50
	→ usm4n joined	08:51
	← leftriver45 left	08:51
osse	0.003 vs 0.009 seconds	08:51
	→ yuhlw_ joined	08:51
	→ jceb joined	08:51
	→ MattMaker joined	08:51
_ikke_	wat?	08:52
	UNACCEPTABLE!	08:52
selckin	never ignore the constant factor with small values of n	08:52
	← Lomex left	08:54
tango_	osse: issue a bug report	08:54
osse	fuckit, I'm requesting a CVE	08:55
	← romerocesar left	08:57
	← usm4n left	08:58
	← PioneerAxon left	08:58
	→ usm4n joined	08:58
	→ PioneerAxon joined	08:58
	→ romerocesar joined	09:00
	← MattMaker left	09:01
thadtheman	CVE?	09:01
	→ MattMaker joined	09:02
_ikke_	https://cve.mitre.org/	09:02
	Database of public vulnerabilities	09:02
	← elect left	09:04
	→ Lomex joined	09:04
	→ usm4n_ joined	09:05
	→ elect joined	09:06
	← usm4n left	09:07
	← DJ_Spies left	09:08
	← Lomex left	09:09
	→ wrouesnel joined	09:09
	→ leeN joined	09:09
	← usm4n_ left	09:10
	← MattMaker left	09:11
	← timothy left	09:11
	→ drizztbsd joined	09:11
	→ a_thakur joined	09:11
	drizztbsd → timothy	09:11
	← cagedwisdom left	09:12
	→ MattMaker joined	09:12
	→ isbotnetcool joined	09:13
	← sin3t left	09:14
	→ fracting joined	09:14
	→ notebox joined	09:16
	← a_thakur left	09:16
	→ a_thakur joined	09:17
	← energizer left	09:17
	→ irqq joined	09:18
	← notebox left	09:20
	← JeroenT left	09:21
	← MattMaker left	09:24
	← romerocesar left	09:25
	← GandalfTheWizard left	09:25
	→ romerocesar joined	09:25
	→ MattMaker joined	09:25
	→ nonconvergent joined	09:26
	→ JeroenT joined	09:28
	← itosh left	09:29
	→ GandalfTheWizard joined	09:29
	← MattMaker left	09:30
	← nilg left	09:30
	→ MattMaker joined	09:31
	← nonconvergent left	09:31
	← ap0c left	09:35
	→ as_g5pw joined	09:36
	← Limes left	09:36
	→ Limes joined	09:36
	← g5pw left	09:36
	as_g5pw → g5pw	09:36
	← thekrynn_ left	09:37
	← Akimb left	09:37
	→ ap0c joined	09:37
	→ baxx joined	09:38
	← GandalfTheWizard left	09:41
	→ GandalfTheWizard joined	09:41
	← GandalfTheWizard left	09:41
	→ GandalfTheWizard joined	09:42
	← GandalfTheWizard left	09:42
	→ GandalfTheWizard joined	09:42
	← romerocesar left	09:43
	← harish left	09:44
	← nwkj86 left	09:44
	← MattMaker left	09:44
	→ goxul joined	09:45
	← Homerone left	09:45
	→ MattMaker joined	09:45
	→ romerocesar joined	09:45
	← blackwind_123 left	09:46
	→ a3pq51 joined	09:46
	gitinfo set mode: +v	09:47
goxul	gitinfo	09:47
	→ blackwind_123 joined	09:48
	→ Akimb joined	09:48
	→ the_last joined	09:48
_ikke_	!bot	09:49
gitinfo	[!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans. Please see http://jk.gs/git/bot for more information about how to (ab)use me.	09:49
the_last	hi, i'm releasing a new version of software on github (so its tagged as a new version), just wondering if i can rebase into master instead of merge, or is there a reason this might conflict badly with previous tags?	09:49
_ikke_	depends on what commits you are rebasing	09:50
	→ jonno11 joined	09:50
	← MattMaker left	09:50
	→ nilg joined	09:51
	→ MattMaker joined	09:51
	← heroux left	09:51
	→ heroux joined	09:51
	→ jianyang joined	09:51
	→ mischat joined	09:52
	← mehola left	09:52
	→ jhgundersen joined	09:54
	← jonno11 left	09:54
	→ dimi1947 joined	09:55
chrisml	with master, develop and feature branches, when ready to merge, do i merge the feature into develop then develop into master?	09:56
	or just feature into master?	09:57
_ikke_	That's entirely up to you and is basically part of the workflow you choose	09:58
	!workflow	09:58
gitinfo	Finding the right workflow for you is critical for the success of any SCM project. Git is very flexible with respect to workflow. See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.	09:58
chrisml	with git-flow what would it be?	09:58
	chrisml reads	09:58
_ikke_	in git-flow you would merge them in develop first	09:58
chrisml	ta	09:59
_ikke_	then from develop you create a release branch, which would get merged into master	09:59
	← MattMaker left	09:59
	← JeroenT left	10:02
	→ Homerone joined	10:02
	→ AfroThundr joined	10:08
	← AfroThundr left	10:08
	→ ljaulin joined	10:09
	→ romerocesar_ joined	10:09
	← ljaulin left	10:09
	← romerocesar left	10:10
	→ stuh84 joined	10:10
	← mikecmpbll left	10:13
	← LiENUS left	10:14
	← timothy left	10:14
	→ drizztbsd joined	10:14
	drizztbsd → timothy	10:14
	→ Emperor_Earth joined	10:15
	→ LiENUS joined	10:16
	← dan2k3k4 left	10:16
	→ ShekharReddy joined	10:17
	→ budre joined	10:18
	← dimi1947 left	10:19
	→ prawnzy joined	10:20
	→ MattMaker joined	10:20
	← CussBot left	10:20
	→ dan2k3k4 joined	10:20
	→ CussBot joined	10:21
	→ ochorocho__ joined	10:23
	← prawnzy left	10:24
	→ bumbala joined	10:24
	→ fees joined	10:25
	← ochorocho__ left	10:28
	← romerocesar_ left	10:28
	→ romerocesar joined	10:30
	→ mingrammer joined	10:30
	← MattMaker left	10:32
	← a_thakur left	10:33
	→ MattMaker joined	10:33
	← mingrammer left	10:34
	→ gechr joined	10:37
	← dsdeiz_ left	10:37
	→ lindenle joined	10:38
	← MattMaker left	10:38
	→ MattMaker joined	10:39
	← lindenle left	10:42
	→ somaReverse joined	10:43
	→ sin3t joined	10:43
	→ Asenar joined	10:44
	→ rnsanchez joined	10:44
	← berndl left	10:44
	→ mycyber joined	10:44
	→ a_thakur joined	10:47
	← stuh84 left	10:48
	← romerocesar left	10:48
	→ King_Hual joined	10:48
	← King_Hual left	10:48
	→ King_Hual joined	10:48
	← MattMaker left	10:48
	→ JeroenT joined	10:49
	→ MattMaker joined	10:49
	← finalbeta1 left	10:50
	→ circ-user-E1qCe joined	10:50
	→ finalbeta joined	10:50
	→ romerocesar joined	10:51
	→ mehola joined	10:52
	→ tlaxkit joined	10:53
	← fracting left	10:54
	→ mikecmpbll joined	10:55
	→ syg_ joined	10:55
	← inflames left	10:55
	← romerocesar left	10:56
	← tlaxkit left	10:56
	→ romerocesar joined	10:56
	→ yqt joined	10:57
	→ abhinav joined	10:57
abhinav	how can i discard unwanted changes in git add -p. pressing n do not discard it	10:58
	← phanimahesh left	10:58
osse	git checkout -p	10:58
	→ brn joined	10:58
	← mehola left	10:59
	← ap0c left	10:59
	→ espindola joined	11:02
	→ tlaxkit joined	11:02
abhinav	osse: its opposite of add i think. is that right.	11:02
	← budre left	11:03
	→ dodobrain joined	11:03
osse	kind of	11:04
	you want to undo changes to files, yes?	11:04
abhinav	yeah	11:04
osse	then use checkout -p	11:04
	answer y to things you want to discard	11:04
	→ m0viefreak joined	11:05
selckin	you either add all the things you want to keep and discard the rest (add -p; git checkout -- .), or discard the parts you want to remove (git checkout -p )	11:05
	← MattMaker left	11:06
	→ mkoskar joined	11:07
	→ MattMaker joined	11:07
	← gechr left	11:08
	← sin3t left	11:10
	← heroux left	11:10
	→ mizu_no_oto joined	11:11
	← shams left	11:11
	← romerocesar left	11:12
	← espindola left	11:12
	→ romerocesar joined	11:14
	→ shams joined	11:14
	→ dsdeiz joined	11:14
	← shams left	11:14
	→ GavinMagnus joined	11:15
	← MattMaker left	11:17
	→ a3Dman_ joined	11:17
	→ shams joined	11:17
	→ MattMaker joined	11:18
	→ usm4n joined	11:18
	→ eihabarabia joined	11:20
	← shams left	11:20
	← a3Dman left	11:20
	→ shams joined	11:20
	← GavinMagnus left	11:20
	← shams left	11:20
	→ CheckDavid joined	11:21
	→ heroux joined	11:23
	← nilez left	11:24
	→ nilez joined	11:25
	→ narendraj9 joined	11:26
	← tom[] left	11:26
	→ tom[] joined	11:27
	← MattMaker left	11:27
	← chachasmooth left	11:28
	← brn left	11:28
	→ DolpheenDream joined	11:28
	← romerocesar left	11:28
	→ chachasmooth joined	11:28
	← cdown left	11:30
	← nilez left	11:30
	→ romerocesar joined	11:30
	→ nilez joined	11:30
	→ choki joined	11:31
	← usm4n left	11:32
	→ vlt joined	11:34
	← nilez left	11:34
	→ nilez joined	11:34
	← romerocesar left	11:35
	→ MattMaker joined	11:36
	← ayjay_t left	11:37
	→ shams joined	11:37
	→ ayjay_t joined	11:37
	← shams left	11:38
	← syg_ left	11:38
	→ notebox joined	11:39
	← t0by left	11:40
	→ ochorocho__ joined	11:40
	← MattMaker left	11:41
	→ espindola joined	11:41
	← Sceorem left	11:42
	← ShapeShifter499 left	11:42
	→ Darcidride joined	11:42
	← nilez left	11:43
	→ nilez joined	11:43
	→ t0by joined	11:44
	← SwiftMatt left	11:44
	← ochorocho__ left	11:45
	→ MattMaker joined	11:46
	← nilez left	11:46
	→ nilez joined	11:46
	→ raijin joined	11:47
	→ rffleaie joined	11:47
	← narendraj9 left	11:48
	→ narendraj9 joined	11:49
	← espindola left	11:49
	← aidalgol left	11:49
	→ vuoto joined	11:50
	← nilez left	11:50
	→ romerocesar joined	11:50
	→ Sceorem joined	11:50
	→ nilez joined	11:50
	← rffleaie left	11:51
	← MattMaker left	11:51
	→ MattMaker joined	11:51
	→ Lomex joined	11:52
	← nilez left	11:53
	→ nilez joined	11:53
abhinav	can anyone tell me real use of PowerBanks for mobile phones and tablets? why not jsut plug them into AC wall and charge it?	11:54
	wrong channel.	11:54
	→ ahmed_elgabri joined	11:54
selckin	kinda hard to plug into ac when you're walking	11:54
matthiaskrgr	it's for when there is no wall around	11:54
	→ cdown joined	11:55
	← t0by left	11:55
selckin	abhinav: why have a battery in your phone? just keep it plugged in	11:55
	← romerocesar left	11:55
	← JeroenT left	11:55
	← ahmedelgabri left	11:55
	→ liquidjamm joined	11:55
abhinav	matthiaskrgr: when does that happen? when we finish walking we reach home / office / something where we can have AC wall??	11:55
	← MattMaker left	11:56
	← qt-x left	11:56
	← a_thakur left	11:57
	→ MattMaker joined	11:57
	→ a_thakur joined	11:57
_ikke_	When you need to use the mobile / tablet when there is no AC aruond and battery is running out	11:57
abhinav	ok...	11:57
	→ rjack2 joined	11:58
	← BackEndCoder left	11:58
selckin	why put more then 2l of feul in the car, just drive from gasstation to gasstation	11:58
	← DolpheenDream left	11:59
abhinav	thets answer to your own quetion of why have batteri inside mobile phone! :-p	11:59
	→ qt-x joined	11:59
	→ BackEndCoder joined	11:59
selckin	woosh	11:59
_ikke_	Because having an external battery attached all the time is impractical	11:59
markmarkmark	imagine that you get up at 3am to get to the airport for a 6am flight on a regional jet with no power outlet. that's a 4 hour flight that gets you to your connecting airport with 10 minutes before your next flight boards onto another regional outletless plane for your next 2.5 hour flight.	12:00
	then you have to drive ~1.5 hours to your hotel	12:00
	that's like 13 hours of probably using your phone as entertainment no the flights, and now you're using it as a gps to navigate in this place you've never been	12:01
	→ t0by joined	12:01
markmarkmark	that's why I have a battery pack for my phone	12:01
abhinav	but how many times these type of situatiosn arise? its just once a month.	12:01
markmarkmark	there was a time last year where I was doing that at least 2 times a month	12:01
	and it doesn't really matter how often it happens, once you are in the middle of nowhere and your phone dies and you have no map, you're already going to be pretty unhappy	12:02
	or at least, I would be	12:02
	→ espindola joined	12:02
selckin	it's only usefull for 1% of the people, clearly it shouldn't exist	12:02
	← goxul left	12:02
matthiaskrgr	music + gps + mobile data for several hours can be quite taxing on the battery	12:02
_ikke_	ideally the battery of your phone should last 1 year	12:02
matthiaskrgr	^	12:03
	just make it nuclear :P	12:03
markmarkmark	or, for a more silly example, I usually like to keep one around and charged because my fiance almost never charges her phone and it is prone to dying while we're out and about	12:04
	← nilez left	12:06
	→ nilez joined	12:06
	← MattMaker left	12:06
abhinav	now I know why I never felth need for any powerbank.....cause I dont have a gf!!	12:06
	← _ng left	12:06
	→ MattMaker joined	12:07
	→ elementalest joined	12:07
	→ JeroenT joined	12:07
	→ sdothum joined	12:08
	→ rhlkjh joined	12:08
	→ fahadash joined	12:09
	← rhlkjh left	12:09
	→ SoRoot joined	12:10
	→ JSharpe joined	12:11
markmarkmark	lol	12:12
	← bruce_lee left	12:12
	← t0by left	12:12
	→ bruce_lee joined	12:13
	← bruce_lee left	12:13
	→ bruce_lee joined	12:13
	→ synthroid joined	12:13
eduardas_m	hello, I am new to git... gitk shows only the master branch on my remote git repository that I keep in a networked PC's drive mounted on my Linux host... I know that there is also a development branch there from the command line	12:13
	→ t0by joined	12:13
selckin	gitk --all	12:14
	→ synthroi_ joined	12:14
	← notebox left	12:15
eduardas_m	selckin, thanks a lot... it works..but I am not sure why it is organized in such a way... as qgit also did not show development branch by default	12:15
selckin	it should the current branch	12:15
	*shows	12:15
	← mizu_no_oto left	12:16
eduardas_m	but what sense does current branch have if the repository is bare.. I mean nothing is being checked out there	12:16
	← narendraj9 left	12:16
canton7	in a bare repository, there's still a 'default' branch: it's the branch that's checked out when someone clones the repo	12:16
	gitk will have picked up on that branch as the 'current' branch	12:16
eduardas_m	canton7, thanks...yes, that makes good sense	12:17
	← MattMaker left	12:17
	← synthroid left	12:18
	← kyan left	12:18
	→ MattMaker joined	12:18
	← mycyber left	12:18
	→ mingrammer joined	12:18
	→ Prisoner-2460_1 joined	12:19
	← SoRoot left	12:19
	← a_thakur left	12:19
	→ jaafar joined	12:20
	→ a_thakur joined	12:20
knittl	is there a way to say gitk A...B with multiple branches? gitk A...B...C	12:20
	or is this ambiguous?	12:20
	→ prawnzy joined	12:20
selckin	gitk A B	12:20
knittl	but this will include common commits of the branches	12:21
selckin	oh like that hmm	12:21
	← mingrammer left	12:23
knittl	hm. I did it manually now. found the common commit and run gitk A B C ^common	12:24
	← timothy left	12:25
	→ salamanderrake joined	12:25
	← prawnzy left	12:25
selckin	git merge-base will give common ib elieve	12:25
	← nilez left	12:26
knittl	yes. but also only for two branches. nevermind, I have what I need :] thanks	12:26
	→ timothy joined	12:26
	→ nilez joined	12:26
selckin	gitk A B C ^$(git merge-base $(git merge-base A B) C)	12:26
	might work	12:26
	← MattMaker left	12:28
	→ GodGinrai joined	12:28
	← nilez left	12:30
	→ nilez joined	12:30
	← nydel07 left	12:31
	← aavrug left	12:31
	→ bytesnz joined	12:31
	← a_thakur left	12:33
	→ a_thakur joined	12:34
	→ ItSANgo joined	12:34
	← njbair left	12:34
	← nilez left	12:35
	→ nilez joined	12:35
	→ Oebele joined	12:36
	gitinfo set mode: +v	12:38
bytesnz	Hello. Would someone be able to tell me what I am looking for? I have a repository with a single branch on it (the new branch contains a new version). Since the branch was created a single commit has been added to the (master) branch, the changes of which are not required in the new branch. I would new like to insert word here (merge?) the new branch onto the master branch (so the master HEAD is pointing to the new branch HEAD) witho	12:38
	→ skypuke_ joined	12:38
knittl	bytesnz: so 2 branches? master & a branch?	12:39
selckin	message got cut of after 'HEAD) witho'	12:39
bytesnz	... Merging the branch into master will cause the change on the master branch to be included, which I don't want. Should I just reset the master HEAD to the branch head and push that?...	12:39
	knittl: correct	12:39
	→ harish joined	12:39
knittl	and master has 1 commit which is not in your branch?	12:40
	← nilez left	12:40
	→ nilez joined	12:40
	→ ahmedelgabri joined	12:40
selckin	sounds like you want to throw away cahnges on master and make it equal to the branch?	12:40
	→ MattMaker joined	12:40
bytesnz	knittl: yes, it includes a change that is not required in the new version (the version in the branch)	12:40
	→ njbair joined	12:40
knittl	but you want the changes of the branch (the new version?) in your master?	12:41
	← ahmed_elgabri left	12:41
	← skypuke left	12:41
	→ cyan__ joined	12:41
selckin	think you just want git reset --hard branch, from master, but not entirely sure	12:42
bytesnz	knittl: correct	12:42
knittl	i think you simply want "git checkout master; git merge branch"	12:42
	changes of your branch will then be in master, but the branch will not contain anything new from master	12:43
	← subhojit777 left	12:43
	← nilez left	12:43
	→ nilez joined	12:43
	→ lennoo joined	12:45
	← finalbeta left	12:45
	→ finalbeta joined	12:45
	→ Noldorin joined	12:45
	→ nydel07 joined	12:46
	← MattMaker left	12:47
	← nilez left	12:47
	← lennoo left	12:47
	→ nilez joined	12:47
	→ mycyber joined	12:48
	← satya4ever left	12:48
bytesnz	knittl: but that will merge the new version branch onto the master that includes the change(/commit) that isn't required in the new version	12:48
knittl	bytesnz: but the branch will still not contain it. what should happen with this single new commit that is not required? should it be removed/deleted/forgotten?	12:49
	or do you want to keep it in master (or possibly some other branch)?	12:49
	→ chll_ joined	12:49
	← nilez left	12:51
	→ nilez joined	12:51
	→ MattMaker joined	12:51
	→ djb-irc joined	12:53
	← Vivekananda left	12:53
bytesnz	knittle: no, so as my master (and the remote master) contains the change the changes in the branch will be merged onto the master branch and will include the change/commit I don't want. What I want is to scrap the last commit on master and just merge (will be a fastforward) the changes onto the master branch. I'm just not sure on the safe way of doing that (won't break other peoples copies of the repo). Can I just use reset to move the	12:53
	→ nettoweb joined	12:53
	← Noldorin left	12:53
knittl	bytesnz: so you want to get rid of the commit on master?	12:53
	→ cdown_ joined	12:53
	→ kadoban joined	12:54
bytesnz	knittl: ... well yes, but I don't want to delete commit (as the history has already been pushed to the server)	12:54
	→ subhojit777 joined	12:55
	→ mehola joined	12:56
knittl	bytesnz: sounds like a merge --ours or merge --theirs	12:56
	← kadoban left	12:56
	→ YourTheBombNow23 joined	12:56
	← cdown left	12:56
	cdown_ → cdown	12:56
	→ kadoban joined	12:57
	→ fguillot joined	12:57
	→ zivester joined	12:57
	← raijin left	12:58
	→ dviola joined	13:00
	← mehola left	13:00
bytesnz	knittl: is there such a thing?	13:00
	← MattMaker left	13:01
	← Akimb left	13:01
	← espindola left	13:02
	→ MattMaker joined	13:02
knittl	bytesnz: yes. git merge -s ours	13:02
	bytesnz: git checkout branch ; git merge -s ours master ;	13:03
	← re1 left	13:03
	← Lomex left	13:04
	→ rgrinberg joined	13:04
	→ stuh84 joined	13:04
knittl	will make a merge commit which moves master to the state of branch. all changes of master are basically lost	13:04
	← rgrinberg left	13:04
	→ al-damiri joined	13:05
bytesnz	knittle: Ah cool. Would you then reset the master HEAD onto that new commit?	13:06
knittl	onto your branch	13:06
	well, one ahead. it will create a new commit. has to, due to cryptographic integrity	13:07
	→ nikivi joined	13:07
bytesnz	knittl: yeah. Awesome. Thank you very much knittl!	13:08
	← cyan__ left	13:08
yoh	for e.g. this repo http://datasets.datalad.org/openfmri/ds000006/.git how to list only stats on the merges into the master? I am trying git log --merges --stat --left-only but it gives all other merges as well :-/ (and no stats really)	13:08
	← Prisoner-2460_1 left	13:09
	→ ExoUNX joined	13:09
grawity	--first-parent?	13:09
	→ raijin joined	13:10
	→ cdg joined	13:10
	← MattMaker left	13:11
yoh	grawity: sweet -- not sure how I have missed it!	13:12
	→ MattMaker joined	13:12
yoh	thanks... now I wonder if possible to get stats since otherwise I came up only with this ugly shell beast ...	13:12
	> p=; git log --merges --stat --right-only --pretty=oneline \| grep 'Merge branch.*process' \| while read next l1 l2 l3; do if [ ! -z "$p" ]; then echo -n "$p "; git diff --stat $next..$p 2>/dev/null \| grep 'files ch' ; fi; p=$next; done	13:12
	to get summaries ;)	13:12
	→ rgrinberg joined	13:13
	← Shentino left	13:13
	← fguillot left	13:13
	→ mingrammer joined	13:13
	→ Shentino joined	13:13
	→ nidr0x joined	13:14
	← submitnine left	13:14
	→ fmcgeough joined	13:15
yoh	fwiw -- here is the refined (not only merges and using --first-parent): p=; git log --first-parent --pretty=oneline \| while read l; do next=${l%% *}; if [ ! -z "$p" ]; then echo -n "$l "; git diff --stat $next..$p 2>/dev/null \| grep 'files ch' ; fi; p=$next; done	13:15
	→ Lomex joined	13:16
grawity	try diff'ing $commit^..$commit	13:16
	gives you exactly what got merged in	13:16
	→ Noldorin joined	13:18
yoh	grawity: all ingenious is simple! ;-) should get more coffee	13:18
	← mingrammer left	13:18
	← eduardas_m left	13:18
	← lolmac left	13:18
	← dodobrain left	13:18
	→ Vivekananda joined	13:19
	← subhojit777 left	13:19
	← vuoto left	13:20
	← MattMaker left	13:20
	← Noldorin left	13:21
	← jon-mac left	13:21
	← Lomex left	13:21
	→ MattMaker joined	13:21
	← Phlogistique left	13:22
	→ Prisoner-2460_1 joined	13:22
	→ crose joined	13:22
	← wrouesnel left	13:23
	→ Noldorin joined	13:25
	← MattMaker left	13:25
	→ paws_ joined	13:25
	→ sangy joined	13:28
	← Noldorin left	13:28
	→ lolmac joined	13:28
	→ narendraj9 joined	13:28
yoh	FWIW -- my ultimate helper atm: git log --first-parent --pretty=oneline \| while read l; do p=${l%% }; gd=$(git describe $p 2>/dev/null); printf "%-20s %8s %-40s" "$gd" "${l:0:8}" "${l:40:40}"; git diff --stat $p^..$p 2>/dev/null \| grep --color=never 'files ch' \|\| echo ; done	13:28
	→ AaronMT joined	13:30
	← YourTheBombNow23 left	13:30
	→ berndl joined	13:30
	→ MattMaker joined	13:30
	← crose left	13:34
	← krs93 left	13:34
	← jknetl left	13:35
	← a_thakur left	13:36
yoh	grr... failed to bring it into a git alias... heh -- later ;)	13:36
	→ re1 joined	13:37
	← dviola left	13:37
	← a3pq51 left	13:38
	→ Noldorin_ joined	13:38
	← nydel07 left	13:38
yoh	never give up -- here is the alias! ;) lgl = "!bash -c 'git log --first-parent --pretty=oneline \| while read l; do p=${l%% }; gd=$(git describe $p 2>/dev/null); printf \"%-20s %8s %-40s\" \"$gd\" \"${l:0:8}\" \"${l:40:40}\"; git diff --stat $p^..$p 2>/dev/null \| grep --color=never \"files ch\" \|\| echo ; done'"	13:39
	→ lindenle joined	13:40
	← tlaxkit left	13:40
	→ dviola joined	13:41
	← rominronin left	13:41
	→ ochorocho__ joined	13:41
	→ YourTheBombNow23 joined	13:42
	→ rnsanchez_ joined	13:43
	← nikivi left	13:43
	→ Phlogistique joined	13:43
	← Noldorin_ left	13:43
	← rnsanchez left	13:44
	→ griffindy joined	13:44
	← circ-user-E1qCe left	13:44
	→ circ-user-E1qCe joined	13:44
	← lindenle left	13:44
	← synthroi_ left	13:45
	← andlabs left	13:45
	← MattMaker left	13:45
	→ a3pq51 joined	13:45
	← ochorocho__ left	13:45
	→ MattMaker joined	13:46
	→ nikivi joined	13:49
	rnsanchez_ → rnsanchez	13:49
	→ isysd joined	13:50
	→ rahtgaz joined	13:50
	→ romerocesar joined	13:52
	→ Darren__ joined	13:53
	→ rnsanchez_ joined	13:54
	gitinfo set mode: +v	13:54
choki	hi	13:54
	oh it works, thanks bytesnz	13:54
	← MattMaker left	13:54
	← YourTheBombNow23 left	13:54
	→ MattMaker joined	13:55
bytesnz	+choki: np	13:55
	← rnsanchez left	13:55
	→ ash_workz joined	13:56
	← abhinav left	13:56
	← romerocesar left	13:56
	rnsanchez_ → rnsanchez	13:58
	→ nydel07 joined	14:03
	→ dendazen joined	14:03
	→ Lomex joined	14:03
	→ ProbabilityMoon joined	14:04
	→ phaleth joined	14:04
	← jceb left	14:04
	← mycyber left	14:05
	→ nonconvergent joined	14:06
	→ YourTheBombNow23 joined	14:06
osse	yoh: you can save yourself some quoting madness by ditching bash -c. the code is run as a shell command	14:07
	← leeN left	14:08
	← MattMaker left	14:09
	→ oldrobot joined	14:09
	→ ResidentBiscuit joined	14:09
	← ResidentBiscuit left	14:09
	→ sin3t joined	14:09
	← oldrobot left	14:09
	→ leeN joined	14:09
	← ferr left	14:10
	→ ResidentBiscuit joined	14:10
	← ResidentBiscuit left	14:10
	→ MattMaker joined	14:10
	→ ResidentBiscuit joined	14:10
	← raijin left	14:10
	→ oldrobot joined	14:10
	← dec0n left	14:11
	← oldrobot left	14:11
	← Bowel left	14:11
	gitinfo set mode: +v	14:11
	→ eizua joined	14:11
	→ gf_ joined	14:12
	→ jeffreylevesque joined	14:12
	← nikivi left	14:12
	→ le_melomane joined	14:13
	→ ToBeCloud joined	14:13
	← utrack left	14:13
	→ utrack joined	14:13
	gitinfo set mode: +v	14:13
	→ Bowel joined	14:13
	→ oldrobot joined	14:13
	→ LionsMane joined	14:14
	← MattMaker left	14:14
	→ MattMaker joined	14:15
	← gf_ left	14:15
	← jhgundersen left	14:17
	→ jhgundersen joined	14:18
	← Bowel left	14:19
	← eizua left	14:19
	← MattMaker left	14:20
	→ MattMaker joined	14:20
	← nidr0x left	14:20
	→ Zamerick joined	14:20
	→ prawnzy joined	14:21
	→ jceb joined	14:22
	→ clemf joined	14:23
	← jhgundersen left	14:23
	→ synthroid joined	14:24
	→ NwS joined	14:25
	→ Bowel joined	14:25
	→ jstein_ joined	14:25
	← prawnzy left	14:26
	← jstein_ left	14:26
	→ e14 joined	14:27
	← Bowel left	14:27
	← e14 left	14:28
	← MattMaker left	14:28
	→ e14 joined	14:28
	→ MattMaker joined	14:29
	→ usm4n joined	14:30
selckin	osse: under the current shell?	14:31
	selckin believes it might just use /bin/sh and then you get actual crap sh on debian	14:31
selckin	probably $SHELL maybe	14:32
	← usm4n left	14:32
	← zivester left	14:32
_ikke_	I suspect /bin/sh	14:32
	→ raijin joined	14:32
	← BrianBlaze420 left	14:33
	← MattMaker left	14:33
_ikke_	git -c alias.sh='! echo $SHELL' sh	14:34
	→ MattMaker joined	14:34
_ikke_	So looks like selckin is right	14:34
	← Darren__ left	14:34
	→ BrianBlaze420 joined	14:35
	→ lindenle joined	14:36
osse	selckin: I took the time to scan yoh's alias for bashisms and found none	14:37
	← le_melomane left	14:37
osse	ehh, never mind. I think ${var:n:m} is	14:37
	← lindenle left	14:38
	→ actinide joined	14:38
	← MattMaker left	14:39
	→ MattMake_ joined	14:39
	→ le_melomane joined	14:39
osse	also in this case the extra bash -c doesn't add any quting headaches anyway	14:40
	osse shows himself out	14:40
selckin	just put it in a script :)	14:40
	← ProbabilityMoon left	14:41
osse	agreed	14:41
	→ cami_78 joined	14:41
	← cami_78 left	14:42
	← MattMake_ left	14:43
	→ MattMaker joined	14:44
	→ ProbabilityMoon joined	14:45
	← anton-io left	14:45
	→ clemf_ joined	14:46
	← clemf left	14:46
	← ahmedelgabri left	14:47
	→ ahmedelgabri joined	14:47
	→ chrisshattuck joined	14:48
	← nonconvergent left	14:48
	→ nonconvergent joined	14:48
	← MattMaker left	14:49
	← lb1c left	14:49
	→ MattMake_ joined	14:49
	← stamina left	14:49
	← chrisshattuck left	14:50
	→ happy-dude joined	14:51
	← e14 left	14:52
	→ romerocesar joined	14:52
	→ matsaman joined	14:52
	→ andlabs joined	14:52
	→ e14 joined	14:53
	← MattMake_ left	14:53
	→ MattMaker joined	14:54
	← e14 left	14:55
	→ e14 joined	14:55
	← fahadash left	14:56
	→ everamzah joined	14:56
	← romerocesar left	14:56
	← e14 left	14:57
	→ chrisshattuck joined	14:57
	← JeroenT left	14:58
	← chrisshattuck left	14:58
	→ chrisshattuck joined	14:59
	→ e14 joined	14:59
	← matsaman left	14:59
	→ raspado joined	15:00
	← e14 left	15:00
	→ mingrammer joined	15:01
	→ finalbeta1 joined	15:01
	← MattMaker left	15:02
	← finalbeta left	15:02
	→ espindola joined	15:02
	→ MattMaker joined	15:03
	← ProbabilityMoon left	15:04
	← mingrammer left	15:06
	→ e14 joined	15:07
	→ jknetl joined	15:07
	← MattMaker left	15:08
	→ MattMake_ joined	15:08
	← espindola left	15:08
	→ rsukla joined	15:09
	← qt-x left	15:10
	→ ejb joined	15:12
	← MattMake_ left	15:12
	→ MattMaker joined	15:13
	→ marcogmonteiro joined	15:14
	→ sanketdg joined	15:14
	← cybersphinx left	15:14
	← narendraj9 left	15:15
	→ tyreld joined	15:15
	← kaldoran left	15:16
	→ the_cybersphinx joined	15:17
	← gfixler left	15:17
	← Sceorem left	15:17
	← MattMaker left	15:17
	→ MattMaker joined	15:18
	← przemoc left	15:18
	→ xlegoman joined	15:18
	→ przemoc joined	15:19
	← laumann left	15:19
	→ satbyy joined	15:19
	← satbyy left	15:19
	→ satbyy joined	15:19
	← chele left	15:20
	← raijin left	15:21
	← Remram[m] left	15:21
	← Ineentho[m] left	15:21
	← aviraldg left	15:21
	← M-shine left	15:21
	← M-meznak left	15:21
	← M-mistake left	15:21
	← overlord_tm left	15:21
	→ nd_ joined	15:22
	← nettoweb left	15:22
	→ wrouesnel joined	15:22
	→ Zamyatin joined	15:22
	→ robotroll joined	15:22
	→ InfoTest joined	15:22
	→ MattMake_ joined	15:23
	← MattMaker left	15:23
	← e14 left	15:23
	← marcogmonteiro left	15:23
	← nd left	15:25
	→ thiago joined	15:25
	→ shgysk8zer0 joined	15:26
	→ alfism joined	15:27
	← djb-irc left	15:27
	→ MattMaker joined	15:28
	← MattMake_ left	15:28
	→ raijin joined	15:28
	→ madewokherd joined	15:29
	← thierryp left	15:31
	→ zivester joined	15:32
	← Alienpruts left	15:32
	→ zeroed joined	15:33
	← zeroed left	15:33
	→ zeroed joined	15:33
	→ shinnya joined	15:33
	← danslo left	15:33
	→ timmu joined	15:34
	← stuh84 left	15:34
	→ pasadinhas joined	15:34
	→ danslo joined	15:34
	← robotroll left	15:35
	← Prisoner-2460_1 left	15:35
	→ dreiss joined	15:36
	← MattMaker left	15:36
	→ MattMaker joined	15:37
	→ lindenle joined	15:38
	→ rubyonrailed joined	15:39
yoh	osse: my motto in life -- never "fix" working git alias ;)	15:39
	← danslo left	15:39
osse	yoh: That's probably good life advice	15:40
	← shgysk8zer0 left	15:40
	← Balliad left	15:41
	← MacWinner left	15:41
	→ ochorocho__ joined	15:42
	← MattMaker left	15:42
	→ MattMake_ joined	15:42
	← lindenle left	15:43
	← cdown left	15:44
	→ patarr joined	15:44
patarr	Hi all. I had a branch where I had a few commits, and then I squash merged them onto master. How can I also now take that squashed commit and place it on staging as well?	15:45
	→ nettoweb joined	15:46
	← eshlox left	15:46
	→ MattMaker joined	15:47
	← ochorocho__ left	15:47
	→ afuentes joined	15:47
	← MattMake_ left	15:47
	← nilg left	15:47
	→ NimeshNeema joined	15:49
	→ e14 joined	15:49
	→ Noldorin_ joined	15:49
	← e14 left	15:50
	→ e14 joined	15:51
	← andlabs left	15:51
	← clmsy left	15:51
	← MattMaker left	15:52
	→ MattMake_ joined	15:52
	→ romerocesar joined	15:52
	→ hobodave joined	15:53
	← jceb left	15:53
	→ zhodge joined	15:55
	← Noldorin_ left	15:55
	← liquidjamm left	15:55
	→ subhojit777 joined	15:55
	→ mingrammer joined	15:55
	→ EvilPenguin joined	15:56
	→ matsaman joined	15:56
	← MattMake_ left	15:57
	← rchavik left	15:57
	→ MattMaker joined	15:57
	← alfism left	15:58
	← romerocesar left	15:58
	→ alfism joined	15:58
	← ahmedelgabri left	15:59
	→ andlabs joined	15:59
	← thiago left	15:59
	← t0by left	16:00
	← mingrammer left	16:00
	→ kingarmadillo joined	16:00
kingarmadillo	is there a way to move a set of commited files to a new branch?	16:00
	← alfism left	16:00
	→ romerocesar joined	16:00
	→ alfism joined	16:01
	→ thiago joined	16:01
	← MattMaker left	16:01
	→ MattMaker joined	16:02
jeffreylevesque	i just merged my friends pull request (he also created the issue) to my github master branch, but it doesn't show him as a "contributor" above the colored bar on the repo (designating the programming languages used)	16:02
	i thought if someone contributes, and it gets merged to the repo, they become a "contributor"?	16:03
	← zeroed left	16:03
canton7	(asked in #github as well)	16:04
	→ espindola joined	16:04
	→ a_thakur joined	16:05
	← a_thakur left	16:05
	→ lindenle joined	16:06
	→ energizer joined	16:06
	→ ochorocho__ joined	16:08
	→ BSab joined	16:08
	← lordjancso left	16:09
	← espindola left	16:09
	← MattMaker left	16:10
	→ MattMaker joined	16:11
	→ Electrometro joined	16:11
	← elsevero left	16:11
	← elect left	16:11
	← BSAlb left	16:11
	→ BSAlb joined	16:12
	→ choki_ joined	16:13
	← e14 left	16:13
	← choki left	16:14
	← MattMaker left	16:15
zhodge	if I add a new file in my last commit along with other file modifications, what's the quickest way to edit that commit to exclude the file addition and bring it onto the staging area?	16:16
	→ MattMaker joined	16:16
	← BSab left	16:16
	← EvilPenguin left	16:16
zhodge	I usually do `cp file ~/Desktop; git rm file; git commit --amend; cp ~/Desktop/file .; git add file` :)	16:18
Seveas	zhodge: git rm --cached the-new-file && git commit --amend	16:18
	→ e14 joined	16:18
Seveas	rm --cached only removes it from the index, leaves the file on disk intact	16:19
zhodge	Seveas: very nice, thanks!	16:20
	← MattMaker left	16:20
	→ MattMaker joined	16:21
	→ prawnzy joined	16:22
	← patarr left	16:22
	← raspado left	16:23
	← nonconvergent left	16:23
	← MattMaker left	16:25
	→ neilthereildeil joined	16:26
	→ MattMaker joined	16:26
	→ cagedwisdom joined	16:26
neilthereildeil	if i do "git diff Branch1 Branch2" and there is not output, does that mean the branch tips point to the same commit?	16:27
	how can i veify that the branches are the same?	16:27
	← prawnzy left	16:27
thiago	no, it doesn't mean they point to the same commit	16:27
	it means they have the same content	16:27
	→ nitric joined	16:27
thiago	being at the same commit is just one way to have the same content	16:27
	→ raspado joined	16:28
	← ItSANgo left	16:28
	← finalbeta1 left	16:28
neilthereildeil	how can i verify that Branch1 and Branch2 are the same?	16:28
	→ finalbeta joined	16:28
	→ EvilPeng1 joined	16:29
neilthereildeil	if they are, i want to delete one...	16:29
	← MattMaker left	16:30
	→ MattMaker joined	16:31
	← kurkale6ka left	16:31
	← Homerone left	16:31
	→ flavius joined	16:32
	← nettoweb left	16:32
	→ durham joined	16:32
	← rafalcpp left	16:33
	← isbotnetcool left	16:33
	← mikecmpbll left	16:34
	← dreiss left	16:34
	→ robotroll joined	16:34
	← raspado left	16:34
	← GandalfTheWizard left	16:34
	← e14 left	16:34
	← Asenar left	16:34
	→ danslo joined	16:35
	← ShekharReddy left	16:35
	→ e14 joined	16:35
	← e14 left	16:35
	→ MattMake_ joined	16:36
	← MattMaker left	16:36
	← BadSnappa left	16:36
	← rjack2 left	16:37
	← irco left	16:38
	← LionsMane left	16:38
	← danslo left	16:39
	← hobodave left	16:40
	← actinide left	16:40
	← robotroll left	16:40
	→ M-shine joined	16:41
	→ actinide joined	16:41
	← EvilPeng1 left	16:42
	→ hobodave joined	16:42
	→ EvilPeng1 joined	16:42
osse	neilthereildeil: git rev-parse Branch1 Branch2	16:43
	neilthereildeil: git show Branch1 will show at the top if Branch2 is the same thing	16:44
	← MattMake_ left	16:44
	→ MattMaker joined	16:45
	← ToBeCloud left	16:45
	← wrouesnel left	16:45
	← pasadinhas left	16:46
	← jknetl left	16:46
	→ Noldorin_ joined	16:47
	→ efco joined	16:47
	→ sonikspin joined	16:49
	← M-shine left	16:50
	→ MattMake_ joined	16:50
	→ mingrammer joined	16:50
	← MattMaker left	16:50
	→ liquidjamm joined	16:53
	← mlittlej1 left	16:53
	→ patarr joined	16:53
	← antispaceman left	16:54
	← mingrammer left	16:54
	← MattMake_ left	16:55
	→ MattMaker joined	16:55
	← cdg left	16:55
	→ boombatower joined	16:55
	→ SteffanW joined	16:57
	Noldorin_ → Noldorin	16:57
	→ newbiee joined	16:58
	← MattMaker left	17:00
	→ MattMaker joined	17:00
	→ jon-mac joined	17:00
	← encod3 left	17:01
	→ antispaceman joined	17:01
	← thiago left	17:02
	← irqq left	17:02
	← actinide left	17:02
	→ _tgunr joined	17:02
	← a3pq51 left	17:03
	→ actinide joined	17:03
	→ a_thakur joined	17:03
	← tgunr left	17:03
	← Electrometro left	17:03
	→ hobodave_ joined	17:03
	→ JamesBaxter joined	17:04
	→ laumann joined	17:04
neilthereildeil	osse: the output of that command just shows the same hash twice. Was i supposed to pass some additional parameters?	17:04
	→ Electrometro joined	17:04
	← MattMaker left	17:05
osse	neilthereildeil: no. that's what i expected. it means they're equal	17:05
	→ MattMake_ joined	17:05
osse	they point to the same commit.	17:05
neilthereildeil	ok thanks. ill delete one of them	17:05
	← hobodave left	17:06
	← nilez left	17:07
	→ nilez joined	17:08
	→ Mobutils joined	17:08
	← patarr left	17:09
	← MattMake_ left	17:09
	← relgar left	17:09
	→ rinwa joined	17:10
	→ MattMaker joined	17:10
	→ relgar joined	17:10
	← ochorocho__ left	17:11
	→ ochorocho__ joined	17:12
	← mischat left	17:12
	→ thierryp joined	17:12
	→ dreiss joined	17:12
	← rubyonrailed left	17:12
	→ mischat joined	17:12
	← ejb left	17:13
	→ michaelsharpe joined	17:14
	← sonikspin left	17:15
	→ raspado joined	17:15
	→ VagabondAzulien joined	17:15
	← yqt left	17:16
	→ QwertyDragon joined	17:16
	← mischat left	17:17
	← boombatower left	17:17
	← Lunatrius left	17:17
	← shinnya left	17:18
	← chll_ left	17:18
	← MattMaker left	17:18
	→ MattMaker joined	17:19
	→ roentgen joined	17:19
	→ Lunatrius joined	17:20
	← afuentes left	17:20
	← rsukla left	17:21
	← thierryp left	17:21
	← romerocesar left	17:21
	→ terminal_echo joined	17:23
	→ MattMake_ joined	17:24
	← MattMaker left	17:24
	→ WayToDoor joined	17:24
	← a_thakur left	17:25
	→ ahmedelgabri joined	17:27
	← terminal_echo left	17:27
	→ robotroll joined	17:27
	← MattMake_ left	17:29
	→ MattMaker joined	17:29
	← synthroid left	17:30
	→ romerocesar joined	17:31
	→ Darren__ joined	17:32
	→ patarr joined	17:32
	→ scorphus joined	17:33
	→ sbeller joined	17:33
	→ MattMake_ joined	17:34
	← MattMaker left	17:34
	→ danslo joined	17:36
	→ Sasazuka joined	17:36
	← berndl left	17:36
	← romerocesar left	17:36
	→ berndl joined	17:36
	→ rubyonrailed joined	17:37
	→ krs93 joined	17:39
	← danslo left	17:40
	→ yqt joined	17:40
	→ ansimation joined	17:42
	← glebihan_ left	17:43
	→ rominronin joined	17:43
	→ thiago joined	17:44
	→ mingrammer joined	17:44
	→ glebihan_ joined	17:45
	← kingarmadillo left	17:46
	→ synthroid joined	17:46
	← QwertyDragon left	17:46
	→ M-shine joined	17:46
	← ochorocho__ left	17:46
	← circ-user-E1qCe left	17:47
	→ jrun joined	17:47
jrun	can upstream be a tag?	17:47
	...for a branch i mean.	17:48
	← rominronin left	17:48
	← mingrammer left	17:49
	→ King_Hual` joined	17:49
osse	easy enough to test	17:50
	$ git branch --set-upstream-to=refs/tags/v2.9.0	17:50
	fatal: Cannot setup tracking information; starting point 'refs/tags/v2.9.0' is not a branch.	17:50
	→ BrianJ joined	17:50
osse	IOW: no.	17:50
	→ durham_ joined	17:51
jrun	what's the difference between refs/tags and branches?	17:51
	→ King_Hual_ joined	17:52
	← everamzah left	17:52
	← Synthead left	17:52
	← jon-mac left	17:53
	← King_Hual left	17:53
	← patarr left	17:53
	← msonntag left	17:53
ojacobson	refs are the base naming system	17:53
	tags and branches are kinds of refs that imply workflow	17:54
i7c	There are two kinds of tags. Lightweight tags are a lot like branches, i.e. simply a name for an object (commit). But when you checkout a (lightwheight) tag you are in detached head which means the tag won’t move if you commit.	17:54
ojacobson	git's high-level interfaces make assumptions based on what kinds of refs you're working with.	17:54
	← dsantiago left	17:54
i7c	The other tags are real objects, they behave like tags but you can sign them for example with pgp.	17:54
ojacobson	`git branch --set-upstream-to` requires that the named ref is either a local branch (`refs/heads/`) or a remote-tracking branch (`refs/remotes/REMOTE/` for some REMOTE)	17:54
	← King_Hual` left	17:55
ojacobson	it makes workflow decisions based on which of the two cases you select, and rejects any other kind of ref	17:55
	← paws_ left	17:55
	← durham left	17:55
	← multi_io left	17:55
	→ durham joined	17:55
	→ mohabaks joined	17:56
	→ multi_io joined	17:56
	← durham_ left	17:56
	← durham left	17:58
	→ durham joined	17:58
	→ ShekharReddy joined	17:59
	← rubyonrailed left	17:59
	→ rubyonrailed joined	18:00
	→ mikecmpbll joined	18:00
jrun	i build asterisk off the official git repo and would like to keep up with their LTS. their workflow is as follows: create a release branch (13 if 13 doesn't exist else create 13.11); create a tag off of with (13.x) but keep the release branch around for future pulls.	18:00
	i want to have a testing branch, say next-LTS, that tracks the upstream LTS	18:01
	→ eshlox joined	18:01
	← Zamyatin left	18:01
	→ a3pq51 joined	18:02
	→ patarr joined	18:03
	← durham left	18:03
	→ circ-user-E1qCe joined	18:03
	→ cdg joined	18:04
jrun	but now i know that i can't track the release tag which is what release tars are based off.	18:04
	so any idea what's the best way to go about this?	18:04
	→ ejb joined	18:05
	→ King_Hual` joined	18:05
	← ShekharReddy left	18:05
	gitinfo set mode: +v	18:05
choki_	hello	18:05
gitinfo	choki_: 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:05
	choki_ → choki	18:05
	← DonRichie left	18:07
	→ DonRichie joined	18:07
	← robotroll left	18:07
	← SteffanW left	18:08
	← Mobutils left	18:08
	← King_Hual_ left	18:09
	→ LionsMane joined	18:09
	← patarr left	18:10
	→ Sadeukko joined	18:10
	← BackEndCoder left	18:10
	→ BackEndCoder joined	18:11
	→ rsukla joined	18:12
	→ thierryp joined	18:13
	← WayToDoor left	18:13
	→ bmahe joined	18:15
	→ WayToDoor joined	18:16
	→ vuoto joined	18:16
	← le_melomane left	18:17
	→ patarr joined	18:17
	→ cdown joined	18:17
	→ le_melomane joined	18:17
	← isysd left	18:18
	→ ShekharReddy joined	18:18
	← Phlogistique left	18:19
	→ msonntag joined	18:19
	→ govg joined	18:19
	← raspado left	18:19
	→ kingarmadillo joined	18:19
	← bocaneri left	18:20
	→ raspado joined	18:20
	→ timmu_ joined	18:21
	← raspado left	18:21
	→ raspado joined	18:22
	→ kyan joined	18:22
	→ stamina joined	18:22
	→ prawnzy joined	18:23
	← timmu left	18:23
	→ satifant joined	18:24
	← jason237 left	18:26
	→ cdown_ joined	18:27
	← prawnzy left	18:28
	← michaelsharpe left	18:28
	→ nonconvergent joined	18:29
	← rnsanchez left	18:30
	← cdown left	18:30
	cdown_ → cdown	18:30
	→ irqq joined	18:30
	← BrianJ left	18:30
	← cdg left	18:31
	nanga → m0f0x	18:31
	→ BrianJ joined	18:32
	m0f0x → nanga	18:34
	← subhojit777 left	18:34
	← dreiss left	18:35
	← patarr left	18:36
	→ danslo joined	18:36
	← bluj left	18:37
	→ astrofog joined	18:38
	→ mingrammer joined	18:38
	← le_melomane left	18:39
	→ durham joined	18:39
	← durham left	18:40
	→ bluj joined	18:40
	→ durham joined	18:40
	← danslo left	18:41
	← stamina left	18:41
	→ le_melomane joined	18:42
	← mingrammer left	18:43
	→ rominronin joined	18:44
	→ afuentes joined	18:44
	→ nettoweb joined	18:45
	→ AnarchyAo joined	18:46
	← antispaceman left	18:47
	← baxx left	18:47
	→ Zamyatin joined	18:49
	← rominronin left	18:49
	→ Ryanar joined	18:50
	→ QwertyDragon joined	18:51
	→ elastix joined	18:51
	← mohabaks left	18:53
	→ d10n-work joined	18:53
	← vuoto left	18:53
	→ duderonomy joined	18:53
	→ vuoto joined	18:53
	← thierryp left	18:55
	→ thierryp joined	18:55
	→ Dummy joined	18:55
	← finalbeta left	18:55
	Dummy → Guest36300	18:55
	→ finalbeta joined	18:56
	→ Salander27 joined	18:56
	gitinfo set mode: +v	18:56
Guest36300	hey guys	18:56
gitinfo	Guest36300: 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:56
Guest36300	I have a question. I'm not an expert on git by any chance, so let me know if Im missing something silly:	18:57
	← yqt left	18:58
	← EvilPeng1 left	18:58
	→ patarr joined	18:58
	← mikecmpbll left	18:59
	← Guest36300 left	18:59
	→ EvilPeng1 joined	19:02
GodGinrai	Guest92408: you're missing a question: :P	19:02
	→ dreiss joined	19:03
	→ ItSANgo joined	19:04
	→ mikecmpbll joined	19:04
	← finalbeta left	19:05
Seveas	GodGinrai: the question must be enormous if he's still typing it :)	19:06
	→ finalbeta joined	19:06
	→ joshuaturner joined	19:06
	→ liberpater joined	19:07
liberpater	I have two files that shows as modified when I do "git status" How do I undo those changes?	19:07
	← vuoto left	19:08
	→ vuoto joined	19:08
	→ Mobutils joined	19:09
	→ dsantiago joined	19:09
GodGinrai	Seveas: it's a shame his novel will likely either get cut off very early on by the character limit, or his client will be "helpful" enough to split it into multiple message, getting him booted for flooding the network	19:09
	*messages	19:10
	→ alexclark joined	19:10
	← bsanford_ left	19:11
	→ sonikspin joined	19:12
	← Muzer left	19:12
	→ mischat joined	19:12
	→ romerocesar joined	19:12
Seveas	liberpater: git status tells you how to :)	19:13
	← joshuaturner left	19:14
	→ jason237 joined	19:15
	→ mohabaks joined	19:15
	← astrofog left	19:16
	← sangy left	19:17
	← romerocesar left	19:17
	→ fahadash joined	19:17
	← efco left	19:18
alexclark	does anyone know the command to update a git submodule to a specific commit?	19:18
	→ yqt joined	19:19
	← matsaman left	19:19
	← finalbeta left	19:20
Hello71	checkout.	19:20
madewokherd	(cd submodule/ && git checkout ...)	19:20
liberpater	Seveas: It tells me how to add the files, but I don't want to do that.	19:22
	wait, nm	19:22
	→ elsevero joined	19:23
GodGinrai	Seveas: oh, he disconnected before I even answered him. Wow.	19:23
liberpater	Seveas: I did "git checkout -- path/to/some/file.ext" but git status still shows that file	19:24
	→ pandeiro joined	19:26
	→ Muzer joined	19:26
	→ bsanford_ joined	19:26
	→ OnBrokenWings joined	19:26
	← raijin left	19:27
	→ Balliad joined	19:28
Seveas	GodGinrai: heh, I've set my client to ignore joins/parts/quits :)	19:28
GodGinrai	lol	19:28
Seveas	liberpater: smells like a dodgy filter or broken crlf settings. Can you pastebin the output of that checkout command and the git status command. And the content of the .gitattributes file, if it exists.	19:29
	→ sangy joined	19:30
	→ terminal_echo joined	19:30
	→ boombatower joined	19:31
	← patarr left	19:32
	← OnBrokenWings left	19:32
	← drawkula left	19:32
	→ mingrammer joined	19:33
	→ raijin joined	19:33
liberpater	Seveas: My "git status" http://sprunge.us/TLJJ	19:34
	→ drawkula joined	19:34
	→ anuxivm joined	19:34
liberpater	git checkout -- drupal_web/vendor/phpunit/phpunit/build/tools/phpab; produces no output	19:35
m0viefreak	are you on windows?	19:35
	← Ryanar left	19:37
	→ danslo joined	19:37
	← mingrammer left	19:37
	← actinide left	19:38
	→ actinide joined	19:38
Seveas	liberpater: and the .gitattributes file?	19:38
	← BrianJ left	19:38
	← Darcidride left	19:38
	← actinide left	19:38
	→ Ryanar joined	19:38
alexclark	madewokherd: exactly what i wanted to do, thanks!	19:39
	← Ryanar left	19:39
	→ OnOut2k16 joined	19:41
Seveas	madewokherd: alexclark: that can be shortened to git -C submodule checkout ...	19:42
	→ BrianJ joined	19:42
	← danslo left	19:43
	← emg left	19:43
	← BrianJ left	19:43
	← ejb left	19:43
	→ romerocesar joined	19:43
liberpater	Seveas: http://sprunge.us/IhAA	19:44
	→ theskillwithin joined	19:44
	→ BrianJ joined	19:44
	→ dangerousdave joined	19:45
Seveas	liberpater: that looks sane. What does git diff say about the files?	19:45
	→ rominronin joined	19:45
liberpater	Seveas: they look like binaries, so git diff is a mess	19:46
	← terminal_echo left	19:46
	← OnOut2k16 left	19:46
Seveas	that means git is interpreting them as text	19:47
	→ lagothri1 joined	19:48
Seveas	ah yes, the .gitattributes file tells it to. That's not quite sane.	19:48
	← romerocesar left	19:48
	→ ejb joined	19:49
liberpater	Seveas: what should I change in the .gitattributes?	19:49
	← rominronin left	19:50
Seveas	not sure, I don't use the attribute system that much.	19:50
	← lagothrix left	19:50
	← Balliad left	19:52
	→ clemf joined	19:52
	→ actinide joined	19:52
	McKraken_zzzzz → McKraken	19:53
	→ eivarv joined	19:53
	← cdown left	19:53
	← actinide left	19:54
	← clemf_ left	19:55
ExoUNX	git --good	19:55
	→ michaelsharpe joined	19:55
	→ actinide joined	19:57
	← actinide left	19:58
_ikke_	liberpater: <path> binary	19:59
	binary is a macro for several attributes	19:59
	→ stompleee joined	20:00
	→ dodobrain joined	20:00
	→ actinide joined	20:01
	← BrianJ left	20:02
	← dreiss left	20:03
	← stomplee left	20:03
	→ dreiss joined	20:03
	→ cdown joined	20:06
_ikke_	Hmm, lots of submodule topics on the mailing list lately	20:07
	gitinfo set mode: +v	20:07
sbeller	_ikke_: because we're trying to jump start usage of submodules here for dogfooding and we like doing things in the open ;)	20:08
osse	I don't trust things with "sub" in the name. submodule, subtree, subversion.	20:09
_ikke_	sbeller: Not only talking about patches, but also user requests	20:09
	sbeller: But I like the work you're doing	20:09
	← stompleee left	20:10
	→ stomplee joined	20:10
osse	_ikke_: would you say it's sublime?	20:10
_ikke_	Hehe	20:11
	→ salamanderrake_ joined	20:13
	→ grayjoc joined	20:13
	← clemf left	20:14
	← alexclark left	20:14
	← netj left	20:15
	← phaleth left	20:15
	→ emg joined	20:15
	→ netj joined	20:15
	← bongjovi left	20:15
	emg → Guest67772	20:15
	← jason237 left	20:16
	← salamanderrake left	20:16
	→ clemf joined	20:16
	← dan2k3k4 left	20:21
	→ patarr joined	20:22
	→ `mx joined	20:22
	← actinide left	20:23
	→ cdown_ joined	20:23
	← mischat left	20:23
	→ actinide joined	20:23
	→ cdg joined	20:23
	← InfoTest left	20:23
	← cdg left	20:23
	→ mischat joined	20:24
	→ prawnzy joined	20:24
	→ cdg joined	20:24
	→ everamzah joined	20:24
	→ nwkj86 joined	20:24
	← dodobrain left	20:24
	← le_melomane left	20:25
	← michaelsharpe left	20:25
	→ le_melomane joined	20:25
	→ dodobrain joined	20:25
	← cdown left	20:25
	cdown_ → cdown	20:25
	→ ankitraj joined	20:27
	→ michaelsharpe joined	20:27
	→ mingrammer joined	20:27
	← Guest67772 left	20:27
	← salamanderrake_ left	20:27
	→ salamanderrake joined	20:28
	→ M-meznak joined	20:28
	→ aviraldg joined	20:28
	→ Remram[m] joined	20:28
	→ Ineentho[m] joined	20:28
	→ M-mistake joined	20:28
	← monoprotic left	20:28
	← mischat left	20:29
	← prawnzy left	20:29
	← GodGinrai left	20:29
	→ crayon joined	20:29
	← NimeshNeema left	20:29
	← crayon left	20:30
	→ crayon joined	20:30
	← Darren__ left	20:30
	→ Shearer joined	20:30
	→ Darren__ joined	20:30
	← Darren__ left	20:31
	← mingrammer left	20:31
	← clemf left	20:32
	← cdown left	20:34
	→ GodGinrai joined	20:37
	→ baxx joined	20:37
	← guampa left	20:37
	→ terminal_echo joined	20:37
	← sanketdg left	20:40
	← GodGinrai left	20:41
	→ GodGinrai joined	20:41
	→ guampa joined	20:42
	← sonikspin left	20:42
	← crayon left	20:43
	← bsanford_ left	20:43
	→ newbie1 joined	20:43
	← yqt left	20:43
	← le_melomane left	20:45
	→ cdown joined	20:45
	→ jason237 joined	20:46
	← synthroid left	20:46
	→ rominronin joined	20:46
	← WayToDoor left	20:46
	→ hweaving joined	20:47
	→ syg_ joined	20:47
	→ le_melomane joined	20:47
hweaving	"man git reset" says "It does not affect the wokring tree or the current branch" for "git reset <tree-ish> <paths>"	20:47
gitinfo	the git-reset manpage is available at http://jk.gs/git-reset.html	20:47
hweaving	When it says it doesn't affect the current branch, this just means that no commits etc. are modified, merely the tracking?	20:48
	Just sanity checking myself	20:48
	→ ToBeCloud joined	20:48
	gitinfo set mode: +v	20:48
	→ Gsham joined	20:49
	→ WayToDoor joined	20:49
	← rinwa left	20:50
	← kingarmadillo left	20:50
	← vuoto left	20:50
	← rominronin left	20:51
	← newbie1 left	20:53
	→ newbie1 joined	20:53
	← swiftgeek left	20:54
	→ bsanford_ joined	20:55
	← a3pq51 left	20:56
hweaving	I guess so :D	20:56
clr	hweaving: it only updates the index (aka, staging)	20:56
	← Orion3k left	20:56
	→ dan2k3k4 joined	20:57
	← mohabaks left	20:57
hweaving	clr: Cheers	20:57
clr	hweaving: "tracking" refers to whether Git knows about a file or not	20:57
	← fmcgeough left	20:57
clr	hweaving: cheers	20:57
	← circ-user-E1qCe left	20:57
	← rbern left	20:58
	← dangerousdave left	20:58
	← jeffreylevesque left	20:58
	← Vampire0 left	20:59
	→ nidr0x joined	20:59
	← hweaving left	21:00
	← EvilPeng1 left	21:01
	→ Ninzex joined	21:02
	→ EvilPeng1 joined	21:03
	← WayToDoor left	21:03
	→ dangerousdave joined	21:03
	← afuentes left	21:05
	← michaelsharpe left	21:05
	→ sonikspin joined	21:07
	← sangy left	21:07
	← Emperor_Earth left	21:07
	→ rbern joined	21:09
	→ Nikitaw99 joined	21:10
Nikitaw99	hi	21:10
gitinfo	Nikitaw99: 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:10
	← Gitzilla left	21:12
	← raijin left	21:12
	→ Orion3k joined	21:13
	→ Gitzilla joined	21:13
	← terminal_echo left	21:14
	← andlabs left	21:14
	← ash_workz left	21:14
	← LionsMane left	21:16
	→ finalbeta joined	21:17
	→ MacWinner joined	21:18
	→ kingarmadillo joined	21:19
	← mattcen left	21:19
	← Macaveli left	21:19
	→ cdown_ joined	21:21
	← ankitraj left	21:21
	→ mingrammer joined	21:21
	→ Guest55 joined	21:21
	← thierryp left	21:22
	→ Rodya_ joined	21:22
	→ thierryp joined	21:22
	← rj1 left	21:23
	← kingarmadillo left	21:23
	← cdown left	21:23
	cdown_ → cdown	21:23
	← dendazen left	21:24
	← ejb left	21:25
Nikitaw99	rip	21:25
	→ crayon joined	21:25
	← mingrammer left	21:26
	← Ninzex left	21:26
	← pandeiro left	21:27
	→ aidalgol joined	21:27
	← ExoUNX left	21:28
	→ mattcen joined	21:29
	← laumann left	21:29
	→ NeverDie joined	21:31
	← raspado left	21:33
	→ ejb joined	21:33
	← crayon left	21:34
	← Zamyatin left	21:37
	→ jeffreylevesque joined	21:38
	→ prawnzy joined	21:38
	← jason237 left	21:40
	→ sangy joined	21:41
	← Nikitaw99 left	21:42
	← patarr left	21:42
	← eivarv left	21:42
	← GodGinrai left	21:42
madknight	"git commit --amend --no-edit" does the commit hash change because of different timestamp?	21:43
osse	yes	21:43
madknight	osse, ah okay thx	21:43
	→ LabMonkey joined	21:43
	→ moestevens_ joined	21:44
	→ Jon28_ joined	21:44
	← liquidjamm left	21:44
	← armenzg left	21:45
	→ PaulCape_ joined	21:45
	← flupke left	21:45
	← Klumben left	21:45
	← devhoag left	21:45
	← asdofindia left	21:45
	→ evilmquin2 joined	21:45
	← moestevens_ left	21:45
	→ cust_ joined	21:45
	← [cust] left	21:45
	← cschneid left	21:45
	← Awesomecase left	21:45
	← timwis left	21:45
	← imdsm_ left	21:45
	← barq left	21:45
	← NightStrike left	21:45
	← bcardarella left	21:45
	← r3c0d3x left	21:45
	← blackjid left	21:45
	← bremner left	21:45
	→ Zarthus_ joined	21:46
	← lebster left	21:46
	← evanc left	21:46
	← mehdi__ left	21:46
	← ec left	21:46
	← Neo_ left	21:46
	← zacts left	21:46
	← souther left	21:46
	← jokester left	21:46
	← gmh left	21:46
	← gitinfo left	21:46
	← Zarthus left	21:46
	← POQDavid left	21:46
	→ Bigcheese_ joined	21:46
	Zarthus_ → Zarthus	21:46
	mquin → Guest5705	21:46
	← Guest5705 left	21:46
	evilmquin2 → mquin	21:46
	← Fissure left	21:46
	← GGMethos left	21:46
	← sparr left	21:46
	← bouncy left	21:46
	← zeller left	21:46
	← ToeSnacks left	21:46
	← Lowell left	21:46
	← harleypig left	21:46
	← rfv left	21:46
	← moestevens left	21:46
	← devster31 left	21:46
	← nchambers left	21:46
	← de-vri-es left	21:46
	← creppe left	21:46
	← Remram left	21:46
	← cjbrambo left	21:46
	← Jon28 left	21:46
	← superteece left	21:46
	← asd5a left	21:46
	← Eugene left	21:46
	← Peng_ left	21:46
	← CustosLimen left	21:46
	← ojacobson left	21:46
	← systmkor left	21:46
	← hagabaka left	21:46
	← geko left	21:47
	← bauruine left	21:47
	← thecomedian left	21:47
	← jgrasser left	21:47
	← Seveas left	21:47
	← [diecast] left	21:47
	← kanyeezy left	21:47
	← Mannn left	21:47
	← uidzer0 left	21:47
	← karstensrage left	21:47
	← murph left	21:47
	← PaulCapestany left	21:47
	← aca20031 left	21:47
	← dhanush left	21:47
	← krillr left	21:47
	← shauna left	21:47
	← wcpan left	21:47
	← codebam left	21:47
	← vktec left	21:47
	← i7c left	21:47
	← StatutoryApe left	21:47
	← hide left	21:47
	← slixpk left	21:47
	← cdesai left	21:47
	← gigq left	21:47
	← uebera\|\| left	21:47
	← emilyrose left	21:47
	← nedbat left	21:47
	← Bigcheese left	21:47
	← Forkk left	21:47
	← rancyd left	21:47
	← Riviera left	21:47
	→ i8c joined	21:47
	→ jgrasser joined	21:47
	→ shauna joined	21:47
	→ Forkk joined	21:47
	→ moestevens joined	21:47
	i8c → i7c	21:47
	→ wcpan joined	21:47
	→ rominronin joined	21:47
	→ Neo_ joined	21:48
	→ r3c0d3x joined	21:48
	→ gigq joined	21:48
	→ emilyrose joined	21:48
	→ souther joined	21:48
	← dhollinger left	21:48
	→ cdesai joined	21:48
	→ thebope joined	21:48
	← d0nn1e left	21:48
	→ systmkor joined	21:48
	→ Seveas joined	21:48
	→ geko joined	21:49
	→ ahr3n joined	21:49
	→ Peng_ joined	21:49
	→ lebster joined	21:50
	→ Lowell joined	21:50
	→ rfv joined	21:50
	→ wrouesnel1 joined	21:51
	→ bremner joined	21:51
	← Ineentho[m] left	21:51
	→ dhollinger joined	21:51
	→ barq joined	21:51
	→ NightStrike joined	21:51
	← bremner left	21:51
	→ bremner joined	21:51
	← ghostlight left	21:51
	→ d0nn1e joined	21:51
	→ bcardarella joined	21:51
	→ cjbrambo joined	21:51
	→ imdsm_ joined	21:51
	→ uidzer0 joined	21:51
	→ uebera\|\| joined	21:51
	← uebera\|\| left	21:51
	→ uebera\|\| joined	21:51
	→ timwis joined	21:52
	→ devster31 joined	21:52
	→ CustosLimen joined	21:52
	→ aca20031 joined	21:52
	→ POQDavid joined	21:52
	→ nedbat joined	21:52
	→ hide joined	21:52
	→ nchambers joined	21:52
	→ [diecast] joined	21:52
	→ ojacobson joined	21:52
	→ evanc joined	21:52
	→ bouncy joined	21:52
	→ krillr joined	21:52
	→ cschneid joined	21:52
	→ ec joined	21:52
	→ superteece joined	21:52
	→ Eugene joined	21:52
	→ e14 joined	21:52
	→ bauruine joined	21:52
	← rominronin left	21:53
	← madewokherd left	21:53
	← thebope left	21:53
	→ gmh joined	21:53
	← ejb left	21:54
	→ flupke joined	21:54
	← Shearer left	21:54
	← ec left	21:54
	→ ec joined	21:55
	→ hagabaka joined	21:56
	→ blackjid joined	21:56
	→ thecomedian joined	21:56
	← Gsham left	21:57
	→ zeller joined	21:57
	→ murph joined	21:57
	→ Awesomecase joined	21:57
	← griffindy left	21:57
	→ Guest77202 joined	21:57
	murph → Guest2400	21:57
	→ ToeSnacks joined	21:57
	→ mehdi__ joined	21:57
	← AaronMT left	21:58
	→ asdofindia joined	21:58
	← YourTheBombNow23 left	21:58
	→ devhoag joined	21:58
	→ jokester joined	21:59
	→ sparr joined	21:59
	→ andlabs joined	21:59
	→ armenzg joined	21:59
	→ Riviera joined	21:59
	→ vktec joined	21:59
	→ Mannn joined	21:59
	→ harleypig joined	21:59
	→ Remram joined	22:00
	→ slixpk joined	22:00
	← Remram left	22:00
	→ Remram joined	22:00
	→ de-vri-es joined	22:00
	→ Fissure joined	22:00
	→ asd5a joined	22:00
	→ Gsham joined	22:00
	→ GGMethos joined	22:00
	→ creppe joined	22:00
	→ rancyd joined	22:02
	← grayjoc left	22:02
	← dan2k3k4 left	22:03
	→ dhanush joined	22:03
	→ Ineentho[m] joined	22:04
	→ codebam joined	22:05
	→ Klumben joined	22:06
	→ gitinfo joined	22:06
	ChanServ set mode: +o	22:06
	← zivester left	22:07
	← King_Hual` left	22:07
	→ ghostlight joined	22:08
	→ ejb joined	22:08
	← hobodave_ left	22:08
	→ King_Hual joined	22:09
	← prawnzy left	22:10
	→ raijin joined	22:10
	← Gsham left	22:10
	← le_melomane left	22:11
	← fees left	22:13
	← dangerousdave left	22:14
	→ romerocesar joined	22:14
	→ Immune__ joined	22:14
	← thierryp left	22:15
	→ mingrammer joined	22:15
	→ l4v2 joined	22:19
	← romerocesar left	22:19
	← l4v2 left	22:20
	← mingrammer left	22:20
	→ prawnzy joined	22:20
	← ResidentBiscuit left	22:21
	← d10n-work left	22:22
	→ emg joined	22:22
	→ AfroThundr joined	22:23
	← JamesBaxter left	22:23
	← AfroThundr left	22:24
	→ rj1 joined	22:25
	← eshlox left	22:26
	→ HoierM joined	22:27
	← ejb left	22:27
	← rahtgaz left	22:28
	← gravitron left	22:29
	→ gravitron joined	22:29
	← e14 left	22:31
	← nonconvergent left	22:36
	← wrouesnel1 left	22:37
	← satifant left	22:38
	→ heroux_ joined	22:40
	→ SonOfLilit joined	22:40
SonOfLilit	I have identical .gitattributes for .csv and .tsv, but git only listens to the *.tsv	22:41
	any idea how to debug this?	22:41
	(I'm trying to set up textconv or an external differ for csv files)	22:41
	← heroux_ left	22:43
	→ zhodge_ joined	22:43
	← heroux left	22:43
	→ duderono_ joined	22:44
	→ madewokherd joined	22:45
	→ heroux joined	22:45
	← mikecmpbll left	22:46
	← duderonomy left	22:46
	← zhodge left	22:46
	← rsukla left	22:47
	→ e14 joined	22:47
	← ahr3n left	22:47
	← zhodge_ left	22:47
	← everamzah left	22:48
	→ rominronin joined	22:48
	← bmahe left	22:50
	← martin_g left	22:50
	→ mizu_no_oto joined	22:53
	← bbhoss left	22:54
	← rominronin left	22:54
	← cstrahan left	22:55
	← chrisshattuck left	22:55
	← JSharpe left	22:55
	McKraken → McKraken_zzzzz	22:55
	→ isysd joined	22:56
	← Shentino left	22:58
	→ martin_g joined	22:58
	→ bbhoss joined	22:58
	→ cstrahan joined	22:58
	→ mischat joined	22:58
	← cdown left	22:58
	← rbern left	22:59
	← blueyed left	23:00
matthiaskrgr	ls	23:01
	← newbiee left	23:02
	← neilthereildeil left	23:02
	→ newbiee joined	23:02
	→ romerocesar joined	23:03
	→ Ryanar joined	23:03
	← syg_ left	23:04
	← SonOfLilit left	23:04
	← dsdeiz left	23:04
	← isysd left	23:05
	← stomplee left	23:06
	→ SonOfLilit joined	23:06
	← ahmedelgabri left	23:06
	← NeverDie left	23:07
	← Zamerick left	23:07
	← King_Hual left	23:07
	← finalbeta left	23:09
	← Electrometro left	23:09
	→ rbern joined	23:10
	→ mingrammer joined	23:10
	← _W_ left	23:10
	← prawnzy left	23:10
	← Ryanar left	23:12
	← elastix left	23:12
	← AlHafoudh left	23:12
	→ rsukla joined	23:13
	→ Ryanar joined	23:13
	← MacGyver left	23:13
	← roflin left	23:13
	← Nothing4You left	23:14
	← ohcibi left	23:14
	← mingrammer left	23:14
	← nitric left	23:15
	→ nitric joined	23:16
	→ kaldoran joined	23:16
	→ blueyed joined	23:17
	→ NeverDie joined	23:17
	← SonOfLilit left	23:17
	← rubyonrailed left	23:18
	→ rubyonrailed joined	23:18
	→ AlHafoudh joined	23:19
	→ MacGyver joined	23:19
	→ roflin joined	23:19
	→ ohcibi joined	23:20
	← newbie1 left	23:20
	→ Nothing4You joined	23:20
	ChanServ set mode: +o	23:21
	← al-damiri left	23:21
	Eugene changed the topic to: Welcome to #git, the place for git help and unnecessary bowdlerisms \| Please take the git survey: https://jk.gs/gsurv \| Public logs at http://jk.gs/glog \| First visit? Read: http://jk.gs/git \| Current stable version: 2.10.0 \| Getting "cannot send to channel"? /msg gitinfo .voice \| git-fsck: think of the children	23:22
	Eugene set mode: -o	23:22
	→ SonOfLilit joined	23:22
	← rubyonrailed left	23:23
	← nitric left	23:24
	→ cagmz joined	23:25
	→ johnnyfive joined	23:27
	← Rodya_ left	23:27
	← VagabondAzulien left	23:27
	← kaldoran left	23:28
	← Ryanar left	23:28
	→ Rodya_ joined	23:29
	→ shinnya joined	23:29
	← e14 left	23:30
	→ e14 joined	23:31
	→ prawnzy joined	23:32
	← cdg left	23:33
	→ kaldoran joined	23:34
	← tyreld left	23:34
	← Sasazuka left	23:34
	→ Sasazuka__ joined	23:35
	→ dendazen joined	23:35
	← johnmilton left	23:37
	← Salander27 left	23:37
	← e14 left	23:37
	→ dsdeiz joined	23:38
	→ durham_ joined	23:39
	→ e14 joined	23:40
	← Oebele left	23:40
	← kaldoran left	23:41
	← Mobutils left	23:41
	← AnarchyAo left	23:41
	← durham left	23:42
	← durham_ left	23:43
	← Rodya_ left	23:46
	→ Rodya_ joined	23:46
	← mrpackethead left	23:47
	→ newbie1 joined	23:48
	← Immune__ left	23:48
	← dsdeiz left	23:48
	→ dsdeiz joined	23:49
	← dsdeiz left	23:49
	→ dsdeiz joined	23:49
	→ rominronin joined	23:50
	→ bronson joined	23:50
	← Rodya_ left	23:51
	← nettoweb left	23:53
	← satbyy left	23:53
	→ fguillot joined	23:54
	← jianyang left	23:54
	← rsukla left	23:55
	← rominronin left	23:55
	→ ap0c joined	23:55
	← e14 left	23:55
	→ e14 joined	23:57
	← NeverDie left	23:58
	→ JamesBaxter joined	23:58
	← Guest77202 left	23:59

Logs Search ←Prev date Next date→

Channels Documentation