Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-07

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:00 EvilPenguin joined #git
00:00 r4z joined #git
00:00 ojacobson git-http-backend contains on authentication code paths
00:00 quetz joined #git
00:00 ojacobson that's entirely down to the server you put in front of it
00:00 danslo joined #git
00:00 rominronin joined #git
00:01 cyphase joined #git
00:01 ojacobson for example, you could put apache in front, with mod_authn_dbd
00:02 star_prone joined #git
00:02 unreal joined #git
00:03 actinide joined #git
00:08 Puffball joined #git
00:09 ochorocho__ joined #git
00:10 fahadash joined #git
00:11 ToBeCloud joined #git
00:11 mkopriva joined #git
00:12 mingrammer joined #git
00:12 codezomb joined #git
00:14 hahuang65 joined #git
00:17 realz_ joined #git
00:18 e14 joined #git
00:18 dhollinger joined #git
00:21 vassagus joined #git
00:22 AnarchyAo joined #git
00:29 clemf joined #git
00:29 msm joined #git
00:32 UserOO7 joined #git
00:33 wizardedit joined #git
00:33 mikeric joined #git
00:33 diogenese joined #git
00:34 sleepee joined #git
00:34 UserOO7 joined #git
00:35 e14 joined #git
00:39 ruby_ joined #git
00:42 stamina joined #git
00:44 justanotheruser joined #git
00:46 pamplemousse joined #git
00:51 Darren_ joined #git
00:51 hiroki Strange problem when using GIT_SSH env variable: running a git clone using GIT_SSH seems to change the output of for instance: '/usr/local/bin/git -C /cf/git/apl-tld.domain.branch.subnet.node/bin config --get remote.origin.url'. Somehow it doesn't perform a get remote.origin.url anymore on the directory specified with C. Instead, the remote URL of the 'to-be-created' repository shows up instead. Running the
00:51 hiroki exact same command outside the GIT_SSH wrapper seems to work without a hitch. Any pointers ?
00:51 cyphase joined #git
00:52 jrozner joined #git
00:54 deadprez joined #git
00:55 deadprez_ joined #git
00:55 mizu_no_oto joined #git
00:56 cqi joined #git
00:58 moei joined #git
00:59 dreiss joined #git
01:00 vrishab joined #git
01:01 ksefchik joined #git
01:02 rominronin joined #git
01:04 d4rklit3 joined #git
01:05 r4z joined #git
01:06 cyphase joined #git
01:06 mycelium joined #git
01:06 _sjs joined #git
01:08 GT4066 joined #git
01:10 lucz joined #git
01:10 yitz joined #git
01:11 ruby_ joined #git
01:11 yitz Heya. If I commit something locally and decide it was a bad move, can I somehow "drop" the last commit (before pushing to remote)?
01:13 israelzuniga joined #git
01:14 MistahKurtz joined #git
01:14 copumpkin joined #git
01:15 shmuli joined #git
01:15 kadoban yitz: Sounds like http://sethrobertson.github.io/GitFixUm/fixup.html#rework_last
01:15 fungal joined #git
01:15 yitz Yeah. Looks like it. Thanks!
01:16 kadoban 'welcome
01:18 cagedwisdom joined #git
01:23 leb joined #git
01:24 raijin joined #git
01:26 sssilver joined #git
01:27 dsantiago joined #git
01:28 pks joined #git
01:28 neersighted joined #git
01:29 mingrammer joined #git
01:29 ghostlight joined #git
01:31 r4z joined #git
01:35 moreirapontocom joined #git
01:36 ruby_ joined #git
01:36 Sasazuka__ joined #git
01:36 a_thakur joined #git
01:36 pouet joined #git
01:36 d4rklit3 joined #git
01:36 blackwind_123 joined #git
01:37 jeffreylevesque joined #git
01:38 r4z joined #git
01:38 _leb joined #git
01:40 duderonomy joined #git
01:41 d^sh_ joined #git
01:42 cyphase joined #git
01:46 Topic for #git is now Welcome to #git, the place for git help and competitive typing | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git: Multiplayer Notepad
01:46 evanwang joined #git
01:46 Vampire0_ joined #git
01:48 israelzuniga joined #git
01:49 deadprez joined #git
01:50 sssilver joined #git
01:51 polyzen joined #git
01:53 deadprez_ joined #git
01:55 kyan joined #git
01:55 SpecChum joined #git
01:56 cyphase joined #git
01:57 dreiss joined #git
01:59 jimi_ joined #git
02:00 mkopriva joined #git
02:01 ksefchik joined #git
02:01 star_prone joined #git
02:02 danslo joined #git
02:02 A5101 joined #git
02:03 rominronin joined #git
02:07 mycelium joined #git
02:09 JamesBaxter joined #git
02:09 cyphase joined #git
02:10 ochorocho__ joined #git
02:12 durham_ joined #git
02:14 hahuang65 joined #git
02:16 Goplat joined #git
02:17 hexagoxel joined #git
02:18 DeaTheAngel joined #git
02:20 waveclaw joined #git
02:21 thiago_ joined #git
02:22 _sjs joined #git
02:22 fstd_ joined #git
02:23 ahr3n joined #git
02:24 arescorpio joined #git
02:26 greendo joined #git
02:27 cyphase joined #git
02:30 cqi joined #git
02:37 lagothri1 joined #git
02:38 dsdeiz is it possible to checkout the files from another branch to the current branch but on a different path?
02:40 mingrammer joined #git
02:41 mycelium joined #git
02:42 cyphase joined #git
02:43 Megaf joined #git
02:43 Eugene dsdeiz - not directly; if you just want one file you can cheat with `git show $REV:$FILE > file.txt`
02:44 Eugene Or you can diff to another branch, with a custom diff-tool even
02:45 pouet joined #git
02:49 dodobrain joined #git
02:53 ruby_ joined #git
02:53 _sjs joined #git
02:54 TheMoonMaster joined #git
02:58 felipe joined #git
02:59 chachasmooth joined #git
03:03 aavrug joined #git
03:04 aavrug joined #git
03:04 rominronin joined #git
03:08 tdeng joined #git
03:08 clr dsdeiz: git read-tree --prefix=different/path/ $branch^{tree}; git checkout -- different/path/
03:09 dsantiago joined #git
03:09 clr That will put the files from $branch under different/path/ in both the index and your sandbox.
03:11 fakenerd joined #git
03:15 Emperor_Earth joined #git
03:15 Vortex34 joined #git
03:17 dsdeiz sweet, yeah ill give it a try. thx!
03:17 flavius joined #git
03:17 Bl4ckpajamas joined #git
03:19 dsantiago joined #git
03:20 ruby_ joined #git
03:20 stonercoder joined #git
03:20 rideh joined #git
03:22 jeromelanteri joined #git
03:24 jeromelanteri my situation is: i have a rails application project with a versionning git (on bitbucket) online. But when i upload it, i forget to exclude/ignore (i see there is .git/info/exclude file, and .gitignore file for that) some directrories, like public/assets/* recursively. But now, i tryied a gir rm --cached public/assets/* -r for ignore them (un-index them) and for remove them from bitbucket repos. But they stay on bitbucket
03:24 jeromelanteri repos (i commit them and push... but stay on the bitbucket repo)
03:25 jeromelanteri how to remove all the content of public/assets/ on the bitbucket repo ?
03:25 jeromelanteri (without remove them from my hard drive)
03:26 pouet joined #git
03:26 jeromelanteri i'm looking the git documentation and thinking about "unstage", but there is no unstage finction has i can see, and i not find what i'm searching for. please, help me
03:26 ayjay joined #git
03:26 e14 joined #git
03:27 phroa jeromelanteri: !bfg !rewrite !forcepush might help a bit
03:27 gitinfo jeromelanteri: A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
03:27 gitinfo jeromelanteri: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
03:27 magicturtle joined #git
03:29 drewery joined #git
03:30 jeromelanteri phroa, when i will do a git-filter-branch for remove them on the repo, i hope this not remove them also on my hard drive... correct ?
03:30 a_thakur joined #git
03:30 drewery hey there, I have a quick question about re-basing my branch...
03:30 phroa so, in theory, if you know the hash of the commit you're at right now, you can always get back to it (and its history, and all files in it, and all files in its history.)
03:30 phroa I'd still take a backup.
03:30 phroa filter-branch is really mean.
03:31 mmattice a couple backups.
03:32 drewery I have a branch "ab" and on beanstalk it says the base branch is master... which actually I branched of "a" ...how can I change the base branch from master to "a"
03:32 drewery I do checkout ab and then try rebase a ...it does not work
03:33 jeromelanteri ok, but there is no other way to just delete files in the repo withou move them from the current localhosts and just said: "ok... ignore these files... do not update them from any where" ? i thank it was that "unstage" command has to done... it is not possible there is not something simple with git for do that... correct ?
03:33 phroa !unstage
03:33 gitinfo To unstage a file from the index(in other words, to undo an accidental `git add foo/bar.txt`), use: git reset -- foo/bar.txt
03:33 phroa ...that isn't great
03:34 jeromelanteri so maybe my question was not clear.
03:34 cyphase joined #git
03:35 phroa I'm reading either: you want to make .gitignore start working, but you've already added files that would be ignored if you didn't.
03:35 phroa or: I never wanted these files in my repo at all, they should have been ignored from the start
03:35 jeromelanteri i try more simply: i want to remove files on the bitbucket online repo, and then tell to git to ignore this directory.
03:35 drewery yeah, you can't stage them first and ignore them later
03:35 drewery you have to ignore in the beginning and do your changes
03:35 circ-user-OBsh3 joined #git
03:36 jeromelanteri phroa, yes sure, but i'm a human, i'm not try to have a lesson about what i should do at start time... because i can not go back in the past and i done it allready. I just want to use a human tool for be able to correct things the easy way. And also, simple things... don't tell me git can not dio that...
03:37 drewery jeromelanteri: don't be rude, nobody is getting paid to help you bro
03:37 jeromelanteri drewery, ok ok... but no one is pefect. so git is for human use or not ?
03:37 phroa that's not rude, but it doesn't really explain which situation you're in
03:37 e14 joined #git
03:38 drewery jeromelanteri: move the directory somewhere else... as if you deleted it... then make a commit without the directory which will remove it from the remote as well...
03:38 jeromelanteri drewery, be rude is make lesson to people instead of help them, i'm nbot rude, i tell you i recognize my error and i'm human.
03:38 drewery then create a ignore file and then put the folder back in
03:38 phroa do you care if public/assets/ is in your history as long as it's gone now and in the future or do you want it gone _completely_?
03:38 drewery that way you will have a clean history too
03:38 jeromelanteri what is rude is to said: you was wrong... go away...
03:39 jeromelanteri phroa, mmmh... yeah, i want to delete it totaly, from history to.
03:39 e14 joined #git
03:39 jeromelanteri so git can not. i need to use  this bfg-repo-cleaner definitly ?
03:40 Bl4ckpajamas joined #git
03:40 phroa the only things that come to mind are the !bfg tool or doing a rather inconvenient interactive-rebase exec to get a shell inside the first commit
03:40 gitinfo A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
03:40 drewery jeromelanteri: yeah you say you are only human... I mean we all are human as well.. so have empathy and don't tell people "don't tell me this" "go away" you demand help saying I am a pure human being but you abuse others WTF!
03:40 drewery I am not cool with that
03:40 phroa I don't think I really know the answer.  if you just want the files gone, "git rm --cached <file>" will untrack a should-be-ignored-but-is-not file
03:41 drewery phroa: I think his problem is that he already committed files that are also in the remote repo
03:41 drewery his problem is not only staging
03:41 jeromelanteri drewery, yes sure. i'm not policeman, and i don't want to be judge also. i hope you can understand. but not i stop to speak about that, this serve nothing, i don't know why you follow on this way man. thank you for your help.
03:42 nights_ left #git
03:42 peepsalot is there a good program to view and edit merge conflict changes side by side on the same lines?
03:43 jeromelanteri phroa, yes i done it, and files will not be tracked sure. but when i go in my bitbucket repo... what i can see ? all these files again are here.
03:43 drewery well, I wrote above on what you should do as well to clean up your remote repo
03:43 phroa peepsalot: man git mergetool
03:43 gitinfo peepsalot: the git-mergetool manpage is available at http://jk.gs/git-mergetool.html
03:44 drewery phroa: do you know how I can change the base branch of my branch from master?
03:44 phroa drewery: nope
03:44 drewery thanks anyways
03:46 jeromelanteri drewery, phroa does this one command is something same as you talking about with me ? http://dalibornasevic.com/posts/2-permanently-remove-files-and-folders-from-a-git-repository
03:47 jeromelanteri (i want to be sure, because i'm not feeling good with git and not well understand all)
03:47 phroa I think so, but be careful.  I think it will also delete local copies of the file, not just what git knows.  make a backup of your files before doing anything
03:48 MattMaker joined #git
03:48 jeromelanteri phroa... mmh... anyway, if delete local files, i normally can regenerate them (and sure, i should backup them)
03:48 mkopriva joined #git
03:48 jeromelanteri so this is a git command, no need to download an other soft (and a java program...)
03:49 a_thakur joined #git
03:49 ayjay ojacobson: it's not good enough.apaches mods are no good. we're forking the git source
03:50 vassagus joined #git
03:50 phroa jeromelanteri: I just remembered this exists https://help.github.com/articles/remove-sensitive-data/#using-filter-branch
03:51 Dispatch joined #git
03:51 phroa I have to go, but good luck
03:51 jeromelanteri phroa, ok, thank you. i'm going to try this.
03:55 clr jeromelanteri: after `git rm --cach <path>' did you commit and then push?
03:55 jeromelanteri and an other question, what is the difference between the use of ".gitignore" or ".git/info/exclude" ?
03:55 jeromelanteri clr, they i do commit -m 'blablabla' and then git push
03:55 jeromelanteri yes
03:56 jeromelanteri clr and i try it on master and devel branch with the same result: my files are allways in the repo
03:56 clr jeromelanteri: and you see the commit out in bitbucket?
03:57 jeromelanteri (not only in the past commits, but they are here now, after the commits and pushes)
03:57 jeromelanteri let me check this
03:58 jeromelanteri yes
03:59 _sjs joined #git
03:59 deltab drewery: rebase should do it
03:59 jrozner joined #git
03:59 drewery I tried rebase it doesn't work
03:59 deltab how so?
04:00 drewery have no clue... on beanstalk it still says base branch is master
04:00 drewery where I thought I originally branched off from some other branch
04:00 deltab jeromelanteri: .gitignore can be added, committed, shared with others; .git/info/exclude is just for your local repo
04:01 drewery https://git-scm.com/docs/gitignore
04:01 clr jeromelanteri: also, .gitignore only applies to the directory it's in (and below)
04:01 mycelium joined #git
04:02 mikeric joined #git
04:02 deltab drewery: in git, branches are just the chains of commits reachable from heads
04:02 clr jeromelanteri: so if you can see the commit and you still see the files on the head of the respective branch, then apparently the commit does not remove those files
04:03 drewery yeah I know, I work with them everyday from dev to prod environments
04:03 danslo joined #git
04:03 drewery may be I am missing something... I just can't seem to rebase this branch onto another branch
04:03 deltab drewery: so, is master just pointing to a commit further down your current branch?
04:03 jeromelanteri clr, ok. so .gitignore give informations, and .git/info/exclude not. but also, the same way, if for example a user clone the repo and the origin owner of the repo has a .git/info/exclude, the user who clone, after generate the public/assets file will probably push them accidentaly... so .gitignore should be better in this situation.
04:04 r4z joined #git
04:04 mehola joined #git
04:05 clr jeromelanteri: what do you see if you run `git log --stat $commit', where $commit is the name of the branch you pushed or the commit's SHA1?
04:05 _sjs joined #git
04:05 rominronin joined #git
04:06 drewery deltab: well the branch I thought I branched off is a branch from master
04:06 drewery I wonder if that's what beanstalk is tracking down to
04:07 jeromelanteri clr, i see the list of deleted file on commit. But also, i just can see that i have a local branch who is not present in the bitbucket repo... why ? i have no idea
04:07 clr jeromelanteri: that seems like good reasoning to prefer the .gitignore in that scenario
04:08 jeromelanteri when i do git checkout -b my_new_branch, and then do works and commit, then push... does this my_new_branch will be create on my bitbucket repo or not ?
04:08 clr jeromelanteri: seems like you are looking at a different branch in bitbucket
04:08 cyphase joined #git
04:08 dermoth joined #git
04:08 jeromelanteri clr, yes, i'm feeeling like i forget my road... :)
04:11 jeromelanteri i'm trying to correct errors and not see some other errors i do i the same time. well... i thank about when i do create a branch, then go isnide, then use it and commit, on the bitbucket repo, at push time it has to create this branch on the repo... but it is not what's happen. so... there is something i not understand.
04:11 Cabanossi joined #git
04:12 madewokherd joined #git
04:12 ochorocho__ joined #git
04:13 clr jeromelanteri: I think if you run `git branch -vv' you will see the branch you are pushing to in square "[remote/branch]" brackets
04:14 jeromelanteri clr i see my branch on my localhost, not on the bitbucket repo
04:16 clr jeromelanteri: you can try pushing explicitly to the branch in bitbucket: git push <remote> <local branch>:<remote branch>
04:16 phanimahesh joined #git
04:16 clr e.g., git push origin my_new_branch:master
04:16 hahuang65 joined #git
04:17 Bl4ckpajamas joined #git
04:18 laumann joined #git
04:19 jeromelanteri clr, git is not happy... he said that i have to pull first because the head branch is in the back in this situation. ok, anyway, i'm going to re-read the basics of git slowly... i think i not well undrestood all. there is local things and synchronisations things, then in the documentation, for me, it is not clear.
04:20 jeromelanteri i learned git the most from there : https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
04:21 jeromelanteri but, it missed to talk about synchronisation between localhost and online repo... or i miiss to see this in a corner somewhere
04:23 cyphase joined #git
04:25 clr jeromelanteri: git is complaining because you are trying to update a remote branch to something that is not a direct decendent of the remote branch.  The soluiton might be to merge, or maybe rebase?  Pretty hard to advise without knowing what your repo looks like and other context.
04:28 jeromelanteri clr... mmmh. i think you understand better than me what is rebase, merge, and how to synchronise things with git. actually on my head it is not clear... all of this. and sometime, i think it is... but quickly strange things happen and show me that... it is not clear at all for me and stay complicate because of that. so... i'm searching for a tuto link who explain me better how to well use all the commands options of git.
04:30 jeromelanteri and i see that if i create a local branch, it is only for my local environment. then if i push from there... it not create a new branch on the repo (and for me it seems to be not logic). so... it is like that.
04:32 jeromelanteri it seems to me to be not logic because, if i create a new branch on my localhost and from there i push... it is logic to think that if this branch not exist on the remote repo, it has to creat it automatically, if not, why a user would like to push something from a new branch ?
04:33 _ikke_ jeromelanteri: How are you pushing
04:33 _ikke_ new branches are created automatically when pushed
04:33 _ikke_ git push <remote> <branch> should just work
04:33 jeromelanteri and if it has to pull for create the new branch empty before sync this one, so if he forget to first create/synch this new empty branch, it will loose his works or it will become complicate just for tell to the remote repo: "ok, create this new branch with this content/or remove files concernend by this branch...".
04:34 jeromelanteri _ikke_, git push origin my_new_branch:master
04:34 peepsalot i'm doing a rebase and ran into a conflict.  if i do rebase --skip, that will ignore the changes from that commit, but the conflicting changes from the new base will all still be there?
04:35 jeromelanteri _ikke_, yes, it seems to works has you tell me
04:35 _ikke_ jeromelanteri: The way you do it, you push a new branch to master
04:35 _ikke_ Not create a new branch
04:36 jeromelanteri _ikke_, ok
04:36 _ikke_ peepsalot: yes, only the changes from that single commit is skipped
04:36 clr jeromelanteri: sorry if the example was confusing
04:37 clr it wasn't clear to me what branch you were trying to push to
04:37 _sjs joined #git
04:37 jeromelanteri hooo... well. now actually on this my_new_branch, my git rm --cached public/assets/* -r show me that inside public/assets/ there is nothing more than one hideen file (cool)
04:38 jeromelanteri clr, no problem, in fact, you know, i feel better to see that i'm not alone to, in practice, be confused with git commands. it let me thinking that i'm not so stupid (sometime). :)
04:38 cyphase joined #git
04:39 pouet joined #git
04:39 clemf joined #git
04:40 jeromelanteri ok, _ikke_ now from there, if i do git status, what i see ? i see that it tell me there is all the files i rm --cached just before in red color and tell me that this files are not followed.
04:40 _ikke_ jeromelanteri: So those files are untracked, but not ignored
04:40 jeromelanteri but... i thank that if i do remove them from index (--cached) it was clear that i really don't care and don't want git care about them to... so why does it signal me these files who will make me more problem after ?
04:41 jeromelanteri _ikke_, ha ! untracked but not ignored... well.
04:41 jeromelanteri i pain to well undersatnd the difference between untracked and ignored.
04:42 jeromelanteri (i'm sorry, for you it seems to be evident)
04:42 jeromelanteri i think that if you ignore you no more track.. then if you no more track, it is because you ignore
04:42 jeromelanteri but not.
04:43 mkopriva joined #git
04:43 jeromelanteri ok, i add thes public/assets/ to my .gitignore file, correct ?
04:43 Andrew_K joined #git
04:44 jeromelanteri but after from other branch... what's will be happen ? may i will remove them from other branch after ignored them ? (it seems to be not logic)
04:44 qws-user-1228 joined #git
04:45 jeromelanteri from there, now, i can not checkout in an other branch... lol very funny isn't it ?
04:47 _ikke_ jeromelanteri: ignores means git status will not list the files
04:47 _ikke_ git will not remove untracked files
04:47 clr jeromelanteri: you add them to .gitignore so they can't easily be re-added (i.e. "tracked") by the repository (e.g., `git add .' followed by a commit)
04:48 _ikke_ that too
04:48 jeromelanteri _ikke_, yes, after add the directory to .gitignore, i had to git add .gitignore, then git commit, then git push, then after i can git checkout master..... pfiu !
04:51 _ikke_ :-)
04:51 a3Dman joined #git
04:53 jeromelanteri _ikke_, clr, ok, now actually, from master branch and with public/assets/ added to .gitignore file, i done a git rm --cached public/assets/* -r (but i thank that same you tell me, git can not remove some file it has to ignore...) and then it show me two things: in green color all that files that has to be deleted, and just under, all that files in red like not ignored (same situation i had from my_new_branch). that for me is
04:53 jeromelanteri totaly un-logic again. but ok... i do git add . then git commit -m 'wash things', then git push... et voila... no more public/assets/ not hidden files in mzster branch to (pfiu !)
04:53 greendo joined #git
04:53 dsdeiz_ joined #git
04:53 ruby_ joined #git
04:54 Pieplay joined #git
04:54 jeromelanteri but now git status show me same... sure .gitignore in this branch has to be modified to
04:55 bket joined #git
04:55 subhojit777 joined #git
04:56 jeromelanteri so ok i understand better... is there a way to, for example, do a midification command that will occur in same time on all branch (or on a list of defined branch) ?
04:56 cyphase joined #git
04:57 jeromelanteri if i want to modify .gitignore in all the branch for example, but in one command line the easy way... how to do that ?
04:57 netj joined #git
04:59 daey_ joined #git
04:59 clr jeromelanteri: see `git help for-each-ref'
05:00 jeromelanteri clr, ok thank you. have a good day gys and thank you all for your help to make me understand a little bit better what and how git do things.
05:01 rvaldes joined #git
05:02 whatevsz joined #git
05:02 dec0n joined #git
05:03 mloy Hi, what's the best way to merge only specific hunks of a development with multiple branches into master?
05:03 mloy of a development branch*
05:03 mloy err
05:03 mloy with multiple commits*
05:03 mloy sorry, i'm very tired
05:04 mloy rephrasing: what's the best way to merge only specific hunks of a branch with multiple commits into master?
05:04 cyan__ joined #git
05:05 clr mloy: what constitutes a hunk?  a subset of the commits?  a subset of the files?
05:05 mloy clr: a subset of the files
05:07 rominronin joined #git
05:07 clemf joined #git
05:07 mloy basically i need to pull specific changes from a development branch where a ton of things were changed over the course of 4 commits. i need certain of those changes, but others break the program in their current state
05:07 mloy i need some of*
05:07 _ikke_ mloy: Best is to split them out in a separate commit, then cherry-pick that commit
05:08 mloy oh thanks _ikke_
05:09 mloy how would you split only certain changes to a new commit?
05:09 mloy stashing the others and then checking out a new branch keeping staged changes?
05:09 mloy s/others/other changes
05:10 bmahe joined #git
05:10 pouet joined #git
05:10 mloy oh nvm, i see, with rebase
05:10 mloy thanks for the help! :)
05:11 clr mloy: if the changes are actually independent between the bisection of the files you care about and the ones you don't, then filter-branch followed by a rebase of the original branch might be the answer.
05:12 cyphase joined #git
05:13 mloy clr: they are! these commits were huge and had many unrelated changes :|
05:13 mloy thanks, filter-branch looks like exactly what i need
05:14 _sjs joined #git
05:14 Aces_Charles joined #git
05:14 clr mloy: and I bet the commit log is about seven words long.  ;-)
05:14 mangolisk joined #git
05:15 mloy clr: it's six! lmao
05:16 _ikke_ :D
05:16 ansimation joined #git
05:16 HumanSheeple joined #git
05:17 dec0n joined #git
05:17 hahuang65 joined #git
05:17 nanga joined #git
05:17 stuh84 joined #git
05:18 mloy this is from the most recent commit: "Showing 44 changed files with 1,662 additions and 2,548 deletions"
05:18 mloy anyways, thanks for all the help y'all
05:18 mloy left #git
05:19 fakenerd joined #git
05:21 ayjay joined #git
05:26 evanwang joined #git
05:27 jungsubk joined #git
05:29 _ng joined #git
05:30 jeromelanteri clr, https://git-scm.com/docs/git-for-each-ref  this has nothing related with "how to modify a file in all branch or in a list of specified branch ?".
05:32 clr jeromelanteri: it's not specific to "how to modify a file", it let's you do something to a bunch of branches, where "something" might be "modify a file"
05:33 clr probably overkill if what you're doing is a one-off effort
05:33 jeromelanteri clr, did you read the doc ?
05:33 jeromelanteri git-for-each-ref - Output information on each ref
05:34 dec0n joined #git
05:34 jeromelanteri how to use this comand to change a file inside each branch ?
05:34 sagittarian|2 joined #git
05:36 jeromelanteri clr, because, if you thinking about use a pipe for include other commands on output, you will not be in other branch to apply the modification... so, i not understand how you can use it for change a file in all branch.
05:37 clr jeromelanteri: for ref in $(git for-each-ref --format='%(refname)'); do echo $ref; done
05:37 mkopriva joined #git
05:37 ksefchik joined #git
05:37 durham joined #git
05:38 jeromelanteri clr, and this will modify, then commit, then push on each branch ?
05:38 jeromelanteri (on each branch)
05:38 clr jeromelanteri: that's a skeleton for looping over a set of references ... I hit <Enter> prematurely.
05:38 jeromelanteri but in fact, what you tell me indirectly is that there is no git command for do that and i have to construct a shell script. that is ?
05:39 clr if you add "refs/heads/*" to the end of the for-each-refs command it will only include branches
05:39 dsdeiz joined #git
05:39 dsdeiz joined #git
05:40 bocaneri joined #git
05:40 ruby_ joined #git
05:40 clr afaik, no, no specific command
05:40 jeromelanteri ok
05:41 rscata joined #git
05:43 ThomasLocke joined #git
05:43 ThomasLocke joined #git
05:44 zeroed joined #git
05:46 Aboba joined #git
05:46 _sjs joined #git
05:47 chele joined #git
05:52 freimatz joined #git
05:52 lolmac joined #git
05:53 dec0n joined #git
05:54 deadprez joined #git
05:55 qt-x joined #git
05:55 cyphase joined #git
05:56 slayerjain joined #git
05:57 Raging_Hog joined #git
05:57 navidr joined #git
05:58 harish joined #git
06:01 pouet joined #git
06:02 JeroenT joined #git
06:06 satya4ever joined #git
06:08 rominronin joined #git
06:12 apotry joined #git
06:13 ochorocho__ joined #git
06:13 vrishab joined #git
06:14 dec0n joined #git
06:16 Macaveli joined #git
06:17 roelmonnens joined #git
06:17 dec0n joined #git
06:19 jrozner joined #git
06:19 Rodya_ joined #git
06:21 elect joined #git
06:23 mingrammer joined #git
06:26 zeroed joined #git
06:26 zeroed joined #git
06:27 sssilver joined #git
06:31 mkopriva joined #git
06:33 JeroenT joined #git
06:34 _sjs joined #git
06:34 a_thakur joined #git
06:37 carif joined #git
06:37 Sceorem joined #git
06:38 star_prone joined #git
06:40 rominronin joined #git
06:40 danslo joined #git
06:42 eduardas_m joined #git
06:45 netj joined #git
06:47 blur3d joined #git
06:49 jceb joined #git
06:49 sssilver joined #git
06:50 dineshp joined #git
06:51 dtux joined #git
06:53 _ng joined #git
06:55 thecomedian hello! My team an I are using git-flow. Yesterday I ran into a problem. While I was releasing a new version, one of my mates merged a feature in the "develop" branch. We ended up having his "develop" branch and the "develop" branch on the remote with his feature merged, but without the commits of the new "release" (the ones I had on my local repository).
06:55 thecomedian What's the correct way of dealing with this problem? I could cherry-pick his "feature" commit on my local "develop" and force a git push to the remote, but then my colleague should reset his "develop" branch...
06:56 Silenced joined #git
06:57 _ng joined #git
06:57 Silenced joined #git
06:58 zeroed joined #git
07:00 i7c thecomedian, why not merge again?
07:00 i7c Your local branch this time.
07:00 thecomedian ah i7c, I forgot to write that I had already pushed the updated "master" and the release tag
07:01 nitesh joined #git
07:01 thecomedian i7c: you mean just "git checkout develop ; git pull" ?
07:02 DieguezZ joined #git
07:02 i7c If you just want to get your local commits in the develop branch, yes, that should work. But I'm guessing a bit about what you want to achieve. What commits are missing in what branch exactly?
07:02 i7c Do you want to update the release of your version?
07:02 cyphase joined #git
07:03 i7c Or just have develop branch with all commits from you and that other guy?
07:05 thecomedian mmm I want to get the local commits to the development branch without changing the history
07:05 thecomedian the remote branch has a commit more then my local
07:05 thecomedian and my local as 3 commits more then the remote
07:05 Mimicize joined #git
07:05 i7c yup, then just merge it again
07:05 i7c There’s no harm in that. :)
07:05 i7c pull is fetch+merge
07:06 submitnine joined #git
07:06 e14 joined #git
07:07 thecomedian that's the fist thing I tried, but the one commit on the remote was merged before the commits of the release (the history of my local develop branch was changed and the commits didn't match the ones on master)
07:07 thecomedian It's like if the git pull did a rebase
07:09 thecomedian I should check my default merge strategies?
07:10 i7c Check if config pull.rebase is set
07:10 Aboba joined #git
07:11 aax joined #git
07:11 _sjs joined #git
07:12 TomyWork joined #git
07:18 hahuang65 joined #git
07:20 Rodya_ joined #git
07:21 nitesh` joined #git
07:23 DieguezZ joined #git
07:23 nilg joined #git
07:23 spudowiar joined #git
07:23 Oebele joined #git
07:25 ksefchik joined #git
07:25 qt-x joined #git
07:26 infra-red joined #git
07:27 Balliad joined #git
07:27 dtux joined #git
07:28 mikecmpbll joined #git
07:29 infra-re_ joined #git
07:30 quetz joined #git
07:30 nilg` joined #git
07:32 star_prone joined #git
07:37 marcisb joined #git
07:37 marcisb Hello all
07:37 gitinfo marcisb: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
07:37 marcisb I have problem
07:37 marcisb I cant see git status because it shows
07:37 marcisb # nothing added to commit but untracked files present (use "git add" to track)
07:37 marcisb Hot i can remove these untracked files?
07:37 _ikke_ What do you want to happen to them?
07:38 _ikke_ Is that list so long that the rest falls off the screen?
07:38 marcisb For edxsample i accidentally added 2 files in my project folder
07:38 marcisb Now i cant use git status
07:38 marcisb because it shows
07:38 _ikke_ git status -uno
07:38 marcisb # nothing added to commit but untracked files present (use "git add" to track)
07:38 simenbrekken joined #git
07:39 marcisb I dont need these files to track
07:39 _ikke_ that hides untraced files
07:39 osse then you should ignore them
07:39 _ikke_ yes
07:39 ahmedelgabri joined #git
07:39 marcisb But i cant use git status
07:39 marcisb because it doesnt shows 2 files from my project
07:39 marcisb but these untracked stuff
07:39 marcisb how i can get away from these message
07:39 marcisb ?\
07:39 _ikke_ marcisb: does git status -uno show that?
07:39 marcisb # nothing added to commit but untracked files present (use "git add" to track)
07:39 osse marcisb: you misunderstand what git status does
07:40 osse marcisb: if you don't change files in your project then git status won't show them
07:40 marcisb # On branch master # Your branch is based on 'origin/master', but the upstream is gone. #   (use "git branch --unset-upstream" to fixup) #
07:40 marcisb On git status-uno
07:40 GavinMagnus joined #git
07:40 Alienpruts joined #git
07:40 marcisb # Untracked files: #   (use "git add <file>..." to include in what will be committed) # #       .nfs00000000057e01a400000001 #       .~lock.id_rsa.pub# # nothing added to commit but untracked files present (use "git add" to track)
07:40 marcisb git status
07:41 marcisb I need repair git
07:41 dsdeiz_ joined #git
07:41 marcisb How i can reset all like a fresh git?
07:41 marcisb remove and add project again?
07:41 Seveas delete the folder and make a fresh clone.
07:41 marcisb ok
07:41 marcisb thx
07:42 laumann joined #git
07:42 marcisb i cant remove folder
07:42 marcisb doenst allow me
07:42 marcisb )=
07:42 star_prone joined #git
07:44 leftriver94 joined #git
07:44 watabou joined #git
07:45 nitesh joined #git
07:48 nitesh`` joined #git
07:49 nilg joined #git
07:51 anonymuse joined #git
07:51 cdown joined #git
07:53 nevodka joined #git
07:58 leftriver69 joined #git
07:58 chll_ joined #git
07:59 mycelium os?
07:59 mikecmpbll joined #git
08:00 nilg joined #git
08:00 bongjovi joined #git
08:02 rjack2_ joined #git
08:02 JeroenT joined #git
08:02 cbreak who doesn't let you?
08:02 mikecmpbll joined #git
08:02 GavinMagnus left #git
08:03 rominron_ joined #git
08:04 polyzen joined #git
08:05 PHPanos joined #git
08:05 lb1c joined #git
08:06 lb1d joined #git
08:06 PHPanos hello
08:08 PHPanos If I have 3 commits where commit #3 is the latest, is it possible to create a new branch from commit #1 and "cherry pick" commit #3 into the new branch somehow? That would mean skipping commit #2 in the new branch
08:08 tobiasvl PHPanos: yes. see also !interactive_rebase
08:08 gitinfo PHPanos: Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.
08:08 GavinMagnus joined #git
08:08 PHPanos tobiasvl: Thank you so much!
08:09 nitesh joined #git
08:10 catbeard joined #git
08:10 DieguezZ joined #git
08:11 jeromelanteri joined #git
08:14 ochorocho__ joined #git
08:14 annoymouse4210 joined #git
08:15 paulh_ joined #git
08:17 marcogmonteiro joined #git
08:20 tvw joined #git
08:20 arand_ joined #git
08:20 mkopriva joined #git
08:22 Rodya_ joined #git
08:23 aspiers joined #git
08:30 berndl joined #git
08:30 ams__ joined #git
08:31 ferr joined #git
08:31 King_Hual joined #git
08:31 cworth joined #git
08:33 liamonade joined #git
08:33 blaster joined #git
08:34 ome joined #git
08:34 a_thakur joined #git
08:36 dimi1947 joined #git
08:36 cyphase joined #git
08:37 King_Hual joined #git
08:37 King_Hual joined #git
08:37 cdown joined #git
08:38 tvw joined #git
08:38 i7c PHPanos, besides interactive rebase you can also do it exactly as you mentioned.
08:38 i7c make a new branch at #1 and cherry-pick the third commit.
08:39 settermjd joined #git
08:40 szmq joined #git
08:40 szmq gi
08:40 szmq hi
08:40 i7c ji
08:40 szmq i hace problem with authentication ;/
08:41 szmq when I do push it asks for a password so ok
08:41 szmq but after
08:41 szmq fatal: Could not read from remote repository.
08:41 szmq Please make sure you have the correct access rights
08:41 ruby_ joined #git
08:42 irqq joined #git
08:42 szmq i can login on website and its ok
08:42 tobiasvl i7c PHPanos: yeah, sorry if that was not clear. "yes" was the answer to your question, and it's also useful to know about interactive rebase.
08:43 tobiasvl szmq: ssh? https? what website?
08:43 szmq ssh
08:45 PHPanos i7c tobiasvl Thank you both! I will probably use the cherry pick method, but I will definitely look into interactive rebase immediately
08:45 tobiasvl then your login on the website has nothing to do with pushing, it's your ssh key that matters
08:45 elsevero joined #git
08:47 szmq tobiasvl: it seems to me that I have the key
08:47 szmq but not work auth
08:48 afuentes joined #git
08:49 tobiasvl szmq: what website is this?
08:49 szmq private gitlab
08:51 jimi_ joined #git
08:51 Blkt joined #git
08:52 PioneerAxon joined #git
08:52 tjone270 joined #git
08:53 sevenfourk joined #git
08:53 star_prone joined #git
08:54 tjone270 joined #git
08:54 satya4ever joined #git
08:56 arand_ joined #git
08:56 cdown_ joined #git
08:59 rchavik joined #git
08:59 Anticom joined #git
09:00 achadwick joined #git
09:01 _ng joined #git
09:02 freimatz joined #git
09:03 Sceorem joined #git
09:04 zonality joined #git
09:06 PioneerAxon joined #git
09:07 Silenced joined #git
09:09 ljc joined #git
09:09 kurkale6ka joined #git
09:11 nilg joined #git
09:12 encod3 joined #git
09:17 mquin joined #git
09:17 rastos2 joined #git
09:19 hahuang65 joined #git
09:19 simenbrekken Hi, my workflow is probably similar to a lot of others. I create pull requests from feature branches that I later squash and merge on Github. I'm wondering if there's an easy way to clean up local branches that have merged using squash and merge. git branch --merged obviously doesn't list the branches since the merge was performed using --squash
09:22 JeroenT joined #git
09:23 Rodya_ joined #git
09:24 GavinMagnus left #git
09:25 berndl simenbrekken: What do you mean by "clean up local branches"?
09:26 notebox joined #git
09:26 nullie remove branches which were merged
09:27 berndl git branch -D ?
09:27 nullie he needs to know which were merged
09:27 paulh_ joined #git
09:28 berndl I don't think there's a way of knowing that, unless its your branches.
09:29 jesk created a new repo, then a new branch, did then like 3 commits, today wanted to make another one, but it failed:
09:29 jesk fatal: loose object 1bd975aada6d8cddd4f7dc1dacf8af9079c1b511 (stored in /var/opt/gitlab/git-data/repositories/configurations/opennms.git/objects/1b/d975aada6d8cddd4f7dc1dacf8af9079c1b511) is corrupt
09:29 jesk how can this happen?
09:29 jesk and what can I do now?
09:31 btree joined #git
09:31 Impaloo In terms of speed, what's the quickest way of extracting the SHA of HEAD?
09:35 i7c git rev-parse HEAD?
09:36 PCatinean joined #git
09:36 tobiasvl Impaloo: I haven't measured it, but I'd think "git rev-parse HEAD"
09:36 i7c Which speed? To type? Execution speed?
09:37 Impaloo i7c: execution speed
09:37 Thorn joined #git
09:37 canton7 or git symbolic-ref HEAD
09:37 i7c Mapping a ref to sha is generally pretty cheap so I don't see why it matters.
09:37 canton7 they're pretty close in terms of speed
09:37 canton7 and they're both really quite quick, so I'm not sure why you'd worry?
09:41 mquin joined #git
09:41 tobiasvl cd .git; cat HEAD | cut -d' ' -f2 | xargs cat
09:41 tobiasvl :>
09:41 tobiasvl well, doesn't work with a detached head I guess...
09:43 Seveas Impaloo: the quickest *correct* way is git rev-parse HEAD
09:44 Seveas tobiasvl: or packed refs.
09:45 simenbrekken berndl: I'd like to figure out which local branches that when merged won't result in any changes on master. Given that I can delete them
09:49 berndl simenbrekken: git diff them first?
09:49 texasmynsted joined #git
09:49 simenbrekken berndl: there's hundreds of branches, I'm looking for something that can automate the cleanup
09:49 JeroenT joined #git
09:50 berndl Write a script?
09:50 Seveas simenbrekken: git merge-tree can help. If its output is empty, a merge would make no changes.
09:51 simenbrekken Seveas: thanks, I'll check that out
09:51 Seveas https://git.seveas.net/previewing-a-merge-result.html#previewing-a-merge-result
09:51 selckin or google it and find like http://stackoverflow.com/a/18143078 (i have no clue if this is correct)
09:51 stamina joined #git
09:51 Seveas it's not. His branches are squash-merged.
09:52 raven-au joined #git
09:53 circ-user-OBsh3 joined #git
09:53 vassagus joined #git
09:53 mkoskar joined #git
09:54 aidalgol joined #git
09:54 wrksx joined #git
09:54 ronskisika joined #git
09:54 wrksx Is there a way to ask git to tell me the location of the systemwide .gitconfig?
09:55 raven-au joined #git
09:57 m1m3-50 joined #git
09:58 selckin doesn't look like it
09:58 aidalgol joined #git
09:59 Seveas wrksx: if you have anything in there , git config --list --show-origin will tell you
09:59 Seveas if you cannot write to it, trying git config --system foo.bar baz will whine at you, telling you the filename
09:59 m0viefreak joined #git
09:59 wrksx Seveas, ty will try
10:00 wrksx hum I get fatal: bad config line 1
10:00 wrksx I think there is an issue =)
10:02 abhinav joined #git
10:02 abhinav hi
10:02 abhinav how to set only one specific file to --heard head of current branch?
10:02 abhinav hard
10:04 tacit joined #git
10:04 Silenced joined #git
10:04 Silenced joined #git
10:06 abhinav rvm.
10:06 abhinav nvm.
10:06 mflow joined #git
10:06 texasmynsted joined #git
10:08 m1m3-50 joined #git
10:08 ASOLAr joined #git
10:11 star_prone joined #git
10:14 Darcidride joined #git
10:14 ahmed_elgabri joined #git
10:14 mar77i joined #git
10:15 ochorocho__ joined #git
10:16 a_thakur joined #git
10:20 JeroenT joined #git
10:21 Thorn joined #git
10:22 PioneerAxon joined #git
10:22 Junior yello! :)
10:24 Junior Just to be sure, if a have a repo named "foo" i can push the report to two remote repositories? I am asking because: i develop locally and i push changes to a remote server named "web" where people will verify the changes. Cna i push also to "gitlab" ? And this automatically if possible? Thanks!
10:24 cagedwisdom left #git
10:24 Rodya_ joined #git
10:24 Puffball joined #git
10:24 _ikke_ Junior: Sure, you can push to as many repositories as you want
10:25 _ikke_ Junior: You can create a shell alias to push to two repositories at the same time
10:25 rts-sander joined #git
10:26 rts-sander I get  an error patch failed / patch does not apply after doing "git checkout -p"
10:26 Junior _ikke_, i have initially added my repo named "web" as : git remote add web ssh://user@server:1110/path/to/app.git so now i can just run: git remote add lab ssh://user@gitlab.com:1100/path/to/app.git ?
10:27 wrksx I switch my git copy (from cygwin git to windows git) and trying to get back to work on my old repo
10:27 wrksx thing is, all files are concidered modified
10:27 wrksx git diff .gitignore (or any file shows:
10:27 wrksx old mode 100755
10:27 wrksx new mode 100644
10:27 wrksx stat -c %a .gitignore shows 775
10:28 wrksx Any hint about what could mess things up for me?
10:28 _ikke_ Junior: correct
10:29 _ikke_ wrksx: You probably have to set git config core.ingoreCase true
10:30 Puffball joined #git
10:31 texasmynsted joined #git
10:32 a_thakur joined #git
10:32 jost joined #git
10:32 Megaf joined #git
10:33 optraz joined #git
10:35 Puffball joined #git
10:35 iveqy joined #git
10:35 notebox joined #git
10:35 mingrammer joined #git
10:40 jimi_ joined #git
10:43 jknetl joined #git
10:45 _ikke_ gmane might be continued (by another company): http://home.gmane.org/2016/08/29/next-steps-gmane/
10:45 JeroenT joined #git
10:49 iveqy joined #git
10:49 nettoweb joined #git
10:51 frobnic Larsi just announced that.
10:52 frobnic https://lars.ingebrigtsen.no/2016/09/06/gmane-alive/
10:52 CussBot joined #git
10:54 wrksx Ha still got the same issue, can't remember what to do
10:54 navidr joined #git
10:54 wrksx I merged my dev branch to my master branch
10:55 wrksx then had some commit on the master, and my dev branch is behind
10:55 wrksx how can I bring my dev branch up to date? it's 2 commits behind, the merge commit, and another commit we can call hotfix
10:56 JeroenT joined #git
10:56 _ikke_ wrksx: merge master into that branch (which will fastforward that branch, kind of disconnecting it from the previous branch)
10:57 wrksx _ikke_, ok tryin that
10:57 aidalgol joined #git
10:57 wrksx _ikke_, worked exactly as u described =)
10:58 wrksx _ikke_, so it's simple really just merge the other way around
10:58 _ikke_ It's does not do an actual merge
10:58 nyuszika7h joined #git
10:58 wrksx _ikke_, I guess using non fast forward I would have kept the branch 'parallel'
10:58 _ikke_ it sees master is now a descendant from that branch, and it will just move the branch ahead (fast-forward)
10:58 Atlantic777 joined #git
10:58 Atlantic777 joined #git
10:59 wrksx yes but the command is merge that's what I meant
10:59 _ikke_ yes
10:59 wrksx yes to what :P
10:59 wrksx g non fast forward I would have kept the branch 'parallel' ?
10:59 elect joined #git
10:59 same_ol_geez joined #git
11:00 _ikke_ yeah, it would've created a commit that master doesn't have
11:00 same_ol_1eez joined #git
11:00 wrksx so non descendent any more
11:00 BeerSerc joined #git
11:00 a_thakur joined #git
11:00 ericsupreme joined #git
11:00 wrksx I think that's good to try and keep it fast forwarding at that point
11:01 aidalgol joined #git
11:02 ksefchik joined #git
11:02 wrksx If I drop a branch, all of it's commit disapear?
11:02 wrksx by disapear I mean 'are forever lost'
11:03 aidalgol- joined #git
11:03 tobiasvl !reflog
11:03 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
11:03 tobiasvl wrksx: not immediately, they're still available in reflog for some time ^
11:03 ahmedelgabri joined #git
11:03 leeN joined #git
11:03 wrksx tobiasvl, okay, this some kind of security buffer, but after that time it's gone forever right?
11:05 tobiasvl yes. you can also expire them prematurely and prune them with git gc (garbage collection) if you want to get rid of them
11:05 tobiasvl and all of this is assuming the commits aren't referred from other branches, of course
11:06 antranigv does Github or Gitlab or any other git server software recognize signed commits?
11:06 wrksx tobiasvl, yeah right. the branch has been merged into master, and then deleted, all that stays would be the merge commit, not the commit of the branch itself right?
11:06 raijin joined #git
11:06 antranigv oh github does :) didn't find yet for gitlab
11:07 greendo joined #git
11:07 tobiasvl wrksx: is the branch has been merged into master, the commits are reachable from master and won't disappear
11:07 tobiasvl s/is/if
11:09 wrksx tobiasvl, okay ty for explaining. all of this is kinda confusing and require some practice. I should play a bit more with toy repo to get better at this
11:09 rastos2 newbie here. let's say I have files several/levels/directories/deep/module-A/code.{c,h} existing in repository "git.example.org:remote/project/repository.git" - is it possible to create a clone which has only the structure "module/code.{c,h}"? I.e. I want to only work on the "module-A" and I do not need the whole deep directory structure.
11:10 canton7 rastos2, you can use sparse checkouts. You'll still clone everything, but only a subdirectory will be checked out
11:10 rastos2 canton7: yes, but the depth of the directory structure remains. that is what I want to avoid
11:10 tobiasvl wrksx: remember that a git branch is just a pointer at a commit. if you delete a branch, the commit it pointed to and its ancestors are not reachable any more, unless another branch points at it or its descendants. unreachable commits will eventually be deleted. if another branch points at it, it's not unreachable and nothing will happen to it. deleting the branch in that case just means deleting the pointer
11:10 tobiasvl .
11:10 mohabaks joined #git
11:11 canton7 ah yeah, so it does
11:11 encod3 joined #git
11:11 wrksx wouldn't it be more accurate to say a git branch is just a list of pointers a commits?
11:12 wrksx miss some words in there :-/
11:13 bremner no. it's a single pointer which moves
11:14 bremner as pointers do.
11:14 tristanp joined #git
11:14 copumpkin joined #git
11:14 wrksx so 1 branch points to only one commit?
11:15 bremner and that commit points to other commits, in most cases
11:15 PioneerAxon joined #git
11:15 wrksx ha, that's the thing then.
11:15 bremner sure, there's pictures in !gcs
11:15 gitinfo [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html
11:16 _ng joined #git
11:17 wrksx bremner, seems like a good ressource, will read that ty
11:18 diogenese joined #git
11:18 PHPanos joined #git
11:19 hahuang65 joined #git
11:21 PioneerAxon_ joined #git
11:22 Pyrogerg joined #git
11:23 notebox joined #git
11:25 Rodya_ joined #git
11:26 ronny left #git
11:29 notebox joined #git
11:30 mingrammer joined #git
11:31 citizen-_ joined #git
11:32 mquin joined #git
11:32 cyan__ joined #git
11:36 phanimahesh joined #git
11:36 m1m3-50 joined #git
11:37 encod3 joined #git
11:38 tlaxkit joined #git
11:39 cyphase joined #git
11:39 citizen-stig joined #git
11:40 Hink joined #git
11:41 DuckHuntDog joined #git
11:42 blip- joined #git
11:43 berndl joined #git
11:43 jost_ joined #git
11:45 Sceorem joined #git
11:45 Achylles joined #git
11:48 dsdeiz joined #git
11:48 dsdeiz joined #git
11:48 phanimahesh joined #git
11:48 d0nn1e joined #git
11:49 DuckHuntDog I just lost the tracking information for my branch after trying to cherry-pick another commit into it. What happened there? (First time I've tried to use cherry-pick) Is that expected?
11:49 lb1c joined #git
11:50 _ikke_ No, cherry-picking should not affect tracking information
11:51 moritz DuckHuntDog: what does 'git status' say?
11:51 Shentino joined #git
11:52 Akimb joined #git
11:52 sdothum joined #git
11:53 vassagus joined #git
11:54 JeroenT joined #git
11:54 bongjovi joined #git
11:55 Sadeukko joined #git
11:55 synthroid joined #git
11:56 mizu_no_oto joined #git
11:56 roelmonn_ joined #git
11:59 jottr joined #git
12:02 anonymuse joined #git
12:06 Eryn_1983_FL joined #git
12:08 mehola joined #git
12:08 dev-rohit joined #git
12:09 raijin joined #git
12:09 cyphase joined #git
12:11 govg joined #git
12:12 erguven joined #git
12:12 star_prone joined #git
12:15 ochorocho__ joined #git
12:18 jceb joined #git
12:18 Megaf joined #git
12:18 phanimahesh joined #git
12:21 Gamecubic joined #git
12:21 PCatinean joined #git
12:22 mar77i joined #git
12:23 Juzzika joined #git
12:24 msm joined #git
12:25 zonality joined #git
12:26 madewokherd joined #git
12:26 settermjd joined #git
12:27 the_last joined #git
12:28 DieguezZ joined #git
12:28 the_last hi, just after a bit of clarification. ive got a v1 release already in master, and ive been working on a v2 release in a dev branch. now my dev branch code is done, im ready to release, should i be tagging my dev branch as v2, or should i be merging into master first, and then tagging master as v2? will it break anyone using v1 if i merge into master?
12:30 osse the_last: does master contain anything that dev doesn't ?
12:31 the_last osse not really, no, the dev branch did not make any changes to existing API stuff, just new additions
12:31 jeffreylevesque joined #git
12:31 osse then i suppose it doesn't matter
12:31 ash_workz joined #git
12:31 osse the common case is to merge dev into master then tag master as v2
12:33 the_last okay. and if i had changes that affected master, i presume there would be merge conflicts. but people using v1 specifically should still be getting the v1 tagged code even in that case, no? their local package, if specifying v1 explicitly, should not pick up any of those new changes, i would think?
12:35 osse the_last:there doesn't have to be any conflicts. yes, and no respectively to your questions
12:35 osse the definition of "v1" will never change
12:35 ayjay joined #git
12:35 tacit left #git
12:36 the_last right :) okay thanks
12:36 liamonade joined #git
12:38 GodGinrai joined #git
12:40 Gurkenglas joined #git
12:41 liamonade joined #git
12:41 notebox joined #git
12:42 hay207 joined #git
12:44 zonality joined #git
12:45 ruby_ joined #git
12:45 johnmilton joined #git
12:48 cdown joined #git
12:49 hay207 Hi, i want to clone only the folder named "source" inside the stuntrally master directory
12:49 hay207 https://github.com/stuntrally/stuntrally/tree/master/source
12:50 ksefchik joined #git
12:50 jast you can't clone part of a repository
12:51 andlabs joined #git
12:54 zivester joined #git
12:54 JamesBaxter joined #git
12:54 mingrammer joined #git
12:58 kalib joined #git
12:59 kpease joined #git
13:00 kalib Hello guys. I am new to git. If I clone a repository from bitbucket, where they have the master, develop, etc.. branches. I will receive all in my master branch, sure. Now I created a local develop branch, because I will include a file that I need to push to the origin develop branch. The question is: Should I run 'git pull origin develop' inside my develop branch so get all the up to date stuff from the origin
13:00 kalib develop branch? And if I do that, when I run 'git push origin develop' from my develop branch, will they (origin) also receive all my local log? Thanks.
13:00 CheckDavid joined #git
13:01 jimi_ joined #git
13:01 mizu_no_oto joined #git
13:03 danslo kalib: a 'git pull' is basically a 'git fetch' + 'git merge'. so yes, it will merge the changes in the remote repository into your local one and when you push they will receive your changes. however it's probably easier to just do 'git fetch' followed by 'git checkout develop' ;-) this will automatically track the remote branch
13:04 testt joined #git
13:04 kalib danslo: so, you mean, right after my git clone, for example.. The first thing I should do before start working should be a git fetch and after that git checkout develop?
13:04 kalib So I wouldn't need to create a local develop with 'git branch develop'?
13:06 rgrinberg joined #git
13:06 danslo kalib: yeah, in fact, you can even omit the git fetch if this is a fresh clone
13:06 brendyn joined #git
13:06 danslo just  git clone and git checkout develop
13:06 sin3t joined #git
13:06 rgrinberg joined #git
13:07 kalib danslo: since I will not be clonning everyday, just the first time.. So I would use git fetch for the next days, right?! I will try it right now.. thanks.
13:07 danslo (of course, you may still need to regularly git pull, while others are also working on develop)
13:07 ProbabilityMoon joined #git
13:08 danslo also another reason to work with feature branches, instead of a generic develop branch. but that's all up to you
13:08 kalib danslo: yes, that's my doubt. so every time, before I commit some change I made.. I would use 'git checkout develop' + 'git pull origin develop' + 'git push origin develop'?
13:09 JeroenT joined #git
13:09 Discovery joined #git
13:10 kadoban joined #git
13:10 danslo git checkout develop, git pull, git merge <whatever feature branch you were working on>, git push - at least that's how we're doing it
13:10 danslo anyway, gotta run for a bit, bbl
13:11 danslo you may also opt to  git pull --rebase origin develop, once in a while, while working on your feature branch. again, it's all up to you :)
13:12 IlNominePatre joined #git
13:12 fmcgeough joined #git
13:12 ExoUNX joined #git
13:12 ExoUNX joined #git
13:12 mehola joined #git
13:13 f3r70rr35f joined #git
13:13 kalib danslo: thanks
13:15 a_thakur joined #git
13:15 NeXTSUN joined #git
13:15 berndl joined #git
13:16 hay207 left #git
13:18 rastos2 joined #git
13:18 bsanford joined #git
13:19 str joined #git
13:20 cdg joined #git
13:20 hahuang65 joined #git
13:22 simenbrekken Seveas: thanks, the command was actually fairly simple: git for-each-ref --no-merged master --shell refs/heads/ --format='git merge-tree `git merge-base %(refname) master` master %(refname)'|sh
13:24 sangy joined #git
13:25 thiago joined #git
13:26 Rodya_ joined #git
13:27 berndl simenbrekken: yeah, that looks "fairly simple"
13:29 star_prone joined #git
13:29 ProbabilityMoon left #git
13:30 ProbabilityMoon joined #git
13:30 togede joined #git
13:30 dendazen joined #git
13:30 crised joined #git
13:30 happy-dude joined #git
13:30 crised is github down or soemthing?
13:31 nilg joined #git
13:32 osse no
13:33 f3r70rr35f joined #git
13:34 stonercoder joined #git
13:34 settermjd joined #git
13:35 e14 joined #git
13:35 jaafar joined #git
13:36 deadprez joined #git
13:38 griffindy joined #git
13:38 Silenced joined #git
13:38 Silenced joined #git
13:44 m0nkmaster joined #git
13:44 serses joined #git
13:45 AaronMT joined #git
13:46 DieguezZ joined #git
13:47 madewokherd joined #git
13:48 Dougie187 joined #git
13:48 Asenar joined #git
13:49 annoymouse joined #git
13:50 jceb joined #git
13:50 hemangpatel joined #git
13:53 hemangpatel Hello there, Is it good to use 100 mb file in git ?
13:53 a_thakur joined #git
13:53 hemangpatel track 100 mb binary file
13:54 ^7heo no
13:54 vassagus joined #git
13:54 hemangpatel Is git LFS help in that scenario ?
13:54 ^7heo There are ways to do that without git directly (see git annex), but it's not good to track a 100mb binary file in git.
13:55 bremner !media
13:55 gitinfo [!annex] git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs
13:55 ^7heo hemangpatel: yes, git lfs too.
13:55 ^7heo and what bremner said
13:56 Gurkenglas joined #git
13:56 saml joined #git
13:56 fahadash joined #git
13:56 hemangpatel ok thanks
13:56 serses left #git
13:56 serses joined #git
13:56 saml how can I tell if a file on my branch is mergeable to another branch without conflicts without actually merging?
13:57 Silenced joined #git
13:57 Silenced joined #git
13:57 crised curl: (7) Failed to connect to github.com port 80: Connection timed out
13:57 saml i branched off foo. call my branch, bar. but i want to create a branch out off master  with one file  from bar.
13:57 cyphase joined #git
13:58 saml crised, curl https://github.com
13:58 saml never mind
13:58 le_melomane joined #git
13:59 zacts joined #git
13:59 freimatz joined #git
13:59 hemangpatel left #git
14:01 geoid joined #git
14:02 notebox joined #git
14:04 osse saml: after creating and checking out the branch:  git checkout bar -- one/file
14:05 EY joined #git
14:05 EY hi all.
14:05 EY can anyone recommend a good diff tool for use with git on Windows?
14:05 DieguezZ joined #git
14:06 selckin kdiff3
14:06 osse meld
14:06 ash_workz joined #git
14:06 osse do you work at EY ?
14:06 marc_v92 joined #git
14:07 EY osse, no :)
14:07 EY I've had this nick since the 90s.
14:07 marc_v92 joined #git
14:07 EY I only noticed their rebranding to EY when I saw the sign on a building in London.
14:08 EY selckin, thanks. I'll give that a try.
14:08 EY osse, I'll check out meld too.
14:09 Noldorin joined #git
14:09 EY does the diff.compactionHeuristic setting affect third-party diff tool?
14:09 tilpner_ joined #git
14:09 selckin no
14:10 saml osse, thanks
14:10 ruby_ joined #git
14:11 pR0Ps_ joined #git
14:11 a_thakur joined #git
14:11 EY OK
14:11 cyphase joined #git
14:12 e14 joined #git
14:15 JRHaigh joined #git
14:15 osse EY: is your name Eric Young?
14:15 EY osse, close enough :) I thought it was in my /whois
14:16 r4z joined #git
14:16 ochorocho__ joined #git
14:17 osse so it is
14:18 ahmedelgabri joined #git
14:19 Potatoes joined #git
14:19 hexagoxel_ joined #git
14:19 mikar joined #git
14:19 ResidentBiscuit joined #git
14:20 kpease joined #git
14:21 bsanford joined #git
14:21 thiago as long as it's not Ernst
14:21 hahuang65 joined #git
14:22 JanC joined #git
14:23 A5101 joined #git
14:24 holodoc joined #git
14:25 EY haha
14:25 EY thiago, why the hate? :)
14:25 Muzer joined #git
14:26 cyphase joined #git
14:27 Rodya_ joined #git
14:28 rgrinberg joined #git
14:28 mohabaks joined #git
14:28 sssilver joined #git
14:28 phaleth joined #git
14:28 e14 joined #git
14:28 clemf joined #git
14:29 axisys joined #git
14:29 PCatinean joined #git
14:30 chrisshattuck joined #git
14:30 Seveas Because auditors are a useless annoyance.
14:30 pythonirc101 joined #git
14:31 pythonirc101 why not "git pull" instead of "git pull origin master"?
14:32 Corosus joined #git
14:33 EY pythonirc101, on git pull documentation, it has this to say:
14:33 EY When no refspec was given on the command line, then git pull uses the refspec from the configuration or $GIT_DIR/remotes/<origin>. In such cases, the following rules apply:
14:33 deadprez joined #git
14:33 EY pythonirc101, read the rest of the rules on the page.
14:34 pythonirc101 EY: Thanks
14:34 EY pythonirc101, np.
14:35 ResidentBiscuit joined #git
14:36 ruby_ joined #git
14:36 Orku joined #git
14:36 danslo joined #git
14:36 EY Wow. kdiff3 has not been updated since 2014. does this mean it's matured?
14:37 moritz it's so mature that biologists have a separate word for it.
14:37 EY moritz, transcendance?
14:37 danslo matured, abandoned... same difference
14:37 moritz EY: it doesn't dance very much :(
14:38 EY moritz, :)
14:38 ksefchik joined #git
14:39 tribly joined #git
14:39 satya4ever joined #git
14:39 stomplee joined #git
14:40 rscata joined #git
14:42 ToBeFree joined #git
14:42 lss8 joined #git
14:42 crose joined #git
14:42 govg joined #git
14:42 johnmilton joined #git
14:42 Pyrogerg joined #git
14:42 tristanp joined #git
14:42 optraz joined #git
14:42 Anticom joined #git
14:42 mkopriva joined #git
14:42 Vampire0_ joined #git
14:42 VladGh joined #git
14:42 rbr joined #git
14:42 thoros- joined #git
14:42 mattsl1 joined #git
14:42 underpantz_ joined #git
14:42 iamtakingiteasy joined #git
14:42 Nevik joined #git
14:42 KnightsOfNi joined #git
14:42 traxo-xx joined #git
14:42 kaldoran joined #git
14:42 AndreSomers joined #git
14:42 snits_ joined #git
14:42 LHL_Jordan joined #git
14:42 deltab joined #git
14:42 mrkake joined #git
14:42 siprbaum joined #git
14:42 mwleeds joined #git
14:42 gruetzkopf joined #git
14:42 styler2go joined #git
14:42 jesk joined #git
14:42 EgS joined #git
14:42 jast joined #git
14:42 krabat joined #git
14:42 bond joined #git
14:42 gnoirzox joined #git
14:42 Soliton joined #git
14:42 Derega joined #git
14:42 forgot joined #git
14:42 TomyWork joined #git
14:42 crose joined #git
14:42 mingrammer joined #git
14:42 dviola joined #git
14:43 ToBeFree joined #git
14:43 govg joined #git
14:43 danslo_ joined #git
14:43 HoierM joined #git
14:43 cyphase joined #git
14:44 a_thakur joined #git
14:45 a_thakur joined #git
14:46 ruby_ joined #git
14:46 ahmed_elgabri joined #git
14:47 a_thakur joined #git
14:48 notebox joined #git
14:49 abra0 joined #git
14:49 deadprez joined #git
14:49 e14 joined #git
14:49 chrisshattuck joined #git
14:49 lss8 joined #git
14:50 flopsec joined #git
14:50 subhojit777 joined #git
14:50 njbair joined #git
14:52 njbair joined #git
14:52 andlabs joined #git
14:53 zivester joined #git
14:55 anonymuse joined #git
14:55 ahmedelgabri joined #git
14:55 InfoTest joined #git
14:55 njbair joined #git
14:55 jceb joined #git
14:56 stomplee joined #git
14:57 vassagus joined #git
14:58 p4trix joined #git
15:00 harish joined #git
15:01 dmto joined #git
15:01 roelmonnens joined #git
15:04 lordjancso joined #git
15:04 anonymuse joined #git
15:04 phanimahesh joined #git
15:04 mallowmow joined #git
15:05 shinnya joined #git
15:05 cyphase joined #git
15:06 mallowmow joined #git
15:06 InfoTest joined #git
15:07 mallowmow I've followed this page: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/#platform-linux in order to push an existing file into a repository that I've made but I am given the following error: ! [rejected]        master -> master (fetch first), am I going about this in the right way?
15:07 deadprez joined #git
15:08 mallowmow ultimately, is there a better way of push files to a repositry that I've created on github?
15:09 grawity this sounds fine on its own, but part of the story seems to be missing
15:09 grawity what does your repo have right now?
15:09 grawity e.g. does it have Github's stock README? (the article above specifically mentions that in step 1.)
15:10 mallowmow it has a stock README and a LICENCE
15:10 GeekMan joined #git
15:10 twizsted joined #git
15:10 mallowmow ah grawity, good spot
15:10 MacGyver If the repository on github is fresh, simply use the Star Wars option (--force push)
15:11 MacGyver It's basically got conflicting master branches now because you initialized with those files.
15:11 Curly060 joined #git
15:12 mallowmow MacGyver: yeah, I think I'm just going to create a new repo without the files
15:12 MacGyver mallowmow: No need really, just force the push.
15:13 crelix joined #git
15:13 eivarv joined #git
15:13 lordjancso joined #git
15:13 mallowmow MacGyver: does this not create issues later?
15:14 LionsMane joined #git
15:14 canton7 only if you've cloned the repo elsewhere
15:14 canton7 it doesn't sound like you have, so it's OK in this case
15:14 tyreld joined #git
15:15 mallowmow will I have to use the force option each time?
15:15 canton7 no
15:16 canton7 this is specifically because github has a commit which you don't have, you want to send some commits to github which github doesn't have, and you want to throw away the commit which github does have
15:18 sssilver joined #git
15:18 Ieca joined #git
15:18 mallowmow work perfectly, thank you all
15:19 Edwin__ joined #git
15:19 ochorocho__ joined #git
15:20 mallowmow by using the --force option, I no longer have a readme or licence file, do those have to be created locally and pushed in order to avoid conflicts?
15:21 grawity it doesn't matter
15:21 LeBlaaanc joined #git
15:22 grawity after you threw away what's on Github, now local repo & Github repo are on the same commit, so from now on it's regular fetch/merge/pull/push business
15:22 PCatinean joined #git
15:22 dreiss joined #git
15:22 mallowmow but if I add readme and licence remotely, any changes locally will be in conflict, no? given locally I do not have those readme or licence files?
15:23 grawity no, what would they conflict with?
15:23 grawity if only one repo adds a file, it doesn't matter which one does
15:23 grawity it propagates like a regular change
15:23 MacGyver mallowmow: Is this your first time using git?
15:24 grawity so if you added them remotely, and tried to pull in that change locally, a conflict would only happen if you *did* also have uncommited local versions of the same file
15:24 mallowmow but the reason I had an issue previously was because I was adding a file to the repository where there was only a readme and licence locally
15:24 mallowmow MacGyver: no, unfortunately
15:24 grawity no, that wasn't quite the reason
15:24 grawity that was a symptom
15:24 wrksx I was reading that thing http://gitolite.com/gcs.html#(35) and am a bit confused
15:24 chigang_ joined #git
15:24 wrksx is it possible to checkout a remote's branch directly?
15:24 MacGyver mallowmow: Okay, so you're familiar with the distributed model and synchronizing repositories?
15:25 grawity the real reason was that the Github repo had a completely separate history from the local one
15:25 mallowmow MacGyver: the basics but very little past that, I'm afriad
15:25 e14 joined #git
15:26 grawity and a `git push` always reports a conflict if you try to push something that doesn't /strictly/ "go forwards" from what the server already had
15:26 grawity now, you could have actually done the opposite and pulled/merged that Github README into your local repo
15:26 grawity merging those two histories into one
15:27 grawity but it's just a stock README; that's a waste of time
15:27 bsanford_ joined #git
15:27 cyan__ joined #git
15:27 grawity such a merge *would* likely have been conflict-free though
15:27 mallowmow but it is not necessary for me to pull files such as a readme to my local machine in order to be able to continue pushing to the remote repo?
15:28 deadprez joined #git
15:28 grawity generally it is
15:28 grawity like I said, pushes are usually only accepted if they go forwards
15:28 Rodya_ joined #git
15:28 grawity (to avoid accidentally overwriting someone else's earlier push)
15:28 Jellyg00se joined #git
15:29 Darren_ joined #git
15:29 grawity all of this is probably a lot easier to understand when seeing actual commit graphs, like gitk shows
15:30 May-meimei__ joined #git
15:31 satbyy joined #git
15:31 zacts joined #git
15:31 wrksx oh nm, they got it covered on slide 52, checkout a remote's branch is possible but results in a detached head
15:32 mallowmow I now have an error telling me I can't push because there is no upstream branch, is this because of the creation of the README?
15:32 pythonirc101 left #git
15:32 grawity nope, git is just being obtuse by default
15:32 grawity `git push -u origin master` to set it
15:33 raijin joined #git
15:33 Edwin__ Hi! I could use some assistance with deleting an old commit from a local repository. I've googled the problem, but haven't found a solution that works for me.
15:34 m0viefreak joined #git
15:34 grawity all solutions boil down to the same history rewriting, really
15:34 Edwin__ The problem appears to be the branching after the commit I want deleted.
15:34 mallowmow grawity: it seems I am having the original issue since I created a readme on the remote repo, after doing the --force push
15:34 Bart_ joined #git
15:34 marc_v92 joined #git
15:35 grawity mallowmow: this time it's somewhat different since both repos now start at the same base
15:35 grawity mallowmow: i.e. this is the earlier thing about having to pull in remote changes before being able to push local ones
15:35 cyphase joined #git
15:36 grawity Edwin__: as in?
15:36 Edwin__ I tried several things with "git rebase", but that either left the commit in other branches or made quite a mess.
15:36 Bart_ hey, I'm trying to expose a git repo through my apache server on windows
15:36 SegFaultAX joined #git
15:36 Bart_ But I keep getting 403 Forbidden
15:36 Bart_ on the git directory
15:36 grawity Edwin__: in Git, branches are pointers to a specific history
15:36 Bart_ I can push and pull locally, but not through the apache server
15:36 grawity Edwin__: so they all have to be rewritten in an identical way to remove a commit
15:37 mingrammer joined #git
15:37 grawity Edwin__: I *think* `git replace` + `git filter-branch` might be less destructive actually
15:38 mallowmow grawity: I tried using git pull origin master and I think it now requires me to merge, is that correct?
15:38 grawity mallowmow: yes
15:38 Edwin__ grawity: Does it help that the commit in question *only* adds files. And those files are never changed again.
15:39 grawity Edwin__: not the slightest
15:39 grawity Edwin__: or, well, I guess it does mean a rebase isn't required
15:39 grawity let's see
15:39 Edwin__ My problem is that the contents of that commit need to be gone before I can share the repository.
15:40 grawity so it's not the commit itself, but the files that have to be deleted
15:40 grawity `git filter-branch --tree-filter` or `git filter-branch --index-filter` will be useful
15:40 grawity see e.g. github's tutorial on nuking sensitive data
15:40 sssilver joined #git
15:41 Edwin__ Having the files gone and the commit message cleared would be enough.
15:41 VagabondAzulien joined #git
15:42 grawity filter-branch has --prune-empty to remove no-op commits
15:42 mallowmow grawity:  when I use the command "git merge", an error appears telling me that I have not concluded the merge,although that's what I am trying to do, is there an additional command I'm missing?
15:42 grawity so if you ask it to remove the exact same files that a commit added, then I'm pretty sure it'd also get removed entirely.
15:42 grawity mallowmow: at this point I have no idea at all what you're looking at
15:42 grawity mallowmow: !repro, etc.
15:42 gitinfo mallowmow: [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
15:43 ksefchik joined #git
15:44 Bart_ How do I even find out if git-http-backend is doing anything?
15:44 Edwin__ grawity: thanks, I'll go read up on that and have a go at it.
15:49 cyphase joined #git
15:54 mallowmow when I try to git pull, there error states that it cannot run vi, does git need to use vi in order to pull?
15:55 LeBlaaanc joined #git
15:55 cyan__ joined #git
15:56 marc_v92 joined #git
15:57 hdon joined #git
15:57 hdon hi all :) do there exist any scripts for reverse-engineering the git revision of a particular working tree?
15:57 berndl mallowmow: Sometimes, it does.
15:58 GodGinrai marc_v92: it's probably merging
15:58 GodGinrai * mallowmow
15:58 osse hdon: no, but you can create a temporary git repo to produce it
15:58 _ikke_ It runs an editor when the pull results in a merge commit
15:59 mallowmow I use vim daily and I don't understand why it can't find vi
15:59 hdon osse, what do you mean?
15:59 _ikke_ mallowmow: which vi
15:59 _ikke_ what does that return?
15:59 GodGinrai mallowmow: maybe it's not in the path git has access to? (or the vi symlink doesn't exist)
15:59 deadprez_ joined #git
15:59 osse hdon: now I'm not sure, because I realize I didn't understand the question
15:59 mallowmow vi in the terminal finds nothing but vim opens vim
15:59 mallowmow weird
16:00 GodGinrai mallowmow: that means the symlink doesn't exist
16:00 GodGinrai mallowmow: what distro are you on?
16:00 mallowmow manjaro
16:00 hdon by "reverse-engineering git revision," i mean if someone produces a tar archive and they don't know which revision it belongs to, figure out which revision it belongs to, or the revision from which it descends
16:00 hdon my simplest idea is to use some dumb heuristic like measuring the number of lines output by "git diff" and picking the one with the lowest
16:01 osse hdon: you can find the hash of the top-level tree
16:01 SegFaultAX hdon: Was the archive created with git-archive?
16:01 hdon SegFaultAX, no. some jerks copied and pasted all the files but the .git dir
16:01 mallowmow GodGinrai: thanks for your help with this
16:02 SegFaultAX hdon: Bummer. You're in a rough spot then.
16:02 hdon SegFaultAX, yeah.. :\
16:02 Electrometro joined #git
16:02 osse y u no listen to me
16:02 osse this ain't no rough spot
16:02 hdon osse, oh, how?
16:02 osse hdon: you can find the hash of the top-level tree
16:03 osse hdon: git init; git add .; git commit -mthrowaway; git rev-parse HEAD^{tree}
16:03 hdon osse, i come from mercurial but have switched to git. i still have some difficulty with git's jargon. what is "top-level tree?"
16:03 osse no compare that number to all the numbers produced by git log --format='%H %T' in the original repo
16:03 SegFaultAX That assumes there are no artifacts from the build process in the tarball that were untracked by the original repo
16:03 osse hdon: "tree" = git's way of storing a directory
16:03 hdon osse, oh, i see. i think that won't work because changes have already been made :\
16:03 osse now you'
16:04 osse now you're in a rough spot
16:04 hdon :3
16:04 SegFaultAX Indeed.
16:04 osse diff it against all commits and find which diff is the smallest
16:04 hdon osse, lol yes, that's my only idea...
16:05 govg joined #git
16:05 Bart_ Do I need to tell git http backend on what port it is nywhere?
16:05 hdon i'm gonna see if i can identify a set of files which haven't been modified locally in any of the "forks" i'm looking at... that might help speed up the process since i don't have time to develop an efficient diff measurement system... it's not unlikely that only a few revisions were used as the basis for these "forks"
16:05 CheckDavid joined #git
16:06 osse hdon: if you know the time the tar was produced you can exclude any newer commits
16:06 mohabaks joined #git
16:06 osse finding some files that are identical seems like a good idea
16:07 osse as for an efficient diff measurement system(TM) I was just thinking diffing it all and see which git diff --shortstat produced the smallest numbers
16:11 e14 joined #git
16:11 jrozner joined #git
16:12 zeroed joined #git
16:12 zeroed joined #git
16:14 chrisshattuck joined #git
16:15 mehola joined #git
16:17 e14 joined #git
16:17 mycelium joined #git
16:19 danslo joined #git
16:20 synthroid joined #git
16:20 actinide joined #git
16:20 jas4711 joined #git
16:21 actinide joined #git
16:22 hahuang65 joined #git
16:23 VagabondAzulien joined #git
16:24 terminal_echo joined #git
16:24 actinide joined #git
16:24 cyphase joined #git
16:25 albel727 joined #git
16:25 romerocesar joined #git
16:29 Rodya_ joined #git
16:29 nitric joined #git
16:32 LionsMane joined #git
16:34 annoymouse joined #git
16:35 t0by joined #git
16:35 vrishab joined #git
16:36 linoespinoza joined #git
16:37 OnBrokenWings joined #git
16:38 linoespinoza joined #git
16:38 Salander27 joined #git
16:39 laumann joined #git
16:39 a_thakur joined #git
16:41 bket joined #git
16:41 axisys joined #git
16:42 stonercoder joined #git
16:43 spudowiar joined #git
16:44 ejb joined #git
16:45 NimeshNeema joined #git
16:47 e14 joined #git
16:47 ruby_ joined #git
16:48 d5sx43 joined #git
16:48 paws_ joined #git
16:49 falkenb0t joined #git
16:50 RominRonin joined #git
16:51 SteffanW joined #git
16:52 gargola joined #git
16:52 pikajude joined #git
16:52 pikajude joined #git
16:52 greendo joined #git
16:53 holodoc joined #git
16:53 quetz^^ joined #git
16:53 LionsMane joined #git
16:55 RominRonin joined #git
16:55 EvilPenguin joined #git
16:56 mikecmpbll joined #git
16:57 gargola joined #git
16:59 Silenced joined #git
16:59 armyriad joined #git
17:01 Silenced joined #git
17:01 Groscheri joined #git
17:02 d4rklit3 joined #git
17:02 ejb joined #git
17:04 nikivi joined #git
17:05 rominronin joined #git
17:05 cyphase joined #git
17:09 Psychiatrist joined #git
17:10 stux|RC-only joined #git
17:11 rom1504 joined #git
17:12 liuzhen joined #git
17:15 thiago joined #git
17:15 thiago joined #git
17:15 dmto joined #git
17:16 Xizor joined #git
17:17 RominRonin joined #git
17:17 AnarchyAo joined #git
17:17 srcerer joined #git
17:17 deadprez joined #git
17:18 stux|RC-only joined #git
17:20 cyphase joined #git
17:22 gusnan joined #git
17:22 gusnan joined #git
17:22 netj joined #git
17:23 nilg joined #git
17:23 fakenerd joined #git
17:23 liuzhen joined #git
17:25 mingrammer joined #git
17:25 axisys joined #git
17:26 peepsalot joined #git
17:27 le_melomane joined #git
17:29 Rodya_ joined #git
17:32 Grav joined #git
17:33 Sasazuka joined #git
17:33 cyphase joined #git
17:33 dreiss joined #git
17:34 Silenced joined #git
17:34 Silenced joined #git
17:37 irqq joined #git
17:40 e14 joined #git
17:40 rahtgaz joined #git
17:41 ahmedelgabri joined #git
17:42 deadprez joined #git
17:43 mikecmpbll joined #git
17:44 pouet joined #git
17:47 cyphase joined #git
17:50 SwiftMatt joined #git
17:50 hdon osse, i can't trust the m-time :(
17:50 hdon osse, i'll check out --shortstat thanks :)
17:52 bruce_lee joined #git
17:54 kyan joined #git
17:55 multi_io joined #git
17:57 chris2 joined #git
18:00 dmto joined #git
18:00 cyphase joined #git
18:03 pouet joined #git
18:03 Grav left #git
18:06 rominron_ joined #git
18:06 actinide joined #git
18:07 dsantiago joined #git
18:09 ejb joined #git
18:11 mikecmpbll joined #git
18:13 stomplee joined #git
18:13 sanketdg joined #git
18:13 Darren_ joined #git
18:13 cyphase joined #git
18:14 sanketdg joined #git
18:15 mohabaks joined #git
18:15 mgoodwin left #git
18:15 morenoh149 joined #git
18:16 mehola joined #git
18:17 sanketdg joined #git
18:18 sanketdg joined #git
18:19 mingrammer joined #git
18:22 pouet joined #git
18:22 durham joined #git
18:22 hahuang65 joined #git
18:23 jimi_ joined #git
18:26 nicoulaj joined #git
18:28 quetz joined #git
18:28 ToBeCloud joined #git
18:29 fees joined #git
18:29 cyphase joined #git
18:30 quetz^^ joined #git
18:30 ejb joined #git
18:30 ejb joined #git
18:31 _Patrick_ joined #git
18:31 ash_workz joined #git
18:33 MrJones joined #git
18:33 MrJones hi
18:33 e14 joined #git
18:34 MrJones I tried to write myself a simple git mirror to be able to have something available for others on the popular github, while using something else as a development platform (still public but on my own infrastructure)
18:34 MrJones the mirror simply checks out all branches, then pulls from a 'source' origin from that branch, then pushes to the 'target' origin on that branch
18:34 MrJones however, still I managed to get an incorrect resulting history on the target :-/
18:35 MrJones (commits on incorrect branches)
18:35 MrJones can someone think of an obvious problem which I might have overlooked with that approach?
18:36 UTAN_dev_ joined #git
18:36 MrJones basically the order of things is: git fetch source; git branch -a (and check for results); git checkout branch_1; git pull source branch_1; git push target branch_1; git checkout branch_2; git pull source branch_2; ...
18:37 MrJones is there a scenario I'm missing where this can lead to unintentional merges?
18:38 israelzuniga joined #git
18:38 zacts joined #git
18:40 osse MrJones: if you force push your automated thing might create merges
18:43 MrJones osse: no, I'm never force pushing and nobody is actually doing anything on the target
18:43 MrJones still the branches got mangled up and some commits are on an incorrect branch :-/ I have absolutely no idea why
18:43 osse MrJones: in any event it sounds like you should use git clone --mirror
18:43 pouet joined #git
18:43 cyphase joined #git
18:44 MrJones osse: probably, but I would still need to push per branch I think
18:44 osse that's not a problem
18:45 MrJones is there a git pull option to never merge?
18:45 osse no
18:45 bremner use git fetch
18:45 DuckHuntDog joined #git
18:46 osse pull is simply not the right tool for the job
18:46 crawler joined #git
18:47 dmto joined #git
18:47 MrJones bremner: will git fetch actually advance the local branches though?
18:47 ToxicFrog No, but if it's meant to be a mirror, why does it have local branches at all?
18:48 MrJones because I can't run code on github, obviously
18:48 MrJones so it works as a sort of in-betweener that gets the changes from A, and then pushes them to B
18:48 falkenb0t joined #git
18:48 osse you don't need local branches for that
18:49 ejb joined #git
18:49 MrJones how do you propose to do it?
18:49 osse git fetch origin; git push github origin/master:master
18:49 MrJones hm
18:49 erguven joined #git
18:49 Vinnie_win_g joined #git
18:49 MrJones that certainly looks like it might be what I want to do
18:49 ToxicFrog osse: maybe push -f, since you have no guarantee that origin isn't doing silly things with history
18:50 osse and if you use clone --mirror it's just git fetch origin; git push github master; because with --mirror it doesn't create the remotes/origin prefix
18:50 MrJones I would rather have it fail in fishy situations
18:50 osse ToxicFrog: agreed
18:50 MrJones yea but --mirror would mean I'd need to redownload everything all the time
18:50 MrJones that doesn't really seem like a good approach
18:50 osse no
18:50 osse git clone --mirror once, git fetch thereafter
18:51 _ikke_ it just changes how an what refs are feched
18:52 satifant joined #git
18:57 RominRonin joined #git
19:06 rominron_ joined #git
19:06 star_prone joined #git
19:07 eka13 joined #git
19:07 eka13 left #git
19:07 pouet joined #git
19:09 mikecmpbll joined #git
19:12 mohabaks joined #git
19:12 e14 joined #git
19:14 e14_ joined #git
19:16 btree left #git
19:21 zacts joined #git
19:21 MrJones osse: ah, I might have found the culprit. apparently you can't reliably change to another branch with zero commits in the repo
19:21 MrJones so I guess directly after launch with a blank repo trying to change to a non-master branch and pulling changes, it might have pulled them sometimes to master
19:21 rgrinberg joined #git
19:23 raijin joined #git
19:24 antranigv I'm finally able to use git without looking at the manual every min, yeeey
19:24 pouet joined #git
19:24 _ikke_ antranigv: gratz
19:25 m1m3-50 joined #git
19:27 CheckDavid joined #git
19:28 durham_ joined #git
19:30 antranigv how can I do tags?
19:30 antranigv say I want to make a tag, that this commit is a version release?
19:30 antranigv or something like that, heh
19:31 _ikke_ git tag -a <version>
19:31 _ikke_ This will tag the current commit with that version
19:32 antranigv aha! oh gonna read the manual, thankie _ikke_ !
19:32 antranigv btw, it can be anything, aye?
19:32 antranigv even a UUID? :P
19:33 infra-red joined #git
19:33 King_Hual joined #git
19:34 nwkj86 joined #git
19:35 jeremyhall joined #git
19:35 yitz left #git
19:37 antranigv so this company uses Jira thing, I wonder if I can tag each development period with a tag?
19:37 Gianormagantrous joined #git
19:38 hahuang65 joined #git
19:39 toogley joined #git
19:39 m1m3-50 joined #git
19:42 nwkj86 joined #git
19:42 synthroid joined #git
19:43 red82 joined #git
19:44 s34n joined #git
19:45 israelzuniga joined #git
19:46 deadprez joined #git
19:46 s34n When I `git submodule` it lists all of the entries in .gitmodules except for one. When I `git status`, it lists all the subdirectories except for the one for the missing submodule.
19:46 s34n git version 2.4.11
19:46 _ikke_ antranigv: sure
19:47 RominRonin joined #git
19:47 _ikke_ s34n: git submodule update --init
19:48 liamonade joined #git
19:48 s34n _ikke_: same
19:49 chrisshattuck joined #git
19:49 jagob joined #git
19:49 jason237 joined #git
19:50 morenoh149 how do I checkout a single file at a certain commit?
19:50 s34n if I git submodule --init path/to/submodule, git tells me ~"pathspec did not match any file(s) known to git."~
19:51 s34n morenoh149: git help checkout
19:52 Xrayez joined #git
19:52 pouet joined #git
19:53 _ikke_ git ls-tree path/to/submodule
19:53 deadprez joined #git
19:53 _ikke_ morenoh149: git checkout <commit> <file>
19:54 morenoh149 _ikke_: ++
19:54 e14 joined #git
19:55 JamesBaxter joined #git
19:55 s34n _ikke_: fatal: Not a valid object name
19:56 s34n morenoh149: sorry. That is not documented in git help
19:57 vuoto joined #git
19:57 morenoh149 s34n: is okey
19:58 e14 joined #git
19:59 drizztbsd joined #git
20:02 Xrayez joined #git
20:02 Xrayez joined #git
20:02 s34n _ikke_: can I delete it from .gitmodules, then git submodule add again?
20:04 stuivi joined #git
20:05 thiago joined #git
20:05 Xrayez joined #git
20:06 relipse joined #git
20:06 relipse why is my dev and origin/dev different, how do i get them the same?
20:06 rominronin joined #git
20:07 s34n relipse: git status
20:07 kadoban relipse: You should check somehow, either !lol or gitk --all . When you figure out what happened, then you can choose how to make them the same.
20:07 gitinfo relipse: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
20:08 mingrammer joined #git
20:09 EvilPeng1 joined #git
20:10 s34n relipse: is your origin a commit or more ahead or behind?
20:10 cdg joined #git
20:10 cdg joined #git
20:11 vuoto joined #git
20:12 spudowiar joined #git
20:12 relipse Your branch and 'origin/dev' have diverged,and have 62 and 40 different commits each, respectively
20:12 toogley joined #git
20:12 raijin joined #git
20:12 carif joined #git
20:12 relipse how do i make dev be the same as origin/dev
20:12 Alienpruts joined #git
20:12 kadoban relipse: Are you sure you want to just dump your local branch and make it exactly equal to the remote?
20:13 kadoban Do you know what changes you're dumping, if any?
20:13 relipse i'm not dumping anything
20:13 zacts joined #git
20:13 relipse yes remote is best i think
20:13 relipse right isn't the remote the one with more commits
20:13 pijiu2 joined #git
20:14 kadoban You have *different* commits, which can mean either you rewrote history accidentally, or you did some work, they did some work, etc.
20:14 kadoban If you really want to do it, git checkout dev && git reset --hard origin/dev   pretty dangerous though, as far as git commands go.
20:15 relipse i did rewrite history
20:15 relipse how do i determine which is the most up to date
20:15 kadoban That was the first thing I suggested. Did you look at what commits differ between them?
20:16 relipse ok i found out remote is more up to date
20:16 relipse i pushed on my laptop at home
20:16 aard_ joined #git
20:17 mehola joined #git
20:17 deadprez joined #git
20:18 ochorocho__ joined #git
20:19 Rodya_ joined #git
20:20 martinkl_ joined #git
20:20 kulelu88 joined #git
20:26 falkenb05 joined #git
20:27 pouet joined #git
20:28 israelzuniga_ joined #git
20:28 nettoweb joined #git
20:30 bauruine joined #git
20:31 relipse I can't figure out why my changes do not have public_html/resources i rebased and it should of had this
20:32 relipse it is listed in untracked files
20:32 skylite joined #git
20:34 jwest joined #git
20:34 LukeLR joined #git
20:36 e14 joined #git
20:37 dodobrain joined #git
20:37 raijin joined #git
20:39 nikivi joined #git
20:39 vuoto joined #git
20:40 DuckHuntDog joined #git
20:40 DuckHuntDog left #git
20:43 m1m3-50 joined #git
20:44 mycelium joined #git
20:46 cagedwisdom joined #git
20:47 r4z joined #git
20:49 tjone270_ joined #git
20:50 jeffreylevesque joined #git
20:50 boontdustie joined #git
20:53 mrpackethead joined #git
20:54 raijin joined #git
20:57 eivarv joined #git
20:58 deadprez joined #git
21:00 smakarov_ joined #git
21:01 Darren_ joined #git
21:02 mingrammer joined #git
21:02 deadprez joined #git
21:04 LionsMane joined #git
21:05 Marco_Ramius joined #git
21:05 liamonade joined #git
21:05 clemf joined #git
21:06 DomeMasterYolo joined #git
21:07 rominronin joined #git
21:07 p4trix joined #git
21:09 yitz joined #git
21:09 yitz How do I pull all remote branches?
21:10 elastix joined #git
21:10 ansimation joined #git
21:10 ojacobson you want to merge -every- remote branch into your current local branch?
21:11 ojacobson weird, but, `git pull some-remote branch branch2 branch3 branch4…` should do it
21:11 afuentes joined #git
21:11 ojacobson (this is very unlikely to be what you wanted.)
21:11 p4trick joined #git
21:11 yitz Eh. How about just fetching a list of all remote branch names?
21:12 ojacobson `git ls-remote REMOTE 'refs/heads/*'` will list them, `git fetch REMOTE` will update your locally-cached tracking branches (origin/foo, for origin)
21:13 hahuang65 joined #git
21:13 yitz Thanks
21:14 ojacobson I would avoid `git pull` entirely until you have a stronger understanding of how git handles remote branches, personally; everything it does can be done with `git fetch` and `git merge`, and being explicit about the steps for a while may be useful for learning about the semantics and common practice
21:15 yitz Yeah. Wrong thing. I don't actually want to fetch nor merge (nor pull). I basically just wanted that ls-remote list so I can help prune old branches I created
21:15 ojacobson `git fetch --all --prune && git branch --no-merged origin/master` may be helpful :)
21:15 LukeLR joined #git
21:15 ojacobson (update locally-cached state, then compare local branches with origin/master to find the ones that aren't merged)
21:16 ojacobson you can also use `--merged` there to identify ones which _have_ been accepted
21:16 ResidentBiscuit joined #git
21:16 ahmedelgabri joined #git
21:17 yitz merged ones should be dropped from remote, so, yes. Those are good :)
21:19 shirty joined #git
21:19 cdg joined #git
21:19 yitz We use feature branches for each tiny change and the number of branches in one repo is getting large
21:19 ojacobson You may want to add `--remote` or `--all` to `git branch`, then - the version I gave will list your _local_ branches
21:20 boombatower joined #git
21:20 ojacobson (Backing theory: every repo has a 100%-independent set of branches. 'master' and 'origin/master' have no relationship with one antoher, except the one in your head.)
21:20 ojacobson (The one in your head is entirely real, in as much as it guides your workflow, but git doesn't care.)
21:20 yitz *nods*
21:21 BSaboia joined #git
21:26 l4v2 joined #git
21:29 cdown joined #git
21:31 Dazzyp joined #git
21:32 dsdeiz_ joined #git
21:33 DJ_Spies joined #git
21:34 johnmilton joined #git
21:34 jimi_ joined #git
21:37 DieguezZ joined #git
21:39 hahuang61 joined #git
21:39 aidalgol joined #git
21:41 martinkl_ joined #git
21:42 deadprez joined #git
21:43 ToBeCloud joined #git
21:44 brandonw joined #git
21:44 e14 joined #git
21:46 raijin joined #git
21:47 Wizek joined #git
21:48 Dougie187 left #git
21:48 Topic for #git is now Welcome to #git, the place for git help and 90s cartoons | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | It's big, it's heavy, it's wood! git-log, from BLAMMO!
21:50 Diqb joined #git
21:51 Wizek hey, quick question! Can relative refs (e.g. "master@{yesterday}") be specified with different characters instead of curly brackets?
21:51 Eugene !treeish
21:51 gitinfo A tree-ish is something that looks like a tree. Read 'man gitrevisions' and http://git-scm.com/book/en/Git-Tools-Revision-Selection
21:51 Eugene ^ that's what git accepts.
21:53 Eugene master@{yesterday} is the syntax for master's state, as of yesterday. Note that this refers to your local master's state at that time, not to a commit that was made yesterday on any remotes
21:53 Eugene (and is thus probably not what you want anyway)
21:53 Wizek Actually, it is :) let me be more specific
21:54 ix007 joined #git
21:54 Wizek I mean along the lines of substituting the curly character literals, e.g. "master@<yesterday>" or "master@[yesterday]"
21:54 Eugene Nope.
21:54 r4z joined #git
21:54 Eugene !xy
21:54 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
21:55 Wizek sure thing
21:55 johnmilton joined #git
21:55 Wizek I just recently found out that it is possible on GitHub to point to a file not just by branch name and commit hash, but by relative refs too! E.g.: https://github.com/Wizek/exp-di-poc/blob/master@%7B_2016-09-06_22:40_%7D/Main10.hs
21:56 Wizek Which I really like, and I was wondering if I could make it even more clean by substituting %7B and %7D to something
21:57 jumpman joined #git
21:57 fullstack joined #git
21:58 Wizek Eugene, Do you see any different hoops that I can jump through? :)
21:59 citizen-stig joined #git
21:59 Eugene Ah, I gotcha
21:59 Eugene %7B and %7D are just {} URL-encoded; there's really no way to get around that
22:00 chrisshattuck joined #git
22:00 Eugene It's an artifact of your browser, not of github or git
22:00 aax joined #git
22:00 e14_ joined #git
22:02 stonercoder joined #git
22:02 fullstack joined #git
22:03 andlabs joined #git
22:04 e14_ joined #git
22:06 nidr0x joined #git
22:08 artgoeshere joined #git
22:08 wrkfc5 joined #git
22:08 rominronin joined #git
22:09 vassagus joined #git
22:09 pouet joined #git
22:10 Shentino joined #git
22:10 justanotheruser joined #git
22:10 Wizek Sure, I know that too, that's why I was wondering if by chance git supported different chars that didn't need URL encoding
22:10 artgoeshere joined #git
22:10 ochorocho__ joined #git
22:11 jimi_ joined #git
22:11 Wizek But it seems not, so I'll just have to deal with the sight of %7Bs and %7Ds
22:11 neanderslob joined #git
22:12 s34n I did a git rm on a directory. Now I'm trying to git add submodule that directory, but git says a git directory of that name is found locally with remote(s)
22:13 s34n what do I have to do to reuse that directory as a submodule?
22:15 madewokherd joined #git
22:15 artgoeshere joined #git
22:16 neanderslob joined #git
22:17 deadprez joined #git
22:18 mehola joined #git
22:18 artgoeshere joined #git
22:20 jumpman joined #git
22:23 ojdo joined #git
22:23 moneylotion joined #git
22:24 QwertyDragon joined #git
22:29 neanderslob joined #git
22:34 sangy joined #git
22:34 pouet joined #git
22:35 Rouker joined #git
22:36 e14 joined #git
22:36 vassagus joined #git
22:40 Rodya_ joined #git
22:41 anuxivm joined #git
22:43 a_thakur joined #git
22:44 moneylotion joined #git
22:44 star_prone joined #git
22:46 raijin joined #git
22:47 moneylotion joined #git
22:47 DomeMasterYolo joined #git
22:50 artgoeshere joined #git
22:51 mingrammer joined #git
22:59 m1m3-50 joined #git
23:00 jimi_ joined #git
23:00 jimi_ joined #git
23:01 deadprez joined #git
23:01 monoprotic joined #git
23:05 DieguezZ joined #git
23:06 EvilPenguin joined #git
23:06 al-damiri joined #git
23:07 cdown_ joined #git
23:08 McNozes joined #git
23:09 rominronin joined #git
23:11 vrishab joined #git
23:11 deadprez joined #git
23:12 duderonomy joined #git
23:12 deadprez joined #git
23:13 artgoeshere joined #git
23:13 rishi` joined #git
23:13 Gitzilla_ joined #git
23:14 GavinMagnus joined #git
23:14 BrianJ joined #git
23:14 ksefchik joined #git
23:16 ayjay joined #git
23:17 kanzure p/win 3
23:19 ochorocho__ joined #git
23:20 l4v2 joined #git
23:20 pouet joined #git
23:21 vrishab joined #git
23:22 inflames joined #git
23:28 _Patrick_ joined #git
23:34 rishi` joined #git
23:34 dendazen joined #git
23:38 EvilPenguin joined #git
23:39 dsdeiz joined #git
23:39 deadprez joined #git
23:40 hahuang61 joined #git
23:41 eizua joined #git
23:42 clandestino joined #git
23:43 diogenese joined #git
23:43 unreal joined #git
23:45 fahadash joined #git
23:46 durham joined #git
23:47 clemf joined #git
23:48 thiago joined #git
23:51 cagedwisdom joined #git
23:51 Raed|Mobile joined #git
23:52 tyreld joined #git
23:57 tobyn joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary