Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-02

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

All times shown according to UTC.

Time Nick Message
00:01 eletuch__ joined #git
00:01 ahmedelgabri joined #git
00:02 ffabi joined #git
00:03 geerc joined #git
00:04 eletuchy joined #git
00:06 MattMaker joined #git
00:06 eletuchy_ joined #git
00:07 paul424 joined #git
00:08 tesuji_ joined #git
00:08 eletuch__ joined #git
00:09 HoierM joined #git
00:09 watabou joined #git
00:11 hahuang61 joined #git
00:12 eletuchy joined #git
00:15 jaguarmagenta joined #git
00:16 eletuchy_ joined #git
00:17 hahuang61 joined #git
00:18 eletuch__ joined #git
00:22 efdetonator joined #git
00:24 eletuchy joined #git
00:24 fornax joined #git
00:28 Rikairchy joined #git
00:28 guzzlefry joined #git
00:28 _xor joined #git
00:28 Nick2 joined #git
00:29 fuchstronaut joined #git
00:29 eletuchy_ joined #git
00:31 Nick3 joined #git
00:31 eletuchy joined #git
00:31 pnorman joined #git
00:31 MattMake_ joined #git
00:33 eletuch__ joined #git
00:35 eletuchy_ joined #git
00:35 pnorman I need to backport some changes to an old version, but am not sure of the best way to do so. The changes are in the form of a set of commits and a merge commit. In the past I've done git cherry-pick -x commitish..commitish or git cherry-pick -x merge_commitish -m 1. Is there a best practice?
00:36 Nick3 joined #git
00:36 fstd_ joined #git
00:44 clemf joined #git
00:57 arescorpio joined #git
00:59 romerocesar joined #git
00:59 stantonk joined #git
00:59 rgrinberg joined #git
01:00 ToBeCloud joined #git
01:03 eletuchy joined #git
01:07 rbr joined #git
01:08 jimi_ joined #git
01:09 watabou joined #git
01:10 stantonk_ joined #git
01:10 texasmynsted left #git
01:10 ensyde joined #git
01:11 eck left #git
01:13 harish joined #git
01:15 shgysk8zer0_ joined #git
01:17 zumba_addict joined #git
01:18 eletuchy joined #git
01:18 wxg joined #git
01:19 ahmedelgabri joined #git
01:21 sandroqz joined #git
01:22 denimsoft joined #git
01:23 hahuang61 joined #git
01:23 The_Phoenix joined #git
01:25 Jason_ joined #git
01:25 Hobbyboy|BNC joined #git
01:26 fhackdroid joined #git
01:28 maestrojed left #git
01:30 fcrick joined #git
01:30 ekinmur joined #git
01:31 astrofog joined #git
01:32 fcrick hey there i was looking for examples of tools built on top of git's database that use it for something other than version control of a file system tree - any come to mind?
01:33 Jason_ joined #git
01:34 mischat joined #git
01:36 pks joined #git
01:37 psacrifice joined #git
01:38 tgunr joined #git
01:38 netj joined #git
01:43 darkbit joined #git
01:46 kbs joined #git
01:48 rbr joined #git
01:48 psacrifice joined #git
01:50 zumba_addict joined #git
01:50 romerocesar joined #git
01:50 Electrometro joined #git
01:51 eletuchy_ joined #git
01:53 eletuchy joined #git
01:54 justanotheruser joined #git
01:55 chrisshattuck joined #git
01:56 eletuchy_ joined #git
02:00 eletuchy joined #git
02:01 tarkus joined #git
02:03 eletuchy_ joined #git
02:04 milki_ joined #git
02:06 Douhan joined #git
02:06 eletuchy joined #git
02:07 justanotheruser joined #git
02:09 eletuchy_ joined #git
02:09 Goplat joined #git
02:10 romerocesar joined #git
02:11 molt joined #git
02:11 eletuchy joined #git
02:13 fracting joined #git
02:14 mebigfatguy joined #git
02:14 chachasmooth joined #git
02:15 eletuchy_ joined #git
02:16 mebigfatguy i have a hash, on which i do git checkout {hash} but get: fatal: reference is not a tree: 092054170ec3daf92ec494a0db295037d3563229    i have done this before with other hashes and they work fine...  i see the hash here https://git1-us-west.apache.org/repos/asf?p=cassandra.git;a=commit;h=092054170ec3daf92ec494a0db295037d3563229     am i doing something wrong?
02:17 eletuch__ joined #git
02:18 greymalkin joined #git
02:18 eletuchy joined #git
02:20 romerocesar joined #git
02:21 User458764 joined #git
02:21 rewt mebigfatguy, are you sure you did checkout?  not sure why it's complaining that it's not a tree
02:21 mebigfatguy yes
02:21 mebigfatguy and my local is up to date (git pull)
02:22 Electrometro joined #git
02:22 mebigfatguy i can do get checkout {hash} where hash is listed as the parent 017ec3e99e704db5e1a36ad153af08d6e7eca523 on that page
02:23 kbs not a git expert, but out of curiosity - what does git cat-file -p show for that hash?
02:23 mebigfatguy sorry parent: ea8c430124dbe6395f00d8f06831bd1374581abe
02:23 eletuchy_ joined #git
02:23 mebigfatguy fatal: Not a valid object name 092054170ec3daf92ec494a0db295037d3563229
02:24 kbs so it seems that you may not have that object at all, or something is corrupted?
02:24 kbs (assuming the pull worked, etc..)
02:24 kbs git fsck might also have some tips, perhaps
02:25 mebigfatguy when i do get branch --contains 092054170ec3daf92ec494a0db295037d3563229 it says error: no such commit 092054170ec3daf92ec494a0db295037d3563229
02:26 githogori joined #git
02:27 mebigfatguy i guess i'll try recloning it
02:27 rewt i just cloned it, and looks like i can checkout that hash
02:28 mebigfatguy thanks
02:29 eletuchy joined #git
02:29 fuchstronaut joined #git
02:31 ome joined #git
02:32 eletuchy_ joined #git
02:32 cd-rum joined #git
02:33 mebigfatguy ha! on a re-clone it works fine... *shrug* -- thanks everyone
02:33 eletuch__ joined #git
02:34 hexagoxel joined #git
02:37 eletuchy joined #git
02:37 parachan joined #git
02:38 parachan Quick I think basic question - is it normal to have a git server that you push to and that is where your production web site lives
02:38 sauvin joined #git
02:39 eletuchy_ joined #git
02:39 mebigfatguy it is not normal for the git server and the web site to be on the same server
02:39 pnorman normal workflow I've seen is that you push to a git server, and your production site pulls from that server. or your build server pulls from that server and prepares a binary package
02:39 parachan what if the only point of having the git server is to push production code to it easier
02:40 parachan I'm actually planning on doing this for a personal site but wanted to know if it was typical production style so don't judge too much! :3
02:40 parachan oo i like that .. just remoting in and pulling
02:41 pnorman in many cases the git server is run by someone else (e.g. github)
02:41 eletuch__ joined #git
02:41 parachan yeah i'm using github now to track changes / work on multiple computers. i think i'm going to do the pull method just mentioned to update it
02:42 githogori joined #git
02:44 chrisshattuck joined #git
02:44 parachan Thanks folks
02:44 rewt when you push to a remote repo, you still need a checkout on that side, so might as well just pull from there
02:44 eletuchy joined #git
02:44 PaulCape_ joined #git
02:46 eletuchy_ joined #git
02:46 bouncy joined #git
02:50 eletuchy joined #git
02:52 eletuchy_ joined #git
02:53 githogori joined #git
02:54 eletuch__ joined #git
02:57 eletuchy joined #git
02:57 xaviergmail joined #git
02:59 Hobbyboy joined #git
02:59 WizJin joined #git
03:00 arand joined #git
03:00 Urbany joined #git
03:00 eletuchy_ joined #git
03:01 d4rklit3 joined #git
03:01 githogori joined #git
03:03 eletuchy joined #git
03:05 Literphor joined #git
03:05 MattMaker joined #git
03:05 tesuji joined #git
03:05 eletuch__ joined #git
03:09 eletuchy joined #git
03:10 d4rklit3 joined #git
03:11 eletuchy_ joined #git
03:12 Literphor joined #git
03:13 eletuch__ joined #git
03:13 mehola joined #git
03:16 tanuki joined #git
03:16 eletuchy joined #git
03:17 fracting joined #git
03:19 eletuchy_ joined #git
03:20 ahmedelgabri joined #git
03:21 eletuch__ joined #git
03:24 eletuchy joined #git
03:25 Rodya_ joined #git
03:26 ensyde__ joined #git
03:26 Motoko joined #git
03:26 eletuchy_ joined #git
03:29 treaki_ joined #git
03:30 eletuchy joined #git
03:30 romerocesar joined #git
03:31 eletuch__ joined #git
03:32 Motoko joined #git
03:33 Hitch joined #git
03:35 eletuchy joined #git
03:36 nilg joined #git
03:36 Motoko joined #git
03:37 eletuchy_ joined #git
03:40 eletuchy joined #git
03:44 Codfection joined #git
03:45 eletuchy_ joined #git
03:46 hk238 joined #git
03:47 eletuch__ joined #git
03:50 eletuchy joined #git
03:53 eletuchy_ joined #git
03:55 xall joined #git
03:57 jbitdrop_ joined #git
04:00 nnyk_ joined #git
04:01 phanimahesh joined #git
04:01 romerocesar joined #git
04:02 cd-rum joined #git
04:04 Chiko joined #git
04:07 liuzhen joined #git
04:09 shgysk8zer0_ joined #git
04:17 jaguarmagenta joined #git
04:17 wxg joined #git
04:19 chrisshattuck joined #git
04:19 nettoweb joined #git
04:20 mehola joined #git
04:20 cyan__ joined #git
04:20 SwiftMatt joined #git
04:21 drodger joined #git
04:22 Literphor joined #git
04:23 dreiss joined #git
04:23 nnyk_ joined #git
04:23 nnyk_ joined #git
04:25 Literphor joined #git
04:28 eletuchy joined #git
04:30 fuchstronaut joined #git
04:32 Rodya_ joined #git
04:33 hahuang61 joined #git
04:34 fhackdroid joined #git
04:39 piling joined #git
04:40 nitin joined #git
04:42 romerocesar joined #git
04:42 eletuchy_ joined #git
04:44 eletuch__ joined #git
04:44 shinnya joined #git
04:45 SwiftMatt joined #git
04:45 clemf joined #git
04:46 guardianJ joined #git
04:47 a_thakur_ joined #git
04:47 eletuchy joined #git
04:48 jungsubk joined #git
04:48 yaewa joined #git
04:49 ploop joined #git
04:53 mebigfatguy left #git
04:55 ochorocho__ joined #git
04:56 Cabanossi joined #git
04:58 stantonk joined #git
04:58 nnyk_ joined #git
04:58 eletuchy_ joined #git
04:59 jeffreylevesque_ joined #git
05:00 milki joined #git
05:01 phaleth joined #git
05:02 _ikke_ parachan: We usually not recommend push to deploy here
05:03 eletuchy joined #git
05:03 Lea2 joined #git
05:03 JrCs_ joined #git
05:03 languitar_ joined #git
05:03 beatdown_ joined #git
05:03 totemizer joined #git
05:03 dan joined #git
05:03 bakingbread joined #git
05:03 bakingbread joined #git
05:03 tcurdt_ joined #git
05:03 Olipro_ joined #git
05:03 MTwister joined #git
05:03 mniip_ joined #git
05:03 JeremyD joined #git
05:03 JeremyD joined #git
05:03 rogerraymond joined #git
05:03 jor_ joined #git
05:03 hfp__work joined #git
05:03 naitsirhc_ joined #git
05:04 Olipro- joined #git
05:04 ashnur joined #git
05:05 toydestroyer joined #git
05:06 User458764 joined #git
05:06 docnvk_ joined #git
05:07 monty joined #git
05:07 saidelike_ joined #git
05:07 ploop joined #git
05:07 rbern joined #git
05:08 ketas joined #git
05:09 lordjancso joined #git
05:09 eletuchy_ joined #git
05:11 romerocesar joined #git
05:12 eletuch__ joined #git
05:13 pnorman left #git
05:18 BombStrike joined #git
05:20 a_thakur joined #git
05:21 ahmedelgabri joined #git
05:23 Aaeriele joined #git
05:23 nickthetait joined #git
05:23 DolphinDream joined #git
05:23 interne7y joined #git
05:23 githogori joined #git
05:23 Limes joined #git
05:25 xaviergmail joined #git
05:25 eletuchy joined #git
05:26 liuzhen joined #git
05:29 ploop joined #git
05:30 Sonicbit joined #git
05:31 eletuchy joined #git
05:31 hero616_ joined #git
05:34 eletuchy_ joined #git
05:38 EvilPenguin joined #git
05:42 Smirnov joined #git
05:47 harish joined #git
05:49 freimatz joined #git
05:50 Sleepy63 joined #git
05:53 tgunr joined #git
05:55 cyphase joined #git
05:55 ochorocho__ joined #git
05:57 freimatz joined #git
05:59 raijin joined #git
05:59 nitin joined #git
05:59 eletuchy joined #git
06:00 kutsuya joined #git
06:01 zumba_addict joined #git
06:02 ploop joined #git
06:05 eletuchy joined #git
06:06 subhojit777 joined #git
06:07 eletuchy_ joined #git
06:12 eletuchy joined #git
06:17 eletuchy_ joined #git
06:17 bayman joined #git
06:17 jaguarmagenta joined #git
06:18 eletuchy_ left #git
06:21 romerocesar joined #git
06:22 eletuchy_ joined #git
06:23 eletuchy_ left #git
06:23 ploop joined #git
06:26 elgenie__ joined #git
06:26 a_thakur joined #git
06:26 lindenle joined #git
06:27 vuoto joined #git
06:28 TomyLobo joined #git
06:28 hahuang61 joined #git
06:29 elgenie joined #git
06:31 fuchstronaut joined #git
06:32 Oebele joined #git
06:32 circ-user-emArs joined #git
06:34 OnBrokenWings joined #git
06:36 zumba_addict joined #git
06:37 nnyk_ joined #git
06:38 cyan__ joined #git
06:39 Fijit joined #git
06:42 fahadash joined #git
06:44 ahmedelgabri joined #git
06:44 nitin joined #git
06:45 mehola joined #git
06:47 mixfix41 left #git
06:47 bayman- joined #git
06:48 Rajeshk joined #git
06:51 a_thakur joined #git
06:51 LeMike joined #git
06:51 paakku joined #git
06:52 xaa joined #git
06:52 LeMike joined #git
06:53 toogley joined #git
06:54 LeMike joined #git
06:54 InfoTest joined #git
06:56 ochorocho__ joined #git
06:56 Sasazuka joined #git
06:57 dreiss joined #git
06:57 Smirnov joined #git
07:00 zarubin joined #git
07:02 darkbit joined #git
07:12 xaviergmail joined #git
07:17 fscala joined #git
07:18 elgenie joined #git
07:20 raijin joined #git
07:21 elgenie_ joined #git
07:22 User458764 joined #git
07:23 romerocesar joined #git
07:23 nwkj86 joined #git
07:25 elgenie joined #git
07:25 ShekharReddy joined #git
07:26 Robdgreat joined #git
07:27 chrisshattuck joined #git
07:31 elgenie_ joined #git
07:33 raijin joined #git
07:33 romerocesar_ joined #git
07:33 Davey joined #git
07:33 Davey joined #git
07:34 circ-user-emArs joined #git
07:34 vuoto joined #git
07:35 jrnieder joined #git
07:36 elgenie joined #git
07:38 PCatinean joined #git
07:38 elgenie__ joined #git
07:41 zumba_addict joined #git
07:44 elgenie joined #git
07:46 elgenie_ joined #git
07:46 raijin joined #git
07:47 zumba_addict joined #git
07:47 multi_io joined #git
07:48 romerocesar joined #git
07:51 elgenie joined #git
07:53 elgenie_ joined #git
07:55 elgenie__ joined #git
07:57 b100s joined #git
07:57 ochorocho__ joined #git
07:57 sanketdg joined #git
07:57 ome joined #git
07:58 elgenie joined #git
08:00 elgenie_ joined #git
08:02 elgenie__ joined #git
08:08 moei joined #git
08:08 romerocesar joined #git
08:08 SteffanW joined #git
08:11 User458764 joined #git
08:11 vuoto joined #git
08:14 jstein_ joined #git
08:15 subhojit777 joined #git
08:16 Sasazuka joined #git
08:16 nnyk_ joined #git
08:18 jaguarmagenta joined #git
08:18 romerocesar joined #git
08:20 basiclaser joined #git
08:23 Smirnov joined #git
08:23 jrnieder joined #git
08:27 phanimahesh joined #git
08:29 lindenle joined #git
08:30 jrnieder joined #git
08:31 BombStrike joined #git
08:31 Smirnov joined #git
08:31 Smirnov joined #git
08:32 fuchstronaut joined #git
08:32 quetz joined #git
08:33 nivag joined #git
08:34 shinnya joined #git
08:44 robotroll joined #git
08:44 LeMike joined #git
08:45 JaffaKree joined #git
08:57 King_Hual joined #git
08:57 King_Hual joined #git
08:58 M-shine joined #git
08:58 anbz joined #git
09:00 anbz joined #git
09:00 KeyWeeUsr joined #git
09:01 KeyWeeUsr hi guys! git fetch -p doesn't remove local branches if they are not present in remote. why?
09:01 KeyWeeUsr git branch -r doesn't have any of them listed
09:01 freimatz joined #git
09:02 spudowiar joined #git
09:02 thinsoldier joined #git
09:06 molt joined #git
09:07 Bombe KeyWeeUsr, because that’s simply not what it does.
09:08 mkoskar joined #git
09:09 KeyWeeUsr Bombe: oh and what does the thing?
09:09 freimatz joined #git
09:09 Bombe KeyWeeUsr, it removes the remove tracking references, just like it says in the man page.
09:11 KeyWeeUsr I asked what removes the local branches O.o
09:11 elastix joined #git
09:11 Bombe No, you didn’t. Also, nobody removes the local branches except you.
09:12 Bombe If there’s a local branch matching a remote branch, git didn’t create it, you did, so git also won’t delete it.
09:12 KeyWeeUsr what "does" the thing, not what "does" that command "do" :P
09:13 Bombe KeyWeeUsr, ah, misunderstood that. You delete local branches with git branch -d.
09:13 KeyWeeUsr thanks! :)
09:13 Jackneill joined #git
09:14 troulouliou_dev joined #git
09:14 M-mistake joined #git
09:14 M-meznak joined #git
09:15 OnBrokenWings joined #git
09:18 Balliad joined #git
09:18 romerocesar joined #git
09:20 OnBrokenWings joined #git
09:23 satifant joined #git
09:26 elastix joined #git
09:28 ahmedelgabri joined #git
09:29 romerocesar joined #git
09:32 fahadash joined #git
09:35 molt hey everyone. Me and a friend have a repo and I just noticed a typo in the name of the repository. How can i change the name (when I am not the owner of the repo) ?
09:35 WayToDoor joined #git
09:35 jbitdrop joined #git
09:37 rsukla joined #git
09:38 mehola joined #git
09:38 t0by joined #git
09:38 Bombe molt, the concept of a repository name is external to git, i.e. do what you want with it, git doesn’t care.
09:38 molt in other words: is there a way to request a rename of the repo?
09:39 Bombe In other words: a repository does not have a name.
09:39 molt wow - that is extremely helpful.
09:39 KeyWeeUsr left #git
09:40 molt left #git
09:40 Bombe Yeah, well, I can imagine half a dozen different things you could call the name of the repo, you have to be more specific.
09:45 Balliad joined #git
09:47 filcab joined #git
09:48 guzzlefry left #git
09:50 subhojit777 joined #git
09:50 elastix joined #git
09:54 anushil051 joined #git
09:56 elastix joined #git
09:56 elastix joined #git
09:58 Tryop88 joined #git
09:58 circ-user-emArs joined #git
10:02 irco joined #git
10:03 Jeroen joined #git
10:04 clivejo joined #git
10:04 GandalfTheWizard joined #git
10:06 oich joined #git
10:08 keltvek joined #git
10:13 GandalfTheWizard joined #git
10:15 nuck joined #git
10:18 oich joined #git
10:19 DARSCODE joined #git
10:19 jaguarmagenta joined #git
10:21 rubyonrailed joined #git
10:22 sanketdg joined #git
10:24 sdothum joined #git
10:24 DARSCODE joined #git
10:29 psprint joined #git
10:29 psprint Hello. Can git log its output to a file?
10:31 User458764 joined #git
10:32 fornax joined #git
10:32 fuchstronaut joined #git
10:33 chrisshattuck joined #git
10:36 denimsoft joined #git
10:37 psprint apparently not
10:37 satifant you can always let the shell redirect the output?
10:39 psprint satifant: but the password prompt needs /dev/tty
10:40 satifant hm, i see
10:42 satifant what about "| tee output.log" ?
10:44 psprint doesn't help. I'm running git from vim via system()
10:47 _ikke_ psprint: whatabout defining pager as cat file.log?
10:48 _ikke_ psprint: or an alternative, use credential helpers for password
10:49 weox joined #git
10:50 rossome joined #git
10:58 User458764 joined #git
10:58 ochorocho__ joined #git
11:01 mrina joined #git
11:01 earational joined #git
11:02 Rajeshk joined #git
11:07 davisonio joined #git
11:09 psprint actually the passwords are in some magical way remembered without credential helper being set. Where are they stored, how to remove them? OS X
11:09 elsevero joined #git
11:10 _ikke_ psprint: Might be that OS X sets up a credential helper itself
11:10 elsevero_ joined #git
11:10 _ikke_ git config -l
11:11 j416 psprint: keychain
11:11 netj joined #git
11:11 j416 not sure about credential helper, maybe
11:11 j416 if anywhere, keychain.
11:11 _ikke_ yes, the credential helper would invoke keychain
11:13 King_Hual joined #git
11:13 King_Hual joined #git
11:15 ojdo joined #git
11:15 mablae joined #git
11:15 psprint well grepped "git" in the keychain and rather nothing is found
11:16 _ikke_ And the site it's logging in to?
11:16 _ikke_ All these kinds of things are defered to other programs
11:17 _ikke_ The only time when git itself remembers passwords is through the cache / memory credential helpers
11:17 psprint ahso
11:18 mablae git subtree splitting ? can anyone help?
11:18 psprint I'll try removing bitbucket site from Keychain in a moment
11:19 _rgn joined #git
11:20 Codfection joined #git
11:28 Rajeshk joined #git
11:30 rolha joined #git
11:31 lindenle joined #git
11:33 psprint _ikke_: indeed removing site from Keychain helped
11:36 _ikke_ Note that git uses curl to talk http
11:36 _ikke_ so it might be curl that is coupled to keychain too
11:37 johnmilton joined #git
11:39 mehola joined #git
11:42 psprint I once coded script that used curl to create github account and the password wasn't remembered
11:43 mablae This shoud work for me: https://ariya.io/2014/07/extracting-parts-of-git-repository-and-keeping-the-history
11:45 _rgn joined #git
11:48 Gamecubic joined #git
11:51 ochorocho__ joined #git
11:51 mischat joined #git
11:52 mischat joined #git
11:56 synthmeat joined #git
11:56 ahmedelgabri joined #git
11:58 tribly joined #git
11:58 chris2 joined #git
12:00 ochorocho__ joined #git
12:02 tomog999_ joined #git
12:05 mariuscc joined #git
12:06 Rooxo joined #git
12:07 nwf joined #git
12:08 stonerfish joined #git
12:13 mablae Hey, when using filter-branch with subdirectory-filter how to maintain the path to that subdir? Or prefix it afterwards?
12:14 mablae atm the subdirectory becomes the top level. I dont want that. any pointers?
12:15 mablae I used git filter-branch --prune-empty --subdirectory-filter src/MyVendorNameSpace/MyBundle subtree-split
12:15 mablae The src/MyVendorNameSpace/MyBundle should be in the final splitted version ...
12:20 jaguarmagenta joined #git
12:20 raijin joined #git
12:20 nitin joined #git
12:23 osse mablae: The easiest is probably to run filter branch again to move everything
12:23 mablae Yeah, I am on it: http://stackoverflow.com/a/9523876/693546
12:24 osse Alternatively you can avoid subdirectory filter and create a filter that deletes everything except src
12:24 HappyLoaf_ joined #git
12:24 Hitch joined #git
12:25 mablae osse, How would that work?
12:30 variable joined #git
12:31 osse mablae: --tree-filter 'rm -r everything except src' I suppose
12:31 dangerousdave joined #git
12:31 osse subdir followed by a move is probably much easier
12:33 fuchstronaut joined #git
12:33 mda1_ joined #git
12:34 ohcibi joined #git
12:39 rishi joined #git
12:40 LeMike joined #git
12:41 davisonio joined #git
12:44 denimsoft joined #git
12:52 GavinMagnus joined #git
12:52 psprint This will show that branch contents is needed to be pushed: git diff origin/master..HEAD --name-status . Is doing  git diff origin/{branchname}..{branchname} --name-status a correct fix for this?
12:55 anushil05 joined #git
13:06 NwS joined #git
13:07 rbr joined #git
13:09 worstadmin joined #git
13:09 moop joined #git
13:09 epic joined #git
13:10 dreiss joined #git
13:10 JackMc joined #git
13:10 [diecast] joined #git
13:10 SpeakerToMeat joined #git
13:10 ec joined #git
13:11 romerocesar joined #git
13:13 nettoweb joined #git
13:13 ffabi joined #git
13:15 osse psprint: fix for what?
13:16 rahtgaz joined #git
13:16 psprint osse: doing master..HEAD shows already pushed commits from say 'testbranch', because it doesn't see the commits in branch master
13:16 psprint so doing testbranch..testbranch, master..master is a logical answer to that
13:16 osse yes
13:16 Nick2 joined #git
13:17 osse and you can use branchname@{u} to mean branchname's upstream (incase it's something other than origin/branchname)
13:17 psprint asking because on soverflow people recommend that stuff
13:17 osse git diff branch@{u}..branch
13:17 psprint upstream must be defined, though
13:17 osse yes
13:19 psprint so what is upstream? A distinction of repo that is main, while origin refers to own fork on say Github
13:19 psprint ?
13:20 osse since you're asking that, what did you mean by "upstream must be defined" ?
13:20 osse I mean git branch -u (or git push -u)
13:20 osse ie. set a remote tracking branch
13:21 psprint I saw some posts about --set-upstream or similar option
13:21 GavinMagnus left #git
13:21 romerocesar joined #git
13:21 circ-user-emArs joined #git
13:22 osse Example of git status:
13:22 osse On branch master
13:22 m0viefreak joined #git
13:22 osse Your branch is up-to-date with 'origin/master'.
13:22 astrofog joined #git
13:22 osse here origin/master is configured to be master's upstream branch
13:22 osse !upstream
13:22 gitinfo Do you want to set the remote branch which is being tracked(!set_upstream), list what remote branches are being tracked(!show_upstream), or incorporate changes from another repo which is not your "origin"(!pull_upstream) ?
13:23 osse but it could just as well have said:
13:23 osse On branch chair
13:23 osse Your branch is up-to-date with 'otherplace/sofa'
13:24 osse that's why  chair@{u}  is useful instead of assuming it's origin/{same name}
13:24 denimsoft joined #git
13:25 psacrifice joined #git
13:25 psprint luckily, my project will be about having repositories of dotfiles. That is being rarely forked, extended, requested to be pulled back, it is rather "my remote repo", "my repo", "someone's repo"
13:26 osse in that case it's fine
13:26 osse this was more if you're writing a script meant to be used by other people
13:27 psprint well the project is for others
13:29 Hobbyboy joined #git
13:30 psprint user will have his repo "/zkl" on his account "his", that repo will contain a database of dotfiles. He will be able to share bits of the dotfiles, pull other's bits, but rather not: fork a zkl repo, extend the fork, request the changes to be pulled back (this is how upstream is useful as far as I understand)
13:39 digidog joined #git
13:40 mehola joined #git
13:40 chrisshattuck joined #git
13:40 raijin joined #git
13:41 johnmilton joined #git
13:42 HoierM joined #git
13:43 rgrinberg joined #git
13:44 rolha joined #git
13:45 tcurdt joined #git
13:46 liquidjamm joined #git
13:47 piattino joined #git
13:48 jbitdrop joined #git
13:52 zumba_ad_ joined #git
13:52 yang joined #git
13:55 paws_ joined #git
13:56 anushil051 joined #git
13:59 ahmedelgabri joined #git
13:59 yang joined #git
14:01 endiruna joined #git
14:06 JaffaKree left #git
14:06 kappy joined #git
14:07 Samual joined #git
14:07 Nick2 joined #git
14:08 anushil_ joined #git
14:10 Rajesh_ joined #git
14:11 GavinMagnus joined #git
14:12 ahmedelgabri joined #git
14:13 snowkidind joined #git
14:13 D-Boy joined #git
14:13 anushil051 joined #git
14:14 anushil_ joined #git
14:15 tomboy64 joined #git
14:15 cyan__ joined #git
14:20 nitin joined #git
14:20 User458764 joined #git
14:21 jaguarmagenta joined #git
14:22 ntonjeta joined #git
14:25 phanimahesh joined #git
14:27 zumba_addict joined #git
14:28 ag4ve joined #git
14:31 zarel joined #git
14:33 lindenle joined #git
14:34 wrouesnel joined #git
14:34 fuchstronaut joined #git
14:35 darkbit joined #git
14:36 mostlybadfly joined #git
14:39 davisonio joined #git
14:42 denimsoft joined #git
14:45 elsevero joined #git
14:45 rolha joined #git
14:46 ochorocho__ joined #git
14:47 edude03 joined #git
14:49 GavinMagnus left #git
14:50 bp9110 joined #git
14:51 bp9110 Hey guys - very new to git and I'm running into an issue. I"m doing a 'git pull' and getting this message: Your local changes to the following files would be overwritten by merge: oauth.ini. Please, commit your changes or stash them before you can merge.
14:51 bp9110 Aborting
14:51 liuzhen joined #git
14:51 bp9110 oauth.ini contains sensitive info that I don't want to commit
14:51 ahmedelgabri joined #git
14:52 bp9110 Basically the version on GitHub is a template but I want to keep the sensitive version oocally
14:52 bp9110 *locally. How would I do that?
14:52 _ikke_ Rename the template
14:52 chrysa joined #git
14:52 _ikke_ So that they don't clash
14:53 bp9110 _ikke_: Hmm interesting. Okay, so say I do that, would I just add oauth.ini to my .gitignore file so that it never gets committed?
14:54 nettoweb joined #git
14:54 FunkyAss joined #git
14:55 ekinmur joined #git
14:56 mischat joined #git
14:56 tgunr joined #git
14:57 d4rklit3 joined #git
14:58 _ikke_ correct
15:00 bp9110 _ikke_: Okay so I did that, now I still have to resolve my conflict that keeps me from doing a pull. Currently oauth.ini exists on github in template form but since that file will now be ignored, how do I remove it from my remote repo?
15:00 toogley joined #git
15:02 anushil05 joined #git
15:02 xaa joined #git
15:03 Ordentlig joined #git
15:03 Ordentlig hi, how can I remove all commits?
15:03 Ordentlig I only made 2
15:04 Ordentlig I commited, tagged, realized that I did something wrong I then fixed the problem and did git amend, git push --force
15:04 Ordentlig now I have two commits
15:04 Ordentlig in my logs
15:04 CtrlC joined #git
15:05 ekinmur joined #git
15:05 CtrlC To remove some parts of the project, deleting the file and doing a commit would be enough. right?
15:05 anushil051 joined #git
15:06 Jackneill joined #git
15:06 CtrlC by delete I mean "git rm".
15:08 madewokherd joined #git
15:08 Ordentlig nvm, I just removed .git reinitialized the project removed tags from remote and overwrote remote
15:09 koro you can do git commit -a -m "blah"
15:09 koro that's a little bit drastic
15:09 ShekharReddy joined #git
15:11 BombStrike joined #git
15:15 anushil05 joined #git
15:16 OnBrokenWings joined #git
15:16 edude03 joined #git
15:16 thiago joined #git
15:17 Jackneill joined #git
15:18 Rodya_ joined #git
15:19 irqq joined #git
15:19 zumba_ad_ joined #git
15:21 edude03 joined #git
15:23 ochorocho__ joined #git
15:24 marcelofr joined #git
15:26 macslab7 joined #git
15:29 livingstn joined #git
15:31 anushil05 joined #git
15:34 elsevero joined #git
15:34 ochorocho__ joined #git
15:36 t0by joined #git
15:37 Jackneill joined #git
15:37 stuh84 joined #git
15:38 circ-user-emArs joined #git
15:38 Vauff joined #git
15:38 fscala joined #git
15:40 mehola joined #git
15:46 EckyEcky Is it possible to set the code to an old commit and later reverse it again to the current status?
15:47 canton7 EckyEcky, sure. you can 'git checkout old_commit', then later, 'git checkout master'. be aware that checking out an old commit directly gives you a !detached HEAD: any work you do and commits you make may be lost, until you checkout a proper branch again
15:47 gitinfo EckyEcky: 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
15:48 NeverDie joined #git
15:48 Jackneill joined #git
15:48 EckyEcky tx
15:50 efdetonator joined #git
15:51 nitin joined #git
15:52 EckyEcky so It's useful for just having a look at the code?
15:54 canton7 yeah, exactly
15:54 Noldorin joined #git
15:55 tjone270 joined #git
15:55 BlessJah EckyEcky: actually compiling or running tests, diff and log alone are enought to take a look
15:55 jaguarmagenta joined #git
15:56 canton7 ... if you want to make some commits, then create and checkout a branch first
15:56 EckyEcky Not if you want to look at the file structure changes
15:56 BlessJah git log --name-status
15:57 BlessJah diff has such option as well
15:57 canton7 that tells you which files have changed in each commit. that's different to see how a file looked at some point in the past
15:57 ochorocho__ joined #git
15:57 canton7 *to seeing
15:58 Bizkit joined #git
15:58 chrisshattuck joined #git
15:58 ahmedelgabri joined #git
15:59 EckyEcky I need to see the whole directory structure at a certain commit, and what is in the files
16:00 BlessJah canton7: my point is that for looking with eyeballs it's actually better to see log and diff - changes are hilighted and listed so you dont need to hunt for them
16:00 ochorocho__ joined #git
16:01 BlessJah canton7: checkout gives you just snapshot, nearly useless for eyeballs but it's what machine needs to run tests or compile/deploy prior version for comparision
16:02 canton7 BlessJah, it depends what you need to do. Sometimes you want to see a diff; sometimes you just want to see what a historic file looked like
16:02 canton7 I've needed both in the past
16:03 BlessJah others uses are still valid, but checkouts sometimes turns into weird changes-hunting fest
16:04 j416 only when you're using it wrongly? :P
16:05 BlessJah j416: exactly what I'm saying: sometimes it's better to stick with other tools
16:05 j416 nod
16:06 Smirnov joined #git
16:06 Smirnov joined #git
16:07 Chiko joined #git
16:11 diogenese joined #git
16:12 narendraj9 joined #git
16:14 diegoviola joined #git
16:15 subhojit777 joined #git
16:15 marcelofr joined #git
16:15 Bizkit_ joined #git
16:16 piattino joined #git
16:16 rolha joined #git
16:18 Darcidride joined #git
16:18 ochorocho__ joined #git
16:18 warthog9 joined #git
16:19 zeroed joined #git
16:19 ferr joined #git
16:19 ShekharReddy joined #git
16:19 Bizkit_ hey i am currently trying to learn the arts of git in the command line, my setup is this: i have my university server as a remote, i have set up my usb stick as a remote and of course i have my local repo. Now i am testing a scenario where i delete something locally and commit that and then want to get to the state of my project on either the university server or my usb stick that haven't gotten that commit pushed
16:19 Bizkit_ to yet, how do i do that?
16:21 sangy joined #git
16:21 _rgn git reset --hard usb-stick-remote/commit-or-branch-etc
16:22 romerocesar joined #git
16:23 jstein_ joined #git
16:23 j416 Bizkit_: when I was starting out, I found it much easier to learn without involving remotes. Add them later.
16:24 j416 Bizkit_: everything is local, except when you fetch or push to a remote
16:25 Bizkit_ _rgn do i need to pull after that?
16:25 ochorocho__ joined #git
16:26 _rgn to do what?
16:26 Bizkit_ _rgn to get the missing files
16:26 piattino joined #git
16:27 _rgn no
16:27 Bizkit_ doesn't seem like it got them for me though
16:29 ochorocho__ joined #git
16:30 j416 Bizkit_: you need to fetch the changes from the remote that has them, to be able to check them out.
16:31 Phaf joined #git
16:32 Bizkit_ j416 so git fetch on the remote that has the files and then git merge?
16:32 spudowiar joined #git
16:32 j416 Bizkit_: fetch from the remote.
16:32 j416 Bizkit_: not at the remote.
16:33 romerocesar joined #git
16:33 dreiss joined #git
16:34 elsevero joined #git
16:34 Bizkit_ j416 what's the difference between from and at?
16:34 j416 Bizkit_: from indicates direction, at indicates location.
16:35 fuchstronaut joined #git
16:35 diegoviola joined #git
16:36 j416 Bizkit_: you committed something on your.. laptop, and you want to have the change where?
16:36 surfnturf_ joined #git
16:36 piattino joined #git
16:36 j416 Bizkit_: did you read the part on remotes in e.g. pro git? !book
16:36 gitinfo Bizkit_: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
16:37 spudowiar Anyone know how to pull a ViewGit repository?
16:38 Bizkit_ scenario is this: i delete something on my laptop and commit that change, then notice that this was a mistake and want to roll back to the state of the project on my remote repository
16:38 j416 Bizkit_: do you have the remote added as a remote?
16:38 Bizkit_ j416 yes in fact i have 2 remotes
16:38 j416 Bizkit_: (you did git remote add foo url/to/foo
16:38 j416 Bizkit_: ok.
16:38 j416 Bizkit_: then as _rgn says
16:39 j416 Bizkit_: however
16:39 j416 Bizkit_: you didn't commit the change?
16:39 Bizkit_ i did commit but not push
16:39 ochorocho__ joined #git
16:39 j416 Bizkit_: I don't understand if you want new changes from the remote, or if you want to get back to where you were before the commit
16:39 _rgn in reality you'd probably just do reset --hard HEAD~ to discard the latest commit (and other uncommitted changes)
16:40 Nicolas joined #git
16:40 j416 _rgn: depends entirely on his answer
16:40 Bizkit_ basically i want to get back to before the delete
16:40 f3r70rr35f joined #git
16:40 j416 Bizkit_: then you don't need your remotes at all
16:40 j416 Bizkit_: git reset --hard HEAD^
16:41 liquidjamm joined #git
16:41 j416 Bizkit_: the syntax _rgn uses above is also ok
16:42 Bizkit_ j416 ok command line says i am one commit in the past now do i need to apply that or something along those lines?
16:42 j416 not sure what you mean
16:43 j416 what exactly does it say?
16:43 Bizkit_ "Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded."
16:43 _rgn you have pushed the change then
16:43 j416 Bizkit_: it means either you pushed that commit, or you didn't do a commit at all. And that you are now one commit behond.
16:43 j416 behind* even
16:44 Bizkit_ ah nevermind i pushed it to one of the remotes
16:46 Bizkit_ j416 now how would i get the one remote that is a commit ahead to be in line with my local version that is a commit behind?
16:47 j416 Bizkit_: push
16:47 endiruna joined #git
16:47 j416 Bizkit_: in this case, you are altering history on the remote, so you need to pass --force
16:48 Bizkit_ j416 if i do that i get "remote: GitLab: You are not allowed to force push code to a protected branch on this project."
16:49 j416 Bizkit_: that's a gitlab setting then.
16:49 j416 Bizkit_: go to project settings -> protected branches.
16:49 j416 Bizkit_: it has nothing to do with git itself.
16:49 jokajak joined #git
16:52 Bizkit_ j416 _rgn sweet everything works now, thanks for all the help, i guess i'll i have to read the whole ebook when i find the time to get a better understanding of what i am actually doing
16:53 j416 Bizkit_: o/
16:53 zumba_addict joined #git
16:55 anushil_ joined #git
16:56 diegoviola joined #git
16:57 cyan__ joined #git
16:57 mablae_ joined #git
17:05 basiclaser joined #git
17:05 anushil05 joined #git
17:06 anushil051 joined #git
17:10 APic joined #git
17:11 viper474 joined #git
17:11 ochorocho__ joined #git
17:11 moldy joined #git
17:11 moldy hi
17:11 moldy git push -u origin HEAD:some-branch  <-- this doesn't work if some-branch doesn't exist yet, right?
17:12 thiago I think you're right
17:12 PresidentIvanka joined #git
17:12 piattino joined #git
17:12 thiago it will refuse to push to "unqualified some-branch that doesn't exist"
17:12 thiago you have to write "HEAD:refs/heads/some-branch"
17:13 moldy thiago: ahh. thanks.
17:13 PresidentIvanka how do I get rid of every commit before a certain commit?
17:13 thiago PresidentIvanka: nice nickname
17:13 j416 PresidentIvanka: filter-branch or rebase
17:13 thiago PresidentIvanka: are you sure you want to do that?
17:13 thiago PresidentIvanka: !rewrite
17:13 gitinfo PresidentIvanka: 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
17:13 _ikke_ git replace + git filter-branch
17:13 PresidentIvanka rewriting for to a new repo
17:13 thiago PresidentIvanka: ok, the easiest way is this: write the SHA-1 of the commit that should have no parents in .git/info/grafts
17:13 j416 +1 to _ikke_'s suggestion; this is quite nice
17:14 thiago use git log to confirm the history looks like what you want
17:14 thiago then git filter-branch --all
17:14 i7c There's also checkout --orphan if you just wanna start over.
17:14 j416 thiago: I tried out replace recently, it works just like grafts but it actually has documentation
17:14 j416 not bad at all.
17:14 thiago interesting
17:14 PresidentIvanka _ikke_ is a git god
17:14 thiago I'm not able to recommend it, having never used it
17:15 j416 thiago: yeah, I was in the same boat before. It's even easier than grafts, in fact.
17:15 _ikke_ It's basically grafts done in a git way
17:15 j416 thiago: just one command line, then there's a graft
17:15 liquidjamm joined #git
17:16 PresidentIvanka so what flags am I passing to git replace?
17:16 j416 PresidentIvanka: --graft
17:17 j416 PresidentIvanka: see man git-replace read section on --graft
17:17 gitinfo PresidentIvanka: the git-replace manpage is available at http://jk.gs/git-replace.html
17:17 _ikke_ git replace --graft <last_commit_to_keep>
17:17 PresidentIvanka yeah I had the man open
17:17 PresidentIvanka thx
17:18 _ikke_ You need to make sure the older commits are not referenced through another path
17:20 PresidentIvanka basically what I want to do is turn one branch into its own project without the history of master branch
17:21 PresidentIvanka what flag am I passing to git filter-branch?
17:22 thiago --all
17:22 thiago or that branch name, at leat
17:22 _ikke_ git filter-branch -- --all
17:24 IanV0rn2341 joined #git
17:25 PresidentIvanka ok perfect
17:25 PresidentIvanka I want to now get rid of master
17:25 PresidentIvanka and then rename the current branch as master
17:26 ochorocho__ joined #git
17:31 Literphor joined #git
17:31 elsevero joined #git
17:32 PresidentIvanka meh used brute force...
17:33 Goplat joined #git
17:33 cdesai joined #git
17:34 PresidentIvanka no I didn't.... whoops I push the branch I was trying to get rid of
17:34 nitin joined #git
17:34 surfnturf_ left #git
17:35 spudowiar hahaha
17:35 ochorocho__ joined #git
17:36 PresidentIvanka ok localbranch:remotebranch
17:36 lindenle joined #git
17:36 PresidentIvanka pray this works
17:36 spudowiar it will
17:39 davisonio joined #git
17:39 PresidentIvanka it did
17:39 PresidentIvanka magic... git is evil
17:40 denimsoft joined #git
17:41 flopsec joined #git
17:41 mehola joined #git
17:41 ochorocho__ joined #git
17:44 darkbit joined #git
17:46 Ordentlig joined #git
17:46 mischat joined #git
17:51 ochorocho__ joined #git
17:52 sangy joined #git
17:52 xaviergmail joined #git
17:53 Hitch joined #git
17:54 blahdodo joined #git
17:55 satbyy joined #git
17:57 ochorocho__ joined #git
17:58 blahdodo joined #git
17:59 Urbany joined #git
18:04 Nicolas joined #git
18:05 moritz is there any solution to the zeroPaddedFilemode error with receive.fsckObjects other than rewriting history?
18:06 ochorocho__ joined #git
18:06 axiom_1 joined #git
18:06 tmz joined #git
18:07 ahmedelgabri joined #git
18:11 ybden joined #git
18:12 PresidentIvanka left #git
18:13 dreiss joined #git
18:13 GavinMagnus joined #git
18:16 m1dnight_ joined #git
18:17 cdown joined #git
18:17 stonerfish joined #git
18:21 jost__ joined #git
18:22 jcase joined #git
18:24 Raging_Hog joined #git
18:28 hahuang65 joined #git
18:31 chris2 joined #git
18:34 mdw joined #git
18:35 fuchstronaut joined #git
18:36 a3Dman joined #git
18:37 chris2 joined #git
18:37 Bieo joined #git
18:38 davisonio joined #git
18:38 nephyrin joined #git
18:39 arand joined #git
18:39 User458764 joined #git
18:44 romerocesar joined #git
18:44 WizJin joined #git
18:45 Sonicbit joined #git
18:48 yqt joined #git
18:48 mischat joined #git
18:52 tmz joined #git
18:52 circ-user-jjOUE joined #git
18:56 vivekp hi, i have a problem. Whenever i clone a remote repo from Github, all i see is only one branch is present and other branch just don't exist.
18:56 Bombe Have you tried listing the remote branches?
18:57 vivekp how could i see other branches that I have in the remote repo?
18:57 Bombe git branch has an option for that.
18:58 vivekp Bombe: not sure, what you are asking. Pardon me, i'm not very good at using git.
18:58 vivekp "git branch" shows just master branch
18:58 _ikke_ git branch -r
18:58 Bombe vivekp, yes, that’s why I told you that it has an option for listing remote branches.
18:59 quetz joined #git
18:59 vivekp ok let me see
18:59 vivekp what _ikke_ said... is that it?
19:00 Bombe If only there was a way to find out…
19:00 rolha joined #git
19:03 doener joined #git
19:04 vuoto joined #git
19:04 mangolisk joined #git
19:04 vivekp well,  git branch -r did list all branches nicely
19:05 cyan__ joined #git
19:05 vivekp tried checking out to one those branches and it goes in detached head state
19:06 mischat joined #git
19:06 _ikke_ check them out without the origin/ part
19:06 vivekp ok brb
19:07 zumba_addict joined #git
19:07 vivekp works! thanks
19:07 schwepps joined #git
19:09 Literphor joined #git
19:11 PCatinean joined #git
19:12 cyphase joined #git
19:12 vivekp _ikke_: i can't guess what was missing in my previous attempts; probably i should remember to use git branch -r before checkout ?
19:14 vivekp because all the previous times when i used git checkout other_branch, it took all the master branch commits with it onto other branches
19:14 _ikke_ No, git branch -r has no influence on git checkout
19:19 vivekp ahh okay but i did nothing different other than git branch -r. Anyway, i'm happy it worked FINALLY.
19:19 davisoni_ joined #git
19:22 cdg joined #git
19:25 Tee_Pee joined #git
19:25 nnyk_ joined #git
19:27 _rgn joined #git
19:30 jchonig joined #git
19:30 _rgn joined #git
19:30 liquidjamm joined #git
19:31 ESphynx joined #git
19:31 settermjd joined #git
19:31 ESphynx hey guys... is there a way for git to smarten up with code?
19:32 bremner wat?
19:32 ESphynx make it syntax aware? if a function has a different body...
19:32 bremner in what context?
19:33 ESphynx bremner: well I'm stuggling here trying to rebase stuff
19:33 bremner you can, in principle, define custom merge drivers
19:33 ESphynx and git just has no idea when it comes to basic code constructs....
19:33 diegoviola joined #git
19:33 _ikke_ Git does not do semantic merging
19:33 _ikke_ It does not know anything about code
19:34 ESphynx bremner: that's the answer I get that everytime, but it's always in principle maning probably no one does it and it's not practica
19:34 _ikke_ You'd need a separate merge driver
19:34 ESphynx Does anyon do this?
19:34 _ikke_ https://www.semanticmerge.com/
19:35 ESphynx that offers a driver for git or it's a whole different thing?
19:35 _ikke_ Not sure if it cooperates with git
19:35 ESphynx I mean semantic merge makes so much more sense, it's a shame it's not more popular / built-in
19:35 _ikke_ You have to define something for every language
19:35 ESphynx of course
19:35 _ikke_ and maintain it
19:36 _ikke_ And expectations of such a merge would be much higher
19:36 _ikke_ chances for bugs increase
19:36 ESphynx but this is the 21st century :P
19:36 ESphynx merge should be semantics aware :P
19:37 _ikke_ It's very easy to say it should
19:37 _ikke_ but it's quite hard to implement correctly
19:38 ESphynx what's a starting point
19:38 moritz ESphynx: I'm sure somebody will teach git merge semantic merge within the 21st century
19:38 moritz ESphynx: ... unless it will be replaced by something more awesome, of course :-)
19:38 ESphynx moritz: well I'm trying to build the momentum here
19:38 ESphynx I find this a major time drainer
19:38 ESphynx so where would you plug this driver exactly?
19:39 bremner into git merge
19:39 ESphynx it would be used when you execute cherry-picks, rebases, diffs, and so on?
19:39 _ikke_ man gitattributes
19:39 gitinfo the gitattributes manpage is available at http://jk.gs/gitattributes.html
19:39 moritz ESphynx: there are custom merge driver for debian/changelog files out there, for example
19:40 moritz which is a simple file format, and has pretty easy rules for merging
19:40 ESphynx moritz: what I'm looking for is a very basic driver for C derived languages, that understand basic things like comments and function blocks {  }
19:40 ESphynx that would take git a long way
19:40 sonOfRa joined #git
19:41 ESphynx instad of merging unrelated structs and because it matches a context line containing only '{'
19:41 moritz yes, might be worth a shot
19:41 ESphynx basically if you don't match the meaningful beginning of the block, don't go matching it's opening or closing bracket
19:41 moritz a semi-semantic merge that doesn't understand all of the language, but does know wich parts are significant and which aren't
19:41 tgunr joined #git
19:42 ESphynx exactly.
19:42 spudowiar joined #git
19:42 mehola joined #git
19:44 ESphynx Is there any tutorial / info on how to write a git merge driver?
19:45 ESphynx that would plug in as a separate executable?
19:47 moritz ESphynx: I don't know of a tutorial, but I'd recommend you look at the debian/changelog merge as an example
19:47 moritz because it's probably not too complicated
19:48 ESphynx moritz: that would do... any link?
19:48 moritz ESphynx: no; i'd have to google them too
19:49 ESphynx hehe ok thanks :)
19:49 ESphynx I guess though it's just an executable... so best thing is probably to try and see what git is sending it :P
19:50 moritz aye
19:50 Rodya_ joined #git
19:51 fscala joined #git
19:51 _rgn joined #git
19:52 ag4ve joined #git
19:53 ag4ve how do I copy the changes made in one directory to a branch?
19:54 ag4ve git subtree split --prefix dir -b branch # almost DWIW
19:56 ag4ve but it moves the dir to ./
19:56 oich joined #git
19:56 RahulAN_ joined #git
19:56 ag4ve and I want to keep the location in tact
19:56 jimi_ joined #git
19:57 vuoto joined #git
20:01 tmz joined #git
20:02 RahulAN_ hi all
20:02 gitinfo RahulAN_: 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.
20:02 vuoto joined #git
20:02 RahulAN_ How do i start using git on linux
20:03 vuoto joined #git
20:03 RahulAN_ I mean i want to share my project with my friends also , how do we start using it via git
20:03 qsx RahulAN_: !book
20:03 gitinfo RahulAN_: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
20:03 vuoto joined #git
20:04 ag4ve tar -,
20:04 ag4ve tar -czvf repo.tgz repo/
20:04 RahulAN_ git init , git add , git commit -m "msg" , git push
20:04 RahulAN_ this much i got ..
20:05 RahulAN_ but how do my friends can share the code in it ,.. (make the changes with my repo)
20:06 irqq joined #git
20:06 ag4ve you can copy repos around like I indicated (nothing special)  or see git-remote
20:08 RahulAN_ ag4ve: after clone , what i have to do .. to contribute in it
20:10 jhass RahulAN_: where did you clone it from?
20:10 ag4ve I'm guessing you are looking at github or similar?
20:11 RahulAN_ jhass: this is my account https://github.com/nested, and want to contribute here: https://github.com/citrix123/GrandShopping.git
20:12 jhass see https://help.github.com/articles/using-pull-requests/
20:12 ESphynx left #git
20:12 RahulAN_ jhass: how to do it from command line
20:13 jhass RahulAN_: we've provided you documentation, please read it and come back with specific questions
20:13 RahulAN_ jhass: some time i have minimal linux
20:13 ag4ve *after* you're done with that, there's #github
20:13 Ahmed90 joined #git
20:15 ag4ve (and if you don't like reading, there's tons on YouTube)
20:16 v0n joined #git
20:16 vuoto_ joined #git
20:17 oich joined #git
20:17 diegoviola joined #git
20:18 d4rklit3 joined #git
20:20 d4rklit3 joined #git
20:22 RahulAN_ jhass: thats great
20:22 RahulAN_ just create a pull request and then merge it
20:22 RahulAN_ the reviewer willl review and merge it to master
20:23 RahulAN_ am i right ?
20:23 jhass yes
20:23 jhass note that's specific to github, less so git
20:24 RahulAN_ jhass: with web page it was so easy
20:24 RahulAN_ but how do i do in cmd ..
20:24 jhass what step specifically?
20:25 romerocesar joined #git
20:25 mdw joined #git
20:25 RahulAN_ i mean after cloning , do changes, then how to request-pull
20:25 ekinmur joined #git
20:26 diegoviola joined #git
20:26 jhass that's multiple steps, I'm still not sure about which specific step your question is
20:26 peeps joined #git
20:28 nnyk_ joined #git
20:31 radsy joined #git
20:33 Literphor joined #git
20:33 sandstrom joined #git
20:34 sandstrom In hooks I've seen `# Redirect output to stderr; exec 1>&2` is it a bad idea to omit that?
20:35 snowkidind joined #git
20:36 fuchstronaut joined #git
20:36 kadoban sandstrom: Depends what your hook is doing I guess. Often probably won't matter.
20:37 slick joined #git
20:37 sandstrom It will abort my commits if I've forgot to set the right user.email value. I want to see the message, but perhaps both std-out and std-err are shown in the console?
20:37 sandstrom kadoban
20:38 lindenle joined #git
20:39 tmz joined #git
20:39 RahulAN_ Is it possible to create a repo from command line?
20:40 jaguarmagenta joined #git
20:40 acetakwas joined #git
20:40 _ikke_ git init
20:40 RahulAN_ _ikke_: I did it
20:40 _ikke_ git status
20:40 RahulAN_ _ikke_: i did  git add .
20:41 WayToDoor joined #git
20:41 xall joined #git
20:41 RahulAN_ _ikke_: as i  am doing git commit -m "Codeigniter framework"
20:42 RahulAN_ and  git push origin master  i am getting fatal: 'origin' does not appear to be a git repository
20:42 RahulAN_ _ikke_: there is no repo names origin on git
20:43 RahulAN_ what should i do to create one ?
20:45 xaviergmail joined #git
20:46 RahulAN_ any one here?
20:47 shgysk8zer0_ joined #git
20:47 d4rklit3 joined #git
20:47 jhass this is all covered in all basic tutorials and all books, we're here to clarify stuff in case you're confused about something you read or simply couldn't find an answer to after doing your research. We're not here to tutor you on your first steps, go read a tutorial or book
20:48 oich joined #git
20:48 inflames joined #git
20:48 Goplat joined #git
20:50 royanne joined #git
20:50 _ikke_ RahulAN_: Where are you pushing to?
20:51 RahulAN_ jhass: i know you are there to assist
20:51 RahulAN_ but i want to know is there any way to create a new repository from command like
20:51 RahulAN_ _ikke_:  i want to have a new repo from command line
20:52 jhass you seem to be confused about the difference between github and git
20:52 jhass go read about that first
20:54 ahmedelgabri joined #git
20:56 thinsoldier joined #git
20:57 _ikke_ RahulAN_: You cannot with plain git create a remote repository from the command line
20:58 RahulAN_ _ikke_: Yes i got it
20:58 RahulAN_ http://stackoverflow.com/questions/2423777/is-it-possible-to-create-a-remote-repo-on-github-from-the-cli-without-opening-br
21:00 mwhooker joined #git
21:06 zumba_addict joined #git
21:07 RahulAN_ jhass: i got some more thing by reading that book:D
21:09 ash_workz joined #git
21:11 dkug joined #git
21:11 elastix joined #git
21:16 bjoe2k4 joined #git
21:16 diegoviola joined #git
21:18 thinsoldier joined #git
21:18 HoierM joined #git
21:22 arooni joined #git
21:23 acetakwas joined #git
21:24 ekinmur joined #git
21:24 d4rklit3 joined #git
21:25 Literphor joined #git
21:25 xall joined #git
21:26 MacGyver joined #git
21:29 mwhooker joined #git
21:29 RahulAN_ To contribute in one project i did forked a repository, now i made some changes and pushed to my master,  nnow i want to pull-request ro the main repository
21:29 RahulAN_ how do i do it?
21:30 todd_dsm joined #git
21:30 RahulAN_ https://git-scm.com/docs/git-request-pull
21:31 RahulAN_ i am trying this.. but getting fatal: unable to access 'https://github.com/citrix123/Mayabazar/': The requested URL returned error: 403
21:31 sonOfRa github pull requests aren't done with git-request-pull
21:31 sonOfRa You want to use the github UI for that after you pushed your changes to your repository
21:32 RahulAN_ sonOfRa: with it is it not possible ?
21:32 RahulAN_ with command line ?
21:32 sonOfRa no, command line git doesn't do what you need to do for github pull requests out of the box.
21:32 sonOfRa There might be command line tools that allow you to do this, but they don't come with git itself
21:33 RahulAN_ Oh i see
21:33 moritz RahulAN_: https://github.com/ingydotnet/git-hub
21:34 RahulAN_ moritz: does it have pull request?
21:35 mmmveggies joined #git
21:36 moritz RahulAN_: sure; the pr-new command
21:38 stonerfish joined #git
21:41 jeffreylevesque joined #git
21:41 tmz joined #git
21:43 mehola joined #git
21:47 RahulAN_ moritz: i am getting API url '/repos//' looks suspiciously wrong
21:47 RahulAN_ moritz: i am doing this git hub pr-new --remote=github.com/citrix123/Mayabazar
21:50 davisonio joined #git
21:51 mischat joined #git
21:51 keltvek joined #git
21:52 spudowiar joined #git
21:53 tmz joined #git
21:56 denimsoft joined #git
21:57 BlaXpirit moritz, hoold up, why would you use this and not the official one?
21:58 mneb joined #git
21:58 RahulAN_ BlaXpirit: any other suggestion instead of using the web page?
22:00 BlaXpirit RahulAN_, https://github.com/github/hub pull-request
22:00 joki joined #git
22:02 jc174 joined #git
22:03 mwhooker joined #git
22:07 RahulAN_ BlaXpirit: I will try it
22:07 RahulAN_ if i changed many files and i want to add them , is there any way or command to diff and add those are change
22:07 superteece joined #git
22:08 Ahmed-90 joined #git
22:08 duderonomy joined #git
22:08 BlaXpirit RahulAN_, I don't understand
22:09 RahulAN_ I mean i changed some files , and if in case to leave any one of the file for adding, is there any way so that i can get to knwo that how many files i had changed in my local workspace.
22:10 RahulAN_ BlaXpirit: sorry for my bad english :)
22:10 BlaXpirit RahulAN_, git status
22:10 tmz joined #git
22:11 jc174 left #git
22:13 cd-rum joined #git
22:15 Rodya_ joined #git
22:16 jstein__ joined #git
22:17 cd-rum_ joined #git
22:18 endiruna joined #git
22:18 gosti joined #git
22:22 piattino joined #git
22:23 acetakwas joined #git
22:23 spoiv joined #git
22:25 piattino joined #git
22:25 GavinMagnus left #git
22:28 rubyonrailed joined #git
22:28 robotroll joined #git
22:28 CheckDavid joined #git
22:28 inflames joined #git
22:30 zumba_addict joined #git
22:30 cyan__ joined #git
22:37 spudowiar joined #git
22:37 fuchstronaut joined #git
22:50 oich I want to ignore everything in directory a/b except for a/b/special. So, in .gitignore I have a/b/* followed by !a/b/special but git status reports anything below a/b/ as untracked and check-ignore prints nothing for any file in a/b. what am I doing wrong?
22:51 mischat joined #git
22:55 shgysk8zer0 joined #git
22:55 ahmedelgabri joined #git
22:56 romerocesar joined #git
22:57 Literphor joined #git
22:58 livingstn joined #git
22:58 piattino joined #git
23:05 mmlb joined #git
23:05 xaviergmail joined #git
23:06 shgysk8zer0 joined #git
23:17 vivekp joined #git
23:19 ddybing joined #git
23:21 piattino hi. in dir1, files f1, f2, f3, f-many-N have been both edited and renamed. which command helps me see the differences better?  ideally, i would like to browse the 2 statuses of dir1 simultaneously
23:23 chrisshattuck joined #git
23:25 Waskeend joined #git
23:25 wagle joined #git
23:25 cbreak joined #git
23:27 Goplat joined #git
23:28 nd joined #git
23:29 vivekp joined #git
23:31 vivekp joined #git
23:34 mablae__ joined #git
23:37 inflames joined #git
23:41 cbreak joined #git
23:43 jrnieder joined #git
23:44 mehola joined #git
23:50 BSaboia joined #git
23:53 Codfection joined #git
23:55 Chiko joined #git
23:56 ahmedelgabri joined #git
23:56 mischat joined #git
23:59 jaguarmagenta joined #git

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