| 2021-06-29 |
| Gustavo6046 → Gustavo60 | 00:00 |
| FLHerne_ → FLHerne | 00:00 |
| ← wagle left | 00:01 |
| → wagle joined | 00:02 |
| ← Gustavo60 left | 00:02 |
| → CalimeroTeknik joined | 00:06 |
| ← cronos left | 00:08 |
| ← FFY00 left | 00:08 |
| → cronos joined | 00:09 |
| → quiexotic_ joined | 00:09 |
| → qpdb_ joined | 00:12 |
| ← qpdb left | 00:15 |
| ← quiexotic_ left | 00:16 |
| → jhulten joined | 00:17 |
| → s1b1 joined | 00:18 |
| ← orbyt left | 00:31 |
| → orbyt joined | 00:31 |
| → rifl joined | 00:33 |
| → Gustavo6046 joined | 00:36 |
| ← dka left | 00:36 |
| ← Gustavo6046 left | 00:36 |
| ← orbyt left | 00:36 |
| → PaMeDa joined | 00:37 |
| → dka joined | 00:37 |
| ← apauli left | 00:41 |
| → rafspiny joined | 00:43 |
| → quiexotic_ joined | 00:46 |
| ← jhulten left | 00:50 |
| ← goldfish left | 00:54 |
| → Gustavo6046 joined | 00:57 |
| ← arash left | 01:00 |
| ← quiexotic_ left | 01:03 |
| ← Guest53 left | 01:05 |
| ← vdamewood left | 01:06 |
| → blue_penquin joined | 01:10 |
| → venmx joined | 01:11 |
| ← jim left | 01:14 |
| → jim joined | 01:15 |
| → hbautista joined | 01:25 |
| ← Sasazuka left | 01:26 |
| ← phylaz left | 01:27 |
| → pete443 joined | 01:27 |
| → AnAverageHuman_ joined | 01:29 |
| ← pete443_ left | 01:29 |
| ← AnAverageHuman left | 01:29 |
| → quiexotic_ joined | 01:30 |
| ← alzgh left | 01:38 |
| ← rifl left | 01:39 |
| → rifl joined | 01:40 |
| → maher joined | 01:45 |
|
jim
| you made iot | 01:46 |
|
maher
| jim: thanks! | 01:47 |
|
jim
| welcome... now, which repo is this? | 01:47 |
|
maher
| I'm looking at this: https://gitlab.gnome.org/GNOME/evince/-/merge_requests/316 | 01:48 |
|
| I haven't looked at this since Feb - so my local copy of master is from Feb | 01:48 |
|
| if I do git pull in the master branch it asks if I want to merge or rebase - I think I want to reabse | 01:49 |
|
jim
| I see commits from yesterday | 01:49 |
| ← ThorMojito left | 01:49 |
|
jim
| umm :) that I don't know, I forgot exactly what a rebase is | 01:50 |
|
maher
| if i do a rebase, and decide later I should have done a merge, can I undo the rebase? | 01:50 |
|
jim
| well, you could always reclone... are you contributing code to it | 01:51 |
|
| ? | 01:51 |
|
maher
| I sent in a patch and revised it - I think I did it the git way with a request to merge - can you tell from that webpage if I am meant to to anything now? | 01:51 |
|
jim
| is 316 yours? | 01:52 |
|
maher
| yes | 01:52 |
|
jim
| brb | 01:52 |
|
maher
| but I don't understand anything about git and needed some hand holding to get there, and don't want to bug the evince devs further if I can avoid it... | 01:53 |
|
jim
| ok | 01:55 |
|
maher
| i just did a git fetch, and it downloaded some things, but git show still shows somethign with a Feb 26 date | 01:56 |
|
jim
| howbout git log -1 | 01:57 |
| → phylaz joined | 01:57 |
| → ThorMojito joined | 01:58 |
|
maher
| jim: gives we something with a Feb 26 date | 01:58 |
|
jim
| when you do git status, which branch are you on? | 01:59 |
| ← venmx left | 02:00 |
|
maher
| On branch master \ Your branch is up to date with 'origin/master'. | 02:00 |
|
jim
| hmm | 02:00 |
|
| did you say you're new to git? | 02:01 |
| → rifl` joined | 02:01 |
|
maher
| jim: yes | 02:01 |
|
| git branch gives me: issue-316-open-new-window \ josephmaher/evince-issue-316-open-new-window \ * master | 02:02 |
|
| i want to update master to current remote master | 02:02 |
|
imMute
| it already is | 02:03 |
| ← rifl left | 02:03 |
|
jim
| do you have -uncommited- (and unpushed) changes? | 02:03 |
|
maher
| imMute: why does git log only show changes from Feb 26th and earlier? | 02:03 |
|
| jim: I don't know | 02:03 |
| → Xenguy joined | 02:03 |
|
imMute
| did you do a 'git fetch' ? | 02:04 |
| ← quiexotic_ left | 02:04 |
|
maher
| imMute: yes | 02:04 |
|
imMute
| idk then. but " Your branch is up to date with 'origin/master'" means the two branches are the same | 02:04 |
|
maher
| ImMute: git fetch now runs with no output | 02:04 |
|
imMute
| the last time anyone committed to master was back in Feb then | 02:05 |
|
jim
| maher, is your remote, to a fork you made? | 02:05 |
|
maher
| jim: I don't know | 02:05 |
| → rifl`` joined | 02:05 |
| ← PaMeDa left | 02:06 |
|
jim
| ok. I'll ask this again: are you -new- to git? | 02:06 |
|
maher
| jim: yes - I have never understood anything about git | 02:06 |
| rifl`` → rifl | 02:06 |
|
jim
| how would you like to fix that part? | 02:07 |
|
| I have a video you could watch... there's the book 'pro git'... | 02:07 |
| ← rifl` left | 02:07 |
|
maher
| jim: I want to know the minimun about git to get this patch into the evince source tree so I don't need to maintain my own version which I have been doing for the past 10 years :( | 02:07 |
|
jim
| I guess the merge request is present... | 02:08 |
|
maher
| jim: ok - here's a specific question: maybe master points to some other branch which is not evnice master - how do I find out where master points to? | 02:09 |
|
jim
| howbout this: let's reclone the repo into a different dir... sound good? | 02:09 |
|
maher
| jim: in the past past I have always just made new clones - I thought I would try and do things the git way this time | 02:09 |
|
jim
| well we could look at a fresh clone to see what's what | 02:10 |
|
| find a different dir you'd like to use (you could get rid of this clone when you figure out what happened) | 02:11 |
|
| cd to that dir... and run git clone [email@hidden.address] | 02:12 |
|
maher
| ok - I just made a new clone and git show gives me a Jun 27th change | 02:12 |
|
jim
| ok | 02:12 |
|
maher
| how do I find out where master comes from> | 02:13 |
|
jim
| then cd to the original clone (yeah, it's a contradiction :), and see if you can run: git merge | 02:13 |
|
maher
| i ran: git clone [email@hidden.address] <--- what do I type into git to tell me that that master comes from there? | 02:14 |
|
rifl
| i want commands combined together in push like this "git once" which consists of git add git commit git push , how can i do this? | 02:14 |
|
maher
| jim: on the original one it says up to date, so I think imMute was right, and that master is not evince master but something else | 02:15 |
|
rifl
| seems my script running this has old syntax is outof date | 02:16 |
|
jim
| that could be | 02:16 |
|
maher
| hah!: git remote show origin | 02:16 |
|
jim
| do you understand what a git fork is? | 02:16 |
|
| you found it :) | 02:17 |
|
| you should bookmark this: https://progit2.s3.amazonaws.com/en/2016-03-22-f3531/progit-en.1084.pdf | 02:17 |
| → FFY00 joined | 02:18 |
|
jim
| wait, there must be a better way | 02:18 |
|
maher
| jim: thanks - have pdf now | 02:18 |
|
jim
| that's the book Pro Git by Scott Chacon | 02:19 |
|
maher
| jim: i thought I knew what a fork was in source code repositories, but my inability to use git shows that in fact I do not understand them | 02:19 |
|
| ok - so the original rep I was looking at is: Fetch URL: [email@hidden.address] | 02:20 |
|
jim
| when you ask a site like github (which is a storage place for repositories), to fork a particular repository, it takes the repo and makes a complete copy of it, including all the history | 02:20 |
|
| and sets it up so that you can write to it | 02:21 |
|
maher
| actual evince master is: Fetch URL: [email@hidden.address] | 02:21 |
|
| jim: ok - I think I'm getting there - so I thought I was in evince master, but I was in the Feb 26th remote copy master... | 02:22 |
|
jim
| if you write or push to the repository, or even if you mess it up entirely, it won't hurt the original | 02:22 |
|
| you can blow it all away, and it won't hurt the original | 02:23 |
|
maher
| jim: I don't want to mess up [email@hidden.address] because isn't that where the evince devs are going to pull the changes for the main tree if they ever decide to merge them? | 02:23 |
|
jim
| once the fork is ready, you would clone the fork... then you can work work work, commit commit, push push push... | 02:24 |
| → ferdna joined | 02:24 |
|
jim
| once you're satisfied that your work... umm, works, then you can "raise your hand" and say "hey, merge from me, I think it's good" | 02:25 |
| ← Gustavo6046 left | 02:25 |
|
maher
| this is what happened: I uploaded an initial patch and did a merge request - the devs made some suggestions to fix it, and I made their changes | 02:25 |
|
jim
| that's called a pull request, or a merge request | 02:25 |
| → Gustavo6046 joined | 02:25 |
|
maher
| jim: i think I meant pull request there not merge request | 02:25 |
|
jim
| it looks like one site calls em pull requests, another calls em merge requests | 02:26 |
|
maher
| so when I look at: https://gitlab.gnome.org/GNOME/evince/-/merge_requests/316 i see a big button that says rebase - what happens if I click this button? am I meant to do this? | 02:26 |
|
jim
| I don't know exactly... others here can answer that question | 02:27 |
|
maher
| if I do the merge on my local copy, I assume it doesn't update the remote one? | 02:27 |
|
| jim pokes others :) | 02:27 |
| ← tang^ left | 02:28 |
|
jim
| it's a site I'm not used to... you should wait for an answer other than me :) | 02:28 |
|
maher
| jim: thanks for your help! | 02:28 |
|
jim
| welcome :) | 02:29 |
| → quiexotic_ joined | 02:29 |
|
jim
| maher, also, https://www.youtube.com/watch?v=8JJ101D3knE | 02:29 |
| → finn_elija joined | 02:30 |
| ← FinnElija left | 02:30 |
| finn_elija → FinnElija | 02:30 |
|
jim
| maher, having said that, I think you're more advanced than that... having said that, maybe you should watch that video (series?) to fill in any holes... the more you know the better | 02:32 |
| ← ferdna left | 02:33 |
|
maher
| jim: I hate watching videos :( | 02:33 |
| → gco joined | 02:36 |
| ← Gustavo6046 left | 02:41 |
| → YuGiOhJCJ joined | 02:44 |
| → Gustavo6046 joined | 02:45 |
| ← quiexotic_ left | 02:45 |
| ← Wuzzy left | 02:52 |
|
jim
| maher, oh, sorry to hear that... well, you got a great book too | 02:56 |
| ← gco left | 02:57 |
| → gast0n joined | 02:58 |
| → gco joined | 03:00 |
| → quiexotic_ joined | 03:02 |
| ← pac1_ left | 03:05 |
| ← pac1 left | 03:05 |
| → Guest53 joined | 03:15 |
| → bytehackr joined | 03:21 |
| ← Xenguy left | 03:21 |
| ← gco left | 03:22 |
| → gco joined | 03:27 |
| ← Guest53 left | 03:28 |
| ← gco left | 03:39 |
| → Lord_of_Life_ joined | 03:40 |
| ← Lord_of_Life left | 03:41 |
| Lord_of_Life_ → Lord_of_Life | 03:41 |
| → nate1 joined | 03:42 |
| → guy_frm_yogaland joined | 03:49 |
| ← thiago left | 04:06 |
| ← Betal left | 04:06 |
| ← bytehackr left | 04:07 |
| ← Vipul left | 04:13 |
| ← arcatech left | 04:15 |
| ← skapata left | 04:18 |
| → wender joined | 04:19 |
| ← bjwyman_ left | 04:19 |
| ← computeiro left | 04:22 |
| ← cliluw left | 04:24 |
| → cliluw joined | 04:25 |
| ← debsan left | 04:28 |
| ← guy_frm_yogaland left | 04:31 |
| → guy_frm_yogaland joined | 04:32 |
| ← nate1 left | 04:33 |
| → gco joined | 04:35 |
| ← vishal left | 04:40 |
| → vishal joined | 04:43 |
| ← gast0n left | 04:45 |
| ← Gustavo6046 left | 04:49 |
| → Gustavo6046 joined | 04:50 |
| ← quiexotic_ left | 04:52 |
| → nate1 joined | 04:56 |
| → hoochmonger joined | 04:58 |
| ← nate1 left | 05:04 |
| ← Gustavo6046 left | 05:09 |
| → quiexotic_ joined | 05:11 |
| → Gustavo6046 joined | 05:13 |
| → srinidhi joined | 05:34 |
| ← quiexotic_ left | 05:38 |
| ← AbleBacon left | 05:44 |
| ← guy_frm_yogaland left | 05:45 |
| ← AnAverageHuman_ left | 05:47 |
| ← srinidhi left | 05:50 |
| → srinidhi joined | 05:51 |
| → gordonfish- joined | 05:52 |
| ← gordonfish left | 05:54 |
| ← rafspiny left | 05:58 |
| ← supernovah left | 06:00 |
| → supernov1h joined | 06:06 |
| → supernovah joined | 06:07 |
| → quiexotic_ joined | 06:07 |
| ← supernov1h left | 06:08 |
| ← supernovah left | 06:09 |
| → shabius_ joined | 06:11 |
| ← quiexotic_ left | 06:12 |
| ← shabius left | 06:15 |
| → supernovah joined | 06:16 |
| ← gco left | 06:18 |
| → alfredb joined | 06:18 |
| → rafspiny joined | 06:19 |
| → quiexotic_ joined | 06:29 |
| → DevAntoine joined | 06:30 |
| ← ntwk left | 06:30 |
| ← DevAntoine left | 06:35 |
| → opzeul joined | 06:35 |
| → guy_frm_yogaland joined | 06:38 |
| → xrisovalantis joined | 06:41 |
| ← quiexotic_ left | 06:42 |
| → ntwk joined | 06:43 |
| → venmx joined | 06:46 |
| → DevAntoine joined | 06:46 |
| ← DevAntoine left | 06:50 |
| ← venmx left | 06:50 |
| → lpapp joined | 06:54 |
|
lpapp
| hi, is it possible to do git show HEAD anotherbranch? | 06:54 |
|
selckin
| whats that supposed to do different from git show branch | 06:55 |
|
lpapp
| oh, that is it, thanks! | 06:56 |
| → nate1 joined | 06:59 |
| → quiexotic_ joined | 07:00 |
| → rfuentess joined | 07:04 |
| ← unluckyshrubbery left | 07:04 |
| ← nate1 left | 07:05 |
| → haskl joined | 07:24 |
| → goldfish joined | 07:30 |
| → eoli3n_ joined | 07:31 |
|
eoli3n_
| Hi | 07:31 |
|
| how to resolv conflict with the choice to keep all remote version of files ? | 07:32 |
| ← hbautista left | 07:32 |
| → Tomte joined | 07:34 |
|
eoli3n_
| git checkout --theirs * | 07:36 |
|
mspe
| hmm, didn't know about --theirs | 07:36 |
| → venmx joined | 07:37 |
|
mspe
| was gonna suggest | 07:37 |
|
| git checkout <remote-branch> * | 07:37 |
| ← goldfish left | 07:38 |
| → mkopriva joined | 07:38 |
|
eoli3n_
| i was not sure, i removed then re cloned | 07:39 |
|
mspe
| or you could just abort merge/rebase | 07:40 |
|
| no need to wipe it all ^^ | 07:40 |
|
eoli3n_
| i'm the guy who destroy the house to kill a fly | 07:40 |
| ← venmx left | 07:41 |
| → arash joined | 07:42 |
| ← quiexotic_ left | 07:44 |
| → DevAntoine joined | 07:49 |
| → Nalt joined | 07:52 |
| ← Gustavo6046 left | 07:53 |
| ← DevAntoine left | 07:54 |
| → DevAntoine joined | 07:56 |
| → EvilDMP joined | 07:57 |
| ← lpapp left | 07:57 |
| → Nalt| joined | 08:02 |
| → Gustavo6046 joined | 08:02 |
| ← arash left | 08:04 |
| → zj joined | 08:05 |
| → arash joined | 08:05 |
| ← Nalt left | 08:05 |
| ← ntwk left | 08:06 |
| ← bLeDy[m] left | 08:09 |
| ← heftig[m] left | 08:09 |
| ← ServerStatsDisco left | 08:09 |
| ← kadoban left | 08:09 |
| ← blue_penquin[m] left | 08:09 |
| ← morguldir left | 08:09 |
| ← dieggsy left | 08:09 |
| ← novasharper left | 08:09 |
| ← Rubin left | 08:09 |
| ← cpackham[m] left | 08:09 |
| ← inkbottle[m] left | 08:09 |
| ← Kamui left | 08:09 |
| ← thetourist108 left | 08:09 |
| ← elemongw[m] left | 08:09 |
| ← crysisanon[m] left | 08:09 |
| ← tuxayo left | 08:09 |
| ← silvio[m] left | 08:09 |
| ← viral_mutant[m] left | 08:09 |
| ← pinage404 left | 08:09 |
| ← nazarii[m] left | 08:09 |
| → ntwk joined | 08:10 |
| ← EvilDMP left | 08:14 |
| ← Murr left | 08:14 |
| → hegstal joined | 08:14 |
| → Murr joined | 08:14 |
| ← Quack left | 08:18 |
| ← adanwan left | 08:20 |
| → Quack joined | 08:20 |
| → adanwan joined | 08:21 |
| ← arash left | 08:22 |
| ← selckin left | 08:22 |
| ← reset left | 08:27 |
| ← DevAntoine left | 08:27 |
| → DevAntoine joined | 08:27 |
| → unixbhaskar joined | 08:35 |
| → jimklimov1 joined | 08:36 |
| ← jimklimov left | 08:40 |
| → VoidFox joined | 08:42 |
| → FH_thecat joined | 08:43 |
| → gareppa joined | 08:46 |
| ← Gustavo6046 left | 08:46 |
| → Gustavo6046 joined | 08:47 |
| ← jsrnop left | 08:48 |
| ← gareppa left | 08:48 |
| ← guy_frm_yogaland left | 08:48 |
| → jsrnop joined | 08:49 |
| → guy_frm_yogaland joined | 08:49 |
| ← FH_thecat left | 08:49 |
| → offpics joined | 08:52 |
| → Crassus joined | 08:55 |
| ← Gustavo6046 left | 09:00 |
| → sysh joined | 09:00 |
| → nate1 joined | 09:01 |
| ← unixbhaskar left | 09:04 |
| ← guy_frm_yogaland left | 09:04 |
| → unluckyshrubbery joined | 09:04 |
| → unixbhaskar joined | 09:04 |
| ← Nalt| left | 09:05 |
| ← nate1 left | 09:06 |
|
rfuentess
| shame on me... I screwed the `git commit -C` and I already pushed the commit into an active PR | 09:07 |
| → Gustavo6046 joined | 09:08 |
| → Nalt joined | 09:12 |
| ← eoli3n_ left | 09:15 |
| ← hnOsmium0001 left | 09:16 |
| → zeenk joined | 09:17 |
| → DevAntoi_ joined | 09:18 |
| → Hi-Angel1 joined | 09:18 |
| → Nalt| joined | 09:19 |
|
Hi-Angel1
| Hmm, is it just me, or `git reset` is broken in git 2.32.0 ? | 09:19 |
|
| When I execute `git reset` to unstage file changes, the file changes disappear completely | 09:19 |
| → Nalt|| joined | 09:20 |
| ← Nalt left | 09:20 |
|
Hi-Angel1
| Although, there's a nuance: they *don't* disappear if I made the changes myself. But they *do* disappear if I brought the changes by executing `git reset HEAD^ -- myfile`. | 09:21 |
|
ikke
| That sounds as intended | 09:21 |
| ← DevAntoine left | 09:22 |
|
Hi-Angel1
| ikke: but how am I supposed to unstage the file changes? | 09:22 |
|
ikke
| You only bring the changes in the staging area | 09:22 |
|
| With git reset, you undo that again | 09:22 |
|
| Your 2nd command does not change the workingtree | 09:23 |
| ← Nalt| left | 09:24 |
|
Hi-Angel1
| I see, I should probably use instead `git checkout` in the second command | 09:24 |
|
| Thanks ikke | 09:24 |
| ← DevAntoi_ left | 09:26 |
| → DevAntoine joined | 09:26 |
| ← offpics left | 09:31 |
| → offpics joined | 09:31 |
| ← offpics left | 09:32 |
| → offpics joined | 09:32 |
| ← Gustavo6046 left | 09:39 |
| ← haskl left | 09:39 |
| → haskl joined | 09:40 |
| ← Nalt|| left | 09:41 |
| ← haskl left | 09:45 |
| → Nalt joined | 09:45 |
| ← acid left | 09:45 |
| → Gustavo6046 joined | 09:47 |
| ← jinsun left | 09:47 |
| → haskl joined | 09:48 |
| → venmx joined | 09:49 |
| → jinsun joined | 09:49 |
| ← haskl left | 09:51 |
| → haskl joined | 09:51 |
| → acid joined | 09:51 |
| ← venmx left | 09:53 |
| ← acid left | 09:57 |
| → adlternative joined | 10:00 |
| ← Gustavo6046 left | 10:00 |
| → acid joined | 10:01 |
| ← adlternative left | 10:15 |
| → Gustavo6046 joined | 10:31 |
| → iauc joined | 10:34 |
|
iauc
| hi, is there some addon/overlay for git which will basically allow me to have a normal commit flow as if I'm working on master, but commit changes to branches instead | 10:35 |
|
nedbat
| iauc: that sounds like switching to a branch, and then just making commits. i must be missing something. | 10:36 |
|
iauc
| well it is :) | 10:36 |
| ← dka left | 10:39 |
| ← Gustavo6046 left | 10:40 |
|
j416
| iauc: git checkout branch | 10:42 |
| → skapata joined | 10:47 |
| → Adoi joined | 10:50 |
| → selckin joined | 10:51 |
| → stennowork joined | 10:53 |
| → adlternative joined | 10:54 |
|
stennowork
| good day, i want to copy a repository A with all its branches and commit history into a new repository B. I selected the --mirror option during cloning. Now if i push a commit to repository A, will it reflect in B and vice versa? | 10:55 |
|
ikke
| stennowork: it will not automatically sync, you need to setup hooks to do that | 10:55 |
|
stennowork
| aah great | 10:55 |
|
| can i still cherrypick from A to B ? | 10:55 |
|
ikke
| sure | 10:56 |
|
| note that if you clone with --mirror, B will be a bare repository | 10:56 |
|
| So that repo does not have a working tree | 10:57 |
|
stennowork
| what is the consequence of that? can i not push commits to B? | 10:57 |
|
ikke
| You cannot do operations which require a working tree (cherry-picking for example) | 10:57 |
|
| bare repository are actually what you want when you want to push to it | 10:58 |
|
stennowork
| so i cannot cherrypick _from_ B? | 10:58 |
|
| sorry for being so slow lol | 10:59 |
|
ikke
| You can fetch history from B, and then cherry-pick locally, that's not an issue | 10:59 |
|
| You cannot cd to repository B and cherry-pick there | 10:59 |
|
stennowork
| i only want to pick from A to B | 10:59 |
|
| hmm | 10:59 |
| → pulse joined | 11:01 |
|
stennowork
| well i guess thats fine then if i understood correctly which i am not sure about | 11:01 |
|
| the problem is when i read git documentation, it somehow reads a bit for me like one of those autogenerated fake git man pages | 11:01 |
|
ikke
| They are mostly references | 11:02 |
| → nate1 joined | 11:02 |
|
ikke
| So the expectation is that you are already familiar with the concepts | 11:02 |
| → jinsun__ joined | 11:02 |
|
stennowork
| yeah and that is only partly the case | 11:02 |
|
| i really need to sit on my ass and get into the details of git | 11:02 |
|
ikke
| stennowork: in general, you do not need to cherry-pick on B | 11:03 |
|
| you can have a dedicated branch on A, cherry-pick commits there, and then push that to B | 11:03 |
|
stennowork
| ooh i see | 11:03 |
| ← jinsun left | 11:03 |
|
stennowork
| i am worried that i accidentally execute the wrong command and overwrite the changes of B completely with A. My understanding is that that might happen | 11:05 |
|
ikke
| unless you use --force (-f), you can only push new changes, not overwrite existing ones | 11:06 |
|
stennowork
| ok, i wont anyway | 11:07 |
| ← nate1 left | 11:07 |
| ← jkl left | 11:07 |
| → jkl joined | 11:09 |
| → PaMeDa joined | 11:10 |
| ← Tomte left | 11:11 |
| ← Adoi left | 11:13 |
| → Adoi joined | 11:16 |
| ← jkl left | 11:19 |
| → jkl joined | 11:20 |
| ← jazzy left | 11:31 |
| → Gustavo6046 joined | 11:35 |
| ← stkrdknmibalz left | 11:35 |
| ← wender left | 11:39 |
| ← Adoi left | 11:40 |
| → computeiro joined | 11:41 |
| ← fnurkla left | 11:43 |
| ← FFY00 left | 11:58 |
| → FFY00 joined | 11:59 |
| → nate1 joined | 12:25 |
| ← adlternative left | 12:25 |
| → kenanmarasli joined | 12:28 |
| ← cliluw left | 12:28 |
| → cliluw joined | 12:28 |
| ← nate1 left | 12:30 |
| → jinsun joined | 12:33 |
| ← jinsun__ left | 12:35 |
| → TomyWork joined | 12:38 |
| ← lgc left | 12:42 |
| → debsan joined | 12:52 |
| ← iauc left | 12:55 |
| → EvilDMP joined | 12:55 |
| → gh34 joined | 12:58 |
| ← EvilDMP left | 13:08 |
| → Guest53 joined | 13:09 |
| ← drew left | 13:13 |
| → yaymukund joined | 13:15 |
| ← stennowork left | 13:16 |
| → fnurkla joined | 13:18 |
| ← cxl left | 13:21 |
| → AnAverageHuman joined | 13:22 |
| ← Guest53 left | 13:23 |
| ← Crassus left | 13:28 |
| ← offpics left | 13:33 |
| ← discipulus left | 13:47 |
| → discipulus joined | 13:49 |
| → reset joined | 13:49 |
| → iauc joined | 13:52 |
| ← gpanders left | 13:53 |
| → gpanders joined | 13:53 |
| → venmx joined | 13:57 |
| → jimklimov joined | 13:57 |
| ← jimklimov1 left | 13:58 |
| → arcatech joined | 13:58 |
| ← venmx left | 14:02 |
| → thiago joined | 14:04 |
| ← Murr left | 14:14 |
| → Murr joined | 14:14 |
| ← liefer left | 14:16 |
| ← pulse left | 14:21 |
| → nate1 joined | 14:26 |
| ← ndim left | 14:28 |
| → AbleBacon joined | 14:28 |
| ← nate1 left | 14:31 |
| ← discipulus left | 14:33 |
| → DevAntoi_ joined | 14:34 |
| → discipulus joined | 14:35 |
| ← DevAntoine left | 14:38 |
| ← discipulus left | 14:41 |
| ← rifl left | 14:41 |
| → discipulus joined | 14:42 |
| → rifl joined | 14:42 |
| → Guest63 joined | 14:49 |
| → digup joined | 14:49 |
| Guest63 → __that__ | 14:49 |
| ← __that__ left | 14:50 |
| ← AnAverageHuman left | 14:53 |
| → sahilister joined | 14:55 |
| → qunzhong_luxian joined | 14:59 |
| ← xrisovalantis left | 15:01 |
| → rifl` joined | 15:04 |
| ← zj left | 15:04 |
| ← rifl left | 15:06 |
| ← rifl` left | 15:10 |
| → vicfred joined | 15:11 |
| → AnAverageHuman joined | 15:13 |
| → EvilDMP joined | 15:14 |
| ← EvilDMP left | 15:20 |
| ← sudoforge left | 15:22 |
| → pulse joined | 15:26 |
| → mehwork joined | 15:34 |
|
mehwork
| is it always bad to squash commits after pushing? For instance, even if it's my own branch? | 15:35 |
|
BtbN
| After pushing? | 15:35 |
|
ikke
| It all depends on expectations of others | 15:35 |
|
BtbN
| You'd immediately diverge from what you just pushed, and the next pull/push will be a mess. | 15:36 |
|
ikke
| If the branch you are working on is only used by yourself or not | 15:36 |
|
Timvde
| Using fixup commits and autosquash is explicitly part of our workflow | 15:40 |
|
mehwork
| I'm so confused | 15:41 |
|
ikke
| about what? | 15:41 |
|
mehwork
| as to when it's ok to squash after pushing | 15:42 |
| ← dmvrtx left | 15:42 |
|
imMute
| mehwork: if you're the only one using the branch, it's usually fine. if other people are using your branch too (basing theirs off it or contributing to it directly) then it's usually a bad idea | 15:43 |
|
mehwork
| they're not using it | 15:44 |
|
| ok thanks | 15:45 |
|
| is it still fine even if i merged develop into it? | 15:45 |
| → nate1 joined | 15:45 |
| → dmvrtx joined | 15:46 |
| → fef joined | 15:48 |
| ← nate1 left | 15:50 |
| → liefer joined | 15:54 |
| ← sahilister left | 15:59 |
| ← unixbhaskar left | 16:00 |
| → nate1 joined | 16:02 |
|
j416
| mehwork: what is it that you are worried about? | 16:04 |
|
| mehwork: perhaps, understanding _why_ it's sometimes a bad idea would be helpful. | 16:05 |
|
mehwork
| j416: i'm also worried about breaking things. I ended up in a state where i get a fatal error about not possible to pull because of fast forward | 16:06 |
|
j416
| so you're more afraid of the tool than of the state? | 16:06 |
| → unixbhaskar joined | 16:06 |
|
j416
| learn it well and that'll go away. :) | 16:06 |
|
mehwork
| well i'm trying to learn it well. I'm afraid of the painful process of learning it on a real code base and making these mistakes the hard way | 16:07 |
|
j416
| so have a test repo to try with? | 16:07 |
|
mehwork
| i did, but then i still ran into these issues. Anyway i'll keep playing with it, eventually i'll get better at it | 16:07 |
|
j416
| !book | 16:07 |
|
gitinfo
| There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable | 16:07 |
| → Betal joined | 16:07 |
| → dimi1947 joined | 16:08 |
| ← nate1 left | 16:08 |
|
j416
| this should be one of the first chapters http://git-scm.com/book/en/v2/Git-Internals-Git-Objects | 16:08 |
|
| at least for me, it was much easier to first understand the data model, and only after that learn what commands do what | 16:09 |
|
mehwork
| those things never answer my questions though | 16:09 |
|
j416
| sure they do | 16:09 |
| ← qunzhong_luxian left | 16:09 |
| → sudomann joined | 16:10 |
|
mehwork
| like right now i'm still wondering if when 'git log' says 'merge branch develop into [branch]' as the top commit and then the commit i want to squash to, if it's ok to squash that merge of develop | 16:10 |
|
j416
| start with that, then build experience on top of that | 16:10 |
|
mehwork
| iow are all commits equal | 16:10 |
|
j416
| that depends on what you mean by "ok" | 16:10 |
|
mehwork
| ok as in a good idea | 16:10 |
|
| or safe | 16:10 |
|
sudomann
| I am trying to learn more about hooks | 16:10 |
|
| such as precommit etc | 16:10 |
|
| Do you provide a shell script to run? | 16:10 |
|
mehwork
| sudomann: yes, and there's some example ones usually included that you can use as a template | 16:11 |
| → qunzhong_luxian joined | 16:11 |
|
j416
| mehwork: assuming you're about to force push that after altering history, if you are the only person working on the branch, or, you've informed the others and they're ok with it, then yes, squash all you want | 16:12 |
|
sudomann
| Okay, so you are responsible to making sure you dont have logical conflicts such as: pre commit hook which maybe does a git command (which might invoke other hooks, etc) | 16:12 |
| ← digup left | 16:13 |
|
mehwork
| j416: ok, and going forward am i better off using --squash when merging develop to my branch? | 16:13 |
|
j416
| mehwork: the reason altering the history of a shared branch is often a bad idea is that you can end up with people confused over why their history suddently doesn't match what's on the remote. | 16:13 |
|
mehwork
| e.g., git merge --squash develop | 16:13 |
| → digup joined | 16:13 |
|
j416
| mehwork: that'd depend entirely on your workflow. I never use --squash. | 16:14 |
|
| mehwork: I also never merge upstream into my branch. | 16:14 |
| ← Murr left | 16:14 |
| ← AnapodoPsalidaki left | 16:14 |
|
mehwork
| i'm using git-flow | 16:14 |
| → Murr joined | 16:14 |
|
j416
| does that encourage merging upstream into topic branches? | 16:15 |
| → b0rf joined | 16:15 |
|
j416
| it's a valid workflow; just creates a lot of unnecessary noise, which I prefer to not have. | 16:15 |
|
| also risk of introducing issues in merge conflict resolution | 16:16 |
|
| I prefer to rebase topic branches instead. | 16:16 |
|
| this does of course still doesn't remove potential merge conflicts, but at least you get to solve them in the original commits, rather than doing that in the merge commit | 16:17 |
|
| and through that, you get clean history, plus git blame or git bisect or such will give you a proper commit that introduced whatever bug, rather than a merge commit | 16:18 |
|
| which is useful. | 16:18 |
|
mehwork
| j416: git-flow is merge based so yeah | 16:19 |
|
j416
| this is subjective. some prefer to keep the commit history exactly as it happened, with all work in progress half-finished commits and so. I see no value in that, but each to their own. | 16:19 |
|
| mehwork: in that case, avoid --squash, because that won't create a merge. | 16:20 |
|
mehwork
| the _only_ reason i use git rebase is to keep history cleaner by getting rid of useless commits like "fixes eslint issue" | 16:20 |
|
| ok thanks | 16:20 |
|
j416
| s/merge/merge commit/ | 16:20 |
|
mehwork
| well, wait, that's what i wanted though | 16:20 |
|
| to also keep the useless 'merged develop' commits that are just there to keep my branch up to date | 16:20 |
|
j416
| if you're keeping the commits anyway, why not keep the history of those commits by avoiding --squash? | 16:21 |
| → EvilDMP joined | 16:21 |
| → ndim joined | 16:22 |
|
j416
| "git blame" on a line showing "sync with develop" doesn't make much sense. | 16:22 |
| ← mkopriva left | 16:22 |
|
jiffe
| which git | 16:24 |
|
mehwork
| right tht's why i want to squash | 16:24 |
|
j416
| I don't follow | 16:24 |
|
mehwork
| I don't either, so i'm back to confused :[ | 16:24 |
|
j416
| see git object model above | 16:24 |
|
| this might be helpful https://learngitbranching.js.org/?NODEMO | 16:25 |
| ← TomyWork left | 16:25 |
|
j416
| merge --squash effectively discards the history and just keeps the result of the merge, which becomes a regular commit with no info on where those changes came from other than the commit message | 16:26 |
| → hbautista joined | 16:27 |
|
mehwork
| ok, so you're saying don't use merge --squash because it offers no real benefit and only takes away the ability to figure out if a merge of that branch caused a bug? | 16:28 |
| → vicecea joined | 16:28 |
|
mehwork
| and i shouldn't squash those merges of other branches into my branch, unless i've verified it didn't cause a bug first? | 16:28 |
|
BtbN
| I don't like having merge commits in my history at all | 16:29 |
|
| hard to read and potentially confusing | 16:29 |
|
vicecea
| hi, I merged another branch that included 2 commits, C1 and C2, C2 added a file F1, however, F1 does not exist after I have merged the branch in the workspace, I can't `git co F1` and merging the branch again says it's already up to date - I have never seen this before, any pointers? | 16:29 |
|
j416
| mehwork: it won't take away the ability to figure out that the _merge_ cause the bug. | 16:30 |
|
mehwork
| ok, then i wish squash ad nauseum | 16:30 |
|
j416
| mehwork: but that's the very issue. If the merge commit caused the bug, that creates more headache than needed. | 16:30 |
|
| mehwork: it's the equivalent of writing code, committing that saying "Add stuff" | 16:31 |
|
| not very useful. | 16:31 |
|
| except also in this case, you're doing that with code you didn't write. | 16:31 |
|
mehwork
| j416: meaning if 'git log' in my branch shows these 3 commits: 1. fixes eslint issue 2. Merge branch 'develop' into <mybranch> 3. Commit message i want -- then i'll do `git rebase -i HEAD~3` and squash 2 and 3, right? | 16:32 |
|
j416
| but, y'know, squash merge if you prefer. | 16:32 |
|
mehwork
| yeah i'm not gonna use --squash | 16:32 |
|
j416
| mehwork: I don't understand the question | 16:32 |
|
BtbN
| My colleagues at work love squash merges | 16:32 |
|
| so our history consists only of single commits with like -5000+5000 lines | 16:32 |
|
| bisecting bugs is next to impossible | 16:33 |
|
j416
| BtbN: wonderful. | 16:33 |
|
BtbN
| Not sure if that or their original history of "Ooops" "Fix" "One more thing" "forgot" would be better | 16:33 |
|
j416
| small commits make finding bugs much easier. | 16:33 |
|
| BtbN: sounds like you want to teach them a thing or two. :) | 16:33 |
|
mehwork
| j416: my question is, is it ok to do that based on everything we've talked about with keeping history a cleaner while still merging develop into my branch | 16:33 |
|
BtbN
| I tried. Doesn't work. | 16:33 |
| ← hbautista left | 16:34 |
|
mehwork
| j416: once i push these changes and make a PR in github, i don't want it saying there's 3 commits. I want it saying there's 1 | 16:34 |
|
j416
| mehwork: looks like you're describing squash merge. | 16:34 |
|
| mehwork: so rebase. | 16:34 |
|
mehwork
| yes that's why i said i'm going to do git rebase -i HEAD~3 in that case | 16:35 |
|
BtbN
| You usually want one commit per "thing" you did | 16:35 |
|
| as granular as possible | 16:35 |
|
mehwork
| j416: and then i'll mark 2 and 3 as 'squash' | 16:35 |
|
j416
| mehwork: skip the merge altogether | 16:35 |
|
| mehwork: just rebase | 16:35 |
|
BtbN
| You don't want stuff like "typo fixes" as individual commits, unless the typo is in the main repo | 16:35 |
|
j416
| mehwork: also, rebase will eat the merge by default. | 16:36 |
|
mehwork
| j416: the problem for me is that i already have a PR and it's still showing 3 commits. And when i squash this one into 1 commit, it shows 4 commits now :/ | 16:36 |
|
j416
| mehwork: rebase + force push is the only option to get that to show 1 commit. | 16:36 |
|
mehwork
| oh i didn't force push when i pushed, maybe that's why | 16:36 |
|
BtbN
| You pushed _something_ tho | 16:37 |
|
j416
| ^ | 16:37 |
|
mehwork
| yes | 16:37 |
|
| it still let me push | 16:37 |
|
| without -f | 16:37 |
|
j416
| force push is only useful when you have altered history | 16:37 |
|
mehwork
| that's what i'm trying to do | 16:37 |
|
j416
| but you didn't. | 16:37 |
|
mehwork
| alter the history from 3 commits to 1 by rebasing | 16:37 |
|
j416
| if you had, the regular push would give an error. | 16:37 |
|
| if you rebase, then a regular push won't work. | 16:38 |
|
mehwork
| but i did rebase, what the heck. I did git rebase -i HEAD~3 and squashed 2 commits | 16:38 |
|
j416
| mehwork: anyway, object model, commit graph. it's in the book. :) | 16:38 |
|
| this is not about workflow anymore but about the commit graph and how to modify it | 16:39 |
| ← fef left | 16:39 |
|
j416
| so, it's all there. sorry to say rtfm, but book will explain it better and with less wasted time than anyone here can. | 16:39 |
|
mehwork
| yes, i need to master that | 16:39 |
|
| no that's fair. I just hate when i follow instructions and things don't work | 16:39 |
|
| not your instructions, but some i found online | 16:39 |
|
j416
| yes | 16:39 |
|
| learn why it doesn't work instead | 16:40 |
| ← sysh left | 16:40 |
|
j416
| better yet, don't follow instructions at all. | 16:40 |
|
mehwork
| including your instructions? jk | 16:48 |
|
| you're right. It doesn't pay to just follow someone else's steps without truly understanding what's going on (tell that to the millions of people who just copy paste from stack overflow all day) | 16:48 |
|
| Ok now another issue is i'm trying NOT to squash commits, and i just did a 'git push origin <mybranch>' after creating a commit and it's giving me error: failed to push some refs: updates rejected because top of your current branch is behind its remote | 16:51 |
|
| so i ran 'git pull origin <mybranch>' and that's failing: fatal: Not possible to fast-forward, aborting | 16:52 |
| ← srinidhi left | 16:52 |
|
mehwork
| so i can't pull nor push. What the heck? | 16:52 |
|
imMute
| your branch and the branch on the server have diverged (they both have commits the other doesnt). you can 'git fetch' and then do the merge manually. but that's what git-pull does by default, but yours seems to be configured to only allow fast-fowards, so that's probably for a reason | 16:53 |
| ← rfuentess left | 16:53 |
|
mehwork
| oh yes, my local gitconfig has ff-only | 16:54 |
|
| because someone at work told me that's a good idea | 16:54 |
|
imMute
| IMO it is. I never use git pull. I always fetch, and then examine the branches to decide if I want to rebase/ff/merge. | 16:54 |
| → Adoi joined | 16:55 |
|
mehwork
| git fetch origin <mybranch> didn't have an error but i still can't push or pull | 16:55 |
| → hnOsmium0001 joined | 16:55 |
|
imMute
| just 'git fetch' is enough. you need to manually merge/rebase before you can push though. | 16:55 |
|
mehwork
| i can do 'git pull origin <mybranch> --no-ff' and it said "Merge made by the 'recursive' stratgy' | 16:56 |
|
imMute
| so that did the fetch and then a merge, overriding your ff-only config option. | 16:56 |
|
| which is probably fine. | 16:56 |
|
j416
| mehwork: yes, don't blindly follow. read up and make your own opinion. :) | 16:56 |
| ← unixbhaskar left | 16:56 |
|
j416
| mehwork: (also, I can't recall giving you instructions.) | 16:56 |
|
mehwork
| yeah that worked and now i can push | 16:56 |
|
| j416: i was making a joke about how you gave me instructions not to follow instructions | 16:56 |
|
j416
| sure. | 16:57 |
| → unixbhaskar joined | 16:57 |
| → jmcantrell joined | 16:57 |
|
j416
| I'm a random person on the internet. don't trust me. :) | 16:57 |
|
mehwork
| how is that different than a random person irl or a random author in a book? | 17:00 |
| ← DevAntoi_ left | 17:01 |
|
j416
| not much I suppose. | 17:01 |
| ← dimi1947 left | 17:01 |
|
j416
| (though not sure about the latter) | 17:03 |
|
mehwork
| i've read worse advice in random books than on irc in my time | 17:04 |
|
| at least with computer related stuff | 17:04 |
|
j416
| (how'd the author get into the book?) | 17:04 |
|
| j416 shows self out | 17:05 |
| ← digup left | 17:06 |
| ← Hi-Angel1 left | 17:06 |
|
jiffe
| there a way to get git running on an old version of x64 linux with https running out of ~/.local ? I tried grabbing https://github.com/EXALAB/git-static which works in a new ubuntu machine but not in this old rhel5 machine, it segfaults | 17:08 |
| → sahilister joined | 17:09 |
|
mehwork
| j416: convinced a publisher? Not hard for technical people to convince non technical people, since they have no way of knowing if they know wth they're talking about | 17:11 |
| ← Adoi left | 17:13 |
|
BtbN
| You will need to compile it yourself, targetting the ancient toolchain of that OS | 17:13 |
|
jiffe
| BtbN: why do I need to use an old toolchain? | 17:14 |
|
| I've got a static version of curl running in this machine ok | 17:14 |
|
j416
| mehwork: (.....joke.) | 17:14 |
|
BtbN
| jiffe, glibc is never truely static | 17:15 |
|
| something built with a newer glibc has absolutely no guarantee to run on a system with an older one | 17:15 |
|
ikke
| musl can be fully statically linked | 17:17 |
|
BtbN
| You lose a bunch of features then though | 17:17 |
|
| like, dynamically loading nss modules | 17:17 |
|
jiffe
| I don't need a lot of functionality, I just need to be able to git clone some stuff | 17:18 |
|
| via https | 17:18 |
|
BtbN
| That is a lot of dependencies just for that | 17:18 |
|
ikke
| jiffe: do you actually need a git repo? | 17:18 |
|
BtbN
| best bet might be using something like conda, which brings literally everything except the kernel | 17:18 |
|
ikke
| if you just need the files, downloading an archive might be simpler | 17:19 |
|
BtbN
| But even that might expect a more modern glibc | 17:19 |
|
Betal
| jiffe: is it an one time download? can it be http? | 17:19 |
|
jiffe
| not a one time, and has top be https as I don't think you can use http with github | 17:20 |
|
Betal
| jiffe: can't you use the browser and download a zip? | 17:20 |
|
ikke
| or use curl and download a zip | 17:20 |
|
jiffe
| Betal: I'm using this with pyenv which installs and updates a local version of python | 17:20 |
|
Betal
| would not be a option to git clone in a working machine, than use it as a proxy repo, old ubuntu -> updated machine -> github ? | 17:22 |
| ← kenanmarasli left | 17:23 |
|
jiffe
| I can figure out other solutions if there's absolutely no way to get this to work, I'm here with the interest of trying to get git + https as a solution here | 17:23 |
| → kenanmarasli joined | 17:24 |
| ← liefer left | 17:24 |
| ← kenanmarasli left | 17:24 |
| → liefer joined | 17:25 |
|
Betal
| isn't rhel5 eol? still secure to use it connected to internet? | 17:25 |
|
jiffe
| that's up to the sys admins, these are dev machines running rhel5 and they're on the internet | 17:27 |
|
mspe
| rhel5 extended support ended November 30 2020 | 17:28 |
| ← YuGiOhJCJ left | 17:28 |
|
ikke
| poor sobs who have to develop on rhel5 | 17:28 |
|
| jiffe: Not sure if there is an easy solution | 17:29 |
|
| you have to figure out why it's segfaulting | 17:30 |
|
| or try to get a static build against musl | 17:30 |
| ← liefer left | 17:30 |
| → liefer joined | 17:31 |
|
jiffe
| alright I'll see what I can figure out, thanks | 17:33 |
| → digup joined | 17:35 |
| ← cliluw left | 17:41 |
| → ubique joined | 17:42 |
| → jhulten joined | 17:43 |
| → Sasazuka joined | 17:46 |
| ← madewokherd left | 17:46 |
| → madewokherd joined | 17:47 |
| ← Sasazuka left | 17:54 |
| ← opzeul left | 17:54 |
| → waxer joined | 17:58 |
|
maher
| when I look at the repository on gitlab, there are lots of branches - but when I clone it, I only get one branch. How do I get all the branches? | 17:58 |
|
ikke
| You have all branches | 17:59 |
|
| try git branch -r | 17:59 |
| → crabbedhaloablut joined | 18:01 |
| → nate1 joined | 18:04 |
| → Sasazuka joined | 18:04 |
|
maher
| ok - so I did a git switch issue-316-open-new-window and it made a new local branch tracking that remote branch | 18:06 |
| ← AbleBacon left | 18:06 |
|
maher
| but then I did git switch josephmaher/issue-316-open-new-window and it said: fatal: invalid reference: josephmaher/issue-316-open-new-window, but that branch shows up in git branch -r | 18:06 |
| → zmt01 joined | 18:06 |
| → AbleBacon joined | 18:07 |
|
ikke
| it's a remote tracking branch | 18:08 |
| → Adoi joined | 18:08 |
| → jimklimov1 joined | 18:08 |
| ← nate1 left | 18:09 |
|
ikke
| like you said, you created 'local' branch already | 18:09 |
| ← zmt00 left | 18:10 |
|
maher
| ikke: in branch -r I see two branches: origin/issue-316-open-new-window and origin/josephmaher/issue-316-open-new-window <--- are these different branches? | 18:10 |
|
ikke
| maher: yes, they do represent different branches | 18:11 |
| ← jimklimov left | 18:12 |
| → natrys joined | 18:12 |
|
maher
| ikke: why doesn't git switch josephmaher/issue-316-open-new-window work? | 18:12 |
| ← Sasazuka left | 18:14 |
| ← Murr left | 18:14 |
|
ikke
| git switch -c josephmaher/issue-316-open-new-window -t origin/josephmaher/issue-316-open-new-window | 18:14 |
| → Murr joined | 18:14 |
|
maher
| ikke: thanks! ( there was type in my original git switch command :( ) | 18:16 |
| → seand joined | 18:20 |
| ← theoceaniscool left | 18:22 |
| gordonfish- → gordonfish | 18:23 |
| → dogood joined | 18:23 |
| ← digup left | 18:23 |
| → Sasazuka joined | 18:23 |
| → srinidhi joined | 18:27 |
| → infernix joined | 18:29 |
| ← vicecea left | 18:31 |
| ← infernix left | 18:35 |
| → hbautista joined | 18:35 |
| → infernix joined | 18:37 |
| ← dogood left | 18:40 |
| Soni → queeries | 18:42 |
| ← hbautista left | 18:44 |
| → jazzy joined | 18:48 |
| ← nyah left | 18:49 |
| → forgotmynick joined | 18:49 |
| → CJ joined | 18:51 |
| → tsdh joined | 18:54 |
| ← xayto left | 18:54 |
| → waxer_ joined | 18:55 |
| ← waxer_ left | 18:55 |
| ← hoochmonger left | 18:58 |
| → hoochmonger joined | 18:59 |
| ← CJ left | 19:04 |
| ← mthall left | 19:05 |
| → mthall joined | 19:06 |
| → opzeul joined | 19:09 |
| ← blue_penquin left | 19:10 |
| ← unixbhaskar left | 19:10 |
| → xayto joined | 19:19 |
| ← jhulten left | 19:20 |
| → jhulten joined | 19:21 |
| ← AnAverageHuman left | 19:21 |
| ← jhulten left | 19:25 |
| → hbautista joined | 19:35 |
| → AnAverageHuman joined | 19:37 |
| → jhulten joined | 19:41 |
| ← alfredb left | 19:42 |
| → DevAntoine joined | 19:46 |
| ← arcatech left | 19:49 |
| → arcatech joined | 19:50 |
| ← DevAntoine left | 19:52 |
| → DevAntoine joined | 19:52 |
| ← arcatech left | 19:53 |
| ← DevAntoine left | 19:57 |
| → arcatech joined | 20:00 |
| ← hbautista left | 20:01 |
| ← arcatech left | 20:05 |
| → nate1 joined | 20:05 |
| → DevAntoine joined | 20:08 |
| ← nate1 left | 20:10 |
| → GNUcifer joined | 20:12 |
| ← cehteh left | 20:12 |
| GNUcifer → cehteh | 20:12 |
| ← DevAntoine left | 20:12 |
| → mokulus joined | 20:15 |
| → xall joined | 20:18 |
| → AnapodoPsalidaki joined | 20:22 |
| ← EvilDMP left | 20:25 |
| → EvilDMP joined | 20:26 |
| ← liefer left | 20:29 |
| ← waxer left | 20:29 |
| → liefer joined | 20:29 |
| ← BUSY left | 20:34 |
| → idego joined | 20:40 |
| ← pieguy128 left | 20:42 |
| → pieguy128 joined | 20:43 |
| → gast0n joined | 20:45 |
| ← b0rf left | 20:53 |
| ← liefer left | 20:55 |
| → liefer joined | 20:56 |
| ← srinidhi left | 20:57 |
| ← idego left | 20:57 |
| ← forgotmynick left | 20:59 |
| ← qunzhong_luxian left | 21:02 |
| ← shabius_ left | 21:03 |
| → shabius joined | 21:03 |
| ← ubique left | 21:04 |
| → toinen joined | 21:12 |
| ← yksi left | 21:13 |
| → Xenguy joined | 21:19 |
| ← ThorMojito left | 21:21 |
| another → another| | 21:23 |
| ← gh34 left | 21:25 |
|
mehwork
| everytime i see glibc i think of how glib C is | 21:33 |
|
| What exactly does this do: git co <mybranch> ; git rebase -i origin/main | 21:34 |
|
| does it fetch `main`'s changes from the remote and replay those commits over my branch? | 21:34 |
| ← shabius left | 21:35 |
| ← mokulus left | 21:35 |
| → unixbhaskar joined | 21:38 |
| → shabius joined | 21:39 |
| → SuperLag joined | 21:39 |
| → lgc joined | 21:40 |
| ← fnurkla left | 21:44 |
| → nyah joined | 21:44 |
| ← EvilDMP left | 21:47 |
| ← Nalt left | 21:48 |
| → EvilDMP joined | 21:48 |
| ← EvilDMP left | 21:48 |
| → EvilDMP joined | 21:49 |
| ← EvilDMP left | 21:49 |
| → EvilDMP joined | 21:49 |
| ← EvilDMP left | 21:50 |
| → EvilDMP joined | 21:50 |
| ← EvilDMP left | 21:50 |
| → EvilDMP joined | 21:51 |
|
j416
| mehwork: there's no network involved in that. | 21:51 |
| ← EvilDMP left | 21:51 |
|
j416
| mehwork: it checks out <mybranch>, then rebases that on top of whatever origin/main points at. | 21:51 |
|
| (a commit) | 21:52 |
| → EvilDMP joined | 21:52 |
| ← shabius left | 21:52 |
| ← EvilDMP left | 21:52 |
|
j416
| mehwork: most things in Git are local. | 21:52 |
| → EvilDMP joined | 21:53 |
| ← EvilDMP left | 21:53 |
| → EvilDMP joined | 21:53 |
| ← EvilDMP left | 21:54 |
| → EvilDMP joined | 21:54 |
| ← EvilDMP left | 21:54 |
| → EvilDMP joined | 21:55 |
| ← EvilDMP left | 21:55 |
| → EvilDMP joined | 21:56 |
| ← EvilDMP left | 21:56 |
| ← kilobyte_ch left | 21:56 |
| → shabius joined | 21:59 |
| → mud joined | 22:00 |
| → arcatech joined | 22:01 |
| → Rubin joined | 22:03 |
| → offpics joined | 22:05 |
| ← offpics left | 22:06 |
| → nate1 joined | 22:06 |
| → fnurkla joined | 22:07 |
|
mehwork
| interesting thanks | 22:07 |
| → heftig[m] joined | 22:07 |
| → bLeDy[m] joined | 22:07 |
| → pinage404 joined | 22:07 |
| → cpackham[m] joined | 22:07 |
| → tuxayo joined | 22:07 |
| → novasharper joined | 22:07 |
| → morguldir joined | 22:07 |
| → dieggsy joined | 22:07 |
| → kadoban joined | 22:07 |
| → Kamui joined | 22:07 |
| → ServerStatsDisco joined | 22:07 |
| → Guest5383 joined | 22:07 |
| → elemongw[m] joined | 22:07 |
| → crysisanon[m] joined | 22:07 |
| → silvio[m] joined | 22:08 |
| → inkbottle[m] joined | 22:08 |
| → thetourist108 joined | 22:08 |
| ← jazzy left | 22:08 |
| → viral_mutant[m] joined | 22:08 |
|
mehwork
| so it's the same thing as git co main ; git pull ; git co <my branch> ; git merge main ? | 22:08 |
| → nazarii[m] joined | 22:08 |
| → jazzy joined | 22:09 |
| → blaklistd joined | 22:10 |
| → kilobyte_ch joined | 22:11 |
| ← bLeDy[m] left | 22:11 |
| ← ServerStatsDisco left | 22:11 |
| ← heftig[m] left | 22:11 |
|
mehwork
| well not the exact same thing obviously, but similar | 22:11 |
| ← morguldir left | 22:11 |
| ← Rubin left | 22:11 |
| ← kadoban left | 22:11 |
| ← Guest5383 left | 22:11 |
| ← dieggsy left | 22:11 |
| → heftig[m] joined | 22:11 |
| ← cpackham[m] left | 22:11 |
| ← nazarii[m] left | 22:11 |
| ← inkbottle[m] left | 22:11 |
| → bLeDy[m] joined | 22:12 |
| ← novasharper left | 22:12 |
| ← Kamui left | 22:12 |
| → cpackham[m] joined | 22:12 |
| ← nate1 left | 22:12 |
| → novasharper joined | 22:12 |
| → morguldir joined | 22:12 |
| → dieggsy joined | 22:12 |
| → kadoban joined | 22:12 |
| → Kamui joined | 22:12 |
| → ServerStatsDisco joined | 22:12 |
| ← elemongw[m] left | 22:12 |
| ← fnurkla left | 22:12 |
| → blue_penquin[m] joined | 22:12 |
| → fnurkla joined | 22:12 |
| → elemongw[m] joined | 22:12 |
| → inkbottle[m] joined | 22:12 |
| blue_penquin[m] → Guest649 | 22:13 |
| → nazarii[m] joined | 22:13 |
| ← crysisanon[m] left | 22:13 |
| ← thetourist108 left | 22:13 |
| ← pinage404 left | 22:13 |
|
gpanders
| no, it's not the same thing. For one, there's no 'git pull'. For two, rebase and merge are not the same (though they *sometimes* have the same outcome) | 22:13 |
| → Rubin joined | 22:13 |
| ← tuxayo left | 22:13 |
| → pinage404 joined | 22:13 |
|
gpanders
| And the -i flag means it's an interactive rebase, so it's *definitely* different than git merge | 22:14 |
| → tuxayo joined | 22:14 |
| → crysisanon[m] joined | 22:14 |
| → thetourist108 joined | 22:14 |
|
mehwork
| what if i did this though (all in my branch): git fetch ; git rebase -i origin/main | 22:14 |
|
| does the git fetch first make up for it not doing a git pull? | 22:15 |
|
ndorf
| pull = fetch + rebase, or fetch + merge. so yes. | 22:15 |
|
mehwork
| nice | 22:18 |
| ← silvio[m] left | 22:19 |
| ← viral_mutant[m] left | 22:20 |
| → venmx_ joined | 22:21 |
| ← blaklistd left | 22:22 |
| ← Kamui left | 22:22 |
| ← heftig[m] left | 22:22 |
| ← thetourist108 left | 22:22 |
| ← dieggsy left | 22:22 |
| ← kadoban left | 22:22 |
| ← cpackham[m] left | 22:22 |
| ← bLeDy[m] left | 22:22 |
| ← novasharper left | 22:22 |
| ← inkbottle[m] left | 22:22 |
| ← morguldir left | 22:22 |
| ← pinage404 left | 22:22 |
| ← crysisanon[m] left | 22:22 |
| ← Guest649 left | 22:22 |
| ← Rubin left | 22:22 |
| ← tuxayo left | 22:22 |
| ← nazarii[m] left | 22:22 |
| ← ServerStatsDisco left | 22:22 |
| ← elemongw[m] left | 22:22 |
| → blaklistd joined | 22:22 |
|
mehwork
| is it fine to always just 'git fetch -p' instead of plain 'git fetch'? | 22:24 |
| → JanC_ joined | 22:26 |
| ← JanC left | 22:27 |
| → Rubin joined | 22:28 |
|
cehteh
| possibly not .. depends on what you want to do | 22:28 |
| → heftig[m] joined | 22:28 |
| → bLeDy[m] joined | 22:28 |
| → pinage404 joined | 22:28 |
| → cpackham[m] joined | 22:28 |
| → tuxayo joined | 22:29 |
| → novasharper joined | 22:29 |
| → dieggsy joined | 22:29 |
| → morguldir joined | 22:29 |
| → kadoban joined | 22:29 |
| → Kamui joined | 22:29 |
|
mehwork
| at leat in this case where i want to fetch before rebase'ing origin/foo onto my branch | 22:29 |
| → ServerStatsDisco joined | 22:29 |
| → Guest6204 joined | 22:29 |
| → elemongw[m] joined | 22:29 |
| → crysisanon[m] joined | 22:29 |
| → silvio[m] joined | 22:29 |
| → inkbottle[m] joined | 22:29 |
| → thetourist108 joined | 22:29 |
| → viral_mutant[m] joined | 22:29 |
| → nazarii[m] joined | 22:29 |
|
fnurkla
| doesn't seem necessary | 22:29 |
|
cehteh
| why do you want -p then? | 22:29 |
|
mehwork
| it says it will remove any remote-tracking references that no longer exist ont he remote | 22:30 |
| ← jstein left | 22:30 |
|
mehwork
| just seemed like a bonus | 22:30 |
|
cehteh
| in presence of multiple remote repositories which are not in sync pruning can be nasty, possibly not overy dangerous but unnecessary at best | 22:30 |
|
fnurkla
| ^ | 22:30 |
|
mehwork
| alright thanks | 22:31 |
|
cehteh
| when you only track a single origin its prolly harmless, but still unnecessary unless you exactly want that | 22:31 |
| → ThorMojito joined | 22:32 |
| ← frobnic left | 22:33 |
|
mehwork
| i'll avoid it then | 22:35 |
| → Nalt joined | 22:35 |
| ← micah left | 22:47 |
| → Guest53 joined | 22:51 |
| ← venmx_ left | 22:52 |
| ← zeenk left | 22:53 |
| → frobnic joined | 22:55 |
| ← opzeul left | 22:56 |
| ← discipulus left | 22:57 |
| ← blaklistd left | 22:59 |
| ← jsrnop left | 23:01 |
| → jsrnop joined | 23:01 |
| ← Guest53 left | 23:03 |
| ← polyrob left | 23:08 |
| → blaklistd joined | 23:12 |
| sgn → sgn_ | 23:15 |
| ← navidr left | 23:15 |
| sgn_ → sgn | 23:15 |
| ← natrys left | 23:16 |
| → sudoforge joined | 23:16 |
| ← maher left | 23:23 |
| → maher joined | 23:24 |
| ← blaklistd left | 23:26 |
| → blaklistd joined | 23:26 |
| → polyrob joined | 23:26 |
| → orbyt joined | 23:28 |
| ← keypusher left | 23:34 |
| → stkrdknmibalz joined | 23:36 |
| JanC_ → JanC | 23:39 |
| → keypusher joined | 23:48 |
| → BUSY joined | 23:49 |
| → Adois joined | 23:53 |
| ← jhulten left | 23:55 |
| ← Adoi left | 23:57 |
| → kaisyu joined | 23:58 |