IRCloggy #git 2018-10-29

Provider of IRC logs since 2005.

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

	2018-10-29
	← finalbeta left	00:04
	→ dsx_ joined	00:06
	← yyy left	00:06
	← zxd left	00:06
	→ noark9 joined	00:06
	→ Anja joined	00:13
	→ cd joined	00:13
	← _ADN_ left	00:14
	← jakogut_ left	00:16
	← prg318 left	00:17
	→ novumsensum joined	00:17
	→ Zexaron joined	00:21
	→ neunon joined	00:22
	← sanches left	00:25
	← xcm left	00:25
	→ xcm joined	00:26
	← Mat001 left	00:26
	← pionen left	00:26
	→ sanches joined	00:27
	→ prg318 joined	00:27
	→ Mat001 joined	00:31
	← venmx left	00:31
	← n3wborn left	00:32
	← manuelschneid3r left	00:33
	→ andyhuzhill joined	00:37
	→ albel727 joined	00:38
	→ houami joined	00:38
	← houami left	00:38
	→ houami joined	00:38
	← houami left	00:40
	← madewokherd left	00:40
	← afuentes left	00:45
	→ prakashd1 joined	00:45
	← shicks2525 left	00:45
	→ shicks2525 joined	00:49
	→ neunon_ joined	00:52
	← neunon left	00:53
	neunon_ → neunon	00:53
	→ BallChang-CN joined	00:53
	← miczac left	00:54
	→ kujorulez joined	00:54
	← kujorulez left	00:59
	→ madewokherd joined	01:00
	→ dsdeiz joined	01:00
	→ wnd24 joined	01:01
	← wnd24 left	01:01
	→ impermanence joined	01:07
	← noark9 left	01:10
	← impermanence left	01:12
	← Anja left	01:13
	← monr0e left	01:13
	→ noark9 joined	01:16
	→ impermanence joined	01:19
	→ daurnimator joined	01:23
	← gxt left	01:27
	→ washing joined	01:27
	← washing left	01:27
	← iuaU2DAMR45QzpSp left	01:28
	← Cheyenne left	01:28
	← noark9 left	01:30
	← Essadon left	01:33
	← m0viefreak left	01:36
	→ igemnace joined	01:40
	← xcm left	01:53
	→ xcm joined	01:53
	← M6HZ left	01:57
	→ M6HZ joined	01:58
	← Toadisattva left	01:59
	→ yohnnyjoe joined	02:01
	← dhollinger left	02:03
	← Zexaron left	02:06
	→ jhaenchen joined	02:15
	← jhaenchen left	02:15
	→ jhaenchen joined	02:15
	→ esrse joined	02:19
	→ dreiss joined	02:20
	← yohnnyjoe left	02:25
	→ finalbeta joined	02:28
	← dreiss left	02:33
	→ dreiss joined	02:35
	→ shicks_ joined	02:37
	← shicks2525 left	02:39
	→ shicks2525 joined	02:42
	← avar left	02:42
	→ avar joined	02:42
	← avar left	02:42
	→ avar joined	02:42
	→ dviola joined	02:42
	← shicks_ left	02:44
	→ notnull joined	02:46
	→ Anja joined	02:47
	← Anja left	02:48
	← F0rTex left	02:52
	→ _wrksx joined	02:52
	→ newnickk joined	02:52
	→ F0rTex joined	02:53
	← rigid left	02:54
	→ cjoshmartin joined	02:54
	→ Raging_Frog joined	02:55
	← wrksx left	02:55
	→ __wrksx joined	02:55
	← Raging_Hog left	02:55
	← colona left	02:56
	← Bucciarati left	02:56
	← armyriad left	02:56
	← newnick left	02:56
	← Marmotte left	02:56
	→ armyriad joined	02:56
	← _wrksx left	02:56
	→ rigid joined	02:57
	← rigid left	02:57
	→ rigid joined	02:57
	→ presh joined	02:57
	← cmyers left	02:57
	← bigpresh left	02:58
	presh → bigpresh	02:58
	→ cmyers joined	02:58
	→ g00s joined	02:58
	→ MoziM joined	02:59
	← mlopezviedma left	03:00
	→ fstd_ joined	03:01
	← Led_Zeppelin left	03:02
	→ Marmotte joined	03:03
	lagothrix → Guest4355	03:03
	← Guest4355 left	03:03
	→ lagothrix joined	03:03
	← fstd left	03:04
	fstd_ → fstd	03:04
	← GavinAld- left	03:04
	← Danili left	03:04
	→ Anja joined	03:05
	← ski7777 left	03:05
	← rafalcpp left	03:05
	← Jackneill left	03:05
	→ ski4x7 joined	03:05
	→ rafalcpp joined	03:05
	← noodle left	03:06
	→ GavinAlderson joined	03:07
	→ Toadisattva joined	03:09
	→ colona joined	03:11
	→ DaniliJog joined	03:13
	→ noodle joined	03:14
	→ Mattiasl_ joined	03:16
	← Mattiaslndstrm left	03:17
	← neunon left	03:18
	→ PLLunlock joined	03:18
	→ Jackneill joined	03:18
	← xcm left	03:19
	→ xcm joined	03:20
	← Mattiasl_ left	03:21
	← Anja left	03:21
	← newnickk left	03:22
	→ newnick joined	03:22
	← dreiss left	03:23
	← orbyt_ left	03:24
	← xcm left	03:26
	→ Bucciarati joined	03:27
	→ xcm joined	03:27
	← ghost43 left	03:27
	→ ghost43 joined	03:28
	→ GreenJel_ joined	03:32
	← GreenJello left	03:33
	← dsdeiz left	03:34
	← fatalhalt left	03:35
	→ dsdeiz joined	03:36
	← dsdeiz left	03:36
	→ dsdeiz joined	03:36
	← Mat001 left	03:37
	→ Mat001 joined	03:37
	→ howdoi joined	03:38
	→ fatalhalt joined	03:40
	→ Anja joined	03:41
	← Anja left	03:41
	→ dg_vrani joined	03:44
	← GreenJel_ left	03:46
	→ GreenJello joined	03:47
	← sanches left	03:47
	→ blackandblue joined	03:48
	→ sanches joined	03:48
	→ breakingsad joined	03:49
	← Mat001 left	03:52
	→ t0dd1v joined	03:53
	→ dhollin3 joined	03:53
	dhollin3 → dhollinger	03:53
	← Toadisattva left	03:53
	← blackandblue left	03:53
	→ Anja joined	03:54
	→ akushner joined	03:56
	→ blackandblue joined	03:58
	← Bucciarati left	03:59
	← avar left	03:59
	→ Bucciarati joined	03:59
	→ avar joined	03:59
	← avar left	03:59
	→ avar joined	03:59
	← blackandblue left	04:00
	→ pzp joined	04:02
	→ stefanotorresi6 joined	04:03
	← stefanotorresi6 left	04:03
	← mrCyborg\|zzz left	04:05
	→ mrCyborg\|zzz joined	04:05
	← Yoda1 left	04:06
	← impermanence left	04:09
	→ orbyt_ joined	04:12
	← prakashd1 left	04:14
	← donofrio_ left	04:15
	← silverballz left	04:18
	→ silverballz joined	04:19
	← w0ng left	04:20
	← orbyt_ left	04:21
	→ dirtyroshi joined	04:24
	← timj left	04:25
	← notnull left	04:27
	← dviola left	04:28
	← JanC left	04:36
	→ JanC joined	04:37
	→ pwhat2 joined	04:37
	← johnny56 left	04:38
	→ timj joined	04:40
	← jhaenchen left	04:41
	← novumsensum left	04:42
	→ jhaenchen joined	04:47
	→ llinguini joined	04:47
	← wadadli left	04:48
	→ houami joined	04:49
	← houami left	04:50
	← Anja left	04:51
	← JimmyRcom left	04:52
	→ BallChang-CN_ joined	04:53
	→ jungsubk joined	04:53
	← BallChang-CN left	04:54
	← Lyqyd left	04:54
	← ferdna left	04:55
	← jhaenchen left	04:56
	→ Acelogic joined	04:57
	← UTAN_dev left	05:01
	→ jhaenchen joined	05:01
	→ Mat001 joined	05:01
	→ pks_ joined	05:01
	→ wadadli joined	05:02
	← pks left	05:03
	pks_ → pks	05:03
	→ Anja joined	05:04
	← jungsubk left	05:06
	← Acelogic left	05:06
	← Mat001 left	05:06
	→ notnull joined	05:07
	← notnull left	05:07
	→ notnull joined	05:07
	← Bobguy left	05:08
	→ nightwolf51 joined	05:09
	→ johnny56 joined	05:09
	→ JimmyRcom joined	05:12
	← Anja left	05:14
	← jhaenchen left	05:15
	← nightwolf51 left	05:16
	→ Anja joined	05:17
	→ jhaenchen joined	05:18
	← Anja left	05:20
	← ghost43 left	05:21
	→ ghost43 joined	05:22
	→ Mat001 joined	05:23
	→ houami joined	05:25
	← houami left	05:30
	← jhaenchen left	05:32
	→ Acelogic joined	05:33
	→ jhaenchen joined	05:36
	← libertyprime left	05:37
	← PLLunlock left	05:41
	← dsx_ left	05:42
	← TinkerT left	05:45
	→ TinkerT joined	05:47
	← JimmyRcom left	05:56
	← jhaenchen left	05:58
	→ jhaenche_ joined	05:58
	← mollusk left	05:59
	→ houami joined	05:59
	← houami left	06:02
	← t0dd1v left	06:02
	← frobnic left	06:03
	← sanches left	06:03
	→ frobnic joined	06:03
	→ mescalinum joined	06:06
	→ w0ng joined	06:07
	← jhaenche_ left	06:07
	→ T_UNIX joined	06:09
	→ jhaenchen joined	06:11
	→ Ayo joined	06:12
	← salek_ left	06:16
	→ soee joined	06:19
	→ mollusk joined	06:19
	← pzp left	06:21
	→ corsair joined	06:23
	→ Salek joined	06:23
	← mollusk left	06:23
	→ voolik joined	06:24
	← madewokherd left	06:24
	→ Hi-Angel joined	06:24
	← d10n-work left	06:24
	→ naoey joined	06:25
	→ spacesuitdiver joined	06:26
	→ mollusk joined	06:27
	← jhaenchen left	06:28
	→ madewokherd joined	06:30
	→ dege joined	06:30
	← spacesuitdiver left	06:31
	→ jhaenchen joined	06:32
	→ dreiss joined	06:32
	← dege left	06:35
	→ tsdh joined	06:37
	→ schubskiesel joined	06:39
	← mollusk left	06:40
	← igemnace left	06:40
	← corsair left	06:41
	→ aw1 joined	06:41
	→ libertyprime joined	06:42
	→ mollusk joined	06:44
	← cjoshmartin left	06:45
	← jfr left	06:47
	→ igemnace joined	06:48
	← selckin left	06:49
	← jhaenchen left	06:49
	→ edward_ joined	06:50
	→ selckin joined	06:50
	→ jiji606 joined	06:51
	→ jhaenchen joined	06:54
	← schubskiesel left	06:57
	→ sztrovacsek joined	06:58
	← edward_ left	06:59
	← dsdeiz left	06:59
	← random_yanek left	07:00
	→ sQVe joined	07:02
	← thiago left	07:02
	→ cjoshmartin joined	07:03
	← dreiss left	07:03
	← g00s left	07:03
	← aw1 left	07:04
	← muelleme left	07:04
	← mollusk left	07:04
	→ oxymoron93 joined	07:05
	← silverballz left	07:05
	← sleepee left	07:06
	→ jhaenche_ joined	07:06
	← jhaenchen left	07:07
	→ prakashd1 joined	07:10
	← jhaenche_ left	07:11
	→ Silmarilion joined	07:12
	← Hi-Angel left	07:13
	→ Hi-Angel joined	07:16
	← ExoUNX left	07:16
	← Mat001 left	07:18
	← Lunatrius left	07:19
	→ jhaenchen joined	07:19
	→ chele joined	07:21
	← voolik left	07:22
	← Zialus left	07:24
	← jhaenchen left	07:24
	→ Zialus joined	07:25
	→ yyy joined	07:25
	← llinguini left	07:26
	→ lowbro joined	07:28
	← lowbro left	07:28
	→ lowbro joined	07:28
	→ JZA joined	07:29
	→ silverballz joined	07:30
	← cjoshmartin left	07:33
	→ zfer joined	07:33
	← Acelogic left	07:34
	← rkta left	07:37
	→ afuentes joined	07:43
	→ muelleme joined	07:45
	McKraken → McKraken_zzzzz	07:46
	← zfer left	07:47
	→ Gray joined	07:47
	← inovas left	07:48
	→ jhaenchen joined	07:49
	→ inovas joined	07:50
	→ corsair joined	07:52
	← muelleme left	07:52
	→ jfr joined	07:52
