Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-05-24

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

All times shown according to UTC.

Time Nick Message
00:00 mischat joined #git
00:00 kfunk joined #git
00:01 mischat joined #git
00:01 kloeri joined #git
00:02 mischat joined #git
00:02 eletuchy joined #git
00:02 mischat joined #git
00:03 mischat joined #git
00:04 mischat joined #git
00:05 mischat joined #git
00:05 mischat joined #git
00:06 mischat joined #git
00:06 peepsalot joined #git
00:07 mischat joined #git
00:08 mischat joined #git
00:08 mischat joined #git
00:08 boudicca joined #git
00:09 mischat joined #git
00:10 kpease_ joined #git
00:10 mischat joined #git
00:10 nettoweb joined #git
00:11 mischat joined #git
00:11 mischat joined #git
00:12 mischat joined #git
00:13 mischat joined #git
00:14 JanC_ joined #git
00:14 mischat joined #git
00:14 CheckDavid joined #git
00:14 wviana__ joined #git
00:14 mischat joined #git
00:15 mischat joined #git
00:16 mischat joined #git
00:17 mischat joined #git
00:17 mischat joined #git
00:18 mischat joined #git
00:19 jpb joined #git
00:19 wloncom joined #git
00:19 alcohol joined #git
00:19 tgy joined #git
00:19 damccull joined #git
00:19 aspellip_ joined #git
00:19 remi1 joined #git
00:19 tolland joined #git
00:19 gfixler joined #git
00:19 roknir joined #git
00:19 tuor joined #git
00:19 iota_pi joined #git
00:19 yushyin joined #git
00:19 batrick joined #git
00:19 tcsc joined #git
00:19 mischat joined #git
00:19 alexsystemf__ joined #git
00:19 myme joined #git
00:19 axion joined #git
00:19 daurnimator joined #git
00:19 devhost joined #git
00:19 braderhart joined #git
00:19 {AS} joined #git
00:19 sr___ joined #git
00:19 raijin joined #git
00:19 gitinfo joined #git
00:20 mischat joined #git
00:20 frem_ joined #git
00:20 kjnilsson joined #git
00:20 [diecast] joined #git
00:20 mischat joined #git
00:21 linduxed joined #git
00:21 shennyg joined #git
00:21 da5id joined #git
00:21 mischat joined #git
00:21 epic joined #git
00:21 zero7 joined #git
00:22 quackgyver joined #git
00:22 mischat joined #git
00:22 ril joined #git
00:23 mischat joined #git
00:23 mischat joined #git
00:24 mischat joined #git
00:25 mischat joined #git
00:25 SwiftMatt joined #git
00:26 mischat joined #git
00:26 mischat joined #git
00:27 mischat joined #git
00:28 mischat joined #git
00:29 mischat joined #git
00:29 mischat joined #git
00:30 mischat joined #git
00:30 bronson joined #git
00:30 tomog999_ joined #git
00:31 mischat joined #git
00:32 mischat joined #git
00:32 sangy joined #git
00:32 mischat joined #git
00:33 mischat joined #git
00:34 mischat joined #git
00:34 mkoskar joined #git
00:35 mischat joined #git
00:35 mischat joined #git
00:36 mischat joined #git
00:36 bjpenn joined #git
00:37 mischat joined #git
00:37 dtrott joined #git
00:38 johnmilton joined #git
00:38 mischat joined #git
00:38 mischat joined #git
00:38 Remram joined #git
00:39 mischat joined #git
00:40 mischat joined #git
00:41 mischat joined #git
00:41 mischat joined #git
00:42 hashpuppy joined #git
00:42 mischat joined #git
00:43 mischat joined #git
00:44 mischat joined #git
00:44 mischat joined #git
00:44 IWishIKnew joined #git
00:45 mischat joined #git
00:46 mischat joined #git
00:47 mischat joined #git
00:47 AbsurdTech joined #git
00:47 mischat joined #git
00:48 mischat joined #git
00:49 mischat joined #git
00:49 bjpenn joined #git
00:50 mischat joined #git
00:50 mischat joined #git
00:51 mischat joined #git
00:51 boudicca joined #git
00:52 IWishIKnew joined #git
00:52 mischat joined #git
00:52 mizu_no_oto joined #git
00:53 mischat joined #git
00:53 mischat joined #git
00:54 mischat joined #git
00:54 Gsham joined #git
00:55 mischat joined #git
00:55 ensyde joined #git
00:56 mischat joined #git
00:56 Rodya_ joined #git
00:56 mischat joined #git
00:57 mischat joined #git
00:58 mischat joined #git
00:59 mischat joined #git
00:59 mischat joined #git
01:00 mischat joined #git
01:01 mischat joined #git
01:02 mischat joined #git
01:02 mischat joined #git
01:03 mischat joined #git
01:04 mischat joined #git
01:05 mischat joined #git
01:05 dermoth_ joined #git
01:05 mischat joined #git
01:06 bjpenn joined #git
01:06 mischat joined #git
01:07 mischat joined #git
01:08 mischat joined #git
01:08 mischat joined #git
01:09 patarr joined #git
01:09 mischat joined #git
01:10 mischat joined #git
01:11 mischat joined #git
01:11 mvensky joined #git
01:11 eka joined #git
01:11 mischat joined #git
01:12 mischat joined #git
01:13 jaafar joined #git
01:13 mischat joined #git
01:13 ajf- joined #git
01:14 mischat joined #git
01:14 mischat joined #git
01:15 mischat joined #git
01:16 mischat joined #git
01:16 fahadash joined #git
01:16 hexagoxel joined #git
01:17 mischat joined #git
01:17 mischat joined #git
01:18 mischat joined #git
01:19 mischat joined #git
01:19 rubyonrailed joined #git
01:20 NeverDie joined #git
01:20 spoonUltra joined #git
01:20 mischat joined #git
01:20 mischat joined #git
01:21 mischat joined #git
01:21 diegoaguilar joined #git
01:22 mischat joined #git
01:23 mischat joined #git
01:23 mischat joined #git
01:24 thiago joined #git
01:24 rvsjoen joined #git
01:24 rvsjoen joined #git
01:24 mischat joined #git
01:25 Remram joined #git
01:25 mischat joined #git
01:26 mischat joined #git
01:26 mischat joined #git
01:27 mischat joined #git
01:27 spoonUltra left #git
01:28 mischat joined #git
01:29 rubyonrailed joined #git
01:29 mischat joined #git
01:29 mischat joined #git
01:30 mischat joined #git
01:31 mischat joined #git
01:32 mischat joined #git
01:32 rmbeer joined #git
01:32 rmbeer hello
01:32 rmbeer i have a problem with git, i use "git commit -v" but this enter in vi, and with ":q" abort the process, how to enter a new commit?
01:32 mischat joined #git
01:33 mischat joined #git
01:34 mischat joined #git
01:34 rvsjoen joined #git
01:35 arescorpio joined #git
01:35 chigang_ joined #git
01:35 mischat joined #git
01:35 mischat joined #git
01:36 harish joined #git
01:36 mischat joined #git
01:36 jaguarmagenta joined #git
01:37 mischat joined #git
01:37 lep2 left #git
01:38 mischat joined #git
01:38 leprechau joined #git
01:38 mischat joined #git
01:39 ToBeCloud joined #git
01:39 mischat joined #git
01:40 mischat joined #git
01:41 mischat joined #git
01:41 mischat joined #git
01:42 LeBlaaanc joined #git
01:46 mischat joined #git
01:46 BombStrike joined #git
01:46 yude joined #git
01:46 mischat joined #git
01:46 mischat joined #git
01:46 mischat joined #git
01:46 mischat joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and zerg rushes | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | YOU MUST SUBMIT ADDITIONAL JOKES https://madeitwor.se/git-jokes
01:49 mischat joined #git
01:49 Orbitrix joined #git
01:50 mischat joined #git
01:50 mischat joined #git
01:51 ten10 joined #git
01:51 mischat_ joined #git
01:52 kadoban rmbeer: You should set your editor so it's one you know how to use. If you really want to use vim, you should do :wq to write the file and then quit.
01:52 mischat_ joined #git
01:53 mischat_ joined #git
01:53 ten10 so I migrated 30 repos to a new git server but I guess I didn't carry over the branches and tags... is there any easy way to now copy them over to the new repos without messing a ton up?
01:53 mischat_ joined #git
01:54 zivester joined #git
01:54 interne7y joined #git
01:54 mischat_ joined #git
01:55 pks joined #git
01:55 mischat_ joined #git
01:56 mischat_ joined #git
01:56 mischat joined #git
01:57 mischat joined #git
01:58 deltab ten10: how did you do that?
01:58 mischat joined #git
01:58 ten10 deltab well, I thought I did a push origin
01:58 ten10 but I guess that doesn't do branches?
01:58 est31 joined #git
01:58 ten10 (sorry I'm learning git a bit)
01:59 est31 how can I change the commiter for a commit?
01:59 xlegoman joined #git
01:59 mischat joined #git
01:59 est31 not the author, i know how that works
01:59 est31 I want the committer to be the same as the author
01:59 mischat joined #git
02:00 mischat joined #git
02:00 rmbeer kadoban, thank, but it was not the problem.
02:01 deltab ten10: --all, I think
02:01 mischat joined #git
02:02 mischat joined #git
02:02 drbean joined #git
02:02 rmbeer left #git
02:02 mischat joined #git
02:03 AbsurdTech joined #git
02:03 mischat joined #git
02:03 fracting joined #git
02:04 deltab est31: set GIT_COMMITTER_NAME and GIT_COMMITTER_EMAIL and git commit --amend, I think
02:04 mischat joined #git
02:04 ten10 deltab: will that overwrite any updates people might have made to the new repos tho?
02:04 Shakeel_ joined #git
02:05 deltab ten10: maybe, I'm not sure
02:05 mischat joined #git
02:05 deltab check the manual
02:05 ten10 man for as much as people love git it sure seems like a mystery lol
02:05 deltab est31: env var from git-commit-tree
02:05 mischat joined #git
02:06 deltab heh, I'm no expert, so I'm being super cautious
02:06 mischat joined #git
02:06 deltab but if you want, make a copy and experiment there
02:06 deltab !backup
02:06 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.c​om/GitBestPractices/#backups
02:07 mischat joined #git
02:07 arooni joined #git
02:08 mischat joined #git
02:08 est31 hrmm
02:08 est31 it works thanks deltab!
02:08 mischat joined #git
02:09 mischat joined #git
02:09 est31 I have now set the committer
02:10 est31 and the author should be the same as well
02:10 est31 as well as the commit date
02:10 mischat joined #git
02:10 mkoskar joined #git
02:10 est31 just wondering what else can be different
02:10 est31 doing git am of a patch file I've downloaded from github
02:10 nb-ben joined #git
02:11 est31 because git fetch origin commit-sha didnt work
02:11 mischat joined #git
02:11 est31 but it would be cool if the commit sha in fact matched
02:11 joki joined #git
02:11 mischat joined #git
02:12 Remram joined #git
02:12 mischat joined #git
02:13 mischat joined #git
02:13 clemf joined #git
02:13 est31 now the next thing to get the same is the time zone
02:14 mischat joined #git
02:14 est31 should be doable with GIT_AUTHOR_DATE
02:15 mischat joined #git
02:15 mischat joined #git
02:16 mischat joined #git
02:17 mischat joined #git
02:17 mischat joined #git
02:18 Gsham joined #git
02:18 mischat joined #git
02:18 dreiss joined #git
02:19 mischat joined #git
02:20 mischat joined #git
02:20 mischat joined #git
02:21 mischat joined #git
02:22 mischat joined #git
02:22 rivarun joined #git
02:23 mischat joined #git
02:23 Dougie187 joined #git
02:23 mischat joined #git
02:24 mischat joined #git
02:25 mischat joined #git
02:26 mischat joined #git
02:26 fracting joined #git
02:26 mischat joined #git
02:27 zivester_ joined #git
02:27 mischat joined #git
02:28 mischat joined #git
02:28 boudiccas joined #git
02:29 mischat joined #git
02:29 LeBlaaanc joined #git
02:30 nb-ben_ joined #git
02:32 Gore|home joined #git
02:32 zivester__ joined #git
02:32 SwiftMatt joined #git
02:33 hexagoxel joined #git
02:35 rgrinberg joined #git
02:37 mischat joined #git
02:38 mischat joined #git
02:38 tristanp_ joined #git
02:38 unreal joined #git
02:39 mischat joined #git
02:39 mischat joined #git
02:40 a_thakur joined #git
02:40 mischat joined #git
02:41 mischat joined #git
02:41 jaguarmagenta joined #git
02:42 mischat joined #git
02:42 mischat joined #git
02:43 raijin joined #git
02:43 mischat joined #git
02:44 jonesinator joined #git
02:44 Khisanth joined #git
02:44 mischat joined #git
02:45 mischat joined #git
02:45 mischat joined #git
02:46 mischat joined #git
02:47 chachasmooth joined #git
02:47 mischat joined #git
02:47 mischat joined #git
02:48 mischat joined #git
02:49 mischat joined #git
02:50 mischat joined #git
02:50 tristanp joined #git
02:51 mischat joined #git
02:51 mischat joined #git
02:52 mischat joined #git
02:52 linuxmint joined #git
02:53 mischat joined #git
02:53 MattMaker joined #git
02:53 est31 left #git
02:54 mischat joined #git
02:54 Goplat joined #git
02:54 mischat joined #git
02:55 mischat joined #git
02:55 zivester joined #git
02:56 mischat joined #git
02:57 mischat joined #git
02:57 mischat joined #git
02:58 mischat joined #git
02:59 mischat joined #git
03:00 mischat joined #git
03:00 c0ded joined #git
03:00 mischat joined #git
03:01 mischat joined #git
03:02 mischat joined #git
03:03 aavrug joined #git
03:03 mischat joined #git
03:03 mischat joined #git
03:03 EduardoMartins joined #git
03:04 aavrug joined #git
03:04 mischat joined #git
03:05 mischat joined #git
03:06 mischat joined #git
03:06 mischat joined #git
03:07 bjpenn joined #git
03:07 mischat joined #git
03:08 mischat joined #git
03:09 mischat joined #git
03:09 mischat joined #git
03:10 Dougie187 left #git
03:10 mischat joined #git
03:11 mischat joined #git
03:12 mischat joined #git
03:12 mischat joined #git
03:13 jstimm joined #git
03:13 diegoviola joined #git
03:13 mischat joined #git
03:14 Tim-SEM joined #git
03:14 mischat joined #git
03:14 AK-47_ joined #git
03:14 boudicca joined #git
03:14 AK-47_ hi all for overclocking join ##securify and press f9 and for interpol channel go to ##beyondtime and for governor and UNITED NATIONS GO TO ##un.org , for SU FEDORA OS COME TO ##su.os
03:15 mischat joined #git
03:15 noodle joined #git
03:15 NeverDie joined #git
03:15 mischat joined #git
03:16 mischat joined #git
03:17 mischat joined #git
03:18 mischat joined #git
03:18 yude joined #git
03:18 jaguarmagenta joined #git
03:18 mehola joined #git
03:18 mischat joined #git
03:19 mischat joined #git
03:20 mischat joined #git
03:20 k3rn31 joined #git
03:21 mischat joined #git
03:21 mischat joined #git
03:22 mischat joined #git
03:23 aavrug_ joined #git
03:23 mischat joined #git
03:23 a_thakur joined #git
03:23 milki o.O
03:24 mischat joined #git
03:24 milki wat
03:24 Rodya_ joined #git
03:24 mischat joined #git
03:25 mischat joined #git
03:26 MattMaker joined #git
03:26 mischat joined #git
03:27 mischat joined #git
03:27 mischat joined #git
03:28 mischat joined #git
03:29 clemf joined #git
03:29 mischat joined #git
03:32 sangy so I just want to add a file (not its changes yet). I'm doing "git add --intent-to-add [file]; git commit". I get a commit, which changes tree, but when I clone localy to test I see that the empty files are not added
03:33 bronson joined #git
03:34 jstimm joined #git
03:35 AbsurdTech joined #git
03:39 thiago sangy: --intent-to-add doesn't add
03:40 thiago if you want to add an empty file, you have to add an empty file
03:40 ojacobson hmm…
03:41 ojacobson You're right, but the docs suggest otherwise. There's some ambiguity: they say "without content" which to me suggested empty content, rather than an explicit, distinct lack of content
03:42 ojacobson of course, 'git status' shows a diff between an intent-to-add entry and an empty file, so that should've been a clue to me :)
03:43 checkit joined #git
03:44 weox joined #git
03:45 checkit Hey guys... So, I've been using git for a while now. We're currently working on a huge app. I need to "fork" an alpha release to setup on a dedicated server that I only really intend on pulling small incremental updates to. Is forking "alpha" the best way to do this? Or do I just need a branch?
03:46 netj joined #git
03:50 rubyonrailed joined #git
03:53 MattMaker joined #git
03:54 interne7y joined #git
03:55 t2mkn joined #git
03:55 thiago checkit: first of all, "forking" is not a term we use. GitHub repurposed it.
03:55 tristanp_ joined #git
03:56 thiago you're asking whether you should use a new repository or just a branch in your repository
03:56 thiago it's up to you. The options are identical.
03:58 sangy ojacobson: the impression I get from git status is that an empty file will be added ('changes staged for commit: new file: [file]')
03:59 thiago sangy: it's just that: an impression
03:59 sangy even when I do git commit, I see in the buffer that it says "changes to be committed: [file]"
03:59 thiago I'm guessing this situation isn't very well explored
03:59 sangy thiago: no, I understand the underlying logic, I just feel that the behavior fails the "principle of least surprise"
03:59 thiago --intent-to-add is used so that git diff shows the entire file
04:00 checkit thiago: Oh. didn't know that.
04:00 checkit Thank you.
04:00 thiago not adding the file you intended to add is not explored
04:00 sangy thiago: sure, it doesn't break terribly or anything, but it allows me to keep adding new commits with the same tree, without the "new file"
04:00 sangy thiago: yup, I understand the logic. I just found it "odd"
04:01 eletuchy joined #git
04:02 sangy it would be nice if there was something along the lines of a "git touch", which is what I was trying to achieve (some files in one commit require the file to exist, but conceptually the file should be populated along with other changes later)
04:02 tristanp joined #git
04:03 thiago it's easy to implement with actual "touch"
04:03 sangy sure, that's what I ended up doing, backup the file somewhere else, touch and then add regularly
04:04 italoacasas joined #git
04:04 thiago git config --global touch '!f() { mv $1 tmpfile; touch $1; git add $1; mv tmpfile $1 }; f'
04:04 * sangy promptly steals the alias
04:05 thiago it can probably be done more efficiently with git update-index
04:05 sangy probably, but I don't think it's something so performance sensitive, is it?
04:06 GeekNerd joined #git
04:06 GeekNerd hello
04:06 gitinfo GeekNerd: 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.
04:06 thiago you may want to update this so it works with multiple files too
04:06 thiago a simple for inside the function, for example
04:06 GeekNerd what is the purpose of this channel?
04:06 tristanp joined #git
04:07 thiago GeekNerd: to talk about Git
04:07 GeekNerd what is git?
04:07 GeekNerd anything related to github?
04:07 thiago it's the tool that allows GitHub to exist in the first place
04:07 thiago you can consult Wikipedia
04:08 rscata joined #git
04:08 GeekNerd oh
04:08 SwiftMatt joined #git
04:09 josuebrunel joined #git
04:21 tristanp_ joined #git
04:21 baba_ joined #git
04:21 fahadash joined #git
04:25 tristanp joined #git
04:25 PityDaFool joined #git
04:25 Rodya_ joined #git
04:29 tristanp_ joined #git
04:30 d4rklit3 joined #git
04:31 fracting joined #git
04:34 bjpenn joined #git
04:39 linuxmint joined #git
04:39 k3rn31 joined #git
04:40 Cabanossi joined #git
04:41 dalias joined #git
04:42 jaafar joined #git
04:51 kyledr joined #git
04:51 tristanp joined #git
04:52 nilg joined #git
04:54 Trieste joined #git
04:59 xbox joined #git
05:00 fracting joined #git
05:00 SimonNa joined #git
05:04 tristanp joined #git
05:04 eletuchy joined #git
05:05 inflames joined #git
05:06 tristanp_ joined #git
05:11 tristanp joined #git
05:13 wviana joined #git
05:13 Shakeel_ joined #git
05:13 tristanp_ joined #git
05:15 Bigcheese joined #git
05:15 HedgeMage joined #git
05:15 cstrahan joined #git
05:15 srcerer_ joined #git
05:15 trista___ joined #git
05:15 raijin joined #git
05:16 puff` joined #git
05:16 skarm joined #git
05:17 eka joined #git
05:18 canine joined #git
05:18 Chunk2 joined #git
05:18 njt joined #git
05:18 Novitsh joined #git
05:20 subhojit777 joined #git
05:21 kyledr_ joined #git
05:22 M-shine joined #git
05:22 boombatower joined #git
05:23 jaguarma_ joined #git
05:26 t-mart__ joined #git
05:29 rubyonrailed joined #git
05:29 nilg joined #git
05:29 flavius joined #git
05:31 leeN joined #git
05:31 jaguarmagenta joined #git
05:31 Fijit joined #git
05:33 ygeLN joined #git
05:34 a_thakur joined #git
05:34 snowinferno joined #git
05:35 bronson joined #git
05:36 akushner joined #git
05:36 SimonNaa joined #git
05:38 mariuscc joined #git
05:38 muthu joined #git
05:39 phy1729 joined #git
05:40 mda1 joined #git
05:40 Alienpruts joined #git
05:43 catuca joined #git
05:44 tristanp joined #git
05:46 khmarbaise joined #git
05:47 Guest55323 joined #git
05:47 wizardedit joined #git
05:47 tristanp_ joined #git
05:47 akushner joined #git
05:49 LucaTM joined #git
05:49 circ-user-taqdN joined #git
05:50 dopesong joined #git
05:51 zeroed joined #git
05:51 eka joined #git
05:52 cdown joined #git
05:52 ygeLN joined #git
05:53 PCatinean joined #git
05:54 akushner joined #git
05:54 bjpenn joined #git
05:54 tristanp joined #git
05:55 interne7y joined #git
05:57 netj joined #git
05:58 cgundersson joined #git
05:58 cgunders1on joined #git
05:58 cgunders2on joined #git
06:00 cdown_ joined #git
06:02 scarabx joined #git
06:03 dhaavhincy joined #git
06:04 zeroed joined #git
06:04 qt-x joined #git
06:04 cgunders2on left #git
06:05 cgunders1on left #git
06:06 freimatz joined #git
06:06 pks joined #git
06:07 nnyk joined #git
06:09 hahuang61 joined #git
06:09 a_thakur joined #git
06:10 Guest55323 joined #git
06:12 lamppid joined #git
06:12 a_thakur joined #git
06:13 Raging_Hog joined #git
06:15 flupke_ joined #git
06:15 angiebadillo joined #git
06:15 boxrick1 joined #git
06:16 baba_ joined #git
06:16 pizzaops joined #git
06:16 shennyg joined #git
06:16 BlackPanx joined #git
06:16 akitada joined #git
06:16 imdsm_ joined #git
06:16 iota_pi joined #git
06:16 evanc joined #git
06:16 dhaavhincy left #git
06:17 johtso joined #git
06:17 spr0tsuki joined #git
06:17 addshore joined #git
06:17 tristanp_ joined #git
06:17 jleclanche joined #git
06:17 zeller joined #git
06:18 vcoinminer joined #git
06:18 worstadmin joined #git
06:18 Aerosonic joined #git
06:18 WizJin joined #git
06:18 FritzLakritz joined #git
06:18 ionelmc joined #git
06:18 XDS2010 joined #git
06:18 DuncanT joined #git
06:18 TSS_ joined #git
06:19 yuhlw joined #git
06:19 kwmiebach joined #git
06:19 da5id joined #git
06:19 kutenai joined #git
06:19 meZee joined #git
06:19 henriquev___ joined #git
06:19 Awesomecase joined #git
06:19 barq joined #git
06:19 apotry joined #git
06:19 fwdit joined #git
06:20 parsnip joined #git
06:20 quackgyver joined #git
06:20 cloudcell__ joined #git
06:20 qknight joined #git
06:20 tfnico joined #git
06:20 dhaavhincy joined #git
06:20 armenzg joined #git
06:21 Mixologic joined #git
06:21 GeekNerd joined #git
06:21 paperziggurat joined #git
06:22 WillMoogle joined #git
06:22 kloeri joined #git
06:22 janx joined #git
06:22 kappy joined #git
06:23 skapunker joined #git
06:23 ec joined #git
06:23 nezZario joined #git
06:23 encod3 joined #git
06:24 wooy joined #git
06:24 yonatankoren joined #git
06:24 bcardarella joined #git
06:25 JackMc joined #git
06:25 sfan786 joined #git
06:25 tristanp_ joined #git
06:25 njbair joined #git
06:25 braderhart joined #git
06:25 imanc joined #git
06:26 timthowtdi joined #git
06:26 z1haze2 joined #git
06:26 Macaveli joined #git
06:26 PCatinean joined #git
06:27 GeekNerd jast: can I be added to the elite list of users who can set up triggers for gitinfo?
06:27 a_thakur_ joined #git
06:28 jaeckel joined #git
06:28 Dirkson joined #git
06:28 kallisti5 joined #git
06:28 selckin no
06:28 GeekNerd selckin: the help page says to talk to jast
06:28 GeekNerd are you jast?
06:28 GeekNerd you seem not to be
06:30 GeekNerd so unless you were speaking to someone else who asked something before I joined, you are out of your place
06:30 GeekNerd to be telling me I cannot do stuff
06:30 ix007 joined #git
06:32 ecraven hm.. I have a file with permissions 0600 checked into git, but on checkout on a different machine, it gets permissions 0644. any way to keep 0600?
06:32 selckin no git doesn't track permissions
06:32 selckin except +x
06:32 bcardarella joined #git
06:32 ecraven selckin: ah, didn't know that, thank you!
06:34 WayToDoor joined #git
06:35 dsdeiz joined #git
06:37 PaulCapestany joined #git
06:37 Alienpruts joined #git
06:39 baba_ joined #git
06:40 aavrug joined #git
06:43 Oog joined #git
06:45 Guest54869 joined #git
06:47 sauvin joined #git
06:53 tristanp joined #git
06:56 [Brain] joined #git
06:56 Guest54869 joined #git
06:56 Sceorem joined #git
06:57 tristanp_ joined #git
06:57 baba_ joined #git
06:58 dimi1947 joined #git
06:58 Gore|home left #git
06:59 zincrokx joined #git
07:00 JeroenT joined #git
07:00 tristanp joined #git
07:02 phroa joined #git
07:03 Darcidride joined #git
07:05 baba_ joined #git
07:05 tristanp_ joined #git
07:05 nnyk joined #git
07:06 Urbany joined #git
07:07 dan2k3k4 joined #git
07:10 fees joined #git
07:10 synthmeat joined #git
07:11 pks joined #git
07:12 dhaavhincy in git there is time to delay when push to server ?
07:12 selckin rephrase
07:12 jagob joined #git
07:13 hahuang61 joined #git
07:13 GeekNerd meth
07:15 armyriad joined #git
07:17 TomyWork joined #git
07:19 guardian is there a syntax to push a local tag 'foo' on a remote repo 'bar' and rename it to tag 'baz' ?
07:20 Gonzo89 joined #git
07:20 _0xAX joined #git
07:20 armyriad joined #git
07:21 jast GeekNerd: generally we only add that privilege for people who have been around and active (and, gosh, even helpful) for a while
07:21 GeekNerd oj
07:21 GeekNerd *oh
07:21 GeekNerd I am famous on freenode
07:21 GeekNerd have you heard of me?
07:21 jast you're not famous here
07:21 JeroenT joined #git
07:21 GeekNerd I used to be the greatest ban evader in the world with all kinds of VPN apps set up.
07:22 GeekNerd then I decided to stop being an ass wipe
07:22 jast that's nice
07:22 GeekNerd decided, being the key word
07:22 GeekNerd as they could not stop me
07:23 GeekNerd even got my own extban channel it seems.  check out the banlist of ##gn-bans, everything on that list used to be me.  I'm apparently a big deal
07:26 josuebrunel joined #git
07:28 mikecmpbll joined #git
07:30 Balliad joined #git
07:31 rubyonrailed joined #git
07:34 Sendoushi joined #git
07:37 blackwind_123 joined #git
07:37 GavinMagnus joined #git
07:37 bronson joined #git
07:37 ahmedelgabri joined #git
07:39 zadock joined #git
07:41 tristanp joined #git
07:42 netj joined #git
07:43 lindenle joined #git
07:43 PCatinean joined #git
07:44 Oog joined #git
07:46 TheBrayn how can I cherry-pick all commits from another branch from one commit to the most recent one?
07:46 [Brain] joined #git
07:46 elastix joined #git
07:47 selckin commit..branch or commit...branch or some form of that i can never remember and try all combinations till i get the one i want (use log to test)
07:47 moritz TheBrayn: cherry-pick accepts a range of commits too
07:47 TheBrayn oh, I see, thanks
07:49 Ch4rAss joined #git
07:50 Grexo joined #git
07:51 davisonio joined #git
07:54 GeekNerd left #git
07:54 sdothum joined #git
07:56 interne7y joined #git
07:57 troulouliou_div2 joined #git
07:58 TomyWork is it just me or does git svn clone put tags in the wrong place?
07:59 mikecmpbll joined #git
07:59 boudiccas joined #git
08:02 settermjd joined #git
08:02 tristanp joined #git
08:05 mrkat joined #git
08:07 mehola_ joined #git
08:08 tristanp_ joined #git
08:09 acetakwas joined #git
08:10 _pix joined #git
08:10 cbreak TomyWork: just you :)
08:12 dsdeiz joined #git
08:12 durham joined #git
08:12 CROOKED^HILLARY^ joined #git
08:12 tristanp joined #git
08:14 TomyWork well, by default, it puts the tags under remotes/origin/tags/$tagname
08:14 TomyWork they'd show up under "git branch -av" but not under "git tag"
08:15 TomyWork and git push --tags wouldnt push them
08:15 selckin svn doesn't have tags
08:15 Guest57 joined #git
08:15 TomyWork so i'd say that's the wrong place
08:15 selckin just branches in a tag folder
08:15 HeresJoh1y left #git
08:15 TomyWork selckin yes because in SVN everything is a version-controlled folder
08:16 TomyWork but that's like saying git has no tags, just refs in a tag folder
08:16 elastix joined #git
08:16 selckin there is a difference between using git to use an svn repo, and converting svn to git
08:16 TomyWork i want to do the later
08:17 tristanp_ joined #git
08:17 Sendoushi joined #git
08:17 ahmed_elgabri joined #git
08:18 harish_ joined #git
08:19 subpath joined #git
08:20 tristanp joined #git
08:21 TomyWork should i use git svnimport instead? i heard that's deprecated
08:22 selckin there are scripts like svn2git and one i can't remember the name
08:23 cbreak TomyWork: svn tags are branches
08:23 a_thakur joined #git
08:23 selckin svn2git will make them git tags etc
08:23 cbreak you can tag those branches without problem
08:23 cbreak git for-each-ref might help with that)
08:24 sdeshpande_ joined #git
08:24 tristanp_ joined #git
08:24 br0kenman joined #git
08:25 ahmed_elgabri joined #git
08:27 cdown joined #git
08:29 DolphinDream joined #git
08:31 marcogmonteiro joined #git
08:32 nicechap joined #git
08:32 sanketdg joined #git
08:34 tvw joined #git
08:35 garethdaine joined #git
08:36 artemisart joined #git
08:37 WayToDoor joined #git
08:39 MutantMahesh joined #git
08:39 ig0r_ joined #git
08:41 sans_s3r1f joined #git
08:43 emPi joined #git
08:46 MadHatter42 joined #git
08:46 iokill joined #git
08:47 MatthewAllan93 joined #git
08:47 MatthewAllan93 joined #git
08:49 tristanp joined #git
08:50 cyan__ joined #git
08:53 JeroenT joined #git
08:53 tristanp_ joined #git
08:53 tatran joined #git
08:55 tojoko joined #git
08:55 leehambley joined #git
08:58 ceaucari joined #git
08:58 eijk joined #git
08:59 tristanp_ joined #git
09:00 baba_ joined #git
09:00 davisonio joined #git
09:00 boudiccas joined #git
09:01 ferr joined #git
09:03 robotroll joined #git
09:03 baba_ joined #git
09:07 Linkandzelda joined #git
09:07 Linkandzelda joined #git
09:08 anenigma joined #git
09:09 tristanp joined #git
09:11 baba_ joined #git
09:11 toogley joined #git
09:15 oded joined #git
09:16 leonarth joined #git
09:17 tlaxkit joined #git
09:17 mdw joined #git
09:18 jorj joined #git
09:19 mariuscc joined #git
09:19 boingy joined #git
09:20 nicechap joined #git
09:25 liuzhen joined #git
09:26 eijk_ joined #git
09:27 tristanp_ joined #git
09:28 dsdeiz joined #git
09:33 Dev0n hey, look for some ideas on what to prefix branches that are mainly dependency updates?
09:33 Dev0n +with
09:34 bollullera joined #git
09:34 tristanp joined #git
09:34 baraba joined #git
09:35 bollullera left #git
09:35 selckin bump
09:36 MutantMahesh joined #git
09:37 dsdeiz joined #git
09:38 nwf_ joined #git
09:38 emPi joined #git
09:40 tristanp_ joined #git
09:43 Dev0n thanks selckin, that should work
09:44 tristanp joined #git
09:44 Jellyg00se joined #git
09:45 MutantMahesh joined #git
09:46 a_thakur joined #git
09:50 Guest55323 joined #git
09:51 mdw_ joined #git
09:53 guardian is there a single file I can change permissions so that I put a bare repository in read-only?
09:53 ocbtec joined #git
09:54 jbitdrop joined #git
09:57 davisonio joined #git
09:57 interne7y joined #git
09:57 zamba joined #git
09:58 zamba hi! i started modifying a file.. but i want to remove my changes and pull down the latest version from a central repo instead
09:58 zamba how do i do that?
09:58 JeroenT_ joined #git
09:59 canton7 zamba, 'git status' tells you how to remove your changes
09:59 spinningarrow joined #git
10:00 CROOKED^HILLARY^ joined #git
10:01 baba_ joined #git
10:01 cdown joined #git
10:02 prsn joined #git
10:04 a3Dman joined #git
10:04 a3Dman joined #git
10:05 csd_ joined #git
10:06 TomyWork guardian take a look at gitlab
10:07 Guest55323 joined #git
10:09 TomyWork it's easy to install on many distros these days
10:11 rafalcpp joined #git
10:14 Oog joined #git
10:15 guardian nope
10:15 tristanp joined #git
10:15 guardian that's not what I'm asking
10:15 tojoko left #git
10:15 guardian anyways I fiddled with permissions
10:16 guardian I'm curious about git remote set-url --add <-- what does it mean to add a remote URL?
10:17 WayToDoor joined #git
10:18 Sceorem joined #git
10:19 rxo joined #git
10:19 Rish joined #git
10:19 Rish_ joined #git
10:19 SirCmpwn joined #git
10:20 m8 joined #git
10:20 artemisart joined #git
10:23 gaen joined #git
10:23 skylite joined #git
10:23 User458764 joined #git
10:24 nephyrin joined #git
10:24 freimatz joined #git
10:25 MutantMahesh joined #git
10:26 rideh joined #git
10:27 darlinger joined #git
10:30 neanderslob joined #git
10:31 zamba canton7: thanks
10:32 darkbit joined #git
10:34 afuentes joined #git
10:34 kurkale6ka joined #git
10:36 tristanp_ joined #git
10:36 m0nkmaster joined #git
10:38 trista___ joined #git
10:38 chilversc left #git
10:39 lite_ joined #git
10:39 dsfreak93 joined #git
10:40 mehola joined #git
10:40 bjpenn joined #git
10:40 bronson joined #git
10:41 dsdeiz joined #git
10:42 Macaveli joined #git
10:43 tristanp joined #git
10:45 tristanp joined #git
10:46 gitnewbie joined #git
10:48 JeroenT joined #git
10:48 gitnewbie hello all, git commit -am "message" dont add new created files ? ii need to git add . first?
10:49 Macaveli joined #git
10:50 Ch4rAss joined #git
10:50 tobiasvl gitnewbie: correct. from man git commit: -a, --all   Tell the command to automatically stage files that have been modified and deleted, but new files you have not told Git about are not affected.
10:50 gitinfo gitnewbie: the git-commit manpage is available at http://jk.gs/git-commit.html
10:50 EY joined #git
10:51 gitnewbie ok my bad! ty for the help
10:52 CheckDavid joined #git
10:54 tristanp joined #git
10:54 leonarth joined #git
10:55 cgundersson joined #git
10:58 netj joined #git
10:58 interne7y joined #git
11:00 jaguarmagenta joined #git
11:03 prsn joined #git
11:04 fracting joined #git
11:05 digidog joined #git
11:06 k3rn31 joined #git
11:06 dangerousdave joined #git
11:07 jimi_ joined #git
11:07 m0nkmaster joined #git
11:07 mizu_no_oto joined #git
11:10 JeroenT joined #git
11:10 JeroenT joined #git
11:10 tristanp_ joined #git
11:11 dan2k3k4 joined #git
11:12 tristanp joined #git
11:13 EY__ joined #git
11:14 trista___ joined #git
11:14 sans_s3r1f joined #git
11:15 ThomasLocke joined #git
11:16 tristanp_ joined #git
11:19 settermjd joined #git
11:20 johnmilton joined #git
11:22 tristanp_ joined #git
11:22 liquidjamm joined #git
11:27 darlinger joined #git
11:28 jave joined #git
11:30 rnsanchez joined #git
11:30 griffindy joined #git
11:32 boudicca joined #git
11:37 fracting joined #git
11:40 JeroenT joined #git
11:40 JeroenT joined #git
11:42 kus joined #git
11:44 nnyk_ joined #git
11:45 darkbit joined #git
11:46 darkbit joined #git
11:47 netj joined #git
11:51 tristanp joined #git
11:51 rawtaz joined #git
11:53 rawtaz hi. i ran `git init --bare --shared=group foo.git` and the bare repo case created nicely except one thing; the group does not have the sticky bit set for directories (e.g. like the branches/ folder does in https://kovshenin.com/2011/howt​o-remote-shared-git-repository/ ) - any idea why?
11:53 trista___ joined #git
11:53 rawtaz s/case/was/
11:54 rawtaz git 2.8.1 on freebsd 10.1
11:54 moritz rawtaz: I don't know why, but I know that it's far easy to make this reliably by using gitolite, and a single user
11:54 Gloomy joined #git
11:55 ojdo joined #git
11:56 rawtaz right. i figured this simple sharing would be fine as it's just two users and its just for pushing and fetching
11:56 rawtaz do you think this way of sharing will be problematic?
11:56 ig0r_ joined #git
11:57 rawtaz (i also need the other user to have a shell account anyway)
11:58 xanadu joined #git
11:58 faux___ joined #git
11:59 |2701 joined #git
11:59 tristanp joined #git
11:59 moritz well, as I said, in my experience, going with group permissions doesn't work reliably
11:59 interne7y joined #git
11:59 moritz at least I never got it to work reliably
11:59 moritz and installng gitolite is quite easy
11:59 rawtaz hm, interesting. what were the symptoms?
11:59 lite_ joined #git
11:59 moritz wrongly set permission bits
11:59 fstd joined #git
12:00 moritz or the group was wrong on some files
12:00 prsn joined #git
12:00 moritz or... stuff, dunno
12:00 rawtaz ok
12:01 tristanp_ joined #git
12:02 maucar joined #git
12:02 rawtaz well ill probably try gitolite then, about time anyway :)
12:03 trista___ joined #git
12:03 jeffreylevesque joined #git
12:03 fracting joined #git
12:04 CJKinni joined #git
12:06 synthroid joined #git
12:08 Chill_Surf joined #git
12:09 Sceorem joined #git
12:09 umbSublime joined #git
12:10 tristanp joined #git
12:10 zivester joined #git
12:12 jimi_ joined #git
12:14 baba_ joined #git
12:14 EY joined #git
12:15 ahmed_elgabri joined #git
12:15 hahuang61 joined #git
12:16 rwb joined #git
12:18 kus joined #git
12:19 m0nkmaster joined #git
12:20 dome joined #git
12:21 eletuchy joined #git
12:21 dome I have a question for you git-fu masters
12:21 mauricar joined #git
12:21 dome At work we have feature branches and release branches, feature branches get mreged into the release branches, which then get merged into master
12:22 dome as of lately the devs haven't been testing their code locally as well as they should, and therefor we've been having a lot of reverts in our feature branches
12:22 dome and reverts can be a pain.... revert, then revert of the revert, then merge again
12:22 dsdeiz joined #git
12:23 dome so i've been using --squash merges o merge as a commit
12:23 dome this has been working good, except now it's showing as if all the code is mine, if there are no conflicts the git message has a nice summary, but if there are conflicts that summary goes away
12:23 dome Anyone have any good insight on how to better handle these situations?
12:24 selckin why are there merges before the tests
12:25 mikecmpb_ joined #git
12:25 dome selckin: we don't have good unit testing... and the merges happen into releases which are deployed into QA before being merged into master
12:25 dome so QA catches many careless mistakes
12:26 fahadash joined #git
12:26 dome some feature branches have been merged in and out 5-6 times from a release :/
12:26 dome it just gets so messy
12:26 selckin i try to stay aawy from feature branches, maybe someone else can help
12:27 dome yeah, i wish i could re-work the way we do it... i'm going to propose something different to my bosses possibly, but this has been the way since before i joined
12:27 dome we have a couple of newer devs, and their branches seem to come in and out a lot
12:27 vompatti joined #git
12:28 vompatti left #git
12:28 dome the most annoying thign is the revert of a revert and then a 2nd commit
12:29 dome just seems like such a dirty way
12:29 dome squash merges fix that, but then keeping track of who owns what code becomes a bitch
12:29 dome i guess it's just the way of git
12:30 SleePy joined #git
12:31 dome was so much easier managing git w/ a smaller developer base, as well as not being on an agile type workflow
12:31 tristanp_ joined #git
12:31 selckin think all your problem are human not technial
12:32 dome def a bit of both
12:32 dome but human is real world problems
12:32 dome not much i can do about that
12:32 dome would be nice if everyone cared as much s I do about the codebase.. just isn't the case
12:33 bahamas joined #git
12:33 selckin why revert the revert, instead of merging the branch in again?
12:33 selckin with the fix commit
12:33 dome it won't let you
12:33 dome says the changes are already there
12:34 selckin uhm no
12:34 dome the revert doesn't actually undo the commit, it just creates another commit that undoes the changes.... so original commit is still there
12:34 dome uhm.... yes... lol, i'm telling you this is what i've been going through, not making this up
12:34 lolmac joined #git
12:35 selckin yeah, so you fix the feature commit on the branch, merge that in
12:35 selckin that should definitly work
12:35 tristanp joined #git
12:35 dome yes but you have to first revert the revert
12:35 tobiasvl dome is correct
12:35 tobiasvl !revert_merge
12:35 gitinfo [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Docu​mentation/howto/revert-a-faulty-merge.txt
12:35 dome yes it's not a good time :(
12:35 dome lol
12:35 algun joined #git
12:35 dome i will read that though
12:35 dome see if it will give me some insight
12:36 bahamas hello. I have a long process of merging several code bases into one. I've decided to approach this by merging one file at a time. when I say merge, I mean I need to refactor code. it's not a simple git merge. do I use a single branch for the entire merge process or do I create a new branch for each file? I'm using branches so I can send pull requests for review
12:36 dome like i said, squash merges have been a muchhh better approach to the issue, only problem is the tracking of who did what is now based on git commit messages rather than the actual commit
12:36 selckin imo feature branches should be aggressively rabsed on master till merged, but ppl here will disagree i'm sure :)
12:37 tristanp_ joined #git
12:37 algun joined #git
12:37 dome selckin: it's tough... i wish my team were better at git-fu
12:37 charlesr joined #git
12:37 dome bahamas: I'm not sure i fully understand what you're doing... but if i do, i would make a new branch for each "fix" let's call it... it will be easier to track
12:38 JeroenT joined #git
12:38 crose joined #git
12:38 trista___ joined #git
12:39 bahamas dome: which part is unclear? maybe I can clarify
12:39 fracting joined #git
12:39 dome you're saying "merging
12:39 dome "
12:39 dome but not really merging...
12:40 dome so i'm assuming you're refactoring file by file?
12:40 selckin i think he wants commits
12:40 bahamas dome: yes, I'm refactoring file by file.
12:40 selckin :/
12:40 dome bahamas: good luck :p lol... how big is this codebase?
12:40 tristanp joined #git
12:40 bahamas dome: I'm migrating several repos into one.
12:41 dome I would say focus on refactoring sections, each section in a branch, and maybe each file in a commit within that branch
12:41 mehola joined #git
12:41 bahamas dome: I didn't do a line count. maybe it's better, so I don't feel discouraged.
12:41 baba_ joined #git
12:41 bahamas dome: what do you mean by section in a branch?
12:42 bahamas a, I think I know what you mean. sections of the application
12:42 dome not sure how the code-base is constructed... but say focus on a controller and model and view that are related in 1 branch maybe?
12:42 dome yeah something of that sort
12:42 bronson joined #git
12:42 wwwbukolaycom joined #git
12:43 bahamas dome: and if someone works on one of the files, we will handle the conflict when merging, I assume
12:43 dome welp, gotta do some work... might pop in a little later, see if anyone else feels my merge-revert pain, we can commiserate together
12:44 dome bahamas: yeah... try using a tool like P4 merge, it helps
12:44 bahamas I will check it out. thanks!
12:44 dome https://www.perforce.com/product/compone​nts/perforce-visual-merge-and-diff-tools
12:44 dome alright fellas, i'm outta here for a bit
12:45 bahamas still, I'm inclined to send pull requests one file at a time, so the colleague who reviews them doesn't feel discouraged
12:46 JeroenT_ joined #git
12:46 selckin they will want stuff that compiles and runs
12:47 selckin which is unlikely with 1 file at time, unless you have some special stuff
12:47 bahamas selckin: no tests here
12:47 selckin doesn't matter
12:48 bahamas selckin: the repos are used to build different browser extensions. the problem is that they share almost all logic, so they have almost identical files in separate repos
12:48 bahamas that's why I'm migrating them into a single repository
12:48 selckin so by file you ment project
12:48 bahamas selckin: no, I mean each javascript file
12:49 selckin you only review functional work, unless its to ask for help/advice
12:49 bahamas I don't understand
12:49 AbsurdTech joined #git
12:50 CJKinni joined #git
12:51 GavinMagnus joined #git
12:54 tristanp joined #git
12:54 rubyonrailed joined #git
12:55 sigma__ joined #git
12:55 Guest55323 joined #git
12:55 johnmilton joined #git
12:56 italoacasas joined #git
12:58 sigma__ If I've got branch1 and branch2 both created by branching from master, and branch1 has maybe 50 commits on it, but branch2 has maybe only one, and I want to keep my history clean and linear, I need to rebase branch2 on branch1 and then merge back into master, right?
12:58 sigma__ Assuming master has not changed.
12:59 sigma__ Or else, what is the right way to do this? I'm getting a lot of conflicts trying to git checkout branch2; git rebase branch1
12:59 selckin rebase one on master, ff merge it in, rebase branch 2 on master, ff it in
13:00 sigma__ I need to learn when to use ff.
13:00 interne7y joined #git
13:00 sigma__ My example may not completely accurately describe my situation, but I'll give it a shot.
13:00 selckin you can also use rebase, but you said merge so
13:00 prsn joined #git
13:01 przemoc joined #git
13:01 sigma__ Well, with my current understanding, I would want the changes in branch2 to look as though they were made after all of the changes in branch1, so I rebase branch2 on branch1, but that's problematic due to conflicts.
13:01 jaguarmagenta joined #git
13:01 selckin the goal to get them in master, so just add them to master one at a time
13:01 Lvjasha joined #git
13:01 dstarh joined #git
13:02 rwb joined #git
13:02 rnsanchez joined #git
13:02 sigma__ It might be more accurate to say that master has changed, and so I'm trying to rebase each of branch1 and branch2 on master, one at a time, and merge them back into master.
13:03 sigma__ git checkout branch1; git rebase master; git checkout master; git merge branch1
13:03 wrouesnel1 joined #git
13:03 selckin yeah that should work
13:03 sigma__ But the rebase has tons of conflicts.
13:03 sigma__ Maybe that's.. just my fault?
13:03 sigma__ I just want to be sure I'm not doing it wrong with regards to the git commands.
13:04 selckin yea, if the same line was changed in master and on the branch it'll conflict
13:04 sigma__ I'll see if I can work through them.
13:04 selckin git mergetool
13:04 sigma__ Will that keep my history linear?
13:04 selckin will help you resolve the conflicts
13:05 sigma__ During a rebase?
13:05 tristanp_ joined #git
13:05 selckin anytime
13:05 sigma__ Cool. Thanks.
13:05 sigma__ Reading the git-mergtool docs now.
13:05 selckin kdiff3 is best one imo
13:05 sigma__ git-mergetool*
13:05 ilmari !rerere is handy if you're repeatedly rebasing the same branch and get the same conflicts
13:05 ilmari man git rerere
13:05 gitinfo the git-rerere manpage is available at http://jk.gs/git-rerere.html
13:06 sigma__ Thank ilmari
13:06 sigma__ Thanks*
13:06 cgunders2on joined #git
13:08 sigma__ left #git
13:08 tristanp joined #git
13:11 jimi_ joined #git
13:11 BSaboia joined #git
13:12 tristanp_ joined #git
13:14 livingstn joined #git
13:14 nilsi joined #git
13:14 prsn joined #git
13:15 rnsanchez_ joined #git
13:16 platzhirsch joined #git
13:16 hahuang61 joined #git
13:16 platzhirsch With git fetch -p I got the information branches have been deleted upstream
13:17 lmat I'm rebasing, but having some difficulty.
13:17 platzhirsch but git checkout still completes to the deleted branches
13:17 platzhirsch how can Ig et rid of them
13:17 rgrinberg joined #git
13:17 lmat platzhirsch: Do you have local tracking branches for the remote branches, or do you have markers for the remote branches?
13:18 Gsham joined #git
13:18 lmat platzhirsch: In the first case, use git branch -D branchname; in the second, you need to remote the reference to the upstream branch.
13:18 platzhirsch lmat: yeah I guess the former, thought there's a handy command to delete all upstream deleted branches
13:18 bongjovi joined #git
13:20 lmat platzhirsch: Does git branch -r; show what you want?
13:20 lmat platzhirsch: err, is it what you want?
13:20 ash_workz joined #git
13:20 jhasse left #git
13:20 lmat platzhirsch: maybe git remote prune origin?
13:21 lmat or git fetch origin --prune
13:21 lmat I am working through a "large" rebase (maybe more than a dozen commits being rebased onto another dozen changes). There are plenty of conflicts.
13:21 platzhirsch lmat: yeah, execute that :)
13:22 lmat While cleaning up conflicts, I decided I was going the wrong way. I would like to get back to the state that git rebase gave me when I started.
13:23 wviana joined #git
13:23 zivester joined #git
13:23 koltroll joined #git
13:23 moritz git rebase --abort
13:23 lmat One way to get what I want, and what I've done before, is git rebase --abort; git rebase --onto ...<original command>...
13:24 lmat I've already taken care of several commits, and would prefer not to have to do them again, though.
13:25 btree joined #git
13:25 lmat moritz: I'm basically wanting to abort the changes I've done to the specific commit I'm rebasing just this momen :-)
13:26 lmat moritz: Oh...maybe I should rebase one at a time so that git rebase --abort only undoes one commit?
13:26 User458764 joined #git
13:26 lmat osse: ja?
13:27 moritz lmat: sorry, then I don't know
13:28 moritz lmat: I typically just muck around with git checkout --ours/--theirs path/to/file
13:28 lmat moritz: yeah, that!
13:28 btree left #git
13:29 lmat moritz: that wouldn't be too bad :-)
13:29 lmat moritz: It doesn't leave the WC in "conflicted" state, but it's something.
13:29 ajf- joined #git
13:30 raijin joined #git
13:30 moritz lmat: you can 'git add thefile' to resolve the conflict
13:31 lmat right. I'm wanting the full conflicted state back, though :-)
13:31 moritz erm, you don't want that. Never mind.
13:31 ntshetty joined #git
13:32 AaronMT joined #git
13:33 Ravana joined #git
13:33 umbSublime joined #git
13:34 moritz lmat: ah, git checkout -m thefile exists
13:34 baba_ joined #git
13:35 moritz http://stackoverflow.com/questions/16​77049/how-do-i-get-my-git-merge-confl​icts-back-after-merging-incorrectly
13:35 moritz I'd assume the same technique applies for rebases
13:35 lmat "When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths." Sounds promising!
13:37 astrofog joined #git
13:38 baba_ joined #git
13:38 BigWillie joined #git
13:38 ncd|leeN joined #git
13:39 ehynds joined #git
13:39 al-damiri joined #git
13:40 ntshetty joined #git
13:40 bitkiller joined #git
13:40 Gsham joined #git
13:40 tristanp joined #git
13:40 MadHatter42 joined #git
13:41 f3r70rr35f joined #git
13:43 jbitdrop joined #git
13:43 tristanp_ joined #git
13:43 acetakwas joined #git
13:44 f3r70rr36f joined #git
13:45 lindenle joined #git
13:45 Dougie187 joined #git
13:45 acetakwas joined #git
13:47 L8D joined #git
13:47 ash_workz_ joined #git
13:47 L8D Does git have the ability to commit/persist local changes without sending them upstream?
13:48 selckin thats what it does by default
13:48 MutantMahesh joined #git
13:48 sangy joined #git
13:49 deadnull_ joined #git
13:49 L8D I mean if I have local changes to a configuration file or something checked in, is there a way to keep those changes local and never commit them to a branch history?
13:49 selckin no
13:49 acetakwas joined #git
13:49 L8D like .gitignore but for specific sets of changes?
13:49 nnyk_ joined #git
13:54 ash_workz_ joined #git
13:55 ramsub07 joined #git
13:55 ramsub07 hello, i have committed some changes. how do i check what are those changes ? (There is an extra diff that i want to figure out which)
13:56 baba_ joined #git
13:56 leot joined #git
13:56 ilmari git show
13:57 leot Good afternoon all!
13:57 maestrojed joined #git
13:58 ash_workz_ left #git
13:58 leot When I try to build git-2.8.3 with gmake-4.2 I have `*** No rule to make target 'PM.stamp', needed by 'perl.mak'.  Stop.' (this only affect building it via gmake-4.2, not the previous 4.1 version!) Anyone also saw that? I've also tried to grep through the sources... For what perl/PM.stamp is used? (it just contains the list of all the `.pm')
13:58 baraba joined #git
13:59 cdg joined #git
13:59 Tim-SEM joined #git
13:59 Meteorhead Hello guys, a tricky situation here; file deleted (well moved elsewhere) is there a way to see its contents from a previous commit ?
13:59 puff Good morning.
14:00 Meteorhead I would have used something like git show commit:file but its not there anymore :/
14:00 moritz Meteorhead: git show othercommit:path/to/file
14:00 moritz Meteorhead: hum. Did somebody rewrite the history?
14:00 osse Meteorhead: you must give the correct path given the commit
14:00 phaleth joined #git
14:01 interne7y joined #git
14:01 gsingh joined #git
14:01 moritz if you're not sure about the correct path, you can do something like  git log --stat | grep filename
14:01 marcogmonteiro joined #git
14:02 Gamecubic joined #git
14:02 Meteorhead moritz: wow actually it corrected the path and gave me the contents, thanks dude!
14:02 cdg joined #git
14:02 Meteorhead osse: thanks a lot! works like a charm :)
14:03 linuxmint joined #git
14:03 quenode joined #git
14:03 r00twrh joined #git
14:03 osse lmat: que?
14:04 baba_ joined #git
14:04 lmat osse: I git rebase --onto a b c; and a few commits go. I have some conflicts; resolve; git add; git rebase --continue
14:04 lmat osse: Then I come upon a big ugly conflict. I start to resolve it, move files around and everything.
14:04 f3r70rr35f joined #git
14:05 lmat osse: Then I change my mind, "I shouldn't have moved those files...I need to go back and put the files back and try something else."
14:05 lmat osse: How do I do that?
14:05 osse git checkout --merge file(s)
14:05 osse I guess
14:08 ash_workz____ joined #git
14:08 bewbs joined #git
14:08 bewbs how can i git pull revision xxxxx
14:08 bewbs to pull a certain revision to local
14:08 selckin checkout
14:09 ten10 joined #git
14:09 bewbs git checkout xxxx?
14:09 ten10 if I do a git clone on a remote repo does it copy the branches?
14:09 selckin ten10: yes
14:10 ten10 but doing a "git push -u origin" doesn't push them?
14:10 inflames joined #git
14:10 selckin default was changed to only push current branch a while ago
14:11 ten10 fair enough... my question then is, I have the cloned repos and I want to now push those branches.. can I do it safely since there probably has been changes since I did the original push?
14:12 ten10 in other words, old git repo -> cloned -> middle linux box -> pushed -> new repo without branches
14:13 puff I have been working on some server code, and to test it I needed some front-end code.  I've committed several sets of changes, including the front-end code changes.  Now I'm ready to push, but I don't want to send the front-end changes. I *think* what I need to do is just "git log frontend.jsp" on each of the front-end pieces, find the hashcode for the version before my changes, then "git checkout prechangehashcode
14:13 puff /path/to/front/end/jsp"
14:13 puff Makes sense?
14:14 leot Ok! According to http://article.gmane.org/gmane.​comp.version-control.git/202342 probably it was added because Makefile.PL generate a list of all the `.pm' but if a developer added/deleted file the `perl/perl.mak' wasn't automatically updated.
14:14 eletuchy joined #git
14:14 Tim-SEM left #git
14:15 ten10 or another way to ask my question, is there a way to just push the branches that I missed with the original push?
14:16 cbreak push --all? :)
14:16 cbreak only history that is not yet present on the remote is pushed
14:16 jeffreylevesque_ joined #git
14:16 bahamas joined #git
14:17 cbreak ten10: be aware that --all does only include local branches
14:17 ten10 cbreak ok so if they made changes to their code me repushing the old stuff shouldn't break anything? (I'm a git noob, sorry)
14:17 baba_ joined #git
14:17 cbreak it'll just say it's up to dat
14:17 cbreak (unless you use -f, then it'd overwrite their history :)
14:18 rubyonrailed joined #git
14:18 ten10 heh, ok cool thanks for the info.. yes I won't use -f :)
14:18 ten10 when you say it'll only do local branches? could to explain a bit more?
14:18 cbreak git branch vs git branch -r
14:19 ten10 ok so I did an initial "git clone" on a repo repo so it should have pulled all those original branches right?
14:19 ten10 (sorry, typo on the dup repo)
14:20 darkbit joined #git
14:20 mauricari joined #git
14:21 vls-xy joined #git
14:21 cbreak ten10: sure, you have all, as remote repos
14:21 cbreak but only one as local branch
14:22 cbreak you can get more if you git checkout them
14:22 cbreak (this is a local operation)
14:22 cbreak or via git branch
14:22 ten10 sorry, I'm still a bit confused...
14:23 ten10 I guess if you can explain with my example.. if I git clone to a new local repo I will have all the branches but only in 1 local branch?
14:23 axl_ joined #git
14:23 SwiftMatt joined #git
14:23 cbreak yes
14:23 cbreak typically master
14:23 cbreak the one that is checked out by default
14:24 cbreak all others will exist as remote tracking branch
14:24 LBV_User joined #git
14:24 ten10 so then if I pushed why didn't the new repo get those branches?
14:25 ten10 err why didn't it get all those branches in 1 main branch
14:25 cbreak because push only pushes the current branch
14:25 cbreak (by default)
14:25 tristanp joined #git
14:25 leot left #git
14:25 clemf joined #git
14:25 cbreak push --all pushes all local branches (not remote tracking branches)
14:25 csd_ joined #git
14:25 import_this joined #git
14:25 cbreak push --mirror pushes everything... but it has other issues, so don't do it without reading the details
14:26 ten10 ok, so I think if I did a push --all it should push everything I need for branches anyways
14:26 ten10 (in my example)
14:26 Darcidride joined #git
14:26 kadoban joined #git
14:27 CROOKED^HILLARY^ joined #git
14:29 shaggycat joined #git
14:29 tristanp_ joined #git
14:31 tristanp joined #git
14:33 darkbit joined #git
14:34 sagerdearia joined #git
14:36 mase-tech joined #git
14:36 import_this joined #git
14:39 tehtraveler2321 joined #git
14:40 ajf- joined #git
14:42 dtrott joined #git
14:42 livingstn joined #git
14:42 EY joined #git
14:43 ten10 ok, so next problem I run into, error: --all can't be combined with refspecs
14:43 ten10 when I tried to git push --all -u origin master
14:44 fahadash joined #git
14:44 rgrinberg joined #git
14:44 osse ten10: get rid of 'master'
14:44 osse and -u probably
14:44 bronson joined #git
14:45 mdw joined #git
14:45 armyriad joined #git
14:46 mSSM joined #git
14:46 ten10 ok I'll can the master thanks.. can you tell me what the -u does?
14:46 mmlb joined #git
14:46 jast sets upstream information
14:47 jast i.e. it associates your local master branch with the one on origin
14:47 mSSM I have a file, which I staged with git add -p, ignoring some hunks from it. I now want to stash the unstaged hunks. How do I do that?
14:47 jast it's something you can do separately, and in any case it only needs to be done once at most
14:48 tazle_ joined #git
14:48 jast mSSM: stash always stashes stuff from all files, but basically git stash save --keep-index
14:48 david007 joined #git
14:48 ten10 alright, so git push --all origin.. let me try it, thanks!
14:48 mSSM jast: After I expressed what I wanted here I found the right terms to punch into google. :-)
14:48 mSSM jast: --keep-index it was, thanks.
14:49 jast ah well, it's the result that counts :)
14:49 ten10 dang, so it ran but says everything is up to date but people say the branches weren't there...
14:51 ten10 so going back to my original question, git clone should pull all branches down?
14:51 ajf- joined #git
14:52 JeroenT joined #git
14:52 JeroenT joined #git
14:52 osse yes
14:52 osse but they become remote branches
14:52 osse which won't automatically be pushed with --all
14:53 ten10 ok, so is there a way to push them?
14:53 osse --mirror
14:54 editshare-ericf joined #git
14:54 osse but then they will be named refs/remotes/origin/blahblah on the other remote as well
14:54 jast which is fairly useless
14:55 osse ten10: maybe you want clone --mirror and then push --all
14:55 jast if you want to mirror stuff, it's easiest to do so using a dedicated clone that was created with --mirror
14:55 jast (which can't be used for normal working, though)
14:55 grawity well there's always a manual `git push <remote> refs/remotes/origin/*:refs/heads/*`
14:56 fmcgeough joined #git
14:56 ten10 i'm ok with recreating the middle repos I'm trying to push
14:57 dmto joined #git
14:58 ajf- joined #git
14:58 ten10 so, git clone --mirror my_repo ; git push --all origin
14:58 efco joined #git
14:59 jast if my_repo is a local clone, mirror cloning it won't actually win you anything
14:59 ten10 my_repo would be the original repo I'm trying to mirror
14:59 jast that should work, then, if I'm understanding your situation correctly
15:00 rgrinberg joined #git
15:01 madewokherd joined #git
15:03 tristanp joined #git
15:06 przemoc joined #git
15:06 Topic for #git is now Welcome to #git, the place for git help and minutiae | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | This isn't funny, guys. https://madeitwor.se/git-jokes
15:07 AbsurdTech joined #git
15:07 cdg joined #git
15:09 NeverDie joined #git
15:09 ajf- joined #git
15:09 kilo_bravo joined #git
15:09 tristanp joined #git
15:11 anu0 joined #git
15:11 leonarth joined #git
15:12 ajf- joined #git
15:12 neknekemo joined #git
15:14 imachuchu joined #git
15:15 neknekemo hi guys, quick question. so i have 2 branches(A and B: A is primary) and want to merge it. is there an option where when I merge I would check if there's a conflict on the files in such the same way Im resolving conflicts?
15:16 _ikke_ I don't undestand your question
15:17 synchron- left #git
15:17 dreiss joined #git
15:17 mohabaks joined #git
15:17 sigma__ joined #git
15:17 synchronous joined #git
15:18 sigma__ I am trying to clean up my project history, and when I look at my git branch tree, it's basically down to two long parallel lines.
15:18 sigma__ Trying to rebase one on the other produces a lot of conflicts.
15:18 hahuang61 joined #git
15:18 NwS joined #git
15:18 neknekemo how can I force merge conflicts when merging?
15:19 sigma__ neknekemo: Use a strategy.
15:19 bhavik joined #git
15:19 neknekemo a what?
15:19 NeverDie joined #git
15:19 sigma__ neknekemo: Look at the -X options with git merge.
15:20 sigma__ E.g. git merge -X theirs [branch]
15:20 _ikke_ That's something different
15:20 sigma__ It is?
15:20 _ikke_ yes
15:20 sigma__ Maybe I don't understand the question.
15:21 _ikke_ He wants to force conflicts for each merge, basically a two way merge
15:21 blackwind_123 joined #git
15:21 mauricar joined #git
15:21 sigma__ I guess I don't know what "force conflicts" means.
15:21 ajf- joined #git
15:21 neknekemo i mean you conflicts when pulling requests right?
15:21 _ikke_ sigma__: If git knows how to merge something, it does so automatically
15:21 neknekemo *you see
15:22 neknekemo I want to do it on 2 local branches
15:22 _ikke_ You only see those when there actually are conflicts
15:22 _ikke_ but you would get hem also locally then
15:22 moobee joined #git
15:22 kpease joined #git
15:22 cyan__ joined #git
15:22 sigma__ _ikke_: Right. In which case, you can tell it to favor one side's changes or the other.
15:23 Sendoushi joined #git
15:23 EY joined #git
15:24 _ikke_ He want's to see conflicts, not hide them
15:24 sigma__ I get it now.
15:25 sigma__ Do not auto merge.
15:25 sigma__ Or auto-resolve, I should say.
15:25 jceb joined #git
15:26 neknekemo yup. that's what ime getting. sorry guys, im getting you headaches
15:26 thiago joined #git
15:26 br0kenman` joined #git
15:26 sigma__ What might be the best way for me to clean up my project history if my branch tree is basically two long parallel lines, each with many commits?
15:26 diegoaguilar joined #git
15:26 sigma__ Should I just merge one into the other?
15:26 sigma__ I wanted to rebase, but that's turning into a nightmare.
15:27 _ikke_ sigma__: look into git replace
15:27 _ikke_ man git replace
15:27 gitinfo the git-replace manpage is available at http://jk.gs/git-replace.html
15:27 _ikke_ in combination with git filter-branch
15:28 _ikke_ neknekemo: There is no way in git to 'force' commits
15:28 _ikke_ If can merge them, it will
15:29 neknekemo yeah. ill just rephrase it to a more elusive method.
15:29 JeroenT joined #git
15:29 neknekemo how can i view "git diff 2 branches" in one file
15:29 sigma__ _ikke_: I don't even know where to begin understanding how to implement this.
15:30 sigma__ I suppose I can just merge.
15:30 sigma__ I don't need to have a perfectly linear project history.
15:33 durham joined #git
15:36 zeroed joined #git
15:38 DirtyCajun joined #git
15:40 King_Hual joined #git
15:40 lindenle joined #git
15:40 Gloomy joined #git
15:40 Ch4rAss joined #git
15:40 freimatz joined #git
15:40 sanketdg joined #git
15:40 jagob joined #git
15:40 Mixologic joined #git
15:40 BlackPanx joined #git
15:40 phy1729 joined #git
15:40 puff joined #git
15:40 gfixler joined #git
15:40 wloncom joined #git
15:40 jpb joined #git
15:40 sleezd joined #git
15:40 rbr joined #git
15:40 martinbjeldbak joined #git
15:40 blackwell joined #git
15:40 M-meznak1 joined #git
15:40 nichi_ joined #git
15:40 Vinnie_win_l joined #git
15:40 Kamilion joined #git
15:40 Topic for #git is now Welcome to #git, the place for git help and zerg rushes | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | YOU MUST SUBMIT ADDITIONAL JOKES https://madeitwor.se/git-jokes
15:40 bjpenn joined #git
15:40 WayToDoor joined #git
15:41 tristanp joined #git
15:41 User458764 joined #git
15:42 jeffreylevesque joined #git
15:42 chrisgeorge joined #git
15:43 rgrinberg joined #git
15:44 metastableB joined #git
15:44 _ikke_ sigma__: just 'graft' the end of one branch onto the top of the other
15:45 _ikke_ git replace --graft <root> <branch>
15:45 Terens joined #git
15:46 relipse2 joined #git
15:46 dhollinger joined #git
15:46 pks joined #git
15:46 Urbany joined #git
15:46 wizardedit joined #git
15:46 yude joined #git
15:46 BombStrike joined #git
15:46 likewhoa joined #git
15:46 ujjain joined #git
15:46 tokkee joined #git
15:46 HarryHallman_oth joined #git
15:46 resetpacket joined #git
15:46 mattcen joined #git
15:46 joevandy1 joined #git
15:46 scoobert1on joined #git
15:46 mozzarella joined #git
15:46 babilen joined #git
15:46 canton7 joined #git
15:46 bgamari joined #git
15:46 ceaucari joined #git
15:46 eijk joined #git
15:47 frem_ joined #git
15:47 babilen joined #git
15:48 rgrinberg joined #git
15:51 synthroid joined #git
15:55 rath joined #git
15:55 synthroi_ joined #git
15:55 f3r70rr35f joined #git
15:56 diogenese joined #git
15:56 IWishIKnew joined #git
15:58 ceaucari joined #git
16:02 LeBlaaanc joined #git
16:02 MattMaker joined #git
16:02 artemisart joined #git
16:02 interne7y joined #git
16:03 tristanp_ joined #git
16:03 ceaucari joined #git
16:04 ten10 if I do a git clone --mirror what would be the best way to push it to another repo (with branches)?
16:04 koltroll joined #git
16:05 ten10 i tried with push --all and got this error: error: --all and --mirror are incompatible
16:05 ntshetty joined #git
16:06 david007 joined #git
16:06 vls-xy left #git
16:06 relipse2 joined #git
16:06 dhollinger joined #git
16:06 pks joined #git
16:06 Urbany joined #git
16:06 wizardedit joined #git
16:06 yude joined #git
16:06 BombStrike joined #git
16:06 likewhoa joined #git
16:06 ujjain joined #git
16:06 tokkee joined #git
16:06 HarryHallman_oth joined #git
16:06 resetpacket joined #git
16:06 mattcen joined #git
16:06 joevandy1 joined #git
16:06 scoobert1on joined #git
16:06 mozzarella joined #git
16:06 canton7 joined #git
16:06 bgamari joined #git
16:07 ceaucari joined #git
16:07 relipse2 ok i did git checkout master and git merge --squash foobar then i did git log --oneline and i don't see my squashed branch commit, but I checked git reflog and it says it moved my branch into master?
16:08 relipse2 does it not record a commit message when merging like that?
16:08 grawity that...depends on what output you got from the `git merge`
16:08 grawity check `git status` please
16:08 tristanp joined #git
16:08 LeBlaaanc anyone have a good read on branching specifically when it comes to having to maintain existing releases?
16:08 LeBlaaanc Or want to even chat?
16:09 bremner !workflows
16:09 gitinfo [!workflow] Finding the right workflow for you is critical for the success of any SCM project.  Git is very flexible with respect to workflow.  See http://sethrobertson.github.c​om/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.
16:09 diogenese joined #git
16:09 relipse2 grawity Oh i see so it puts them ready to stage
16:09 AaronMT joined #git
16:11 a_thakur joined #git
16:11 LeBlaaanc these seem to hint at a "release" branch but are those just forever maintained?
16:11 LeBlaaanc at least the second link does.
16:12 LeBlaaanc ah wait I see it ignore me
16:13 tristanp joined #git
16:14 rubyonrailed joined #git
16:16 subhojit777 joined #git
16:16 import_this joined #git
16:16 ceaucari joined #git
16:16 nnyk_ joined #git
16:18 boudiccas joined #git
16:18 Rooxo joined #git
16:18 maestrojed joined #git
16:19 chachasmooth joined #git
16:20 Terens joined #git
16:22 LeBlaaanc yea my question is still valid, this http://nvie.com/posts/a-succ​essful-git-branching-model/ seems to work in such a way that existing releases are no longer maintained.
16:23 sbeller joined #git
16:24 rgrinberg joined #git
16:24 Terens joined #git
16:25 import_this joined #git
16:28 darkbit joined #git
16:28 a_thakur_ joined #git
16:29 armyriad joined #git
16:32 EY joined #git
16:32 eletuchy joined #git
16:32 noteness joined #git
16:34 narendraj9 joined #git
16:37 flaguy48 left #git
16:37 Noldorin joined #git
16:37 LeBlaaanc Is it acceptable/adventageous to have a release/v2.7/master maybe?
16:39 rath LeBlaaanc: Sure. You can keep the release branches as long as you want to, or even recreate one out of the tag if necessary.
16:39 User458764 joined #git
16:40 baraba left #git
16:40 LeBlaaanc rath would you ever have feature brancehs just for a given release?
16:40 LeBlaaanc like release/v2.7/feature/my-thingy
16:40 tristanp joined #git
16:41 LeBlaaanc let me outline what I am doing a bit... the major/minor represents a binary version that's in the ios app store... we will continue to use our "code push" (live code update) on that release until we decide to update the binary, which then we'd stop dev on that release branch
16:41 geoid joined #git
16:42 LeBlaaanc (unless there was a patch or bug that needed to be addressed)
16:42 a_thakur joined #git
16:42 LeBlaaanc "code push" targets 2.7.x
16:43 akushner joined #git
16:44 nilg joined #git
16:45 baba_ joined #git
16:45 ahmed_elgabri joined #git
16:45 dimatteo joined #git
16:47 Rish_ joined #git
16:47 LeBlaaanc anyone else have thoughts?
16:47 shinnya joined #git
16:48 angular_mike is checking out a branch supposed to apply unstaged changes to files?
16:49 SteffanW joined #git
16:49 barajasfab joined #git
16:49 grawity no
16:49 grawity but, in a way, also yes
16:49 Rooxo if you have unstaged changes you aren't able to checkout or did i get this wrong
16:49 angular_mike Rooxo: wrong
16:49 grawity more specifically, checking out a branch only actually checks out files that are different between the two branches
16:50 grawity if it has to touch a file with unstaged changes, it'll stop and show an error
16:50 grawity if it doesn't need to touch a file with unstaged changes, it'll just leave it as is, changes and all
16:50 LeBlaaanc ya what grawity said :)
16:50 angular_mike grawity: I mean tracked files with unstaged changes, where the changes aren't there on the original branch
16:50 grawity unstaged changes aren't on *any* branch yet
16:50 grawity by definition
16:51 angular_mike grawity they aren't staged
16:51 angular_mike on the original branch
16:51 angular_mike that's what
16:51 angular_mike i mean
16:51 angular_mike t
16:51 grawity the *staging area* is also not part of any branch
16:51 angular_mike grawity: they aren't committed either
16:51 angular_mike grawity: they never were staged
16:51 grawity well okay, so see my initial answer
16:51 angular_mike grawity: you have to stage a change to commit it
16:51 angular_mike grawity: right/
16:52 grawity yes
16:52 elastix joined #git
16:52 LeBlaaanc I however am curious, if the file change is staged, it remains staged?
16:52 grawity yes
16:52 LeBlaaanc cool hah, peaked my interest, never tried this.
16:52 ahmed_elgabri joined #git
16:53 grawity a regular `git checkout` never overwrites files that have any kind of *uncommitted* changes
16:53 dreiss joined #git
16:53 grawity (git checkout -f, meanwhile, discards everything.)
16:53 angular_mike hmm. so I pulled a branch and now status says I have local changes
16:53 Rooxo ok i think i got uncommited and ustaged mixed up
16:53 grawity "pulled a branch"?
16:53 angular_mike while I didn't have them befor pulling
16:54 grawity I guess `git pull` doesn't do what you think it does
16:54 angular_mike grawity: `git fetch; git merge; git reset --hard <hash>; git fetch; git rebase`
16:54 ramsub07 joined #git
16:54 grawity what
16:54 angular_mike pull=fetch+merge, right?
16:55 grawity right
16:55 angular_mike but you don't want to use it
16:55 angular_mike so you reset and rebase instead
16:55 grawity oh you can use it fine, in situations where you want to do what it does
16:55 grawity nothing wrong with a merge really
16:55 grawity my point is, it always merges *into the current branch*
16:55 angular_mike I don't want to create a merge commit
16:55 grawity while people here often expect it to checkout the given branch
16:55 someone235 joined #git
16:56 LeBlaaanc anyone else have any thoughts on the branch thing I was asking about?
16:56 angular_mike what I don't understand is why as a result I got unstaged changes
16:56 angular_mike if I didn't have them before
16:56 grawity perhaps the merge failed due to conflicts
16:56 angular_mike LeBlaaanc: thing?
16:56 angular_mike grawity: no, status is up-to-date
16:57 angular_mike no merge conflicts
16:57 LeBlaaanc angular_mike I'm trying to develop a workflow of branches that help me support existing binaries.
16:57 ochorocho__ joined #git
16:57 LeBlaaanc I'm not creating a website or software... I'm creating an app store app that has the ability to do live code updates (js is pulled)
16:58 angular_mike LeBlaaanc: do you not like a successful branching model?
16:58 Lothar2k joined #git
16:58 LeBlaaanc well, from what I've read, his release branches are temporary
16:58 LeBlaaanc his/her*
16:59 aard joined #git
16:59 LeBlaaanc it doesn't help me create ongoing updates to a "released" binary
16:59 elementalest joined #git
16:59 cyan__ joined #git
17:01 hahuang61 joined #git
17:01 angular_mike LeBlaaanc: hmm, maybe replace single master branch with `released` branches?
17:01 sesquipedalian joined #git
17:02 LeBlaaanc yea... I'm proposing a branch like release/v2.7.x/master
17:03 LeBlaaanc angular_mike would you then pull in items in `develop` branch or if it's just a hotfix for that release `release/v.2.7/hotfix/my-hot-hotfix
17:03 interne7y joined #git
17:04 EvilPenguin joined #git
17:04 tristanp_ joined #git
17:04 LeBlaaanc or wait... maybe that doesn't make sense, that scenario you'd just modify `release/v2.7/master`
17:04 dopesong joined #git
17:05 angular_mike LeBlaaanc: are you planning to update the binaries 'released into the wild' with only bugfixes or new features as well?
17:05 ochorocho__ joined #git
17:06 LeBlaaanc angular_mike that would be good so that the user doesn't have to always wait for the "live update" to happen if they just freshly installed it.
17:06 LeBlaaanc but that cycle would be slower for many reasons
17:06 angular_mike LeBlaaanc: which one is it?
17:07 LeBlaaanc what do you mean? periodically `release/v2.7` would have a tagged "patch" version v2.7.2 or something that would be "released in the wild"
17:07 angular_mike what are you planning to include in the live updates?
17:07 LeBlaaanc anything that is compatible to the v2.7 binary
17:07 angular_mike features, bugfixes, tweaks, holiday messages, ads?
17:08 dopesong joined #git
17:08 LeBlaaanc angular_mike the only reason a v2.8 binary exists is if the binary itself had to change to support the live udpate
17:08 tristanp joined #git
17:09 LeBlaaanc does that answer your question?
17:09 angular_mike LeBlaaanc: so, anything that can be pushed, as long it's compatible with the old api?
17:11 LeBlaaanc api as in the binaries libraries?
17:11 DirtyCajun joined #git
17:11 LeBlaaanc there's also the web api that might bump the version I suppose?
17:11 angular_mike LeBlaaanc: does your code layout allow to have all version-independent feature implementation in one place, and the version-dependent stuff in another?
17:11 L8D joined #git
17:12 LeBlaaanc what do you mean?
17:12 anu1 joined #git
17:12 angular_mike maybe you could develop new features in feature-specific branches
17:12 nwkj86 joined #git
17:12 angular_mike and then create a branch for each release that is responsible for integrating the feature with it
17:13 Noldorin_ joined #git
17:13 angular_mike merge the feature branch into it, update the API/library calls
17:13 tristanp_ joined #git
17:14 LeBlaaanc there's a chances that that feature might never be compatible with the older release.
17:14 tvw joined #git
17:14 kfpratt joined #git
17:15 LeBlaaanc an example is, v2.8 has a camera library in the binary, v2.7 does not.
17:15 import_this joined #git
17:15 Gsham joined #git
17:15 LeBlaaanc so I can't push a live update that does camera things
17:15 LeBlaaanc to v2.7
17:15 LeBlaaanc btw thanks so much for your feedback.
17:17 angular_mike LeBlaaanc: i made a chart
17:17 angular_mike https://usercontent.irccloud-cdn.c​om/file/VAQkQylQ/git-wf-model.png
17:17 angular_mike LeBlaaanc: can you see it?
17:17 LeBlaaanc yes
17:18 ajf- joined #git
17:18 angular_mike so, when you merge features into release branches, you perform API/library integration in there
17:18 idmistir joined #git
17:18 dimi1947 joined #git
17:19 idmistir joined #git
17:19 kyledr joined #git
17:19 angular_mike as long as you can develop the release-independent parts first
17:19 LeBlaaanc okay, should f2 go from v2.7 to v2.8?
17:19 angular_mike ye
17:19 angular_mike that's when 2.8 begins
17:19 angular_mike right after f2 is merge int o2.7
17:19 LeBlaaanc oh
17:19 LeBlaaanc gotcha
17:20 * angular_mike is not the best drawer
17:20 LeBlaaanc no no it's not your drawing, just missed it.
17:20 csd_ joined #git
17:20 mikecmpbll joined #git
17:20 angular_mike if a release doesn't support a feature, you don't have to merge it in
17:20 angular_mike or you can just make a stub that doesn't do anything for the sake of consistency
17:21 LeBlaaanc okay cool.
17:21 mar77i left #git
17:21 alex1a joined #git
17:21 LeBlaaanc let me ask you this.... where do you actively develop?
17:21 LeBlaaanc on r2.8?
17:21 angular_mike LeBlaaanc: where you want
17:21 LeBlaaanc okay but does a develop or master branch even exist at root?
17:22 angular_mike LeBlaaanc: well, the ideal variant would be to develop version-independent parts first i nfeature branches
17:22 baba_ joined #git
17:22 dopesong joined #git
17:22 angular_mike LeBlaaanc: but I guess you can develop for a specific version first, as long as you separate independent and dependent checnges
17:23 angular_mike LeBlaaanc: then you first push independent changes to feature branch, then merge it into release branch for the active dev release, and add on top the dependent changes
17:23 angular_mike if dependent part is complex, might be easier to add integration branch for each release as well
17:23 LeBlaaanc hrm
17:23 aard joined #git
17:24 devster31 I have this history, https://bpaste.net/show/a0cc0449fd8c, quite simple, I made a pull request from a branch and merged upstream/master into my local master, now I tried to rebase decelop on top of master, but it requires me to force push, is it normal or did I do something wrong?
17:24 peepsalot joined #git
17:24 LeBlaaanc angular_mike is it easy to patch in a change from v2.8 and put it in v2.7?
17:24 LeBlaaanc without branching it as a feature
17:25 arand joined #git
17:25 unbalancedparen joined #git
17:25 LeBlaaanc oooh ooh... wait this is my question too, where are those feature branches stemmed from?
17:25 angular_mike LeBlaaanc: my assumption was that you want the releases to be independed of each other, after they're created
17:26 lmat osse: Ahh, --merge interesting
17:26 lmat moritz: Did you see that? git checkout --merge <file>
17:26 LeBlaaanc angular_mike that's fine, so in order for them to share they would have to come from a feature branch?
17:26 marc_v92 joined #git
17:26 dopesong joined #git
17:26 angular_mike LeBlaaanc: yes. Of course you could probably cherry pick some commits, if you really need to
17:27 LeBlaaanc okay... where do the feature branches start from?
17:27 angular_mike but the idea is that feature branches are their common point of contact
17:27 satbyy joined #git
17:28 angular_mike LeBlaaanc: good point, didn't think of that one
17:28 Psychiatrist joined #git
17:29 angular_mike LeBlaaanc: shouldn't really matter much, as long as feature independent code is kept separate from dependent
17:29 angular_mike *release-independent
17:29 angular_mike I guess, you could start feature branch from your active development release branch
17:30 LeBlaaanc yea i was thinking a "develop" branch
17:30 LeBlaaanc on root
17:30 angular_mike then work you way backwards/forwards when integrating with other releases
17:30 elastix joined #git
17:31 ajf- joined #git
17:31 LeBlaaanc Is it going to be a problem branching new release from an existing release?
17:31 hahuang65 joined #git
17:31 perlpilot LeBlaaanc: git has no problem with it :)
17:31 Tyrannosaur joined #git
17:31 angular_mike LeBlaaanc: what do you mean? Are new releases not going to be backwards-comptatible with old features?
17:31 LeBlaaanc heh, but will my mind explodddd :P
17:32 Tyrannosaur left #git
17:32 LeBlaaanc angular_mike not unless the major version changes
17:32 LeBlaaanc i would think.
17:33 angular_mike you can think of it that way: r2.8 originated from the state 2.7 was at specific point in time
17:33 LeBlaaanc in which case I suppose I'd merge the latest release into develop and then branch back out
17:33 Motoko joined #git
17:33 tristanp joined #git
17:33 Motoko joined #git
17:34 flopsec joined #git
17:34 LeBlaaanc perlpilot you folllowing along? there's a pop quiz later.
17:35 perlpilot LeBlaaanc: your mind may explode.  Caution is advised.
17:35 Urbany joined #git
17:35 thiago joined #git
17:36 LeBlaaanc oh this is guranteed
17:36 angular_mike https://github.com/icco/git-explode
17:36 circ-user-fbIZM joined #git
17:36 tristanp_ joined #git
17:38 darkbit joined #git
17:38 baba__ joined #git
17:38 LeBlaaanc angular_mike if a feature branch is only for v2.8 would you attempt to signify this somehow in the branch?
17:38 LeBlaaanc i feel like release/v2.7/feature/my-feature is possibly valid still in this situation?
17:39 leehambley joined #git
17:39 angular_mike LeBlaaanc: i don't know, never say never
17:39 tristanp joined #git
17:39 LeBlaaanc bieberisms asside... what?
17:39 angular_mike you might change your mind later
17:40 LeBlaaanc with it not being compatible?
17:40 angular_mike LeBlaaanc: bieberisms?
17:40 LeBlaaanc https://www.youtube.com/watch?v=_Z5-P9v3F8w
17:40 angular_mike LeBlaaanc: yeah, you might decide to make it work
17:40 LeBlaaanc hrmmm I don't like this
17:40 bjpenn joined #git
17:41 Gsham joined #git
17:41 jost joined #git
17:42 tristanp_ joined #git
17:42 nilg joined #git
17:42 Sasazuka joined #git
17:43 angular_mike LeBlaaanc: the movie was ok
17:43 LeBlaaanc it's a song ;)
17:43 angular_mike LeBlaaanc: there was a movie
17:43 LeBlaaanc oh some documentary I remember now
17:43 darkbit joined #git
17:44 angular_mike LeBlaaanc: I don't think it was a documentary
17:44 rubyonrailed joined #git
17:44 LeBlaaanc ah either way i've not seen it.
17:44 angular_mike Jackie Chan isn't some poor meachanic IRL
17:44 angular_mike *mechanic
17:44 Rish joined #git
17:45 synthroid joined #git
17:45 angular_mike and jaden smith still got his father
17:45 fscala joined #git
17:46 angular_mike LeBlaaanc: I think you can just decided into which release branches to merge some feature branch and into which no to
17:46 LeBlaaanc ok
17:47 LeBlaaanc now i just need to figure out how in the world to trigger builds and such
17:47 ojacobson You may want to consider rolling merges instead of parallel merges
17:48 bronson joined #git
17:48 ojacobson when you merge feature f into release r1, merge r1 into r2 and r2 into r3
17:48 ojacobson rather than f into each of r1, r2, and r3
17:48 synthro__ joined #git
17:48 ojacobson _assuming_ each release is a strict successor to the prior release
17:48 LeBlaaanc ojacobson assuming f is compatible with r1 and r2?
17:49 Dyonisos joined #git
17:49 ojacobson rather, assuming that r2 should contain all features of r1 plus any additional features unique to r2
17:49 Tim-SEM joined #git
17:49 mohabaks joined #git
17:49 Tim-SEM joined #git
17:49 LeBlaaanc ojacobson my question though is, can f exist in r2 and not r1?
17:50 ojacobson sure. if you're introducing a feature in r2 then you'd merge f to r2, r2 to r3
17:50 ojacobson and leave r1 untouched
17:50 ojacobson (and probably branch f off of r2 in the first place)
17:50 LeBlaaanc got it
17:51 ojacobson either approach works, but I find the rolling merge approach easier to reason about when it comes to "which releases is this feature in?" because the answer is always "rN and all later releases"
17:51 ojacobson and never "rA, rC, but not rB"
17:51 LeBlaaanc gotcha
17:51 angular_mike ojacobson: what if r2 already has got f0, which shouldn't be in r3?
17:52 LeBlaaanc i feel like r3 would just revert f0
17:52 perlpilot angular_mike: then r3 gets a feature that deprecates f0  :)
17:52 LeBlaaanc perlpilot++
17:52 LeBlaaanc you said it more fancy
17:53 angular_mike perlpilot: that actually sounds nice
17:54 angular_mike LeBlaaanc: I've only used jenkins myself
17:54 angular_mike LeBlaaanc: if you're hosting it on github, I think there's travis
17:54 ojacobson is the jenkins git plugin's default behaviour still "build whatever the fuck refs happen to change" or did they finally start building a single branch by default
17:54 angular_mike and Bamboo on atlassian
17:55 angular_mike ojacobson: I thought it was rm rf; git clone; ./build
17:55 bluezone joined #git
17:56 LeBlaaanc really just need to figure out how to send something through an in-house (staging) pipeline vs app store pipeline
17:56 LeBlaaanc ... when to trigger.
17:57 nnyk_ joined #git
17:57 angular_mike LeBlaaanc: daily?
17:57 Tim-SEM left #git
17:57 geoid joined #git
17:58 User458764 joined #git
17:59 rahtgaz joined #git
17:59 MattMaker joined #git
17:59 LeBlaaanc i mean right now it just does it when I merge into either "in-house" or "app-store" branches, but that's kinda awkward now that I'm moving this to releases
18:00 clemf_ joined #git
18:01 diegoviola joined #git
18:02 tristanp joined #git
18:03 boudicca joined #git
18:03 diegoaguilar joined #git
18:04 interne7y joined #git
18:05 oncall-pokemon joined #git
18:05 akushner joined #git
18:05 tristanp_ joined #git
18:07 trista___ joined #git
18:07 Sendoushi joined #git
18:10 tristanp joined #git
18:11 LeBlaaanc is it any value to have those as branches or should I figure some other logic to determine where it should deploy?
18:11 LeBlaaanc app store or in-house (hockeyapp)
18:12 LeBlaaanc I'd like to compare the patch version and only build if it's incremented but that might just be a bunch of work.
18:13 idmistir_ joined #git
18:13 yude_ joined #git
18:13 mozzarel1 joined #git
18:15 thiago_ joined #git
18:15 Gitzilla joined #git
18:16 WizJin joined #git
18:16 ahmed_elgabri joined #git
18:16 boudiccas joined #git
18:16 relipse2 joined #git
18:16 bgamari joined #git
18:17 likewhoa joined #git
18:17 scoobertron joined #git
18:19 tristanp joined #git
18:20 garethdaine joined #git
18:21 hashpuppy joined #git
18:21 Rish joined #git
18:21 tokkee joined #git
18:22 tvw joined #git
18:22 idmistir_ left #git
18:22 satbyy joined #git
18:22 ig0r_ joined #git
18:23 tristanp_ joined #git
18:24 settermjd joined #git
18:25 rahtgaz joined #git
18:25 trista___ joined #git
18:26 LeBlaaanc a commit can hold multiple tags right?
18:28 tristanp joined #git
18:29 arand joined #git
18:29 Lothar2k left #git
18:30 mikecmpbll joined #git
18:30 boudicca joined #git
18:30 LeBlaaanc yes, yes it can... okay next question, is it useful if I tag a commit when it's been built and sent to various places, like in-house and app store?
18:30 bjpenn joined #git
18:31 grift joined #git
18:32 tristanp_ joined #git
18:33 m0viefreak joined #git
18:33 multi_io joined #git
18:33 compeman joined #git
18:34 clemf joined #git
18:34 tristanp joined #git
18:34 dimi1947 joined #git
18:34 import_this tags are like a pointer that simply never moves, most people after you push to central repo etc by default do not pull down the tags
18:35 compeman joined #git
18:35 import_this makes searching easier, but very underutilized by most
18:35 import_this so if they download them with intention to search for commits easily, then yes
18:36 LeBlaaanc hrm
18:36 import_this at the very least its not useless and not a burden
18:36 import_this i think it shows good practice
18:37 LeBlaaanc right now i tag with a build version.
18:37 LeBlaaanc v2.7.0+1234 for instance
18:37 import_this which is fine, best is to keep your tags naming schemes consistent
18:37 import_this thats much more informative, the version, than a hash
18:38 import_this easier to find it, I personally use tags whether those developing with me pull them down or not
18:38 LeBlaaanc most of my peoples use sourctree, so they are there for them to look at.
18:38 VikingHoarder joined #git
18:38 import_this yea so for example in source tree when you choose fetch
18:38 import_this even if you click the third option for tags it will not stay selected
18:38 LeBlaaanc ah
18:39 import_this kinda dumb but atlassian has some oddities about it
18:39 LeBlaaanc would you ever use a tag to designate that a build exists say, in the app store?
18:39 LeBlaaanc in addition to the version
18:40 efco joined #git
18:40 import_this really don't have enough experience in regards to best practice for the app store
18:41 import_this I couldn't imagine it being frowned upon
18:42 import_this tags are like a node in the git tree that just point to wherever, you can change their name, remove them, add as many as you want, keep them local, choose to not pull them down
18:42 import_this documentation is rarely frowned upon, just make sure your tags are consistent and relevant
18:43 SJr joined #git
18:44 LeBlaaanc yea i guess i just don't want the tag to be irrelevant and confusing...
18:45 SJr What is the command that will give me a list of all commits in the history one per line.
18:45 tristanp_ joined #git
18:47 import_this git log --pretty=oneline
18:48 tristanp joined #git
18:48 NateAGeek joined #git
18:49 bronson joined #git
18:49 LeMike joined #git
18:50 Sendoushi joined #git
18:50 EvilPenguin joined #git
18:51 devster31 I'll try again... I have more or less this: https://bpaste.net/show/a0cc0449fd8c, I made a pull request (accepted) from a branch and merged upstream/master into my local master, now I tried to rebase decelop on top of master, but it requires me to force push, is it normal or did I do something wrong?
18:51 texasmynsted_ joined #git
18:52 tristanp_ joined #git
18:53 khmarbaise joined #git
18:55 tristanp joined #git
18:55 tristanp joined #git
18:56 ahmed_elgabri joined #git
18:57 Balliad joined #git
18:57 kyledr joined #git
18:58 livingstn joined #git
18:58 CJKinni` joined #git
18:59 dsdeiz joined #git
18:59 GavinMagnus joined #git
19:00 EduardoMartins joined #git
19:00 moritz devster31: it's normal that you have to force-push after a rebase, yes
19:04 tristanp joined #git
19:04 eletuchy joined #git
19:05 interne7y joined #git
19:06 tristanp_ joined #git
19:06 KungFuJesus joined #git
19:06 EvilPenguin joined #git
19:06 KungFuJesus alright, git newb here.  I have submodules checked out in my repo
19:06 KungFuJesus actually nested submodules (where one submodule has a directory that is a submodule)
19:07 KungFuJesus why is it when I do "git status" inside the base directory of a given submodule it tells me: HEAD detached at fcdc28f
19:07 KungFuJesus and it has changes not staged for commit: but it doesn't list the untracked files or the modified content
19:08 KungFuJesus it only says this:  modified:   caffe-fast-rcnn (modified content, untracked content)
19:09 KungFuJesus if I recall, git status, at least on a non-submodule, will say "Hey you have this Makefile, this file here, and this file untracked" and "here are the files that are changed but not staged for commit"
19:09 tristanp joined #git
19:09 mwhooker joined #git
19:10 KungFuJesus why is it behaving differently for a submodule, and isn't it a reasonable assumption that I'd want to track local changes to a given submodule and push them to the corresponding external repo as well?
19:10 codezomb joined #git
19:10 mwhooker joined #git
19:11 tristanp_ joined #git
19:13 ojacobson KungFuJesus: the unit of change within a parent repo for a submodule is the commit id of the submodule to use.
19:13 ojacobson KungFuJesus: from within the parent repo, a submodule is a single opaque object; git-status can tell you that the submodule _has_ changes, but not what they are (cd into the submodule for that)
19:13 ajf- joined #git
19:14 import_this the parent module will point to the most recent time the submodule was committed back to the top. so further commits of the sub module won't be reflected in the parent until you commit from the bottom up
19:14 mda1 joined #git
19:15 import_this https://git-scm.com/book/e​n/v2/Git-Tools-Submodules
19:16 josuebrunel joined #git
19:16 tgunr joined #git
19:18 KungFuJesus ojacobson, import_this: I am on the bottom
19:18 FilipNortic joined #git
19:18 KungFuJesus I'm directly in the submodule directory and git status is still doing that
19:19 clemf_ joined #git
19:19 ojacobson !transcript
19:19 gitinfo Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
19:19 KungFuJesus I cloned the repo with git clone --recursive
19:20 KungFuJesus https://gist.github.com/anonymous​/f059bb5ea19200ecf5ee22c9d1272f60
19:20 Balliad joined #git
19:21 ojacobson within py_faster_rcnn, the directory caffe-fast-rcnn is the root of another submodule
19:21 Gloomy joined #git
19:21 KungFuJesus yes, but it's also a submodule itself
19:21 ojacobson irrelevant in this case
19:21 KungFuJesus alright hold on, I'll cd into that
19:21 ojacobson within py_faster_rcnn, git-status will show the state of caffe-fast-rcnn as a unit, rather than breaking it down as it would if you ran git-status within within py_faster_rcnn, git-status will show the state of caffe-fast-rcnn as a unit, rather than breaking it down in
19:21 ojacobson er
19:22 ojacobson within py_faster_rcnn, git-status will show the state of caffe-fast-rcnn as a unit, rather than breaking it down as it would if you ran git-status within  caffe-fast-rcnn
19:22 ojacobson editor fail :)
19:22 tristanp joined #git
19:22 KungFuJesus ohhhh, git status worked there.  I'm just dumb, I didn't realize that's what was happening
19:23 KungFuJesus thanks
19:24 Shentino joined #git
19:24 ForgottenPlayer joined #git
19:26 jagob joined #git
19:27 tristanp_ joined #git
19:28 ehynds joined #git
19:29 tristanp joined #git
19:32 arooni joined #git
19:33 tristanp_ joined #git
19:33 ahmed_elgabri joined #git
19:33 devster31 moritz: thanks, is that the correct process to resync with upstream?
19:34 nitrospectide joined #git
19:35 ahmedelgabri joined #git
19:36 italoacasas joined #git
19:38 nitrospectide preaction: I think you missed my final comment yesterday. We were talking about a perms issue on the Git objects. You had suggested someone must have used git as a different user, such as root. Well, I went into the .git folder, and found 3 object folders with root as owner. They are from 4 yrs ago, and must have been executed by the person I inherited this from. The question is: Why did this suddenly come up now? Did one of my file changes touch one of th
19:40 ceaucari joined #git
19:41 texasmynsted joined #git
19:42 texasmynsted What is the best way to see what commits change a particular file along a branch back to an old commit?
19:43 tristanp joined #git
19:43 Ranhir joined #git
19:43 Seveas git log path/to/file
19:44 * texasmynsted facepalm
19:44 texasmynsted yes, I think that should work.
19:44 LeMike joined #git
19:45 texasmynsted Well, I would need to specify the range of commits right?
19:45 texasmynsted How do I confine them to a branch?
19:46 _ikke_ You need to know where the branch branched off
19:46 texasmynsted ok
19:46 _ikke_ git log <base>..<branch> path
19:46 _ikke_ if develop branched of master: git log master..develop path
19:48 DirtyCajun texasmynsted, where in texas
19:49 texasmynsted north Texas
19:49 texasmynsted I have actually moved now ha
19:49 texasmynsted I live in TN now
19:50 texasmynsted Too late to change nick
19:50 satifant joined #git
19:51 GodusX joined #git
19:52 texasmynsted ah yes.  This works fine.
19:52 texasmynsted so long as I have — before path
19:52 mwhooker joined #git
19:54 tristanp_ joined #git
19:54 nnyk_ joined #git
19:57 tristanp joined #git
19:57 robotroll joined #git
19:58 |2701 joined #git
19:59 durham joined #git
20:00 SleePy joined #git
20:00 tristanp_ joined #git
20:01 encod3 joined #git
20:01 GodusX joined #git
20:01 diegoviola joined #git
20:01 durham joined #git
20:02 mda1 joined #git
20:02 ceaucari joined #git
20:03 tristanp joined #git
20:04 Mobutils joined #git
20:05 axl_ joined #git
20:06 interne7y joined #git
20:06 vdv joined #git
20:07 axl_ joined #git
20:07 GavinMagnus joined #git
20:08 nivag joined #git
20:08 SJr Beyond committer and author of a commit, is there any other attributes on a commit that would contain an e-mail.
20:09 GavinMagnus joined #git
20:09 kyledr_ joined #git
20:10 cdg joined #git
20:11 ojacobson gpg signature can correspond to zero or more emails
20:12 import_t_ joined #git
20:12 SJr ojacobson, any other ideas?
20:12 import_t_ joined #git
20:13 ojacobson about what?
20:13 ojacobson !xy :)
20:13 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
20:13 SJr Lol okay we can try this :)
20:14 s00pcan joined #git
20:16 kyledr_ joined #git
20:16 SJr For one particular user, when they break a build, jenkins which watches and seemingly uses git to determine who broke it, gets a weird e-mail address for a user. And I can't find where it is getting that e-mail.
20:16 eletuchy joined #git
20:16 SJr That e-mail consists of the username@<ip address> on a network it should have no knowledge about.
20:16 ojacobson jenkins has its own user database and can (try to, badly) autodetect correlations between jenkins users and git users
20:17 ojacobson I would look there; that's bitten me before
20:17 SJr Yeah I already checked there as that was my first thought. What is odd is that the jenkins server is off site, yet the ip address is very plausibly something on our LAN, which led me think it was a git thing.
20:17 BSaboia joined #git
20:21 mase-tech joined #git
20:21 import_this joined #git
20:21 bjpenn joined #git
20:24 LeBlaaanc joined #git
20:25 Cliente_5646 joined #git
20:26 FarbrorAlBot joined #git
20:27 Cliente_5646 left #git
20:29 ojacobson hmm. can you get at jenkins' data dir? if so, any hits if you grep for the ip address?
20:29 clemf joined #git
20:30 durham joined #git
20:30 acetakwas joined #git
20:30 mwhooker joined #git
20:31 tristanp joined #git
20:32 ToBeCloud joined #git
20:32 kpease joined #git
20:33 tristanp_ joined #git
20:33 devwop joined #git
20:33 d4rklit3 joined #git
20:34 EvilPenguin joined #git
20:34 GavinMagnus joined #git
20:35 devwop left #git
20:35 trista___ joined #git
20:35 radsy joined #git
20:35 blr_ joined #git
20:35 ceaucari joined #git
20:35 asnoehu joined #git
20:37 bjpenn joined #git
20:39 devwop joined #git
20:39 devwop left #git
20:41 renlo joined #git
20:41 tristanp joined #git
20:42 devwop joined #git
20:42 renlo is there any way to fork your own repo with github? looks like the answer is no (I do not want to clone it or whatever, I want github to treat it as a fork)
20:42 devwop left #git
20:42 renlo also, does bitbucket / others allow you to do that?
20:42 cgundersson joined #git
20:44 n13l joined #git
20:44 The_Woodsman joined #git
20:45 The_Woodsman if i have git, do i also by definition have gitk?
20:45 n13l hey all, i would like to create shared git repo with kbuild build system and share code in other repositories of projects using it. kbuild is part of root directory and that's reason why i cant use git modules. any ideas ?
20:46 devwop joined #git
20:46 sagerdearia joined #git
20:46 tobiasvl renlo: no, you can't fork your own repo to your own account.
20:46 bjpenn joined #git
20:46 devwop left #git
20:46 tobiasvl I don't believe other services let you do that either, but ask in e.g. #bitbucket to make sure
20:47 renlo thats kind of lame
20:47 ojacobson bitbucket lets you - forks don't have to have the same name as the parent repo
20:47 renlo thanks tobiasvl
20:47 ojacobson and ofc gitolite lets you do whatever you want :)
20:47 tobiasvl The_Woodsman: yes, most likely. it's in the main git repo.
20:47 tobiasvl oh ok, I stand corrected then
20:47 tobiasvl ojacobson: does gitlab?
20:47 ojacobson ionno
20:48 livingstn joined #git
20:48 import_this joined #git
20:48 The_Woodsman tobiasvl: so should i be able to just type gitk at my terminal and run it if everything is working correctly? because that's what I expected, but I can't. I'm told gitk is not a command bash understands
20:48 tobiasvl OK, then I guess you don't have it then
20:49 tobiasvl depends on your package manager etc I guess
20:49 sagerdearia joined #git
20:49 tobiasvl whether or not it's a dependency of git or not
20:50 Psychiatrist joined #git
20:50 jjido joined #git
20:50 The_Woodsman all of the guides i'm seeing for using it are from scratch - like, install git on in such and such way, not install gitk after already having installed git. do you know of a way to install gitk after-the-fact?
20:50 bronson joined #git
20:50 jjido Hi. How would I ask git what URL it will push to?
20:50 The_Woodsman i'm a little reluctant to completely reinstall git
20:51 diegoaguilar joined #git
20:52 Dougie187 left #git
20:53 tobiasvl The_Woodsman: just install gitk by itself?
20:53 tobiasvl what OS are you on?
20:53 The_Woodsman os x. for some reason i can't find a way to install it on its own, but maybe i just haven't googled hard enough
20:53 tobiasvl like any other program?
20:54 tobiasvl jjido: git remote -v
20:54 tobiasvl jjido: that will show you all remotes - you might also need to check the config to see what remote your branch is set up for
20:55 jjido I was trying git config -l
20:55 jjido ok looks like I did not clone
20:56 tobiasvl jjido: that should do it. it should show you something like "branch.BRANCHNAME.remote=REMOTENAME"
20:56 jjido thanks
20:56 tobiasvl jjido: but I also remembered that "git branch -vv" also shows remotes per branch
20:56 sagerdearia joined #git
20:56 tobiasvl perhaps a cleaner view
20:56 raijin joined #git
20:57 tobiasvl The_Woodsman: how did you install git in the first place?
20:57 The_Woodsman tobiasvl: i know it seems really simple, but apparently gitk only comes bundled with git. i could reinstall it from scratch using brew, but apparently when i installed git i didn't use brew to do it, because brew has no idea that git is on my computer. i'm nervous about totally reinstalling git because it seems like it could be a huge hassle
20:57 tobiasvl I don't use OS X but it has a package manager, right? albeit an unofficial one or something
20:57 tobiasvl oh ok, so you compiled it?
20:57 The_Woodsman tobiasvl: i apparently didn't use the package manager to install it initially. i can't really remember to be honest
20:58 eletuchy joined #git
20:59 The_Woodsman tobiasvl: i'm hot on the trail of a stackoverflow answer though, i may have it...
21:00 tristanp_ joined #git
21:00 ryouma joined #git
21:00 ryouma "git log --since midnight" wfm.  "git diff --since midnight" dnwfm.  wtf?
21:01 jjido I think MacOS X comes with git preinstalled, or maybe it's Xcode dev tools
21:02 tristanp joined #git
21:03 import_this can't remember but feel like it is
21:03 jjido $ /usr/bin/git --version
21:03 jjido git version 2.7.4 (Apple Git-66)
21:03 import_this there you go
21:04 devwop joined #git
21:04 devwop joined #git
21:05 tristanp_ joined #git
21:05 italoacasas joined #git
21:07 aidalgol joined #git
21:07 interne7y joined #git
21:08 bhavik left #git
21:08 GodusX_ joined #git
21:09 pandeiro joined #git
21:10 kyledr joined #git
21:10 kyledr i just got told "a rebase is in progress" after hitting commit, then hit cancel (this is sourcetree) and now my local changes are all gone
21:10 prsn joined #git
21:11 kyledr is there a way to see if those changes are still floating around somewhere?
21:11 devwop joined #git
21:12 import_this there is around 2 weeksish, if you have the previous commit hashes you can check them out as a new branch, likely orphaned at the moment
21:13 import_this rather 2 weeks cached if they were orphaned before, but otherwise the others should remain
21:15 tobiasBora joined #git
21:15 import_this https://www.youtube.com/watch?v=1ffBJ4sVUb4 is painfully long but a great video to watch to get a deeper understanding of this
21:15 import_this and git in general
21:15 tobiasvl man git reflog
21:15 gitinfo the git-reflog manpage is available at http://jk.gs/git-reflog.html
21:16 Rooxo joined #git
21:16 WaReZ joined #git
21:17 mellernoia joined #git
21:18 Rooxo joined #git
21:19 Dougie187 joined #git
21:19 rnsanchez_ joined #git
21:20 tobiasBora Hello,
21:20 tobiasBora I would like to know, is it possible to automatiquely sync a .git file with a folder (for example /var/www) so
21:20 tobiasBora that when the git is updated (via git push from ssh), the folder is automatiquely sync.
21:20 eletuchy joined #git
21:20 tobiasBora I could do a cron that "git fetch" every n minutes, but I would like to apply changes immediatly
21:22 renlo joined #git
21:22 Gitzilla joined #git
21:22 axl_ joined #git
21:23 knutstrut joined #git
21:23 knutstrut joined #git
21:27 lolmac joined #git
21:34 dimi1947 joined #git
21:35 L8D joined #git
21:35 nitin joined #git
21:35 johnmilton joined #git
21:38 jagob joined #git
21:39 bjpenn anyone know why git clone is looking in wrong location? im in as a user thats not root trying to do a git clone, and it's saying this: unable to access '/root/.config/git/attributes': Permission denied
21:40 _rnsanchez_ joined #git
21:40 Rooxo that sounds like your logged in as root
21:40 bjpenn im not though
21:41 Rooxo then it's strange git would want to read from the root folder
21:41 Rooxo what is in your HOME variable?
21:42 bjpenn hm /home/bjpenn
21:43 Rooxo ok...
21:43 Rooxo i would have thought it's /root/
21:43 Rooxo then it would have made sense
21:43 bjpenn yeah its not
21:43 Rooxo does it work if you clone as rooty
21:44 bjpenn Rooxo: now that i know its $HOME related, ill continue troubleshooting
21:44 bjpenn ill make it output what it thinks $HOME is
21:44 bjpenn and go from there
21:44 Seveas bjpenn: what's the command you use, the full output of the command, and the output of git config --list
21:44 bjpenn thanks! :)
21:44 mwhooker joined #git
21:46 bjpenn Seveas: https://gist.github.com/anonymous​/3124fbcfe14b9c42a317b1f9569515bf
21:46 tristanp joined #git
21:46 dsdeiz joined #git
21:47 Seveas so you're cloning inside another repo? Not the best idea...
21:47 renlo joined #git
21:48 Seveas also, i still need the other output.
21:48 import_this going to end up with submodule
21:48 tristanp_ joined #git
21:48 nwkj86 joined #git
21:49 bjpenn Seveas: https://gist.github.com/anonymous​/734c87f6ea444ca64e2e4f95c62517f3
21:49 bjpenn thats the clone command
21:49 MadHatter42 joined #git
21:50 import_this type pwd
21:51 Seveas you're cloning into /blah/, that ain't gonna work...
21:51 import_this if you can use git but the clone command isn't working reinstalling it under your account would be advisable.. but really 'git config --list' would shorten the ts process
21:51 joevandy1 left #git
21:51 bjpenn Seveas: im changing the output because i cant just paste the output
21:51 bjpenn but its probably /blah
21:51 Seveas also, that warning is coming from the remote
21:51 Seveas remote: warning: unable to access '/root/.config/git/attributes': Permission denied
21:51 bjpenn ohhh
21:52 bjpenn interesting
21:52 Seveas so your remote end is running as root and/or misconfigured.
21:52 import_this again, git config --list
21:52 Seveas bjpenn: also, !secret
21:52 gitinfo bjpenn: [!topsecret] If your situation is so secret that you can't tell us how to !reproduce it, there's really not much we can do. Perhaps you need to find or buy support you can trust?  There are people with clearances even on #git but they may not want to identify themselves.  However, you are protected by the biggest secret of all:  We just don't care.
21:52 import_this nm missed your post
21:53 bjpenn that explains it guys
21:53 bjpenn i restarted my git as root
21:53 bjpenn :po
21:53 texasmynsted if I cherry pick an old change then git reset —hard that will undo the cherry pick right?
21:54 preaction yes, in a manner of speaking
21:54 import_this https://git-scm.com/book/en/v2
21:54 import_this this is free and very informative
21:54 texasmynsted hmm.  Seems not.  Looks like cherry pick created a commit and I am not sure what I just did
21:55 texasmynsted reflog . . .
21:55 ryouma left #git
21:55 bjpenn Seveas: ah its not running as root...
21:55 bjpenn i wonder why its doing that
21:56 import_this might check out https://git-scm.com/book/en/v2/Git-In​ternals-Maintenance-and-Data-Recovery
21:56 preaction texasmynsted: reset will change your current branch to the desired commit. cherry-pick creates commits. so you want to reset to a commit before the cherry-pick
21:56 raijin joined #git
21:57 tristanp joined #git
21:57 texasmynsted yeah, I should done that.  And I need to remember to prevent cherry pick from creating a commit
22:01 Seveas texasmynsted: cherry-pick -n
22:01 texasmynsted thank you
22:02 josue joined #git
22:02 unreal joined #git
22:03 liquidjamm joined #git
22:04 gaen joined #git
22:06 madewokherd joined #git
22:07 m_antis joined #git
22:08 interne7y joined #git
22:08 NeverDie_ joined #git
22:09 ochorocho__ joined #git
22:11 jimmybuffet joined #git
22:11 AbsurdTech joined #git
22:14 mwhooker joined #git
22:14 dsdeiz joined #git
22:17 prsn joined #git
22:20 renlo joined #git
22:23 tristanp joined #git
22:23 mwhooker joined #git
22:25 tristanp_ joined #git
22:25 LeBlaaanc joined #git
22:25 moei joined #git
22:26 Lauven joined #git
22:26 trista___ joined #git
22:29 fscala joined #git
22:30 k3rn31 joined #git
22:31 tristanp joined #git
22:35 sargas joined #git
22:36 renlo joined #git
22:37 raijin joined #git
22:37 n13l left #git
22:37 knownasilya_ joined #git
22:38 Sonderblade joined #git
22:39 netj joined #git
22:40 tristanp joined #git
22:42 peepsalot joined #git
22:44 dsdeiz joined #git
22:44 Synthead joined #git
22:45 mizu_no_oto joined #git
22:46 tristanp joined #git
22:46 jimmybuffet left #git
22:47 mwhooker joined #git
22:49 tristanp_ joined #git
22:50 metl joined #git
22:51 texasmynsted ok, dumb question, I know, but I could not find it.  I know a commit by its hash in a different branch.  I want that commit in this branch which now has a different hash.  How do I find it?
22:52 Orbitrix joined #git
22:52 linuxmint joined #git
22:53 texasmynsted reflog is local so that would be no help.  (somebody merged those in their local)
22:53 tristanp joined #git
22:53 Arahael texasmynsted: if you know it's hash...  you've already found it?
22:54 texasmynsted I know the hash in the other branch.  I need the new hash for this branch.
22:54 texasmynsted I guess
22:54 texasmynsted because I know the commit is here but it does not show in this branch with the hash from the other .
22:54 Arahael texasmynsted: all commits are referred to by it's hash. as a convenience you can give the hash a name (eg, as a tag or branch name)
22:55 Arahael texasmynsted: so, gitk the-hash?
22:55 texasmynsted hmm
22:55 texasmynsted ok. will grep the log and see
22:56 Arahael texasmynsted: no need to grep. just specify the hash. done!
22:56 texasmynsted snap, it is an IDE problem
22:56 texasmynsted sigh
22:56 tristanp joined #git
22:56 sangy joined #git
22:56 Arahael how so?
22:56 texasmynsted I can find if from the command line
22:57 texasmynsted I have a file foo.  I know the commit for the last time it worked.
22:57 texasmynsted I know the hash of the the breaking change
22:57 Arahael right.  so yeah, this is why we don't support third-party gui's in this channel.
22:58 texasmynsted yep for good reason
22:58 tristanp joined #git
22:58 texasmynsted hmm.  I see the problem
22:59 texasmynsted if I confine the log to the file foo, I know the breaking change breaks the file, but the prior change did not affect the file so does not show
22:59 zivester joined #git
23:00 texasmynsted sigh haste makes waste
23:01 eletuchy joined #git
23:01 sigma__ left #git
23:02 rubyonrailed joined #git
23:06 f3r70rr35f joined #git
23:07 knutstrut joined #git
23:12 IWishIKnew joined #git
23:15 corebits joined #git
23:16 raijin joined #git
23:22 jimi_ joined #git
23:23 ffabi joined #git
23:26 _28_ria joined #git
23:26 cagedwisdom joined #git
23:27 Trieste joined #git
23:28 boudiccas joined #git
23:29 fahadash joined #git
23:30 raijin joined #git
23:31 boudicca joined #git
23:33 csd_ joined #git
23:34 rkazak joined #git
23:34 tristanp_ joined #git
23:35 gaen_ joined #git
23:35 mablae_ joined #git
23:36 tristanp joined #git
23:38 afuentes joined #git
23:39 sanscheese joined #git
23:40 SwiftMatt joined #git
23:41 tristanp_ joined #git
23:41 hahuang65 joined #git
23:42 L8D joined #git
23:44 tristanp joined #git
23:44 boudiccas joined #git
23:46 kontoo joined #git
23:46 ManiacTwister joined #git
23:47 fracting joined #git
23:48 tristanp_ joined #git
23:48 david007 joined #git
23:50 boudicca joined #git
23:50 l4rry_ joined #git
23:50 medeirosthiiago joined #git
23:51 xlegoman joined #git
23:53 mattfoo joined #git
23:54 mrkake joined #git
23:54 Lyqyd joined #git
23:57 DelphicOkami joined #git
23:57 orbisvicis joined #git
23:57 orbisvicis github is 1 branch per pull request?
23:57 preaction yes
23:58 orbisvicis how can I build with my branches merged ?
23:58 preaction merge them?
23:59 sargas joined #git
23:59 ahmed_elgabri joined #git
23:59 ceaucari joined #git

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