Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-31

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

All times shown according to UTC.

Time Nick Message
00:00 lindenle joined #git
00:02 anuxivm left #git
00:03 atesc joined #git
00:03 lindenle joined #git
00:03 |ifei5g00d joined #git
00:09 matoro joined #git
00:11 QwertyDragon joined #git
00:12 ochorocho__ joined #git
00:13 WayToDoor joined #git
00:14 eka joined #git
00:14 shmuli joined #git
00:15 someone235 joined #git
00:16 GavinMagnus joined #git
00:17 steven_a_s joined #git
00:19 jottr_ joined #git
00:21 Dohplay joined #git
00:23 JamesBaxter joined #git
00:26 jcalonso joined #git
00:28 jason237 joined #git
00:32 e14 joined #git
00:33 PsionTheory joined #git
00:34 Anja joined #git
00:37 pks joined #git
00:39 SwiftMatt joined #git
00:39 hahuang61 joined #git
00:40 jottr joined #git
00:41 jaafar joined #git
00:42 fstd_ joined #git
00:45 f3r70rr35f joined #git
00:47 parasite joined #git
00:48 mischat joined #git
00:50 kugel joined #git
00:50 kugel joined #git
00:51 safe joined #git
00:52 thiago joined #git
00:53 steelsw0rd joined #git
00:53 Gsham joined #git
00:54 fahadash joined #git
00:54 irqq_ joined #git
01:01 Vale joined #git
01:02 e14 joined #git
01:03 jcalonso joined #git
01:06 akurniawan joined #git
01:08 xameada joined #git
01:11 _28_ria joined #git
01:13 mehola joined #git
01:19 n00bdev joined #git
01:21 steelsw0rd joined #git
01:22 f3r70rr35f joined #git
01:24 werdfriek joined #git
01:25 Goplat joined #git
01:26 Gsham joined #git
01:27 f3r70rr35f joined #git
01:29 a3Dman_ joined #git
01:34 andrew710 joined #git
01:36 fstd_ joined #git
01:36 andrew710 joined #git
01:38 Kaisyu joined #git
01:39 prg3 joined #git
01:39 hahuang61 joined #git
01:41 jcalonso joined #git
01:41 cqi joined #git
01:45 Jameser joined #git
01:48 shmuli joined #git
01:49 NeverTired joined #git
01:51 liuzhen joined #git
01:53 Dougie187 joined #git
01:58 danslo_ joined #git
01:58 jaguarmagenta joined #git
02:02 svm_invictvs joined #git
02:02 raijin joined #git
02:03 govg joined #git
02:08 finalbeta joined #git
02:09 txdv joined #git
02:13 ochorocho__ joined #git
02:17 cqi joined #git
02:19 jcalonso joined #git
02:21 cdown joined #git
02:21 jottr joined #git
02:24 mrpackethead joined #git
02:25 hypercube32 joined #git
02:25 hypercube32 joined #git
02:26 dreiss joined #git
02:28 iamthad joined #git
02:29 railssmith joined #git
02:30 fling joined #git
02:30 Vampire0_ joined #git
02:31 cagmz joined #git
02:36 dodobrain joined #git
02:43 xameada joined #git
02:46 User458764 joined #git
02:46 gr8kodr_ joined #git
02:46 einnjo joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and public-access television programming | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.2 | Getting "cannot send to channel"? /msg gitinfo .voice | git-bisect: No, not like that. Grow up.
02:50 d^sh joined #git
02:52 gr8kodr joined #git
02:57 mizu_no_oto joined #git
02:58 jcalonso joined #git
02:58 somaReverse joined #git
02:58 somaReverse helli
02:58 somaReverse hi
02:59 somaReverse how can I make a branch point to my current HEAD
03:00 jaguarmagenta joined #git
03:02 Random832 somaReverse: is this a branch that already exists?
03:02 Dohplay joined #git
03:10 inflames joined #git
03:13 aavrug joined #git
03:14 e14 joined #git
03:14 somaReverse yes
03:14 sunri5e joined #git
03:15 thiago somaReverse: git push . HEAD:thatbranchname
03:16 drbean joined #git
03:18 somaReverse thiago: hmm, doesn't git push interact with remote repo?
03:20 thiago somaReverse: yes, but the remote is .
03:24 pks joined #git
03:25 gr8kodr left #git
03:26 einnjo joined #git
03:26 govg joined #git
03:28 chachasmooth joined #git
03:29 Dohplay joined #git
03:30 f3r70rr35f joined #git
03:34 somaReverse thanks !
03:36 jcalonso joined #git
03:38 fatalhalt joined #git
03:38 hypercube32 joined #git
03:40 hahuang61 joined #git
03:41 jottr joined #git
03:41 sgtbigman joined #git
03:44 danslo_ joined #git
03:46 Andrew_K joined #git
03:47 lagothrix joined #git
03:48 idk_njr joined #git
03:48 hexagoxel joined #git
03:49 njr_pc joined #git
03:50 arescorpio joined #git
03:52 eka joined #git
03:53 njr_pc left #git
03:53 njr_pc joined #git
03:54 nalley joined #git
03:57 qguv joined #git
03:59 jost__ joined #git
04:01 njr_pc left #git
04:04 dreiss joined #git
04:05 sonikspin joined #git
04:13 _cyril_ joined #git
04:14 xall_ joined #git
04:14 Limes joined #git
04:14 jcalonso joined #git
04:15 Vortex34 joined #git
04:16 eblip joined #git
04:17 eb0t joined #git
04:26 lindenle joined #git
04:30 im_ joined #git
04:32 eb0t joined #git
04:33 snthsnth joined #git
04:35 Paker joined #git
04:36 blackwind_123 joined #git
04:36 p_d joined #git
04:38 Puffball joined #git
04:39 p_d left #git
04:48 _cyril_ joined #git
04:48 nuck joined #git
04:49 subhojit777 joined #git
04:50 nawwmz joined #git
04:50 atesc joined #git
04:52 drbean joined #git
04:53 jcalonso joined #git
04:54 govg joined #git
04:54 flavius joined #git
04:54 zumba_ad_ joined #git
05:00 waveclaw joined #git
05:00 xameada joined #git
05:01 xall_ joined #git
05:02 cdown joined #git
05:05 waveclaw joined #git
05:06 zumba_ad_ joined #git
05:07 liuzhen joined #git
05:10 laumann joined #git
05:11 qws-user-1228 joined #git
05:11 rscata joined #git
05:11 MrMojito joined #git
05:16 p_d_ joined #git
05:25 brillenfux joined #git
05:26 Thorn__ joined #git
05:27 xall joined #git
05:27 p_d joined #git
05:27 p_d hey
05:27 gitinfo p_d: 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.
05:27 shmuli joined #git
05:28 p_d I'm new to git and I want to know how do I make pull request at this repo->https://github.com/jainaman​224/Algo_Ds_Notes/pull/354 ..whats the complete process.. I have got the whole day..Thank you
05:31 OnBrokenWings joined #git
05:31 ngperfex joined #git
05:32 jcalonso joined #git
05:39 Cabanossi joined #git
05:41 hahuang61 joined #git
05:45 liuzhen joined #git
05:49 phroa p_d: you want to make a pull request... of a pull request?
05:51 p_d phora: sorry i didnt get you.. Well actually I've participated in Hacktoberfest ..they said make 4 pull request at any of the repo/directories(idk what to say) which are labbeled as hacktoberfest
05:51 p_d participating*
05:52 phroa Boy, you're cutting that deadline close :)  this might help, since pull requests are a github-only feature https://help.github.com/art​icles/about-pull-requests/
05:53 phroa just for the record, they don't need to be labeled Hacktoberfest.  that's just a way for project owners to mark easy-to-fix-by-people-new-to-the-project issues
05:53 phroa _any_ four pull requests count
05:53 p_d phora: Hmm this is the last day
05:54 p_d phora: so can I make pull req. in my own repo? or of my friend?
05:54 p_d simply add new txt file saying hello?
05:55 preaction that sounds like cheating
05:55 phroa well you _can_ but it's kinda going against the spirit of the thing
05:55 re1_ joined #git
05:56 Darren_ joined #git
05:56 p_d hmm right.... okay so should I fix issues actually I'm new in this whole world of programming? you guys suggest
05:57 phroa this is more ethical territory at this point, but the idea is to get new people involved in improving existing open source projects
05:57 p_d hmm
05:59 p_d so I know DFS code in C....I'm thinking about this issue- https://github.com/jainaman​224/Algo_Ds_Notes/pull/354 ....what should my first step towards making pull req.? Fork this directory?
06:00 phroa the 'issue' you linked is a pull request someone proposed already.  go back to the main project, find a file, click "edit".  github will handle the rest.
06:01 phroa when you actually want to learn what that ^ is doing, I suggest you read !books
06:01 gitinfo [!book] 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
06:01 phroa because git is more than github's shiny website
06:01 jottr joined #git
06:02 p_d phroa: how to get back to the main project? sorry for silly question
06:02 phroa click 'code' at the top
06:03 p_d yea done..there are many folders..what next then
06:04 _ng joined #git
06:05 cagedwisdom joined #git
06:06 jfr joined #git
06:06 p_d phroa: I have gone to DFS directory...there I cant see edit..I guess one need to add C implementation of dfs there ..am i right?
06:06 unreal joined #git
06:06 xall joined #git
06:07 ych joined #git
06:08 mehola joined #git
06:09 phroa p_d: the page you linked was /someone else already doing DFS/.  click "issues" for a list of things you can do :)
06:09 phroa it's getting pretty late on this side of the world, so hopefully someone else can help you
06:10 xpk joined #git
06:10 xpk joined #git
06:11 p_d phroa: The first thing i got is quick sort in C..i know it.....I clicked the issue and I can see a comment I'm working on it! ..do this means I need to work on next issue?
06:11 p_d okay phroa night
06:11 jcalonso joined #git
06:15 nidr0x joined #git
06:16 jfr joined #git
06:16 shubhnik joined #git
06:18 zulutango joined #git
06:23 qt-x joined #git
06:24 dreiss joined #git
06:29 Wayne_Shephard joined #git
06:30 pks joined #git
06:31 ldlework How can I remove specific changes inside of a commit?
06:31 ldlework Instead of the whole commit itself
06:31 mehola joined #git
06:35 stuh84 joined #git
06:37 nilg joined #git
06:37 xall joined #git
06:39 armyriad joined #git
06:41 kenden joined #git
06:43 PioneerAxon_ joined #git
06:44 ThomasLocke joined #git
06:44 ThomasLocke joined #git
06:46 robotroll joined #git
06:48 User458764 joined #git
06:49 Puffball joined #git
06:50 Motoko joined #git
06:50 jcalonso joined #git
06:51 BaneAliens joined #git
06:51 BaneAliens p_d:
06:52 K1ck3dByC0ns0l3 joined #git
06:52 BaneAliens p_d: adding a file and pushing it doesn’t mean a pull request
06:53 p_d BaneAliens: so what excatly should I do to add/push a new file in Quick_Sort directory of https://github.com/jainaman224/Algo_Ds_Notes?
06:54 BaneAliens push it up to your fork repo. Then click on the create pull request
06:54 cdown joined #git
06:54 BaneAliens https://help.github.com/artic​les/creating-a-pull-request/
06:55 p_d its cloning in my local machine
06:55 sssilver joined #git
06:56 atesc joined #git
06:56 armyriad joined #git
06:59 BaneAliens p_d: I think I saw you forked it though right?
06:59 BaneAliens git commit your change, then git push origin
06:59 p_d BaneAliens: yea
06:59 BaneAliens then go to github.com and createa pull request
06:59 p_d okay
07:00 basiclaser joined #git
07:00 Raging_Hog joined #git
07:04 jozwior joined #git
07:05 aesycos joined #git
07:05 freimatz joined #git
07:05 brillenfux joined #git
07:06 Salander27 joined #git
07:08 resurtm joined #git
07:10 jfr joined #git
07:13 imightbestupid12 joined #git
07:13 imightbestupid12 how much is linus torvalds worth as a salaried worker?
07:14 grawity how would we know
07:14 imightbestupid12 guess?
07:14 imightbestupid12 idk
07:14 sgtbigman git = the great income tracker ;)
07:15 imightbestupid12 very creative
07:15 User458764 joined #git
07:17 BaneAliens imightbestupid12: looking to hire him?
07:17 imightbestupid12 i'm curious since he's very good at what he does but he's also an unbearable asshole
07:19 chele joined #git
07:20 Guest24432 joined #git
07:21 sgtbigman Surely if you are able to make a statement like that, you should know his salary...
07:21 imightbestupid12 have you ever met that guy?
07:21 imightbestupid12 i have and other people who met him too say nearly identifal things
07:22 lindenle joined #git
07:23 cqi joined #git
07:25 Sceorem joined #git
07:27 Lynxium joined #git
07:28 jfr joined #git
07:29 jcalonso joined #git
07:30 xall_ joined #git
07:30 shmuli joined #git
07:30 Xuefer joined #git
07:31 wrouesnel joined #git
07:35 [twistii] joined #git
07:36 xall joined #git
07:39 cyan__ joined #git
07:39 PCatinean joined #git
07:40 mehola joined #git
07:40 User458764 joined #git
07:42 SocratesTV joined #git
07:42 Lynxium joined #git
07:43 gigq joined #git
07:43 hahuang61 joined #git
07:45 ISmithers joined #git
07:47 simple2x joined #git
07:48 aidalgol joined #git
07:48 sssilver joined #git
07:49 mrpacket_ joined #git
07:50 eduardas_m joined #git
07:50 resurtm joined #git
07:53 usm4n joined #git
07:56 cagedwisdom joined #git
07:58 p_d anyone on here?
07:59 xall_ joined #git
08:02 LucaTM joined #git
08:03 davix joined #git
08:04 corsibu joined #git
08:05 duckgoose joined #git
08:05 jrheat joined #git
08:06 qpdb joined #git
08:07 govg joined #git
08:08 jcalonso joined #git
08:08 nilg joined #git
08:09 pweh joined #git
08:09 shmuli joined #git
08:11 shmuli joined #git
08:14 ochorocho__ joined #git
08:15 danslo joined #git
08:15 davix joined #git
08:16 tobiasvl p_d: sure
08:16 pweh left #git
08:17 corpsicle joined #git
08:17 vannorden joined #git
08:18 p_d tobiasvl: issue is resolved now thanks
08:20 atesc joined #git
08:21 jottr joined #git
08:22 ahmedelgabri joined #git
08:25 xaa joined #git
08:25 brk_ joined #git
08:25 resurtm joined #git
08:27 Endarked joined #git
08:28 mischat joined #git
08:30 [twistii] good old rubber duck, eh ?
08:30 kimonorouge joined #git
08:30 pokalyis joined #git
08:31 mikecmpbll joined #git
08:32 Jackneill_ joined #git
08:33 ojdo joined #git
08:34 Balliad joined #git
08:35 Gonzo89 joined #git
08:38 encod3 joined #git
08:38 Vasa joined #git
08:39 Balliad joined #git
08:40 Vasa hello, in my .gitignore I want to ignore the directory out, but allow all the .exe files in out/artifacts/artifacts/*/*.exe  ,the first * stands for ANY DIRECTORY, here is what I tried http://pastebin.com/6F4Yg46a what did i do wrong?
08:41 tobiasvl Vasa: you want the .exe files inside out/artifacts/artifacts/ to be tracked too?
08:41 Vasa yes exactly
08:41 tobiasvl then you probably want !out/artifacts/artifacts/**/*.exe
08:41 gitinfo [!flexible] git's status as a Distributed VCS really means that it is flexible - you can build any layout of repos you like to suit your !workflow. Here are some diagrams of common ones: http://git-scm.com/about/distributed
08:41 tobiasvl what the. that message from gitinfo was unintended.
08:41 tobiasvl Vasa: anyway, ** means "zero or more directories"
08:42 Vasa !out/artifacts/artifacts/**/*.exe
08:42 gitinfo [!flexible] git's status as a Distributed VCS really means that it is flexible - you can build any layout of repos you like to suit your !workflow. Here are some diagrams of common ones: http://git-scm.com/about/distributed
08:42 Vasa it seems to still ignore the .exes
08:42 snthsnth joined #git
08:42 tobiasvl make a paste with the output git status
08:42 Vasa well I don't need multiple directory
08:42 Vasa one sec
08:42 tobiasvl you don't? sounded like you did
08:43 Vasa it can be multiple, but it doesn't have to, the problem is,  here is an examle path: !out/artifacts/artifacts/C​GFetcher_jar/CGFetcher.exe
08:43 gitinfo [!flexible] git's status as a Distributed VCS really means that it is flexible - you can build any layout of repos you like to suit your !workflow. Here are some diagrams of common ones: http://git-scm.com/about/distributed
08:44 Vasa but those CGFetcher_jar/CGFetcher.exe can be anything: */*.exe
08:44 nilg joined #git
08:44 tobiasvl you don't need to put a ! in front of file paths (especially when gitinfo triggers on them) ;)
08:44 tobiasvl ah OK
08:45 Vasa hmm I ran git status
08:45 Vasa On branch master
08:45 Vasa nothing to commit, working directory clean
08:45 Vasa i guess its because I already commited and pushed
08:46 Vasa do you think what I want is not possible and I should just direct file approach which worked for sure but a bit more cumbersome?
08:46 nilg` joined #git
08:47 tobiasvl should be possible
08:49 Vasa ohh I think I made a mistake!
08:50 corpsicle joined #git
08:52 Vasa well I don't know I will just use the direct approach unfortunately
08:52 Vasa thank you anyway :)
08:56 nan2 joined #git
08:56 nan2 joined #git
08:56 kurkale6ka joined #git
08:57 mikecmpbll joined #git
08:57 nan2 joined #git
08:58 nan2 joined #git
08:59 govg joined #git
08:59 nan2 joined #git
09:00 nan2 joined #git
09:00 lss8 joined #git
09:01 reducesuffering joined #git
09:03 corpsicle joined #git
09:04 mooru joined #git
09:09 laumann joined #git
09:14 GavinMagnus joined #git
09:15 someone235 joined #git
09:16 TomyWork joined #git
09:18 mischat joined #git
09:19 nilg joined #git
09:20 pitastrudl joined #git
09:21 lordjancso joined #git
09:22 jcalonso joined #git
09:22 pitastrudl joined #git
09:26 Repox joined #git
09:27 dan2k3k4 joined #git
09:28 xall joined #git
09:28 King_Hual joined #git
09:28 resurtm joined #git
09:30 User458764 joined #git
09:31 Rumbles joined #git
09:31 wagle joined #git
09:31 Rumbles Hi, , I was trying to figure out how to convert a simple check, which I can run on some files I hold on my local git branch, I've written in python, in to a server side pre-receive hook: http://stackoverflow.com/questions/403221​11/bitbucket-external-hook-how-do-i-recon​struct-the-folder-structure-of-the-git-re
09:32 Rumbles when I run the check remotely it runs in from hat looks like a git bare repo, so my check doesn't work
09:33 Rumbles is there any way to convert the content of the working bare directory to the branch I am pushing so the check can be run?
09:34 grawity either use `git show` to extract specific files, or one of the !deploy methods to extract the whole commit
09:34 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
09:34 tobiasvl (note: I answered the SO question with general info about bitbucket/CI)
09:39 jknetl joined #git
09:40 j416 joined #git
09:42 Rumbles I would disagree that tobiasvl has answered my question
09:43 tobiasvl well, I meant I added an answer on SO. but feel free to ask away here
09:44 hahuang61 joined #git
09:46 User458764 joined #git
09:46 bdeferme joined #git
09:47 tlaxkit joined #git
09:48 fuchstronaut joined #git
09:52 reducesuffering joined #git
09:54 jozwior joined #git
09:54 cyan__ joined #git
09:55 tobiasvl I wonder who suddenly downvoted two of my years-old SO questions
09:55 j416 joined #git
09:57 ShapeShifter499 joined #git
10:02 User458764 joined #git
10:04 [twistii] joined #git
10:05 brk_ joined #git
10:06 nettoweb joined #git
10:12 notebox joined #git
10:12 bremner it definitely wasn't me. nosir.
10:13 dodobrain joined #git
10:13 lss8 joined #git
10:13 lss8 joined #git
10:14 alhariel joined #git
10:14 xall_ joined #git
10:15 rnsanchez joined #git
10:15 umask077 joined #git
10:15 pokalyis joined #git
10:17 Corosus joined #git
10:18 tobiasvl yeah, it was a rhetorical question ;)
10:21 achadwick joined #git
10:22 bernardio joined #git
10:22 jottr joined #git
10:24 rahtgaz joined #git
10:25 mehola joined #git
10:25 tofu00 joined #git
10:29 JanC_ joined #git
10:31 manuel_ joined #git
10:31 Knirch is there a way to find commits that ADDED a specific word? like -G/-S but only for additions?
10:35 usm4n joined #git
10:35 avar --diff-filter=A -Gfoo
10:35 avar or any number of other diff-filter options..
10:39 PioneerAxon joined #git
10:43 kedare joined #git
10:43 msonntag joined #git
10:44 fuchstronaut joined #git
10:44 fuchstronaut joined #git
10:44 t0by joined #git
10:45 nanga joined #git
10:45 nanga joined #git
10:45 raijin joined #git
10:46 Xuefer_oNctX joined #git
10:46 lmatteis joined #git
10:49 nanga joined #git
10:49 nanga joined #git
10:51 Knirch avar: right, my question was unclear. I was aiming for when the occurance went up, diff-filter A will limit to added files, not added occurances. but I think my reasoning is flawed as to why I think I need this, so I'll have to reconsider my use case
10:53 dan2k3k4 joined #git
10:56 ulkesh joined #git
10:56 mizu_no_oto joined #git
10:59 avar Knirch: Ah, misunderstood, yeah from my reading of the manpage I don't think it can do that currently
10:59 Sonderblade when you get a conflict in a file, is there a way to automatically select the upstreams version without having to edit the file?
11:00 avar Should be diff-filter=+ or --diff-filter=-
11:00 avar Sonderblade: git checout --ours / --theirs <file>
11:00 bruce_lee joined #git
11:00 bruce_lee joined #git
11:01 fees joined #git
11:05 Sonderblade thanks
11:05 xall joined #git
11:07 jknetl joined #git
11:08 phunkren_ joined #git
11:09 liuzhen joined #git
11:10 phunkren_ left #git
11:10 phunkren_ joined #git
11:10 phunkren_ Hi
11:11 phunkren_ I'm setting up a project that multiple developers will be working on. How can I ensure that each of their commit messages contain a ticket number reference? I have the regex stored in a .githooks file, but I can still commit without the ticket reference
11:11 bremner .githooks??
11:11 Sceorem_ joined #git
11:11 phunkren_ Hi bremner
11:11 phunkren_ Here is my regex
11:11 phunkren_ http://pastebin.com/v1sVnkyk
11:12 bremner .githooks is not a thing in git
11:12 dimi1947 joined #git
11:12 phunkren_ Strange. I pulled this file from a previous project. Not sure why it was stored in that file
11:13 phunkren_ Ok, then scrap that. So I have the regex, how can I ensure that this runs when all developers try to commit
11:13 bremner man githooks
11:13 gitinfo the githooks manpage is available at http://jk.gs/githooks.html
11:13 dimi1947 what does it mean that the repository has loose objects...sometimes when I open git a popup window appears showing this...
11:14 phunkren_ bremner so commit-msg looks to be what I'm after, but since the hooks folder is not tracke din the repository I can't remove the .sample extension on other developer's machines
11:14 phunkren_ *tracked in
11:15 bremner phunkren_: yes, you need to get them to configure the hook, e.g. by running a script
11:16 iyxu joined #git
11:16 phunkren_ bremner could you point me to some documentation that would help me set up said script? I'm using npm and gulp if that helps?
11:16 bremner or you can run a hook on push, but that would be more complicated (and not possible on hosting services)
11:16 bremner phunkren_: it's a 2 line bash script
11:17 jeffreylevesque joined #git
11:17 bremner cp file .git/hooks/hook-name
11:17 yetithefoot joined #git
11:17 kimonorouge joined #git
11:20 traxo-xx joined #git
11:21 phunkren_ Thanks bremner
11:21 tobiasvl dimi1947: a popup window? sounds like you're using some !gui? what does it say exactly? it's likely warning you that you have commits that aren't pointed to by any ref, so the commits might be garbage collected and lost at some point
11:21 gitinfo dimi1947: Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
11:22 jaguarmagenta joined #git
11:23 pokalyis joined #git
11:23 liuzhen joined #git
11:25 Juzzika joined #git
11:26 xall_ joined #git
11:26 mehola joined #git
11:26 brk_ joined #git
11:27 robotroll joined #git
11:27 meth joined #git
11:28 Masber joined #git
11:28 kimonorouge joined #git
11:30 Jameser joined #git
11:33 qpdb joined #git
11:34 _cyril_ joined #git
11:36 meth joined #git
11:39 User458764 joined #git
11:40 PCatinean joined #git
11:42 Mir4g3 joined #git
11:45 hahuang61 joined #git
11:49 dimi1947 gitinfo:yes indeed I am referring to the GUI...is git CLI another channel?
11:50 PCatinean joined #git
11:50 Thorn joined #git
11:51 grawity no, git GUIs are another channel
11:52 tobiasvl what is "the GUI"
11:53 PCatinean joined #git
11:54 resurtm joined #git
11:56 shubhnik joined #git
11:57 moritz the one GUI for git, obviously :-)
11:57 fuchstronaut joined #git
12:00 K1ck3dByC0ns0l3 joined #git
12:01 dimi1947 grawity:I cannot find git GUIs...is it on Freenode
12:03 johnmilton joined #git
12:03 inflames joined #git
12:03 synthroid joined #git
12:03 fuchstronaut joined #git
12:04 bcardarella joined #git
12:07 umask077 joined #git
12:07 PCatinean joined #git
12:07 fuchstronaut joined #git
12:10 dan2k3k4 joined #git
12:10 fuchstronaut joined #git
12:13 LucaTM joined #git
12:13 encod3 joined #git
12:16 drbean joined #git
12:17 ngperfex joined #git
12:23 umask077 joined #git
12:23 Rumbles joined #git
12:27 jottr joined #git
12:28 robattila256 joined #git
12:31 tvw joined #git
12:31 [twistii] joined #git
12:32 XVar joined #git
12:32 jeffreylevesque joined #git
12:35 acetakwas joined #git
12:35 encod3 joined #git
12:37 Starky joined #git
12:38 doener joined #git
12:40 Geee` joined #git
12:41 shiriru joined #git
12:41 bsanford joined #git
12:41 jottr joined #git
12:43 King_Hual joined #git
12:45 alcohol dimi1947: there are many GUI implementations. try to find the support channels (mail, forum, irc, whatever) for whichever you are using.
12:46 fuchstronaut joined #git
12:46 Geee` i'm trying to build a game with a team of people, but we don't know if everything should go on git, if i may quote a member of the team: "Git is for code sharing and not for uploading assets, textures and whatnot. I don't know how big softwares are doing that."
12:47 Geee` any idea ?
12:47 Cavallari joined #git
12:47 [twistii] git is fine for sharing assets as long as you are not talking gigabytes
12:48 DieguezZ joined #git
12:50 sixtyten joined #git
12:50 XVar joined #git
12:52 thebigj left #git
12:54 anonymuse joined #git
12:55 canton7 Geee`, the problem with tracking binary stuff in git is that every time the binary file changes, the size of the repo increases by the size of that file. So if you have textures which keep changing, for example, git isn't going to be a good fit for them.
12:55 subhojit777 joined #git
12:55 canton7 Geee`, there are various extensions (!binary), or using something like SVN for your binary assets isn't a bad shout
12:55 gitinfo Geee`: Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions
12:55 canton7 bleh, !annex
12:55 gitinfo git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs
12:57 Geee` ok great, thanks
13:00 ahmed_elgabri joined #git
13:00 nilg` joined #git
13:00 nickthetait joined #git
13:02 PioneerAxon joined #git
13:05 ash_workz joined #git
13:06 m1dnight2 joined #git
13:08 GavinMagnus left #git
13:10 corsibu joined #git
13:10 jbitdrop joined #git
13:16 jeffreylevesque joined #git
13:16 Xuefer joined #git
13:17 User458764 joined #git
13:17 Gsham joined #git
13:17 ronybeck joined #git
13:18 ronybeck Where are client side hooks stored?  Are they downloaded when cloning?
13:20 Darren_ joined #git
13:21 danslo joined #git
13:22 Seveas .git/hooks and nope, that would be a security risk.
13:22 akurniawan joined #git
13:22 ngperfex joined #git
13:23 re1_ joined #git
13:23 ronybeck so if I want to write a hook that takes the tag name and writes that to a file, that is impossible?
13:24 ToBeCloud joined #git
13:24 Seveas there's nothing impossible about that but this smells like an !xy problem
13:24 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
13:25 lindenle joined #git
13:25 ronybeck So what I want to do is be sure what tag version is really running on a system.  I thought that a git hook might be good for updating the version number automatically so that the programmer didn't have to remember to do it himself each time they make a new tage.
13:25 ronybeck *tag
13:25 zumba_addict joined #git
13:25 ronybeck bad idea?
13:26 corsibu joined #git
13:26 grawity "running on a system"?
13:26 ronybeck PC
13:26 ronybeck Server
13:26 ronybeck System
13:26 grawity if the development happens one system and then the program is built/deployed elsewhere,
13:26 grawity do that as part of the build/compile/deploy steps
13:26 ronybeck grawity: That is a typical scenario
13:27 grawity many C/C++ projects call `git describe` during compilation
13:27 PCatinean joined #git
13:27 ronybeck Ah ok
13:27 ronybeck That could work
13:27 pokalyis joined #git
13:28 mehola joined #git
13:28 grawity that way, you always get the version number that's being compiled
13:28 ronybeck Thanks.  That is perfect!
13:28 grawity not just whatever tag happens to be mots recent
13:29 meth joined #git
13:29 p_d Can I send two pull request to same repo? same day
13:30 madewokherd joined #git
13:30 fahadash joined #git
13:31 osse p_d: Yes. Why do you ask?
13:31 p_d osse: Do I need to fork again that repo? two make pull request again?
13:32 p_d to*
13:32 JamesBaxter joined #git
13:34 p_d Do I?
13:35 ExoUNX joined #git
13:38 jozwior joined #git
13:39 jottr joined #git
13:39 Raed|Mobile joined #git
13:40 p_d Anyone on ?
13:40 cdg joined #git
13:40 joki joined #git
13:40 Es0teric joined #git
13:40 stux|RC-only joined #git
13:42 serses joined #git
13:42 serses If I go into gitlab i see a list of projects. Are each one of the projects a repository?
13:42 canton7 serses, yeah
13:42 grawity afaik, no, gitlab projects are groups of repositories
13:42 canton7 ah, I stand corrected
13:43 grawity or am I confusing it with gitorious
13:43 PCatinean joined #git
13:43 serses ok so is there a git command to get a list of repositories that I can checkout ?
13:43 Lipp joined #git
13:44 FilipNortic_ joined #git
13:44 Noldorin joined #git
13:44 osse p_d: You can make two from the same
13:45 p_d how please explain the process please
13:45 tobiasvl serses: no, git doesn't know about gitlab's list of repos
13:45 hahuang61 joined #git
13:48 xameada joined #git
13:51 kadoban joined #git
13:51 rnsanchez_ joined #git
13:51 e14 joined #git
13:52 Dougie187 joined #git
13:52 User458764 joined #git
13:54 akurniawan joined #git
13:54 PHPanos joined #git
13:55 anonymuse joined #git
13:56 stuivi joined #git
13:56 sangy joined #git
13:56 boombatower joined #git
13:57 refried_ joined #git
13:58 BSaboia how can I use git log and know how many commit messages have more than one line?
13:58 dimi1947 joined #git
14:00 mostlybadfly joined #git
14:00 introx joined #git
14:00 introx_ joined #git
14:02 fuchstronaut joined #git
14:03 jaguarmagenta joined #git
14:03 CheckDavid joined #git
14:05 meth joined #git
14:05 Andrew_K|2 joined #git
14:08 p_d Is their any good Video or tutorial to learn to PR via branches?
14:08 fuzzy joined #git
14:09 akurniawan joined #git
14:09 tobiasvl p_d: are you using github? https://help.github.com/art​icles/about-pull-requests/
14:10 p_d tobiasvl: yes
14:10 tobiasvl p_d: like osse said you can have as many pull requests from a fork as you wish, but only one per branch. the most common workflow is to create a new branch every time you develop a new feature.
14:11 _ikke_ BSaboia: There is no easy way
14:11 pdgwien joined #git
14:11 jbeeze joined #git
14:11 sword joined #git
14:12 IrishPrime joined #git
14:12 systemovich joined #git
14:13 IrishPrime joined #git
14:14 p_d tobiasvl: Okay so I need to learn about branches :|
14:15 tobiasvl p_d: https://git-scm.com/book/en/v2/Git​-Branching-Branches-in-a-Nutshell
14:15 p_d thanks for the tutorial
14:16 Miika-- left #git
14:16 shinnya joined #git
14:16 ShekharReddy joined #git
14:17 bannakaffalatta joined #git
14:22 BadSnappa joined #git
14:22 ResidentBiscuit joined #git
14:23 evanc joined #git
14:24 mischat joined #git
14:25 jaguarmagenta joined #git
14:26 spaceone joined #git
14:28 m1dnight_ joined #git
14:28 User458764 joined #git
14:28 iamthad joined #git
14:28 thebope joined #git
14:29 thebope joined #git
14:29 a_thakur joined #git
14:32 matsaman joined #git
14:32 Derperperd joined #git
14:34 Ahmed90 joined #git
14:36 kimonoro_ joined #git
14:37 howdoi joined #git
14:38 Ryanar joined #git
14:38 AaronMT joined #git
14:38 StrongJava joined #git
14:39 f0g joined #git
14:39 lucazz joined #git
14:39 lucazz hi guys, quick question
14:39 _ikke_ you have 5 seconds :P
14:39 lucazz lol
14:40 lucazz is possible for me to write a pre-push hook to check the SSH key fingerprint from the user that is pushing content to my repo?
14:40 lucazz in order to either enable or disable force pushes
14:40 _ikke_ Sounds a lot like what gitolite does
14:41 _ikke_ (it uses ssh's authorized keys command option)
14:41 lucazz the main idea here is to disallow all developers to force push
14:41 lucazz and only all the team lead to do so
14:41 _ikke_ lucazz: You might want to checkout !gitolite
14:41 gitinfo lucazz: Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/
14:41 lucazz kool
14:41 foist joined #git
14:41 lucazz hmm
14:42 lucazz the thing is, we're not hosting out own git central server
14:42 _ikke_ What are you using then?
14:42 lucazz we're using Acquia (which behaves just like Heroku)
14:42 p_d well I need to PR in other person repo.. it has already two branches master and other(idk name) can I create another branch and then will I be able to PR on that repo?
14:43 _ikke_ p_d: Use, you can create as many branches as you want (make sure they're all based on master, not on eachother)
14:43 lucazz p_d: I think so, you can make PR's against bot branches that already exists on the repo
14:43 p_d based on master? i didnt get that
14:44 lucazz branches are made from the master branch
14:44 lucazz so when you push your shinny new branch to your git server, it'll also be a branch from the master branch
14:44 JamesBaxter joined #git
14:44 lucazz as well as the one that's already in place
14:44 lucazz all branches come from master
14:45 _ikke_ Branches can be created on any other branch
14:45 _ikke_ master is in no way special
14:45 p_d lucazz: okay i understand now
14:45 p_d okay
14:46 mrpackethead joined #git
14:46 kevwil joined #git
14:46 Xuefer joined #git
14:47 lucazz so, _ikke_  back to what I was saying
14:48 lucazz since we're hosting our site on something like Heroku, deploying our own git service is not the right way to go, IMHO
14:49 lamont joined #git
14:49 fuchstronaut joined #git
14:50 danslo joined #git
14:50 howdoi !logs
14:50 gitinfo [!irclog] Public logs of #git are kept at: http://colabti.org/irclogger/irclogger_log/git or look at stats for the last 30 days: http://itvends.com/irc/git.html or since Jan 1, 2012: http://itvends.com/irc/git-all.html
14:51 p_d Okay so I'm in my new branch right now.. I have finished up coding work ..so now can I add the new file(i'm at new brach right now)?
14:52 lucazz it depends on what command you used to create this new branch
14:52 lucazz you can either do something like `git checkout -b branch_name_here`
14:52 p_d I've used git branch brannch_name
14:52 lucazz that'll create the new branch and change to it
14:52 lucazz or
14:52 lucazz you can create the branch, just like you did
14:53 lucazz but now you'll have to change to it. to do so, run:  `git checkout branch_name`
14:53 xshuiniu joined #git
14:54 p_d so i need to run git checkout master..right?
14:54 BackEndCoder joined #git
14:54 sammyo joined #git
14:55 p_d I havent run git add or commit like that (within my new branch) ?
14:55 matoro joined #git
14:55 WhiskerBiscuit joined #git
14:57 eduardas_m joined #git
14:58 p_d and whats excatly git add -A used for?
14:58 al-damiri joined #git
14:58 dviola joined #git
14:58 aarobc joined #git
15:00 phaleth joined #git
15:00 inflames joined #git
15:01 belak joined #git
15:02 saml joined #git
15:02 alcohol https://github.com/composer/compose​r/pull/5831#issuecomment-257316353 did i describe this right? and is there a simpler approach?
15:02 mischat_ joined #git
15:03 dminuoso_ joined #git
15:04 dminuoso_ Hi. I have commits A->B and A->C->D->E - how can I rebase all commits starting from C onto B?
15:04 mischat_ joined #git
15:04 alcohol dminuoso_: so you have 2 branches?
15:04 dminuoso_ alcohol: No :(
15:05 alcohol huh?
15:05 Es0teric joined #git
15:05 dminuoso_ just itchy fingers
15:05 fuchstronaut joined #git
15:07 Seveas if you don't have 2 barnches, you can't have a->b and a->c :)
15:08 raijin joined #git
15:09 crose joined #git
15:10 dreamer joined #git
15:10 fuchstronaut joined #git
15:10 dminuoso_ Seveas: uhh, I have to figure this one out.
15:10 fuchstronaut joined #git
15:10 Seveas dminuoso_: try a !lol
15:10 gitinfo dminuoso_: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
15:10 dreamer hmmm, any clien-tips for selectively merging branches? (particularly on the line-level)
15:10 dreamer client*
15:11 kyan joined #git
15:11 Seveas if you want to integrate only certain lines, you're not merging.
15:11 dreamer ok, what would you call this then?
15:12 Seveas you're cherry picking. So cherry-pick -n and commit -p
15:12 Learath2 joined #git
15:12 _ikke_ lucazz: Then you have to look at what the product you are using offers
15:14 rkazak joined #git
15:14 dminuoso_ Seveas: I figured it out. I simply said "screw it and fix this properly" and ended up just resetting to the bad state and rebasing the way I needed it to. :)
15:14 dminuoso_ reflog is a bless
15:15 lucazz @_ikke_ It offers us simple git hosting
15:16 lucazz That's why I'm going with hit hooks
15:16 lucazz That's pretty much all the triggering I have
15:16 aax joined #git
15:16 _ikke_ the triggers don't know about ssh
15:17 dminuoso_ I cant figure this out - every time I rebase and reorder things, one commit disappears.
15:18 moritz .oO( leaky pipeline )
15:19 corsibu joined #git
15:19 ArchNoob joined #git
15:20 xaa__ joined #git
15:20 ArchNoob I just made a silly git commit -m "silly message" how do i edit that comment?
15:20 dreamer Seveas: sorry I can't find how cherry-picking can select particular lines in a commit
15:20 osse ArchNoob: commit --amend
15:20 le_melomane joined #git
15:20 ArchNoob thanks!
15:20 nawwmz joined #git
15:21 dviola joined #git
15:22 jaafar joined #git
15:23 kpease joined #git
15:24 p_d I have a new query :/
15:24 iota_pi joined #git
15:26 fuchstronaut joined #git
15:27 dminuoso_ This is silly, I cant get rid of this silly merge commit.
15:27 svm_invictvs joined #git
15:28 Es0teric joined #git
15:30 amz3 joined #git
15:34 zivester joined #git
15:35 berndj joined #git
15:38 pks joined #git
15:39 SwiftMatt joined #git
15:42 dunk joined #git
15:43 alex1a joined #git
15:46 nettoweb joined #git
15:46 hahuang61 joined #git
15:46 railssmith joined #git
15:46 Awesomecase joined #git
15:49 fuchstronaut joined #git
15:49 Dohplay joined #git
15:49 hackal joined #git
15:50 hackal joined #git
15:50 hackal Hi, how can I roll back to specific commit?
15:51 _ikke_ Do you want to undo all commits following that commit?
15:51 _ikke_ And have you pushed any of those commits?
15:51 King_Hual joined #git
15:51 King_Hual joined #git
15:52 hackal No, I just need to change my local to which they were at specific commit in past
15:53 cdown_ joined #git
15:54 irqq joined #git
15:56 thiago hackal: git checkout thatcommithere
15:56 Starky joined #git
15:56 p_d I have created a new branch..added a file (command i used- git add folder/filename) then i run git commit -a .. but then it says "On branch b1
15:56 p_d nothing to commit, working tree clean
15:56 p_d " hows this possible?
15:56 kimonorouge joined #git
15:57 thiago p_d: why that .. ?
15:57 p_d idk why this happpen?
15:57 thiago p_d: why did you type it?
15:57 _cyril_ joined #git
15:57 p_d which command?
15:57 thiago git commit -a ..
15:58 p_d https://www.kernel.org/pub/softwa​re/scm/git/docs/gittutorial.html  see Managin branches part
15:58 thiago p_d: !repro
15:58 gitinfo p_d: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
15:58 p_d i'm following this tutorial
15:58 einnjo joined #git
15:59 jccn joined #git
16:00 p_d thiago: then what should I do after adding the new file? (I'm in a new branch right now)
16:00 xall_ joined #git
16:00 joki joined #git
16:00 thiago p_d: pastebin the terminal so I can tell you
16:00 p_d thiago: sure
16:01 UTAN_dev joined #git
16:02 p_d http://pastebin.com/4Q7wzTQc
16:02 p_d P.S- I am completely new to git
16:03 mischat joined #git
16:03 Es0teric joined #git
16:04 Electrometro joined #git
16:04 amz3 left #git
16:04 nickthetait1 joined #git
16:04 thiago that git add didn't add anything
16:05 thiago are you sure Depth_First_Search/Depth_First_Search.c exists and is a regular file?
16:06 p_d Depth_First_Search.c is in another Drive(D)
16:06 p_d should I add this in the default drive(C)?
16:07 anth0ny joined #git
16:07 irqq joined #git
16:07 Electrom_ joined #git
16:08 thiago what do you mean "is in another drive" ?
16:08 kadoban joined #git
16:08 thiago is Depth_First_Search/ a mountpoint?
16:08 thiago or a symlink?
16:08 p_d thiago: the forked repo is in C drive and depth_first_Search.c is on other Drive(D)
16:09 p_d I'm using windows
16:09 ojdo joined #git
16:09 p_d or u can say at other partition
16:09 p_d idk if it wil be correct to say
16:10 thiago p_d: so is Depth_First_Search/ the place where the D drive is mounted?
16:11 thiago how can a file in a subdir be in another drive?
16:11 thiago anyway, I'm going to go ahead and assume that Git won't work with files split across different drives.
16:11 p_d nope the folder and file exists in different partitions
16:12 p_d okay i will add it to the same drive
16:12 e14 joined #git
16:13 msonntag joined #git
16:14 dviola joined #git
16:15 svm_invictvs joined #git
16:16 Jameser joined #git
16:16 red82 joined #git
16:18 qpdb joined #git
16:20 govg joined #git
16:22 ChristopheT joined #git
16:26 nikivi joined #git
16:26 eivarv joined #git
16:28 aarobc joined #git
16:28 _ng joined #git
16:29 jaguarmagenta joined #git
16:29 vals_ joined #git
16:31 mischat joined #git
16:32 ieee joined #git
16:32 K1ck3dByC0ns0l3 joined #git
16:32 rewt`` joined #git
16:32 kadoban joined #git
16:34 vuoto joined #git
16:34 meauses_ joined #git
16:34 meauses joined #git
16:34 Faylite joined #git
16:36 durham joined #git
16:37 shmuli joined #git
16:38 inflames joined #git
16:38 a_thakur joined #git
16:38 ngrin joined #git
16:40 resurtm2 joined #git
16:41 resurtm2 joined #git
16:41 InfoTest joined #git
16:42 JanC_ joined #git
16:44 lucazz @_ikke_: you mean, I can't write some bash script to check fingerprints and put it as a per-push hook?
16:45 _ikke_ iirc, there is no easy way to get the fingerprint being used
16:45 _ikke_ lucazz: Do you have access to the .ssh/authorized_keys file?
16:46 lindenle joined #git
16:46 resurtm joined #git
16:46 crayon joined #git
16:47 bluezone joined #git
16:48 vannorden joined #git
16:48 User458764 joined #git
16:49 User458764 joined #git
16:49 User458764 joined #git
16:50 xall joined #git
16:50 p_d How do I remove/undo the commit ..i just commited?
16:50 bluezone p_d: you can use git reset
16:50 _ikke_ do you want to keep the changes?
16:50 ilmari p_d: if you haven't pushed it yet, git reset HEAD^
16:51 p_d i have pushed i can see in my github a/c
16:51 King_Hual joined #git
16:51 p_d whats the complete command
16:51 p_d _ikke_: nope
16:51 ngrin_ joined #git
16:51 bluezone if you don't want to keep your changes: git reset --HARD (commit-id you want to go back to)
16:51 _ikke_ git reset --hard HEAD~
16:52 ngrin joined #git
16:52 _ikke_ that also undoes any uncomitted changes though
16:52 StrongJava joined #git
16:52 bluezone _ikke_: how come it was HEAD^ previously
16:52 ilmari git push --force # to reset the remote as well
16:52 ilmari but see !rewrite
16:52 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
16:52 _ikke_ HEAD~ and HEAD^ are equal, but HEAD~2 and HEAD^2 are not
16:53 bluezone what is the difference?
16:53 _ikke_ ^ means parent
16:53 annoymouse joined #git
16:53 _ikke_ only merge commits have more then one parent
16:53 p_d is this only -> "git reset --hard" ?
16:53 _ikke_ ~ means ancestor
16:53 _ikke_ No
16:54 p_d oh
16:54 p_d then what?
16:54 _ikke_ p_d: i gave you the command
16:54 _ikke_ bluezone: see man gitrevisions
16:54 gitinfo bluezone: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
16:54 Random832 HEAD~2 is HEAD^^ right?
16:54 p_d is this only "git reset --hard HEAD~" ??
16:54 irqq_ joined #git
16:54 bluezone If I understood man pages I would have already taken over the world :(
16:54 _ikke_ Random832: correct
16:55 p_d i just want to remove my last commit
16:55 meauses joined #git
16:55 meauses_ joined #git
16:55 p_d _ikke_: am i right there?
16:55 _ikke_ p_d: yes
16:55 p_d okay i m about to run ..i will get back to you soon
16:56 bluezone so ilmari you are suggesting manually undoing the changes and pushing again?
16:56 Random832 of course, technically they won't *have to*, it's just the next time they pull they'll get a messy merge commit that may end up putting back stuff that you tried to undo
16:57 p_d _ikke_: It says "HEAD is now at 42b2ef4 Added Depth First Search Implementation in C
16:57 p_d "   ... "Depth First Search Implementation in C
16:57 p_d " is my commit message
16:57 ngrin joined #git
16:57 ilmari bluezone: depends on whether anyone has actually fetched those changes yet, and how annoyed they will be at having to rebase
16:58 p_d have i successfully removed my changes?
16:58 leeN joined #git
16:58 p_d I have seen my github repo change is still there :/ what should I do now?
16:58 navidr joined #git
16:59 ilmari p_d: you need to 'git push --force-with-lease' as well
16:59 ilmari p_d: but that will annoy anyone who's already fetched the commit
16:59 ilmari see what gitinfo said about rewriting earlier
17:01 WhiskerBiscuit joined #git
17:01 p_d ilmari: yea now the commit has been removed thanks dude
17:03 lucazz Hmmm
17:03 lucazz Idk, I'd have to check
17:04 usm4n joined #git
17:04 WayToDoor joined #git
17:04 p_d anyone of you guys on? needed a quick help
17:04 p_d sorry for typo
17:06 floatingman joined #git
17:06 p_d anyways i will post my question
17:09 jstimm joined #git
17:09 hahuang61 joined #git
17:09 TomyLobo joined #git
17:09 nitric joined #git
17:10 stomplee joined #git
17:10 gtrmtx left #git
17:10 rapha joined #git
17:10 rapha Hi!
17:11 rapha I've a submodule where I committed quite a lot of stuff and it shows up in 'git log', too, but it never got pushed to upstream. I keep trying to change and commit things, and *they* always get pushed, just these 5 or 6 commits didn't and don't. Is there a way to figure out what's wrong?
17:12 kimonorouge joined #git
17:12 sbeller_ rapha: did you push in both submodule as well as its superproject?
17:13 rapha sbeller_: I might have forgotten to do that. Let me try...
17:14 p_d IF YOU CLEAR MY PROBLEM YOU ARE A GENIUS- I have a branch and I have a master branch..I have made some changes in my other branch let say(b1)..Now I have already made a PR via master branch on some repo now i wanted to make another PR to the same repo..someone Suggested me this only gonna happen if you create a another branch and make a PR through it ..this is the only way..thats why I made another branch..so now question is how do I make a PR via another branch I
17:14 p_d made ..do anyone have few mins to sort out my problem? this really freakin out me i m trying to resolve this problem from paste 5 hours i guess done a tons of google search but nothin happen :(
17:14 dreiss joined #git
17:14 aard_ joined #git
17:14 laumann joined #git
17:14 rapha p_d: what if noone feels like being a genius today?
17:15 barteks2x joined #git
17:15 p_d p_d: ahh ..i m in sad mood right now
17:16 p_d rapha:* i mean
17:16 StrongJava joined #git
17:16 rapha sorry to hear that :(
17:17 p_d p_d: nevertheless if you can help to make a simple PR can lift my mood
17:17 p_d me*
17:18 sammyo joined #git
17:18 Lauven joined #git
17:20 rapha i'd love to unfortunately i've never had to make a PR anywhere else but from a master to a master branch
17:20 oskarkv joined #git
17:22 shubhnik joined #git
17:22 p_d rapha:say if you need to do two PR on the same repo on the same day? what will you do then?
17:23 rapha p_d: what happens for me on github is that when i commit and push to my forked repo before the first PR got accepted, then the new commit will automatically be made part of the first PR by GitHub
17:24 p_d rapha: oh
17:24 skunkz joined #git
17:25 atrus if a server has a sha that isn't pointed to by any branch or descendant commit, but hasn't been gc'd, is there a way for me, as a client (via ssh) to fetch that sha, so I can point a branch at it?
17:25 thiago joined #git
17:25 thiago joined #git
17:28 SteffanW2 joined #git
17:29 finalbeta joined #git
17:30 algun joined #git
17:31 Starky joined #git
17:31 e14 joined #git
17:31 svm_invictvs joined #git
17:31 skunkz joined #git
17:32 cagedwisdom joined #git
17:33 psprint joined #git
17:34 psprint Hello. I've apparently commited some code in detached head few hours ago. Can I somehow get the commits' oids?
17:34 hariel joined #git
17:34 User458764 joined #git
17:35 Masber joined #git
17:37 railssmith joined #git
17:39 grawity try digging them out of `git reflog` or `git log -g`
17:39 psprint hah, I've commited to tip of master, now I've just put last OID (found in terminal's history) into refs/heads/master and issued git reset --hard
17:40 psprint I was detaching head at tip of master
17:41 Ryanar joined #git
17:42 psprint but reflog had the oids too
17:42 Seveas psprint: the correct way to do that is 'git checkout master && git merge that-commit-id'
17:42 Seveas editing things in .git directly is not recommended
17:42 psprint Seveas: would it perform fast forward?
17:43 Seveas psprint: if fast-forwardable, yes
17:43 psprint I did manual fast forward hehe, learned that when implementing this via libgit2
17:44 Seveas you did a dodgy hack that may have been a fast forward, or you could have lost lots of commits :)
17:45 fahadash joined #git
17:46 Seveas you also broke the reflog for master as your change is not in there
17:49 psprint I would perform the merge if not already done
17:49 psprint after months with libgit2 less things look like hacks
17:50 anonymuse joined #git
17:51 moestevens joined #git
17:51 anonymuse joined #git
17:53 red82 joined #git
17:53 Electrometro joined #git
17:53 shubhnik joined #git
17:53 emg joined #git
17:54 Sasazuka__ joined #git
17:54 Paker joined #git
17:54 railssmith joined #git
17:54 tyreld joined #git
17:54 toydestroyer joined #git
17:54 Ryanar joined #git
17:54 nawwmz joined #git
17:55 matoro joined #git
17:55 d0nn1e joined #git
17:57 xall joined #git
17:58 Darren_ joined #git
18:00 dsantiago joined #git
18:02 skift joined #git
18:02 shmuli joined #git
18:03 dsantiago joined #git
18:03 Ryanar joined #git
18:03 jeffreylevesque joined #git
18:08 railssmith joined #git
18:10 gho5t joined #git
18:10 Ryanar joined #git
18:10 tom[] joined #git
18:11 jstimm joined #git
18:12 mikecmpbll joined #git
18:13 alex1a joined #git
18:14 snthsnth joined #git
18:15 usm4n_ joined #git
18:16 Limes joined #git
18:19 e14 joined #git
18:19 User458764 joined #git
18:20 pfloyd joined #git
18:21 wizardedit joined #git
18:21 pfloyd I initiated a git gc because I was told the team working on the repo would not be using it during this time, but it's still running beyond the expected down time period. would a git push during this time cause any problems?
18:23 jcalonso joined #git
18:24 b7 joined #git
18:27 b7 Hi. I'm new in git. I made some commits to master branch, they were bad and now I want to go back to some commit and start another branch from there, make it master and abandon the current master. How can I do that?
18:29 kulelu88 joined #git
18:29 xall_ joined #git
18:29 dodobrain joined #git
18:29 nyuszika7h joined #git
18:30 ToxicFrog b7: you don't need to create a new branch and "make it master", you can just move master itself.
18:30 ToxicFrog git checkout master; git reset --hard <commit to start over from>
18:30 mwleeds joined #git
18:30 satifant joined #git
18:31 btree joined #git
18:32 b7 ToxicFrog: Thank you. Will the current changes be completely lost or remain in repository as a branch?
18:33 ToxicFrog b7: they will be "lost" in the sense that they'll no longer be reachable from a branch; you'll still be able to get them back if you need to using the reflog (until they get automatically deleted for good in a month or so).
18:34 perlpilot joined #git
18:34 ToxicFrog If you want to keep them around, use 'git branch' or 'git tag' before you reset master.
18:34 Ryanar joined #git
18:35 b7 ToxicFrog: Thank you very much.
18:36 AlexMax joined #git
18:36 AlexMax Question - is the behavior that empty folders are always deleted - is that recent git functionality?
18:36 AlexMax One of my co-workers is claiming that empty folders are not being deleted from their local copy
18:37 Dougie187 AlexMax: Git never tracks empty folders. But if it's added with a .gitignore in it, it won't be ignored.
18:38 AlexMax Dougie187: I mean folders that had data in them, then all files in that folder were deletd
18:38 xall joined #git
18:38 Dougie187 I don't know why git would delete that either
18:38 Dougie187 It wouldn't show up if you cloned it though
18:38 dermoth_ joined #git
18:38 AlexMax in command line git, it appears that if a folder has all files deleted from it, git will delete the folder
18:38 Dougie187 You mean git won't track that folder.
18:38 ilmari AlexMax: git does not track directories, only files
18:39 AlexMax I am aware of this
18:39 Dougie187 I don't know that git would delete it for you. but let me try it.
18:40 Dougie187 AlexMax: It did actually delete the directory for me.
18:40 Dougie187 I couldn't tell you how "new" that is though. I know git hasn't tracked directories since I started using it.
18:41 e14 joined #git
18:41 Dougie187 And I think it hasn't ever tracked directories.
18:41 Groscheri joined #git
18:41 j416 AlexMax: git won't create an empty directory on checkout; and, if you check something out that has deleted everything inside a directory, it will remove the directory entirely
18:41 j416 it does not track directories.
18:41 meauses joined #git
18:41 meauses_ joined #git
18:41 ilmari you can create a .exists file or something in the directory if you want to make sure it gets created on checkout
18:41 Dougie187 ilmari: Or a .gitignore
18:42 j416 correction: it tracks directories if they are not empty.
18:42 Dougie187 but I don't think his question is how to make an empty directory show up
18:42 ilmari Dougie187: that counts as "something" :)
18:42 finalbeta joined #git
18:42 Dougie187 ilmari: True. Just pointing out. Typically people recommend making a .gitignore with "* !.gitignore" in it.
18:43 j416 AlexMax: git won't go and delete emtpy folders just like that unless there is a reason.'
18:43 Dougie187 AlexMax: I'd make sure your co-worker has empty directories. And check their version (Compared to yours)
18:43 Dougie187 j416: Actually, it does
18:43 ilmari Dougie187: yeah, because presumably something will want to put files in there that you dont't want to check in
18:43 ilmari because otherwise why have the empty directory?
18:43 j416 a common convention I have seen is to add a file called .gitkeep; but it seems nicer to avoid creating the folder altogether if possible
18:43 Dougie187 j416: I just tried it, and it definitely deleted the empty directory after a commit that made it empty.
18:43 j416 Dougie187: oh, how?
18:44 j416 Dougie187: yes, that goes into "a reason"
18:44 Dougie187 ilmari: On a project I used to work on, we had an empty directory to dump some generated code into.
18:44 Dougie187 ilmari: So, we'd want the directory to always be created (to help with parallel builds) and always be empty.
18:45 AlexMax Exactly, I want to know if this is a recent thing or if git has always deleted folders where all files in them were removed
18:45 j416 Dougie187: fwiw, my version of git doesn't do that.
18:45 AlexMax j416: what version?
18:45 Dougie187 j416: What version do you have? (I think that's his question)
18:45 j416 current version
18:45 AlexMax ...
18:45 Dougie187 What is "current"
18:45 Dougie187 I'm using 2.7.4
18:45 AlexMax git version 2.10.2
18:45 j416 2.10.2
18:45 Dougie187 ok, let me try updating
18:46 AlexMax I"m using 2.10.2 and my git deletes directories when all committed files have been deleted
18:46 ilmari AlexMax: at which point? when you 'git rm' the last file?
18:46 j416 !repro
18:46 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
18:47 Dougie187 I'll share one in a sec.
18:47 hypercube32 joined #git
18:47 * ilmari just did 'git rm foo/*' and that did indeed remove foo/ as well (on 2.10.2)
18:48 brillenfux joined #git
18:48 AlexMax j416: http://pastebin.com/nhN6sULc
18:49 mischief joined #git
18:49 Dougie187 Here https://gist.github.com/douglasjacob​sen/6e02672a1edaf463975875251d67d778
18:49 mischief is there a way to execute a command after commit/fetch?
18:49 Dougie187 Using 2.10.2
18:49 mischief (for all git repos)
18:49 sagerdearia joined #git
18:49 Dougie187 mischief: I don't think so. But you could make aliases that do what you want.
18:50 Dougie187 I don't think you can have global hooks
18:50 dodobrain joined #git
18:50 Dougie187 Could be wrong though
18:50 nedbat mischief: what command would you like to execute?
18:51 j416 AlexMax: that's git rm (i.e. rm) that is removing it
18:51 j416 AlexMax: https://dl.dropboxusercontent.com/​u/3207594/90d/git-remove-files.txt
18:51 mischief nedbat: 'sync' :-)
18:51 cyan__ joined #git
18:51 j416 AlexMax: it has nothing to do with tracking
18:51 mischief i'm tired of my git repos being corrupted when my system freezes or i lose power
18:51 j416 Dougie187: ^
18:52 Dougie187 j416: Of course it doesn't. But the question was when did git start deleting empty folders.
18:52 j416 Dougie187: when 'git rm' was introduced, probably.
18:52 PCatinean joined #git
18:53 j416 Dougie187: either that, or it's a regression
18:53 j416 does indeed seem odd that it would remove the directory as well (since rm doesn't) but perhaps it is a design choice
18:53 Dougie187 Sure. I'd agree that it was most likely when `git rm` was introduced.
18:53 Dougie187 And I agree. I'm a bit surprised that it actually deleted the directory.
18:54 Dougie187 I expected it to leave an empty directory, unless I was cloning the repo.
18:54 Faylite joined #git
18:56 irqq joined #git
18:56 shmuli joined #git
18:56 irqq__ joined #git
18:58 berndj-blackout joined #git
19:03 refried__ joined #git
19:05 ochorocho__ joined #git
19:06 j416 Dougie187: it has been there since 2006, and it was not clear if it was the right choice then
19:07 Dougie187 j416: :P Thanks
19:07 j416 I think it's quite nice that it cleans them up, though
19:07 j416 I'd be reluctant to propose a patch that does not clean
19:07 Dougie187 j416: Me too, it's just surprising.
19:07 j416 I think it's quite nice
19:07 sssilver joined #git
19:08 j416 Dougie187: here it is, anyway https://github.com/git/git/commit/d9b​814cc97f16daac06566a5340121c446136d22
19:08 j416 Dougie187: last paragraph.
19:08 p_d how do I add two files at once in git cui? for ex like we do- git add filename.xyz?
19:08 j416 p_d: git add foo bar
19:09 j416 p_d: I don't know what cui is, though
19:09 p_d j416: sorry i didnt get you :/
19:09 j416 p_d: what is git cui?
19:09 Dougie187 I think he means CLI
19:09 p_d command line interface
19:09 j416 I thought so too
19:09 Orion3k joined #git
19:09 Dougie187 Like a Gui, but for the command line
19:09 p_d yea sorry
19:09 Dougie187 :P
19:09 j416 p_d: "git add foo bar" where foo and bar are files
19:10 p_d okay
19:11 danimal2 joined #git
19:12 j416 whoa. git is 230,000 lines of code. o_O
19:15 anjen joined #git
19:16 einnjo joined #git
19:17 danslo_ joined #git
19:19 meauses joined #git
19:19 meauses_ joined #git
19:20 joki joined #git
19:21 sdothum joined #git
19:23 e14 joined #git
19:26 nidr0x joined #git
19:26 sagerdearia joined #git
19:26 Raed|Mobile joined #git
19:27 SwiftMatt joined #git
19:32 Balliad joined #git
19:35 nebg joined #git
19:36 skunkz joined #git
19:36 dviola joined #git
19:37 kyan joined #git
19:42 tomaw_ joined #git
19:45 cdg joined #git
19:46 WayToDoor joined #git
19:47 berndj joined #git
19:47 paws_ joined #git
19:49 Xuefer joined #git
19:49 ShekharReddy joined #git
19:51 kenden joined #git
19:52 msonntag joined #git
19:53 railssmith joined #git
19:56 kimonorouge joined #git
19:57 menip joined #git
20:00 AaronMT joined #git
20:01 flashpoint9 joined #git
20:02 flashpoint9 Hey I have been googling this but there's nothing that is written so clearly that I feel sae doing it, My company just moved a site from bitbucket to github and I need to push to github now, not sure how to change the origin
20:02 grawity git remote set-url, or git remote add
20:02 bronson joined #git
20:04 HoierM joined #git
20:05 bronson joined #git
20:05 kimonorouge joined #git
20:07 sdothum joined #git
20:07 _cyril_ joined #git
20:10 atomi joined #git
20:11 GavinMagnus joined #git
20:14 kpease joined #git
20:14 aidalgol joined #git
20:19 dreiss joined #git
20:20 pokalyis joined #git
20:20 kpease joined #git
20:21 JelmerD joined #git
20:21 atomi joined #git
20:21 prg318 joined #git
20:21 nedbat flashpoint9: keep in mind that .git/config is just a text file, so you can also edit it directly.
20:23 matsaman joined #git
20:23 prg318 Okay - so I have a git repository with branches A and B.  Branch B depends on the contents of branch A, but branch A has not been merged to master yet.  Can I somehow either 1) view both branches simultaneiously so long as there are no conflicts? or 2) create branch B off of branch A instead of from master?
20:24 prg318 from what I understand I need to merge branch A into branch B
20:25 atomi joined #git
20:25 nedbat prg318: you can rebase B onto A
20:25 kpease joined #git
20:26 ColdKeyboard joined #git
20:27 prg318 thanks; i'll read the docs on that
20:27 prg318 i'm coming to git after working with 3 years of rational clearcase [a very scary place] so i appreciate the answers to these basic questions
20:27 LocusAsaf joined #git
20:27 kyan_ joined #git
20:28 dermoth_ joined #git
20:29 _nwkj86 joined #git
20:30 Starky joined #git
20:30 LocusAsaf I have an intellij folder inside my project, ~/my_project/app/.idea/ (.git is in ~/my_project) and I put a .gitignore inside .idea so far has "* !.gitignore" but I'd like to have it not ignore a folder inside the .idea folder, runConfigurations and I can't seem to find something that removes it from the ignore list
20:30 TinkerTyper joined #git
20:31 GenZai joined #git
20:31 robotroll joined #git
20:32 GavinMagnus left #git
20:33 LocusAsaf what do I put to exempt that folder?
20:33 Ryanar joined #git
20:33 LocusAsaf I tried "!runConfigurations" "!runConfigurations/" "!runConfigurations/*" none of them work
20:34 sagerdearia joined #git
20:34 svm_invictvs joined #git
20:34 warthog9 joined #git
20:35 FrameFever joined #git
20:35 b1tchcakes joined #git
20:35 matsaman joined #git
20:35 FrameFever I have added a submodule to git via "git submodule add", how do I say it should track a certain commit from a certain branch now?
20:35 cdown_ joined #git
20:36 sbeller_ git -C <submodule/path> checkout <certain commit>
20:36 sbeller_ git add <submodule/path>
20:36 sbeller_ git commit -m "submodule points to <certain commit>"
20:37 matsaman joined #git
20:38 FrameFever and when i want to update it later?
20:38 irqq joined #git
20:39 railssmith joined #git
20:39 flashpoint9 whats the proper way to have two different repos connected to me code base and push to either of my choosing
20:40 perlpilot flashpoint9: sounds like you want to add another remote
20:40 flashpoint9 perlpilot: yes
20:41 perlpilot so do that and then use "git push remote_name master" to push to the remote of your choosing
20:41 sssilver joined #git
20:41 jstimm joined #git
20:41 flashpoint9 ok, so what determines 'remote_name' above?
20:42 flashpoint9 git remote add old bitbucket.org/skdjfslkdjflsdkf
20:42 flashpoint9 and then when I want to push run `git push old master'?
20:42 grawity you determine it
20:42 FrameFever can I do something like this?
20:42 FrameFever git submodule add git://github.com/miloyip/rapidjson.git/f​54b0e47a08782a6131cc3d60f94d038fa6e0a51 3rd_party/rapidjson
20:42 dreiss joined #git
20:43 flashpoint9 grawity: I determine it when I run `git remote add`?
20:43 perlpilot flashpoint9: yes
20:43 flashpoint9 perlpilot: thanks!
20:43 flashpoint9 grawity: thanks!
20:43 FrameFever sbeller_: ?
20:44 sbeller_ no as  git://github.com/miloyip/rapidjson.git/f​54b0e47a08782a6131cc3d60f94d038fa6e0a51 is not a valid url
20:44 sbeller_ FrameFever: rather do git -C submodule/path fetch && git -C submodule/path checkout <new sha1> && git add submodule/path && git commit
20:45 FrameFever sbeller_: what is submodule/path?
20:45 FrameFever the path to the repository or my path where the submodule should be located?
20:45 sbeller_ the path you added the submodule with?
20:45 sbeller_ >  my path where the submodule should be located?
20:45 sbeller_ (git -C ...) acts as if git was invoked from ...
20:45 FrameFever okay, then I miss the path to the repo itself?
20:46 tang^ joined #git
20:46 FrameFever where should I place git://github.com/miloyip/rapidjson.git?
20:48 FrameFever sbeller_: git -C 3rd_party/rapidjson checkout f54b0e47a08782a6131cc3d60f94d038fa6e0a51
20:48 chachasmooth joined #git
20:50 courrier joined #git
20:51 kpease_ joined #git
20:53 FrameFever sbeller_: I dont get it, sorry
20:54 kimonorouge joined #git
20:56 xall_ joined #git
20:57 TSS_ joined #git
21:00 sq-one joined #git
21:03 snthsnth joined #git
21:03 inflames joined #git
21:04 bronson joined #git
21:04 Eryn_1983_FL joined #git
21:05 t0by joined #git
21:08 cdown_ joined #git
21:09 kenden joined #git
21:11 finalbeta joined #git
21:12 HoierM joined #git
21:12 johnmilton joined #git
21:13 davidosomething joined #git
21:15 sagerdearia joined #git
21:17 ArchNoob joined #git
21:18 PCatinean joined #git
21:20 vannorden joined #git
21:21 alhariel joined #git
21:25 toogley joined #git
21:25 kimonorouge joined #git
21:25 alex88 joined #git
21:26 alex88 hi there, is it possible to apply a patch file even if it generates a conflict? like when there are conflicts on merges?
21:26 kimonorouge joined #git
21:26 j416 alex88: -3
21:26 alex88 thanks j416!
21:26 j416 o/
21:28 ShekharReddy joined #git
21:29 eivarv joined #git
21:29 _ADN_ joined #git
21:31 Starky joined #git
21:32 prg3 joined #git
21:33 sdothum joined #git
21:34 prg3 joined #git
21:35 hahuang61 joined #git
21:36 shum joined #git
21:39 jjasinski joined #git
21:40 snthsnth joined #git
21:41 sdothum joined #git
21:42 anuxivm joined #git
21:43 sdothum joined #git
21:45 tristanp joined #git
21:46 _cyril_ joined #git
21:48 sdothum joined #git
21:51 tristanp joined #git
21:51 nikivi joined #git
21:52 Electrometro joined #git
21:52 e14 joined #git
21:54 railssmith joined #git
21:58 theskillwithin joined #git
21:58 sdothum joined #git
21:59 Rumbles_ joined #git
22:00 Electrometro joined #git
22:01 ArchNoob joined #git
22:01 sdothum joined #git
22:02 svm_invictvs joined #git
22:03 nettoweb joined #git
22:03 Electrometro joined #git
22:03 StrongJava joined #git
22:05 blackwind_123 joined #git
22:07 Dougie187 left #git
22:08 Dougie187 joined #git
22:08 cdg joined #git
22:08 shinnya joined #git
22:08 m0viefreak joined #git
22:09 popmystack joined #git
22:09 raijin joined #git
22:13 justanotheruser joined #git
22:14 ToBeCloud joined #git
22:14 Vinnie_win_z joined #git
22:15 cdown joined #git
22:16 pks joined #git
22:20 todd_dsm joined #git
22:21 Learath2 joined #git
22:24 FrameFever left #git
22:25 akurniawan joined #git
22:29 jstimm joined #git
22:31 apotry joined #git
22:32 cdown joined #git
22:33 blahdodo joined #git
22:37 cdown joined #git
22:37 NwS joined #git
22:38 Anja_ joined #git
22:39 NeverTired joined #git
22:40 arescorpio joined #git
22:40 MaximusColourum joined #git
22:41 MaximusColourum Given a project that works on monthly releases and ever so often a hot-fix or two....
22:42 MaximusColourum New minor version release work starts at the beginning of the month
22:42 cdown joined #git
22:42 MaximusColourum Towards the end of the month, a bug is reported.
22:42 MaximusColourum So, month begins at say 2.10.0
22:43 MaximusColourum Team is working on 2.11.0 release
22:43 snthsnth joined #git
22:43 MaximusColourum Bug is reported week 3 and 2.10.1 hot-fix is worked, released and tagged.
22:44 MaximusColourum When all the 2.11.0 work is then released and tagged, do all of the commits made earlier under the current release now fall under the latest hot-fix tag?
22:44 MaximusColourum ^ simply due to the timeline of the commit history?
22:45 anonymuse joined #git
22:46 Gsham joined #git
22:46 MaximusColourum I've always though that a tagging was smart enough to understand the history and order of commits, therefore able to keep the history of 2.10.0, 2.10.1 and 2.11.0 all separate if you wanted to checkout each tag and view the history comparatively.
22:46 lacour joined #git
22:48 MaximusColourum If this is not the case, then there is a good argument for never deleting release branches.
22:48 railssmith joined #git
22:48 tristanp joined #git
22:51 b1tchcakes joined #git
22:51 eivarv joined #git
22:52 tyzoid joined #git
22:53 cagedwisdom joined #git
22:53 sagerdearia joined #git
22:54 tyzoid So I have an issue where I'm trying to checkout a remote branch. I run `git checkout <branch>`, and I get no output, and I'm still on my original branch.
22:54 mizu_no_oto joined #git
22:54 tyzoid If I checkout origin/<branch>, then git checkout -b <branch>, it creates a local branch for me
22:54 tyzoid but I'm used to it working where I can tell it to checkout and it does.
22:55 tyzoid I'm running git version 2.10.0, and the server is using 1.8.3.1
22:56 sdothum joined #git
22:56 skunkz joined #git
22:57 MaximusColourum tyzoid see section on branch.autosetupmerge  here: https://git-scm.com/docs/git-config
22:57 MaximusColourum sounds like a simple configuration change of your 2.10.0
22:57 GavinMagnus joined #git
22:58 nedbat MaximusColourum: you should have a 2.10.x branch, and a 2.11.x branch, with tags along the way for 2.10.0, 2.10.1, 2.11.0, etc
22:59 MaximusColourum So you tag the branches?
22:59 MaximusColourum I always merge into master then tag the release.
22:59 MaximusColourum Either way, at the time of tagging, master reflects the exact hisory I want tagged as that version.
23:00 tyzoid MaximusColourum: It should default to true, no?
23:00 MaximusColourum I think so tyzoid
23:00 dreiss joined #git
23:01 MaximusColourum nedbat you are saying best practice is to keep tagging the release branches separately and save those perpetually?
23:02 Rodya_ joined #git
23:03 dviola joined #git
23:04 dviola joined #git
23:04 nedbat MaximusColourum: ok, then how do you make 2.10.1 after 2.11.0 has been merged to master?
23:05 MaximusColourum I did not
23:05 PioneerAxon_ joined #git
23:05 MaximusColourum 2.11.0 branched from master which was tagged 2.10.0 at the beginning of the month.
23:06 lolmac joined #git
23:06 nedbat MaximusColourum: ok, so how do you make 2.10.1?
23:06 nedbat MaximusColourum: or are you saying that after 2.11.0 is done, you won't make a 2.10.1?
23:06 kimonorouge joined #git
23:07 nedbat MaximusColourum: maybe i don't understand your question
23:07 MaximusColourum the 2.10.1 hot-fix was branched from master weeks later when bug was reported, released, then merged back into master then tagged as 2.10.1.  This was all before the branch for 2.11.0 was completed and merged back into master.
23:07 nedbat MaximusColourum: ok. and what if you need to fix a bug in 2.10 after 2.11 is made?
23:08 MaximusColourum I always thought you could git checkout v2.10.0 and get a clean history of that release.
23:08 Ryanar joined #git
23:09 nedbat MaximusColourum: yes, you can.
23:09 MaximusColourum Hmm..
23:09 nedbat MaximusColourum: the tag will always refer to that point in time.
23:09 netj joined #git
23:09 MaximusColourum Let me be a bit more clear.
23:09 Learath2 joined #git
23:10 MaximusColourum 2.11.0 has commits going back to the beginning of the month. All the way back to the day after 2.10.0 was released.
23:10 nedbat MaximusColourum: yes
23:10 falkenb0t joined #git
23:11 MaximusColourum Our releases are 2.10.0 on week 40.  2.10.1 on week 43. 2.11.0 on week 44.
23:11 MaximusColourum Say on week 45, major projection problem discovered.
23:11 MaximusColourum Rollback is required.
23:11 Jameser joined #git
23:11 tyzoid So MaximusColourum: That didn't help. Further testing indicates that it is only an issue for one particular branch
23:11 MaximusColourum Action would be to checkout v2.10.1
23:12 tyzoid all other branches (master, etc.) can be checkout out fine via the normal method
23:12 MaximusColourum meaning, checkout the 2.10.1 tag from master, and do a new build to production.
23:12 nedbat tyzoid: does the branch have unusual characters in it?
23:12 nedbat MaximusColourum: yes, ok.
23:12 nedbat tyzoid: the branch name, that is
23:12 tyzoid nedbat: The commit message has a backtick
23:12 tyzoid could that screw it up?
23:12 falkenb0t exit
23:12 falkenb0t welp
23:13 falkenb0t left #git
23:13 nedbat tyzoid: doubtful. can you pastebin the exact terminal session where you try to check it out?
23:13 matoro joined #git
23:14 nedbat MaximusColourum: what is the question?
23:14 MaximusColourum nedbat given now that master has had 2.10, 2.10.1 and 2.11.0 history all merged in.  And commits for 2.11 started before 2.10.1 did timewise, wouldn't the checkout that I did of tag 2.10.1 from master now contain 2.10, 2.10.1 and the commits for 2.11 between 2.10 and 2.10.1 in the timeline?
23:15 tyzoid nedbat: http://pastie.org/10953544
23:15 nedbat MaximusColourum: if you added 2.11 commits to master, and then later tagged master as 2.10.1, then yes, you have some 2.11 commits in 2.10.1
23:15 MaximusColourum exactlly
23:16 tyzoid nedbat: After double-checking, the commit with backticks in it's description is one of the ones that *is* checking out properly.
23:16 tyzoid Hmmm
23:16 MaximusColourum and you are saying if I had tagged the 2.10.1 branch before merging into master.
23:16 nedbat MaximusColourum: but it has nothing to do with rolling back, you had those commits when you originally shipped 2.10.1
23:16 MaximusColourum they were not in master yet
23:16 MaximusColourum they were in a separate release branch.
23:17 nedbat MaximusColourum: ugh: whatever you tagged as 2.10.1, it doesn't change. The tag points to a commit, and the commit won't get new parents as a result of later merges.
23:17 nedbat MaximusColourum: you need to make a diagram, or point us at a repo we can look at. i think we are going around in circles
23:17 tyzoid nedbat: Here's the commit log for the branch that won't checkout properly: http://pastie.org/10953545
23:18 nedbat tyzoid: even better would be seeing the terminal session where you try to check it out, first.
23:18 tyzoid That was pasted above: http://pastie.org/10953544
23:18 nedbat (oops, you pasted that, sorry)
23:18 MaximusColourum Ok, thanks nedbat
23:18 tyzoid np nedbat, you probably just missed it
23:22 nedbat tyzoid: i would look in .git/config to see if there's a clue, or in .git elsewhere
23:22 Ryanar joined #git
23:22 nedbat tyzoid: but is testbranch really the name of the branch?
23:22 nedbat tyzoid: sorry, testbench
23:22 tyzoid shoud be testbench, but yeah
23:23 nedbat ok
23:23 btree joined #git
23:23 ColdKeyboard joined #git
23:24 tyzoid nedbat: Anything in particular I should look for?
23:24 nedbat tyzoid: "testbench"
23:24 watabou joined #git
23:25 tyzoid nedbat: I get that, but anything related to it that might give any context?
23:26 nedbat tyzoid: not sure, sorry
23:26 tyzoid It does give me different output when I search for testbench and cleanup inside of .git
23:26 tyzoid nedbat: http://pastie.org/10953547
23:27 tyzoid but I'm not sure what the lack of a log file indicates
23:27 tyzoid or what that binary index file is
23:27 SwiftMatt joined #git
23:27 bannakaffalatta joined #git
23:28 mizu_no_oto joined #git
23:29 _cyril_ joined #git
23:30 cdown joined #git
23:33 svm_invictvs joined #git
23:34 cdg joined #git
23:35 bronson joined #git
23:36 railssmith joined #git
23:36 rbern joined #git
23:37 cdown joined #git
23:37 tristanp joined #git
23:38 nd_ joined #git
23:39 nikivi joined #git
23:40 QwertyDragon joined #git
23:41 zumba_addict joined #git
23:45 modulitos joined #git
23:46 nettoweb joined #git
23:47 Ryanar joined #git
23:48 modulitos Hi all - is there a way to select and apply specific patches from my git sttash? For example, I'm trying to run something like `git stash -p pop stash@{0}`, which could operate similar to `git add -p`, but apply stashed patches from my stash into my working directory.
23:49 a3Dman joined #git
23:49 railssmith joined #git
23:50 modulitos I've also tried `git stash show -p stash@{0} | git apply -R`, but I get a `patch does not apply` error
23:52 sdothum joined #git
23:52 mikecmpbll joined #git
23:57 gautam joined #git
23:58 JamesBaxter joined #git

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