Gray	Hello Everyone, I have a very strange issue, a file has changed by commits like c4,c3,c2,c1(latest commit comes first), `git log -1 path/to/file` results c4, after merged a commit, the `git log -1 path/to/file` results c3. And changes belongs c4 gone away!	07:53
	→ eduardas_m joined	07:53
	← Goplat left	07:53
	→ houami joined	07:54
	← jhaenchen left	07:54
igemnace	you didn't checkout a different branch during that period? what command did you use to run the merge	07:54
	← houami left	07:54
Gray	igemnace: thanks for your reply, no, I didn't change branch during that period, just use normal merge `git merge BRANCH`.	07:55
	`git merge -s ours` can avoid that	07:56
	← dpyro left	07:56
	← Silmarilion left	07:57
	→ Silmarilion joined	07:57
	← downer06 left	07:58
	→ mollusk joined	07:58
	→ crimastergogo joined	07:59
igemnace	mind posting a !situation	08:00
gitinfo	Please post the url returned by `git log -n 20 --all --graph --format="%h %p %d %s" \| curl -F text=@- https://upaste.de/` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)	08:00
	→ Anja joined	08:01
Gray	gitinfo: https://upaste.de/56i	08:02
	here is what i did: https://img.vim-cn.com/0d/4fc35db639e61b1ab69a74f3721bc527acd497.png	08:02
	→ dsx_ joined	08:03
	→ zfer joined	08:03
_ikke_	also look at --full-history	08:03
Gray	I believe there not only this file affected like this by this commit	08:04
	_ikke_: https://upaste.de/hYp	08:05
	→ jhaenchen joined	08:06
_ikke_	Gray: try git log -1 --full-history path/to/file	08:06
	→ voolik joined	08:07
Gray	_ikke_: That results the merge commit	08:09
	→ dege joined	08:09
_ikke_	Gray: and git log -2 --full-history path/to/file	08:10
	→ Noti joined	08:10
	← jhaenchen left	08:10
	→ jhaenchen joined	08:11
	← kodapa85 left	08:11
Gray	_ikke_: The seconds commits is the commit before I merge.	08:12
	← corsair left	08:12
Gray	_ikke_: Please excuse my typos :)	08:12
	→ zxd joined	08:13
	→ spacesuitdiver joined	08:14
	← jhaenchen left	08:16
	← Noti left	08:17
	← mollusk left	08:18
	→ Noti joined	08:20
	Noti → SteffanW	08:20
	← spacesuitdiver left	08:21
	← sztrovacsek left	08:22
	→ riemann joined	08:22
	← HumorBaby left	08:22
	← lipvig left	08:23
	→ lipvig joined	08:24
	→ jhaenchen joined	08:24
	← yyy left	08:25
	→ HumorBaby joined	08:27
	→ nasd4 joined	08:28
	← jhaenchen left	08:28
	→ JeroenT joined	08:30
	→ jhaenchen joined	08:30
	← opalepatrick left	08:30
	← luca_penn_ left	08:32
	← luke_penn left	08:32
	→ luke_penn joined	08:35
	← jhaenchen left	08:35
	→ venmx joined	08:39
	→ jhaenchen joined	08:39
	← jhaenchen left	08:39
	→ jhaenchen joined	08:39
	→ yyy joined	08:43
	← Anja left	08:45
	→ n3wborn joined	08:47
	← jhaenchen left	08:48
	← Hi-Angel left	08:48
	→ WhereIsMySpoon joined	08:48
	← WhereIsMySpoon left	08:48
	→ WhereIsMySpoon joined	08:48
	→ muelleme joined	08:48
	→ yyy- joined	08:49
	← yyy left	08:49
	→ Hi-Angel joined	08:49
	→ jtrzebiatowski joined	08:49
	→ corsair joined	08:51
	← venmx left	08:51
	→ omerzzz joined	08:51
	→ mofai joined	08:52
	← muelleme left	08:53
	← corsair left	08:54
	← Hi-Angel left	08:57
	→ Hi-Angel joined	08:57
	→ kes joined	08:58
	→ Anja joined	08:58
	→ PEG joined	08:58
	→ bsaboia joined	09:00
	→ Raimondii joined	09:01
	← JeroenT left	09:02
	← Hi-Angel left	09:02
	→ JeroenT joined	09:03
	→ Hi-Angel joined	09:03
	→ mikecmpbll joined	09:03
	← Raimondi left	09:03
	Raimondii → Raimondi	09:03
	→ g00s joined	09:04
	← prakashd1 left	09:05
	→ benr joined	09:06
	← Hi-Angel left	09:07
	→ rsrx joined	09:08
RichiH	59	09:08
	→ kostur86 joined	09:09
	← zulutango left	09:14
	← xcm left	09:16
	→ prakashd1 joined	09:16
	← tsdh left	09:17
	→ xcm joined	09:17
	← catsup left	09:18
	→ catsup joined	09:19
	← catsup left	09:19
	→ catsup joined	09:19
