IRCloggy #git 2019-05-04

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2019-05-04

← nerosnm left00:00
← veegee left00:01
→ azwieg103 joined00:01
→ watabou_ joined00:02
← jottr left00:08
← nic-hartley left00:09
← thiago left00:10
← Lucas_Gray left00:11
→ jottr joined00:13
← Ignacy left00:13
← lucasb left00:14
← jottr left00:18
← iam730 left00:19
← azwieg103 left00:19
← astrofog left00:20
← Sasazuka left00:20
→ azwieg103 joined00:20
← eva left00:22
→ jottr joined00:23
← watabou_ left00:25
← orbyt_ left00:26
→ durham joined00:28
← jottr left00:29
→ watabou_ joined00:29
← kjartan left00:31
← durham left00:32
→ jottr joined00:34
→ kjartan joined00:36
→ nerosnm joined00:37
← jottr left00:38
qpdb → Guest6417300:39
→ qpdb joined00:39
← troyt left00:41
→ troyt joined00:42
← Guest64173 left00:42
→ FutureTense joined00:43
→ jottr joined00:44
→ dfee joined00:44
← zulutango left00:45
→ zulutango joined00:45
← oatmealraisin left00:46
← Fernando-Basso left00:46
← jottr left00:49
→ learningc joined00:51
← akushner left00:52
→ jottr joined00:54
← AtumT left00:54
← jleclanche left00:56
← jottr left00:59
→ cdown joined01:01
← leeN left01:02
← osse left01:03
← Regon left01:03
→ jottr joined01:04
← F0rTex left01:05
→ F0rTex joined01:07
→ oatmealraisin joined01:07
→ finalbeta joined01:08
← jottr left01:09
→ thiago joined01:11
→ sitaram joined01:13
→ greatgatsby joined01:16
→ nic-hartley joined01:17
← moldybits left01:19
→ jottr joined01:20
← jottr left01:24
→ SwiftMatt joined01:25
→ noobineer joined01:26
← learningc left01:33
← duderonomy left01:33
→ learningc joined01:34
→ jottr joined01:36
← watabou_ left01:38
← nerosnm left01:40
→ YuGiOhJCJ joined01:41
← jottr left01:41
← b0zil left01:42
← oatmealraisin left01:44
← SwiftMatt left01:46
← dfee left01:46
→ jottr joined01:46
→ Goplat joined01:49
← cd left01:50
← jottr left01:51
→ cd joined01:52
→ jottr joined01:57
← jottr left02:01
← meLon left02:02
← F0rTex left02:02
→ F0rTex joined02:03
← wootehfoot left02:05
lagothrix → Guest3206802:06
← Guest32068 left02:06
→ lagothrix joined02:06
← m0viefreak left02:09
→ m0viefreak joined02:09
← greatgatsby left02:10
→ greatgatsby joined02:10
→ jottr joined02:11
← cbreak left02:12
← bluezone left02:12
→ sozuba joined02:12
→ cbreak joined02:13
← greatgatsby left02:15
→ nerosnm joined02:16
← thiago left02:19
→ thiago joined02:19
← noobineer left02:21
← igemnace left02:22
← jottr left02:22
← pR0Ps left02:24
→ pR0Ps joined02:26
→ jottr joined02:28
→ meLon joined02:30
→ watabou_ joined02:30
→ oatmealraisin joined02:31
← jottr left02:33
→ noobineer joined02:35
→ igemnace joined02:37
→ SwiftMatt joined02:37
← SwiftMatt left02:38
→ jottr joined02:38
→ Kaedenn1 joined02:41
← thebope left02:41
Kaedenn1 how do I add checkin hooks that abort the checkin if they fail?02:41
nightshift checkin?02:41
→ thebope joined02:41
Kaedenn1 commit hooks02:41
My brain is confusing git with other SCMs02:42
nightshift depends on what you want the hook to check/evaluate, I think02:42
Kaedenn1 I want it to build the minified version of the project (JavaScript) and run lint on it02:43
currently I sometimes accidentally forget to minify the code, leading to people using the wrong version02:43
← jottr left02:43
nightshift (I don't really work with hooks, but, my understanding is, if the, in this case lint, fails, the check fails, which aborts the commit, if you use the RIGHT hook)02:43
you would probably want to use the pre-commit hook https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks02:45
meejah i think the way to reject things is that "post-receive" hook returns non-zero02:45
nightshift also, what os are you doing your day to day work on?02:45
→ gugah joined02:46
nightshift pre-commit is run locally, post-receive is on the server. Which you use depends on at what point do you want it rejected, the commit or the push02:47
→ jottr joined02:49
← watabou_ left02:49
nightshift as far as how you use it, you write a script, that will run on your OS (so, if you're using windows, and don't have cygwin installed, the script would be different than what you'd use on *nix and macosx), that runs the linter and the minifier. If either the lint or the minify fail, you exit the script with something other than the exit code 002:49
→ rmbeer joined02:50
rmbeer hello...02:50
Where can I find a complete list of open source websites that manages gits repositories?...02:50
← jottr left02:53
← thebope left02:55
nightshift rmbeer: are you looking for open source alternatives to github, or, something else?02:55
rmbeer nightshift, yes, Something like that, I'm looking for a website that manages repositories...02:56
← gugah left02:56
rmbeer ...for install* a...02:57
← Kaedenn1 left02:57
nightshift rmbeer, what do you mean by "manages repositories" a site that hosts them, a site that uses them, or a person/organization that has repositories that are under active development02:58
?02:58
← sozuba left02:58
→ jottr joined02:59
rmbeer nightshift, a site that hosts git repositories and manages several users...02:59
nightshift rmbeer, a search a long the lines of "open source github alternative" might be your best bet, but, as far as I know, nobody keeps a complete and up to date list03:00
rmbeer nightshift, rather, I want everything. A huge list of opensource of websites that manage repositories gits...03:01
nightshift also, it depends on exactly what features you are looking for03:01
google or duck duck go, with a properly crafted search phrase is probably your best option.03:02
rmbeer nightshift, the the biggest list that exists is already good for me....03:02
nobody has here?...03:02
:(03:02
← chandoo left03:03
nightshift google or duck duck go, I don't have a list, and I don't have a link to such a list, because no one maintains one, and, even if we did, we don't know exactly what you are after03:03
rmbeer nightshift, I want a list of source codes, that's all. It does not matter what I need it for or what I want to use it for....03:04
← jottr left03:04
nightshift it DOES matter, some options are literally github clones, some you can host yourself, others can only be used on the developer's servers. Some have more features than others.03:05
if you want us to do the search FOR you, we need to know what features you want03:05
→ matsaman joined03:07
← matsaman left03:07
rmbeer nightshift, I do not want a search, I just want a list. Do you usually keep a list of those sites on your machines?...03:08
→ jottr joined03:09
→ sentinal8473 joined03:09
→ RoriconKnight joined03:11
nightshift No, I don't. Why would I?03:12
→ BenderRodriguez joined03:13
← jottr left03:14
→ sozuba joined03:14
→ watabou_ joined03:14
rmbeer nightshift, how weird... You're weird...03:15
nightshift Most people here wouldn't either. If you want someone here to compile such a list for you, we need to know what features you are after (btw, if you're looking to borrow code to create your own github clone, I could really care less, but if that's the case, I know of three projects off the top of my head that I can point you towards, one of them you could even host your code with them and they wouldn't care,03:15
or you could install their code on your own server, to host your clone, and they also wouldn't care, but, if you have another goal, I've got a couple different ones I can point you to that are a little less full featured)03:15
rmbeer nightshift, ok, understand...03:17
nightshift, well, i search by a replace of github... (that manages repositories, accounts, repositories by accounts, bug tracks, etc.)03:18
(except by make websites)...03:18
nightshift Ok, you want a true github clone, sans github pages function, but that is open source03:18
rmbeer all dedicated to repositories, users, and bug tracks...03:19
← watabou_ left03:19
nightshift Start with gitlab community edition03:19
→ jottr joined03:19
rmbeer nightshift, Would not gitlab have the same bugs as github?...03:19
nightshift that one is written in ruby on rails03:19
I don't know rmbeer, I don't use them03:20
rmbeer i found GNU savannah, seem good...03:20
nightshift there's that one too, as well as gitprep, which is written in perl03:20
As for whether they have github's bugs, I have no clue, I don't use any of them03:20
igemnace they're all different software; it'd be a huge coincidence if they shared the exact same bus03:21
bugs*03:21
← gxt left03:21
rmbeer mmm.... ok, thanks... I'm just waiting for advice from others while I explore a bit...03:21
nightshift But, they are open source, so if they DO have the bugs, and you speak the language, you can help fix them03:21
→ oiyouyeahyou joined03:23
← victorqueiroz left03:23
← linux_dr left03:23
← jcbitter left03:25
→ jcbitter joined03:26
→ duderonomy joined03:28
← jottr left03:30
→ Sleepy63 joined03:31
← jcbitter left03:31
← mooasaurus left03:33
→ jcbitter joined03:34
→ justan0theruser joined03:35
→ jottr joined03:36
← learningc left03:36
← justanotheruser left03:36
→ learningc joined03:37
→ OtakuSenpai joined03:38
← jcbitter left03:40
← nerosnm left03:40
← jottr left03:40
→ libertyprime joined03:42
→ watabou_ joined03:44
← Cabanossi left03:44
→ jottr joined03:46
→ Cabanossi joined03:46
→ Balthasar_ joined03:49
← oatmealraisin left03:49
→ oatmealraisin joined03:49
← oatmealraisin left03:51
→ oatmealraisin joined03:51
← oatmealraisin left03:51
← jottr left03:51
→ oatmealraisin joined03:51
→ mooasaurus joined03:52
← Balthasar__ left03:52
← Raimondi left03:55
→ jottr joined03:56
← Milos left03:57
← oatmealraisin left03:58
→ oatmealraisin joined03:58
← OtakuSenpai left04:00
← oiyouyeahyou left04:00
← jottr left04:01
← oatmealraisin left04:01
→ oatmealraisin joined04:02
← scientes left04:02
→ Raimondi joined04:02
→ OtakuSenpai joined04:03
→ jottr joined04:07
→ snowkidimd joined04:07
← m0viefreak left04:08
← graingert left04:09
← mostlybadfly left04:09
← Raed left04:10
→ nerosnm joined04:10
→ mostlybadfly joined04:11
← profmac left04:11
← ggherdov left04:11
← jottr left04:11
→ graingert joined04:12
← graingert left04:13
→ ggherdov joined04:13
→ graingert joined04:13
→ Milos joined04:13
justan0theruser → justanotheruser04:14
→ pd09041999 joined04:20
← OtakuSenpai left04:24
→ Nawab joined04:24
→ jottr joined04:24
→ profmac joined04:25
← Milos left04:25
→ Raed joined04:25
→ plasticle joined04:25
→ iam730 joined04:27
← YuGiOhJCJ left04:28
← jottr left04:29
← in1t3r left04:31
→ bitcycle joined04:31
bitcycle Hey all. I'm trying to shell out to git-upload-pack. Is there anything special that I need to make this work (golang)? https://pastebin.com/QFLVNViV04:32
→ jottr joined04:35
← nero left04:37
→ Milos joined04:37
→ nero joined04:38
← learningc left04:38
→ learningc joined04:38
← jottr left04:40
← kjartan left04:44
→ Rakewn joined04:44
→ jottr joined04:45
← Nawab left04:47
→ kjartan joined04:49
← jottr left04:50
→ OtakuSenpai joined04:53
← justanotheruser left04:55
← noobineer left04:55
→ jottr joined04:55
← d^sh left04:56
→ d^sh joined04:57
→ butterthebuddha joined04:58
← oatmealraisin left04:59
→ oatmealraisin joined05:00
← jottr left05:00
→ SkarmoutsosV joined05:02
→ jottr joined05:05
← butterthebuddha left05:07
→ jcbitter joined05:08
← sozuba left05:09
← oatmealraisin left05:11
← sentinal8473 left05:11
→ justanotheruser joined05:12
← gde33 left05:13
→ gde33 joined05:14
← jottr left05:15
← justanotheruser left05:17
→ jleclanche joined05:18
← jcbitter left05:19
→ jcbitter joined05:20
kreyren → crazyrenSSL05:21
→ jottr joined05:21
← xcm left05:26
→ xcm joined05:27
← jottr left05:33
→ sauvin joined05:33
← nightshift left05:35
→ jottr joined05:38
→ zeug joined05:42
← jottr left05:43
← nerosnm left05:45
← Emperor_Earth left05:45
→ Emperor_Earth joined05:45
← RoriconKnight left05:46
→ jottr joined05:48
← SkarmoutsosV left05:50
← learningc left05:51
← Balthasar_ left05:52
← shicks_ left05:53
← jottr left05:53
← bket left05:54
→ clime joined05:55
← kerframil left05:56
→ jottr joined05:59
→ ecilam joined05:59
← zeug left06:02
→ zeug joined06:02
← jottr left06:04
→ gxt joined06:04
→ Balthasar joined06:05
← OtakuSenpai left06:08
→ OtakuSenpai joined06:09
→ jottr joined06:09
← pR0Ps left06:09
→ pR0Ps joined06:11
→ RoriconKnight joined06:13
→ n3wborn joined06:13
← jottr left06:14
← jcbitter left06:15
→ nerosnm joined06:17
→ Raging_Hog joined06:18
← Rakewn left06:18
→ bket joined06:18
→ jottr joined06:19
→ dege joined06:20
← dege left06:20
→ dege joined06:21
← dege left06:23
← jottr left06:24
→ jottr joined06:29
← nic-hartley left06:32
← Goplat left06:34
← jottr left06:40
→ jottr joined06:46
→ apoos_maximus joined06:49
→ AfroThundr|main joined06:51
← jottr left06:51
← Milos left06:53
→ Milos joined06:56
← alyptik left06:56
→ alfredb joined06:59
→ jcbitter joined07:01
→ kid_rock joined07:01
→ jottr joined07:02
→ oprypin joined07:02
← alfredb left07:06
← jcbitter left07:06
← jottr left07:06
→ alfredb joined07:06
← nerosnm left07:06
← alfredb left07:07
← thiago left07:08
← Mattiaslndstrm left07:19
→ jottr joined07:20
← downer06 left07:20
← xcm left07:21
→ downer06 joined07:21
→ xcm joined07:22
→ jcbitter joined07:22
← jottr left07:24
→ alyptik joined07:25
→ Mattiaslndstrm joined07:25
← n3wborn left07:25
← jcbitter left07:27
← howdoi left07:28
→ SkarmoutsosV joined07:28
→ jottr joined07:29
← navidr left07:30
← mat001 left07:30
→ thebope joined07:32
← Kamparano left07:32
→ h1d joined07:34
← h1d left07:35
crazyrenSSL → kreyren07:37
← pd09041999 left07:40
← serialoverflow left07:40
→ jcbitter joined07:41
→ mikecmpbll joined07:46
← jcbitter left07:46
→ serialoverflow joined07:47
→ SwiftMatt joined07:48
← SwiftMatt left07:50
← jottr left07:52
→ pd09041999 joined07:53
← SkarmoutsosV left07:55
→ jottr joined07:59
← thebope left08:00
→ Lucas_Gray joined08:01
← jottr left08:03
→ nnyk joined08:06
→ jottr joined08:09
← mikecmpbll left08:10
→ mikecmpbll joined08:10
→ jcbitter joined08:12
← jottr left08:14
→ plexigras joined08:14
→ jottr joined08:19
← Mattiaslndstrm left08:20
→ mase-tech joined08:20
← avu left08:21
→ freeman42x joined08:23
← jottr left08:24
← bitcycle left08:27
← watabou_ left08:29
→ jottr joined08:29
→ TJ- joined08:30
← plexigras left08:32
← apoos_maximus left08:34
← pd09041999 left08:34
→ moldybits joined08:35
← zeug left08:36
← nnyk left08:39
← cbreak left08:40
→ cbreak joined08:41
→ gloomy joined08:44
← alyptik left08:44
→ nowhere_man joined08:45
→ rsrx joined08:48
← nowhere_man left08:49
← AfroThundr|main left08:53
→ sozuba joined08:54
→ Rene joined08:58
← Fudge left09:03
← jcbitter left09:03
→ jcbitter joined09:05
← sozuba left09:06
→ nowhere_man joined09:08
← hussam left09:11
→ nast joined09:12
→ thebope joined09:12
→ alyptik joined09:17
→ YuGiOhJCJ joined09:18
← catsup left09:18
→ catsup joined09:18
← catsup left09:19
→ catsup joined09:19
← dpyro left09:21
← mase-tech left09:22
→ czart joined09:28
→ sozuba joined09:28
← fphilipe left09:28
← igemnace left09:29
→ n3wborn joined09:32
→ graingert_ joined09:32
← graingert left09:32
graingert_ → graingert09:32
← jottr left09:33
→ fphilipe joined09:35
← kid_rock left09:37
→ kid_rock joined09:37
← YuGiOhJCJ left09:38
→ jottr joined09:39
→ Regon joined09:42
← nast left09:43
← jottr left09:44
← royal_screwup21 left09:44
→ jottr joined09:49
← sozuba left09:52
← OtakuSenpai left09:53
← jottr left09:54
→ abraxxas joined09:55
← fphilipe left09:56
→ fphilipe joined09:56
← nowhere_man left09:57
← jhill left09:59
→ jhill joined10:00
← ec left10:00
→ ec joined10:00
→ apoos_maximus joined10:00
← lankanmon left10:01
← ec left10:01
← rsrx left10:01
→ ec joined10:01
→ sozuba joined10:05
→ jottr joined10:05
→ leeN joined10:08
← nezZario left10:10
← jottr left10:10
→ nezZario joined10:10
← graingert left10:11
→ graingert joined10:11
→ jottr joined10:15
← Wizek left10:17
→ Wizek joined10:17
→ OtakuSenpai joined10:17
← thebope left10:18
→ shicks2525 joined10:18
← fphilipe left10:19
→ thebope joined10:19
← gloomy left10:20
→ nowhere_man joined10:21
→ howdoi joined10:22
← jottr left10:26
← Inline left10:26
→ Inline joined10:27
← czart left10:28
← OtakuSenpai left10:29
→ OtakuSenpai joined10:29
→ SkarmoutsosV joined10:29
← tango_ left10:31
→ tango_ joined10:31
→ jottr joined10:32
→ gloomy joined10:34
→ chaosruler joined10:35
← lolmac left10:36
← cd left10:36
→ lolmac joined10:37
← jottr left10:37
→ savolla joined10:40
→ jottr joined10:42
← abraxxas left10:43
← jottr left10:47
← Lucas_Gray left10:48
→ kapil____ joined10:50
→ Lucas_Gray joined10:51
→ jottr joined10:52
← Novae left10:53
→ Novae joined10:53
← thunderbirdtr left10:54
← nowhere_man left10:54
→ lankanmon joined10:54
← thebope left10:56
← snowkidimd left10:57
→ Ignacy joined11:02
→ gareppa joined11:03
→ Ayo joined11:04
→ mowcat joined11:05
← colemickens_ left11:05
← kjartan left11:06
← omnireq left11:09
← leah2 left11:09
← OtakuSenpai left11:11
→ kjartan joined11:11
→ OtakuSenpai joined11:12
← jottr left11:16
→ thebope joined11:19
→ fphilipe joined11:20
→ jottr joined11:21
→ pd09041999 joined11:26
← jottr left11:26
← fphilipe left11:28
← Lucas_Gray left11:30
→ snowkidimd joined11:30
→ borkr joined11:31
← xcm left11:32
→ xcm joined11:32
← n3wborn left11:32
→ rosco_y joined11:34
← Peetz0r left11:34
→ welovfree joined11:35
→ Lucas_Gray joined11:35
→ Peetz0r joined11:36
rosco_y I'm starting to have (what seems to me to be) a long branch: (master < GAMEMANAGER < ITEMSCRIPT < STATICCURRENCY). Is this a bad idea?11:36
→ jottr joined11:38
→ coco joined11:38
rosco_y is there a way to visually see a branches lineage?11:41
lol, lots of people come here to sleep ZZZzzz....11:42
Right now, I'm taking a shower.11:42
← jottr left11:42
← d^sh left11:47
→ jottr joined11:48
→ greatgatsby joined11:48
← pd09041999 left11:49
→ d^sh joined11:49
← jottr left11:53
→ rsrx joined11:56
← Xeago left11:56
→ Noti joined11:58
cbreak rosco_y: !lol11:58
gitinfo rosco_y: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all11:58
→ jottr joined11:58
cbreak that will visualize branches on the command line11:58
there are GUIs that do it in a more visual form11:58
rosco_y Thank you cbreak :) I'll make a batch script of that :)11:59
cbreak rosco_y: normally you'd make an alias11:59
git config --global alias.lol='log --oneline --graph --decorate --all'11:59
→ nowhere_man joined12:00
cbreak hmm, no, like this:12:00
git config --global alias.lol 'log --oneline --graph --decorate --all'12:00
rosco_y cool I didn't know you can make aliases within git12:00
cbreak it'll be used when you type git lol12:00
rosco_y lol12:01
cbreak (I have mine as git graph, you can call it how ever you want, as long as it doesn't collide with a built-in command)12:01
→ nerosnm joined12:02
rosco_y Well, Thanks a bunch. I gotta get to it, so hope to see you here later!12:02
← rosco_y left12:02
← snowkidimd left12:03
← jottr left12:04
← Lucas_Gray left12:04
→ eva joined12:06
→ hussam joined12:06
→ leah2 joined12:06
→ Lucas_Gray joined12:07
→ jottr joined12:08
← mud left12:09
→ learningc joined12:10
← Noti left12:13
← jottr left12:13
→ Noti joined12:14
← welovfree left12:15
← sozuba left12:16
← Ayo left12:18
→ nnyk joined12:19
→ Xeago joined12:19
→ Mattiaslndstrm joined12:20
← apoos_maximus left12:20
→ jottr joined12:21
← mowcat left12:24
← Xeago left12:29
→ Xeago joined12:31
→ abraxxas joined12:33
← freeman42x left12:34
→ freeman42x joined12:35
→ scientes joined12:38
→ victorqueiroz joined12:38
→ fstd_ joined12:38
← fstd left12:42
fstd_ → fstd12:42
← tsaka__ left12:46
→ Achylles joined12:48
← nerosnm left12:48
← yonder left12:49
← abraxxas left12:52
← cdown left12:52
→ AtumT joined12:56
← libertyprime left12:57
→ royal_screwup21 joined13:02
→ m0viefreak joined13:03
← Lucas_Gray left13:09
→ Lucas_Gray joined13:11
→ sozuba joined13:15
→ plexigras joined13:17
← jottr left13:18
→ czart joined13:20
→ jottr joined13:24
→ Wryhder joined13:24
→ fphilipe joined13:24
← Lucas_Gray left13:25
Wryhder → Lucas_Gray13:25
← Lucas_Gray left13:27
→ mat001 joined13:28
← fphilipe left13:29
← SkarmoutsosV left13:30
→ Lucas_Gray joined13:30
→ mowcat joined13:33
← howdoi left13:34
← eva left13:37
→ ave_milia joined13:39
→ crawler joined13:40
← jottr left13:42
← royal_screwup21 left13:43
← gloomy left13:44
→ wootehfoot joined13:45
→ igemnace joined13:45
← Lucas_Gray left13:47
→ jottr joined13:47
→ justanotheruser joined13:48
→ nerosnm joined13:50
← wootehfoot left13:50
→ Lucas_Gray joined13:51
← jottr left13:52
→ jottr joined13:53
← igemnace left13:53
→ osse joined13:53
→ igemnace joined13:53
← Lucas_Gray left13:55
← crawler left13:55
← nnyk left13:56
← JanC left13:57
← Noti left13:57
→ JanC joined13:57
→ Lucas_Gray joined13:58
→ wootehfoot joined13:59
→ eva joined13:59
→ kerframil joined14:02
← Lucas_Gray left14:08
← jottr left14:10
→ Lucas_Gray joined14:11
→ Noldorin joined14:14
→ jottr joined14:15
← wootehfoot left14:17
← Noldorin left14:18
← jottr left14:20
→ dpyro joined14:22
→ Richard_Cavell joined14:23
Richard_Cavell Hi everyone. I'm using git 2.7.4. I have a problem where when I do git commit, typically the file that I've changed is *not* staged for commit, so that I have to manually specify it. Can I change this so that git automatically knows what to commit?14:23
→ Noldorin joined14:24
→ jottr joined14:26
cbreak Richard_Cavell: staging is always manually14:27
unless you use git commit -a14:27
Richard_Cavell: but I advise you against doing that14:27
Richard_Cavell svn can automatically detect which files have changed. Are you saying git can't or won't do that?14:27
cbreak use git add -p instead so you can review what you're going to commit again14:28
Richard_Cavell: no, I'm saying that svn sucks :)14:28
and you should be more aware of what you're doing14:28
it's not a technical issue, it's a workflow decision14:28
git obviously knows which files changed14:28
it'll tell you so in git status, git diff, and so on.14:29
← Muzer left14:29
→ moei joined14:29
← jottr left14:30
← borkr left14:31
→ Muzer joined14:36
→ jottr joined14:36
_ikke_ git does not assume that every change in the work tree should be comitted14:37
You could have left some debugging code or other unrelated changes in there14:37
So git allows you to specify what should be comitted (even within a file) and what not14:38
svn makes that a lot harder14:38
← sybariten left14:39
← moei left14:40
→ jstein_ joined14:40
jstein_ → jstein14:40
← jottr left14:41
← queip left14:43
← Muzer left14:45
← Lucas_Gray left14:46
→ jottr joined14:46
→ rafasc joined14:47
→ Lucas_Gray joined14:50
← mowcat left14:50
→ watabou_ joined14:50
← jottr left14:51
→ gloomy joined14:51
→ hqdruxn08__ joined14:51
← hqdruxn08_ left14:55
→ jottr joined14:56
← perrier-jouet left14:57
→ Muzer joined14:57
→ mitchell joined14:57
← gloomy left14:59
→ queip joined15:00
← drbean left15:03
→ buckworst joined15:04
→ SwiftMatt joined15:04
← SwiftMatt left15:05
→ abraxxas joined15:06
← savolla left15:11
← Lucas_Gray left15:12
← jottr left15:13
→ Goplat joined15:14
→ Bobdude joined15:14
→ Lucas_Gray joined15:14
→ apoos_maximus joined15:15
← watabou_ left15:17
→ ferdna joined15:18
← Achylles left15:19
← kjartan left15:19
→ jottr joined15:19
→ moei joined15:23
→ kjartan joined15:24
← jottr left15:24
← nowhere_man left15:25
→ maxzor joined15:25
maxzor Hello, how can I push a local branch to origin in another branch (<>name)?15:25
git push origin/dest_branch local_branch?15:26
→ watabou_ joined15:26
osse maxzor: git push origin somename:differentname15:26
if differentname doesn't already exist you might need git push origin somename:refs/heads/differentname15:26
maxzor differentname exists so thats the first command?15:27
→ jottr joined15:30
_ikke_ yes, that should suffice15:30
→ Achylles joined15:32
← Lucas_Gray left15:33
maxzor yep, thank you15:34
any thoughts about pijul? https://pijul.org/15:35
← clime left15:36
_ikke_ Seems like they have a more fluid concept of history15:37
https://news.ycombinator.com/item?id=1907017215:39
→ inkbottle joined15:39
← shicks2525 left15:40
→ shicks2525 joined15:44
→ fphilipe joined15:45
→ thiago joined15:45
← SpeakerToMeat left15:48
← jottr left15:48
← apoos_maximus left15:49
← fphilipe left15:49
← learningc left15:49
→ learningc joined15:50
→ oiyouyeahyou joined15:51
→ jottr joined15:53
→ dfee joined15:55
← oiyouyeahyou left15:56
← plexigras left15:56
→ jamiejackson joined16:01
← gareppa left16:01
← Inline left16:01
→ gareppa joined16:02
→ omnireq joined16:03
← inkbottle left16:04
← Bobdude left16:05
← jottr left16:05
→ Inline joined16:07
→ jottr joined16:10
← jottr left16:15
→ fphilipe joined16:17
→ kfoonamalik joined16:18
→ jottr joined16:20
← akula left16:23
← jottr left16:25
← hexnewbie left16:26
→ sentinal8473 joined16:30
→ jottr joined16:31
→ hexnewbie joined16:32
← alyptik left16:32
← FutureTense left16:36
→ neure joined16:40
neure gi16:40
hoi16:40
hi ..16:40
→ shabius joined16:40
neure is there way to recover files removed by accidental git clean?16:40
← craftyguy left16:40
→ craftyguy joined16:41
neure I had files in .gitignore and thought they would not be removed by git clean :P16:42
cbreak neure: they won't be16:44
unless you specify -fx or similar16:44
neure: files that are not tracked by git can not be recovered by git16:44
you'll have to use some other form of backup, like time machine16:44
neure good to know16:47
I didnt have anything too fancy there16:47
← jottr left16:48
→ pd09041999 joined16:48
rafasc if you ever used stash --include-untracked, you may be able to recover some with some effort.16:48
cbreak I can recommend Arq Backup, Timemachine or ZFS Snapshots16:50
in case you want to have more safety16:50
→ jottr joined16:51
→ royal_screwup21 joined16:53
→ TomyLobo joined16:54
← jottr left16:55
→ _ng joined16:56
neure I think I'll just add these files to git :)16:56
.vscode file16:57
cbreak are those project specific?16:58
are they user specific?16:58
neure should work for other users as well16:59
there are virtually no other users at the moment though16:59
once there is, time to fix16:59
→ jottr joined17:01
→ alyptik joined17:05
← jottr left17:06
← mitchell left17:07
← fphilipe left17:07
→ nnyk joined17:08
← neure left17:09
← kapil____ left17:10
← nnyk left17:13
→ clime joined17:13
← gde33 left17:15
→ b0zil joined17:16
→ gde33 joined17:16
→ jottr joined17:17
→ jjido joined17:17
jjido Hi. is there an easy way to delete a file in past history?17:18
grawity git filter-branch, with all the caveats of !rewriting17:18
gitinfo [!rewrite] 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/waqum17:18
jjido That is the commit with redundant binary file: https://github.com/jido/decimalsense32/commit/31f7ab3577c26bd6ffbc0f50d44c82898f67a7b117:19
Can I use "splitting commits"?17:22
← jottr left17:22
← abraxxas left17:22
→ nnyk joined17:22
→ abraxxas joined17:22
grawity a bit overkill; there's nothing to split, just edit17:23
jjido so an interactive rebase, edit the commit to remove the file, then rebase --continue? Not used to rebase17:25
← OtakuSenpai left17:26
rafasc jjido: provided you understand the consequences of rewriting public history, yes.17:26
→ jottr joined17:27
rafasc git rm <file>; git commit --fixup=31f7ab3577; git rebase -i --autosquash 31f7ab35~1 ;17:27
grawity you can use interactive rebase, or you can use filter-branch, or you can use git-bfg, they all have the same end result17:28
→ bolovanos joined17:28
→ fphilipe joined17:28
rafasc this will rewrite *all* commits made after the one you edited.17:28
And you'll need to force-push to make github accept this rewrite.17:28
← RoriconKnight left17:29
jjido git rm was already done several commits back17:29
rafasc jjido: !filter_sensitive17:30
gitinfo jjido: You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/17:30
← bolovanos left17:30
grawity that doesn't really change the result17:30
all the newer commits reference their previous commit ID, so they all will have to be rewritten just to adjust that, even if they no longer have the file itself17:31
jjido rafasc that's a brilliant idea, didn't think of it! Thanks.17:31
← jottr left17:32
rafasc still, for a 8k binary, just leaving it there would not be problematic.17:33
← gareppa left17:33
jjido yeah it looks like the Github solution also rewrites history17:34
grawity well by definition, if you need to change a commit that's in the past, you're rewriting history17:35
there's no getting away from that17:35
jjido I was hoping github would just hide the file, but thinking about it... of course git pull would see the file unless you rewrite17:36
rafasc jjido: there is not way around that.17:36
no*17:36
jjido Ok. I think it's not worth the trouble. Thanks all!17:36
→ jottr joined17:37
← dfee left17:41
← clime left17:41
← jottr left17:42
← kid_rock left17:46
→ jottr joined17:47
→ dege joined17:48
→ zeug joined17:49
← jottr left17:52
← ferdna left17:53
→ plexigras joined17:55
← TJ- left17:55
→ jottr joined17:58
← jjido left18:02
← jottr left18:03
← fphilipe left18:03
← Achylles left18:05
→ nic-hartley joined18:05
→ jottr joined18:08
→ perrier-jouet joined18:10
→ clime joined18:12
← jottr left18:13
→ Lucas_Gray joined18:16
→ jottr joined18:18
← Luyin left18:22
← buckworst left18:22
→ null1337 joined18:23
← jottr left18:23
← Lucas_Gray left18:24
→ OliverJAsh joined18:28
→ jottr joined18:28
OliverJAsh When I do an interactive rebase, whilst I'm editing the todo file (edit, pick, squash, etc.), it would be really nice if somehow my list was validated in front of me, so I was aware of any conflicts before I proceed. Does any tooling like this exist? Without this, sometimes I have to restart rebase multiple times, in order to find an order with a minimum number of conflicts.18:30
← th3m1s left18:32
← jottr left18:33
→ mowcat joined18:33
← kfoonamalik left18:35
→ jottr joined18:39
← ave_milia left18:39
_ikke_ The problem is that conflcts are only detected when actual performing the merges. Im not aware of any tooling that does the whole rebase in the background before closing the todo list18:40
→ cd joined18:40
→ dhendrix joined18:40
OliverJAsh Yeah, that's what I thought. Alternatively, what would help is: when a conflict happens, abort the rebase, restart the rebase, but re-use the same todo as previously. This would allow me to make adjustments, to try and avoid the conflict from occurring this time round.18:41
_ikke_ You can probably save a copy of the todo list and use that as the new todo list18:41
OliverJAsh As in pre-emptively copy it to clipboard, just in case I have to go back?18:42
_ikke_ Yes, or write it to another file, whatever floats your boat18:43
← jottr left18:44
rafasc Not exactly what you asked, but have you tried git imerge?18:45
!imerge18:45
gitinfo https://github.com/mhagger/git-imerge -- a tool to split a large merge with many conflicts into many smaller merges, hopefully each with easier-to-understand small conflicts.18:45
← sozuba left18:45
_ikke_ rafasc: good suggestion!18:45
I added that trigger, but forgot again about it18:46
rafasc used once or twice to merge a long lived branch, worked quite well.18:47
OliverJAsh I keep meaning to familiarise myself with that. Each time I've tried, I've found it overwhelming for some reason. I need to invest more time into it!18:47
Although in this case, I can often avoid a conflict altogether if I'm careful about how I re-order commits.18:48
_ikke_ He has a short-ish presentation explaining the idea behind it18:48
https://www.youtube.com/watch?v=FMZ2_-Ny_zc18:48
recommended to watch it18:48
OliverJAsh My use case is I work on a feature, and do a bunch of generic refactoring a long the way. I want to split these commits into "prep" and "feature".18:48
Most of the time it doesn't matter what order the prep commits are, as long as they are before the feature.18:48
rafasc much easier to commit them separately.18:49
→ jottr joined18:49
OliverJAsh Hmm, that's not always ideal though. Sometimes you want to do a refactor as part of a feature—but you don't know if it will solve your problem until you try it.18:49
rafasc It's much easier to squash things together them split apart.18:50
← prg318 left18:50
rafasc OliverJAsh: That's an stronger reason to do even smaller commits.18:52
→ prg318 joined18:52
rafasc if you keep the changes small, it's super easy to "build" another branch with the changes you want.18:53
→ b0zil_ joined18:53
← jottr left18:54
← b0zil left18:56
→ blackandblue joined18:59
→ jottr joined18:59
← jottr left19:04
← Xiti left19:05
→ rafasc1 joined19:05
← rafasc left19:06
→ jottr joined19:09
→ Xiti joined19:09
→ inkbottle joined19:11
→ navidr joined19:13
← mooasaurus left19:14
← null1337 left19:14
→ mooasaurus joined19:14
← jottr left19:14
← rsrx left19:16
→ SkarmoutsosV joined19:17
→ nowhere_man joined19:17
← queip left19:18
→ g00s joined19:19
→ jottr joined19:19
← kerframil left19:21
← mowcat left19:21
← mat001 left19:23
← jottr left19:24
→ jottr joined19:30
← b0zil_ left19:30
→ queip joined19:30
→ b0zil_ joined19:30
← kjartan left19:32
← jottr left19:34
→ jottr joined19:36
→ kjartan joined19:37
← nowhere_man left19:38
← d^sh left19:41
→ d^sh joined19:42
← czart left19:47
← metrixx left19:47
→ agowa338 joined19:48
← nerosnm left19:48
← jottr left19:51
→ orbyt_ joined19:53
← b0zil_ left19:55
→ jottr joined19:57
→ nerosnm joined19:58
→ Sonderblade joined19:58
→ fphilipe joined20:00
→ mat001 joined20:01
← mat001 left20:02
→ mat001 joined20:02
← jottr left20:02
← xcm left20:03
→ b0zil_ joined20:03
→ czart joined20:03
← royal_screwup21 left20:03
→ xcm joined20:03
← mat001 left20:03
← fphilipe left20:05
→ yonder joined20:06
→ jottr joined20:07
→ jayjo joined20:10
← jottr left20:12
→ Lucas_Gray joined20:12
→ mat001 joined20:14
→ fphilipe joined20:16
← Lucas_Gray left20:17
→ jottr joined20:17
← coco left20:18
← jottr left20:22
→ Lucas_Gray joined20:23
← rafasc1 left20:26
← Lucas_Gray left20:28
→ jottr joined20:28
← sweatsuit left20:32
← jottr left20:33
→ fraktor joined20:33
→ sweatsuit joined20:34
← nerosnm left20:34
← learningc left20:34
→ boombatower joined20:37
→ pks_ joined20:38
→ jottr joined20:38
← blackandblue left20:39
← pks left20:40
pks_ → pks20:40
← jottr left20:43
→ coco joined20:43
← coco left20:44
→ coco joined20:44
→ jottr joined20:48
→ crudbits joined20:50
→ Revan- joined20:50
← orbyt_ left20:52
→ nerosnm joined20:52
← jottr left20:53
← JanC left20:55
→ chandoo joined20:55
→ JanC joined20:56
→ orbyt_ joined20:57
→ jottr joined20:58
← nerosnm left21:01
→ ferdna joined21:02
→ rsrx joined21:02
← jottr left21:03
→ borkr joined21:04
→ jottr joined21:09
← jottr left21:13
→ n3wborn joined21:14
← zeug left21:15
→ jrabe joined21:15
→ cdown joined21:17
← fraktor left21:19
→ jottr joined21:19
← cdown left21:19
← alyptik left21:19
→ andrybak joined21:19
← orbyt_ left21:20
→ cdown joined21:23
← clime left21:23
← jottr left21:23
→ jottr joined21:29
← iam730 left21:32
← theoceaniscool left21:33
← jottr left21:34
→ iam730 joined21:35
← borkr left21:37
← OliverJAsh left21:37
→ CatInAHumanSuit joined21:38
← chaosruler left21:38
→ jottr joined21:39
← arecaceae left21:40
← CatInAHumanSuit left21:40
→ arecaceae joined21:40
← rmbeer left21:41
→ CatInAHumanSuit joined21:41
← fphilipe left21:43
← jottr left21:44
→ jottr joined21:49
← diogenese left21:53
← dpyro left21:54
← jottr left21:54
→ Achylles joined21:56
→ dpyro joined21:57
→ jottr joined22:00
← jrabe left22:04
← jottr left22:05
← andrybak left22:05
← iam730 left22:06
← khisanth_ left22:08
← justanotheruser left22:09
→ jottr joined22:10
→ orbyt_ joined22:10
← rsrx left22:13
← czart left22:14
← jottr left22:15
→ libertyprime joined22:15
→ fphilipe joined22:17
← agowa338 left22:17
← dege left22:20
→ andrybak joined22:20
→ jottr joined22:20
→ khisanth_ joined22:21
← jottr left22:25
← mosh left22:26
← m0viefreak left22:28
→ alyptik joined22:29
→ bambams joined22:29
bambams cbreak: I knew I knew I knew. >:) <3 >:(22:30
→ jottr joined22:30
← SkarmoutsosV left22:33
→ nerosnm joined22:35
← Sonderblade left22:35
← jottr left22:35
← Achylles left22:35
→ justanotheruser joined22:39
→ jottr joined22:41
→ iam730 joined22:41
← jottr left22:45
→ Copenhagen_Bram joined22:49
← nerosnm left22:49
← fphilipe left22:50
→ jottr joined22:51
← orbyt_ left22:53
→ licnep joined22:55
← jottr left22:55
← libertyprime left22:58
→ nowhere_man joined22:59
→ durham joined22:59
→ YuGiOhJCJ joined23:00
← hussam left23:01
→ jottr joined23:01
← durham left23:02
→ diogenese joined23:02
← finalbeta left23:04
← g00s left23:04
← azwieg103 left23:05
← jottr left23:06
← dviola left23:06
← leeN left23:09
→ jottr joined23:11
← coco left23:11
← iam730 left23:13
← Ignacy left23:13
→ agowa338 joined23:14
← moei left23:15
← wildlander left23:15
→ iam730 joined23:15
← jottr left23:16
← JanC left23:18
→ OliverJAsh joined23:19
← OliverJAsh left23:19
→ jottr joined23:21
→ Achylles joined23:22
← plexigras left23:23
← abraxxas left23:24
→ nerosnm joined23:24
← YuGiOhJCJ left23:25
← jottr left23:26
→ YuGiOhJCJ joined23:26
→ mowcat joined23:28
→ jottr joined23:32
→ gloomy joined23:33
← n3wborn left23:33
← jottr left23:36
→ jottr joined23:42
← nerosnm left23:42
→ nerosnm joined23:43
← jottr left23:47
← Achylles left23:47
→ kerframil joined23:47
← crudbits left23:48
→ jottr joined23:52
← bookworm left23:53
→ bookworm joined23:55
← jottr left23:57

Logs Search ←Prev date Next date→ Channels Documentation