Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-14

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

All times shown according to UTC.

Time Nick Message
00:00 gmunker The difference between my pc and my laptop is that i am the only user on the laptop, on the pc i have 3 users
00:00 gmunker i did that as well
00:00 gmunker same error
00:00 mizu_no_oto joined #git
00:00 jast you have these messages that say, "operation not permitted, rename [... incomplete ...]"
00:01 jast that suggests there's a file or directory in the way somewhere
00:01 thiago joined #git
00:02 gmunker going to run it again as admin, and i'm being summoned by the wife to put kids to bed :( i'm sorry i'll be as quick as i can, not expecting you to hang around and i really appricate the help you have given me already! I'll be back in a few mins.
00:03 jast yeah, I have to go get some sleep, good luck with this though
00:04 thiago joined #git
00:05 Vampire0 joined #git
00:07 Raed joined #git
00:08 romerocesar joined #git
00:11 shinnya joined #git
00:11 clemf joined #git
00:13 gmunker Cool thanks again if your still looking in! I'm gonna go play with it some more now that i have a little more to go on.
00:14 raspado joined #git
00:16 kingpinlz_ joined #git
00:18 clemf_ joined #git
00:20 kingpinlz_ joined #git
00:23 medeirosthiiago joined #git
00:23 Rodya_ joined #git
00:24 boombatower joined #git
00:25 ahr3n joined #git
00:28 tesuji_ joined #git
00:30 e14 joined #git
00:38 Rodya_ joined #git
00:39 justanotheruser joined #git
00:40 kingpinl_ joined #git
00:41 justanotheruser joined #git
00:41 ochorocho__ joined #git
00:41 stfn joined #git
00:46 bauruine joined #git
00:46 mingrammer joined #git
00:47 NeverDie joined #git
00:48 barbs joined #git
00:49 cqi joined #git
00:52 NeverDie joined #git
00:53 PioneerAxon joined #git
00:55 Raed joined #git
00:59 tjone270 joined #git
01:00 heroux joined #git
01:03 Mobutils joined #git
01:04 Rodya_ joined #git
01:06 guilherme joined #git
01:09 e14_ joined #git
01:09 HoierM joined #git
01:11 raven-au_ joined #git
01:11 kini joined #git
01:11 chigang joined #git
01:13 actinide joined #git
01:14 ahr3n joined #git
01:14 pks joined #git
01:15 finalbeta joined #git
01:15 duderonomy joined #git
01:17 clemf joined #git
01:19 prawnzy joined #git
01:20 mozzarella joined #git
01:22 therealGent joined #git
01:22 fguillot joined #git
01:23 bluepixel joined #git
01:23 tjone270 joined #git
01:25 guilherme joined #git
01:25 waveclaw joined #git
01:27 Salander27 joined #git
01:27 tjone270 joined #git
01:28 tjone270 joined #git
01:28 SwiftMatt joined #git
01:30 SwiftMatt joined #git
01:31 e14 joined #git
01:32 Vivekananda joined #git
01:34 waveclaw joined #git
01:35 Dougie187 joined #git
01:37 d^sh joined #git
01:46 dweelie joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and all your base | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-prune: not as tasty as git-cherry, but much better for you
01:55 SwiftMatt joined #git
01:56 EvilPenguin joined #git
01:58 thiago joined #git
01:58 rchavik joined #git
02:00 theskillwithin joined #git
02:00 harish joined #git
02:07 Motoko joined #git
02:08 fstd joined #git
02:09 Noldorin joined #git
02:11 deadprez joined #git
02:12 SwiftMatt joined #git
02:19 prawnzy joined #git
02:23 d0nn1e joined #git
02:26 Electrom_ joined #git
02:26 ojdo joined #git
02:28 Mobutils joined #git
02:28 Salander27 joined #git
02:29 zivester joined #git
02:30 afuentes joined #git
02:32 deadprez joined #git
02:33 howdoi joined #git
02:33 elementalest joined #git
02:33 elementalest joined #git
02:34 durham_ joined #git
02:34 mingrammer joined #git
02:34 elementalest joined #git
02:34 elementalest joined #git
02:37 elementalest joined #git
02:37 mkoskar joined #git
02:40 cybersphinx joined #git
02:43 chrisshattuck joined #git
02:44 Goplat joined #git
02:44 Shakeel_ joined #git
02:45 deadprez joined #git
02:49 barbs joined #git
02:50 netj joined #git
02:52 Dougie187 left #git
02:52 ayjay_t joined #git
02:54 bratchley joined #git
02:54 bratchley Any idea why ssh can use an ssh identity but git says it doesn't exist? https://dpaste.de/bxsL
02:55 actinide joined #git
02:56 BSAlb joined #git
02:57 EvilPenguin joined #git
03:00 Puffball joined #git
03:01 boombatower joined #git
03:02 netj joined #git
03:02 dsantiago joined #git
03:03 aavrug joined #git
03:03 chachasmooth joined #git
03:04 cyan__ joined #git
03:05 Peuc joined #git
03:05 Puffball joined #git
03:07 hexagoxel joined #git
03:09 thiago bratchley: what is your GIT_SSH set to?
03:09 glebihan_ joined #git
03:09 boombatower joined #git
03:11 fakenerd joined #git
03:14 dreiss joined #git
03:15 Vortex34 joined #git
03:16 romerocesar joined #git
03:16 Puffball_ joined #git
03:18 aidalgol joined #git
03:20 boombatower joined #git
03:22 sleepy_ joined #git
03:22 beco joined #git
03:24 Olipro joined #git
03:25 robotroll joined #git
03:26 cyphase joined #git
03:29 mingrammer joined #git
03:29 snthsnth joined #git
03:30 gfixler joined #git
03:30 a_thakur joined #git
03:42 cqi joined #git
03:44 nonconvergent joined #git
03:45 mehola joined #git
03:49 ochorocho__ joined #git
03:50 dreiss joined #git
04:03 gfixler1 joined #git
04:07 rgrinberg joined #git
04:08 AfroThundr joined #git
04:09 arand joined #git
04:10 romerocesar joined #git
04:11 kulelu88 joined #git
04:13 rscata joined #git
04:20 cyphase joined #git
04:21 romerocesar joined #git
04:23 mingrammer joined #git
04:23 romerocesar_ joined #git
04:28 daey_ joined #git
04:28 _ng joined #git
04:28 deadprez joined #git
04:30 ezio joined #git
04:30 ezio is there a way to run git so that the output is compatible with a vagrant provisioning script?
04:31 nilg joined #git
04:31 ezio I think the script is actually freezing
04:32 _ikke_ ezio: What would vagrant compatible output look like?
04:32 ezio one line per % downloaded or something
04:32 ezio or no output
04:33 thiago --quiet
04:34 ezio thanks
04:34 romerocesar joined #git
04:46 auzty joined #git
04:50 thiago joined #git
04:53 d5sx43 joined #git
04:54 eduardas_m joined #git
04:55 greendo joined #git
04:56 overlord_tm joined #git
04:56 subhojit777 joined #git
05:00 romerocesar_ joined #git
05:00 Cabanossi joined #git
05:02 justanotheruser joined #git
05:02 romerocesar joined #git
05:03 ahr3n joined #git
05:04 dec0n joined #git
05:07 Darren__ joined #git
05:07 ezio i accidentally committed my ssh public key to a github repo.  it's probably impossible to come up with a private key from it, but is there a way i can blow away that commit.
05:07 romerocesar joined #git
05:07 satya4ever joined #git
05:07 ezio so it's not there at all anymore
05:07 _ikke_ Sure
05:08 _ikke_ Note that it's not for nothing called a public key
05:08 tgunr joined #git
05:08 _ikke_ Is it the last commit?
05:08 Mikaela Not that public keys you have added to your GitHub account are public anyway
05:09 Mikaela *note
05:09 phroa ezio: for what it's worth, https://github.com/ezio.keys
05:09 phroa lists all public keys associated with ezio
05:09 ezio hmmmmmmmmm
05:09 ezio good point
05:10 bocaneri joined #git
05:10 phroa maybe a man git-revert is cleaner, unless you don't care about !rewriet
05:10 gitinfo the git-revert manpage is available at http://jk.gs/git-revert.html
05:10 phroa !rewrite
05:10 gitinfo 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
05:12 bocaneri joined #git
05:12 snthsnth joined #git
05:14 prawnzy joined #git
05:16 inflames joined #git
05:18 Emperor_Earth joined #git
05:19 watersoul joined #git
05:22 dalias joined #git
05:22 jeffreylevesque joined #git
05:23 netj joined #git
05:31 lindenle joined #git
05:31 duderonomy joined #git
05:32 duderonomy joined #git
05:36 romerocesar joined #git
05:37 Akimb joined #git
05:40 ochorocho__ joined #git
05:41 bobtherealbob joined #git
05:42 Ravana joined #git
05:44 JeroenT joined #git
05:45 Raging_Hog joined #git
05:48 dan2k3k4 joined #git
05:49 ewet joined #git
05:49 jungsubk joined #git
05:52 JrCs joined #git
05:53 qt-x joined #git
05:55 JrCs joined #git
05:55 tjone270_ joined #git
05:55 alcohol joined #git
05:55 fedepad joined #git
05:57 Zamerick joined #git
05:59 zeroed joined #git
06:02 lb1c joined #git
06:08 jceb joined #git
06:09 Pontus joined #git
06:11 nonconvergent joined #git
06:11 mingrammer joined #git
06:12 Junior joined #git
06:12 JeroenT joined #git
06:13 fedepad joined #git
06:17 freimatz joined #git
06:18 JrCs joined #git
06:22 davidbz joined #git
06:24 Marbug joined #git
06:26 JeroenT joined #git
06:26 t0by joined #git
06:26 laumann joined #git
06:29 cdown joined #git
06:32 tvl left #git
06:32 tobiasvl joined #git
06:33 a_thakur joined #git
06:36 quesker I have to move 20 projects from one gitlab to another.  do I need to go set each of them up from the web interface first before trying to push them to the new server?
06:38 quesker do I really have to clone --mirror them all before pushing to new server?  this is a ton of stuff, can I just use existing checkouts somehow?
06:38 quesker there is only a master branch afaik
06:39 quesker merging seems like a huge nightmare so I don't allow it
06:40 govg joined #git
06:40 DistantStar joined #git
06:41 thiago you don't have to use --mirror
06:41 thiago only if you want to keep an exact copy
06:41 quesker as opposed to what
06:41 quesker I want all history for sure
06:42 thiago as opposed to whatever portion of it you had cloned
06:43 overlord_tm joined #git
06:43 a_thakur_ joined #git
06:43 ShekharReddy joined #git
06:47 _ikke_ --mirror is about how and what refs are fetcched
06:47 _ikke_ fethced
06:50 quesker wow I don't get any of that
06:50 quesker I just need to move these repos
06:51 quesker management always decides we need to move servers here and there
06:51 dsantiago joined #git
06:52 Alienpruts joined #git
06:52 quesker never used refs afaik
06:52 _ikke_ If you only care about the master branch, it's enough to just push that branch from a local repository to new remote
06:52 dsdeiz joined #git
06:52 _ikke_ (every branch is a ref)
06:53 quesker ok that is probably fine
06:53 user133 joined #git
06:53 thiago why don't you just do the right thing?
06:53 quesker because it will take all day to check these out again
06:54 quesker and use tons of disk on my tiny VMs
06:54 quesker --mirror is the right thing?
06:54 Sceorem joined #git
06:54 quesker I guess I'll do it.  just will take a while
06:54 thiago if it will take days to transfer a Git repository, you're doing something very wrong
06:54 thiago your repositories are either way too big or you don't have enough badnwdith
06:55 _ikke_ it's a matter of whether you want to keep non-branch refs
06:55 quesker 37000 files in the biggest one
06:55 thierryp joined #git
06:56 quesker only 180 meg in that one
06:56 jknetl joined #git
06:57 quesker but I need to set up the new repos in the gui first right?
06:57 _ikke_ yes
06:57 quesker ok thanks
06:58 prawnzy joined #git
06:58 danslo joined #git
06:59 submitnine joined #git
06:59 thiago that's not big. It shouldn't take more than a few minutes to do that
07:01 quesker so I clone --mirror then remote add downstream and push downstream --mirror?  what does downstream mean there?
07:01 danslo joined #git
07:02 grawity joined #git
07:02 thierryp joined #git
07:02 utrack joined #git
07:02 finalbeta joined #git
07:03 daishan joined #git
07:03 Puffball joined #git
07:04 Ankhers joined #git
07:05 Davey joined #git
07:05 Davey joined #git
07:06 quesker oh can I just call it origin again instead?
07:06 mingrammer joined #git
07:06 thiago yes
07:06 quesker k
07:06 thiago change origin's URL, then push
07:06 dling` joined #git
07:08 SJr joined #git
07:08 jbondhus joined #git
07:09 dreiss joined #git
07:10 yuhlw_ joined #git
07:10 finalbeta joined #git
07:11 TomyWork joined #git
07:14 quesker then I have to clone again to do dev?
07:16 jave joined #git
07:16 quesker fatal: remote origin already exists.
07:17 quesker when I tried do change origin...  git remote add origin newURL
07:17 neque joined #git
07:17 _ikke_ that's adding a new remote
07:17 Guest69308 left #git
07:17 _ikke_ git remote set-url origin <newUrl>
07:17 quesker ah
07:19 cyan__ joined #git
07:20 quesker now git push origin --mirror   just hangs.  1 file test repo
07:20 JeroenT joined #git
07:20 ghostlight joined #git
07:20 _ikke_ I don't think you want to push --mirror
07:20 _ikke_ with a repo that was not cloned as --mirror
07:20 quesker oh ok
07:20 quesker no I cloned as mirror
07:20 _ikke_ ah ok
07:20 _ikke_ Then n/m
07:21 quesker oh this box can't get to new gitlab  heh
07:21 quesker of course
07:21 quesker these morons are locking everything down
07:21 Cork joined #git
07:21 quesker we need security!  so secure not even devs can use it
07:22 vhost- joined #git
07:22 zeroed joined #git
07:22 zeroed joined #git
07:23 t0by joined #git
07:27 _ng joined #git
07:28 Balliad joined #git
07:28 Hink joined #git
07:29 cydrobolt joined #git
07:29 cydrobolt joined #git
07:30 barduck joined #git
07:32 snufft joined #git
07:32 voiter joined #git
07:33 lindenle joined #git
07:33 wloncom joined #git
07:33 voiter what does the hash mean in reflog: "checkout: moving from A to B"? is it the hash of A or the hash of B or even something else?
07:33 ahmedelgabri joined #git
07:34 selckin old and new value of HEAD i believe
07:34 voiter there is only one hash
07:34 selckin (ie you changed branches from A to B for exmaple)
07:35 selckin hmm out of my league then sorry
07:35 voiter k
07:35 voiter np
07:37 chele joined #git
07:37 davidstrauss joined #git
07:38 kurkale6ka joined #git
07:40 blahdodo joined #git
07:40 ochorocho__ joined #git
07:41 iota_pi joined #git
07:41 voiter selckin, the hash seems to refer to "B".
07:43 joseph_arnstein joined #git
07:43 neque joined #git
07:43 selckin nice way to browser reflog is with gitk !reflog
07:43 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`
07:45 encod3 joined #git
07:46 voiter I will keep it in mind. Thanks.
07:46 iota_pi joined #git
07:47 c0ded joined #git
07:48 t0by joined #git
07:50 stuh84 joined #git
07:52 c0ded joined #git
07:54 cyphase joined #git
07:55 Anthaas joined #git
07:57 d3r1ck joined #git
07:58 JeroenT joined #git
07:58 fling joined #git
07:58 quite joined #git
07:59 saml joined #git
08:00 mingrammer joined #git
08:00 JeroenT joined #git
08:00 GavinMagnus joined #git
08:03 dermoth joined #git
08:04 JeroenT_ joined #git
08:04 bongjovi joined #git
08:04 XVar joined #git
08:04 rjack2_ joined #git
08:06 quesker once I move everything to the new repo can I just point my old working dir at the new remote and pull?
08:06 quesker or do I have to clone again?
08:07 _ikke_ quesker: Just changing the remote is enough
08:07 quesker nice
08:09 dodobrain joined #git
08:11 JeroenT joined #git
08:13 dermoth joined #git
08:14 zeroed joined #git
08:16 chll_ joined #git
08:17 cdown joined #git
08:19 traxo-xx joined #git
08:19 cisco87 joined #git
08:20 romerocesar joined #git
08:21 JeroenT joined #git
08:22 mkoskar joined #git
08:27 t0by joined #git
08:30 therealGent joined #git
08:30 therealGent joined #git
08:36 JeroenT joined #git
08:38 nonconvergent joined #git
08:41 a_thakur joined #git
08:45 irco joined #git
08:47 earational joined #git
08:47 earational hey
08:48 a3pq51 joined #git
08:48 earational joined #git
08:49 dan_w joined #git
08:50 dermoth joined #git
08:51 dan_w Hi all. Militant SVN user here now using git for the last year on a 6 person team. Sometimes we have an issue where someone fumbles a merge and someone elses changes vanish. When this happens, it is really hard to see that the changes have gone missing in the history and also to figure out how to fix it. Except for the person who fumbled the merge, am i don't anything wrong when I can't see where the change happens?
08:51 quenode joined #git
08:52 selckin by fumble merge you mean they said it fuck it i'm not resolving these conflicts?
08:53 dan_w selckin: I am saying that they get confused that it is a marge and just start reverting the changes in it then push
08:53 dan_w selckin: "wtf, i didn't change this!" >> revert
08:54 nonconvergent joined #git
08:54 selckin probably want to use pull --rebase
08:54 mingrammer joined #git
08:54 selckin and not have willy nilly merges
08:57 Hounddog joined #git
08:58 osse I've seen merges which seemingly completely ignore the content being merged in. I suspect the developer made a copy of the directory, pulled, copied the directory back in, committed.
09:00 a3Dman joined #git
09:00 Shentino joined #git
09:01 dan_w selckin: thanks just discussed with the team. Apparently if you pull --rebase, then you should stash before this (then unstash after) otherwise it kind of messes up?
09:01 osse I'd say commit first.
09:01 selckin you should never pull/merge/rebase without a clean workdir
09:01 selckin and git will stop you from doing so
09:01 dermoth joined #git
09:02 dan_w selckin: I am using sourcetree
09:02 selckin if it can conflcit, it needs to update the workdir to show the conflicts
09:02 selckin so if you already have changes there it can't continue
09:02 achadwick joined #git
09:03 selckin !gui
09:03 gitinfo Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
09:04 dan_w selckin: so normally i commit my changes, then pull, merge, and push all
09:04 ahmedelgabri joined #git
09:04 dan_w selckin: you are saying i should commit, pull, rebase, (then merge?) and push?
09:04 ShapeShifter499 joined #git
09:05 selckin pull = fetch + merge
09:05 selckin pull --rebase = fetch + rebase
09:05 selckin and will avoid creating uselss merge commits that clutter the history (not everyone agrees on this)
09:05 dan_w selckin: ok thanks. so i commit, fetch + rebase, merge and push?
09:05 selckin there is no merge then
09:06 selckin they all work, you just have to resolve conflicts when they ahppen and not try to ignore them
09:07 selckin rebase is easier, since it moves your commits on top of the remote commits, so the conflicts are in what you just changed, and you can fix them up nicer
09:08 iskander_work joined #git
09:09 romerocesar joined #git
09:12 a3Dman joined #git
09:13 evanwang joined #git
09:14 notebox joined #git
09:15 inflames joined #git
09:15 rjack2_ joined #git
09:16 berndl joined #git
09:18 Fissure joined #git
09:19 evanwang_ joined #git
09:20 _ikke_ dan_w: Best is to teach people how to deal with merge conflicts properly
09:20 IndigoTiger joined #git
09:20 _ikke_ merging or rebasing both can result into merge conflicts
09:20 vrishab joined #git
09:22 selckin import reason to prefer rebase is that they conflcit per commit, and not the whole lot
09:25 lss8 joined #git
09:25 lss8 joined #git
09:25 Fuzzmz joined #git
09:27 stamina joined #git
09:27 b10n1k joined #git
09:27 rjack2 joined #git
09:28 earational joined #git
09:29 maaarghk left #git
09:31 _ikke_ correct
09:32 irqq joined #git
09:34 lindenle joined #git
09:39 King_Hual joined #git
09:44 _nwkj86 joined #git
09:46 ferr joined #git
09:49 dan_w selckin: thanks for the help! really appreciated, i will give rebasing a go
09:50 DelphicOkami joined #git
09:51 bencevan_ joined #git
09:52 bencevan_ joined #git
09:56 cyphase joined #git
10:02 barbs joined #git
10:03 evanwang joined #git
10:05 okdamn joined #git
10:06 okdamn Hi i want to exlude all the files in a directory except for index.html what to put in .gitignore?
10:08 Fuzzmz @okdamn, you could use something like
10:08 Fuzzmz !directory/index.html
10:08 gitinfo Git does not track directories, only files in directories.  Create a nonce file as a placeholder (eg .gitignore) to create the directory or create the directory as part of a post-checkout hook
10:08 Fuzzmz directory/*
10:08 okdamn Sec sorry, actually i want to keep the empty folder but not the content inside the repo
10:08 okdamn so not possible to keep an empty folder?
10:09 Fuzzmz not without having any files in it
10:09 okdamn daaaaamn ufff ok
10:09 Fuzzmz but you can have an noempty file in that folder without any content
10:09 Fuzzmz and then ignore every other files in that directory so that they don't get commited to git
10:09 Fuzzmz your gitignore would look like this:
10:10 Fuzzmz !directory/noempty
10:10 gitinfo Git does not track directories, only files in directories.  Create a nonce file as a placeholder (eg .gitignore) to create the directory or create the directory as part of a post-checkout hook
10:10 Fuzzmz directory/*
10:11 dcpc007 joined #git
10:12 mehola joined #git
10:12 nohitall joined #git
10:13 DelphicOkami joined #git
10:13 nohitall hey, got a question on best practise. If I do changes on multiple files that are for different purposes, is it smart to do a commit for each separate? I guess a commit like "all changes today" would be not so good?
10:19 Fuzzmz well, it depends
10:19 Fuzzmz do you break anything by commiting them separately? that is, do you need all changes at once so that your thingy works?
10:19 Fuzzmz if yes, then commit them all at once
10:20 Fuzzmz if no, I'd commit them separately so that they're easier to revert if something goes wrong
10:20 nohitall ok I guessed so too
10:20 canton7 it's also easier to review if they're separate
10:20 nohitall yea, will do
10:20 canton7 and you're more likely to write useful commit messages
10:20 _ikke_ nohitall: But yes, "all changes today" is not a very good commit message
10:20 _ikke_ right
10:20 nohitall just have to remember to do a commit after each edit
10:20 _ikke_ nohitall: git add -p
10:21 _ikke_ You can stage related changes together, and only commit those
10:21 canton7 or 'git gui'
10:21 nohitall biggest issue is mainly I forget commiting before doing a change on another file :)
10:21 ShapeShifter499 joined #git
10:21 _ikke_ nohitall: Happens to me too, but git is flexible enough to still make separate commits
10:22 nohitall ok I look in man what that add -p means :)
10:22 _ikke_ You can use git stash -k to stash away non-staged changes to verify if the commit is good
10:23 nohitall k thx for feedback
10:23 archaic joined #git
10:24 tombruijn joined #git
10:25 harish joined #git
10:25 crawler joined #git
10:26 ThomasLocke joined #git
10:26 ThomasLocke joined #git
10:31 spaceone there is no cherry-pick --continue "--no-verify" ?!
10:31 _ikke_ spaceone: there is git commit --no-verify
10:32 _ikke_ (which is what cherry-pick --continue would do anyway)
10:32 _ikke_ and then you can still continue
10:34 _ikke_ spaceone: rational: https://public-inbox.org/git/xmqqk2lj​189l.fsf@gitster.mtv.corp.google.com/
10:34 dsdeiz joined #git
10:34 BadSnappa joined #git
10:36 earational joined #git
10:40 okdamn does it works public/*.js for excluding all js files?
10:42 _ikke_ all js files in the public folder that are not tracked
10:42 mingrammer joined #git
10:47 cdown joined #git
10:48 t0by joined #git
10:48 JeroenT joined #git
10:50 okdamn awesome thanks
10:50 okdamn left #git
10:51 DolpheenDream joined #git
10:54 Segfault_ joined #git
10:55 greendo joined #git
10:57 danslo joined #git
10:58 crawler_1 joined #git
11:01 sdothum joined #git
11:02 CheckDavid joined #git
11:03 JeroenT joined #git
11:04 mizu_no_oto joined #git
11:04 tlaxkit joined #git
11:10 BlackPanx joined #git
11:11 sleetdrop joined #git
11:11 thebloggu joined #git
11:12 jost joined #git
11:14 rnsanchez joined #git
11:14 leeN joined #git
11:17 geko joined #git
11:18 tango_ joined #git
11:18 rbern joined #git
11:19 choki joined #git
11:21 fakenerd joined #git
11:22 spaceone _ikke_: thanks
11:22 cisco_ joined #git
11:24 a_thakur_ joined #git
11:28 GavinMagnus left #git
11:29 liquidjamm joined #git
11:31 DieguezZ joined #git
11:32 DieguezZ joined #git
11:33 dan2k3k4 joined #git
11:34 fahadash joined #git
11:36 a_thakur joined #git
11:37 mingrammer joined #git
11:38 a_thakur joined #git
11:40 eshlox joined #git
11:44 jost_ joined #git
11:45 Thorn joined #git
11:45 JeroenT joined #git
11:46 ShapeShifter499 joined #git
11:46 clmsy joined #git
11:47 DolpheenDream joined #git
11:52 finalbeta1 joined #git
11:52 chele joined #git
11:53 Thorn joined #git
11:56 Sceorem joined #git
11:56 rgrinberg joined #git
11:59 fakenerd joined #git
12:00 thierryp_ joined #git
12:02 re1 joined #git
12:03 finalbeta joined #git
12:04 GavinMagnus joined #git
12:06 dan2k3k4 joined #git
12:08 crose joined #git
12:09 thierryp joined #git
12:10 synthroid joined #git
12:10 notebox joined #git
12:12 bruce_lee joined #git
12:12 bruce_lee joined #git
12:13 Sadeukko joined #git
12:13 mehola joined #git
12:16 raspado joined #git
12:17 dreamyspell joined #git
12:17 syg_ joined #git
12:18 fuzzmz- joined #git
12:20 ahmedelgabri joined #git
12:21 nwkj86 joined #git
12:22 nwkj86 joined #git
12:24 King_Hual joined #git
12:24 ShapeShifter499 joined #git
12:25 inflames joined #git
12:26 Shentino joined #git
12:26 PCatinean joined #git
12:28 inflames joined #git
12:28 mlittlej joined #git
12:28 prawnzy joined #git
12:30 earational joined #git
12:31 sleepy__ joined #git
12:32 sleepy_ joined #git
12:35 afuentes joined #git
12:37 lindenle joined #git
12:38 GodGinrai joined #git
12:39 pijiu joined #git
12:39 jimi_ joined #git
12:42 a_thakur joined #git
12:44 cdown joined #git
12:45 thierryp_ joined #git
12:46 DieguezZ joined #git
12:46 andlabs joined #git
12:47 clemf joined #git
12:48 chimay joined #git
12:48 ahmed_elgabri joined #git
12:50 DieguezZ joined #git
12:51 tabrez joined #git
12:51 byteflame joined #git
12:52 m0viefreak joined #git
12:52 Darren__ joined #git
12:53 a_thakur joined #git
12:55 mlittlej Q: Has there ever been any discussion on adding hooks to git-add, and what the outcome of it? (Can't search gmane because it's broke just now)
12:55 ochorocho__ joined #git
12:56 crose joined #git
12:58 _ikke_ What would the goal of such a hook be?
12:59 netj joined #git
13:00 irco joined #git
13:02 ExoUNX joined #git
13:02 imMute mlittlej: would the smudle/clean filters be sufficient for what you need?
13:02 osse So meta:  git config --global alias.alias 'config --get-regexp "^alias\."'
13:03 imMute osse: I am definitely stealing that.
13:03 mlittlej I have a pre-commit hook that runs flake8 over all my python files - I'd like to have that done before I stage the files so I don't get caught at pre-commit, make my changes, and then have to stage the updates
13:03 _ikke_ clean filters are the way to go then
13:04 osse imMute: after I wrote it I also got the idea of making it so that if you do 'git alias kek rofl' it does 'git config --global alias.kek rofl'
13:04 osse but that'll have to be another time
13:04 mlittlej _ikke_: imMute: I'll look at them again then, didn't quite get my head around them first time, but didn't seem to be the right fit/ Give it another go.
13:05 cdg joined #git
13:06 cdg joined #git
13:07 rchavik joined #git
13:08 kugel_ joined #git
13:08 kugel_ joined #git
13:10 mlittlej1 joined #git
13:10 mlittlej1 left #git
13:10 mlittlej1 joined #git
13:10 notebox joined #git
13:11 UTAN_dev joined #git
13:11 holgersson joined #git
13:12 mozzarella joined #git
13:13 jeffreylevesque joined #git
13:13 chigang joined #git
13:15 pothepanda joined #git
13:17 Kulrak joined #git
13:17 Kulrak joined #git
13:17 GavinMagnus joined #git
13:17 sanketdg joined #git
13:18 bsanford_ joined #git
13:18 sangy joined #git
13:21 m0nkmaster joined #git
13:22 tchan joined #git
13:22 Vivekananda joined #git
13:25 zivester joined #git
13:25 mingrammer joined #git
13:28 Zamerick joined #git
13:29 mischat joined #git
13:29 serialoverflow joined #git
13:33 dunpeal joined #git
13:33 dunpeal Hi. Is there a shortcut to pull a repo into a branch of my current repo?
13:33 selckin git remote add
13:34 dunpeal well
13:34 dunpeal that's not a a shortcut :)
13:34 selckin can't get much shorter
13:34 somaReverse joined #git
13:35 dunpeal it's `git remote add foo URL; git fetch foo; git checkout -b foo new_branch`
13:35 dunpeal it could be something like `git pull URL -b new_branch`
13:35 selckin it could also be, git-read-my-mind
13:36 dunpeal awesome idea, think they'll have time to merge it for the next point release?
13:36 _ikke_ I think it will be 3.0
13:36 selckin also if you provide a patch
13:37 GodGinrai selckin: there's a great read-my-mind utility: https://github.com/nvbn/thefuck
13:37 * dunpeal gets to work
13:37 yoh could someone open my eyes on why git says that something is ignored while submodule add?   http://pastebin.com/W5PTiE8b
13:37 selckin GodGinrai: they can read your mind at 12words/min
13:37 selckin GodGinrai: like no joke, google it
13:38 dunpeal they can remember it for you wholesale o.O
13:38 selckin yoh: you can have global gitignores always like ~/.gitignore, think you configure the path in gitconfig
13:39 selckin *also
13:39 JeroenT joined #git
13:39 dendazen joined #git
13:39 Noldorin joined #git
13:40 yoh ~/.gitignore  had only *~  , I removed entire file -- the same story
13:41 yoh I did configure the path to point to additional file but do not have such one on my system
13:41 inflames joined #git
13:41 rnsanchez_ joined #git
13:41 Dougie187 joined #git
13:41 yoh interestingly I do not see any of those being consulted if I look at strace of the git call
13:41 selckin any parent dir up to the git root dir can also have gitignore
13:42 AaronMT joined #git
13:43 earational joined #git
13:44 tabrez joined #git
13:44 griffindy joined #git
13:44 yoh checked... do not see any (this is also a submodule), but copied into another new git repo -- added there fine -- so it is something strange of a local (or parents), not global config
13:45 LBV_User joined #git
13:45 yoh but how come strace doesn't show any gitignore file being checked/opened???
13:45 yoh some fancy caching is happening somehow?
13:46 bsanford_ joined #git
13:47 yoh HA -- git check-ignore says nothing is ignored :-(
13:47 selckin submodule is a bash script i think, not sure how good strace is at looking into child processes
13:48 BitSalvage joined #git
13:48 ToxicFrog selckin: "strace -f"
13:48 selckin yoh: ^
13:48 yoh ToxicFrog: yeah.. .did even old fashion -fF
13:49 dviola joined #git
13:49 yoh but the point is that git check-ignore  says different, so there is some inconsistency regardless
13:49 yoh if I clone entire repo where I am trying to add to a new location -- it just adds there just fine
13:49 selckin time to grep for the error message in the source :x
13:49 yoh so something about specific state/config here
13:49 stuh84 joined #git
13:50 yoh FTR -- atm was using  git 2.7.0
13:50 yoh let me just build current master and see if anything changes ;)
13:52 yoh nope -- the same  with 2.10.0.129.g35f6318
13:53 yoh HA HAHA
13:53 yoh "Read the source Luke" indeed...
13:54 thierryp joined #git
13:54 yoh withing git-submodule, any failure of "git add --dry-run --ignore-missing" is giving this completely unrelated to my case error message
13:54 yoh in my case failure is due to   .git/index.lock': File exists.
13:54 yoh I will report to the list
13:56 gb left #git
13:56 BitSalvage left #git
13:58 finalbeta1 joined #git
14:00 arup___ joined #git
14:01 arup___ left #git
14:04 BSaboia joined #git
14:05 ShekharReddy joined #git
14:07 annoymouse joined #git
14:07 sleepy_ joined #git
14:07 emg joined #git
14:07 thierryp joined #git
14:07 Kulrak joined #git
14:08 Kulrak joined #git
14:08 snood1205 joined #git
14:10 marcogmonteiro joined #git
14:11 al-damiri joined #git
14:11 thierryp_ joined #git
14:12 thierryp joined #git
14:15 nolageek joined #git
14:15 kulelu88 joined #git
14:15 sr___ joined #git
14:16 bratchley Any idea why ssh can use an ssh identity but git says it doesn't exist? https://dpaste.de/bxsL
14:17 bratchley GIT_SSH is set to the command I'm manually running after the "git clone" fails
14:17 satbyy joined #git
14:17 selckin man git, /GIT_SSH
14:17 gitinfo the git manpage is available at http://jk.gs/git.html
14:18 bratchley selckin: yeah I read the man page but I'm still not seeing the issue
14:18 i7c I’ve been looking for the piece of code that matches pathspecs against a tree. Is that somehow interweaven with tree traversal itself? Could somebody send me in a useful direction?
14:19 dunpeal joined #git
14:19 selckin bratchley: GIT_SSH_COMMAND
14:19 Kulrak joined #git
14:19 Kulrak joined #git
14:19 nolageek I mainly use git to install and maintain software, not really doing any development myself. I saw there was an unmerged PR on one of the repos I cloned that added functionality I needed so I did a 'git pull origin pull/###' as per instructions I found. That worked and the functionality it working.  Will this cause problems going forward when updating the
14:19 nolageek master ('git pull')
14:21 crose joined #git
14:21 le_melomane joined #git
14:21 noidea joined #git
14:21 noidea joined #git
14:23 ResidentBiscuit joined #git
14:24 ResidentBiscuit joined #git
14:24 mkopriva joined #git
14:24 ResidentBiscuit joined #git
14:25 ResidentBiscuit joined #git
14:26 phaleth joined #git
14:26 ^7heo possibly already posted here, but: http://devopsreactions.tumblr.com/post/​132397380217/applying-svn-habits-to-git
14:27 _ikke_ Nope, not yet
14:29 prawnzy joined #git
14:30 selckin bratchley: another way to solve is to have the path to the key in ~/.ssh/config
14:30 raijin joined #git
14:32 saedelaere joined #git
14:34 matsaman joined #git
14:37 sonOfRa joined #git
14:37 fmcgeough joined #git
14:37 sin3t joined #git
14:38 lindenle joined #git
14:39 howitdo joined #git
14:39 howitdo joined #git
14:39 actinide joined #git
14:42 nd joined #git
14:43 nonconvergent joined #git
14:43 jason237 joined #git
14:45 Fuzzmz nolageek, well you didn't actually merge that branch into master, so it won't affect it
14:45 Fuzzmz at most you might have to do a rebase on master once that gets updated and fix any eventual conflicts
14:45 ahmed_elgabri joined #git
14:46 berndl joined #git
14:47 Homerone joined #git
14:48 r4z joined #git
14:49 subhojit777 joined #git
14:51 yac joined #git
14:55 fees joined #git
14:56 ochorocho__ joined #git
14:56 robotroll joined #git
14:57 raspado joined #git
14:57 Darcidride joined #git
14:58 PCatinean joined #git
14:59 clemf joined #git
15:00 actinide joined #git
15:00 NightMonkey joined #git
15:01 zivester joined #git
15:02 NightMonkey joined #git
15:02 cdown joined #git
15:03 zivester joined #git
15:03 rahtgaz joined #git
15:03 mikecmpbll joined #git
15:04 lykinsbd joined #git
15:04 mikecmpbll joined #git
15:06 Noldorin joined #git
15:08 GavinMagnus left #git
15:11 fakenerd joined #git
15:11 InfoTest joined #git
15:12 tyreld joined #git
15:12 cyan__ joined #git
15:13 mingrammer joined #git
15:14 thiago_ joined #git
15:14 romerocesar joined #git
15:14 finalbeta joined #git
15:15 tabrez joined #git
15:15 ayjay_t joined #git
15:17 dan2k3k4 joined #git
15:18 neque joined #git
15:19 jguillen joined #git
15:20 rubie joined #git
15:22 jknetl joined #git
15:24 ash_workz joined #git
15:26 lykinsbd joined #git
15:26 shinnya joined #git
15:27 bongjovi joined #git
15:29 Homerone joined #git
15:32 gusnan joined #git
15:32 rbern joined #git
15:33 narendraj9 joined #git
15:34 QwertyDragon joined #git
15:38 kulelu88 joined #git
15:40 fakenerd joined #git
15:40 NightMonkey joined #git
15:41 hobodave joined #git
15:43 baxx joined #git
15:44 baxx for some reason i can push up to bitbucket but not up to github...  this is an SSH key thing? The key seems to be on my github profile.
15:44 baxx any idiot checks?
15:45 grawity ssh -vv git@github.com
15:45 baxx what am i looking for?
15:45 Darcidride_ joined #git
15:45 madewokherd joined #git
15:45 jeffmjack joined #git
15:46 lindenle joined #git
15:47 baxx grawity: ?
15:51 ahmedelgabri joined #git
15:51 cyphase joined #git
15:51 EvilPenguin joined #git
15:51 osse the usual. stuff that says "error" or "denied" or "warning"
15:52 bremner or !paste
15:52 gitinfo Please use a pastebin for snippets longer than one line. https://gist.github.com and https://vomitb.in both work well.
15:55 BSAlb joined #git
15:56 RedNamalas joined #git
15:56 RedNamalas left #git
15:57 spudowiar joined #git
15:57 laumann joined #git
15:58 raspado joined #git
15:58 ejb joined #git
15:59 Electrometro joined #git
16:00 ShekharReddy joined #git
16:00 leprechau joined #git
16:00 clemf joined #git
16:00 Electrometro joined #git
16:01 clemf joined #git
16:02 baxx thanks
16:02 baxx https://gist.github.com/34be​793eb0d7581fe168e94d822477c1 < here's a paste
16:03 bratchley selckin: I can probably do that but I think I should know how to do it this way
16:03 bratchley rather than giving up on this method just because I had trouble with it
16:04 bratchley I'm still trying to get it to work but it seems to be ignoring that variable: https://dpaste.de/jFd8
16:04 Sleepy63 joined #git
16:05 catsup joined #git
16:05 leprechau joined #git
16:05 bratchley if I'm interpretting the trace output correctly it seems like it's not specifying the identity file
16:06 ahmedelgabri joined #git
16:06 bratchley I've also tried it without including the hostname, the hostname was just in that iteration of trying to get it to work
16:06 bratchley in GIT_SSH_COMMAND I mean
16:06 fmcgeough joined #git
16:06 platta joined #git
16:06 thiago_ bratchley: GIT_SSH specifies the executable. If you put spaces in that, it will try to find a file with spaces in the name
16:06 ash_workz osse: can I ask you a personal question?
16:07 thiago_ bratchley: GIT_SSH_COMMAND allows for options to ssh and is interpreted by the shell
16:07 thiago_ bratchley: a better solution: configure ~/.ssh/config
16:07 bratchley thiago_: I am using GIT_SSH_COMMAND now
16:07 thiago_ bratchley: then stop using it and configure ~/.ssh/config
16:07 bratchley I could do it that way but I feel like I need to figure out why this isn't working
16:08 mingrammer joined #git
16:08 osse ash_workz: Sure, but I won't promise a personal answer
16:09 Seveas bratchley: what's GIT_SSH_COMMAND set to?
16:09 bratchley Seveas: I have a dpaste up there with the full command
16:09 thiago_ is GIT_SSH still set?
16:09 bratchley https://dpaste.de/jFd8
16:09 bratchley thiago_: no
16:09 ash_workz osse: would you understand what I was going for if I said, "I refuse to participate in the cyclic propagation of machiavellianism" ?
16:09 thiago_ and what git version?
16:09 Seveas bratchley: ahh, missed that
16:10 bratchley thiago_: looks like 1.8
16:10 Seveas bratchley: yeah, that doesn't support GIT_SSH_COMMAND (and is also ancient)
16:10 thiago_ bratchley: that's mighty old. It probably doesn't support GIT_SSH_COMMAND.
16:10 bratchley yeah after you said that I checked the man page and it isn't mentioned there
16:11 xpk joined #git
16:11 bratchley well if that's why I might as well do the ssh_config thing
16:11 bratchley :\
16:11 kpease joined #git
16:11 thiago_ and upgrae
16:12 bratchley this is on RHEL 7, so that's about as new as it's going to get for a while
16:12 bratchley I'm sure it's in RHSCL somewhere but I'm trying to keep things as "out of the box" as I can
16:12 romerocesar joined #git
16:13 Seveas GIT_SSH_COMMAND is in 2.2 and newer
16:13 t0by joined #git
16:13 ochorocho__ joined #git
16:14 bratchley I guess I could do GIT_SSH and create a wrapper script
16:14 osse ash_workz: OMG! What a personal question!! I refuse to answer
16:14 ash_workz osse: s/a personal (answer)/any \1/ ?
16:14 Seveas or configure it properly in .ssh/config as suggested several times :)
16:14 osse ash_workz: I wouldn't understand fully. I know machiavellian means bad/evil (related to the (ab)use of authority?) but that's about it
16:14 bratchley that's the easy way though ;-)
16:15 thiago_ bratchley: why can't you configure ssh like suggested?
16:15 osse baxx: this looks perfectly fine
16:15 jast macchiavellian isn't exactly "evil"
16:15 ash_workz osse: hmm... it's just "ends justifies the means" mentality
16:15 mehola joined #git
16:15 ash_workz osse: typically characterized by deception
16:15 jast it's just... results-oriented :)
16:16 nonconvergent joined #git
16:16 nonconvergent left #git
16:16 nonconvergent joined #git
16:16 nonconvergent can you amend a commit that isn't the latest?
16:16 ash_workz osse: eg someone who pretends to be your friend because they know they can later "backstab" you to further their success
16:16 jast nonconvergent: sure, but then you use a slightly bigger tool. :) !interactive_rebase
16:16 gitinfo nonconvergent: 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'.
16:17 nonconvergent jast: So rebase -i <hash>
16:17 ash_workz osse: but I was more concerned with if you understood what I was going for when I said "cyclic propagation"
16:17 osse I think I do
16:17 jast nonconvergent: actually the argument defines your "base commit", i.e. the last commit you *don't* want to change. it's really <hash>^ you want
16:17 thiago_ nonconvergent: no. You have to rebase --interactive for that
16:17 osse But I'm more curious why you're asking me in the first place
16:18 jast thiago_: we're already there :)
16:18 platta left #git
16:18 jast ash_workz: in many ways, everything propagates cyclically
16:18 nonconvergent jast: And <hash>^ is shorthand for <hash>~1?
16:18 thiago_ <hash>^ is a shorthand for <hash>^1
16:19 nonconvergent ...then where did I get ~ from?
16:19 jast nonconvergent: not exactly, but they have the same meaning. it's shorthand for ^1. ^1 happens to be the same as ~1, but ^2 and ~2 are different. :)
16:19 jast you can write <hash>~ to mean ~1, too
16:19 osse ^n = n'th parent.  ~n = n'th ancestor
16:19 jast ^2 and up are really only relevant for merges
16:20 nonconvergent ancestors and parents are't necessarily the same?
16:20 jast well, first parent = mommy, second parent = daddy
16:20 osse nonconvergent: ancestors = grand parents and grand grand parents
16:20 jast first ancestor = mommy, second ancestor = grandmommy
16:21 VagabondAzulien joined #git
16:21 Seveas jast: that analogy gets mightily weird with octopus merges...
16:21 ash_workz jast: yes, I was just wondering if, given that sentence people would think one who participates in a machiavellian society, which preys off altruism, will convert altruistic people to machiavellians, which propagates.
16:21 dvl joined #git
16:21 jast Seveas: conveniently my example covers all the typical cases :)
16:21 dvl We are decommissioning an old server. I've turned off Apache, so no commits that way.  Apart from disabling sshd, can I easily block git via ssh:// or git://
16:21 osse Seveas: jeez. it's 2016!  artifical this and thats. genders and such
16:22 jast ash_workz: that's a very simplified view if you ask me, but I can't talk about this now, got to leave. maybe another time.
16:22 Seveas osse: my gender is cluebat. Let me hit you with my gender.
16:22 osse Seveas: maybe have a new syntax %n, where %n = ^(2+n)
16:22 osse Seveas: %n is the n'th step-parent
16:22 nonconvergent dvl: why not just turn it off?
16:22 thiago_ dvl: disable the accounts. I assume no one is doing commits as root.
16:23 thiago_ dvl: and turn off the git daemon, though you should not have enabled commit via anonymous, unencrypted methods.
16:23 Seveas dvl: rm /usr/bin/git
16:23 Seveas oh, and git-receive-pack and git-upload-pack
16:24 nonconvergent If it's a VPS, delete the container. If it's on prem, walk over and pull the power. If you're really concerned about data, pop in a copy of DBAN (because no kill like overkill).
16:24 Seveas nonconvergent: thermite!
16:24 ash_workz jast: well, thanks for your input!
16:24 Seveas Ain't no party like a thermite party!
16:24 osse ash_workz: you mean given that sentence people would think that's what the sentence means? or that's what's going on?
16:25 crose joined #git
16:25 durham joined #git
16:25 Seveas Relevant: https://www.youtube.com/watch?v=JEoqrjFX1yI
16:25 durham joined #git
16:25 dvl thiago_: There is no git daemon running, FWIW.
16:25 ash_workz osse: I am looking for a simplified way to convey that; and I was hoping that was it.
16:25 rubyonrailed joined #git
16:26 dvl nonconvergent: Physical box, DBAN later.  I want to keep it around a while, just in case.
16:26 nonconvergent Hehe, I made the mistake of making a DBAN usb image one time configured to run the 30x wipe on all available storage devices. It started with itself. That flash drive was never the same.
16:26 osse ash_workz: it may be shorter. it's not simpler :p
16:26 thiago_ dvl: then there's no git://
16:27 osse what's so machiavellian ?
16:27 ash_workz osse: that's more a grand picture though... in the more general sense I wanted to convey the concept of, "the bullied become bullies, machiavellian prey become machiavellian, etc"
16:27 dvl thiago_: Noted.  Only ssh.  I think I'll mv /var/lib/git /var/lib/git.NO.NO.NO
16:28 EvilPenguin joined #git
16:28 ash_workz osse: should I PM you?
16:28 GodGinrai ash_workz: "conforming to result-oriented bias"?
16:28 ash_workz GodGinrai: hmm, interesting... I think that's pretty close
16:29 ash_workz GodGinrai: cept bias is not really the right word
16:30 _rnsanchez_ joined #git
16:30 lss8 joined #git
16:30 lss8 joined #git
16:30 prawnzy joined #git
16:30 osse ash_workz: this is all above my head
16:32 ash_workz thanks anyway! :)
16:33 ascarter joined #git
16:33 clemf joined #git
16:33 happy-dude joined #git
16:35 NightMonkey joined #git
16:35 dreiss joined #git
16:36 nidr0x joined #git
16:36 danslo joined #git
16:37 rominronin joined #git
16:37 ash_workz osse: fyi; the concept would be that one who is deceived by a party to get ahead becomes cynical and thinks, "if you are nice, you'll be trampled by the mean and duplicitous; so I should be mean and duplicitous myself (to get ahead/otherwise I'll be trampled)"
16:37 lucz joined #git
16:37 kulelu88 joined #git
16:40 Ryanar joined #git
16:41 baxx osse: hmm ok
16:41 baxx osse: every time i commit i have to add my password :S
16:43 Fuzzmz baxx, are you gpg-signing by any chance?
16:43 Salander27 joined #git
16:43 baxx not intentionally - fwiw i can push up to bitbucket
16:43 nitric joined #git
16:44 Fuzzmz wait, do you have to add your password when commiting, or when pushing?
16:44 baxx pushing! sorry not commiting >.<
16:44 Fuzzmz it means that you cloned via http instead of ssh
16:45 baxx Fuzzmz: oh what, damn, that's it?
16:45 Fuzzmz if you do a git remote -v what's the output?
16:45 baxx yeah https, damn
16:47 baxx just take https:// off the remote ?
16:47 Kopitaja joined #git
16:48 baxx Fuzzmz: cool its working, thanks
16:48 Fuzzmz no problem
16:53 durham_ joined #git
16:53 spudowiar joined #git
16:53 LionsMane joined #git
16:53 clandestino joined #git
16:55 PioneerAxon_ joined #git
16:56 SwiftMatt joined #git
16:58 d0nn1e joined #git
16:58 dvl left #git
16:59 GavinMagnus joined #git
17:00 p4trix joined #git
17:00 GandalfTheWizard joined #git
17:01 Electrom_ joined #git
17:02 jungsubk joined #git
17:02 mingrammer joined #git
17:07 robotroll joined #git
17:09 steven_ joined #git
17:09 Noldorin joined #git
17:11 rubyonra_ joined #git
17:11 YourTheBombNow23 joined #git
17:12 thiago joined #git
17:14 skypuke joined #git
17:15 rubyonrailed joined #git
17:17 dreiss joined #git
17:18 osse joined #git
17:19 synthroid joined #git
17:20 clemf joined #git
17:23 HoierM joined #git
17:24 jungsubk joined #git
17:25 jungsubk joined #git
17:28 rubyonrailed joined #git
17:29 tabrez joined #git
17:30 tabrez joined #git
17:30 romerocesar joined #git
17:31 Pursuit joined #git
17:31 dermoth joined #git
17:33 rubyonrailed joined #git
17:35 sanketdg joined #git
17:35 InfoTest1 joined #git
17:36 Ryanar joined #git
17:36 k6ekb joined #git
17:37 whitby joined #git
17:38 rominronin joined #git
17:38 danslo_ joined #git
17:41 Faylite joined #git
17:41 raijin joined #git
17:42 skunkz joined #git
17:45 d0nn1e joined #git
17:46 mjt joined #git
17:47 rubyonra_ joined #git
17:49 cdown joined #git
17:49 Sasazuka joined #git
17:49 newbiee joined #git
17:50 newbiee how can i search for full word? git grep -e “word” doens’t do that.
17:52 _ikke_ What is a full word?
17:52 Fuzzmz I think he means an exact match
17:52 newbiee yes
17:52 bremner on a line by itself?
17:53 jimi_ joined #git
17:53 newbiee full word means an exact match.
17:53 bremner isn't that the default?
17:53 _ikke_ it is
17:54 _ikke_ How can you search inexactly for a word?
17:54 Fuzzmz newbiee, doesn't it work with the -w flag?
17:54 bremner if the "word" has regex special characters, maybe?
17:54 bmahe joined #git
17:55 newbiee git grep -ew "word" *  — doesn’t work but git grep -we "word" *  — works
17:55 grawity that makes sense since "-ew" means giving 'w' as a parameter to -e
17:55 Fuzzmz yeah, the expression (e) always comes last
17:55 multi_io joined #git
17:56 osse last and last, miss bloom
17:56 osse git grep -e word -w
17:56 jceb joined #git
17:56 newbiee got it thanks.
17:57 skinux joined #git
17:57 skinux How do I create a new branch on GitHub and make it the master branch?
17:57 Guest86383 left #git
17:57 Nugget "master" is just a name.
17:58 qsx !master
17:58 gitinfo [!master_branch] 'master' is the default name for the first branch created by git, and it is in no way special. You can just delete it, and use more meaningful names such as 'dev' 'stable' 'unstable' 'bug/001' etc. If this is a bare repo, you will want to change the default branch(`git symbolic-ref HEAD refs/heads/somebranch`) first.
17:58 grawity the term you're looking for is "default branch"
17:58 grawity it's in the repository's settings page on Github
17:58 grawity 'master' is just the .... default default.
17:59 Balliad joined #git
18:00 d0nn1e joined #git
18:05 Electrometro joined #git
18:05 Ryanar joined #git
18:08 avar Git's diff.compactionHeuristic=true is the best feature in like 3-5 years
18:08 Gsham joined #git
18:08 ruby_ joined #git
18:09 _ikke_ hehe
18:09 _ikke_ haven't been able to see it in use yet
18:09 _ikke_ avar: And it's still being improved
18:09 finalbeta1 joined #git
18:10 cdg joined #git
18:12 irqq joined #git
18:13 ponyofdeath joined #git
18:13 NightMonkey joined #git
18:14 ponyofdeath hi, after checking out a remote branch with git checkout origin/feat/blah then modifying stuff and trying to git push origin feat/blah i get could not read from remote repository.. any ideaS?
18:15 avar _ikke_: here's a snippet from an e-mail I sent to an internal ML after I upgraded to 2.10.0: http://pastebin.com/raw/dx0mkg8m
18:16 rsukla joined #git
18:16 mehola joined #git
18:17 _ikke_ ponyofdeath: check the remote url
18:17 _ikke_ ponyofdeath: Looks like a connection proble
18:17 mikecmpbll joined #git
18:17 ponyofdeath _ikke_: well i can do it with another branch i just created and to master
18:18 ponyofdeath _ikke_: is there a way to be more verbose
18:18 _ikke_ GIT_TRACE=1 git push ..
18:18 bongjovi joined #git
18:21 aard_ joined #git
18:22 Ryanar joined #git
18:22 grawity note that feat/blah isn't the same as origin/feat/blah
18:23 t0by joined #git
18:25 King_Hual joined #git
18:26 dsantiago joined #git
18:27 yqt joined #git
18:29 rahtgaz joined #git
18:29 ponyofdeath grawity: ok so how do i properly check out a branch?
18:30 ponyofdeath grawity: i do git branch -r
18:30 ANTItorture joined #git
18:30 ponyofdeath then copy that and do git checkout
18:30 ponyofdeath after with i modify stuff i need
18:30 ponyofdeath then commit
18:30 ponyofdeath then do git push origin that same name
18:31 prawnzy joined #git
18:31 ponyofdeath funny thin is if i do git status it says detached from origin/feat/blah
18:31 Fuzzmz then I'd do a git branch -d feat/blah
18:31 Fuzzmz and on first push do git push -u origin feat/blah
18:31 osse !remote_tr > ponyofdeath
18:31 gitinfo [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote
18:31 cdown joined #git
18:31 _ikke_ ponyofdeath: when you checkout such a branch, you are detaching HEAD
18:32 ponyofdeath so what is the proper way to checkout a remote branch?
18:33 osse ponyofdeath: what you've done is not improper.
18:33 osse but it depends on what you want to do
18:33 _ikke_ ponyofdeath: git checkout -b branch remote/branch
18:33 _ikke_ is one form
18:33 _ikke_ git checkout branch is the automagic form
18:34 Faylite_ joined #git
18:34 ponyofdeath ok so git checkout feat/blah is wrong?
18:34 ponyofdeath that use to work
18:34 NightMonkey joined #git
18:35 osse git checkout feat/blah is not the same as git checkout origin/feat/blah
18:36 kpease joined #git
18:36 ponyofdeath osse: so lets say i want to modify a remote branch and check it in
18:36 ponyofdeath which one do i use
18:36 ponyofdeath i tried both and i am unable to push in either case
18:36 osse ponyofdeath: what _ikke_ said
18:36 osse you CANNOT modify a remote branch
18:36 osse you must create a local one, work on that, and push it to the remote
18:37 ponyofdeath ok, so git checkout -b feat/blah remote/feat/blah ?
18:39 rominronin joined #git
18:40 ANTItorture joined #git
18:41 _ikke_ yes
18:41 _ikke_ add -t if you want to add tracking information
18:41 grawity isn't that the default?
18:41 osse checkout takes care of that
18:41 _ikke_ Not by default
18:42 _ikke_ if you do git checkout -b foo bar, no tracking info is setu
18:42 osse liar
18:42 _ikke_ setup
18:42 snood1205 joined #git
18:42 kpease joined #git
18:42 _ikke_ osse: then tell my why there is a -t / --track option?
18:43 grawity to undo an earlier --no-track
18:43 mohabaks joined #git
18:43 ToxicFrog _ikke_: tracking is the default. It can be turned off. --track/--no-track are for overriding that.
18:43 grawity or branch.autoSetupMerge, I guess
18:43 chrisshattuck joined #git
18:44 osse _ikke_: --track is implied if the starting point is a remote branch
18:44 berndl joined #git
18:44 _ikke_ I stand corrected
18:44 osse now sit down
18:44 osse kek
18:45 GodGinrai lol
18:46 Walex joined #git
18:46 EricPoe joined #git
18:48 ejb joined #git
18:48 crose joined #git
18:49 mmatros joined #git
18:49 duderono_ joined #git
18:50 mingrammer joined #git
18:50 ANTItorture joined #git
18:51 boombatower joined #git
18:52 ahmedelgabri joined #git
18:53 shinnya joined #git
18:54 isysd joined #git
18:55 satifant joined #git
18:55 sleepy_ joined #git
18:55 finalbeta1 joined #git
18:58 toogley1 left #git
19:02 vassagus joined #git
19:02 AnarchyAo joined #git
19:07 vassagus joined #git
19:08 dan2k3k4 joined #git
19:09 azv4 joined #git
19:09 azv4 I've tried about a zillion
19:09 _ikke_ That's how many?
19:09 azv4 different google result solutions to:
19:09 azv4 "Application validation did not succeed. Unable to continue."
19:09 azv4 while trying to install github for windows
19:10 azv4 anyone know trick off top of their heads?
19:10 azv4 _ikke_, about one zillion I believe
19:10 vktec azv4: Github != Git
19:10 vktec We can't help you there, I'm afraid
19:11 preaction there's a #github though
19:11 azv4 sweet thx
19:14 elastix joined #git
19:15 Balliad joined #git
19:15 stamina joined #git
19:21 EricPoe joined #git
19:24 jsolano joined #git
19:26 cdown joined #git
19:27 vassagus joined #git
19:28 raijin joined #git
19:29 re1 did git universe ended?
19:29 re1 they said they're taking short break and gonna be back at noon
19:30 _ikke_ You mean github universe?
19:30 _ikke_ git != github
19:31 finalbeta2 joined #git
19:31 re1 yes i know
19:32 re1 just asking here anyways since i'm not in #github channel.. i guess i'll /j there now
19:32 _ikke_ Not watching, so I wouldn't know
19:34 grumble left #git
19:36 grumble joined #git
19:37 rsukla joined #git
19:38 rominronin joined #git
19:38 Electrometro joined #git
19:39 inflames joined #git
19:39 danslo_ joined #git
19:42 espindola joined #git
19:43 cagedwisdom joined #git
19:45 mingrammer joined #git
19:51 drizztbsd joined #git
19:51 circ-user-KVqjt joined #git
19:51 nevodka joined #git
19:53 thierryp joined #git
19:54 rsukla joined #git
19:57 dreiss joined #git
19:58 ochorocho__ joined #git
19:59 EvilPenguin joined #git
20:01 Electrom_ joined #git
20:02 Electrom_ joined #git
20:03 nonconvergent How would I git log --oneline --decorate commits with a message containing a "S-50385"?
20:03 nonconvergent I'm trying to identify commits for a cherry-pick.
20:04 Darcidride joined #git
20:04 nonconvergent I want to make sure they're from the right branch too.
20:04 snthsnth joined #git
20:05 _ikke_ git log --oneline --decorate --grep "S-50385"
20:06 dan2k3k4 joined #git
20:07 spudowiar joined #git
20:08 ejb joined #git
20:09 nonconvergent Thanks.
20:09 nonconvergent What does it mean when I try "git show fab563b" which i found in the log and I get "fatal: ambiguous argument 'fab563b': unknown revision or path not in the working tree."
20:09 nonconvergent ?
20:10 isysd is it correct that if I wanted to contribute to git financially I would need to talk to the Software Freedom Convservancy?
20:10 yitz Is that a valid commit? Do multiple commits start with that?
20:10 _ikke_ nonconvergent: It means that there are two or more objects start with that prefix
20:10 _ikke_ isysd: I believe so, yes
20:11 isysd how bureaucratic
20:11 nonconvergent _ikke_: Then how do I get log to give me the whole ref?
20:11 _ikke_ is that a ref git log gave?
20:11 _ikke_ It should not give out ambiguous refs
20:11 nonconvergent https://gist.github.com/nonconverge​nt/90836a25b06ba9b3bf5fb114c17d92c7
20:12 nwkj86 joined #git
20:13 _ikke_ nonconvergent: Did you set core.abbrev? (git config core.abbrev)
20:13 nonconvergent no
20:13 nonconvergent So we had an issue where I cherry-picked some commits into a release branch
20:13 _ikke_ git config --global core.abbrev 8
20:14 _ikke_ That will tell git to use 8 characters from the hash
20:14 nonconvergent And when we deployed it, we see a change in the branch, made from a tag our Jenkins server puts on it, that is not present at the head of the release branch.
20:15 nonconvergent Literally code was showing up in the build that was not there at the HEAD of the branch it was built from. If I checkout the tag our build server applies to the HEAD I see the change but I don't see it when I checkout the HEAD.
20:15 mudtar joined #git
20:16 nonconvergent So I'm going back and re-cherrypicking to a fresh release branch and being very careful.
20:16 IndigoTiger joined #git
20:17 mehola joined #git
20:18 nonconvergent Am I even doing this right? git cherry-pick <commit I want to bring into my current (release candidate) branch>
20:18 ProbabilityMoon joined #git
20:18 mischat joined #git
20:18 cdown joined #git
20:19 _ikke_ looks alright
20:19 nullie nonconvergent: do you need only one commit?
20:20 nonconvergent How is it that a checkout of the tag at the HEAD would have different code than the HEAD?
20:20 Ryanar joined #git
20:20 nonconvergent nullie: a dozen
20:20 nullie nonconvergent: maybe you need merge
20:21 nullie Oh, nevermind
20:26 laumann joined #git
20:26 Ryanar joined #git
20:27 fmcgeough joined #git
20:27 nonconvergent So I'm grepping each commit now for the bad code
20:27 thebope joined #git
20:29 d0nn1e joined #git
20:31 thebope Can I do git diff between a folder on this branch and the same folder on another branch?
20:31 cdown_ joined #git
20:31 Seveas git diff thisbranch otherbranch -- path/to/folder
20:32 prawnzy joined #git
20:32 thebope awesome thanks Seveas
20:33 Orion3k joined #git
20:35 mykespb joined #git
20:37 sleepy_ joined #git
20:39 rominronin joined #git
20:41 danslo_ joined #git
20:42 eihabarabia joined #git
20:42 ash_workz joined #git
20:42 thebope that was a helluva survey
20:50 finalbeta2 joined #git
20:52 actinide joined #git
20:53 ejb joined #git
20:55 greendo joined #git
20:57 ploop joined #git
20:58 johnmilton joined #git
21:01 prawnzy joined #git
21:01 afuentes joined #git
21:01 aidalgol joined #git
21:02 finalbeta1 joined #git
21:07 mischat joined #git
21:07 thierryp joined #git
21:08 ploop joined #git
21:08 disi joined #git
21:10 Macaveli joined #git
21:12 LBV_User joined #git
21:13 matsaman joined #git
21:14 kyan joined #git
21:20 emg I just read the git book chapter on submodules. I see how to use submodules and push changes to their origins. Is it possible to keep changes from submodules without pushing to their origins? e.g. I add a submodule, cloned form some 3rd party repo. I create my own branch in the submodule and do work. I can't push to origin because I don't have permission, but I want my changes to be available to anyone checking out my project. Is that possible?
21:20 jon-mac joined #git
21:20 thiago yes, push those changes somewhere
21:20 overlord_tm joined #git
21:21 thiago you should consider upstreaming to the original project, though
21:21 jimi_ joined #git
21:21 cdown_ joined #git
21:21 emg well they are changes specific to my project, so sending patches upstream doesn't make sense
21:22 thiago you should still consider making the changes generic
21:22 emg so for each submodule I want to work with in this way, I have to create my own separate repo to keep the changes?
21:22 thiago yes
21:22 emg ok, thanks
21:22 thiago and by "my own separate repo", you mean "another separate repo in some hosting service"
21:23 emg my confusion was thinking that the submodule _was_ that separate repo
21:23 emg yes
21:23 thiago because you already have multiple repos on your own machine
21:23 thiago it is
21:23 emg I just realized I worded poorly, let me try one more time
21:23 thiago you have separate repos on your machine. If you want people to get those changes, give them access to your machine or push those changes to somewhere public.
21:23 thiago one repository per submodule, plus your supermodule
21:24 thiago and since you will need to make those changes public anyway, if you don't send them upstream, you've effectively created a fork
21:24 thiago that's a source of confusion. Hence my very strong recommendation that you work with upstream to create a generic version of your changes that can be sent to everyone.
21:26 emg scenario: there is a project that contains submodules hosted somewhere. I clone that project/supermodule. In one of the submodules I make a branch, commit changes. I want to push those changes back to the project/supermodule, not back to the origin of this specific submodule. Is that possible?
21:27 emg or do I have to, as you said before, host that submodule as well, in another repo besides the project/supermodule thing
21:27 ochorocho__ joined #git
21:27 thiago technically possible, not adviseable
21:27 thiago just create one repository per repository that you have changes for
21:27 Homerone joined #git
21:28 emg ok
21:28 emg why is it not adviseable?
21:28 thiago because you'll have multiple projects in one single repository
21:28 thiago different commit roots
21:29 thiago and besides, people would clone your repository twice, so you'll make poeple use 2x disk space as is required
21:30 nevodka joined #git
21:30 emg and I'm confused again, why would they clone it twice? (and is there more documentation I should read to understand this instead of spamming here?)
21:30 thiago because poeple would git clone your superproject
21:30 shaggycat joined #git
21:30 thiago then they'd realise it has submodules, and they'd do git submodule init, which clones the submodules
21:30 thiago except that the submodules are the same repository, so it gets cloned over and over again
21:31 thiago are you out of disk space on your server? Is that why you can't have multiple repositories?
21:31 emg no I'm just trying to understand what I can and can't do with submodules. I had an idea in my head and I'm figuring out where it's right, where it's wrong, and where it's stupid
21:32 thiago you can do a lot with git that is not adviseable
21:32 thiago that's not the point
21:32 emg hence the last part :-)
21:32 thiago I'm giving you the recommended procedure: one repository in the hosting service per repository that you have modified on your machine
21:32 emg thank you
21:32 thiago that's if you can't upstream the changes
21:33 thiago upstreaming is the overall recommended procedure
21:33 mingrammer joined #git
21:34 ochorocho__ joined #git
21:34 cdg joined #git
21:35 fguillot_ joined #git
21:37 emg I agree, but upstreaming makes no sense in this case as the changes are extremely project specific
21:37 emg thank you for your help
21:37 LionsMane joined #git
21:37 thiago that's why I recommended making them generic so that they can be upstreamed
21:38 ahr3n joined #git
21:39 yitz left #git
21:40 rominronin joined #git
21:42 danslo_ joined #git
21:43 ochorocho__ joined #git
21:45 ash_workz joined #git
21:46 emg thiago: would it be inadvisable to do what I want with subtrees? for each package I want to include, have 1 branch in my project that tracks that package's upstream, have 1 branch that contains my changes, use read-tree to map the branch with my changes into a subdirectory of my project?
21:46 thiago I've never used subtree
21:46 emg ok
21:46 thiago given what I know about it (including another project inside a larger one), it may do what you want
21:47 emg I'll play around with toy repos to see how it goes
21:47 ochorocho__ joined #git
21:48 crayon joined #git
21:48 crayon joined #git
21:49 durham joined #git
21:50 prawnzy joined #git
21:55 e14 joined #git
21:56 actinide joined #git
22:01 Celmor joined #git
22:02 Celmor is there an easy way to switch from an existing manual version control scheme (copy file and append version number) to git?
22:02 cdown joined #git
22:02 sangy joined #git
22:04 p4trix joined #git
22:05 Sasazuka__ joined #git
22:05 andlabs joined #git
22:05 romerocesar joined #git
22:06 raijin joined #git
22:08 therealGent joined #git
22:08 King_Hual` joined #git
22:17 kfunk joined #git
22:18 mehola joined #git
22:18 nilg joined #git
22:21 Darren__ joined #git
22:23 Dougie187 left #git
22:24 yqt joined #git
22:24 cdown joined #git
22:25 AfroThundr joined #git
22:25 bball2music joined #git
22:26 jeffreylevesque joined #git
22:26 Seveas Celmor: do you mean adapting your workflow or importing older versions?
22:28 mingrammer joined #git
22:28 bball2music left #git
22:28 Celmor Seveas, importing
22:28 bball2music joined #git
22:29 bball2music left #git
22:29 osse Celmor: this might do the trick:
22:29 osse https://github.com/git/git/blob/master/co​ntrib/fast-import/import-directories.perl
22:30 Celmor osse, is there a description anywhere?
22:30 osse in the file itself
22:30 osse if it's a single file then maybe a shell loop can do the trick
22:30 mizu_no_oto joined #git
22:32 Celmor osse, that's what I thought too, just wanted to look if such a script has been published somewhere already, no need to re-invent the wheel
22:32 osse i don't know of any.
22:33 osse the import-dirs thing might be more trouble getting to learn than it's worth
22:35 Celmor guess I have to script myself then, one question though, does git work well with symlinks if I only want to put certain files from various directories into the same version control?
22:35 osse Celmor: git will version the symlink itself, not the file it's pointing to.
22:36 Celmor can I change this behavior?
22:36 osse No
22:36 fish3485 joined #git
22:36 snthsnth joined #git
22:36 osse Celmor: i suggest you flip link and target. put a link where the files used to be that point to their new location in the repo
22:37 kfunk joined #git
22:38 Celmor some other applications may have a problem with that too, I would rather have only 1 source of problems and solve that (git not following symlinks)
22:38 thiago feel free to patch Git
22:38 thiago I doubt your change will be accepted. You'll need to keep your fork of Git for some time.
22:39 isysd joined #git
22:40 faheem joined #git
22:40 chrisshattuck joined #git
22:41 rominronin joined #git
22:42 stonerfish joined #git
22:43 danslo joined #git
22:43 Seveas Celmor: or have a proper deployment process that deploys your files to where you want the m to be....
22:43 nevodka joined #git
22:44 offlim joined #git
22:44 Celmor adds too much overhead to simple versioning of a few script files
22:45 Electrometro joined #git
22:45 thiago which one is more overhead: writing a script that deploys or modifying Git?
22:46 mycyber joined #git
22:47 jas4711 joined #git
22:47 Gsham joined #git
22:48 Celmor I'm just gonna put .git in the lowest root and add only specific files to its management (.gitignore)
22:48 thiago or set GIT_DIR and GIT_WORK_TREE
22:49 jave joined #git
22:49 thiago in fact, you can set the worktree in the config file too
22:51 Cork joined #git
22:52 clr Celmor: what applications are you worried might not follow symlinks?  is that just a hypothetical concern?  not following symlinks is pretty exceptional behavior.
22:52 Celmor so I guess git is exceptional in that regard
22:53 clr Celmor: for good reason
22:53 Celmor like applications (e.g. virt-manager) managing interl XMLs for definitions
22:53 Celmor internal*
22:53 ToxicFrog Yes? version control and backup/synchronization softwar are pretty much the only things I would expect to not follow symlinks.
22:53 rgrinberg joined #git
22:54 osse Should I pop some popcorn for this?
22:54 Celmor I would just love the option to enable this functionality
22:55 osse but what should happen if you do  rm file; git checkout -- file
22:55 Celmor it puts the file where the symlink was
22:56 joeo joined #git
22:56 elsevero joined #git
22:56 DolpheenDream joined #git
22:57 johnmilton joined #git
22:57 offlim joined #git
22:57 clr Celmor: maybe you're right, maybe it's a problem.  just wasn't clear to me if you had a specific concern or not.
22:57 offlim left #git
22:58 offlim joined #git
22:58 offlim left #git
22:59 EvilPenguin joined #git
23:03 offlim joined #git
23:05 madewokherd joined #git
23:06 nevodka joined #git
23:07 Gitzilla joined #git
23:07 King_Hual joined #git
23:09 dreiss joined #git
23:10 e14 joined #git
23:15 ayjay_t joined #git
23:17 offlim left #git
23:18 byteflame joined #git
23:18 offlim joined #git
23:19 atag joined #git
23:21 ahr3n joined #git
23:22 Shentino joined #git
23:22 mangolisk_ joined #git
23:23 chrisshattuck joined #git
23:24 ffabi joined #git
23:25 johnmilton joined #git
23:29 daishan joined #git
23:30 DJ_Spies joined #git
23:31 tier2villain_ joined #git
23:31 ffabi joined #git
23:33 e14 joined #git
23:34 King_Hual` joined #git
23:35 stamina joined #git
23:39 ffabi joined #git
23:40 byteflame joined #git
23:42 rominronin joined #git
23:43 King_Hual joined #git
23:43 King_Hual joined #git
23:44 danslo joined #git
23:44 ghostlight joined #git
23:46 Synthead joined #git
23:47 ffabi joined #git
23:47 lelu3 joined #git
23:48 fguillot joined #git
23:49 Gsham joined #git
23:51 chartractegg joined #git
23:53 eihabarabia joined #git
23:54 ffabi joined #git
23:56 King_Hual joined #git
23:56 King_Hual joined #git
23:56 johnmilton joined #git

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