IRCloggy #git 2023-01-30

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.

2023-01-30

← joshisanonymous left00:00
← R2robot left00:00
CornBa Let say I have a repo stored in /home/u/myapp1/, but inside of it, I have an untacked directory called public for storing myapp1's output... that untracked directory (public) should also be a repo of its own.... should I be using submodules inside gitrepo-myapp1 for automatically pushing app1's output after initializing app2? Would git update both of the mother and childre app? or is there a better way?00:02
→ gast0n joined00:02
→ R2robot joined00:03
← EvgenyK left00:04
→ xandris joined00:05
→ fflam joined00:07
← xandris left00:09
CornBa In other words: I would add a remote origin for app1 set to github1 with untracked public direcoty and branch/push it... Then add public's dirctory (app2) remote origin set to github2 ... and finally set app2 as a submodule to app1 even if it is a subdirectory of it (untracked mby app1)00:09
→ xandris joined00:11
← giu-- left00:11
CornBa (I'm open to suggestions if you understand what I'm trying to do and have a better way do to it)00:13
← MIsAn left00:13
→ yuljk joined00:14
← supay left00:19
→ EvgenyK joined00:20
← mrfhitz left00:24
CornBa or another way to try to explain it: I have ~/u/app1/* -> github#1 (except for u/app1/public (automated output of app1))... I also have /u/app1/public -> github#2 ... should github#2 be set as a submodule of github1? for me to be able to push git1 & 2 at the same time I should add git2 as a submobule of git1?00:25
← Aminda left00:27
← EvgenyK left00:28
← xandris left00:29
→ Aminda joined00:29
→ sqrl joined00:32
← currenthandle left00:34
→ EvgenyK joined00:35
→ currenthandle joined00:36
← The_Blode left00:38
← Soni left00:38
← EvgenyK left00:39
← zeroes_ left00:41
→ zeroes_ joined00:41
← falafel left00:44
→ chandash joined00:45
jast CornBa: submodules don't exactly let you push both at the same time00:45
your options: !subpro00:46
gitinfo [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.00:46
jast !gitslave maybe, but that's a third-party tool00:46
gitinfo gitslave ( http://gitslave.sf.net ) is useful to add subsidiary git repositories to a git superproject when you control and develop on the subprojects at more or less the same time as the superproject, and furthermore when you typically want to tag, branch, push, pull, etc. all repositories at the same time.00:46
← delay left00:46
← dav1d left00:46
→ dav1d joined00:47
CornBa jast: ok thanks, I witll probably just set them completly separated as advised to remove complexity/confusion and set the output of app1 to external app2's dirrectory00:50
→ EvgenyK joined00:51
→ derpydoo joined00:54
→ rama joined00:59
← EvgenyK left01:00
→ Murr- joined01:01
→ EvgenyK joined01:02
← Murr left01:04
Murr- → Murr01:04
← Ranhir left01:04
← NightMonkey left01:05
← farzat1 left01:06
← EvgenyK left01:06
← przemoc left01:07
→ falafel joined01:08
→ NightMonkey joined01:09
→ Ranhir joined01:11
→ roadie joined01:18
→ EvgenyK joined01:20
← roadie left01:22
← rama left01:23
→ przemoc joined01:24
← EvgenyK left01:25
← currenthandle left01:29
← m1dnight left01:29
→ EvgenyK joined01:33
← clime left01:34
→ peirik_ joined01:36
← fflam left01:37
← EvgenyK left01:42
← NightMonkey left01:43
→ NightMonkey joined01:46
→ potash joined01:48
→ m1dnight joined01:51
→ gsi_ joined01:53
→ EvgenyK joined01:54
→ unixaos joined01:54
← gsi left01:55
← unixaos left01:57
→ unixaos joined01:57
→ farzat1 joined01:58
← unixaos left01:59
← rgrinberg left01:59
← potash left02:00
→ roadie joined02:00
← roadie left02:05
← EvgenyK left02:13
← peirik_ left02:14
→ roadie joined02:17
→ currenthandle joined02:18
← thiago left02:20
→ thiago joined02:21
← joshwasanon left02:22
← cbreak left02:24
→ cbreak joined02:24
← Aminda left02:24
→ xandris joined02:26
→ EvgenyK joined02:26
→ Aminda joined02:27
← roadie left02:33
→ YuGiOhJCJ joined02:33
← flyingpoon left02:37
← EvgenyK left02:38
← mei left02:39
→ peirik_ joined02:39
← m1dnight left02:40
→ m1dnight joined02:42
← ChmEarl left02:44
← peirik_ left02:44
← gryffus left02:44
→ roadie joined02:52
→ Xenguy joined02:54
→ rgrinberg joined02:56
← roadie left02:57
→ EvgenyK joined03:00
← currenthandle left03:04
→ roadie joined03:09
← EvgenyK left03:10
← gast0n left03:12
← m0viefreak left03:18
→ currenthandle joined03:21
→ EvgenyK joined03:23
← roadie left03:25
← EvgenyK left03:27
← runlevels06 left03:29
→ EvgenyK joined03:30
→ peirik_ joined03:34
→ drbeco joined03:38
← EvgenyK left03:38
← bywaterloo left03:39
← Yruama_ left03:39
→ finn_elija joined03:41
← FinnElija left03:41
finn_elija → FinnElija03:41
→ kexec joined03:47
← hbautista left03:50
→ EvgenyK joined03:52
← EvgenyK left03:57
← falafel left03:59
→ lgc joined04:01
← lgc left04:01
→ kexec61 joined04:04
← rurtty left04:04
← kexec left04:04
kexec61 → kexec04:04
→ YuGiOhJCJ2 joined04:04
← YuGiOhJCJ left04:05
← peirik_ left04:07
→ rurtty joined04:08
→ EvgenyK joined04:09
→ Soni joined04:09
← lucasta left04:10
→ lucasta joined04:16
→ bywaterloo joined04:20
← kexec left04:24
← lucasta left04:25
← EvgenyK left04:29
← bin101 left04:30
→ bin101 joined04:33
← currenthandle left04:33
← FinnElija left04:34
→ FinnElija joined04:34
← nattiestnate left04:35
→ lucasta joined04:40
→ EvgenyK joined04:42
→ roadie joined04:46
← roadie left04:51
← EvgenyK left04:52
→ EvgenyK joined04:54
← EvgenyK left04:59
← FinnElija left05:02
→ FinnElija joined05:03
→ han-solo joined05:03
← Disconsented left05:04
→ Disconsented joined05:05
→ hqdruxn08 joined05:05
← hqdruxn08__ left05:09
→ roadie joined05:11
→ EvgenyK joined05:12
→ rama joined05:12
→ net0bsd joined05:12
← lucasta left05:13
← chandash left05:14
← rama left05:16
← EvgenyK left05:20
← dviola left05:30
← roadie left05:31
→ hamburgler joined05:32
→ peirik_ joined05:33
→ EvgenyK joined05:33
← peirik_ left05:38
← EvgenyK left05:39
← elastic_dog left05:47
→ elastic_dog joined05:48
← ferdna left05:50
→ falafel joined05:51
→ EvgenyK joined05:51
← rgrinberg left05:51
→ rgrinberg joined05:55
→ roadie joined05:57
→ chandash joined05:58
→ currenthandle joined05:59
← rgrinberg left06:00
→ rgrinberg joined06:02
← EvgenyK left06:02
← chandash left06:03
→ duxsco joined06:04
← thiago left06:05
→ cdown joined06:13
← rgrinberg left06:13
← roadie left06:14
→ lucasta joined06:20
→ roadie joined06:24
→ falafel_ joined06:24
← falafel left06:27
→ EvgenyK joined06:33
→ chandash joined06:33
← cdown left06:34
→ rgrinberg joined06:35
← chandash left06:38
← net0bsd left06:44
← duxsco left06:46
→ chandash joined06:47
→ igemnace joined06:49
← chandash left06:51
← falafel_ left06:52
← Inline left06:53
← EvgenyK left06:53
← hamburgler left06:54
→ hamburgler joined06:55
→ jacobk joined07:02
← teddyc left07:03
→ EvgenyK joined07:05
← rgrinberg left07:09
← EvgenyK left07:14
→ teddyc joined07:17
→ peirik_ joined07:21
→ EvgenyK joined07:22
← EvgenyK left07:27
← esc23 left07:31
← sjoshi left07:33
→ c0dehu1k joined07:36
→ EvgenyK joined07:39
← rurtty left07:40
→ rfuentess joined07:42
→ iomari891 joined07:44
→ mei joined07:46
← EvgenyK left07:47
→ pydev1 joined07:52
→ EvgenyK joined07:53
← peirik_ left07:55
← EvgenyK left07:57
← dob1 left07:58
→ EvilDMP joined07:58
← ackyshake left07:58
→ dob1 joined07:58
← YuGiOhJCJ2 left08:02
→ austin987 joined08:02
→ zeenk joined08:04
→ YuGiOhJCJ2 joined08:05
→ austin_ joined08:10
← austin_ left08:10
← austin987 left08:12
→ Jck_true joined08:13
→ chandash joined08:13
→ Q_Q2 joined08:14
→ coot joined08:16
← chandash left08:18
→ EvgenyK joined08:22
→ fling_ joined08:27
← fling left08:28
← EvgenyK left08:28
→ sjoshi joined08:31
← warmana left08:31
← c0dehu1k left08:32
→ peirik_ joined08:34
fling_ → fling08:34
→ warmana joined08:34
→ EvgenyK joined08:37
← Q_Q2 left08:38
→ mrfhitz joined08:38
← fdsfsaj left08:40
→ fdsfsaj joined08:41
→ dionysus69 joined08:42
← sqrl left08:45
← EvgenyK left08:47
← very_sneaky left08:50
→ very_sneaky joined08:51
← warmana left08:54
→ bgs joined08:59
→ warmana joined09:00
→ jaredce joined09:01
→ theoceaniscool joined09:08
← skapata left09:09
→ rosco joined09:12
← currenthandle left09:14
→ Masklin joined09:15
← Betal left09:21
→ clime joined09:21
→ mobidrop joined09:23
→ gildasio1 joined09:28
← gildasio left09:28
→ esc joined09:35
← esc left09:36
→ esc joined09:36
→ rainn92675 joined09:43
← warmana left09:47
← Masklin left10:02
→ elastic_1 joined10:02
elastic_dog → Guest551610:02
← Guest5516 left10:02
elastic_1 → elastic_dog10:02
→ Masklin__Gurder joined10:02
← Masklin__Gurder left10:02
→ lacrymology joined10:05
→ Masklin__Gurder joined10:06
Masklin__Gurder → Masklin10:06
← haritz left10:08
→ derfflinger joined10:14
← lucasta left10:15
→ lucasta joined10:16
→ gryffus joined10:18
→ Guest28 joined10:25
Guest28 → icbd10:26
← icbd left10:27
→ feriman joined10:27
← hamburgler left10:33
← aton` left10:43
→ chandash joined10:43
← chandash left10:48
← derpydoo left10:53
→ haritz joined10:57
← haritz left10:57
→ haritz joined10:57
→ warmana joined10:58
← haritz left11:04
← mrfhitz left11:08
→ haritz joined11:08
← haritz left11:08
→ haritz joined11:08
← haritz left11:08
← YuGiOhJCJ2 left11:10
→ haritz joined11:11
← haritz left11:11
→ haritz joined11:11
← haritz left11:11
→ haritz joined11:17
← haritz left11:17
→ haritz joined11:17
← haritz left11:18
→ duxsco joined11:19
→ vladoski joined11:20
← mobidrop left11:22
→ lpapp joined11:22
lpapp hi, when git log -L 60,60:file does help to find out when self.tool_requires("UUID/1.0@foo/stable") was added in the source code, is there some sort of grep I could use for this to figure when a line was added? And not just moved, refactored, etc.11:23
some literal grep for that line, git grep or something11:23
osse git log -S'self.tool_requires("UUID/1.0@foo/stable")'11:24
→ mobidrop joined11:28
← rosco left11:40
← cbreak left11:42
→ rosco joined11:42
← lucasta left11:45
→ cbreak joined11:46
← warmana left11:48
→ chandash joined11:48
lpapp sadly, it also gave the same as git log11:48
it gave me one commit where this line was moved11:48
oh, hmm, no, I was wrong,11:49
thanks11:49
← lpapp left11:49
→ lpapp joined11:49
lpapp no, I take that back, it gives a change where these lines were moved, not introduced11:49
not sure how I can get the actual commit which introduced these lines.11:49
→ haritz joined11:49
← haritz left11:49
→ haritz joined11:49
osse git log -S should show both11:50
lpapp not sure why it does not then11:50
osse me neither11:50
ikke --full-history? Though not sure if that applies to -S11:51
osse git log -Sfoo will show commits where "foo" occurs only in + or - lines but not both11:51
lpapp it showed one commit with - and +11:51
osse can you show it11:51
lpapp could be because the indenting has changed?11:51
actually, it did not11:52
really weird stuff going on11:52
osse: https://bpa.st/OQTYC11:52
osse build_requires != tool_requires11:53
Maybe they mean the same thing, but Git doesn't know that :p11:53
lpapp oh11:54
→ lucasta joined11:55
lpapp thanks11:55
← farzat1 left11:56
→ Lunatrius` joined12:00
← Lunatrius left12:00
Lunatrius` → Lunatrius12:00
← vishal left12:01
← duxsco left12:01
→ vishal joined12:04
← samuelb left12:06
→ berndj-blackout joined12:09
← lpapp left12:12
→ grub-reinstall joined12:13
berndj-blackout → berndj12:14
→ mirai_ joined12:15
← mirai left12:15
← lucasta left12:18
← gtkgtkgtk left12:18
→ dulange joined12:21
← peirik_ left12:22
→ lucasta joined12:29
→ peirik_ joined12:32
← grub-reinstall left12:34
← pydev1 left12:34
→ grub-reinstall joined12:38
→ roadie` joined12:38
← grub-reinstall left12:41
← roadie left12:41
← fling left12:41
→ grub-reinstall joined12:43
← grub-reinstall left12:43
→ fling joined12:44
→ grub-reinstall joined12:45
← grub-reinstall left12:45
→ grub-reinstall joined12:47
← grub-reinstall left12:47
→ farzat1 joined12:48
→ grub-reinstall joined12:49
← grub-reinstall left12:49
← fdsfsaj left12:49
→ grub-reinstall joined12:50
→ fdsfsaj joined12:50
← chandash left12:50
← grub-reinstall left12:50
→ Guest4483 joined12:55
← Guest4483 left13:07
← coot left13:15
→ fflam joined13:20
← jaredce left13:26
→ nwoob joined13:28
nwoob I am creating branch from a tag but that branch also contains commit which are pushed after tag commit13:29
→ chandash joined13:29
nwoob I thought if I create a branch from tag then only those commits which are present in that tag will come in new branch13:30
am I wrong?13:30
→ pydev1 joined13:33
osse that behaviour sounds surprising to me too13:34
how did you create the branch ?13:34
← chandash left13:35
→ Oddly joined13:38
→ jaredce joined13:39
← analpaper left13:41
→ coot joined13:45
← jaredce left13:46
→ chandash joined13:48
→ jdarnley joined13:53
← J_Darnley left13:53
→ blackhawk joined13:53
→ bloody joined14:01
→ jaredce joined14:01
← nwoob left14:05
→ loulou joined14:06
← loulou left14:06
→ loulou joined14:06
→ nwoob joined14:07
→ konsolebox joined14:10
→ davicito joined14:10
→ tirnanog joined14:10
← loulou left14:10
→ gast0n joined14:11
→ tuskkk____ joined14:12
→ loulou joined14:12
← lacrymology left14:13
→ kurbus joined14:14
← KimK left14:16
→ vqueiroz joined14:17
← loulou left14:20
← kurbus left14:21
→ samuelbernardo joined14:23
→ lacrymology joined14:26
→ kurbus joined14:26
← Xenguy left14:28
← blackhawk left14:29
→ masber joined14:32
→ gh34 joined14:33
→ DEEPAKs joined14:37
→ Guest319 joined14:39
Guest319 Hi!14:39
Am researching ways to keep my companies Macs up to date with Git. Specifically ensuring the Git version that apple ships with is patched frequently. Any suggestions ?14:40
← ajfriesen left14:41
← rosco left14:42
→ mexen joined14:43
→ ajfriesen joined14:44
chandash you could look into installing git via homebrew and using the installed version over the type that is shipped with apple14:48
→ skapata joined14:48
chandash by modifying the order of $PATH perhaps14:48
R2robot ^14:48
Guest319 Thanks both. Yes I think we might opt for that but the apple version will actually still exist even if not being used14:48
← chandash left14:49
→ OolonColluphid joined14:54
→ drogas joined14:56
← konsolebox left14:59
← kurbus left15:01
← feriman left15:03
→ kurbus joined15:13
→ warmana joined15:23
← kurbus left15:24
← subopt left15:27
→ derpydoo joined15:28
→ thiago joined15:28
→ f_ joined15:33
← jdarnley left15:33
→ J_Darnley joined15:34
→ Swahili joined15:36
← coot left15:38
← roadie` left15:38
→ roadie joined15:41
→ kurbus joined15:43
← cbreak left15:45
← masber left15:46
→ rosco joined15:47
→ cbreak joined15:49
← kurbus left15:54
→ rgrinberg joined15:56
← jinsun_ left16:00
→ Nicklificent joined16:01
← Millicent left16:01
Nicklificent → Millicent16:01
→ neure joined16:02
neure hi16:02
given a commit, how do I find what tag is nearest before before it? (or after will do as well)16:02
← mobidrop left16:02
← tirnanog left16:03
← finalriposte left16:08
neure nvm I found it16:10
jast if you want to "describe" a commit in terms of a tag, `git describe` tends to work well16:11
the direct answer to your question is `git tag --merged`16:11
though that lists all reachable tags and may need post-processing16:12
← Guest319 left16:15
← Guest4 left16:17
← dsrt^ left16:18
← dionysus69 left16:18
→ sa0 joined16:20
→ duxsco joined16:27
→ KimK joined16:28
← gryffus left16:28
→ The_Blode joined16:29
← iomari891 left16:36
→ TheCatBehemoth joined16:38
→ iomari891 joined16:38
← duxsco left16:38
← neure left16:38
→ coot joined16:39
→ moldorcoder7 joined16:42
→ kurbus joined16:44
← f_ left16:46
→ f_ joined16:48
→ vlado_ joined16:48
← igemnace left16:50
← DEEPAKs left16:50
← kurbus left16:51
← vladoski left16:51
← derfflinger left16:52
→ Yruama joined16:52
→ rama joined16:57
← oprypin left16:58
→ oprypin joined16:58
← fdsfsaj left16:58
→ fdsfsaj joined16:59
← jaredce left17:04
← hyperair left17:06
→ c0dehu1k joined17:11
→ Yruama_ joined17:11
→ oriba joined17:11
← c0dehu1k left17:12
← sjoshi left17:12
→ c0dehu1k joined17:12
← Yruama left17:13
← c0dehu1k left17:13
→ c0dehu1k joined17:14
← rfuentess left17:14
← c0dehu1k left17:14
→ c0dehu1k joined17:15
→ ChmEarl joined17:16
← warmana left17:17
→ Inline joined17:21
→ hypera1r joined17:22
← dulange left17:25
→ kurbus joined17:27
← han-solo left17:31
← rgrinberg left17:31
→ causasui joined17:33
← bloody left17:33
→ rgrinberg joined17:34
→ lmat joined17:39
lmat What is the best way to tell if a tag is in a remote? It's too bad there aren't "origin/v1.0.0" remote markers :shrug:.17:40
→ Betal joined17:42
ljharb lmat: there are17:45
lmat :gulp:17:45
lmat ljharb: I use git log --graph --oneline --decorate --all; and I don't see any remote tags. (I do see remote branches.)17:46
ljharb lmat: tags aren't usually per-remote - every git fetch will pull them all down, and any push that pushes tags will push them all up17:47
lmat ljharb: I have a lot of tags in my local repo, but I would like to know if any are missing in a remote.17:47
ljharb lmat: `git push --tags` will push those up, i think you can use `-n` to dry run it17:48
lmat: use `git ls-remote --tags origin` and grep the output17:49
← bywaterloo left17:50
lmat ljharb: Thank you!17:50
git push -n origin --tags; very helpful!17:51
← tuskkk____ left17:52
→ riposte joined17:57
← zeenk left17:57
← rosco left17:58
→ rosco joined18:00
→ currenthandle joined18:01
→ randallb joined18:02
rewt long form of -n is --dry-run, which may be more intuitive to read/remember18:02
← rgrinberg left18:04
→ davidsong joined18:12
terminaldweller 5/5518:13
← Betal left18:15
→ Betal joined18:17
→ rama_ joined18:19
← rama left18:19
→ gryffus joined18:20
← iomari891 left18:21
← Yruama_ left18:25
Rhys → Guest351218:28
← Guest3512 left18:28
→ Rhvs joined18:28
→ iomari891 joined18:28
← vlado_ left18:29
← mexen left18:29
← coot left18:36
→ coot joined18:36
→ bloody joined18:40
← EdFletcher left18:40
← pydev1 left18:41
← Swahili left18:44
→ Swahili joined18:44
→ EdFletcher joined18:44
← iomari891 left18:48
← cluelessperson_ left18:49
← f_ left18:50
← bket left18:51
→ bket joined18:54
→ cluelessperson joined18:56
← causasui left19:00
← rosco left19:01
→ feriman joined19:02
← cbreak left19:09
← xandris left19:09
← zulutango left19:09
→ zulutango joined19:09
← haritz left19:11
← coot left19:13
→ cbreak joined19:13
→ dulange joined19:13
→ haritz joined19:14
← haritz left19:14
→ haritz joined19:14
← EdFletcher left19:15
→ duxsco joined19:16
→ EdFletcher joined19:17
→ xandris joined19:17
← xandris left19:17
→ xandris joined19:22
→ cdown joined19:23
← xandris left19:24
→ xandris joined19:26
→ EvgenyK joined19:27
← nwoob left19:30
← clime left19:32
← EdFletcher left19:33
→ EdFletcher joined19:35
← randallb left19:37
← EvgenyK left19:37
→ xandris_ joined19:40
← xandris left19:40
← bgs left19:42
→ ELFrederich joined19:43
← vqueiroz left20:00
← jfsimon1981_b left20:00
→ jfsimon1981 joined20:02
kurbus → test12320:03
test123 → kurbus20:03
→ Jong joined20:04
→ clime joined20:04
→ Kangie_ joined20:09
← Kangie left20:09
← Coop left20:12
← TheCatBehemoth left20:12
ELFrederich I'm getting this on a GitLab server when I run some git operations... core.fsyncObjectFiles is deprecated; use core.fsync instead, any idea how to suppress this?20:12
→ TheCatBehemoth joined20:17
→ Coop joined20:24
→ bywaterloo joined20:36
→ tuskkk____ joined20:37
← kurbus left20:38
← davidsong left20:45
← jacobk left20:48
← epony left20:52
← dermoth left20:53
→ stewie925 joined20:54
← Visor left20:57
→ Visor joined20:58
anddam howdy, for anyone familiar with "oneflow" I am trying to getting the meaning of the merge for completing a release branch https://www.endoflineblog.com/oneflow-a-git-branching-model-and-workflow#finishing-a-release-branch21:00
it says "After that, the branch needs to be merged into master to be versioned permanently" I figure this means that by making the commint an ancestor of master you're pulling that branch along with the repo tip forever and ever21:01
whereas if it was just a tag it could get lost in cloning21:01
→ dermoth joined21:05
→ m0viefreak joined21:05
→ jacobk joined21:07
← lucasta left21:13
→ lucasta joined21:14
→ epony joined21:17
← jacobk left21:20
nedbat anddam: you need to merge to master so that your last few commits to get 2.3.0 out the door will persist into the future, and be part of 2.4.021:20
← gryffus left21:22
→ gryffus joined21:23
→ xD- joined21:25
xD- yo guys how do i merge only one affected subfolders if i have 2 branches like master and devel?21:26
→ jacobk joined21:26
xD- i commit garbage at devel subfolders i dont want in master21:26
ikke xD-: that's not something git has support for21:32
xD- but its common use case?21:33
→ tirnanog joined21:33
ikke no21:33
xD- yes21:34
→ ZacSharp joined21:34
xD- you create subfolder with whatever examples images metadata21:34
and you dont want it back in master21:34
ikke in git, you merge all or nothing21:34
(you can manually modify the end result of merges to undo some changes though)21:35
but in general, the expectation is that if you merge 2 branches, all the contents of both branches will be merged21:35
xD- maybe someone should add the feature21:35
ikke unlikely to be accepted21:36
xD- but subtree merge exists?21:36
this not?21:36
and i can only merge single files21:36
from diff branches21:36
but not whole folders21:36
it doesnt make sense21:36
→ rurtty joined21:37
xD- i guess i have to read more manuals21:40
git read-tree <-21:40
or write script with find to add all single files in a subdir for merge21:40
but its stupid21:40
nedbat xD-: why do you want files in the branch, but not on master? You can do that by having two commits: the files you do want to merge to master, and then the files you don't. Then you merge the first commit to master.21:41
xD- because it is devel branch21:42
with a lot more testing stuff inside21:43
it doesnt belong to master21:43
ikke xD-: https://lore.kernel.org/git/xmqqk0zxbe6f.fsf@gitster.c.googlers.com/21:43
xD-: don't commit it then21:43
→ Guest11 joined21:43
xD- i can always checkout between them21:43
i didnt use .gitignore21:43
since i wanted it stored21:44
not lost data21:44
← Guest11 left21:44
ikke branches are not meant to keep changes apart indefinetly21:44
xD- well i come up with feature req21:44
xD21:44
or i code script around that issue21:44
i dont understand how software development can work with this all or nothin21:45
ikke it works very well21:46
→ Lord_of_Life_ joined21:46
← Lord_of_Life left21:46
xD- not in my case21:47
i handle binary data too21:47
for testing21:47
→ ZMarkGC joined21:47
Lord_of_Life_ → Lord_of_Life21:48
xD- like adding 100gb test files to linux kernel because you cant move it some devel21:48
it sounds kinda stupid21:48
nedbat xD-: if you want to keep it forever, find a directory to put it in, and commit it to master.21:48
xD- if everything is .c21:48
its fine and small21:48
← ELFrederich left21:48
xD- text based shits21:49
nedbat xD-: how will future developers use these test files if you don't put them in master?21:49
xD- they change to devel branch21:49
and see all files21:49
git checkout devel21:49
and users do git checkout master21:50
it sounds simple21:50
yet git doesnt work like that i guess21:50
ikke correct21:50
that's not what git is for21:50
or git branches21:50
← lucasta left21:50
xD- someone must fix it21:50
make a branch of git supporting that21:51
ikke xD-: feel free to fork git21:51
xD- na i will fix with script and quit developing like that21:52
never start a branch21:53
i also found workaround for file modification time stamps21:54
its sad that you need workaround for all21:54
gitstore meta thing21:54
and now i need script fixing that21:54
nedbat xD-: you can keep a long-lived branch like that if you want. You just have to separate files into different commits.21:55
← foul_owl left21:55
← derpydoo left21:57
xD- git checkout (-p|--patch) [<tree-ish>] [--] [<pathspec>…​]22:00
find and xargs xD22:00
← jacobk left22:00
→ lucasta joined22:01
→ foul_owl joined22:02
→ codaraxis joined22:04
← hypera1r left22:06
← foul_owl left22:08
← currenthandle left22:11
← jfsimon1981 left22:12
→ jfsimon1981 joined22:12
← TheCatBehemoth left22:17
← roadie left22:17
→ TheCatBehemoth joined22:18
→ roadie joined22:18
→ foul_owl joined22:18
← roadie left22:22
← bloody left22:24
→ giu- joined22:25
← jfsimon1981 left22:25
→ bloody joined22:25
→ jfsimon1981 joined22:25
← gast0n left22:27
← Swahili left22:27
→ Swahili joined22:28
← thebombzen left22:28
→ bloody_ joined22:29
→ bloody__ joined22:32
← bloody left22:32
← ZMarkGC left22:33
→ ZMarkGC joined22:33
→ jacobk joined22:35
← bloody_ left22:36
← EvilDMP left22:40
→ Toneloc30 joined22:43
Toneloc30 anyone know of any good online resource to practice/train on git commands using an online sandbox?22:45
I read the git parable last night and found it really awesome, so well done22:45
← jfsimon1981 left22:45
xD- i found easy way ...22:46
→ jfsimon1981 joined22:46
xD- find project/ -type f -exec git checkout --merge devel {} \;22:46
then i can commit devel changes to master22:47
and skip all the crap22:47
just add feature to git22:47
then no find needed22:47
→ roadie joined22:48
← duxsco left22:50
← gh34 left22:50
← lucasta left22:51
xD- so all other folders wont get touched by merge22:51
← Toneloc30 left22:52
xD- simple features22:52
→ lucasta joined22:52
→ ackyshake joined22:52
→ bloody joined22:52
→ zeenk joined22:54
← jfsimon1981 left22:54
→ jfsimon1981 joined22:54
← bloody__ left22:56
→ ferdna joined22:56
← feriman left22:57
← roadie left22:59
← lucasta left23:01
→ loulou joined23:03
← loulou left23:03
→ loulou joined23:03
← cdown left23:03
→ lucasta joined23:03
anddam nedbat: I'm thinking about that23:07
← lucasta left23:08
← Swahili left23:09
→ Swahili joined23:09
← peirik_ left23:13
→ lucasta joined23:15
← moldorcoder7 left23:17
← loulou left23:17
← The_Blode left23:18
→ lucasta_ joined23:20
← sa0 left23:21
→ roadie joined23:25
← lucasta left23:26
← OolonColluphid left23:26
→ currenthandle joined23:28
ZacSharp toneloc30: https://git-school.github.io/visualizing-git/ (based on https://onlywei.github.io/explain-git-with-d3/) and https://git.tm/ are what I know23:29
← giu- left23:32
xD- i guess i need school been using it for the first time23:32
but i will pull all the bookware about it done :)23:34
better than askin23:34
PACKT_GIT_COMPLETE_TUTORIAL-kEISO / PLURALSIGHT_CODE_SCHOOL_GIT_REAL_TUTORIAL-kEISO23:35
etc23:35
there seems to be a lot23:35
← roadie left23:36
nedbat xD-: we don't know what you are talking about, but you seem to have strong opinions before learning how git works.23:37
xD- yes i use software normally and i usually find design issues bugs instantly23:38
thats my talent23:38
software architecture is a big thing23:38
and i am no software guy ...23:39
yet ppl code and design a lot of crap23:39
← jacobk left23:40
xD- i filled some android bug reports even for banking apps23:40
since they dont notice basic things23:40
like fingerprint sensor above an OK button or dark mode missing23:41
how can that be missed23:41
→ derpydoo joined23:41
nedbat xD-: your other talent is typing many many lines where just one would be enough.23:42
← xD- left23:43
→ off^ joined23:44
→ thebombzen joined23:46
→ peirik_ joined23:49
← TheCatBehemoth left23:52
→ Sulky joined23:53
← peirik_ left23:58

Logs Search ←Prev date Next date→ Channels Documentation