| 2015-01-05 |
| ← lpax left | 00:00 |
| ← Gama11 left | 00:00 |
| → EminenceHC joined | 00:01 |
| ← liamkeily1 left | 00:01 |
| gitinfo set mode: +v | 00:01 |
| → CheckDavid joined | 00:02 |
|
| dm7freek heard GitFS is on the way. | 00:03 |
|
dm7freek
| How's that coming? | 00:03 |
| → teran_ joined | 00:03 |
| → pawanspace joined | 00:03 |
| ← lucianangelus left | 00:04 |
| ← irc-5225225 left | 00:04 |
| → nizram joined | 00:04 |
| ← serum left | 00:05 |
| ← dreiss left | 00:06 |
| ← teran left | 00:07 |
| ← pawanspace left | 00:08 |
| ← nizram left | 00:08 |
| ← EminenceHC left | 00:09 |
| → dreiss joined | 00:09 |
| → scientes joined | 00:10 |
| ← nour_ left | 00:10 |
| → jazzzu joined | 00:11 |
| ← paul424 left | 00:12 |
| ← jatt left | 00:13 |
| ← puff left | 00:13 |
| → joeyDB joined | 00:13 |
| → Karisik joined | 00:14 |
| → eburcat joined | 00:14 |
| ← dreiss left | 00:15 |
| → sinkensabe joined | 00:17 |
| ← joeyDB left | 00:18 |
| → irc-5225225 joined | 00:19 |
| ← eburcat left | 00:19 |
| → jmpp_ joined | 00:20 |
| → checkItOut joined | 00:21 |
| → hexagoxel__ joined | 00:21 |
| → listochkin joined | 00:21 |
| ← hexagoxel__ left | 00:22 |
| ← sinkensabe left | 00:22 |
| → DrHouse|DellM650 joined | 00:22 |
| ← Velzes left | 00:22 |
| → hexagoxel joined | 00:23 |
| ← Amandil|2 left | 00:23 |
| ← hexagoxel_ left | 00:24 |
| ← intransi_ left | 00:24 |
| ← jmpp_ left | 00:24 |
| ← mchvs left | 00:26 |
| ← serapath left | 00:26 |
| ← listochkin left | 00:27 |
| → pawanspace joined | 00:28 |
| → dreiss joined | 00:28 |
| ← SonikBoom left | 00:28 |
| ← scientes left | 00:28 |
| → invapid joined | 00:29 |
| → devoldmx joined | 00:30 |
|
invapid
| so "git push github master" failed with "src refspac master does not match any..... failed to push some refs", but "git push github HEAD:master" worked | 00:30 |
|
| can anyone explain why that is? or have a good link to look at | 00:30 |
| ← harish left | 00:30 |
| ← DrHouse|DellM650 left | 00:31 |
|
invapid
| might have something to do with branches? "git branch" => no branch | 00:32 |
| ← pawanspace left | 00:32 |
| → scientes joined | 00:33 |
| → intransit joined | 00:34 |
| → iamjarvo joined | 00:36 |
| ← iamjarvo left | 00:37 |
| ← FunkyAss left | 00:37 |
| → Goplat joined | 00:37 |
| ← mezod left | 00:37 |
| → iamjarvo joined | 00:37 |
| → liamkeily1 joined | 00:37 |
|
invapid
| ahh, I think it's in a "headless" state | 00:39 |
| ← HoMM left | 00:42 |
|
invapid
| yep - git checkout master fixed it | 00:43 |
| ← invapid left | 00:44 |
| ← jazzzu left | 00:45 |
| ← s8321414 left | 00:46 |
| ← chrisshattuck left | 00:47 |
| ← bitkiller left | 00:47 |
| → phretor joined | 00:48 |
| ← alaudet left | 00:49 |
| → jstimm joined | 00:49 |
| ← liamkeily1 left | 00:49 |
| → saint-ron joined | 00:50 |
| → kadoban joined | 00:51 |
| ← wakd left | 00:51 |
| → wakd joined | 00:52 |
| ← blackmesa left | 00:52 |
| → tmcmahon joined | 00:52 |
| → liamkeily1 joined | 00:53 |
| ← iamjarvo left | 00:54 |
| ← dik_dak left | 00:54 |
| → dik_dak joined | 00:55 |
| → APerson_ joined | 00:56 |
| ← checkItOut left | 00:57 |
| → checkItOut joined | 00:58 |
| ← checkItOut left | 00:59 |
| ← codezomb left | 00:59 |
| → marius joined | 00:59 |
| ← fstd left | 01:00 |
| → fstd joined | 01:00 |
| ← tmcmahon left | 01:00 |
| → bg__ joined | 01:01 |
| → medgno joined | 01:02 |
| ← Lyqyd left | 01:03 |
| ← marius left | 01:06 |
| ← foulou left | 01:06 |
| → lachm joined | 01:06 |
| → sbogg joined | 01:06 |
| ← flugo left | 01:07 |
| → valeriansaliou joined | 01:08 |
| → Dopagod joined | 01:08 |
| ← dougsland left | 01:10 |
| ← MattMaker left | 01:10 |
| ← jagob left | 01:10 |
| ← VimFleed left | 01:11 |
| → Gamecubic joined | 01:11 |
| ← valeriansaliou left | 01:12 |
| → linoespinoza joined | 01:12 |
| ← linoespinoza left | 01:12 |
| → hyperair joined | 01:12 |
| ← hyperair left | 01:12 |
| → rchavik joined | 01:14 |
| ← rchavik left | 01:14 |
| → rchavik joined | 01:14 |
| → joeyDB joined | 01:14 |
| ← nkouevda left | 01:15 |
| ← lachm left | 01:18 |
| → jmpp_ joined | 01:18 |
| → checkItOut joined | 01:19 |
| ← joeyDB left | 01:19 |
| ← checkItOut left | 01:23 |
| ← vu left | 01:24 |
| → bobdobbs joined | 01:24 |
| ← diegoviola left | 01:25 |
| → sinkensabe joined | 01:25 |
| ← rendar left | 01:25 |
| → pwnz0r joined | 01:26 |
| → bronson joined | 01:27 |
| ← mizu_no_oto left | 01:27 |
| ← saint-ron left | 01:27 |
| ← dave_boling left | 01:27 |
| ← pwnz0r left | 01:28 |
| ← BlaXpirit_ left | 01:28 |
| → brucelee joined | 01:29 |
| ← sinkensabe left | 01:30 |
| ← txomon|home left | 01:30 |
| ← dreiss left | 01:32 |
| ← bronson left | 01:32 |
| → hyperair joined | 01:33 |
| → ome joined | 01:38 |
| → bronson joined | 01:38 |
| ← robustus left | 01:38 |
| ← herrbischoff left | 01:39 |
| ← rafaelcpalmeida left | 01:39 |
| → harish joined | 01:39 |
| → robustus|Off joined | 01:41 |
| robustus|Off → robustus | 01:41 |
| → herrbischoff joined | 01:42 |
| ← kpreid left | 01:42 |
| → kpreid joined | 01:42 |
| ← bronson left | 01:43 |
| ← phretor left | 01:46 |
| ← nikio_ left | 01:48 |
| → pheaver joined | 01:50 |
| → weiyang joined | 01:50 |
| → MattMaker joined | 01:50 |
| ← liamkeily1 left | 01:51 |
| ← netameta left | 01:51 |
| → stanier joined | 01:52 |
| ← Gamecubic left | 01:52 |
| gitinfo set mode: +v | 01:52 |
| → Gamecubic joined | 01:53 |
| → echo-area joined | 01:53 |
| → daito joined | 01:54 |
| ← CheckDavid left | 01:54 |
| → netameta joined | 01:55 |
| ← shinnya_ left | 01:55 |
|
stanier
| What's the best way to advertise a project that needs contributors? | 01:55 |
| ← johnny2600 left | 01:55 |
| → k_sze[work] joined | 01:55 |
|
HedgeMage
| stanier: that tends to depend a lot on what kind of contributors you need | 01:56 |
|
offby1
| stand on a street corner wearing a sandwich board | 01:56 |
| → nottombrown joined | 01:57 |
|
offby1
| stanier: seriously: write a bunch of good code by yourself, and get it Out There | 01:57 |
|
| maintain it | 01:57 |
|
| blog about it | 01:57 |
|
stanier
| offby1 I thought that only applied to prostitutes and activists | 01:57 |
|
offby1
| i.e. prove that the project is real | 01:57 |
| ← EvilPenguin left | 01:57 |
|
offby1
| act like you don't need any help; then you're sure to get lots :) | 01:58 |
|
| sort of like a bank loan | 01:58 |
|
stanier
| offby1 I guess that makes sense | 01:58 |
| → Shellbee joined | 01:58 |
|
stanier
| my worry is that nobody will really pick up on it, being that it's not much of a development resource, not like jQuery plugins or CSS frameworks | 01:59 |
|
HedgeMage
| stanier: recruiting from your own user base is usually a place to start | 01:59 |
|
| stanier: however, depending on your project, this may involve educating newbie coders and such. | 02:00 |
| ← mnml left | 02:01 |
| → EminenceHC joined | 02:01 |
|
stanier
| hm, alright. Thanks for the tips | 02:02 |
| ← ncd|leeN left | 02:03 |
| → eburcat joined | 02:03 |
| → tokik joined | 02:04 |
| → KeelOfSteel joined | 02:04 |
| → scriptThis joined | 02:05 |
| ← pheaver left | 02:06 |
|
offby1
| however, getting high on your own supply -- not so great | 02:06 |
|
| offby1 whistles innocently | 02:06 |
| ← KeelOfSteel left | 02:07 |
| ← nottombrown left | 02:07 |
| ← eburcat left | 02:08 |
| ← Shellbee left | 02:08 |
| ← EminenceHC left | 02:09 |
| → listochkin joined | 02:09 |
| → jazper- joined | 02:11 |
| ← jazper- left | 02:11 |
| → jazper- joined | 02:11 |
| → crelix joined | 02:12 |
| → nottombrown joined | 02:13 |
| → mizu_no_oto joined | 02:14 |
| ← listochkin left | 02:14 |
| ← daito left | 02:14 |
| → UKn0Me joined | 02:14 |
| → daito joined | 02:15 |
| → joeyDB joined | 02:15 |
| ← HD|Laptop left | 02:16 |
| → HD|Laptop joined | 02:16 |
| → KeelOfSteel joined | 02:16 |
| ← dik_dak left | 02:17 |
| ← APerson_ left | 02:18 |
| ← Zentdayn left | 02:18 |
| ← stanier left | 02:18 |
| ← daito left | 02:19 |
| ← joeyDB left | 02:19 |
| → dik_dak joined | 02:21 |
| → tummy joined | 02:21 |
| → marioxcc joined | 02:22 |
| → APerson_ joined | 02:22 |
|
marioxcc
| Hello. Suppose I have 2 git repositories that don't share any filename betweem them. Is there a tool that will allow me to combine both repositories into one, in which commits are the union of both repositories, sorted by date?. | 02:23 |
|
| There are no merges either. | 02:23 |
| ← crelix left | 02:24 |
| → sinkensabe joined | 02:26 |
| ← APerson_ left | 02:26 |
| ← daivyk left | 02:26 |
| → Vampire0_ joined | 02:27 |
| ← tummy left | 02:28 |
| → eburcat joined | 02:28 |
| ← Anders_J left | 02:28 |
| ← thiago left | 02:29 |
| ← Vampire0 left | 02:30 |
| ← sinkensabe left | 02:30 |
| ← marioxcc left | 02:31 |
|
offby1
| pretty sure there is, but I don't know what it is | 02:31 |
| → pheaver joined | 02:31 |
|
offby1
| you could always 1) create a new empty repository 2) add each exiting repository as a remote 3) fetch both remotes 4) create an artificial merge commit that has some commit from each remote as a parent | 02:32 |
|
| "sorted by date" has little meaning | 02:32 |
|
| unless you don't actually care about the original _commits_, and instead merely want to preserve the _patches_ and trees | 02:32 |
|
| !graft | 02:32 |
|
gitinfo
| [!grafts] Grafts are an obscure feature allowing distinct histories to be joined together; see https://git.wiki.kernel.org/index.php/GraftPoint | 02:32 |
|
offby1
| good guess | 02:33 |
|
| !boss tweed | 02:33 |
| ← eburcat left | 02:33 |
|
offby1
| !tamanny | 02:33 |
|
| oh well | 02:33 |
| → dreiss joined | 02:33 |
|
deltab
| won't history viewers tend to interleave the commits by date anyway? | 02:33 |
| → devll joined | 02:34 |
|
offby1
| beats me! | 02:34 |
| ← HelloShitty left | 02:34 |
|
offby1
| I know you can ask gitk to "strictly order by date" | 02:34 |
|
deltab
| it's moot now anyway, as marioxcc left just before you responded | 02:35 |
| ← looper left | 02:35 |
|
offby1
| *sigh* | 02:37 |
| → looper joined | 02:38 |
| ← hgl left | 02:39 |
| → hgl joined | 02:39 |
| → nottombr_ joined | 02:40 |
| ← nottombrown left | 02:41 |
| → GT joined | 02:42 |
| ← Wulf left | 02:43 |
| → Wulf joined | 02:43 |
| → thessaly joined | 02:45 |
| → nkouevda joined | 02:45 |
| → daito joined | 02:45 |
| ← kukks left | 02:46 |
| → nnyk joined | 02:49 |
| → DrHouse|DellM650 joined | 02:54 |
| ← daito left | 02:54 |
| ← autochthon left | 02:54 |
| → valeriansaliou joined | 02:56 |
| → scarabx joined | 02:57 |
| → chrisshattuck joined | 02:59 |
| ← johtso left | 03:00 |
| ← valeriansaliou left | 03:01 |
| ← pandeiro left | 03:03 |
| → anothermoron joined | 03:04 |
| → pandeiro joined | 03:06 |
| → listochkin joined | 03:07 |
| ← darkbasic left | 03:08 |
| → darkbasic joined | 03:09 |
| → autochthon joined | 03:09 |
| → bronson joined | 03:09 |
| → pm90_ joined | 03:10 |
| ← listochkin left | 03:11 |
| → Dougie187 joined | 03:11 |
| ← ojacobson left | 03:11 |
| ← Noldorin left | 03:12 |
| → ojacobson joined | 03:13 |
| ← bronson left | 03:13 |
| ← mizu_no_oto left | 03:14 |
| ← pm90_ left | 03:14 |
| → joeyDB joined | 03:16 |
| → Kulrak joined | 03:19 |
| ← Kulrak left | 03:19 |
| → Kulrak joined | 03:19 |
| ← nginx77 left | 03:20 |
| ← devll left | 03:20 |
| ← msonntag left | 03:20 |
| → mizu_no_oto joined | 03:21 |
| ← joeyDB left | 03:21 |
| ← Milkweed left | 03:21 |
| → pm90_ joined | 03:21 |
| → msonntag joined | 03:21 |
| → kukks joined | 03:21 |
| ← kukks left | 03:21 |
| → kukks joined | 03:21 |
| ← enitiz left | 03:21 |
| → enitiz joined | 03:22 |
| ← MattMaker left | 03:25 |
| ← pm90_ left | 03:26 |
| → sinkensabe joined | 03:26 |
| ← livingstn left | 03:27 |
| → rafaelcpalmeida joined | 03:28 |
| ← sbogg left | 03:28 |
| → UKn0Meh joined | 03:28 |
| ← sinkensabe left | 03:31 |
| ← mizu_no_oto left | 03:31 |
| ← UKn0Me left | 03:31 |
| → daito joined | 03:31 |
| ← rafaelcpalmeida left | 03:33 |
| ← DrHouse|DellM650 left | 03:35 |
| ← echo-area left | 03:37 |
| ← intransit left | 03:37 |
| → sbogg joined | 03:38 |
| → echo-area joined | 03:38 |
| → TheTeapot joined | 03:39 |
| → intransit joined | 03:39 |
| ← TheTeapot left | 03:39 |
| → TheTeapot joined | 03:40 |
| → hfp joined | 03:42 |
| → hfp_work joined | 03:42 |
| → fandi joined | 03:43 |
| → pm90_ joined | 03:46 |
| ← TheTeapot left | 03:48 |
| → TheTeapot joined | 03:49 |
| ← TheTeapot left | 03:50 |
| ← pm90_ left | 03:51 |
| ← brucelee left | 03:52 |
| ← kyb3r_ left | 03:52 |
| → TheTeapot joined | 03:53 |
| → EminenceHC joined | 03:53 |
| ← fatalhalt left | 03:54 |
| ← sbogg left | 03:56 |
| → iamjarvo joined | 03:56 |
| → AmR|EiSa joined | 03:56 |
| ← veebers left | 03:56 |
| → sleepee joined | 03:57 |
| ← EminenceHC left | 03:58 |
| → EminenceHC joined | 04:01 |
| → kyb3r_ joined | 04:04 |
| → ohseap joined | 04:05 |
| ← Zygocat left | 04:05 |
| ← bg__ left | 04:05 |
| ← Dougie187 left | 04:07 |
| → MattMaker joined | 04:08 |
| → Floatingman joined | 04:09 |
| ← EminenceHC left | 04:09 |
| ← ohseap left | 04:10 |
| ← TheTeapot left | 04:10 |
| → TheTeapot joined | 04:11 |
| ← anothermoron left | 04:12 |
| → DrHouse|DellM650 joined | 04:12 |
| → JR___ joined | 04:15 |
| → freeruncan joined | 04:16 |
| → joeyDB joined | 04:17 |
| ← Kulrak left | 04:18 |
| → ReekenX joined | 04:19 |
| → pm90_ joined | 04:20 |
| ← joeyDB left | 04:21 |
| → brucelee joined | 04:22 |
| ← HD|Laptop left | 04:23 |
| ← freeruncan left | 04:23 |
| ← JR___ left | 04:23 |
| → hafeez3000 joined | 04:24 |
| ← daito left | 04:24 |
| → dts|pokeball joined | 04:24 |
| → daito joined | 04:25 |
| → subhojit777 joined | 04:25 |
| → naught101 joined | 04:26 |
| → HD|Laptop joined | 04:26 |
| → JR___ joined | 04:27 |
| ← hcc23 left | 04:27 |
| → sinkensabe joined | 04:27 |
| ← dreiss left | 04:27 |
| ← chrisshattuck left | 04:28 |
| ← daito left | 04:29 |
|
naught101
| I have a repo cloned using git-svn. I'm keeping the master clean (points to https://server/svn/project/trunk), and I have a branch called "comments". I want to push it to https://server/svn/project/branches/naught101/comments/. https://server/svn/project/branches/naught101 already exists, but the branch directory doesn't, and git complains about path not found | 04:29 |
|
| Is there a way to git svn dcommit and create the path at the same time? | 04:29 |
| ← smccarthy left | 04:29 |
| → Kulrak joined | 04:31 |
| ← Kulrak left | 04:31 |
| → Kulrak joined | 04:31 |
| ← Kulrak left | 04:31 |
| ← sinkensabe left | 04:32 |
| → Kulrak joined | 04:32 |
| ← Kulrak left | 04:32 |
| → Kulrak joined | 04:32 |
| ← DrHouse|DellM650 left | 04:33 |
| → thiago joined | 04:36 |
| ← AmR|EiSa left | 04:36 |
| ← Kulrak left | 04:37 |
| → AmR|EiSa joined | 04:37 |
| → libero123 joined | 04:39 |
|
libero123
| ciao | 04:39 |
|
| hi | 04:39 |
|
| !list | 04:39 |
|
gitinfo
| [!official] Some official resources for git. Homepage: http://git-scm.com/ | Source repo: https://www.kernel.org/pub/scm/git/git.git/ (Mirrrored: https://github.com/git/git/) | IRC channel: You're in it. | Mailing list: http://vger.kernel.org/vger-lists.html#git | 04:39 |
| ← medgno left | 04:40 |
| ← libero123 left | 04:41 |
| ← dropdrive left | 04:42 |
| → ag4ve_ joined | 04:42 |
| ← thiago left | 04:44 |
| → valeriansaliou joined | 04:45 |
| ← aidalgol left | 04:45 |
| ← scarabx left | 04:46 |
| → sbogg joined | 04:46 |
| ← sleepee left | 04:47 |
| → Kulrak joined | 04:48 |
| ← Kulrak left | 04:48 |
| → Kulrak joined | 04:48 |
| → daito joined | 04:49 |
| ← ojacobson left | 04:50 |
| ← valeriansaliou left | 04:50 |
| → scarabx joined | 04:51 |
| → beautifulmind joined | 04:54 |
| → iraj joined | 04:55 |
| → irqq joined | 04:56 |
| ← scarabx left | 04:56 |
| ← nottombr_ left | 04:57 |
| ← bgerber left | 04:57 |
| → bgerber joined | 04:58 |
| → bronson joined | 04:58 |
| → dreiss joined | 04:58 |
| ← HD|Laptop left | 04:58 |
| → decimad joined | 04:59 |
| → HD|Laptop joined | 04:59 |
| ← HD|Laptop left | 04:59 |
| → HD|Laptop joined | 04:59 |
| ← devoldmx left | 05:00 |
| ← decimad2 left | 05:00 |
| ← nkouevda left | 05:01 |
| → nkouevda joined | 05:02 |
| ← bronson left | 05:03 |
| ← zumba_addict left | 05:04 |
| ← decimad left | 05:04 |
| → ohseap joined | 05:06 |
| → Malsasa_ joined | 05:08 |
| Malsasa_ → Malsasa | 05:08 |
| ← gfixler left | 05:10 |
| → MattMake_ joined | 05:10 |
| → webguynow joined | 05:10 |
| ← ohseap left | 05:10 |
| ← MattMaker left | 05:11 |
| → zumba_addict joined | 05:13 |
| → ManikM joined | 05:13 |
| → Tommy[D]_ joined | 05:13 |
| → nginx77 joined | 05:14 |
| → rafaelcpalmeida joined | 05:17 |
| ← Tommy[D] left | 05:17 |
| ← kcm1700 left | 05:17 |
| ← JR___ left | 05:17 |
| → joeyDB joined | 05:18 |
| → hafeez3000_ joined | 05:18 |
| ← hafeez3000 left | 05:18 |
| hafeez3000_ → hafeez3000 | 05:19 |
| ← kukks left | 05:20 |
| → nottombrown joined | 05:20 |
| ← pm90_ left | 05:20 |
| ← brlkid left | 05:21 |
| → pm90_ joined | 05:21 |
| ← rafaelcpalmeida left | 05:21 |
| ← pheaver left | 05:22 |
| ← joeyDB left | 05:22 |
| → pheaver joined | 05:23 |
| ← n-st left | 05:24 |
| → JR___ joined | 05:24 |
| ← pm90_ left | 05:25 |
| → kcm1700 joined | 05:25 |
| → sinkensabe joined | 05:28 |
| ← Lewoco left | 05:29 |
| → Lewoco_ joined | 05:29 |
| → foulou joined | 05:29 |
| ← irqq left | 05:29 |
| → irqq joined | 05:31 |
| ← sinkensabe left | 05:32 |
| ← intransit left | 05:40 |
| → intransit joined | 05:40 |
| → phretor joined | 05:41 |
| ← enitiz left | 05:41 |
| → _0xAX joined | 05:42 |
| ← JR___ left | 05:43 |
| → gfixler joined | 05:43 |
| ← kcm1700 left | 05:44 |
| → kcm1700_ joined | 05:44 |
| ← hafeez3000 left | 05:45 |
| ← phretor left | 05:46 |
| → JR___ joined | 05:48 |
| ← Bryzzle left | 05:49 |
| → ra0 joined | 05:49 |
| ← nnyk left | 05:51 |
| → nardev joined | 05:51 |
| → scarabx joined | 05:51 |
| ← intransit left | 05:52 |
| → fragamus joined | 05:53 |
| → EminenceHC joined | 05:53 |
| → joo-_ joined | 05:54 |
| ← brucelee left | 05:56 |
| ← dreiss left | 05:58 |
| ← EminenceHC left | 05:58 |
| → EminenceHC joined | 06:01 |
| ← madewokherd left | 06:01 |
| → k4rtik joined | 06:01 |
| → pretzel80 joined | 06:02 |
| ← pretzel80 left | 06:02 |
| → nofxx joined | 06:03 |
| → kcm1700 joined | 06:04 |
| ← kermit left | 06:06 |
| ← kcm1700_ left | 06:06 |
| ← zivester left | 06:06 |
| → kermit joined | 06:07 |
| ← dik_dak left | 06:07 |
| ← tpollard left | 06:07 |
|
nofxx
| How should I work this out: cloned a project and fixed a file, let's say it's branch 'fix'. Now I want to make a new feature let's say branch 'feature', but to work/test/run I need the 'fix'. How to work this in git? kinda temporary/hidden branch that should not be commited. | 06:08 |
| ← joo-_ left | 06:08 |
| → kcm1700_ joined | 06:09 |
|
nofxx
| I mean, work on 'feature' using 'fix' but push those independently | 06:09 |
|
naught101
| nofxx: from the feature branch, merge fix | 06:09 |
| ← EminenceHC left | 06:09 |
|
naught101
| then fix would get included in feature | 06:09 |
| → Marcus joined | 06:09 |
|
naught101
| if the fix gets included by itself before you merge feature, then from feature, git rebase master | 06:10 |
| ← eletuchy_ left | 06:10 |
| Marcus → Guest73854 | 06:10 |
| → serum joined | 06:10 |
|
naught101
| (or not, doesn't matter, the merge will include it anyway) | 06:10 |
|
| depends how neat you want the history to look | 06:10 |
| ← kcm1700 left | 06:11 |
| ← JR___ left | 06:11 |
|
nofxx
| naught101, think I get it, experimenting, thank you. So rebase will remove fix from feature, so I push... | 06:12 |
| → lru joined | 06:12 |
|
lru
| anyone know offhand what actually happens at the "Unpacking objects" stage of a git fetch? | 06:13 |
| → Consuela joined | 06:14 |
| ← beautifulmind left | 06:14 |
| ← cannonball left | 06:15 |
| → rdbell joined | 06:17 |
| → hafeez3000 joined | 06:17 |
| → Error404NotFound joined | 06:17 |
| ← rdbell left | 06:17 |
| → tarkus joined | 06:17 |
| → eletuchy joined | 06:18 |
|
lru
| nevermind.... looks like it is downloading stuff at that stage | 06:18 |
| → joeyDB joined | 06:18 |
| → zumba_ad_ joined | 06:19 |
| → skorgon joined | 06:19 |
| → Raging_Hog joined | 06:21 |
| ← Guest73854 left | 06:22 |
| ← zumba_addict left | 06:23 |
| ← joeyDB left | 06:23 |
| ← hafeez3000 left | 06:23 |
| → freezway joined | 06:23 |
|
freezway
| so I want to include my friends library which is in a git repo in my git repo | 06:24 |
|
| like I want to use it. Whats the best way to have a repo inside a repo | 06:24 |
| → hafeez3000 joined | 06:26 |
|
skorgon
| !subprojects | 06:26 |
|
gitinfo
| So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding. | 06:26 |
| ← polyzen left | 06:28 |
| → sinkensabe joined | 06:29 |
| → bronson joined | 06:29 |
| ← jmpp_ left | 06:30 |
| → saurabh joined | 06:31 |
| saurabh → Guest28913 | 06:32 |
| → brucelee joined | 06:33 |
| ← sinkensabe left | 06:33 |
|
freezway
| thanks | 06:34 |
| → pantsman- joined | 06:34 |
| ← bronson left | 06:34 |
| → valeriansaliou joined | 06:34 |
| → Jason_p joined | 06:34 |
| ← foulou left | 06:34 |
| ← moparisthebest left | 06:35 |
| → moparisthebest joined | 06:35 |
| ← kcm1700_ left | 06:35 |
| ← HD|Laptop left | 06:36 |
| → kcm1700 joined | 06:38 |
| ← valeriansaliou left | 06:39 |
| → PCatinean joined | 06:39 |
| → ThomasLocke joined | 06:40 |
| → HD|Laptop joined | 06:40 |
| ← HD|Laptop left | 06:40 |
| → HD|Laptop joined | 06:40 |
| ← kyb3r_ left | 06:40 |
| ← hvxgr left | 06:43 |
|
naught101
| lru: I imagine it's decomressing and sorting the stufd it's just downloaded | 06:43 |
| → jmpp_ joined | 06:44 |
| ← daito left | 06:44 |
| ← serum left | 06:44 |
| → daito joined | 06:45 |
| ← Goplat left | 06:45 |
| → intransit joined | 06:45 |
| → valeriansaliou joined | 06:47 |
| → akiva joined | 06:48 |
| ← daito left | 06:48 |
| ← dts|pokeball left | 06:51 |
| → dts|pokeball joined | 06:51 |
| → craigp joined | 06:51 |
| → tjm_jimmy joined | 06:53 |
| → sorind joined | 06:53 |
| → JR___ joined | 06:53 |
| ← sbogg left | 06:54 |
| → ohseap joined | 06:55 |
| → dreiss joined | 06:55 |
| → erickr joined | 06:56 |
| ← freezway left | 06:56 |
| ← pantsman- left | 06:56 |
| → c0ded joined | 06:57 |
| → nikio_ joined | 06:58 |
| → daito joined | 06:58 |
| ← ohseap left | 06:59 |
| → jceb joined | 07:00 |
| ← MLM left | 07:00 |
| → sbogg joined | 07:01 |
| → devoldmx joined | 07:03 |
| → tjm_jimm_ joined | 07:03 |
| ← irqq left | 07:05 |
| → Silmarilion joined | 07:05 |
| → rafaelcpalmeida joined | 07:06 |
| → irqq joined | 07:06 |
| ← twoface88 left | 07:06 |
| ← tjm_jimmy left | 07:07 |
| → twoface88 joined | 07:07 |
| ← rafaelcpalmeida left | 07:10 |
| ← devoldmx left | 07:10 |
| → devoldmx joined | 07:10 |
| ← intransit left | 07:11 |
| → raatiniemi joined | 07:12 |
| ← ManikM left | 07:13 |
| → ManikM joined | 07:13 |
| ← subhojit777 left | 07:13 |
| → hvxgr joined | 07:14 |
| → rath joined | 07:14 |
| → foulou joined | 07:17 |
| → Macaveli joined | 07:18 |
|
Kartagis
| hi | 07:19 |
| → joeyDB joined | 07:19 |
|
Kartagis
| git rm <filename> gives me fatal: pathspec <filename> did not match any files but it's there | 07:19 |
|
milki_
| does git know about it? | 07:20 |
| ← nikio_ left | 07:20 |
|
milki_
| you can verify with git ls-tree HEAD -- /path/to/file | 07:20 |
| ← nkouevda left | 07:21 |
|
milki_
| if you dont see it in git status | 07:21 |
| ← raatiniemi left | 07:21 |
| ← scarabx left | 07:21 |
|
Kartagis
| milki_: oh, it has to be added first? okay | 07:21 |
|
milki_
| yes | 07:21 |
| ← iraj left | 07:21 |
| ← k_sze[work] left | 07:23 |
| → VimFleed joined | 07:23 |
| ← _0xAX left | 07:24 |
| → acolson joined | 07:24 |
| ← joeyDB left | 07:24 |
| → skylite joined | 07:24 |
| → subhojit777 joined | 07:25 |
| → sinkensabe joined | 07:26 |
| → Gizburdt joined | 07:27 |
| ← skorgon left | 07:28 |
| → joo-_ joined | 07:31 |
| → Anders_J joined | 07:32 |
|
osse
| Kartagis: no point in adding it just to remove it | 07:32 |
| ← JR___ left | 07:35 |
| ← pheaver left | 07:35 |
| ← eletuchy left | 07:36 |
| → flowinho joined | 07:36 |
| → _0xAX joined | 07:36 |
| → GODDOG joined | 07:37 |
| → Duikb00t joined | 07:37 |
| → BlaXpirit joined | 07:39 |
| ← otter768 left | 07:40 |
| ← Gizburdt left | 07:41 |
| → booboy joined | 07:41 |
| → phretor joined | 07:41 |
| ← _0xAX left | 07:42 |
| → JR___ joined | 07:43 |
| → Gizburdt joined | 07:45 |
| ← D-Boy left | 07:46 |
| → sebhoss joined | 07:47 |
| → chimay joined | 07:47 |
| → D-Boy joined | 07:47 |
| ← GODDOG left | 07:48 |
| → GODDOG joined | 07:48 |
| → joo--_ joined | 07:48 |
| ← joo-_ left | 07:48 |
| ← Gamecubic left | 07:49 |
| ← J1G|Anon126 left | 07:51 |
| → anybroad_ joined | 07:52 |
| ← greves left | 07:52 |
| → mlechner joined | 07:52 |
| → marthinal joined | 07:52 |
| ← dreiss left | 07:52 |
| → Guest44731 joined | 07:53 |
| → EminenceHC joined | 07:53 |
| → DaisyTheCow joined | 07:54 |
| ← DaisyTheCow left | 07:54 |
| → jagob joined | 07:54 |
| → dreiss joined | 07:54 |
| → jnewt1 joined | 07:54 |
|
jnewt1
| am i here? | 07:55 |
|
kadoban
| No, you're there. | 07:55 |
|
Kartagis
| nope | 07:55 |
| ← erickr left | 07:55 |
| ← anybroad left | 07:56 |
| → eburcat joined | 07:56 |
| → Guest87023 joined | 07:56 |
| Guest87023 → hxm | 07:56 |
|
jnewt1
| network problems... | 07:56 |
| ← iamjarvo left | 07:58 |
| → mkoskar joined | 07:58 |
| ← EminenceHC left | 07:58 |
| ← Gizburdt left | 08:00 |
| ← GODDOG left | 08:00 |
| → bronson joined | 08:01 |
| → EminenceHC joined | 08:01 |
| → jnavila joined | 08:03 |
| ← tokik left | 08:03 |
| → aswen joined | 08:05 |
| ← bronson left | 08:05 |
| ← akiva left | 08:05 |
| → DrHouse|DellM650 joined | 08:06 |
| → Gizburdt joined | 08:07 |
| → nilg joined | 08:08 |
| ← EminenceHC left | 08:09 |
| → osfe joined | 08:12 |
| ← VimFleed left | 08:13 |
| → hgl- joined | 08:15 |
| → regan joined | 08:15 |
| → blackmesa joined | 08:15 |
| ← ra0 left | 08:15 |
| ← hgl- left | 08:16 |
| → hgl- joined | 08:16 |
| ← hgl left | 08:17 |
| hgl- → hgl | 08:17 |
| ← nofxx left | 08:18 |
| ← hexagoxel left | 08:19 |
| ← daito left | 08:19 |
| → daito joined | 08:20 |
| ← daito left | 08:20 |
| → joeyDB joined | 08:20 |
| → daito joined | 08:20 |
| → psoo joined | 08:21 |
| ← netj left | 08:21 |
| → netj joined | 08:21 |
| → Marcus_ joined | 08:21 |
| ← subhojit777 left | 08:22 |
| Marcus_ → Guest97434 | 08:22 |
| ← GT left | 08:23 |
| ← JR___ left | 08:23 |
| ← joeyDB left | 08:25 |
| ← nottombrown left | 08:28 |
| → nottombrown joined | 08:29 |
| dts|pokeball → blackmist | 08:29 |
| → seschwar joined | 08:29 |
| ← seschwar left | 08:29 |
| → seschwar joined | 08:29 |
| blackmist → dts|pokeball | 08:29 |
| ← AmR|EiSa left | 08:31 |
| → tvl joined | 08:32 |
|
Nickeeh
| I want git to show me what was not in the parents of a merge commit (so what was added in the commit) | 08:33 |
| → nnyk joined | 08:33 |
| → JR___ joined | 08:33 |
| ← nottombrown left | 08:33 |
|
Nickeeh
| How do I do this? | 08:34 |
| → iraj joined | 08:34 |
| ← DrHouse|DellM650 left | 08:34 |
| ← blackmesa left | 08:34 |
| ← chimay left | 08:35 |
|
osse
| Nickeeh: git show <merge commit> will do that | 08:35 |
|
| or git diff --cc <merge commit> | 08:35 |
| → jadne joined | 08:35 |
| ← albel727 left | 08:36 |
| → eletuchy joined | 08:37 |
|
jadne
| so i changed my username on github and now it won't let me push changes to my repository. | 08:38 |
|
| git suggested that i instead try https:// instead of git:// but that was not met with any more sucess | 08:39 |
|
Nickeeh
| osse: ah, so 'git log --merges --format=%h | xargs git show' will show me all the merges and changes introduced therein, right? :D | 08:39 |
| ← anbz left | 08:39 |
| → raatiniemi joined | 08:39 |
|
osse
| it should | 08:39 |
|
Nickeeh
| osse: thanks :) | 08:40 |
| → szx joined | 08:40 |
|
osse
| at least the ones reachable from HEAD | 08:40 |
| → ecky--ptang-zoob joined | 08:40 |
|
osse
| Nickeeh: try this though: git log --merges -p --cc | 08:40 |
| → subhojit777 joined | 08:40 |
|
Nickeeh
| osse: haha, nice :) Thanks | 08:40 |
| → Amandil joined | 08:41 |
| tvl → tobiasvl | 08:41 |
|
Nickeeh
| When you get to know xargs, everything is a list passable to other commands. | 08:41 |
| ← eletuchy left | 08:41 |
| ← kadoban left | 08:43 |
| ← sinkensabe left | 08:44 |
| ← jnewt1 left | 08:44 |
| ← HD|Laptop left | 08:44 |
| ← jaydubya left | 08:47 |
| → sinkensabe joined | 08:51 |
| → hebz0rl joined | 08:51 |
| ← nginx77 left | 08:54 |
| → rafaelcpalmeida joined | 08:54 |
| → hexagoxel joined | 08:55 |
| ← hebz0rl left | 08:56 |
| → hebz0rl joined | 08:58 |
| → GGflags joined | 08:58 |
| ← tobiasvl left | 09:01 |
| → Kicer86 joined | 09:02 |
| → shpoont joined | 09:02 |
| ← rafaelcpalmeida left | 09:02 |
| ← Amandil left | 09:03 |
| → CustosL1men joined | 09:04 |
| → Segfault_ joined | 09:04 |
| ← dreiss left | 09:04 |
| → reim joined | 09:05 |
| ← jmpp_ left | 09:05 |
| ← harish left | 09:06 |
| ← Segfault_ left | 09:09 |
| → nkouevda joined | 09:09 |
| → Segfault_ joined | 09:09 |
| ← Gizburdt left | 09:09 |
| ← fandi left | 09:11 |
| ← netj left | 09:11 |
| → jnavila_ joined | 09:11 |
| → netj joined | 09:11 |
| ← jnavila left | 09:11 |
| ← Segfault_ left | 09:12 |
| → Segfault_ joined | 09:12 |
| ← ManikM left | 09:12 |
| → ManikM joined | 09:13 |
| ← nkouevda left | 09:14 |
| ← phretor left | 09:14 |
| → GODDOG joined | 09:15 |
| ← Segfault_ left | 09:16 |
| → bronson joined | 09:16 |
| → Segfault_ joined | 09:17 |
| ← Segfault_ left | 09:17 |
| ← Zamyatin left | 09:17 |
| ← sbogg left | 09:17 |
| ← astrofog left | 09:17 |
| → erickr joined | 09:18 |
| → Segfault_ joined | 09:18 |
| → Gizburdt joined | 09:18 |
| → liamkeily joined | 09:19 |
| → Nizumzen joined | 09:19 |
| ← valeriansaliou left | 09:20 |
| → valeriansaliou joined | 09:20 |
| ← valeriansaliou left | 09:20 |
| ← JR___ left | 09:20 |
| → JR___ joined | 09:21 |
| → joeyDB joined | 09:21 |
| ← bronson left | 09:21 |
| → teran joined | 09:23 |
| → phretor joined | 09:24 |
| ← irqq left | 09:25 |
| ← teran_ left | 09:25 |
| → marcogmonteiro joined | 09:25 |
| ← CEnnis91 left | 09:25 |
| ← joeyDB left | 09:26 |
| → irqq joined | 09:26 |
| → Tuna-Fish joined | 09:26 |
| → chiromante joined | 09:27 |
| → VimFleed joined | 09:28 |
| → nottombrown joined | 09:29 |
| → tvl joined | 09:30 |
| → nisseni joined | 09:30 |
| tvl → tobiasvl | 09:30 |
| → _setuid joined | 09:30 |
| ← phretor left | 09:30 |
| → jmpp_ joined | 09:31 |
| ← asakura left | 09:32 |
| ← nottombrown left | 09:34 |
| ← ecky--ptang-zoob left | 09:34 |
| → Bombe joined | 09:34 |
| → reim_ joined | 09:35 |
| ← setuid_ left | 09:35 |
| ← erickr left | 09:35 |
| → crumpler joined | 09:35 |
| → Takle joined | 09:35 |
| → erickr joined | 09:36 |
| → asakura joined | 09:36 |
| → pacon joined | 09:37 |
| ← reim left | 09:38 |
| ← erickr left | 09:38 |
| ← Macaveli left | 09:40 |
| → otter768 joined | 09:41 |
| → jottr_ joined | 09:43 |
| ← otter768 left | 09:45 |
| ← weiyang left | 09:46 |
| → eletuchy joined | 09:46 |
| → vtunka joined | 09:47 |
| → fandi joined | 09:48 |
| → s8321414 joined | 09:48 |
| ← jmpp_ left | 09:50 |
| → mnml joined | 09:52 |
| → achadwick joined | 09:52 |
| → k_sze[work] joined | 09:52 |
| ← hgl left | 09:53 |
| ← sinkensabe left | 09:53 |
|
cbreak
| jadne: what do you mean with "doesn't let you"? | 09:53 |
| → EminenceHC joined | 09:54 |
|
cbreak
| jadne: git:// is a read only protocol, you can't push via it | 09:54 |
|
| https is also read only normally, but there's a read-write version. | 09:54 |
|
| but you need to reed the error messages | 09:54 |
| → hgl joined | 09:54 |
| ← hgl left | 09:55 |
| → hgl joined | 09:56 |
| reim_ → reim | 09:58 |
| ← EminenceHC left | 09:58 |
| → dougsland joined | 09:58 |
| → nottombrown joined | 09:59 |
| ← VimFleed left | 10:00 |
| → EminenceHC joined | 10:01 |
| ← jstimm left | 10:02 |
| ← nottombrown left | 10:04 |
| ← jeffmjack left | 10:04 |
| → mezod joined | 10:04 |
| → Macaveli joined | 10:06 |
| → blackmesa joined | 10:07 |
| ← GODDOG left | 10:08 |
| → beautifulmind joined | 10:09 |
| ← EminenceHC left | 10:09 |
| ← hahuang61 left | 10:13 |
| → teran_ joined | 10:15 |
| → gccostabr joined | 10:15 |
| ← hyperair left | 10:15 |
| → okanck joined | 10:15 |
| → petersr joined | 10:16 |
| → DrHouse|DellM650 joined | 10:18 |
| → Jackneill joined | 10:18 |
| ← teran left | 10:18 |
| → erickr joined | 10:18 |
| ← Bombe left | 10:19 |
| ← teran_ left | 10:19 |
| → metastableB joined | 10:20 |
| ← jnavila_ left | 10:21 |
| ← dm7freek left | 10:21 |
| → firestarter joined | 10:21 |
|
metastableB
| Hello. I added a feature to one repo I forked and created a pull request. One of the contributors went through the changes and asked me to do some modifications to the code (indentation and stuff) | 10:21 |
| firestarter → Guest26499 | 10:21 |
| → joeyDB joined | 10:22 |
|
metastableB
| I made the changes to the local branch and pushed it | 10:22 |
| → Bombe joined | 10:22 |
|
metastableB
| now do I have to create a fresh pull request or will the existing one reflect the new changes ? | 10:22 |
|
cbreak
| that doesn't sound git related | 10:23 |
|
| metastableB: did you ask them to merge a branch? or a commit? | 10:23 |
|
| commit hashes never change, but branches can | 10:23 |
| → sinkensabe joined | 10:24 |
|
metastableB
| Let me make my question clearer , I'm new to git btw. I forked a repo and added a feature . Then created a pull request. Later I modified my repo again to improve the code. Now do I have to create a new pull request ? | 10:25 |
|
| merge my branch to the master branch | 10:26 |
|
| It was a minor feature addition | 10:26 |
| ← joeyDB left | 10:26 |
| ← learner left | 10:26 |
|
metastableB
| cbreak: | 10:27 |
|
cbreak
| git doesn't do forking, or feature requests | 10:28 |
|
| you probably used something else | 10:28 |
|
| maybe github? | 10:28 |
| → msm` joined | 10:30 |
|
metastableB
| yes github | 10:30 |
| ← fragamus left | 10:30 |
|
cbreak
| don't know then. Can't you just look at the pull request there? | 10:30 |
|
metastableB
| I was under the impression they both were very related | 10:31 |
| ← DrHouse|DellM650 left | 10:31 |
|
metastableB
| Ok I'll browse around a little bit more | 10:31 |
|
| thanks | 10:31 |
| → bronson joined | 10:33 |
| ← msm`` left | 10:33 |
| → cwillu_at_work joined | 10:35 |
| → jaydubya joined | 10:36 |
| → mikecmpbll joined | 10:37 |
| → sq-one joined | 10:37 |
| → Gama11 joined | 10:37 |
| ← bronson left | 10:37 |
| → rendar joined | 10:37 |
| ← raven-au left | 10:38 |
| → raven-au joined | 10:39 |
| ← jaydubya left | 10:41 |
| ← k_sze[work] left | 10:43 |
| ← craigp left | 10:44 |
| ← zumba_ad_ left | 10:45 |
|
tobiasvl
| metastableB: #github | 10:46 |
| ← Gizburdt left | 10:46 |
|
tobiasvl
| but pull requests on github are requests to pull specific branches, as far as I know, so the pull request should be updated when you push the branch | 10:47 |
| ← hgl left | 10:47 |
|
tobiasvl
| at least as far as I can remember. but #github can probably provide better help. | 10:47 |
| ← erickr left | 10:47 |
| ← echo-area left | 10:47 |
| → nicedice joined | 10:48 |
| → shodan` joined | 10:49 |
| → VimFleed joined | 10:49 |
| → jottr joined | 10:50 |
| → hgl joined | 10:50 |
|
metastableB
| tobiasvl :Thank you very much | 10:50 |
| ← jottr_ left | 10:51 |
| → Gizburdt joined | 10:52 |
| ← chiromante left | 10:52 |
|
nicedice
| hello everyone! problem: i have two files in the .git folder index and index.lock, is it ok to delete index lock (git cannot make a commit as it reports a problem) | 10:52 |
| ← szx left | 10:52 |
|
canton7
| nicedice, if you're sure git isn't open somewhere else doing something, sure | 10:53 |
|
| ..but if you do delete it, and git is open somewhere else, you're going to get some weird problems and corruption | 10:53 |
| → Walex joined | 10:53 |
|
nicedice
| thank you canton7 , what is the command to check my repository (i'm sure git is not open, but still) | 10:54 |
|
canton7
| ps ax | grep git | 10:54 |
|
| see if it's running anywhere | 10:54 |
|
| ...or if you're windows, check task manager | 10:54 |
|
nicedice
| ow, ok, thanks... windows is my case | 10:54 |
| → learner joined | 10:55 |
| → nnyk_ joined | 10:55 |
| ← nnyk left | 10:55 |
| → RaceCondition joined | 10:57 |
| → Skapadapaduu joined | 10:58 |
| ← shpoont left | 10:59 |
| → nottombrown joined | 11:00 |
| ← kcj left | 11:00 |
|
metastableB
| I want to revert the last commit I made. git revert Head is the command ? | 11:01 |
|
tobiasvl
| metastableB: no, HEAD is the last commit you made. | 11:01 |
|
| metastableB: !revert | 11:01 |
|
gitinfo
| metastableB: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]? | 11:01 |
| → creep joined | 11:03 |
| ← joo--_ left | 11:03 |
| ← s8321414 left | 11:03 |
| → s8321414 joined | 11:04 |
| ← jottr left | 11:06 |
| ← petersr left | 11:06 |
| ← Gizburdt left | 11:07 |
| ← nottombrown left | 11:07 |
| → valeriansaliou joined | 11:09 |
| → howlymowly joined | 11:09 |
| → shpoont joined | 11:10 |
| ← shodan` left | 11:11 |
| ← ManikM left | 11:13 |
| → ManikM joined | 11:13 |
| ← valeriansaliou left | 11:13 |
| → cavallari joined | 11:14 |
| → kurkale6ka joined | 11:14 |
| → teran joined | 11:15 |
| → Amandil joined | 11:15 |
| ← teran left | 11:21 |
| ← Malsasa left | 11:21 |
| ← Amandil left | 11:21 |
| → joeyDB joined | 11:22 |
| ← crumpler left | 11:23 |
| ← Error404NotFound left | 11:23 |
| ← acolson left | 11:23 |
| → joo-_ joined | 11:23 |
| → Amandil joined | 11:24 |
| ← cavallari left | 11:26 |
| → cavallari joined | 11:26 |
| → stamina joined | 11:27 |
| ← joeyDB left | 11:27 |
| ← sinkensabe left | 11:31 |
| → nvbknh joined | 11:32 |
| ← FAMAS left | 11:33 |
| → CheckDavid joined | 11:33 |
| → FAMAS joined | 11:33 |
| ← devoldmx left | 11:34 |
| ← nvbknh left | 11:36 |
| ← sq-one left | 11:36 |
| ← dougsland left | 11:36 |
| ← jceb left | 11:36 |
| ← Kulrak left | 11:36 |
| ← Floatingman left | 11:36 |
| ← UKn0Meh left | 11:36 |
| ← msonntag left | 11:36 |
| ← netameta left | 11:36 |
| ← kpreid left | 11:36 |
| ← ghoti left | 11:36 |
| ← zapb left | 11:36 |
| ← zapb_ left | 11:36 |
| ← Kartagis left | 11:36 |
| ← ribasushi left | 11:36 |
| ← rasto left | 11:36 |
| ← gv left | 11:36 |
| ← theneb left | 11:36 |
| ← saidelike left | 11:36 |
| ← tyteen4a03 left | 11:36 |
| ← frdmn_ left | 11:36 |
| ← levifig left | 11:36 |
| ← lru left | 11:36 |
| → suigeneris joined | 11:36 |
| → lru_ joined | 11:36 |
| → yoh_ joined | 11:36 |
| → spb_ joined | 11:36 |
| → acolson joined | 11:36 |
| → chuck joined | 11:36 |
| ← chuck left | 11:36 |
| → chuck joined | 11:36 |
| ← autochthon left | 11:36 |
| → rasto joined | 11:36 |
| → theneb_ joined | 11:36 |
| → ciaranm_ joined | 11:36 |
| → jceb joined | 11:36 |
| → grawity joined | 11:36 |
| spb_ → spb | 11:36 |
| → Kulrak joined | 11:36 |
| ← Kulrak left | 11:36 |
| → Kulrak joined | 11:36 |
| → benbergman joined | 11:36 |
| → berndj joined | 11:36 |
| → osse joined | 11:37 |
| suigeneris → Kartagis | 11:37 |
| → frdmn joined | 11:37 |
| → tyteen4a03 joined | 11:37 |
| ← tyteen4a03 left | 11:37 |
| → tyteen4a03 joined | 11:37 |
| → kpreid joined | 11:37 |
| → netameta joined | 11:37 |
| → dougsland joined | 11:37 |
| → flughafen joined | 11:37 |
| ← Kulrak left | 11:37 |
| → tvw joined | 11:37 |
| → ghoti joined | 11:37 |
| → nicedice_ joined | 11:37 |
| → UKn0Meh joined | 11:37 |
| → Floatingman joined | 11:37 |
| → Kulrak joined | 11:37 |
| ← Kulrak left | 11:37 |
| → Kulrak joined | 11:37 |
| → King_Hual joined | 11:38 |
| → sq-one_ joined | 11:38 |
| → saidelike_ joined | 11:38 |
| → rafaelcpalmeida joined | 11:38 |
| → lewellyn joined | 11:38 |
| → eightyeight joined | 11:38 |
| → Rylee joined | 11:38 |
| ← brucelee left | 11:39 |
| ← s8321414 left | 11:40 |
| → nowhere_man joined | 11:40 |
| → s8321414 joined | 11:40 |
| → tm512 joined | 11:40 |
| → yazdmich joined | 11:40 |
| → tomleese joined | 11:40 |
| → SirCmpwn joined | 11:41 |
| ← nicedice left | 11:41 |
| ← myyst left | 11:41 |
| → PaulCapestany joined | 11:41 |
| → levifig joined | 11:41 |
| → malesca joined | 11:41 |
| ← Guest26499 left | 11:41 |
| → moritz joined | 11:41 |
| → rotorooter joined | 11:41 |
| → myyst joined | 11:41 |
| → ihlcqe joined | 11:41 |
| ← sebhoss left | 11:42 |
| ← ruukasu left | 11:42 |
| → otter768 joined | 11:42 |
| → Gizburdt joined | 11:43 |
| ← rafaelcpalmeida left | 11:43 |
| → aliouii_ joined | 11:43 |
| → ribasushi joined | 11:43 |
| → a-l-e joined | 11:44 |
| ← Takle left | 11:45 |
| → brucelee joined | 11:46 |
| → plasticboy joined | 11:46 |
| ← otter768 left | 11:46 |
| ← Duikb00t left | 11:48 |
| → autochthon joined | 11:48 |
| ← cagedwisdom left | 11:48 |
| → rajeerc joined | 11:49 |
| → Takle_ joined | 11:50 |
| ← rajeerc left | 11:50 |
| → jazzzu joined | 11:51 |
| ← fandi left | 11:53 |
| ← netj left | 11:53 |
| → netj joined | 11:53 |
| → EminenceHC joined | 11:53 |
| → endiruna joined | 11:55 |
| ← daito left | 11:57 |
| ← EminenceHC left | 11:58 |
| → daito joined | 11:58 |
| ← paulweb5151 left | 11:58 |
| ← Takle_ left | 12:01 |
| → EminenceHC joined | 12:01 |
| → Zupoman joined | 12:01 |
| ← pacon left | 12:02 |
| ← daito left | 12:02 |
| ← Gitzilla left | 12:03 |
| → hyperair joined | 12:03 |
| → nottombrown joined | 12:04 |
| ← aswen left | 12:04 |
| ← VimFleed left | 12:05 |
| ← warthog9 left | 12:05 |
| ← hyperair left | 12:06 |
| ← aliouii_ left | 12:06 |
| → NosBit joined | 12:08 |
| ← nottombrown left | 12:08 |
| ← JR___ left | 12:08 |
| ← EminenceHC left | 12:09 |
| → Laris joined | 12:10 |
| ← iraj left | 12:11 |
| → chiromante joined | 12:11 |
| → warthog9 joined | 12:12 |
| ← Gizburdt left | 12:12 |
| → shodan` joined | 12:12 |
| ← Amandil left | 12:13 |
| → Takle joined | 12:13 |
| → Gizburdt joined | 12:14 |
| ← sq-one_ left | 12:14 |
| ← bsm117532 left | 12:14 |
| ← brucelee left | 12:14 |
| → valeriansaliou joined | 12:15 |
| → thevishy joined | 12:16 |
| → Duikb00t joined | 12:16 |
| → teran joined | 12:17 |
|
mlechner
| how to get the recent core.ignorecase value of my git configuration? | 12:17 |
| → aswen joined | 12:17 |
| ← Takle left | 12:17 |
| → mizu_no_oto joined | 12:18 |
|
mlechner
| is core.ignorecase repository specific? if i init a git repo on a ext vs. fat filesystem on the same machine? | 12:18 |
|
grawity
| all settings can be either global or repository-specific | 12:18 |
| ← stamina left | 12:18 |
|
grawity
| depending on whether they're in a repo's .git/config or not | 12:18 |
|
canton7
| iirc 'git init' sets core.ignorecase on a per-repository basis when it inits that repo? | 12:19 |
| ← mkoskar left | 12:20 |
|
mlechner
| grawity, ok i found a ignorecase=true entry in my repo that has been initialized on fat but been moved to a ext file system this options stays on (of course). shall i edit the .git/config file or iss there a way using git tools/commands? | 12:21 |
| → bronson joined | 12:21 |
| → FreezingCold joined | 12:21 |
| ← teran left | 12:22 |
| ← Macaveli left | 12:22 |
| → jottr joined | 12:23 |
| ← flowinho left | 12:23 |
| → joeyDB joined | 12:23 |
| → uwjesq joined | 12:24 |
|
uwjesq
| Hello, can I git init a directory that is in an ignored directory inside a repository? | 12:24 |
|
iveqy
| mlechner: man git config | 12:25 |
|
gitinfo
| mlechner: the git-config manpage is available at http://jk.gs/git-config.html | 12:25 |
| → jaydubya joined | 12:25 |
|
iveqy
| uwjesq: yes, but maybe you should see !submodules | 12:25 |
|
gitinfo
| uwjesq: [!submodule] git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules | 12:25 |
| → cvanball joined | 12:26 |
| ← metastableB left | 12:26 |
| ← bronson left | 12:26 |
|
uwjesq
| iveqy: The use case is slightly different to a submodule it is very unlikely to change from outside. | 12:26 |
| → Macaveli joined | 12:26 |
| → paul424 joined | 12:27 |
| Guest44731 → greves | 12:28 |
| → jmpp joined | 12:28 |
| ← joeyDB left | 12:28 |
| ← jaydubya left | 12:29 |
| → petersr joined | 12:30 |
| ← petersr left | 12:30 |
|
iveqy
| uwjesq: if there is a dependency between your both repos then sumodule is the way to go. How else would you know that your project only works with version X.Y.Z of the other project? | 12:30 |
| ← FreezingCold left | 12:30 |
| ← Guest28913 left | 12:30 |
| → FreezingCold joined | 12:30 |
|
uwjesq
| iveqy: The main repository is a viewer software and the subdirectory is content. So there is no dependency on the subdirectory. | 12:31 |
| → jaydubya joined | 12:31 |
| → Zamyatin joined | 12:31 |
|
nedbat
| I have core.ignorecase=true, and I'm on a mac. The remote has branches that differ only by case ("west" and "West"). Is there a way I can get "git fetch" to stop pulling down "West" over and over? | 12:32 |
|
NosBit
| since its ignored there shouldnt be any probs | 12:32 |
|
| but there arent any risks to try out why dont you try it? | 12:32 |
|
nedbat
| NosBit: was that to me? | 12:32 |
|
iveqy
| uwjesq: I see, then I fully agree with you | 12:32 |
|
uwjesq
| iveqy: Ok, great. | 12:33 |
| ← jmpp left | 12:33 |
|
iveqy
| NosBit: just tell fetch wich brances to fetch? | 12:34 |
| ← warthog9 left | 12:34 |
|
iveqy
| /s/brances/branches | 12:34 |
|
NosBit
| it was for uwjesq | 12:34 |
| → uknowho joined | 12:34 |
|
uwjesq
| NosBit: I will. Thanks. | 12:35 |
| → lsiv568 joined | 12:36 |
| → warthog9 joined | 12:36 |
| → sebhoss joined | 12:38 |
| → icio joined | 12:39 |
| ← bobmarchman left | 12:39 |
| → metastableB joined | 12:39 |
| → mikiones joined | 12:40 |
|
mlechner
| grawity, iveqy, thnx everything fine now | 12:40 |
| → freestyl3r joined | 12:41 |
| ← warthog9 left | 12:41 |
| ← mikecmpbll left | 12:41 |
| → Takle joined | 12:43 |
| ← jceb left | 12:44 |
| → paulweb515 joined | 12:44 |
| ← blackmesa left | 12:45 |
| → VimFleed joined | 12:45 |
| → JoshLope_ joined | 12:46 |
|
JoshLope_
| Hello -- Me and some friends we are doing some website related to Anime -- www.loop-anime.com -- i would like to invite any1 here experienced with Symfony to contribute on the project -- send me a private message thank you :) | 12:46 |
| → nkouevda joined | 12:47 |
|
uwjesq
| JoshLope_: Are you on github? | 12:47 |
| ← mezod left | 12:47 |
| ← NosBit left | 12:47 |
| → basiclaser_ joined | 12:48 |
|
JoshLope_
| uwjesq ya -- the project not lol -- right now we are mantaining the project on Bitbucket | 12:48 |
| ← joo-_ left | 12:48 |
| ← paulweb515 left | 12:49 |
| → soerenb joined | 12:49 |
| ← valeriansaliou left | 12:49 |
| ← a-l-e left | 12:49 |
| ← Gizburdt left | 12:50 |
| → paulweb515 joined | 12:50 |
| → warthog9 joined | 12:51 |
| → Gizburdt joined | 12:51 |
| ← nkouevda left | 12:51 |
|
tobiasvl
| JoshLope_: php :o | 12:52 |
| ← SirCmpwn left | 12:52 |
| → SirCmpwn joined | 12:53 |
|
JoshLope_
| tobiasvl any problem with that ? :) | 12:53 |
|
tobiasvl
| yes, but that's neither here nor there ;) | 12:53 |
|
cbreak
| php is the most crappy language that is actually used. | 12:53 |
| ← vtunka left | 12:53 |
| ← shodan` left | 12:54 |
|
uwjesq
| cbreak: Which aspect of it? | 12:54 |
| → vtunka joined | 12:54 |
|
uwjesq
| cbreak: Security? Execution time? | 12:54 |
|
tobiasvl
| all of the above | 12:54 |
|
grawity
| the design of the language itself, I'd guess | 12:54 |
|
| (…or lack thereof.) | 12:54 |
|
cbreak
| http://eev.ee/blog/2012/04/09/php-a-fractal-of-bad-design/ :D | 12:54 |
|
| uwjesq: all of them? :) | 12:54 |
|
| the language is terribly designed | 12:54 |
|
| it has the wrong premise | 12:54 |
|
| it is insecure because of that | 12:54 |
|
| it is also slow because of that | 12:54 |
|
JoshLope_
| grawity for some1 that pops up in the language mby -- but there is so many standart rules etc that actually makes it pratical | 12:55 |
|
cbreak
| it is not even standardized, nor documented, so it's merely a vendor language. | 12:55 |
| → Cryp71c joined | 12:55 |
|
grawity
| ah yes, standartized like C++ is an ISO standard? the "34 countries voted on the C++ filesystem module" made me chuckle. | 12:55 |
|
uwjesq
| cbreak: Which implementation of php do you mean? | 12:55 |
| ← cavallari left | 12:55 |
|
Cryp71c
| if a local repo is behind by some commits, does 'git reset origin/trunk --hard' automatically pull in order to bring trunk up to date with origin/trunk? | 12:55 |
| → Milkweed joined | 12:56 |
|
cbreak
| uwjesq: there's only one. Because some language rules apparently say "just do it like in the zend engine" | 12:56 |
|
| everything else isn't php, it's some derivate | 12:56 |
| → cavallari joined | 12:56 |
|
iveqy
| cbreak: because a good language is secure and fast? That's not necessarily a design goal valid to all languages. And even if I don't like php I would say it's harder to write good javascript than good php. | 12:57 |
|
uwjesq
| cbreak: I see. So it is 100% compatible but it is a derivate. | 12:57 |
| ← Guest97434 left | 12:57 |
| ← creep left | 12:57 |
|
iveqy
| Cryp71c: a git reset do not do pull. You need to do a git fetch and then a git reset | 12:57 |
| → mikecmpbll joined | 12:57 |
| → plasku joined | 12:57 |
|
uwjesq
| iveqy: Agreed. | 12:58 |
|
plasku
| Hi | 12:58 |
|
gitinfo
| plasku: 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. | 12:58 |
|
cbreak
| uwjesq: it can't be compatible because the language can change under everyone elses asses | 12:58 |
| → jceb joined | 12:58 |
|
jast
| a flame war, here? what is the world coming to ;) | 12:58 |
|
cbreak
| jast: welcome to 2015 | 12:58 |
|
grawity
| NEW TOPIC: SVN VS BZR | 12:58 |
|
cbreak
| it's the year of flamewars on the desktop. | 12:58 |
|
uwjesq
| jast: Agreed. | 12:58 |
|
jast
| okay, I'm just going to close this channel... bye, everyone | 12:59 |
|
Cryp71c
| iveqy, wait you said that git reset doesn't pull, so what wold git fetch and then git reset do? | 12:59 |
|
| iveqy puts the topic VIM vs EMACS in cue | 12:59 |
|
jast
| /msg chanserv git rm * | 12:59 |
|
osse
| Cryp71c: if you are strictly behind then the end result is the same | 12:59 |
|
uwjesq
| iveqy: lol | 12:59 |
|
grawity
| that's "/msg chanserv clear #git users" | 12:59 |
|
iveqy
| Cryp71c: a git fetch would fetch things from your remote and then a git reset would move your branch | 12:59 |
| ← fstd left | 13:00 |
|
jast
| grawity: boring | 13:00 |
|
plasku
| I was tasked to clean up one of our repos, and now checkout any branch but master isn't working. Is there any way to restore "automatic" tracking of branches? | 13:00 |
|
jast
| what exactly isn't working? | 13:00 |
|
Cryp71c
| iveqy, got it...misconception on my part, I had always thought of "fetch" as "check the server for any updates I don't have" but it really is "fetch the updates from the server" it just doesn't update your HEAD | 13:00 |
| → fstd joined | 13:00 |
| ← thessaly left | 13:01 |
|
iveqy
| Cryp71c: a git pull is a fetch followed by a git merge | 13:01 |
|
| Cryp71c: Not sure what you mean the difference is between check the server and fetch the updates, but git fetch downloads the updates from the server | 13:02 |
|
Cryp71c
| iveqy, do you invest in the "pull should be avoided" opinion? | 13:02 |
|
| (in preference for git fetch followed by some other action) | 13:02 |
| ← looper left | 13:02 |
| ← Zamyatin left | 13:02 |
|
iveqy
| Cryp71c: depends on who's asking | 13:02 |
| → looper joined | 13:03 |
|
iveqy
| Cryp71c: a git pull does stuff automatic, if you know what it does, then use it. If you don't have a clue, then your should use fetch and merge. | 13:03 |
| → joo-_ joined | 13:03 |
| → sburgess joined | 13:03 |
|
iveqy
| Cryp71c: however I'm of the opinion that you should really know your worktools, so every good developer should be able to use git pull. However we all know that the world isn't full of good developers, so sometimes it is valid to recommend git fetch and git pull | 13:04 |
|
| sometimes a usb-stick passed around is also superior to git, I've learned that the hard way... | 13:05 |
| ← uwjesq left | 13:05 |
|
Cryp71c
| iveqy, orly, how so? | 13:05 |
|
| (i'm curious for your experience) | 13:05 |
|
iveqy
| Cryp71c: using git (on windows) with developers not familiar with version control, with a graphical (non mergeable) files, was a disaster | 13:06 |
|
| Cryp71c: using git collaborating on word documents with non-computer people is also a disaster | 13:06 |
| → eburcat_ joined | 13:07 |
|
Cryp71c
| iveqy, back on my original question, after you've fetched reseting to trunk (vs origin/trunk) is the same thing? | 13:07 |
| ← eburcat left | 13:07 |
| → bsanford joined | 13:07 |
|
iveqy
| Cryp71c: no, origin/trunk and trunk isn't the same (or rather, a git fetch doesn't make them the same) | 13:07 |
| → jatt joined | 13:08 |
|
Cryp71c
| iveqy, got it...I'm sort of facing that, except with our CIO who has barely gotten by with svn and can't realy grasp git it seems. | 13:08 |
| ← jatt left | 13:08 |
| → jatt joined | 13:08 |
|
Cryp71c
| iveqy, sorry to keep bothering you, could you enlighten me? I fear I've misconstrued something here then. | 13:08 |
|
jast
| resetting to the upstream branch is the same *if* you haven't made any commits/changes yourself | 13:08 |
|
tobiasvl
| origin/trunk is a !remote_tracking branch | 13:08 |
|
gitinfo
| [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote | 13:08 |
| ← Takle left | 13:08 |
|
Cryp71c
| jast, ok, that makes sense. That is the situation I'm in, but I haven't said that so iveqy doesn't knwo that. | 13:09 |
|
| jast, no local commits (or at least, there shouldn't be) | 13:09 |
|
jast
| if you do have changes, reset will make them disappear, whereas pull/merge will try to combine them with the new stuff | 13:09 |
|
Cryp71c
| jast, what if I git fetch and git reset but there are local commits (that are behind origin/trunk)? | 13:09 |
|
iveqy
| Cryp71c: then maybe you should consider using SVN for your CIO and just use git as a SVN client. (or make sure to get a nice GUI for your CIO). I don't know your case but at #daywork we stick to SVN because most of the team members won't benefit from git, just the software guys | 13:10 |
|
| Cryp71c: then they will be "throwed away" | 13:10 |
|
| !talks | 13:10 |
|
gitinfo
| Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional) | 13:10 |
| ← a_le left | 13:11 |
|
iveqy
| Cryp71c: listen to Jesica Kerr, she will tell you all about git reset in a very good way | 13:11 |
|
jast
| Cryp71c: reset truncates history. if you reset to 'foo', then afterwards your current branch will have exactly the same history as 'foo'. | 13:11 |
|
| you can even use this to change absolutely everything about a branch | 13:11 |
| → GODDOG joined | 13:12 |
|
jast
| (by resetting to something totally different) | 13:12 |
| ← Gizburdt left | 13:12 |
| → flughafe1 joined | 13:12 |
| → Gizburdt joined | 13:12 |
|
Cryp71c
| iveqy, got it, I'll put some on now. | 13:12 |
| ← ManikM left | 13:12 |
| → ManikM joined | 13:13 |
|
osse
| eg. git reset --hard 8376afb79e99395e26fdb8f12d4d2088e46ede2b | 13:13 |
| → stfn joined | 13:14 |
| ciaranm_ → ciaranm | 13:15 |
| ← GODDOG left | 13:16 |
| → scampbell joined | 13:17 |
| → teran joined | 13:18 |
| _setuid → setuid | 13:18 |
| gitinfo set mode: +v | 13:18 |
|
plasku
| Is there a setting in git to automatically track all remote branches on a new git clone? | 13:21 |
| → GODDOG joined | 13:22 |
| ← segfalt left | 13:22 |
| ← liamkeily left | 13:22 |
|
plasku
| My repo doesn't seem to like it | 13:22 |
|
osse
| that's default | 13:22 |
| ← teran left | 13:22 |
|
osse
| do you mean to create local corresponding branches? Then no. | 13:22 |
|
iveqy
| plasku: for remote in `git branch -r `; do git branch --track $remote; done | 13:24 |
|
canton7
| and, honestly, you probably don't want that | 13:24 |
| → zapb_ joined | 13:24 |
| → gv joined | 13:24 |
| ← gv left | 13:24 |
| → gv joined | 13:24 |
| ← VimFleed left | 13:24 |
|
iveqy
| plasku: but as canton7 says, you don't want that. | 13:24 |
|
plasku
| I just want it for our staging and experimental branches. | 13:24 |
| → joeyDB joined | 13:24 |
|
canton7
| if you've got a local branch you're not actively working on, it's going to be out of date | 13:24 |
| → msonntag joined | 13:24 |
|
canton7
| you can always use origin/whatever for log, diff, etc | 13:25 |
| → VictorBjelkholm joined | 13:25 |
|
plasku
| Thanks! | 13:25 |
| ← Kartagis left | 13:26 |
| → Marcus_ joined | 13:26 |
| ← Jason_p left | 13:26 |
| Marcus_ → Guest48971 | 13:27 |
| ← warthog9 left | 13:27 |
| → wowaname joined | 13:27 |
| ← Anders_J left | 13:27 |
|
plasku
| I don't understand this behavior though, when I do a git clone from scratch, and try to git checkout experimental- it just stays on master and no error is output. | 13:27 |
|
iveqy
| plasku: !repro | 13:28 |
|
gitinfo
| plasku: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%. | 13:28 |
|
plasku
| Okay, one moment | 13:28 |
| → brandonw joined | 13:28 |
| ← joeyDB left | 13:29 |
| ← irqq left | 13:30 |
| → warthog9 joined | 13:31 |
| → irqq joined | 13:31 |
|
plasku
| https://gist.github.com/eivindj/8be8714808f9f883a8d3 | 13:31 |
| → interrobangd joined | 13:31 |
|
plasku
| I'm missing something obvious, I bet. | 13:31 |
| → ruukasu joined | 13:31 |
|
osse
| weird that you don't see an error after than checkout then | 13:32 |
|
canton7
| plasku, output of 'git branch -a' | 13:32 |
|
osse
| did you expect to see "Branch stage set up to track ..…" ? | 13:32 |
| → craigp joined | 13:33 |
|
plasku
| http://paste.lisp.org/display/145079 | 13:33 |
|
| osse: It does for all the other branches | 13:34 |
|
| That's a truncated branch -a | 13:34 |
| ← CheckDavid left | 13:34 |
|
canton7
| plasku, are you sure that's the entire output | 13:34 |
|
| plasku, git indicated that 2021-recycle-pins existed on the remote, but your output suggests it doesn't | 13:35 |
| → riceNbeans joined | 13:35 |
| ← dialeth left | 13:35 |
|
plasku
| It's there | 13:35 |
|
| Thanks for rubber ducking, I think I solved it. | 13:35 |
|
osse
| is remotes/origin/stage there too ? | 13:35 |
|
canton7
| remotes/origin/2021-recycle-pins doesn't exist | 13:35 |
|
| in your output | 13:35 |
|
plasku
| My colleague added a bunch of folders, amongst them 'stage' | 13:35 |
|
canton7
| aah, it is truncated. PLEASE NEVER MODIFY OUTPUT when you paste it | 13:36 |
|
plasku
| so git checkout stage doesn't work | 13:36 |
|
riceNbeans
| how do I pull? Git pull -u origin master? or git pull origin master? I'm not sure what clause I might need. | 13:36 |
|
plasku
| git clone | 13:36 |
|
osse
| plasku: ahh.. 'git checkout stage --' BAM! | 13:36 |
|
canton7
| you don't know what we're looking for - anything you cut out is almost guarenteed to send us down the wrong path, and waste everyone's time | 13:36 |
|
plasku
| Anyways, sorry for wasting your time. I'm stupid. | 13:36 |
| → apurcell joined | 13:36 |
|
canton7
| plasku, 'git checkout branch', where branch does not exist locally but does exist on a remote, is an example of magic | 13:36 |
|
| plasku, the correct command is something like 'git checkout -b branch origin/branch' | 13:37 |
| → kakku joined | 13:37 |
|
canton7
| git's gone "is there a local branch stage? no. is there a folder called stage? yes. ok, I'm working in file mode, and not trying to create branches" | 13:37 |
| → harish joined | 13:37 |
|
riceNbeans
| how do I pull? Git pull -u origin master? or git pull origin master? I'm not sure what clauses I might need. | 13:37 |
|
iveqy
| riceNbeans: it depends on what you want. What do you want to do? | 13:37 |
| → liamkeily joined | 13:37 |
| ← jceb left | 13:37 |
| gitinfo set mode: +v | 13:37 |
|
plasku
| canton7: yeah, I understand, thanks for the help! | 13:38 |
| ← chiromante left | 13:38 |
|
riceNbeans
| iveqy: get the code from my git repo. I believe it's the origin master in my foler already becase I've pushed to it from this folder already | 13:38 |
| → dannymichel joined | 13:38 |
| → Dorf joined | 13:38 |
|
iveqy
| riceNbeans: then a git pull should do the trick | 13:39 |
|
riceNbeans
| iveqy: that's it? I'll try it :) | 13:39 |
| ← eletuchy left | 13:39 |
| → sinkensabe joined | 13:39 |
| → smccarthy joined | 13:39 |
| → wachterjohannes joined | 13:39 |
| ← ghoti left | 13:39 |
| → eletuchy joined | 13:40 |
| ← apurcell left | 13:40 |
| → otter768 joined | 13:43 |
| → boblee joined | 13:43 |
| ← boblee left | 13:43 |
| → boblee joined | 13:43 |
| ← flughafe1 left | 13:43 |
|
kakku
| My friend and I are experimenting with git flow and I encountered a problem, He is working on a feature branch (feature/F1) and rebasing on top of the main line of development (develop) every morning. I took a branch from his branch (feature/F1improvement). Is it ok to rebase on top of his branch? Currently, whenever he rebases, I have to rebase also but we are getting duplicate commits on my branch | 13:43 |
| ← metastableB left | 13:44 |
| ← sinkensabe left | 13:44 |
| → sinkensabe joined | 13:44 |
| ← mikiones left | 13:44 |
| → ghoti joined | 13:44 |
|
iveqy
| kakku: duplicate commits? Could you elaborate on that? | 13:45 |
| ← eletuchy left | 13:45 |
| → pm90_ joined | 13:45 |
| → sinkensa_ joined | 13:46 |
| ← pm90_ left | 13:46 |
|
riceNbeans
| is atmosephere the defacto package manager? | 13:46 |
|
| sry wrong sub | 13:46 |
| → polyzen joined | 13:47 |
| → sq-one joined | 13:47 |
| → pm90_ joined | 13:47 |
| → metastableB joined | 13:47 |
| ← otter768 left | 13:47 |
| → dangerousdave joined | 13:47 |
| → mikiones joined | 13:48 |
|
kakku
| iveqy: Let's say he commits A, B and C. On my branch I have P and Q. When he rebases his branch on develop, he uses force push (this will change the history and move his branch on top of the develop). When I rebase my branch on top of his I can still see his commits as parent commits of P and Q. | 13:48 |
| → intransit joined | 13:49 |
| → ohseap joined | 13:49 |
| ← sinkensabe left | 13:49 |
|
kakku
| iveqy: therefore we are getting conflicts on his rebased history | 13:49 |
| ← moparisthebest left | 13:49 |
| → tmcmahon joined | 13:49 |
|
spb
| yes, this is why force push is considered harmful | 13:49 |
| ← okanck left | 13:49 |
| ← ap0c left | 13:49 |
| → jceb joined | 13:50 |
| → hoijui_ joined | 13:50 |
| → DrSkyLizard joined | 13:51 |
| ← Milkweed left | 13:51 |
|
j416
| kakku: in that case, use rebase --onto | 13:52 |
|
kakku
| j416: thanks, let me try it out | 13:52 |
| ← naught101 left | 13:52 |
| → PCatinean_ joined | 13:52 |
|
j416
| kakku: git checkotu yourbranch; git rebase --onto <newbase> <oldbase> | 13:52 |
| → nottombrown joined | 13:53 |
|
j416
| where yourbranch is your branch, <newbase> is the new branch you want to base your work on, <oldbase> is the last old commit before you started your work | 13:53 |
| → EminenceHC joined | 13:53 |
|
j416
| checkout*, sorry | 13:53 |
| ← dannymichel left | 13:54 |
| ← tmcmahon left | 13:54 |
|
j416
| kakku: the real solution is to stop rewriting things on which others have based work on | 13:54 |
| ← vtunka left | 13:54 |
|
j416
| kakku: or rather, stop basing your work on stuff that may be rewritten. | 13:54 |
| → moparisthebest joined | 13:55 |
|
j416
| kakku: it'll increase the risk of bugs in your code. | 13:55 |
| → sieve joined | 13:55 |
| ← PCatinean left | 13:55 |
|
kakku
| j416: so what is an ideal workflow to use when working on feature branches taken from other feature branches? | 13:56 |
|
j416
| kakku: because every time you rebase, you are rewriting your code on top of a new base; and if that base has also changed, who knows how that affects your new code. | 13:56 |
|
| kakku: don't. | 13:56 |
|
sieve
| How might a take a subdirectory of git A foo/ and make it a subdirectory of git B bar/ | 13:56 |
|
| retaining the history | 13:56 |
| ← roger_raymond left | 13:56 |
| → Zentdayn joined | 13:56 |
| → roger_raymond joined | 13:57 |
| ← mizu_no_oto left | 13:57 |
|
j416
| kakku: have an integration branch with stable things that is never rewritten. | 13:57 |
| ← nottombrown left | 13:57 |
| ← EminenceHC left | 13:58 |
| → dm7freek joined | 13:59 |
| PCatinean_ → PCatinean | 13:59 |
|
kakku
| j416: so if a huge feature needs to be implemented a branch (stable/featureHuge) it is taken from develop and all mini features (related to featureHuge) will be taken from this branch and merged back into this branch | 13:59 |
|
| j416: right? | 13:59 |
| → hyperair joined | 13:59 |
|
j416
| kakku: that's how I would do it. | 13:59 |
|
| kakku: but I would avoid huge feature branches if I can. | 14:00 |
|
kakku
| j416: and have if a bug fix was committed on develop, how am I going to get it on the stable branch? | 14:00 |
| → shinnya_ joined | 14:00 |
|
j416
| kakku: don't fix it on develop, fix it on git merge-base develop stable/featureHuge | 14:00 |
|
| kakku: then merge to develop and stable/featureHuge | 14:01 |
| → EminenceHC joined | 14:01 |
|
j416
| kakku: but you'll want to merge stable/featureHuge to develop every now and then anyway | 14:01 |
|
| kakku: or you'll end up with code rot | 14:01 |
|
| kakku: http://en.wikipedia.org/wiki/Feature_toggle | 14:01 |
| → freimatz joined | 14:01 |
|
j416
| kakku: use that if you can. | 14:01 |
| → vtunka joined | 14:02 |
| ← achadwick left | 14:02 |
| ← beautifulmind left | 14:02 |
| → th3fallen joined | 14:04 |
| ← dm7freek left | 14:04 |
| → m0nkmaster joined | 14:04 |
| ← jgardella left | 14:05 |
| ← m0nkmaster left | 14:05 |
|
kakku
| j416: In fact we are already using feature toggle, maybe we should stop using feature branches | 14:05 |
| → kotk_ joined | 14:06 |
| ← kotk left | 14:06 |
|
kakku
| j416: the thing is that on this project we have more than 10 developers working at the same time | 14:06 |
|
j416
| don't stop using feature branches | 14:07 |
|
kakku
| j416: we started experimenting with feature branches so that everyone will have like an 'isolated' code base | 14:08 |
|
j416
| we use per-developer namespaces | 14:08 |
|
| that works quite well | 14:08 |
|
| j416 afk a bit | 14:08 |
| → nullie joined | 14:08 |
| ← dangerousdave left | 14:09 |
| → jason237 joined | 14:09 |
| → bobmarchman joined | 14:10 |
| ← EminenceHC left | 14:10 |
|
iveqy
| j416: isn't per developer namespaces just using git as a backup tool? You always have developer branches locally on your computer. Why share them? If you share them they should be feature branches, right? | 14:10 |
| → bronson joined | 14:10 |
| → beautifulmind joined | 14:11 |
| ← bsanford left | 14:11 |
| → jerius joined | 14:12 |
| → saint-ron joined | 14:12 |
| → zapb__ joined | 14:12 |
| ← s8321414 left | 14:12 |
| ← tjm_jimm_ left | 14:13 |
| ← Gizburdt left | 14:14 |
| → bsanford joined | 14:14 |
| ← bronson left | 14:14 |
| ← setuid left | 14:16 |
| ← bobmarchman left | 14:16 |
| → setuid joined | 14:16 |
| → iamjarvo joined | 14:16 |
| → jmpp joined | 14:17 |
| → teran joined | 14:18 |
| → Gizburdt joined | 14:18 |
| ← darkbasic left | 14:18 |
| → Patch joined | 14:19 |
| → CEnnis91 joined | 14:20 |
|
j416
| iveqy: I don't see how publishing them is a bad thing | 14:20 |
| → darkbasic joined | 14:20 |
|
j416
| iveqy: it's also a nice way to share work | 14:20 |
| ← intransit left | 14:21 |
|
j416
| iveqy: and do code review | 14:21 |
| ← saint-ron left | 14:21 |
|
| j416 afk again | 14:21 |
| ← jmpp left | 14:21 |
| → Zamyatin joined | 14:22 |
|
iveqy
| j416: but if you do share (work and doing reviews) them, what differs them from beeing feature branches? (not critizing your workflow, just trying to learn from you) | 14:23 |
| ← teran left | 14:23 |
| → hafeez3000_ joined | 14:24 |
| ← Zentdayn left | 14:24 |
| ← hafeez3000 left | 14:24 |
| hafeez3000_ → hafeez3000 | 14:24 |
| → Guest9358 joined | 14:24 |
| ← sieve left | 14:24 |
| → javaJake joined | 14:24 |
| Guest9358 → daynaskully | 14:24 |
| → sieve joined | 14:25 |
| → joeyDB joined | 14:25 |
| ← kstuart left | 14:26 |
| → kristofferR joined | 14:28 |
| → kukks joined | 14:28 |
| ← kukks left | 14:28 |
| → kukks joined | 14:28 |
| → knownasilya joined | 14:28 |
| ← joeyDB left | 14:30 |
| → Takle joined | 14:30 |
| → tonyj joined | 14:32 |
| ← metastableB left | 14:32 |
| → johnkevinmbasco joined | 14:32 |
| ← iamjarvo left | 14:33 |
| ← hafeez3000 left | 14:33 |
| ← smccarthy left | 14:34 |
| ← Zamyatin left | 14:35 |
| → saint-ron joined | 14:35 |
| → nkouevda joined | 14:36 |
| → msmith_ joined | 14:36 |
| → drupald joined | 14:36 |
| → Dougie187 joined | 14:37 |
| → valeriansaliou joined | 14:37 |
| → icio_ joined | 14:38 |
| ← wachterjohannes left | 14:39 |
| → Zentdayn joined | 14:40 |
| → eletuchy joined | 14:40 |
| ← nkouevda left | 14:40 |
| → cannonball joined | 14:41 |
| → wachterjohannes joined | 14:41 |
| ← saint-ron left | 14:41 |
| ← icio left | 14:41 |
| ← Peuc left | 14:42 |
| ← valeriansaliou left | 14:42 |
| → mizu_no_oto joined | 14:42 |
| → saint-ron joined | 14:42 |
| → nginx77 joined | 14:43 |
| → hafeez3000 joined | 14:43 |
| → IrishPrime joined | 14:44 |
| → denete joined | 14:44 |
| ← eletuchy left | 14:44 |
| → mezod joined | 14:45 |
| ← lsiv568 left | 14:47 |
| ← kristofferR left | 14:47 |
| → VimFleed joined | 14:48 |
| → Zamyatin joined | 14:48 |
| ← beckyconning_ left | 14:48 |
| ← nginx77 left | 14:48 |
| → jpoirier joined | 14:48 |
| ← jpoirier left | 14:49 |
| ← beautifulmind left | 14:49 |
| → AaronMT joined | 14:49 |
| ← denete left | 14:50 |
| → hafeez3000_ joined | 14:50 |
| ← Zentdayn left | 14:50 |
| ← hafeez3000 left | 14:51 |
| hafeez3000_ → hafeez3000 | 14:51 |
| → HandheldPenguin` joined | 14:51 |
| → denete joined | 14:51 |
| → bannakaffalatta joined | 14:52 |
| → lsiv568 joined | 14:54 |
| → GrupoCITEC joined | 14:54 |
| → hafeez3000_ joined | 14:55 |
| ← hafeez3000 left | 14:55 |
| hafeez3000_ → hafeez3000 | 14:55 |
| ← kakku left | 14:55 |
| ← ruukasu left | 14:55 |
| → kakku joined | 14:55 |
| gitinfo set mode: +v | 14:55 |
| → tystr joined | 14:56 |
| ← icio_ left | 14:57 |
| → Trudko joined | 14:57 |
| → macabre joined | 14:57 |
| → s00pcan_ joined | 14:58 |
| → icio joined | 14:58 |
| ← jatt left | 14:59 |
| → Bpit joined | 14:59 |
| → jatt joined | 14:59 |
| ← Zamyatin left | 14:59 |
| ← jatt left | 14:59 |
| → jatt joined | 14:59 |
| → dannymichel joined | 15:00 |
| ← denete left | 15:00 |
| → fandi joined | 15:00 |
| → bobmarchman joined | 15:01 |
| ← bobmarchman left | 15:01 |
| → bobmarchman joined | 15:01 |
| → denete joined | 15:01 |
| ← vtunka left | 15:01 |
| → DrHouse|DellM650 joined | 15:02 |
| ← k4rtik left | 15:03 |
| ← bobmarchman left | 15:03 |
| → vtunka joined | 15:03 |
| → joeyDB joined | 15:04 |
| → phantomtiger joined | 15:04 |
| → Peuc joined | 15:04 |
| → ruukasu joined | 15:06 |
| → Amandil joined | 15:06 |
| → affa09 joined | 15:06 |
| ← kukks left | 15:06 |
| ← joo-_ left | 15:06 |
| → bobmarchman joined | 15:07 |
| → chrisgeo joined | 15:07 |
| → kevwil joined | 15:07 |
| → joo-_ joined | 15:08 |
| → nottombrown joined | 15:09 |
| ← cvanball left | 15:09 |
| ← cavallari left | 15:09 |
| → Milkweed joined | 15:10 |
| → Zamyatin joined | 15:10 |
| ← rchavik left | 15:10 |
| ← hoijui_ left | 15:10 |
| ← craigp left | 15:10 |
| ← Consuela left | 15:11 |
| ← bannakaffalatta left | 15:11 |
| ← sieve left | 15:11 |
| ← lsiv568 left | 15:12 |
| → fragamus joined | 15:12 |
| → Manny joined | 15:13 |
| ← ManikM left | 15:13 |
| ← nottombrown left | 15:13 |
| ← autochthon left | 15:14 |
| → zivester joined | 15:14 |
| → klusias joined | 15:15 |
| → hoijui_ joined | 15:16 |
| → Neozonz joined | 15:16 |
|
klusias
| hello. is there any good book or tutorial about *advanced* git features, like merging, rebasing, branches? | 15:16 |
|
tobiasvl
| !book | 15:17 |
|
gitinfo
| 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 | 15:17 |
|
PerlJam
| klusias: those aren't advanced features. Those are every-day bread and butter features. | 15:17 |
| ← trey left | 15:17 |
| ← dannymichel left | 15:17 |
|
PerlJam
| klusias: read the book that gitinfo recommends :) | 15:17 |
| ← Bpit left | 15:18 |
| → daivyk joined | 15:18 |
| ← thevishy left | 15:18 |
| ← Zamyatin left | 15:19 |
| → teran joined | 15:19 |
| → sbogg joined | 15:19 |
| → wrouesnel joined | 15:19 |
| → autochthon joined | 15:19 |
| ← hoijui_ left | 15:21 |
| → tranzfuse joined | 15:21 |
| → medgno joined | 15:21 |
| ← subhojit777 left | 15:22 |
| ← teran left | 15:24 |
| → iamjarvo joined | 15:24 |
| → subhojit777 joined | 15:25 |
| → apurcell joined | 15:25 |
| → CheckDavid joined | 15:26 |
| → Ankhers joined | 15:26 |
| → kukks joined | 15:26 |
| ← kukks left | 15:26 |
| → kukks joined | 15:26 |
| ← zivester left | 15:27 |
| ← hyperair left | 15:27 |
| → listochkin joined | 15:28 |
| → thedodd joined | 15:28 |
| ← Segfault_ left | 15:28 |
| → Segfault_ joined | 15:29 |
| ← apurcell left | 15:30 |
| ← paul424 left | 15:30 |
| ← pm90_ left | 15:30 |
| → kstuart joined | 15:30 |
| → nottombrown joined | 15:30 |
| → cavallari joined | 15:31 |
| → ehmatthes joined | 15:33 |
| → hoijui_ joined | 15:33 |
| ← Akagi201 left | 15:33 |
| → Akagi201 joined | 15:33 |
| ← scampbell left | 15:34 |
| → zumba_addict joined | 15:34 |
| → EminenceHC joined | 15:35 |
| → valeriansaliou joined | 15:35 |
| → Zamyatin joined | 15:36 |
|
kakku
| !bottomup | 15:36 |
|
gitinfo
| 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf) | 15:36 |
| ← Zamyatin left | 15:37 |
|
kakku
| !designers | 15:37 |
|
gitinfo
| 'Git for Web Designers' is a quick "Who why what when how" on VCS and git: http://www.webdesignerdepot.com/2009/03/intro-to-git-for-web-designers/ | 15:37 |
| → Zamyatin joined | 15:38 |
| → lsiv568 joined | 15:38 |
| → d10n-work joined | 15:38 |
| → jwest joined | 15:39 |
|
kakku
| !gcs | 15:39 |
|
gitinfo
| [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html | 15:39 |
| ← Zamyatin left | 15:39 |
| → dannymichel joined | 15:39 |
| ← EminenceHC left | 15:39 |
| → Zamyatin joined | 15:40 |
| ← Takle left | 15:40 |
|
kakku
| !cs | 15:40 |
|
gitinfo
| "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup | 15:40 |
| → nginx77 joined | 15:40 |
| → eletuchy joined | 15:41 |
| ← nginx77 left | 15:41 |
| ← nowhere_man left | 15:42 |
| ← Zamyatin left | 15:43 |
|
aberrant
| !parable | 15:43 |
|
gitinfo
| 'The git parable' provides some good reasoning behind git. http://tom.preston-werner.com/2009/05/19/the-git-parable.html | 15:43 |
| → nginx77 joined | 15:43 |
| → otter768 joined | 15:44 |
| → Takle joined | 15:44 |
| ← vlovgr left | 15:44 |
| ← zumba_addict left | 15:44 |
| → vlovgr joined | 15:44 |
| ← vlovgr left | 15:44 |
| → vlovgr joined | 15:44 |
| → smccarthy joined | 15:45 |
| ← eletuchy left | 15:45 |
| → nnyk joined | 15:46 |
| → zumba_addict joined | 15:46 |
| ← jceb left | 15:46 |
| ← DrHouse|DellM650 left | 15:46 |
|
kakku
| !gitt | 15:47 |
|
gitinfo
| A book designed to teach people about Git in a real world usage model. The book follows a fictional company as they implement and learn about Git. Covers all 21 standard Git commands. Available for free at http://cbx33.github.com/gitt/ | 15:47 |
|
kakku
| !vcbe | 15:47 |
|
gitinfo
| 'Version Control By Example' gives a good overview of the different VCSes available. The author will even mail you a dead-tree copy for free. http://ericsink.com/vcbe/ | 15:47 |
| ← wachterjohannes left | 15:47 |
| ← hafeez3000 left | 15:47 |
| → dm7freek joined | 15:47 |
| ← subhojit777 left | 15:48 |
| ← otter768 left | 15:48 |
| ← nnyk_ left | 15:48 |
| ← jatt left | 15:49 |
| ← smccarthy left | 15:49 |
| ← sbogg left | 15:49 |
| ← sinkensa_ left | 15:50 |
| → alekks joined | 15:50 |
| → HoMM joined | 15:50 |
| → hyperair joined | 15:50 |
| ← dannymichel left | 15:51 |
| ← nilg left | 15:51 |
| ← valeriansaliou left | 15:52 |
| → EminenceHC joined | 15:52 |
| ← dm7freek left | 15:53 |
| ← scientes left | 15:53 |
| ← alekks left | 15:55 |
| → SumDude joined | 15:56 |
| ← interrobangd left | 15:56 |
| ← GODDOG left | 15:57 |
| ← mlechner left | 15:57 |
| → chrisshattuck joined | 15:57 |
| ← EminenceHC left | 15:57 |
| ← daivyk left | 15:57 |
| ← kukks left | 15:57 |
| → albel727 joined | 15:58 |
| → devoldmx joined | 15:58 |
| → mahtennek joined | 15:59 |
| → serum joined | 15:59 |
| ← DrSkyLizard left | 15:59 |
| → axl_ joined | 15:59 |
| → bronson joined | 15:59 |
| → kpease joined | 15:59 |
| ← VimFleed left | 16:00 |
| ← seschwar left | 16:00 |
| → devoldmx_ joined | 16:00 |
| ← devoldmx left | 16:00 |
| ← acolson left | 16:00 |
| ← Silmarilion left | 16:00 |
| → Noldorin joined | 16:01 |
| → EminenceHC joined | 16:01 |
| → smccarthy joined | 16:02 |
| → ojacobson joined | 16:02 |
| → subhojit777 joined | 16:02 |
| ← johnkevinmbasco left | 16:03 |
| → kpease_ joined | 16:03 |
| → MLM joined | 16:03 |
| ← bronson left | 16:04 |
| ← devoldmx_ left | 16:04 |
| → sieve joined | 16:04 |
| → asturel joined | 16:04 |
| ← Gizburdt left | 16:05 |
| ← EminenceHC left | 16:05 |
| → devoldmx joined | 16:05 |
| → EminenceHC joined | 16:05 |
| ← hexagoxel left | 16:05 |
| ← ThomasLocke left | 16:06 |
| → tang^ joined | 16:06 |
| → dangerousdave joined | 16:06 |
| ← kpease left | 16:06 |
| ← iamjarvo left | 16:06 |
| → gchristensen joined | 16:07 |
|
gchristensen
| Hi, is it correct to assume that sparse checkout won't impact the amount of data which is cloned? | 16:07 |
| ← FAMAS left | 16:09 |
|
osse
| yes | 16:10 |
| ← nisseni left | 16:11 |
| ← zumba_addict left | 16:11 |
| → zumba_addict joined | 16:11 |
| ← Amandil left | 16:12 |
| kpease_ → kpease | 16:13 |
| → pm90_ joined | 16:14 |
| → Spacew00t joined | 16:14 |
| ← chrisshattuck left | 16:15 |
| ← dangerousdave left | 16:16 |
| ← subhojit777 left | 16:16 |
| ← joo-_ left | 16:16 |
| ← zumba_addict left | 16:17 |
| → zumba_addict joined | 16:17 |
| ← KeelOfSteel left | 16:17 |
| → chrisshattuck joined | 16:18 |
| ← Raging_Hog left | 16:18 |
| kpease → kpease_ | 16:19 |
| → acharlieh joined | 16:19 |
| → joo-_ joined | 16:19 |
| → luksaur joined | 16:19 |
| ← luksaur left | 16:19 |
| → luksaur joined | 16:19 |
| → Gamecubic joined | 16:19 |
| ← Macaveli left | 16:19 |
| → teran joined | 16:20 |
| → bobmarch_ joined | 16:20 |
| ← mahtennek left | 16:20 |
| ← jaydubya left | 16:20 |
| → jaydubya joined | 16:21 |
| ← Segfault_ left | 16:21 |
| → Segfault_ joined | 16:22 |
| → Ankhers` joined | 16:22 |
| → dangerousdave joined | 16:22 |
| ← Ankhers left | 16:22 |
| ← bobmarchman left | 16:22 |
| ← dangerousdave left | 16:23 |
| → jmpp joined | 16:24 |
| ← teran left | 16:24 |
| → nkouevda joined | 16:25 |
| → moviuro_ joined | 16:25 |
| ← jaydubya left | 16:25 |
| → zumba_ad_ joined | 16:25 |
| ← sq-one left | 16:26 |
| ← Segfault_ left | 16:27 |
| ← moviuro left | 16:27 |
| ← zumba_addict left | 16:27 |
| ← Guest48971 left | 16:27 |
| → joelm joined | 16:27 |
| ← eburcat_ left | 16:27 |
| ← pm90_ left | 16:28 |
| ← jmpp left | 16:28 |
| ← saint-ron left | 16:28 |
| → pm90_ joined | 16:28 |
| → subhojit777 joined | 16:29 |
| m0f0x → nanga | 16:29 |
| ← nkouevda left | 16:29 |
| → eburcat joined | 16:30 |
| ← zumba_ad_ left | 16:30 |
| → Segfault_ joined | 16:30 |
| → saint-ron joined | 16:30 |
| → sparr joined | 16:31 |
| → zumba_addict joined | 16:31 |
| ← paulweb515 left | 16:31 |
| ← neunon left | 16:31 |
| ← zumba_addict left | 16:32 |
| → neunon joined | 16:32 |
| → jaydubya joined | 16:32 |
| ← Segfault_ left | 16:33 |
| → Segfault_ joined | 16:33 |
| ← Duikb00t left | 16:33 |
| ← sebhoss left | 16:34 |
| kpease_ → kpease | 16:34 |
| ← eburcat left | 16:34 |
| → zumba_addict joined | 16:34 |
| ← Segfault_ left | 16:35 |
| → shreyas1 joined | 16:35 |
| → b4rbz joined | 16:36 |
| ← ReekenX left | 16:36 |
| → Bootinbull joined | 16:36 |
| ← rasto left | 16:37 |
| kpease → kpease_ | 16:37 |
| ← jaydubya left | 16:37 |
| → diamonds joined | 16:37 |
| → n-st joined | 16:37 |
|
diamonds
| I used git rm --cached to remove the index file which I no longer need but am keeping for now for reference | 16:38 |
|
| http://hastebin.com/raw/gisicezino | 16:38 |
|
| why is git calling it "modified"? | 16:38 |
|
osse
| "the index file"? is that index.html by any chance? index.js is the one that is modified | 16:39 |
| ← gchristensen left | 16:39 |
| → iamshercoder joined | 16:39 |
| → eletuchy joined | 16:41 |
|
diamonds
| heh... | 16:41 |
| → kadoban joined | 16:42 |
|
| diamonds backs out of room quietly | 16:42 |
| ← mizu_no_oto left | 16:42 |
| → jceb joined | 16:42 |
|
osse
| ^_^ | 16:42 |
| kpease_ → kpease | 16:42 |
| kpease → kpease_ | 16:42 |
| ← devoldmx left | 16:43 |
| ← acharlieh left | 16:43 |
| ← Takle left | 16:43 |
| ← lsiv568 left | 16:43 |
| → a_le joined | 16:43 |
| ← CustosL1men left | 16:43 |
| ← tranzfuse left | 16:44 |
| → flugo joined | 16:44 |
| → Segfault_ joined | 16:44 |
| Segfault_ → Segfault_|away | 16:45 |
| → deryni joined | 16:45 |
| ← eletuchy left | 16:46 |
| → nisseni joined | 16:48 |
| kpease_ → kpease | 16:48 |
| → Takle joined | 16:48 |
| ← ehmatthes left | 16:49 |
| → FAMAS joined | 16:50 |
| → vurma joined | 16:50 |
| → jonmorehouse joined | 16:50 |
| → ruukasuu joined | 16:51 |
| ← ruukasu left | 16:51 |
| ← ruukasuu left | 16:51 |
| → asdofindia joined | 16:51 |
| ← vurma left | 16:51 |
| ← Segfault_|away left | 16:52 |
| → Tabmow joined | 16:52 |
| kpease → kpease_ | 16:52 |
| ← gfixler left | 16:52 |
| → livingstn joined | 16:53 |
| → Inv1s1ble joined | 16:54 |
| → skemper_ joined | 16:54 |
| ← FAMAS left | 16:55 |
| → ruukasu joined | 16:55 |
| → FAMAS joined | 16:55 |
| ← FAMAS left | 16:55 |
| Ankhers` → Ankhers | 16:58 |
| → Acidnerd joined | 16:58 |
| ← nisseni left | 16:58 |
| → paulweb515 joined | 16:58 |
| → devoldmx joined | 16:58 |
| → lsiv568 joined | 16:59 |
| → DolphinDream joined | 17:00 |
| shreyas1 → shrey | 17:00 |
| ← mezod left | 17:01 |
| ChanServ set mode: +o | 17:01 |
| → blackmesa joined | 17:01 |
| kpease_ → kpease | 17:01 |
| Eugene changed the topic to: Welcome to #git, the place for git help and identity crises | Current stable version: 2.2.1 | Start here: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | No, I'm gitticus! | 17:01 |
| Eugene set mode: +vvvv | 17:02 |
| → Macaveli joined | 17:02 |
| Eugene set mode: -o | 17:02 |
| → leeN joined | 17:02 |
| ← zumba_addict left | 17:02 |
|
DolphinDream
| what's new in 2.2.1 vs 1.9.1 ? :) | 17:02 |
| ← affa09 left | 17:03 |
| kpease → kpease_ | 17:03 |
| ← ihlcqe left | 17:03 |
| kpease_ → kpease | 17:04 |
| → rcampbel3 joined | 17:04 |
| ← wrouesnel left | 17:05 |
|
Eugene
| https://git.madeitwor.se/git/tree/master/Documentation/RelNotes/ | 17:05 |
| → fresham joined | 17:06 |
| kpease → kpease_ | 17:06 |
| → french joined | 17:07 |
| → Sasazuka_work joined | 17:08 |
| → plutt joined | 17:09 |
|
DolphinDream
| Eugene, thx. btw. what are the major changes since 1.9.x ? is it worth updating to 2.2.x ? | 17:09 |
| ← saint-ron left | 17:09 |
|
Eugene
| Stay with a !package | 17:09 |
|
gitinfo
| [!packaged] Unless you have a specific technical need for the "latest and greatest" you should go with a packaged version. Compiling and installing your own is not something that we will walk you through or troubleshoot (though it *is* fairly easy for developers with GNU/Linux experience). | 17:09 |
|
DolphinDream
| ah.. bliss. | 17:10 |
| ← jonmorehouse left | 17:11 |
| → nowhere_man joined | 17:12 |
| → Quevin joined | 17:12 |
| → imachuchu joined | 17:12 |
| ← Manny left | 17:13 |
| → ManikM joined | 17:13 |
| ← joo-_ left | 17:14 |
| → apurcell joined | 17:14 |
| → jnavila joined | 17:15 |
| ← subhojit777 left | 17:15 |
| → jaydubya joined | 17:15 |
| → rishi joined | 17:16 |
| → FAMAS joined | 17:16 |
| ← FAMAS left | 17:16 |
| → FAMAS joined | 17:17 |
| ← FAMAS left | 17:17 |
| → FAMAS joined | 17:18 |
| ← FAMAS left | 17:18 |
| → FAMAS joined | 17:18 |
| ← FAMAS left | 17:18 |
| ← psoo left | 17:18 |
| ← apurcell left | 17:19 |
| → FAMAS joined | 17:19 |
| → maletor joined | 17:19 |
| → githash joined | 17:19 |
|
DolphinDream
| is git branch newBranch a new feature? i thought you use git checkout -b newBranch to create branches | 17:19 |
| ← kakku left | 17:19 |
| gitinfo set mode: +v | 17:19 |
|
fresham
| If a dev creates a feature branch, a few commits happen to develop, pulls from develop to feature (non-ff-merge), a few commits happen to develop, then merges to develop, will the work done on develop after the merge commit be overwritten? | 17:20 |
| ← icio left | 17:20 |
| → teran joined | 17:21 |
|
githash
| hii - if i make 2 commits, and then reset back to the 1st commit and then make a commit. does that overwrite my original 2nd commit ? | 17:21 |
|
ojacobson
| DolphinDream: no, 'git branch <name>' has been around as long as 'git branch' has. | 17:21 |
|
| 'git checkout -b' checks out the new branch as well, which most people want | 17:22 |
| Sasazuka_work → Sasazuka_ | 17:22 |
| → Sample joined | 17:22 |
| → jatt joined | 17:22 |
|
ojacobson
| 'git branch <name>' creates it (at HEAD, by default, though you can specify) but does not check it out | 17:22 |
|
DolphinDream
| ohh.. gotcha. thx ojacobson | 17:22 |
| ← jatt left | 17:22 |
| → jatt joined | 17:22 |
|
DolphinDream
| never used it | 17:22 |
|
githash
| anyone ?! | 17:23 |
|
soerenb
| githash, if you reset back you already discarded the second commit | 17:23 |
|
DolphinDream
| i'm playing with the try.github.io :) and one of the commands was git branch newBranch | 17:23 |
| → joshin4colours joined | 17:23 |
|
DolphinDream
| not that i needed to "try" git .. but i was curious to checkout the new learning tool | 17:23 |
|
joshin4colours
| hello | 17:23 |
| → nofxx joined | 17:23 |
|
githash
| soerenb: aaah yes. makes sense. thanks | 17:24 |
|
joshin4colours
| does any one have any sources/benchmarks for when performance of a git repo starts to degrade? | 17:24 |
| → _0xAX joined | 17:24 |
|
joshin4colours
| in terms of no of commits, no of branches, etc? | 17:24 |
|
ojacobson
| depending on which metrics you care about, it degrades immediately. | 17:24 |
| ← githash left | 17:24 |
| ← CheckDavid left | 17:24 |
|
ojacobson
| Most of git's internal algorithms scale linearly with the number of something. | 17:24 |
|
| Repack (and thus git-gc) is probably the biggest exception, because of delta-encoding; git-push and git-fetch are affected by repacking, too | 17:25 |
| → jds joined | 17:25 |
|
joshin4colours
| ojacobson: ok, understood | 17:25 |
| ← teran left | 17:25 |
|
joshin4colours
| I guess I mean at what point does a repo's commands become much less usable? (ie noticably slower) | 17:26 |
| → pheaver joined | 17:26 |
| ← vtunka left | 17:26 |
| → mezod joined | 17:26 |
| → iraj joined | 17:26 |
| → KeelOfSteel joined | 17:26 |
| → joel_falcou joined | 17:27 |
| → bg__ joined | 17:28 |
| ← shpoont left | 17:28 |
| ← s00pcan_ left | 17:29 |
| ← Nizumzen left | 17:29 |
| → Gizburdt joined | 17:30 |
| → bronson joined | 17:30 |
| → encod3 joined | 17:30 |
| ← mikecmpbll left | 17:31 |
| → zumba_addict joined | 17:31 |
| ← kurkale6ka left | 17:32 |
| ← liamkeily left | 17:32 |
| → mellernoia joined | 17:33 |
| → subhojit777 joined | 17:33 |
| → desposo joined | 17:34 |
| ← wowaname left | 17:34 |
| → erickr joined | 17:34 |
| → saint-ron joined | 17:34 |
| ← bronson left | 17:35 |
| ← jatt left | 17:35 |
| ← saint-ron left | 17:35 |
| → PeterBooker joined | 17:37 |
| → dm7freek joined | 17:37 |
| ← ghoti left | 17:38 |
| → dreiss joined | 17:38 |
| → rafaelcpalmeida joined | 17:38 |
| → intransit joined | 17:39 |
| ← skylite left | 17:39 |
| → ecky--ptang-zoob joined | 17:39 |
| → rafaelcp_ joined | 17:39 |
| ← Muzer left | 17:39 |
| ← rafaelcpalmeida left | 17:39 |
| ← erickr left | 17:40 |
| ← Takle left | 17:40 |
| → Segfault_ joined | 17:41 |
| → valeriansaliou joined | 17:41 |
| ← dm7freek left | 17:41 |
| → ghoti joined | 17:42 |
| → eletuchy joined | 17:42 |
| ← sieve left | 17:42 |
| → squeegily joined | 17:43 |
| → tranzfuse joined | 17:44 |
|
squeegily
| I have two files with changes that have not been staged yet. I want to stage the changes to one file, and revert/discard the other file to its state as of the last commit | 17:44 |
| → otter768 joined | 17:45 |
|
fresham
| If Dev A pulls develop into his feature branch, Dev B merges new feature to develop, Dev A merges feature branch into develop (and the merge commit touches the same stuff as the new commits on dev) -- does that stale merge commit overwrite the work Dev B did? | 17:45 |
| ← jazper- left | 17:46 |
| ← valeriansaliou left | 17:46 |
| → jazper- joined | 17:46 |
| ← jazper- left | 17:46 |
| → jazper- joined | 17:46 |
|
Dorf
| squeegily: http://www.norbauer.com/rails-consulting/notes/git-revert-reset-a-single-file.html | 17:46 |
|
| does that help? | 17:46 |
| → sinkensabe joined | 17:46 |
| → jmpp joined | 17:46 |
| ← eletuchy left | 17:46 |
| ← tarkus left | 17:47 |
|
squeegily
| Dorf: Yep, the command was 'git checkout file/tp/revert.py' | 17:47 |
| → Muzer joined | 17:48 |
| → bannakaffalatta joined | 17:48 |
| ← otter768 left | 17:49 |
| → EvilPenguin joined | 17:49 |
| → cvanball joined | 17:49 |
| ← tranzfuse left | 17:50 |
| ← bg__ left | 17:50 |
| ← Gizburdt left | 17:51 |
| → tieTYT2 joined | 17:52 |
| ← blackmesa left | 17:52 |
| → Gizburdt joined | 17:52 |
|
iveqy
| fresham: !tryit but afaik you should get a conflict | 17:52 |
|
gitinfo
| fresham: [!tias] Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS. | 17:52 |
|
fresham
| iveqy: Good point. I'm just having an issue where our codebase is missing code, and that's the prime suspect | 17:52 |
| → shpoont joined | 17:53 |
| ← Spacew00t left | 17:53 |
| → brucelee joined | 17:53 |
| → dik_dak joined | 17:54 |
|
danemacmillan
| !backup | 17:54 |
|
gitinfo
| Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups | 17:54 |
| → Dudi joined | 17:54 |
| → thiago joined | 17:55 |
|
iveqy
| fresham: if I where you I would start looking at the merges and try to see where the code is missing. However usually there's a problem with someone doing a forced push. | 17:55 |
|
| !force | 17:55 |
|
gitinfo
| [!force_push] If you need to overwrite the history of a remote git repository (very bad idea, see !rewrite), you can do so with `git push -f`. Note the remote server may reject this. See man git-config and search for receive.denyNonFastForwards. Best practice is for upstream servers to denyNonFastForwards. | 17:55 |
|
iveqy
| fresham: are your server configurated with denyNonFastForwards? | 17:55 |
| → Duikb00t joined | 17:56 |
| ← freimatz left | 17:56 |
| ← Gizburdt left | 17:57 |
| ← shpoont left | 17:57 |
| → rdbell joined | 17:57 |
| → shpoont joined | 17:58 |
| → milki joined | 17:58 |
| ← nnyk left | 17:58 |
| ← jaydubya left | 17:58 |
| ← zumba_addict left | 17:59 |
| → jaydubya joined | 17:59 |
|
fresham
| I don't think so. It's github | 17:59 |
|
| Yeah, I'm gonna backtrack to where it's missing | 17:59 |
| ← MattMake_ left | 18:00 |
|
fresham
| Actually, everything merged to develop is handled by github pull request, unless there's a conflict | 18:00 |
| → MattMaker joined | 18:00 |
| → DSH105 joined | 18:01 |
| → mizu_no_oto joined | 18:01 |
| ← UKn0Meh left | 18:02 |
| → zumba_addict joined | 18:02 |
| → hguux_ joined | 18:02 |
| → saint-ron joined | 18:02 |
| → salamanderrake joined | 18:02 |
| ← phantomtiger left | 18:03 |
| ← encod3 left | 18:03 |
| → Malsasa_ joined | 18:03 |
| Malsasa_ → Malsasa | 18:03 |
| ← ghoti left | 18:04 |
| ← jaydubya left | 18:04 |
|
iveqy
| fresham: good luck, I've to go afk | 18:04 |
| ← ohseap left | 18:05 |
| → nour joined | 18:06 |
| ← dts|pokeball left | 18:06 |
| ← dreiss left | 18:06 |
| ← JoshLope_ left | 18:06 |
| → dts|pokeball joined | 18:06 |
| ← ruukasu left | 18:06 |
| → ruukasu joined | 18:07 |
| → anothermoron joined | 18:07 |
| → Zamyatin joined | 18:07 |
| ← GGflags left | 18:07 |
| ← dts|pokeball left | 18:07 |
| ← mmattice left | 18:07 |
| → dts|pokeball joined | 18:07 |
| ← flugo left | 18:08 |
| ← hebz0rl left | 18:08 |
| ← Ankhers left | 18:08 |
| ← endiruna left | 18:08 |
| → akushner joined | 18:08 |
| ← aswen left | 18:08 |
| ← dts|pokeball left | 18:08 |
| → dts|pokeball joined | 18:09 |
| → Ankhers joined | 18:10 |
| ← rishi left | 18:10 |
| → petersr joined | 18:10 |
| ← Zamyatin left | 18:11 |
| ← d10n-work left | 18:11 |
| ← ome left | 18:11 |
| → bobdobbs` joined | 18:11 |
| ← mnml left | 18:12 |
| ← dsteplight___ left | 18:12 |
| ← knownasilya left | 18:12 |
| ← bb010g left | 18:12 |
| ← skelterjohn left | 18:12 |
| ← jds left | 18:12 |
| ← MLM left | 18:12 |
| ← sarbs left | 18:12 |
| ← rylinaux left | 18:12 |
| → rishi joined | 18:12 |
| → pantsman- joined | 18:12 |
| ← dts|pokeball left | 18:12 |
| ← himikof left | 18:12 |
| ← Noldorin left | 18:12 |
| ← GGMethos left | 18:12 |
| → Bigcheese joined | 18:13 |
| ← DSH105 left | 18:13 |
| → jophish joined | 18:13 |
| → scalability-junk joined | 18:13 |
| ← nottombrown left | 18:13 |
| ← bdavenport left | 18:13 |
| ← troyt left | 18:13 |
| ← i_ron left | 18:13 |
| → ghoti joined | 18:13 |
| → mwarning joined | 18:13 |
| → ZucchiniZe joined | 18:14 |
| ← n-st left | 18:14 |
| ← cannonball left | 18:14 |
| ← grawity left | 18:14 |
| ← c0ded left | 18:14 |
| ← DrNick left | 18:14 |
| ← ORiON-- left | 18:14 |
| ← bobdobbs left | 18:14 |
| → nottombrown joined | 18:14 |
| ← ecky--ptang-zoob left | 18:14 |
| ← basiclaser_ left | 18:14 |
|
mwarning
| hi folks, I like to try this command, bu it fails to expand pwd: git -C feeds/routing am --whitespace=nowarn `pwd`firmware/patches/routing/*.patch | 18:14 |
| → yena_ joined | 18:14 |
|
mwarning
| any ideas how to overcome this? | 18:14 |
| ← tobiasvl left | 18:14 |
| ← Wulf left | 18:14 |
| → tyreld joined | 18:14 |
| → grawity joined | 18:15 |
| ← myyst left | 18:15 |
| → ecky--ptang-zoob joined | 18:15 |
| → Ionic joined | 18:15 |
|
mwarning
| ah, pwd is executed, but * is not handled | 18:15 |
| ← jadne left | 18:15 |
| ← synchronous left | 18:15 |
| ← pacbard left | 18:15 |
| ← lacrosse__ left | 18:15 |
| → tvl joined | 18:15 |
| Ionic → Guest21429 | 18:15 |
| → tfnico____ joined | 18:15 |
| tvl → tobiasvl | 18:15 |
| ← ecky--ptang-zoob left | 18:15 |
| → finster joined | 18:15 |
| ← finster left | 18:15 |
| → finster joined | 18:15 |
| → himikof joined | 18:15 |
| → cstrahan_ joined | 18:16 |
| → devhost_ joined | 18:16 |
| → k4r1m joined | 18:16 |
| → lachesis joined | 18:16 |
| → apipkin joined | 18:16 |
| → Wulf joined | 18:16 |
| → ScottE joined | 18:16 |
| → bbhoss joined | 18:16 |
| → haarg joined | 18:16 |
| → ecky--ptang-zoob joined | 18:16 |
| → basiclaser_ joined | 18:16 |
| → Jeroen joined | 18:16 |
| → shennyg joined | 18:16 |
| → Riviera joined | 18:16 |
| → nioncode joined | 18:16 |
| → averell joined | 18:16 |
| → myyst joined | 18:16 |
| → c0ded joined | 18:16 |
| → GameGamer43 joined | 18:16 |
| → rylinaux joined | 18:16 |
| → knownasilya joined | 18:16 |
| → karstensrage joined | 18:16 |
| → _ikke_ joined | 18:16 |
| → Spinkzeit joined | 18:16 |
| → cannonball joined | 18:16 |
| → Outsider__ joined | 18:16 |
| → mnml joined | 18:16 |
| → dnyy joined | 18:16 |
| karstensrage → Guest69793 | 18:16 |
| → MLM joined | 18:16 |
| → n-st joined | 18:16 |
| → bdavenport joined | 18:17 |
| → lacrosse__ joined | 18:17 |
| → DrNick joined | 18:17 |
| → cloudcell joined | 18:17 |
| → SegFaultAX joined | 18:17 |
| → danmackay joined | 18:17 |
| → cagedwisdom joined | 18:17 |
| → DSH105 joined | 18:17 |
| → SleePy joined | 18:17 |
| ← SleePy left | 18:17 |
| → SleePy joined | 18:17 |
| → dsteplight___ joined | 18:17 |
| → [diecast]_ joined | 18:17 |
| → d10n-work joined | 18:17 |
| ← a_le left | 18:17 |
| → skelterjohn joined | 18:17 |
| → troyt joined | 18:17 |
| → HedgeMage joined | 18:17 |
| → ORiON-- joined | 18:17 |
| → mtscout6 joined | 18:17 |
| → ome joined | 18:17 |
| → tgummerer joined | 18:17 |
| → WakiMiko joined | 18:17 |
| → Nickeeh joined | 18:17 |
| → robmozart__ joined | 18:17 |
| → moogumbo joined | 18:17 |
| → akitada joined | 18:17 |
| → jds joined | 18:18 |
| ← cagedwisdom left | 18:18 |
| → Xe joined | 18:18 |
| → wowaname joined | 18:18 |
| → pacbard joined | 18:18 |
| → upene joined | 18:18 |
| → smw joined | 18:18 |
| → GGMethos joined | 18:18 |
| → lebster joined | 18:18 |
| → jonmorehouse joined | 18:18 |
| → Guest30207 joined | 18:18 |
| → cagedwisdom joined | 18:18 |
| → Klumben joined | 18:19 |
| → Hedgework joined | 18:19 |
| → jonet joined | 18:19 |
| → bb010g joined | 18:19 |
| ← cagedwisdom left | 18:19 |
| ← autochthon left | 18:19 |
| ← Macaveli left | 18:19 |
| → dziga joined | 18:19 |
| ← dziga left | 18:19 |
| → dziga joined | 18:19 |
| ← dziga left | 18:19 |
| → dziga joined | 18:19 |
| → blackjid_ joined | 18:19 |
| → cagedwisdom joined | 18:19 |
| ← listochkin left | 18:20 |
| → twisted` joined | 18:20 |
| ← blackjid_ left | 18:20 |
| ← darkbasic left | 18:20 |
| → CalimeroTeknik joined | 18:20 |
| ← MLM left | 18:20 |
| → spaceone joined | 18:20 |
| → sarbs joined | 18:20 |
| ← jottr left | 18:20 |
| → darkbasic joined | 18:21 |
| → dtscode joined | 18:21 |
| → Steve_Jobs joined | 18:21 |
| → i_ron joined | 18:21 |
| ← DSH105 left | 18:21 |
| → teran joined | 18:21 |
| → pekster joined | 18:21 |
| → synchronous joined | 18:22 |
| ← pekster left | 18:22 |
| → blackjid_ joined | 18:22 |
| → Amandil joined | 18:22 |
| ← upene left | 18:22 |
| → MrChris joined | 18:23 |
| → dmarr joined | 18:23 |
|
d10n-work
| Is there a nice way to stash staged and unstaged changes and keep the stage state of the changes on stash pop? | 18:23 |
| → SupaHam joined | 18:23 |
| → apurcell joined | 18:23 |
| → TDJACR joined | 18:23 |
| → ggherdov joined | 18:23 |
| ← jonmorehouse left | 18:23 |
| → ashemark joined | 18:24 |
| → Consuela joined | 18:24 |
| ← riceNbeans left | 18:24 |
|
ashemark
| Hi everyone!! | 18:24 |
| → eburcat joined | 18:24 |
| → encod3 joined | 18:24 |
| → akiva joined | 18:25 |
|
ashemark
| I just made a private repo on github, but am not able to clone it on my pc | 18:25 |
| ← jmpp left | 18:25 |
|
ashemark
| "fatal error - repository not found" | 18:25 |
|
j416
| ashemark: what did you run? | 18:25 |
|
ashemark
| git clone <repo-address> | 18:25 |
| → flugo joined | 18:25 |
|
j416
| that won't work <repo-address> is not an url | 18:26 |
|
| ... | 18:26 |
|
ashemark
| well it was a placeholder, actually it's https://github.com/my_username/myrepo.git | 18:26 |
|
j416
| ashemark: what I'm trying to say is, the part you left out is essential in understanding what went wrong | 18:26 |
|
| ok | 18:26 |
| ← saint-ron left | 18:26 |
| ← kstuart left | 18:26 |
| → edk joined | 18:26 |
| ← joeyDB left | 18:26 |
| ← ruukasu left | 18:26 |
| → pekster joined | 18:26 |
|
j416
| ashemark: I think you have a type in your url. | 18:26 |
|
| typo* | 18:27 |
| ← teran left | 18:27 |
| → kstuart joined | 18:27 |
|
| j416 typo in a sentence about a typo | 18:27 |
|
ashemark
| I tried copying the same from github page, but didn't work either | 18:27 |
|
j416
| for emphasis | 18:27 |
|
| ashemark: should work | 18:27 |
|
ashemark
| it isn't :( | 18:27 |
|
j416
| are you getting any more output? | 18:28 |
|
fresham
| So there's no sign of forced pushes. | 18:28 |
| → electrogeek joined | 18:28 |
|
fresham
| Could it be a rebase or something? | 18:28 |
|
ashemark
| I just initialized the repo and committed a change to the readme file | 18:29 |
| ← rath left | 18:29 |
| → Takle joined | 18:29 |
|
ashemark
| the error is | 18:29 |
|
j416
| ashemark: aha, so there was no repo | 18:29 |
|
ashemark
| j416: on the github website | 18:29 |
|
j416
| ashemark: when you create a new repo on github, it'll tell you exactly what to type | 18:29 |
| → MacGyver joined | 18:30 |
|
ashemark
| ok | 18:30 |
|
j416
| you can just copypaste that | 18:30 |
|
ashemark
| ok | 18:30 |
| → hcc23 joined | 18:30 |
| ← marcogmonteiro left | 18:31 |
| → Sample_ joined | 18:31 |
| → liamkeily joined | 18:31 |
| → J1G|Anon126 joined | 18:32 |
| ← J1G|Anon126 left | 18:32 |
| → silverfix joined | 18:32 |
| → preyalone joined | 18:32 |
| ← bannakaffalatta left | 18:32 |
| → hahuang65 joined | 18:32 |
| → J1G|Anon126 joined | 18:33 |
| → ruukasu joined | 18:33 |
|
ashemark
| j416: ? | 18:33 |
| ← preyalone left | 18:33 |
| → atomx joined | 18:33 |
| ← silverfix left | 18:33 |
| → skylite joined | 18:34 |
| ← thedodd left | 18:34 |
| ← Sample left | 18:34 |
| ← diamonds left | 18:34 |
| → silverfix joined | 18:34 |
| → tarkus joined | 18:34 |
| ← RaceCondition left | 18:35 |
| → FunkyAss joined | 18:35 |
| ← ojacobson left | 18:35 |
| ← tvw left | 18:35 |
| ← averell left | 18:35 |
| → averell joined | 18:35 |
| ← lsiv568 left | 18:36 |
| ← skemper_ left | 18:36 |
| → kukks joined | 18:37 |
| ← kukks left | 18:37 |
| → kukks joined | 18:37 |
|
j416
| ashemark: ! | 18:37 |
| → dm7freek joined | 18:37 |
|
ashemark
| think i'm gonna initiate it locally and push | 18:38 |
| ← iraj left | 18:38 |
|
j416
| and you need my help with..? | 18:38 |
|
ashemark
| j416: thanks for the help so far | 18:38 |
|
j416
| o/ | 18:39 |
|
ashemark
| o/ | 18:39 |
|
denete
| toss-up question: what is the biggest concept that people coming from SVN (check-out, check-in) background need to know when moving to git? | 18:39 |
| → joeyDB joined | 18:39 |
| ← eburcat left | 18:39 |
| ← ghoti left | 18:39 |
| ← intransit left | 18:40 |
| → aidalgol joined | 18:40 |
| → tranzfuse joined | 18:40 |
| ← ruukasu left | 18:40 |
| → intransit joined | 18:40 |
|
bremner
| forget everything | 18:40 |
|
denete
| :) | 18:40 |
| ← Consuela left | 18:41 |
| → ghoti joined | 18:41 |
|
fresham
| If I do git log with a path, shouldn't only merge commits that modified that file show up? | 18:41 |
|
bremner
| I guess there must be more detailed "git for svn users" tutorials around | 18:41 |
| ← jnavila left | 18:41 |
| ← ashemark left | 18:41 |
| → ruukasu joined | 18:41 |
|
bremner
| but really, distributed version control is pretty different from the whole "versioned file system" approach of svn. | 18:42 |
| → ladies joined | 18:42 |
|
bremner
| I guess the notion of atomic commits is in common. | 18:42 |
|
denete
| that ^^^ might be the mental hurdle that would most help the people I'm about to convert | 18:42 |
| → preyalone joined | 18:43 |
| → dreiss joined | 18:43 |
|
denete
| thx | 18:43 |
| → kcj joined | 18:44 |
| ← kcj left | 18:44 |
| → kcj joined | 18:44 |
| → zadock joined | 18:44 |
|
J1G|Anon126
| fresham: try adding --dense | 18:45 |
| ← c0ded left | 18:45 |
| → c0ded joined | 18:45 |
|
fresham
| J1G|Anon126: Didn't help. But my missing commits show up when I add --all | 18:48 |
|
J1G|Anon126
| ah | 18:48 |
| ← zumba_addict left | 18:50 |
|
fresham
| and rev-list of that file only shows older commits | 18:50 |
|
| What exactly does --all do? | 18:51 |
|
J1G|Anon126
| fresham: --all shows commits from all branches, not just the one you're on | 18:51 |
| → eburcat joined | 18:52 |
|
fresham
| oh | 18:52 |
| → Zamyatin joined | 18:52 |
| → okanck joined | 18:52 |
| → zumba_addict joined | 18:52 |
| → jottr joined | 18:52 |
|
fresham
| So if I do 'git log -- somefile.txt', won't that also show me merge commits that modified that file? | 18:52 |
| → rivarun_ joined | 18:52 |
| ← netameta left | 18:53 |
| ← Malsasa left | 18:53 |
| ← cvanball left | 18:53 |
| ← Zamyatin left | 18:53 |
|
J1G|Anon126
| fresham: oh, I thought you meant that *more* merges were showing than you expected | 18:53 |
|
| in that case, you can try --sparse, which should show more | 18:54 |
| → tgkokk joined | 18:54 |
| → Zamyatin joined | 18:54 |
| → donmichelangelo joined | 18:54 |
| ← hoijui_ left | 18:54 |
|
fresham
| Ah, awesome | 18:55 |
|
| that might help | 18:55 |
| ← Zamyatin left | 18:55 |
| → codeFiend joined | 18:55 |
| → Zamyatin joined | 18:56 |
| codeFiend → aeontech | 18:56 |
| → aminorex joined | 18:56 |
| ← michelangelo left | 18:56 |
| → nnyk joined | 18:58 |
| ← tgkokk left | 18:59 |
| → s00pcan_ joined | 19:01 |
| ← twoface88 left | 19:01 |
| ← s00pcan left | 19:01 |
| → ehynds joined | 19:02 |
| ← ehynds left | 19:02 |
| → ELFrederich joined | 19:02 |
|
ELFrederich
| does Git use any kind of locking of objects?... or does it just create / delete objects and update references? | 19:03 |
| → s00pcan joined | 19:03 |
| → MLM joined | 19:03 |
|
ghoti
| Anybody using RANCID (Really Awesome New Cisco confIg Differ) with git? | 19:03 |
|
osse
| ELFrederich: on individual objects in .git/objects you mean? | 19:03 |
| → tgkokk joined | 19:04 |
|
ELFrederich
| osse, yeah | 19:04 |
|
Eugene
| ghoti - Nope. !ask the real question if you want a real response ;-) | 19:04 |
|
gitinfo
| ghoti: Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon. | 19:04 |
| ← joshin4colours left | 19:04 |
| ← desposo left | 19:04 |
|
osse
| ELFrederich: i don't know. there is no need to; they're only written once | 19:04 |
| → hebz0rl joined | 19:04 |
| ← Zamyatin left | 19:04 |
| → weeb1e_ joined | 19:05 |
| → s00pcan__ joined | 19:05 |
| ← s00pcan left | 19:05 |
| ← joki left | 19:05 |
| ← darkbasic left | 19:05 |
| ← anothermoron left | 19:05 |
| → darkbasic joined | 19:05 |
| ← thiago left | 19:06 |
| → desposo joined | 19:06 |
|
ghoti
| Eugene: the "real" question, I suppose, is... Has anyone modified RANCID so that it works with git, rather than just CVS and SVN? | 19:07 |
| → dannymichel joined | 19:07 |
| → andi3 joined | 19:07 |
|
Eugene
| Doubt it. git is also not picking about diff tools | 19:07 |
| ← shrey left | 19:07 |
| ← s00pcan__ left | 19:08 |
|
ghoti
| RANCID, afaik, uses shell wrappers around CVS/SVN commands, so I imagine it wouldn't be too much of a stretch to replace them with other commands. What I'm trying to determine is whether I have to do this myself, or if someone else has already done the work so that I can benefit from it. | 19:08 |
| ← Duikb00t left | 19:09 |
|
ghoti
| I'm not sure I understand what you're saying that git does not pick. | 19:09 |
| → shreyas1 joined | 19:09 |
|
ghoti
| Or did you mean "not picky", implying that RANCID would somehow be called by git, rather than the other way around? | 19:09 |
| → joki joined | 19:09 |
| → joo-_ joined | 19:10 |
| → jaydubya joined | 19:10 |
| → alejandrozf joined | 19:10 |
| → ehynds joined | 19:10 |
| → Zamyatin joined | 19:10 |
| → Gizburdt joined | 19:10 |
| ← Sample_ left | 19:10 |
|
fresham
| Okay, I have a file that changed in a feature branch that was merged to dev (merge commit is there), but the change isn't currently there. How do I find out what rebase or merge broke it? | 19:11 |
| ← jason237 left | 19:12 |
| → Sample joined | 19:12 |
| ← EvilPenguin left | 19:12 |
| → a_le joined | 19:12 |
| ← subhojit777 left | 19:12 |
| ← ManikM left | 19:12 |
| → bronson joined | 19:13 |
| → ManikM joined | 19:13 |
| → s00pcan joined | 19:14 |
| ← flugo left | 19:15 |
| ← rotorooter left | 19:15 |
| → roto joined | 19:15 |
| → phantomtiger joined | 19:16 |
|
fresham
| So we have a bunch of commits like "Merged branch 'develop' into 'feature/something-awesome' with huge lists of changed files. | 19:16 |
| → zackiv31 joined | 19:16 |
| ← zackiv31 left | 19:16 |
|
fresham
| And I think those are overwriting old changes. And that's from people pulling from develop while on a feature branch. | 19:16 |
| → blackmesa joined | 19:17 |
| ← french left | 19:17 |
| ← a_le left | 19:17 |
| → _br_ joined | 19:17 |
|
fresham
| Shouldn't a conflict pop up when you try to merge those stale merge commits into develop? | 19:18 |
| kpease_ → kpease | 19:18 |
| ← s00pcan left | 19:18 |
| → a_le joined | 19:18 |
| → zackiv31 joined | 19:19 |
|
ghoti
| ah - to answer my own question, http://dotwaffle.github.io/rancid-git/ exists. | 19:19 |
| → jonmorehouse joined | 19:19 |
| → s00pcan joined | 19:19 |
| ← Zamyatin left | 19:20 |
| ← shpoont left | 19:20 |
| ← kcj left | 19:21 |
| ← _0xAX left | 19:21 |
| → shpoont joined | 19:21 |
|
ghoti
| Though it's a patch set for a pretty old version of rancid. :( | 19:21 |
| ← jottr left | 19:22 |
| ← kukks left | 19:22 |
| ← blackmesa left | 19:22 |
| ← ladies left | 19:22 |
| → Spacew00t joined | 19:22 |
| → thedodd joined | 19:22 |
| ← Spacew00t left | 19:22 |
| → teran joined | 19:22 |
|
mwarning
| hi, maybe someone can give me some advice: | 19:22 |
|
| git -C feeds/packages am `pwd`firmware/patches/packages/*.patch | 19:22 |
|
| /usr/lib/git-core/git-am: 211: /usr/lib/git-core/git-am: cannot open /media/daten/openwrtfirmware/patches/packages/*.patch: No such file | 19:22 |
|
| does file globbing not work wih -C? | 19:23 |
| ← jonmorehouse left | 19:23 |
| ← tgkokk left | 19:24 |
| → jgardella joined | 19:24 |
| → Anders_J joined | 19:25 |
| ← leeN left | 19:25 |
| → ncd|leeN joined | 19:25 |
| → totte joined | 19:25 |
|
soerenb
| don't you need a '/' after `pwd`? | 19:26 |
|
mwarning
| heh, right | 19:26 |
|
| I forgot :] | 19:26 |
| → anothermoron joined | 19:27 |
| ← teran left | 19:27 |
| → jerius_ joined | 19:27 |
| → affa09 joined | 19:27 |
| → bannakaffalatta joined | 19:28 |
|
mwarning
| thanks | 19:28 |
| ← kpease left | 19:28 |
| → Zentdayn joined | 19:28 |
| → gsingh93 joined | 19:28 |
| → idoru joined | 19:29 |
| → pwnz0r joined | 19:29 |
| → jnavila joined | 19:30 |
| → valeriansaliou joined | 19:30 |
| ← plutt left | 19:30 |
| → veebers joined | 19:30 |
| → tgkokk joined | 19:30 |
| → plutt joined | 19:31 |
| ← nnyk left | 19:31 |
| ← s00pcan left | 19:31 |
| → eletuchy joined | 19:31 |
| ← jerius left | 19:31 |
| → mmattice joined | 19:31 |
| ← plutt left | 19:31 |
| → plutt joined | 19:32 |
| → ohseap joined | 19:32 |
| ← eburcat left | 19:33 |
| ← howlymowly left | 19:34 |
| ← valeriansaliou left | 19:34 |
| ← liamkeily left | 19:35 |
| → baweaver joined | 19:35 |
| ← baweaver left | 19:35 |
| → g3danken joined | 19:35 |
| → baweaver joined | 19:35 |
| ← eletuchy left | 19:36 |
| ← wowaname left | 19:36 |
| → s00pcan joined | 19:37 |
| → lsiv568 joined | 19:37 |
| → luriv joined | 19:37 |
| ← s00pcan left | 19:37 |
| → mjuszczak joined | 19:38 |
| → s00pcan joined | 19:38 |
| ← joo-_ left | 19:39 |
| → kpease joined | 19:39 |
| ← bobmarch_ left | 19:39 |
| → cfgmgr joined | 19:39 |
| ← kpease left | 19:39 |
| → devoldmx_ joined | 19:40 |
| → kpease joined | 19:40 |
| ← greves left | 19:40 |
| → greves joined | 19:41 |
| ← lsiv568 left | 19:41 |
| ← tarkus left | 19:42 |
| → tarkus joined | 19:42 |
| → EvilPenguin joined | 19:43 |
| → jonmorehouse joined | 19:43 |
| → listochkin joined | 19:43 |
| ← s00pcan_ left | 19:43 |
| ← devoldmx left | 19:44 |
| → DrHouse|DellM650 joined | 19:45 |
| ← klusias left | 19:45 |
| → otter768 joined | 19:45 |
| ← msmith_ left | 19:45 |
|
danemacmillan
| Hi--would anyone know why my git log pretty=format:"" won't accept spaces in the format? | 19:46 |
| ← listochkin left | 19:46 |
| → flugo joined | 19:46 |
|
J1G|Anon126
| danemacmillan: you need to put the quotes around "format", too: --pretty="format:..." | 19:46 |
| → listochkin joined | 19:47 |
| → txomon|home joined | 19:47 |
| → erickr joined | 19:47 |
|
danemacmillan
| That doesn't seem to be it. | 19:47 |
| → jatt joined | 19:48 |
| ← jatt left | 19:48 |
| → jatt joined | 19:48 |
|
danemacmillan
| The git log --help examples don't do that, either | 19:48 |
| → s00pcan_ joined | 19:48 |
|
J1G|Anon126
| hm... | 19:48 |
|
canton7
| !repro | 19:49 |
|
gitinfo
| [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%. | 19:49 |
|
qsuscs
| example in the manpage is format:"The author of %h was %an, %ar%nThe title was >>%s<<%n", so it should work with spaces | 19:49 |
| ← zadock left | 19:49 |
|
danemacmillan
| Yeah, that's why I'm confused. | 19:50 |
|
J1G|Anon126
| danemacmillan: what is the output, exactly? | 19:50 |
| ← encod3 left | 19:50 |
|
danemacmillan
| fatal: ambiguous argument '%h': unknown revision or path not in the working tree. | 19:50 |
|
| Use '--' to separate paths from revisions, like this:yY | 19:51 |
|
| Though it's a log. Not sure why -- would be required. | 19:51 |
| → encod3 joined | 19:51 |
|
danemacmillan
| Also, tried with double dash and it output nothing | 19:51 |
|
| Though the error was suppressed | 19:51 |
|
J1G|Anon126
| danemacmillan: did you include the double dash before "pretty"? | 19:51 |
|
| that is: "--pretty" | 19:52 |
|
danemacmillan
| Yeah, got that | 19:53 |
|
| Well, it works when I print a byte from a hex code using the %x option | 19:54 |
|
| %x20 | 19:54 |
|
| Odd | 19:54 |
|
J1G|Anon126
| single quotes, then? maybe it's just a shell problem | 19:55 |
| → joo-_ joined | 19:55 |
| → Macaveli joined | 19:55 |
| ← encod3 left | 19:55 |
| ← Gizburdt left | 19:55 |
|
danemacmillan
| J1G|Anon126: on the money | 19:56 |
|
| Should have debugged that :| | 19:56 |
|
| Double quotation marks | 19:56 |
|
J1G|Anon126
| that's interesting though, because I've recalled double quotes working for me | 19:56 |
|
danemacmillan
| Instead of single | 19:56 |
|
| Yeah, as have I | 19:56 |
|
| And many, if not most, examples demonstrate the syntax with double quotation marks | 19:57 |
| ← joo-_ left | 19:57 |
| ← dik_dak left | 19:58 |
| ← zapb__ left | 19:58 |
| ← zumba_addict left | 19:58 |
| → lsiv568 joined | 19:59 |
| ← desposo left | 19:59 |
| → eletuchy joined | 19:59 |
| ← bronson left | 19:59 |
| ← BlaXpirit left | 19:59 |
| → Gizburdt joined | 20:00 |
| → BlaXpirit joined | 20:00 |
| → ladies joined | 20:01 |
| ← mizu_no_oto left | 20:01 |
| ← cavallari left | 20:01 |
| [diecast]_ → [diecast] | 20:02 |
| ← [diecast] left | 20:02 |
| → [diecast] joined | 20:02 |
| ← [diecast] left | 20:02 |
| → [diecast] joined | 20:02 |
| ← hahuang65 left | 20:02 |
| → eburcat joined | 20:02 |
| ← mjuszczak left | 20:02 |
| ← lsiv568 left | 20:03 |
| → desposo joined | 20:03 |
| ← KeelOfSteel left | 20:04 |
| ← a_le left | 20:04 |
| → mjuszczak joined | 20:05 |
| → a_le joined | 20:05 |
| ← tang^ left | 20:05 |
| → zumba_addict joined | 20:05 |
| → kyb3r_ joined | 20:06 |
| → toogy joined | 20:06 |
| → bronson joined | 20:07 |
| → zapb joined | 20:07 |
| ← EminenceHC left | 20:08 |
| ← plutt left | 20:08 |
| → liamkeily joined | 20:09 |
|
toogy
| Today we have github or bitbucket or whatever and it is very easy to pull request on these platforms. But how do you do a pull request if the repository is hosted somewhere else? I'm sure the answer is really straightforward but I never had to do it. Do you do some kind of diff and send it to the maintainer by email (the old way)? | 20:09 |
| → Radivarig joined | 20:10 |
| → plutt joined | 20:10 |
|
qsuscs
| toogy: man git format-patch; man git send-email; man git request-pull | 20:10 |
|
gitinfo
| toogy: the git-format-patch manpage is available at http://jk.gs/git-format-patch.html | 20:10 |
|
| toogy: the git-send-email manpage is available at http://jk.gs/git-send-email.html | 20:10 |
|
| toogy: the git-request-pull manpage is available at http://jk.gs/git-request-pull.html | 20:10 |
|
toogy
| ok that's what I thought, thanks :) | 20:10 |
| → nour_ joined | 20:10 |
| → jason237 joined | 20:12 |
| ← ruukasu left | 20:12 |
| ← nour left | 20:14 |
| ← myyst left | 20:15 |
| ← jerius_ left | 20:15 |
| ← JEEB left | 20:16 |
| ← zapb left | 20:16 |
| ← shreyas1 left | 20:16 |
| ← Zentdayn left | 20:16 |
| → myyst joined | 20:16 |
| → tgkokk` joined | 20:16 |
| ← eletuchy left | 20:17 |
| → jerius joined | 20:17 |
| → Shusshu joined | 20:17 |
| ← tgkokk left | 20:17 |
| ← mjuszczak left | 20:18 |
| → JEEB joined | 20:20 |
| → Sijdesign joined | 20:20 |
| ← tarkus left | 20:20 |
| → tarkus joined | 20:20 |
| → panther_ joined | 20:20 |
| → rpg joined | 20:21 |
| ← jerius left | 20:22 |
| → jerius joined | 20:23 |
| → teran joined | 20:23 |
| → bobmarchman joined | 20:23 |
| panther_ → redpanther | 20:23 |
| → tang^ joined | 20:23 |
| redpanther → pantherify | 20:24 |
| → phretor joined | 20:24 |
| ← devoldmx_ left | 20:24 |
| ← ladies left | 20:24 |
| → zapb joined | 20:25 |
| ← Shusshu left | 20:25 |
| → mizu_no_oto joined | 20:25 |
| ← pantherify left | 20:25 |
| ← iamshercoder left | 20:26 |
| → bheesham joined | 20:27 |
| moviuro_ → moviuro | 20:27 |
| → lsiv568 joined | 20:28 |
| ← teran left | 20:28 |
| → iamshercoder joined | 20:28 |
| ← zapb left | 20:28 |
| ← erickr left | 20:29 |
| → rikko joined | 20:29 |
| ← Sijdesign left | 20:29 |
| → CustosL1men joined | 20:29 |
| ← CustosL1men left | 20:29 |
| → CustosL1men joined | 20:29 |
| ← brucelee left | 20:29 |
| → paul424 joined | 20:30 |
| ← fragamus left | 20:30 |
|
Sample
| There is a repo only 2 people have visiblity to, one of them committed (and pushed) 2 commits that were totally unwanted, a ton of binary files. What's the best method of force pushing the branch ref to be 2 commits back | 20:30 |
| ← rikko left | 20:30 |
|
Sample
| I'm not sure what git push does exactly from the plumbing perspective | 20:30 |
| ← paul424 left | 20:30 |
| → eletuchy joined | 20:31 |
|
J1G|Anon126
| Sample: git checkout [branch]; git reset --hard HEAD~2; git push [remote] +[branch] | 20:31 |
| → konr joined | 20:31 |
|
osse
| it's not actually required to reset, but you probably want to do so anyway | 20:33 |
| → pantherify joined | 20:33 |
| ← pwnz0r left | 20:34 |
|
phy1729
| git can do symlinks right? | 20:34 |
| ← phretor left | 20:34 |
| ← phantombeta left | 20:34 |
|
qsuscs
| phy1729: depending on how you define “do” … | 20:35 |
|
asturel
| is there better alternative to sourcetree (gui git client?) its kinda 'laggy' | 20:35 |
|
phy1729
| I add a relative symlink that stays within the repo and everyone else will have the symlink and not two copies of the file | 20:35 |
| ← Macaveli left | 20:35 |
|
qsuscs
| phy1729: should do, see e.g. git.git/RelNotes for a working example | 20:36 |
| → ojacobson joined | 20:36 |
| → phantombeta joined | 20:36 |
|
Sample
| osse: Im' resetting simply for the purpose of being able to stage those 2 commit changes before telling remote to point at the commit we're currently on | 20:36 |
|
tang^
| asturel: try one of these: http://git-scm.com/downloads/guis | 20:36 |
| tgkokk` → tgkokk | 20:36 |
|
Sample
| STASH not stage | 20:36 |
| ← anothermoron left | 20:36 |
|
asturel
| is github's client works only with github? | 20:36 |
|
Sample
| does `git push` in this instance simply and only tell origin's branch to point at commit XYZ | 20:36 |
| ← pandeiro left | 20:36 |
| ← eburcat left | 20:37 |
|
asturel
| i have to download now on windows, previously i used git via cli but on windows its a pain (no proper autocomplete etc) | 20:37 |
|
| download=develop :D | 20:37 |
| → dik_dak joined | 20:37 |
| → zapb joined | 20:38 |
|
J1G|Anon126
| asturel: I believe you can use it for other repos as well | 20:38 |
|
asturel
| it use an internal/external git executable? | 20:38 |
|
| or its fully integrated into the gui | 20:38 |
|
J1G|Anon126
| I am not sure | 20:39 |
| ← Gizburdt left | 20:39 |
|
asturel
| because sourcetree just call the git and throw the log | 20:39 |
| ← foulou left | 20:39 |
| → Gizburdt joined | 20:39 |
| → VimFleed joined | 20:40 |
|
osse
| Sample: what I mean is you can make the remote point anywhere without having to reset or checkout anything first | 20:40 |
|
| Sample: git push -f remote whatever:branch | 20:40 |
| ← ManikM left | 20:40 |
| → dannymiche joined | 20:40 |
|
osse
| aka. git push remote +whatever:branch | 20:41 |
| ← marthinal left | 20:41 |
|
asturel
| or anyone knows a good replacement for windows cmd? (which also replaces the conhost if its possible not just the cmd.exe) | 20:42 |
|
qsuscs
| asturel: have a look at console2 or mintty | 20:43 |
|
| asturel: and msysgit comes with bash | 20:43 |
|
osse
| asturel: https://github.com/cbucher/console | 20:43 |
| → Zentdayn joined | 20:43 |
|
osse
| oh cmd.exe in particular... I guess that's either msys or cygwin | 20:43 |
|
asturel
| i saw console2 but it just forks terminals inside it(?) | 20:43 |
| ← dannymichel left | 20:43 |
| ← tgkokk left | 20:44 |
| → hahuang65 joined | 20:44 |
| → jollyirc joined | 20:44 |
|
asturel
| does it support proper copy paste, osse? | 20:45 |
|
| i mean not that dumb one whats in windows cmd :D | 20:45 |
|
grawity
| cmd is a shell, it doesn't deal with copy/paste | 20:45 |
| ← maletor left | 20:45 |
| ← cfgmgr left | 20:45 |
|
grawity
| the Windows console always had copy/paste though only for rectangular selections | 20:45 |
|
| in Win10 it has regular selections as well | 20:45 |
|
asturel
| isnt the conhost the actual 'shell' ? | 20:46 |
|
grawity
| no | 20:46 |
|
| the 'shell' – the command interpreter – is cmd.exe | 20:46 |
|
osse
| asturel: yes | 20:46 |
|
asturel
| i thought cmd is just launch conhost.exe kinda | 20:46 |
|
grawity
| conhost would be the 'terminal' | 20:46 |
| → foulou joined | 20:46 |
|
asturel
| oh :D | 20:46 |
|
osse
| asturel: it's the other way around | 20:46 |
|
grawity
| the Windows console used to be part of CSRSS in earlier versions; separated into conhost nowadays | 20:46 |
| ← a_le left | 20:47 |
|
grawity
| (it's not very terminal-ish) | 20:47 |
| → a_le joined | 20:47 |
|
grawity
| so Console2 works on top of the same Windows console | 20:47 |
| → shreyas1 joined | 20:47 |
|
grawity
| that is, it opens a hidden console window, reads text from it, sends keys into it | 20:47 |
| ← pantherify left | 20:48 |
|
grawity
| (there's even a menu option to make the stock console window visible for debugging) | 20:48 |
| ← iamshercoder left | 20:48 |
| → pantherify joined | 20:48 |
|
grawity
| I think it refreshes every 100ms or something like that | 20:48 |
| → jmpp joined | 20:49 |
| → wowaname joined | 20:49 |
|
grawity
| there are actual Unixish terminals like mingetty, they work with Git fine (just not with native Windows console programs like EDIT) | 20:49 |
| → boombatower joined | 20:50 |
| ← dm7freek left | 20:50 |
|
tang^
| I like Cmder with Powershell.exe | 20:51 |
|
ToxicFrog
| There's a windows native version of rxvt, too, although I think mingetty is the default with both msys and cygwin now. | 20:51 |
|
grawity
| one problem with replacing this thing is, the Windows console actually does a bit more than Unix terminals :/ | 20:52 |
|
asturel
| well i saw something what supported even e.g. git autocomplete too | 20:52 |
|
grawity
| on Unix, bash & zsh handle their own line editing – on Windows, the console does | 20:53 |
| → EminenceHC joined | 20:53 |
|
grawity
| though bash switches it to raw mode anyway | 20:53 |
|
asturel
| so whats a good combination for git on windows?:D | 20:55 |
| ← Zentdayn left | 20:55 |
|
asturel
| some terminal+cli or there's a good gui? | 20:55 |
|
ToxicFrog
| asturel: git-for-windows comes with mingetty, IIRC | 20:55 |
|
| I just use the git that comes with cygwin, since I have cygwin installed anyways. | 20:55 |
|
| There's probably GUIs but I don't know of them. Is there a !gui trigger? | 20:55 |
|
gitinfo
| Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed. | 20:55 |
|
asturel
| but then u use the rectangle selection? | 20:55 |
|
grawity
| Console2 was nice | 20:55 |
|
ToxicFrog
| asturel: no, as I said, it comes with mingetty | 20:55 |
|
| So it's mingetty+bash rather than cmd.exe | 20:56 |
|
grawity
| I kind of got used to the Windows console though – copy/paste isn't *awful* in it | 20:56 |
|
asturel
| its horrible | 20:56 |
|
ToxicFrog
| (you can still use it from cmd.exe if you really want to. I don't.) | 20:56 |
|
asturel
| when the line breaks into 2 line | 20:56 |
| ← Patch left | 20:56 |
|
asturel
| try to copy paste that :D | 20:56 |
|
osse
| I use the standard Git for Windows thing but I run it from ConsoleZ | 20:56 |
|
| it am the niceness | 20:56 |
|
| well... good enough | 20:57 |
|
qsuscs
| osse, silvester is over. stop drinking. | 20:57 |
|
| s/silvester/new years eve/, whatever | 20:57 |
| → mjuszczak joined | 20:57 |
| ← EminenceHC left | 20:57 |
| ← Jackneill left | 20:58 |
| → Zamyatin joined | 20:58 |
|
tang^
| asturel: try one of these: http://git-scm.com/downloads/guis | 20:58 |
| ← skylite left | 20:58 |
| ← wowaname left | 20:58 |
| ← zapb left | 20:59 |
| ← Zamyatin left | 20:59 |
| → WaReZ joined | 20:59 |
| → tpollard joined | 20:59 |
| ← jonmorehouse left | 20:59 |
| ← ncd|leeN left | 20:59 |
| → Zamyatin joined | 21:00 |
| → ncd|leeN joined | 21:00 |
| → wowaname joined | 21:00 |
|
osse
| hmm | 21:01 |
|
asturel
| well i tried sourcetree | 21:01 |
|
osse
| hadn't heard of this silvester thing before. | 21:01 |
| → bobmarch_ joined | 21:01 |
| → Sample_ joined | 21:01 |
| → encod3 joined | 21:01 |
|
asturel
| but most gui i assume just run a git.exe | 21:02 |
|
osse
| there aren't many other ways of doing it | 21:02 |
|
asturel
| but its 'kinda suxx' | 21:02 |
|
tang^
| sourcetree just runs git.exe | 21:02 |
|
osse
| there's libgit2. dunno which GUIs use it | 21:02 |
|
tang^
| as does tortoisegit | 21:02 |
|
asturel
| i mean i would except a little more integration | 21:03 |
|
ToxicFrog
| asturel: due to the way git is structured, it's a lot easier to use that than to use a library. There's libgit, but it has some...issues. | 21:03 |
|
grawity
| osse: Visual Studio does | 21:03 |
| → Hestil joined | 21:03 |
|
qsuscs
| !smartgit is probably not the worst of all choices | 21:03 |
|
gitinfo
| SmartGit is a (commercial) UI for git that is very user-friendly and feature-complete. http://syntevo.com/smartgithg | 21:03 |
| ← Zamyatin left | 21:03 |
|
tang^
| plus, if you show the sourcetree command, you can see what it's doing | 21:03 |
|
asturel
| is the vs's git good?:D | 21:03 |
|
tang^
| and learn to use the command line | 21:03 |
|
grawity
| at least, I'm guessing based on Microsoft's contributions to libgit2. | 21:03 |
|
asturel
| tang^ i know howto use git via cli | 21:03 |
|
| it just a pain in the pass on windows, atleast on the default cmd.exe | 21:03 |
|
qsuscs
| grawity: but git is GPL, eh? and libgit LGPL or similar IIRC—i guess microsoft was just afraid of license issues | 21:04 |
|
asturel
| in the ass* :D | 21:04 |
| ← jnavila left | 21:04 |
| ← bobmarchman left | 21:04 |
| ← Sample left | 21:05 |
| → Chealsea_Jurgens joined | 21:05 |
| → blackmesa joined | 21:05 |
| ← ehynds left | 21:05 |
|
tang^
| asturel: what's a pain about it? | 21:05 |
| ← encod3 left | 21:06 |
| → dannymichel joined | 21:07 |
| ← Chealsea_Jurgens left | 21:07 |
| → Zamyatin joined | 21:07 |
| → zapb joined | 21:08 |
| ← Zamyatin left | 21:09 |
| ← Hestil left | 21:09 |
| → Zamyatin joined | 21:09 |
| → thiago joined | 21:09 |
| → EminenceHC joined | 21:11 |
| ← dannymiche left | 21:11 |
| → autochthon joined | 21:11 |
| ← mwarning left | 21:13 |
| ← zapb left | 21:13 |
| ← alejandrozf left | 21:15 |
| → zapb joined | 21:15 |
| ← desposo left | 21:16 |
| ← eletuchy left | 21:17 |
| ← DrHouse|DellM650 left | 21:18 |
| ← mjuszczak left | 21:18 |
| ← shreyas1 left | 21:18 |
| ← thiago left | 21:18 |
| ← asdofindia left | 21:19 |
| → valeriansaliou joined | 21:19 |
| → Zentdayn joined | 21:19 |
|
asturel
| tang^ well i usually dont use git commit -a so copy pasting everytime the file.. | 21:19 |
| ← Zentdayn left | 21:20 |
| → skemper joined | 21:20 |
|
osse
| the tab key is your friend | 21:21 |
| ← sinkensabe left | 21:22 |
| ← Takle left | 21:22 |
| ← nofxx left | 21:22 |
|
asturel
| well its not a little project, usually 3-4 directory deep atleast | 21:23 |
| → proq joined | 21:23 |
| ← jazzzu left | 21:23 |
|
osse
| the tab key loves you anyway | 21:23 |
|
asturel
| :D | 21:23 |
| ← valeriansaliou left | 21:23 |
|
asturel
| well i usually just copy pasted (in putty) | 21:23 |
| → teran joined | 21:24 |
| ← Zamyatin left | 21:24 |
| ← Zupoman left | 21:24 |
| zapb → zapb__ | 21:24 |
| → JoshLopes joined | 21:25 |
| → vurma joined | 21:26 |
| ← Gizburdt left | 21:26 |
| ← phantombeta left | 21:27 |
| → psoo joined | 21:27 |
| ← listochkin left | 21:27 |
| → intransi_ joined | 21:28 |
| ← teran left | 21:29 |
| → eletuchy joined | 21:29 |
| ← psoo left | 21:30 |
| ← ohseap left | 21:31 |
| → psoo joined | 21:31 |
| ← fresham left | 21:31 |
| ← intransit left | 21:32 |
| ← sburgess left | 21:32 |
| → phantombeta joined | 21:32 |
| → Zamyatin joined | 21:32 |
| ← jmpp left | 21:33 |
| → settermjd joined | 21:34 |
| → starkhalo joined | 21:34 |
| → Macaveli joined | 21:34 |
| → UKn0Meh joined | 21:35 |
| ← blackmesa left | 21:35 |
| ← silverfix left | 21:35 |
| → malahal joined | 21:35 |
| ← javaJake left | 21:36 |
| ← bronson left | 21:36 |
| ← phantombeta left | 21:36 |
|
malahal
| I would like to compare two branches to see if they differ in source code. Does "git diff X Y" has any options that just tells me if they differ or not (will be using it in a script)? | 21:36 |
| ← St_Marx left | 21:37 |
| ← Zamyatin left | 21:37 |
|
BtbN
| They don't point to the same commit -> they differ | 21:37 |
| → St_Marx joined | 21:37 |
| ← Sasazuka_ left | 21:37 |
| ← VictorBjelkholm left | 21:38 |
|
j416
| BtbN: not necessarily | 21:38 |
|
| malahal: man git-diff | 21:38 |
|
gitinfo
| malahal: the git-diff manpage is available at http://jk.gs/git-diff.html | 21:38 |
| → phantombeta joined | 21:38 |
|
j416
| malahal: --quiet | 21:38 |
|
malahal
| j416, thanks | 21:38 |
| → brucelee joined | 21:38 |
|
j416
| yw | 21:38 |
|
BtbN
| Even if they somehow have the same source, you'd propably still want to treat them as diffrent | 21:38 |
| ← jollyirc left | 21:38 |
| gitinfo set mode: +v | 21:39 |
| ← Macaveli left | 21:39 |
|
j416
| BtbN: well, you have no idea what malahal is doing with this script. | 21:39 |
|
BtbN
| As stuff like fast-forward merges won't work | 21:39 |
|
j416
| you're assuming a lot without knowing.. :) | 21:39 |
|
malahal
| j416, BtbN my script will send a mail out if things do differ, otherwise no. This some kind of auto-merge script. | 21:39 |
| → bronson joined | 21:40 |
|
j416
| malahal: like some warning mail? | 21:40 |
|
| j416 doesn't get it | 21:40 |
| ← pantherify left | 21:41 |
|
BtbN
| Sounds like something where you definitly do want to check for same commit | 21:41 |
| → sinkensabe joined | 21:41 |
| → _spire joined | 21:42 |
|
malahal
| j416, BtbN: there is notion of work branch. Few developers work with their topic branches would be listed in a file. The scripts looks at the file and merges all those devs works into merge-branch (whose history can/will change). | 21:42 |
|
BtbN
| If the only purpose of the branch is testing the merge, why not hard reset it to master before? | 21:43 |
| → nofxx joined | 21:43 |
| ← ScottE left | 21:43 |
|
diminoten
| hey I'm on the hook to teach git/github to a bunch of folks at my job, my thought was to just go through the "getting started", "git basics" and "github" chapters of git-scm | 21:43 |
| → Zamyatin joined | 21:44 |
|
diminoten
| should that cover enough to get people using github, or should I cover some other stuff too? | 21:44 |
| ← serum left | 21:44 |
| ← IrishPrime left | 21:44 |
|
malahal
| my script would run in a cronjob, in theory I could store the dev's hashes and not do any merge if they don't differ in hashes, but I am not doing it. I just merge them in a tmp merge branch and compare tmp-merge and merge branches to see if there is a change. If there is, I send an email that there is new source code to check it out. | 21:44 |
| → ScottE joined | 21:44 |
| ← jason237 left | 21:44 |
| → StefanLehmann joined | 21:44 |
|
j416
| malahal: sounds like a cumbersome workflow | 21:45 |
|
| malahal: what is the problem you're solving using this method? | 21:45 |
| ← Zamyatin left | 21:45 |
| → Zamyatin joined | 21:46 |
| → iamshercoder joined | 21:46 |
| ← zumba_addict left | 21:46 |
| → javaJake joined | 21:46 |
| → listochkin joined | 21:46 |
| → yaymukund joined | 21:47 |
|
malahal
| j416, we all will be pushing combined changes from us to upstream. We would like to avoid merge conflicts within our own group and touch test them together. | 21:47 |
| ← AaronMT left | 21:47 |
| ← Zamyatin left | 21:47 |
|
yaymukund
| is there a way to tell `git add -p` to show diffs for entire files rather than parts of files? | 21:47 |
|
| I guess I could just write a simp\le wrapper script :p | 21:47 |
| → Sasazuka_work joined | 21:47 |
| → Zamyatin joined | 21:48 |
|
malahal
| j416, this way, any dev who wants to send something upstream will list his topic branch in the merge list file and this script just checks for any conflicts and creates a branch for someone to touch test it. | 21:48 |
| Sasazuka_work → Sasazuka_ | 21:48 |
| → tgkokk joined | 21:49 |
| ← Zamyatin left | 21:49 |
|
malahal
| j416, welcome for any easy work flows! | 21:49 |
| → klync joined | 21:49 |
| → Zamyatin joined | 21:49 |
|
j416
| yaymukund: not sure, maybe you can experiment with -U | 21:50 |
|
| yaymukund: man git-diff | 21:50 |
|
gitinfo
| yaymukund: the git-diff manpage is available at http://jk.gs/git-diff.html | 21:50 |
| → phy1729 joined | 21:51 |
| → ap0c joined | 21:51 |
| ← Zamyatin left | 21:51 |
| ← mellernoia left | 21:51 |
| → Zamyatin joined | 21:51 |
|
klync
| having a hard time and googling hasn't helped me yet... i created a local branch off "master" and made some changes, pushed the branch and the changes to remote, then merged it into master. now instead of deleting the branch i want to re-sync it with the latest from master, but if i try merging master back to the branch, i get all sorts of conflicts from the previous work. I thought `git rebase -s recursive -X ours` would solve this but apparently not | 21:52 |
| ← lsiv568 left | 21:52 |
|
j416
| malahal: just because git says there are no conflicts, there may be semantic conflicts; keep this in mind. | 21:52 |
| → zumba_addict joined | 21:52 |
| ← dik_dak left | 21:52 |
| → ruukasu joined | 21:52 |
|
j416
| klync: that should result in a fast-forward merge; you're doing something wrong. | 21:53 |
| → EvilPeng_ joined | 21:53 |
|
malahal
| j416, agreed! build could fail to compile.... this is just a first pass. A person is going to build and test before sending upstream. The scripts is just a merge-conflict checker. | 21:53 |
|
klync
| j416: judging by the conflicts, it's due to a commit (on the branch then merged to master) which was in error, and later undone | 21:53 |
| → jazzzu joined | 21:53 |
| ← FreezingCold left | 21:54 |
| → perlstein joined | 21:54 |
|
klync
| really, i just want the most direct way to say "make my branch like origin/master HEAD" | 21:54 |
|
perlstein
| hey guys, we have a git repo, it's kinda large, mostly due to some stupid checkins at the start of some large files | 21:54 |
|
| plus there is a lot of history we do not need | 21:54 |
|
yaymukund
| j416: thank you. I just wrote a script, but I'll look at -U | 21:54 |
| ← JanC left | 21:54 |
|
perlstein
| is there a way to "rebase" the repo without changing the hashes? | 21:54 |
|
j416
| malahal: it's an interesting system. I suppose you have a person that merges the things together "manually" later on (i.e. merges and checks that things look good)? | 21:55 |
|
perlstein
| to get rid of the earliest revisions? | 21:55 |
|
malahal
| j416, correct | 21:55 |
|
j416
| malahal: I might steal your idea, there's often the case that people forget to rebase and there are conflicts | 21:55 |
|
| on the other hand, I've managed to get people to rebase before requesting a merge so there's usually little conflicts | 21:55 |
|
| the conflicts that do arise are between branches being merged | 21:56 |
| ← EvilPenguin left | 21:56 |
|
j416
| mostly. | 21:56 |
|
| thanks for the idea, though | 21:56 |
|
malahal
| j416, you are welcome. | 21:56 |
| → joo-_ joined | 21:56 |
|
j416
| it doesn't sound like a bad thing to have, although perhaps not super useful most of the time :) | 21:56 |
|
| malahal: although, instead of checking for differences, why don't you just merge it and see? | 21:57 |
|
| malahal: sounds like that would be easier | 21:57 |
|
| anwyay, I must dash | 21:57 |
|
| café is closing | 21:57 |
|
| o/ | 21:57 |
| ← joo-_ left | 21:57 |
| → Takle joined | 21:57 |
|
malahal
| j416, if two people work on same file, things do fail and the second person will look at the "merge-branch" and rebase his code based on that. | 21:57 |
| ← Dorf left | 21:57 |
| ← duderonomy left | 21:57 |
| ← pm90_ left | 21:57 |
|
j416
| malahal: I would suggest an integration branch of some sort, in that case | 21:58 |
|
| leaving o/ | 21:58 |
| → thiago joined | 21:58 |
| ← sinkensabe left | 21:58 |
| ← kermit left | 21:58 |
| → EvilDMP joined | 21:59 |
| ← VimFleed left | 21:59 |
| → lhunath joined | 21:59 |
| ← jceb left | 21:59 |
| ← petersr left | 21:59 |
| ← Sample_ left | 21:59 |
| ← Zamyatin left | 21:59 |
|
malahal
| j416, I do merge, if merge fails, a mail goes out. I do want to send a mail if a merge process is successful as well, but not every time I do merge. That is why I want to do "git diff merge -tmp-merge" | 22:00 |
| → Zentdayn joined | 22:00 |
|
lhunath
| is there a known good and stable solution for overlaying a git repo with another repo such that I can commit file changes to either the parent or the child repo? | 22:00 |
|
J1G|Anon126
| lhunath: !suprepo ? | 22:01 |
|
| lhunath: !subrepo | 22:01 |
|
gitinfo
| lhunath: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding. | 22:01 |
|
osse
| best I can think of is wrapping it in something that sets env vars as needed | 22:01 |
| ← mizu_no_oto left | 22:01 |
| → sinkensabe joined | 22:01 |
| ← Zentdayn left | 22:01 |
| → dik_dak joined | 22:01 |
| ← medgno left | 22:01 |
| → PerlWebDev joined | 22:01 |
| ← GrupoCITEC left | 22:04 |
| ← Dudi left | 22:04 |
| → Sample joined | 22:04 |
| → sinkensa_ joined | 22:05 |
| → devoldmx joined | 22:06 |
| ← sinkensabe left | 22:06 |
| → jeffmjack joined | 22:07 |
| ← foulou left | 22:07 |
| → Zentdayn joined | 22:08 |
| → Zamyatin joined | 22:08 |
| → JanC joined | 22:08 |
| → valeriansaliou joined | 22:09 |
| → jottr joined | 22:10 |
| → bitkiller joined | 22:10 |
| ← settermjd left | 22:10 |
| ← tgkokk left | 22:10 |
| ← Ankhers left | 22:11 |
| ← Zamyatin left | 22:11 |
| → EvilDMP_ joined | 22:12 |
| ← livingstn left | 22:12 |
| → joo-_ joined | 22:13 |
| ← nginx77 left | 22:14 |
| ← chrisgeo left | 22:14 |
| → Zamyatin joined | 22:14 |
| ← klync left | 22:14 |
| ← denete left | 22:15 |
| ← joo-_ left | 22:17 |
| → GrupoCITEC joined | 22:17 |
| → ellotheth joined | 22:17 |
| ← PeterBooker left | 22:17 |
| → maletor joined | 22:18 |
| ← Skapadapaduu left | 22:18 |
|
uknowho
| /quit | 22:18 |
| ← uknowho left | 22:18 |
| ← vurma left | 22:18 |
| ← Zamyatin left | 22:18 |
| ← zumba_addict left | 22:19 |
| ← ellotheth left | 22:19 |
| → joo-_ joined | 22:19 |
| ← ojacobson left | 22:19 |
| EvilPeng_ → EvilPenguin | 22:19 |
| → FreezingCold joined | 22:19 |
| → Spacew00t joined | 22:20 |
| ← th3fallen left | 22:20 |
| → encod3 joined | 22:20 |
| ← malahal left | 22:21 |
| ← akiva left | 22:21 |
| → ojacobson joined | 22:22 |
| ← Spacew00t left | 22:22 |
| → Spacew00t joined | 22:22 |
| → s8321414 joined | 22:22 |
| ← PCatinean left | 22:23 |
| ← valeriansaliou left | 22:24 |
| ← macabre left | 22:24 |
| ← Spacew00t left | 22:24 |
| → teran joined | 22:25 |
| ← tranzfuse left | 22:25 |
| → macabre joined | 22:25 |
| → Spacew00t joined | 22:26 |
| ← liamkeily left | 22:26 |
| → kukks joined | 22:26 |
| ← Kicer86 left | 22:26 |
| ← tarkus left | 22:26 |
| ← plutt left | 22:27 |
| → Zamyatin joined | 22:27 |
| ← Zamyatin left | 22:27 |
| → pm90_ joined | 22:27 |
| ← intransi_ left | 22:28 |
| → phretor joined | 22:29 |
| ← ecky--ptang-zoob left | 22:29 |
| → lekare joined | 22:30 |
| ← jaydubya left | 22:30 |
| → moviuro_ joined | 22:31 |
| → cavallari joined | 22:31 |
| ← moviuro left | 22:31 |
| → jaydubya joined | 22:31 |
| → Ragnor joined | 22:31 |
| ← teran left | 22:31 |
| ← EvilPenguin left | 22:32 |
| → ajustrun joined | 22:32 |
| → Guest95 joined | 22:32 |
| ← Spacew00t left | 22:32 |
| → segfalt joined | 22:32 |
| ← joo-_ left | 22:32 |
| → cYmen joined | 22:33 |
| ← cavallari left | 22:34 |
| ← phretor left | 22:34 |
| moviuro_ → moviuro | 22:34 |
| → intransit joined | 22:35 |
| ← Acidnerd left | 22:35 |
| ← jaydubya left | 22:35 |
| → piccata joined | 22:36 |
| ← pm90_ left | 22:36 |
| → foulou joined | 22:37 |
| ← yaymukund left | 22:37 |
| ← J1G|Anon126 left | 22:37 |
| ← WaReZ left | 22:38 |
| ← jottr left | 22:38 |
| → yaymukund joined | 22:38 |
| ← EminenceHC left | 22:39 |
| → caipora joined | 22:39 |
| → EminenceHC joined | 22:39 |
| ← preyalone left | 22:39 |
| → akiva joined | 22:40 |
| ← JoshLopes left | 22:41 |
| → m0viefreak joined | 22:41 |
| → z8z joined | 22:44 |
| ← konr left | 22:45 |
| ← Trudko left | 22:46 |
| → DrHouse|DellM650 joined | 22:46 |
| ← thiago left | 22:48 |
| ← macabre left | 22:49 |
| → macabre joined | 22:50 |
| ← irqq left | 22:50 |
| ← Dougie187 left | 22:51 |
| → jottr joined | 22:53 |
| ← pantsman- left | 22:53 |
| → SonikBoom joined | 22:53 |
| → mchvs joined | 22:55 |
| ← okanck left | 22:55 |
| ← axl_ left | 22:56 |
| → kermit joined | 22:56 |
| ← eletuchy left | 22:58 |
| → liamkeily joined | 23:00 |
| ← dtscode left | 23:00 |
| → Zamyatin joined | 23:00 |
| ← Dopagod left | 23:01 |
| → dts|pokeball joined | 23:01 |
| ← b4rbz left | 23:01 |
| ← nofxx left | 23:01 |
| → scientes joined | 23:01 |
| → puff joined | 23:03 |
| → Velzes joined | 23:03 |
| ← phantomtiger left | 23:03 |
| ← kyb3r_ left | 23:03 |
| → phantomtiger joined | 23:04 |
| → LBV_User joined | 23:04 |
| ← sinkensa_ left | 23:04 |
| ← baweaver left | 23:04 |
| ← phantomtiger left | 23:05 |
| → baweaver joined | 23:05 |
| ← Zamyatin left | 23:05 |
| ← bannakaffalatta left | 23:05 |
| ← caipora left | 23:06 |
| → nginx77 joined | 23:06 |
| → caipora_ joined | 23:06 |
| ← foulou left | 23:06 |
| → foulou joined | 23:06 |
| → semicolon joined | 23:07 |
| ← veebers left | 23:07 |
| ← King_Hual left | 23:08 |
| → nafg_ joined | 23:09 |
| ← lekare left | 23:10 |
| → eletuchy joined | 23:10 |
| → EvilPenguin joined | 23:13 |
| → jaydubya joined | 23:14 |
| ← baweaver left | 23:15 |
| → groton joined | 23:16 |
| ← Neozonz left | 23:16 |
| → robert__ joined | 23:16 |
| → sgen_ joined | 23:17 |
| ← xp_prg left | 23:18 |
| → dm7freek joined | 23:18 |
| ← Velzes left | 23:18 |
| ← jerius left | 23:19 |
| ← FunkyAss left | 23:19 |
| ← nour_ left | 23:20 |
| ← Sample left | 23:20 |
| ← z8z left | 23:20 |
| → Velzes joined | 23:21 |
| ← rendar left | 23:21 |
| → nofxx joined | 23:21 |
| ← nofxx left | 23:21 |
| → nofxx joined | 23:21 |
| ← hebz0rl left | 23:22 |
| → jakesyl_insomnia joined | 23:22 |
| ← Velzes left | 23:23 |
| ← bronson left | 23:23 |
| → jstimm joined | 23:23 |
| → xp_prg joined | 23:23 |
| → Velzes joined | 23:23 |
| → future28 joined | 23:24 |
| → alekks joined | 23:24 |
| ← future28 left | 23:24 |
| → future28 joined | 23:24 |
|
future28
| Hey, could be slightly off topic but say I found a mistake on 1 line of code in a 100,000 line codebase on github, how should I fix it? Is it necessary to add a pull request for just a single line change? | 23:24 |
| → sbogg joined | 23:25 |
| → jottr_ joined | 23:26 |
|
ojacobson
| future28: do you have push access to the project? | 23:26 |
|
future28
| ojacobson: No I do not | 23:26 |
| → thiago joined | 23:27 |
|
osse
| future28: it is possible to edit files directly in the github interface thing | 23:27 |
| → teran joined | 23:27 |
| ← Gama11 left | 23:27 |
|
osse
| so fork the project and do that | 23:27 |
|
| then you can create a pull req | 23:28 |
| lru_ → lru | 23:28 |
| ← jottr left | 23:28 |
| ← Velzes left | 23:29 |
|
lahwran
| how do I do the equivalent to `git reset --hard HEAD^` but not blow away changes in the working directory? | 23:29 |
| ← boombatower left | 23:29 |
|
phy1729
| just don't do --hard ? | 23:29 |
|
ojacobson
| lahwran: read man git-reset -- the first part of the synopsis is relevant, as it tells you what else can take the place of --hard | 23:29 |
|
gitinfo
| lahwran: the git-reset manpage is available at http://jk.gs/git-reset.html | 23:29 |
|
ojacobson
| ah, last, not first | 23:30 |
|
lahwran
| won't that pull the change back onto the working directory? | 23:30 |
| ← LBV_User left | 23:30 |
| ← Somasis left | 23:30 |
|
future28
| osse: Yep, done. Thanks! | 23:30 |
|
lahwran
| so let's say I have two files, a and b, and they start out empty. I add the word "hello" to b, and commit that, then I add the word "world" to a, and haven't committed. I want to delete the commit and the change to b, such that it's empty again, without affecting a. how do I do that? | 23:31 |
| ← bobmarch_ left | 23:31 |
|
lahwran
| is that --keep? | 23:31 |
| ← ncd|leeN left | 23:32 |
|
osse
| lahwran: git stash; git reset HEAD^; git stash pop | 23:32 |
| ← teran left | 23:32 |
| → LBV_User joined | 23:32 |
| ← semicolon left | 23:32 |
|
lahwran
| I suppose that'd work, but it's pretty awkward | 23:32 |
| ← starkhalo left | 23:32 |
|
| lahwran tests if --keep will do it | 23:32 |
| Guest21429 → Ionic | 23:32 |
|
osse
| I think a straight git reset HEAD^ will work too | 23:33 |
|
| ehh, no | 23:33 |
| → veebers joined | 23:33 |
| ← HoMM left | 23:34 |
|
osse
| the only ways I can think of are more awkward | 23:34 |
| ← kevwil left | 23:34 |
|
osse
| plus my suggestion required --hard | 23:34 |
| → zumba_addict joined | 23:34 |
|
m0viefreak
| just do a git checkout -- a afterwards? | 23:35 |
| → scarabx joined | 23:36 |
|
osse
| you am genius | 23:36 |
| ← dts|pokeball left | 23:36 |
|
lahwran
| sorry? | 23:37 |
|
osse
| git reset HEAD^ && git checkout -- a | 23:37 |
|
m0viefreak
| uhm b that is | 23:37 |
| ← rpg left | 23:37 |
|
osse
| oops yeah | 23:37 |
|
lahwran
| this is from a script | 23:37 |
| → intransi_ joined | 23:37 |
| → pm90_ joined | 23:37 |
|
lahwran
| I think I'll use git stash | 23:38 |
|
osse
| how does that affect things? | 23:38 |
| → dtscode joined | 23:38 |
|
lahwran
| it's the least awkward, and my only concern is actually not an issue - that stash will ignore untracked files | 23:38 |
| ← dtscode left | 23:38 |
| → dtscode joined | 23:39 |
|
osse
| resetting stuff in a script sounds a bit awkward to begin with | 23:39 |
|
lahwran
| osse: because I don't know what files will be affected | 23:39 |
| → Dougie187 joined | 23:40 |
| → naught101 joined | 23:40 |
| ← intransit left | 23:41 |
| ← jatt left | 23:43 |
| ← thedodd left | 23:43 |
| ← groton left | 23:43 |
| ← andi3 left | 23:43 |
| ← smccarthy left | 23:44 |
| → mizu_no_oto joined | 23:45 |
| → bg__ joined | 23:45 |
| → rpg joined | 23:45 |
| → zumba_ad_ joined | 23:47 |
| ← zumba_addict left | 23:47 |
| → bsm117532 joined | 23:48 |
| ← _spire left | 23:48 |
| → CheckDavid joined | 23:48 |
| → mjuszczak joined | 23:48 |
| ← dtscode left | 23:48 |
| → jmpp joined | 23:49 |
| ← freestyl3r left | 23:49 |
| → dtscode joined | 23:49 |
| → SonikBoom_ joined | 23:49 |
| → mellernoia joined | 23:50 |
| ← zumba_ad_ left | 23:50 |
| ← chrisshattuck left | 23:51 |
| ← DrHouse|DellM650 left | 23:51 |
| ← SonikBoom left | 23:52 |
| ← pm90_ left | 23:53 |
| ← future28 left | 23:54 |
| ← sgen_ left | 23:54 |
| ← jmpp left | 23:54 |
| ← tang^ left | 23:58 |
| → pigeon joined | 23:58 |
| ← macabre left | 23:58 |