| 2018-09-08 |
| ← netj left | 00:00 |
| ← Regon left | 00:00 |
| → netj joined | 00:00 |
| ← aLeSD left | 00:02 |
| ← xoxo left | 00:03 |
| ← notnull left | 00:03 |
| → aLeSD joined | 00:03 |
| → notnull joined | 00:03 |
| ← notnull left | 00:03 |
| → notnull joined | 00:03 |
| ← TinkerT left | 00:05 |
| → wpcarro joined | 00:10 |
| ← cagomez left | 00:12 |
| → cagomez joined | 00:13 |
| ← wpcarro left | 00:15 |
| ← cagomez left | 00:17 |
| ← publio left | 00:20 |
| → qpdb joined | 00:21 |
| → Essadon joined | 00:23 |
| ← Essadon left | 00:24 |
| → fstd_ joined | 00:24 |
| ← fstd left | 00:27 |
| fstd_ → fstd | 00:27 |
| → cagomez joined | 00:27 |
| ← Achylles left | 00:31 |
| → deehuck joined | 00:33 |
| ← cagomez left | 00:33 |
| ← yyy- left | 00:34 |
| ← Arcatech left | 00:35 |
| ← deehuck left | 00:38 |
| ← Sasazuka left | 00:38 |
| ← graphene left | 00:47 |
| → graphene joined | 00:47 |
| → SirFunk joined | 00:49 |
| → applecrumble joined | 00:53 |
| ← texinwien left | 00:54 |
| ← ilmostro left | 01:04 |
| → ilmostro joined | 01:06 |
| → zalt_ joined | 01:06 |
| ← graphene left | 01:07 |
| → ToBeFree joined | 01:07 |
| ← ToBeFree left | 01:07 |
| → ToBeFree joined | 01:07 |
| gitinfo set mode: +v | 01:07 |
| → graphene joined | 01:08 |
| ← zalt left | 01:08 |
| → finalbeta joined | 01:08 |
| ← ToBeFree left | 01:09 |
| → Mattiaslndstrm joined | 01:10 |
| ← Mattiasl_ left | 01:11 |
| ← xaa__ left | 01:13 |
| → thiago joined | 01:13 |
| ← njbair left | 01:14 |
| → njbair joined | 01:14 |
| ← TheRuckus left | 01:15 |
| → tomfarr joined | 01:16 |
| ← F0rTex left | 01:17 |
| → lanlink joined | 01:18 |
| → F0rTex joined | 01:18 |
| ← profmac left | 01:23 |
| → supernovah joined | 01:24 |
| → TinkerT joined | 01:37 |
| → shicks2525 joined | 01:40 |
| ← sentriz left | 01:41 |
| → sentriz joined | 01:42 |
| ← veegee left | 01:43 |
|
jim
| hi, I need to do it again... how do I tell git I want a local branch to track a remote one? | 01:44 |
| ← inovas left | 01:48 |
|
rafasc
| jim: git branch --set-upstream-to=... | 01:49 |
| → inovas joined | 01:50 |
|
rafasc
| and be sure you give the remote tracking branch. | 01:50 |
|
| git checkout master; git branch --set-upstream-to=origin/master | 01:50 |
| ← TinkerT left | 01:50 |
| → LiftLeft2 joined | 01:51 |
| ← LiftLeft left | 01:53 |
|
jim
| so, git checkout master ; git branch --set-upstream-to=origin/master? | 01:56 |
| ← Mattiaslndstrm left | 01:57 |
| → Goplat joined | 01:58 |
| ← chat left | 02:00 |
| → chat joined | 02:01 |
| → profmac joined | 02:09 |
| → fission6 joined | 02:10 |
| → venb joined | 02:11 |
| ← njbair left | 02:12 |
| → njbair joined | 02:12 |
| → jelmer_ joined | 02:13 |
| ← jelmer_ left | 02:31 |
| → jelmer_ joined | 02:31 |
| ← jj15 left | 02:35 |
| → jj15 joined | 02:36 |
| ← applecrumble left | 02:37 |
| ← AtumT left | 02:37 |
|
rafasc
| jim: yep, that is basically copy paste from my line above :) | 02:42 |
| ← fission6 left | 02:42 |
| ← jj15 left | 02:43 |
| ← thiago left | 02:45 |
| → Silenced joined | 02:48 |
| LiftLeft2 → LiftLeft | 02:52 |
| ← lagothrix left | 02:53 |
| → lagothrix joined | 02:53 |
| ← duderonomy left | 02:53 |
| ← darkbit left | 02:53 |
| → Guest47855 joined | 02:55 |
| ← Silenced left | 02:58 |
| → TinkerT joined | 02:58 |
| → kfoonamalik joined | 03:01 |
| ← orbyt_ left | 03:04 |
| → plos joined | 03:07 |
| ← Guest18 left | 03:10 |
| → tribrid joined | 03:10 |
| ← dre_ left | 03:12 |
| ← TinkerT left | 03:12 |
| ← MACscr left | 03:13 |
| → deehuck joined | 03:16 |
| → orbyt_ joined | 03:20 |
| ← deehuck left | 03:20 |
| ← a3Dman left | 03:21 |
| ← PLLunlock left | 03:21 |
| → PLLunlock joined | 03:22 |
| → texinwien joined | 03:26 |
| ← Garen left | 03:27 |
| → Garen joined | 03:27 |
| → a3Dman joined | 03:28 |
| → zsocw joined | 03:30 |
| ← zsoc left | 03:30 |
| → kartch_finnix joined | 03:30 |
| → felixsanz joined | 03:32 |
| ← felixsanz left | 03:32 |
| → motoko-chan joined | 03:33 |
| → felixsanz joined | 03:33 |
| ← felixsanz left | 03:33 |
| → dreiss joined | 03:35 |
| ← texinwien left | 03:35 |
|
jim
| rafasc, thanks for that, I ended up looking at the book so I make sure to understand its surroundings | 03:38 |
| → felixsanz joined | 03:39 |
| ← felixsanz left | 03:39 |
|
jim
| glad you told me, it clued me into where to look | 03:39 |
|
rafasc
| no worries. :) | 03:39 |
| ← m0viefreak left | 03:39 |
| → felixsanz joined | 03:39 |
|
rafasc
| keep in mind that the option to do the same thing on push is named slightly different. | 03:39 |
| ← felixsanz left | 03:39 |
| ← sylario left | 03:40 |
|
rafasc
| -u or --set-upstream | 03:40 |
| ← stoopkid left | 03:41 |
|
rafasc
| and branch has a now deprecated --set-upstream. | 03:41 |
|
| jim: so just keep in mind that :P | 03:42 |
| → felixsanz joined | 03:42 |
| ← felixsanz left | 03:42 |
| → felixsanz joined | 03:44 |
| ← felixsanz left | 03:44 |
| → timj1 joined | 03:44 |
| ← profmac left | 03:44 |
| → felixsanz joined | 03:45 |
| ← felixsanz left | 03:45 |
| → felixsanz joined | 03:46 |
| ← felixsanz left | 03:46 |
| → felixsanz joined | 03:46 |
| ← felixsanz left | 03:47 |
| ← timj left | 03:47 |
| → felixsanz joined | 03:47 |
| ← felixsanz left | 03:47 |
| → stoopkid joined | 03:48 |
| ← ilmostro left | 03:53 |
| → ilmostro joined | 03:55 |
| ← dreiss left | 03:55 |
| → wpcarro joined | 03:55 |
| → TinkerT joined | 03:55 |
| → profmac joined | 03:57 |
| → Arcatech joined | 03:58 |
| ← wpcarro left | 04:00 |
| ← mrCyborg|zzz left | 04:05 |
| → mrCyborg|zzz joined | 04:05 |
| ← st-gourichon-f left | 04:05 |
| → new1__ joined | 04:06 |
| ← Garen left | 04:07 |
| ← TinkerT left | 04:08 |
| ← profmac left | 04:09 |
| ← return1_ left | 04:09 |
| ← new1__ left | 04:10 |
| → return joined | 04:11 |
| → dreiss joined | 04:14 |
| hays_ → hays | 04:15 |
| ← kfoonamalik left | 04:19 |
| → duderonomy joined | 04:19 |
| ← tribrid left | 04:20 |
| ← PLLunlock left | 04:23 |
| → PLLunlock joined | 04:23 |
| ← zsocw left | 04:25 |
| ← duderonomy left | 04:26 |
|
jim
| so --set-upstream-to=... in git-branch is not deprecated? | 04:26 |
| → dc13ff joined | 04:27 |
| → piggah joined | 04:29 |
| ← wreed left | 04:33 |
|
rafasc
| jim, correct. And is now the recommended way to set up tracking for existing branches. | 04:34 |
| → wreed joined | 04:38 |
| ← dreiss left | 04:42 |
| → duderonomy joined | 04:47 |
| ← jkyle left | 04:47 |
| → mikemcowie joined | 04:47 |
| → tribrid joined | 04:47 |
| ← sword left | 04:49 |
|
craftyguy
| Is there a way to basically "git diff sha1..sha2" and then blame the lines in the diff? | 04:49 |
| → tvw joined | 04:50 |
| ← finalbeta left | 04:50 |
| → wpcarro joined | 04:50 |
| → dendazen_ joined | 04:50 |
| → finalbeta joined | 04:50 |
| ← duderonomy left | 04:51 |
| → sword joined | 04:52 |
| → jungsubk joined | 04:53 |
| → TinkerT joined | 04:54 |
| ← kartch_finnix left | 04:55 |
| ← wpcarro left | 04:55 |
| ← jungsubk left | 05:00 |
| → profmac joined | 05:01 |
| → Silenced joined | 05:01 |
| → kfoonamalik joined | 05:01 |
|
rafasc
| what would expect from such command? | 05:01 |
| → pks_ joined | 05:02 |
|
rafasc
| whatever shows in the diff, will be blamed to the author of sha2... | 05:02 |
| ← pks left | 05:02 |
| pks_ → pks | 05:02 |
| ← RoriconKnight left | 05:03 |
|
craftyguy
| rafasc: not when the diff is over a range of commits, right? | 05:03 |
| → RoriconKnight joined | 05:03 |
| ← Arcatech left | 05:04 |
| ← RoriconKnight left | 05:05 |
| ← mikemcowie left | 05:06 |
|
rafasc
| why not? you're just comparing against a different base, but sha2 is responsible for the changes. | 05:06 |
| → mikemcowie joined | 05:07 |
| ← mikemcowie left | 05:07 |
|
craftyguy
| rafasc: oh I see what you mean. yea, I guess I'd like to be able to display the blame right along with the diff (limit blame to *only* lines in diff) | 05:08 |
| → sauvin joined | 05:08 |
|
rafasc
| https://github.com/Osse/git-scripts/blob/master/git-blamediff | 05:08 |
|
| osse: you're around? | 05:09 |
|
craftyguy
| rafasc: interesting the name seems to suggest it does what I want :P | 05:09 |
|
| I'll give it a try | 05:09 |
|
rafasc
| a regular user has built a tool that seems to do that. | 05:09 |
|
| never tried it though. | 05:10 |
|
craftyguy
| sure. thanks for finding it, I failed :) | 05:10 |
|
rafasc
| I didn't look for it. I just knew it existed cause osse is a regular around here :) | 05:12 |
| → cfoch joined | 05:13 |
| → susame joined | 05:13 |
| → duderonomy joined | 05:13 |
|
craftyguy
| ah, well you searched your brain or something for it :P | 05:13 |
|
| I searched the internets, but I probably was not using the right terms | 05:14 |
|
rafasc
| for the sake of interested, I just tried and it outputs garbage out. | 05:15 |
| ← tribrid left | 05:15 |
|
craftyguy
| boo | 05:16 |
|
rafasc
| or should I say, I can't interpret whatever it is outputting. | 05:17 |
|
| seems to work on the simpler commits though.. | 05:17 |
| ← boombatower left | 05:18 |
| ← Silenced left | 05:20 |
|
craftyguy
| I can't try it now, but will look at it more later when I have the time. Maybe the fix is something I can help with | 05:20 |
|
rafasc
| I think you wouldn't be the first. :) | 05:21 |
| ← PLLunlock left | 05:24 |
| ← ferdna left | 05:25 |
|
rafasc
| craftyguy: https://github.com/eantoranz/difflame | 05:28 |
| ← finalbeta left | 05:29 |
| ← ilmostro left | 05:30 |
| → finalbeta joined | 05:30 |
|
rafasc
| But I often have more luck using git log -S/-G/-L | 05:30 |
| → PLLunlock joined | 05:31 |
| → ilmostro joined | 05:32 |
|
craftyguy
| rafasc: wow, that looks very promising | 05:32 |
|
rafasc
| and add -p, if you want to actually look at the diffs. | 05:33 |
| ← BPL left | 05:35 |
| ← kfoonamalik left | 05:36 |
| → mikemcowie joined | 05:36 |
|
rafasc
| craftyguy: what are you looking for? | 05:37 |
|
| git bisect can also be an option if you can test for the presence of what are you trying to find. | 05:38 |
| → apxm joined | 05:39 |
|
craftyguy
| I work with a project that sees patch series merged regularly. when things break, sometimes I can spot candidates in the diff, but then I have to go blame the file, find the line, etc to get the commit. Sometimes it is multiple commits. | 05:40 |
|
| so I end up doing "git diff", look, "git blame <interesting file>", look, "git diff", look, "git blame <another interesting file>" , etc | 05:40 |
|
rafasc
| are you aware of git bisect? | 05:41 |
|
craftyguy
| yes I am. I use that too | 05:41 |
|
rafasc
| ok, just checking. | 05:41 |
|
craftyguy
| but that is more useful if I don't have a clue about what broke | 05:41 |
|
rafasc
| sometimes it's faster than looking manually. | 05:43 |
|
| especially if you use bisect run. | 05:43 |
| ← dendazen_ left | 05:44 |
|
rafasc
| but yeah, depending on the issue it might be easier to just look at the logs. | 05:44 |
| → jkyle joined | 05:45 |
|
rafasc
| Sometimes I do both, continue searching while it runs. | 05:46 |
|
craftyguy
| yea same here | 05:46 |
| ← tristanp left | 05:49 |
| → freimatz joined | 05:50 |
| ← netj left | 05:50 |
| → netj joined | 05:51 |
| → RoriconKnight joined | 05:53 |
| → pawle joined | 05:53 |
| → ocds joined | 05:54 |
| → junaidnaseer2 joined | 05:58 |
| ← ocds left | 05:59 |
| ← inovas left | 06:00 |
| → prakashdanish joined | 06:01 |
| ← pawle left | 06:01 |
| → inovas joined | 06:01 |
| → ocds joined | 06:03 |
| → keepLearning512 joined | 06:04 |
| ← Toadisattva left | 06:06 |
| ← duderonomy left | 06:11 |
| ← tombusby left | 06:11 |
| → tombusby joined | 06:12 |
| ← tombusby left | 06:13 |
| → tombusby joined | 06:13 |
| → duderonomy joined | 06:13 |
| → tribrid joined | 06:13 |
| ← motoko-chan left | 06:14 |
| ← madewokherd left | 06:14 |
| → neure joined | 06:17 |
| ← stoopkid left | 06:21 |
| → MACscr joined | 06:21 |
| ← navidr left | 06:24 |
| → dreiss joined | 06:25 |
| ← duderonomy left | 06:26 |
| → lightstalker joined | 06:26 |
| ← tvw left | 06:28 |
| → duderonomy joined | 06:29 |
| ← tribrid left | 06:31 |
| ← susame left | 06:33 |
| ← dreiss left | 06:34 |
| ← Bobguy left | 06:35 |
| ← lanlink left | 06:35 |
| ← duderonomy left | 06:37 |
| → wpcarro joined | 06:39 |
| → themill joined | 06:42 |
| ← wpcarro left | 06:43 |
| ← Hounddog left | 06:47 |
| → Hounddog joined | 06:47 |
| → duderonomy joined | 06:48 |
| → dreiss joined | 06:50 |
| → tristanp joined | 06:50 |
| → susame joined | 06:52 |
| ← tristanp left | 06:55 |
| ← duderonomy left | 06:56 |
| ← apxm left | 06:56 |
| → duderonomy joined | 06:58 |
| → Envil joined | 07:01 |
| ← susame left | 07:01 |
| ← prakashdanish left | 07:02 |
| → teodorg joined | 07:03 |
| → schleppel joined | 07:04 |
| ← PLLunlock left | 07:07 |
| ← plos left | 07:08 |
| → plos joined | 07:08 |
| ← dreiss left | 07:10 |
| → lordjancso joined | 07:11 |
| → zegerjan joined | 07:12 |
| → joelroa joined | 07:15 |
| ← duderonomy left | 07:15 |
| ← return left | 07:19 |
| → return joined | 07:19 |
| → libregeekingkid joined | 07:19 |
| → duderonomy joined | 07:21 |
| ← lordjancso left | 07:22 |
| → martinus__ joined | 07:24 |
| → plexigras joined | 07:27 |
| ← duderonomy left | 07:28 |
| → duderonomy joined | 07:29 |
| → nBurn joined | 07:31 |
| ← Mat001 left | 07:31 |
| → wpcarro joined | 07:34 |
| ← dc13ff left | 07:37 |
| ← wpcarro left | 07:38 |
| ← Goplat left | 07:39 |
| ← duderonomy left | 07:42 |
| ← zegerjan left | 07:43 |
| → duderonomy joined | 07:46 |
| → felixsanz joined | 07:50 |
| ← felixsanz left | 07:50 |
| → felixsanz joined | 07:52 |
| ← felixsanz left | 07:52 |
| ← duderonomy left | 07:52 |
| → felixsanz joined | 07:53 |
| ← felixsanz left | 07:53 |
| → felixsanz joined | 07:54 |
| ← felixsanz left | 07:54 |
| → duderonomy joined | 07:55 |
| → felixsanz joined | 07:55 |
| ← felixsanz left | 07:56 |
| → felixsanz joined | 07:56 |
| ← felixsanz left | 07:56 |
| → leeN joined | 07:59 |
| → dege joined | 08:00 |
| ← orbyt_ left | 08:00 |
| ← jkyle left | 08:00 |
| ← cfoch left | 08:02 |
| ← mikemcowie left | 08:02 |
| ← dege left | 08:05 |
| → kes joined | 08:07 |
| ← freimatz left | 08:10 |
| ← chat left | 08:11 |
| ← duderonomy left | 08:14 |
| ← beerdrop left | 08:18 |
| ← GreenJello left | 08:18 |
| → GreenJello joined | 08:20 |
| → Carlsberg joined | 08:20 |
| → chat joined | 08:22 |
| → zsocw joined | 08:23 |
| → tvw joined | 08:26 |
| ← GreenJello left | 08:26 |
| → GreenJello joined | 08:28 |
| → soee joined | 08:30 |
| ← keepLearning512 left | 08:32 |
| → beerdrop joined | 08:32 |
| → czart joined | 08:33 |
| ← njbair left | 08:34 |
| → njbair joined | 08:34 |
| → okovko joined | 08:34 |
| → K1rk joined | 08:36 |
| ← joelroa left | 08:37 |
| ← Guest89225 left | 08:40 |
| → paskl_ joined | 08:40 |
| → sourcream joined | 08:42 |
| → joelroa joined | 08:42 |
| ← rafasc left | 08:44 |
| ← tvw left | 08:44 |
| → Mrdoor joined | 08:45 |
| ← paskl_ left | 08:45 |
| → tvw joined | 08:47 |
| ← andai left | 08:47 |
| → BallChang-CN_ joined | 08:48 |
| ← dsdeiz left | 08:48 |
| → Guest89225 joined | 08:50 |
| → paskl joined | 08:50 |
| ← BallChang-CN left | 08:51 |
| → Quetzal2 joined | 08:52 |
| → PedolordIV joined | 08:54 |
| ← PedolordIV left | 08:55 |
| → PedolordIV joined | 08:55 |
| ← RoriconKnight left | 08:55 |
| → EbbaReiger joined | 08:55 |
| ← Carlsberg left | 08:57 |
| ← graphene left | 09:00 |
| → graphene joined | 09:00 |
| → Raimondii joined | 09:01 |
| ← Raimondi left | 09:03 |
| Raimondii → Raimondi | 09:03 |
| → tribrid joined | 09:04 |
| ← finalbeta left | 09:05 |
| → finalbeta joined | 09:05 |
| ← libregeekingkid left | 09:06 |
| → Silenced joined | 09:06 |
| ← EbbaReiger left | 09:08 |
| → SteffanW joined | 09:09 |
| → mikecmpbll joined | 09:11 |
| ← return left | 09:12 |
| → return joined | 09:13 |
| → pfleck joined | 09:14 |
| → meek joined | 09:15 |
| → zegerjan joined | 09:15 |
| ← zegerjan left | 09:16 |
| → zegerjan joined | 09:16 |
| → xrt joined | 09:16 |
| → soee_ joined | 09:17 |
| ← meek left | 09:18 |
| → honnda324 joined | 09:18 |
| ← chris349 left | 09:19 |
| → texinwien joined | 09:19 |
| ← soee left | 09:20 |
| ← honnda324 left | 09:20 |
| ← catsup left | 09:20 |
| → catsup joined | 09:20 |
| ← catsup left | 09:21 |
| → libregeekingkid joined | 09:22 |
| → catsup joined | 09:22 |
| ← SteffanW left | 09:22 |
| → chris349 joined | 09:23 |
| ← joelroa left | 09:24 |
| ← njbair left | 09:24 |
| → estodiMania joined | 09:24 |
| → njbair joined | 09:25 |
| ← return left | 09:25 |
| → return joined | 09:25 |
| ← zegerjan left | 09:27 |
| ← libregeekingkid left | 09:27 |
| → zegerjan joined | 09:28 |
| → libregeekingkid joined | 09:29 |
| → Arcatech joined | 09:32 |
| ← estodiMania left | 09:33 |
| ← vera_zhang left | 09:33 |
| ← return left | 09:36 |
| ← pfleck left | 09:36 |
| → return joined | 09:37 |
| ← return left | 09:38 |
| → return joined | 09:38 |
| ← leeN left | 09:38 |
| ← return left | 09:39 |
| → return joined | 09:39 |
| ← tvw left | 09:44 |
| ← plos left | 09:51 |
| ← ilmostro left | 09:51 |
| → ilmostro joined | 09:53 |
| ← zegerjan left | 09:54 |
| ← gxt left | 09:56 |
| → gxt joined | 09:59 |
| ← Arcatech left | 09:59 |
| → magellanicloud joined | 10:00 |
| ← lankanmon left | 10:01 |
| → zegerjan joined | 10:02 |
| → Regon joined | 10:05 |
| ← Silenced left | 10:10 |
| → doev joined | 10:10 |
| ← inovas left | 10:11 |
| → inovas joined | 10:13 |
| → xaa__ joined | 10:15 |
| → wpcarro joined | 10:16 |
| ← tribrid left | 10:21 |
| ← sourcream left | 10:23 |
| ← xrt left | 10:23 |
| ← wpcarro left | 10:24 |
| → freimatz joined | 10:25 |
| ← libregeekingkid left | 10:25 |
| ← fatalhalt left | 10:36 |
| → tarkus joined | 10:39 |
| → yyy- joined | 10:41 |
|
okovko
| after git rebase HEAD~2 HEAD -i, and i edit HEAD~1, how can i git checkout HEAD some_file? | 10:46 |
|
| when i type git log after stopping at HEAD~1, HEAD now refers to what was HEAD~1 | 10:46 |
|
oprypin
| okovko, HEAD is where you are at right now | 10:47 |
|
| so it's obvious why it refers to... where you are right now | 10:47 |
|
grawity
| you have to refer to the branch by name | 10:47 |
|
| before starting the rebase, HEAD probably pointed to the tip of master | 10:47 |
| → libregeekingkid joined | 10:47 |
|
grawity
| or something like that | 10:48 |
|
| so `git checkout master some_file` would do the job | 10:48 |
|
okovko
| ah okay, thanks, so HEAD doesn't always point to the tip of the branch? | 10:48 |
|
grawity
| no | 10:49 |
|
| HEAD points to the thing you currently have checked out | 10:49 |
|
okovko
| woops, that was a bad misunderstanding | 10:49 |
|
| thanks for clarifying | 10:49 |
|
grawity
| mid-rebase, when you're editing some commit, HEAD points to that commit -- because that's what you have checked out | 10:49 |
|
okovko
| but let's say i have some other commit i need to refer to that isn't the tip of master | 10:50 |
|
| it doesn't show up in git log anymore, so how could i refer to that? | 10:50 |
|
grawity
| the same way as always really | 10:50 |
|
| it doesn't show up in git log, because git log starts at HEAD | 10:50 |
|
| but the commit is still in master | 10:50 |
|
| so you can find its commit ID from `git log master` | 10:50 |
|
| or use master~1 etc. if that's what you need | 10:51 |
|
okovko
| thank you for clearing this up for me! | 10:51 |
| → Ekaterina joined | 10:51 |
| ← texinwien left | 10:51 |
| ← sentriz left | 10:52 |
| ← njbair left | 10:52 |
| → njbair joined | 10:53 |
| ← Ekaterina left | 10:55 |
| → tvw joined | 10:56 |
| → Ekaterina joined | 10:56 |
| → lankanmon joined | 10:56 |
| → nikio_ joined | 10:57 |
| ← z|bandito left | 10:57 |
|
okovko
| grawity: if you still have a minute, when i performed the steps i got a merge conflict at the end, even though everything was performed within one branch. i'm not really understanding what is being merged and why there is a conflict. basically, i want to transfer a hunk from a commit to its parent, and i'm not expecting a merge conflict | 11:00 |
| → borkr joined | 11:01 |
| → staafl_ joined | 11:02 |
| → AtumT joined | 11:03 |
| → m0viefreak joined | 11:04 |
|
grawity
| sorry, I don't really have any idea about rebasing | 11:07 |
|
| the full log of your terminal (!repro) would be useful in general though | 11:07 |
|
gitinfo
| [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see | 11:07 |
|
okovko
| sure, one sec | 11:07 |
| ← topdownjimmy left | 11:08 |
| ← njbair left | 11:09 |
| ← Ekaterina left | 11:09 |
| → topdownjimmy joined | 11:09 |
| ← tvw left | 11:10 |
| → njbair joined | 11:10 |
| ← a3Dman left | 11:11 |
| → pfleck joined | 11:12 |
|
j416
| if you are right after the rebase, ORIG_HEAD will point to what HEAD was at before the rebase. | 11:14 |
|
| you can also find it in the reflog. | 11:14 |
| → z|bandito joined | 11:14 |
| → a3Dman joined | 11:15 |
|
j416
| you can use that to compare the state or log before/after | 11:15 |
|
okovko
| j416 does that work during the rebase, or only right after? | 11:18 |
|
j416
| after. | 11:18 |
|
| maybe during | 11:18 |
|
| not sure | 11:18 |
|
okovko
| i'll give that a try in a sec | 11:18 |
|
j416
| never tried, never had a use for it | 11:18 |
|
okovko
| i finished my log and i'm posting it in a sec | 11:18 |
|
j416
| you can use the branch name during the rebase | 11:18 |
| ← libregeekingkid left | 11:21 |
|
okovko
| okay, this is quite ugly https://gist.github.com/okovko/90df91be0d0e085b0e43f0343c831852 | 11:23 |
|
| this is a download link for the text file with the contents of my terminal output http://termbin.com/005v if that's any better | 11:24 |
| ← neure left | 11:25 |
|
okovko
| i'll try just copy pasting it by highlighting in my terminal.. i tried using xclip to put the file the script command generated into my clipboard and pasting that | 11:26 |
| → Harias joined | 11:26 |
| → neure joined | 11:27 |
|
okovko
| grawity okay, here is a clean gist https://gist.github.com/okovko/90df91be0d0e085b0e43f0343c831852, if you still have a sec | 11:30 |
| → SteffanW joined | 11:30 |
|
okovko
| it would be really crisp if i could generate a log using script that isn't full of creepy characters, because it shows the part of the git interface that's in the editor (for example right after git rebase -i) | 11:31 |
|
j416
| asciinema maybe | 11:32 |
| → libregeekingkid joined | 11:32 |
| ← dpyro left | 11:34 |
|
oprypin
| okovko, what's really creepy is your shell prompt but w/e | 11:34 |
|
okovko
| it's just oh-my-zsh :P | 11:34 |
| → dpyro joined | 11:34 |
| ← dpyro left | 11:35 |
|
okovko
| i disabled my little extension that shows the vi mode my shell is in to make it a little less ugly ^^ | 11:35 |
|
oprypin
| i think the most important thing for readability is to never change the horizontal position of the command input | 11:36 |
| ← freimatz left | 11:36 |
|
oprypin
| 2nd most important is to never change the delimiter that indicates the start | 11:36 |
|
| of the command input | 11:36 |
|
| this just murders those points | 11:36 |
| → jnavila joined | 11:37 |
|
okovko
| oprypin you're right, i'll figure out how to toggle it in zsh and make it the bare minimum for the next time i make a terminal history gist | 11:37 |
| → DusteD joined | 11:38 |
| → andrewm87 joined | 11:39 |
| yyy- → yyy | 11:45 |
| ← jnavila left | 11:46 |
| ← zsocw left | 11:49 |
| → Essadon joined | 11:50 |
|
okovko
| oprypin i updated the gist so it's legible like you requested, now https://gist.github.com/okovko/90df91be0d0e085b0e43f0343c831852 | 11:50 |
|
| to reiterate the question, it's that i'm unsure why there is a merge conflict at the end and if anyone can clarify that for me it would help out a lot. googling for this was not successful | 11:51 |
| ← andrewm87 left | 11:53 |
| ← soee_ left | 11:53 |
| → soee joined | 11:53 |
| → nbunjeva3 joined | 11:53 |
| → TheRuckus joined | 11:54 |
| ← magellanicloud left | 11:55 |
| ← graphene left | 11:56 |
| ← nbunjeva1 left | 11:56 |
| → sunri5e joined | 11:57 |
| → graphene joined | 11:57 |
| → felixsanz joined | 11:58 |
| ← felixsanz left | 11:58 |
| → felixsanz joined | 11:59 |
| ← felixsanz left | 11:59 |
| ← pfleck left | 12:00 |
| → felixsanz joined | 12:00 |
| ← felixsanz left | 12:00 |
| → felixsanz joined | 12:02 |
| ← felixsanz left | 12:02 |
| → cybrNaut joined | 12:03 |
|
okovko
| i actually did find a resource that answers my question in an obscure stack overflow answer after googling a lot of variations, thanks guys, here it is if anyone is curious https://stackoverflow.com/questions/45059039/how-do-i-move-partial-changes-hunks-between-commits | 12:03 |
|
| turns out that i need to edit both the commit that i want to move the hunk to, and also remove that hunk from the commit that introduced it prior to the rebase | 12:04 |
| → felixsanz joined | 12:04 |
| ← felixsanz left | 12:04 |
| ← Harias left | 12:04 |
|
oprypin
| i've never used `git rebase` with two positional arguments, so i'm inclined to guess that there's a better way | 12:05 |
| → felixsanz joined | 12:05 |
| ← felixsanz left | 12:05 |
| → felixsanz joined | 12:06 |
| ← felixsanz left | 12:06 |
| → felixsanz joined | 12:06 |
| ← felixsanz left | 12:06 |
|
okovko
| oprypin i didn't set an upstream so i had to be explicit, but it's just the default behavior you'd expect with git rebase -i | 12:07 |
| ← czart left | 12:07 |
|
okovko
| i'm starting to wish git had a regex cli interface instead of making me pop open vim every time | 12:08 |
| → zsoc joined | 12:08 |
| ← zsoc left | 12:08 |
| → zsoc joined | 12:08 |
|
okovko
| like regex option for patch instead of selecting "e" | 12:08 |
|
| manually editing patch files is a drag.. | 12:08 |
|
| j416 btw ORIG_HEAD did the trick during rebase, it's nicer than having to use branch~#, thanks | 12:12 |
| ← libregeekingkid left | 12:19 |
| ← zegerjan left | 12:20 |
| ← zsoc left | 12:23 |
| ← PedolordIV left | 12:26 |
| → PedolordIV joined | 12:26 |
| ← g00s left | 12:26 |
| ← govg left | 12:27 |
| → g00s joined | 12:27 |
|
okovko
| oprypin looks like the optimal approach instead of git rebase is to use git format-patch, because then you can apply that patch to all the branches you potentially invalidated | 12:28 |
|
| man it seemed like a trivial thing to do, to clean up local commits before pushing by moving some hunks around, but performing this is a huge drag | 12:29 |
| → zegerjan joined | 12:30 |
|
okovko
| i wonder how i could get started writing a git extension to do this elegantly? | 12:30 |
| ← piggah left | 12:32 |
| → polyzen joined | 12:37 |
| ← okovko left | 12:50 |
| ← ocds left | 12:51 |
| ← negaduck left | 12:52 |
| → tristanp joined | 12:53 |
| → madewokherd joined | 12:55 |
| → okovko joined | 12:56 |
| → st-gourichon-fid joined | 12:56 |
| ← tristanp left | 12:57 |
| ← zegerjan left | 12:58 |
| → dre_ joined | 12:59 |
| → negaduck joined | 12:59 |
| → osse joined | 13:01 |
| → danielh1234 joined | 13:12 |
|
j416
| okovko: good to know! | 13:15 |
|
| ty | 13:15 |
| → ocds joined | 13:16 |
|
j416
| okovko: you don't need format-patch to apply a patch in the same repo. Use cherry-pick instead. | 13:17 |
|
okovko
| j416 i didn't look into detail into that method but i think the idea was that if you want to move hunks between commits A and Z, you can format a patch from A to Z then apply it as an alternative to git rebase -i --rebase-merges | 13:18 |
|
| but then you have to manually edit the patch file which isn't particularly appealing either | 13:19 |
|
| i'm not sure how cherry pick operates when it comes to commit ranges | 13:19 |
|
| is that another potential alternative? | 13:19 |
|
j416
| man git-cherry-pick look for -p | 13:21 |
|
gitinfo
| the git-cherry-pick manpage is available at https://gitirc.eu/git-cherry-pick.html | 13:21 |
|
j416
| hm maybe it doesn't have patch mode | 13:21 |
|
| yo can cherry-pick without committing and add -p as needed | 13:22 |
|
okovko
| sounds even more painful than rebase or patch | 13:24 |
| ← ocds left | 13:25 |
| ← nikio_ left | 13:27 |
| → Mat001 joined | 13:28 |
| ← chris349 left | 13:33 |
| → prakashdanish joined | 13:33 |
| → avar joined | 13:35 |
| ← avar left | 13:35 |
| → avar joined | 13:35 |
| ← dre_ left | 13:35 |
| ← SteffanW left | 13:36 |
| ← nbunjeva3 left | 13:37 |
| → Darren joined | 13:38 |
| Darren → Guest56473 | 13:38 |
|
j416
| ¯\_(ツ)_/¯ | 13:40 |
| ← nuc left | 13:42 |
| → atlas_ joined | 13:43 |
| → nuc joined | 13:44 |
| → ToBeFree joined | 13:44 |
| ← ToBeFree left | 13:44 |
| → ToBeFree joined | 13:44 |
| gitinfo set mode: +v | 13:45 |
| → chris349 joined | 13:47 |
| → Mattiaslndstrm joined | 13:48 |
|
royal_screwup21
| anyone here have experience with golang + godep? I'm importing a local packages in my .go file like so: Import "greet" . I ran godep save ./... and I'm getting this error: https://thepasteb.in/p/98hRXqV7kz2ck | 13:49 |
| ← PedolordIV left | 13:50 |
| → zmt01 joined | 13:50 |
| → ferdna joined | 13:50 |
| ← Guest56473 left | 13:53 |
| ← finalbeta left | 13:55 |
| ← xaa__ left | 13:55 |
| → finalbeta joined | 13:55 |
| → xaa__ joined | 13:55 |
|
royal_screwup21
| anyway, fixed it. Apparently godep can't trace local dependency if they aren't version controlled | 13:56 |
| → opalepatrick joined | 14:06 |
| xaa__ → xaa | 14:06 |
|
royal_screwup21
| what does this mean: "If you include the repository URL in the package's import path, go get will fetch, build, and install it automatically. Eg: go get github.com/<user>/mypackage" Does this mean that if you want to go get a package, that package HAS to be a github.com clone? | 14:06 |
| ← opalepatrick left | 14:07 |
| → lomex joined | 14:08 |
| ← graphene left | 14:08 |
| → graphene joined | 14:09 |
|
canton7
| royal_screwup21, you'll probably get better answers in a go channel, not a git channel | 14:10 |
|
| since these are go questions | 14:10 |
|
royal_screwup21
| ah yup,sorry about that, the go-nuts channels seems to super inactive today :( | 14:10 |
|
canton7
| yeah, things tend to be quieter on IRC at weekends, since everyone is at home and away from their computers | 14:11 |
| → upperdeck joined | 14:12 |
| → stoopkid joined | 14:13 |
| ← unreal left | 14:18 |
| ← DusteD left | 14:20 |
| → DusteD joined | 14:20 |
| ← lankanmon left | 14:23 |
| → czart joined | 14:23 |
| → Silenced joined | 14:23 |
| → lankanmon joined | 14:24 |
| → mud joined | 14:25 |
| → xtungvu90 joined | 14:28 |
| → zegerjan joined | 14:30 |
| ← zegerjan left | 14:30 |
| → zegerjan joined | 14:30 |
| → dc13ff joined | 14:37 |
| → ShekharReddy joined | 14:38 |
| ← ilmostro left | 14:40 |
| → ilmostro joined | 14:41 |
| ← prakashdanish left | 14:42 |
| ← notnull left | 14:43 |
| → notnull joined | 14:44 |
| ← notnull left | 14:44 |
| → notnull joined | 14:44 |
| → Darren joined | 14:44 |
| Darren → Guest65312 | 14:44 |
| ← mud left | 14:45 |
| ← wreed left | 14:46 |
| ← ilmostro left | 14:46 |
| → ilmostro joined | 14:49 |
| ← zegerjan left | 14:51 |
| → tristanp joined | 14:53 |
| ← tomfarr left | 14:54 |
| → zegerjan joined | 14:57 |
| ← tristanp left | 14:58 |
| ← junaidnaseer2 left | 15:01 |
| → opalepatrick joined | 15:01 |
| ← doev left | 15:02 |
| → kfoonamalik joined | 15:04 |
| → lanlink joined | 15:05 |
| ← opalepatrick left | 15:07 |
| ← lomex left | 15:08 |
| ← Guest65312 left | 15:10 |
| → RuckusBringer joined | 15:17 |
| ← zegerjan left | 15:18 |
| ← borkr left | 15:19 |
| ← TheRuckus left | 15:20 |
| → dsdeiz joined | 15:20 |
| ← dsdeiz left | 15:20 |
| → dsdeiz joined | 15:20 |
| → tomfarr joined | 15:22 |
| → ajbura joined | 15:23 |
| → ajbura` joined | 15:23 |
| ← ajbura left | 15:24 |
| ajbura` → ajbura | 15:24 |
| → pfleck joined | 15:30 |
| → applecrumble joined | 15:32 |
| ← BallChang-CN_ left | 15:32 |
| ← profmac left | 15:32 |
| → BallChang-CN joined | 15:32 |
| ← DusteD left | 15:34 |
| ← BallChang-CN left | 15:37 |
| → BallChang-CN joined | 15:37 |
| → Bobdude joined | 15:39 |
| ← BallChang-CN left | 15:42 |
| ← pfleck left | 15:42 |
| → darkbit joined | 15:42 |
| → BallChang-CN joined | 15:42 |
| ← darkbit left | 15:43 |
| → darkbit joined | 15:44 |
| ← ajbura left | 15:44 |
| ← mofai left | 15:46 |
| ← BallChang-CN left | 15:47 |
| → BallChang-CN joined | 15:47 |
| → duderonomy joined | 15:49 |
| ← ToBeFree left | 15:50 |
| → zmt00 joined | 15:56 |
| ← zmt01 left | 16:00 |
| → DusteD joined | 16:01 |
| ← duderonomy left | 16:02 |
| → BPL joined | 16:02 |
|
BPL
| My factory local branch is tracking origin/factory and it's pointing out to the same commit than remote upstream. It says it's "78 ahead 30 behind", I understand this message refers it's N commits ahead from the remote branch is tracking. Anyway, my question being, how do i "sync" local and tracked branch with upstream? :/ | 16:05 |
|
j416
| BPL: rebase, merge, or reset | 16:07 |
| → duderonomy joined | 16:08 |
| → joelroa joined | 16:08 |
| ← Mattiaslndstrm left | 16:13 |
|
BPL
| j416: could you please be more specific? I'm a little bit lost here, I've made a git rebase --abort and after waiting a bit the gui i'm using refreshed and now is telling me Pull(30) and Push(78). If I try to push it'll tell me "hint: Updates were rejected because the tip of your current branch is behind", how to proceed now? | 16:13 |
| ← danielh1234 left | 16:14 |
| → jyk joined | 16:14 |
| ← multi_io left | 16:14 |
| → multi_io joined | 16:15 |
| ← lanlink left | 16:17 |
|
BPL
| meh, never mind, i've checkout another local branch, deleted the conflicted one, checkout origin/factory, reset hard to upstream/factory and made git push --force-with-lease, done :P | 16:20 |
| → jkyle joined | 16:23 |
| → orbyt_ joined | 16:24 |
| ← applecrumble left | 16:24 |
| ← atlas_ left | 16:25 |
| ← darkbit left | 16:27 |
|
j416
| BPL: not without more info | 16:27 |
|
| BPL: but it seems you chose the 'reset' path. | 16:27 |
|
BPL
| j416: yeah, i'm sure i could have solved the issue in a better way but hey, at least now I've got my fork in sync with remote :/ | 16:28 |
|
j416
| ¯\_(ツ)_/¯ | 16:28 |
| ← zmt00 left | 16:29 |
| ← Guest89225 left | 16:32 |
| → freimatz joined | 16:37 |
| → fission6 joined | 16:37 |
| → zmt00 joined | 16:41 |
| → Guest89225 joined | 16:41 |
| → maarhart joined | 16:42 |
| ← maarhart left | 16:42 |
| ← Silenced left | 16:42 |
| → maarhart joined | 16:42 |
| ← maarhart left | 16:42 |
| → doev joined | 16:42 |
| ← duderonomy left | 16:43 |
| → maarhart joined | 16:43 |
| ← maarhart left | 16:43 |
| → maarhart joined | 16:43 |
| ← maarhart left | 16:43 |
| → maarhart joined | 16:43 |
| → zegerjan joined | 16:46 |
| ← joelroa left | 16:47 |
| ← averell left | 16:48 |
| → jnavila joined | 16:50 |
| ← BallChang-CN left | 16:52 |
| → BallChang-CN joined | 16:52 |
| → tristanp joined | 16:54 |
| → averell joined | 16:54 |
|
cxc99
| does anyone know how in general you would step over the auto-complete "" in an IDE instead of having to type " or use the arrow key? | 16:55 |
| → mescalinum joined | 16:56 |
| → thiago joined | 16:56 |
| → boshhead joined | 16:56 |
| ← boshhead left | 16:56 |
| → boshhead joined | 16:56 |
| ← BallChang-CN left | 16:57 |
| → jhaenchen joined | 16:57 |
| → BallChang-CN joined | 16:57 |
| → basteh joined | 16:58 |
| ← tristanp left | 16:58 |
|
okovko
| cxc99 use a snippets plug in and make your own binds. the defaults for that behavior don't seem to make anyone happy | 16:59 |
| ← Guest89225 left | 16:59 |
| → Onionnion joined | 17:00 |
| ← cdown left | 17:03 |
| → cdown joined | 17:06 |
| → aax joined | 17:09 |
| → Guest89225 joined | 17:11 |
| ← jkyle left | 17:12 |
| ← xaa left | 17:13 |
| → keepLearning512 joined | 17:13 |
|
j416
| cxc99: that's not a Git question but what editor is it? | 17:14 |
|
| the general way would be "disable it in the editor configuration" | 17:15 |
|
cxc99
| most editors, but this is intellij | 17:16 |
| → Goplat joined | 17:18 |
| ← ferdna left | 17:18 |
| ← zegerjan left | 17:20 |
| ← hermann_1ordung left | 17:20 |
| ← maarhart left | 17:20 |
| ← finalbeta left | 17:21 |
| ← aax left | 17:21 |
| → finalbeta joined | 17:21 |
| → maarhart joined | 17:21 |
| → aax joined | 17:21 |
| → joelroa joined | 17:22 |
| → shicks_ joined | 17:24 |
| → nbunjeva1 joined | 17:24 |
| ← keepLearning512 left | 17:25 |
|
j416
| wouldn't say most editors. | 17:26 |
|
| never used intellij, sorry. | 17:26 |
| ← shicks2525 left | 17:26 |
|
j416
| maybe google "disable quote matching intellij". | 17:26 |
| → zegerjan joined | 17:26 |
|
BPL
| do you know how to delete all local branches? ie: `git branch | grep -v "master" | xargs git branch -D | 17:27 |
|
| ` will delete all of them except master... but I'm not sure if one "active" local branch can be deleted. | 17:27 |
| → jkyle joined | 17:28 |
| ← Guest89225 left | 17:30 |
|
canton7
| I think 'git update-ref' can delete the current branch? Why do you want to do that, anyway? | 17:31 |
| → lomex joined | 17:33 |
| ← maarhart left | 17:33 |
|
cxc99
| ah thanks couldn't figure out what it was actually called :) | 17:33 |
| ← okovko left | 17:34 |
| → okovko joined | 17:34 |
| → maarhart joined | 17:35 |
| ← ilmostro left | 17:36 |
| ← dc13ff left | 17:37 |
| → Guest89225 joined | 17:37 |
| ← maarhart left | 17:38 |
| → ilmostro joined | 17:38 |
|
BPL
| canton7: I was testing this script https://bpaste.net/show/06a92a9173c2 which I'd like to use to sync all my forks with their remotes. But to make it work I think I need first to remove all the local branches first. Or maybe not, for instance, not sure if related but if i remove all local branches except "master" and run the script i'll get this error https://dl.dropboxusercontent.com/s/yq7d4w7b6kaq1q7/cmd_2018-09-08_19-37-56.png | 17:39 |
| → fflam joined | 17:39 |
| ← ilmostro left | 17:40 |
|
canton7
| BPL, right, so the branch pr_accept on origin has commits which the pr_accept branch on upstream doesn't have | 17:41 |
|
| BPL, which is why it's refusing to push -- if it did let you push, you'd be removing commits which exist on origin | 17:42 |
| → maarhart joined | 17:42 |
|
BPL
| canton7: I see, i was looking at the gui and you're completely right, it wasn't because of master not deleted afterall :/ | 17:42 |
|
| canton7: So, guess the script is doing the right thing by failing in those cases? | 17:43 |
| → ilmostro joined | 17:43 |
|
canton7
| sure, git's refusing to throw away data | 17:43 |
| ← maarhart left | 17:48 |
|
BPL
| canton7: One last question, I'm checking my fork at github and i can see all branches are even with upstream except 'master', any idea? | 17:50 |
|
canton7
| that script specifically excludes master | 17:50 |
|
BPL
| oh, yeah, sure, my first question grep -v :/ | 17:51 |
|
canton7
| what are you trying to achieve though? Why do you have a fork which is identical to upstream in every way? | 17:51 |
|
BPL
| canton7: I'm just messing around and getting more familiar with git tbh, I've got some outdated forks i'd like to sync so i can check the state of the project and what needs to be done, nothing special actually | 17:53 |
|
canton7
| cool. Most forks exist either to apply some modifications on top of upstream, or to develop contributions back to upstream. In the former updating is going to be a partially manual process, and the latter you only need to update master when you want to develop another contribution | 17:55 |
| → Mattiaslndstrm joined | 17:55 |
| → dviola joined | 17:55 |
| ← joelroa left | 17:59 |
| → govg joined | 17:59 |
|
BPL
| I see, I guess it makes sense, if you're assigned or self-assigning to a particular ticket that way seems to be really fast. In this case is more about grasping an overall view of my outdated forks, but also to learn some new stuff about git as I just barely know the basics and because of that i end-up wasting a lot of time with non-coding git related things, and that's bad :) | 18:00 |
|
canton7
| if you've just got outdated forks hanging around, why not delete them? | 18:01 |
|
BPL
| mmm, that's actually a good suggestion :) . Delete and clone them again | 18:01 |
|
| sorry, delete and fork them again | 18:02 |
|
canton7
| my point was more, if they're not being used, why have them at all? | 18:02 |
| → profmac joined | 18:03 |
| → profmac_ joined | 18:03 |
| ← BallChang-CN left | 18:03 |
| ← profmac_ left | 18:03 |
| → jim joined | 18:04 |
| ← jim left | 18:04 |
|
BPL
| well... I'm the type of guy who likes to stack books on the worktable, even if I don't read them straightaway I like to have them as a reference :) . But yeah, sure you've got a point there | 18:05 |
| → jakogut joined | 18:05 |
| → VladGh joined | 18:06 |
|
BPL
| although i guess if you're just using projects as a reference or to not contribute on it at all you should just clone it directly without forking it :/ | 18:07 |
|
canton7
| yeah. stars are github's way of bookmarking a project | 18:08 |
|
BPL
| never used the stars thing, i know they exist but don't know very well it's purpose, I thought they were to measure how popular a repo was... :/ | 18:09 |
|
Zarthus
| they serve many purposes | 18:09 |
|
| but most of it is superficial and nonsignificant | 18:09 |
|
canton7
| "how many people have bookmarked this repo" is a reasonable measure of how popular it is | 18:09 |
| ← graphene left | 18:10 |
| ← chris349 left | 18:11 |
| → graphene joined | 18:11 |
| ← graphene left | 18:12 |
| → graphene joined | 18:13 |
| → jim joined | 18:14 |
| → bast3h joined | 18:16 |
| → xaa__ joined | 18:16 |
| ← xaa__ left | 18:17 |
| → dpyro joined | 18:18 |
| ← Hounddog left | 18:18 |
| ← tarkus left | 18:18 |
| ← basteh left | 18:19 |
| → Hounddog joined | 18:19 |
| ← aax left | 18:19 |
| zalt_ → zalt | 18:21 |
| ← m0viefreak left | 18:22 |
| → chris349 joined | 18:25 |
| → bastey joined | 18:26 |
| ← soee left | 18:26 |
| ← bast3h left | 18:29 |
| → applecrumble joined | 18:29 |
| ← jnavila left | 18:31 |
| ← dviola left | 18:32 |
| ← inovas left | 18:33 |
| → sQVe joined | 18:36 |
| ← supernovah left | 18:36 |
| → inovas joined | 18:40 |
| ← sQVe left | 18:40 |
| → mizu_no_oto joined | 18:40 |
| ← lomex left | 18:44 |
| → Silenced_v2 joined | 18:49 |
| → Arcatech joined | 18:52 |
| ← okovko left | 18:52 |
| ← xtungvu90 left | 18:53 |
| → tristanp joined | 18:55 |
| ← Silenced_v2 left | 18:56 |
| → jnavila joined | 18:59 |
| ← tristanp left | 18:59 |
| → _abs_ joined | 18:59 |
|
gxt
| BPL: Instead of deleting and cloning again, just fetch and merge. | 19:00 |
| → texinwien joined | 19:02 |
| → dege joined | 19:04 |
| ← Mat001 left | 19:08 |
| ← Onionnion left | 19:10 |
| → spacesuitdiver joined | 19:15 |
| ← ShekharReddy left | 19:17 |
| → mlopezviedma_ joined | 19:18 |
| → maarhart joined | 19:19 |
| → rafasc joined | 19:23 |
| → andai joined | 19:26 |
| → gareppa joined | 19:26 |
| ← justanotheruser left | 19:28 |
| ← Arcatech left | 19:29 |
| → Toadisattva joined | 19:30 |
| → justanotheruser joined | 19:31 |
| → zsoc joined | 19:34 |
| ← justanotheruser left | 19:35 |
| ← gareppa left | 19:36 |
| ← mlopezviedma_ left | 19:36 |
| → mlopezviedma joined | 19:37 |
| ← maarhart left | 19:39 |
| → wpcarro joined | 19:41 |
| ← mooasaurus left | 19:41 |
| → Silenced_v2 joined | 19:42 |
| → justanotheruser joined | 19:46 |
| → wreed joined | 19:48 |
| ← graphene left | 19:49 |
| → graphene joined | 19:50 |
| ← applecrumble left | 19:51 |
| → aw1 joined | 19:52 |
| → Wetmelon joined | 19:53 |
| → joft joined | 19:53 |
| ← ilmostro left | 19:55 |
| ← wpcarro left | 19:56 |
| ← graphene left | 19:56 |
| → ilmostro joined | 19:57 |
| → graphene joined | 19:57 |
| → roler joined | 19:57 |
| ← Silenced_v2 left | 19:57 |
| ← jyk left | 20:03 |
| ← mizu_no_oto left | 20:03 |
| → vavkamil joined | 20:08 |
| ← profmac left | 20:08 |
| → profmac joined | 20:09 |
| → dviola joined | 20:10 |
| → tristanp joined | 20:12 |
| → bast3h joined | 20:17 |
| ← bast3h left | 20:17 |
| ← tristanp left | 20:18 |
| ← dansan left | 20:19 |
| ← bastey left | 20:20 |
| → piggah joined | 20:24 |
| ← jakogut left | 20:26 |
| → jakogut joined | 20:27 |
| ← st-gourichon-fid left | 20:28 |
| → st-gourichon-fid joined | 20:28 |
| ← kes left | 20:30 |
| → lomex joined | 20:35 |
| ← Quetzal2 left | 20:38 |
| ← aw1 left | 20:39 |
| → babyflakes joined | 20:39 |
| ← babyflakes left | 20:40 |
| ← st-gourichon-fid left | 20:45 |
| ← jhaenchen left | 20:45 |
| → st-gourichon-f joined | 20:46 |
| ← freimatz left | 20:49 |
| → jhaenchen joined | 20:49 |
| ← jhaenchen left | 20:49 |
| → jhaenchen joined | 20:49 |
| → mizu_no_oto joined | 20:49 |
| ← schleppel left | 20:50 |
| ← st-gourichon-f left | 20:51 |
| ← plexigras left | 20:52 |
| ← mizu_no_oto left | 20:52 |
| → st-gourichon-fid joined | 20:52 |
| ← jhaenchen left | 20:54 |
| → plexigras joined | 20:54 |
| ← BenderRodriguez left | 20:54 |
| ← lomex left | 20:55 |
| → timj joined | 20:57 |
| ← st-gourichon-fid left | 20:59 |
| → jhaenchen joined | 20:59 |
| ← timj1 left | 21:00 |
| ← plexigras left | 21:00 |
| → Dougie187 joined | 21:01 |
| → plexigras joined | 21:01 |
| → st-gourichon-fid joined | 21:02 |
| ← jhaenchen left | 21:04 |
| → junaidnaseer2 joined | 21:05 |
| → CheckDavid joined | 21:07 |
| ← zegerjan left | 21:08 |
| ← st-gourichon-fid left | 21:13 |
| → st-gourichon-fid joined | 21:13 |
| ← BPL left | 21:14 |
| → jhaenchen joined | 21:14 |
| ← joft left | 21:17 |
| ← jnavila left | 21:18 |
| ← thiago left | 21:18 |
| → st-gourichon-f joined | 21:19 |
| ← spacesuitdiver left | 21:19 |
| → thiago joined | 21:19 |
| ← jhaenchen left | 21:19 |
| → applecrumble joined | 21:20 |
| ← st-gourichon-fid left | 21:20 |
| ← DusteD left | 21:23 |
| → liefer joined | 21:23 |
| → jhaenchen joined | 21:24 |
| ← st-gourichon-f left | 21:25 |
| ← martinus__ left | 21:25 |
| → st-gourichon-fid joined | 21:26 |
| ← st-gourichon-fid left | 21:28 |
| ← jhaenchen left | 21:28 |
| ← Essadon left | 21:31 |
| → jhaenchen joined | 21:31 |
| → st-gourichon-fid joined | 21:32 |
| ← jhaenchen left | 21:36 |
| → jhaenchen joined | 21:36 |
| ← plexigras left | 21:38 |
| → plexigras joined | 21:39 |
| ← st-gourichon-fid left | 21:40 |
| → st-gourichon-fid joined | 21:41 |
| ← jhaenchen left | 21:41 |
| → minimal_life joined | 21:42 |
| ← Toadisattva left | 21:42 |
| → Toadisattva joined | 21:43 |
| → Arcatech joined | 21:44 |
| → jhaenchen joined | 21:44 |
| → wcpan joined | 21:47 |
| ← junaidnaseer2 left | 21:48 |
| ← Envil left | 21:53 |
| ← plexigras left | 21:55 |
| ← gxt left | 21:56 |
| ← RuckusBringer left | 21:57 |
| ← jhaenchen left | 21:58 |
| → TheRuckus joined | 21:58 |
| → gxt joined | 21:58 |
| → jhaenchen joined | 22:02 |
| ← minimal_life left | 22:04 |
| → junaidnaseer2 joined | 22:06 |
| ← st-gourichon-fid left | 22:08 |
| ← e_l1997 left | 22:09 |
| → st-gourichon-fid joined | 22:09 |
| → al-damiri joined | 22:09 |
| ← jhaenchen left | 22:10 |
| → jhaenchen joined | 22:11 |
| → courrier joined | 22:14 |
| ← Arcatech left | 22:15 |
| ← govg left | 22:15 |
| ← theoceaniscool left | 22:16 |
| → m0viefreak joined | 22:17 |
| → st-gourichon-f joined | 22:24 |
| ← st-gourichon-fid left | 22:24 |
| ← realnot left | 22:26 |
| ← Mattiaslndstrm left | 22:27 |
| ← TripFandango left | 22:30 |
| ← jhaenchen left | 22:30 |
| ← vavkamil left | 22:31 |
| → TripFandango joined | 22:31 |
| ← st-gourichon-f left | 22:31 |
| → Arcatech joined | 22:32 |
| → st-gourichon-fid joined | 22:32 |
| → boombatower joined | 22:34 |
| → Muzer joined | 22:34 |
| → jhaenchen joined | 22:35 |
| → CrystalMath joined | 22:35 |
|
CrystalMath
| hi all, is it common practice to check out every branch into a specific folder? | 22:36 |
| ← junaidnaseer2 left | 22:36 |
|
CrystalMath
| like, clone the repository | 22:36 |
| → strugee_ joined | 22:36 |
|
CrystalMath
| many times | 22:36 |
|
| and then switch each folder into its own branch | 22:36 |
|
| because i don't know if i'm doing something wrong but jumping between branches is super inconvenient | 22:37 |
|
| sometimes i need something that was done in a different branch | 22:37 |
| ← Guest89225 left | 22:39 |
| ← jhaenchen left | 22:40 |
|
rafasc
| CrystalMath: you're cloning the repo multiple times to be able to have multiple branches checked out? | 22:42 |
|
CrystalMath
| yes | 22:42 |
|
rafasc
| that's silly :) | 22:42 |
|
| use git worktree isntead. | 22:42 |
|
CrystalMath
| is there some other way? | 22:42 |
|
rafasc
| man git worktree | 22:43 |
|
gitinfo
| the git-worktree manpage is available at https://gitirc.eu/git-worktree.html | 22:43 |
| → jhaenchen joined | 22:43 |
| ← st-gourichon-fid left | 22:43 |
| ← chris349 left | 22:43 |
|
CrystalMath
| rafasc: that's very interesting! | 22:43 |
|
rafasc
| you'll be able to have a branch checked out on another directory, but it will still belong to the same repo. | 22:43 |
| → st-gourichon-fid joined | 22:44 |
|
CrystalMath
| so, how does that clash with the branch that's checked out in the current directory? | 22:44 |
|
| is it common practice to create a subfolder named "branches" | 22:44 |
|
| because the name of a branch might clash | 22:44 |
|
| with the name of a directory in the tree | 22:44 |
|
rafasc
| No duplicate data transfered, and more important, you wont have the problem being out of sync in some directories because you forgot to update it. | 22:45 |
|
| CrystalMath: the worktree should be created outside the current repo. | 22:46 |
|
CrystalMath
| ah, but how will it know what repo i am referring to then? | 22:46 |
|
| oh, i can just | 22:46 |
|
| cd to the repository | 22:46 |
|
rafasc
| No one cares how you organize yourself. | 22:46 |
|
CrystalMath
| and then use ../ | 22:46 |
|
| yeah, sorry | 22:46 |
| → tristanp joined | 22:46 |
|
rafasc
| the worktree uses something like symbolic link to refer to the original repository. | 22:47 |
| → wpcarro joined | 22:47 |
| ← jhaenchen left | 22:48 |
| ← tristanp left | 22:48 |
|
CrystalMath
| thank you, this helps a lot! | 22:49 |
|
rafasc
| on your current repo, you can do something like: git worktree add ../my_other_worktree <branch>. | 22:49 |
| → jhaenchen joined | 22:49 |
|
rafasc
| the other worktree works as if it is a cloned repo. | 22:49 |
|
| the only restriction is that you can only checkout a branch in one place at a time. | 22:50 |
| ← inovas left | 22:50 |
| → Guest89225 joined | 22:50 |
| ← TheRuckus left | 22:50 |
| → tristanp joined | 22:51 |
| ← tristanp left | 22:51 |
|
CrystalMath
| the other directories say they're not git repositories | 22:51 |
| ← wpcarro left | 22:52 |
| → inovas joined | 22:52 |
|
rafasc
| can you post a transcript of your session? | 22:52 |
| → czart_ joined | 22:52 |
|
CrystalMath
| [coderain@theoracle mm_rewrite]$ git status | 22:53 |
|
rafasc
| what does git worktree list; say? | 22:53 |
|
CrystalMath
| fatal: Not a git repository: /home/coderain/projects/monolithium/repository/.git/worktrees/mm_rewrite | 22:53 |
|
| if i cd to the original one | 22:53 |
|
| and do that | 22:53 |
|
| it prints 5 lines | 22:53 |
|
| /home/coderain/projects/monolithium/master ae4db17 [master] | 22:53 |
|
| /home/coderain/projects/monolithium/mm_rewrite c50efc0 [mm_rewrite] | 22:53 |
|
| /home/coderain/projects/monolithium/manager_work 882bf02 [manager_work] | 22:53 |
|
| /home/coderain/projects/monolithium/ide_driver_work 4549cab [ide_driver_work] | 22:53 |
|
| /home/coderain/projects/monolithium/unit_tests 045be77 [unit_tests] | 22:53 |
| ← jhaenchen left | 22:54 |
|
rafasc
| each of those is a worktree.. | 22:54 |
| ← jakogut left | 22:54 |
|
rafasc
| cd /home/coderain/projects/monolithium/mm_rewrite; git status; complains? | 22:54 |
|
CrystalMath
| yes | 22:54 |
| ← st-gourichon-fid left | 22:55 |
|
rafasc
| it shouldn't... | 22:55 |
|
| git version? | 22:55 |
| → st-gourichon-fid joined | 22:55 |
|
CrystalMath
| 2.11.0, i'm on debian stable | 22:55 |
| → jhaenchen joined | 22:55 |
|
CrystalMath
| is it a bug? | 22:55 |
| ← Guest89225 left | 22:55 |
| → jakogut joined | 22:56 |
| ← czart left | 22:56 |
|
CrystalMath
| oops, i know the problem | 22:56 |
|
| i renamed "repository" to "master" | 22:56 |
|
| with mv | 22:56 |
|
| but the links seem to be pointing to "repository" | 22:56 |
|
| so i guess i have to delete them and recreate them | 22:57 |
|
rafasc
| CrystalMath: do you have worktree move? | 22:57 |
|
| it's recent I think. | 22:57 |
|
CrystalMath
| add, list, lock, prune, unlock | 22:58 |
| → chris349 joined | 22:58 |
|
rafasc
| newer versions have move, since you dont, just add the new ones and run worktree prune afterwards | 22:59 |
|
| to remove the dead links. | 22:59 |
| ← st-gourichon-fid left | 22:59 |
| → st-gourichon-f joined | 22:59 |
| ← jhaenchen left | 23:00 |
|
CrystalMath
| yes, everything works now, thanks :) | 23:01 |
|
rafasc
| CrystalMath: also, I would perhaps suggest another naming convention.. | 23:01 |
|
| because you can cd master; checkout dev; | 23:01 |
| ← mikecmpbll left | 23:01 |
| ← dege left | 23:01 |
|
CrystalMath
| hehe, i come from an SVN background | 23:01 |
|
| and branches there are literal copies of everything | 23:01 |
|
rafasc
| problem with that is that worktrees are not bound to the branch it was created from... | 23:02 |
|
CrystalMath
| yes | 23:02 |
|
rafasc
| you'll eventually be confused if you checkout something else on the master directory. | 23:02 |
|
CrystalMath
| hmm... | 23:03 |
| → jhaenchen joined | 23:03 |
|
rafasc
| as you can see, worktree list already tells which branch is checked out there. | 23:03 |
| ← finalbeta left | 23:04 |
| ← st-gourichon-f left | 23:04 |
| → st-gourichon-fid joined | 23:04 |
|
CrystalMath
| but this still helps a ton | 23:05 |
| → cbreak joined | 23:05 |
|
rafasc
| instead of having all those, I would probably just have two worktrees. One 'main' where you work on, and an alt where you checkout other branches as needed. | 23:05 |
|
| as the name implies, worktree are trees you work on. If they're just there standing still, you're doing something "wrong". :P | 23:07 |
|
| bed time, good luck with your project :) | 23:07 |
| ← jhaenchen left | 23:08 |
| ← rafasc left | 23:08 |
| → jhaenchen joined | 23:08 |
| → tristanp joined | 23:10 |
| → jhaenche_ joined | 23:13 |
| ← jhaenchen left | 23:13 |
| ← tristanp left | 23:14 |
| → kasual joined | 23:14 |
|
CrystalMath
| ok i now i started seriously messing things up | 23:16 |
|
| *ok now | 23:17 |
| → tristanp joined | 23:17 |
| ← tristanp left | 23:18 |
| ← st-gourichon-fid left | 23:18 |
| → st-gourichon-fid joined | 23:19 |
| ← jhaenche_ left | 23:20 |
| → tristanp joined | 23:20 |
| → jhaenchen joined | 23:21 |
| ← tristanp left | 23:21 |
| → dre_ joined | 23:21 |
| ← fahadash left | 23:22 |
| ← jhaenchen left | 23:26 |
| → jhaenche_ joined | 23:26 |
| → tristanp joined | 23:26 |
| → fatalhalt joined | 23:27 |
| ← jhaenche_ left | 23:31 |
| ← fission6 left | 23:31 |
| ← st-gourichon-fid left | 23:32 |
| → st-gourichon-fid joined | 23:32 |
| → st-gourichon-f joined | 23:35 |
| ← st-gourichon-fid left | 23:36 |
| ← CheckDavid left | 23:36 |
| → hbautista joined | 23:37 |
| → Guest89225 joined | 23:37 |
| ← tristanp left | 23:39 |
| → fission6 joined | 23:40 |
| → MACscr|lappy joined | 23:41 |
| → tristanp joined | 23:41 |
| → jhaenchen joined | 23:43 |
| ← AtumT left | 23:43 |
| ← fission6 left | 23:44 |
| ← jhaenchen left | 23:47 |
| → jhaenchen joined | 23:51 |
| ← _abs_ left | 23:51 |
| ← mescalinum left | 23:52 |
| ← tristanp left | 23:56 |