Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-26

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

All times shown according to UTC.

Time Nick Message
00:00 jaguarmagenta joined #git
00:01 eletuchy joined #git
00:03 eletuch__ joined #git
00:06 eletuchy joined #git
00:08 livingstn joined #git
00:09 eletuchy_ joined #git
00:11 allcentury joined #git
00:13 dreiss joined #git
00:13 eletuchy joined #git
00:15 eletuchy_ joined #git
00:15 tesuji_ joined #git
00:17 eletuch__ joined #git
00:17 rubyonrailed joined #git
00:18 Rooxo joined #git
00:19 nnyk joined #git
00:20 allcentury joined #git
00:24 mehola joined #git
00:27 allcentury joined #git
00:29 lindenle joined #git
00:33 ochorocho__ joined #git
00:33 Goplat joined #git
00:38 ajf- joined #git
00:38 redrocket joined #git
00:39 rominronin joined #git
00:40 Electrometro joined #git
00:41 xaa joined #git
00:46 arescorpio joined #git
00:47 alexgooz joined #git
00:48 fstd_ joined #git
00:49 inflames joined #git
00:50 kasper93_ joined #git
00:51 eletuchy joined #git
00:51 allcentury joined #git
00:59 hahuang61 joined #git
01:02 mehola joined #git
01:05 inflames joined #git
01:07 bdb-me joined #git
01:07 mehola joined #git
01:08 Pulp joined #git
01:09 ahmedelgabri joined #git
01:09 vuoto joined #git
01:12 eletuchy joined #git
01:14 demiro joined #git
01:21 demiro joined #git
01:25 demiro joined #git
01:27 docnvk joined #git
01:28 Sucks joined #git
01:35 nick123 joined #git
01:39 ochorocho__ joined #git
01:40 romerocesar joined #git
01:40 rominronin joined #git
01:40 ki0 joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and plumbing advice | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Remember to keep your porcelain clean
01:48 pks joined #git
01:54 xall joined #git
01:55 watabou joined #git
01:56 eletuchy joined #git
01:56 Narwhaal joined #git
01:56 Electrometro joined #git
01:59 jaguarmagenta joined #git
02:00 hahuang61 joined #git
02:00 jaguarmagenta joined #git
02:01 livingstn joined #git
02:01 allcentury joined #git
02:02 Lyqyd joined #git
02:03 drbean joined #git
02:06 demiro joined #git
02:11 SwiftMatt joined #git
02:11 demiro joined #git
02:17 ResidentBiscuit joined #git
02:21 demiro joined #git
02:21 taylorm joined #git
02:23 eletuchy joined #git
02:27 ImJune joined #git
02:31 diogenese joined #git
02:32 gnarf joined #git
02:35 SwiftMatt joined #git
02:36 hexagoxel joined #git
02:37 mozzarella joined #git
02:41 rominronin joined #git
02:42 ki0 joined #git
02:46 chachasmooth joined #git
02:47 realz joined #git
02:49 mozzarella joined #git
02:50 mehola joined #git
02:52 iron74 joined #git
02:55 drodger joined #git
02:55 mozzarella joined #git
02:59 tristanp joined #git
03:01 hahuang61 joined #git
03:04 nowhere_man joined #git
03:09 ahmedelgabri joined #git
03:11 ajf- joined #git
03:16 tesuji joined #git
03:17 allcentury joined #git
03:21 eletuchy joined #git
03:21 k3rn31 joined #git
03:21 wiky joined #git
03:24 sauvin joined #git
03:27 eletuchy joined #git
03:32 hk238 joined #git
03:33 Orbitrix joined #git
03:34 mehola joined #git
03:35 raijin joined #git
03:36 dreiss joined #git
03:36 nick123 joined #git
03:42 ochorocho__ joined #git
03:42 UDM joined #git
03:42 rominronin joined #git
03:43 ki0 joined #git
03:49 ShekharReddy joined #git
03:50 demiro joined #git
03:50 xall_ joined #git
03:52 ImJune joined #git
03:54 nonconvergent joined #git
03:55 howdoi joined #git
03:58 lindenle joined #git
03:59 allcentury joined #git
04:01 hahuang61 joined #git
04:02 eletuchy joined #git
04:04 xall joined #git
04:04 mozzarella joined #git
04:04 ki0 joined #git
04:05 shinnya joined #git
04:07 bubbaboy joined #git
04:10 dreiss joined #git
04:13 fowlslegs joined #git
04:14 fowlslegs I'm trying to push to github and for some reason am being prompted for my username + passwd even though I set it long ago.
04:14 fowlslegs My ~/.gitconfig is still there and `git config --get user.email` returns the correct address.
04:15 fowlslegs Anyone know what could be causing that?
04:16 iamcreasy joined #git
04:16 mehola joined #git
04:18 Orbitrix joined #git
04:18 Orbitrix joined #git
04:19 mmmveggies fowlslegs: why not just generate an ssh key and register it with your account
04:19 mozzarella joined #git
04:20 docnvk joined #git
04:20 gfixler1 joined #git
04:20 iamcreasy Can anyone tell me what's the difference between "git checkout ." and "git reset --hard". Both seem to discard my local changes and revert the local files to the latest commit.
04:20 fowlslegs mmmveggies: I actually do that. I just happened to clone down one of my repos via https and noticed this.
04:22 newlifer joined #git
04:22 mmmveggies fowlslegs: not sure, but you can do `git remote set-url git@.....`
04:23 mmmveggies err, don't forget `origin` *
04:23 fowlslegs mmmveggies: I know. I'm just trying to figure out why git isn't "listening" to my ~/.gitconfig.
04:24 mmmveggies try setting it on --global ?
04:24 mmmveggies err
04:24 mmmveggies fowlslegs: https://git-scm.com/docs/git-credential-cache maybe
04:25 ki0 joined #git
04:26 jungsubk joined #git
04:28 fowlslegs The problem is actually worse than I thought.
04:29 thiago iamdevnul: yes, both do that
04:29 fowlslegs I can't even push with SSH I believe because git doesn't know which key to use and is perhaps trying the wrong one.
04:29 thiago Git doesn't know anything about keys
04:29 thiago ssh does
04:29 thiago you have to configure SSH to what youwant it to do
04:30 mda1 joined #git
04:30 jaguarmagenta joined #git
04:31 fowlslegs thiago: There's a field under the [user] section in your ~/.gitconfig where you can set your default signing key, but you're right--maybe that at least has something to do with the fact I made some changes to my ~/.ssh/config recently.
04:31 fowlslegs Well you're half-way right at least :-D
04:31 thiago I'm 100% sure I am 100% right
04:31 romerocesar joined #git
04:32 fowlslegs thiago: https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work See where it talks about setting the global user.signingkey
04:33 thiago fowlslegs: why are you talking about the signing key?
04:33 thiago that has nothing to do with the SSH key used for SSH
04:33 iamdevnul thiago: wrong nick i think
04:34 iamdevnul i think you meant to beep iamcreasy but he quit
04:34 lindenle joined #git
04:34 thiago iamdevnul: no
04:34 iamdevnul ?
04:34 thiago iamdevnul: oh, you mean for my answer from 5 minutes ago
04:34 iamdevnul yeah
04:34 iamdevnul i didn't ask anything :D
04:34 thiago iamdevnul: right. I thought you were talking now about the discussion with fowlslegs
04:34 iamdevnul rgr
04:35 fowlslegs thiago: In general you're right, but my SSH key is a PGP auth key--a subkey of the same master key my signing key is a subkey of. Anyway...
04:35 thiago fowlslegs: Git doesn't care
04:35 thiago fowlslegs: have you configured SSH with the correct key, wherever that key is stored?
04:37 fowlslegs It totally had to do with some new settings I put in my ssh config. Anyway, got that working again. I'll have to diagnose exactly what it was later.
04:38 mozzarella joined #git
04:38 fowlslegs Thanks for trying to help me figure this out thiago, mmmveggies
04:38 mmmveggies np yo
04:41 eletuchy joined #git
04:42 demiro joined #git
04:42 nonconvergent joined #git
04:43 ResidentBiscuit joined #git
04:43 rominronin joined #git
04:45 SimonNa joined #git
04:47 languitar joined #git
04:47 feignix joined #git
04:48 shgysk8zer0 joined #git
04:48 allcentury joined #git
04:49 Ubercow joined #git
04:50 diegoaguilar joined #git
04:50 sanketdg joined #git
04:53 Douhan joined #git
04:54 eletuchy joined #git
04:56 davidbz joined #git
04:57 Cabanossi joined #git
04:59 Sonicbit joined #git
05:02 hahuang61 joined #git
05:02 yrzr joined #git
05:05 _ng joined #git
05:08 phaleth joined #git
05:10 ahmedelgabri joined #git
05:17 hk238 joined #git
05:18 lindenle joined #git
05:19 ajf- joined #git
05:21 guardianJ joined #git
05:22 rasto joined #git
05:24 ajf- joined #git
05:25 a_thakur joined #git
05:26 akushner joined #git
05:27 k3rn31 joined #git
05:28 cyan__ joined #git
05:37 nick123 joined #git
05:37 FuzzySockets joined #git
05:39 FireArrow133 joined #git
05:40 FireArrow133 Hey guys, I have a remote added to my GitHub repository and I want to discard all changes I've made to my local copy and pull the repository from the remote, how would I do that?
05:41 FireArrow133 git pull origin master does nothing.
05:42 ochorocho__ joined #git
05:44 rominronin joined #git
05:47 eletuchy joined #git
05:49 nilg joined #git
05:51 FroMaster joined #git
05:51 rubyonrailed joined #git
05:52 chyell joined #git
05:54 chyell left #git
05:55 madewokherd joined #git
05:57 dreiss joined #git
06:03 hahuang61 joined #git
06:03 loglaunch left #git
06:07 ki0 joined #git
06:11 tristanp joined #git
06:13 demiro joined #git
06:13 fscala joined #git
06:16 allcentury joined #git
06:18 DistantStar left #git
06:23 eletuchy joined #git
06:25 Fijit joined #git
06:29 allcentury joined #git
06:31 jaguarmagenta joined #git
06:31 boombatower joined #git
06:33 romerocesar joined #git
06:38 xall_ joined #git
06:41 eletuchy_ joined #git
06:41 englishstudent joined #git
06:44 eletuchy joined #git
06:45 rominronin joined #git
06:47 eletuchy_ joined #git
06:47 lordjancso joined #git
06:48 eletuch__ joined #git
06:49 ki0 joined #git
06:51 jungsubk joined #git
06:52 eletuchy joined #git
06:52 davidbz joined #git
06:54 nonconvergent joined #git
06:55 eletuchy_ joined #git
06:57 cyan__ joined #git
07:00 eletuchy joined #git
07:04 hahuang61 joined #git
07:05 eletuchy_ joined #git
07:07 eletuch__ joined #git
07:08 Literphor joined #git
07:08 Raging_Hog joined #git
07:09 subhojit777 joined #git
07:09 pungi-man joined #git
07:09 nonconvergent joined #git
07:10 quetz joined #git
07:10 eletuchy joined #git
07:11 ahmedelgabri joined #git
07:13 eletuchy_ joined #git
07:14 tristanp joined #git
07:15 eletuch__ joined #git
07:16 shinnya joined #git
07:16 netj joined #git
07:19 grift joined #git
07:19 eletuchy joined #git
07:21 eletuchy_ joined #git
07:23 eletuch__ joined #git
07:25 mariuscc joined #git
07:28 Tryop88 joined #git
07:30 hk238 joined #git
07:31 rubyonrailed joined #git
07:31 circ-user-Oetft joined #git
07:36 ilbot3 joined #git
07:36 Topic for #git is now Welcome to #git, the place for git help and plumbing advice | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Remember to keep your porcelain clean
07:37 jaguarmagenta joined #git
07:38 toydestroyer joined #git
07:40 d0nn1e joined #git
07:42 toogley joined #git
07:43 ochorocho__ joined #git
07:45 eletuchy joined #git
07:46 rominronin joined #git
07:47 roflin joined #git
07:47 multi_io joined #git
07:47 ochorocho__ joined #git
07:48 emPi joined #git
07:50 roflincopter joined #git
07:50 eletuchy_ joined #git
07:51 King_Hual joined #git
07:51 aidalgol joined #git
07:51 roflin_ joined #git
07:54 eletuchy joined #git
07:54 ahmedelgabri joined #git
07:55 feignix joined #git
07:56 eletuchy_ joined #git
07:57 docnvk joined #git
07:58 t0by joined #git
08:03 Shakeel_ joined #git
08:04 hahuang61 joined #git
08:05 lindenle joined #git
08:06 Literphor joined #git
08:08 antranigv left #git
08:08 Guest78572 joined #git
08:08 hero616_ joined #git
08:08 ochorocho__ joined #git
08:08 allcentury joined #git
08:17 Gitzilla joined #git
08:19 eletuchy joined #git
08:21 isxek joined #git
08:21 cyan__ joined #git
08:22 hk238 joined #git
08:23 eletuchy_ joined #git
08:23 cdown_ joined #git
08:24 watabou joined #git
08:25 eletuch__ joined #git
08:26 FrontPsych joined #git
08:28 eletuchy joined #git
08:32 hero616__ joined #git
08:33 eletuchy_ joined #git
08:33 binaryplease1 joined #git
08:34 netj joined #git
08:35 eletuchy joined #git
08:36 eletuch__ joined #git
08:41 tvw joined #git
08:41 ShekharReddy joined #git
08:43 xall_ joined #git
08:43 eletuchy joined #git
08:48 rominronin joined #git
08:51 Sonderblade joined #git
08:52 feignix joined #git
08:53 trobotham joined #git
08:54 lione_1 joined #git
08:57 conf joined #git
08:58 elastix joined #git
09:03 guardian joined #git
09:05 romerocesar joined #git
09:05 hahuang61 joined #git
09:07 allcentury joined #git
09:07 lindenle joined #git
09:09 piattino joined #git
09:11 ahmedelgabri joined #git
09:13 diegoaguilar joined #git
09:15 allcentury joined #git
09:17 catsup joined #git
09:20 dlaboratory joined #git
09:21 nonconvergent joined #git
09:21 deadnull_ joined #git
09:22 ramsub07 joined #git
09:25 ynanm joined #git
09:33 eletuchy joined #git
09:35 ntonjeta joined #git
09:36 nonconvergent joined #git
09:39 nick123 joined #git
09:43 kasper93 joined #git
09:46 le-idiot joined #git
09:49 rominronin joined #git
09:49 MrWoohoo joined #git
09:50 allcentury joined #git
09:51 ki0 joined #git
09:51 elastix joined #git
09:52 SimonNa joined #git
09:53 ozette joined #git
09:56 allcentury joined #git
09:57 jaguarmagenta joined #git
09:58 RominRonin joined #git
10:02 Literphor joined #git
10:02 ShekharReddy joined #git
10:02 MattMaker joined #git
10:03 zeroed joined #git
10:03 zeroed joined #git
10:06 hahuang61 joined #git
10:07 irco joined #git
10:07 nick123 joined #git
10:09 quetz^^ joined #git
10:10 slayerjain joined #git
10:12 Sonicbit joined #git
10:13 eletuchy joined #git
10:18 tristanp joined #git
10:18 rubyonrailed joined #git
10:19 aax joined #git
10:19 vuoto joined #git
10:20 allcentury joined #git
10:21 cbreak then you obviously already have all the changes from the remote
10:22 saidelike joined #git
10:23 watabou joined #git
10:25 fhackdroid joined #git
10:26 ribasushi joined #git
10:27 Cabanossi joined #git
10:30 AL13N joined #git
10:31 AL13N can i revert a single hunk from index?
10:31 shinnya joined #git
10:31 xaa__ joined #git
10:32 xaa joined #git
10:33 jhass AL13N: git checkout -p
10:33 Segore joined #git
10:35 aax joined #git
10:36 samgoody joined #git
10:36 samgoody hi all, when i try to create a new repo
10:37 samgoody git init . ; and git add . ;
10:37 ozette left #git
10:38 samgoody both work, but when I do git commit I get the error fatal: bad object HEAD \n fatal: 'git status --porcelain' failed in submodule sites
10:38 canton7 so the current directory contains at least one other git repo, but it looks like it's corrupted
10:38 canton7 (a "git repo" being a folder containing a file/folder called '.git')
10:38 PCatinean joined #git
10:39 glauxosdever joined #git
10:41 samgoody Aha. thanks. That's obvious now that you say it.
10:42 Orphis joined #git
10:43 Segore joined #git
10:44 tomek joined #git
10:44 tomek joined #git
10:45 ktosiek joined #git
10:46 neunon joined #git
10:46 nitin_ joined #git
10:47 SporkWitch joined #git
10:47 djb-irc joined #git
10:48 ahmedelgabri joined #git
10:48 Arban joined #git
10:48 samgoody I have two directories that I want to diff. I was going to just init one as a git repo, and then copy the second into it to get a diff.
10:49 MikeChernev joined #git
10:49 samgoody But it has corrupt submodules, so this may not work, and besides, its not really what git is made for
10:49 nedbat samgoody: git diff will gladly work on two directories which aren't git repos if you want
10:49 samgoody Really? Will the fact that it has submodules be an issue?
10:50 rominronin joined #git
10:50 canton7 many diff tools will give you proper directory diffs
10:50 canton7 heck, 'diff' will do it iirc
10:51 samgoody I read somewhere that diff uses filenames, not hashes, to compare files
10:51 madknight joined #git
10:52 samgoody The man pages dont say nything about how it works.
10:52 canton7 not sure how you're expecting 'git diff' to use hashes to compare files. It does some rename detection
10:52 vuoto joined #git
10:52 ki0 joined #git
10:52 i7c Actually `man diff` says "Compare FILES line by line."
10:53 samgoody I know, but when comparing directories with binary files how does it compare?
10:53 i7c Not sure to which diff you are referring tho. :)
10:53 canton7 hmm? if you give it directories, it compares them
10:53 samgoody I meant "diff", not "git diff". Someone on the internet said the line by line is only for text files
10:53 i7c binary files are compared byte by byte. The difference is that you cannot display the diff properly.
10:53 canton7 samgoody, as in, how does it compare binary files? it doesn't, iirc
10:53 i7c It does.
10:54 Sonicbit joined #git
10:54 i7c It'll output somethign like "binary files herp and derp differ".
10:54 i7c And that's about it.
10:54 samgoody but how do i use git diff for 2 dirs? i tried gitt diff a b, and it retuned nothing
10:54 canton7 well, it says "there are differences", but it doesn't actually find out what they are
10:55 feignix joined #git
10:56 cdown joined #git
10:56 Gamecubic joined #git
10:56 i7c git diff compares versions, not directories.
10:56 ki0 joined #git
10:57 i7c Maybe --no-index can handle directories? Never tried that.
10:57 feignix joined #git
10:57 samgoody how can i use git to compare directories recursively (without first making them a git repo)?
10:58 howdoi joined #git
10:58 i7c Oh cool it actually does.
10:58 i7c --no-index
10:58 i7c I have no idea why you would want that but there you go. ;)
10:59 feignix joined #git
11:00 _ikke_ Because you like the output of git diff better then plain diff?
11:00 feignix joined #git
11:01 circ-user-Oetft joined #git
11:01 feignix joined #git
11:02 i7c Mhmyeah, true.
11:02 samgoody awesome, thanks
11:03 feignix joined #git
11:05 feignix joined #git
11:05 sdothum joined #git
11:07 hahuang61 joined #git
11:07 eletuchy joined #git
11:08 MrWoohoo joined #git
11:13 spudowiar joined #git
11:14 ojdo joined #git
11:14 davisonio joined #git
11:16 aard_ joined #git
11:22 CheckDavid joined #git
11:24 jstein_ joined #git
11:28 m0viefreak joined #git
11:29 basiclaser joined #git
11:31 watabou joined #git
11:31 piling joined #git
11:34 SimonNa joined #git
11:34 Tryop88 joined #git
11:34 raijin joined #git
11:39 allcentury joined #git
11:44 stonerfish joined #git
11:48 nonconvergent joined #git
11:51 MattMaker joined #git
11:51 rominronin joined #git
11:54 settermjd joined #git
11:58 jaguarmagenta joined #git
11:59 coolsumitan joined #git
12:02 coolsumitan left #git
12:03 coolsumitan joined #git
12:03 zeroed joined #git
12:03 zeroed joined #git
12:03 rahtgaz joined #git
12:04 eletuchy joined #git
12:07 hahuang61 joined #git
12:10 romerocesar joined #git
12:14 Corneliu joined #git
12:20 romerocesar joined #git
12:21 skylite joined #git
12:22 j416 man git-diff
12:22 gitinfo the git-diff manpage is available at http://jk.gs/git-diff.html
12:23 qsx joined #git
12:24 j416 i7c: I did not know about --no-index; TIL! Thank you
12:25 piling_ joined #git
12:26 i7c j416, I'm happy I could be useful. :)
12:31 lohfu joined #git
12:31 fscala joined #git
12:31 jknetl joined #git
12:33 watabou joined #git
12:34 docnvk joined #git
12:34 Ardethian\work joined #git
12:40 raijin joined #git
12:43 coolsumitan left #git
12:47 narendraj9 joined #git
12:52 rominronin joined #git
12:55 _h264 joined #git
12:56 dcpc007 joined #git
13:00 _ikke_ note that if you're not in a git repository, --no-index is optional
13:01 SenpaiSilver joined #git
13:01 holodoc joined #git
13:01 Kartagis joined #git
13:01 hiroki joined #git
13:01 strayArch joined #git
13:02 SporkWitch joined #git
13:02 docnvk joined #git
13:06 eletuchy joined #git
13:08 hahuang61 joined #git
13:09 pkiller joined #git
13:10 sesquipedalian joined #git
13:11 ochorocho__ joined #git
13:12 realz joined #git
13:14 robotroll joined #git
13:16 ki0 joined #git
13:17 kbs joined #git
13:18 kbs So a couple of days back, I was wondering why signed commits exist, given this Linus rant http://git.661346.n2.nabble.com/GPG-signing-for-git-commit-td2582986.html - for anyone still interested, a much longer debate is at https://patchwork.ozlabs.org/patch/122876/
13:24 _ikke_ Because some people still see value in it
13:25 barteks2x joined #git
13:25 kbs right - succinct summary :)
13:28 toogley joined #git
13:30 johnmilton joined #git
13:32 watabou joined #git
13:37 RominRonin joined #git
13:38 fuchstronaut joined #git
13:39 MattMaker joined #git
13:43 hk238 joined #git
13:46 zeroed joined #git
13:48 armyriad joined #git
13:52 Balliad joined #git
13:52 ggt77 joined #git
13:53 rominronin joined #git
13:56 Tryop88 joined #git
13:57 eletuchy joined #git
13:58 jaguarmagenta joined #git
13:59 fracting joined #git
13:59 zarel joined #git
14:03 liamonade joined #git
14:04 qsx and there is no reason to discard that feature – https://xkcd.com/1172/
14:05 watabou joined #git
14:06 zivester joined #git
14:08 kbs qsx: heh. Well, linus seemed particularly anxious to disallow signatures directly inside the commit history, so I was quite curious about what happened.
14:09 gajus left #git
14:09 kbs I was also poking around to see when git verifies the DAG and blobs itself, was somewhat surprised to realize git clone doesn't seem to check it. But merge from a signed tag seems to do check it... still trying to sort it out in my head
14:09 hahuang61 joined #git
14:12 djb-irc joined #git
14:19 Tryop88 joined #git
14:19 D-Boy joined #git
14:19 wiky joined #git
14:19 dreiss joined #git
14:21 dminca joined #git
14:23 Spacew00t joined #git
14:27 cdown joined #git
14:29 livingstn joined #git
14:31 romerocesar joined #git
14:31 paul424 joined #git
14:35 Noldorin joined #git
14:38 Tryop88 joined #git
14:38 Balliad joined #git
14:39 mangolisk_ joined #git
14:40 quetz joined #git
14:41 harha_ joined #git
14:42 harha_ Hey. I created a new repository @ github with only license set initially. Now I added a new remote to this repository of mine with that github repo url, it doesn't let me push my changes to it. Error: "Permission denied (publickey)." "fatal: Could not read from remote repository."
14:42 harha_ My credentials should be set to my github credentials in my git client..
14:42 zeroed joined #git
14:43 harha_ Could the problem be with setting more than one push URL to my origin remote?
14:43 harha_ So it has my private repository URL as fetch and push and then my new github repository URL as push
14:43 harha_ for origin
14:44 phillly joined #git
14:45 Tryop88 joined #git
14:46 efdetonator joined #git
14:46 mmmveggies joined #git
14:48 Segore joined #git
14:49 mykespb joined #git
14:54 rominronin joined #git
14:54 RominRonin_Home joined #git
14:59 dsfreak93 joined #git
15:01 eletuchy joined #git
15:01 Dear_Deer joined #git
15:01 romerocesar joined #git
15:03 cbreak harha_: no
15:03 cbreak it says it's a permission problem
15:03 cbreak so either you use the wrong URL, or the wrong key
15:04 cbreak try to log in via ssh
15:04 lol joined #git
15:04 mingrammer_ joined #git
15:05 djb-irc joined #git
15:05 Dear_Deer left #git
15:06 watabou joined #git
15:06 trobotham joined #git
15:07 jungsubk joined #git
15:08 Tryop88 joined #git
15:08 HerrK joined #git
15:10 hahuang61 joined #git
15:10 lindenle joined #git
15:14 diegoviola joined #git
15:14 Error404NotFound joined #git
15:14 Error404NotFound joined #git
15:14 Error404NotFound joined #git
15:14 Error404NotFound joined #git
15:16 rahtgaz can I add tags to the output of pretty? I'm trying to add a tag column to 'git log --pretty=format:"%h %s"', but the man page makes no reference of it
15:16 harha_ cbreak; I'm trying over https now and git is trying to use my secondary github account I've switched to some time. I set git config user.name and email to this current github account both in repo and globally yet it still tries to push to my remote with the old github account. :D
15:17 cbreak harha_: irrelevant
15:17 cbreak the user.name and so on only matters for committing
15:17 _ikke_ rahtgaz: %d is decorate, but it is not limited to tags
15:17 cbreak harha_: if you use https, it will use the password and username that is configured somewhere else
15:17 cbreak if you use ssh, it'll use the ssh keys from somewhere else
15:18 harha_ cbreak; Oh, right. Well I'll see where I can set the credentials for this action then.
15:18 cbreak I recommend ssh
15:18 cbreak just delete the old keys, or only add the new to ssh agent
15:19 djb-irc joined #git
15:20 Orbitrix joined #git
15:21 waruqi joined #git
15:22 rahtgaz _ikke_: thank you. I tried it but it is not exactly what I wanted. I merely wanted a column displaying the tag added to commits in git log
15:22 harha_ Yeah I'll try to figure out how to delete all my old ssh keys... This seems rather mystical on windows for git cmd users. I guess I have to add some ssh tools to my PATH, maybe...
15:27 MattMaker joined #git
15:32 romerocesar joined #git
15:33 FunkyAss joined #git
15:35 FunkyAss joined #git
15:36 pungi-man joined #git
15:37 doener joined #git
15:37 harha_ I cleared my github account SSH keys and yet still I get "Permission denied (publickey)." if I try to push to my repo... I've never had any problems with git or github before...
15:38 nnyk joined #git
15:39 Silenced joined #git
15:39 beatdown joined #git
15:39 osse harha_: ssh -T git@github.com
15:39 jknetl joined #git
15:39 Orbitrix joined #git
15:40 harha_ Yeah.. "Permission denied (publickkey)."
15:40 osse harha_: ssh -vvv T git@github.com
15:40 osse maybe it tries to use the wrong key
15:40 osse oops
15:40 osse harha_: ssh -vvv -T git@github.com
15:40 _ikke_ -vv is enough
15:40 liquidjamm joined #git
15:40 Tryop88 joined #git
15:41 harha_ hmmh, lets see, didn'
15:41 harha_ * didn't think of using that kind of verbose output mode
15:42 carif joined #git
15:42 jagob joined #git
15:42 tristanp joined #git
15:42 romerocesar joined #git
15:42 harha_ "debug1: key_load_public: No such file or directory" "debug1: identity file /c/Users/harha/.ssh/id_rsa type -1"
15:43 harha_ myeah...
15:43 tristanp joined #git
15:44 harha_ Yeah there was nothing in ~/.ssh
15:44 harha_ Creating those.. lets see.
15:45 liquidjamm joined #git
15:46 RominRonin_Home joined #git
15:46 ShekharReddy joined #git
15:47 AL13N left #git
15:48 harha_ Well it works now.
15:48 harha_ I generated new ssh keys
15:48 harha_ and added the public key to my github account manually.
15:48 harha_ <_<
15:48 osse that's how it's supposed to work
15:48 harha_ All this has been automatic to me before, that's what confuses me.
15:49 osse hmm. what did you use then?
15:50 harha_ I used the git package available in MSYS2 before. Now on this new windows 10 machine I installed just the git for windows and am using git via CMD
15:50 scarcry joined #git
15:52 _ikke_ Did you have something like pageant running?
15:53 harha_ Maybe. But if I had I was not aware of it.
15:53 diegoviola joined #git
15:54 spudowiar joined #git
15:55 zumba_ad_ joined #git
15:55 livingstn joined #git
15:55 rominronin joined #git
15:57 italoacasas joined #git
15:58 Balliad joined #git
15:58 osse harha_: maybe you had some keys in /home/harha/.ssh in msys
15:58 osse which afaik is not the same as C:\Users\harha\.ssh
15:59 harha_ Yeah it's not indeed.
15:59 xlegoman joined #git
15:59 jaguarmagenta joined #git
15:59 eletuchy joined #git
15:59 mingrammer_ joined #git
16:04 xall_ joined #git
16:05 piling joined #git
16:05 feignix joined #git
16:07 feignix joined #git
16:08 rubyonrailed joined #git
16:09 cbreak harha_: without an SSH key, you can't authenticate via ssh
16:10 hahuang61 joined #git
16:11 spudowiar cbreak: you could, using another auth method, like IP-based auth :)
16:11 cbreak good luck convincing them to accept that
16:11 Sucks joined #git
16:12 SimonNa joined #git
16:12 watabou joined #git
16:13 SwiftMatt joined #git
16:13 davisonio joined #git
16:14 xall_ joined #git
16:16 shgysk8zer0 joined #git
16:17 tomog999 joined #git
16:20 quickquestion joined #git
16:22 m15k_ joined #git
16:23 m15k_ Is there a way to define which curl binary is used?
16:25 osse m15k: i don't think git does that
16:25 allcentury joined #git
16:26 m15k osse I currenty have some issues with bower which uses git, and fails to resolve an https github repo.
16:27 m15k When I execute the bare git command all is fine - but with bower ssl verification seems to be disabled.
16:27 ajf- joined #git
16:28 Orbitrix joined #git
16:29 diegoviola git bisect of linux.git still going since yesterday's 10am, jeez
16:29 reim joined #git
16:29 diegoviola Sun Jun 26 13:29:24 BRT 2016
16:29 m15k https://gist.github.com/asbachb/b67e8aac7ecbeec8f4b5b1c760f23313
16:29 diegoviola only 6-7 steps to go
16:30 ojacobson joined #git
16:31 Goplat joined #git
16:32 _ikke_ How long does each step take?
16:33 Orbitrix joined #git
16:35 diegoviola _ikke_: about an hour
16:36 diegoviola _ikke_: I'm using archlinux' /proc/config.gz which enables way too many things
16:36 diegoviola in the .config
16:37 romerocesar joined #git
16:37 diegoviola and my CPU is not the greatest too: Intel(R) Core(TM) i5-5300U CPU @ 2.30GHz
16:37 diegoviola ThinkPad T450
16:39 mdw joined #git
16:39 diegoviola I could use a smaller config, yes... but part of the bug I'm trying to solve is only reproducible with the Arch .config
16:39 diegoviola s/part of//
16:39 mischat joined #git
16:40 dreiss joined #git
16:40 chachasmooth joined #git
16:41 qsx lol, i dropped the arch config because it was too fat
16:41 qsx and i have a i7-6700HW
16:41 qsx *HQ
16:42 shinnya joined #git
16:42 Literphor joined #git
16:43 _ikke_ What config are you using now then?
16:44 xall joined #git
16:45 qsx hand-made
16:45 _ikke_ How do you know what to pick?
16:46 qsx well i know what hardware i have
16:46 qsx and when i didn’t know, i took the defaults
16:46 _ikke_ Does it matter much?
16:46 qsx yes
16:46 xall__ joined #git
16:46 qsx 17min for arch config, 6min for mine
16:47 _ikke_ So it only helps when rolling your own kernel?
16:47 _ikke_ instead of using the default arch kernel
16:47 _ikke_ ?
16:47 qsx i don’t even use arch :>
16:47 qsx i use gentoo, so i more or less have to build my own kernel
16:48 _ikke_ ah, ok
16:48 diegoviola Linux already ships with a few configs you can use, if you do a make menuconfig that will in turn do a defconfig which just copies the config from arch/x86/config/x86_64_defconfig and puts it in .config for you to use, after that only a make is necessary...
16:49 toogley joined #git
16:49 diegoviola I didn't know that before and always wrote my .config by hand... wish I knew back in the days, all the time I could have saved
16:49 eletuchy_ joined #git
16:50 diegoviola you might still need to enable a driver or two after the defconfig
16:50 mellernoia joined #git
16:53 diegoviola qsx: Gentoo also ships with their own configs, right? so you can build a huge kernel that work for most hardware?
16:53 t0by joined #git
16:54 qsx diegoviola: no
16:54 diegoviola hrm
16:55 Literphor joined #git
16:56 rominronin joined #git
16:57 diegoviola genkernel I think is what I was thinking about
16:57 bin4ry joined #git
16:57 diegoviola genkernel --menuconfig all
16:57 diegoviola I haven't used gentoo in years
16:57 eletuchy joined #git
16:57 bin4ry joined #git
16:59 watabou joined #git
17:01 Silenced joined #git
17:01 eletuchy_ joined #git
17:02 cdown_ joined #git
17:03 diegoviola if I was using gentoo I'd prbably just do a defconfig and build a kernel for my own hw
17:03 diegoviola or any distro for that matter
17:04 eletuchy joined #git
17:05 SwiftMatt joined #git
17:05 quickquestion left #git
17:06 hk238 joined #git
17:06 eletuch__ joined #git
17:09 rubyonrailed joined #git
17:09 thiago joined #git
17:10 eletuchy joined #git
17:10 _ikke_ Are you always using you own compiled kernel?
17:11 hamster joined #git
17:11 hahuang61 joined #git
17:11 Timvde joined #git
17:13 eletuchy_ joined #git
17:15 eletuch__ joined #git
17:15 MattMaker joined #git
17:16 eletuchy joined #git
17:16 cdown__ joined #git
17:20 m15k left #git
17:20 Sleepy63 joined #git
17:20 ramsub07 joined #git
17:23 Literphor joined #git
17:25 efdetonator joined #git
17:27 rahtgaz joined #git
17:32 bin4ry joined #git
17:33 cdown_ joined #git
17:33 bin4ry joined #git
17:33 TomyLobo joined #git
17:34 TomyLobo windows git is so bad... cygwin git+git-lfs takes like an hour to check out this branch (check out, not fetch). linux in a VM: 2m 38s
17:35 TomyLobo and not in the most efficient way, i might add. had to work around jenkins limitations to make jenkins use worktrees and fetch lfs objects
17:36 mdw joined #git
17:39 allcentury joined #git
17:39 zivester joined #git
17:40 thiago TomyLobo: Windows FS support is already slow enough
17:40 rsukla joined #git
17:40 thiago Cygwin layer only makes it worse
17:40 xpk joined #git
17:40 thiago that's why no one uses Cygwin for their applications, if they have the option
17:44 efdetonator joined #git
17:44 romerocesar joined #git
17:45 NeverDie joined #git
17:46 efdetonator joined #git
17:46 xpk joined #git
17:46 mib_77e joined #git
17:47 aard_ joined #git
17:47 cbreak TomyLobo: why not use native git?
17:47 mingrammer_ joined #git
17:47 cbreak or at least msys git?
17:48 xpk joined #git
17:48 Guest26 joined #git
17:48 madewokherd joined #git
17:54 mrkake joined #git
17:55 mdw_ joined #git
17:56 infinite_ joined #git
17:56 mdw_ joined #git
17:56 elementalest joined #git
17:56 elementalest joined #git
17:57 mdw_ joined #git
17:57 rominronin joined #git
17:57 satifant joined #git
17:58 thiago msysgit is built with cygwin lib
17:58 xall__ joined #git
17:59 efdetonator joined #git
17:59 nilg joined #git
18:00 jaguarmagenta joined #git
18:04 TomyLobo cbreak, there is a native git?
18:07 reim joined #git
18:07 TomyLobo i think the problem with git-lfs slowness is inherent though
18:07 TomyLobo git-lfs smudge is just called soooooo often
18:08 TomyLobo git-lfs comes with some mitigations that go around the smudge mechanism, but afaik, there's nothing to switch branches efficiently
18:10 theRealGent joined #git
18:10 vuoto joined #git
18:12 hahuang61 joined #git
18:15 Gitzilla joined #git
18:16 gajus joined #git
18:16 watabou joined #git
18:16 gajus This is GitHub-Git question. I have a PR against my repository. Is there a way for me to checkout branch for that PR from the main repository?
18:17 gajus or do I need to pull the repository of the person making the PR
18:17 _ikke_ !pr
18:17 jhass you need to fetch something either way
18:17 _ikke_ !github_pull
18:17 gitinfo To easily see Github Pull Requests in your local repo, use this fetchspec trick: https://gist.github.com/piscisaureus/3342247
18:17 jhass there's a ref on your repo that you can fetch and that saves you from fetching their entire repo
18:18 jhass I can never remember it though, refs/pulls/number/head or so?
18:19 _ikke_ see that link
18:19 gajus wow
18:19 ki0 joined #git
18:20 gajus That is neat
18:22 gajus There is also https://github.com/tj/git-extras/blob/master/Commands.md#git-pr
18:24 Arban joined #git
18:26 _ikke_ convenient
18:27 ascarter joined #git
18:31 sauvin joined #git
18:32 romerocesar joined #git
18:32 ascarter joined #git
18:33 lindenle joined #git
18:34 Segore joined #git
18:36 romerocesar_ joined #git
18:36 Ph_ joined #git
18:37 ShekharReddy joined #git
18:40 Segore joined #git
18:41 jstein_ joined #git
18:41 ahmedelgabri joined #git
18:42 Segore joined #git
18:44 jknetl joined #git
18:44 ochorocho__ joined #git
18:45 Segore joined #git
18:46 akiva joined #git
18:48 mdw joined #git
18:48 MattMaker joined #git
18:49 Segore joined #git
18:51 mariuscc joined #git
18:55 JanC_ joined #git
18:55 livingstn joined #git
18:56 livingstn joined #git
18:57 githogori joined #git
18:58 rominronin joined #git
19:03 Orbitrix joined #git
19:03 Orbitrix joined #git
19:04 mkoskar joined #git
19:09 kbs joined #git
19:09 mrat joined #git
19:13 hahuang61 joined #git
19:13 kline whats the name of the new git diff option to highlight the character changes on a line?
19:13 redrocket joined #git
19:13 eletuchy_ joined #git
19:13 kline i saw the new feature mention but i cant remember what i need to look for to read up on it
19:13 bremner --color-words ?
19:13 djb-irc joined #git
19:14 kline possibly, for some reason i only saw it recently, perhaps im confusing it with the new edge detection so things like similar loops dont get all chopped up, thanks
19:15 eletuch__ joined #git
19:15 _ikke_ yes
19:15 _ikke_ that's new
19:15 kline thanks, close enough :)
19:16 thiago word-diff isn't new
19:18 eletuchy joined #git
19:18 davisonio joined #git
19:20 eletuchy_ joined #git
19:21 moritz kline: you probably meant diff-hlight
19:21 moritz *diff-highlight
19:22 _ikke_ The new option is "--compaction-heuristic"
19:22 eletuch__ joined #git
19:22 nwkj86 joined #git
19:22 Ph_ joined #git
19:25 djb-irc joined #git
19:26 cyan__ joined #git
19:26 eletuchy joined #git
19:27 nitin joined #git
19:28 eletuchy_ joined #git
19:30 xall__ joined #git
19:30 RandalSchwartz joined #git
19:30 * RandalSchwartz waves at the channel
19:30 thiago hey Randal
19:31 eletuchy joined #git
19:31 RandalSchwartz I seem to remember something that does this, but the googles fail me
19:31 RandalSchwartz hey thiago
19:31 moritz \o RandalSchwartz
19:31 diogenese joined #git
19:32 _ikke_ RandalSchwartz: hai
19:32 RandalSchwartz I have a common master, and I've changed code, and a co-worker has changed code.  Is there something that will show a "3-way diff" so I can see if I were to merge (without conflict) what parts of master would be changed by my branch, or his branch, or both?
19:32 Yuri4_ joined #git
19:32 Yuri4_ Guys, how can I remove all users in gitlab?
19:32 eletuch__ joined #git
19:33 qsx Yuri4_: rm -rf /*
19:33 _ikke_ RandalSchwartz: not sure, but something like diff -c or diff -cc ?
19:33 qsx Yuri4_: this question is not git-specific, but gitlab.  direct your question to their support.
19:34 thiago RandalSchwartz: the only way to see if a merge has a conflict is to attempt that merge
19:34 RandalSchwartz But I want to know more than the possible conflicts
19:34 RandalSchwartz I want to see what each branch contributed.
19:35 _ikke_ I never heard of such an option
19:35 RandalSchwartz something like what gitk shows for a merge commit
19:35 mingrammer_ joined #git
19:35 RandalSchwartz but for all files changed in the tree.
19:35 jknetl joined #git
19:35 romerocesar joined #git
19:36 eletuchy joined #git
19:36 RandalSchwartz I guess I could review master...mine and master...his
19:36 moritz I could imagine that some GUI git tools show such things
19:36 RandalSchwartz but then I can't easily see what files both branches touch
19:37 moritz you could build the interesection of git diff --name-only master..mine and master..his
19:37 eletuchy_ joined #git
19:39 Suchiman joined #git
19:40 thiago git log -p ..other
19:40 eletuchy joined #git
19:41 mdw_ joined #git
19:41 Suchiman any ideas on putting .gitignore and .gitattributes as the first commit of an git repository [to be] migrated from svn, retroactively enforcing the ignores and attributes on (especially line ending normalization since git-svn takes them 1:1) the entire history?
19:41 raininja joined #git
19:42 mdw_ joined #git
19:42 efdetonator joined #git
19:44 eletuchy_ joined #git
19:44 djb-irc joined #git
19:45 eletuch__ joined #git
19:46 _xor joined #git
19:46 ochorocho__ joined #git
19:47 Suchiman thinking about it, it would need to interactively rebase a commit with gitignore and gitattributes added to the first commit in the repro and then foreach commit, git reset && git add --all (which should take care of line ending normalization and removing files that are ignored according to gitignore)
19:48 eletuchy joined #git
19:49 Slush-_ joined #git
19:50 Sonderblade joined #git
19:51 j416 Suchiman: I would just import it all, then filter-branch it if you need to alter things
19:52 eletuchy_ joined #git
19:52 nitin joined #git
19:53 eletuch__ joined #git
19:53 opal joined #git
19:54 Balliad joined #git
19:54 lindenle joined #git
19:55 netcarver joined #git
19:56 Slush-_ left #git
19:56 kbs [out of mainly my curiosity] when git clone'ing from a potentially unknown repository - is the security story that developers always run git fsck (even if they have can see a trusted+signed commit-sha at the head?)
19:56 eletuchy joined #git
19:57 sdothum joined #git
19:57 dreiss joined #git
19:57 Slush- joined #git
19:57 Literphor joined #git
19:58 _ikke_ I doubt many people do this
19:58 * moritz not paranoid enough
19:59 davisonio joined #git
19:59 eletuchy_ joined #git
19:59 kbs I'm kinda curious why this isn't automatically done as part of clone - I can imagine people inserting scripts that remove themselves once they are run during (say) one of the install/setup tasks in most repositories, so any traces also disappear...
19:59 rominronin joined #git
20:01 jaguarmagenta joined #git
20:01 moritz kbs: if you run code from an untrusted repo, you're already screwed
20:01 _ikke_ git does not automatically run scripts
20:01 SwiftMatt joined #git
20:01 _ikke_ Hooks are not cloned
20:01 kbs no, but if I see a signed commit head that I trust, I might be (incorrectly) assuming that the repo is "good"
20:02 Ahmed90 joined #git
20:02 kbs ie, I might not trust the storage, but I do trust the code itself (modulo it being correctly verified locally)
20:02 j416 > using modulo in a sentence o_O
20:03 eletuchy joined #git
20:03 * moritz does that too, occasionall
20:03 moritz y
20:03 * j416 is not intelligent enough to
20:04 jbitdrop joined #git
20:04 digidog joined #git
20:05 eletuch__ joined #git
20:05 * kbs occasionally writes openpgp code, so tends to assume everything is fully checked locally, and no remote storage is trusted :)
20:05 trobotham joined #git
20:07 lindenle joined #git
20:08 eletuchy joined #git
20:12 anddam joined #git
20:13 hahuang61 joined #git
20:14 dingus joined #git
20:15 eletuchy joined #git
20:16 davisonio joined #git
20:17 eletuchy_ joined #git
20:17 _nwkj86 joined #git
20:17 Darcidride joined #git
20:19 Seveas_ kbs: git config --global transfer.fsckobjects true
20:19 kbs Seveas: aah -- nice, thanks for the tip!
20:20 eletuchy joined #git
20:21 infra-red joined #git
20:22 mehola joined #git
20:22 kbs Seveas: does that work during cloning? (my little test case doesn't seem to have failed after setting this value.)
20:23 Seveas kbs: it does. What's your test?
20:23 eletuchy_ joined #git
20:23 m0viefreak joined #git
20:24 kbs basically, I've replaced an blob in .git/objects/.. with an incorrect value. I then clone the repository.
20:24 * kbs can upload tests somewhere if interesting
20:24 Seveas how do you clone?
20:25 Seveas local filesystem clone? (git clone /foo /bar) perhaps?
20:25 mehola_ joined #git
20:25 kbs Seveas: yes - local filesystem clone
20:25 Seveas yeah, that bypasses a lot of safety checks
20:25 kbs ah
20:25 Seveas try git clone file://foo
20:25 eletuch__ joined #git
20:25 dangerousdave joined #git
20:26 Seveas or --no-local
20:27 Seveas pretty sure you don't even need transfer.fsckobjects for this test, the sending git will fail. transfer.fsckobjects protects against broken/rogue git implementations and errors in transit
20:27 eletuchy joined #git
20:28 kbs Seveas: yep, you're right :-) about local clone - let me repeat and unset the transfer.fsckobjects as well
20:29 kbs Yep - yay! so clone checks by default, taht's awesome
20:30 mingrammer_ joined #git
20:30 nitin joined #git
20:30 eletuchy_ joined #git
20:30 * kbs is now testing with file:/// -- thanks for that tip, didn't realize
20:32 eletuch__ joined #git
20:33 lindenle joined #git
20:34 romerocesar joined #git
20:36 eletuchy joined #git
20:36 Ubercow joined #git
20:36 vuoto joined #git
20:38 eletuchy_ joined #git
20:40 garethdaine joined #git
20:41 ynanm joined #git
20:41 ahr3n joined #git
20:42 ahmedelgabri joined #git
20:44 inflames joined #git
20:45 kfunk joined #git
20:45 Darcidride joined #git
20:48 _nwkj86 joined #git
20:48 radsy joined #git
20:52 Douhan joined #git
20:53 zeemz joined #git
20:53 DolphinDream joined #git
20:53 mehola_ joined #git
20:54 allcentury joined #git
20:54 nettoweb joined #git
20:55 catsup joined #git
20:56 nettoweb hey guys, how do you save useful git commands so you can get later on? I'm thinking about mind maps but was wondering if there's something simpler or more direct
20:57 BlaXpirit nettoweb, aliases
20:57 BlaXpirit git aliases or otherwise
20:57 davisonio joined #git
20:58 BlaXpirit but hmm that's very rare for me. I guess I just google for the thing until I remember
20:59 nettoweb yes, that's what I always do. But Im trying to keep adding commands and I can check all that I learned. I know that a simple doc do this but maybe there's something for this purpose
21:00 rominronin joined #git
21:01 xall joined #git
21:04 vuoto joined #git
21:09 Darcidride joined #git
21:09 zeemz joined #git
21:14 hahuang61 joined #git
21:14 DolphinDream joined #git
21:15 d0nn1e joined #git
21:16 livingstn joined #git
21:21 aidalgol joined #git
21:22 cdown_ joined #git
21:24 mingrammer_ joined #git
21:25 mehola joined #git
21:25 romerocesar joined #git
21:27 stevenbenner joined #git
21:29 allcentury joined #git
21:31 dingus joined #git
21:31 nonconvergent joined #git
21:32 RichiH joined #git
21:32 livingstn joined #git
21:35 Devastator joined #git
21:38 mehola joined #git
21:44 docnvk joined #git
21:44 Devastator how to get patches from an specific branch? git clone git://address/project.git but how to inform the branch?
21:46 allcentury joined #git
21:46 Devastator or the whole project from an specific branch..
21:46 qsx Devastator: man git-checkout
21:46 gitinfo Devastator: the git-checkout manpage is available at http://jk.gs/git-checkout.html
21:46 qsx or pass -b to clone to checkout a specific branch directly
21:48 Devastator qsx so git checkout git://address/project.git <branch here>?
21:49 qsx Devastator: say did you even read the manpage?
21:50 Devastator I did, but not with the given attention, so I wanted to confirm
21:51 qsx Devastator: git checkout acts on a local repository.
21:51 boombatower joined #git
21:52 Devastator qsx in this case, I want to get the files from a remote repository
21:53 codekyle joined #git
21:54 codekyle Hi. Need some advice here. I made a commit saying I did something, but realized I didn't actually do it. I used git log --oneline, then git checkout <id> to go back to the commit, then did added my changes, then did git commit --amend, finally git push -u origin master.
21:55 codekyle But my changes are not showing up on the github repo. Am I missing something obvious?
21:55 qsx Devastator: if you only want the files at a certain state, you can use git archive.  if you need the history, git clone
21:55 codekyle (Something work mentioning, is that I had added a commit 'after' the commit I messed up on.)
21:56 qsx codekyle: what you did was !detach
21:56 gitinfo codekyle: [!detached] A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
21:56 texasmynsted left #git
21:56 Devastator qsx thanks, let me try
21:56 qsx codekyle: the commits you made after the commit you believed to alter were still based on the old one
21:56 qsx codekyle: you’d need to do e.g. an interactive rebase, but that’s !rewrite
21:56 gitinfo codekyle: 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
21:57 codekyle :/
21:58 joki joined #git
21:58 codekyle thank you
22:00 codekyle Is it better to just write in some sort of later commit that you are making a change you said you had made previously?
22:01 jaguarmagenta joined #git
22:02 rominronin joined #git
22:02 justanotheruser joined #git
22:03 romerocesar joined #git
22:05 Devastator qsx thanks, git clone -b <branch> <remote repository> seems to have worked, I've also added <directory> at the end so it doesn't replace the files.. is there an easy way to compare what I have with what I get from the branch?
22:05 qsx Devastator: huh?
22:05 qsx codekyle: yeah
22:06 lindenle joined #git
22:07 Devastator qsx suppose I have <HEAD> and <HEAD>/<HEAD from an specific branch>, is there a way to compare the two? like /home/user/project/ and /home/user/project/sameproject-different-branch
22:08 qsx Devastator: one, !HEAD already has a special meaning
22:08 gitinfo Devastator: HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is *not* something that exists separately for every branch. It also is *not* necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)
22:09 qsx Devastator: two, those are distinct repos, so not really (at least not easily)
22:09 qsx Devastator: trhee, nested repos? this will be fun.
22:09 netj joined #git
22:10 Devastator qsx I should have cloned into .. of project, but I thought it would replace all the files, but I would like to know the difference as I'm gonna edit some of them
22:10 qsx Devastator: i feel like i’m missing something. !xy
22:10 gitinfo Devastator: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
22:11 tristanp joined #git
22:12 hahuang61 joined #git
22:13 Devastator qsx let me see if I can explain, my english is far from being good: I've cloned debian-installer's repo, I then need to clone two branches of two packages inside that repo, finally edit some files from those two branches
22:17 _28_ria joined #git
22:18 mingrammer_ joined #git
22:18 bin4ry joined #git
22:19 cdg joined #git
22:22 acetakwas joined #git
22:22 watabou joined #git
22:24 dopesong joined #git
22:26 Devastator qsx did it help? I'm guessing no hehe
22:26 aidalgol joined #git
22:26 qsx Devastator: i still don’t exactly see what you need :(
22:27 pR0Ps joined #git
22:28 Devastator qsx I need to compare the files from "trunk" and an specific branch
22:28 qsx Devastator: git diff trunk..branch -- files
22:30 Devastator qsx but I've cloned branch into trunk, like /home/user/trunk and /home/user/trunk/branch, they have the same files though, would that work?
22:30 qsx Devastator: don’t nest repos unless you know what you’re doing
22:30 qsx Devastator: and do you really need a checkout of both branches?
22:31 harro joined #git
22:31 Devastator qsx I do
22:31 qsx Devastator: man git worktree
22:31 gitinfo Devastator: the git-worktree manpage is available at http://jk.gs/git-worktree.html
22:32 Devastator qsx I mean, once I compare what is in branch that is not in trunk, I can ditch branch
22:32 qsx Devastator: so all you need _is_ a diff?
22:33 Devastator qsx yes, so I know where to edit heheh
22:33 qsx 00:28 <qsx> Devastator: git diff trunk..branch -- files
22:34 Devastator ok
22:34 Devastator let me test
22:34 A5101_ joined #git
22:34 A5101 joined #git
22:35 nonconvergent joined #git
22:36 rubyonrailed joined #git
22:36 elastix joined #git
22:39 romerocesar joined #git
22:41 bin4ry_ joined #git
22:52 ahmedelgabri joined #git
22:53 netj joined #git
22:55 King_Hual joined #git
22:58 jaguarmagenta joined #git
22:58 elastix joined #git
22:58 eletuchy joined #git
22:59 WaReZ joined #git
23:01 eletuch__ joined #git
23:01 ochorocho__ joined #git
23:03 rominronin joined #git
23:04 eletuchy joined #git
23:04 k3rn31 joined #git
23:06 jaguarma_ joined #git
23:07 eletuchy_ joined #git
23:08 allcentury joined #git
23:09 Ubercow joined #git
23:10 eletuchy joined #git
23:12 nonconvergent joined #git
23:12 mingrammer_ joined #git
23:13 eletuchy_ joined #git
23:13 xall_ joined #git
23:15 eletuch__ joined #git
23:15 romerocesar joined #git
23:17 ahr3n joined #git
23:18 eletuchy joined #git
23:20 mablae__ joined #git
23:21 jarray52 joined #git
23:21 kbs joined #git
23:21 eletuchy_ joined #git
23:23 nettoweb joined #git
23:23 eletuch__ joined #git
23:23 xall joined #git
23:24 jarray52 I'm trying to understand the difference between 'git clone git@stash.wentlrr.com:7999/sys/appcode.git' and 'git clone ssh://git@stash.wentlrr.com:7999/sys/appcode.git. The latter works after setting up ssh keys. However, various devops tools use the former.
23:25 Seveas jarray52: the former doesn't support port numbers. You're trying to access a repo at path 7999/sys/appcode.git
23:26 jarray52 Seveas: Thanks.
23:26 Seveas jarray52: though git@[stash.wentlrr.com:7999]:sys/appcode.git may work. I do remember some mailinglist noise about that syntax.
23:26 eletuchy joined #git
23:28 jarray52 Seveas: That exact incarnation does not work.
23:28 eletuchy_ joined #git
23:29 Seveas hence the 'may' :) I probably misremembered the details in the noise. Sorry for the distraction.
23:29 jarray52 No worries. That port number advice was huge.
23:30 jarray52 Thanks for that tip.
23:31 eletuchy joined #git
23:32 jstimm joined #git
23:33 reim joined #git
23:34 eletuchy_ joined #git
23:37 romerocesar joined #git
23:42 SwiftMatt joined #git
23:44 allcentury joined #git
23:47 runlevl4 joined #git
23:48 pierre365 joined #git
23:48 boshhead joined #git
23:49 kam270 joined #git
23:50 Devastator left #git
23:52 JeDa joined #git
23:52 GavinMagnus joined #git
23:53 GavinMagnus left #git
23:56 hahuang61 joined #git
23:58 ki0 joined #git
23:59 AfroThundr joined #git

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