| 2021-01-22 |
| → tryte joined | 00:01 |
| → cyrus_mc_ joined | 00:01 |
| ← g00s left | 00:01 |
|
cyrus_mc_
| Doing git subtree pull --prefix .ci [email@hidden.address] master --squash via automation so don't want it to ask me to merge. I tried --non-interactive but it said unknown option. Is there a way I can tell it to just go ahead and merge | 00:02 |
| ← royal_screwup21 left | 00:02 |
| → royal_screwup21 joined | 00:02 |
| ← herren left | 00:02 |
| ← royal_screwup21 left | 00:07 |
| → royal_screwup21 joined | 00:08 |
| ← tiin57 left | 00:08 |
| → zulutango joined | 00:09 |
| → tiin57 joined | 00:12 |
| ← calcul0n_ left | 00:13 |
| → SwiftMatt joined | 00:18 |
| → dqx_ joined | 00:19 |
| ← dqx_ left | 00:23 |
| → dqx_ joined | 00:23 |
| ← chewb left | 00:24 |
| → g00s joined | 00:24 |
| → envex joined | 00:25 |
| ← akiva left | 00:26 |
| ← cbreak_ left | 00:27 |
| ← trinityblade left | 00:28 |
| ← hololeap left | 00:33 |
| ← Ram-Z left | 00:34 |
| ← infl00p left | 00:35 |
| ← g00s left | 00:35 |
| ← Gustavo6046 left | 00:38 |
| ← tiin57 left | 00:38 |
| → g00s joined | 00:39 |
| ← tryte left | 00:41 |
| ← AnAverageHuman left | 00:41 |
| ← Hello71 left | 00:41 |
| ← tejr left | 00:41 |
| ← Nickwiz left | 00:41 |
| ← meropyri left | 00:41 |
| ← iNs_ left | 00:41 |
| ← xelxebar left | 00:41 |
| ← denisse left | 00:41 |
| ← andreas303 left | 00:41 |
| ← reen left | 00:41 |
| ← j7k6 left | 00:41 |
| ← maxwilliamson left | 00:41 |
| ← DiffieHellman left | 00:41 |
| ← ghost43 left | 00:41 |
| → tiin57 joined | 00:41 |
| → Gustavo6046 joined | 00:41 |
| ← wolfshappen left | 00:48 |
| → developer24 joined | 00:49 |
| → akiva joined | 00:50 |
| ← shabius left | 00:51 |
| → shabius joined | 00:51 |
| → ericnoan joined | 00:52 |
| → Mmike joined | 00:54 |
| → Ram-Z joined | 00:54 |
| → infl00p joined | 00:56 |
| → crose_ joined | 00:56 |
| → Hello71 joined | 00:58 |
| → reen joined | 00:58 |
| → tryte joined | 00:58 |
| ← royal_screwup21 left | 00:58 |
| → royal_screwup21 joined | 00:59 |
| → ghost43 joined | 00:59 |
| → tejr joined | 01:00 |
| ← cyrus_mc_ left | 01:01 |
| → gast0n joined | 01:02 |
| → DiffieHellman joined | 01:03 |
| → xelxebar joined | 01:03 |
| → meropyri joined | 01:03 |
| → denisse joined | 01:03 |
| ← developer24 left | 01:03 |
| → maxwilliamson joined | 01:03 |
| ← royal_screwup21 left | 01:03 |
| → wolfshappen joined | 01:05 |
| ← tejr left | 01:05 |
| → tejr joined | 01:06 |
| ← reen left | 01:06 |
| → reen joined | 01:06 |
| → j7k6 joined | 01:07 |
| → AnAverageHuman joined | 01:07 |
| → iNs joined | 01:08 |
| ← clime left | 01:08 |
| ← tiin57 left | 01:08 |
| → yoh joined | 01:08 |
|
yoh
| I would like to figure out some detail of how git-remote-https "works" to decide on HTTP_REAUTH, want to gdb it, what is the communication language if I start "git-remote-https origin https://..." ? | 01:09 |
| ← durham left | 01:10 |
| → durham joined | 01:11 |
| → tiin57 joined | 01:12 |
| ← gordonfish left | 01:12 |
| → Nickwiz joined | 01:12 |
| → andreas303 joined | 01:12 |
|
yoh
| I think found it: https://git-scm.com/docs/gitremote-helpers | 01:16 |
| ← arcatech left | 01:17 |
| → raven-au joined | 01:19 |
| ← g00s left | 01:20 |
| → arcatech joined | 01:20 |
| ← hurfdurf left | 01:20 |
| → hurfdurf joined | 01:21 |
| ← rumbler31_ left | 01:26 |
| → alyawn joined | 01:29 |
| → DevAntoine joined | 01:30 |
| → maxwilli- joined | 01:30 |
| ← maxwilliamson left | 01:30 |
| ← moldorcoder7 left | 01:31 |
| → moldorcoder7 joined | 01:31 |
| ← mowotter left | 01:32 |
| ← DevAntoine left | 01:34 |
| → Technodrome joined | 01:37 |
| ← tiin57 left | 01:38 |
| ← p-core left | 01:40 |
| → p-core joined | 01:40 |
| → tiin57 joined | 01:42 |
| → BUSY joined | 01:45 |
| → gordonfish joined | 01:47 |
| → akasuv joined | 01:48 |
| → Xenguy_ joined | 01:51 |
| ← akasuv left | 01:51 |
|
yoh
| eh, still do not quite get though how git gets 401 and not 404 when trying to access private repos on github: https://git-annex.branchable.com/bugs/be_like_git_and_ask_for_credentials_if_404/#comment-bfe2ec4cc10d7bb543c6bfec850de4c1 | 01:53 |
| ← Xenguy left | 01:53 |
| → Guest20 joined | 01:56 |
| ← cr4y1 left | 01:59 |
| → royal_screwup21 joined | 02:00 |
| ← arcatech left | 02:03 |
| ← akiva left | 02:04 |
| ← royal_screwup21 left | 02:05 |
| ← tiin57 left | 02:08 |
| → tiin57 joined | 02:12 |
| → nsc joined | 02:14 |
| nsc → Guest76013 | 02:14 |
| → arcatech joined | 02:15 |
| ← Guest58752 left | 02:16 |
| ← arcatech left | 02:22 |
| ← foul_owl left | 02:22 |
| → arcatech joined | 02:27 |
| ← arcatech left | 02:27 |
| Xenguy_ → Xenguy | 02:28 |
| → iskander- joined | 02:32 |
| ← Betal left | 02:32 |
| ← steven left | 02:33 |
| ← iskander left | 02:34 |
| → Betal joined | 02:34 |
| → steven joined | 02:34 |
| ← Wetmelon left | 02:36 |
| ← venmx left | 02:38 |
| ← tiin57 left | 02:38 |
| → tiin57 joined | 02:42 |
| ← bogartjack left | 02:46 |
| ← SwiftMatt left | 02:50 |
| → arcatech joined | 02:53 |
| → Wetmelon joined | 02:55 |
| ← F0rTex left | 02:58 |
| → Muimi joined | 02:59 |
| → F0rTex joined | 02:59 |
| → myst1crule joined | 03:06 |
| ← arcatech left | 03:07 |
| ← tiin57 left | 03:08 |
| ← Ranhir left | 03:08 |
| ← nomadicmathmo left | 03:09 |
| ← Sleepy63 left | 03:11 |
| → tiin57 joined | 03:11 |
| → Ranhir joined | 03:12 |
| → jaziz joined | 03:12 |
| ← pedahzur left | 03:13 |
| ← PJBoy left | 03:18 |
| ← DavidJOwens left | 03:22 |
| → atrus joined | 03:23 |
|
atrus
| Trying to help a co-worker out of a tough git problem. We're not positive, but we *think* what happened was that while Bob was resolving conflicts while merging Charlie's changes into their branch, they (somehow) removed all of the Charlie's changes, in the merge commit. So Charlie's changes are in the history, but not reflected int he contents post-merge. That merge commit was then merged into master. | 03:26 |
|
| I've tried reverting the ->master merge (with "git revert -m 1"), and then attempting to re-merge Charlie's changes in -- but git's just coming back with "Already up to date." | 03:27 |
|
| The only solution I'm seeing may require Charlie to cherry-pick each of his commits back in one at a time -- it's not insurrmountable, just frustratingly tedious. | 03:28 |
| ← mgedmin left | 03:30 |
| → DevAntoine joined | 03:30 |
| → mgedmin joined | 03:32 |
| ← DevAntoine left | 03:35 |
|
atrus
| over the past 5 years in i've seen 2 instances of users accidentally getting some weird changes into a merge commit. It's rare, but once the change has gone into the merge commit itself, it can be very hard to see before it's too late. | 03:37 |
| ← tiin57 left | 03:39 |
| ← shush left | 03:41 |
| → tiin57 joined | 03:41 |
| → shush joined | 03:42 |
| → SwiftMatt joined | 03:42 |
| ← cd left | 03:42 |
| ← Technodrome left | 03:45 |
| ← shush left | 03:46 |
| ← mirrorbird left | 03:48 |
| → xirhtogal joined | 03:49 |
| lagothrix → Guest24876 | 03:49 |
| ← Guest24876 left | 03:49 |
| xirhtogal → lagothrix | 03:49 |
| ← SwiftMatt left | 03:49 |
| → bogartjack joined | 03:54 |
| → adlternative joined | 03:56 |
| ← durham left | 03:57 |
| ← gast0n left | 03:59 |
| → royal_screwup21 joined | 04:01 |
| ← royal_screwup21 left | 04:06 |
| → backthen joined | 04:06 |
| ← tiin57 left | 04:08 |
| ← chachasmooth left | 04:09 |
| → chachasmooth joined | 04:11 |
| → tiin57 joined | 04:11 |
| → shush joined | 04:15 |
| → arcatech joined | 04:19 |
| ← gadget left | 04:19 |
| ← kerframil left | 04:20 |
| ← shush left | 04:20 |
| ← zebrag left | 04:22 |
| → zebrag joined | 04:23 |
| ← Jackneill left | 04:23 |
| → Newami joined | 04:24 |
| ← mindCrime_ left | 04:26 |
| → Goplat joined | 04:29 |
| → gadget joined | 04:31 |
| → venmx joined | 04:33 |
| ← andrologic left | 04:34 |
| ← Newami left | 04:34 |
| ← sicelo left | 04:36 |
| ← arcatech left | 04:36 |
| → mindCrime_ joined | 04:38 |
| ← tiin57 left | 04:38 |
| ← venmx left | 04:40 |
| → tiin57 joined | 04:42 |
| → arcatech joined | 04:43 |
| → adl_ joined | 04:47 |
| ← adlternative left | 04:47 |
| → g00s joined | 04:48 |
| ← mindCrime_ left | 04:48 |
| → shush joined | 04:50 |
| → Jackneill joined | 04:50 |
| ← bogartjack left | 04:53 |
| ← shush left | 04:55 |
| → milkt joined | 04:58 |
| → clarity joined | 05:00 |
| → SwiftMatt joined | 05:00 |
| ← Wetmelon left | 05:07 |
| ← austin987 left | 05:07 |
| ← tiin57 left | 05:08 |
| ← nrh^ left | 05:10 |
| → tiin57 joined | 05:12 |
| → austin987 joined | 05:19 |
| ← zebrag left | 05:22 |
| → zebrag joined | 05:23 |
| → Sleepy63 joined | 05:25 |
| ← AnAverageHuman left | 05:26 |
| → drbean joined | 05:31 |
| → inoteajw joined | 05:31 |
| → DevAntoine joined | 05:31 |
| → mosh joined | 05:33 |
| ← tryte left | 05:34 |
| → tryte joined | 05:34 |
| ← DevAntoine left | 05:36 |
| ← zebrag left | 05:36 |
| ← cation21 left | 05:37 |
| ← tiin57 left | 05:38 |
| Ayo → Guest79417 | 05:40 |
| ← Guest79417 left | 05:40 |
| → Ayo joined | 05:40 |
| ← radu242 left | 05:41 |
| ← SwiftMatt left | 05:41 |
| → radu242 joined | 05:42 |
| → tiin57 joined | 05:42 |
| ← arcatech left | 05:43 |
| ← g00s left | 05:47 |
| ← bn_work left | 05:49 |
| ← geosmileus left | 05:50 |
| → jl4 joined | 05:52 |
| → pedahzur joined | 05:53 |
| ← orbyt_ left | 05:55 |
| ← pedahzur left | 05:57 |
| → pedahzur joined | 05:57 |
| ← alyawn left | 06:00 |
| → royal_screwup21 joined | 06:02 |
| ← madewokherd left | 06:02 |
| → g00s joined | 06:05 |
| ← royal_screwup21 left | 06:06 |
| → daysun joined | 06:07 |
| ← tiin57 left | 06:08 |
| → arahael joined | 06:10 |
|
arahael
| How do I run 'git ls-files -om' but have it include modified-but-staged files as well? | 06:11 |
| → tiin57 joined | 06:11 |
| ← p-core left | 06:12 |
| → p-core joined | 06:12 |
| ← pedahzur left | 06:14 |
|
ackyshake
| arahael: git ls-files -oms | 06:15 |
|
arahael
| ackyshake: That doesn't really do that, that seems to have a different interpretation. | 06:15 |
|
| It's listing files that were never changed at all in the current working tree. | 06:16 |
|
| (But which are, never-the-less, tracked) | 06:16 |
| ← g00s left | 06:16 |
|
ackyshake
| You want to limit the output to _just_ the modified but staged? | 06:16 |
|
arahael
| I basically want the list you get with `git status` | 06:17 |
|
ackyshake
| arahael: Why not use git status --porcelain then? | 06:17 |
|
arahael
| That looks promising. | 06:18 |
|
| Yep, `git status --porcelain=2 | cut -d' ' -f 9-` works | 06:20 |
|
| That's not going to bite me with renames, I hope. | 06:23 |
|
ackyshake
| Renames show up as 'R' in the output. | 06:25 |
| → riksteri joined | 06:25 |
|
arahael
| Yes, but it's still at item 9? The output is unfortunately space-delimited, but space can be in file names. | 06:27 |
| → wrobinso1 joined | 06:28 |
|
ackyshake
| It starts at field 9 yeah, but non-renames would just print the filename, so I guess you would need to consider that in your logic. | 06:29 |
|
arahael
| Yeah, it does look like renames will mess up that naive parsing. | 06:30 |
| ← wrobinson left | 06:31 |
| ← kenwoodfox left | 06:33 |
| → kenwoodfox joined | 06:34 |
| → g00s joined | 06:34 |
| ← thiago left | 06:34 |
| → venmx joined | 06:35 |
| ← tiin57 left | 06:38 |
| ← venmx left | 06:40 |
| → tiin57 joined | 06:41 |
| → herren joined | 06:42 |
| → ferdna joined | 06:43 |
| → sord937 joined | 06:43 |
| ← heyitsrama left | 06:45 |
| → OnkelBlade joined | 06:48 |
| ← Betal left | 06:53 |
| → YuGiOhJCJ joined | 06:53 |
|
Jackneill
| hey | 06:53 |
|
| how can i add (not merge, just add as uncommitted) the changes from a different branch? | 06:54 |
|
ackyshake
| Jackneill: git checkout some_branch -- some_file | 07:04 |
|
Jackneill
| -- . for everything? | 07:05 |
|
| thank you | 07:05 |
|
ackyshake
| Yep, | 07:06 |
| ← ferdna left | 07:07 |
|
ackyshake
| You could also use git cherry-pick --no-commit <commit> for this purpose, which also accepts a commit range. | 07:07 |
| ← tiin57 left | 07:08 |
| → venmx joined | 07:08 |
| → Betal joined | 07:09 |
| → __Aqua_Vitae__ joined | 07:10 |
| → mirrorbird joined | 07:10 |
| ← g00s left | 07:11 |
| → meropyri- joined | 07:11 |
| ← meropyri left | 07:12 |
| → tiin57 joined | 07:12 |
| ← __Aqua_Vitae__ left | 07:12 |
| ← venmx left | 07:14 |
|
arahael
| Depending on what you mean by "changes", I usually use a soft reset for that. | 07:16 |
| → venmx joined | 07:17 |
| ← atrigent left | 07:18 |
| ← justanotheruser left | 07:21 |
| ← inoteajw left | 07:26 |
| ← vicfred left | 07:27 |
| ← cim209 left | 07:27 |
| → vicfred joined | 07:27 |
| → cim209 joined | 07:27 |
| ← kjartan left | 07:29 |
| → kjartan joined | 07:30 |
| → DevAntoine joined | 07:30 |
| ← kjartan left | 07:31 |
| → kjartan_ joined | 07:32 |
| ← mirrorbird left | 07:34 |
| → cbreak joined | 07:36 |
| ← tiin57 left | 07:38 |
| → knobi joined | 07:41 |
| → tiin57 joined | 07:41 |
| ← blahboybaz left | 07:43 |
| ← FRWB left | 07:44 |
| ← knobi left | 07:45 |
| → clime joined | 07:54 |
| → cr4y1 joined | 07:54 |
| ← DiffieHellman left | 07:54 |
| → DiffieHellman joined | 07:55 |
| ← otisolsen70 left | 07:57 |
| → rfuentess joined | 07:58 |
| ← Goplat left | 07:59 |
| ← unluckyshrubbery left | 08:02 |
| → royal_screwup21 joined | 08:02 |
| → rcoote joined | 08:02 |
| → TomyWork joined | 08:05 |
| ← jl4 left | 08:05 |
| ← royal_screwup21 left | 08:07 |
| → krkini joined | 08:08 |
| ← kini left | 08:08 |
| ← tiin57 left | 08:08 |
| ← howdoi left | 08:11 |
| → tiin57 joined | 08:12 |
| ← DevAntoine left | 08:15 |
| → knobi joined | 08:15 |
| ← lawid left | 08:15 |
| ← Muimi left | 08:16 |
| → lawid joined | 08:16 |
| → Muimi joined | 08:16 |
| → DevAntoine joined | 08:18 |
| ← venmx left | 08:19 |
| → chele joined | 08:21 |
| ← cliluw left | 08:24 |
| → cliluw joined | 08:25 |
| ← leeN left | 08:26 |
| ← drbean left | 08:27 |
| ← mat001 left | 08:33 |
| → Haohmaru joined | 08:35 |
| → mirrorbird joined | 08:36 |
| ← tiin57 left | 08:38 |
| ← clarity left | 08:38 |
| → calcul0n_ joined | 08:41 |
| → tiin57 joined | 08:42 |
| → tonythomas joined | 08:43 |
| → venmx joined | 08:44 |
| → mozgalom joined | 08:48 |
| → g00s joined | 08:49 |
| → tsrt^ joined | 08:49 |
| ← venmx left | 08:50 |
| ← Betal left | 08:52 |
| ← sudoforge left | 09:01 |
|
daysun
| windows doesn't have an executable file flag. If you pull and edit a +x script in windows and commits it, is the +x flag lost? | 09:02 |
| → ivanc joined | 09:03 |
| → sicelo joined | 09:04 |
|
osse
| daysun: no | 09:05 |
| ← YuGiOhJCJ left | 09:06 |
| ← knobi left | 09:07 |
| ← tiin57 left | 09:08 |
| → klonn joined | 09:08 |
| → YuGiOhJCJ joined | 09:09 |
| → angusrobot joined | 09:10 |
| → knobi joined | 09:11 |
| → tiin57 joined | 09:11 |
| → bolovanos__ joined | 09:13 |
| ← jor left | 09:14 |
| ← hexa- left | 09:14 |
| ← cdown left | 09:14 |
| ← kaisyu[m] left | 09:14 |
| ← BloodShot[m] left | 09:14 |
| ← leibniz[m] left | 09:14 |
| ← greyltc[m] left | 09:14 |
| ← Rampoina[m] left | 09:14 |
| ← rjstone left | 09:14 |
| → jor joined | 09:15 |
| → Rampoina[m] joined | 09:15 |
| → kaisyu[m] joined | 09:15 |
| → greyltc[m] joined | 09:15 |
| → leibniz[m] joined | 09:15 |
| → BloodShot[m] joined | 09:15 |
| → cdown joined | 09:15 |
| → rjstone joined | 09:15 |
| → cYmen joined | 09:15 |
| → quizzi joined | 09:15 |
| → karstensrage joined | 09:15 |
| → relipse joined | 09:15 |
| → roflin joined | 09:15 |
| → joako joined | 09:15 |
| → ephemera_ joined | 09:15 |
| → Fusl joined | 09:15 |
| → Norrin joined | 09:15 |
| → TimWolla joined | 09:15 |
| → Ragnor joined | 09:15 |
| → nerdypepper joined | 09:15 |
| → nemesit|znc joined | 09:15 |
| → blowry joined | 09:15 |
| → astronavt joined | 09:15 |
| ← karstensrage left | 09:15 |
| ← leibniz[m] left | 09:15 |
| → deepy joined | 09:16 |
| ← ChrisLane left | 09:16 |
| ← reprazent left | 09:16 |
| ← haxki_ left | 09:17 |
| → hexa- joined | 09:17 |
| ← AlexMax left | 09:17 |
| ← BloodShot[m] left | 09:17 |
| ← greyltc[m] left | 09:17 |
| ← Rampoina[m] left | 09:18 |
| ← cpackham left | 09:18 |
| ← Phase[m] left | 09:18 |
| ← kaisyu[m] left | 09:18 |
| ← Birdie[m] left | 09:18 |
| ← skalexisenvsnet left | 09:18 |
| → haxki joined | 09:19 |
| → reprazent joined | 09:19 |
| → FabioP joined | 09:20 |
| ← chibit left | 09:20 |
| ← M8zkoscjbf2dhkfz left | 09:21 |
| ← blue_penquin left | 09:21 |
| ← dunc4n left | 09:21 |
| ← aks3n[m] left | 09:21 |
| ← finn[m] left | 09:21 |
| ← hiq[m] left | 09:21 |
| ← hsiktas[m] left | 09:21 |
| ← ecrockz123[m] left | 09:21 |
| ← colemickens left | 09:21 |
| ← bthompson90 left | 09:21 |
| ← romanblanco[m] left | 09:21 |
| ← cerna left | 09:21 |
| ← morguldir left | 09:21 |
| ← kb1000 left | 09:21 |
| ← sith[m] left | 09:22 |
| ← silviof left | 09:22 |
| ← ForeverNoob[m] left | 09:22 |
| ← hussam left | 09:22 |
| → Guest33533 joined | 09:23 |
| ← mirrorbird left | 09:24 |
| ← LordRyan left | 09:24 |
| ← wunderbar left | 09:24 |
| ← lusrx left | 09:24 |
| → royal_screwup21 joined | 09:25 |
| → angusrobot_ joined | 09:26 |
| → LordRyan joined | 09:26 |
| → sammyg joined | 09:26 |
| → mbalmer joined | 09:27 |
| → wunderbar joined | 09:27 |
| ← angusrobot left | 09:27 |
| → ChrisLane joined | 09:27 |
| ← Ayo left | 09:27 |
| angusrobot_ → angusrobot | 09:29 |
| → cation21 joined | 09:30 |
| ← mbalmer_ left | 09:30 |
| ← adl_ left | 09:30 |
| → nomadicmathmo joined | 09:31 |
| → adlternative joined | 09:31 |
| → mitrokov joined | 09:34 |
| ← hnOsmium0001 left | 09:35 |
| ← tiin57 left | 09:38 |
| ← downunder left | 09:39 |
| ← nomadicmathmo left | 09:39 |
| → downunder joined | 09:41 |
| → tiin57 joined | 09:42 |
| → clarity joined | 09:44 |
| → ccrr10 joined | 09:44 |
| → unluckyshrubbery joined | 09:47 |
| → tmm88 joined | 09:48 |
| ← tmm88 left | 09:51 |
| → tmm88 joined | 09:51 |
| ← DevAntoine left | 09:53 |
| → DevAntoine joined | 09:53 |
| ← angusrobot left | 09:55 |
| → Ori_B joined | 09:56 |
| ← yawkat left | 10:00 |
| → yawkat joined | 10:03 |
| → onizu joined | 10:08 |
| → nomadicmathmo joined | 10:08 |
| ← tiin57 left | 10:08 |
| → PJBoy joined | 10:09 |
| → bthompson90 joined | 10:10 |
| → tiin57 joined | 10:12 |
| ← Penagwin24 left | 10:20 |
| ← gigasu_shida left | 10:21 |
| ← blowry left | 10:21 |
| → jl4 joined | 10:21 |
| ← sicelo left | 10:24 |
| → Penagwin24 joined | 10:24 |
| → blowry joined | 10:25 |
| → drag0nius joined | 10:30 |
| → winny joined | 10:31 |
| → jungdongho joined | 10:35 |
| → angusrobot joined | 10:37 |
| ← tiin57 left | 10:38 |
| → Pickchea joined | 10:39 |
|
Pickchea
| Hey, is there a way to stage a directory but not its contents? | 10:39 |
|
ikke
| No | 10:41 |
| → tiin57 joined | 10:41 |
| → itp_student|50 joined | 10:42 |
|
Pickchea
| ikke, that sucks pretty hard. | 10:43 |
|
| But thanks. | 10:43 |
| ← itp_student|50 left | 10:43 |
| ← tmm88 left | 10:43 |
|
nedbat
| Pickchea: git doesn't store directories separately from their contents. What did you want to do? | 10:45 |
|
| ikke: btw, "git push --all" doesn't seem to push tags | 10:45 |
|
adlternative
| When I checkout to some old branch,i find that some empty directory still exist. | 10:46 |
|
Pickchea
| nedbat, I have a subfolder `data' that contains large files (and no, I don't want to check them in with git-lfs). I want this folder to be in my repository but without the large files. | 10:46 |
|
nedbat
| Pickchea: put a README in there explaining what it's for. | 10:47 |
|
Pickchea
| nedbat nice workaround, thanks! | 10:47 |
|
ikke
| nedbat: I see I misread that. --all pushes refs/heads | 10:47 |
|
osse
| Pickchea: it also makes sense to put a .gitignore therre | 10:47 |
|
| but I guess you have ignored everything already | 10:47 |
|
nedbat
| ikke: it seems odd that there isn't one git command that will push everything I have. oh well: alias pa = two commandss | 10:48 |
|
Pickchea
| osse, I have a .gitignore file in the root of my repository. It currently says `data/*.csv' but because `data' does not contain anything else, the directory itself won't be staged. | 10:48 |
|
osse
| yeah | 10:49 |
|
| you can also put '*.csv' in data/.gitignore | 10:49 |
|
| that way you also get a file in there that serves a purpose and you don't have to write a README :P | 10:49 |
|
nedbat
| writing a README will be the best thing you do today :) | 10:50 |
| → Thorn joined | 10:53 |
| → finn[m] joined | 10:55 |
| → blue_penquin joined | 10:55 |
| → Phase[m] joined | 10:55 |
| → kaisyu[m] joined | 10:55 |
| → romanblanco[m] joined | 10:55 |
| → ecrockz123[m] joined | 10:55 |
| → colemickens joined | 10:55 |
| → leibniz[m] joined | 10:55 |
| → M8zkoscjbf2dhkfz joined | 10:55 |
| → Birdie[m] joined | 10:55 |
| → morguldir joined | 10:55 |
| → silviof joined | 10:55 |
| → hussam joined | 10:55 |
| → ForeverNoob[m] joined | 10:55 |
| → sith[m] joined | 10:55 |
| → chibit joined | 10:55 |
| → hiq[m] joined | 10:55 |
| → hsiktas[m] joined | 10:55 |
| → greyltc[m] joined | 10:55 |
| → BloodShot[m] joined | 10:55 |
| → cerna joined | 10:55 |
| → Rampoina[m] joined | 10:55 |
| → kb1000 joined | 10:55 |
| → cpackham joined | 10:55 |
| → AlexMax joined | 10:55 |
| → skalexisenvsnet joined | 10:55 |
| → dunc4n joined | 10:55 |
| → aks3n[m] joined | 10:55 |
| angusrobot → angus | 10:55 |
| → onmeac joined | 10:56 |
| ← g00s left | 10:56 |
| ← onmeac left | 10:57 |
| → g00s joined | 10:58 |
| ← OnkelBlade left | 11:01 |
| ← ChrisLane left | 11:03 |
| ← Muimi left | 11:04 |
| → Muimi_ joined | 11:04 |
| Muimi_ → Muimi | 11:04 |
| ← Muimi left | 11:04 |
| → ChrisLane joined | 11:05 |
| ← tiin57 left | 11:08 |
| ← Lord_of_Life left | 11:10 |
| → tiin57 joined | 11:12 |
| ← sweatsuit left | 11:12 |
| → Muimi joined | 11:12 |
| ← Muimi left | 11:12 |
|
jungdongho
| hello! is there any way to commit with previous messages in an editor? | 11:13 |
|
| like a --reuse-message but in an editor | 11:14 |
|
| I want to do that for keep my log message style consistently | 11:14 |
| → venmx joined | 11:15 |
| → Lord_of_Life joined | 11:15 |
|
osse
| jungdongho: git commit -C somecommit --edit | 11:16 |
|
| you can also customize the template, or write a hook to generate the template | 11:16 |
|
| lots of ways | 11:16 |
|
jungdongho
| osse: ah..! --edit! I missed that | 11:18 |
|
| thanks! :D | 11:18 |
| ← g00s left | 11:20 |
| → ADG1089__ joined | 11:22 |
|
ADG1089__
| I squash merged dev -> qa. Now I'm getting merge conflicts too complex for github web when merging new changes from dev -> qa. Also I can't push directly to dev or qa. What should I do? | 11:22 |
|
| since both branches are protected | 11:22 |
|
ikke
| ADG1089__: squash merges loose history about what has been merged | 11:23 |
|
| so doing multiple merges from the same branch and then squash merging it in is indeed bound to conflict | 11:24 |
|
| (it's similar to how SVN used to merge branches, which was a disaster as well) | 11:24 |
| ← Pickchea left | 11:24 |
|
ADG1089__
| ikke: so I should use squash merge only for feature branches and merge-commit merge for public branches | 11:24 |
|
| not even rebase, right? | 11:25 |
|
ikke
| if the branches are protected, you cannot rebase them (and for public branches that should be avoided anyway) | 11:25 |
|
| so yes | 11:25 |
| ← jl4 left | 11:25 |
| → freimatz joined | 11:28 |
| ← dqx_ left | 11:31 |
| ← drag0nius left | 11:32 |
| ← jungdongho left | 11:32 |
| → otisolsen70 joined | 11:32 |
|
graingert
| ADG1089__: having a `dev` and `qa` and `main`/`master` branch is a bit odd? | 11:32 |
|
| why not just have one default branch for everything and qa each feature branch? | 11:33 |
|
ikke
| graingert: it totally depends on the workflow | 11:33 |
| ← freimatz left | 11:34 |
| ← vicfred left | 11:34 |
| → sier81 joined | 11:34 |
| → dionysus69 joined | 11:38 |
| → vicfred joined | 11:38 |
| ← tiin57 left | 11:38 |
| ← sgn left | 11:40 |
| → tiin57 joined | 11:41 |
| → sgn joined | 11:42 |
| → OnkelBlade joined | 11:46 |
| ← nomadicmathmo left | 11:48 |
| → jl4 joined | 11:48 |
| ← strk left | 11:49 |
| ← ivanc left | 11:53 |
| → ivanc joined | 11:53 |
| → SwiftMatt joined | 11:54 |
| → dionysus69_ joined | 11:56 |
| ← dionysus69 left | 11:56 |
| ← dionysus69_ left | 11:56 |
| → dionysus69 joined | 11:57 |
| ← SwiftMatt left | 11:58 |
| → tmm88 joined | 12:00 |
| ← tmm88 left | 12:00 |
| ← powerhouse left | 12:06 |
|
Dev0n
| hey, so when working with git submodules, if feature X is being developed on submodule A on branch X, would you have to create a branch X on the parent module as well to keep things consistent when it comes to merging? | 12:06 |
|
| I'm trying to wrap my head around the workflow here | 12:06 |
| → freimatz joined | 12:06 |
| → tmm88 joined | 12:07 |
| ← tmm88 left | 12:07 |
| → tmm88 joined | 12:07 |
| → Muimi joined | 12:08 |
| ← Muimi left | 12:08 |
| ← tiin57 left | 12:08 |
| ← freimatz left | 12:09 |
| → MrC joined | 12:09 |
| → powerhouse joined | 12:10 |
| → tiin57 joined | 12:12 |
| → dqx_ joined | 12:14 |
| ← venmx left | 12:18 |
| → Pickchea joined | 12:19 |
| ← OnkelBlade left | 12:19 |
| ← klonn left | 12:21 |
| ← jl4 left | 12:24 |
| ← rcoote left | 12:25 |
| → nomadicmathmo1 joined | 12:33 |
| ← FabioP left | 12:35 |
| nomadicmathmo1 → nomadicmathmo | 12:36 |
| ← tiin57 left | 12:38 |
| ← ivanc left | 12:40 |
| ← tmm88 left | 12:41 |
| ← ADG1089__ left | 12:41 |
| ← sgn left | 12:42 |
| → tiin57 joined | 12:42 |
| → sgn joined | 12:42 |
| → Tobbi_1 joined | 12:45 |
| ← cyphase left | 12:46 |
| ← Tobbi_ left | 12:46 |
| Tobbi_1 → Tobbi_ | 12:46 |
| → cyphase joined | 12:57 |
| → gast0n joined | 12:59 |
| ← gavlee left | 13:00 |
| ← clime left | 13:00 |
| → aw1 joined | 13:02 |
| → gavlee joined | 13:06 |
| → _I3^RELATIVISM joined | 13:06 |
| ← NitrousPG left | 13:06 |
| ← tiin57 left | 13:08 |
| → OnkelBlade joined | 13:08 |
| → rcoote joined | 13:10 |
| → tiin57 joined | 13:12 |
| → bolovanos_ joined | 13:14 |
| ← nomadicmathmo left | 13:17 |
| ← bolovanos__ left | 13:17 |
| ← axisys left | 13:21 |
| → Raging_Hog joined | 13:23 |
| → Technodrome joined | 13:30 |
| → mat001 joined | 13:31 |
| ← ezzieyguywuf left | 13:34 |
| → tmm88 joined | 13:38 |
| ← tmm88 left | 13:38 |
| → tmm88 joined | 13:38 |
| ← tiin57 left | 13:38 |
| ← royal_screwup21 left | 13:39 |
| → royal_screwup21 joined | 13:39 |
| ← moldorcoder7 left | 13:40 |
| ← Lord_of_Life left | 13:40 |
| → calcul0n__ joined | 13:41 |
| → tiin57 joined | 13:42 |
| → Lord_of_Life joined | 13:42 |
| ← tgunr_ left | 13:43 |
| ← calcul0n_ left | 13:44 |
| ← royal_screwup21 left | 13:44 |
| → AnAverageHuman joined | 13:45 |
| → tgunr joined | 13:46 |
| → __that__ joined | 13:47 |
| → zebrag joined | 13:47 |
| → royal_screwup21 joined | 13:49 |
| → nomadicmathmo joined | 13:49 |
| ← rustyshackleford left | 13:50 |
| ← tgunr left | 13:51 |
| → cd joined | 13:52 |
| ← mitrokov left | 13:53 |
| ← royal_screwup21 left | 13:54 |
| → royal_screwup21 joined | 13:54 |
| → lacrymology joined | 13:55 |
| → fastfresh joined | 13:56 |
| → ADG1089__ joined | 13:59 |
| ← royal_screwup21 left | 14:00 |
| → klonn joined | 14:00 |
| → sweatsuit joined | 14:08 |
| ← tiin57 left | 14:08 |
| → CodeSlingerPaul joined | 14:11 |
| → rwdrich joined | 14:11 |
| → tiin57 joined | 14:12 |
| → royal_screwup21 joined | 14:12 |
| → moldorcoder7 joined | 14:13 |
| → venmx joined | 14:15 |
|
osse
| Dev0n: short answer: no | 14:15 |
| → tgunr joined | 14:16 |
| ← k3yp left | 14:16 |
|
osse
| Dev0n: longer answer: branches doesn't matter. the parent git repo only cares about which commit the submodule should have checked out | 14:16 |
| ← OnkelBlade left | 14:16 |
| ← ADG1089__ left | 14:17 |
| ← royal_screwup21 left | 14:17 |
| → royal_screwup21 joined | 14:18 |
| ← klonn left | 14:18 |
| → klonn joined | 14:18 |
| ← aw1 left | 14:18 |
|
Dev0n
| osse ok, so if feature/branch X is developed in the submodule, when this is ready to be included in the parent git repo, you would just make your merge from feature X to master in the submodule. Ideally the parent master branch would be tracking the master branch of the submodule right? | 14:19 |
|
| Then it should *just work* without an additional workflow | 14:19 |
|
osse
| Dev0n: Yes, but it's at the "ideally" part it breaks down. there is no branch tracking with submodules | 14:20 |
| ← zebrag left | 14:20 |
| ← venmx left | 14:20 |
| → zebrag joined | 14:20 |
|
osse
| i mean, there is some convenience stuff to make it easier to update | 14:20 |
|
| but a submodules will not magically be at the lastest commit on a branch by itself | 14:20 |
|
Dev0n
| osse, so just to clarify, on the parent master branch, you're not able to say the submodule in that parent is the master branch of that submodule, only an specific commit? | 14:21 |
|
osse
| correct | 14:22 |
|
Dev0n
| ahh | 14:22 |
|
| that does mess with the workflow a bit I guess | 14:22 |
|
osse
| submodules are not very good if the submodule and the parent repo are developed in tandem | 14:22 |
| ← royal_screwup21 left | 14:22 |
|
osse
| but they work quite weill if the parent repo just upgrade from v1.2 to v1.3 of the submdoule | 14:23 |
| → nomadicmathmo1 joined | 14:23 |
|
Dev0n
| osse, I'm in the process of having to rip out a monorepo into individual repos but trying to use submodules as an interim solution until it's completely detached | 14:24 |
|
| seeing as submodules are only tracked by a specific commit, I guess the flow would be: branch x in submodule, merge submodule branch x to master, checkout parent master, update parent submodule to track latest commit of submodule master, push/deploy etc? | 14:25 |
| ← nomadicmathmo left | 14:25 |
| nomadicmathmo1 → nomadicmathmo | 14:25 |
| → royal_screwup21 joined | 14:26 |
|
osse
| yes | 14:26 |
|
| but in the parent repo different branches can have different commits checked out of the submodule | 14:26 |
|
| and that will be carried over when merging and stuff | 14:26 |
| → mowotter joined | 14:26 |
|
osse
| it could make sense (and it will work) to have a branch in the parent repo dedicated to updating the submodule, make any other necessary changes in that branch, and then merge that branch to master in the parent | 14:27 |
|
Dev0n
| ahh in that case, referring back to my original question, as a part of developing a feature, you would then create a branch on the parent *and* the submodule, where the flow would be to merge the submodule, then merge the parent | 14:27 |
|
| osse, think we're on the same page | 14:28 |
|
| cool, I think that's clear, thanks! | 14:28 |
| ← Xenguy left | 14:28 |
|
osse
| I would develop the feature in the submodule (feature branches, whatever), *and then* I would update the parent repo in much the same way as I would if it were a 3rd party dependency | 14:29 |
|
| The latter step could just be a le update and rebuild, or whether that requires changing API calls or whatever. | 14:29 |
|
| ugh | 14:30 |
| ← royal_screwup21 left | 14:30 |
|
Dev0n
| ahh, that's a better way to put it | 14:30 |
|
osse
| The latter step could just be a simple update and rebuild, or it could be a longer process that it would make sense to make a branch for (ie. changing API stuff) | 14:30 |
| → royal_screwup21 joined | 14:30 |
|
Dev0n
| yup, makes sense | 14:30 |
|
osse
| but all that is easier said than done... maybe the guys who develop something new in the submodule wants the other guys dealing with the parent repo to test the changes | 14:32 |
|
| and maybe all those guys are just one guy! | 14:32 |
|
| But if you at least try to treat the submodule as if it were a 3rd party thing it becomes easier. | 14:33 |
|
Dev0n
| yea, I think that's going to be a lot clearer to explain to the team, plus documentation on the process and *nothing can go wrong*, rite? >.> | 14:33 |
| ← chele left | 14:33 |
| ← Benzi-Junior left | 14:34 |
| ← Technodrome left | 14:34 |
| → chele joined | 14:35 |
| ← royal_screwup21 left | 14:36 |
| → ccrr10_ joined | 14:37 |
| → Benzi-Junior joined | 14:37 |
| ← Fokst left | 14:38 |
| ← tiin57 left | 14:38 |
| → royal_screwup21 joined | 14:38 |
| → Fokst joined | 14:38 |
| ← ccrr10 left | 14:38 |
| ← barteks2x left | 14:41 |
|
osse
| Documentation? What documentation? | 14:42 |
| → tiin57 joined | 14:42 |
|
osse
| ... is what I say at work all the time | 14:42 |
| ← adlternative left | 14:47 |
| ← royal_screwup21 left | 14:47 |
| → adlternative joined | 14:47 |
| → royal_screwup21 joined | 14:47 |
| → vdamewood joined | 14:47 |
| → Peetz1r joined | 14:48 |
| → kes joined | 14:49 |
| ← mowotter left | 14:50 |
| ← Sonderblade left | 14:50 |
| → Technodrome joined | 14:52 |
| ← royal_screwup21 left | 14:52 |
| → gareppa joined | 14:52 |
| → adl_ joined | 14:54 |
| ← adlternative left | 14:54 |
|
Learath2
| I seem to have an untracked file in a commit? keeps showing up in status, I can't even google for it since idk what this "state" is called | 14:54 |
| → ivanc joined | 14:55 |
|
Learath2
| oh nvm, the cherry-pick I aborted really created that file | 14:55 |
| → rustyshackleford joined | 15:05 |
| → FRWB joined | 15:05 |
| ← v0n left | 15:05 |
| → Guest98408 joined | 15:06 |
| → justanotheruser joined | 15:06 |
| ← tiin57 left | 15:08 |
| ← gareppa left | 15:08 |
| → OnkelBlade joined | 15:10 |
| ← adl_ left | 15:10 |
| → tiin57 joined | 15:11 |
| ← sweatsuit left | 15:11 |
| → adl_ joined | 15:12 |
| ← Gustavo6046 left | 15:12 |
| → Gustavo6046 joined | 15:16 |
| → ADG1089__ joined | 15:17 |
| → worc3131 joined | 15:18 |
| ← zebrag left | 15:20 |
| → zebrag joined | 15:20 |
| ← Guest98408 left | 15:21 |
| → madewokherd joined | 15:22 |
| → wawrek joined | 15:25 |
| → averell joined | 15:26 |
| ← tgunr left | 15:26 |
|
wawrek
| I want to migrate projects from gitlab to github. how to move all the branches and their commits to another host? | 15:27 |
|
Haohmaru
| o_O | 15:27 |
|
Learath2
| just push the repo to github? wawrek | 15:28 |
|
wawrek
| does it take care of branches | 15:28 |
|
| ? | 15:28 |
|
Learath2
| `git push --all origin` should do all the branches | 15:28 |
|
| well not origin, the new remote you add | 15:28 |
|
wawrek
| 'git push --all origin' should do | 15:30 |
|
| thanks | 15:30 |
| ← Lord_of_Life left | 15:30 |
| → rsx joined | 15:31 |
| → feriman joined | 15:33 |
| → tgunr joined | 15:34 |
| → shush joined | 15:34 |
| → Lord_of_Life joined | 15:34 |
| → SwiftMatt joined | 15:36 |
| → Longshanks joined | 15:36 |
| ← YuGiOhJCJ left | 15:37 |
| ← Longshanks left | 15:38 |
| ← tiin57 left | 15:38 |
| → Longshanks joined | 15:38 |
| ← ivanc left | 15:39 |
| ← shush left | 15:39 |
| ← tgunr left | 15:40 |
|
Longshanks
| Hi all | 15:40 |
|
gitinfo
| Longshanks: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on. | 15:40 |
| → sweatsuit joined | 15:42 |
| → tiin57 joined | 15:42 |
| → thiago joined | 15:42 |
| ← adl_ left | 15:42 |
| → adl_ joined | 15:43 |
| → tgunr joined | 15:43 |
| ← angus left | 15:43 |
| → rosco_y joined | 15:44 |
| ← theorangeone left | 15:46 |
| → theorangeone joined | 15:46 |
| → Newami joined | 15:50 |
| ← tgunr left | 15:51 |
| → ccrr10__ joined | 15:51 |
| ← Newami left | 15:53 |
| → mrkx joined | 15:53 |
| → tgunr joined | 15:54 |
| ← ccrr10_ left | 15:54 |
| → clime joined | 15:54 |
| ← adl_ left | 15:56 |
| ← chele left | 15:56 |
| ← Longshanks left | 15:57 |
| ← wawrek left | 15:57 |
| → wawrek joined | 15:57 |
| → adlternative joined | 15:58 |
| → kenwoodfox_ joined | 15:58 |
| ← kenwoodfox left | 15:58 |
| ← tgunr left | 15:59 |
| ← wawrek left | 16:07 |
| ← tiin57 left | 16:08 |
| → wawrek joined | 16:08 |
| → akiva joined | 16:09 |
| ← thiago left | 16:11 |
| → tiin57 joined | 16:11 |
| → cisco87 joined | 16:12 |
| → thiago joined | 16:13 |
| → tgunr joined | 16:14 |
| ← wawrek left | 16:15 |
| → wawrek joined | 16:15 |
| → venmx joined | 16:16 |
| ← luke-jr left | 16:20 |
| ← zebrag left | 16:20 |
| → zebrag joined | 16:20 |
| ← venmx left | 16:20 |
| → luke-jr joined | 16:20 |
| ← milkt left | 16:23 |
| ← tgunr left | 16:24 |
| → milkt joined | 16:24 |
| → shush joined | 16:26 |
| ← Guest33533 left | 16:26 |
| ← OnkelBlade left | 16:28 |
| → karstensrage joined | 16:29 |
| → zsoc joined | 16:31 |
| ← zsoc left | 16:31 |
| → zsoc joined | 16:31 |
| → k3yp joined | 16:33 |
| → Maxattax joined | 16:37 |
| ← rsx left | 16:37 |
| ← wawrek left | 16:38 |
| ← tiin57 left | 16:38 |
| → mowotter joined | 16:38 |
| ← mozgalom left | 16:40 |
| → tgunr joined | 16:40 |
| ← __that__ left | 16:41 |
| → jl4 joined | 16:41 |
| → tiin57 joined | 16:41 |
| → mindCrime_ joined | 16:42 |
| → hnOsmium0001 joined | 16:42 |
| → nvmd joined | 16:43 |
| → CoolerX joined | 16:44 |
|
CoolerX
| Hi | 16:44 |
|
| How do you annotate | 16:44 |
|
| git attributes? | 16:44 |
|
imMute
| CoolerX: https://git-scm.com/docs/gitattributes | 16:45 |
|
CoolerX
| yeah | 16:45 |
|
| there was some way to ignore a file when showing diff | 16:45 |
|
| I think it was like binary? | 16:45 |
| → tarkus joined | 16:45 |
| ← fastfresh left | 16:45 |
|
CoolerX
| ? | 16:46 |
|
| /path/to/file diff set binary | 16:46 |
|
| something like that? | 16:46 |
|
imMute
| CoolerX: https://git-scm.com/docs/gitattributes#_marking_files_as_binary | 16:46 |
|
CoolerX
| in .gitattributes | 16:46 |
| ← shabius left | 16:47 |
| → royal_screwup21 joined | 16:48 |
|
CoolerX
| is this it? https://github.com/kubernetes/kubernetes/blob/master/.gitattributes#L4 | 16:48 |
| ← rfuentess left | 16:51 |
| ← royal_screwup21 left | 16:52 |
|
CoolerX
| anyone? | 16:53 |
|
andi_
| what's the difference between a fork and a new repo with a git pull remote/old-repo/master e.g? | 16:54 |
|
imMute
| CoolerX: did you read the link I posted? | 16:54 |
|
CoolerX
| imMute, yeah but what about the link I posted? | 16:54 |
|
| the linguist-generated | 16:55 |
| → Lord_of_Life_ joined | 16:55 |
|
osse
| andi_: none | 16:55 |
|
imMute
| CoolerX: never seen that before. sounds like something custom. | 16:55 |
|
andi_
| osse: so probably a fork is just a git pull on all the existing branches from the old repo? | 16:55 |
| ← Lord_of_Life left | 16:56 |
| → arcatech joined | 16:56 |
|
osse
| maybe the github web site doesn't say "osse/coolproject is a fork of andi_/coolproject" | 16:56 |
|
| andi_: it's a clone that's pushed somewhere else | 16:56 |
|
CoolerX
| https://github.com/github/linguist#generated-code | 16:56 |
| Lord_of_Life_ → Lord_of_Life | 16:56 |
|
CoolerX
| it's custom for github | 16:56 |
|
andi_
| osse: yeah switching namespaces. alright nice that's great | 16:56 |
|
CoolerX
| osse, you can see all the forks of a repo | 16:58 |
|
| so if you do the pull thing then it probably won't list it as a fork | 16:58 |
|
| also github allows you to compare across forks while starting a pull request | 16:58 |
|
andi_
| CoolerX: yeah but that doesn't matter to git and is just a github/gitlab/whatever feature | 16:58 |
|
CoolerX
| actually does github even allow PRs from non fork repos? | 16:59 |
|
| andi_, usually when talking about forks you mean some hosted service like github, gitlab, bitbucket, etc | 16:59 |
| → durham joined | 17:00 |
|
andi_
| yeah :) | 17:00 |
| → orbyt_ joined | 17:00 |
|
andi_
| what made me curious was that there's no git fork command | 17:00 |
|
| so git must do something under the hood | 17:01 |
|
imMute
| andi_: it's called "clone" | 17:01 |
|
| or rather, what would a "git fork" command do that a "git clone" command doesn't? | 17:01 |
|
andi_
| is it a clone and then switching the remote? | 17:01 |
| ← tarkus left | 17:01 |
|
andi_
| or is it git pull into an empty directory | 17:02 |
|
| or repo | 17:02 |
|
imMute
| andi_: "git clone" sets up a new repo with a remote called "origin" that points at the original repo. | 17:02 |
|
andi_
| yes | 17:02 |
|
CoolerX
| osse, what bad things can happen if I mark a code file as binary? | 17:03 |
|
| using https://git-scm.com/docs/gitattributes#_marking_files_as_binary | 17:03 |
|
osse
| git diff won't show it by default | 17:03 |
| ← rwdrich left | 17:03 |
| → rumbler31_ joined | 17:04 |
|
andi_
| CoolerX: i think that the CRLF/LF is also disabled | 17:04 |
| ← durham left | 17:04 |
|
osse
| hmm probably | 17:04 |
|
CoolerX
| osse, well the git diff treating it as binary is what I want | 17:05 |
|
| what do you mean won't show it? | 17:05 |
| → durham joined | 17:05 |
|
CoolerX
| it should say binary file changed | 17:05 |
|
osse
| that's what I meant | 17:05 |
|
CoolerX
| andi_, oh noes | 17:05 |
|
| that's bad | 17:05 |
|
osse
| it won't show a patch | 17:05 |
|
CoolerX
| the file is a generated file | 17:05 |
|
| we are embedding some binary data in the code | 17:06 |
|
| it's a golang file btw | 17:06 |
|
osse
| maybe you just want -diff | 17:06 |
|
CoolerX
| path/to/file -diff | 17:06 |
|
imMute
| CoolerX: why are you checking in generated files to the repo? | 17:06 |
| ← sier81 left | 17:06 |
|
CoolerX
| what about the CRLF/LF problem? | 17:06 |
|
osse
| that's why I suggest -diff instead of binary | 17:07 |
|
imMute
| andi_: what's this about CRLF/LF problem? | 17:07 |
|
CoolerX
| imMute, lots of people do that | 17:07 |
|
| for various reasons | 17:07 |
| → rwdrich joined | 17:07 |
|
imMute
| CoolerX: doesn't mean it's not a bad idea... | 17:07 |
|
CoolerX
| mostly it saves the trouble of regenerating the files | 17:07 |
|
| for anyone who clones the repo | 17:08 |
| ← rwdrich left | 17:08 |
|
osse
| lemme guess: protobuf? | 17:08 |
| ← tiin57 left | 17:08 |
|
CoolerX
| it especially sucks to regenerate on every build | 17:08 |
| → sier81 joined | 17:08 |
|
andi_
| imMute: well as far as i know git takes care (auto) of crlf/lf | 17:08 |
|
imMute
| andi_: oh that. that's only if you turn it on (I explicitly turn it off everywhere) | 17:08 |
|
andi_
| imMute: isn't it as default set to "auto" | 17:09 |
|
CoolerX
| osse, so -diff won't mark it as binary then? | 17:09 |
|
osse
| correct | 17:09 |
|
imMute
| andi_: dunno. the docs don't say. | 17:09 |
|
osse
| it will just produce a diff as if it were binary | 17:10 |
| ← kes left | 17:10 |
|
CoolerX
| nice | 17:10 |
|
osse
| you can even create your own diff if you want | 17:11 |
|
andi_
| imMute: i'm not sure either, what i do know is that the CRLF/LF is off (which makes sense) for binary files | 17:11 |
|
osse
| andi_, imMute: by default git falls back to the core.autocrlf setting | 17:11 |
| → tiin57 joined | 17:11 |
|
imMute
| osse: yeah, what's the default for that setting? | 17:11 |
|
osse
| I have no clue :P | 17:12 |
|
andi_
| i think "true" | 17:12 |
|
| but i'm not sure about it | 17:12 |
|
osse
| I would guess it's true on windows and false otherwise | 17:12 |
| → bolovanos__ joined | 17:14 |
| ← mindCrime_ left | 17:16 |
| ← rcoote left | 17:17 |
| → hololeap joined | 17:17 |
| ← bolovanos_ left | 17:18 |
| → Betal joined | 17:18 |
| → tarkus joined | 17:18 |
| ← zebrag left | 17:20 |
| → zebrag joined | 17:20 |
| ← mrkx left | 17:21 |
| → dimi1947 joined | 17:21 |
| ← ADG1089__ left | 17:24 |
| → ADG1089__ joined | 17:24 |
| ← kenwoodfox_ left | 17:26 |
| → kenwoodfox joined | 17:26 |
| ← jaziz left | 17:27 |
| ← dionysus69 left | 17:27 |
| → dionysus69 joined | 17:28 |
| → heyitsrama joined | 17:30 |
| ← dionysus69 left | 17:30 |
| ← sier81 left | 17:30 |
| → dionysus69 joined | 17:31 |
| ← calcul0n__ left | 17:34 |
| → calcul0n joined | 17:35 |
| → APic joined | 17:36 |
| ← tiin57 left | 17:38 |
| → faisal joined | 17:38 |
| ← austin987 left | 17:41 |
| ← Haohmaru left | 17:41 |
| ← onizu left | 17:41 |
| ← gast0n left | 17:42 |
| → tiin57 joined | 17:42 |
| ← orbyt_ left | 17:44 |
| ← clime left | 17:46 |
| ← tmm88 left | 17:47 |
| → flex14 joined | 17:48 |
| ← kjartan_ left | 17:53 |
| → austin987 joined | 17:54 |
| ← klonn left | 17:54 |
| → sudoforge joined | 17:54 |
| ← dimi1947 left | 17:55 |
| ← tgunr left | 17:56 |
| ← TomyWork left | 17:57 |
| → g00s joined | 17:58 |
| ← tonythomas left | 18:01 |
| ← CoolerX left | 18:02 |
| → kjartan joined | 18:02 |
| ← zulutango left | 18:03 |
| → zulutango joined | 18:04 |
| → tgunr joined | 18:04 |
| ← dqx_ left | 18:05 |
| ← RandomGuy90 left | 18:10 |
| ← tiin57 left | 18:11 |
| → blahboybaz joined | 18:13 |
| → RandomGuy90 joined | 18:13 |
| → tiin57 joined | 18:13 |
| → clime joined | 18:14 |
| ← tgunr left | 18:14 |
| → venmx joined | 18:16 |
| → dqx_ joined | 18:16 |
| → Blukunfando joined | 18:17 |
| → BSaboia joined | 18:18 |
| ← g00s left | 18:18 |
| ← jl4 left | 18:18 |
| ← blahboybaz left | 18:19 |
| → klonn joined | 18:19 |
| → theoceaniscool joined | 18:19 |
| → wootehfoot joined | 18:20 |
| ← zebrag left | 18:20 |
| → zebrag joined | 18:20 |
| ← venmx left | 18:21 |
| → pedahzur joined | 18:22 |
| → royal_screwup21 joined | 18:23 |
| → tgunr joined | 18:25 |
| → orbyt_v7 joined | 18:27 |
| → orbyt_ joined | 18:27 |
| → mozgalom joined | 18:28 |
| → blahboybaz joined | 18:30 |
| → fmlatghor joined | 18:31 |
| ← klonn left | 18:33 |
| → klonn joined | 18:33 |
| ← arcatech left | 18:33 |
| ← HumanG33k left | 18:34 |
| → arcatech joined | 18:36 |
| ← ccrr10__ left | 18:36 |
| ← flex14 left | 18:37 |
| ← tiin57 left | 18:38 |
| → Wetmelon joined | 18:41 |
| → tiin57 joined | 18:45 |
| → howdoi joined | 18:46 |
| ← hendry left | 18:47 |
| ← luke-jr left | 18:47 |
| ← p-core left | 18:48 |
| → luke-jr joined | 18:48 |
| → hendry joined | 18:48 |
| → p-core joined | 18:48 |
| ← crose_ left | 18:48 |
| ← worc3131 left | 18:50 |
| ← Technodrome left | 18:51 |
| → j`ey joined | 18:53 |
|
j`ey
| with git format-patch, it produces a file with a Subject: line, it has split that over 2 lines, but will it be sent with the full thing as the subject? | 18:54 |
| ← dob1 left | 18:55 |
| → jstein joined | 18:57 |
| ← Guest20 left | 18:58 |
| ← tgunr left | 19:03 |
| → dob1 joined | 19:03 |
| ← DarthRadar left | 19:05 |
| → tgunr joined | 19:06 |
| ← tiin57 left | 19:08 |
| → tiin57 joined | 19:12 |
| → skered joined | 19:15 |
| ← DonRichie left | 19:17 |
| → Technodrome joined | 19:19 |
| ← daysun left | 19:23 |
| ← shored left | 19:23 |
| ← royal_screwup21 left | 19:26 |
| → royal_screwup21 joined | 19:26 |
| → shored joined | 19:26 |
| ← nomadicmathmo left | 19:27 |
| → vorona joined | 19:30 |
| ← royal_screwup21 left | 19:31 |
| → DonRichie joined | 19:32 |
| → dextercd joined | 19:36 |
| ← tiin57 left | 19:38 |
|
osse
| j`ey: https://serverfault.com/a/512235 | 19:38 |
|
| I suppose that's what's happening | 19:38 |
| → tiin57 joined | 19:42 |
| ← fmlatghor left | 19:42 |
| ← blahboybaz left | 19:42 |
| → g00s joined | 19:43 |
| ← mozgalom left | 19:43 |
| ← tarkus left | 19:43 |
| → blahboybaz joined | 19:43 |
| → royal_screwup21 joined | 19:43 |
| → bkuhlmann joined | 19:44 |
| ← tgunr left | 19:44 |
|
j`ey
| osse: ill just test email it to myselfi guess | 19:45 |
| → axisys joined | 19:47 |
| ← bkuhlmann left | 19:50 |
|
osse
| did it work? | 19:52 |
| ← vorona left | 19:52 |
| LordRyan → ryab | 19:53 |
| → bogartjack joined | 19:53 |
| → CC joined | 19:53 |
|
j`ey
| osse: I havent tried yet, had to eat dinner :P | 19:54 |
| CC → Guest9372 | 19:54 |
| ← Guest9372 left | 19:56 |
| → jnavila joined | 19:57 |
| → nedbat joined | 19:58 |
| ← nedbat left | 19:58 |
| → nedbat joined | 19:58 |
| → tgunr joined | 19:59 |
|
osse
| the wrapping is hard-coded into format-patch | 20:01 |
| ← nedbat left | 20:01 |
| → nedbat joined | 20:02 |
| ← nedbat left | 20:02 |
| → nedbat joined | 20:02 |
| ← AnAverageHuman left | 20:03 |
| ← tgunr left | 20:03 |
| ← tiin57 left | 20:08 |
| → AnAverageHuman joined | 20:08 |
| ← Mmike left | 20:10 |
| → Mmike joined | 20:10 |
| ← energizer left | 20:11 |
| → tiin57 joined | 20:11 |
| ← k3yp left | 20:12 |
| → k3yp joined | 20:12 |
| ← g00s left | 20:13 |
| → HYWTYD joined | 20:13 |
| ← shokohsc left | 20:15 |
| parsnip → user-agent-nokia | 20:16 |
| ← kjartan left | 20:17 |
| → venmx joined | 20:17 |
| ← knobi left | 20:17 |
| → kjartan_ joined | 20:17 |
| ← kjartan_ left | 20:19 |
| → kjartan joined | 20:19 |
| ← zebrag left | 20:20 |
| → nomadicmathmo joined | 20:20 |
| → zebrag joined | 20:20 |
| ← venmx left | 20:22 |
| ← austin987 left | 20:26 |
|
HYWTYD
| I'm trying to do a conversion from SVN and it's starting to drive me insane. We have branches that were only partial copies of trunk. After the git conversion, I'm trying to graph those branches back on to main, since they all just have root commits. I managed to do this successfully once, and then I wrote a script for it, but my script didn't work | 20:28 |
|
| and now I can't get it to work anymore. I'm doing the following, which is what I thought I did when it worked, but it doesn't seem to be working anymore. | 20:28 |
|
| git replace --graft <hashOfFirstCommitInTheBranch> <hashOfCommitWhereWasOriginallyBranchedFromTrunk> | 20:28 |
|
| git filter-repo --force | 20:28 |
| → otisolsen70_ joined | 20:28 |
| user-agent-nokia → parsnip | 20:30 |
| → milkt_ joined | 20:31 |
| ← otisolsen70 left | 20:31 |
| ← milkt left | 20:33 |
| ← clime left | 20:35 |
| ← Wetmelon left | 20:35 |
| ← andy25225 left | 20:37 |
| ← tiin57 left | 20:38 |
| ← cyphase left | 20:40 |
| → tiin57 joined | 20:42 |
| → mindCrime_ joined | 20:43 |
| → andy25225 joined | 20:49 |
| → Azrael_- joined | 20:49 |
|
Azrael_-
| hi | 20:49 |
| ← kjartan left | 20:50 |
| ← sord937 left | 20:52 |
| ← mindCrime_ left | 20:52 |
| ← Pickchea left | 20:52 |
| ← BSaboia left | 20:53 |
| → BSaboia joined | 20:54 |
| ← bogartjack left | 20:55 |
| ← diverger left | 20:55 |
| → g00s joined | 20:55 |
| ← Maxattax left | 20:55 |
|
Azrael_-
| i need some help managing the source base i'm currently using. i checked out an oss and modified it. now i've got lots of changes and am in the detached head state. from the master i now created a new branch and want to commit my changes to it. in order to do this, do i have to rebase to this branch or what would be the right way? | 20:57 |
| → brunosaboia_ joined | 21:00 |
| → cyphase joined | 21:00 |
| ← BSaboia left | 21:00 |
| ← HYWTYD left | 21:01 |
| → HYWTYD joined | 21:01 |
| ← tiin57 left | 21:08 |
| → clime joined | 21:08 |
| ← Hello71 left | 21:09 |
|
dextercd
| Azrael_-: branches are just pointers to commits, so you most likely just want to create a branch that points to the newest commit you made. git branch <branch-name> <commit-sha> will create a branch on a particular commit, without <commit-sha> it'll default to the commit you're currently on. after that you can go onto that branch with git checkout <branch-name> | 21:12 |
| → tiin57 joined | 21:12 |
| → Hello71 joined | 21:17 |
| → flex14 joined | 21:17 |
| ← flex14 left | 21:18 |
| ← otisolsen70_ left | 21:22 |
|
Azrael_-
| ok, will try (didn't do any commits yet) | 21:27 |
| ← feriman left | 21:28 |
|
dextercd
| ah, I misread, in that case just checkout the new branch and create your commits | 21:28 |
| → feriman joined | 21:32 |
| ← brunosaboia_ left | 21:35 |
| ← calcul0n left | 21:35 |
| ← tiin57 left | 21:38 |
| → LuxuryMode joined | 21:38 |
| ← feriman left | 21:38 |
| ← SwiftMatt left | 21:38 |
| ← wootehfoot left | 21:39 |
| → tiin57 joined | 21:41 |
| → faisal_ joined | 21:41 |
| ← faisal left | 21:42 |
| → Wetmelon joined | 21:45 |
| → SwiftMatt joined | 21:45 |
| ← faisal_ left | 21:47 |
| ← ADG1089__ left | 21:48 |
| ← shush left | 21:48 |
| → shush joined | 21:49 |
| → ccrr10 joined | 21:54 |
| ← Technodrome left | 21:54 |
| ← cyphase left | 21:56 |
| ← g00s left | 21:57 |
| → Technodrome joined | 21:59 |
| ← ketas left | 22:04 |
| ← HYWTYD left | 22:06 |
| ← shush left | 22:07 |
| → shush joined | 22:07 |
| ← tiin57 left | 22:08 |
| → cyphase joined | 22:09 |
| → ccrr10_ joined | 22:09 |
| → ketas joined | 22:10 |
| → tiin57 joined | 22:12 |
| ← shush left | 22:12 |
| ← ccrr10 left | 22:12 |
| → energizer joined | 22:15 |
| → shush joined | 22:16 |
| → venmx joined | 22:18 |
| ← cr4y1 left | 22:19 |
| ← zebrag left | 22:20 |
| → zebrag joined | 22:20 |
| → cr4y1 joined | 22:21 |
| ← orbyt_v7 left | 22:21 |
| ← venmx left | 22:23 |
| → m0viefreak joined | 22:23 |
| → brunosaboia_ joined | 22:24 |
| ← dionysus69 left | 22:25 |
| → ccrr10 joined | 22:28 |
| ← ccrr10_ left | 22:28 |
| ← sammyg left | 22:30 |
| ← ccrr10 left | 22:33 |
| → CoolerX joined | 22:34 |
| dansan_ → dansan | 22:35 |
| ← tiin57 left | 22:38 |
| ← envex left | 22:40 |
| → tiin57 joined | 22:41 |
| ← CoolerX left | 22:42 |
| ← jnavila left | 22:44 |
| → Sonderblade joined | 22:46 |
| → tgunr joined | 22:47 |
| → gigasu_shida joined | 22:48 |
| ← jimklimov left | 22:49 |
| ← arcatech left | 22:50 |
| ← sudoforge left | 22:53 |
| ← clime left | 22:55 |
| ← royal_screwup21 left | 22:56 |
| → royal_screwup21 joined | 22:56 |
| → sudoforge joined | 22:57 |
| ← klonn left | 22:59 |
| ← royal_screwup21 left | 23:01 |
| → clime joined | 23:01 |
| → royal_screwup21 joined | 23:06 |
| ← tiin57 left | 23:08 |
| ← blahboybaz left | 23:09 |
| ← rangergord left | 23:10 |
| → tiin57 joined | 23:12 |
| → arcatech joined | 23:12 |
| ← m0viefreak left | 23:12 |
| ← orbyt_ left | 23:14 |
| → rangergord joined | 23:16 |
| ← nvmd left | 23:17 |
| → segnior joined | 23:17 |
| → sgen joined | 23:18 |
| → mirrorbird joined | 23:18 |
| ← sgen left | 23:19 |
| → nvmd joined | 23:19 |
| → sgen joined | 23:19 |
| ← sgen left | 23:19 |
| ← tgunr left | 23:20 |
| ← zebrag left | 23:20 |
| → sgen joined | 23:20 |
| ← Raging_Hog left | 23:20 |
| → zebrag joined | 23:20 |
| ← sgen left | 23:21 |
| → sgen joined | 23:21 |
| ← backthen left | 23:23 |
| ← snits left | 23:24 |
| → snits joined | 23:25 |
| ← cr4y1 left | 23:31 |
| ← bolovanos__ left | 23:36 |
| ← nvmd left | 23:38 |
| ← tiin57 left | 23:38 |
| → sz0 joined | 23:39 |
| → envex joined | 23:39 |
| → nvmd joined | 23:39 |
| ← segnior left | 23:41 |
| ← rangergord left | 23:41 |
| → tiin57 joined | 23:42 |
| ← sgen left | 23:44 |
| → Xenguy joined | 23:45 |
| ← RandomGuy90 left | 23:46 |
| → RandomGuy90 joined | 23:46 |
| ← RandomGuy90 left | 23:47 |
| → orbyt_ joined | 23:47 |
| ← igemnace left | 23:49 |
| → RandomGuy90 joined | 23:49 |
| ← theoceaniscool left | 23:52 |
| ← herren left | 23:53 |
| → rangergord joined | 23:55 |
| → segnior joined | 23:56 |
| ← brunosaboia_ left | 23:58 |
| → Lyqyd joined | 23:59 |
| ← RandomGuy90 left | 23:59 |