Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-17

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

All times shown according to UTC.

Time Nick Message
00:00 publio joined #git
00:00 eclecticjohny joined #git
00:00 kbs joined #git
00:02 roelmonnens joined #git
00:13 d^sh joined #git
00:13 thib joined #git
00:14 salamanderrake joined #git
00:15 venmx joined #git
00:16 miha_S7_ joined #git
00:16 luke_nukem joined #git
00:19 Levex joined #git
00:20 gopar joined #git
00:23 Levex joined #git
00:24 star_prone joined #git
00:27 ToBeCloud joined #git
00:28 hasc joined #git
00:32 dodgems joined #git
00:32 DarkPsydeLord joined #git
00:32 JanC_ joined #git
00:33 rominronin joined #git
00:35 wxg joined #git
00:36 gugah joined #git
00:37 d1z joined #git
00:37 dirtyroshi joined #git
00:37 hahuang61 joined #git
00:38 roelmonnens joined #git
00:38 sz0 joined #git
00:40 mizu_no_oto joined #git
00:43 gopar joined #git
00:46 Rotaerk joined #git
00:47 Cabanossi joined #git
00:48 a_thakur joined #git
00:54 jeffreylevesque joined #git
00:56 tmg joined #git
00:59 venmx joined #git
00:59 Rotaerk_ joined #git
01:02 cdown joined #git
01:02 metachr0n joined #git
01:05 justan0theruser joined #git
01:10 thiago joined #git
01:10 thiago joined #git
01:11 _28_ria joined #git
01:12 xaviergmail_ joined #git
01:12 gugah joined #git
01:14 roelmonnens joined #git
01:16 miha_S7_ joined #git
01:20 durham_ joined #git
01:22 sveinse joined #git
01:22 cdg joined #git
01:23 eclecticjohny joined #git
01:24 TbobbyZ joined #git
01:27 dreiss joined #git
01:27 Levex joined #git
01:29 dreiss joined #git
01:30 arescorpio joined #git
01:31 einnjo joined #git
01:32 Niket joined #git
01:34 puff` joined #git
01:36 cdg joined #git
01:37 Ardethian joined #git
01:40 Niket left #git
01:40 dsantiago joined #git
01:41 levex_ joined #git
01:42 Rodya_ joined #git
01:49 Lyqyd joined #git
01:50 Lunatrius joined #git
01:51 roelmonnens joined #git
01:51 afuentes joined #git
01:51 zezba9000 in git branch -a; What does "remotes/origin/HEAD -> origin/master" mean?
01:51 hfp joined #git
01:52 zezba9000 does -> mean the head is origin/master...
01:52 zezba9000 I guess that makes sense
01:52 hfp_work joined #git
01:52 cdown joined #git
01:53 anuxivm left #git
01:54 BackEndCoder joined #git
01:56 rkazak_ joined #git
02:00 dreiss joined #git
02:05 rominronin joined #git
02:09 kbs joined #git
02:09 foodSurprise joined #git
02:10 peterbecich joined #git
02:14 pks joined #git
02:15 foodSurprise joined #git
02:16 bejeb joined #git
02:17 miha_S7_ joined #git
02:21 GodGinrai joined #git
02:23 d^sh joined #git
02:23 AKPWD joined #git
02:23 hahuang61 joined #git
02:27 nebodka joined #git
02:27 roelmonnens joined #git
02:29 zezba9000 left #git
02:31 gugah joined #git
02:36 SwiftMatt joined #git
02:37 BlueMatt joined #git
02:37 BlueMatt joined #git
02:39 liberpater joined #git
02:46 cdg joined #git
02:46 mizu_no_oto joined #git
02:46 wagle joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | We are aware of the SHA-1 collision. See: http://jk.gs/t/a4 | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:49 sunri5e joined #git
02:49 a_thakur joined #git
02:51 AKPWD joined #git
02:54 fstd_ joined #git
02:55 raijin joined #git
02:57 Pseudocrat joined #git
02:57 Pseudocrat joined #git
02:59 cqi joined #git
03:00 cqi joined #git
03:02 gfixler joined #git
03:02 Cabanossi joined #git
03:03 roelmonnens joined #git
03:05 ojdo joined #git
03:09 cklester joined #git
03:10 cklester just a quick question: when I add a .gitignore file, why does 'git status' pick it up?! shouldn't it ignore the ignore file? :D
03:12 cklester good news is, the file i specified in the gitignore file is actually being ignored. how about that? neat!
03:14 cklester the other good news is, i found an answer! http://stackoverflow.com/questions/767147​/ignore-the-gitignore-file-itself#767213
03:14 cklester Thanks, y'all!
03:15 j416 joined #git
03:18 miha_S7_ joined #git
03:20 lagothrix joined #git
03:21 cdg joined #git
03:24 foodSurprise left #git
03:24 mehola joined #git
03:27 variable joined #git
03:27 j416 joined #git
03:28 hexagoxel joined #git
03:30 TbobbyZ joined #git
03:33 Cabanossi joined #git
03:35 ashnur joined #git
03:35 ashnur joined #git
03:36 rominronin joined #git
03:37 MuffinMedic joined #git
03:39 durham joined #git
03:39 durham joined #git
03:39 duderonomy joined #git
03:39 roelmonnens joined #git
03:40 bwn joined #git
03:40 Andrew_K joined #git
03:41 a3Dman joined #git
03:43 ankit01ojha joined #git
03:44 lb1c joined #git
03:44 Rodya_ joined #git
03:46 seni joined #git
03:46 Darren_ joined #git
03:51 hexagoxel joined #git
03:57 chachasmooth joined #git
03:57 Vortex34 joined #git
03:58 armyriad joined #git
03:59 star_prone joined #git
04:01 jeffreylevesque joined #git
04:01 safe joined #git
04:03 roelmonnens joined #git
04:08 hhee joined #git
04:09 dsdeiz joined #git
04:14 chipotle joined #git
04:15 svm_invictvs joined #git
04:19 miha_S7_ joined #git
04:22 justanotheruser joined #git
04:24 hahuang61 joined #git
04:30 ayogi joined #git
04:31 pks joined #git
04:31 siaw23 joined #git
04:32 siaw23 hello. i forked a project. how do i pull from the main project that i forked from? i want to reset my forked project to be the same as the original i forked from. how do i do that?
04:35 raijin joined #git
04:36 kadoban siaw23: Add it as a remote, fetch it and then do whatever you want
04:40 luke_nukem joined #git
04:41 pks joined #git
04:44 eclecticjohny joined #git
04:45 Rodya_ joined #git
04:47 rkazak joined #git
04:48 pwnz0r joined #git
04:50 a_thakur joined #git
04:52 NightMonkey joined #git
04:53 EV3RYDAYPR0GRESS joined #git
04:55 aidalgol joined #git
04:56 aidalgol joined #git
05:01 Cabanossi joined #git
05:04 sbulage joined #git
05:05 hexagoxel joined #git
05:07 rominronin joined #git
05:09 lucido-cl joined #git
05:14 bocaneri joined #git
05:16 suzeren joined #git
05:17 SwiftMatt joined #git
05:18 pzp joined #git
05:19 StuartMI joined #git
05:19 miczac joined #git
05:20 miha_S7_ joined #git
05:27 h0bbit joined #git
05:33 TbobbyZ joined #git
05:34 luke_nukem joined #git
05:35 hashtagstrashtag joined #git
05:36 kfoonamalik joined #git
05:36 imack joined #git
05:37 unborn joined #git
05:41 freimatz joined #git
05:42 brent__ joined #git
05:45 pks joined #git
05:46 Rodya_ joined #git
05:56 Chinggis6 joined #git
06:01 finalbeta joined #git
06:01 Cabanossi joined #git
06:06 jascott1- left #git
06:06 MineCoins joined #git
06:06 imack joined #git
06:07 manuelschneid3r joined #git
06:07 dec0n joined #git
06:07 raijin joined #git
06:11 Chinggis6 joined #git
06:15 tmg joined #git
06:15 rscata joined #git
06:16 _28_ria joined #git
06:17 siaw23 joined #git
06:17 qt-x joined #git
06:17 pks joined #git
06:19 leeN joined #git
06:20 luke_nukem joined #git
06:20 miha_S7_ joined #git
06:21 svm_invictvs joined #git
06:22 gargola joined #git
06:23 venmx joined #git
06:24 johnny56 joined #git
06:25 theoceaniscool joined #git
06:25 hahuang61 joined #git
06:30 wxg joined #git
06:31 overlord_tm joined #git
06:31 Cabanossi joined #git
06:32 fedepad joined #git
06:36 amrits joined #git
06:39 rominronin joined #git
06:42 kristofferR joined #git
06:42 lalilulelo joined #git
06:47 Rodya_ joined #git
06:47 ayogi joined #git
06:49 chachasmooth joined #git
06:51 a_thakur joined #git
06:53 ThomasLocke joined #git
06:53 ThomasLocke joined #git
06:53 seni joined #git
06:54 d0nn1e joined #git
06:54 ToxicFrog joined #git
06:56 impliednude joined #git
06:56 t0by joined #git
06:57 freimatz joined #git
06:58 Raging_Hog joined #git
07:08 ToxicFrog joined #git
07:08 hexagoxel joined #git
07:08 lordjancso joined #git
07:11 chachasmooth joined #git
07:15 Silmarilion joined #git
07:15 JeroenT joined #git
07:17 blomp joined #git
07:17 diogenese joined #git
07:19 synchronous joined #git
07:19 styler2go joined #git
07:19 Tobbi joined #git
07:20 roelmonnens joined #git
07:21 miha_S7_ joined #git
07:22 rominronin joined #git
07:22 theoceaniscool joined #git
07:23 janx joined #git
07:23 chele joined #git
07:24 trelane joined #git
07:24 trelane joined #git
07:26 luke_nukem joined #git
07:26 MineCoins joined #git
07:27 chachasmooth joined #git
07:27 mar77i joined #git
07:30 madduck the statement at the end of a git-diff--stat ("1 file changed, 1 insertion(+), 5 deletions(-)"
07:30 madduck ) can I get just the numbers easily?
07:30 madduck 1/1/5?
07:31 venmx joined #git
07:32 xall joined #git
07:33 Random832 joined #git
07:34 djb-irc joined #git
07:35 sbulage joined #git
07:35 TbobbyZ joined #git
07:39 jnavila joined #git
07:40 joki joined #git
07:41 j08nY joined #git
07:41 zeroed joined #git
07:41 zeroed joined #git
07:42 hexagoxel joined #git
07:48 star_prone joined #git
07:51 djb-irc left #git
07:55 star_prone joined #git
07:58 rokups joined #git
07:59 aswen joined #git
08:01 sarri joined #git
08:01 sarri joined #git
08:07 Tobbi joined #git
08:14 yqt joined #git
08:14 netroxen joined #git
08:14 mehola joined #git
08:16 Cabanossi joined #git
08:18 psprint One could push a stash to remote, yes?
08:19 _ikke_ yes, it is possible
08:19 djb-irc joined #git
08:21 elect joined #git
08:22 schleppel joined #git
08:22 miha_S7_ joined #git
08:22 fedepad joined #git
08:24 lmatteis joined #git
08:24 Vampire0 psprint, actually you can push any commit, that you have in your repository, whether it has a name (branch, tag), or even whether it is reachable or dangling doesn't matter at all
08:24 jagob joined #git
08:26 hahuang61 joined #git
08:26 _ikke_ right, but stashes being actual commits is more of an implementation detail
08:27 chigang joined #git
08:27 Vampire0 Yeah, but it is the reason you can push them, isn't it? :-)
08:27 psprint Vampire0: ahm, I was more about making stashes more persistent. Recalled that github does /refs/pull or similar. Thought that there is refs/stashes, is there? They could then be full-right pushable things, like the github pulls
08:28 Vampire0 psprint, there is refs/stash for the topmost, the others in the stash are maintained via the reflog of the "stash" ref
08:28 kurkale6ka joined #git
08:28 psprint ahso
08:28 hexagoxel joined #git
08:29 Vampire0 psprint, if you want to make them more perisistent, you could e. g. make a normal commit instead and tag it or something like that
08:29 psprint I like such stopgap solutions, they're actually solid and reveal many tricks to be possible
08:29 Silmarilion joined #git
08:29 psprint Vampire0: better a branch not only commit?
08:31 psprint and yet better create refs/stashes to not use refs/heads
08:32 Vampire0 psprint, well, depends mainly on your liking
08:32 Vampire0 psprint, you can use refs/stashes, or refs/heads/stashes/..., both have their pros and cons
08:33 Vampire0 psprint, or you can simply use tags, nothing is wrong with that, if stashes for you remain to be one commit that saves some changes
08:33 Vampire0 psprint, if not, you might be better off with a branch anyway
08:34 King_Hual joined #git
08:34 psprint stash is a patch from user point of view. Can be applied to any work-tree. Wonder if a commit would work this way. Rather yes, git stores not diffs but full objects, it is so probably also for stashes
08:35 Taikibansei joined #git
08:35 jast stashes are actually implemented as two commits stored in a reflog
08:36 osse Only one of them is stored in the reflog ;););););)
08:36 jast I was going to explain in more detail, but now you ruined it :(
08:36 psprint so this is apparently a way for git to store not snapshots, but diffs? The two commits are to have "store diff" functionality
08:37 netj joined #git
08:37 jast no
08:37 jast when you stash, the index contents are put into one commit, the worktree contents are put into the other
08:38 jast all diffs are always calculated on the fly from comparing two snapshots
08:38 jast in this case, comparing to the base commit the stash was initially created on
08:38 psprint yes I meant that diff is computed but 2 commits are provided for this
08:38 jast you can make a stash that creates only one commit
08:39 mar77i joined #git
08:39 Vampire0 psprint, actually git always stores patches if I'm not completely mistaken
08:40 jast oh, never mind, you can't. it always creates at least two commits, but by default only one of them is used when applying the stash
08:40 Vampire0 psprint, and yes, you can use a commit like a patch, you just cherry-pick it from somewhere else to apply the changes it made at the other place.
08:40 jast no, git doesn't store patches
08:40 jast it only creates binary deltas internally to optimize storage, but never diffs/patches
08:41 Balliad joined #git
08:41 SteffanW joined #git
08:41 star_prone joined #git
08:41 jast binary deltas are an implementation detail, you can't even get Git plumbing to output the deltas
08:41 jast (AFAIK, anyway)
08:41 Vampire0 jast, isn't a binary delta a sort of diff / patch? I didn't say "textual" patch. :-d
08:41 Vampire0 s/:-d/:-D/
08:41 jast yeah, but people get the wrong idea from that. you never actually see the deltas.
08:42 jast Git always behaves as though the objects are full snapshots
08:42 psprint jast: interesting, maybe enabling use of second commit would give better apply? I don't have a full picture but restoring changes of stash from single commit seems like a hard task
08:43 psprint jast: yeah coded libgit2, it's clear, there are objects that are hashed, that's all, there is the git hash-object, I used it as a notepad
08:44 jast nah, it's very simple applying with just one commit, actually :)
08:44 jast let's look a little further into the structure
08:45 jast when you create a stash, Git first determines the base commit (HEAD at the time), let's call it B
08:45 jast it then creates a commit containing the index data, with B as its parent
08:45 jast the second commit contains the worktree data and has B as its first parent and the index commit as its second parent
08:46 jast when you run 'git stash apply', it does a three-way merge, using B as the base, current HEAD as side 1 and the second commit as side 2
08:47 jast this is exactly the same as doing a 'git cherry-pick stash@{0}', in fact
08:48 jast except that creates a new commit on the current branch, so it's actually the same as 'git cherry-pick -m 1 -n stash@{0}'
08:48 jast (and the -m 1 is necessary because the stash commit has the two parents, which normally signifies a merge commit, we're basically just telling cherry-pick to ignore that)
08:49 psprint forgot about parents, that quite solves it, and quite saves git abstraction, because relying on commit in reflog would be not-nice, it is however nice as a back-up thing
08:49 Stutters joined #git
08:49 jast well, the reflog is where 'git stash apply' finds the commit. without the reflog your stash is unreferenced and subject to getting lost accidentally
08:50 jast it's a separate reflog just for the stash, found at .git/logs/refs/stash
08:50 jast this is the (only) place where the list of currently known stashes is stored
08:51 Silenced joined #git
08:53 psprint one could write a script, get object IDs of stashes in stash-reflog, create a head in refs/stashes/{stash_head} for each of them ;]
08:53 aielima joined #git
08:53 jast sure, but 'git stash' isn't going to look at that
08:53 psprint to them push them easily to github e.g.
08:54 flaviodesousa joined #git
08:54 jast personally I wouldn't want stashes to clutter up a central repo, but yeah, you could do that
08:55 psprint it would be about some specific stashes, not the "garbage" that's typically there, e.g. long worked debug-print putting into source
08:55 osse for n in 1 2 3 4 5; do git push origin refs/stash@{$n}:refs/stashes/stash$n; done
08:56 jast could just use a normal branch, then
08:57 psprint osse: from this, '@{...}' looks like an instruction to parse reflog
08:58 jast sure
08:58 osse correct
08:58 jast foo@{0} is the entry #0 from foo's reflog
08:58 osse hah, forgot 0
08:58 jast = typically the most recent one
08:58 jast you might recall that I used the same thing in my cherry-pick example
08:59 acetakwas joined #git
09:01 Lunatrius joined #git
09:01 Cabanossi joined #git
09:04 JeroenT_ joined #git
09:05 tvw joined #git
09:05 psprint nice, @{0} normally looked like a 'doh one more ^, ~, @' to address stash, but it's a general tool, that's fine
09:06 sbasso joined #git
09:06 howdoi joined #git
09:08 psprint afair from libgit2, one object id is not-in-text assigned to reflog entry, so having a tool to address reflog entries is expected
09:10 luke_nukem joined #git
09:12 circ-user-Qgl13 joined #git
09:13 psprint This has value in it, because normally "object list" is done through parents, and with reflog, one can have "object list" not connected with parent
09:15 dvaske joined #git
09:15 roelmonn_ joined #git
09:15 mehola joined #git
09:16 n1ce joined #git
09:16 marcogmonteiro joined #git
09:16 upvjjo joined #git
09:18 jast psprint: as it happens, there is even more to that syntax. reflog entries also have timestamps and you can address them by age: stash@{5.days.ago}
09:18 clmsy joined #git
09:18 jast man gitrevisions for all the sordid details, as always
09:18 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
09:19 Ovear joined #git
09:20 Lunatrius joined #git
09:21 jast TIL: @{foo} is shorthand for currentbranch@{foo}, not for HEAD@{foo}
09:21 Ovear joined #git
09:21 jast it's documented, of course, but I always assumed otherwise
09:21 navidr joined #git
09:21 boshhead joined #git
09:21 feinhuur joined #git
09:23 miha_S7_ joined #git
09:23 psprint so @{} can be used not for reflog? (sorry for not diving into the docs)
09:23 jast @{} is always for reflog
09:23 Ovear Hello, Does git support socks5 proxy? i use "git config --global http.proxy socks5://127.0.0.1:1088" to set proxy. But it seems still treat as http proxy.
09:24 dec0n joined #git
09:24 jast Ovear: not via that syntax, but you can use core.gitProxy to tunnel connections through another program and use a SOCKS client
09:26 osse jast: except when the stuff inside {} is a negative number
09:26 jast oh, right. yeah, that means something entirely different. :D
09:28 psprint jast: so final thing, one could send email "Checkout which commits made the new feature", and suppy refid of reflog that is a set of commits
09:29 jast the reflog is not shared with other repos, so that wouldn't really help
09:29 imack joined #git
09:29 seni joined #git
09:29 j08nY joined #git
09:29 JeroenT joined #git
09:31 JeroenT_ joined #git
09:31 psprint maybe git will one day develop the entity of "commit set" based on reflogs, who knows
09:31 Ovear jast: core.gitProxy seems only work with git://, but i work git with https protocol. I find this method on https://stackoverflow.com/questions/15227130/usi​ng-a-socks-proxy-with-git-for-the-http-transport, It is not correct?
09:31 Cabanossi joined #git
09:31 oskarkv joined #git
09:32 JeroenT_ joined #git
09:34 MarioBranco joined #git
09:34 neunon joined #git
09:35 mindfart joined #git
09:36 imack joined #git
09:38 MarioBranco joined #git
09:39 TbobbyZ joined #git
09:39 nikitasius joined #git
09:39 JeroenT joined #git
09:40 afuentes joined #git
09:41 ayogi joined #git
09:44 JeroenT joined #git
09:44 jast Ovear: which version of git are you using?
09:45 xaa joined #git
09:46 Ovear git version 2.12.0 from ius
09:46 jast https.proxy (not http.proxy, that's only for unencrypted connection) should support socks5:// URLs since version 2.6.4
09:46 acetakwas joined #git
09:46 n1ce joined #git
09:47 Ovear i have both set https.proxy and http.proxy to socks5://
09:47 jast also your version of libcurl must be at least 7.24
09:47 EvilJStoker joined #git
09:48 Ovear ok, i got it. It seems that my libcurl version is below 7.24. I am trying to update it. Thanks a lot :)
09:49 JeroenT joined #git
09:50 jast Ovear: the problem is that if your Git binary was compiled for an older version of libcurl, updating the library won't help. you'll need a git package that is built for the newer version.
09:50 tmg joined #git
09:52 jast IUS contains libcurl 7.29 but it seems like the IUS Git package doesn't use that one
09:52 jast you'll probably have to build Git yourself in the end
09:52 jast or try to use a SOCKS wrapper. it's annoying, but better than nothing.
09:53 knobo joined #git
09:54 Ovear OK, i got it. Thanks, i am trying to avoid compile git by my self. But if it it still not work. i will compile it. Really very thanks.
09:54 knobo Can I copy a file from current branch to another branch?
09:54 osse knobo: yes
09:55 osse knobo: as in, you can check a file out as it is in another branch
09:55 knobo ok, so I have to switch branches.
09:55 osse you have to switch to the branch you want to copy to
09:56 imack joined #git
09:58 marcogmonteiro joined #git
10:01 acetakwas joined #git
10:01 knobo ok, thanx.
10:06 acetakwas joined #git
10:09 acetakwas joined #git
10:11 ronator joined #git
10:13 elect joined #git
10:14 Lunatrius joined #git
10:16 imack joined #git
10:16 Cabanossi joined #git
10:17 roelmonnens joined #git
10:17 ikonia_ joined #git
10:18 Hogofwar joined #git
10:18 MarioBranco_2 joined #git
10:20 ikonia joined #git
10:21 Balliad joined #git
10:23 XII-tdv joined #git
10:23 neunon joined #git
10:23 miha_S7_ joined #git
10:25 sbasso joined #git
10:26 c0ded joined #git
10:26 hahuang61 joined #git
10:31 MarioBranco joined #git
10:32 MarioBranco joined #git
10:34 cdown joined #git
10:34 Flowinho joined #git
10:35 kexmex joined #git
10:36 irqq joined #git
10:36 cdown_ joined #git
10:38 marcogmonteiro joined #git
10:39 tcorneli joined #git
10:44 dsteplight__ joined #git
10:46 sbasso joined #git
10:49 Rodya_ joined #git
10:50 dendazen joined #git
10:54 BackEndCoder joined #git
11:01 Endarked joined #git
11:01 freimatz joined #git
11:02 Raging_Hog joined #git
11:03 Levex joined #git
11:04 _UniFreak joined #git
11:04 _UniFreak I want to my c-tag's .tags file be versioned in my local workspace. but before push to origin, it should not be in repo
11:04 _UniFreak how can I do this?
11:05 JeroenT joined #git
11:05 cbreak _UniFreak: git can not do that
11:05 cbreak pushing will not change history
11:05 cbreak if it's tracked, it becomes part of history, and pushing will push it
11:06 _UniFreak cbreak: do you use ctag? how do you manage tag files?
11:06 ferr1 joined #git
11:06 _UniFreak every branch shold have distince .tags file, or after changing branch, the tag is not pointing to the right file right place
11:06 cbreak no, I don't use it, and I don't manage tag files.
11:07 cbreak I'm a C++ devs, I don't need weird tag file things :)
11:07 guest Not strictly a git question, but on Github how do I indicate that a pull requests solves an issue?
11:07 _UniFreak I don't know C++, but even in C++, you need to jump around right?
11:08 cbreak sure.
11:08 cbreak my IDE builds index files
11:08 cbreak it notices when files change
11:08 cbreak either because of me or because of git
11:09 _UniFreak OK... I'm not going to switch away from sublime-text
11:09 _UniFreak there got be a way
11:10 cbreak why do you need different files for different branches?
11:10 cbreak why do those files not have to be on the remote repo?
11:11 HardlySeen joined #git
11:11 Vampire0 guest, you simply mention them. There is no formal "fixes" relationship afaik
11:11 guest "fixes #51" does it
11:11 guest that sets up the relationship
11:11 sotoz joined #git
11:11 guest it will close the issue once the PR is merged
11:12 thib joined #git
11:12 _UniFreak cbreak: I don't know how ctag works, but I guess it generate .tags file for current files, and when I switch branch, the file change, so the .tags file would point to wrong place when I trying to jump to definitions...
11:13 osse _UniFreak: http://tbaggery.com/2011/08/08/​effortless-ctags-with-git.html
11:13 _UniFreak it's not file-changing aware, I need to re-generate .tags file if I changed things, even in the same branch
11:13 cbreak _UniFreak: so just regenerate them?
11:15 Flowinho _UniFreak you can exlude that file
11:15 Flowinho that way it will not be shared with other repositories
11:15 Flowinho `You can exclude files on a per repository basis by editing the .git/info/excludes file in your repository. (Why it takes it from this location rather than .git/config I don’t know: add it to the list of git annoyances). These exclusions (or inclusions, you can override the higher level exclusions by prepending ! to lines that you want to include) are not shared with the working directory, so they only apply to that particular repository, and
11:15 Flowinho are not shared with any remotes. This is useful when you have particular requirements because of your workflow or machine setup.`
11:16 Flowinho Source: http://365git.tumblr.com/post/51901​6351/three-ways-of-excluding-files
11:18 _UniFreak Flfowinho: I don't think you understand my problem. or maybe I misunderstood you solution....
11:19 _UniFreak I need .ctags to be versioned, so they are branch-switching aware, but don't be pushed to the remote
11:19 osse _UniFreak: that is not possible.
11:19 _UniFreak osse's link may be a help, I'm checking on it
11:19 cs_shadow joined #git
11:22 t-mart_ joined #git
11:24 miha_S7_ joined #git
11:30 Snugglebash joined #git
11:31 leeN joined #git
11:33 osse _UniFreak: I eprsonally think its better to get the editor to deal with it
11:33 osse but this isn't bad
11:33 finalbeta1 joined #git
11:33 JeroenT joined #git
11:36 sst joined #git
11:37 ak77 joined #git
11:39 ak77 hello all. I converted hg repo to git, intial pull with git-remote-hg, and then few filter-branch rewrites (big files, subrepos, authors, etc...) almost all nice and dandy.... except refs/notes/hg stayed on tree number 1... how to get them to tree number 4 ? :S
11:40 ak77 matching by subject is no good, because there are few cases where same patch was applied to multiple branches (so far: http://pastebin.com/n0bfkKsF)
11:41 TbobbyZ joined #git
11:43 cbreak what do you need notes for?
11:45 sotoz joined #git
11:46 ak77 when doing hg -> git,  I can change hg subrepos to git submodules in whole history, but I need hg commit hash to resolve to git commit hash... this information is stored in hg notes
11:47 finalbeta joined #git
11:48 JeroenT joined #git
11:49 JeroenT_ joined #git
11:50 MineCoins joined #git
11:50 Rodya_ joined #git
11:53 bremner I can't imagine that working
11:53 bremner if what you mean is that git commits magically have the same hash as old hg commits
11:54 tvw joined #git
11:55 bsanford joined #git
11:57 ak77 bremner: no. but git commits have /refs/notes/hg with corresponding hg commit hash
11:58 synthroid joined #git
11:58 _Cyclone_ joined #git
11:59 ak77 bremner: and in filter-branch --tree-filter, I inspect .hgsubstate (subrepo hg commit hash) and translate it to git commit hash, and update git submodule commit. so I get subrepo/submodule match throughout the history of the repo
11:59 jameser joined #git
12:00 ak77 that works,.... If i don't rewrite submodules repository,... in that case resolving is no longer valid as filter-branch doesn't rewrite notes
12:00 ak77 (doesn't update references to notes)
12:01 borkr joined #git
12:01 bariscant joined #git
12:01 ak77 so. my question is more like... how to reliably find same commits in multiple trees
12:02 ak77 commit hashes are different... tree hashes... due to rewrites probably as well...
12:02 ScioMin joined #git
12:03 hexagoxel joined #git
12:04 ScioMin Any ideas why I can't star, fork or watch this github project? https://github.com/kataras/rizla. It says: "You can't perform that action at this time."
12:05 cdown_ joined #git
12:06 ak77 maybe I could use hash of a diff (not commit)... most of diffs in commits are the same event after rewrites... and those that are not don't have corresponding hg commit anyway
12:08 tobiasvl ScioMin: probably better to ask that at #github
12:08 mda1 joined #git
12:08 davimore joined #git
12:08 ScioMin tobiasvl, you're right. thanks
12:10 bitmod joined #git
12:10 jagob joined #git
12:12 theoceaniscool joined #git
12:13 bariscant joined #git
12:14 netj joined #git
12:15 insane_tesla joined #git
12:15 UniFreak joined #git
12:16 insane_tesla left #git
12:16 Orxata_ joined #git
12:16 Orxata_ Hi
12:16 gitinfo Orxata_: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
12:16 eikhorst joined #git
12:17 UniFreak joined #git
12:18 Orxata_ why "git log -p" and not "git patch"?
12:18 tobiasvl Orxata_: what do you mean
12:18 UniFreak joined #git
12:18 osse Why "football" and not "traffic cone" ?
12:19 grawity because it's still the same log, just with more stuff
12:19 tobiasvl Orxata_: a lot of git commands take the --patch switch
12:19 grawity there are many other options which would fit `git patch`
12:19 JeroenT joined #git
12:19 grawity would be more confusing, not less
12:19 grawity "does this apply a patch? show a patch? generate a patch?"
12:19 miczac joined #git
12:20 bariscant joined #git
12:20 osse oh, now I understand the question
12:20 kpease joined #git
12:21 rjCousineau joined #git
12:22 Orxata_ : )
12:22 Orxata_ thanks grawity
12:22 gajus joined #git
12:22 rjCousineau Hello
12:22 gitinfo rjCousineau: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
12:23 sfan786_ joined #git
12:23 Orxata_ grawity: however, in the man page of git log, option -p
12:24 Orxata_ it describes it as: -p, -u, --patch Generate patch (see section on generating patches).
12:24 Orxata_ which is very confusing and desorientating
12:24 Vampire0 Why??
12:24 rjCousineau I have made a bare git, and i have commited and pushed to it.  If I run 'git ls-tree -r master' I can a breakdown of all the files inside. great!  Now if I run 'git clone repo.git' I get: "warning: You appear to have cloned an empty repository."  I can't figure out why.
12:24 Orxata_ because -p shows a diff
12:24 sawk joined #git
12:24 Orxata_ doesn't generate a patch, as far as I understand it
12:24 gugah joined #git
12:25 Snugglebash joined #git
12:25 Vampire0 Orxata_, what is the difference between showing and generating in this context?
12:25 tobiasvl well, there's also "git format-patch"
12:25 Vampire0 Orxata_, actually it generates a textual diff and shows it
12:25 miha_S7_ joined #git
12:25 Orxata_ and what is a patch, then
12:26 Vampire0 when "then"?
12:26 Orxata_ so what is a patch*
12:26 jmesmon joined #git
12:26 Orxata_ it is a textual diff?
12:26 Vampire0 a patch is a textual diff that can be applied to the base code to get the same target code
12:26 grawity 'diff' and 'patch' are more or less interchangeable
12:26 Orxata_ ook
12:26 cdown_ joined #git
12:26 Orxata_ I understand something different from patch
12:26 Vampire0 and that is?
12:26 grawity well, 'patch' can mean a format-patch output with all the From:/Subject:/etc. headers
12:27 grawity but it just as often means a plain unified diff
12:27 Orxata_ Vampire0: some code that you write to fix something
12:27 dviola joined #git
12:27 Oatmeal joined #git
12:27 hahuang61 joined #git
12:27 aw1 joined #git
12:27 Vampire0 Orxata_, ah, yeah, wrong context. :-)
12:27 Orxata_ that's the thing
12:27 Vampire0 Orxata_, but actually that is where it comes from I think
12:28 Vampire0 Orxata_, you fix a bug, generate the patch (textual diff) and submit it to the maintainer for applying and including in the next release
12:28 grawity don't forget that the Unix command `patch` applies the output of `diff`
12:28 grawity so people often use both names for that output
12:28 Orxata_ I see
12:29 Orxata_ I think that's all
12:30 Orxata_ thank you very much
12:30 Vampire0 you're welcome
12:30 gitinfo Orxata_: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
12:31 Cabanossi joined #git
12:35 _UniFreak joined #git
12:36 jimi_sanchez joined #git
12:36 DBag joined #git
12:37 DBag left #git
12:37 dendazen joined #git
12:39 jim_carry joined #git
12:41 Orxata_ ok, so
12:42 Orxata_ thanks Vampire0 grawity
12:42 ak77 is there a way to find same commits in different trees? with some heuristics I think, equal N parents or something ?
12:42 brent__ joined #git
12:43 bariscant joined #git
12:43 JeroenT_ joined #git
12:45 ScioMin left #git
12:45 bariscant joined #git
12:46 dsdeiz joined #git
12:46 dsdeiz joined #git
12:47 Raging_Hog joined #git
12:50 dersand joined #git
12:51 Rodya_ joined #git
12:54 bremner git patch-id might help
12:55 bremner when you say "in different trees", I'm not sure what that means.
12:55 kristofferR joined #git
12:55 ExoUNX joined #git
12:56 achadwick joined #git
12:58 sbasso joined #git
12:58 a3Dman joined #git
12:59 nedbat i'm in a directory where i'm not sure what files are tracked, and which are not.  What's the git command that let's me see the status of *.foo?  "git status *.foo"  just tells me that there's nothing to commit.
13:00 Snugglebash joined #git
13:00 miczac joined #git
13:01 Chrismeister joined #git
13:03 CussBot joined #git
13:04 Gsham joined #git
13:05 tobiasvl nedbat: man git ls-files
13:05 gitinfo nedbat: the git-ls-files manpage is available at http://jk.gs/git-ls-files.html
13:05 nedbat tobiasvl: thanks.
13:06 nedbat tobiasvl: i could have sworn there was a way to see all the *.foo files, with tracked and untracked indicated by a status flag.  This only shows the tracked files (which will work for me)
13:06 Endarked joined #git
13:06 cdg joined #git
13:08 tobiasvl nedbat: git status --porcelain ?
13:08 tobiasvl perhaps
13:08 ak77 bremner: different roots
13:08 nedbat tobiasvl: hmm, nope
13:09 linuxmodder tobiasvl,  got organizational repos would user.organization foo work?
13:10 tobiasvl linuxmodder: sorry?
13:11 linuxmodder tobiasvl,  seem to remember there being organization specific config switches for git-config
13:11 linuxmodder but can't find them now
13:11 nikivi joined #git
13:13 tobiasvl linuxmodder: OK... why are you telling/asking me this? have we talked earlier? I have no idea what you're talking about, sorry
13:13 sawk joined #git
13:14 mehola joined #git
13:15 venmx joined #git
13:18 moL-Ou joined #git
13:18 cdown joined #git
13:21 Jellyg00se joined #git
13:22 brokensyntax joined #git
13:23 tmg joined #git
13:26 mozzarella joined #git
13:26 miha_S7_ joined #git
13:27 CEnnis91 joined #git
13:27 jeffreylevesque joined #git
13:27 Rodya_ joined #git
13:29 seni joined #git
13:30 JeroenT joined #git
13:32 star_prone joined #git
13:33 Dougie187 joined #git
13:33 rubyonrailed joined #git
13:34 ij Should I tag "1.0.0" or "v1.0.0"?
13:34 unborn ij: its up to you
13:34 unborn i do v.numbers
13:35 unborn humans usually recognise v.numbers as versions
13:35 ij Luckily I am actually an independent apache helicopter.
13:36 unborn :)
13:36 re1 joined #git
13:38 apotry joined #git
13:43 masuberu joined #git
13:43 mazert_ joined #git
13:43 Stummi our branches are x.y and our tags x.y.z
13:43 Stummi I think it doesn't matter as long as you are doing it consistently
13:46 rubyonrailed joined #git
13:46 publio joined #git
13:46 JeroenT joined #git
13:48 porsche944 joined #git
13:49 JeroenT joined #git
13:50 tobiasvl do both! the more tags the merrier
13:50 WhereIsMySpoon joined #git
13:51 ij "the merrier"
13:51 moL-Ou joined #git
13:51 WhereIsMySpoon Im really confused. I have a branch which has the remote way back in the past. I want to rebase it on top of a much more recent branch. The rebase succeeds, but when I try to push the branch, it fails and says the tip is behind the remote?
13:51 * ij deleted 100 ticked-numbered tags with xargs the other day that took 10 minutes to push to bitbucket.
13:51 WhereIsMySpoon clarification: the remote and my local are way back in the past, they're in sync before the rebase
13:52 WhereIsMySpoon not just the remote :)
13:53 stoned joined #git
13:53 GodGinrai joined #git
13:54 WhereIsMySpoon can anyone help me understand why im getting this please?
13:54 Ryanar joined #git
13:54 Vampire0 WhereIsMySpoon, maybe you try to push to the old tracking branch instead of the new one?
13:54 WhereIsMySpoon old?
13:54 star_prone joined #git
13:54 GodGinrai hey guys, when I do an interactive rebase from one branch to another, is there a way to make it flag the commits that are specific to my branch?
13:54 WhereIsMySpoon im only rebasing one branch here
13:55 Levex joined #git
13:55 AaronMT joined #git
13:56 cdg_ joined #git
13:57 WhereIsMySpoon Vampire0: what do you mean push to the old branch
13:57 stoned Hello, I want to go back to 38612fac this commit from an hour ago, and destroy all my changes and all other commits/pushes commits that occured after this commit, is it possible?
13:57 alexandre9099 joined #git
13:57 stoned how would I go about doign this?
13:58 WhereIsMySpoon stoned: sure, git reset --hard <hash>
13:58 JeroenT joined #git
13:58 WhereIsMySpoon if you already pushed those changes however its more tricky
13:58 bremner !rewrite
13:58 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
13:58 stoned WhereIsMySpoon: yes, already pushed
13:58 stoned I tried to do all this and it only made more c ommits
13:58 stoned :(
13:58 WhereIsMySpoon why do you want to rewrite git history?
13:58 stoned mental problems.
13:59 stoned can we remove?
13:59 WhereIsMySpoon revert all the commits after the one you want to use and commit those reverts
13:59 Vampire0 WhereIsMySpoon, what don't you understand? If you have the upstream branch set for your local branch and then rebase against a different branch, but didn't update the upstream, you are pushing still to the configured upstream by default if you don't manually give another push target
13:59 stoned so I can' tjust remove someting?
13:59 stoned http://i.imgur.com/NT3A0N8.jpg
13:59 bremner stoned: did you read what the bot said above
14:00 WhereIsMySpoon stoned: read the bot response
14:00 Eryn_1983_FL joined #git
14:00 bratchley joined #git
14:00 Levex joined #git
14:00 stoned :(
14:00 WhereIsMySpoon stoned: shit happens people make mistakes just revert it and move on
14:00 stoned but my files are gone
14:00 stoned :(
14:00 Vampire0 stoned, you can, but everyone else working with the repo might hate you because they need to fix their stuff. See !rewrite and !perfect
14:00 gitinfo stoned: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
14:00 gitinfo stoned: [!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.
14:00 stoned it's no one else.
14:00 stoned just me.
14:01 sespiros joined #git
14:01 jast then don't worry about any of that, just do it :)
14:01 stoned not easy.
14:01 stoned menetal problems
14:01 stoned also files gone
14:01 WhereIsMySpoon if you used git to remove files, you can just as easily revert the commits to get them back
14:01 Vampire0 stoned, then just do a hard reset and push
14:01 stoned I tried it and it deletd my file
14:01 stoned I'm trying to back into a prev. commit w/ the good changes
14:01 WhereIsMySpoon but yea if its -just- you then as Vampire0 said do a hard reset then force push
14:01 jast okay
14:02 jast first, figure out the commit ID for the old commit (e.g. using 'git log')
14:02 stoned sorry, not sure exactly what to do, I read a lot an then tried it
14:02 iamthad joined #git
14:02 Snugglebash joined #git
14:02 z1haze_work joined #git
14:02 stoned 38612fac
14:02 stoned I have it
14:02 jast then, with that commit ID, say it's 1234: git reset --hard 1234. after that you'll be back to that commit and all later commits will be gone.
14:02 Cabanossi joined #git
14:02 stoned HEAD is now at 38612fa MDMA therapy rick dublin update
14:02 z1haze_work I have committed and pushed to my repo, but I had a tiny mistake in a file, how can I just change that file, and push it up to that previous commit?
14:02 jast if any files are missing, you didn't commit them in that commit
14:02 stoned ok now my files are back
14:02 stoned ?
14:02 jast well, that sounds good, then :)
14:03 stoned ok it's back
14:03 stoned now i commit this?
14:03 stoned right?
14:03 bratchley Hey, any ideas why my git config doesn't seem to be taking? https://dpaste.de/hdCn
14:03 jast no, it's already right locally
14:03 WhereIsMySpoon z1haze_work: read all of what we just talked about
14:03 stoned I don't understand
14:03 jast to update the remote repo, use a force push: git push -f (this will do the same overwriting on the remote side)
14:03 WhereIsMySpoon then realise you can just commit and push the tiny change again
14:03 z1haze_work I just got here
14:03 stoned right, update the remote repo
14:03 WhereIsMySpoon ow
14:03 WhereIsMySpoon !rewrite
14:03 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
14:04 stoned I read that, I see again
14:04 WhereIsMySpoon you cant amend an already-pushed commit if thats what you want to do
14:04 miczac joined #git
14:04 WhereIsMySpoon (i think)
14:04 stoned Well, I just reset back hard to a commit number w/ the good stuff. files are back, changes are back. I'm a happy stoned
14:04 jast z1haze_work: it's possible but can have nasty side effects if anyone else is using the same remote repo. still game?
14:04 z1haze_work nah no one is usin it
14:04 stoned But now I want to push all this to the remote. so I force?
14:04 z1haze_work its just me
14:04 stoned yes.?
14:04 jast see, that simplifies things
14:04 Es0teric joined #git
14:05 z1haze_work i literally just a have a single typo in one file i dont want to have another commit in history for that
14:05 kbs joined #git
14:05 jast z1haze_work: basically fix your file, 'git add' it, 'git commit --amend' to fold it into the previous commit, then 'git push -f' to overwrite the commit remotely
14:05 z1haze_work and no one has seen it yet
14:05 WhereIsMySpoon i guess I was wrong
14:05 z1haze_work oh
14:05 stoned I just don't want to do something w/o being sure. That's all.
14:05 WhereIsMySpoon git always has something to do shit :P
14:05 stoned So now that I have reset back to good changes, I want these changes to be the current commit everyone else can use
14:05 jast stoned: yes, forcing will make the remote look exactly like the local branch.
14:05 stoned ahh
14:05 stoned thank you for clarification
14:06 jast and now I'm going to get me some lunch. good luck with your git woes, everyone. ;)
14:06 bratchley Hey, any ideas why my git config doesn't seem to be taking? It keeps prompting me to set the username and email: https://dpaste.de/hdCn
14:06 Vampire0 bratchley, user.email, not user.mail
14:06 bratchley one second
14:06 WhereIsMySpoon Vampire0: to be honest, one of the issues i have when it comes to stuff like this is that Im using a git client and not git from cmd line
14:07 WhereIsMySpoon Vampire0: what push target do i want to give
14:07 Vampire0 WhereIsMySpoon, git from cmd line is also a git client, actually the best one available and the only one supported in here :-D
14:07 Vampire0 WhereIsMySpoon, I don't know what you want
14:07 Rotaerk_ user.mail would be cool... start receiving things via snail mail about git commits
14:08 stoned GitLab: You are not allowed to force push code to a protected branch on this project. *sigh*
14:08 Vampire0 bye jastt
14:08 WhereIsMySpoon Vampire0:   rebased, i want to push the rebase to the remote so that it's at the same point as my local
14:08 Vampire0 s/jastt/jast/
14:08 stoned what does this mean? how can I make it not protected?
14:08 WhereIsMySpoon ive rebased*
14:08 z1haze_work that worked, thanks dude
14:08 z1haze_work @jast
14:08 jast stoned: protected branches, it's a setting in gitlab's web interface somewhere
14:08 WhereIsMySpoon Rotaerk_: lol :P
14:09 t0by joined #git
14:09 Vampire0 WhereIsMySpoon, well, then just do it. Either configure the upstream branch for your local branch and push or push by specifying explicitly where to push to
14:10 WhereIsMySpoon Vampire0: the upstream branch -is- my branch, im so confused by what you're saying, if my branch is my_cool_branch and the remote is origin/my_cool_branch, im just pushing to origin no?
14:11 marcogmonteiro joined #git
14:13 kexmex joined #git
14:14 Snugglebash joined #git
14:14 Sound joined #git
14:15 _Vi joined #git
14:16 mehola joined #git
14:16 TechnoTony joined #git
14:16 eclecticjohny joined #git
14:17 WhereIsMySpoon Vampire0: oh, this is interesting. I picked "pull with last action" from the menu that appears when i try to push and it says there's a conflict
14:17 WhereIsMySpoon why didnt this come up when i rebased
14:19 stoned news in this world of stoned
14:19 stoned :D
14:19 jameser joined #git
14:20 unborn :)
14:20 stoned I did that you said and now I am back but all the other commits are there, but that's okay I have have to get rid of this mental problem and then maybe get a new one
14:20 roelmonn_ joined #git
14:20 stoned Anyone want to see my website I made?
14:20 stoned maybe not?
14:20 stoned okay.
14:21 roelmonn_ joined #git
14:21 unborn stoned: just shoot it out
14:21 unborn :)
14:21 stoned https://psychedelicsdaily.com/news/mdma-assisted​-psychotherapy-explained-by-rick-dublin-of-maps/ <- tried to move the facebook/twitter buttons from under my author section to up to and I broke the thing.
14:22 stoned I'm still learning git, as I do, as I learn.
14:23 StuartMI joined #git
14:23 unborn stoned: welcome to git then :D btw nice.. i was about to ask you like why not cms but since I am old fashion guy (I do hybrid sites) - I understand why its static :)
14:23 Derperperd joined #git
14:23 stoned You can tell the static nature?
14:23 stoned how?
14:24 stoned oh
14:24 stoned generator tag.
14:24 unborn its fast.. I mean youtube you cannot make it faster.. but disqus - do you need it? it takes a lot of time to load that crap
14:24 stoned Yes, hugo static site
14:24 stoned UYeah
14:24 unborn yes I can tell.. Im devops as well (web dev)
14:24 stoned I also might take off the twitter and fb save things from under the author, makes it slow
14:25 stoned and disqus make i slow, but no other really way to do static comments
14:25 unborn I don't load any fb things.. wont be tracked..  but buttons works for me
14:25 stoned ther eis a self hoste dpython solution, but I don't want. It's okay to rely on external comment service.
14:25 unborn stoned: the question is - do you need comments?
14:25 stoned Well, it gives bit of interactivity
14:25 cdg joined #git
14:25 stoned might engage more people to talk about psychedleics
14:25 unborn stoned: on my smallish blog, people email me with comments.. but have no comments at all.
14:26 WhereIsMySpoon left #git
14:26 stoned I think like 2-3 people commented on my blogs :D
14:26 stoned https://stoned.io
14:26 unborn ah for that .. i would do something like g+ link
14:26 stoned I don't use google plus
14:26 stoned why do you have a unborn nickname?
14:26 unborn the thing is if you write something good and quality - you don't need comments at all
14:26 PCatinean_ joined #git
14:26 stoned https://psychedelicsdaily.com/news/psychedelic​s-are-deeply-linked-with-the-human-condition/ I wrote this
14:27 unborn stoned: why do you have a stoned nickname? :)
14:27 stoned My english not so great in irc, but because I am stoney.
14:27 miha_S7_ joined #git
14:27 stoned well because I am The Psychedelic Stoned Ape who came out of africa million years ago and ate a bunch of mushroom along athe way and now I'm ahuman monkey
14:27 stoned so that's why my name is stoend
14:27 finalbeta joined #git
14:28 unborn well I am unborn as I am too old to be all of those new docker and other thing along person.. - seems to me that I missed my own days :)
14:28 stoned omg!
14:28 stoned me too!
14:28 unborn you know me from debian chan
14:28 stoned what's w/ the vagratns and th edockers and the containers and things.
14:28 hahuang61 joined #git
14:28 stoned I am oldschool bash scripty guy
14:28 stoned i also got old, yes maybe, I dont' remembe rmuch.
14:28 stoned <--
14:29 unborn Im oldschool fella - bare metal servers and configs..
14:29 unborn (same for coding)
14:29 stoned people said, use ansible, I said I can debian clone
14:29 stoned ansible runs atop debian base install anyway.
14:29 stoned why not preseed and script yoru stuff bash stright up
14:30 Cavallari joined #git
14:30 unborn :) stoned there is nothing better then writing things by hand be it sh or php or mysql or simple css or html.. and tracking it with git.. I think we are a bit offtopic.. we should get back to git topic here
14:30 stoned I wonder if I should make a testing branch, test my site in there, and when it looks okay, push to live.
14:31 unborn stoned: sounds like good dev step :)
14:32 stoned unborn: https://gist.github.com/HashBorgir​/c99ac75e2294f038f06e90b895af2419
14:32 chachasmooth joined #git
14:32 nicoulaj joined #git
14:32 stoned Everybody wants you to use cms thingies
14:32 stoned and frameworks and all that goofy nonsense.
14:33 unborn hm
14:33 stoned here's the code for https://MarijuanaDaily.NET
14:33 unborn I am considering to write all my site in md
14:33 stoned (scraper part anyway, parsing googly moogly alerts)
14:33 unborn I mean blog sorry
14:33 stoned static site?
14:33 stoned I use GoHugo static site gen, golang is ugly but kinda fun.
14:34 unborn there is nothing better like custom script which will push changes to your repo and then rsync files on real server
14:34 manuelschneid3r joined #git
14:34 unborn mine one is hybrid means - static with blog running on wordpress
14:35 unborn .. and possibly slow too :D
14:35 unborn even its run on sqlite
14:35 unborn so means like 'static'
14:35 al-damiri joined #git
14:35 dvaske joined #git
14:36 * unborn thinks go is beautiful
14:36 stoned I dunno, man.
14:36 stoned Golang makes a monkey furious
14:36 stoned make a monkey fling poo.
14:36 JeroenT joined #git
14:36 stoned It's alright, Iguess.
14:36 unborn :)
14:38 unborn stoned: you should write something about debian and git it self!
14:38 unborn on your personal web
14:38 stoned https://stoned.io/linux/Using-ZRAM-Compressed-RA​M-Block-Device-On-Debian-Jessie-On-Old-Hardware/
14:38 unborn something positive and not about poos and ganjas
14:38 unborn :)
14:38 stoned Seriously.
14:39 stoned I'm Indian, right?
14:39 stoned So like, Shiva is perfection. And he exists within everything.
14:39 orbyt_ joined #git
14:39 stoned Including poo and ganja.
14:39 stoned No act man can do is dirty or disgusting
14:39 unborn and monkeys :D
14:39 stoned Even an infant plays freely in his poo
14:39 unborn yes that is right
14:39 stoned It is only through culture and society and the conditioning of knowlege
14:39 unborn :)
14:39 stoned That we learn this is not good or something
14:40 stoned For examle, the Aghori Sadhus of India
14:40 stoned Share my belief. that nothing I can do is wrong or bad or disgusting
14:40 chachasmooth joined #git
14:40 stoned so through living a vile and disgusting life, we find purity
14:40 unborn I know that.. I observed in server room with my daughter
14:40 stoned vile and disgusting as deemed by society and culture.
14:40 roelmonnens joined #git
14:41 fk joined #git
14:41 chachasmooth_ joined #git
14:41 unborn I place one year old next to two year old boy and they just start talking and exploring and playing.. - just imagine this within adults - they will be looking around and that's it. :)
14:42 Cavallari joined #git
14:42 stoned Well, the only thing that makes you different from me, is the conditioning of knowledege
14:42 unborn hardly talk together if they don't like smallish thing around each other... you got my point anyway - whats the issue with your git then? :)
14:42 stoned Data gathereed since birth, through the organs of sense perception
14:42 stoned Thought, which is a response of memory, which is knowledge.
14:42 Cthalupa joined #git
14:42 stoned You cannot think what you do not already know.
14:43 stoned Therefore, thought, knowledge, divides you from me.
14:43 Rodya__ joined #git
14:43 stoned Thought says, you are this, andI am that.
14:43 stoned Thought... produces the division, the conflict, the agony of life.
14:43 stoned *shrug*
14:43 stoned That's why I stone. Jai Shiva.
14:43 Exagone313 joined #git
14:44 kpreiksa joined #git
14:44 stoned unborn: oh, git issues sovled, thansk to you guys. I thought yo uwere just chatting me up
14:44 stoned np. We can talk about git.
14:45 stoned Let's see. Testing branch, and then push to testing in stead of master, then the problem arises in testing th site live on a test domain, as the domain address then changes and some testing things get broken.
14:45 stoned I wonder how to work around that.
14:45 unborn not sure about it stoned - don't know any ops here and I believe they could be very well annoyed by just offtopic
14:45 selckin !offtopic
14:45 gitinfo From the #git website: it's okay to talk about anything (within general limits of reason), as long as you don't get in the way of people talking about on-topic things (mainly questions about git and using git). Accordingly, please consider pausing off-topic discussions to help people having trouble with git (if any).
14:45 stoned say I setup a test domain, and virtual host, then pull the testing branch there, stage it on the server and test it out, once it's fully golden, I would merge with master?
14:45 stoned I need to learn branch mangaement.
14:46 selckin !deploy
14:46 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
14:46 * unborn thanks selckin
14:47 unborn stoned: see the link posted by selckin ^^
14:47 stoned well im not using it as a deployment tool
14:47 z1haze_work left #git
14:47 gitinfo unborn: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
14:47 stoned but isn't this why we have branches?
14:48 selckin no
14:48 stoned .karma
14:48 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
14:48 stoned .karma stoned
14:48 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
14:48 unborn ah I see
14:48 moL-Ou joined #git
14:48 cdg joined #git
14:48 unborn selckin: thank you for very first link about offtopic
14:48 unborn selckin: thanks for second link as well :)
14:48 Vampire0 stoned, it seems you have not collected any karma yet. You need 10 thanks for one karmic point
14:49 stoned Do you know what is Karma?
14:49 Vampire0 yes
14:49 stoned It's actually Karmm. Double mm, strong m sound, produces an slight 'a' sound at the end.
14:49 tcorneli joined #git
14:49 unborn Vampire0: how can I check mine.. will be possibly zero too :D
14:49 stoned It's wrong to put 'a' at the end of Sanskrit words in English.
14:49 stoned also, what does Karma mean?
14:49 Vampire0 .karma unborn
14:49 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
14:50 stoned hello Vampire0 :)
14:50 unborn .karma unborn
14:50 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
14:50 Vampire0 Hi stoned
14:50 Silenced joined #git
14:50 Silenced joined #git
14:50 selckin you can /msg the bot the avoid spamming the channel
14:50 unborn :D
14:50 Vampire0 unborn, for yourself you can simply do .karma
14:50 Vampire0 .karma
14:50 gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 29 (2 in past 30 days) (3 given out)
14:50 stoned Vampire0: what is karma mean? (not in the bot, but in your mind)
14:50 unborn .karma
14:50 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
14:50 unborn sorry guys
14:50 tribly joined #git
14:50 Vampire0 stoned, I'm not here for philosophic discussions about karma :-D
14:51 Tantamounter joined #git
14:51 stoned see, it's used in the context of thanks.
14:51 stoned it's wrongfully used.
14:51 * unborn lets back to git discussion shall we?
14:52 stoned Karma does not mean good deed, or what you do good comes back to you, or what goes around comes around... etc. etc. and all that simplistic nonsnese that the Occidental mind has concocted while severed from the sacred living in the profane space.
14:52 treehug88 joined #git
14:52 jast the bot's karma feature is unrelated to the more general concept of karma, it just borrowed the name
14:52 stoned Karma means Thoughtless Action. An action born w/o thought. Without the confliction of existence. An action which is neither good, nor bad, one existing w/o a value function attached through the conditioning of knowldege.
14:52 stoned Anyway :D
14:52 Tantamounter I have a branch based on another branch based on another branch which was originally based on a master branch! I have tried to resolve conflicts with master in the most recent PR, at the top of the branching tree, but I now have to resolve exactly the same conflicts in the other two branches below it. How can I avoid resolving the same conflicts with master in the other two branches?
14:53 stoned bye
14:53 chachasmooth joined #git
14:53 Vampire0 Tantamounter, you are probably searching for man git rerere
14:53 gitinfo Tantamounter: the git-rerere manpage is available at http://jk.gs/git-rerere.html
14:53 jast Tantamounter: turn on rerere (git config --global rerere.enabled true) before you do your first merge, then you can use 'git rerere' to automatically fix conflicts you've identically encountered before
14:54 Vampire0 jast, you don't need to use it manually, do you? Just enabling is enough
14:54 ravior joined #git
14:54 Vampire0 If there are conflicts, rerere is used automatically
14:54 jast I'm not sure. back when I looked at it, it needed to be used manually. I've never actually needed it.
14:54 ravior Does someone has a color.ui for fedora terminals? (white background and black text)
14:55 YuGiOhJCJ joined #git
14:56 Tantamounter jast: by first merge, you mean first merge _after_ the merge I already did to resolve conflicts the first time, right?
14:56 Tantamounter Or is it too late to turn it on now?
14:56 Vampire0 Tantamounter, no, he meant before that
14:56 jast basically if it's not turned on it doesn't record your conflict resolutions
14:56 Vampire0 Tantamounter, it is never too late, but you have to redo the merges one more time
14:56 jast so if you enable it now, it won't know what you did the last time
14:57 Tantamounter But it should be able to learn by pointing it at the merge commit
14:57 jast it will help for the future only. if you expect having to fix the same conflicts twice still, you'll have to do it manually only once
14:57 jast in theory it might be possible for it to learn from that, but it's not implemented
14:57 Vampire0 Tantamounter, if rerere is enabled and there is a conflict it searches whether you resolved the exact conflict before and does the same resolution as before. If not, it remembers the conflict and after you resolved it you resolution. Then the next time this conflict arises, it is resolved automatically for you
14:57 bratchley Vampire0: ty
14:57 Vampire0 bratchley, yw
14:58 Tantamounter Well how does it learn normally? By commiting a merge commit? Surely I can just reset and recommit it
14:58 Vampire0 Btw. yast, does gitinfo recognize "ty" for karma, it doesn't does it?
14:58 jast just looked, it doesn't
14:58 Vampire0 jast, room for improvement then :-)
14:59 weltall joined #git
14:59 Vampire0 Tantamounter, well, as I said. When the conflict happens, it records the conflict, when you then after that resolved the conflict and commit the merge result it recognizes your resolution. Just re-committing the merge commit will not be enough
15:00 livingstn joined #git
15:00 jast Vampire0: fixed
15:00 bariscant joined #git
15:00 synthroi_ joined #git
15:00 Vampire0 jast, nice reaction time  :-)
15:01 jast don't get used to it!
15:01 Vampire0 too late :-D Now I expect that ;-)
15:01 jast you're just setting yourself up for disappointment
15:01 Vampire0 .trigger_edit karma
15:01 gitinfo Vampire0: Syntax: .trigger_edit <name> <contents>
15:01 Vampire0 .trigger_edit karma This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
15:01 gitinfo Vampire0: Okay.
15:03 shinnya joined #git
15:03 Tantamounter So is there some other way I can pull in the merge commit only?
15:04 jast if you want to try and teach rerere about the merge after the fact, this might work:
15:04 unborn meh what was the link about rerere agian? I have like last 3 posts in logs. thanks
15:04 jast remember merge commit ID. go back, start merge over. to fix conflicts, git read-tree --reset -u oldmergeid
15:05 Vampire0 Tantamounter, you could maybe undo the merge, then redo the merge and for resolution checkout the result of your former merge result
15:05 Vampire0 unborn, !rerere
15:05 jast man git-rerere
15:05 gitinfo the git-rerere manpage is available at http://jk.gs/git-rerere.html
15:05 unborn Vampire0: ty
15:05 julia_c jast: there is a rerere-train shell script in contrib
15:05 Vampire0 ah, right
15:05 jast it's also available as manpage if you have Git installed :)
15:05 unborn Vampire0: 404.. http://jk.gs/git-rerere.html
15:05 Cthalupa joined #git
15:05 unborn ?
15:06 jast julia_c: good to know. if I ever need to use rerere I hope I'll remember...
15:06 jast I don't get a 404
15:06 Vampire0 unborn, works fine here
15:06 unborn okay one sec
15:06 Vampire0 jast, read-tree? Isn't "git checkout old-merge-id ." the porcellain way to go?
15:07 GodGinrai joined #git
15:07 jast I don't think "checkout foo ." applies deletions
15:07 jast I do think read-tree does
15:07 jast not 100% about either of the two, though ;)
15:07 Vampire0 jast, of tracked files? should do I think
15:07 Vampire0 jast, but also not fully sure
15:07 menip joined #git
15:08 Vampire0 julia_c, what does that script do exactly? You give it a merge and it creates the rerere information for it?
15:08 unborn Vampire0: https://cdn.topfreelancer.co.uk/tmp​/screencast-17-03-2017-15:06:36.mp4
15:09 jast unborn: something seems to be messing with your DNS lookups. what does your system think is the IP address of jk.gs?
15:09 unborn one sec
15:10 julia_c Vampire0: yes, pretty much.
15:10 jstimm joined #git
15:10 unborn heh jast well I cannot get any info out not even whois
15:10 unborn george@gs:~$ whois http://jk.gs/
15:10 unborn No whois server is known for this kind of object.
15:10 unborn george@gs:~$
15:10 Vampire0 julia_c, cool, good to know
15:10 weltall joined #git
15:10 Vampire0 julia_c, thx
15:11 Vampire0 So Tantamounter, then use the train script julia_c mentioned
15:11 jast unborn: 'whois' looks up domain registration info, not DNS info, and it wants the domain name only, not the http:// and stuff
15:11 Vampire0 unborn, nslookup jk.gs
15:11 jstimm joined #git
15:11 jast typically you look up DNS using 'host' or 'nslookup' or 'dig'
15:13 dreiss joined #git
15:13 unborn Im back :)
15:13 d1z joined #git
15:14 jast unborn: actually I think it might be related to your local hostname being 'gs' and the DNS setup being broken. :D
15:14 Brski joined #git
15:14 Tantamounter jast, thanks, let me try the read-tree trick
15:15 unborn jast: ah crap you right!
15:15 unborn :D
15:15 unborn its not broken - dnsmasq - for local development you know.. like wiki.gs etc
15:15 jast right
15:15 jast unfortunately .gs is a country code TLD :)
15:16 unborn thanks jast
15:16 venmx joined #git
15:16 unborn yeah.. I know.. but you know how we do it all.. sorry, it works now
15:16 jast Problem Solved (tm)
15:16 jast !next
15:16 gitinfo Another satisfied customer. NEXT!
15:16 mehola joined #git
15:17 Cabanossi joined #git
15:17 chachasmooth joined #git
15:17 guampa joined #git
15:17 Vampire0 !snack
15:17 gitinfo [!botsnack] Om nom nom
15:18 staafl joined #git
15:18 sbasso joined #git
15:19 thiago joined #git
15:19 unborn oh I like it
15:19 weltall joined #git
15:19 unborn meh that makes me even more lazier doh
15:20 Riviera joined #git
15:21 ssarah joined #git
15:21 mozzarella joined #git
15:22 impliednude joined #git
15:23 MarioBranco joined #git
15:24 mostlybadfly joined #git
15:24 bsm1175322 left #git
15:25 brent__ joined #git
15:27 rkazak joined #git
15:27 TbobbyZ joined #git
15:27 chipotle joined #git
15:28 miha_S7_ joined #git
15:28 ssarah joined #git
15:30 DarkPsydeLord joined #git
15:30 Tantamounter jast: looks like rerere recorded the resolutions of the merge replay trick... so let's see if it helps with my other merges :^)
15:31 jast good luck!
15:31 MrcRjs joined #git
15:31 Levex joined #git
15:32 computer2000 joined #git
15:33 Tobbi joined #git
15:33 Tantamounter It says it resolved conflict using previous resolution for many files, however... I do not know which ones it missed
15:33 Tantamounter `git status` is not helpful in this regard because it seems oblivious of rerere
15:34 Tantamounter It actually looks like it might have resolved them all but it would be useful to know a reliable way to check that quickly
15:35 osse Tantamounter: you could search for <<<<<
15:35 osse git diff | grep '<<<<<'
15:35 Tantamounter Yes I am doing that now xD
15:36 einnjo joined #git
15:37 chachasmooth joined #git
15:37 ryxxed joined #git
15:41 madewokherd joined #git
15:41 qpykxs joined #git
15:41 nowhere_man joined #git
15:41 synthroid joined #git
15:44 Gustavo6046 joined #git
15:44 Vampire0 Tantamounter, or you can use `git mergetool`, it will say "nothing to merge" or something like that if all conflicts were resolved by rerere, despite the fact that status shows the files in conflict state
15:44 osse smart
15:45 Vampire0 Tantamounter, this is to give you the opportunity to re-check the result rerere produced, as merges are always potentially dangerous in breaking the actual code
15:45 Vampire0 at least I think so
15:45 jast definitely
15:45 jast it's not difficult to construct an example of that
15:46 stoned I found a thing :D
15:46 stoned git config --global help.autocorrect 10
15:46 stoned Now I can type git statsu and it works
15:46 Noldorin joined #git
15:46 manuelschneid3r joined #git
15:46 stoned Continuing under the assumption that you meant 'status'
15:47 Vampire0 stoned you can also make statsu an alias of status :-D
15:47 stoned well it's not always statsu
15:47 stoned it could be statuss
15:47 stoned or other error in other words
15:47 jast or 'git cheesecake'
15:47 osse git config --global alias.s status; alias g=git
15:47 jast an example of a somewhat more drastic typo
15:47 stoned i see
15:48 roelmonn_ joined #git
15:48 jast 'checkin' suggests 'check-ignore' and 'checkout' :)
15:50 MarioBranco joined #git
15:51 impliednude joined #git
15:51 chachasmooth joined #git
15:51 Pseudocrat joined #git
15:51 Pseudocrat joined #git
15:52 sgrover joined #git
15:52 muhannad__ joined #git
15:53 johan` joined #git
15:54 Snugglebash joined #git
15:54 sgrover doing a merge --squash and getting a conflict.   Examining the file shows the usual <<<<<< , =====, >>>>>> lines.  I want to do a checkout --??? to get the original file, but can never remember if that is "theirs" or "ours"...
15:55 sgrover specifically, I'm on branch staging, mergin in feature-ABC branch.  So "ours" should be the staging branch.. right?
15:55 johan` left #git
15:55 ejbs joined #git
15:56 ejbs Hi! I have a git repo on github (private) and a branch. When my friend does a git clone and a checkout of the relevant branch he has the latest commit and everything BUT for some reason 1 file is from an older commit than the most recent one. What the heck's going on?
15:56 jast sgrover: --theirs is always the thing getting added, so yes
15:57 sgrover jast: thanks.
15:57 sgrover that makes it easier to remember. :)
15:57 Tantamounter jast: did you have something to do with the development of rerere?
15:57 jast Tantamounter: no
15:57 Tantamounter Do you know why it's not enabled by default?
15:57 Karazhan joined #git
15:58 dviola joined #git
15:58 chachasmooth joined #git
16:00 chachasmooth_ joined #git
16:00 chardan joined #git
16:00 crose joined #git
16:01 sbasso joined #git
16:01 ejbs Alright, fixed it. No bloody idea what it was though
16:02 Cabanossi joined #git
16:02 jast Tantamounter: no. you can ask on the mailing list if you want a qualified response.
16:02 bschindler joined #git
16:04 boombatower joined #git
16:05 Guest9835 left #git
16:06 raulp joined #git
16:07 miczac joined #git
16:09 DDBag joined #git
16:10 Snugglebash joined #git
16:10 timetrex joined #git
16:11 timetrex left #git
16:11 Darren_ joined #git
16:12 raspado joined #git
16:13 tcorneli joined #git
16:14 qt-x1 joined #git
16:15 DBag joined #git
16:16 blackwind_123 joined #git
16:16 ankit01ojha joined #git
16:16 mmlb joined #git
16:17 mehola joined #git
16:17 dvaske joined #git
16:20 sbasso joined #git
16:20 durham joined #git
16:20 IRQ` joined #git
16:21 rxo joined #git
16:23 robotroll joined #git
16:24 sgrover Looking for ideas how best to clean this up.  Have feature-branch with about 15 files that have changed.  At one point the develop branch was merged into the feature-branch (for integration) - not feature into develop.  Now when we are merging feature to develop we get only 3 files.
16:25 sgrover If I do a merge --squash to our "staging" branch - which does not include changes on develop - I'm getting ALL the pending changes, not just the changes from this feature branch.
16:26 synthroi_ joined #git
16:26 sgrover So, I tried to revert the merge in question and then do the merge --squash into staging.  Still getting the wrong list of files...
16:26 svm_invictvs joined #git
16:27 synthro__ joined #git
16:27 chachasmooth joined #git
16:28 mindfart joined #git
16:28 miha_S7_ joined #git
16:29 Darcidride joined #git
16:29 rubyonrailed joined #git
16:29 hahuang61 joined #git
16:29 osse sgrover: merging the feature into develop should work just fine
16:29 osse is the result wrong?
16:30 Es0teric joined #git
16:31 sgrover osse: we are after a single commit on the develop branch that can be easily reverted later if needed.  If we just merge the files in, then in this case 3 files get merged, the code works right, but now we have 2 or more commits we need to revert later if we have to remove the feature for some reason.
16:31 phy1729 left #git
16:31 sgrover (prior to deployment to production)
16:31 osse reverting the merge should do the trick if you need to
16:31 sgrover This is because we have competing feature branches.. full continuous integration hasn't been truely adopted yet... (sighs)
16:32 grawity was develop merged to feature for a reason? like, do any changes in feature depend on previous develop-only changes?
16:32 Cabanossi joined #git
16:32 NeverDie joined #git
16:32 sgrover grawity: no particular reason other than making sure the feature integrated with the current files on develop.
16:33 grawity well, then it doesn't really make much sense to try to merge it separately into staging
16:33 grawity since those changes in feature now kinda depend on develop
16:33 grawity unless you rebase feature on top of master/prod/whatever, without any "current files on develop"
16:34 sgrover grawity: that's essentally what we are after, by using the merge --squash
16:34 grawity that's...not what merge --squash is for
16:35 dreiss joined #git
16:35 sgrover takes all changes and rolls them up into a single commit instead of multiple commits.
16:35 grawity right, and that has nothing to do with what I just said
16:35 Guest36247 joined #git
16:36 osse rebase feature on top of master, then use merge --squash
16:36 osse everybody wins
16:36 TomyWork joined #git
16:37 sgrover hmm.. no harm trying that on the local repo... :)
16:37 chachasmooth joined #git
16:38 synthroid joined #git
16:38 willingc joined #git
16:40 jstimm joined #git
16:40 tang^ joined #git
16:41 porsche944 what happens if you cherry-pick a commit from branch A, and later merge branch A into that same branch
16:41 tojo joined #git
16:41 porsche944 you get 2 commits correct?
16:42 Snugglebash joined #git
16:44 osse yser
16:44 osse yes
16:44 GodGinrai joined #git
16:46 computer2000 joined #git
16:46 GodGinrai generally you don't cherry-pick from branches you are intending to merge
16:47 porsche944 yeah
16:47 porsche944 I screwed up
16:47 GodGinrai btw, I don't think anyone answered my question before, so I'll repeat it since there have been plenty of joins/parts over the past couple of hours
16:47 porsche944 I made the changes on my release branch
16:48 porsche944 well I guess I could merge release in to develop again
16:48 GodGinrai When I do an interactive rebase from one branch to another, is there a way to make it flag the commits that are specific to my branch?
16:48 grawity isn't that the default?
16:48 grawity as in I thought it only lists those commits in the first place
16:49 GodGinrai grawity: well, we have 3 branches.  One called develop, one called stage, and the third is the feature branch based off of develop
16:49 miczac joined #git
16:49 GodGinrai because of our screwy system, develop and stage are different from each other
16:49 GodGinrai so when we rebase the feature from develop to stage
16:49 Ice_Strike joined #git
16:49 Derperperd joined #git
16:50 GodGinrai the interactive rebase shows all of the commits from develop that hadn't been accepted for stage in the list
16:50 hahuang61 joined #git
16:50 GodGinrai that aren't actually part of the feature branch
16:50 Ice_Strike How do I search for code that committed at the past?
16:50 GodGinrai but are part of the develop branch that the feature branch was branched from
16:50 Ice_Strike I want to search for has_color
16:50 GodGinrai Ice_Strike: use the !pickaxe
16:50 GodGinrai oh
16:50 GodGinrai there's no command for that one
16:51 GodGinrai Ice_Strike: git log -S <code>
16:52 Ice_Strike but show to show the code?
16:52 GodGinrai I think there's a flag that you can use to get git-log to show the diffs as well
16:52 GodGinrai but yes, you can just use git-show with the commit hash found
16:53 NeverDie_ joined #git
16:53 Ice_Strike Thanks
16:53 Rodya_ joined #git
16:54 borkr joined #git
16:55 GodGinrai np
16:55 Ice_Strike I wonder if I can search on github
16:56 GodGinrai github can search the repo... I don't remember if it can search commits
16:56 prg3 joined #git
16:57 osse it can search all the code
16:58 m0viefreak joined #git
16:58 Tantamounter jast: that git read-tree trick was truly some secret sauce. Replaying the merge commit worked 100% on other branches!
16:58 Tantamounter Thanks so much for that tip
17:00 mt joined #git
17:01 sbasso joined #git
17:02 kfoonamalik joined #git
17:06 dmc joined #git
17:06 unborn left #git
17:06 LiquidatorBrunt joined #git
17:06 IRQ` left #git
17:07 LiquidatorBrunt good day git!
17:07 fedepad joined #git
17:08 mda1 joined #git
17:08 gugah joined #git
17:08 ReptilianBrain joined #git
17:09 prg3 joined #git
17:09 malide joined #git
17:10 gugah joined #git
17:10 gopar joined #git
17:12 gitinfo LiquidatorBrunt: [!welcome] Welcome to #git, a place full of helpful gits. If you have a question,  feel free to just go ahead and ask—somebody should answer shortly.  For more info on this channel, see http://jk.gs/git/  Take backups (type !backup to learn how) before taking advice.
17:15 multi_io joined #git
17:15 sbasso joined #git
17:16 venmx joined #git
17:18 prg3 joined #git
17:20 wootehfoot joined #git
17:20 shgysk8zer0 joined #git
17:20 ayogi joined #git
17:23 rubyonrailed joined #git
17:24 Rodya_ joined #git
17:24 Fyoo joined #git
17:27 Atm0spher1c joined #git
17:27 miczac joined #git
17:29 miha_S7_ joined #git
17:32 Cabanossi joined #git
17:34 LiquidatorBrunt question: why do most of the git tutorials out on the net leave out the key part (imho)
17:34 LiquidatorBrunt which is that git automatically loads and unloads the relevant files and their parts based on which branch you are using
17:35 osse They do?
17:35 preaction what could it do instead?
17:36 LiquidatorBrunt it seems like they do, i've finally taken the step and tried to start learning it
17:36 synthroi_ joined #git
17:36 Ryanar joined #git
17:37 LiquidatorBrunt and i couldn't quite figure out how exactly it was all working until i realized git handles loading and unloading stuff for you
17:40 causasui joined #git
17:40 causasui joined #git
17:42 livingstn joined #git
17:44 raijin joined #git
17:45 MikeD_ joined #git
17:46 LiquidatorBrunt one thing though, where is all of the meta data stored?  i did a test, and i know git is not the best usecase for this, but i created a 500 MB file and then checked it into my dev branch
17:46 LiquidatorBrunt then switched to master
17:46 MikeD_ every time i start git it complains about loose objects - is there something I have to do to save the fixed-up state?  (like exit properly)
17:46 Es0teric joined #git
17:46 kadoban joined #git
17:47 LiquidatorBrunt where are the 500mb worth of changes stored?  in git's own directory?
17:47 osse LiquidatorBrunt: Inside .git
17:48 LiquidatorBrunt but the .git folder is only 2 MB?
17:48 Forlorn joined #git
17:48 osse LiquidatorBrunt: Was it a text file?
17:48 LiquidatorBrunt yeah
17:48 osse Try zipping it yourself and see how big it is :)
17:50 MikeD_ left #git
17:51 prg3 joined #git
17:52 raynold joined #git
17:52 LiquidatorBrunt ahh ok
17:53 LiquidatorBrunt does git automatically compress files which don't have a known languaue extension?
17:53 thiago joined #git
17:54 _ikke_ it compresses everything\
17:54 nedbat LiquidatorBrunt: git doesn't care what language the file is meant to be.
17:57 satifant joined #git
17:57 Es0teric joined #git
17:57 marcogmonteiro joined #git
17:57 qqx joined #git
17:59 LiquidatorBrunt seeick
17:59 LiquidatorBrunt i'm addicted to githubs
17:59 gopar joined #git
18:01 mozzarella joined #git
18:01 kisonecat joined #git
18:04 porsche944_ joined #git
18:05 worktoner joined #git
18:05 worktoner Is there a way to pull up a warning from my last push? Like a log of the warning messages?
18:06 porsche944_ joined #git
18:08 pwnz0r joined #git
18:10 worktoner Like a history of the resposnes to my last git push calls?
18:10 exarch joined #git
18:11 qqx worktoner: No, git doesn't save that output.
18:11 avar Is "git log -1 --pretty=..." the shortest way to print out formatted info about a given commit?
18:11 qqx Only possibility would be terminal scrollback.
18:11 Sasazuka joined #git
18:12 porsche944_ left #git
18:13 InfoTest joined #git
18:14 dglambert joined #git
18:14 dglambert yo
18:15 raijin joined #git
18:15 gugah_ joined #git
18:19 worktoner Why would git be giving me a warning 'unable to rmdir' certain directories when I git reset --hard <some commit>
18:21 leeN joined #git
18:22 osse avar: yes
18:22 qqx worktoner: Probably because there's untracked content in that directory.
18:23 osse avar: There's show, but then you have to suppress the patch output with -s, so then you're a byte over budget
18:23 worktoner qqx: I think it's due to these pack files. I'm getting `rm: cannot remove 'modules/better_normalizers/.git/objects/pack/pac​k-3f71e6b0899b4ac8c3314a3420d1fae4f09f7452.pack': Device or resource busy`
18:26 mizu_no_oto joined #git
18:26 tojo left #git
18:27 DDBag joined #git
18:28 guampa joined #git
18:30 chipotle joined #git
18:30 miha_S7_ joined #git
18:30 goTAN joined #git
18:32 avar osse: thx
18:32 kfoonamalik joined #git
18:37 livingstn joined #git
18:38 Levex joined #git
18:38 salamanderrake joined #git
18:41 allan_ joined #git
18:41 miha_S7_ joined #git
18:44 seishun joined #git
18:44 seishun is there a way to do `git checkout some-branch && git rebase master` without touching files twice?
18:44 DBag joined #git
18:44 DBag left #git
18:45 _ikke_ git rebase master some-branch
18:45 _ikke_ though I suspect the exact same thing happens
18:46 osse seishun: git checkout -b tmp && git cherry-pick master..some-branch && git checkout -B some-branch
18:46 peterbecich joined #git
18:46 osse \o/
18:47 pwnz0r joined #git
18:47 seishun so, cherry-picking it is
18:47 osse might have to get clever so you avoid merges like rebase would
18:47 levex_ joined #git
18:48 osse git cherry-pick $(git rev-list --reverse --no-merges master..some-branch) or something like that
18:48 osse Alternatively you can use forward declarations where you can to decrease build times \o/
18:48 seishun well this repo doesn't have merge commits so it should be fine
18:50 seishun it seems msbuild rebuilds every file that has been touched since last build, so forward declarations wouldn't help
18:51 ij left #git
18:51 IRCFrEAK joined #git
18:52 osse that was just a general tip
18:52 allan_ left #git
18:53 osse forward declarations help reducing the number of files msbuild will check the timestamps of
18:53 raijin joined #git
18:53 MineCoins joined #git
18:57 willingc joined #git
18:57 IRCFReAK joined #git
19:01 kexmex joined #git
19:02 th_ joined #git
19:02 PCatinean_ joined #git
19:04 Levex joined #git
19:05 IRCFReAK joined #git
19:05 j08nY joined #git
19:06 aswen joined #git
19:07 aspiers joined #git
19:07 IRCFReAK joined #git
19:08 bwn joined #git
19:11 _Vi joined #git
19:13 Levex joined #git
19:14 miczac joined #git
19:14 IRCFReAK joined #git
19:15 LeBlaaanc joined #git
19:16 livingstn joined #git
19:17 venmx joined #git
19:19 mehola joined #git
19:19 IRCFReAK joined #git
19:21 IRCFReAK joined #git
19:22 tkuester joined #git
19:24 gopar joined #git
19:25 Levex joined #git
19:27 IRCFReAK joined #git
19:27 tkuester I have a question about rebasing... (and a sob story, but I'll save that for later.)
19:27 tkuester I'm trying to merge and exclude a few nasty reverted commits... is a rebase the appropriate action?
19:27 tkuester Git tree here: http://pastebin.com/GwpwpcQa
19:28 GodGinrai tkuester: exclude reverted commits?
19:28 GodGinrai Like, you reverted them, and now you are trying to exclude the revert?
19:28 tkuester Not me in this instance, fortunately haha
19:28 blackpajamas joined #git
19:29 tkuester Sorry, just trying to figure out how to word this concisely.
19:29 tkuester My feature branch got merged prematurely. Work was done on it, before a massive revert to unmerge the branch from master.
19:29 tkuester I'm trying to merge feature back into master, but the reverts are wrecking havoc.
19:29 tkuester The pastebin might help explain things a little.
19:29 tkuester (Also the revert was done in two stages. >.o)
19:30 _ikke_ Was that merge done before a?
19:30 tkuester Ack, sorry. Master into feature.
19:30 tkuester Actually, yes. Let me update.
19:31 Balliad joined #git
19:31 tkuester _ikke_, GodGinrai: http://pastebin.com/WjgPDNmj
19:33 tkuester I could create a new branch off of h and manually copy the files over from feature... but I'm trying to avoid nasty hacks.
19:34 _ikke_ did you continue to commit the feature commits onto master?
19:34 jnewt joined #git
19:34 _ikke_ Or was master fast-forwarded?
19:34 TomyLobo2 joined #git
19:34 GodGinrai couldn't he revert the reverts?
19:34 tkuester No, in a two stage revert, a user brought it back to commit 7
19:34 tkuester Thought about that as well, ugh... this is an ugly situation.
19:35 _ikke_ You can ofcourse use rebase to drop those revert commits
19:35 _ikke_ but that requires rewriting published history
19:35 tkuester oog.
19:36 GodGinrai Yea, that's why I suggested reverting the reverts
19:36 GodGinrai no history rewrite
19:36 _ikke_ tkuester: why is reverting those reverts not possible?
19:37 tkuester Ah, d'oh.
19:37 tkuester I misspoke earlier... master into feature, not the other way around.
19:37 tkuester I'd have to replay the reverts on master, leaving master in an ugly state.
19:37 sq-one joined #git
19:37 drodger joined #git
19:38 GodGinrai as long as you revert the reverts on master, you should be able to merge either way
19:38 peterbecich joined #git
19:38 irqq joined #git
19:38 GodGinrai reverts are just commits
19:39 tkuester Right, but wouldn't I have to push the re-reverts back onto master?
19:39 GodGinrai tkuester: when you finally merge your feature branch, sure
19:40 tkuester So since there's two reverts... which one do I revert first?
19:40 * _ikke_ afk
19:40 prg3 joined #git
19:41 peterbecich joined #git
19:41 GodGinrai tkuester: https://git-scm.com/docs/git-revert
19:41 GodGinrai git-revert takes multiple commits as parameters
19:41 GodGinrai you can revert both together
19:41 _ikke_ but it will still result into two commits
19:43 g5w joined #git
19:44 peterbecich joined #git
19:45 IRCFReAK joined #git
19:45 Levex joined #git
19:47 drodger joined #git
19:47 tvw joined #git
19:49 peterbecich joined #git
19:50 hasc joined #git
19:51 Rodya_ joined #git
19:51 IRCFReAK joined #git
19:52 peterbecich joined #git
19:53 suroegin joined #git
19:53 MarioBranco joined #git
19:54 gopar joined #git
19:55 Levex joined #git
19:56 Darcidride joined #git
19:57 mda1 joined #git
19:58 chipotle joined #git
19:58 gopar joined #git
19:59 gopar joined #git
20:00 LeBlaaanc joined #git
20:00 dave0x6d joined #git
20:01 jimi_sanchez joined #git
20:02 luke_nukem joined #git
20:04 suroegin joined #git
20:04 suroegin joined #git
20:05 chipotle joined #git
20:05 einnjo joined #git
20:06 saul joined #git
20:07 IRCFReAK joined #git
20:07 chipotle_ joined #git
20:08 ajpiano joined #git
20:09 IRCFReAK joined #git
20:10 daBONDi joined #git
20:13 Es0teric joined #git
20:13 NeverDie_ joined #git
20:15 Lunatrius joined #git
20:15 IRCFReAK joined #git
20:16 venmx joined #git
20:17 finalbeta joined #git
20:18 irqq_ joined #git
20:18 jwmann joined #git
20:18 cdg joined #git
20:20 mehola joined #git
20:21 overlord_tm joined #git
20:24 foist_ joined #git
20:24 al-damiri joined #git
20:26 Levex joined #git
20:27 ahrs joined #git
20:29 IRCFReAK joined #git
20:29 ahrs joined #git
20:30 Levex joined #git
20:31 mjuszczak joined #git
20:31 mjuszczak joined #git
20:34 IRCFReAK joined #git
20:34 Ryanar joined #git
20:36 IRCFReAK joined #git
20:38 dvaske joined #git
20:38 IRCFReAK joined #git
20:39 robattila256 joined #git
20:40 dsdeiz joined #git
20:40 dsdeiz joined #git
20:41 bgerber joined #git
20:42 IRCFReAK joined #git
20:44 Ryanar joined #git
20:45 mizu_no_oto joined #git
20:47 tmg joined #git
20:47 IRCFReAK joined #git
20:48 Derperperd joined #git
20:49 bariscant joined #git
20:50 Jackneill joined #git
20:50 bariscant joined #git
20:52 Jackneill joined #git
20:53 seni joined #git
20:53 Vampire0_ joined #git
20:53 dendazen joined #git
20:56 IRCFReAK joined #git
20:57 lb1d joined #git
21:00 Rodya_ joined #git
21:00 Vinnie_win joined #git
21:00 IRCFReAK joined #git
21:04 pwnz0r joined #git
21:04 jeffreylevesque joined #git
21:04 sgrover left #git
21:06 givemeparttt2000 joined #git
21:07 chipotle joined #git
21:07 Es0teric joined #git
21:09 jagob joined #git
21:09 mizu_no_oto joined #git
21:12 raijin joined #git
21:13 givemeparttt2000 joined #git
21:13 jost__ joined #git
21:14 d0nn1e joined #git
21:14 chipotle_ joined #git
21:16 apotry joined #git
21:17 mizu_no_oto joined #git
21:18 givemeparttt2000 joined #git
21:20 bocaneri joined #git
21:20 sotoz joined #git
21:21 lucido-cl joined #git
21:22 ayee joined #git
21:23 ayee Is it possible to git clone a specific directory in a repo only?
21:23 Es0teric joined #git
21:23 osse no
21:23 bocaneri joined #git
21:23 durham joined #git
21:24 dirtyroshi joined #git
21:26 grawity it's kinda in the works according to the list
21:26 grawity but currently it's only possible to avoid checking out unwanted files (sparse-checkout)
21:26 _ikke_ Well, someone is making a proposal
21:27 _ikke_ (or I missed something)
21:27 grawity wasn't there some code?
21:28 saul i'm wondering how large groups of coders work irl ... does everyone have their own branch and work on that?
21:28 saul i'm used to working alone and now i've got two guys here who need to use git
21:29 osse technically there's no way to NOT have your own branch
21:29 osse master and origin/master are different
21:30 Tacoder joined #git
21:30 aax joined #git
21:31 lamer14897856317 joined #git
21:32 Cabanossi joined #git
21:32 mizu_no_oto joined #git
21:32 menip joined #git
21:33 Sound joined #git
21:35 _ikke_ !workflow
21:35 gitinfo 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.
21:36 mmlb joined #git
21:37 mda1 joined #git
21:37 IRCFrEAK joined #git
21:37 mmlb joined #git
21:38 mmlb joined #git
21:38 roelmonnens joined #git
21:39 Tobbi joined #git
21:42 rubyonrailed joined #git
21:42 mizu_no_oto joined #git
21:44 marianina8 joined #git
21:44 seishun joined #git
21:50 mickkelodeon joined #git
21:50 mickkelodeon hi
21:51 mickkelodeon is possible to squash commits when one has been pushed to a PR and another ones is still local?
21:52 raijin joined #git
21:55 minn joined #git
21:55 [Brain] joined #git
21:57 nyuszika7h joined #git
21:57 oleo joined #git
21:59 tobiasvl mickkelodeon: PR? as in GitHub? you can squash if you want, but you'll have to force push (rewriting history) – usually that should be OK with PRs
21:59 mickkelodeon yes, I meant Github sorry
22:00 mickkelodeon but is ok if 1 is remote on 1 local?
22:01 oleo how do you merge two trees into 1 ?
22:02 Rodya_ joined #git
22:02 tobiasvl mickkelodeon: sure
22:03 tobiasvl oleo: what do you mean by "trees"? man git merge
22:03 gitinfo oleo: the git-merge manpage is available at http://jk.gs/git-merge.html
22:05 thiago joined #git
22:06 shgysk8zer0 joined #git
22:09 drodger joined #git
22:09 willingc joined #git
22:18 bgerber joined #git
22:19 clandestino joined #git
22:20 mehola joined #git
22:23 daBONDi left #git
22:24 IRCFrEAK joined #git
22:24 mjuszczak joined #git
22:24 borkr joined #git
22:25 mjuszczak joined #git
22:26 mickkelodeon joined #git
22:26 goTAN joined #git
22:26 marianina8 joined #git
22:27 IRCFrEAK joined #git
22:33 roelmonnens joined #git
22:35 miczac joined #git
22:35 IRCFrEAK joined #git
22:37 marianina8 joined #git
22:40 gugah joined #git
22:43 clandestino joined #git
22:43 GodGinrai joined #git
22:44 newbie007 joined #git
22:46 newbie007 greetings, I'm on a windows OS and I see that mingw64 comes with the installer. Is it possible (or how can I) add programs to git such as nano, wget, and about a thousand other tools?
22:49 venmx joined #git
22:49 n1ce_ joined #git
22:49 d5sx43 joined #git
22:50 ok91 joined #git
22:50 eikhorst joined #git
22:51 miha_S7_ joined #git
22:51 jstimm joined #git
22:54 __main__ joined #git
22:55 * newbie007 hmm I see that there is a windows binary for nano...
22:55 IRCFrEAK joined #git
22:55 IRCFrEAK left #git
22:57 clandestino joined #git
22:58 joshszep joined #git
22:59 __main__ joined #git
22:59 IRCFrEAK joined #git
23:07 cust joined #git
23:07 diogenese joined #git
23:08 minn Doesn't the migw installer let you select packages? See http://www.mingw.org/wiki/getting_started for example.
23:10 Captain_Beezay joined #git
23:11 masuberu joined #git
23:11 cluelessperson joined #git
23:11 Captain_Beezay i did a local git mv; did a git push afterwards.however the old directory is still present on the remote repo
23:12 Captain_Beezay how can i rename and have it synchronized
23:16 osse Captain_Beezay: After mv you need to commit
23:16 osse Just like after add
23:16 Captain_Beezay i did
23:17 Captain_Beezay the remote repo has 2 directories now lol.
23:18 Captain_Beezay one missing locally,but won't complain when pushing changes committed
23:22 pwnz0r joined #git
23:24 IRCFrEAK joined #git
23:26 aielima joined #git
23:28 luke_nukem joined #git
23:33 dendazen joined #git
23:35 lagothrix joined #git
23:47 Cabanossi joined #git
23:55 seni joined #git
23:55 YuGiOhJCJ joined #git
23:59 madewokherd joined #git

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