Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-02

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

All times shown according to UTC.

Time Nick Message
00:02 urda joined #git
00:02 red82 joined #git
00:03 diogenese joined #git
00:09 mizu_no_oto joined #git
00:11 jstimm joined #git
00:18 red82 joined #git
00:19 __builtin joined #git
00:20 Eugene That sounds like Wednesday to me
00:22 Phenix joined #git
00:33 variable joined #git
00:35 Atrumx joined #git
00:36 invisbl joined #git
00:39 Lyqyd joined #git
00:42 Noodlewitt joined #git
00:43 jstimm joined #git
00:46 msonntag joined #git
00:48 sfix_ joined #git
00:49 mehola joined #git
00:49 _raynold_ join #Node.js
00:56 brent__ joined #git
00:56 LionsMane1 joined #git
00:57 Sasazuka joined #git
00:57 cdown_ joined #git
01:00 anuxivm joined #git
01:02 nickabbey joined #git
01:02 GreenJello joined #git
01:05 matoro joined #git
01:10 xaviergmail joined #git
01:10 jtojnar joined #git
01:11 Tobbi joined #git
01:12 ozmage joined #git
01:12 madewokherd joined #git
01:20 _raynold_ ahh it's a wonderful day
01:20 GreenJello left #git
01:21 urda joined #git
01:21 jokester joined #git
01:22 pur3eval joined #git
01:23 red82 joined #git
01:26 infernix joined #git
01:27 menip joined #git
01:27 ozmage_ joined #git
01:31 mischat joined #git
01:31 raijin joined #git
01:38 israelzuniga joined #git
01:39 chipotle joined #git
01:49 gigq joined #git
01:51 cdown joined #git
01:51 harry1 joined #git
01:56 diego1 joined #git
01:58 Kulrak joined #git
01:58 Kulrak joined #git
01:59 diego2 joined #git
02:00 raiden_0x71 joined #git
02:01 matoro joined #git
02:01 Lyqyd joined #git
02:01 Bizkit joined #git
02:11 pks joined #git
02:12 prg3 joined #git
02:13 mizu_no_oto joined #git
02:13 njbair joined #git
02:17 finalbeta joined #git
02:17 regedit joined #git
02:18 mizu_no_oto joined #git
02:22 Gsham joined #git
02:23 jtojnar left #git
02:26 SwiftMatt joined #git
02:29 Puffball joined #git
02:30 NightMonkey joined #git
02:31 solenodic joined #git
02:32 mischat joined #git
02:33 safe joined #git
02:33 rivarun joined #git
02:33 ikelso joined #git
02:38 d^sh joined #git
02:39 svm_invictvs joined #git
02:40 BackEndCoder joined #git
02:46 invisbl joined #git
02:46 Vampire0_ joined #git
02:46 cdown joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and alternative commits | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-slushie: submit your best punch line to https://madeitwor.se/git-jokes
02:49 aavrug joined #git
02:49 danimal2 joined #git
02:50 svm_invictvs joined #git
02:50 matoro joined #git
02:51 ozmage joined #git
02:54 variable joined #git
02:58 pur3eval joined #git
02:59 pR0Ps joined #git
03:00 dermoth joined #git
03:05 a_thakur joined #git
03:07 gugah joined #git
03:10 fstd_ joined #git
03:16 rivarun joined #git
03:17 invisbl joined #git
03:18 duderonomy joined #git
03:19 krillr joined #git
03:21 Emperor_Earth joined #git
03:21 pR0Ps joined #git
03:27 BenderRodriguez joined #git
03:30 Foxhoundz joined #git
03:31 redhedded1 joined #git
03:32 solrize so is this gitlab failure a shortcoming in git itself?  presumably nobody lost any code because git is distributed so everyone had local repos, but a bunch lost recent bug tracking info, CI scripts and stuff
03:32 solrize could that stuff all go in git as well?
03:32 ojacobson gitlab's failure was "someone ran rm -rf on an SQL database's data dir" and had no connection to git itself
03:32 solrize yeah but they had all that stuff in SQL because it wasn't in git
03:33 ojacobson Sure.
03:33 ojacobson That's a technical choice. Frankly, it doesn't make a ton of sense to store it _in_ git, but you could do so, if you wanted to.
03:33 solrize like fossil has built-in issue tracking
03:33 raiden_0x117 joined #git
03:33 kadoban git isn't and has never been a backup solution anyway
03:33 mischat joined #git
03:33 ojacobson yeah, had this eaten the git repos, a bunch of revision data would likely have been lost
03:33 ojacobson "it's distributed" is not magic :)
03:33 kadoban It seems related to git only in that gitlab has git in the same.
03:34 kadoban name*
03:34 solrize well git is everything ;).  i use it for backup in the sense that i type "git push" every so often just so there's a remote copy
03:34 solrize the existence of anything like git{hub,lab} doesn't seem in the decentralized spirit of git
03:34 ojacobson Tools like ticgit and bugs-everywhere _do_ store bugs in git. There are a number of wiki tools that use git as a backend. Gitlab chose not to use those.
03:35 solrize oh i didn't know about ticgit or bugs-everywhere... i'll look at those
03:35 cdg joined #git
03:35 solrize i used gitit for a while
03:35 ojacobson Probably for good reasons, but this is the tradeoff: their tools on top of git are centralized.
03:35 GodGinrai joined #git
03:36 solrize fossil is impressive at least for small projects--i haven't seen a full on comparison with git but the main difference i know of is little or no rebase support.  but that's because of the author's don't-rewrite-history philosophy, so maybe it's addable
03:36 kadoban The decentralized spirit of git is more about choice, and about many operations not needing to go out to the network.
03:36 solrize yes
03:36 kadoban There's nothing wrong with centralization in the git world. Most projects of more than 1 person have some kind of central repo.
03:37 solrize sure but not some central external web site
03:37 kadoban What's the difference?
03:37 kadoban github is just some convenient place to throw remotes for sharing
03:37 solrize one of them deletes your files and the other collects your personal information ;)
03:39 solrize anyway i'll check out ticgit etc.   thanks for the pointers
03:40 mgedmin joined #git
03:40 harry1 joined #git
03:42 PioneerAxon joined #git
03:45 peeps[lappy] joined #git
03:46 howdoi joined #git
03:46 dodobrain joined #git
03:49 solenodic joined #git
03:50 Impaloo joined #git
03:50 mostlybadfly joined #git
03:51 sborza joined #git
03:51 Goplat joined #git
03:52 chachasmooth joined #git
03:52 ozmage joined #git
03:52 jedahan joined #git
03:55 govg joined #git
03:55 red82 joined #git
03:56 hexagoxel joined #git
03:56 sunri5e joined #git
03:57 navidr joined #git
03:57 jost_ joined #git
04:04 zacts joined #git
04:05 donught joined #git
04:05 solenodic joined #git
04:05 donught joined #git
04:08 ozmage joined #git
04:11 mohabaks joined #git
04:12 cagmz joined #git
04:18 lindenle joined #git
04:18 invisbl joined #git
04:19 arescorpio joined #git
04:19 sbulage joined #git
04:23 robotroll joined #git
04:26 mehola joined #git
04:30 dreiss joined #git
04:33 miczac joined #git
04:34 mischat joined #git
04:39 Phenix joined #git
04:41 dreiss joined #git
04:48 ayogi joined #git
04:49 solenodic joined #git
04:50 gigq joined #git
04:51 ozmage joined #git
04:54 armyriad joined #git
04:58 Cabanoss- joined #git
05:00 dermoth joined #git
05:04 hernest joined #git
05:10 Limes joined #git
05:13 raijin joined #git
05:14 zezba joined #git
05:15 hernest left #git
05:18 Keverw joined #git
05:19 svm_invictvs joined #git
05:22 sagerdearia joined #git
05:24 Darren_ joined #git
05:27 alexbaben joined #git
05:27 d^sh joined #git
05:29 harry1 joined #git
05:30 sagerdearia joined #git
05:30 diego3 joined #git
05:32 acetakwas joined #git
05:33 funfunctor joined #git
05:33 funfunctor Hi
05:33 solenodic joined #git
05:33 funfunctor How do you git send-email a diffstat for a large patch to a mailing list that just deletes files?
05:35 metachr0n joined #git
05:35 mischat joined #git
05:36 GodGinrai joined #git
05:38 menip joined #git
05:49 a_thakur joined #git
05:49 codemann_ joined #git
05:50 ayogi joined #git
05:57 ckruczek joined #git
05:57 freimatz joined #git
06:02 Anuj_ joined #git
06:02 freimatz joined #git
06:02 freimatz_ joined #git
06:05 dec0n joined #git
06:07 BatMac joined #git
06:09 adino joined #git
06:10 fstd_ joined #git
06:10 sbulage joined #git
06:10 skynxnex_ joined #git
06:11 shgysk8zer0__ joined #git
06:11 milki_ joined #git
06:12 ketas- joined #git
06:13 wagle_ joined #git
06:13 _28_ria joined #git
06:13 DolpheenDream joined #git
06:13 rscata joined #git
06:14 absence joined #git
06:14 Levex joined #git
06:14 BeerSerc joined #git
06:14 lucasem joined #git
06:14 Ragnor joined #git
06:14 mns joined #git
06:15 brewmaster joined #git
06:15 axisys joined #git
06:15 zezba left #git
06:15 DolpheenDream joined #git
06:16 mohabaks joined #git
06:17 Nugget joined #git
06:17 DolpheenDream joined #git
06:17 sfix joined #git
06:18 Zarthus joined #git
06:18 RiPer joined #git
06:18 MikeChernev joined #git
06:18 Celelibi joined #git
06:18 drbean joined #git
06:18 NightMonkey joined #git
06:19 matoro joined #git
06:19 FilipNortic joined #git
06:19 steven joined #git
06:19 DolpheenDream joined #git
06:20 raijin joined #git
06:21 __main__ joined #git
06:21 DolpheenDream joined #git
06:22 LordRyan joined #git
06:22 cyan__ joined #git
06:23 cyan__ joined #git
06:23 DolpheenDream joined #git
06:24 cyan__ joined #git
06:24 qlkzy joined #git
06:25 Anja joined #git
06:25 jwest joined #git
06:26 tribly joined #git
06:26 cyan__ joined #git
06:26 felixjet joined #git
06:26 plasticle joined #git
06:26 Sleepy63 joined #git
06:27 cyan__ joined #git
06:28 cyan__ joined #git
06:30 Noodlewitt joined #git
06:31 cyan__ joined #git
06:31 mnaser joined #git
06:32 donught joined #git
06:32 jrm joined #git
06:35 invisbl joined #git
06:36 mischat joined #git
06:38 donught joined #git
06:40 promethean_2004 joined #git
06:41 thiago joined #git
06:42 dersand joined #git
06:43 overlord_tm joined #git
06:46 plushy joined #git
06:48 solenodic joined #git
06:50 ankit01ojha joined #git
06:51 thiago joined #git
06:56 zeroed joined #git
06:56 zeroed joined #git
06:59 ThomasLocke_ joined #git
06:59 rivarun joined #git
06:59 qt-x joined #git
06:59 algun joined #git
07:01 johnny56 joined #git
07:01 Raging_Hog joined #git
07:02 funfunctor joined #git
07:04 seni joined #git
07:06 Murii joined #git
07:08 tyreld joined #git
07:09 zefferno joined #git
07:10 dreiss joined #git
07:12 hexagoxel joined #git
07:13 seni joined #git
07:14 zefferno joined #git
07:18 harry1 joined #git
07:20 mohabaks joined #git
07:22 seni joined #git
07:25 bocaneri joined #git
07:31 nidr0x joined #git
07:37 GodGinrai joined #git
07:37 mischat joined #git
07:41 boz_v1 joined #git
07:42 JanC_ joined #git
07:46 jnavila joined #git
07:49 Singmyr joined #git
07:49 ihradek joined #git
07:49 seni joined #git
07:50 JeroenT joined #git
07:51 MineCoins joined #git
07:56 pwnz0r joined #git
07:56 msonntag joined #git
07:57 sarri joined #git
07:57 sarri joined #git
07:59 mikecmpbll joined #git
08:05 jknetl joined #git
08:05 Tobbi joined #git
08:07 metachr0n joined #git
08:07 aw1 joined #git
08:12 TomyWork joined #git
08:15 estan joined #git
08:16 PHPanos joined #git
08:16 estan left #git
08:17 estan joined #git
08:17 estan hi folks. this is probably a dumb question, but: i can do `git show HEAD` and `git show HEAD^1` just fine, but `git show HEAD^2` gives me "fatal: ambiguous argument 'HEAD^2': unknown revision or path not in the working tree.". any ideas what i'm doing wrong?
08:17 elect joined #git
08:17 estan i don't understand why it's an unknown revision, i have many commits leading up to HEAD :/
08:18 bernardio joined #git
08:18 lucasem estan: what does `git show HEAD~2` do for you?
08:19 DrSlony left #git
08:20 mloy i'd imagine that would do the trick
08:21 theoceaniscool joined #git
08:21 rasto joined #git
08:22 estan lucasem: that works indeed, thanks! how come ^ didn't work though? looking at gitrevisions(7), it says that should give me the second parent of HEAD.
08:22 tvw joined #git
08:23 estan aha. i think i see now, HEAD has only one parent, so ~ follows ancestry, while ^N is for when you have multiple parents? (a merge commit)
08:23 mloy estan: does the commit referred to by HEAD~2 have multiple parents?
08:23 mloy right
08:23 estan mloy: it does not, i was confused with the terminology :)
08:24 mloy ^_^ tbh I had to read the man page to find out. TIL
08:24 estan :) it's so seldom i look back more than one step, and i had always been using ^ thinking that followed ancestry.
08:25 estan (i mean, look back more than one step using indexing)
08:26 mloy ha yeah, I don't think I've used ^ because I came across ~ first
08:27 mloy is there some benefit to using ^ over ~1 besides brevity?
08:27 lucasem mloy: i'm in the same boat
08:28 lucasem fwiw, you can use just ~ too. (like git show HEAD~)
08:28 jagob joined #git
08:32 robattila256 joined #git
08:36 chele joined #git
08:38 _raynold_ joined #git
08:38 mischat joined #git
08:42 Tobbi joined #git
08:44 osse ^ and ~ with 1 or without a number are the same
08:46 meloc joined #git
08:46 FilipNortic joined #git
08:47 govg joined #git
08:47 [0xAA] joined #git
08:50 DieguezZ joined #git
08:51 zacts joined #git
08:51 grayjoc joined #git
08:51 invisbl joined #git
08:52 Balliad joined #git
08:54 Anuj_ joined #git
08:54 EisNerd_ joined #git
08:56 seni joined #git
08:57 solf1re joined #git
08:57 mehola joined #git
08:58 cyberik joined #git
08:59 bruce_lee joined #git
08:59 bruce_lee joined #git
09:00 manuelschneid3r joined #git
09:00 lss8 joined #git
09:02 aidalgol joined #git
09:04 jknetl joined #git
09:04 a_thakur joined #git
09:06 JeroenT_ joined #git
09:07 harry1 joined #git
09:07 mikecmpbll joined #git
09:08 bongjovi joined #git
09:10 lss8 joined #git
09:10 ozmage joined #git
09:11 borkr joined #git
09:11 kurkale6ka joined #git
09:12 vraju joined #git
09:12 vraju left #git
09:13 msonntag joined #git
09:15 rorro joined #git
09:16 Tobbi joined #git
09:17 Chaser joined #git
09:17 Shashikant86 joined #git
09:18 nostrora joined #git
09:20 brent__ joined #git
09:20 Gloomy joined #git
09:23 mohabaks joined #git
09:25 mSSM joined #git
09:27 Juzzika joined #git
09:27 ShalokShalom joined #git
09:28 synthmeat joined #git
09:28 msonntag joined #git
09:29 Tobbi joined #git
09:30 marcogmonteiro joined #git
09:32 grayjoc joined #git
09:34 JeroenT joined #git
09:37 Bombe joined #git
09:38 GodGinrai joined #git
09:40 pur3eval joined #git
09:47 Shashikant86 joined #git
09:48 seni joined #git
09:49 ferr1 joined #git
09:50 Furai joined #git
09:54 armyriad joined #git
09:55 Tobbi joined #git
09:55 estan left #git
09:58 rnsanchez joined #git
09:59 Vortex34 joined #git
10:01 pR0Ps joined #git
10:01 dminuoso How many commits do you produce on a regular day roughly?
10:01 dminuoso (Assuming full time development on a usual work day)
10:02 jast varies wildly for me. often none, often one or two, sometimes 20 and more.
10:02 mischat joined #git
10:03 shinnya joined #git
10:04 dminuoso jast: Is that after rebase/squashing?
10:04 sim590 joined #git
10:05 durham joined #git
10:05 mischat_ joined #git
10:05 kaldoran joined #git
10:07 jast dminuoso: sometimes yes, sometimes no. :) in integration phases I do sometimes push lots of individual commits. I do use a lot of interactive rebasing on some of my work, though.
10:07 ufk joined #git
10:09 ufk hi! :) i need help! I have branch master with files a/1.txt a/2.txt. in branch b I did 'git mv' to 1.txt and 2.txt from a to b directory. next.. in branch 'a' I modified a/1.txt, in branch 'b' when I try merge branch 'a' into it, it tries to create a/1.txt instead of applying the change on the new file's location. how do I resolve this issue ?
10:09 zefferno joined #git
10:11 Snugglebash joined #git
10:12 Snugglebash joined #git
10:14 achadwick joined #git
10:17 lucasem ufk: you'll probably just have to "manually" apply the changes
10:17 Serpent7776 joined #git
10:18 jast for future reference, make sure you do the rename in different commit from editing the file, this will make rename detection much more reliable in merges
10:18 hussam joined #git
10:19 apotry joined #git
10:22 xall joined #git
10:24 ufk thanks
10:26 Macaveli joined #git
10:27 Snugglebash joined #git
10:27 redeemed joined #git
10:29 Ank_ joined #git
10:30 mischat joined #git
10:31 seni joined #git
10:32 JeroenT joined #git
10:33 Ank_ rus?
10:35 jast what?
10:35 czechy joined #git
10:36 Ank_ any russian speakers over there?
10:36 jast not right now, I think
10:36 Shashikant86 joined #git
10:36 jast I don't really know, anyway
10:38 m4sk1n joined #git
10:39 Ank_ so maybe you can give advice to me about GWT, Google AE and Java?
10:40 SwiftMatt joined #git
10:41 steven getting rid of confusion, if I am on branch foo and rebase master and it results in a conflict
10:41 steven the diff, is local change in that case the change from master and *not* locally from foo?
10:42 nowhereman joined #git
10:42 MineCoins joined #git
10:42 Noodlewitt joined #git
10:42 jast Ank_: no, I don't know anything about any of those. this channel is about Git mainly
10:42 cdown joined #git
10:42 TrentonDAdams joined #git
10:43 jast steven: normally in a conflict you don't have a straight diff but conflict markers (<<<<, ====, >>>>) in the file. is that what you're talking about?
10:43 steven gimme a sec
10:43 steven I am using merge tools
10:44 jast in Git itself, it works like this: you have an "ours" and a "theirs" side. in a normal merge "ours" is your checked out branch and "theirs" is the branch you're merging in
10:45 steven <<<head content ==== content >>>>> branch
10:45 mohabaks joined #git
10:46 jast in rebase, it's effectively the other way around even though the names are the same
10:47 jast to be honest, I don't even remember which is which in conflict markers created during rebase, I always look at the content and figure it out from that
10:48 steven yeah in my case content is hashes
10:48 steven so I dont know what sha1 has is the new one lol
10:48 jast the "HEAD" part normally refers to the "ours" side, I believe
10:48 steven mind tl;dr'ing me why it's the other way around with rebase?
10:48 jast meaning that the top part is basically what was in the file prior to applying the commit it's applying right now
10:49 jast that would make the bottom part the content that was in the file after the old version of that commit
10:50 mischat joined #git
10:50 koneko joined #git
10:50 osse steven: because rebase is implemented a serial cherry-pick
10:51 osse which means going to the new base, then applying commits
10:51 jast in a merge, you have the "ours" version in your working tree when you start
10:51 jast in a rebase, when applying the commit, you have the "ours" version in your working tree immediately before the commit is applied
10:51 jast that's the way in which they're the same
10:52 jast the difference is that in merge, 'ours' is your work, and in rebase, typically 'theirs' (the commit being applied) is your work
10:52 jast actually that's not completely right, it's all a matter of perspective
10:53 jast but to avoid confusion, 'ours' is typically the 'before' of whatever is being applied right now
10:53 steven :D I think I gotta do some more reading, I mean sure as long as I have a ui I simply click on the change that I want but I'd be nice to properly understand it
10:53 steven thanks jast osse :)
10:54 jast (and 'theirs' is the thing being applied)
10:56 harry1 joined #git
10:56 wiesel joined #git
10:58 marcogmonteiro joined #git
10:58 rorro joined #git
10:59 mehola joined #git
11:00 chll_ joined #git
11:03 mischat joined #git
11:05 invisbl joined #git
11:06 aLeSD joined #git
11:06 aLeSD hi all
11:06 aLeSD I could I rebase my local master with the origin/master ?
11:06 osse yes
11:07 aLeSD osse, how I could do it ?
11:07 osse usually 'git rebase' is enough
11:13 aLeSD osse: thanks
11:15 msonntag joined #git
11:16 raiden_0x71 joined #git
11:17 mischat_ joined #git
11:18 dminuoso Mmm, I rebased my branch onto master, switched to master, and removed the last commit through rebase interactive.
11:19 dminuoso Why doesnt another attempt to rebase my branch onto master remove that last commit in my branch as well?
11:20 raijin joined #git
11:20 solenodic joined #git
11:20 tobiasvl what should the rebase do with the extra commit?
11:20 _ikke_ git skips duplicate commits
11:20 tobiasvl it kinda has to assume that commit is part of your branch, and one of the commits you want to rebase onto the new master
11:21 diego3 joined #git
11:21 seni joined #git
11:22 BackEndCoder joined #git
11:23 dminuoso tobiasvl: Oh, that makes sense. I guess Ill manually pluck it out with git rebase interactive there as well.
11:24 dsdeiz joined #git
11:24 dsdeiz joined #git
11:25 Tobbi joined #git
11:25 Noodlewitt joined #git
11:28 theoceaniscool joined #git
11:28 traxo-xx joined #git
11:29 madsj joined #git
11:30 arnoldoree joined #git
11:33 JeroenT joined #git
11:35 seni left #git
11:35 seni joined #git
11:36 seni can one do a hard reset on a file like `git reset --hard <file>`
11:36 brent__ joined #git
11:36 _ikke_ git checkout <file>
11:37 seni that's not the same
11:38 _ikke_ Why?
11:38 seni because it has changes in it
11:38 osse git checkout HEAD file
11:38 osse si the same
11:38 osse is
11:39 tobiasvl and no you can't do git reset --hard on a file
11:39 GodGinrai joined #git
11:39 osse read git status, it will tell you what to do
11:39 sarp joined #git
11:39 awkwardusername joined #git
11:41 seni works now needed to specify HEAD
11:41 seni ty
11:46 sarp joined #git
11:50 mischat joined #git
11:52 ertesx joined #git
11:53 seni joined #git
11:54 Noodlewitt joined #git
11:55 ocbtec joined #git
11:56 JeroenT_ joined #git
11:56 jost__ joined #git
12:00 jimi_ joined #git
12:01 mohabaks joined #git
12:02 suttonwilliamd joined #git
12:04 Bizkit joined #git
12:06 solenodic joined #git
12:09 mgver joined #git
12:09 mgver joined #git
12:09 mgver joined #git
12:10 mgver joined #git
12:10 mischat joined #git
12:12 mgver joined #git
12:14 g_zen joined #git
12:17 Nilesh_ joined #git
12:17 swift1 joined #git
12:22 Tobbi joined #git
12:23 YuGiOhJCJ joined #git
12:23 ShekharReddy joined #git
12:25 lindenle joined #git
12:26 feodaron joined #git
12:28 eduardas_m joined #git
12:31 solenodic joined #git
12:32 Shashikant86 joined #git
12:33 oaao joined #git
12:33 kba joined #git
12:34 assafb_ joined #git
12:35 zack_s_ joined #git
12:36 zack_s_ how can I retrieve the latest tag from a remote repository?
12:36 zack_s_ I have not yet checked out anything
12:36 xaviergmail joined #git
12:36 geoid_ joined #git
12:36 zack_s_ What I want it, checkout the latest tag with history depth=1
12:37 _ikke_ define latest tag?
12:37 kettlewell joined #git
12:37 Darcidride joined #git
12:37 Cassiopaya joined #git
12:37 zack_s_ _ikke_: the latest (from date) tag set is set on a certain branch
12:38 _ikke_ Then you have to clone the entire repository
12:39 rivarun joined #git
12:40 mSSM joined #git
12:42 CheckDavid joined #git
12:42 jsolano joined #git
12:44 harry1 joined #git
12:45 aard_ joined #git
12:47 mischat joined #git
12:50 cda_ joined #git
12:51 nebg joined #git
12:52 cda_ hello, I got a problem when I try to set up a new git repository locally.
12:52 mgver joined #git
12:53 nukeu666 joined #git
12:53 PHPanos joined #git
12:54 jnavila joined #git
12:54 raatiniemi joined #git
12:54 _Cyclone_ joined #git
12:56 cdown joined #git
12:57 cda_ i do :
12:57 dminuoso Mmm, can I commit to a different branch without a checking out first?
12:57 dminuoso I've been doing lots of refactoring in a topic branch, and made some unrelated bug fixes along the way. Constantly checkout out between branches to commit those bug fixes into the correct branch is getting annoying
12:58 _ikke_ dminuoso: no
12:58 _ikke_ You always commit and merge on the current branch
12:59 cda_ I do : git init; touch README.md; git add . ; git commit -m "test";  but this doesn't create master branch and dunno how to debug this
12:59 ojdo joined #git
12:59 osse cda_: !repro
12:59 gitinfo cda_: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
12:59 cda_ ok
12:59 osse including the command you use to show that master isn'tthere
12:59 WayToDoor joined #git
12:59 dminuoso _ikke_: Fair enough. It's not a big deal, was just hoping I could do something like "git commit --into hotfix" :(
13:00 _ikke_ dminuoso: look into man git worktree
13:00 gitinfo dminuoso: the git-worktree manpage is available at http://jk.gs/git-worktree.html
13:00 Tobbi joined #git
13:00 geoid_ joined #git
13:00 _ikke_ You can checkout a branch into another directory
13:00 a_thakur_ joined #git
13:00 dminuoso _ikke_: That sounds workable already! Checking it out :)
13:00 Squarism I wonder if there has happend anything on the "git-scene" in that latest 4 years. Like are there mechanisms that can avoid version history troubles for noob users. Mechanism to prohibit these users of using amend, force-push, pushing orphans, rebase of shared remote branches and such - when they cant.
13:01 cda_ https://gist.github.com/cdallagnol​a/d5c2519302caf973af0019197a58327d
13:02 jast cda_: that's very strange. what happens if you run 'git commit' without any arguments?
13:02 synthroid joined #git
13:02 kettlewell left #git
13:02 cda_ nothing
13:03 cda_ on my other computer i did this command lines and it's ok
13:03 durham joined #git
13:03 jast okay, that's not normal. it should at least output some kind of message...
13:03 djb-irc joined #git
13:04 jast do you have a 'git-commit' somewhere in your PATH? ('which git-commit' should tell you)? or an alias of some kind? ('alias git')
13:05 grayjoc joined #git
13:05 osse builtins always take precedence
13:05 durham_ joined #git
13:05 cda_ which git -> /usr/bin/git
13:06 jast oh, right, didn't know that
13:06 osse if you're on bash, which isn't good enough
13:06 jast makes sense, though
13:06 osse do 'type git'
13:06 cda_ git est haché (/usr/bin/git)
13:06 osse ok, that's good enough :)
13:07 jast maybe this will give more information: GIT_TRACE=1 git commit
13:07 cda_ where to det that ?
13:07 cda_ set*
13:07 jast no, just run that as a command
13:07 jast one line
13:07 osse also, let's see   git config --local --list
13:08 cda_ core.repositoryformatversion=0
13:08 cda_ core.filemode=true
13:08 cda_ core.bare=false
13:08 cda_ core.logallrefupdates=true
13:08 jast okay, that didn't help, unfortunately
13:08 osse git config --get-regexp user
13:09 osse (FYI: which only does a PATH lookup, so won't reveal shell functions and aliases, and is basically useless)
13:09 cda_ user.email cda@mail.com user.name cda
13:10 jast yeah, I actually knew that about which (though it's different in zsh), I just didn't know bash's "type" :)
13:10 osse which in zsh is a builtin, so that does the job
13:10 jast heh, I didn't know it's *not* a builtin in bash
13:11 jast cda_: did 'GIT_TRACE=1 git commit' output anything?
13:11 osse GREP=$(which grep);  $GREP -v whatever.  # DO NOT WANT
13:11 cda_ 14:07:51.861635 git.c:344               trace: built-in: git 'commit'
13:11 cda_ 14:07:51.861846 run-command.c:334       trace: run_command: '.git/hooks/pre-commit'
13:11 cda_ 14:07:51.863040 git.c:344               trace: built-in: git 'diff'
13:12 osse aha!
13:12 osse what does .git/hooks/pre-commit look like
13:12 a_thakur joined #git
13:13 cda_ https://gist.github.com/cdallagnol​a/8d195f59ed53b184e4253f293f429552
13:13 cda_ tried to make a script to abort commit if i got some string in my code
13:13 MineCoins joined #git
13:14 cda_ must be incorrect
13:14 osse i think this aborts any commit
13:14 osse because if grep fails, the hook fails
13:14 osse if grep succeeds, exit 1 is run so the hook fails
13:14 osse => the whole hook could be replaced with  'false'  :p
13:15 cda_ oh !
13:15 jast to fix, try adding a line to the end: exit 0
13:15 ShalokShalom joined #git
13:15 jast side note, shell doesn't treat backslashes specially in single quotes, so your '\n will be output literally
13:16 cda_ ok i try this
13:16 VladGh joined #git
13:16 invisbl joined #git
13:17 Awesomecase joined #git
13:18 cda_ yes ! when i commit without the forbidden word it commits ! with it it doesn't commit and exit on error !!
13:18 cda_ thzanks a lot
13:19 sunri5e joined #git
13:19 telephone joined #git
13:19 telephone joined #git
13:20 clmsy joined #git
13:24 mgver test
13:24 jast test failed!
13:24 mgver huahuahu thanks
13:25 jast !next
13:25 gitinfo Another satisfied customer. NEXT!
13:25 mgver uiashuias awesome
13:27 DieguezZ joined #git
13:28 balu_23 joined #git
13:33 GodGinrai joined #git
13:35 _sagitaire joined #git
13:36 mohabaks joined #git
13:36 cdown joined #git
13:37 funfunctor left #git
13:37 cda_ hmm, I've go rtan other question. My pre-commit make a diff and if there is a word it abords the commit. When I do git commit it's ok. But if I do git add . and then git commit, the diff is empty so my commit is accepted
13:38 cda_ got an*
13:38 cda_ is there a hook on the git add ?
13:38 osse cda_: the relevant thing to use is git diff --staged
13:40 cda_ I didn't know that option ! thx :)
13:40 theoceaniscool joined #git
13:41 DolpheenDream joined #git
13:42 HardlySeen joined #git
13:43 durham joined #git
13:44 BackEndCoder joined #git
13:45 Lynxium joined #git
13:46 lindenle joined #git
13:46 amagawdd joined #git
13:46 ShapeShifter499 joined #git
13:47 jeffreylevesque joined #git
13:47 adamru joined #git
13:49 mgver i have a finished android studio project, and now i would like to make a git repo. first i need to create a bare repository on local server and clone it or what?
13:50 PHPanos joined #git
13:52 brent__ joined #git
13:54 thebinary joined #git
13:57 marcogmonteiro joined #git
13:58 Kaisyu joined #git
13:59 a_thakur joined #git
14:00 Murii joined #git
14:00 mischat_ joined #git
14:04 Gsham joined #git
14:04 Tobbi joined #git
14:06 canuk joined #git
14:06 xcesariox joined #git
14:07 a_thakur joined #git
14:07 jknetl joined #git
14:09 mischat joined #git
14:09 jimi_ joined #git
14:12 jknetl joined #git
14:14 jknetl joined #git
14:15 jknetl joined #git
14:16 chele how do i undo changes to only some files from a commit which was published upstream (i think nobody else uses it so i can save ly rewrite it even remove the remote branch and create new one)
14:19 ThiefMaster `git rebase -i thecommit^`, remove the commit from the list, `git push -f`
14:20 canton7 he only wants to undo some of the changes, not remove the entire thing
14:20 canton7 chele, git rebase -i thecommit^, change 'pick' to 'edit' on the commit you want to edit, save and close, rebase will run and stop just *after* that commit, make that commit look how you want it to look (using e.g. reset HEAD^ and re-commit, or git commit --amend) then git rebase --continue
14:20 ShekharReddy joined #git
14:21 chele canton7 understood
14:23 seni joined #git
14:26 rorro joined #git
14:27 Tobbi joined #git
14:27 israelzuniga joined #git
14:31 lordjancso joined #git
14:32 Snugglebash joined #git
14:33 harry1 joined #git
14:34 xall joined #git
14:34 Ryanar joined #git
14:35 sbulage joined #git
14:36 Dougie187 joined #git
14:37 jknetl joined #git
14:37 jknetl_ joined #git
14:38 marcogmonteiro joined #git
14:39 israelzuniga joined #git
14:43 griffindy joined #git
14:44 stux|RC joined #git
14:45 mischat_ joined #git
14:47 bannakaffalatta joined #git
14:47 pioiytr_ joined #git
14:47 Tobbi joined #git
14:48 aw1 joined #git
14:49 Es0teric joined #git
14:50 red82 joined #git
14:50 ikelso joined #git
14:51 chele i added as a remote to my repo a different repo but i don't see it on my history. why is this happening?
14:51 OMSQ joined #git
14:52 gecjr joined #git
14:53 JeroenT joined #git
14:54 King_Hual joined #git
14:54 bannakaf_ joined #git
14:54 Khisanth joined #git
14:54 cdg joined #git
14:55 al-damiri joined #git
14:55 troulouliou_div2 joined #git
14:56 ShalokShalom joined #git
14:56 cdg joined #git
14:56 seni joined #git
14:58 chele canton7 once the rebase stopped on the commit how can i stage and unstage files. if i try with commit --amend i can only change log msg.
14:59 canton7 chele, it's probably easiest to reset the commit (git reset --soft or --mixed HEAD^), then you can stage and unstage files
14:59 canton7 then 'git commit' (not --amend) to re-commit
15:00 chele canton7 don't i loose commits after the current one if i use reset?
15:00 chele s/loose/lose/g
15:00 mehola joined #git
15:01 canton7 chele, no. git rebase knows that it's going to have to re-apply all of the commits past the one you're editing
15:01 Tobbi joined #git
15:01 canton7 so when you `git rebase --continue`, it'll apply the patch from the commit just after the commit you decided to 'edit'
15:01 Es0teric joined #git
15:02 nickabbey joined #git
15:02 chele canton7 alright
15:03 chele done
15:03 chele had to use mixed HEAD^ instead of --soft reset
15:03 madsj left #git
15:03 minn joined #git
15:04 canton7 cool
15:08 balu_23 joined #git
15:09 ash_workz joined #git
15:10 hasc joined #git
15:11 seni joined #git
15:12 LeBlaaanc joined #git
15:13 e14 joined #git
15:14 AaronMT joined #git
15:21 re1 joined #git
15:21 Tobbi joined #git
15:22 jnavila joined #git
15:22 xall joined #git
15:24 relipse joined #git
15:25 matoro joined #git
15:25 blackwind_123 joined #git
15:25 cdg_ joined #git
15:26 DieguezZ joined #git
15:27 minikN joined #git
15:27 invisbl joined #git
15:28 eduardas_m joined #git
15:30 mischat joined #git
15:31 mischat joined #git
15:32 elect_ joined #git
15:32 donught joined #git
15:32 seni joined #git
15:33 Es0teric joined #git
15:34 basiclaser joined #git
15:38 idlemind joined #git
15:39 ertes joined #git
15:39 gugah joined #git
15:41 chardan joined #git
15:43 eroux joined #git
15:47 chardan joined #git
15:47 seni joined #git
15:47 mischat joined #git
15:48 Tobbi joined #git
15:49 feodaron joined #git
15:49 toogley1 joined #git
15:49 jagob joined #git
15:50 skered joined #git
15:51 jstimm joined #git
15:53 robotroll joined #git
15:58 neilthereildeil joined #git
15:58 Ashish joined #git
15:58 neilthereildeil hey Ashish
16:00 vuoto joined #git
16:00 dave0x6d I am trying to get out of the hell that is svn, how the heck can I simply import/clone https://svn.nmap.org/nmap-exp/pa​sca1/nmap-nseportscan-socks4a/?
16:01 seni joined #git
16:01 wiesel joined #git
16:01 ResidentBiscuit joined #git
16:02 Es0teric joined #git
16:04 qqx joined #git
16:05 wiesel joined #git
16:06 Es0teric joined #git
16:06 wiesel joined #git
16:07 invisbl joined #git
16:08 invisbl joined #git
16:08 Derperperd joined #git
16:08 CheckDavid joined #git
16:09 skered Using git-commit -v git will display what's to be updated however it's commented out (it will be ignored) in the commit message.   Can git not comment the files to be updated such that it will always be in the commit message?  Otherwise the user is expected to just uncomment those lines?
16:09 skered er sorry that's not -v... this would be just a normal commit.
16:09 osse skered: you can use a prepare-commit-msg
16:10 osse or, if you're mad l33t and use vim, while editing the commit message: :r!git diff --staged --name-only
16:11 skered pff.. that would be an autocmd for gitcomit ft
16:11 skered You think I'm going to type that out... I'm a vim user
16:11 osse sure
16:12 mgedmin why would anyone manually include filenames in the commit message?  you can always see them with git show <commithash> --stat or some such
16:12 dhollinger joined #git
16:12 P4Titan joined #git
16:13 jast I'll have to agree
16:13 anyonebutme joined #git
16:13 osse jast: someone holding a gun to your head?
16:13 jast yep
16:13 pbrewczynski joined #git
16:13 osse skered: a prepare-commit-msg is probably better. that way it's a bit more flexible
16:13 skered Ok maybe that's better or is there something in git-log to show that same info?
16:13 osse in case you switch to emacs
16:13 P4Titan Hi all. My development set up consists of a laptop and desktop. I want to be able to code on both computers, but I oftentimes find myself with, say, half-written code on my laptop that I don't want to commit.
16:13 osse skered: git log --name-only
16:14 perlpilot skered: git log --stat # works too
16:14 P4Titan How should I go about this?
16:14 pR0Ps joined #git
16:14 jast or just 'git whatchanged' for people who don't want to remember flags ;)
16:14 anyonebutme Hi, I need to revert an old commit, the files that commit changed have been modified since, is it possible to revert the changes before that bad commit and apply the rest of the changes that came after?
16:14 osse dave0x6d: git-svn, https://www.atlassian.com/git​/tutorials/migrating-overview
16:15 skered Ok.  I think that's good.  With --name-only indented those names :(
16:15 skered Wish*
16:15 perlpilot skered: your wishes are just a simple matter of programming away  ;)
16:15 cyan__ joined #git
16:15 mda1 joined #git
16:16 skered Is that another way of saying "Send patches"
16:16 jast P4Titan: there are a number of ways, for example: 1) use temporary commits (you can get rid of them later using interactive rebase etc. and you can even put them on temporary branches to avoid accidents). 2) use stashing, though it's a little tricky to migrate stashes on another host. 3) copy all modified files over, example (if you have no filenames with whitespace): tar c -zvf foo.tgz $(git ls-files -m --exclude-standard)
16:16 cyan__ joined #git
16:17 jast you can include untracked files (i.e. not added to git yet) by adding -o to the 'ls-files' bit
16:17 P4Titan jast: I'm reading up on this. How does the interactice rebase work?
16:17 Es0teric_ joined #git
16:17 Tobbi joined #git
16:17 toogley1 joined #git
16:17 jast !interactive_rebase
16:17 gitinfo Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.
16:17 cyan__ joined #git
16:18 jast man git-rebase for reference :)
16:18 gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html
16:18 jast I should change those URLs to https...
16:18 P4Titan So I would be working in my `develop` branch
16:18 jast but not now, I've got to catch a train. bye!
16:18 P4Titan oooh, ok
16:18 P4Titan Thanks tho!
16:18 cyan__ joined #git
16:19 invisbl joined #git
16:19 skered Ok... git-log has --stat too...
16:19 e14 joined #git
16:19 ryanez joined #git
16:20 osse skered: git log has all the options git diff has
16:20 cyan__ joined #git
16:20 osse maybe except one or two obscure ones maybe, but I can't think of any
16:20 anyonebutme Is there a way i could checkout the previous commit, and then apply the rest of the commits individually skipping just that one bad commit?
16:20 tanuki joined #git
16:20 perlpilot skered: why exactly do you need the filenames?
16:21 skered perlpilot: Because sometime commit messages aren't as clear
16:21 cyan__ joined #git
16:21 skered With the files give context
16:22 Dougie187 P4Titan: Just to clarify what you guys were talking about.
16:22 osse anyonebutme: I think yoy want  git rebase -i HEAD~n for a suitably sized n
16:22 Dougie187 P4Titan: Since you work on both computers, you can commit your changes at the end of the day, and push, so you can later pull on the other device.
16:22 skered This is why I thought adding them to the commit message the solution... But then you pointed out git's --stat
16:22 osse anyonebutme: Depends on the specifics
16:22 harry1 joined #git
16:22 Dougie187 P4Titan: And with whatever frequency you want, you can "uncommit" or squash multiple commits together using rebase / reset.
16:23 perlpilot skered: Maybe work on making better commit messages too?  :)
16:23 perlpilot skered: or, encouraging your committers to do so
16:23 skered perlpilot: Yep.
16:23 tang^ joined #git
16:24 solenodic joined #git
16:25 osse *if* you need context, you can get it. But if you add names to the commit messages they'll be hard to avoid
16:25 dave0x6d osse: yeah, I've been trying git svn clone https://svn.nmap.org/nmap-exp/pasca1/ # like they suggest, it doesn't work.
16:25 jdelreal joined #git
16:25 osse In my experience I only need that context sometimes, and only for certain commits
16:26 P4Titan Dougie187: yes
16:26 P4Titan So I would commit to `develop` and push from my laptop and pull from my desktop
16:26 lmatteis joined #git
16:26 P4Titan work a bit, commit and push there, pull from my laptop etc.
16:26 Dougie187 Well, as long as develop isn't shared with other people, yes
16:26 govg joined #git
16:26 P4Titan It's only me
16:27 P4Titan Why so though?
16:27 P4Titan left #git
16:27 P4Titan joined #git
16:27 lmatteis hello
16:27 Dougie187 P4Titan: Because rebasing / resetting messes with history.
16:27 anyonebutme osse: perfect, that's what i wanted, but then it fails on the next commit "error: could not apply <NEXT COMMIT ID>", merge conflict in one particular commit
16:28 Dougie187 P4Titan: If other people are basing their changes on your work, you're rewriting history, so you'll end up having a lot of problems when you try to merge later.
16:28 P4Titan And things get messy from there
16:28 P4Titan yes
16:28 P4Titan Dougie187: so I go back and forth on `develop`, only for myself
16:28 Dougie187 Yeah, that's fine
16:28 lmatteis i have a range of commits, and i'd like to see all the files modified in this range, and possibly a way to squash all commits relating a single file
16:28 lmatteis is there an easy way to do this instead of doing git show for every commit?
16:28 P4Titan and then, I would `rebase -i` to trim it down
16:29 P4Titan and then merge w/ `master`?
16:29 P4Titan or would I merger w/ `master` and then trim?
16:29 brent__ joined #git
16:29 dave0x6d osse: How would you import just user or branch?
16:31 bannakaffalatta joined #git
16:31 dave0x6d trying to do this now. svn2git https://svn.nmap.org/nmap-exp --no-minimize-url --revision 33000:36560 --verbose
16:31 dave0x6d it prompts for me a password/username =\
16:32 peeps[lappy] joined #git
16:33 cdg joined #git
16:33 King_Hual joined #git
16:34 P4Titan Dougie187: Or would I `checkout master`, `rebase -i develop`, and squash accordingly
16:34 svm_invictvs joined #git
16:34 P4Titan although I feel like rebasing master is dangerous
16:34 workerbeetwo joined #git
16:34 Dougie187 P4Titan: So, rebase will rebase what you have checked out onto what you list.
16:35 Dougie187 So, in those commands, you'd be rebasing master onto develop.
16:35 Dougie187 Which as you said, isn't the best idea.
16:35 P4Titan yes
16:35 P4Titan so my question is, how should I approach this
16:35 P4Titan since `develop` has been written to a remote
16:35 P4Titan and I can't exactly trim it anymore
16:35 Dougie187 You can rewrite it, if you're the only one working on it.
16:35 Dougie187 You can do something like this
16:35 osse Dougie187: I have no clue
16:35 neilthereildeil left #git
16:35 osse Ehh
16:36 osse dave0x6d: I have no clue
16:36 Dougie187 git checkout develop; git rebase -i `git merge-base develop master`; git push origin +develop
16:37 P4Titan But that would refactor the git structure on the remote, which isn't much good either
16:37 P4Titan albeit, I'm the only one on develop
16:37 Dougie187 Well, since it's your branch, it's fine.
16:37 Dougie187 It's up to you though
16:37 P4Titan yes
16:37 bats joined #git
16:37 P4Titan the alternative would be to create a tmp branch
16:38 P4Titan rebase onto it
16:38 Dougie187 If you want to make it easy to transfer your work back and forth between machines without keeping commits around, that's really the only way to do it.
16:38 P4Titan I see
16:38 Dougie187 The other way, which is a little less effort.
16:38 Dougie187 Is to push your work in progress, and then `git reset HEAD^` after you check it out in the morning.
16:38 Dougie187 or on the other machine
16:38 Dougie187 But that assumes you only want to remove one commit at a time.
16:39 P4Titan I see, I see
16:39 Dougie187 (remove the commit, but keep the changes)
16:39 mohabaks joined #git
16:39 P4Titan I'll further look into this. Thanks so much for the help!
16:39 Dougie187 NP
16:41 franl joined #git
16:42 King_Hual joined #git
16:42 mikecmpbll joined #git
16:42 grayjoc joined #git
16:43 gargola joined #git
16:44 diogenese joined #git
16:44 synthroid joined #git
16:44 mischat_ joined #git
16:45 matoro joined #git
16:45 jknetl_ joined #git
16:48 e14 joined #git
16:48 jstimm joined #git
16:50 publio joined #git
16:50 Es0teric joined #git
16:51 thiago joined #git
16:51 Snugglebash joined #git
16:51 leeN joined #git
16:54 Murii joined #git
16:55 JanC_ joined #git
16:56 bannakaffalatta joined #git
16:57 cdg_ joined #git
16:58 nickabbey joined #git
16:58 jccn joined #git
17:00 thiago joined #git
17:01 kpease joined #git
17:02 serverprocessor joined #git
17:02 stux|RC joined #git
17:03 DolphinDream i forked a repo on github.. made changes to master, made a pull request which was accepted (merged into the original repo).. what do i do next with my forked repo (considering i'm still developing and plan to make more pull requests). Do I pull the merged changes from the original repo in to my forked repo ?
17:03 ServerProcessor_ joined #git
17:03 Dxrjo joined #git
17:03 jnewt_ joined #git
17:05 kaldoran joined #git
17:06 plushy DolphinDream: that would depend on the policy of the project
17:07 harry1 joined #git
17:07 plushy DolphinDream: most probably you will rebase before next MR
17:07 svm_invictvs joined #git
17:07 mischat joined #git
17:07 sim590 joined #git
17:08 matsaman joined #git
17:09 Es0teric joined #git
17:09 ServerProcessor_ left #git
17:09 mischat joined #git
17:11 matsaman left #git
17:12 jknetl joined #git
17:13 sim590 joined #git
17:13 adino joined #git
17:13 kaldoran joined #git
17:14 Odaym joined #git
17:14 Odaym hiya
17:14 a0x10c joined #git
17:15 djb-irc joined #git
17:15 workerbeetwo Hi. Hey. a lot of remote branches are gone. a colleague might have hit a wrong command on production system. former releases / hotfixes and features branches simply gone.
17:16 moritz workerbeetwo: I recommend you restore them from backup
17:17 mquin joined #git
17:17 Odaym hey guys
17:17 moritz workerbeetwo: if you have access to the server on which the git repo lies, a 'git reflog' might also give a clue on how to restore stuff
17:17 _ikke_ any repository that still hass them can push them out
17:17 Odaym I just modified the gitignore file and now my project is gone
17:17 Odaym just kidding, i just modified the gitignore file and I want to "refresh" the index to unstage the files I don't want to track (they are already committed previously)
17:17 canton7 workerbeetwo, as in, they've been deleted from the remote? git ls-remote <remotename> doesn't show them? Do you need them? Did noone fetch them locally? You might be able to recover them if you do need them and don't have backups.
17:18 workerbeetwo canton7: a fresh clone does not show them.
17:18 Guest85 joined #git
17:18 dreiss joined #git
17:18 canton7 Odaym, you'll need to tell git to stop tracking the files which are now ignored. Use 'git rm' (or 'git rm --cached' if you don't want to delete the files from disk)
17:18 moritz Odaym: git rm --cache the files
17:18 canton7 workerbeetwo, does 'git branch -r' show them after a clone? Does git ls-remote <remotename> show them?
17:18 moritz right, --cached, not cache
17:18 Odaym true that
17:18 Odaym i had it in my helpers document, just forgot
17:19 Odaym thanks
17:19 xall joined #git
17:19 workerbeetwo moritz: hmm. its bitbucket hosted repo. I dont know what acces they allow.
17:19 dwigton joined #git
17:19 _ikke_ not the kind of access you need
17:21 dwigton I just now finished a feature branch so I committed 'git checkout master' 'git merge my-feature-branch' 'git svn dcommit' Now I want to clean up old feature branches. 'git branch --merged' only lists master. Shouldn't it at least show the feature I just merged?
17:22 Gsham joined #git
17:22 Derperperd joined #git
17:22 dwigton Or does git-svn mess with master.
17:23 workerbeetwo canton7: nothing shown. a small portion of branches remained.
17:23 canton7 workerbeetwo, even with 'git ls-remote'?
17:23 ejholmes joined #git
17:23 workerbeetwo could I try pushing bakc up one old release branch?
17:23 workerbeetwo canton7: yes even then...
17:23 _ikke_ sure
17:23 _ikke_ git is distributed, anyone who has the commits can push them again
17:24 workerbeetwo canton7: ok. let my check and double check about that ls-remote.. .
17:24 ShalokShalom joined #git
17:24 matsaman joined #git
17:24 dtype although then you'll need to find out who is deleting remote branches and why
17:25 Raging_Hog joined #git
17:26 moritz does bitbucket have some kind of activity log that includes branch deletions?
17:26 moritz iirc gitlab has
17:27 kadoban joined #git
17:27 e14 joined #git
17:27 workerbeetwo canton7: cannot really tell. but seems gone to me. even though there is refs/tags ... stuff
17:28 canton7 well, are you missing branches in the output or not? ><
17:28 canton7 *your
17:29 canton7 if not, then anyone who's run 'git fetch' (and hasn't run 'git fetch --prune') will have them in their repo, as origin/whatever
17:29 workerbeetwo canton7: I would say they are gone. yes. mostly old releases.
17:29 matsaman joined #git
17:29 canton7 so you can find a repo which has them, and push them back
17:29 workerbeetwo canton7: ok. Ill try to push one
17:29 pwnz0r joined #git
17:31 [0xAA] joined #git
17:34 madewokherd joined #git
17:34 col joined #git
17:34 a0x10c joined #git
17:35 ihradek joined #git
17:35 djb-irc joined #git
17:36 solenodic joined #git
17:36 serverprocessor_ joined #git
17:40 adino joined #git
17:41 minn joined #git
17:41 a0x10c joined #git
17:42 Es0teric_ joined #git
17:42 sathed joined #git
17:43 geoid_ joined #git
17:47 jstimm joined #git
17:47 pwndave joined #git
17:48 wilbert joined #git
17:48 Raging_Hog joined #git
17:48 msonntag joined #git
17:50 nickabbey joined #git
17:51 rorro joined #git
17:54 Odaym left #git
17:55 mad_moses joined #git
17:58 kpease joined #git
18:00 nckpz joined #git
18:01 infernix joined #git
18:02 awkwardusername joined #git
18:03 mohabaks joined #git
18:04 tyreld joined #git
18:05 amrx joined #git
18:05 cdg joined #git
18:08 MrMojito joined #git
18:08 MineCoins joined #git
18:08 liberpater left #git
18:09 mohabaks joined #git
18:10 jccn joined #git
18:10 MrMojito left #git
18:13 gargola joined #git
18:13 boombatower joined #git
18:14 MrMojit0 joined #git
18:15 Derperperd joined #git
18:15 rossome joined #git
18:16 hahuang65 joined #git
18:17 geoid_ joined #git
18:17 HardlySeen joined #git
18:18 bernardio joined #git
18:20 DieguezZ joined #git
18:22 ThomasLocke_ joined #git
18:22 ThomasLocke_ joined #git
18:24 TomyLobo joined #git
18:25 ikelso joined #git
18:25 Ozymandy joined #git
18:26 jknetl_ joined #git
18:30 minn joined #git
18:31 synthroi_ joined #git
18:31 infernix joined #git
18:34 Darren_ joined #git
18:35 DrSlony joined #git
18:36 DrSlony Hey, I just want to make sure: if I do `git branch -d foo` on my system, I won't delete it on origin, right?
18:36 nixjdm joined #git
18:38 nickabbey joined #git
18:38 osse Correct
18:38 SwiftMatt joined #git
18:38 kpease joined #git
18:39 kulelu88 joined #git
18:39 Es0teric joined #git
18:39 perlpilot DrSlony: you'd use `git branch -r -d foo` if you wanted to delete the remote tracking branch too
18:39 kpease_ joined #git
18:40 DrSlony perlpilot I do not!
18:41 perlpilot you do not *today*, but you may tomorrow  :)
18:41 perlpilot btw, `git help branch` is very useful
18:41 shgysk8zer0_ joined #git
18:41 qqx dwigton: `git svn dcommit` rebases your current branch after committing to svn. So the commit IDs on master won't match the feature branches.
18:42 dan__ joined #git
18:42 osse DrSlony, perlpilot: But even that won't delete the foo branch in the origin repository
18:42 qqx IIRC you can do dcommit from the feature branch before merging, then merge the result to master and delete the feature branch.
18:42 osse U safe bruh
18:43 DrSlony great
18:43 DrSlony the crime has been committed. Now I need a beer.
18:45 matoro joined #git
18:45 dan__ joined #git
18:46 dan__ left #git
18:46 SteenJobs joined #git
18:47 SteenJobs hey friends - i have a remote commit within which i need to revert a single file (damn Xcode recorded changes to a file because i had it open, and i need to completely remove changes to that file from my PR), how should i go about it?
18:48 Mikerhinos joined #git
18:48 mSSM joined #git
18:49 duderonomy joined #git
18:49 Es0teric joined #git
18:50 jstimm joined #git
18:51 troulouliou_dev joined #git
18:52 troulouliou_dev joined #git
18:53 troulouliou_dev joined #git
18:53 col joined #git
18:54 duderonomy joined #git
18:55 disi i redirected the output of `git diff` to a file. is there a way to `git apply` that?
18:56 grawity redirect the input of `git apply` from a file
18:56 Vampire0 SteenJobs, if it is the latest commit, change the file and use `git commit --amend` to modify the commit, then force-push your branch and the PR will be updated. If it is not the latest commit, use `git rebase -i` and use the edit stanza, then again do the commit amending, finish the rebase and again do the force pushing
18:57 disi grawity: like `cat mypatch | git apply`?
18:57 duderono_ joined #git
18:57 disi (doesnt like that)
18:57 e14 joined #git
18:57 pwndave joined #git
18:57 Vampire0 disi, you don't need to, man git apply takes the patch file as argument
18:57 gitinfo disi: the git-apply manpage is available at http://jk.gs/git-apply.html
18:58 Vampire0 Simply doing `git apply mypatch`  should be fine
18:58 rewt`` joined #git
18:58 disi Vampire0: i tried that first :/
18:58 disi hmm... maybe i need to be in the project root to apply
18:59 tang^_ joined #git
19:00 minn joined #git
19:01 pwndave joined #git
19:01 nickabbey joined #git
19:02 Oatmeal joined #git
19:03 jimi_ joined #git
19:06 manuelschneid3r joined #git
19:06 marcogmonteiro joined #git
19:08 msonntag joined #git
19:09 jstimm joined #git
19:09 flavius joined #git
19:09 Thra11 joined #git
19:10 rossome joined #git
19:11 mda1_ joined #git
19:13 hahuang65 joined #git
19:14 cyberz joined #git
19:14 gugah joined #git
19:15 solenodic joined #git
19:16 crayon joined #git
19:17 Thra11 joined #git
19:19 Alienpruts joined #git
19:19 Dpbho9 joined #git
19:20 netj joined #git
19:21 Vampire0 disi, man git apply says "When running from a subdirectory in a repository, patched paths outside the directory are ignored."
19:21 gitinfo disi: the git-apply manpage is available at http://jk.gs/git-apply.html
19:21 solenodic joined #git
19:21 jnavila joined #git
19:22 WillMoogle joined #git
19:23 mischat joined #git
19:23 disi Vampire0: thanks... i suspect i did something funky when generating this patch. i just get the same error when i do that (patch does not apply). oh well... i just need to read about the porper way to generate a diff that git apply likes
19:23 disi ty for the help
19:24 cagedwisdom joined #git
19:24 disi ha! this solved it: --ignore-space-change --ignore-whitespace
19:25 anyonebutme joined #git
19:26 synthroid joined #git
19:27 Sasazuka joined #git
19:27 regedit joined #git
19:28 sgen joined #git
19:28 matoro joined #git
19:28 brent__ joined #git
19:29 Es0teric joined #git
19:32 Jackneill joined #git
19:33 nidr0x joined #git
19:35 jnavila joined #git
19:38 jstimm joined #git
19:39 mischat joined #git
19:41 jnavila_ joined #git
19:47 Sasazuka joined #git
19:47 joshszep joined #git
19:47 dhollinger joined #git
19:49 Ryanar joined #git
19:50 mischat joined #git
19:52 hashpuppy joined #git
19:52 hasc joined #git
19:52 jnavila_ joined #git
19:53 miczac joined #git
19:54 brent__ joined #git
19:56 d^sh joined #git
20:01 Synthead joined #git
20:02 nickabbey joined #git
20:02 Anja joined #git
20:05 jccn joined #git
20:07 Peuc joined #git
20:13 aard_ joined #git
20:13 Balliad joined #git
20:13 gugah joined #git
20:14 e14 joined #git
20:14 emPi joined #git
20:15 afterburned6387 joined #git
20:15 jnavila joined #git
20:17 jstimm joined #git
20:21 jnavila_ joined #git
20:24 ihradek joined #git
20:25 Nysar joined #git
20:28 Bear13yte joined #git
20:28 cdown joined #git
20:30 EisNerd joined #git
20:33 sawk joined #git
20:34 Atm0spher1c joined #git
20:34 nickabbey joined #git
20:35 EisNerd joined #git
20:35 minn joined #git
20:35 jstimm joined #git
20:36 F0sea joined #git
20:41 Darcidride joined #git
20:42 joki joined #git
20:42 Balliad joined #git
20:43 Es0teric joined #git
20:44 askb joined #git
20:48 Gsham joined #git
20:52 emPi joined #git
20:52 col joined #git
20:53 DrSlony left #git
20:57 Snugglebash joined #git
20:59 matsaman joined #git
21:02 jwmann joined #git
21:02 Sasazuka_ joined #git
21:03 solenodic joined #git
21:03 gigq joined #git
21:05 dsdeiz joined #git
21:05 dsdeiz joined #git
21:08 sharon_so joined #git
21:09 Tobbi joined #git
21:09 ugjka joined #git
21:09 emPi joined #git
21:12 gugah joined #git
21:13 dviola joined #git
21:14 jstimm joined #git
21:15 overlord_tm joined #git
21:15 adino joined #git
21:17 ryan_ joined #git
21:18 ugjka joined #git
21:25 m0viefreak joined #git
21:26 umpc joined #git
21:28 freimatz joined #git
21:29 Bombe joined #git
21:29 Balliad joined #git
21:29 astrofog joined #git
21:29 WayToDoor joined #git
21:32 wilbert_ joined #git
21:32 freimatz joined #git
21:34 solenodic joined #git
21:35 ecuanaso joined #git
21:36 cr34ton joined #git
21:36 overlord_tm joined #git
21:37 Balliad joined #git
21:42 gugah joined #git
21:44 robinsmidsrod joined #git
21:44 acetakwas joined #git
21:45 matoro joined #git
21:47 energizer1 joined #git
21:48 energizer1 I want to see each change diff to a specific file in its history
21:48 energizer1 is that possible?
21:48 endiruna joined #git
21:48 _ikke_ git log -p --all <file>
21:49 dodobrain umm.. how do i exclude a path from git diff?
21:50 _ikke_ git diff :!<path>
21:50 ozmage joined #git
21:50 energizer1 _ikke_: perfect, thanks
21:50 dodobrain err `git diff :!blah/foo` really?
21:51 dodobrain bash simply complains about event not being found (due to the !)
21:51 _ikke_ right, you need to escape / quote it
21:51 _ikke_ man gitglossary
21:51 gitinfo the gitglossary manpage is available at http://jk.gs/gitglossary.html
21:51 _ikke_ pathspec
21:52 zivester joined #git
21:53 e14 joined #git
21:54 dodobrain _ikke_, i just tried git diff A B :\!foo/bar   it said ambiguous argument ':!foo/bar': unknown revision or path not in the working tree
21:55 rwp dodobrain, Bash does csh expansion on ! in command lines. Must be escaped with a single quote.
21:55 endiruna joined #git
21:56 dodobrain rwp, same error when using single quote
21:56 rwp Oh, nevermind. I see that you did actually get a git error out of that. I will crawl back under a rock now.
21:56 dodobrain foo/bar does exist!
21:57 fletom joined #git
21:57 hahuang61 joined #git
21:57 wilbert joined #git
21:58 ecuanaso joined #git
21:59 dodobrain `git diff A B !(bar)` works properly if i  am within the `foo` dir
21:59 afterburned6387 left #git
22:00 Nysar joined #git
22:00 dodobrain but `git diff A B !(foo/bar)`  does not work. it still shows me the changes in foo/bar. the prev 2 cmdlines in bash with extglob on
22:01 rwp The !(...) syntax is bash syntax. It expands names before handing the args to git.
22:01 rwp Try using 'echo' at the front of the command to see what is expanded by the shell.
22:01 rwp echo git diff A B !(bar)
22:01 rwp echo git diff A B !(foo/bar)
22:01 rwp You will see that the shell expanded the files first, and did the exclusion first.
22:02 gargola joined #git
22:04 _ikke_ Hmm, odd, I'd expect it to work
22:04 endiruna joined #git
22:05 _ikke_ ok, found it
22:05 _ikke_ git diff .. -- :/ ':!foo/bar'
22:06 SteenJobs joined #git
22:06 SteenJobs i have a remote commit within which i need to revert a single file (damn Xcode recorded changes to a file because i had it open, and i need to completely remove changes to that file from my PR), how should i go about it?
22:10 Noldorin joined #git
22:11 Anja joined #git
22:11 canuk joined #git
22:12 druonysus_ joined #git
22:14 rwp Cool. Was reading https://git-scm.com/docs/gitglossary.html and learned about pathspec in more detail than before.
22:14 rwp Can do things like: git ls-files ':(glob,icase,top)script' ':(exclude)*.sh'
22:14 solenodic joined #git
22:15 Vampire0 SteenJobs, I already told you
22:15 SteenJobs i got disconnected, must have missed it
22:15 SteenJobs sorry /:
22:15 SteenJobs my computer died before and didn’t have my charger ha
22:15 Vampire0 SteenJobs, ah, yeah, I see I wrote seconds after you disconnected
22:15 Vampire0 [19:56:49] <Vampire0> SteenJobs, if it is the latest commit, change the file and use `git commit --amend` to modify the commit, then force-push your branch and the PR will be updated. If it is not the latest commit, use `git rebase -i` and use the edit stanza, then again do the commit amending, finish the rebase and again do the force pushing
22:15 SteenJobs suhweeet - thanks man!
22:16 SteenJobs or woman
22:16 SteenJobs (my bad)
22:16 Vampire0 man
22:16 gitinfo SteenJobs: 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.
22:17 SteenJobs ha question though. what about doing `git checkout “<commit>” <filename>` - if not, what would that do then?
22:17 SteenJobs oh and Vampire0 thanks :)
22:17 druonysus_ left #git
22:17 druonysus_ joined #git
22:18 rwp SteenJobs, git checkout modifies your working copy. It doesn't do anything on the remote. You would still need to push to change the remote.
22:18 qqx SteenJobs: That would be a valid way to change the file.
22:19 SteenJobs so if i wanted to force push the older version of the file (pre the changes i made), if i went the git checkout way, it’ll have the changes I DONT want staged - if i unstage them, will i be able to essentially revert the remote file?
22:20 SteenJobs meaning i’m still unsure how to use checkout to revert said file
22:23 dodobrain `git checkout HEAD~1 foo.file` should get you the previous version of the file
22:23 druonysus_ left #git
22:23 Vampire0 SteenJobs, yw
22:23 druonysus_ joined #git
22:24 dodobrain _ikke_, yeah it works fine . it always wants a path preceeding the exclusion
22:24 Vampire0 SteenJobs, git checkout <
22:25 dodobrain for example `git diff A B -- . ':!foo/bar'`  also works but only from the repo root. using :/ works from anywhere. thanks
22:25 EisNerd_ joined #git
22:25 Vampire0 SteenJobs, `git checkout <good sha of file> -- file && git add file && git commit --amend -C HEAD && git push -f`
22:25 druonysus_ left #git
22:25 Vampire0 SteenJobs, if the bad commit is the last one
22:25 Vampire0 SteenJobs, so essentially `git checkout @~ -- file && git add file && git commit --amend -C HEAD && git push -f`
22:26 Es0teric joined #git
22:27 ikelso joined #git
22:28 SteenJobs Vampire0: `good sha of file` == `sha of good file`?
22:29 SteenJobs and seriously, thanks a ton - freaking xcode made changes simply because i had this file open, and now my PR has a conflict. gotta love Xcode
22:31 Vampire0 SteenJobs, sha where the good version of the file is present
22:31 SteenJobs awesome
22:33 Nysar joined #git
22:33 jeffreylevesque joined #git
22:34 Gsham joined #git
22:35 druonysus_ joined #git
22:36 druonysus_ left #git
22:37 druonysus_ joined #git
22:38 Dougie187 left #git
22:40 anyonebutme joined #git
22:43 druonysus_ joined #git
22:43 aidalgol joined #git
22:44 jccn joined #git
22:44 chipotle joined #git
22:47 druonysus__ joined #git
22:47 jeffreylevesque joined #git
22:47 druonysus__ left #git
22:47 solenodic joined #git
22:48 druonysus__ joined #git
22:48 druonysus__ left #git
23:00 ToBeCloud joined #git
23:01 mostlybadfly joined #git
23:01 fmeerkoetter joined #git
23:03 dwigton qqx: Thanks for the svn dcommit rebase info. It sounds like the solution is to just delete feature branches as soon as I am done with them. I don't want to dcommit a branch since it may have changes I don't really want.
23:04 solenodic joined #git
23:04 SteenJobs Vampire0: ok i may need a bit more direction - instead of simply reverting the changes, is there a way to completely remove a changed file from a pull request? not delete the file, but simply remove any changes and references to it from within a PR.  using the methods above, i still end up with that file in the PR history
23:06 mehola joined #git
23:07 bernardio joined #git
23:07 rwp SteenJobs, You might ask that question on #github and someone there might know about them.
23:08 rwp Since github pull requests are a github specific feature.
23:08 SteenJobs i guess just interchange PR with a commit on my branch - it’s all the same, i would just need to do a force push
23:08 SteenJobs was just using the term PR
23:08 SteenJobs essentially PR == branch for my concerns
23:08 rwp I thought you were using PR to mean the github pull request feature.
23:09 SteenJobs i was, but i mean it interchangeably
23:09 ShalokShalom_ joined #git
23:09 brent__ joined #git
23:10 InfoTest joined #git
23:13 spacelord_ joined #git
23:16 cyberz joined #git
23:16 Vortex34 joined #git
23:19 InfoTest joined #git
23:21 sgen joined #git
23:21 Vampire0 SteenJobs, the way I told you originally removes any trace of the file in the PR. You must have done something wrongly. !trans
23:21 gitinfo SteenJobs: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
23:24 energizer joined #git
23:25 afuentes joined #git
23:25 madewokherd joined #git
23:26 jor_ joined #git
23:29 dsdeiz joined #git
23:29 dsdeiz joined #git
23:29 InfoTest joined #git
23:29 cyberz joined #git
23:30 SteenJobs joined #git
23:33 SteenJobs Vampire0: hey sorry, disconnected again - i ran the exact commands that you told me too, and while it reverted the file, it didn’t remove it from the PR - the PR now shows the the diff on the file, from the new version —> old version. but even the old version is wrong, and i think it’s due to a merge commit that happened somewhere along the line. oh well, hopefully i’ll figure it out, thanks again for all the help
23:40 Vampire0 SteenJobs, is this a private or public repo?
23:40 SteenJobs private /:
23:41 SteenJobs that’s why i don’t want to waste your time, you’ve already been an immense help
23:43 spacelord_ joined #git
23:44 UserOO7 joined #git
23:46 Vampire0 SteenJobs, does this PR consist of one or multiple commits?
23:46 SteenJobs multiple
23:46 Vampire0 SteenJobs, then you of course have to undo the changes in the commit that introduced the changes, not the latest one
23:47 SteenJobs right - but that commit is kind of funky - it was a merge commit
23:47 SteenJobs so i think that’s what’s messing things up
23:47 SteenJobs i can either revert to the file pre-merge or post-merge, but either way it’s still in my PR
23:47 gugah joined #git
23:50 InfoTest joined #git
23:51 Kaisyu joined #git
23:54 mikecmpbll joined #git
23:55 SteenJobs Vampire0: meaning - is it possible that during the merge it created a hybrid file, and that’s why i can only either keep the current hybrid version or revert to the pre-merge version, but not revert to the unmutated version that was originally present in the branch that was merged in?
23:55 memfrob joined #git
23:55 DieguezZ joined #git
23:56 memfrob Hi all! Great progress on my kernel hacking project. Question, I'm not sure what I did to break my tree, but I'm getting this error whenever I try to use git am: fatal: previous rebase directory .git/rebase-apply still exists but mbox given.
23:56 Vampire0 SteenJobs, you can revert to any version you want without leaving a trace, if you do it right. But it is hard to tell without the repo at hand
23:57 memfrob rm -rf .git/rebase-apply or should I try git rebase --abort?
23:57 Vampire0 memfrob, `git rebase --abort` if you are sure you are not in the middle of a rebase
23:57 SteenJobs Vampire0: yea, completely understood
23:58 mikecmpbll joined #git
23:58 memfrob well I was, but I changed my mind and didn't want to finish fixing the rebase conflicts as I changed my approach.
23:58 memfrob So I kinda just kept working away..
23:58 Vampire0 memfrob, then you should have aborted the rebase, yes.
23:58 memfrob Heh, ok thanks!
23:59 memfrob Uh oh.. "It looks like git-am is in progress. Cannot rebase."
23:59 memfrob Yeah no kidding because I got an error!
23:59 energizer joined #git

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