IRCloggy #git 2022-02-23

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2022-02-23

← dos_ left00:00
← ericho left00:01
← crashrep left00:02
← Kohe left00:02
← ThorMojito left00:03
→ Null_A joined00:05
← Bombo left00:06
← otmi left00:06
→ octetta joined00:09
← Null_A left00:09
← sa0 left00:09
← Gaboradon left00:10
→ sa0 joined00:10
← tyson2 left00:12
← octetta left00:13
← alt-romes left00:15
← sa0 left00:15
→ ThorMojito joined00:22
→ Bombo joined00:22
← Bombo left00:22
→ Bombo joined00:22
← va5c0_ left00:24
→ sa0 joined00:24
→ YellowSuB joined00:26
← ThorMojito left00:27
← sa0 left00:29
← vicfred left00:30
→ crashrep joined00:34
← Vonter left00:35
→ octetta joined00:37
→ tyson2 joined00:40
→ Null_A joined00:41
→ Vonter joined00:41
→ kaiseisei joined00:45
← Null_A left00:45
→ ThorMojito joined00:45
← yagamilito left00:49
→ crised joined00:56
crised Why git diff topic...master is different from git diff master...topic? Why is it assymetrical?00:56
→ cliluw joined00:57
← pretty_dumm_guy left00:57
← ThorMojito left00:58
imMute crised: because it shows the changes that are in one branch but not the other (or both of them)01:01
→ pyevery__ joined01:01
← anaveragehuman left01:02
→ anaveragehuman joined01:02
← ano left01:02
→ klf joined01:03
klf remote repo is ahead of my local repo by one commit. My teammate made some small and pushed to this repo and I was wondering if there is a way for me to 'git pull' and not need to make another commit and just let it overwrite my local version.01:05
Basically I don't want to merge.01:05
OnlineCop `git fetch` ?01:05
Then maybe `git diff origin/branch...topic` ?01:05
→ ericho joined01:06
→ ano joined01:06
hololeap_ → hololeap01:06
← FinnElija left01:06
crised imMute: How do you humanly read git diff topic...master vs git diff master...topic?01:07
klf Updating dbaa1a9..8cec78e01:08
error: Your local changes to the following files would be overwritten by merge: sprint1/generateAST.sh01:08
Please commit your changes or stash them before you merge.01:08
I already issued "git fetch"01:08
OnlineCop Don't you want to diff against what's on `origin/master` instead of what's on your local `master`?01:09
→ FinnElija joined01:09
→ teut joined01:09
klf no01:09
OnlineCop Do you just want to throw away everything in your working directory, like when you `git checkout -- ` ?01:10
→ Ranhir joined01:10
klf everything? no... because I have some untracked tester files that I'd like to keep01:11
OnlineCop I usually temporarily stash what I'm working on, `git pull --rebase` and then pop the stash. Or as others have suggested, `git commit -A -m 'local changes' && git pull --rebase && git reset --soft HEAD~1`01:11
klf it looks like it's sprint1/generateAST.sh that's keep me from pull01:11
← Tang3nt-Man left01:12
OnlineCop So you commit (temporarily), do your pull and handle merge conflicts, then you `reset --soft` to un-commit your temporary and leave everything in your working directory.01:12
klf okay, I'll do that. git commit -A -m 'local changes' && git pull --rebase && git reset --soft HEAD~1`01:14
thank you01:14
← MiniontobyPI left01:14
→ Gustavo6046_ joined01:16
crised Does PR uses git diff master...topic right?01:16
(in github)01:16
← dob1 left01:16
Gustavo6046 → Guest540701:17
← Guest5407 left01:17
Gustavo6046_ → Gustavo604601:17
→ dob1 joined01:18
→ MiniontobyPI joined01:22
← dob1 left01:24
→ dob1 joined01:30
→ arch-angel joined01:32
← srinidhi left01:34
← emf left01:35
→ jbg joined01:41
→ Null_A joined01:49
← cliluw left01:50
OnlineCop What is the proper term to search for? `git diff foo..bar` vs. `git diff foo...bar` (two dots vs. three)01:50
"git diff ellipsis" ?01:50
← Yruama left01:52
→ julius joined01:56
→ cliluw joined01:57
← Novi left01:57
← cliluw left01:58
→ cliluw joined02:00
→ ThorMojito joined02:03
← Null_A left02:06
← drbeco left02:09
← gast0n left02:11
klf OnlineCop: `-a` is an unknown switch02:12
OnlineCop `commit -a` or `commit -A` ?02:12
klf `A`02:12
OnlineCop Yeah; that should be `-a`, or "commit all the things".02:12
← cdown left02:12
klf OnlineCop: http://codepad.org/2PoKN15C02:13
→ steam joined02:18
→ drbeco joined02:19
OnlineCop Ugh. You're right. `git add -A && git commit -m 'local changes && git pull --rebase && git reset HEAD~1'02:20
I knew there was `-A` somewhere.02:20
← derelict left02:20
→ derelict joined02:21
→ ghost43 joined02:22
← ghost43 left02:23
→ ghost43 joined02:26
→ bambanxx joined02:27
← teut left02:31
→ donofrio joined02:32
← great_taste left02:32
→ rgrinberg joined02:34
← locrian9 left02:34
→ Null_A joined02:36
← justAstache left02:36
→ justAstache joined02:37
← Null_A left02:40
← octetta left02:44
→ octetta joined02:44
→ tachoknight joined02:49
← octetta left02:50
→ octetta joined02:50
← mannequin left02:53
← tachoknight left02:54
→ Swahili_ joined02:56
← Swahili left02:57
→ sa0 joined02:57
← uuuu_ left03:02
→ ffl^ joined03:04
← ghost43 left03:05
→ ghost43 joined03:05
→ Cera joined03:06
← hololeap left03:07
→ xx joined03:09
→ ghost43_ joined03:10
→ Null_A joined03:11
← ghost43 left03:12
← dob1 left03:13
→ dob1 joined03:14
← Swahili_ left03:15
← crashrep left03:21
→ hololeap joined03:21
→ Novi joined03:21
← tejr left03:21
← Ranhir left03:23
→ tejr joined03:23
→ great_taste joined03:24
→ Ranhir joined03:26
→ saroy joined03:27
← Gustavo6046 left03:28
← Null_A left03:29
← ChmEarl left03:29
← zachel left03:30
← sa0 left03:31
← masoudd left03:32
→ zachel joined03:33
→ mannequin joined03:36
← anaveragehuman left03:37
→ Azem joined03:37
→ anaveragehuman joined03:38
← Emet-Selch left03:40
← terrorjack left03:41
→ terrorjack joined03:41
← vysn left03:44
← dob1 left03:45
→ dob1 joined03:45
← ThorMojito left03:50
→ ThorMojito joined03:50
← pyevery__ left03:51
→ pyevery__ joined03:52
← xkuru left03:53
← jstein left03:55
← DoofusCanadensis left03:55
← ThorMojito left03:55
← ghost43_ left04:07
← ericho left04:07
→ ghost43 joined04:07
← pulse left04:07
← ghost43 left04:08
→ ghost43 joined04:08
← Cera left04:08
→ ThorMojito joined04:08
← ThorMojito left04:16
← julius left04:16
→ Null_A joined04:18
← tyson2 left04:21
→ _9pfs joined04:24
→ julius joined04:24
→ srinidhi joined04:27
→ ThorMojito joined04:30
← klf left04:31
← Null_A left04:35
→ Xenguy joined04:35
← ThorMojito left04:37
← tehenderz left04:38
→ tehenderz joined04:39
← sudoforge left04:41
← cbreak left04:42
→ cbreak joined04:46
← anaveragehuman left04:47
← skapata left04:49
→ sudoforge joined04:51
← drbeco left04:52
→ anaveragehuman joined04:53
← _9pfs left04:55
← howdoi left04:58
← bloody left04:58
← ghost43 left05:03
→ ghost43 joined05:03
← zebrag left05:04
← donofrio left05:04
→ _9pfs joined05:05
→ hbautista joined05:06
← waterkip left05:10
← pyevery__ left05:12
← bambanxx left05:16
← great_taste left05:18
← igemnace left05:19
→ Null_A joined05:20
← Null_A left05:24
← ghost43 left05:26
→ ghost43 joined05:26
→ sa0 joined05:29
← Thanatermesis left05:31
→ ThorMojito joined05:34
← ThorMojito left05:41
← subopt left05:46
→ zumba_addict joined05:49
← _9pfs left05:50
← tsdh left05:51
→ _9pfs joined05:51
← _9pfs left05:51
→ _9pfs joined05:52
← bartman left05:54
→ ThorMojito joined05:54
← _9pfs left05:54
← hbautista left05:58
→ coot joined06:00
→ Kohe joined06:00
← ThorMojito left06:01
← ghost43 left06:02
→ ghost43 joined06:02
← sa0 left06:02
← Giovanni left06:05
← packet_lozenge_ left06:06
← ghost43 left06:08
→ ghost43 joined06:08
→ Giovanni joined06:11
→ Null_A joined06:12
→ eroux joined06:13
→ nattiestnate joined06:13
← auk left06:18
← nasamuffin left06:19
→ kenanmarasli joined06:20
→ duxsco joined06:21
← rgrinberg left06:21
→ mexen joined06:22
→ packet_lozenge joined06:27
← Null_A left06:28
← thiago left06:35
→ vitali64 joined06:35
← Kohe left06:49
→ otisolsen70 joined06:50
← otisolsen70 left06:52
→ otisolsen70 joined06:52
← Murr left06:52
→ Murr joined06:52
→ Null_A joined06:57
← zumba_addict left07:00
← Null_A left07:01
← octetta left07:02
→ Null_A joined07:15
→ igemnace joined07:15
← ghost43 left07:16
→ ghost43 joined07:16
← ghost43 left07:17
→ ghost43 joined07:19
→ bkicher_ joined07:32
→ EvilDMP joined07:32
← Null_A left07:33
← sudoforge left07:37
← GNUmoon left07:39
→ GNUmoon joined07:41
→ feriman joined07:42
← igemnace left07:42
→ mcpackey joined07:42
→ csm3105 joined07:45
← bkicher_ left07:45
→ bkircher joined07:45
→ MajorBiscuit joined07:47
→ palasso joined07:50
← nattiestnate left07:52
→ fercell joined07:53
← jnnnnnnnnn left07:59
→ jnnnnnnnnn joined07:59
→ ThorMojito joined08:02
→ Null_A joined08:03
→ zeenk joined08:04
← mven left08:04
← unluckyshrubbery left08:06
← Null_A left08:07
← ghost43 left08:08
→ ghost43 joined08:08
← ThorMojito left08:10
← ghost43 left08:11
→ ghost43 joined08:11
← led_belly left08:13
→ iomari891 joined08:15
→ mven joined08:17
foo What does git checkout file.py do? I think I overrode it with what was already committed, right? eg. losing my unstaged changes08:21
→ Null_A joined08:21
geirha right08:21
foo geirha: then what's the difference with git checkout -- file.py08:21
?08:21
geirha it's the same. The -- just helps disambiguate it08:22
foo geirha: ohhhh, ok, thanks. :)08:22
→ led_belly joined08:23
← feriman left08:23
← Null_A left08:25
→ rkta_ joined08:31
rkta_ → rkta08:32
→ Haohmaru joined08:34
→ ThorMojito joined08:35
← mat001 left08:36
← moviuro_ left08:36
→ moviuro joined08:37
→ l4s8g_ joined08:38
← ThorMojito left08:39
→ vysn joined08:44
→ Kohe joined08:55
← junon left09:00
← Shentino left09:01
→ l4s8g___ joined09:09
← ghost43 left09:10
→ feriman joined09:10
→ ghost43 joined09:10
→ Null_A joined09:11
← l4s8g_ left09:12
shailangsa does anybody know whether copying the .git folder on its own is enough to migrate a project ?09:14
← ghost43 left09:15
→ bilbo joined09:17
→ ghost43 joined09:17
bilbo hello. i am using git to keep track of what i'm doing in a repo that has existed for years with out version control. it's a bit of a mess because automake and other tools modify hundreds of files when i configure/make. so i am wondering if it ever makes sense to just put everything in .gitignore and then make exceptions for files that i want to pay09:18
attention to?09:18
→ tsdh joined09:20
→ Shentino joined09:20
ikke shailangsa: not sure what you mean with migrating, but the .git dir does contain everything09:20
shailangsa in the new directory it keeps saying all the files are deleted?09:21
ikke 'git checkout .'09:21
shailangsa says error: pathspec '.' did not match any file(s) known to git ?09:22
geirha are you sure you're in the right directory when you run that?09:24
→ carl- joined09:24
shailangsa it seems git reset --hard was needed first09:25
→ AnapodoPsalidi joined09:26
← coot left09:28
← Null_A left09:29
← AnapodoPsalidaki left09:29
anddam chilversc: what is "git gui"?09:33
→ YuGiOhJCJ joined09:34
← Betal left09:34
Haohmaru this thing: https://i.imgur.com/WQ7zC9T.png09:37
→ ThorMojito joined09:38
← julius left09:41
← csm3105 left09:43
Walex2 lots of 'git' GUIs around, and some EMACS TUIs, and also 'brz'/'bzr' as an alternative 'git' CLI09:44
← crised left09:44
← ThorMojito left09:45
Walex2 bilbo: I think it depends on whether the tools *modify* files or *generate* them.09:45
bilbo: in general files that are generated from other files should not go into content management.09:46
bilbo: or perhaps you should have two branches, one for "original" files, and one for "original plus derived files" and merge periodically the former into the latter for building.#09:47
bilbo Walex2: right. what i'm trying now is to very tediously delete files, re-run autoconf and configure and then see if they get regenerated and then i git rm those files09:48
Walex2 bilbo: you can more easily do that with a 'diff' etc., you get them all in one go.09:50
'git status' after a build09:52
bilbo Walex2: yes, i am deleting the files that are maked as modified with git status09:53
Walex2: once i feel somewhat confident that they are being auto-generated. i guess i could delete all of them, run autoconf and configure, and if it complains i could git checkout those09:53
anddam Haohmaru: mm I see but I do not understand how <somerandomgui> that I do not know is going to help me over an actual git command09:54
geirha git clean -d -f to remove untracked files09:55
→ geowiesnot joined09:55
Walex2 anddam: for simple workflows 'git' GUIs are much more usable than the rather weird 'git' native CLI.09:56
bilbo geirha: i made the mistake of assuming they shipped a "clean dir", but it was shipped with a bunch of automake-generated stuff and i initially did git init .09:56
← PocketKiller left09:56
→ unluckyshrubbery joined09:56
geirha ah09:56
Walex2 bilbo: ideally you should have branched it... :-)09:56
bilbo: what you are trying to do is called in the jargon is a "vendor" import.09:57
→ lpapp joined09:57
lpapp git lfs is no more?09:57
→ Null_A joined09:59
→ pretty_dumm_guy joined10:00
← vaio left10:02
→ vaio joined10:02
← cliluw left10:04
← Null_A left10:04
→ cliluw joined10:04
makara1 I don't understand `git log --oneline --simplify-by-decoration`10:06
→ coot joined10:08
← jazzy left10:11
← redoc left10:11
→ dos_ joined10:12
← chexum left10:13
→ chexum joined10:14
→ csm3105 joined10:14
srinidhi Hi! I wanted to understand what is wrong with my workflow? Could someone please enlighten me?10:14
* git worktree add fix-packaging10:14
* cd fix-packaging10:14
* ... edit10:14
* git push10:14
* .. master changes10:14
* git pull --rebase origin master10:14
* ... resolve conflicts10:14
* git rebase --continue10:14
* git push origin fix-packaging <- fails10:14
* git push origin fix-packaging --force-with-lease <- fails with "(stale info)"10:14
makara1 surprsed you weren't ejected for that10:15
→ Null_A joined10:17
srinidhi (I was worried as well) I thought of breaking my messages into couple of parts.10:17
← vysn left10:17
→ PocketKiller joined10:20
→ redoc joined10:21
← dob1 left10:25
→ dob1 joined10:25
← perrierjouet left10:25
→ perrierjouet joined10:28
← shailangsa left10:28
← ghost43 left10:31
anddam makara1: "kicked"10:31
→ ghost43 joined10:31
← ghost43 left10:32
makara1 too dramaatic?10:32
→ ghost43 joined10:32
← Vonter left10:34
[twisti] srinidhi: next time, use a pastebin - google has plenty of options10:34
← Null_A left10:35
→ Vonter joined10:36
srinidhi [twisti]: I'm aware of pastebin. I use pastebin. I wasn't planning to send so many steps. But ended up with 10 steps to explain my complete workflow.10:36
I'll be careful next time.10:36
[twisti] no worries, it just sounded like you didnt know about pastebins10:41
→ ThorMojito joined10:42
→ julius joined10:42
← ishutin left10:46
← ThorMojito left10:49
→ ishutin joined10:50
makara1 so what's the problem? Did you fetch before force-with-lease push?10:50
← mic4ael left10:59
← AbleBacon left11:00
→ TheCatBehemoth joined11:00
→ ThorMojito joined11:02
← adanwan left11:02
← dos_ left11:02
← coot left11:02
→ adanwan joined11:02
← ghost43 left11:05
→ ghost43 joined11:05
→ crised joined11:06
← ThorMojito left11:08
← feriman left11:10
← lpapp left11:10
← kaiseisei left11:12
→ feriman joined11:12
← crised left11:12
← eroux left11:13
→ mic4ael joined11:18
→ Null_A joined11:20
→ donofrio joined11:20
→ d1b_ joined11:20
← karabaja4 left11:21
→ ThorMojito joined11:21
← d1b left11:21
d1b_ → d1b11:23
→ teut joined11:23
← YuGiOhJCJ left11:23
← ghost43 left11:24
→ ghost43 joined11:24
← ThorMojito left11:28
→ crised joined11:29
← atrigent left11:31
→ atrigent joined11:33
→ karabaja4 joined11:34
← dob1 left11:36
← Null_A left11:38
→ coot joined11:38
→ dob1 joined11:39
← vishal left11:39
→ va5c0 joined11:41
→ vishal joined11:41
→ ThorMojito joined11:41
← ackyshake left11:41
→ lgc joined11:44
→ Sulky joined11:45
← lgc left11:47
← ThorMojito left11:49
→ FH_thecat joined11:54
← FH_thecat left11:55
← Akiva left11:55
→ eroux joined12:01
→ goodfella joined12:02
goodfella hi12:02
git status shows files that are not part of the repo ..12:03
← whatsupdoc left12:03
goodfella within the repo directory i run git status and it show files ../<all of $HOME>12:03
selckin sounds like you have a git repo in $HOME12:04
goodfella selckin: is there a way to check what actual repo it is ?12:06
i really use onyl git clone and git push tbh12:07
selckin git rev-parse --show-toplevel12:07
← ghost43 left12:11
goodfella is doing git clone while in /home/<user> will make a git repo ?12:11
within $HOME ?12:11
i thought it will do .git within the cloned directory12:11
→ Null_A joined12:11
→ ghost43 joined12:11
selckin it wil12:13
← va5c0 left12:14
srinidhi makara1: yes. I am the only one working on this branch. But still, I ran "git pull" before making changes or rebasing and pushing.12:15
goodfella selckin: what is the cleanest way to get rid of this unknown repo12:16
srinidhi the problem is that I need to always run "git push --force"12:16
selckin goodfella: delete it, or maybe move it somewhere else as a backup12:16
→ va5c0 joined12:17
→ bartman joined12:20
srinidhi my specific question is whether "git pull origin master --rebase" while staying on my branch is a bad idea?12:21
← goodfella left12:23
selckin its a common workflow12:23
← Null_A left12:26
← ghost43 left12:28
srinidhi that's what I gathered from online posts. But then why do I have to always use "git push --force"?12:28
→ ghost43 joined12:28
selckin because you are rewriting history, and thats not nice on branches that are shared with other people12:28
srinidhi I asked this same question a few weeks back - but I couldn't get any answers or I couldn't understand properly.12:28
selckin: like I mentioned, I'm the only one working on this branch.12:29
and only from one system / git workarea12:29
selckin thats why its not a problem, some people prefer a nice clean history and commits that implement single features and work, other people prefer a clusterfuck or corss merges and fixup commits (guess which i like)12:30
srinidhi I'm not rebasing "onto master" - but I want to rebase my branch with master.12:30
selckin so feature branches, rebase on master, or change commits as you want, then merge into master, never rewrite history on master12:31
← Kohe left12:33
srinidhi yes. this is what I've been doing for years. I never "rebase on to master"12:35
but recently, I switched to using the git worktree workflow. now I can't seem to do simple "git pull" and "git push"12:35
← dob1 left12:35
srinidhi I need to provide "origin <branch>" every time - this is why I'm asking is my workflow wrong? Am I messing up my history in my feature branch by using the wrong args?12:36
selckin never used worktrees12:36
srinidhi what is making me slightly nervous is that my Pull Requests (Github enterprise) is having these force pushed messages with incorrect dates.12:40
← jnnnnnnnnn left12:40
srinidhi for my next feature branch, I should try "git merge --squash" to merge master on to my branch and try out that workflow.12:40
→ jnnnnnnnnn joined12:41
selckin that sounds like a terrible idea12:42
→ skapata joined12:42
← skapata left12:42
→ skapata joined12:42
selckin google suggests you have to update every worktree individually12:42
← adanwan left12:43
→ adanwan joined12:44
→ tyson2 joined12:45
→ igemnace joined12:46
← zeenk left12:49
→ dob1 joined12:50
← Murr left12:52
→ Murr joined12:52
← dob1 left12:52
→ vanessa joined12:53
→ ThorMojito joined12:56
→ julius2 joined12:59
→ darkbit joined12:59
← julius left13:00
← ghost43 left13:03
→ ghost43 joined13:03
← julius2 left13:06
← Vonter left13:08
→ dviola joined13:10
← iomari891 left13:12
→ iomari891 joined13:12
→ Null_A joined13:16
→ Vonter joined13:18
→ Adoi joined13:22
← vanessa left13:23
← YellowSuB left13:23
→ YellowSuB joined13:25
← ghost43 left13:28
osse How do I --renormalize one file?13:28
→ ghost43 joined13:29
→ zeenk joined13:31
osse It seems I can just do git add --renormalize onefile13:32
← Null_A left13:32
osse but the manpage is unclear, or flat out wrong. not sure yet.13:32
man git-add13:32
gitinfo the git-add manpage is available at https://gitirc.eu/git-add.html13:32
osse "Apply the "clean" process freshly to all tracked files (...)"13:32
→ masoudd joined13:33
→ dob1 joined13:38
makara1 osse: what's the problem though?13:41
osse makara1: with the docs?13:41
makara1 did you set your .gitattributes file first?13:41
that would be a meta problem13:41
← geowiesnot left13:41
makara1 were you able to renormalize one file?13:42
osse The problem was only that I thought add --renormalize didn't accept specific files, but it actually does13:42
yes, git add --renormalize some/file works well.13:42
← fbiagent__ left13:42
osse I was tricked by the "to all tracked files".13:42
henk interactive rebasing to clean up (i.e. fix/squash commits) a development branch before merging it into master using just 'git log' and 'git rebase' seems very tedious. can anyone recommend tools to make it easier? especially figuring out which commits I want to squash is a bit cumbersome IMHO …13:43
makara1 ok. Sometimes it requires `git rm --cached -r file; git reset --hard` otherwise the old line ending keep coming back13:43
selckin keep track during development, don't leave it till the end13:44
← va5c0 left13:45
← mcpackey left13:45
← ThorMojito left13:45
→ ThorMojito joined13:46
→ bloody joined13:46
→ sh0ne joined13:46
makara1 henk: a few suggestions. use the new merge.conflictstyle = zdiff3. Also turn on rerere. Up your merge.renamelimit. Configure a merge.tool (I use atom)13:47
→ Null_A joined13:47
makara1 when im asked to do surgery on a branch I usually first figure out the uniq commits with `git rev-list master..branch --no-merges | tac > /tmp/cherries` and then pick them onto a new master-fork13:49
henk makara1: these all seem to be about merges and conflicts, not about cleaning up a feature-branch by squashing commits _before_ merging.13:49
← csm3105 left13:50
→ gh34 joined13:50
makara1 henk: git reset ff88ee; git add .; git commit -m "Squashed"13:51
am i missing something?13:51
selckin think he wants a gui to easily view the diffs and mark which commits to merge/fixup/squash together13:52
→ sgen joined13:53
← mannequin left13:53
henk makara1: oh, yes: the part where I have not been too careful keeping different things different :D it’s actually not a feature-branch as in "one feature" but a devel-branch in the sense of "I just mess around there and do a lot of different things to get to the next 'release candidate' but now I should probably squash some of the related stuff together so it’s not 25 commits of which about 20% cancel each13:55
other out but only 10 which are almost 'clean' in a way"13:55
makara1 well im quite happy with tig, buts thats just for viewing. Are you sure you're making the most of rebase -i? You known you don't have to write out "squash" you can just say "s". Also, you can reorder commits at this time13:55
henk selckin: yeah, or tui13:55
osse henk: try to figure out before committing whether a particular change should be squashed, and if so use git commit --fixup13:55
I use git blamediff for this13:55
henk osse: I do that, but only sometimes. I still forget too often /-:13:56
← igemnace left13:56
→ _sgen joined13:57
osse in that case it is tedious, yes13:57
henk makara1: yes, I know about that. and I learned about tig recentlyish, so maybe having that open in one window/tmux-pane and doing the rebasing in another is good enough … I’ll give it a go.13:57
→ igemnace joined13:58
osse you can git log --stat to get an idea of which commits touch the same files13:58
→ csm3105 joined13:58
henk I found lazygit which seems to make this kind of thing easier, but it does other things that annoy me so I haven’t really tested yet … does anyone here use it?13:58
osse try to use git commit --fixup as much as possible, and then use git rebase --interactive --keep-base --autosquash @{u} (suggestion: alias to git rewrite)13:58
selckin i use rebase -i in one windows, and gitk to read the diffs, but usually keep on top of keeping things clean during develop too, never too much to clean up13:59
henk osse: tig also shows these stats atop the diff13:59
yeah, I don’t have the discipline to use --fixup consistently /-: sadly. working on it.14:00
← ghost43 left14:01
→ ghost43 joined14:01
← Null_A left14:04
← _sgen left14:08
← sgen left14:08
→ pyevery__ joined14:09
← dtrainor left14:10
selckin only thing i would want was to change the commit message in the rebase -i itself14:10
← ghost43 left14:11
selckin since first step is to reorder all the commits, then i want to mark somehow the ones to squash (edit commit message for example), then do final review, then squash14:11
osse selckin: you can add a exec git commit --amend -m line14:11
→ dtrainor joined14:11
osse but then you'll lose the message if it's multiline I guess14:11
→ drbeco joined14:12
selckin hmm, that sounds ideal can probably write a script to exec to prepend a string to the commit message ?14:12
henk hah! seems I have been disciplined enough that I can keep most commits, mostly need to squash adjacent commits, and barely need to reorder anything (:14:13
→ ghost43 joined14:13
osse in that case maybe you focus on using commit --amend instead of --fixup :p14:15
→ Null_A joined14:18
← tejr left14:18
→ tejr joined14:19
← ffl^ left14:19
→ dos_ joined14:20
→ dtrainor_ joined14:20
← ThorMojito left14:22
← dtrainor left14:22
← Xenguy left14:22
→ ThorMojito joined14:23
→ julius joined14:26
→ zer0bitz joined14:27
← sh0ne left14:27
→ cdown joined14:32
← Vonter left14:33
← dtrainor_ left14:33
→ dtrainor joined14:34
← dtrainor left14:36
→ dtrainor joined14:36
← Null_A left14:36
← Misotauros left14:48
→ va5c0 joined14:49
→ ChmEarl joined14:49
← cdown left14:50
→ DoofusCanadensis joined14:52
← Murr left14:52
→ Murr joined14:52
henk osse: nah, then I can’t use 'reset'14:53
← eroux left14:54
→ dtrainor_ joined14:54
← dtrainor left14:54
← zulutango left14:55
→ pulse joined14:55
osse huh?14:56
selckin my reaction too, but think he means undo/revert only those parts14:57
→ vysn joined14:58
→ cvmn joined14:59
← causa_sui left15:00
henk yes. if my 'fix' does not work, I cannot simply reset it when I used --amend. I can when I used --fixup as long as I did not squash yet.15:02
→ subopt joined15:03
← tyson2 left15:03
→ AbleBacon joined15:04
osse how do you test whether the fix works?15:05
→ Null_A joined15:05
henk this is a puppet module repo. so I push, the branch gets deployed on the puppet server as an environment, then I run the puppet agent on a test machine in that environment. if it does what I want, it worked.15:07
← ThorMojito left15:08
← ghost43 left15:09
→ ghost43 joined15:09
← Null_A left15:10
→ mat001 joined15:10
→ cdown joined15:10
← dos_ left15:11
← ghost43 left15:12
→ Maxattax97 joined15:12
→ Kohe joined15:12
→ dos_ joined15:12
→ great_taste joined15:13
← anaveragehuman left15:13
→ ghost43 joined15:14
→ crashrep joined15:15
← bkircher left15:17
→ bkircher joined15:17
← dtrainor_ left15:17
→ dtrainor joined15:18
→ andrade joined15:18
→ anaveragehuman joined15:19
← teut left15:21
← RiFo left15:23
→ kadobanana joined15:23
← mud left15:23
→ ThorMojito joined15:29
→ cdown_ joined15:34
← Maxattax97 left15:36
← cdown left15:37
← vysn left15:38
← subopt left15:39
→ vysn joined15:40
← cdown_ left15:41
→ bambanxx joined15:43
→ marc-o joined15:45
→ thiago joined15:46
→ zulutango joined15:46
→ cdown joined15:47
← cvmn left15:48
→ joel135 joined15:51
joel135 hello, i have made some local commits but i should have put them on a new branch. is there a simple way to fix this?15:52
→ Cera joined15:53
furrymcgee reset15:53
mackerman Create the new branch, then reset15:55
→ benni joined15:55
joel135 thanks, found this https://stackoverflow.com/questions/1628563/move-the-most-recent-commits-to-a-new-branch-with-git#:~:text=If%20you%20want%20to%20move%20commits%20to%20an%20existing%20branch,first%2C%20they%20will%20be%20lost.15:55
(second paragraph for new branch)15:55
→ Rashad joined15:56
← Rashad left15:57
← dtrainor left15:57
→ dtrainor_ joined15:57
→ roadie joined15:57
← geirha left15:57
joel135 i am running `git rebase -i HEAD~3` now, to edit some commit messages15:59
roadie hello, how do I fork a github project (jekyll theme)? and what is the difference to cloning if any? I usually clone themes I like - is that good enough to use them and change them if I never update them?16:00
joel135 i get a text editor window with three lines like `pick 583298d <my old message>`16:00
→ Misotauros joined16:00
joel135 am i allowed to edit the message here, or do i do it somewhere else?16:00
→ Rashad joined16:01
mackerman roadie: Ask ##github channel about forking16:01
Forking is a thing hosting providers invented, copying a repo into your own namespace. It is not native to git.16:02
→ RiFo joined16:02
roadie found it - cloning local machine / forking on github - all good then - cloning is what I want16:03
← cdown left16:03
roadie thank you16:03
mackerman git clone is a thing yes, downloads entire repo.16:03
← crashrep left16:04
furrymcgee did they invent gitnamespaces?16:04
roadie git is such a nice program16:04
joel135 woohoo - i successfully changed the commit messages!16:05
→ cdown joined16:07
← otisolsen70 left16:09
mackerman I don't know who invented refs/namespaces16:09
→ otisolsen70 joined16:09
← dos_ left16:10
mackerman Of course that's thing in core git. Maybe I should explain forking as copying to your personsal user, to not imply anything about the implementation.16:10
← andrade left16:10
← va5c0 left16:11
→ geirha joined16:13
← Rashad left16:14
→ Null_A joined16:15
→ va5c0 joined16:15
→ zebrag joined16:16
→ rsx joined16:17
← ghost43 left16:18
→ ghost43 joined16:18
→ tyson2 joined16:19
← csm3105 left16:20
→ Maxattax97 joined16:23
← ano left16:24
→ ano joined16:24
← cdown left16:25
→ cdown joined16:27
→ cvmn joined16:29
← arch-angel left16:30
← Null_A left16:31
→ xkuru joined16:31
→ cdown_ joined16:32
← jnnnnnnnnn left16:32
← bambanxx left16:32
→ crashrep joined16:33
← cdown left16:34
→ Common-Lisp joined16:34
cdown_ → cdown16:34
→ bn_work joined16:37
→ jnnnnnnnnn joined16:38
← crashrep left16:38
← vysn left16:38
osse joel135: I take it you found out it's somewhere else :P16:42
joel135 yes stackoverflow16:43
it felt a little dangerous, that rebase, but it worked16:43
→ Swahili joined16:46
← furrymcgee left16:47
→ ___nick___ joined16:51
← skapata left16:51
→ orbyt joined16:51
← Murr left16:51
→ geowiesnot joined16:52
→ Murr joined16:52
→ mannequin joined16:52
← DoofusCanadensis left16:54
osse joel135: my somewhere else I meant you figured out you do it (ie. change message) somewhere else16:58
← Common-Lisp left16:59
osse joel135: rebase is perfectly natural. it's not a sin. all teenagers do it16:59
joel135 heh :p16:59
→ Rashad joined16:59
→ Null_A joined16:59
← MajorBiscuit left17:02
← coot left17:03
← Null_A left17:04
→ wootehfoot joined17:05
→ frm joined17:07
→ toma joined17:07
→ Akiva joined17:07
← frm left17:07
→ subopt joined17:10
← mexen left17:11
← benni left17:13
→ dirigible_ joined17:15
→ crashrep joined17:15
→ sudoforge joined17:15
← ghost43 left17:16
→ Null_A joined17:16
← Maxattax97 left17:16
→ ghost43 joined17:16
← ghost43 left17:16
← dirigible left17:18
← va5c0 left17:18
→ ghost43 joined17:20
→ va5c0 joined17:20
→ vicfred joined17:20
← mw_ left17:22
← Cera left17:23
← l4s8g___ left17:24
← Haohmaru left17:24
→ coot joined17:24
→ mw_ joined17:25
← saroy left17:25
→ l4s8g_ joined17:27
→ txtsd joined17:27
← ___nick___ left17:32
→ ___nick___ joined17:34
← Null_A left17:34
← Rashad left17:34
← ___nick___ left17:35
← feriman left17:36
← duxsco left17:36
→ duxco joined17:36
← duxco left17:36
→ ___nick___ joined17:36
→ duxsco joined17:37
← ThorMojito left17:37
→ t3nj1n joined17:37
← duxsco left17:37
→ t3nj1n_ joined17:37
→ duxco joined17:37
← Adoi left17:38
← duxco left17:38
→ duxsco joined17:38
← duxsco left17:38
← pulse left17:40
← toma left17:42
← crised left17:43
→ tulpa_ joined17:43
GD-IRC can you git log multiple paths?17:44
like `git log main src/c-writer.cc src/tools/wasm2c.cc ...` kinda stuff?17:44
ikke sure17:44
GD-IRC: from man git log: "git log [<options>] [<revision-range>] [[--] <path>...]"17:45
gitinfo GD-IRC: the git-log manpage is available at https://gitirc.eu/git-log.html17:45
ikke note the ... after <path><17:45
which means it can be repeated17:45
GD-IRC and this is the best way to maintain a fork?17:45
ikke What do you mean with maintaining a fork?17:46
GD-IRC or do you just merge the whole thing at once instead of each individual commit?17:46
ikke: https://github.com/SoniEx2/wasm2kotlin17:46
ikke in git, you typically merge history (entire branches), not individual commits17:46
You can work with cherry-pick for example to only pick certain commits17:46
but in the long run that would become harder and harder to maintain as the history would diverge more and more17:47
GD-IRC yeah but individual commits are bite-sized which makes it easier to keep track of merge progress17:47
so e.g. you can "git log main ..." and then "git merge --no-commit next-commit" then adapt the changes to the relevant files and then do it all over again with the new next commit17:48
ikke GD-IRC: maybe look into !imerge17:48
gitinfo GD-IRC: https://github.com/mhagger/git-imerge -- a tool to split a large merge with many conflicts into many smaller merges, hopefully each with easier-to-understand small conflicts.17:48
GD-IRC this doesn't have many conflicts17:48
ikke many conflicts are not required17:49
GD-IRC but yes this is basically what we want17:49
ikke but if there are conflicts, they are limited to changes from individual commits rather than all commits17:49
GD-IRC honestly tho, wasm2kotlin mostly tracks wasm2c, so we need to "replay" the commits that apply to wasm2c, on wasm2kotlin17:51
and it's easier to do that by doing each one individually instead of all at once17:51
ikke GD-IRC: possibly rebasing the commits then17:51
GD-IRC it's a manual process that can't really be automated with git merge, and imerge might not be able to automate it either17:51
ikke solving conflicts is not automatable by definition17:52
but the process can be made easier with tools17:52
GD-IRC hmm, imerge rebase-with-history looks neat, but we don't want merge commits for each upstream commit17:53
"full" looks horrifying17:54
→ rgrinberg joined17:56
→ Maxattax97 joined17:58
→ crised joined17:59
← carl- left17:59
← bilbo left18:02
← great_taste left18:08
← cvmn left18:08
← cdown left18:10
← pretty_dumm_guy left18:12
→ ThorMojito joined18:13
← pyevery__ left18:13
→ pyevery__ joined18:14
← xx left18:14
→ xx joined18:15
→ pretty_dumm_guy joined18:17
← crashrep left18:18
← julius left18:19
← pyevery__ left18:19
← crised left18:21
→ phrix joined18:22
→ crised joined18:23
← ghost43 left18:23
→ ghost43_ joined18:23
→ duxsco joined18:23
← duxsco left18:23
← anaveragehuman left18:24
→ anaveragehuman joined18:24
← l4s8g_ left18:25
→ iffraff joined18:26
→ vdamewood joined18:29
← ThorMojito left18:30
→ ThorMojito joined18:32
→ yagamilito joined18:36
→ emf joined18:38
← rgrinberg left18:39
→ john_johnk joined18:41
← phrix left18:42
→ pulse joined18:42
← bartman left18:43
→ rgrinberg joined18:43
→ emf_ joined18:46
← yagamilito left18:46
← ThorMojito left18:46
← emf left18:48
← anaveragehuman left18:51
→ anaveragehuman joined18:52
→ ThorMojito joined18:53
→ pyevery__ joined18:54
→ julius joined18:57
→ crashrep joined19:00
← chexum left19:04
→ chexum joined19:05
← ghost43_ left19:07
→ ghost43 joined19:07
→ toma joined19:08
→ MajorBiscuit joined19:09
→ SJrX joined19:14
SJrX Anyone know how I can get rid of the "pager" or whatever makes me hit ":q" at the end of a git diff.19:15
→ Null_A joined19:15
← xx left19:17
→ cvemys joined19:18
ikke git --no-pager <cmd>..19:18
← Maxattax97 left19:19
← tyson2 left19:19
→ ThePhilgrim joined19:20
ikke If you want to permanently disable it: git config --global core.pager cat19:20
← tulpa_ left19:20
← ThePhilgrim left19:20
SJrX Thank you!19:22
→ ThePhilgrim joined19:22
← ghost43 left19:23
→ ghost43 joined19:23
→ AnapodoPsalidaki joined19:24
← darkbit left19:25
← AnapodoPsalidi left19:25
→ tyson2 joined19:28
→ Fubbebubbe joined19:32
← Fubbebubbe left19:32
→ Fubbebubbe joined19:32
← Null_A left19:32
← Fubbebubbe left19:33
→ Fubbebubbe joined19:33
→ duxsco joined19:33
← masoudd left19:34
← Fubbebubbe left19:34
→ enoq joined19:35
← vitali64 left19:35
→ yagamilito joined19:36
→ Fubbebubbe joined19:36
← rgrinberg left19:36
← Fubbebubbe left19:36
← bkircher left19:39
→ bkircher joined19:39
→ Lord_of_Life_ joined19:46
← rsx left19:46
← Lord_of_Life left19:47
Lord_of_Life_ → Lord_of_Life19:48
← MajorBiscuit left19:49
← coot left19:52
→ csm3105 joined19:55
← pyevery__ left19:57
← subopt left19:58
OnlineCop Can the core.pager pass commands to cat, such as `cat -n` to see line numbers?20:00
→ coot joined20:00
→ jstein joined20:01
→ Null_A joined20:02
← csm3105 left20:02
← ghost43 left20:02
ikke OnlineCop: It should20:03
→ ghost43 joined20:03
ikke The documentation has examples of passing options to less20:04
← Null_A left20:07
← tehenderz left20:08
← iomari891 left20:08
→ tehenderz joined20:08
→ shokohsc4 joined20:08
← julius left20:09
← shokohsc left20:10
shokohsc4 → shokohsc20:10
→ qwert joined20:11
→ feriman joined20:12
→ Tangent-Man joined20:17
→ Null_A joined20:20
← ghost43 left20:20
→ ghost43 joined20:20
→ rafasc joined20:23
← rafasc left20:23
→ rafasc joined20:23
→ bartman joined20:25
→ Sulky_ joined20:25
← duxsco left20:26
← Sulky left20:29
← TheCatBehemoth left20:29
← ThorMojito left20:31
→ pyevery__ joined20:31
→ DoofusCanadensis joined20:32
← coot left20:34
→ jazzy joined20:35
← pyevery__ left20:36
→ welovfree joined20:37
→ rgrinberg joined20:38
← Null_A left20:41
→ m0viefreak joined20:47
→ duxsco joined20:48
← ThePhilgrim left20:51
← Murr left20:51
→ Murr joined20:52
← mrkajetanp left20:54
← welovfree left20:55
→ mrkajetanp joined20:56
→ pyeveryt_ joined21:04
← ___nick___ left21:04
← GNUmoon left21:05
← ghost43 left21:05
→ ghost43_ joined21:05
→ Sulky__ joined21:05
← rgrinberg left21:06
← igemnace left21:07
← Sulky_ left21:08
← mw_ left21:08
← zeenk left21:08
→ igemnace joined21:08
→ rgrinberg joined21:10
→ mw_ joined21:11
→ ThorMojito joined21:11
← ghost43_ left21:12
→ ghost43 joined21:13
← vdamewood left21:14
← bkircher left21:15
← igemnace left21:16
→ igemnace joined21:17
← ThorMojito left21:24
← polyrob left21:24
→ Null_A joined21:24
→ polyrob joined21:25
← igemnace left21:26
← pyeveryt_ left21:26
→ igemnace joined21:27
← rgrinberg left21:28
← Null_A left21:29
→ rgrinberg joined21:30
← igemnace left21:35
→ igemnace joined21:37
→ auk joined21:38
← wootehfoot left21:44
← igemnace left21:45
→ igemnace joined21:46
← rgrinberg left21:48
← crashrep left21:49
← john_johnk left21:52
→ great_taste joined21:53
→ jimklimov joined21:54
← orbyt left21:56
→ cdown joined21:57
→ GNUmoon joined22:03
← rafasc left22:03
→ Adoi joined22:03
← zer0bitz left22:04
← qwert left22:07
← otisolsen70 left22:10
← enoq left22:12
→ Null_A joined22:17
osse SJrX: pro-tip, you only have to press q :p22:17
→ junebug joined22:18
→ ThorMojito joined22:19
← geowiesnot left22:19
← ghost43 left22:20
→ ghost43 joined22:20
← ghost43 left22:21
→ ghost43 joined22:21
← cdown left22:22
← shokohsc left22:22
→ shokohsc joined22:23
← BrianBlaze left22:26
← igemnace left22:26
← nyuszika7h left22:27
← shokohsc left22:28
→ shokohsc joined22:28
← junebug left22:29
→ junebug joined22:29
→ igemnace joined22:30
← duxsco left22:33
← igemnace left22:33
← Null_A left22:33
→ BrianBlaze joined22:34
← ThorMojito left22:34
← yagamilito left22:35
← Strom left22:38
→ Strom joined22:40
→ geowiesnot joined22:41
← currybullen left22:50
← toma left22:57
← emf_ left22:58
→ emf joined23:01
→ Null_A joined23:01
← gh34 left23:02
→ rgrinberg joined23:03
→ pizdets_ joined23:04
← jstein left23:04
← pizdets left23:04
← Null_A left23:05
← Adoi left23:07
← ghost43 left23:09
→ ghost43 joined23:09
← GNUmoon left23:11
← rgrinberg left23:12
← FFY00_ left23:15
→ ferdna joined23:18
← mat001 left23:18
← ghost43 left23:20
→ Null_A joined23:20
→ ghost43 joined23:20
← TonyStone left23:22
→ TonyStone joined23:23
→ GNUmoon joined23:23
→ Xenguy joined23:24
← tyson2 left23:25
→ FFY00 joined23:27
→ igemnace joined23:30
← TonyStone left23:31
→ TonyStone joined23:32
← igemnace left23:35
← cliluw left23:35
← jrm left23:35
← kenanmarasli left23:35
→ cliluw joined23:35
→ igemnace joined23:36
← Null_A left23:38
← palasso left23:38
→ ackyshake joined23:39
← igemnace left23:42
→ igemnace joined23:42
→ whatsupdoc joined23:43
← anaveragehuman left23:46
← feriman left23:48
→ mat001 joined23:55

Logs Search ←Prev date Next date→ Channels Documentation