IRCloggy #git 2018-03-17

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.

2018-03-17

← weez17 left00:00
← cagomez left00:00
← jimmyrcom left00:00
→ weez17 joined00:00
→ cagomez joined00:00
← jwmann left00:01
→ solaris joined00:01
→ heftig joined00:01
→ Nizumzen joined00:02
→ ferdna joined00:03
← finalbeta left00:03
← Phylock left00:04
← veegee left00:04
← Sasazuka left00:04
← cagomez left00:06
→ nahtnam joined00:07
← nowhereman_ left00:08
→ nowhereman_ joined00:09
→ carpii joined00:12
← adac left00:12
→ shinnya joined00:12
← dreiss left00:12
← Doginal left00:13
→ Doginal joined00:13
→ weijin joined00:14
carpii I push commits from my LOCAL repo to a BARE repo, and then my production server pulls from BARE repo. This is the only workflow I use. But occasionally, I log onto my server and it says my repo is ahead by X commits. Can somehow explain how this is possible please? If I then ssh into my server and push then pull again, there are no extra log entries so I'm really confused00:14
← Doginal left00:14
→ cagomez joined00:14
→ Doginal joined00:14
← Doginal left00:14
← anatal left00:14
→ Doginal joined00:15
← Doginal left00:15
Hello71 !pull00:15
gitinfo pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/00:15
→ applecrumble joined00:15
← tarkus left00:16
Hello71 probably you change history00:16
→ h12o joined00:16
→ Doginal joined00:16
← Doginal left00:16
carpii no rebases involved00:16
or force pushes00:16
→ kliq joined00:16
Hello71 do you ever do commit --amend?00:16
→ Doginal joined00:17
→ shpoont_ joined00:17
carpii no00:17
im aware of the consequences of all that00:17
← Doginal left00:17
← shpoont left00:17
rafasc carpii: if you're getting messages ahead/behind/diverged, it means you have a remote upstream configured.00:17
carpii no upstream involved, its my own repo and just local -> bare -> remote server00:18
when i pull on remote server and it fetches then emrges. Is that merge creating a brand new commit which isnt present on local?00:18
→ gabrielschulhof joined00:19
carpii it never diverges either, its always either consistent with loca, or sometimes ahead00:19
← h12o left00:21
→ VoradorPT joined00:21
← weijin left00:21
rafasc could you paste $git config --get-regexp '^remote\.' output of you bare repo?00:21
carpii hm actually, while i use this worflow on other servers, and do host a bare repo00:22
rafasc carpii: yes, that could be it.00:22
carpii this particular server uses github, where im referring to that as a bare repo00:22
could that be somehow related?00:23
→ arahnoid joined00:23
carpii so not sure how i can access git config on github00:23
could show you config on local or remote servertho00:23
← rokups left00:23
rafasc carpii: is there a reason why you're doing a pull instead of a reset --hard on your remote server?00:24
→ RougeR joined00:24
← RougeR left00:24
→ RougeR joined00:24
carpii im not sure tbh. Its possible that its just because its what Ive always done, but there might be some git hook reasons, Id need to check00:25
← Guest21 left00:25
rafasc if you want the server on that particular commit, you could simply git reset --hard.00:25
!backup00:26
gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups00:26
carpii reset --hard would reset the file timestamps also, which may interfere with any caches etc00:26
← shpoont_ left00:26
carpii yeah ive no concerns about backups, its all rock solid00:26
this is just a deployment oddity really00:26
rafasc you're seein the message of being ahead where? we have 3 repos here.00:27
carpii ok so if i push from local, to bare. Then i run a local script which ssh's into server and does a git pull00:28
and it all seems to work nicely00:28
rafasc so you have your local repo <-> github <- deployment server. Is this correct?00:28
carpii but then i log into remote server and do a git status, and it will still say its ahead sometimes, even directly after ive pulled00:29
yep00:29
on my other servers i do local <-> self hosted bare repo <-> remote server00:29
and dont see this issue00:29
rafasc you don't interact with the remote server yourself right?00:30
so every thing should just fast forward when you pull.00:31
carpii i never change files on the remote server, or interact with git repo no00:31
yeah in theory00:31
← m-alpha left00:32
carpii you agree it sounds strange?00:32
rafasc yes00:32
carpii ok, thats good. i thought i was misunderstanding something00:32
i think maybe i should start capturing the output from my git push, and try to pick the bones out of that00:33
since it should include the resulting HEAD commit00:33
← NoneTheRed left00:34
rafasc carpii: add your remote server as a remote of your local repo.00:34
fetch, and see if both heads are at the same commit.00:34
carpii ok let me just digest that :)00:34
oh i see00:35
well atm they both corrrelate00:35
← cahoots left00:35
carpii i just had this issue earlier tonight, and did a push then pull from remote server00:35
rafasc don't pull from that though, :P00:35
carpii and after that they were both identical00:35
heh yup00:35
rafasc look at the history, and see if there's a bunch of merges?00:35
!lol00:36
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all00:36
carpii on remote server?00:36
→ Alesia joined00:36
carpii yeah i have an alias for that, lets see00:36
← Nizumzen left00:36
rafasc i would do something like this on your local repo: $git remote add deploy url_of_server; git fetch deploy; git lga;00:37
my alias are leaking.... git lga is the alias I mentioned above.00:37
→ mollusk joined00:38
← Alesia left00:39
← cagomez left00:39
→ cagomez joined00:40
→ am55 joined00:40
← cagomez left00:40
← mchl_nix left00:42
→ Nicmavr joined00:43
rafasc carpii: did you find something?00:43
Nicmavr → Guest9735600:43
→ gaeth joined00:43
→ dreiss joined00:43
carpii ok not sure if this provides any insight, but when i look at git log on remote server, it all corresponds with origin, master, and HEAD00:44
http://carpii.homeip.net/skitch/remote-20180317-004322.png00:44
but, theres been changes to my local dev master, which Im not ready to deploy yet00:44
but i think it demonstrates remote server should be working from the same page00:44
→ Lyqyd joined00:45
carpii local shows the same, except with a few extra commits on top00:46
which have not yet been pushed to bare00:46
→ jimmyrcom joined00:47
→ SwiftMatt joined00:47
→ m-alpha joined00:48
← xcm left00:49
→ mpiechotka joined00:50
→ xcm joined00:50
← publio left00:50
rafasc are you pulling with arguments, or just git pull?00:50
carpii just a flat git pull00:51
remote server is always on master branch, never changes00:51
→ weijin joined00:51
rafasc so remote origin is the github server.00:51
← kliq left00:51
carpii yes00:51
rafasc im lost.00:52
mpiechotka Hi. Does git gc removes all objects that are in objects/info/alternates? If no is there a way to do it?00:54
← leeN left00:54
carpii me too raf :)00:54
← Soni left00:54
carpii if i ran git pull on remote, and there hapened to be one branch which couldnt be fast forwarded (maybe it had been rebased or something), that would issue a warnig, but would not prevent it from fetching and applying master right?00:54
→ Soni joined00:55
← weijin left00:56
→ jstimm joined00:56
← Fernando-Basso left00:57
→ h12o joined00:57
→ webdev007 joined00:58
rafasc you could get in a situation where it stops due to conflicts, and asks you to resolve them...00:58
← webdev007 left00:59
← \void left00:59
carpii ok remote server only has master branch checked out, with no other branches00:59
→ webdev007 joined00:59
carpii so at most it would be a warning, and not a non-master conflict00:59
← GoBear left00:59
rafasc master can conflict with itself, if the history diverges.01:00
← m0viefreak left01:00
rafasc but you already said you don't rebase or ammend... So I don't know what's happening there.01:01
carpii ive never seen that on this server, although i understand the diverging problem01:01
i will start logging all outputs i think. I feel like theres not much more I can do to resolve this without logs01:02
really appreciate the help though, i was half expecting someone to say this is normal due to such and such01:03
Random832 rafasc, i asked him about the output of git log. He said "it shows up correctly" which I assume means the *name* is the same as his new github account, which is *irrelevant*01:03
rafasc it could be. I am not an authority on the matter.01:03
← am55 left01:03
carpii Random, I think you might have confused me with someone else01:04
← sentriz left01:05
rafasc carpii: I would keep the deploy server added as a remote on your local repo.01:05
carpii just for comparison?01:06
→ sentriz joined01:06
rafasc yes. when the problem arises again, fetch from it and compare.01:06
← alhariel left01:06
carpii ok thanks, good idea, ill try that and maybe a git hook to ensure its not pushed to01:07
rafasc gitk --all; or git log --graph --online --all.01:07
→ am55 joined01:07
carpii thanks01:07
rafasc while its weird that is happening, i might be missing something obvious... There's no reason to pull on your remote server.01:07
carpii yeah i feel like im missing something too01:08
happens enough that there must be a cause though01:08
rafasc you can update it by just doing reset.01:08
carpii although not every time01:08
yeah i will look into that. Im not sure why I pull but there might be a good reason01:08
← arahnoid left01:08
← quarters_ left01:09
→ weijin joined01:09
→ akushner joined01:09
→ quarters joined01:10
→ Circuitsoft joined01:10
← mollusk left01:10
→ jakogut__ joined01:11
← pirocks_ left01:11
→ veegee joined01:11
← weijin left01:14
← YuGiOhJCJ left01:14
→ YuGiOhJCJ joined01:15
← MattMaker left01:15
→ MattMaker joined01:15
typikal → alyptik01:15
← solaris left01:18
→ solaris joined01:20
← jimmyrcom left01:20
→ weijin joined01:21
← carpii left01:21
→ devxxx joined01:21
devxxx hey how do i merge a detached HEAD to the origin/master branch?01:21
Eugene !reattach01:22
← akushner left01:22
Eugene !detached01:22
Eugene pokes the bot insistently01:22
devxxx bugs, bugs everywhere01:23
HEAD is still detached after doing 'git reset'01:24
i'm just gunna clone it01:24
then i lose all of my other files01:25
gah so annoying01:25
Eugene `git reset --hard @{u}` will make your current state the same as upstream(eg, origin/master)01:25
← weijin left01:25
Eugene This will lose any untracked / uncommited changes, so `git stash` them away if you care01:25
devxxx fatal: HEAD does not point to a branch01:26
← veegee left01:26
devxxx i'm imagining a lynching right now01:26
so annoying01:26
Eugene You are entitled to a complete refund of the purchase price of #git and any support provided in this channel. ;-)01:27
rafasc devxxx: detached head means HEAD is pointing to a commit, instead of a branch.01:27
← m-alpha left01:27
devxxx the weird thing is that the HEAD *is* pointing to the origin/master01:28
the commit ID is the same as the master01:28
rafasc you can create a branch from your detached head with $git checkout -b <new-branch-name>01:28
devxxx is that necessary? creating a new branch?01:29
→ gitinfo joined01:29
ChanServ set mode: +o01:29
Eugene There it is!01:29
!detached01:29
devxxx i mean it's pointing to the exact same commit01:29
rafasc devxxx: HEAD is pointing to the same commit origin/master is poiting.01:29
Eugene Nope, still not better01:29
gitinfo Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue01:29
A detached HEAD (aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach01:29
A detached HEAD (aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach01:30
→ ChrisF-- joined01:30
Eugene There it is!01:30
You need to reattach your HEAD, see bot factoids for the tl;dr ^01:30
rafasc usually HEAD points to a reference. ( a file under .git/refs/)01:30
devxxx hmmn01:30
Eugene !HEAD01:30
gitinfo HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is *not* something that exists separately for every branch. It also is *not* necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)01:30
rafasc !botsnack01:30
gitinfo Om nom nom01:30
Eugene HEAD is one of the most common stumbling stones. I agree that `git` is not designed well for end-users01:30
PAtches welcome01:30
devxxx wtf is an end-user? i'm a developer01:30
Eugene Developers are the end-user for programming tools. QED01:31
rafasc you're the end-user for the git-project.01:31
devxxx definitely not a good design01:31
rafasc !refund01:31
gitinfo If you are not satisfied with git, or the support provided by the volunteers in #git, you are entitled to a full refund of the purchase price, and are invited to use another VCS. Elsewhere.01:31
devxxx why write software, push it in developer's faces, then ask them to go f* themselves?01:32
you ought to feel a sense of responsibility all things considered01:32
rafasc Eugene is just joking, and I was just messing with the bot.01:32
devxxx and not only to your *own* needs, but the requirements of coders who have decided to opt out of working subverions to git01:32
anyway tthanks01:33
rafasc but git itself is not pushing nothing in anybody faces. That blame goes somewhere else. :)01:33
devxxx: did you managed to fix it your issue?01:34
devxxx i just cloned the master branch again and saved what i needed01:34
ugly but works01:34
Eugene git://, `git`, foo.git, and git-send-pack are all totally different things, none of which actually include an access layer. So given those constraints, git is a rather good system that has been ab/used to power a lot more complex systems(like Github)01:34
devxxx might be a bug in how intellij/goland implements git01:34
rafasc you might wast to learn a bit more about git structure. !book01:35
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 !parable01:35
devxxx since i used their git client and couldn't fix it over cli either01:35
Eugene Ah, IntelliJ. IDE-integrated git client? I have heard lots of bad things about those, but I admit to not using any of them myself, for those same reasons01:35
devxxx yeah IDE integrated01:35
that's what caused the problem01:35
Eugene It may have eaten your repo. Yolo.01:35
devxxx thankfully it made no changes, just a local screw up01:36
nothing was pushed01:36
rafasc devxxx: run this command: $cat .git/HEAD01:36
→ alhariel joined01:36
devxxx i get a checksum01:37
i think01:37
sha256?01:37
rafasc depends.01:37
← cyberg left01:37
rafasc usually you get something like "ref: refs/heads/master"01:37
← solaris left01:37
devxxx that's on my broken local copy btw01:38
rafasc that means you're on branch master checked out.01:38
← xcm left01:38
rafasc if you're on a detached head state, that will contain a commit.01:38
→ xcm joined01:38
→ solaris joined01:39
← Cope left01:39
rafasc so head and master can be both pointing at the same commit but It does not mean that HEAD is pointing at master.01:39
← mpiechotka left01:39
devxxx ref: refs/heads/master <- this is what i get after cloning the master branch01:39
rafasc but if you do something like : git checkout origin/master01:40
devxxx the weird thing is that the HEAD was pointing to a commit which was the same ID as the origin/master01:40
rafasc you'll get a detached head, and the file will contain the commit ID.01:40
devxxx yet it was still detached01:40
← dirtyroshi_ left01:40
devxxx is this an issue with git or is it my screw up?01:41
→ ryanjohnstonyyc joined01:41
rafasc no. working as intended.01:41
do you have experience with C?01:41
devxxx yeah, well i'm going to avoid using that IDE client, since idk what commands its using anyway01:41
yeah many years01:41
rafasc that thing is similar to a pointer to a pointer.01:41
devxxx that identifier?01:42
rafasc HEAD.01:42
← h12o left01:42
devxxx so HEAD points to origin/master which points to the file which is the origin?01:42
clear that up for me :p01:43
rafasc lets go slow.01:43
← Guest97356 left01:44
rafasc there are two cases. If you're *not* detached... .git/HEAD will contain something like "ref: refs/heads/master" and .git/refs/heads/master will contain a commit id.01:44
← kus_ubuntui686 left01:45
→ dirtyroshi joined01:45
→ weijin joined01:45
rafasc but when you're detached, .git/HEAD will contain a commit ID. There's no extra step.01:45
devxxx so head/origin/master, when they all point to the same commit, HEAD will say it points to the master branch? otherwise it will point to another commit (i.e. a local file was changed), meaning it will contain the commit id?01:47
what exactly is the commit id, checksum of the file no? i sure hope not O_o01:47
there were two files affected by this commit, hmmm01:48
← gabrielschulhof left01:49
← ChrisF-- left01:49
rafasc HEAD is what represents your checked out branch.01:49
← weijin left01:50
rafasc you also seem to be mixing some concepts.01:50
origin/master is not the same thing as your branch master.01:50
devxxx is HEAD local only?01:51
rafasc origin/master is a tracking branch, essentialy it's a readonly branch that represents the state of the "remote's master branch"01:51
→ Nicmavr joined01:51
Nicmavr → Guest628501:51
devxxx when you do a check out then HEAD points to that tracking branch?01:52
and when you do a push the tracking branch points to the HEAD commit...?01:52
rafasc HEAD is local, when you change branches on your local repo, the remote doesn't change theirs.01:52
devxxx yeah, makes sense01:52
until a push is done, correct?01:53
rafasc almost.01:53
when you checkout, head points to a local branch. It doesn't point to the tracking branch.01:53
→ weijin joined01:53
rafasc it points to a local branch.01:54
devxxx because the tracking branch is remote, i suppose?01:54
rafasc exactly.01:55
devxxx ok i see what you're getting at01:55
rafasc the tracking branch, the ones names origin/name01:55
named*.01:55
devxxx clearly i gotta read up on this a bit more...01:56
i have to get back to work, but thanks for the info, rafasc01:56
i'll try to resolve the other issue when i get a chance, with the detached HEAD01:56
rafasc if you try to checkout a tracking branch, git thinks ( he asked for a readonly branch, idk what he wants, so I will give him the commit directly)01:57
so you end up in "No branch"01:57
← acidjnk left01:57
rafasc read the !book when you have some spare time.01:58
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 !parable01:58
← Guest6285 left01:58
→ Guest6285 joined01:58
Guest6285 → Kestrel-02901:58
← weijin left01:58
← rorro left01:59
devxxx will do, thanks.01:59
→ kus_ubuntui686 joined02:01
→ Raed|Laptop joined02:02
→ jimmyrcom joined02:04
← CheckDavid left02:04
→ jay-m joined02:05
← hph^ left02:06
← d^sh left02:06
→ cdg joined02:07
→ d^sh joined02:08
← dreiss left02:08
← cdg left02:12
→ g00s joined02:13
← am55 left02:14
→ kus joined02:14
← tymczenko left02:15
← alhariel left02:15
→ alhariel joined02:16
→ weijin joined02:16
→ h12o joined02:16
← al-damiri left02:17
→ philippirrip joined02:18
← tkore left02:19
← VoradorPT left02:19
← chris_wot left02:19
→ finalbeta joined02:20
← h12o left02:21
→ dreiss joined02:22
← weijin left02:23
→ weijin joined02:24
→ daidoji70 joined02:26
← daidoji left02:26
← nugstrocity left02:28
← weijin left02:28
→ h12o joined02:29
→ ChrisF-- joined02:30
← solaris left02:31
← ChrisF-- left02:32
← alhariel left02:33
← jay-m left02:36
← h12o left02:37
→ morenoh14 joined02:40
→ mel00010 joined02:40
→ alhariel joined02:41
→ h12o joined02:42
→ chris_wot joined02:45
← ilbot3 left02:45
→ snowkidind joined02:47
← h12o left02:51
→ IndianArya joined02:56
→ weijin joined02:56
→ olbat joined02:56
← olbat left02:56
→ olbat joined02:56
→ ilbot3 joined02:56
← Guest73 left02:56
← jimmyrcom left02:56
→ stoncebat joined03:00
→ Guest73 joined03:00
← shinnya left03:00
← weijin left03:00
→ Gurkenglas joined03:02
→ cdg joined03:02
→ jimmyrcom joined03:03
→ crabovwik joined03:05
→ h12o joined03:06
← Tawonga left03:07
← cdg left03:07
← iamdb left03:07
← chris_wot left03:10
← MattMaker left03:10
← h12o left03:11
→ MattMaker joined03:11
← snowkidind left03:11
← philippirrip left03:12
← kus_ubuntui686 left03:12
← kus left03:12
← RandomGuyOnIrc left03:13
← xaxxon left03:15
→ xaxxon joined03:17
→ weijin joined03:18
→ philippirrip joined03:20
→ Tawonga joined03:20
→ chachasmooth_ joined03:20
← IndianArya left03:22
← chachasmooth left03:23
→ d5sx43 joined03:23
← g00s left03:25
← weijin left03:25
→ h12o joined03:27
← thiago left03:28
→ canvon joined03:30
← canvon_ left03:30
← d5sx43 left03:31
→ thiago joined03:31
← h12o left03:31
← Tawonga left03:33
→ cdg joined03:34
← Guest73 left03:35
→ _ikke_ joined03:37
→ chris_wot joined03:39
← cdg left03:39
→ kus_ubuntui686 joined03:39
← Thominus left03:40
→ Thominus joined03:42
→ weijin joined03:44
→ Tawonga joined03:46
→ h12o joined03:47
← chris_wot left03:47
→ Pilfers joined03:47
← weijin left03:49
→ weijin joined03:51
← h12o left03:52
← crabovwik left03:52
← SwiftMatt left03:55
→ g00s joined03:55
← weijin left03:55
→ IndianArya joined03:56
← webdev007 left03:58
→ lagothrix joined03:59
→ SwiftMatt joined04:01
→ dabura667 joined04:01
← lagothri1 left04:02
← applecrumble left04:03
→ chris_wot joined04:03
← Gurkenglas left04:07
→ h12o joined04:07
→ cagomez joined04:07
← h12o left04:12
→ veegee joined04:14
← xaxxon left04:19
← Lyqyd left04:19
→ jimmylu2333 joined04:20
← jimmylu2333 left04:20
→ weijin joined04:20
← Tawonga left04:20
← gaeth left04:23
← weijin left04:25
← YuGiOhJCJ left04:27
← _ikke_ left04:27
→ YuGiOhJCJ joined04:27
→ h12o joined04:28
← veegee left04:29
→ jesst joined04:31
→ jesst_ joined04:31
→ _ikke_ joined04:32
→ Tawonga joined04:33
← h12o left04:33
→ igemnace joined04:34
→ weijin joined04:34
→ orbyt_ joined04:38
← ljc left04:38
← weijin left04:39
→ veegee joined04:47
← SwiftMatt left04:48
→ h12o joined04:48
→ dviola joined04:49
→ weijin joined04:52
← cagomez left04:53
→ cagomez joined04:54
← weijin left04:57
→ SwiftMatt joined04:58
← cagomez left04:59
→ shinnya joined05:00
raynold ahh it's a wonderful day05:00
← dansan left05:01
← veegee left05:01
← boombatower left05:01
← Noldorin left05:02
← pks left05:03
← mlopezviedma left05:03
→ mlopezviedma joined05:03
→ pks joined05:05
← mlopezviedma left05:05
→ mlopezviedma joined05:05
→ sleepingforest joined05:07
← MACscr left05:10
→ Guest73 joined05:16
← rafasc left05:17
← chris_wot left05:19
→ veegee joined05:19
→ weijin joined05:22
← alyptik left05:23
→ typikal joined05:25
← SwiftMatt left05:25
← weijin left05:26
← stoncebat left05:27
→ sauvin_ joined05:30
→ schleppel joined05:32
→ phinxy joined05:34
← veegee left05:34
sauvin_ → bocaneri05:35
← Raed|Laptop left05:36
← IndianArya left05:38
→ xaxxon joined05:44
→ weijin joined05:44
← xaxxon left05:44
→ Myrl-saki joined05:47
Myrl-saki I have a repo with submodules in it, how do I make the submodules into a normal directory?05:47
I'm thinking of just removing .gitmodules and the .git05:48
← madewokherd left05:48
← ferdna left05:48
← weijin left05:48
← dreiss left05:48
→ re1 joined05:50
→ kfoonamalik joined05:53
→ ferdna joined05:55
→ weijin joined05:59
→ cdg joined06:00
← jimmyrcom left06:02
← cdg left06:04
← weijin left06:04
→ IndianArya joined06:06
← IndianArya left06:08
← mel00010 left06:09
→ cdg joined06:09
← ferdna left06:10
→ nd_ joined06:12
→ sleepingdeforest joined06:12
→ suhdood joined06:13
→ cdown joined06:13
← cdg left06:13
→ Bin4ry joined06:14
← Lunatrius left06:14
← nd left06:14
→ King_Hual` joined06:15
← sleepingforest left06:15
← toydestroyer left06:16
← brokensyntax left06:16
→ wouter0100 joined06:17
← timewalk1r left06:17
→ timewalker joined06:17
→ brokensyntax joined06:18
← King_Hual left06:18
→ toydestroyer joined06:19
→ rts-sander joined06:19
→ mooasaurus joined06:19
→ Cope joined06:20
Cope → Guest8649206:20
→ aananev joined06:21
← Bin4ry left06:21
← orbyt_ left06:23
→ Lunatrius joined06:24
← kfoonamalik left06:24
← jcarpenter2 left06:26
→ jcarpenter2 joined06:26
→ weijin joined06:30
→ tchan1 joined06:33
← weijin left06:35
→ Jackneillll joined06:37
→ drbean_ joined06:38
← kgrimes left06:38
← suhdood left06:38
← cdown left06:39
→ qaz joined06:39
← nowhereman_ left06:40
→ mulvane_ joined06:45
← mulvane_ left06:45
→ mulvane_ joined06:45
→ dreiss joined06:46
→ IndianArya joined06:47
← NerdyPepper left06:48
→ NerdyPepper joined06:48
→ Bin4ry joined06:50
→ Phylock joined06:50
_ikke_ Myrl-saki: that's not enough06:50
!rm_sub06:50
!submodule_rm06:51
gitinfo [!submodules_rm] To delete a submodule, do this in the superproject: Edit/delete .gitmodules to remove the submodule, and `git add .gitmodules`. Then `rm -rf submodulepath; git rm -f --cached submodulepath; git commit -am "Removed submodules!"` Inspect .git/config for "submodule" entries to remove. Inspect .git/modules for caches to remove. Possible alternatives to submodules: "!gitslave" or "!subtree"06:51
Myrl-saki _ikke_: How about converting the submodule to a normal directory?06:52
_ikke_: I'm guessing rather than `rm -rf submodulepath`, do `mv submodulepath $SOMEWHERE_ELSE`06:53
_ikke_ Myrl-saki: right, and also remove the .git dir/file06:53
inside of it06:53
Myrl-saki _ikke_: Thanks.06:54
_ikke_ but the git rm --cached <submodule> is important06:56
It tells git that directory is no longer a submodule06:57
Myrl-saki _ikke_: Thanks.06:58
← fatalhalt left06:59
→ weijin joined06:59
→ fatalhalt joined07:02
← Bin4ry left07:02
← weijin left07:03
← drbean_ left07:07
→ stan_ joined07:10
stan_ → Guest9026507:10
→ KeyJoo joined07:10
→ freimatz joined07:11
← Guest90265 left07:12
→ nast_ joined07:12
← IndianArya left07:16
← tombusby left07:16
→ tombusby joined07:17
→ mrBen2k2k2k___ joined07:18
→ rajat_ joined07:18
← re1 left07:20
← tunekey left07:20
→ thallada joined07:20
← h12o left07:21
← g00s left07:22
← rajat_ left07:23
← dreiss left07:24
→ muelleme joined07:29
→ Raed|Laptop joined07:30
← jesst_ left07:30
← jesst left07:30
→ snappy joined07:30
← snappy left07:30
→ snappy joined07:30
→ weijin joined07:33
→ MACscr joined07:33
→ giraffe joined07:34
← muelleme left07:35
← Puffball left07:37
← weijin left07:37
← thiago left07:41
→ kgrimes joined07:42
→ weijin joined07:44
← kgrimes left07:47
← weijin left07:48
→ veegee_ joined07:48
← xcm left07:51
→ xcm joined07:52
← mattcen left07:56
← nast_ left07:56
→ adac joined07:58
→ ndim joined07:58
→ weijin joined07:59
← Es0teric left08:00
→ opalepatrick joined08:00
→ mchl_nix joined08:01
→ cdg joined08:02
→ mikemcowie joined08:02
← veegee_ left08:03
← weijin left08:03
→ mattcen joined08:04
← cdg left08:06
→ g00s joined08:07
← g00s left08:08
← beerdrop left08:08
→ mikecmpbll joined08:10
→ cdg joined08:11
→ drbean_ joined08:12
← mikecmpbll left08:15
← cdg left08:16
→ fletom joined08:16
→ beerdrop joined08:20
← Raed|Laptop left08:20
← khisanth__ left08:21
→ manuelschneid3r joined08:22
→ mikecmpbll joined08:23
← mikecmpbll left08:24
→ nowhereman_ joined08:25
→ weijin joined08:25
← Guest86492 left08:25
← Guest73 left08:31
← weijin left08:32
→ venmx joined08:33
→ Guest73 joined08:34
→ khisanth__ joined08:35
→ IndianArya joined08:36
→ nowhere_man joined08:38
→ veegee_ joined08:38
→ Nizumzen joined08:41
← nowhereman_ left08:42
← nowhere_man left08:42
← IndianArya left08:43
→ m-alpha joined08:44
→ MoziM joined08:45
→ im0nde joined08:49
→ blahdodo joined08:51
← veegee_ left08:53
← MoziM left08:54
→ MoziM joined08:56
→ weijin joined08:58
→ afuentes joined09:00
← weijin left09:06
→ nielsk joined09:09
← cfoch__ left09:09
← shinnya left09:12
← paraxial left09:14
← catsup left09:19
→ catsup joined09:19
← catsup left09:20
→ tarkus joined09:20
→ catsup joined09:20
→ elementalest joined09:27
→ paraxial joined09:28
← mchl_nix left09:28
← elementalest left09:29
→ elementalest joined09:30
→ cdg joined09:32
→ weijin joined09:33
← belmoussaoui left09:33
→ DerpGusta joined09:35
← asphyxia left09:37
← cdg left09:37
← weijin left09:38
→ asphyxia joined09:39
← finalbeta left09:39
→ finalbeta joined09:39
→ Cope joined09:39
Cope → Guest5949209:40
→ weijin joined09:40
→ arecaceae joined09:42
→ kgrimes joined09:42
→ cdg joined09:43
← weijin left09:44
← manuelschneid3r left09:45
← cdg left09:47
→ bket joined09:47
← kgrimes left09:47
→ subhojit777 joined09:48
→ belmoussaoui joined09:50
→ devbaka_ joined09:51
→ jnavila joined09:52
← belmoussaoui left09:52
→ belmoussaoui joined09:53
→ mollusk joined09:54
→ cmaureir joined09:55
→ jimmyrcom joined09:55
← cmaureir left09:56
→ z41nt joined09:57
← venmx left10:02
← z41nt left10:03
→ _ADN_ joined10:06
← jnavila left10:07
← m-alpha left10:09
→ phluks joined10:10
→ kes joined10:10
→ acidjnk joined10:11
→ muelleme joined10:12
→ weijin joined10:13
← staafl__ left10:13
← weijin left10:17
← zulutango left10:18
← mollusk left10:18
→ escproxy joined10:19
← muelleme left10:20
← Guest73 left10:23
← escproxy left10:23
→ fr33domlover joined10:26
← opalepatrick left10:27
→ borkr joined10:27
← xcm left10:33
→ xcm joined10:34
→ pirocks_ joined10:34
→ jnavila joined10:35
→ venmx joined10:36
→ am55 joined10:38
→ weijin joined10:38
→ zulutango joined10:41
← weijin left10:43
→ dansan joined10:43
← KeyJoo left10:44
← tarkus left10:45
← pirocks_ left10:46
→ weijin joined10:47
→ Fernando-Basso joined10:47
← subhojit777 left10:47
→ Forlorn joined10:47
→ jooni joined10:50
← Guest59492 left10:51
← weijin left10:51
← dpyro left10:52
→ leeN joined10:53
← sleepingdeforest left10:56
→ Bin4ry joined10:58
→ tymczenko joined10:59
→ mikecmpbll joined11:02
← jnavila left11:02
→ zlsyx joined11:05
→ escproxy joined11:06
→ peterR`` joined11:08
← belmoussaoui left11:10
← Forlorn left11:12
← jimmyrcom left11:17
← igemnace left11:20
← elementalest left11:22
→ weijin joined11:23
→ [Brain] joined11:23
← [Brain] left11:24
→ [Brain] joined11:24
→ NoneTheRed joined11:27
← weijin left11:28
→ m0viefreak joined11:28
← ski4x7 left11:31
→ im0nde_ joined11:32
→ ski7777 joined11:33
→ rorro joined11:35
← rorro left11:35
ski7777 Hi11:36
Normally I use ssh for git, but when I am at school the firewall blocks it. Is there a way to fallback to https automatically?11:37
→ _maker joined11:38
← im0nde left11:40
im0nde_ → im0nde11:40
→ PioneerAxon joined11:40
bremner not afaik, but you could set up url.blah.insteadOf configuration manually (see man git-config)11:41
gitinfo the git-config manpage is available at https://gitirc.eu/git-config.html11:41
← venmx left11:41
← PioneerAxon_ left11:42
→ kgrimes joined11:43
→ PioneerAxon_ joined11:44
← im0nde left11:44
← PioneerAxon left11:46
→ belmoussaoui joined11:47
← XenophonF left11:47
← kgrimes left11:48
→ m-alpha joined11:48
← King_Hual` left11:50
→ King_Hual joined11:50
← King_Hual left11:50
→ King_Hual joined11:50
→ clime joined11:51
clime _ikke_: you there?11:52
→ weijin joined11:55
→ im0nde joined11:58
→ veegee joined11:59
clime let's say I have a tag on a treeish. That tag contains Object ID. How can I get the commit ID from that object ID?11:59
← _maker left12:00
← weijin left12:00
→ maker joined12:00
→ jnavila joined12:00
clime I would like to do a checkout on such tag but git currently does not allow me that with: fatal: Cannot switch branch to a non-commit 'iii'12:01
I am not sure why but git does not allow me to checkout on a tree tag so I need to get the commit ID first.12:02
→ XenophonF joined12:03
← maker left12:03
← zlsyx left12:03
→ tactile joined12:03
→ Forlorn joined12:04
→ Forlorn_ joined12:04
→ zlsyx joined12:04
← DerpGusta left12:06
← IanLiu left12:09
← zlsyx left12:12
→ amrits_ joined12:13
→ zlsyx joined12:13
← veegee left12:13
→ \void joined12:14
← \void left12:15
→ weijin joined12:15
← tchan1 left12:16
→ tchan joined12:17
→ ferdna joined12:19
→ hph^ joined12:20
← im0nde left12:20
← hph^ left12:20
← weijin left12:20
→ \void joined12:21
← \void left12:21
→ nugstrocity joined12:25
→ \void joined12:27
← \void left12:27
→ \void joined12:27
← asphyxia left12:27
← \void left12:28
→ \void joined12:31
← \void left12:33
→ weijin joined12:35
→ ProfMac_ joined12:38
← weijin left12:39
← zulutango left12:41
→ \void joined12:44
← MoziM left12:46
→ subhojit777 joined12:47
→ weijin joined12:48
→ widp joined12:49
→ staafl__ joined12:50
→ stutter_ joined12:50
→ gabrielschulhof joined12:53
← weijin left12:54
← YuGiOhJCJ left12:56
→ zulutango joined13:00
← Bin4ry left13:00
→ Singmyr joined13:01
← stutter_ left13:02
→ kostur86 joined13:02
← raynold left13:03
← gabrielschulhof left13:03
← tactile left13:03
→ tactile joined13:03
← m-alpha left13:04
→ Bin4ry joined13:04
→ veegee joined13:06
← Myrl-saki left13:08
← Forlorn_ left13:09
← am55 left13:09
← alhariel left13:10
→ weijin joined13:10
← tymczenko left13:11
← nugstrocity left13:12
← mikecmpbll left13:13
→ nugstrocity joined13:14
→ am55 joined13:14
← weijin left13:15
grawity clime: you cannot get the commit ID from a tree13:15
there are no reverse links, in particular because the same tree can be used by multiple commits or even act as subtree for other trees13:16
you're not allowed to check out a bare tree, because HEAD must point to a commit13:16
however, you're allowed to check out *files* from a tree13:16
one thing that comes to mind is `git checkout --orphan tmpbranch && git checkout $treeish -- .`13:17
or maybe the last part might be done with `git read-tree --empty && git read-tree $treeish`13:17
I don't know the best method yet13:17
← prg318 left13:18
← zlsyx left13:18
→ tymczenko joined13:20
← nugstrocity left13:21
← veegee left13:21
→ alhariel joined13:21
← devbaka_ left13:28
← chaosruler left13:30
← Bin4ry left13:31
← NoneTheRed left13:32
→ bph^ joined13:32
← ferdna left13:33
→ fakenerd joined13:33
→ PioneerAxon joined13:34
← PioneerAxon_ left13:35
→ theoceaniscool joined13:36
← theoceaniscool left13:37
→ theoceaniscool joined13:37
← _ADN_ left13:39
→ jokester joined13:40
clime grawity: thank you, will try it.13:42
→ prg318 joined13:43
→ kgrimes joined13:44
→ skered joined13:45
← mooasaurus left13:45
→ mooasaurus joined13:46
→ weijin joined13:47
→ PioneerAxon_ joined13:48
→ MoziM joined13:48
→ _ADN_ joined13:48
← PioneerAxon left13:48
→ IndianArya joined13:49
← kgrimes left13:49
← weijin left13:51
→ alan5 joined13:52
→ weijin joined13:56
→ rafasc joined13:56
← belmoussaoui left13:57
→ LarArT joined13:59
← jnavila left14:00
← weijin left14:00
→ devwatchdog joined14:05
← LarArT left14:06
→ LarArT joined14:07
← LarArT left14:07
→ Tobbi joined14:12
← bph^ left14:12
→ freakyy joined14:13
← freakyy left14:13
→ freakyy joined14:13
← dsdeiz left14:18
→ Guest21 joined14:18
← subhojit777 left14:19
← IndianArya left14:19
→ weijin joined14:20
→ IndianArya joined14:21
→ alex_ joined14:23
← weijin left14:24
→ crabovwik joined14:24
→ weijin joined14:26
→ belmoussaoui joined14:28
→ veegee joined14:30
← weijin left14:30
→ bph^ joined14:31
← belmoussaoui left14:32
→ Guest73 joined14:32
→ dreiss joined14:33
→ LarArT joined14:33
← Nugget_ left14:34
← qpdb left14:35
→ qpdb joined14:37
→ mborgard joined14:39
→ lalitmee joined14:40
→ ibiam joined14:40
← LarArT left14:41
→ LarArT joined14:41
← Guest73 left14:42
← LarArT left14:42
→ nugstrocity joined14:42
→ LarArT joined14:43
← fakenerd left14:44
← veegee left14:45
→ fakenerd joined14:47
← nugstrocity left14:48
← ibiam left14:49
→ kostur86_ joined14:49
→ ibiam joined14:51
→ Myrl-saki joined14:51
← kostur86 left14:53
← Forlorn left14:53
← LarArT left14:54
→ jnavila joined14:55
→ weijin joined14:55
→ LarArT joined14:55
→ tarkus joined14:56
← LarArT left14:56
← phinxy left14:58
→ rj13 joined14:59
← zulutango left14:59
← weijin left15:00
← xcm left15:01
← crabovwik left15:01
→ xcm joined15:01
→ crabovwik joined15:02
→ LarArT joined15:02
← LarArT left15:03
← bph^ left15:06
→ Noldorin joined15:06
→ jungsubk joined15:10
→ wxg joined15:11
→ phinxy joined15:11
← kostur86_ left15:12
→ kostur86 joined15:14
← Noldorin left15:15
→ Guest73 joined15:17
→ frederfred joined15:17
← rj13 left15:19
→ madewokherd joined15:20
→ Flechette joined15:21
→ xzt joined15:22
← xzt left15:23
→ rokups joined15:23
→ Metalindustrien joined15:24
→ Cavallari joined15:25
← naoey2 left15:26
→ cdown joined15:26
← Guest73 left15:27
→ weijin joined15:27
← mborgard left15:27
→ kliq joined15:29
← jungsubk left15:31
← weijin left15:32
→ Guest21383 joined15:33
← Guest21383 left15:33
← ibiam left15:34
← tymczenko left15:35
→ weijin joined15:36
← cdown left15:37
→ cdown joined15:38
→ Guest73 joined15:38
→ ibiam joined15:38
← ibiam left15:39
→ ibiam joined15:39
← weijin left15:40
→ tunekey joined15:42
← cdown left15:43
← jnavila left15:44
→ kgrimes joined15:45
→ zkl joined15:48
→ Raed|Laptop joined15:48
→ srednab joined15:49
→ cdown joined15:49
← kgrimes left15:50
→ thiago joined15:50
→ chaosruler joined15:51
→ pylove joined15:53
← wxg left15:53
→ veegee joined15:54
← chaosruler left15:55
← kliq left15:57
← Guest73 left15:57
← zkl left15:57
→ zkl joined15:57
→ kliq joined15:58
← cdown left16:00
→ weijin joined16:01
← Raed|Laptop left16:01
→ mollusk joined16:02
→ salek_ joined16:04
← weijin left16:05
← escproxy left16:06
→ escproxy joined16:08
→ js33_s89 joined16:08
← veegee left16:08
← srednab left16:09
← phluks left16:09
→ veegee joined16:09
→ Guest73 joined16:10
← amrits_ left16:12
→ cdown joined16:13
← escproxy left16:13
← js33_s89 left16:13
→ escproxy joined16:14
← Singmyr left16:15
→ Gurkenglas joined16:16
← tarkus left16:16
→ js33_s89 joined16:16
← minionofgozer left16:16
← Guest73 left16:20
→ minionofgozer joined16:20
← escproxy left16:21
→ kgrimes joined16:21
← js33_s89 left16:21
← veegee left16:25
← devwatchdog left16:25
← cdown left16:26
← kgrimes left16:26
← mollusk left16:28
→ Forlorn joined16:28
→ js33_s89 joined16:29
→ weijin joined16:30
→ naoey joined16:31
← pfleck left16:32
← weijin left16:34
→ pfleck joined16:34
→ ibiam_ joined16:34
→ pfleck1 joined16:35
← pfleck left16:35
pfleck1 → pfleck16:35
→ pfleck1 joined16:35
→ Guest73 joined16:37
← ibiam left16:37
ibiam_ → ibiam16:37
→ GoBear joined16:39
→ belmoussaoui joined16:40
← belmoussaoui left16:42
← Myrl-saki left16:42
→ ResidentBiscuit joined16:42
→ belmoussaoui joined16:42
→ bph^ joined16:43
← armyriad left16:43
← am55 left16:44
← mikemcowie left16:45
← Guest73 left16:47
→ a3Dman joined16:49
→ immae joined16:50
→ weijin joined16:50
← IndianArya left16:51
← tec__ left16:51
→ tec__ joined16:53
→ physkets joined16:53
physkets Hi!16:54
I enabled automatic GPG signing in a git repo16:54
But then I'm unable to make commits while SSHd into the machine16:54
← js33_s89 left16:54
← weijin left16:55
physkets Is there some way I can still make commits while signing them?16:55
← Forlorn left16:55
→ js33_s89 joined16:56
← pfleck1 left16:56
← luckman212 left16:57
← alhariel left16:58
→ veegee joined16:58
← zkl left16:58
bremner physkets: you can forward your gpg-agent17:02
iirc, the gnupg docs explain how17:03
physkets Do you mean forward through "X" ?17:03
→ raynold joined17:03
→ luckman212 joined17:04
← ResidentBiscuit left17:05
→ fstd_ joined17:07
→ weijin joined17:07
→ kfoonamalik joined17:07
← fstd left17:10
fstd_ → fstd17:10
← sunri5e left17:10
← weijin left17:12
← veegee left17:13
→ jesst joined17:15
→ sunri5e joined17:16
→ sleepee joined17:17
j416 physkets: you might want to read http://git.661346.n2.nabble.com/GPG-signing-for-git-commit-td2582986.html#a258331617:18
← ibiam left17:18
→ ibiam joined17:19
j416 and I quote from the above: "Signing each commit is totally stupid."17:19
→ gabrielschulhof joined17:20
j416 also, signing commits make the commit objects themselves all bloated with a signature; look at one: git cat-file -p <commit>17:21
bremner physkets: no, I mean forward via SSH17:21
→ ResidentBiscuit joined17:22
→ nast_ joined17:24
→ mollusk joined17:25
→ redshiftzero20 joined17:26
← redshiftzero20 left17:26
→ alhariel joined17:26
← nast_ left17:27
→ weijin joined17:28
← phinxy left17:29
→ Forlorn joined17:30
← sleepee left17:30
→ jungsubk joined17:32
→ tvw joined17:32
← mlopezviedma left17:33
← alhariel left17:33
← frederfred left17:33
← weijin left17:33
← jesst left17:34
→ escproxy joined17:34
← kfoonamalik left17:34
← ResidentBiscuit left17:34
→ KeyJoo joined17:35
← MoziM left17:37
← minionofgozer left17:38
← MattMaker left17:40
→ MattMaker joined17:40
→ rkta joined17:40
→ minionofgozer joined17:41
→ weijin joined17:41
← fakenerd left17:42
→ alhariel joined17:42
→ webdev007 joined17:42
→ fakenerd joined17:42
→ mud joined17:42
→ phinxy joined17:43
← ibiam left17:44
knitt1 → knittl17:45
→ MoziM joined17:46
← weijin left17:46
← belmoussaoui left17:46
← fakenerd left17:47
→ xeno joined17:47
← kadoban left17:50
← jooni left17:50
→ kadoban joined17:51
→ manuelschneid3r joined17:51
→ IndianArya joined17:51
→ sleepingforest joined17:51
→ Yukkuri joined17:58
← xeno left17:58
Yukkuri hi, can i overlay some submodule directory with another submodule?17:58
→ muelleme joined17:58
Yukkuri say, i have libs/submodule1, can i mount submodule2 to libs/submodule1/submodule2 without changing repository of submodule1?17:58
darn chromium with it's crazy buildsystem18:01
→ weijin joined18:01
→ am55 joined18:03
→ OhYash joined18:04
← weijin left18:05
← jungsubk left18:05
→ YuGiOhJCJ joined18:06
→ jnavila joined18:08
→ frederfred joined18:09
← muelleme left18:09
→ publio joined18:10
→ Lyqyd joined18:10
← staafl__ left18:13
← physkets left18:14
→ dpyro joined18:14
← mollusk left18:16
→ cagomez joined18:16
avar no18:17
← frederfred left18:19
← jnavila left18:20
→ jnavila joined18:20
← escproxy left18:20
→ kgrimes joined18:22
→ VoradorPT joined18:23
← pylove left18:26
← jnavila left18:26
← kadoban left18:26
→ kadoban joined18:27
← kgrimes left18:28
→ weijin joined18:30
← kadoban left18:30
← Forlorn left18:30
→ kadoban joined18:31
← cagomez left18:34
← webdev007 left18:34
← weijin left18:35
→ G4an joined18:35
← JanC left18:35
→ JanC joined18:35
← G4an left18:36
→ cagomez joined18:38
← kadoban left18:40
→ demize joined18:41
← gabrielschulhof left18:42
← demize left18:43
→ orbyt_ joined18:43
→ jungsubk joined18:44
← crabovwik left18:44
→ dan_ joined18:45
dan_ → Guest5663518:45
→ demize joined18:45
← Guest56635 left18:46
→ Guest73 joined18:46
← adac left18:50
→ dege joined18:50
→ stutter_ joined18:50
→ weijin joined18:51
→ Raed|Laptop joined18:53
→ adac joined18:53
→ NightStrike joined18:55
← manuelschneid3r left18:55
← weijin left18:56
← Guest73 left18:57
← adac left18:58
→ kadoban joined19:00
→ Arcaelyx joined19:02
← jungsubk left19:02
→ kgrimes joined19:02
→ adac joined19:04
← adac left19:09
← diogenese left19:11
← MACscr left19:12
→ Guest73 joined19:12
→ crabovwik joined19:15
← IndianArya left19:15
→ Cavallari1 joined19:15
→ IndianArya joined19:15
← IndianArya left19:15
← Cavallari left19:17
Cavallari1 → Cavallari19:17
← phinxy left19:18
→ venmx joined19:19
→ weijin joined19:21
← Guest73 left19:22
← mns_ left19:22
→ jimmyrcom joined19:23
→ butterthebuddha joined19:25
→ wreed joined19:25
← Soni left19:26
← weijin left19:26
← tec__ left19:26
← PioneerAxon_ left19:28
← venmx left19:29
→ tec__ joined19:29
→ cagomez_ joined19:30
← pluc_pilou left19:31
→ pluc_pilou joined19:32
← cagomez left19:33
→ Soni joined19:33
← pfleck left19:33
→ pylove joined19:37
← pylove left19:37
→ tarkus joined19:38
← stutter_ left19:39
→ weijin joined19:40
→ stutter_ joined19:40
← weijin left19:44
← a3Dman left19:48
← Raed|Laptop left19:49
← kes left19:49
← ProfMac_ left19:50
→ ProfMac joined19:51
← tarkus left19:53
← kgrimes left19:53
→ sami4ak joined19:55
← sami4ak left19:55
→ xaxxon joined19:55
← dviola left19:56
→ tarkus joined19:56
→ a3Dman joined19:57
← Nizumzen left19:58
→ Nizumzen joined19:58
← kliq left19:58
→ weijin joined19:59
← YuGiOhJCJ left20:00
→ YuGiOhJCJ joined20:01
→ cdown joined20:01
→ mollusk joined20:02
← theoceaniscool left20:02
← cdown left20:02
← dpyro left20:03
← raynold left20:03
← weijin left20:03
→ dpyro joined20:07
← Nizumzen left20:08
← _ADN_ left20:08
→ Forlorn joined20:08
← dpyro left20:12
→ dpyro joined20:13
→ btree joined20:15
→ weijin joined20:15
→ pfleck joined20:16
← stutter_ left20:16
← am55 left20:16
→ mikecmpbll joined20:17
→ am55 joined20:17
→ veegee joined20:18
→ PioneerAxon joined20:19
← weijin left20:20
→ ok91 joined20:21
← paraxial left20:22
→ stutter_ joined20:23
← lalitmee left20:24
← mattcen left20:25
→ webdev007 joined20:25
← Cavallari left20:25
→ paraxial joined20:26
→ _ADN_ joined20:27
→ mattcen joined20:27
← minionofgozer left20:28
→ minionofgozer joined20:28
← btree left20:31
← veegee left20:32
→ veegee joined20:33
→ Singmyr joined20:36
→ weijin joined20:37
← weijin left20:41
→ CheckDavid joined20:42
← metts left20:45
→ duderonomy joined20:45
→ metts joined20:46
→ rosco_y joined20:48
← veegee left20:48
→ veegee joined20:49
← cagomez_ left20:54
→ cagomez joined20:55
← paraxial left20:56
→ paraxial joined20:57
← duderonomy left20:59
← cagomez left20:59
→ pirocks_ joined21:01
→ sammyg joined21:02
← Fernando-Basso left21:02
→ wintrytbs joined21:03
← veegee left21:04
→ theology joined21:06
→ Strepsils joined21:07
theology how do i install this package with this pull request? https://github.com/Zulko/moviepy/pull/154/files21:07
bremner installing packages is not something git does21:07
← mollusk left21:08
theology this pull request https://github.com/Zulko/moviepy/pull/15421:09
ok, how do i clone a git repository with this pull request bremner21:09
← Strepsils left21:10
→ mborgard joined21:10
→ Narrat joined21:12
← pfleck left21:12
→ weijin joined21:14
bremner I guess someone who uses github can figure that out faster than I. I'd just clone https://github.com/flovilmart/moviepy21:15
_ikke_ !github_pr21:15
!github_pull21:15
gitinfo To easily see Github Pull Requests in your local repo, use this fetchspec trick: https://gist.github.com/piscisaureus/334224721:15
← weijin left21:18
← rosco_y left21:18
← xaxxon left21:18
→ rosco_y joined21:19
← \void left21:20
→ pfleck joined21:21
← rosco_y left21:24
← schleppel left21:25
← rokups left21:26
→ duderonomy joined21:27
→ weijin joined21:28
← stutter_ left21:30
→ rosco_y joined21:31
→ Guest73 joined21:31
→ SmashingX joined21:32
SmashingX how can I search for a string in the different versions of a file with git?21:32
← weijin left21:33
SmashingX the string was removed from the file but I don’t know exactly when and how it got replaced21:33
_ikke_ SmashingX: git log -S <string>21:33
mud SmashingX: Look for -S and -G on log, yeah21:33
← orbyt_ left21:33
theology hamstring21:33
SmashingX but git log -S will look for that string in the log title?21:33
← theology left21:33
→ NoneTheRed joined21:34
mud SmashingX: No, it doesn't search commit messages21:34
SmashingX string in quotes?21:34
_ikke_ SmashingX: git doesn't care, it's your shell that cares21:35
← KeyJoo left21:35
SmashingX but how come I don’t have to specify the file where I’m looking for the change?21:35
_ikke_ SmashingX: you *can* specify it21:35
without it, it will look in all files21:35
SmashingX ah ok21:35
cool21:35
thanks21:35
how can I look to the different versions on a file like a log21:36
← tec__ left21:37
← rosco_y left21:37
→ kn-928 joined21:38
→ tec__ joined21:39
← widp left21:40
← NoneTheRed left21:41
← pfleck left21:41
_ikke_ SmashingX: do you want to see diffs?21:42
SmashingX all the diffs like a log but for a file21:43
← freimatz left21:43
_ikke_ git log -p -- <file>21:43
→ armyriad joined21:44
→ raynold joined21:45
→ wcpan joined21:47
→ nimomo joined21:47
→ cagomez joined21:47
SmashingX _ikke_: thank you!21:47
→ kfoonamalik joined21:47
→ weijin joined21:48
→ kgrimes joined21:48
→ ferdna joined21:49
→ phluks joined21:49
← rwb left21:52
← weijin left21:53
→ asphyxia joined21:53
← kgrimes left21:54
→ sothym joined21:55
← bph^ left21:57
→ rafalcpp joined21:58
→ orbyt_ joined22:01
← sh4rm4^bnc left22:02
← kfoonamalik left22:02
← ok91 left22:03
→ rwb joined22:03
← Esoterisch left22:04
← SmashingX left22:06
→ tymczenko joined22:06
→ weijin joined22:06
→ Esoterisch joined22:08
→ venmx joined22:09
← weijin left22:10
→ deepeddy joined22:14
→ pfleck joined22:15
→ weijin joined22:22
→ asphyxia_ joined22:23
← asphyxia left22:23
← weijin left22:26
→ blackpajamas joined22:27
← blackpajamas left22:30
← nimomo left22:33
→ nimomo joined22:34
→ roca joined22:36
← nimomo left22:38
→ tmcmahon joined22:38
← tmcmahon left22:40
← Singmyr left22:42
← deepeddy left22:43
→ nimomo joined22:43
→ greentea2018 joined22:44
← greentea2018 left22:44
→ xeno joined22:46
← mborgard left22:47
← xeno left22:47
← nimomo left22:48
← venmx left22:49
← olbat left22:50
→ manuelschneid3r joined22:51
← MoziM left22:52
→ olbat joined22:53
← olbat left22:53
→ olbat joined22:53
→ nimomo joined22:55
← am55 left22:55
→ allans joined22:56
→ venmx joined22:56
→ weijin joined22:58
← allans left22:58
→ dre_ joined23:01
← weijin left23:03
→ Engrosseur_de_ma joined23:04
← roca left23:06
← asphyxia_ left23:07
← Phylock left23:09
→ asphyxia joined23:09
← zivester left23:10
→ weijin joined23:10
← sammyg left23:11
← nimomo left23:12
→ iamdb joined23:13
← iamdb left23:13
← weijin left23:15
→ sammyg joined23:16
→ nimomo joined23:16
← pirocks_ left23:17
← kneeki left23:18
→ mlopezviedma joined23:20
→ mateothegreat joined23:21
→ theoceaniscool joined23:21
← nimomo left23:21
← phluks left23:21
→ BlaXpirit joined23:24
BlaXpirit → oprypin23:24
← theoceaniscool left23:27
→ Sleepy63 joined23:27
← tarkus left23:27
→ boombatower joined23:28
→ nimomo joined23:31
→ cdown joined23:34
→ pfleck1 joined23:34
← pfleck left23:34
pfleck1 → pfleck23:34
→ weijin joined23:34
→ cdown_ joined23:36
← nimomo left23:36
← Forlorn left23:37
← cdown left23:38
cdown_ → cdown23:38
← weijin left23:38
→ nimomo joined23:42
← Narrat left23:44
← cdown left23:44
→ Narrat joined23:45
← nimomo left23:48
→ kgrimes joined23:49
→ rorro joined23:51
→ nimomo joined23:52
← borkr left23:54
← kgrimes left23:55
← jstimm left23:55
← nimomo left23:57
→ nimomo joined23:59

Logs Search ←Prev date Next date→ Channels Documentation