IRCloggy #git 2021-06-21

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.

2021-06-21

← ultralisk left00:09
← thelounge66 left00:09
← lucerne left00:09
→ arcatech joined00:13
→ hmmmas joined00:21
← Murr left00:23
→ Murr joined00:23
→ wallbroken joined00:24
wallbroken hello00:24
git push -u origin multi-user:multi-user00:24
! [rejected] multi-user -> multi-user (non-fast-forward)00:24
i explain what my goal is:00:25
i had 2 branch00:26
1) multi-user00:26
2) multi-user-registration00:26
my goal is remove multi-user00:26
and then rename multi-user-registration to multi-user00:26
BtbN renaming branches is not a thing I believe00:27
just force push the desired commit there00:27
wallbroken so on the client side i removed multi-user branch00:27
then i renamed multi-user-registration00:27
to multi-user00:27
but something gone wrong00:27
BtbN You're trying to do a non-fast-forward push00:28
can't do that without force00:28
wallbroken what does it mean00:28
BtbN Keep in mind that anyone trying to pull that will get issues after that00:28
so don't force-push branches people actively use00:28
← lgc left00:28
wallbroken is there anybody here able to help me with my current problem?00:30
BtbN I just told you what the problem is?00:31
You can't just push unrelated commits on top of one another00:31
if you want to overwrite the remote branch anyway, you need to --force push00:32
Just be aware of the issues that brings if the branch is in shared use00:32
wallbroken no, it's not clear what the problem is00:33
BtbN If you are fine with overwriting the history, just force push, reylly00:33
*really00:33
wallbroken ...00:33
your explaining sucks00:34
BtbN I can't explain the entirety of gits inner working to you in a few lines of chat...00:34
If you don't understand how branches and remotes work, I'm not sure it's possible to explain this00:34
wallbroken i came across this problem some time ago and i wrote this: https://dpaste.org/4bkr00:35
but it looks like not working00:35
BtbN You can't really "rename" branches00:36
you just make a new one, (re)set it to the desired commit, and delete the old one00:36
If it's not already on the right commit to begin with00:36
Same if the "new" one already exists. Just reset it to the desired commit00:37
reset --hard if you don't care about anything in there00:37
or in your working tree. So be careful with hard resets00:37
wallbroken well, to troubleshot the problem i thing you should have me asking some traceback logging00:38
BtbN To troubleshot a non-fast-forward push?00:38
wallbroken you don't know what my current situation is00:38
BtbN You're quite literally just missing --force00:38
wallbroken which branches are still alive00:38
you don't know anything bout this00:39
and i don't want to destroy projects00:39
→ thelounge66 joined00:39
BtbN Well, I told you the repercurssions of it. I can't know your projects structure or manage it for you. You will need to figure that out yourself.00:39
→ lucerne joined00:40
BtbN If it's literally only you working on those branches, and you want to delete it anyway, just force push really00:40
wallbroken then i'll wait for somebody else which will help me in a non dangerous way00:40
BtbN lol00:40
← hegstal left00:41
→ bddba joined00:41
BtbN Nobody will be able to give you that kind of help, unless you literally hire someone to do it for you00:41
OMGOMG i mean, good instincts to avoid the -f, honestly00:41
→ nyah joined00:42
BtbN The goal is to rename a branch, you very much need to force push for that no matter what00:42
You can probably shift around it by deleting it on the remote first, but the end result will be the same as when you force pushed00:42
wallbroken cbreak helped me in a efficient way00:42
OMGOMG BtbN: yeah, be more efficient, seriously00:43
BtbN This is IRC, not some helpdesk that's paid of some software you paid for.00:44
If you want someone to do work for you, this is not the place00:44
wallbroken "if you want someone to do work for you" ?00:44
BtbN If you want to understand git and have specific issues with it, this is the place00:44
wallbroken what are you saying?00:44
which work?00:44
i came into a problem just "making my own work"00:45
BtbN You are treating this channel like a paid helpdesk. It is not.00:45
wallbroken ...00:45
← ano left00:45
wallbroken it just surprises me that you give suggestion without wanting to know what the current situation is00:45
how many branhes i have both local and remote side00:46
BtbN You came with a specific problem, and I gave you a ton of info regarding that specific problem00:46
wallbroken which command i already executed00:46
BtbN I'm not going to ask the personal backstory of everyone asking a question here00:46
You showed the output of a failing push, what do you mean which command you executed?00:46
wallbroken because it's not the only command i executed00:47
that's for you is a not important detail?00:47
OMGOMG BtbN: man, i can't believe how inefficient you are00:47
BtbN It's not overly important how you got into that situation really. It's a non-fast-forward push00:47
wallbroken OMGOMG: GO AWAY00:47
BtbN The solution is to either not do that, or to force push00:47
Which one is correct depends on if you are okay with altering the remotes history. Which I told you about twice.00:48
wallbroken BtbN: seriously, there are some other details to consider00:48
BtbN Well, if you know about them, why didn't you provide them?00:48
wallbroken idk why on github i have old branches00:48
locally i have the new ones00:49
https://github.com/ClaudioViti/lookbook00:49
here you can see single-user, multi-user, multi-user-registration00:49
ok?00:49
BtbN what?00:49
wallbroken what?00:49
BtbN You mean your local branches are ahead of the remote ones on Github?00:50
Or are they completely detached, and you can't push them?00:50
because your changes are non-fast-forward00:50
OMGOMG i bet cbreak would ask way more efficient questions than that00:51
wallbroken https://www.dropbox.com/s/yw9ja7uq8jrb780/untitledd2.png?dl=000:52
BtbN: see here00:52
OMGOMG: go away00:52
BtbN That's your local branches and the remote branches, yes.00:52
Nothing overly special there00:52
→ PaMeDa joined00:52
wallbroken locally i have the -registration renamed00:53
and the old multi-user deleted00:53
but remotely i still have the old situation00:53
githt?00:53
BtbN So force-push the multi-user branch, and then delete the -registration one on the remote.00:53
_if_ a force push works for your project situation00:54
if that's the case, I cannot tell you00:54
→ ano joined00:54
wallbroken well but when i wrote that mini tutorial00:54
all was working00:54
why now is no more working?00:54
BtbN You "renamed" the branch locally, yes00:54
Github does not care what you do locally until you push it00:54
assuming your working dir is clean, that rename procedure is equialent of hard-resetting multi-user to ..-registration, and then deleting the later00:55
→ sheepduck joined00:55
← apauli left00:55
wallbroken but is what i've done00:56
why when i do push i get an error?00:56
BtbN Because you are trying to do a non-fast-forward push00:56
wallbroken multi-user that now i see on client side is the multi-user-registration after renaming00:56
BtbN you can only (non-force) push commits that are direct children of the remote HEAD00:56
wallbroken i don't get this point00:56
what is non-fast-forwwrd push?00:57
BtbN a push that's not only directly child commits of the remote HEAD00:57
← nyah left00:57
BtbN i.e. you are rewriting history00:57
OMGOMG BtbN: i can't believe you didn't explain this until now00:57
← schmillin_ left00:57
→ schmillin joined00:58
← mns left01:00
wallbroken BtbN: if i do -f i'll loose the history?01:02
← patchie left01:03
→ patchie joined01:03
← thiago left01:07
→ betelgeuse joined01:09
← schmillin left01:18
← mikail left01:21
← reillybrogan left01:23
← bddba left01:25
← Adoi left01:25
→ Murr- joined01:31
← Murr left01:31
→ bddba joined01:31
Murr- → Murr01:31
← bddba left01:31
→ pete443 joined01:36
← pete443_ left01:36
→ igemnace joined01:38
→ blue_penquin joined01:39
← igemnace left01:39
→ igemnace joined01:40
→ aquijoule__ joined01:43
→ vicfred joined01:44
← aquijoule_ left01:45
← m0viefreak left01:47
← frobnic left01:48
→ frobnic joined01:48
→ reillybrogan joined02:00
→ AnAverageHuman joined02:02
→ consolers joined02:02
consolers anyone have git-instaweb working with lighttpd to export a single repository?02:03
→ discipulus joined02:08
→ jetchisel joined02:14
→ vicfred_ joined02:18
← consolers left02:20
← vicfred_ left02:20
← vicfred left02:21
← Murr left02:23
→ Murr joined02:23
s17 k02:31
→ finn_elija joined02:36
← FinnElija left02:36
finn_elija → FinnElija02:36
→ mrquincy_ joined02:38
← Xenguy left02:44
← pretty_dumm_guy left02:46
→ mns joined02:54
← gco left02:57
→ Jonno_FTW joined02:58
→ bin101 joined02:59
← skapata left03:24
→ gco joined03:25
← Karyon left03:26
→ Karyon joined03:29
→ hackinghorn joined03:33
→ Lord_of_Life_ joined03:35
← arcatech left03:36
← Lord_of_Life left03:36
Lord_of_Life_ → Lord_of_Life03:36
→ x88x88x joined03:39
← zebrag left03:39
← gast0n left03:53
← forgotmynick left03:58
→ Murr- joined04:00
→ R2robot_ joined04:00
→ jazzy2 joined04:00
→ thelounge661 joined04:01
→ ThorMojito1 joined04:01
→ cornduk joined04:02
→ LouWestin_ joined04:02
→ betelgeuse7 joined04:02
→ reinhardt joined04:02
→ patchyy joined04:02
→ blue_penquin_ joined04:02
→ randm_ joined04:02
→ FFY00_ joined04:02
→ hnOsmium0001_ joined04:03
→ finn_elija joined04:04
← FinnElija left04:04
finn_elija → FinnElija04:04
→ sudoforg1 joined04:04
→ LuKaRo_ joined04:04
→ chronon_ joined04:05
→ thunfisch_ joined04:05
→ apauli joined04:05
→ Karyon_ joined04:07
→ reillybrogan_ joined04:08
→ bin101_ joined04:09
← Karyon left04:09
← gco left04:09
← bin101 left04:09
← Murr left04:09
← reillybrogan left04:09
← frobnic left04:09
← blue_penquin left04:09
← betelgeuse left04:09
← patchie left04:09
← PaMeDa left04:09
← thelounge66 left04:09
← cronos left04:09
← jazzy left04:09
← sudoforge left04:09
← mschorm left04:09
← R2robot left04:09
← LuKaRo left04:09
← chronon left04:09
← Tuju left04:09
← hnOsmium0001 left04:09
← stkrdknmibalz left04:09
← FFY00 left04:09
← ThorMojito left04:09
← cornduck left04:09
← thunfisch left04:09
← randm left04:09
← elastic_dog left04:09
← LouWestin left04:09
randm_ → randm04:09
Murr- → Murr04:09
reillybrogan_ → reillybrogan04:09
thelounge661 → thelounge6604:09
blue_penquin_ → blue_penquin04:09
hnOsmium0001_ → hnOsmium000104:09
→ elastic_dog joined04:10
← thelounge66 left04:10
← lucerne left04:10
→ frobnic joined04:10
← sheepduck left04:11
→ sheepduck joined04:12
→ mschorm joined04:16
← hmmmas left04:16
→ li joined04:21
→ Guest42 joined04:29
Guest42 hi04:29
→ Guest42_ joined04:30
← reset left04:30
← ferdna left04:31
← Scotty_Trees left04:32
← x88x88x left04:32
→ Tuju joined04:33
← sheepduck left04:39
LouWestin_ → LouWestin04:43
Guest42 i have some commits, those commits are committed by the developers04:43
i want a way to somehow hide that since the commit has some keys04:43
ikke you cannot hide it04:44
Guest42 ikke is there any other ways to atleast modify that and try to conceal somehow04:44
ikke You can rewrite the commit (and everything following it) to remove the key04:44
but consider those keys compromised04:45
Guest42 we have rotated long back04:45
but when i use some scanners like gitleaks - it still shows me that commit04:45
ikke aha04:45
then you would probable need to rewrite a lot04:46
there are tools that can help with it, but it has consequences for everyone using that repo04:46
!filter-repo04:46
gitinfo A new git add-on that greatly improves on git-filter-branch: https://github.com/newren/git-filter-repo04:46
← jetchisel left04:47
Guest42 ikke what do you suggest for me.. is there any other git scanners that will scan my repo for only my active commits04:48
ikke I have no idea04:49
← YuGiOhJCJ left04:53
← AnAverageHuman left04:55
← vishal left04:55
→ vishal joined04:57
→ thelounge661 joined04:58
→ lucerne joined04:59
→ thiago joined05:05
→ x88x88x joined05:05
Guest42 ikke what is the use of git filter branch05:09
← thiago left05:10
ikke it allows you to automatically rewrite commits in the entire repo by applying some operation on them05:11
filter-repo (not filter-branch) has options to censor secrets05:11
Guest42 if there are 100 commits, 100 commits are going to be rewritten05:11
?05:11
← Guest42 left05:12
→ Guest42 joined05:12
Guest42 ikke will it break anything? what about the existing code? that will be still be there05:13
ikke it changes what you tell it to change05:14
Guest42 i am going to run this command git filter-branch --index-filter 'git rm --cached --ignore-unmatched' <somefile> HEAD05:15
here <somefile> has some secret05:15
← FFY00_ left05:15
← hnOsmium0001 left05:15
→ FFY00_ joined05:16
ikke that would remove the entire file from history05:27
make sure to pass -- --all instead of HEAD to rewrite all commits, not just a single branch05:28
← Guest42_ left05:28
← Guest42 left05:29
← Gustavo6046 left05:34
← AbleBacon left05:35
→ Gustavo6046 joined05:35
← R2robot_ left05:39
→ R2robot_ joined05:44
← x88x88x left05:53
← sudoforg1 left05:55
→ zeenk joined05:55
→ filePeter joined06:01
← ThorMojito1 left06:04
thunfisch_ → thunfisch06:07
→ ahunt joined06:08
← Gustavo6046 left06:10
→ Gustavo6046 joined06:15
→ Guest9 joined06:22
← jazzy2 left06:27
← thelounge661 left06:33
← lucerne left06:33
→ lkor joined06:44
← R2robot_ left06:48
lkor → lionkor06:51
→ jhulten joined06:54
← chronon_ left06:54
→ TomyWork joined06:55
→ jancoow joined07:01
jancoow Hi. I want to setup a project structure to work with submodules. In development; it happens that things change inside the submodule. What is the best way to commit/push this to the repository of this submodule?07:03
← unluckyshrubbery left07:04
← jhulten left07:04
← igemnace left07:10
→ pulse joined07:13
→ rfuentess joined07:13
→ GoLiath_ joined07:13
→ Guest42 joined07:14
→ Guest42_ joined07:14
→ envex joined07:14
→ GoLiath__ joined07:17
← GoLiath_ left07:17
→ ackyshake joined07:18
→ tsujp joined07:27
tsujp You know the command `git rebase :/somestring` picks all commits AFTER the first occurance of `somestring` in a commit message, is there a way to have this include the commit with `somestring` too?07:28
osse tsujp: try git rebase :/somestring~107:30
not sure if it considers ~1 part of the text or not07:30
tsujp invalid upstream07:30
osse07:30
osse HEAD^{/somestring}~1 then07:31
that's a mouthful07:31
← mrquincy_ left07:31
→ rothandr_ joined07:31
tsujp and finally is there a way to order the commits on the pick screen to be newest at the top rather than newest at the bottom?07:32
I assume not since it's ordered specifically top-to-bottom for execution?07:32
← rothandrew left07:33
tsujp actually reversing the git log output would do the same, i just find it confusing that git log is newest at top, and git pick is newest at the bottom07:33
osse I can't find a way to reorder it07:34
tsujp hmm `git log --reverse` does indeed reverse but then I still have to press `G` to go to the bottom07:35
→ thelounge661 joined07:35
osse hmm07:35
→ lucerne joined07:36
osse the outpout is reversed, so why do you want to go to the bottom07:36
tsujp because with --reverse the `HEAD` is at the bottom07:36
if I want to view more than my terminal's height of commits (which is often) I need to now press `G`07:37
osse wasn't that what you wanted?07:37
→ hmmmas joined07:37
tsujp It is07:37
Okay imagine you have 100 commits, `git log` shows `HEAD` the top07:37
Now `git log --reverse` shows the oldest commit at the top (good) but now because there are so many commits you have to scroll all the way down to view `HEAD`07:38
Is there a flag (I cannot see any) that automatically focuses `HEAD` with git log?07:38
So that I don't have to press `G` (vim command for "go to the end") with `git log`07:38
→ igemnace joined07:38
osse you could override the pager07:39
git config pager.log 'less +/HEAD'07:40
tsujp Ah ok07:40
Yeah I was gonna ask how to do that via git config instead of bash alias07:40
Okay this is awesome, thanks for the help osse :)07:40
osse it also sounds a bit like you just want git log -n 10 or git log origin/master..master or something like that07:41
← rothandr_ left07:44
→ rothandrew joined07:44
→ theoceaniscool joined07:49
→ mrquincy_ joined07:49
→ chronon joined07:52
← hmmmas left07:53
← mrquincy_ left07:56
← lucerne left07:58
← thelounge661 left07:58
← acid left08:01
→ acid joined08:02
→ R2robot_ joined08:05
← Guest9 left08:08
← Guest42_ left08:09
← Guest42 left08:09
← envex left08:13
→ hegstal joined08:13
← GoLiath__ left08:14
→ GoLiath_ joined08:14
→ jazzy joined08:14
→ envex joined08:15
← ahunt left08:17
→ maroloccio joined08:18
← hegstal left08:19
→ hegstal joined08:19
→ adlternative joined08:25
→ maroloccio1 joined08:26
→ feriman joined08:27
← maroloccio left08:29
→ AnapodoPsalidaki joined08:29
→ Scotty_Trees joined08:31
→ ubique joined08:47
→ dka_ joined08:50
→ tsdh joined08:51
← dka_ left08:52
→ dka joined08:52
← hegstal left08:53
→ lacrymology joined08:58
→ Jck_true joined09:03
Jck_true So I ran a "git pull origin BRANCH" to merge in some work on another branch. I resolved the merge conflicts but now I can't update my submodules and get an error "fatal: No url found for submodule path 'xxx/yy/zzz' in .gitmodules"09:04
→ x88x88x joined09:06
Jck_true But theres only been one addition to the .gitmodules. Unrelated to merge. I tried to remove the submodule that was causing issues... But now it fails on another submodule...09:06
ross nedbat: re "did you get your answer?" - I did, thank you! Timdve pointed me towards repo duping followed by git-filter-repo09:08
→ unluckyshrubbery joined09:11
→ hmmmas joined09:12
← maroloccio1 left09:15
→ DevAntoine joined09:21
DevAntoine Hi, I'm not able to add a file to my previous (pushed) commit (on a feature branch, don't worry it's not develop nor master).09:22
"git add myFile" => "git commit -v --no-edit --amend" => "git push --force"09:22
Resulting in "Everything up-to-date"09:22
What am I missing?09:22
Does my brain is still sleeping in my bed?09:23
→ i7c joined09:23
osse does the add actually stage some differences? does git commit actually make new commit?09:24
also, what does 'git config push.default' say?09:25
DevAntoine osse: the add does stage the file09:27
← tejr left09:27
← chexum left09:27
← ano left09:27
← adanwan left09:27
DevAntoine osse: git config push.default returns nothing09:27
← feriman left09:29
← jmcantrell left09:30
→ adanwan joined09:30
← hmmmas left09:30
← pulse left09:31
→ tejr joined09:32
→ chexum joined09:32
→ ano joined09:33
← alzgh left09:37
→ pretty_dumm_guy joined09:38
DevAntoine osse: I know09:42
osse: I've got a git hook running some commands inside docker but the stack wasn't up...09:42
Now everything is fine.09:42
Thank you.09:42
→ maroloccio joined09:43
→ nazarii[m] joined09:44
← AnapodoPsalidaki left09:44
→ vdamewood joined09:48
R2robot_ → R2robot09:53
→ feriman joined09:53
→ vinleod joined09:56
← vdamewood left09:57
vinleod → vdamewood09:57
← betelgeuse7 left09:58
← Betal left09:58
→ betelgeuse7 joined09:59
→ skapata joined10:05
reinhardt → cronos10:05
→ Cork joined10:07
→ jl4 joined10:08
← aquijoule__ left10:10
→ rsx joined10:15
← nazarii[m] left10:18
→ nazarii[m] joined10:18
→ richbridger joined10:21
← pizdets_ left10:23
→ pizdets joined10:25
← nazarii[m] left10:26
← GoLiath_ left10:26
→ nazarii[m] joined10:26
→ pulse joined10:32
→ sa joined10:33
→ fling joined10:34
→ lgc joined10:36
← jl4 left10:38
→ lgc_ joined10:40
← lgc left10:43
→ jakesyl joined10:43
→ jla joined10:50
← jla left10:51
← Cork left10:51
← zeenk left10:52
← Nalt left10:52
← milosz left11:08
→ milosz joined11:09
→ Exagone313 joined11:15
→ tomek_ joined11:15
← Eustachy_Kapusta left11:15
→ Fabricio20 joined11:16
← pretty_dumm_guy left11:17
Exagone313 → Exa11:17
→ Xenguy joined11:29
← maroloccio left11:30
→ cation joined11:33
→ dimi1947 joined11:36
← dimi1947 left11:38
→ anton joined11:43
← anton left11:43
→ anton joined11:43
→ reset joined11:44
→ GoLiath_ joined11:45
→ otisolsen70 joined11:49
← GoLiath_ left11:50
→ GoLiath_ joined11:50
← shored left11:53
→ dimi1947 joined11:55
← feriman left11:55
→ adelks joined12:00
adelks Hello! I would like to know if git offers COW on checkout. Afaik each commited file version is stored inside the .git directory. And is restored back to the working directory on checkout. I would like to know if that restore can be made with "reflinks"/COW. Or maybe it's already the case ?12:01
of course, if the underlying file system supports it12:02
← dimi1947 left12:04
← ano left12:06
BtbN That seems like a bad idea, even if it was possible, which I doubt12:06
→ dimi1947 joined12:07
BtbN Most of the stuff is stored in compressed packages, not just one file for every file. That'd be pretty inefficient12:07
→ ano joined12:07
adelks BtbN: Thanks for your input. I am unaware of the inner workings of git, yeah if things are compressed then it's not that simple anymore. Got it!12:08
→ Wuzzy joined12:10
adelks I guess it would be possible if files do not get compressed and the file system's seamless compression is used ?12:14
→ Samian joined12:18
Samian for 2 factor authentication, github makes me use this super long string when pushing to the cloud12:19
← Noisytoot left12:19
Samian anyway to use a regular password again?12:19
← lionkor left12:20
osse adelks: consider the contents of .git to be a huge binary blob that looks nothing like the actual files it holds12:20
→ lionkor joined12:20
→ Noisytoot joined12:21
osse the hash of a file (which git uses all over the place) is actually the hash of the file but with some other git-specific data prepended. so I think you're screwed already there12:21
← jimklimov left12:22
adelks osse: thanks for your input. To use the filesystem's seamless compression instead, I think the change would be significant anyway. For the git-specific data prepended, that could be done to bare files too, so that's not a blocker for this alleged idea of using the filesystem's compression instead no ?12:24
BtbN Samian, what do you mean, pushing to the cloud?12:25
Can't you use ssh keys?12:25
Samian ne?12:25
adelks I am asking this because I would like to keep several copies of the kernel source code, with different patches applied. So I thought having cow would be nice. Since the patches change a very small number of files12:25
osse adelks: but then the files would appear with the extra data in them12:26
bremner adelks: you'll really need to read up a bit on git internals before this can be a sensible discussion12:26
Samian I don't get the 2 factor thing on github. it's just substituting one password for another. wtf is 2 factor about that12:26
bremner not that being a sensible discussion is mandatory on the internet12:26
adelks osse: got it12:26
bremner: You are absolutely right. I only wanted to ask the yes/no question :P12:27
osse you can share .git data between several repos12:27
there is also the worktree feature12:27
adelks osse: yes I used that! it's better, I just expected it to have some kind of COW x)12:28
→ AnapodoPsalidaki joined12:29
→ mrquincy_ joined12:30
adelks bremner: I have in mind that, fundamentally, git handles copies of files through their hash. Remembering that filesystems compress on their own now, "one file for every file" sounded viable to me if the kind of compression git does is similar. And wanted to get some feedback on this second idea. Of course, real git is more complex. But sometimes I find it interesting to discuss "simple" ideas.12:33
→ AnAverageHuman joined12:37
→ jimklimov joined12:40
← Karyon_ left12:40
← x88x88x left12:40
→ Karyon joined12:41
Samian BtbN: "pushing to the cloud" == pushing to github.com12:43
BtbN Yeah, just use ssh keys for that12:44
Samian even so, I don't understand how it's "2 factor" when it's merely just replacing one password for another password12:44
← Karyon left12:45
→ Karyon joined12:45
→ sudoforg1 joined12:47
← vdamewood left12:47
osse "For GitHub, the second form of authentication is a code that's generated by an application on your mobile device or sent as a text message (SMS)."12:49
sounds like something other than what you're doing12:49
← blue_penquin left12:50
mgedmin IIRC when you enable 2FA for your github account, git pushes over https no longer allow username+password auth; you must use ssh keys or private tokens instead12:50
→ x88x88x joined12:50
← ano left12:50
mgedmin this is a side effect; the primary effect is that web logins require username + password + second factor12:51
← budo left12:51
→ ano joined12:52
→ shored joined12:56
← elastic_dog left12:59
← Kill-Anirnals left13:00
→ maroloccio joined13:01
→ Nalt joined13:02
← shored left13:04
→ shored1 joined13:04
→ budo joined13:04
→ elastic_dog joined13:05
← adelks left13:05
Seveas that is correct. And if you enable sso/saml for an org, you can do thing like require org members to use 2fa's and to have separate ssh keys for org repos13:09
→ Adoi joined13:10
Seveas And with SSO you can make it 4 factor auth if you really want to annoy your staff: separate passwords and 2fa tokens for github and the sso step.13:11
Samian: the token is only valid for git pushes, not for other authenticated operations (like changing your password...). It's less safe than using an ssh key, but better than having to type in a 2fa token for every git operation.13:14
Samian but it's not 2 factor. 2 factor is when you type a password and then a temporary code is sent to your phone13:15
or a phone app pops up saying "did you just try to do such and such on your computer" and you tap yes13:15
Seveas correct. But it's what enables you to have 2 factor authentication for web operations on github.com while keeping git operations usable13:16
← Adoi left13:20
→ alzgh joined13:21
→ kikijiki joined13:21
→ pflanze joined13:23
→ soifou joined13:25
← soifou left13:29
→ soifou joined13:33
← betelgeuse7 left13:34
← Xenguy left13:34
→ betelgeuse7 joined13:35
→ pretty_dumm_guy joined13:37
← betelgeuse7 left13:38
→ ahunt joined13:39
→ betelgeuse7 joined13:40
→ consolers joined13:40
→ Masklin_Gurder joined13:42
← lionkor left13:49
→ arcatech joined13:52
→ bdeferme joined13:52
→ vdamewood joined13:54
→ xkuru joined13:57
→ LemurP joined13:58
→ vinleod joined14:00
← vdamewood left14:02
vinleod → vdamewood14:02
Samian how can I scroll faster through git log on a macbook>14:03
there isn't a page down key14:03
wffff14:03
osse Ctrl-D and Ctrl-F14:03
mgedmin don't macs page down when you press command+down or something?14:04
consolers osse have you used gitweb14:04
mgedmin also, spacebar in less pages down14:04
Samian osse: what are those shortcuts short for?14:04
it works! btw14:05
osse Samian: what they are for? They are for scrolling14:05
or is there some layer to the question I don't get14:05
mgedmin emacs keybindings ctrl-u/d (for up/down, scrolling by lines), ctrl-f/b (for forward/backward, scrolling by pages)14:05
helpful to know and try in random situations (e.g. when you get a grub boot menu over a serial console and arrow keys don't work)14:06
bremner fwiw, ctrl-u is not up in emacs14:06
mgedmin yeah I don't actually use emacs14:06
→ justBull joined14:06
← kikijiki left14:06
mgedmin to me ctrl-w is the emacs keybinding for delete word backwards, because that's what it does in bash, but turns out emacs uses a different key for that14:07
naming things is hard14:07
osse these bindings are more like vim14:07
Ctrl-n and p go by lines, u/d by half pages, f/b by whole pages14:08
consolers: no14:08
→ Cork joined14:09
Samian thanks osse for telling me about the shortcuts14:13
→ argento joined14:14
→ thiago joined14:15
← chexum left14:15
henk n(ext), p(revious) for completeness sake (;14:16
mgedmin oops I rarely use ^u/^d, forgot what they meant!14:19
cornduk anyone know how i would specify a non-default keyring file with `git-crypt add-gpg-user`? the keys i want to import are stored in a separate keyring like ~/.gnupg/some_keyring.gpg14:20
i figure it should look in all the keyrings in that directory, but i guess it doesn't (?)14:21
its not finding keys which are not in the default keyring14:21
← Murr left14:22
→ Murr joined14:23
cornduk it looks like git-crypt wraps the gpg binary https://github.com/AGWA/git-crypt/blob/master/gpg.cpp14:25
← frobnic left14:28
→ frobnic joined14:28
← frobnic left14:28
→ feriman joined14:29
→ frobnic joined14:29
← consolers left14:31
← AnapodoPsalidaki left14:31
→ AnapodoPsalidaki joined14:34
argento hi, when you issue `git commit` you are presented with a text file with some commented lines. Is there a way to include `git log -10 --oneline` in those commented lines?14:34
adlternative hi, how can I `git rebase -i <first commit>^1`?14:35
osse argento: if you're in vim you can do: :r !git log -10 --oneline14:36
← Shentino left14:36
osse argento: but you might be interested in the prepare-commit-msg hook14:36
← pretty_dumm_guy left14:36
cornduk perhaps my problem lies elsewhere14:36
argento ^1 is for the previous commit. So maybe `git rebase -i <first commit>`14:36
osse argento: or git log ... > tmp; git commit -eF tmp14:37
adlternative: --root14:37
argento osse: thanks I'll check that out14:37
adlternative osse: ok, I get it.14:37
← rothandrew left14:39
→ Shentino joined14:39
Samian What do you guys think about using git switch --detach <commit id> as a way go back to the state of any commit ?14:42
mgedmin isn't comfortable with these newfangled git subcommands and still uses git checkout <commit> for this while shaking his cane at the kids on the lawn14:43
← GoLiath_ left14:45
→ GoLiath_ joined14:46
← jazzy left14:46
Oblomov OK there is a situation I can't explain myself14:47
← madewokherd left14:47
Oblomov a section of code disappeared and I cannot find the commit that deleted it. git log -S string_in_disappeared_code only comes up with the commit that introduced it as the most recent14:47
← pac1_ left14:48
→ shored joined14:49
← shored1 left14:49
Oblomov is pretty sure the fsck up is happening in one of the merges14:52
→ Adoi joined14:54
→ bynx joined14:56
pcarphin The first thing I do in this kind of situation is open up `gitk --all` and try to scroll through the commits. This only works if you have a bit of an idea of where to look and it requires that you recognize commit messages.14:56
Oblomov There is also `git history FILE` which I rarely use because the preceding technique ususally allows me to find what I'm looking for quickly.14:57
man git-history14:57
!man git-history14:58
gitinfo The git man pages are available online at https://gitirc.eu/git.html. Or were you looking for the "man git-foo" syntax (without the !)?14:58
pcarphin !history14:58
gitinfo [!clean_history] For a pointer on how to handle history in git see this e-mail from Linus: http://thread.gmane.org/gmane.comp.video.dri.devel/3474414:58
Oblomov pcarphin: I'll have a look14:58
pcarphin My links aren't working lol14:59
Oblomov hm well it's not git history obviously since it doesn't seem to be recognized as a command14:59
← argento left14:59
pcarphin Maybe that's why my links weren't working lol.14:59
Anyway, try gitk (with --all, very important) and then someone else will tell you what the ....15:00
Oh I know, you just do `git log FILE`15:00
Oblomov I usually get by with git log file but I really can't find the change in the merges, some of them were pretty messy 8-P15:01
pcarphin If the code you are looking for is made by a commit that hasn't been merged yet, then `git log --all FILE` might give more results.15:02
Oblomov oh found it15:04
pcarphin Nice, how?15:04
Oblomov through a different error15:04
apparently an original file was duplicated and split into two other files and a piece of code that should have gone in derivated file B went into derived file C instead15:04
→ blaisebool_ joined15:05
→ Anarchic joined15:09
adlternative hi, I meet a strang situation.15:11
when I use `git rebase -i`, I stop at a commit and use `git add -i (patch mode)` to add some contents.15:12
oh sorry, I forget to say: I stop at a commit and git reset HEAD~ and use `git add -i (patch mode)` to add some contents.15:14
and then `git commit`, it work.15:14
but use `git rebase --continue`, it report an error:15:14
You have uncommitted changes in your working tree. Please commit them15:14
first and then run 'git rebase --continue' again.15:14
→ argento joined15:16
→ GNUcifer joined15:16
→ BSaboia joined15:16
← cehteh left15:16
GNUcifer → cehteh15:17
← BSaboia left15:19
→ Guest42 joined15:21
→ madewokherd joined15:24
→ AbleBacon joined15:25
→ raffaele__ joined15:26
→ Torr joined15:26
← discipulus left15:26
← rsx left15:28
← betelgeuse7 left15:29
→ betelgeuse7 joined15:30
← Guest42 left15:32
← betelgeuse7 left15:34
← ano left15:34
→ ano joined15:35
→ betelgeuse7 joined15:35
← blaisebool_ left15:38
→ blaisebool joined15:38
← betelgeuse7 left15:38
→ betelgeuse7 joined15:39
← AnapodoPsalidaki left15:41
← TomyWork left15:41
← betelgeuse7 left15:42
→ betelgeuse7 joined15:44
imMute adlternative: you have to leave the working tree in a completely clean state before you can continue the rebase. either commit the uncomitted bits or revert them and then you can continue.15:45
→ nate1 joined15:48
← ahunt left15:49
→ ThorMojito joined15:50
→ omnonq9 joined15:54
← Adoi left15:56
→ Crassus joined15:58
← anton left15:59
→ shored1 joined16:00
← shored left16:01
→ jla joined16:01
← rfuentess left16:03
← Anarchic left16:04
← LemurP left16:08
← x88x88x left16:09
→ Guest71 joined16:09
← jla left16:12
→ mikail joined16:15
→ stkrdknmibalz joined16:17
→ tg joined16:18
→ Anarchic joined16:18
← vdamewood left16:18
← nate1 left16:20
gordonfish- → gordonfish16:20
→ jla joined16:21
← jla left16:24
← Anarchic left16:25
→ Anarchic joined16:26
→ anton joined16:26
← anton left16:26
→ anton joined16:27
← anton left16:27
→ anton joined16:27
← anton left16:27
← mschorm left16:28
→ jhulten joined16:30
← Guest71 left16:31
← Gustavo6046 left16:33
→ Gustavo6046 joined16:34
→ anton joined16:35
← Anarchic left16:35
← anton left16:35
→ anton joined16:35
← anton left16:35
→ jetchisel joined16:35
→ anton joined16:35
← anton left16:35
→ Anarchic joined16:36
→ anton joined16:36
← anton left16:36
→ anton joined16:36
← AnAverageHuman left16:37
→ singh joined16:39
← Crassus left16:39
← Anarchic left16:39
→ Anarchic joined16:40
→ AnAverageHuman joined16:43
← betelgeuse7 left16:43
→ betelgeuse7 joined16:45
→ jla joined16:47
← betelgeuse7 left16:48
→ betelgeuse7 joined16:49
anddam hello, semi-OT how do I get tab completion for git branches on macOS 11?16:49
← jla left16:50
R2robot depends on your shell16:51
← betelgeuse7 left16:52
→ Crassus joined16:53
→ betelgeuse7 joined16:53
← betelgeuse7 left16:56
→ betelgeuse7 joined16:58
← Nalt left16:59
→ Nalt joined17:01
← betelgeuse7 left17:01
pcarphin anddam You can take one of the files in https://github.com/git/git/tree/master/contrib/completion17:01
→ betelgeuse7 joined17:02
pcarphin I use fish for my interactive shell on MacOS and it's already installed. For bash or zsh, they should also be installed in a location where they are auto-loaded17:02
← Nalt left17:03
pcarphin But if they arent't, you can just download one of those files (or find it where git is installed) and source it yourself in you .zshrc17:03
→ Nalt joined17:04
← Nalt left17:05
← betelgeuse7 left17:06
→ Nalt joined17:07
→ betelgeuse7 joined17:07
← argento left17:07
anddam R2robot: it's zsh, actually I was not able to figure how to enable completion17:09
← Nalt left17:09
pcarphin Oh so you have to enable it? You might want to look at oh-my-zsh https://github.com/ohmyzsh/ohmyzsh17:10
← betelgeuse7 left17:10
anddam pcarphin: I think so, I was looking at the completion link you pasted17:10
→ Nalt joined17:11
→ betelgeuse7 joined17:12
← Nalt left17:12
← mikail left17:12
→ Nalt joined17:13
← xkuru left17:14
→ xkuru joined17:14
← betelgeuse7 left17:15
→ betelgeuse7 joined17:16
→ cliluw joined17:18
← xkuru left17:19
→ xkuru joined17:19
← betelgeuse7 left17:19
→ betelgeuse7 joined17:21
→ orbyt joined17:22
→ rsx joined17:22
← Nalt left17:23
← amanita_ left17:23
← betelgeuse7 left17:24
→ Nalt joined17:24
← Nalt left17:25
→ betelgeuse7 joined17:25
→ Nalt joined17:27
← betelgeuse7 left17:28
← Nalt left17:28
→ ausserz joined17:29
→ betelgeuse7 joined17:29
← cliluw left17:30
→ Nalt joined17:30
→ amanita joined17:30
← Nalt left17:32
→ Nalt joined17:32
← betelgeuse7 left17:32
← rsx left17:33
← Nalt left17:33
→ Nalt joined17:34
→ betelgeuse7 joined17:34
→ goldfish joined17:35
← betelgeuse7 left17:37
→ betelgeuse7 joined17:38
R2robot yeah, I use Fish as well, but used to use zsh. I don't remember how to do it with the default zsh though. I have zsh/fish installed via brew which makes it easier, IMO.17:40
← betelgeuse7 left17:41
→ betelgeuse7 joined17:43
← ubique left17:45
← betelgeuse7 left17:46
→ betelgeuse7 joined17:47
→ mschorm joined17:48
→ Sasazuka joined17:49
← maroloccio left17:49
← betelgeuse7 left17:50
→ betelgeuse7 joined17:52
→ haltux joined17:54
← betelgeuse7 left17:55
→ betelgeuse7 joined17:56
← betelgeuse7 left17:59
→ betelgeuse7 joined18:00
→ hbautista_ joined18:02
← hbautista_ left18:02
→ hbautista joined18:02
← betelgeuse7 left18:04
tomek_ → EUstachy_Kapusta18:04
EUstachy_Kapusta → Eustachy_Kapusta18:04
← Anarchic left18:05
→ mokulus joined18:05
→ betelgeuse7 joined18:05
→ mikail joined18:05
→ Anarchic joined18:06
← betelgeuse7 left18:08
→ randallb joined18:09
← Crassus left18:09
→ betelgeuse7 joined18:10
← betelgeuse7 left18:13
← Anarchic left18:13
→ Anarchic joined18:14
→ betelgeuse7 joined18:14
→ oriba joined18:16
← betelgeuse7 left18:17
→ betelgeuse7 joined18:19
← betelgeuse7 left18:22
→ x_kuru joined18:23
→ betelgeuse7 joined18:23
← xkuru left18:26
← Noisytoot left18:26
→ Crassus joined18:26
← betelgeuse7 left18:26
← Gustavo6046 left18:26
→ betelgeuse7 joined18:28
← betelgeuse7 left18:31
→ Gustavo6046 joined18:31
← GoLiath_ left18:32
→ betelgeuse7 joined18:32
→ rGSAmMZpPYEz joined18:32
rGSAmMZpPYEz lurinG freeN0de us3r5 hEr3 iS Impud3nt tH3fT18:32
← rGSAmMZpPYEz left18:32
ikke fun times18:32
→ Noisytoot joined18:34
bremner if it continues, we can make the channel +R for a bit18:34
← betelgeuse7 left18:35
ikke ahuh18:35
does libera have +R?18:35
I thought you need to use extban here18:35
bremner oh, probably correct18:35
ban $~a, I guess18:36
ikke nod18:36
or quiet18:36
→ betelgeuse7 joined18:36
bremner yeah, if someone wanted to stay opped, could also set +z18:37
← betelgeuse7 left18:39
→ betelgeuse7 joined18:41
← betelgeuse7 left18:44
→ hVtaoBNohOSU joined18:44
hVtaoBNohOSU LuRin9 freEnOD3 uS3Rs hErE Is IMpud3Nt ThEft18:44
← hVtaoBNohOSU left18:44
ChanServ set mode: +o18:45
ikke set mode: +q18:45
bremner ip ban?18:45
→ betelgeuse7 joined18:45
bremner oh, or that18:45
it's one guy afaict18:45
ikke set mode: +b18:45
ikke set mode: -q18:46
ikke would be fun if you could hell-ban someone18:46
← alzgh left18:47
→ Guest9 joined18:48
→ Betal joined18:50
← omnonq9 left18:53
betelgeuse7 → betelgeuse18:54
pcarphin R2robot just out of curiosity, have you set fish as your system shell. I did that and its non-posix-ness caused problems with things that would run shell commands like emacs.18:55
What I ended up doing was to have an `if [[ $- == *i* ]] && another_check ; then exec fish`. And the other check is sort of a kill switch that I can activate by creating a file.18:57
→ lionkor joined18:57
pcarphin It seems super sketchy but it has served me well for many years.18:58
→ Nalt| joined18:59
← Nalt left19:01
→ omnonq9 joined19:06
← dimi1947 left19:07
→ dimi1947 joined19:08
← Scotty_Trees left19:08
← dimi1947 left19:10
→ forgotmynick joined19:10
→ Scotty_Trees joined19:11
→ zeenk joined19:11
→ amanita_ joined19:12
→ natrys joined19:12
← amanita left19:15
→ dimi1947 joined19:16
imMute pcarphin: as ssystem shell, do you mean /bin/sh or your user's shell noted in /etc/passwd?19:16
← Guest9 left19:19
→ Guest9 joined19:20
← haltux left19:21
← dimi1947 left19:22
→ Guest71 joined19:22
→ brcolow joined19:22
pcarphin I mean in /etc/passwd19:23
→ duckonomy joined19:23
← bynx left19:24
→ Adoi joined19:24
← AnAverageHuman left19:28
R2robot pcarphin: it's my default shell. I haven't had any issues (i use vim (fite me!)) other than a few syntactical things19:30
pcarphin: I added it to /etc/shells and then did a chsh to change it19:31
← thebombzen left19:31
→ thebombzen joined19:33
← ausserz left19:34
→ cbreak joined19:35
→ Gustavo6046_ joined19:40
← Gustavo6046 left19:41
→ alzgh joined19:42
Gustavo6046_ → Gustavo604619:43
← mokulus left19:43
→ dmang joined19:49
← anton left19:50
← Vonter left19:51
→ alfredb joined19:52
→ Codaraxis__ joined19:52
← Codaraxis__ left19:52
→ Codaraxis joined19:53
← Adoi left19:53
→ hnOsmium0001 joined19:54
→ AnAverageHuman joined19:54
← feriman left19:55
← shored1 left19:55
→ shored joined19:57
→ sheepduck joined19:58
← randallb left20:01
→ snood1205 joined20:06
→ ht85 joined20:09
ht85 I'd like to submit an RFC, is there anywhere to browse existing ones? Or is it just the mailing list?20:09
← alfredb left20:11
→ alfredb joined20:11
→ gast0n joined20:12
→ pretty_dumm_guy joined20:12
ikke Just the mailing list20:12
https://lore.kernel.org/git/20:12
ht85 Thanks ikke20:13
← pretty_dumm_guy left20:14
pcarphin R2robot, I use Emacs in evil mode as a kind of orgmode agenda IDE and vim for the rest so we have no beef :)20:15
← sheepduck left20:16
→ sheepduck joined20:16
← snood1205 left20:16
→ snood1205 joined20:17
→ furrymcgee joined20:17
→ fstd_ joined20:22
← Murr left20:22
→ Murr joined20:23
← fstd left20:23
← betelgeuse left20:25
→ betelgeuse joined20:26
← snood1205 left20:27
← alzgh left20:28
← betelgeuse left20:29
→ betelgeuse joined20:31
← betelgeuse left20:34
→ betelgeuse joined20:35
← AnAverageHuman left20:35
← betelgeuse left20:38
← alfredb left20:39
→ argento joined20:39
→ betelgeuse joined20:39
→ alfredb joined20:39
← betelgeuse left20:43
→ snood1205 joined20:43
← snood1205 left20:43
→ betelgeuse joined20:44
R2robot pcarphin: fair enough :P20:44
← otisolsen70 left20:45
→ AnAverageHuman joined20:46
← betelgeuse left20:47
→ Gustavo6046_ joined20:47
← Gustavo6046_ left20:47
→ Gustavo6046_ joined20:47
→ qunzhong_luxian joined20:48
← Gustavo6046 left20:48
→ betelgeuse joined20:48
→ anton joined20:50
← betelgeuse left20:51
→ Gustavo6046 joined20:52
→ betelgeuse joined20:53
→ tmz joined20:53
← Gustavo6046_ left20:54
← betelgeuse left20:56
→ betelgeuse joined20:57
← madewokherd left20:58
Oblomov ok, let's say I have a file A.cc, and I do some refactoring such that most of the code from A.cc goes into B.cc, and A.cc is left with only a small part.20:59
← Gustavo6046 left21:00
Oblomov now I want to rebase my work on top of a branch where only A.cc exists and some changes have been made to it that should actually go into B.cc21:00
← betelgeuse left21:00
Oblomov git doesn't really reconize the 'A/B split' as a copy or move, which would help immensely. is there something within git or some external tool I can use to deal with this situation?21:01
→ betelgeuse joined21:02
← alfredb left21:02
→ Gustavo6046 joined21:03
osse Oblomov: try git rebase -X find-renames=30% or whatever21:04
Oblomov: default is 50%21:04
← ht85 left21:04
→ hoochmonger joined21:04
← mikail left21:05
← betelgeuse left21:05
→ betelgeuse joined21:06
Oblomov ah, find-renames21:06
I was looking for something like -C21:06
← arcatech left21:07
squirrel .дщп21:07
oops sorry ignore that21:07
← betelgeuse left21:09
→ ht85 joined21:09
→ betelgeuse joined21:10
→ mikail joined21:11
→ arcatech joined21:11
← furrymcgee left21:11
← jaggz left21:12
→ m0viefreak joined21:12
← qunzhong_luxian left21:12
→ alfredb joined21:13
Oblomov osse: damn, still not good. there's still too much of the old A 8-/21:13
← alfredb left21:13
← betelgeuse left21:14
→ betelgeuse joined21:15
← ht85 left21:15
→ mikail_ joined21:16
← mikail left21:16
← betelgeuse left21:18
→ haltux joined21:19
→ betelgeuse joined21:20
→ alfredb joined21:20
← Crassus left21:20
← alfredb left21:22
← betelgeuse left21:22
← lacrymology left21:23
→ betelgeuse joined21:24
→ unixbhaskar joined21:25
→ foo joined21:27
foo If I do git add someDir - how do I then undo that?21:27
osse foo: git reset someDir21:27
← Nalt| left21:27
osse Oblomov: I don't know then21:27
foo osse: thank you21:29
→ alfredb joined21:30
← alfredb left21:30
→ cliluw joined21:33
→ madewokherd joined21:35
squirrel why does git suggest that i should edit merge message when merging main branch into feature branch?21:37
osse because git likes it when you explain why21:39
→ chexum joined21:39
squirrel yes but i would understand if it was feature->master but why is it master->feature?21:43
mackerman Branch names are meaningless words to git, makes no difference.21:43
osse git generally doesn't care what your branches are called21:43
squirrel nothing to do with names21:44
← goldfish left21:44
→ goldfish joined21:44
osse what else?21:45
squirrel > Please enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branch.21:45
-- git21:45
well it's actually "upstream" but the idea is the same21:45
osse I don't get your point21:47
→ alfredb joined21:47
squirrel well this has nothing to do with names, does it21:47
not sure why you talk about names21:48
← alfredb left21:48
osse all you said were "feature" and "master". What else is there to go by21:48
→ Nalt joined21:48
squirrel i'm completely lost21:49
osse I can tell *from the names* which is the main line of development and which is a temporary branch21:50
But Git can'21:50
t21:50
squirrel a "feature" branch is not a branch named "feature"21:50
osse I know21:50
squirrel so this doesn't have anything to do with names21:50
osse But how does Git know which is which?21:50
→ pretty_dumm_guy joined21:50
squirrel why does git have to know it21:51
osse Don't you want to figure out when you ask you for a message and when not to?21:51
or do you want it always not to?21:51
*want Git to figure out21:51
squirrel ok let't start over21:52
osse good idea21:52
squirrel git is telling me, and i quote, > Please enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branch21:53
i feel like that of all situations this is one that needs no explanation21:53
i just want to understand this message21:54
cbreak check your hooks.21:54
then go talk to who ever made it21:54
osse no it's default21:54
squirrel this is the default message21:54
→ goldfish_ joined21:55
osse from the commit message that added it: "The sentence about justification is one of the few things about standard git that are not agnostic to the workflow that the user chose. However, f824628 was proposed by Linus specifically to discourage users from merging unrelated upstream progress into topic branches. So we may as well take another step in the same direction."21:55
← betelgeuse left21:56
← goldfish left21:56
mackerman git::f26af3fcbcbd27392b8c94b1e4eb6e671b2466ab21:56
gitinfo Git web link: https://github.com/git/git/commit/f26af3fcbcbd27392b8c94b1e4eb6e671b2466ab21:56
osse git::f82462821:56
gitinfo Git web link: https://github.com/git/git/commit/f82462821:56
osse So, eh... I dunno21:56
mackerman Feel free to ignore the suggestion and not enter a useful message.21:57
→ betelgeuse joined21:57
→ YuGiOhJCJ joined21:57
← forgotmynick left21:57
→ jazzy joined21:58
← betelgeuse left22:00
squirrel on one hand these merges often are unnecessary after it's all finished, on the other one you do them to make sure that your changes play nicely with upstream, and to simplify further merges22:00
→ betelgeuse joined22:01
osse I misunderstood your question22:02
I haven't really paid much attention to the commentary in the editor :p22:02
← betelgeuse left22:04
→ betelgeuse joined22:06
→ devslash joined22:08
← betelgeuse left22:08
devslash I need help remembering the right commands. I went to push local changes to github and got an error that the remote location contains changes that I guess arent reflected locally. Can anyone help me remember the command to compare the differences between the remote and local server ?22:10
→ betelgeuse joined22:10
← amanita_ left22:11
→ amanita joined22:12
← devslash left22:13
← betelgeuse left22:13
→ betelgeuse joined22:14
unixbhaskar devslash git pull ....that all you need22:14
devslash: even better git fetch , then see the changes locally with git diff22:16
osse that's all well and good, but they left22:17
← betelgeuse left22:17
unixbhaskar osse: it's their loss :)22:18
→ betelgeuse joined22:19
← betelgeuse left22:22
← Murr left22:22
→ Oblomov joined22:22
→ Murr joined22:22
← oriba left22:22
→ betelgeuse joined22:23
← orbyt left22:26
← betelgeuse left22:26
← Guest71 left22:27
→ betelgeuse joined22:28
← mikail_ left22:28
→ ausserz joined22:29
← betelgeuse left22:31
→ betelgeuse joined22:32
→ BlessJah joined22:33
← Codaraxis left22:34
→ Codaraxis joined22:34
← Guest9 left22:34
← betelgeuse left22:35
← arcatech left22:35
← Nalt left22:36
→ betelgeuse joined22:37
← betelgeuse left22:40
→ Xenguy joined22:40
→ Vonter joined22:41
→ betelgeuse joined22:41
← betelgeuse left22:44
→ betelgeuse joined22:45
← betelgeuse left22:48
← hackinghorn left22:49
→ betelgeuse joined22:50
← betelgeuse left22:53
→ betelgeuse joined22:54
← betelgeuse left22:57
→ Kill-Anirnals joined22:58
→ betelgeuse joined22:59
← GeorgeK left23:00
← Xenguy left23:01
← jsrnop left23:01
← betelgeuse left23:02
→ Celelibi_ joined23:02
← chexum left23:02
→ jsrnop joined23:02
→ Nalt joined23:02
→ Xenguy joined23:02
→ betelgeuse joined23:03
← m0viefreak left23:05
→ lkor joined23:05
← lionkor left23:06
← betelgeuse left23:06
→ Nalt| joined23:07
→ betelgeuse joined23:07
← mrquincy_ left23:08
Celelibi_ → Celelibi23:09
← Nalt left23:10
← betelgeuse left23:10
→ betelgeuse joined23:12
← Xenguy left23:12
Nalt| → Nalt23:13
← zeenk left23:14
→ tchan joined23:14
← betelgeuse left23:15
→ kaisyu joined23:15
→ betelgeuse joined23:16
← betelgeuse left23:19
→ betelgeuse joined23:21
← betelgeuse left23:24
→ betelgeuse joined23:25
← goldfish_ left23:29
← pretty_dumm_guy left23:32
→ Xenguy joined23:33
← Vonter left23:35
← BlessJah left23:36
→ BlessJah joined23:43
← lgc_ left23:45
← haltux left23:45
← Wuzzy left23:50
→ drew joined23:53
← omnonq9 left23:53
← betelgeuse left23:55
← hbautista left23:56
→ betelgeuse joined23:56
→ hbautista joined23:56
← drew left23:58
← lkor left23:59
← betelgeuse left23:59

Logs Search ←Prev date Next date→ Channels Documentation