IRCloggy #git 2024-11-10

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.

2024-11-10

← toralf left00:00
→ toralf joined00:00
← ZLima12 left00:01
← lucasta left00:15
← toralf left00:17
→ toralf joined00:18
→ ZLima12 joined00:24
→ GuestyAngel26 joined00:25
GuestyAngel26 Greetings, I have an issue with using Git. I want to complete a complex operation. Is this the right place to ask?00:26
→ hwpplayer1 joined00:28
← xdminsy left00:58
← GuestyAngel26 left00:59
→ pveierland joined01:06
← kurahaupo left01:09
← CXGbWtcSb left01:15
→ CXGbWtcSb joined01:17
← CXGbWtcSb left01:18
→ CXGbWtcSb joined01:18
→ konsolebox joined01:29
→ inspork_ joined01:29
← inspork left01:30
inspork_ → inspork01:30
→ oriba joined01:33
→ memset_ joined01:41
→ gsi_ joined01:41
← ossifrage left01:41
← gsi left01:44
← jim left01:44
← memset left01:44
→ jim joined01:44
→ ossifrage joined01:46
← hwpplayer1 left01:57
← Game1145422 left02:02
→ Game1145422 joined02:02
← P1ro left02:03
← GNUmoon left02:10
→ GNUmoon joined02:10
→ P1ro joined02:26
← mgedmin left02:30
→ Guest24 joined02:31
← pedahzur left02:31
← jim left02:33
→ jim joined02:33
→ jimmm joined02:33
← jimmm left02:33
← jim left02:33
→ jim joined02:34
← P1ro left02:34
→ rainn92675560720 joined02:35
← alphazone left02:38
→ ferdna joined02:39
→ P1ro joined02:41
→ fivehundredcc joined02:47
← oriba left02:49
← ChmEarl left02:50
← P1ro left03:01
→ P1ro joined03:08
← pks left03:20
← Traneptora left03:20
→ pks joined03:23
→ hbautista joined03:26
← pveierland left03:29
← insidesources left03:44
→ pveierland joined03:44
→ insidesources joined03:45
← chexum left03:47
→ chexum joined03:47
← fling left03:49
← Guest24 left03:49
→ fling joined03:49
← smallville7123 left03:55
← GNUmoon left04:04
→ alphazone joined04:10
→ iomari891 joined04:10
→ Guest24 joined04:12
→ GNUmoon joined04:18
← iomari891 left04:19
→ smallville7123 joined04:23
← Betal left04:24
→ Betal joined04:26
← dviola left04:37
→ diego joined04:39
diego → Guest737504:39
← jim left04:43
→ jim joined04:43
← Guest7375 left05:02
→ dviola joined05:04
← Guest24 left05:06
← skapata left05:07
← haritz left05:14
← newpy left05:18
→ haritz joined05:24
← haritz left05:24
→ haritz joined05:24
→ doc joined05:26
← dlh404 left05:37
→ marc2377 joined05:39
← marc2377 left05:41
→ paculino joined05:44
→ marc2377 joined05:47
← hbautista left05:51
← CXGbWtcSb left05:53
← jim left06:02
→ jim joined06:02
→ CXGbWtcSb joined06:05
← bindu left06:05
→ bindu joined06:06
← dviola left06:06
→ vysn joined06:06
→ diego joined06:07
diego → Guest598006:07
→ xdminsy joined06:12
← CXGbWtcSb left06:12
→ CXGbWtcSb joined06:12
→ YuGiOhJCJ joined06:17
→ falafel joined06:22
← thiago left06:23
→ Pixi` joined06:27
← Pixi left06:30
← haritz left06:59
← atnl left07:00
→ haritz joined07:01
← haritz left07:01
→ haritz joined07:01
← Guest5980 left07:05
← larryv left07:10
→ iomari891 joined07:13
→ larryv joined07:14
→ user_oreloznog joined07:16
→ cpackham joined07:16
← ferdna left07:22
→ ainema joined07:26
→ Lord_of_Life_ joined07:50
← Lord_of_Life left07:50
Lord_of_Life_ → Lord_of_Life07:51
← paculino left07:58
→ xx joined07:59
→ spare joined08:00
→ mjt0k joined08:01
mjt0k Hi! I've two branches which are "a bit" different from each other, speaking of the actual changes. I *think* one is missing one or two commit(s) which are present in the other. Is there a way to find these commits?08:03
ikke man git range-diff08:04
gitinfo the git-range-diff manpage is available at https://gitirc.eu/git-range-diff.html08:04
ikke git range-diff <base> <branch1> <branch2>08:05
mjt0k aha! yes, this is exactly what I was looking for!08:05
can't it find the <base> automatically, like git merge-base?08:06
but I sure can live with it.08:06
Thank you ikke !08:07
ikke It can08:07
git range-diff <branch1>...<branch2>08:07
← falafel left08:07
mjt0k ..., not .. :)08:08
→ duxsco joined08:08
→ kale_ joined08:11
b0nn I forget, is three dots showing the difference from where the two branches last had a common ancestor, or is it two08:12
← kale_ left08:12
→ kale_ joined08:12
← fling left08:15
→ fling joined08:15
→ konsolebox_ joined08:16
← kale_ left08:16
→ kale_ joined08:17
← konsolebox left08:17
← duxsco left08:25
→ mgedmin joined08:33
← cpackham left08:36
→ tgo joined08:38
← xx left08:44
← Betal left08:45
→ xx joined08:46
← Vonter left08:46
← alexpls0 left08:51
← larryv left09:13
← CXGbWtcSb left09:15
→ CXGbWtcSb joined09:16
← Gary_Sinise left09:18
← kale_ left09:30
→ falafel joined09:43
→ darkbit joined09:52
→ duxsco joined10:01
← xdminsy left10:06
→ Left_Turn joined10:07
→ kale_ joined10:07
→ Guest72 joined10:16
← ak-1 left10:16
← Guest72 left10:16
→ ak-1 joined10:18
← ainema left10:18
← smallville7123 left10:30
← cedd left10:38
← MarkW2600 left10:44
← darkbit left10:49
→ smallville7123 joined10:55
→ sa0 joined10:55
← adamtajti left10:56
→ adamtajti_ joined10:57
→ xdminsy joined11:00
→ darkbit joined11:02
→ Vonter joined11:06
← CXGbWtcSb left11:18
→ CXGbWtcSb joined11:18
← pabs3 left11:19
← CXGbWtcSb left11:25
→ CXGbWtcSb joined11:26
← duxsco left11:29
← falafel left11:32
→ Guest34 joined11:33
Guest34 hi11:33
→ stefanos82 joined11:35
← Guest34 left11:35
← CXGbWtcSb left11:36
→ CXGbWtcSb joined11:36
stefanos82 greetings everyone. I know I can view the code diff changes via `git log -p`, but I would like to export the entire history as PDF, preferably combined with --reverse flag. Is it possible?11:36
← CXGbWtcSb left11:39
→ pabs3 joined11:40
→ jinsun joined11:49
gsish just send the text output to a PDF printer? doesn't take specific git support to do that11:53
it's either that simple, or I must be missing something obvious11:53
← spare left11:56
stefanos82 weird...now it works LOL!12:01
previously it would get interrupted by the -p flag12:01
← canton7 left12:18
→ Everything joined12:19
← stefanos82 left12:24
→ Turn_Left joined12:25
← Left_Turn left12:29
→ john_johnk joined12:32
→ alexherbo2 joined12:34
→ Left_Turn joined12:41
← Turn_Left left12:44
← sa0 left12:53
→ sa0 joined12:53
← memset_ left12:58
→ memset joined12:59
← john_johnk left13:01
→ john_johnk joined13:02
← memset left13:06
→ memset joined13:06
→ Turn_Left joined13:11
→ canton7 joined13:11
→ Guest72 joined13:13
← Left_Turn left13:14
← Guest72 left13:14
← john_johnk left13:15
→ housemate joined13:16
← ZenWalker left13:17
← xx left13:18
→ xx joined13:19
→ john_johnk joined13:19
→ B4ckBOne joined13:20
← iomari891 left13:20
← housemate left13:20
← john_johnk left13:28
→ ZenWalker joined13:30
← YuGiOhJCJ left13:32
← fling left13:32
← GNUmoon left13:32
→ fling joined13:32
→ YuGiOhJCJ joined13:32
→ GNUmoon joined13:32
← kale_ left13:35
→ kale_ joined13:37
→ skapata joined13:40
← YuGiOhJCJ left13:46
→ Guest62 joined13:47
← uco left13:52
← JanC left13:53
→ uco joined13:53
← pveierland left14:00
← alexherbo2 left14:02
→ john_johnk joined14:02
→ alexherbo2 joined14:02
→ housemate joined14:06
← kilobyte_ch left14:09
← Guest62 left14:10
← mven97 left14:12
→ pveierland joined14:16
← yuljk left14:16
→ yuljk joined14:17
→ duxsco joined14:17
← duxsco left14:19
→ kilobyte_ch joined14:20
→ warmana joined14:30
→ kaartic joined14:35
→ Betal joined14:41
→ Guest34 joined14:43
← dsimic left14:44
→ miika joined14:44
← miika left14:45
← Guest34 left14:45
→ dsimic joined14:46
→ amjadhpc joined14:58
→ JanC joined14:58
amjadhpc Hello , git newbie here, i have a local repo which has 2 remotes . I would like to have default local branches for each remote is it possible ?15:00
bookworm what for?15:01
you can already checkout / look at branches coming from either with the defaults15:02
(asking because while you can, there might be a better way, depending on your actual problem)15:02
as is, this sounds like an XY15:02
→ Mooncairn joined15:04
amjadhpc ok let me explain the reason , i have 2 remotes with one .gitignore which has directories that should not be pushed to one remote, but should be pushed to other remote15:04
how can i solve this ? as i understand with my limited understanding thats it impossible to have 2 .gitignore15:05
mjt0k .gitignore is not per repository, it is per branch15:06
bookworm if you track it, what you probably do15:08
← pveierland left15:10
bookworm amjadhpc: you'll have to carry two branches for that anyway, so simply mod the .gitignore file on each to your liking, or if that's too conflict heavy just ignore it everywhere and add files manually for the case where it makes sense15:10
if that's secrets however, we are in !deploy land15:10
gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html15:10
→ ferdna joined15:12
→ dlh404 joined15:13
amjadhpc thanks @bookworm15:15
→ Traneptora joined15:15
→ kaartics joined15:18
← kaartic left15:19
→ mven97 joined15:21
→ thiago joined15:24
→ iomari891 joined15:28
mjt0k what's the way to create a local branch (to track a remote branch) but do not switch to it?15:30
→ R4F4 joined15:30
mjt0k ah. git branch, not git checkout :)15:30
← umbramalison left15:30
→ umbramalison joined15:31
gsish granted that's a surprising one, to use the branch subcommand for branch creation/manipulation :-P15:34
people complain about UI issues, and rightfully so15:35
← kaartics left15:36
thiago "to branch" is the correct use of the command15:37
→ kaartic joined15:37
→ Left_Turn joined15:39
← Turn_Left left15:42
← dostoyevsky2 left15:43
→ dostoyevsky2 joined15:44
→ kurahaupo joined15:49
→ ainema joined15:50
← kaartic left15:51
← amjadhpc left15:52
→ crossby1004 joined15:52
→ jensen1 joined15:53
→ npc joined15:55
← konsolebox_ left16:01
→ PantelicGR joined16:05
← Lunatrius left16:08
→ kurahaupo_ joined16:08
kurahaupo → Guest837016:08
← Guest8370 left16:08
kurahaupo_ → kurahaupo16:08
→ Lunatrius joined16:10
→ cedd joined16:12
← Everything left16:19
← MyNetAz left16:20
→ MyNetAz joined16:21
← MyNetAz left16:22
→ MyNetAz joined16:22
→ Turn_Left joined16:34
← housemate left16:35
← Left_Turn left16:37
← Lunatrius left16:40
← techtruth left16:42
→ hbautista joined16:43
→ Lunatrius joined16:49
→ techtruth joined16:49
← crossby1004 left16:51
→ crossby1004 joined16:52
← alexherbo2 left16:53
→ ChmEarl joined16:54
→ alexherbo2 joined16:54
← hbautista left16:57
→ newpy joined17:08
← Vonter left17:08
← jrm left17:09
← CrunchyFlakes left17:10
→ CrunchyFlakes joined17:10
← kale_ left17:11
nedbat would questions about git-completion.zsh be better here or in #zsh?17:17
kurahaupo nedbat: it probably depends on the question17:19
Here you'll have to explain zsh, there you'll have to explain git17:19
nedbat kurahaupo: the completion file says it needs .git-completion.bash. that file checks if its running in zsh and if so says to use git-completion.zsh. it seems self-defeating17:20
kurahaupo Yes but is that *all* that git-completion.bash does?17:21
nedbat kurahaupo: no, it does a lot, but it prints that message to me whenever i try to use it. This was working a while ago, and now it's not. I'm trying to debug to see what I changed, and it doesn't make sense to me.17:22
i never used to see a message about switching from .bash to .zsh17:22
kurahaupo They come as a matched pair. Do you have matching versions of the two files?17:23
nedbat kurahaupo: what is the right source for the files? I will check17:23
kurahaupo There is a lot of similarity between bash and zsh completion, but there are enough differences that sometimes you need a full rewrite17:25
nedbat kurahaupo: i understand that for sure. you said "they come as a match pair": from where? What is the source of truth for these files?17:27
kurahaupo There's an entire project called "bash completion", for several hundred common commands, but I would have to check whether git is still included in it.17:30
→ rsx joined17:30
kurahaupo (I'm not on a PC right now)17:30
nedbat kurahaupo: this looks like it could be good: https://github.com/git/git/tree/master/contrib/completion the .bash file has a different message when used under zsh17:30
kurahaupo That looks plausible as the primary source17:31
nedbat yes, and it works well! thanks.17:33
→ ss4 joined17:35
← wootehfoot left17:35
← ss4 left17:36
→ jrm joined17:37
osse FYI zsh has its own completion for git also. AFAIK it's more accurate, but slower.17:39
← xx left17:40
→ aiyunyuner4 joined17:42
← ferdna left17:43
→ Left_Turn joined17:45
← Left_Turn left17:45
→ rigid joined17:46
← rigid left17:46
→ rigid joined17:46
← Turn_Left left17:47
← stagas left17:47
← rigid left17:49
← skered left17:49
→ stagas joined17:49
→ rigid joined17:50
← rigid left17:50
→ rigid joined17:50
→ skered joined17:52
→ Narrat joined17:53
→ Left_Turn joined17:54
← Left_Turn left17:55
→ Left_Turn joined17:56
← Left_Turn left17:57
→ xx joined18:02
→ amjadhpc joined18:10
JanC → Guest255918:12
→ JanC joined18:12
← Guest2559 left18:12
← alexherbo2 left18:13
← amjadhpc left18:14
→ housemate joined18:23
← john_johnk left18:24
→ john_johnk joined18:29
← rainn92675560720 left18:30
→ rainn92675560720 joined18:32
← MyNetAz left18:32
← jinsun left18:34
→ MyNetAz joined18:36
← berkay left18:38
→ berkay joined18:40
← fling left18:50
→ fling joined18:50
← john_johnk left18:53
← housemate left18:56
→ alexherbo2 joined18:58
→ john_johnk joined19:00
← Darkfoe left19:08
← ainema left19:10
← sa0 left19:10
← firewyre left19:10
→ sa0 joined19:11
→ firewyre joined19:11
← npc left19:15
→ op joined19:15
→ larryv joined19:20
→ khrbtxyz joined19:22
→ hwpplayer1 joined19:27
← GoGi left19:30
← crossby1004 left19:32
→ cpackham joined19:32
← rsx left19:37
← warmana left19:46
→ lucasta joined19:53
← P1ro left19:55
← Raito_Bezarius left19:57
→ housemate joined20:00
→ wootehfoot joined20:01
→ stolen joined20:06
← hwpplayer1 left20:07
→ Raito_Bezarius joined20:11
→ zloi_user joined20:13
← cedd left20:15
→ crossby1004 joined20:20
← housemate left20:22
→ kale_ joined20:22
→ Everything joined20:25
← crossby1004 left20:26
→ crossby1004 joined20:26
→ P1ro joined20:29
→ housemate joined20:31
→ GoGi joined20:33
← crossby1004 left20:33
← op left20:34
← lucasta left20:35
← xdminsy left20:42
← kale_ left20:44
← bin101 left20:49
← R4F4 left20:53
→ bin101 joined20:56
← bin101 left20:58
→ xdminsy joined20:58
→ bin101 joined21:00
→ demonspork joined21:01
← alexherbo2 left21:07
← xdminsy left21:09
← zloi_user left21:10
← bin101 left21:14
→ bin101 joined21:16
jensen1 → aat21:18
→ lucasta joined21:21
← wootehfoot left21:24
← newpy left21:26
← lucasta left21:30
← phylaz left21:33
→ phylaz joined21:35
← vysn left21:37
← P1ro left21:38
← FH_thecat left21:40
→ P1ro joined21:46
← uco left21:49
→ commiejoke29 joined21:50
→ uco joined21:51
← indy left21:54
→ Gary_Sinise joined21:57
→ jonosterman joined22:02
→ obrien joined22:03
← user_oreloznog left22:13
→ Left_Turn joined22:21
JanC → Guest823922:23
← Guest8239 left22:23
→ JanC joined22:23
→ Turn_Left joined22:30
→ crossby1004 joined22:32
← Left_Turn left22:34
← ryuu left22:40
← cpackham left22:43
← nivag left22:45
← SJrX left22:46
→ SJrX joined22:47
→ ryuu joined22:52
→ AbsolutelyFree joined22:57
← fatfingers left23:06
→ fatfingers joined23:07
← crossby1004 left23:11
← Everything left23:20
→ lucasta joined23:23
← yxt left23:27
← jonosterman left23:32
← flowji left23:38
→ flowji joined23:39
← xx left23:42
← austin_ left23:44
← Narrat left23:45
← stolen left23:48
← Turn_Left left23:50
← lucasta left23:56
→ hwpplayer1 joined23:58

Logs Search ←Prev date Next date→ Channels Documentation