Economic_Hitman, 3 months ago

@RustyCrab
Do cherry picked commits keep the date time of original authorship?

RustyCrab, 3 months ago

@Economic_Hitman I dont know but the way I'm doing it is I'm manually picking stuff from the diff. Its just easier due to the way it was coded

Economic_Hitman, 3 months ago

@RustyCrab from the diff? How do you do that? Sounds like applying patches (which would then get committed, so the date would be "now).

RustyCrab, 3 months ago

@Economic_Hitman you just compare the latest commit of the secret branch with your working tree and manually pull chunks over using a GUI diffing tool. It was coded roughly in modules so I'm just putting the modules over in order of dependencies

RustyCrab, 3 months ago

@Economic_Hitman forget that I said cherrypicking. I just said that because it's easier to understand but what I'm doing is functionally the same thing.

RustyCrab, 3 months ago

@Economic_Hitman plus there are some changes in the cherry picks I actually do not want and its hard to selectively remove those

Economic_Hitman, 3 months ago

@RustyCrab yeah selectively cherry picking isn't really possible.

RustyCrab, 3 months ago

@Economic_Hitman you can do it actually it's just slow. Cherrypick with nocommit, revert the parts you dont want and pray to god you dont get conflicts.

Economic_Hitman, 3 months ago

@RustyCrab ok. I'm git cli only. I wonder if what your diffing tool is doing under the hood is applying patches.

git diff master myBranch > mycool.patch  
git checkout master  
git apply mycool.patch  
git add . && git commit  

RustyCrab, 3 months ago

@Economic_Hitman no its really really simple. If you have ever used WinMerge its the exact same process. You are just presented with a "least change diff" between the two files and you "copy and paste" suff over (but its a lot cleaner than manually copy pasting)

MMS21, 3 months ago

The word based doesn’t do this post justice. We need something more powerful. Gigabased perhaps?

RustyCrab, 3 months ago

@MMS21 gigarebased

ajax, 3 months ago

@RustyCrab how can you justify stealing your poor employer's money like that? don't you know how hard they work to bring you that investor capital how can you be so ungrateful?

mischievoustomato, 3 months ago

the crabset: overwork then commit slowly

RustyCrab, 3 months ago

@mischievoustomato idk man some weeks I just output stuff like I'm snorting adderall. This is a good start though. Managers dont even notice when you get a lot done at once.