_ikke_	https://www.xkcd.com/221/	09:20
	← hussam left	09:25
	← goweol1 left	09:27
	→ venmx joined	09:28
	→ miczac joined	09:29
	← BallChang-CN_ left	09:29
	→ BallChang-CN joined	09:30
	← rsrx left	09:30
	→ g00s_ joined	09:31
	← crimastergogo left	09:32
	← g00s left	09:32
	← andyhuzhill left	09:33
	→ Silenced joined	09:33
	← Silenced left	09:35
	← g00s_ left	09:36
	→ floppydh joined	09:37
	← yyy- left	09:38
	→ rxy joined	09:38
	← GreenJello left	09:38
	→ gooooootime joined	09:40
	← notnull left	09:40
	← rxy left	09:44
	→ m-alpha joined	09:44
	← cybrNaut left	09:52
	→ notnull joined	09:52
	→ _ADN_ joined	09:59
	→ math-alpha joined	10:00
	← lankanmon left	10:00
	→ math-alpha_ joined	10:01
	← m-alpha left	10:01
	→ lomex joined	10:02
	→ jhaenchen joined	10:04
	← jhaenchen left	10:04
	→ jhaenchen joined	10:04
	← math-alpha left	10:05
	← jhaenchen left	10:09
	← miczac left	10:13
	← n3wborn left	10:14
	→ jhaenchen joined	10:15
	← jhaenchen left	10:15
	→ jhaenchen joined	10:15
	→ yyy- joined	10:16
	← math-alpha_ left	10:16
	→ math-alpha_ joined	10:16
	→ cdown_ joined	10:19
	← prakashd1 left	10:20
	← jhaenchen left	10:20
	→ jhaenchen joined	10:20
	→ plexigras joined	10:21
	→ LondonAppDev joined	10:22
	← cdown left	10:22
	cdown_ → cdown	10:22
	→ Zexaron joined	10:22
	← omerzzz left	10:24
	← jhaenchen left	10:25
	→ CodeSlingerPaul joined	10:25
	→ astrofog joined	10:26
	← gooooootime left	10:31
	← BallChang-CN left	10:33
	→ BallChang-CN joined	10:33
	→ crimastergogo joined	10:36
	← Anja left	10:36
	← igemnace left	10:36
	← BallChang-CN left	10:37
	→ BallChang-CN joined	10:38
	→ nowhereman_ joined	10:39
	→ rsrx joined	10:39
	← crimastergogo left	10:41
	← kostur86 left	10:41
	→ minimal_life joined	10:41
	→ jhaenchen joined	10:42
	→ wildermind joined	10:45
	← jhaenchen left	10:46
	← CodeSlingerPaul left	10:48
	→ CodeSlingerPaul joined	10:49
	← breakingsad left	10:53
	→ Silenced joined	10:53
	← genius_monkey left	10:53
	← minimal_life left	10:54
	→ genius_monkey joined	10:54
	← HumorBaby left	10:56
	→ HumorBaby_ joined	10:57
	← nowhereman_ left	10:57
	← genius_monkey left	10:58
	→ elsheepo joined	10:59
	→ genius_monkey joined	10:59
	elsheepo → beatzz	11:00
	← LondonAppDev left	11:01
	← lomex left	11:04
	← beatzz left	11:05
	→ lankanmon joined	11:05
	→ bbbtery joined	11:05
	← dg_vrani left	11:06
	→ LondonAppDev joined	11:07
	→ LondonAp_ joined	11:08
	← dsx_ left	11:08
	→ redeemed joined	11:09
	← LondonAppDev left	11:11
	← bbbtery left	11:14
	← xaa left	11:14
	→ bbbtery joined	11:14
	← bbbtery left	11:14
	← db`` left	11:15
	← alhariel left	11:15
	→ alhariel joined	11:15
	← Some_Person left	11:15
	← mroth_ left	11:15
	← huhlig_ left	11:15
	← phtes_ left	11:15
	← jakesyl_mobile_ left	11:15
	← cttttt left	11:15
	← hexagoxel left	11:15
	← dakar left	11:15
	→ ppang joined	11:16
	→ mroth_ joined	11:16
	→ db` joined	11:16
	← lamont left	11:16
	← leah2 left	11:16
	← bremner left	11:16
	← npgm left	11:16
	← Remram left	11:16
	← dwmw2 left	11:16
	← reu left	11:16
	← lxk left	11:16
	← xcm left	11:16
	→ xcm joined	11:16
	← jabular left	11:17
	← doppo left	11:17
	← stfn left	11:17
	← SleePy left	11:17
	← McKraken_zzzzz left	11:17
	← POQDavid left	11:17
	← KennosiS left	11:17
	← zalun left	11:17
	← marvi left	11:17
	← de-vri-es left	11:17
	← mobile_c left	11:17
	→ qqx_ joined	11:17
	→ marvi joined	11:17
	← qqx left	11:17
	← nedbat left	11:17
	← indieross left	11:17
	→ huhlig_ joined	11:17
	→ jakesyl_mobile_ joined	11:17
	→ cttttt joined	11:17
	→ phtes_ joined	11:18
	→ doppo joined	11:18
	→ stfn joined	11:18
	← thinkpad left	11:18
	← Tobbi_ left	11:18
	→ Some_Person joined	11:19
	→ zalun joined	11:19
	→ npgm joined	11:19
	← hexnewbie left	11:20
	← marvi left	11:20
	→ thinkpad joined	11:21
	→ dwmw2_gone joined	11:21
	→ bremner joined	11:21
	← bremner left	11:21
	→ bremner joined	11:21
	→ hexnewbie joined	11:22
	→ dakar joined	11:22
	→ hexagoxel joined	11:22
	→ SleePy joined	11:22
	→ nedbat joined	11:22
	→ KennosiS joined	11:22
	→ marvi joined	11:22
	→ McKraken_zzzzz joined	11:22
	→ reu joined	11:22
	McKraken_zzzzz → McKraken	11:23
	→ POQDavid joined	11:23
	→ lamont joined	11:23
	→ crimastergogo joined	11:24
	← plouescat left	11:25
	→ plouescat joined	11:26
	→ BouncyMike joined	11:27
	→ Phylock joined	11:27
	→ jhaenchen joined	11:28
	→ Remram joined	11:29
	→ jabular joined	11:30
	→ leah2 joined	11:30
	→ indieross joined	11:30
	→ de-vri-es joined	11:30
	← plouescat left	11:30
	→ lxk joined	11:31
	← jhaenchen left	11:32
	→ rvsjoen joined	11:33
	→ jamm joined	11:34
	← benr left	11:36
	→ cybrNaut joined	11:37
	→ jhaenchen joined	11:37
	← astrofog left	11:37
	← TheRuckus left	11:37
	→ benr joined	11:39
	→ TheRuckus joined	11:39
	← LondonAp_ left	11:40
	← jhaenchen left	11:41
	→ jhaenchen joined	11:43
	← crimastergogo left	11:43
	← TheRuckus left	11:44
	← math-alpha_ left	11:45
	→ Tobbi_ joined	11:46
	← xcm left	11:47
	→ math-alpha_ joined	11:47
	→ xcm joined	11:47
	→ dudek joined	11:48
	← jhaenchen left	11:49
	→ math-alpha joined	11:52
	← math-alpha_ left	11:53
	→ sleepee joined	11:53
	← rsrx left	11:53
	→ LondonAppDev joined	11:57
	→ LondonAp_ joined	11:58
	← xcm left	12:00
	← inovas left	12:00
	→ elsheepo joined	12:00
	→ Tobbi_1 joined	12:00
	→ xcm joined	12:00
	← Tobbi_ left	12:00
	Tobbi_1 → Tobbi_	12:00
	← BallChang-CN left	12:01
	← LondonAppDev left	12:01
	→ Guest80 joined	12:01
	← Guest80 left	12:02
	→ inovas joined	12:02
	→ TheRuckus joined	12:03
	← chachasmooth left	12:04
	→ Essadon joined	12:04
	→ chachasmooth joined	12:04
	← LondonAp_ left	12:07
	→ LondonAppDev joined	12:09
	→ LondonAp_ joined	12:09
	→ mishu_ joined	12:09
	← mishu_ left	12:11
	→ jhaenchen joined	12:11
	→ troulouliou_div2 joined	12:11
	→ shogil joined	12:12
	← LondonAppDev left	12:13
	← armyriad left	12:13
	← BouncyMike left	12:13
	→ armyriad joined	12:14
	← jhaenchen left	12:15
	← jstimm left	12:18
	HumorBaby_ → HumorBaby	12:19
	← ludovicchabant_ left	12:21
	→ ludovicchabant joined	12:21
	← Klumben left	12:22
	→ simmarith joined	12:22
	← rts-sander left	12:22
	← graingert left	12:24
	→ graingert joined	12:24
	← bigode left	12:24
	← introom left	12:25
	→ Lunatrius joined	12:26
	→ introom joined	12:26
	← SleePy left	12:28
	→ donofrio joined	12:29
	→ SleePy joined	12:30
	← ar1el left	12:32
	→ Klumben joined	12:32
	← sleepee left	12:34
	→ JeroenT_ joined	12:35
	← JeroenT_ left	12:37
	→ JeroenT_ joined	12:37
	← JeroenT left	12:37
	← theskillwithin left	12:38
	← jtrzebiatowski left	12:38
	→ jhaenchen joined	12:40
	→ virmin joined	12:41
	→ theskillwithin joined	12:43
	← topdownjimmy left	12:43
	→ lomex joined	12:43
	→ topdownjimmy joined	12:44
	← esrse left	12:44
	← jhaenchen left	12:45
	→ hussam joined	12:45
	→ rsrx joined	12:45
	← xcm left	12:47
	→ prakashd1 joined	12:47
	→ xcm joined	12:47
	→ nxet joined	12:48
	← SteffanW left	12:48
	← jab416171 left	12:50
	→ sleepee joined	12:50
	← madewokherd left	12:51
	→ bigode joined	12:51
	→ nowhereman_ joined	12:51
	→ jab416171 joined	12:53
	→ rts-sander joined	12:54
	→ madewokherd joined	12:57
	← sleepee left	12:59
	← nowhereman_ left	12:59
	← shogil left	13:01
	← LondonAp_ left	13:01
	← Codaraxis left	13:02
	→ jhaenchen joined	13:03
	← jhaenchen left	13:03
	→ jhaenchen joined	13:03
	→ Codaraxis_ joined	13:03
	← psprint left	13:03
	→ psprint_ joined	13:03
	← jhaenchen left	13:07
	← webstrand left	13:12
	← xcm left	13:13
	→ webstrand joined	13:13
	→ xcm joined	13:13
	← mofai left	13:14
	→ noark9 joined	13:16
	← staafl_ left	13:17
	eblip → eb0t_	13:17
	← frobnic left	13:18
	→ frobnic joined	13:18
	← Gray left	13:21
	→ cfoch joined	13:22
	← cybrNaut left	13:23
	→ cybrNaut joined	13:23
	→ jhaenchen joined	13:24
	→ crimastergogo joined	13:25
	→ rsrx_ joined	13:25
	← rsrx_ left	13:25
	← noark9 left	13:27
	← yyy- left	13:27
	← jhaenchen left	13:29
	← rsrx left	13:29
	→ noark9 joined	13:29
	→ staafl joined	13:31
	→ AndresInSpace joined	13:31
	→ jhaenchen joined	13:31
	→ yyy- joined	13:31
	→ Kaisyu joined	13:33
	← genius_monkey left	13:33
	→ genius_monkey joined	13:34
	← Silenced left	13:36
	← jhaenchen left	13:36
	→ luis joined	13:41
	→ jhaenchen joined	13:41
	← genius_monkey left	13:43
	← ppang left	13:43
	→ genius_monkey joined	13:44
	← noark9 left	13:45
	← jhaenchen left	13:46
	→ noark9 joined	13:46
	→ rsrx joined	13:46
	← elsheepo left	13:47
	→ Hi-Angel joined	13:47
	→ seventh__ joined	13:48
Hi-Angel	Does anybody know, how to add "Reviewed-by Name<mail>" to all commits? I'm trying this command I found somewhere, but it fails rebase with "invalid line": GIT_EDITOR='git interpret-trailers --trailer "Reviewed-by: User<mail>" --in-place' git rebase -i HEAD~2	13:49
	→ LondonAppDev joined	13:50
	→ LondonAp_ joined	13:51
	→ ferdna joined	13:51
	→ unpythonic joined	13:53
	→ jetchisel joined	13:54
	← LondonAppDev left	13:55
	→ polydo_s joined	13:55
	→ crose joined	13:55
	← crose left	13:55
	← polydo_s left	13:55
	→ jstimm joined	13:57
	→ jhaenchen joined	13:58
	← jetchisel left	13:58
	→ moei joined	14:00
	← jhaenchen left	14:02
	← Revan- left	14:06
	← dege left	14:06
	→ Assault joined	14:07
Assault	hi...with submodules it is only possible to include the whole repository to another, right?	14:08
	→ Revan- joined	14:08
Assault	I would need a library B in my project A, but I would only need one folder (and its subfolders) of B in project A, not the whole repository	14:09
	any tips?	14:09
	← hapos left	14:09
	← unpythonic left	14:09
	← zsoc left	14:09
_ikke_	right, only the whole repo	14:09
	→ jhaenchen joined	14:10
Assault	ok..so i guess i have to live with that then..	14:11
	← tonton_ left	14:13
	← xcm left	14:15
	→ Raed\|Laptop joined	14:15
	→ xcm joined	14:15
	→ staafl_ joined	14:16
	→ haiiokarin joined	14:16
Assault	are there any other ways to get only certain directory from another git repo?	14:16
_ikke_	if the remote supports it, git archive	14:17
	← jhaenchen left	14:17
_ikke_	(github doesn't expose git archive)	14:17
	← staafl left	14:17
	→ jhaenchen joined	14:17
haiiokarin	new to git, just playing around with some tutorial and had to edit some .txt in vim. I did it good few times but now it crashed and made two files with .swo and .swp . Got no luck do delete them with "rm" ? Any suggestion?	14:17
_ikke_	haiiokarin: if you open the file in vim (the original), it should give you an option to delete the swap files	14:18
	← PEG left	14:18
	← nasd4 left	14:19
haiiokarin	oh ok. i have tried to delete it via git bash	14:19
	→ achadwick joined	14:19
	← jhaenchen left	14:21
	→ jhaenchen joined	14:22
	→ monr0e joined	14:22
Assault	_ikke_, yeah im using GitHub so cannot use archive then..	14:22
	→ shogil joined	14:25
	← mikecmpbll left	14:27
	← shogil left	14:27
	→ shogil joined	14:28
	← genius_monkey left	14:28
	→ spacesuitdiver joined	14:29
	→ genius_monkey joined	14:29
	← jhaenchen left	14:31
	← spacesuitdiver left	14:31
	← shogil left	14:31
	← yyy- left	14:31
	← lomex left	14:32
	← crimastergogo left	14:33
	← genius_monkey left	14:33
	→ genius_monkey joined	14:34
	→ jhaenchen joined	14:35
	→ dpyro joined	14:35
	→ AbleBacon joined	14:35
	← queip left	14:36
	→ rafalcpp_ joined	14:36
	← rafalcpp left	14:36
	→ yyy- joined	14:37
	→ RoriconKnight joined	14:38
	→ lomex joined	14:39
	→ queip joined	14:39
	← Bucciarati left	14:40
	← avar left	14:41
	← LondonAp_ left	14:42
	→ igemnace joined	14:43
	→ Guest48 joined	14:43
	← fxrs left	14:43
	→ fxrs joined	14:43
	← Guest48 left	14:44
	← prakashd1 left	14:44
	→ Bucciarati joined	14:45
	→ avar joined	14:45
	← avar left	14:45
	→ avar joined	14:45
	→ LondonAppDev joined	14:46
	→ quxgyver joined	14:46
	→ chris349 joined	14:46
	← jhaenchen left	14:48
	← _ikke_ left	14:48
	← fxrs left	14:49
	→ fxrs joined	14:50
	← RoriconKnight left	14:50
	← seventh__ left	14:50
	→ RoriconKnight joined	14:51
	← RoriconKnight left	14:51
	← LondonAppDev left	14:51
	→ RoriconKnight joined	14:52
	→ LondonAppDev joined	14:52
	→ _ikke_ joined	14:52
	← RoriconKnight left	14:53
	→ RoriconKnight joined	14:53
	→ Airat102vb joined	14:55
	→ rafasc joined	14:56
	← Raed\|Laptop left	14:57
	→ hapos joined	14:58
	→ VibesYuth joined	15:01
	→ noya joined	15:01
	→ JimmyRcom joined	15:01
	← akushner left	15:01
	→ schleppel joined	15:02
	← Assault left	15:02
	← fflam left	15:02
	← Revan- left	15:02
	→ fflam joined	15:02
	→ unpythonic joined	15:02
	← VectorX left	15:02
	← Silmarilion left	15:03
	← noja left	15:03
	← oxymoron93 left	15:04
	← Airat102vb left	15:05
	→ orbyt_ joined	15:06
	qqx_ → qqx	15:06
	← sQVe left	15:08
	→ dreiss joined	15:10
	→ random_yanek joined	15:11
	→ VectorX joined	15:12
	→ jhaenchen joined	15:13
	← jhaenchen left	15:13
	→ jhaenchen joined	15:13
	→ Brain joined	15:13
	→ GuKKDevel joined	15:13
	← plains left	15:15
	← Anaphylaxis left	15:16
	→ plains joined	15:16
	← flo[m] left	15:16
	← oftc_ftw[m] left	15:16
	← Miguelngel[m] left	15:16
	← k0d3fr34k[m] left	15:16
	→ Miguelngel[m] joined	15:17
	← [Brain] left	15:17
	→ oftc_ftw[m] joined	15:17
	← GuKKDevel left	15:17
	→ Anaphylaxis joined	15:17
	→ spacesuitdiver joined	15:18
	→ flo[m] joined	15:18
	→ k0d3fr34k[m] joined	15:19
	← riceandbeans left	15:20
	← _ikke_ left	15:22
	→ Revan- joined	15:24
	→ Matt\|home joined	15:24
	← lomex left	15:24
Matt\|home	hi. how do i make 1 branch overwrite another branch with all of its changes? in other words let's say i have master and my_branch , and i need any discrepancies between them to be changed in my_branch	15:25
	is that possible ?	15:25
	← DaniliJog left	15:29
	← yyy- left	15:30
	→ thiago joined	15:30
	→ Guest38013 joined	15:31
	← RoriconKnight left	15:32
	→ RoriconKnight joined	15:32
Hello71	... merge?	15:33
	← AbleBacon left	15:33
	→ fission6 joined	15:34
rafasc	merging, and choosing -Xtheirs or -Xours, depending from which side you're tring to merge.	15:35
	Guest38013 → novumsensum	15:35
	← LondonAppDev left	15:35
	→ AbleBacon joined	15:36
	→ Regon joined	15:37
	← dreiss left	15:37
	→ catern joined	15:38
	→ LondonAppDev joined	15:39
	→ Danili joined	15:40
catern	hey #git, so say I have a repo X, which contains file A; and I want to make a copy of file A called file B, and start independently modifying both file A and file B. (for example, say they're implementations of two minorly different versions of a protocol)	15:41
	is there any way to represent within git that the two files have a common history, and are really "branches" of each other, or maybe even support "cherry-picking" a patch from on top of file A to file B or vice versa?	15:41
	← voolik left	15:42
	← orbyt_ left	15:42
	→ _ikke_ joined	15:43
Zexaron	seeing yellow pink purple and cyan for the first time in git diff, this anything new?	15:44
	→ mollusk joined	15:44
Zexaron	I did set to show "moved" stuff by default some time ago tho	15:44
_ikke_	Zexaron: they did add some more diff colors yes	15:45
	to highlight code that has just moved rather than was added or removed	15:45
	→ dege joined	15:47
Zexaron	are the move color more to differentiate or they have different sumbeaning?	15:48
	submeaning?	15:48
	some are pink removed to yellow added, pink removed to cyan added	15:48
	well, I did merge two identical code pieces pieces into one function	15:49
	so some of it got removed and moved at the same time kinda	15:49
	→ yyy- joined	15:49
	→ balance joined	15:50
	← jstimm left	15:50
	← mollusk left	15:51
	→ impermanence joined	15:51
	← dege left	15:52
	→ Serus joined	15:53
	→ al-damiri joined	15:55
	amosbird → amos	15:56
	amos → amos1	15:56
	← gusnan left	15:56
	← bsaboia left	15:56
rafasc	catern: git tracks the state of your project, it doesn't treat files individually.	15:57
	→ gusnan joined	15:57
	← gusnan left	15:57
	→ gusnan joined	15:57
catern	rafasc: yes, I understand that, but nevertheless maybe there's some clever hack	15:58
	→ Mat001 joined	15:58
catern	for example, maybe I could use git subtree to achieve this, if I moved file A into a separate repo?	15:58
rafasc	you can use branches then.	16:00
catern	sure	16:00
	if file A was in a separate repo, certainly I could use branches, so what if file A isn't? I guess I just wonder, maybe there's a hack on git subtree here?	16:01
rafasc	But if you want some changes applied on both sides, you'll have to merge back and forward, or cherry-pick, which isnt ideal.	16:01
	→ dege joined	16:01
catern	yeah that's fine	16:01
	→ bn_work joined	16:01
	← cfoch left	16:01
rafasc	then just make two branches? There's no need for subtrees.	16:01
catern	after all, the other case (of just naively copying the file) is not even being able to merge or cherry-pick back and forth	16:01
	no, I want to simultaneously use both file A and file B in the same program, I want them both around at the same time	16:02
rafasc	or setup whatever you're doing to use "includes".	16:02
	← notnull left	16:03
	→ neunon joined	16:03
	→ bsaboia joined	16:03
rafasc	you can apply the changes from one file to the other with diff & patch...	16:04
	← lowbro left	16:04
	← Kaisyu left	16:04
catern	yes, but that sucks :)	16:05
bn_work	would it be a bad idea to checkin a static website (complete with images, CSS + JS, etc.) into git(hub)? I understand git isn't very good at binary storage? FWIW, I don't think the images will be changing that often though	16:05
catern	I'm using a version control system to avoid using diff & patch, and actually get a proper history and tooling :)	16:05
grawity	bn_work: eh, people do that for small websites	16:06
	Github practically has static web hosting as a feature	16:06
bn_work	grawity: yeah	16:07
	← Hi-Angel left	16:08
	← Boobie left	16:08
	← genius_monkey left	16:08
bn_work	so not a problem?	16:09
	→ genius_monkey joined	16:09
bn_work	I guess the problem with binary blobs is that even if it changes, git can't intelligently only store the diffs?	16:09
grawity	binary blobs tend to not have small diffs	16:10
	← chele left	16:10
grawity	the packfile algorithm doesn't care much about what the files contain, as long as they're actually similar	16:10
	← Guest13389 left	16:11
bn_work	so binary blob repos tend to just snowball up?	16:11
grawity	for most file formats, yes	16:11
	→ crimastergogo joined	16:12
	← unpythonic left	16:12
	← inovas left	16:12
	← genius_monkey left	16:13
	→ genius_monkey joined	16:14
	→ inovas joined	16:16
	→ littlebit1 joined	16:16
	← troulouliou_div2 left	16:18
bn_work	so is there a better way to store these then?	16:18
	← genius_monkey left	16:18
grawity	dedicated blob storage service such as S3 or compatible, or a cheap server under your desk	16:19
	→ Boobie joined	16:19
bn_work	or is that basically just storing it w/o version history? (I was reading there are `shallow` (sub-module?) repos, however that's done)	16:19
grawity	(or, for example, git-lfs)	16:19
	either way, external to the repository	16:19
	→ genius_monkey joined	16:19
littlebit1	hi people, i have a .diff file that I would like to apply to a git repository but it tells me that the patch does not apply	16:19
_ikke_	how was that diff file generated?	16:20
	← LondonAppDev left	16:20
	← redeemed left	16:20
littlebit1	_ikke_: I want to customize a the terminal from suckless-tools a bit, and I got the .diff file from suckless-tools themselves	16:21
	← eduardas_m left	16:21
_ikke_	The first thing you can try is using -3	16:22
	git apply -3	16:22
	→ LondonAppDev joined	16:22
	← genius_monkey left	16:23
	→ genius_monkey joined	16:24
littlebit1	_ikke_: it now tells me that it applied the patch but with conflicts	16:24
	← _ikke_ left	16:24
	→ Guest13389 joined	16:25
	← dudek left	16:27
	→ _ikke_ joined	16:27
littlebit1	_ikke_: wb	16:28
	yyy- → yyy	16:28
_ikke_	thanks	16:28
	can you repeat the last thing you said?	16:28
	ah yeah	16:28
	the conflicts	16:28
	you have to solve them	16:28
	git cannot do that for you	16:28
	→ durham joined	16:29
	← thiago left	16:29
littlebit1	_ikke_: could you test what i did since I'm new to git:	16:30
	→ gxt joined	16:30
littlebit1	st.suckless.org/patches/solarized	16:31
	→ czart joined	16:31
	→ Emperor_Earth joined	16:31
littlebit1	_ikke_: since they are 2 diffs	16:31
_ikke_	The problem most likely is that the diff was generated from an older version	16:31
	There are diff files per version	16:32
	← bsaboia left	16:32
_ikke_	You have to apply the correct one	16:32
	→ akushner joined	16:32
littlebit1	_ikke_: since I use 0.8.1 I have 2 candidates, how do you rollback form the 'apply'?	16:34
_ikke_	just git checkout <filename> I guess	16:35
	→ orbyt_ joined	16:41
	→ jtrzebiatowski joined	16:41
	← jamm left	16:41
	← xcm left	16:42
littlebit1	_ikke_: ok will try	16:42
	_ikke_: thx btw for the fast response	16:42
	→ xcm joined	16:45
bn_work	grawity: so git-lfs looks interesting but does it just end up storing the binary files in a separate git repo?	16:45
	← nxet left	16:46
grawity	no, it's just another form of fully separate blob storage	16:46
	→ nowhereman_ joined	16:46
	→ thebope joined	16:47
	← kneeki left	16:47
	→ sourcream joined	16:47
bn_work	grawity: or wait, it is just stored on a web server basically?	16:48
grawity	yes	16:48
	→ sammyo joined	16:50
	← fission6 left	16:52
teward	how do I reset head to remote head and blast away any local commits I have here so that I can properly rebase a change off of remote 'origin' 's head?	16:52
	i forgot my git-fu today :\|	16:52
	← littlebit1 left	16:52
	rafalcpp_ → rafalcpp	16:52
_ikke_	git reset --hard <remote>/<branchname>	16:52
	cannot be reverted	16:52
	→ c3llulardaxius joined	16:53
	c3llulardaxius → c3llular	16:53
_ikke_	(for uncomitted changes that is)	16:53
	← WhereIsMySpoon left	16:53
	← genius_monkey left	16:53
	→ genius_monkey joined	16:54
	← LondonAppDev left	16:55
	→ prakashd1 joined	16:57
bn_work	hmm, starting to wonder if it may be more hassle than VS just storing it in github to begin with and dealing with the initial clone-time hit. I mean if I delete a binary file, commit it normally, the clone should be less data, no?	16:57
	→ vvor joined	16:57
	→ WhereIsMySpoon joined	16:59
	← akushner left	16:59
	→ LondonAppDev joined	16:59
	→ mikecmpbll joined	17:00
	→ LondonAp_ joined	17:00
	→ akushner joined	17:01
	← JeroenT_ left	17:01
j416	bn_work: the whole point with version control is that you have a history of what happened and you can look at an earlier state.	17:03
	bn_work: no, it doesn't disappear.	17:03
	← genius_monkey left	17:03
	← LondonAppDev left	17:03
	→ blackandblue joined	17:04
	→ genius_monkey joined	17:04
	← madewokherd left	17:04
	← yyy left	17:04
	→ bolovanos joined	17:04
	← WhereIsMySpoon left	17:05
	→ troulouliou_dev joined	17:05
	← noark9 left	17:07
	→ pawle joined	17:07
	← genius_monkey left	17:08
	← Gnuman left	17:09
	← ThatOtherGuy left	17:09
	← LogicAside left	17:09
	→ genius_monkey joined	17:09
	← zfer left	17:10
	→ dansan joined	17:10
	← pawle left	17:11
	→ noark9 joined	17:12
	← genius_monkey left	17:13
	→ genius_monkey joined	17:14
	← Eryn_1983_FL left	17:15
	→ toothe joined	17:15
	← diogenese left	17:16
	→ diogenese joined	17:17
	← pwhat2 left	17:18
	→ muelleme joined	17:20
	→ causasui joined	17:20
	← Ayo left	17:21
	← HumorBaby left	17:22
bn_work	but git-lfs just moving the problem out of git and into a webserver instead? supposedly it supports versioned files too	17:22
	s/but git-lfs/but is git-lfs/	17:23
	→ BSaboia joined	17:23
	← chachasmooth left	17:24
	← muelleme left	17:25
rafasc	bn_work: in essence, lfs replaces your file with a text file saying: "you can get this file at server X".	17:25
grawity	in many cases, people are okay with delaying the fetch of large blobs until they specifically need them	17:25
bn_work	right, but how is stored on the webserver end?	17:26
grawity	even when they would rather have the commit logs and text stuff local	17:26
	on the webserver, it's just a folder full of files	17:26
bn_work	one file per version of it?	17:26
grawity	probably	17:26
bn_work	or blob per version?	17:26
grawity	some product-specific layout, but not a Git repository	17:26
	→ greggerz joined	17:26
grawity	whether it's file or blob, whether they're stored in full or compressed, is an implementation detail	17:26
	they might be stored in full (just deduplicated by sha1 like Git itself does)	17:27
	→ chachasmooth joined	17:27
	→ yyy joined	17:31
	← orbyt_ left	17:31
bn_work	damn, our website folder size is like several GBs	17:34
	→ orbyt_ joined	17:36
	→ Silenced joined	17:36
	→ leeN joined	17:37
	→ thiago joined	17:37
	← novumsensum left	17:38
	← mikecmpbll left	17:38
	← noark9 left	17:39
	← Boobie left	17:39
	→ Benou joined	17:40
	→ Mattiaslndstrm joined	17:40
	← cbrt64 left	17:40
	← math-alpha left	17:41
	→ cbrt64 joined	17:43
	← Benou left	17:46
	→ theoceaniscool joined	17:47
	→ noark9 joined	17:49
	→ ThatOtherGuy joined	17:50
	→ Gnuman joined	17:50
	→ LogicAside joined	17:51
	→ muelleme joined	17:52
	← cbrt64 left	17:54
	→ Envil joined	17:55
	← LondonAp_ left	17:55
	← jrm left	17:56
	← bertschneider left	17:58
guardian	Hey guys, I goofed and rm -rf a working tree. For the sake of it, I used ext4magic to recover files. And now I have a mostly working git repository, despite some error: non-monotonic index errors	17:58
	→ cbrt64 joined	17:58
guardian	is it something I can recover from?	17:58
	→ bertschneider joined	17:58
	← crimastergogo left	17:58
	← genius_monkey left	17:58
grawity	move away .git/index, run `git read-tree HEAD`	17:59
	→ genius_monkey joined	17:59
	→ Eryn_1983_FL joined	18:01
	← rafasc left	18:01
guardian	same	18:02
	error: non-monotonic index .git/objects/pack/pack-bb68ea10fe2f7f59d109ba4fffc63dc33a736f9b.idx	18:02
	error: index file .git/objects/pack/pack-1c6da6ccd37708d4e8f2f6b85829ccccd1c0731b.idx is too small	18:03
	etc...	18:03
	← genius_monkey left	18:03
grawity	oh, that kind of index	18:03
	→ genius_monkey joined	18:04
grawity	start with `git verify-pack .git/objects/pack/pack-1c6da6ccd37708d4e8f2f6b85829ccccd1c0731b.pack`	18:04
	← muelleme left	18:04
grawity	if that works, run `git index-pack` on it	18:04
guardian	so I need to do on all of them manually?	18:04
	← orbyt_ left	18:05
guardian	what if I try to push my branch to origin, will that work?	18:05
bn_work	hmm, kinda wish `git-lfs` would support ssh/scp :/	18:05
	→ Sasazuka joined	18:05
	→ crimastergogo joined	18:06
bn_work	guardian: wouldn't that corrupt origin?	18:06
	can you not clone back down?	18:06
	← crimastergogo left	18:06
guardian	the branch doesn't exits on origin	18:07
	→ jrm joined	18:07
	← _ADN_ left	18:09
guardian	ok pushing to origin worked, local repo still damaged	18:11
	→ orbyt_ joined	18:13
grawity	why would it corrupt origin	18:15
	← orbyt_ left	18:16
	← prakashd1 left	18:18
	← Lunatrius left	18:19
	← T_UNIX left	18:22
	← qqx left	18:22
	→ qqx joined	18:22
guardian	would git-fsck repair all these index files?	18:23
	→ rafasc joined	18:23
	← noark9 left	18:23
_ikke_	grawity mentioned what commands you should run	18:24
	← quxgyver left	18:24
	← alhariel left	18:24
guardian	sure, will do, but there are many files	18:24
	alright here I go, thanks for the help	18:24
	→ orbyt_ joined	18:26
	← ilmostro left	18:26
	← cbrt64 left	18:26
	→ cbrt64 joined	18:28
	← genius_monkey left	18:28
bn_work	sorry, assumed origin already had it there	18:29
	→ genius_monkey joined	18:29
	→ ilmostro joined	18:30
	← jhaenchen left	18:31
	← cbrt64 left	18:32
	→ jhaenchen joined	18:32
	→ m_ joined	18:33
	← genius_monkey left	18:33
	→ genius_monkey joined	18:34
	→ cbrt64 joined	18:34
	← kes left	18:35
	← Mat001 left	18:36
	→ fahadash joined	18:37
	→ jstimm joined	18:37
	→ wootehfoot joined	18:39
	← schleppel left	18:39
	← c3llular left	18:40
	← cbrt64 left	18:44
	→ Mike11 joined	18:45
	→ Anja joined	18:46
	← czart left	18:46
	→ cbrt64 joined	18:47
	→ mikecmpbll joined	18:47
	→ z0 joined	18:49
	→ graphene joined	18:50
	z0 → Guest46914	18:50
	← tazle__ left	18:51
	← Guest46914 left	18:52
	→ salek_ joined	18:52
	→ zzz- joined	18:52
	→ ZeZu joined	18:53
	→ pr0t joined	18:53
	← zzz left	18:53
	← cbrt64 left	18:54
	← Salek left	18:54
	→ smitop_ joined	18:55
	← orbyt_ left	18:56
	→ cbrt64 joined	18:56
	→ GreenJello joined	18:58
	→ pawle joined	18:59
	← cbrt64 left	19:01
	→ polydo_s joined	19:01
	→ tazle_ joined	19:03
	← Mike11 left	19:03
	← floppydh left	19:06
	← polydo_s left	19:06
	→ dsx_ joined	19:07
	← venmx left	19:08
	→ garrettkajmowicz joined	19:10
	← sourcream left	19:10
	← sammyo left	19:10
garrettkajmowicz	Is there a straight-forward way to chop off the ~5 most recent commits to a public repo? I'd like to avoid performing a revert because that makes reapplication more difficult.	19:11
_ikke_	!fixup	19:11
gitinfo	So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	19:11
	→ polydo_s joined	19:12
	→ GreenJel_ joined	19:13
	← achadwick left	19:13
	← jothibasu[m] left	19:13
	← graphene left	19:13
	→ jothibasu[m] joined	19:13
	← blackandblue left	19:14
	→ graphene joined	19:14
	→ notnull joined	19:15
	← notnull left	19:15
	→ notnull joined	19:15
	← GreenJello left	19:15
	← zzz- left	19:15
	← Phylock left	19:16
	← polydo_s left	19:16
	← leeN left	19:16
	→ Phylock joined	19:17
	→ jnavila joined	19:18
	→ madewokherd joined	19:18
	← BSaboia left	19:19
	→ cbrt64 joined	19:19
	→ BSaboia joined	19:20
	→ polydo_s joined	19:21
garrettkajmowicz	_ikke_: Nifty resource. Thanks!	19:22
	← cbrt64 left	19:23
	→ zzz- joined	19:24
	← zzz- left	19:25
	← polydo_s left	19:26
pr0t	I have a gitlab instance I just renamed the hostname, and now I am getting these error	19:27
	* NSS error -8179 (SEC_ERROR_UNKNOWN_ISSUER)	19:27
	* Peer's Certificate issuer is not recognized.	19:27
	Strangely on my OS X laptop I do not get this error when trying to do a git clone, but on all my linux machines I do, any idea why?	19:27
	→ Lunatrius joined	19:27
	→ raulp joined	19:28
	← akushner left	19:30
crem	Is reset --hard of a branch the same thing as force deleting branch and branching from a given commit?	19:31
	→ durham_ joined	19:31
luis	pr0t: git config http.sslVerify false, maybe?	19:31
pr0t	# nginx['ssl_verify_client'] = "off"	19:31
	That guy?	19:31
luis	Hmm, I'm guessing the error is being issued by the client, not the server.	19:33
pr0t	Ahh you mean client side sorry	19:33
rafasc	pr0t: he wasn't mentioned that configuration. They meant: git config http.sslVerify false;	19:33
	but yeah, not ideal...	19:33
pr0t	How can I list that config?	19:33
_ikke_	why do you want to do that	19:33
	→ Enphuego joined	19:33
pr0t	Oh yeah I don't want to disable SSL verification	19:33
	Since it is not a self signed cert or anything like that	19:33
luis	Right, then fix your server's certificate.	19:34
_ikke_	it says the issuer is unknown	19:34
	pr0t: Did you check the certificate that is being offered?	19:34
pr0t	yes	19:34
	It's valid	19:34
_ikke_	And the issuer?	19:34
pr0t	I set it up in nginx as well and it works fine	19:34
	← durham left	19:34
rafasc	maybe try with: GIT_CURL_VERBOSE=1	19:34
	← z]bandito left	19:35
pr0t	InCommon is the issuer	19:35
	→ orbyt_ joined	19:35
	→ z]bandito joined	19:35
	← mikecmpbll left	19:36
luis	pr0t: git uses curl under the hood. Maybe try and grab something from the server using curl.	19:36
	← z]bandito left	19:36
pr0t	Sure good idea	19:36
rafasc	crem: yes, reset --hard <commit>; forces you branch to be at <commit> and also discards any work in your directory to make sure whatever you have matches <commit>;	19:37
	→ jungsubk joined	19:37
	→ cbrt64 joined	19:37
pr0t	Same result so my OS X laptop has no problem with the certificate, but if I do the curl from any of my Linux machines they complain about the issuer :-/	19:37
	→ axisys joined	19:38
axisys	how to check all the changes I made before commit, so I can write a relevant commit message	19:38
	← cbrt64 left	19:38
rafasc	pr0t: which distribution are you using?	19:38
pr0t	@rafasc yes that out I pasted is from GIT_CURL_VERBOSE=1	19:38
	→ z]bandito joined	19:39
pr0t	@rafasc CentOS 7 and Ubuntu 18.04	19:39
	→ cbrt64 joined	19:39
	← Matt\|home left	19:40
luis	pr0t: maybe you can copy the ca bundle from OSX to Linux or figure out how to add the issuer to the bundle?	19:41
	← libertyprime left	19:41
	← jungsubk left	19:41
	← nowhereman_ left	19:43
	← Raging_Frog left	19:45
	→ MACscr joined	19:45
	← graphene left	19:46
	→ g00s joined	19:47
	← Lunatrius left	19:53
	→ Lunatrius joined	19:55
	→ Acelogic joined	19:56
	→ libertyprime joined	19:57
	→ Copenhagen_Bram joined	19:59
Copenhagen_Bram	What is a good website/program for collaborative developing of multiple files?	19:59
	I need something like etherpad but for several .json files at once	19:59
	because i'm lazy lol	20:00
	← garrettkajmowicz left	20:00
rafasc	Copenhagen_Bram: git	20:00
	← jhaenchen left	20:00
rafasc	you all develop on your own branches, then merge your work :D	20:01
Copenhagen_Bram	rafasc: something user friendly, a link for people to click on	20:01
	hmm	20:01
rafasc	Copenhagen_Bram: this isn't the right place for that question.	20:01
	← ilmostro left	20:01
Copenhagen_Bram	alright	20:02
rafasc	For documents, I use google docs.	20:02
Copenhagen_Bram	bah proprietary :(	20:02
	→ fassl joined	20:03
	← virmin left	20:03
	← JimmyRcom left	20:03
	→ ilmostro joined	20:03
rafasc	but etherpad looks like pretty much the same thing right?	20:04
	← TheCuban_ left	20:04
	→ Raimondii joined	20:04
Copenhagen_Bram	yeah but no directories	20:04
	← madewokherd left	20:05
	← Anja left	20:05
	→ virmin joined	20:05
	→ Ayo joined	20:05
Copenhagen_Bram	ah i guess i'll use etherpad anyway	20:06
	← Raimondi left	20:07
	Raimondii → Raimondi	20:07
	← virmin left	20:07
	→ estodiMania joined	20:09
	→ mobile_c joined	20:09
	→ virmin joined	20:10
	→ JimmyRcom joined	20:13
toothe	Anyone familiar with the pack format?	20:14
	I'm having trouble parsing it out.	20:14
	I'm not certain if I have this correctly done.	20:14
	anyone know where that is in the code?	20:15
	← TinkerT left	20:15
	→ RoundHash joined	20:16
	→ novumsensum joined	20:17
	→ jungsubk joined	20:17
	→ TinkerT joined	20:17
	← sine0 left	20:17
	→ boombatower joined	20:18
nedbat	toothe: that's pretty deep magic: why are you parsing it?	20:18
toothe	nedbat: To learn how the heck it works, I'm interested in this system.	20:19
nedbat	toothe: learning is cool :)	20:19
toothe	and painful.	20:19
	→ lewix joined	20:20
	← lewix left	20:21
	→ lewix joined	20:21
lewix	hi	20:21
	how can i recover untracked files?	20:21
rafasc	toothe: have you tried the technical docs? pack-* source files?	20:21
toothe	can you?	20:21
	yes...	20:21
lewix	i lost my untrack files by accidentally running git reset	20:21
toothe	i'm reading pack-format.txt	20:21
	but, my code doesn't line up.	20:21
	and I'm not certain if its me...or not?	20:21
lewix	I tried git reflog without luck	20:21
rafasc	lewix: reflog is a log for refs.	20:22
	→ Anja joined	20:22
rafasc	lewix: if the files are not tracked, git doesn't know about them.	20:22
	thus, cannot recover them.	20:22
	← Anja left	20:23
rafasc	lewix: did you at some point git add them?	20:23
	→ Anja joined	20:24
_ikke_	toothe: I've not yet bothered to find out how the pack format works exectly	20:24
	toothe: kudos for trying it	20:24
toothe	its confusing.	20:24
	the documentation might differ from the actual source...	20:24
	← Hello71 left	20:25
	← inovas left	20:25
	→ Hello71 joined	20:26
	→ m0viefreak joined	20:26
	→ inovas joined	20:27
rafasc	toothe: git ls-files 'pack';	20:27
	:D	20:27
lewix	rafasc: nope	20:27
	:''(	20:27
	← jungsubk left	20:28
psprint_	I'm doing: git log --max-count=1 --pretty=format:%ct to get timestamp of last commit. Is %ct long supported or maybe new?	20:29
rafasc	lewix: yeah, sorry you're out of luck. Unless you have some backup, or the files opened in a editor.... they're pretty much gone.	20:30
	← Trel left	20:30
	→ akushner joined	20:31
rafasc	psprint_: hint: blame the documents.	20:31
	psprint_: https://github.com/git/git/blame/c670b1f876521c9f7cd40184bf7ed05aad843433/Documentation/pretty-formats.txt#L132	20:32
	is 12 years old old enough for you?	20:33
	→ ljmf00 joined	20:36
	← pr0t left	20:37
	← howdoi left	20:37
	→ jungsubk joined	20:37
	← ljmf00 left	20:37
	→ ljmf00 joined	20:37
_ikke_	v1.5.1, so even RHEL has it	20:38
	← ljmf00 left	20:38
	← orbyt_ left	20:38
	→ ljmf00 joined	20:38
	← ljmf00 left	20:38
	→ ljmf00 joined	20:38
	→ n3wborn joined	20:39
	→ Trel joined	20:43
	← Cthalupa left	20:45
	← Envil left	20:45
	→ orbyt_ joined	20:47
	→ Cthalupa joined	20:47
	← Anja left	20:49
	← jungsubk left	20:53
	→ nowhereman_ joined	20:53
	← durham_ left	20:55
	→ durham joined	20:55
	← g00s left	20:57
	→ hbautista joined	20:59
	← nowhereman_ left	21:01
	← soee left	21:02
	→ lin_noob joined	21:04
	→ CheckDavid joined	21:06
	← greggerz left	21:07
	← DefB left	21:08
	→ pifpif joined	21:08
	GreenJel_ → GreenJello	21:11
	← wildermind left	21:12
	→ RuckusBringer joined	21:14
	← estodiMania left	21:14
	← plexigras left	21:15
	→ plexigras joined	21:16
	← TheRuckus left	21:17
	← RuckusBringer left	21:18
	← jelmer left	21:22
	← novumsensum left	21:24
	→ DemonDestroyer joined	21:24
	→ _ADN_ joined	21:27
	← moei left	21:28
	← timj left	21:29
	→ timj joined	21:30
	→ Anja joined	21:30
	← Anja left	21:32
	→ Anja joined	21:32
	← orbyt_ left	21:32
	→ jungsubk joined	21:33
	← jnavila left	21:33
	← jtrzebiatowski left	21:34
	→ ZyX-I joined	21:34
	→ nowhereman_ joined	21:35
	→ orbyt_ joined	21:35
	→ muelleme joined	21:35
	→ polydo_s joined	21:36
	→ Metascion joined	21:37
	← random_yanek left	21:37
	← wootehfoot left	21:38
	← Anja left	21:40
	→ Anja joined	21:41
	→ n8chan joined	21:42
	← jungsubk left	21:43
	← AndresInSpace left	21:45
	→ random_yanek joined	21:45
	← spacesuitdiver left	21:45
	McKraken → McKraken_zzzzz	21:45
	→ venmx joined	21:47
	← ilmostro left	21:49
	→ TheRuckus joined	21:49
	← akushner left	21:52
	← n8chan left	21:52
	→ ilmostro joined	21:52
	McKraken_zzzzz → McKraken	21:53
	← VibesYuth left	21:54
	→ akushner joined	21:56
	→ jungsubk joined	21:58
	← ljmf00 left	22:00
	← orbyt_ left	22:00
	→ ljmf00 joined	22:01
	← ljmf00 left	22:01
	→ ljmf00 joined	22:01
	← mescalinum left	22:02
	→ dcpc007_ joined	22:06
	→ madewokherd joined	22:07
	← RoundHash left	22:08
	← cliluw left	22:09
	→ cliluw joined	22:10
	← cliluw left	22:10
	→ cliluw joined	22:11
	← pifpif left	22:15
Zexaron	funny git discussion happened in ##dolphin-dev ...	22:16
	<Uncle Punch> i did hard reset but i have master's commits as changes to my branch	22:16
	oops didn't mean that, just the picture https://i.imgur.com/rTaafQs.png	22:16
	Wrong one, this one: https://i.imgur.com/VkfvD6H.png	22:17
	← yyy left	22:17
	← pR0Ps left	22:17
	← thiago left	22:17
	← lin_noob left	22:18
	← plexigras left	22:18
Zexaron	I remember once I had a branch named "upstream" too and "help"	22:18
	→ Guest30036 joined	22:19
	← muelleme left	22:19
osse	i regularly have branches lol1 to lol100	22:19
	ok, maybe not regularly, but it happens	22:19
	for testing and such	22:19
rafasc	Zexaron: yeah, they have a local upstream/master branch...	22:20
	that may become confusing...	22:20
	→ novumsensum joined	22:20
Zexaron	I would expect git would disallow special chars like / in branch names	22:21
grawity	no, /-separated hierarchy is a standard feature of Git branches	22:21
rafasc	^	22:21
grawity	`man git check-ref-format` documents a whole lot of restrictions, but '/' is not one of them	22:22
gitinfo	the git-check-ref-format manpage is available at https://gitirc.eu/git-check-ref-format.html	22:22
Zexaron	so it does have a purpose, didn't knew that	22:22
	← dcpc007_ left	22:22
rafasc	The best it could do would be to give a warning...	22:22
Zexaron	At least that indeed	22:22
rafasc	I find that most of the local branches that have names matching remote/branch are created by mistake.	22:22
grawity	it's not a software feature (i.e. there is no actual hierarchical relationship between branches)	22:22
	but why disallow it just because	22:22
	→ dg_vrani joined	22:23
	→ dcpc007_ joined	22:23
	← BSaboia left	22:23
	← cbrt64 left	22:24
	← Regon left	22:24
rafasc	Zexaron: the next step is when they manage to push it to the remote, and then you get an 'origin/origin/branch'	22:25
Zexaron	indeed	22:25
	but if it confuses git it self then it's ought to either support or not, can't be something in between	22:26
	probably just confused the user there afaik	22:26
	← polydo_s left	22:26
rafasc	git doesn't get confused.. It just does what you tell it to do.	22:27
	and the fact it complains the refname is ambiguous is proof it understands as two separate things.	22:28
	← Guest30036 left	22:28
	→ sleepee joined	22:28
	← flying_sausages left	22:29
rafasc	you can always use the full refname if you want to be explicit.	22:29
	refs/heads/origin/branch or refs/remotes/origin/branch	22:29
	→ cbrt64 joined	22:31
	→ flying_sausages joined	22:31
	← Metascion left	22:31
	→ yohnnyjoe joined	22:36
	→ polydo_s joined	22:36
	← timj left	22:37
	→ timj joined	22:37
	→ orbyt_ joined	22:37
	← fahadash left	22:40
	← pawle left	22:41
	← polydo_s left	22:41
	← cbrt64 left	22:41
	→ Toadisattva joined	22:42
	← jungsubk left	22:42
	→ polydo_s joined	22:46
	← TheRuckus left	22:48
	→ Matt\|home joined	22:50
	← polydo_s left	22:50
	← troulouliou_dev left	22:50
	→ pR0Ps joined	22:51
	→ leeN joined	22:51
	→ yyy joined	22:52
	← Acelogic left	22:55
	← Toadisattva left	22:58
	← pR0Ps left	23:00
	→ t0dd1v joined	23:01
	→ ijash joined	23:02
	← Silenced left	23:02
	← leeN left	23:02
	← raulp left	23:03
	→ goweol joined	23:06
	← lipvig left	23:06
	← bn_work left	23:07
	→ mikecmpbll joined	23:07
	→ goweol1 joined	23:08
	← goweol left	23:10
	→ pR0Ps joined	23:15
	→ cbrt64 joined	23:19
	← libertyprime left	23:20
	→ libertyprime joined	23:21
	→ AtumT joined	23:27
	← cbrt64 left	23:27
	→ Kaisyu joined	23:27
	→ cbrt64 joined	23:27
	← ijash left	23:28
	← diogenese left	23:29
	← sleepee left	23:29
	→ diogenese joined	23:29
	→ miczac joined	23:30
	→ treehug88 joined	23:33
	→ polydo_s joined	23:35
	→ TheRuckus joined	23:35
	← CodeSlingerPaul left	23:37
	→ thiago joined	23:37
	← thiago left	23:37
	← RoriconKnight left	23:38
	← dege left	23:38
	← lewix left	23:39
	← venmx left	23:39
	← AtumT left	23:40
	← rafasc left	23:40
	← polydo_s left	23:40
	→ fahadash joined	23:40
	→ sanches joined	23:40
	→ lipvig joined	23:40
	← orbyt_ left	23:42
	← cbrt64 left	23:42
	→ cbrt64 joined	23:44
	→ thiago joined	23:45
	← rsrx left	23:45
	→ mofai joined	23:47
	← cbrt64 left	23:48
	→ Acelogic joined	23:50
	← al-damiri left	23:53
	→ cbrt64 joined	23:53
	→ blackmesa joined	23:56
	→ nageV joined	23:57
	← novumsensum left	23:58
	→ novumsensum joined	23:58
	← Phylock left	23:59
	← libertyprime left	23:59
	→ libertyprime joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation