Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-17

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

All times shown according to UTC.

Time Nick Message
00:01 dsantiago joined #git
00:01 BSaboia joined #git
00:02 unbalancedparen joined #git
00:04 Literphor joined #git
00:06 fstd_ joined #git
00:10 unbalancedparen joined #git
00:13 xall_ joined #git
00:17 ArchNoob joined #git
00:24 white_gecko left #git
00:25 cdown joined #git
00:28 hahuang65 joined #git
00:30 romerocesar joined #git
00:33 tristanp joined #git
00:41 alice` joined #git
00:43 HoierM joined #git
00:45 Electrometro joined #git
00:52 aidalgol joined #git
00:53 xall_ joined #git
00:55 devJet joined #git
00:57 _August_ joined #git
00:58 devJet Hello, I'm wondering if there's a way to pull from another fork. I have a fork of a repo, and someone else has another fork. I would like to pull the other person's commits, but they have not yet been accepted by the master repo. Is this possible?
00:59 Eugene devJet - sure; add their fork as another remote(man git-remote), then fetch from it.
00:59 gitinfo devJet: the git-remote manpage is available at http://jk.gs/git-remote.html
00:59 Eugene You may also be interested in !github_pull
00:59 gitinfo To easily see Github Pull Requests in your local repo, use this fetchspec trick: https://gist.github.com/piscisaureus/3342247
01:00 devJet Eugene: Thanks! I'll give it a go.
01:00 jeffreylevesque joined #git
01:01 leb joined #git
01:02 mingrammer joined #git
01:02 ahmadassaf joined #git
01:04 d3r1ck joined #git
01:04 d3r1ck Hi, just noticed something while messing around with Git
01:05 d3r1ck when I typed "git commit -m -s", it works and the commit message is "-s"
01:05 jmarcelo joined #git
01:05 d3r1ck is it not suppose to say missing commit message or so???
01:05 Eugene Sounds right to me. The next argument is interpreted as the message
01:05 ekinmur joined #git
01:06 phanimah1sh joined #git
01:07 d3r1ck Eugene: which is not
01:07 Eugene Well, then don't put that argument there
01:08 d3r1ck Well, I noticed it and decided to bring it to the channel
01:08 d3r1ck I see it as unusual
01:08 d3r1ck The next thing after -m should be in double quotes " "
01:08 codepython777 joined #git
01:08 codepython777 changes not staged for commit - how do i see what changes the file has?
01:08 d3r1ck Anything apart from that should fail
01:09 Eugene man git-commit doesn't mention " in describing -m; all it sees is arguments
01:09 gitinfo the git-commit manpage is available at http://jk.gs/git-commit.html
01:09 d3r1ck Eugene: Ok, but does what I say makes sense to you?
01:09 Eugene Your shell uses " to delineate arguments containing space characters
01:10 Eugene This is a bit like "the turtle bit me when I stuck my finger in its mouth". Yes, that's what turtles do. Don't stick your finger in its mouth, like the sign said to.
01:10 pks joined #git
01:13 d3r1ck Eugene: :)
01:13 d3r1ck Ok
01:13 d3r1ck There is another one I noticed
01:13 bronson joined #git
01:13 d3r1ck When you type "git commit --amen" to change the prev commit message, it works
01:14 d3r1ck I thought the command should be "git commit --amend"???
01:14 d3r1ck Eugene: What do you have to say about this my little notice, is it still correct or wrong???
01:14 l4v2 joined #git
01:15 clemf joined #git
01:16 Eugene The argument processor is able to tell that you want --amend. Again, not terribly surprising.
01:17 d3r1ck Eugene: well, maybe my version of git doesn't tell me that
01:17 d3r1ck because mine just works like that and I go ahead and amend the commit
01:18 arescorpio joined #git
01:19 romerocesar joined #git
01:19 xall_ joined #git
01:20 codepython777 left #git
01:20 PioneerAxon joined #git
01:22 pioiytr joined #git
01:23 xall_ joined #git
01:29 hahuang65 joined #git
01:31 Electrometro joined #git
01:33 romerocesar_ joined #git
01:37 tristanp joined #git
01:37 mycyber joined #git
01:38 tristanp joined #git
01:39 Limes_ joined #git
01:41 nettoweb joined #git
01:41 thiago joined #git
01:46 _August_ joined #git
01:46 zlens joined #git
01:49 Electrometro joined #git
01:50 shgysk8zer0 joined #git
01:50 raijin joined #git
01:54 qasaur joined #git
01:54 romerocesar joined #git
01:54 moei joined #git
01:54 apipkin_ joined #git
01:56 stantonk joined #git
01:57 david007 joined #git
02:03 shgysk8zer0 joined #git
02:05 fahadash joined #git
02:06 martinium joined #git
02:07 stantonk joined #git
02:11 Literphor joined #git
02:12 monoprotic joined #git
02:12 dmto joined #git
02:14 Gsham joined #git
02:16 chachasmooth joined #git
02:17 hexagoxel joined #git
02:17 romerocesar joined #git
02:17 peepsalot joined #git
02:17 unbalancedparen joined #git
02:23 Sleepy63 joined #git
02:28 Dougie187 joined #git
02:33 eizua joined #git
02:34 phanimahesh joined #git
02:35 dmto joined #git
02:43 shgysk8zer0 joined #git
02:44 romerocesar joined #git
02:47 xall joined #git
02:52 Codfection joined #git
02:52 Literphor joined #git
02:54 Shentino joined #git
02:58 texinwien joined #git
02:59 realz joined #git
03:04 xlegoman joined #git
03:18 nickel joined #git
03:19 nickel hi friends
03:19 gitinfo nickel: 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.
03:20 stantonk joined #git
03:20 stantonk_ joined #git
03:20 k3rn31 joined #git
03:22 nickel I have a question. I am currently using a git for managing my source code(which is basically a bunch of system tests). i have a existing continuous integration infrastructure which uses CVS predominantly. Is there a way migrate the git project to cvs
03:23 nickel ?
03:23 nickel is it worth it?
03:23 nickel i am trying to understand what are the advantages and disadvantages of this effort
03:24 nickel the CI infra would be running nightly tests
03:24 d4rklit3 joined #git
03:25 govg joined #git
03:25 treaki__ joined #git
03:25 thiago no
03:25 thiago migrate from CVS to Git, not the other way around
03:27 nickel Also I did a little bit of research and I found that there are tools to migrate from cvs to git. the CI team in my small company wants us to build a pipeline for migrating the code from cvs to git for every commit or something like that
03:27 nickel i dont know how to do go about it..
03:28 nickel thanks thiago.. for the answer..
03:29 nickel what are some disadvantages you can think of if someone wants to do this way - git to cvs?
03:29 nickel im pretty new to both git and cvs.. I am trying to understand the pros and cons
03:31 thiago you'd have to write the tools
03:33 medeirosthiiago joined #git
03:33 rewt i recently completed migration of cvs to git repos @work using cvs2git; wasn't too bad; and doing incremental migrations of new commits was quite seamless as long as no commits were made to the same branch in git
03:33 blackwind_123 joined #git
03:34 rewt http://www.mcs.anl.gov/~jacob/cvs2svn/cvs2git.html
03:36 rewt nickel, another option would be to write wrapper scripts that lets the CI's tools see your git repo as cvs, but i'm not sure what would be involved in this; it'd depend on what commands CI runs
03:36 zacts joined #git
03:38 xall joined #git
03:39 netj joined #git
03:39 nickel thanks rewt... for the reply. Can this cvs2git be used for migrating from git to CVS?
03:39 nickel the other way around..
03:40 romerocesar_ joined #git
03:45 mmlb joined #git
03:54 ResQue joined #git
03:56 tristanp joined #git
03:57 tristanp joined #git
03:59 raijin joined #git
04:00 ag4ve_ joined #git
04:00 mappy joined #git
04:02 mappy i can run `git clone $bundle` when $bundle is a /local/path to a .bundle file, but not when it's an http://path - i just get 'fatal: repository https://... not found' (git seems to be adding a trailing slash to the resulting URL)
04:02 mappy is it possible to run `git clone` to a git bundle that's hosted on http?
04:03 rgrinberg joined #git
04:05 thiago no
04:05 thiago download it first
04:06 mappy can't :( i'm stuck with a client that always runs `git clone $target` (that's golang's `go get`)
04:07 thiago then make the bundle an actual repository
04:07 mappy i guess that's the only option
04:07 thiago or use a better client
04:08 mappy in that mode, does git request many individual files? i like the concept of bundle pulling everything all at once
04:08 thiago yes and no
04:08 mappy do you think the git maintainers would be receptive to a patch adding support for `git clone bundle` with http-hosted bundles?
04:08 thiago it requests multiple files, but the majority of the data is in one pack file
04:08 mappy ah, that's not so bad then
04:08 thiago yes, but I was talking about your front-end to git
04:09 * mappy nods
04:09 sagerdearia joined #git
04:20 hahuang65 joined #git
04:33 brentison joined #git
04:34 brentison left #git
04:34 nickel joined #git
04:34 romerocesar joined #git
04:37 hahuang65 joined #git
04:38 Cabanossi joined #git
04:38 k3rn31 joined #git
04:43 kadoban joined #git
04:44 romerocesar joined #git
04:47 languitar joined #git
04:48 _August_ joined #git
04:53 TinkerTyper joined #git
04:55 dunpeal joined #git
05:00 stantonk joined #git
05:01 stantonk joined #git
05:01 _August_ joined #git
05:04 theskillwithin joined #git
05:04 Motoko joined #git
05:06 romerocesar joined #git
05:09 hahuang65 joined #git
05:11 Motoko joined #git
05:13 mingrammer joined #git
05:15 azbarcea joined #git
05:16 pioiytr joined #git
05:21 rgrinberg joined #git
05:28 Darren_ joined #git
05:30 romerocesar joined #git
05:36 pootsmk joined #git
05:37 freimatz joined #git
05:41 lamont joined #git
05:47 cyan__ joined #git
05:48 flavius joined #git
05:55 kg6hum joined #git
05:57 OnBrokenWings joined #git
06:03 jokajak joined #git
06:05 romerocesar joined #git
06:07 Electrometro joined #git
06:08 mingrammer joined #git
06:11 vdv joined #git
06:13 sagerdearia joined #git
06:22 ArchNoob joined #git
06:24 vuoto joined #git
06:25 emPi joined #git
06:26 romerocesar joined #git
06:29 mrBen2k2k2k joined #git
06:30 drewo joined #git
06:34 NimeshNeema joined #git
06:35 pioiytr joined #git
06:37 Electrometro joined #git
06:43 drewo joined #git
06:51 Asiajey joined #git
06:54 apotry joined #git
06:56 dunpeal joined #git
06:56 romerocesar joined #git
06:57 drewo joined #git
06:58 MZAWeb joined #git
06:59 FunkyAss joined #git
07:02 _August_ joined #git
07:04 stantonk joined #git
07:06 harish_ joined #git
07:12 drewo joined #git
07:15 feignix joined #git
07:17 emPi joined #git
07:17 D[4]ni joined #git
07:17 mischat joined #git
07:20 romerocesar joined #git
07:21 harish_ joined #git
07:25 Cassiopaya joined #git
07:25 chamunks joined #git
07:27 IlNominePatre joined #git
07:28 Fijit joined #git
07:29 albel727 joined #git
07:30 xall joined #git
07:30 romerocesar joined #git
07:31 dreiss joined #git
07:33 iLembus joined #git
07:40 pR0Ps joined #git
07:42 ScriptThis joined #git
07:42 drewo joined #git
07:45 dreiss joined #git
07:45 romerocesar joined #git
07:45 mingrammer joined #git
07:46 davisonio joined #git
07:50 multi_io joined #git
07:52 bket joined #git
07:54 MattMaker joined #git
07:56 ScriptThis joined #git
07:57 fus joined #git
07:57 elastix joined #git
07:57 vuoto joined #git
08:00 david007 joined #git
08:00 tomboy64 joined #git
08:00 feignix joined #git
08:01 vuoto_ joined #git
08:01 chachasmooth joined #git
08:03 HanClinto joined #git
08:11 MrMojito joined #git
08:13 MattMaker joined #git
08:16 Somelauw joined #git
08:17 Somelauw I messed up. I did git rebase HEAD~20, but only wanted to remove the third last commit, now it has rewritten all previous 20 commits even though nothing changed in them.
08:18 Somelauw can i undo this?
08:18 vuoto joined #git
08:19 Seveas yes. Use git reflog to find the pre-rebase state and reset to it.
08:20 vuoto joined #git
08:20 Somelauw Seveas: will i then lose my commits?
08:20 cd-rum joined #git
08:20 Somelauw i mean the last three i care about
08:22 nettoweb joined #git
08:23 Somelauw Seveas: thanks, it worked
08:23 emPi joined #git
08:24 Seveas Somelauw: once you committed something, git tries quite hard not to lose it :)
08:25 ScriptThis joined #git
08:27 drewo joined #git
08:28 narendraj9 joined #git
08:30 vuoto joined #git
08:30 xtk joined #git
08:33 romerocesar joined #git
08:34 harish joined #git
08:37 e89c8c95a050 joined #git
08:38 cdown_ joined #git
08:39 l0rdPE joined #git
08:39 Liff_ joined #git
08:40 mingrammer joined #git
08:40 mablae joined #git
08:43 Liff_ left #git
08:43 BobbyPeru joined #git
08:43 BobbyPeru is there any easy way of squashing a sequence of commits in the middle of my history?
08:44 Bombe BobbyPeru, !interactive_rebase can do that.
08:44 gitinfo BobbyPeru: 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:44 Somelauw git rebase -i should have a way to cancel
08:44 BobbyPeru thanks i'll look at it
08:45 Somelauw exiting without saving doesn't work
08:45 vuoto joined #git
08:46 jhass Somelauw: well if all stays at pick and there's no new base it does nothing
08:46 jhass but the other day I learned that in vi/vim you can :cq
08:48 Somelauw jhass: it does mark them as updated or something. Otherwise it wouldn't mind me doing git rebase HEAD~20 and only updating the third last commit
08:48 Somelauw in my opinion it should ignore the seven untouched commits before that
08:48 Dreamer3 joined #git
08:48 jhass it does IME?
08:49 duotang joined #git
08:50 chachasmooth joined #git
08:50 Somelauw it did add them to 'changed files' on github
08:50 l0rdPE joined #git
08:50 mehdi_ joined #git
08:50 xall joined #git
08:51 Walex joined #git
08:52 devxom joined #git
08:52 chadi joined #git
08:53 Chunk2 joined #git
08:53 dreamseeker joined #git
08:53 jhass that seems rather unrelated
08:54 mischat joined #git
08:56 vdv joined #git
08:56 robotroll joined #git
08:57 Myrl-saki joined #git
08:57 dunpeal joined #git
09:00 BobbyPeru Bombe: the first step of the rebase works fine, but the second fails due to an empty commit message, even though i've supplied one. do you know what causes this?
09:02 romerocesar joined #git
09:03 acetakwas joined #git
09:04 peepsalot joined #git
09:07 Somelauw BobbyPeru: don't have an empty commit message or maybe your editor starts a background process
09:08 BobbyPeru i switched to nano, let me try going back to vim
09:11 BobbyPeru nope..
09:12 BobbyPeru maybe i can explain what im doing, and someone will see where i do wrong
09:12 BobbyPeru i have commits numbered 1-10, i wish to squash commits 3-7 into a single commit, so i start with "rebase -i 2"
09:13 PioneerAxon joined #git
09:13 BobbyPeru i reword commit 3, and i mark 4-7 as fixup, and save and exit. it does the rebase and then asks me to supply a commit message
09:13 BobbyPeru i add a new commit message, save and exit, it begins to work, and then fails due to an empty commit message.  what am i doing wrong?
09:14 robotroll joined #git
09:15 lordjancso joined #git
09:15 romerocesar_ joined #git
09:17 catsup joined #git
09:18 Sadeukko joined #git
09:18 leeN joined #git
09:19 Electrometro joined #git
09:20 aboseley joined #git
09:21 lordjancso hi
09:21 lordjancso how can i set post receive hook on bitbucket?
09:22 drewo joined #git
09:23 aboseley left #git
09:23 sanketdg joined #git
09:23 i7c You probably can’t.
09:23 i7c Except for the predefined ones, maybe. https://confluence.atlassian.com/bitbuckets​erver/using-repository-hooks-776639836.html
09:23 ahmedelgabri joined #git
09:24 texinwien joined #git
09:26 mischat joined #git
09:27 vuoto joined #git
09:28 lordjancso i7c i cannot find functions like this
09:30 i7c Maybe your hoster disabled this functionality? This is not really a git question. I guess you’re free to ask here and maybe you get lucky and someone knows the answer, but some kind of bitbucket support would probably a better address to turn to.
09:31 lordjancso i7c i have a single repo on bitbucket.org, nothing fancy
09:31 playfullyExist joined #git
09:31 vuoto joined #git
09:31 lordjancso so its a free to use bitbucket private repository
09:31 i7c Still, it’s not a git question.
09:32 lordjancso i know, but there is not bitbucket channel and i guess some of the members of #git using bitbucket
09:32 i7c I guess bitbucket has a documentation/manual/help page?
09:32 i7c lordjancso, yeah, you might have to wait until some of them is around. ;)
09:33 i7c someone*
09:33 lordjancso i have higher chance to find somebody here instead of #nginx
09:33 vuoto joined #git
09:33 lordjancso i7c i'm waiting
09:33 lordjancso there are some documentation of bitbucket but its not clear
09:33 lordjancso they have many services and i'm lost in it
09:34 noy|b joined #git
09:38 _August_ joined #git
09:38 romerocesar joined #git
09:38 MattMaker joined #git
09:38 SteffanW joined #git
09:39 LeMike joined #git
09:39 alcohol joined #git
09:39 noy|b Can someone clarify for me, when using git clone that will get the most up to date files in the repository at that point in time?  So < git clone git://git.libav.org/libav.git \r will get the latest libav source code?
09:39 phaleth joined #git
09:39 noy|b sorry that came out all jumbled
09:39 rudi_s noy|b: Yes.
09:40 noy|b Can someone clarify for me, when using git clone that will get the most up to date files in the repository at that point in time?
09:40 noy|b rudi: ok thanks
09:40 rudi_s noy|b:  But note that the repository may contain multiple branches. Per default the master branch is checked out, but the repository may contain others.
09:40 rudi_s (e.g. a dev branch)
09:40 noy|b ok
09:41 govg joined #git
09:43 noy|b so would this be the correct way to compile the latest libav...
09:43 noy|b $ cd libav
09:43 satifant joined #git
09:43 noy|b $ ./configure
09:43 noy|b $ make
09:43 noy|b $ sudo make install
09:44 noy|b after $ git clone git://git.libav.org/libav.git
09:45 rudi_s noy|b: Yes. But you should most likely use a released version instead. Current master may contain more bugs. - And you should use an encrypted/authenticated connection (e.g. git clone https://git.libav.org/libav.git if it works).
09:45 rudi_s (Btw. building libav is off-topic here.)
09:47 noy|b i don't care about libav i just trying to understand if i can just use git instead of downloading specific tar balls
09:48 noy|b rudi_s: why is a encrypted connection important?
09:50 Sadeukko joined #git
09:50 rudi_s noy|b: You can. You can also use it to go to specific releases if the repository contains the correct tags, e.g. git checkout v1.3.4 and then ./configure; make ..
09:50 rudi_s Otherwise everybody "between" you and the server could manipulate the download and insert e.g. malicious code.
09:51 rudi_s If the tags are signed, you can use gpg to verify them (with git tag -v), but sadly most projects don't do that.
09:51 romerocesar joined #git
09:54 noy|b where are the git tags for the specific releases?
09:55 jhass git tag lists all tags
09:55 freimatz joined #git
09:55 noy|b on github i changed the branch from master to release/0.5
09:56 noy|b sorry i see the tags now
09:56 poisond joined #git
09:59 noy|b so if i wanted v12_dev0 it would be <git checkout v12_dev0> after running <git clone https://git.libav.org/libav.git>
10:00 jhass yes
10:02 noy|b well that seems like a good system
10:02 rudi_s But note that after the checkout you are no longer on a branch (this is called detached head). If you want to create new commits, create a branch after the checkout (git branch foo) and only after that commit on this new branch. Otherwise you might lose those new commits if you don't know what you're doing (they can be recovered, but that requires some knowledge).
10:07 stantonk joined #git
10:07 ahmedelgabri joined #git
10:09 Limes_ joined #git
10:10 GenZai joined #git
10:11 robotroll joined #git
10:12 noy|b rudi_s: but that's only important if I want to record changes to the repository?
10:15 m0viefreak joined #git
10:16 drewo joined #git
10:17 SimonNa joined #git
10:17 ynanm joined #git
10:21 noy|b seems to be hanging at < cloning into '(repository...)>
10:23 noy|b when i use https
10:23 noy|b but doesn't hang when i dont use https
10:24 noy|b does https take a much longer time or after 5 minutes at < cloning into '(repository...)> can i assume it'd be stuck
10:25 jhass it's more likely stuck
10:26 jhass maybe your MITM doesn't know how to forward it anymore :P
10:27 noy|b MITM...is that short for man in the middle?
10:27 mingrammer joined #git
10:28 jhass yes
10:28 jhass and I'm more joking ;)
10:28 noy|b oh i knew you were, i'm afraid it's gone straight over my head though
10:29 zeroed joined #git
10:31 naf hi
10:32 naf is there any way to reverse my last push and commit?
10:32 naf and have the commit deleted from history
10:33 noy|b how do i point git checkout in the right direction after git clone?
10:33 narendraj9 joined #git
10:34 osse noy|b: what do you mean?
10:34 osse you have to cd into the repo before doing anything
10:34 osse or do  git -C <repo> checkout ..
10:35 noy|b right so i need to find where the repository clones to on my file system
10:35 GenZai git checkout 45897g654 index.html
10:36 GenZai do a git log --oneline
10:36 GenZai to know the ID you want to go back to
10:38 noy|b yep of course cd repo
10:39 noy|b ok now after git checkout i'm in detached HEAD state.  Can I compile and make from here without git branch foo etc?
10:39 naf GenZai was that to me?
10:40 osse noy|b: unless you're planning to make changes and commits and whatnot being detached is not a problem
10:40 GenZai naf yes
10:41 zeroed joined #git
10:41 irco joined #git
10:43 naf can i just
10:43 naf simply remove the last push?
10:44 muelli joined #git
10:45 jhass !rewrite
10:45 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
10:45 jhass naf: ^
10:45 naf it is just me in this repository
10:45 jhass !revert
10:45 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
10:45 naf i want to remove a push and commit entirely as it contains some sensitive information
10:45 jhass so e) and force push
10:45 naf what is e) ?
10:46 GenZai e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
10:46 bremner also, realize that the information is out there now, and you should take appropriate steps
10:48 naf i ended up doing:
10:48 naf git reset --hard HEAD^
10:48 naf git push --force
10:54 cyan__ joined #git
10:55 shirty joined #git
10:58 noy|b alright thanks for your help
10:59 dunpeal joined #git
11:00 noy|b left #git
11:00 sdothum joined #git
11:01 nwkj86 joined #git
11:07 _August_ joined #git
11:08 Rodya_ joined #git
11:08 harish joined #git
11:08 FuzzySockets joined #git
11:10 drewo joined #git
11:10 ahmedelgabri joined #git
11:16 ojdo joined #git
11:18 pks joined #git
11:19 davisonio joined #git
11:20 rgrinberg joined #git
11:22 mikecmpbll joined #git
11:22 mingrammer joined #git
11:23 King_Hual joined #git
11:23 Hussam joined #git
11:24 Hussam Hi. If an old revision deleted a file A,  can I retrieve that file without rolling back the whole repo to that revision?
11:25 grawity git checkout commitid^ myfile
11:25 Hussam thanks grawity.
11:25 Seveas or git show commitid^:file if you don't want to overwrite the file
11:32 xtk joined #git
11:36 eijk joined #git
11:37 eijk joined #git
11:38 elastix joined #git
11:43 ahmedelgabri joined #git
11:44 bluepixe1 joined #git
11:47 nnyk joined #git
11:50 theskill_ joined #git
11:53 DieguezZ joined #git
12:01 apotry joined #git
12:02 playfullyExist joined #git
12:02 Noldorin joined #git
12:03 tomog999_ joined #git
12:03 romerocesar joined #git
12:04 MattMaker joined #git
12:06 eijk joined #git
12:06 King_Hual joined #git
12:06 King_Hual joined #git
12:07 dan2k3k4 joined #git
12:08 bongjovi joined #git
12:08 eijk joined #git
12:13 dan2k3k5 joined #git
12:16 eijk joined #git
12:21 Manuel15 joined #git
12:23 reim joined #git
12:23 romerocesar joined #git
12:24 reim joined #git
12:24 davisonio joined #git
12:32 Orbitrix joined #git
12:33 romerocesar joined #git
12:36 Rooxo joined #git
12:44 romerocesar joined #git
12:45 Orbitrix joined #git
12:52 plasticle joined #git
12:55 _28_ria joined #git
12:58 drewo joined #git
13:01 dunpeal joined #git
13:01 xall joined #git
13:07 CheckDavid joined #git
13:10 mingrammer joined #git
13:11 cyan__ joined #git
13:11 pabs3 joined #git
13:12 pabs3 is `git grep thisstringnotpresentintherepo` meant to print terminal escape sequences when stdout is a terminal?
13:15 MattMaker joined #git
13:16 renee joined #git
13:17 cortexman joined #git
13:21 Hussam left #git
13:22 cuebix-wk joined #git
13:24 romerocesar joined #git
13:26 MattMaker joined #git
13:28 reim joined #git
13:32 PioneerAxon joined #git
13:34 mrBen2k2k2k joined #git
13:36 l4v2 joined #git
13:41 Arban joined #git
13:42 liquidjamm joined #git
13:45 bremner pabs3: when you say stdout is a terminal, do you mean with a pager (default) or not? because I have escape sequences for colour in the former case but not the latter
13:45 pabs3 yeah, appears to be caused by the pager (see #debian-devel)
13:46 pabs3 I wonder if git grep can not run the pager when there is no ouput
13:46 liquidjamm joined #git
13:46 bremner I guess you know you can turn off the pager?
13:46 diegoviola joined #git
13:47 pabs3 yeah, but I want it on when there is output
13:48 pabs3 (the scenario is `mr -m grep foo`)
13:48 bremner ack.
13:48 bremner maybe depends on the choice of pager?
13:49 bremner i.e. how can I see these codes in the no-output case?
13:49 pabs3 PAGER=cat gives nothing
13:49 pabs3 same with PAGER=more
13:50 pabs3 I don't really want to mess with the user's choice of PAGER though
13:50 brandonw joined #git
13:50 pabs3 guess I'll work around this with --no-pager in git_grep in my personal ~/.mrconfig
13:52 drewo joined #git
13:56 Lvjasha joined #git
13:57 Ryihne joined #git
13:58 eijk joined #git
13:59 xlegoman joined #git
13:59 playfullyExist joined #git
14:03 MattMaker joined #git
14:06 Berry joined #git
14:08 bluepixel joined #git
14:09 lordjancso joined #git
14:13 ahmedelgabri joined #git
14:15 romerocesar joined #git
14:17 fmcgeough joined #git
14:17 osse pabs3: have use sett LESS in the environment?
14:19 pabs3 $LESS is unset
14:19 osse hmm ok
14:20 unbalancedparen joined #git
14:22 SteffanW2 joined #git
14:24 kbs joined #git
14:25 SteffanW joined #git
14:25 Manuel15 Hi guys, I have a problem. Even if I added a folder in my project directory and used "git add .", git keeps saying me that there are no changes to commit. Is this a bug?
14:25 romerocesar joined #git
14:26 eijk joined #git
14:26 kbs Does the new directory have any files?
14:26 Manuel15 kbs: yes
14:29 Darren_ joined #git
14:31 Somelauw git doesn't track directories but files, strange it doesn't detect the new files
14:32 Manuel15 Somelauw: yea, that's what I find strange too...
14:32 a_thakur joined #git
14:32 D-Boy joined #git
14:33 Manuel15 "On branch master
14:33 Manuel15 Your branch is up-to-date with 'origin/master'.
14:33 Manuel15 nothing to commit, working directory clean"....
14:34 kbs fwiw, it's unlikely enough that I might continue to look for sort of usage issue, than a git bug
14:35 WaReZ joined #git
14:35 ekinmur joined #git
14:35 kbs out of curiosity, does git show path/to/new/folder/file show anything?
14:35 * kbs wonders about an outside chance it was already in the repo
14:36 romerocesar joined #git
14:36 kbs or maybe it's in gitignore, I think that might do it to
14:36 kbs *too
14:37 Manuel15 kbs: 1) I checked gitignore, it's not that. 2) I just tried that command, it gives me the error "permission denied" O.o
14:37 kbs ah, interesting
14:38 thebloggu joined #git
14:39 Manuel15 kbs: "interesting" like "I may know what is causing this" or like "I didn't know that was possible and have no idea what you can do"?
14:39 kbs interesting as in, that seems like a worthwhile place to investigate :) file permissions on the file to be added, etc - dunno
14:41 Somelauw left #git
14:41 azbarcea joined #git
14:42 kbs just for the heck of it you can run git fsck to eliminate the outside chance of any bad data in the repo itself; and barring that, seems like it might be something odd with the directory to be added, not sure
14:42 muelli joined #git
14:43 HoierM joined #git
14:44 osse kbs: are you *sure* it's not gitignore? try  git check-ignore -v path/to/some/file
14:44 Manuel15 kbs: I just checked something: I can't even cd into that folder, it gives me permission denied, but the folder's permissions are 777...
14:45 artemisart joined #git
14:45 osse oh
14:45 osse Manuel15: see what I wrote to kbs
14:46 Manuel15 osse: permission denied again...
14:46 m0viefreak joined #git
14:46 drewo joined #git
14:46 davisonio joined #git
14:46 dan2k3k4 joined #git
14:47 romerocesar joined #git
14:48 osse Manuel15: what about the permissions on the folder contents
14:49 Somelauw joined #git
14:49 Manuel15 osse: all 777
14:49 osse what specifically gets permission denied?
14:49 osse what's the full error output
14:50 Somelauw What do people think of scm-breeze or other shell additions to git?
14:50 Somelauw this for example: https://github.com/ndbroadbent/scm_breeze
14:50 dan2k3k4 joined #git
14:50 Manuel15 osse: with the command you gave me: "warning: unable to access 'requests/.gitignore': Permission denied"
14:51 osse Manuel15: what is the permission on THAT file then
14:52 Manuel15 osse: oh, wait, there is NO .gitignore in that folder....
14:52 osse Manuel15: you know 'ls' hides files starting with a dot by default right?
14:53 osse so do most file managers
14:53 Manuel15 osse: I'm not using ls, and my file manage is set to show the hidden files
14:54 osse i find it hard to believe it doesn't exist when git thinks it does
14:54 osse what does ''ls -l requests/.gitignore' say
14:54 sanketdg joined #git
14:55 dan2k3k4 joined #git
14:56 Manuel15 osse: "ls: /requests/.gitignore: No such file or directory" -.-
14:56 osse Manuel15: requests/.gitignore and /requests/.gitignore are not the same thing
14:57 Manuel15 osse: right, I forgot that..
14:57 Manuel15 ls: requests/.gitignore: Permission denied
14:57 apotry joined #git
14:57 Manuel15 What?
14:57 osse ls -ld requests
14:57 kbs fwiw, occam's razor on the permission denied message strikes me at least as root cause being just that (some permission bit is mis-set, probably on the directory)
14:57 kbs ^^
14:58 dan2k3k4 joined #git
14:59 mingrammer joined #git
14:59 nnyk joined #git
15:01 mrBen2k2k2k joined #git
15:03 dunpeal joined #git
15:06 texinwien joined #git
15:06 robotroll joined #git
15:07 mkoskar joined #git
15:11 zeroed joined #git
15:11 zeroed joined #git
15:11 dreiss joined #git
15:12 Manuel15 osse: that gives me "drwxrwxrwx    4 root     root"
15:17 Somelauw any good highlevel tools or does everyone use cmdline? Are fugitive, magic, vimbreeze, gitk the way to go?
15:19 osse Manuel15: then i have no idea what is going on
15:19 madewokherd joined #git
15:20 bronson joined #git
15:21 Manuel15 osse: also, with root permissions trying to use ls on "requests/.gitignore" gives me "No such file or directory"... There is definitely something weird going on...
15:22 osse is it a network file system?
15:24 Manuel15 osse: network file system?
15:26 osse Manuel15: Samba, NFS, SSHFS etc.
15:27 romerocesar joined #git
15:28 Manuel15 osse: no, actually it is on Android, so it could be an android/termux bug, but I wanted to be sure it wasn't me not being able to use git :P
15:32 Pulp joined #git
15:33 FuzzySockets joined #git
15:34 jimi_ joined #git
15:36 sdothum joined #git
15:38 jungsubk joined #git
15:40 drewo joined #git
15:42 thebloggu joined #git
15:43 noteness joined #git
15:43 l4v2 joined #git
15:45 jaafar joined #git
15:47 thiago joined #git
15:50 zeroed joined #git
15:52 MZAWeb joined #git
15:53 f3r70rr35f joined #git
15:57 diegoviola joined #git
15:57 dunpeal joined #git
15:58 romerocesar joined #git
15:58 diegoviola joined #git
16:03 dstarh joined #git
16:06 stuh84 joined #git
16:08 thoraxe joined #git
16:10 sanketdg joined #git
16:10 skylite joined #git
16:11 a_thakur joined #git
16:11 Dyonisos joined #git
16:15 acetakwas joined #git
16:17 usm4n joined #git
16:17 f3r70rr35f joined #git
16:17 Limes__ joined #git
16:17 vuoto joined #git
16:18 LeMike joined #git
16:18 romerocesar joined #git
16:23 e89c8c95a050 joined #git
16:26 kadoban joined #git
16:26 jmarcelo left #git
16:30 johnmilton joined #git
16:31 a_thakur_ joined #git
16:34 drewo joined #git
16:37 e89c8c95a051 joined #git
16:37 King_Hual joined #git
16:38 MattMaker joined #git
16:39 King_Hual joined #git
16:39 King_Hual joined #git
16:47 mingrammer joined #git
16:50 xall joined #git
16:51 anuxivm joined #git
16:52 usm4n joined #git
16:54 MattMaker joined #git
16:56 zeroed joined #git
16:58 paul424 joined #git
16:58 usm4n left #git
16:59 d4rklit3 joined #git
17:01 pabs3 left #git
17:02 usm4n joined #git
17:06 dsdeiz joined #git
17:07 MattMaker joined #git
17:08 usm4n_ joined #git
17:10 texinwien joined #git
17:13 govg joined #git
17:19 zeroed joined #git
17:19 zeroed joined #git
17:19 tristanp joined #git
17:19 romerocesar joined #git
17:21 bronson joined #git
17:21 stantonk joined #git
17:23 paul424 joined #git
17:25 sweatsuit joined #git
17:26 Waskeend joined #git
17:26 davisonio joined #git
17:28 drewo joined #git
17:31 spudowiar joined #git
17:31 tristanp joined #git
17:32 GenZai joined #git
17:35 NeverDie joined #git
17:37 tristanp joined #git
17:40 jungsubk joined #git
17:41 mischat joined #git
17:43 romerocesar joined #git
17:45 WayToDoor joined #git
17:46 apotry joined #git
17:48 WayToDoor joined #git
17:52 Codfection joined #git
17:57 romerocesar joined #git
18:00 k3rn31 joined #git
18:01 ahmedelgabri joined #git
18:04 piling joined #git
18:08 NeverDie joined #git
18:09 eijk joined #git
18:10 edaught joined #git
18:13 ash_workz joined #git
18:13 unbalancedparen joined #git
18:16 Goplat joined #git
18:17 drewo joined #git
18:18 unbalancedparen joined #git
18:20 sangy joined #git
18:22 romerocesar joined #git
18:23 unbalancedparen joined #git
18:27 unbalancedparen joined #git
18:30 liquidjamm joined #git
18:32 drewo joined #git
18:33 cyan__ joined #git
18:34 dreiss joined #git
18:35 mingrammer joined #git
18:37 st0opkid joined #git
18:38 reim joined #git
18:39 SwiftMatt joined #git
18:40 davisonio joined #git
18:42 cagmz joined #git
18:42 eijk joined #git
18:42 rahtgaz joined #git
18:44 meZee joined #git
18:45 Caelum joined #git
18:50 romerocesar joined #git
18:51 ahmedelgabri joined #git
18:51 nilekada joined #git
18:52 zeroed joined #git
18:52 sto0pkid joined #git
18:53 xall joined #git
18:53 Infamous joined #git
18:54 d4rklit3 joined #git
18:54 anuxivm joined #git
18:55 Pulp joined #git
18:56 kenansulayman joined #git
18:56 cydrobolt joined #git
18:56 cydrobolt joined #git
18:56 acetakwas joined #git
18:57 xall joined #git
18:57 yanome joined #git
18:58 nilekada left #git
18:58 jstein_ joined #git
18:58 sleepee joined #git
19:00 ekinmur joined #git
19:00 MattMaker joined #git
19:03 fiete joined #git
19:04 MZAWeb joined #git
19:04 M-meznak joined #git
19:05 floatingpoint joined #git
19:05 jungsubk joined #git
19:06 cdg joined #git
19:09 nilg joined #git
19:10 ajf- joined #git
19:11 cdown joined #git
19:13 _W_ joined #git
19:13 angseus joined #git
19:13 Peng joined #git
19:13 runtime_error joined #git
19:13 ReenignE joined #git
19:13 mamParra joined #git
19:13 ReenignE joined #git
19:13 topi` joined #git
19:13 iamtakingiteasy joined #git
19:13 knittl joined #git
19:13 msm joined #git
19:13 knittl joined #git
19:13 SirCmpwn joined #git
19:13 mmattice joined #git
19:13 h264 joined #git
19:13 GyrosGeier joined #git
19:13 zmanfx joined #git
19:13 jumpman joined #git
19:13 comps joined #git
19:13 neunon joined #git
19:13 colona joined #git
19:13 Learath2 joined #git
19:13 c^ joined #git
19:13 trelane joined #git
19:13 Ragnor joined #git
19:13 kisonecat joined #git
19:13 manizzle joined #git
19:13 b_rare joined #git
19:13 trelane joined #git
19:13 deryni joined #git
19:13 satifant joined #git
19:13 satifant joined #git
19:13 ilogger2 joined #git
19:13 XVar joined #git
19:13 tabakhase joined #git
19:13 felher joined #git
19:13 Cerise joined #git
19:13 Cerise joined #git
19:13 varesa joined #git
19:13 ac_slater joined #git
19:13 joki joined #git
19:13 meatchicken joined #git
19:13 sto0pkid joined #git
19:13 liquidjamm joined #git
19:13 EvilDMP joined #git
19:13 dcg joined #git
19:13 neurodrone_ joined #git
19:13 lindenle joined #git
19:13 interne7y joined #git
19:13 quadz joined #git
19:13 Esya joined #git
19:13 rafalcpp joined #git
19:13 hplar joined #git
19:13 madewokherd joined #git
19:13 cwillu_at_work joined #git
19:13 remi joined #git
19:14 spaceone joined #git
19:14 M-mistake joined #git
19:14 k-man joined #git
19:14 anth0ny joined #git
19:14 quackgyver joined #git
19:14 LiENUS joined #git
19:14 tristanp joined #git
19:14 whatevsz joined #git
19:14 Mo0O joined #git
19:15 Urbany joined #git
19:15 mutex joined #git
19:16 nuck joined #git
19:16 sLite joined #git
19:16 NeonSynth joined #git
19:17 clemf joined #git
19:17 playfullyExist joined #git
19:17 romerocesar joined #git
19:17 Orbitrix joined #git
19:17 tristanp joined #git
19:17 kline joined #git
19:18 Lvjasha joined #git
19:18 Kronuz joined #git
19:21 bittin joined #git
19:23 Lvjasha joined #git
19:23 hahuang65 joined #git
19:25 eijk joined #git
19:27 jumpman joined #git
19:28 cdown joined #git
19:28 pioiytr_ joined #git
19:30 mingrammer joined #git
19:32 elastix joined #git
19:32 ahmedelgabri joined #git
19:34 cuebix-wk joined #git
19:35 drewo joined #git
19:37 Vgr joined #git
19:39 romerocesar joined #git
19:41 realz joined #git
19:41 User458764 joined #git
19:42 User458764 joined #git
19:42 vuoto joined #git
19:43 User458764 joined #git
19:44 User458764 joined #git
19:45 Leates joined #git
19:45 cagmz joined #git
19:45 anuxivm joined #git
19:48 ynanm joined #git
19:49 drewo joined #git
19:50 eijk_ joined #git
19:50 jungsubk joined #git
19:52 kbs joined #git
19:53 ScriptThis joined #git
19:59 ahmedelgabri joined #git
20:00 eijk_ joined #git
20:00 d4rklit3 joined #git
20:01 _W_ joined #git
20:03 romerocesar joined #git
20:05 ochorocho__ joined #git
20:06 DieguezZ joined #git
20:06 drewo joined #git
20:06 Darcidride joined #git
20:07 pioiytr_ joined #git
20:09 RedShift joined #git
20:12 RedShift hi all
20:12 RedShift has anyone used the git client in combination with smart cards for authentication?
20:13 RedShift my government issues digital passports and I can configure my webserver using TLS to authenticate using my passport
20:13 RedShift doesn't work with git though, when I do a git clone it just asks me a for password
20:13 kbs haha, that's an interesting idea :)
20:13 RedShift it seems Git has support for client side certificates but not for smart cards, which host the private key
20:15 kbs out of curiosity (I'm clueless about your origin, and about digital passports) does the passport itself behave as a smartcard (presumbably with a private key that's possibly also known to the govt?)
20:15 kbs s/your origin/your original question/
20:15 RedShift yes the passport is a smartcard, one of those that works with a PIN but you can't directly read the private key
20:15 RedShift I tried but the CPU in the card prevents you from reading the private key
20:16 RedShift I'm assuming my government is smart enough to throw away the private key once its transferred to the card (which is kind of the point of having these kinds of cards)
20:17 kbs So the one thing I can say (having used a few yubico keys) is that at least those devices are fragile; so it's almost mandatory to have a backup key available somewhere off the device as well
20:17 RedShift if I lose/break it I need to request my gov for a new card. Losing them is supposed to be no biggie because you can't read the private key
20:18 kbs no, but how do you regain access to your remote repo?
20:18 RedShift they maintain CRLs too so should be good...
20:18 BasementFox RedShift: Ideally, it should even be generated on the smartcard
20:18 RedShift I authorize based on my gov serial number, which always stay the same
20:19 RedShift the server is under my control so I can always put in new credentials as needed
20:19 kbs okay, I see
20:19 ekinmur joined #git
20:19 RedShift ideally I should be authorizing on card serial number (which does change) but meh
20:19 qsx git has nothing to do with that
20:20 qsx that usually openssh for (surprise) ssh and curl for http(s)
20:20 qsx you’re using https, so you need to get curl to use said smartcard
20:20 MattMaker joined #git
20:20 qsx never tried it, but i guess it should be possible
20:21 RedShift as far as I'm reading up on that work isn't finished with that
20:21 RedShift https://curl.haxx.se/mail/lib-2016-01/0001.html
20:21 * kbs also wonders if carrying around a passport to git update might get old fast, but applauds what sounds like a fun hack :)
20:21 mangolisk joined #git
20:22 qsx hmph
20:22 qsx well yes, openssl _is_ a bitch.
20:22 RedShift kbs: It's like free 2fa auth and nobody has to buy smartcards
20:22 jargonjunkie joined #git
20:22 qsx i use my pgp smartcard for ssh authentication
20:23 qsx so if you want to give me access to your server, gpg --export-ssh-key 95ee94a432583db1 >> /root/.ssh/authorized_keys :)
20:23 RedShift same thing with smartcards :-)
20:23 RedShift I already have putty working with it
20:23 RedShift someone made a build that works with smartcards
20:24 jason237 joined #git
20:24 mingrammer joined #git
20:26 paul424 joined #git
20:29 eijk_ joined #git
20:30 d4rklit3 joined #git
20:31 eivarv joined #git
20:32 GeekMan joined #git
20:32 durham joined #git
20:33 romerocesar joined #git
20:34 playfullyExist joined #git
20:42 monoprotic joined #git
20:42 monoprotic joined #git
20:43 spudowiar this channel feels quiet...
20:43 * osse spots a tumbleweed
20:44 spudowiar
20:44 spudowiar ▀▄   ▄▀      ▄▄▄████▄▄▄      ▄██▄       ▀▄   ▄▀      ▄▄▄████▄▄▄      ▄██▄  
20:44 spudowiar ▄█▀███▀█▄    ███▀▀██▀▀███   ▄█▀██▀█▄    ▄█▀███▀█▄    ███▀▀██▀▀███   ▄█▀██▀█▄
20:44 spudowiar █▀███████▀█   ▀▀▀██▀▀██▀▀▀   ▀▀█▀▀█▀▀   █▀███████▀█   ▀▀▀██▀▀██▀▀▀   ▀▀█▀▀█▀▀
20:44 spudowiar ▀ ▀▄▄ ▄▄▀ ▀   ▄▄▀▀ ▀▀ ▀▀▄▄   ▄▀▄▀▀▄▀▄   ▀ ▀▄▄ ▄▄▀ ▀   ▄▄▀▀ ▀▀ ▀▀▄▄   ▄▀▄▀▀▄▀▄
20:44 spudowiar
20:44 spudowiar ▀▄   ▄▀      ▄▄▄████▄▄▄      ▄██▄       ▀▄   ▄▀      ▄▄▄████▄▄▄      ▄██▄  
20:44 spudowiar ▄█▀███▀█▄    ███▀▀██▀▀███   ▄█▀██▀█▄    ▄█▀███▀█▄    ███▀▀██▀▀███   ▄█▀██▀█▄
20:44 spudowiar █▀███████▀█   ▀▀▀██▀▀██▀▀▀   ▀▀█▀▀█▀▀   █▀███████▀█   ▀▀▀██▀▀██▀▀▀   ▀▀█▀▀█▀▀
20:44 spudowiar ▀ ▀▄▄ ▄▄▀ ▀   ▄▄▀▀ ▀▀ ▀▀▄▄   ▄▀▄▀▀▄▀▄   ▀ ▀▄▄ ▄▄▀ ▀   ▄▄▀▀ ▀▀ ▀▀▄▄   ▄▀▄▀▀▄▀▄
20:44 spudowiar
20:44 spudowiar
20:44 spudowiar
20:44 spudowiar
20:44 spudowiar
20:44 spudowiar
20:44 spudowiar ▄█▄
20:45 spudowiar ▄█████████▄
20:45 spudowiar ▀▀▀▀▀▀▀▀▀▀▀
20:45 spudowiar
20:45 spudowiar that surely wakes up the channel :)
20:45 aidalgol joined #git
20:46 MrWoohoo joined #git
20:47 polyzen quiet channel confirmed
20:47 osse impressive
20:48 dopesong joined #git
20:48 preaction i'm sure that looks like something other than spam, but i can't see it
20:49 osse preaction: maybe you have to resize your irc client
20:49 osse each message must only be one line
20:51 catag87 joined #git
20:52 cdown_ joined #git
20:52 _ikke_ space invaders
20:53 RedShift I actually almost have it going with git on bash on Windows, using plink as SSH client
20:54 ecraven left #git
20:54 RedShift it's already asking for my pin code but after that it dies with fatal: protocol error: bad line length character:
20:54 RedShift Re
20:54 spudowiar RedShift: what is the server?
20:55 spudowiar RedShift: GitHub?
20:55 RedShift no, my own server
20:55 spudowiar oh, ok
20:55 spudowiar confirmed you can SSH in with plink?
20:55 RedShift yes that works
20:56 spudowiar ok
20:56 spudowiar now, try and see what SSH command is being called by Git
20:56 RedShift ah wait I think I know what the problem is, hold on
20:56 spudowiar :)
20:56 * spudowiar holds
20:57 RedShift it's working
20:57 dopesong joined #git
20:58 Orbitrix joined #git
20:58 RedShift my putty profile had the wrong username in it, didn't notice because I was using the same authorized_keys for my own and my git account
20:58 spudowiar lol
20:58 Orbitrix joined #git
20:59 phroa joined #git
20:59 spudowiar tua culpa
20:59 RedShift it's using SSH though, not HTTPS which is what I wanted :-\
20:59 spudowiar :(
20:59 * spudowiar shrugs, can't haz TLS with client certs :P
21:00 Lyqyd joined #git
21:01 catag87 joined #git
21:02 catag87 joined #git
21:02 Digit joined #git
21:03 Digit are there any free software git guis that i could use without glare?
21:04 romerocesar joined #git
21:04 phroa Glare?
21:04 cbreak Digit: there's git gui
21:05 * spudowiar glares at Digit
21:05 spudowiar gitk?
21:05 spudowiar I've heard of
21:05 eijk joined #git
21:06 jstimm_ joined #git
21:06 eijk joined #git
21:06 usm4n joined #git
21:08 eijk joined #git
21:11 NeonSynth_ joined #git
21:12 ScriptThis joined #git
21:12 b_rare joined #git
21:12 cdown joined #git
21:13 bayman joined #git
21:15 dreiss joined #git
21:18 eijk joined #git
21:18 xall joined #git
21:19 mingrammer joined #git
21:19 johnmilton joined #git
21:20 Digit had another look at gitk... so, sure, it has a colors tab in preferences, but after editing all the colours, it's still spewing out a lot of light grey and white at me that i didnt select... and then when i hit file/start git gui, it's /all/ glare again, with no indication of ability to change that in software.
21:20 osse i think you need to define glare
21:21 osse us cli-loving weirdos don't understand what you mean
21:21 nnyk joined #git
21:22 Digit "a very harsh, bright, dazzling light" - dictionary.com
21:23 osse if you're trying to say that gitk is fugly as sin, then I definitely agree
21:23 Digit https://git-scm.com/downloads/guis like the bottom example there.  gentle on the eyes.  but freedom respecting would be nice.
21:24 romerocesar joined #git
21:24 Digit it's less about aesthetics (tho i agree), n more about... um... ergonomics?   no, erm, not quite the right word for this.   ... health.
21:24 osse What's freedom to you then? GPL or BSD? :p
21:25 Digit :p  yes.
21:26 Digit or if i could wrestle qt into sense, i might manage to use that qt git gui, but i suspect the graphical toolkit may not be sufficient to eliminate the problem of glare.
21:27 tango_ in theory you shoud be able to have 'night mode' themes regardless of toolkit
21:27 anu0 joined #git
21:28 romerocesar joined #git
21:29 zacts joined #git
21:30 ajf- joined #git
21:32 MattMaker joined #git
21:32 SwiftMatt joined #git
21:33 Darren_ joined #git
21:35 GenZai joined #git
21:36 clemf_ joined #git
21:37 GenZai joined #git
21:39 _August_ joined #git
21:40 Digit git-cola's git-dag is a good example of the problem i've been encountering, keeping me away from using a gui to help expedite a few areas of git use.   it's using my gtk theme, but still has the white background on the important bit with the git tree.
21:41 Digit okies.   i suppose i'll accept such a thing doesnt exist yet, n get making issue reports, rather than waste #git's time with this.  ^_^
21:44 _August_ joined #git
21:48 yqt joined #git
21:50 mozzarella joined #git
21:50 skyfaller joined #git
21:52 apotry joined #git
21:52 Garen joined #git
21:53 _August_ joined #git
21:53 romerocesar joined #git
21:54 diogenese joined #git
21:57 Somelauw left #git
21:57 ahr3n joined #git
21:57 nettoweb joined #git
21:58 _August_ joined #git
22:01 _August_ joined #git
22:01 ochorocho__ joined #git
22:04 cd-rum joined #git
22:04 joki joined #git
22:07 Limes_ joined #git
22:11 vF3hNGxc47h8 joined #git
22:12 Limes__ joined #git
22:12 white_gecko joined #git
22:13 mingrammer joined #git
22:16 electr0n joined #git
22:18 romerocesar joined #git
22:19 Limes_ joined #git
22:19 white_gecko When git is merging, it doesn't take the three-way merge as first, but some simpler strategy, which one is this?
22:20 white_gecko Or does it actually only do the three-way merge?
22:20 kn-928 joined #git
22:22 Limes__ joined #git
22:32 tango_ joined #git
22:33 white_gecko which merge strategy does git take, if there is no common ancestor? E.g. if I'm merging two branches from different remotes.
22:36 MattMaker joined #git
22:38 daurnimator joined #git
22:40 pneuma joined #git
22:41 azbarcea joined #git
22:41 FuzzySockets joined #git
22:42 pamplemousse joined #git
22:43 Darren_ joined #git
22:44 inflames joined #git
22:49 Lyqyd joined #git
22:54 watabou joined #git
22:54 fahadash joined #git
22:58 WaReZ joined #git
22:59 anuxivm joined #git
22:59 skyfaller left #git
23:01 MattMaker joined #git
23:04 anuxivm joined #git
23:06 cagmz joined #git
23:09 romerocesar joined #git
23:14 therealGent joined #git
23:14 therealGent joined #git
23:22 Atrumx joined #git
23:22 shgysk8zer0 joined #git
23:24 bronson joined #git
23:31 anu1 joined #git
23:36 romerocesar joined #git
23:37 xall joined #git
23:37 paul424 joined #git
23:40 joki joined #git
23:40 Sasazuka joined #git
23:41 StuartMI joined #git
23:45 mehola joined #git
23:46 al-damiri joined #git
23:50 geko joined #git
23:51 ajf- joined #git

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