Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-25

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

All times shown according to UTC.

Time Nick Message
00:01 naught101 joined #git
00:02 kadoban MTecknology: Well, merge doesn't merge directories, it merges branches, so I'm not sure if you're trying to do something that doesn't make sense or ...
00:02 Gitzilla joined #git
00:03 cyphase joined #git
00:04 bayman joined #git
00:04 MTecknology kadoban: I was making changes in HEAD, but I really need to be making those an that particular branch I just created from 3.4.2
00:05 stantonk joined #git
00:05 MTecknology to later be merged into head
00:05 MTecknology err....
00:05 MTecknology *thinking*
00:06 stdio_h joined #git
00:07 MTecknology kadoban: on master/origin, I was making changes. However, I can't test those changes against master/origin because a few other changes there cause the package to no longer build. This is expected, I need to test my changes against that specific release.
00:08 bayman My current git repo monitors everything from /home/user1/proj1/* but I want to change it to  /home/user1/proj1/app1/* how do i do this?
00:08 sctskw joined #git
00:08 kadoban I have a feeling you mean origin/master? But regardless, I don't understand. You were making changes to it how? You basically never edit remote tracking branches directly. What does test your changes against that specific release mean?
00:09 kadoban bayman: "monitors"?
00:09 MTecknology I committed those changes, did 'git checkout 3.4.2; git branch -b 3.4.2+deb' and now I want to suck in what I changed in origin/master :debian/*
00:09 MTecknology Ya, that was a typo
00:10 MTecknology To test the packaging, I need to run a build against the exact source code that is in the release tarball.
00:10 bayman i want to move /home/user1/proj1/.git to /home/user1/proj1/app1.git
00:10 nidr0x joined #git
00:10 bayman app1/.git
00:11 Sucks joined #git
00:11 kadoban MTecknology: Well, I mean you can use 'git checkout someref -- some_dir/' to bring in the exact state as of a different ref, it'll just change the files in your working directory though, it's not like a merge in any sense and doesn't do anything with history. I can't tell if that's what you want or not.
00:12 leehambley joined #git
00:12 nidr0x joined #git
00:13 MTecknology kadoban: If I do 'git checkout origin/master debian/', then git commit, start modifying things, get it all working nice and pretty, will I then be able to merge my branch without too much pain?
00:13 cd-rum joined #git
00:13 MTecknology That sounds like the workflow I'm looking for.
00:15 MTecknology I guess, even if it doesn't let me merge without pain, I can still completely clobber and checkout from the other and apply it as one big patch.
00:15 Sucks joined #git
00:15 kadoban MTecknology: Well, I don't really have a good sense of what you're trying to do, unfortunately :-/
00:16 kadoban bayman: I don't understand your goal either. Something with filter-branch's subdir filter maybe?
00:16 hahuang61 joined #git
00:17 stantonk joined #git
00:19 tesuji_ joined #git
00:20 forrestv joined #git
00:20 MTecknology kadoban: There are a bunch of issues with the debian packaging in bitlbee source code. One of those issues is that they have debianized packaging in the source repo at all. I forked the repo and now I'm trying to fix all of the issues in the packaging. I /was/ working on origin/master, but now I realize I can't actually test any package building because origin/master != <released_version>. An
00:20 MTecknology obvious statement, but not something I thought of earlier. So, anyway, I did git checkout 3.4.2; git branch -b 3.4.2+deb; git checkout origin/master -- debian/; git diff --cached; <reviewed>; git commit -a
00:20 MTecknology Now I'm editing things and getting ready to do a test build. Hoping it works.
00:21 MTecknology If this works, then I'll need to eventually bring these changes back to origin/master.
00:21 Samual joined #git
00:23 jaguarmagenta joined #git
00:25 MTecknology kadoban: seems to be working! :D
00:26 MTecknology Oh! I'm gonna be able to uncommit these changes in origin/master since I've not pushed and the ~"merge" has no reference to where it came from :)
00:27 fris joined #git
00:29 cqi joined #git
00:30 MTecknology kadoban: If that's still confusing, I'll need help providing information, but I also think you may have answered everything I need. :)
00:30 MTecknology well, you and osse
00:34 qpdb joined #git
00:34 MTecknology ah, turns out they actually are linked in history... I'm gonna go ahead and /not/ remove that current commit
00:34 MTecknology thank you so much, git, for stopping when you did
00:36 snowkidind joined #git
00:37 osse yes me
00:38 mwhooker joined #git
00:39 mehola joined #git
00:40 * MTecknology grumbles..
00:41 MTecknology this is complaining that a patch can't be applied, but I recreated it from scratch against the source and git is telling me there are zero differences because... it's the same exact patch
00:42 xameada joined #git
00:42 MTecknology an issue with quilt, not git
00:43 fris left #git
00:43 ganzeecoding joined #git
00:44 moneylotion joined #git
00:44 SimonNa joined #git
00:44 moneylotion joined #git
00:46 MTecknology and now I get to file a bug against quilt
00:47 Sucks joined #git
00:50 bket joined #git
00:52 stantonk joined #git
00:58 jaguarmagenta joined #git
00:58 xall joined #git
00:58 Literphor joined #git
00:59 DolphinDream joined #git
01:00 pur3eval joined #git
01:03 gax joined #git
01:04 MacWinne_ joined #git
01:07 arescorpio joined #git
01:07 leehambley joined #git
01:08 xall_ joined #git
01:09 oberststen joined #git
01:12 Asiajey_ joined #git
01:16 Literphor joined #git
01:16 sleepee joined #git
01:17 mehola joined #git
01:17 moneylotion joined #git
01:17 CheckDavid joined #git
01:18 sleepee joined #git
01:24 mingrammer joined #git
01:25 andlabs joined #git
01:27 stantonk joined #git
01:29 jaguarma_ joined #git
01:30 ochorocho__ joined #git
01:40 jaguarmagenta joined #git
01:41 Literphor joined #git
01:46 sarbs joined #git
01:50 fuchstronaut joined #git
01:52 oberststen joined #git
01:54 Dougie187 joined #git
01:55 texinwien_ joined #git
01:56 pks joined #git
01:56 Orbitrix joined #git
02:05 lagothri1 joined #git
02:10 cagedwisdom joined #git
02:13 danimal2 joined #git
02:13 Orbitrix joined #git
02:15 HanClinto joined #git
02:15 Orbitrix joined #git
02:16 hahuang61 joined #git
02:17 clemf joined #git
02:18 netj joined #git
02:19 mingrammer joined #git
02:22 sangy joined #git
02:24 Danzeel left #git
02:25 Literphor joined #git
02:26 thekingofbandit joined #git
02:26 LeMike_ joined #git
02:28 mingrammer joined #git
02:30 lindenle joined #git
02:30 clemf joined #git
02:30 cdg joined #git
02:31 ochorocho__ joined #git
02:31 chachasmooth joined #git
02:35 clemf joined #git
02:37 Jellyg00se joined #git
02:39 ajf- joined #git
02:40 SwiftMatt joined #git
02:41 BSaboia joined #git
02:42 pur3eval joined #git
02:44 clemf joined #git
02:44 lindenle joined #git
02:45 stantonk_ joined #git
02:47 clemf joined #git
02:48 lindenle_ joined #git
02:54 Dougie187 left #git
02:54 bluezone joined #git
02:56 clemf joined #git
02:59 durham joined #git
03:02 hexagoxel joined #git
03:04 clemf joined #git
03:07 stantonk joined #git
03:07 msm joined #git
03:07 PioneerAxon joined #git
03:09 cyphase joined #git
03:17 robotroll joined #git
03:17 eozelda left #git
03:17 Wysi joined #git
03:18 clemf joined #git
03:19 ahr3n joined #git
03:20 emilyrose joined #git
03:20 emilyrose joined #git
03:20 k3rn31 joined #git
03:23 MTecknology Is it possible to checkout files from another branch at a specific tag?
03:23 HanClinto joined #git
03:24 kadoban You can checkout files from a specific tag, yes.
03:24 clemf joined #git
03:24 kadoban git checkout the_tag -- the_files
03:25 lindenle_ joined #git
03:26 MTecknology ah, I see my oopsie
03:26 MTecknology thanks!
03:26 kadoban I restated that way because tags don't know/care what branch they're on. It's just a name for a commit, which also doesn't know/care if it's on a branch or not.
03:26 stantonk joined #git
03:27 clemf joined #git
03:29 xall_ joined #git
03:31 MTecknology That was apparent to me once you worded it that way, actually :)
03:31 clemf joined #git
03:34 clemf joined #git
03:36 clemf joined #git
03:38 phroa MTecknology: man gitrevisions and !concepts :)
03:38 gitinfo MTecknology: "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html
03:38 gitinfo MTecknology: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
03:38 a3Dman joined #git
03:39 lindenle joined #git
03:39 MTecknology more reading material!
03:39 frogonwheels joined #git
03:40 phroa gitrevisions is ridiculous
03:40 phroa there's really no shortage of reading material if you're actually interested
03:41 ahmedelgabri joined #git
03:41 MTecknology the challenge is finding time to read it all
03:41 clemf joined #git
03:45 clemf joined #git
03:46 Literphor joined #git
03:50 fstd_ joined #git
03:51 fuchstronaut joined #git
03:52 clemf joined #git
03:56 boombatower joined #git
04:03 dreiss joined #git
04:04 xameada joined #git
04:08 Ma5ter joined #git
04:08 mehola joined #git
04:09 Faylite joined #git
04:10 SwiftMatt joined #git
04:14 clemf joined #git
04:16 ahmedelgabri joined #git
04:17 Garen joined #git
04:17 hahuang61 joined #git
04:21 emPi joined #git
04:21 Andrew_K joined #git
04:22 b_rare joined #git
04:23 clemf joined #git
04:26 pur3eval joined #git
04:27 Mowgli joined #git
04:31 ajf- joined #git
04:31 mehola joined #git
04:31 ochorocho__ joined #git
04:32 Pulp joined #git
04:35 inflames joined #git
04:36 nilg joined #git
04:38 shgysk8zer0 joined #git
04:40 k3rn31 joined #git
04:43 intellix joined #git
04:43 ffabi joined #git
04:43 pur3eval joined #git
04:44 orbitphreak joined #git
04:45 Sucks joined #git
04:45 Mowgli joined #git
04:50 Cabanossi joined #git
04:51 pur3eval joined #git
04:53 freimatz joined #git
04:54 tristanp joined #git
04:54 ffabi joined #git
04:56 Codfection joined #git
04:56 stonerfish joined #git
05:01 dreiss joined #git
05:01 ahmedelgabri joined #git
05:02 jceb joined #git
05:03 subhojit777 joined #git
05:05 ffabi joined #git
05:09 orbitphreak joined #git
05:12 ochorocho__ joined #git
05:13 Sucks joined #git
05:15 Sucks joined #git
05:17 Macaveli joined #git
05:17 clemf joined #git
05:19 scarabx joined #git
05:21 ffabi joined #git
05:27 phanimahesh joined #git
05:31 orbitphreak joined #git
05:34 Repox joined #git
05:35 djb-irc joined #git
05:35 clemf joined #git
05:35 mcqr joined #git
05:36 zacts joined #git
05:37 titanium17 joined #git
05:38 zeroed joined #git
05:40 netj joined #git
05:41 nnyk_ joined #git
05:44 ffabi joined #git
05:44 dopesong joined #git
05:44 Sucks joined #git
05:45 dopesong_ joined #git
05:47 ThomasLocke joined #git
05:47 qt-x joined #git
05:48 theskillwithin joined #git
05:49 jaguarma_ joined #git
05:52 fuchstronaut joined #git
05:55 nnyk joined #git
05:58 gargola joined #git
06:00 PCatinean joined #git
06:05 rscata joined #git
06:08 githogori joined #git
06:14 dopesong joined #git
06:14 durham joined #git
06:16 JeroenT joined #git
06:17 LeMike joined #git
06:24 zeroed joined #git
06:26 _ikke_ Read them gradually
06:28 chachasmooth joined #git
06:30 star_prone joined #git
06:30 redman joined #git
06:34 chachasmooth joined #git
06:39 Sceorem joined #git
06:43 jaguarmagenta joined #git
06:44 akiva joined #git
06:46 zincrokx joined #git
06:46 drbean_ joined #git
06:47 skasturi joined #git
06:48 danslo joined #git
06:48 yuhlw_ joined #git
06:48 phanimahesh joined #git
06:48 Endarked joined #git
06:50 nilg joined #git
06:53 Ma5ter joined #git
06:57 nnyk joined #git
06:59 LeBlaaanc joined #git
07:01 sagerdearia joined #git
07:01 Faylite_ joined #git
07:03 rchavik joined #git
07:05 pluszak joined #git
07:05 ahmedelgabri joined #git
07:05 pluszak git has the feature of mergin subtrees into a project. But how can I merge the other way around?
07:06 pluszak I know I can filter out everything but what I need but I'm not sure if I don't do any unneeded work
07:06 cdg joined #git
07:08 emmajane joined #git
07:08 deltab separating out a subtree? yes, you can do that with git subtree split
07:13 ochorocho__ joined #git
07:13 pluszak deltab: Yes, did that previously. But now that I have the split can I, like, fastforward that operation?
07:14 LeMike joined #git
07:14 kadoban pluszak: What would that mean?
07:14 stantonk joined #git
07:15 pluszak kadoban: I have split a subtree into a new repository. Now that main repo been updated. I know I can split the main repository into a new branch again and merge that new branch into my split repo. But can I, like, do it faster?
07:15 [Brain] joined #git
07:15 deltab you can split again, extending the existing branch
07:16 pluszak extending?
07:17 * jantje has troubles with pre/post receive hooks and signals. (short: client disconnects whilst server runs pre-receive. Pre-receive doesn't terminate, commit goes in, but server does not execute post-receive)
07:19 deltab "Repeated splits of exactly the same history are guaranteed to be identical (ie. to produce the same commit ids). Because of this, if you add new commits and then re-split, the new commits will be attached as commits on top of the history you generated last time, so 'git merge' and friends will work as expected."
07:19 deltab pluszak: I'm guessing that's what you're referring to
07:19 Silenced joined #git
07:19 Silenced joined #git
07:19 pluszak deltab: yes, that's how I intend to do it
07:20 Softeisbieger joined #git
07:21 pks joined #git
07:21 GavinMagnus joined #git
07:23 GavinMagnus left #git
07:24 p4trix joined #git
07:24 harish_ joined #git
07:26 GavinMagnus joined #git
07:26 JeroenT joined #git
07:29 xall_ joined #git
07:30 intellix joined #git
07:30 nnyk_ joined #git
07:32 stasmakarov joined #git
07:36 MrMojito joined #git
07:37 aidalgol joined #git
07:39 LiohAu joined #git
07:39 cdown joined #git
07:41 jaguarma_ joined #git
07:42 wrouesnel1 joined #git
07:43 Alienpruts joined #git
07:43 jaguarmagenta joined #git
07:43 ahmedelgabri joined #git
07:47 cdown joined #git
07:52 fuchstronaut joined #git
07:52 King_Hual joined #git
07:52 King_Hual joined #git
07:54 Sasazuka joined #git
07:57 JeroenT joined #git
08:00 drbean joined #git
08:00 Macaveli joined #git
08:01 sagerdearia joined #git
08:01 marcogmonteiro joined #git
08:02 meditans joined #git
08:10 zeroed joined #git
08:10 zeroed joined #git
08:13 kurkale6ka joined #git
08:13 tomog999_ joined #git
08:15 notebox joined #git
08:17 Alienpruts joined #git
08:18 clmsy joined #git
08:18 Hounddog joined #git
08:20 tvw joined #git
08:21 Oebele joined #git
08:24 * jantje has troubles with pre/post receive hooks and signals. (short: client disconnects whilst server runs pre-receive. Pre-receive doesn't terminate, commit goes in, but server does not execute post-receive)
08:26 chll_ joined #git
08:27 afusion joined #git
08:31 baxx joined #git
08:35 Anticom joined #git
08:43 cdown_ joined #git
08:44 mcqr joined #git
08:45 nilg joined #git
08:49 JeroenT joined #git
08:51 djb-irc joined #git
08:53 ribasushi joined #git
08:53 acetakwas joined #git
08:54 reactormonk joined #git
08:54 reactormonk How can I find out which changed files (working tree vs. HEAD) contain a certain string?
08:55 ams__ joined #git
09:00 stasmakarov joined #git
09:02 TomyWork joined #git
09:05 moritz reactormonk: git diff --name-only | xargs -l grep -F searchstring
09:06 mkopriva joined #git
09:08 reactormonk moritz, doesn't work because I deleted the files :-)
09:08 reactormonk I'd like to search the indexed file
09:09 moritz reactormonk: git grep -l -F searchstring | sort | comm - <(git diff --name-only)
09:09 moritz probably needs comm with the option -3
09:09 nnyk_ joined #git
09:09 moritz or something like that
09:10 reactormonk nice
09:10 moritz reactormonk: if you want to search in the diff, not in the changed files, you can also try git diff -Ssearchstring, optionally with --name-only
09:11 reactormonk moritz, that's what I was looking for, thanks
09:14 Guest3307 joined #git
09:15 ochorocho__ joined #git
09:18 lb moritz i should send you cookie from time to time, just to maintain your scripting knowledge
09:18 GavinMagnus joined #git
09:19 moritz lb: cookie as a service \o/
09:20 lb moritz damn, i should register that domain fast ^^
09:20 shymega joined #git
09:21 moritz Domain cookieasaservice.io is available for purchase
09:21 lb moritz now i got to hurry, before you grab it
09:21 moritz "caas" seems to be taken for most popular TLDs
09:22 moritz lb: don't worry, I've stopped years ago grabbing domains for stuff that I don't actually want to implement
09:22 lb ;)
09:22 moritz and I've promised myself that I won't start another project before I finish my current book
09:23 moritz though some ideas were quite tempting :-)
09:23 lb moritz tech book?
09:24 lb caas.ml, .cf , .gq available for free ;)
09:26 moritz lb: yes, about automating deployments and continuous delivery, https://deploybook.com/ / https://leanpub.com/deploy
09:26 moritz always happy about feedback :-)
09:29 bongjovi joined #git
09:30 lb too small sample for actual feedback i guess. but the topic itself is tempting.
09:31 moritz lb: I can send you ~80 pages (A4) PDF or .epub or .mobi for feedback if you want :-)
09:31 moritz lb: /msg me an email address if you're interested
09:31 lb i already typed /msg moritz but then i started thinking about what email adress is the best option :D
09:32 sweatsuit joined #git
09:32 bremner president@whitehouse.gov
09:32 lb bremner isn't that already donaldtrump@whitehouse.gov?
09:33 Hi-Angel joined #git
09:34 intellix joined #git
09:35 Mowgli joined #git
09:35 cbreak I heard china built a wall.
09:35 gfixler joined #git
09:36 cbreak and someone has wall envy.
09:36 moritz lb: email sent
09:36 lb moritz received
09:36 bremner imagine Sylvester Stallone yelling "Hadrian!"
09:36 moritz the offer goes to others here too; you get a free preview for feedback :-)
09:36 lb bremner now that wall is from china to the UK ? Oo
09:37 lb that donald duck is a busy man
09:37 lb moritz caas.ml registered ^^
09:38 moritz lb: :-)
09:38 aax joined #git
09:38 lb maybe an option to refresh my flash knowledge ^^
09:38 lb flask*
09:38 lb or trying djano
09:38 lb django
09:38 lb damn my typing lost its skill
09:38 jost joined #git
09:39 moritz and here I was questioning your sanity for a moment (building a new website with flash) :-)
09:39 lb moritz sooo sorry ^^
09:40 lb < more the python than perl guy
09:40 Hi-Angel Does anybody know, what could cause git to ignore proxy settings? I have both $http_proxy, $https_proxy set, and I have proxy lines in ~/.gitconfig, but still — I see trough tcpdump — it sends packets directly to github.
09:41 moritz shouldn't those vars be all-caps?
09:41 moritz HTTP_PROXY?
09:41 Hi-Angel I have both up case and lower case variables
09:43 mehola joined #git
09:43 Hi-Angel Ah, I see!
09:44 Hi-Angel I should have changed the "git" protocol to "https" protocol in the address I want to clone!
09:44 lb Hi-Angel that should help ^^
09:45 intellix joined #git
09:49 Hounddog joined #git
09:49 Endarked joined #git
09:50 JeroenT joined #git
09:51 noidea joined #git
09:52 satya4ever joined #git
09:53 fuchstronaut joined #git
09:53 fuchstronaut joined #git
09:54 k3rn31 joined #git
09:55 yoan joined #git
09:58 Pulp joined #git
09:58 Lomex joined #git
09:59 Pulp joined #git
10:00 MACscr any suggestions on what I might be doing wrong here? http://paste.debian.net/plain/784840
10:00 acetakwas joined #git
10:00 Pulp joined #git
10:00 berndj joined #git
10:01 dopesong joined #git
10:01 drbean_ joined #git
10:03 moritz MACscr: you're confusing remotes and branches
10:03 moritz MACscr: if you can't add a *remote*, renaming a *branch* doesn't work
10:03 moritz MACscr: you want git remote rename origin old-origin # or something like
10:04 Ma5ter joined #git
10:05 MACscr i just want to setup this repo of mine that i just setup on github on this system
10:05 MACscr it only has a readme on github. pretty basic
10:06 moritz MACscr: so, do as I said
10:06 moritz then add the remote
10:06 Ma5ter joined #git
10:06 MACscr but there is nothing to rename
10:06 moritz ah no, it seems your remote is already configured
10:07 MACscr correct
10:07 moritz well, then follow the instructions in the error message
10:07 tango_ joined #git
10:08 Ma5ter joined #git
10:09 lss8 joined #git
10:09 cdown joined #git
10:09 Gonzo89 joined #git
10:10 Ma5ter joined #git
10:10 MACscr i had. i resolved it though. thanks
10:11 Ma5ter joined #git
10:13 Ma5ter joined #git
10:17 fairuz joined #git
10:17 solf1re joined #git
10:17 geoid joined #git
10:17 fatmarcel joined #git
10:18 ShapeShifter499 joined #git
10:20 nikitasius joined #git
10:21 nikitasius hi folks! where i can get help about code licencing?
10:22 moritz nikitasius: it really depends. Ultimately at a laywer who knows software licensing
10:23 nikitasius moritz: i want to public my project on github (opensource) and i want to keep it opensource even if someone will edit it.
10:23 moritz nikitasius: then it sounds like you want a so-called "copyleft license", like GPL
10:23 nikitasius moritz: i read on web, that GPL it preferable, but here is gplv1, v2 and v3 and i dont know what will be better.
10:23 nikitasius nice
10:24 moritz gplv3 includes patent protection from those who use the software
10:24 moritz which is nice for the author, but makes some companies hesitant to adopt such software
10:24 moritz gplv1 is obsolete, afaict
10:25 intellix joined #git
10:25 moritz so pick your poison :-)
10:25 nikitasius if i want people to use my code and edit it as they want and i don't think about companies - gplv3?
10:26 nikitasius moritz: im sorry for my english, its not my language:/
10:27 moritz nikitasius: that would be my personal choice for a new project, yes
10:27 nikitasius moritz: thank you!
10:27 moritz nikitasius: though if it's in an existing ecosystem, i'd personally prefer the license that's most used there
10:28 moritz nikitasius: for example Perl modules tends to be licensed "under the same terms as Perl itself" (GPLv2 or Artistic License), so I use that for my Perl modules as well
10:28 nikitasius most of software what i use is under gpl (1 or 3) and MIT. but project is made from zero.
10:31 nikitasius moritz: thank you for information. In my case its more difficult (SQL & Java). Oracle uses their own licence for java as a product. But normally my code is my code..
10:32 dopesong joined #git
10:37 mattcen joined #git
10:39 pluszak left #git
10:40 mdw joined #git
10:40 sdothum joined #git
10:44 jaguarmagenta joined #git
10:44 mehola joined #git
10:46 troulouliou_div2 joined #git
10:47 Codfection joined #git
10:49 settermjd joined #git
10:51 grohne joined #git
10:53 grohne when git bisecting an issue that only occurs with probability p (i.e. if you see it, you know its there, but if you don't see it you retry n times until (1-p)^n is small enough), is there a way to bias git's commit selection towards broken commits?
10:54 aguimaraes1986 joined #git
10:55 mingrammer joined #git
10:55 canton7 not sure what you're asking - git bisect needs a definite yes/no, not a "probably no, but it might actually be"
10:56 Lomex joined #git
10:57 grohne canton7: I know, so what I'm saying is that answering "bad" is much less effort than answering "good" (because good needs more testing), so I'd like git bisect not look for a commit in the middle between my last good and last bad one, but slightly bias the selection towards bad, because that's less effort in the end
10:58 grohne it means more commits tested of course
10:59 canton7 ah righty, gotcha. I don't think there's any way I'm afraid
10:59 Endarked joined #git
10:59 canton7 can you automate the test?
10:59 Endarked joined #git
11:00 JeroenT joined #git
11:00 grohne possibly. it's an early kernel boot bug ;)
11:01 canton7 ah, funtimes
11:01 grohne though I have a serial console and a software power switch :)
11:01 canton7 I haven't looked at the source for bisect, but it might be easy enough to fiddle
11:02 canton7 it's bash, after all
11:02 drbean joined #git
11:02 canton7 ah, no it isn't
11:03 canton7 ... or maybe it is. there's both bash and c for bisect
11:03 grohne I could always work around, by doing a bisect log; bisect good; record the commit; bisect replay; checkout that commit
11:03 grohne though replay takes a lot of time on its own on a linux kernel
11:05 grohne I just thought, maybe someone else already ran into the issue with "asymterically expensive test cases"
11:07 nnyk joined #git
11:09 djb-irc joined #git
11:12 mcqr joined #git
11:15 Blkt joined #git
11:15 mrkat joined #git
11:16 ochorocho__ joined #git
11:16 ojdo joined #git
11:18 JCaesar I'd like to do a bit of heavy history rewriting, linearizing a branch of about 100 commits, changing its base commit, etc…
11:18 selckin i recommend redbul
11:18 JCaesar is there some machinery that just takes a list of commits and rebases them, one by one on, on some other commit?
11:19 selckin cherry-pick
11:19 osse JCaesar: what you are describing is git rebase
11:19 osse JCaesar: you can use git rebase --onto to be more precise
11:20 osse JCaesar: https://github.com/Osse/git-stuff/blob/master/rebase-onto.txt
11:20 JCaesar Hmm. Maybe with multiple rebases…
11:20 JCaesar I also want to get rid of all diamond structures in the process, that's why…
11:21 JCaesar (I was aware of these two options, but neither of them seems particularily appealing…)
11:22 grayjoc joined #git
11:22 yqt joined #git
11:22 selckin then you're not mentioning part of the problem (which you just did i ugess)
11:22 osse rebase automatically discards merges and whatnot
11:23 JCaesar it does? I'll have to try that then…
11:23 osse you'll be neck deep in merge conflicts maybe
11:23 osse but that's what you had coming anyway
11:24 chrisml joined #git
11:24 JCaesar osse: That's the fun. All of those merges are just plain automatic, nobody ever touched anything conflicting in there…
11:28 chrisml i setup a new remote and pushed but had the post-receive hook named incorrectly, i've now renamed it and want to re-push, how can i do that? as it says "everything is up to date"
11:30 bremner make an empty commit and push it?
11:31 HoierM joined #git
11:33 rnsanchez joined #git
11:35 osse chrisml: i suggest commit --amend then push force
11:35 osse unless someone has pulled
11:35 chrisml thanks osse bremner
11:36 Finnoloid joined #git
11:37 dopesong joined #git
11:37 cdg joined #git
11:39 GavinMagnus joined #git
11:41 notebox joined #git
11:42 johnmilton joined #git
11:46 settermjd joined #git
11:46 griffindy joined #git
11:48 HanClinto joined #git
11:48 playfullyExist joined #git
11:50 sterichards joined #git
11:51 sterichards I’ve created a new branch, merged 2 existing branches into that one, committed but getting a weird ‘push’ problem, as seen here - http://pastebin.com/zPy4Q6CK
11:51 sterichards Git thinks there are some changes to push but when I do a push, it shows ‘everything up-to-date'
11:52 grawity but you're pushing to a different branch than Git checks
11:52 grawity pay attention to "Your branch is ahead of 'origin/feature/event-videos' by 2 commits."
11:52 sterichards Ahh, yes. Sorry, I missed that
11:52 sterichards That explains all
11:52 grawity that's also why you get the 'fatal' (a safety feature when upstream branch has a different name)
11:52 King_Hual joined #git
11:52 King_Hual joined #git
11:53 sterichards What is my best approach from here to completely disassociate event-videos from event-videos-and-event-bookings?
11:54 sterichards I have no need for the event-videos branch anymore, as it’s been merged nicely. I have no use for the branch but not sure if deleting that is going to cause me more headaches, git wise?
11:54 fuchstronaut joined #git
11:54 grawity git branch -u origin/feature/event-videos-and-event-bookings
11:54 sterichards That’s worked nicely, thanks @grawity
11:55 circ-user-oufP5 joined #git
11:57 sterichards left #git
11:58 dopesong_ joined #git
12:01 King_Hual joined #git
12:01 King_Hual joined #git
12:01 Sceorem joined #git
12:02 drbean_ joined #git
12:03 _0xAX joined #git
12:05 Jellyg00se joined #git
12:07 courrier joined #git
12:07 nilg joined #git
12:08 t0by joined #git
12:10 TooLmaN joined #git
12:10 cdown joined #git
12:12 fatmarcel joined #git
12:17 Lomex joined #git
12:18 plasticle joined #git
12:20 mcqr joined #git
12:23 dopesong joined #git
12:26 stantonk joined #git
12:27 fmcgeough joined #git
12:27 cyphase joined #git
12:27 ack_inc joined #git
12:27 geoid joined #git
12:29 dopesong joined #git
12:32 SourTrout joined #git
12:37 ribasushi joined #git
12:39 HanClinto joined #git
12:40 Macaveli joined #git
12:42 andlabs joined #git
12:43 livingstn joined #git
12:44 espindola joined #git
12:44 jaguarmagenta joined #git
12:45 dopesong joined #git
12:45 geoid joined #git
12:45 leehambley joined #git
12:46 mischat joined #git
12:47 geoid_ joined #git
12:54 Darren_ joined #git
12:54 aurelien__ joined #git
12:57 Kartagis joined #git
12:58 Kartagis what do I do to blame a file on a given date?
12:58 rnsanchez_ joined #git
12:59 selckin find a sha on that date
12:59 spudowiar Well, to get the commit for a certain date, you use `git rev-list -1 --before="$DATE" master`
13:00 spudowiar or whatever branch you want
13:00 spudowiar what you probably want it
13:00 spudowiar *is
13:01 spudowiar git blame $(git rev-list -1 --before="$DATE" HEAD) -- filename
13:01 spudowiar where DATE is the latest date you want
13:02 JeroenT joined #git
13:03 kadoban You can also try 'git blame master@{1970-01-01}', though it won't work too well unless the repo you're currently in is the one where most changes happened locally.
13:03 lindenle joined #git
13:05 spudowiar That's pretty cool
13:05 andlabs left #git
13:05 spudowiar But it's reflog only, right?
13:06 kadoban Right
13:07 irco joined #git
13:10 zivester joined #git
13:10 lmatteis joined #git
13:11 maucar joined #git
13:11 ExoUNX joined #git
13:11 nnyk joined #git
13:12 synthroid joined #git
13:12 rgrinberg joined #git
13:14 DelphicOkami joined #git
13:14 al-damiri joined #git
13:15 sanketdg joined #git
13:15 lindenle joined #git
13:15 bsanford joined #git
13:16 ochorocho__ joined #git
13:20 CheckDavid joined #git
13:20 JeroenT joined #git
13:21 dopesong joined #git
13:24 ajf- joined #git
13:27 dopesong joined #git
13:29 lindenle_ joined #git
13:29 Darren__ joined #git
13:30 _rnsanchez_ joined #git
13:30 NeverDie joined #git
13:32 ncd|leeN joined #git
13:34 notebox joined #git
13:35 k3rn31 joined #git
13:39 f3r70rr35f joined #git
13:44 Silenced_v2 joined #git
13:45 netj_ joined #git
13:45 Sceorem joined #git
13:49 mbrzuzy joined #git
13:50 jimi_ joined #git
13:51 stantonk joined #git
13:52 clemf joined #git
13:55 fuchstronaut joined #git
13:55 PCatinean_ joined #git
13:57 leehambley joined #git
13:58 doebi joined #git
14:00 shinnya joined #git
14:01 piattino joined #git
14:02 piattino joined #git
14:02 piattino hi. can i do this using only git, without resorting to grep? git log --oneline | grep -i foobar
14:03 GodGinrai joined #git
14:03 perlpilot git log -i --grep=foobar
14:03 perlpilot er, git log -i --grep=foobar --oneline
14:03 piattino -i? -i is the insensitive i was missing?
14:03 perlpilot git help log  #  "-)
14:03 mattcen joined #git
14:03 perlpilot :-) even
14:03 * perlpilot can't type today
14:04 apprentice joined #git
14:04 piattino perlpilot: i have some version problems then. for instance, i have -G but not --grep
14:05 Asiajey joined #git
14:05 GodGinrai piattino: what's your `git --version` output?
14:05 piattino perlpilot: thanks though.. i had not thought of -i (did not know about it)
14:05 flavi0 joined #git
14:05 LionsMane joined #git
14:05 piattino 2.3 i think?
14:05 f3r70rr35f joined #git
14:06 piattino is there --grep in 2.3.x?
14:06 _ikke_ 2.3 is new enough
14:07 _ikke_ git log --grep is pretty old
14:07 flavi0 I want to change a submodule to track the master branch instead of a specific commit. it seems only add supports the -b option. do I have to go through the laborous process of removing the submodule and readding it or can it be changed for an existing submodule?
14:08 axl_ joined #git
14:10 perlpilot flavi0: last I checked (admittedly, it's been a while and I don't really use submodules), submodules didn't track anything and were *only* good for a specific commit.
14:10 ELFrederich joined #git
14:11 ELFrederich any recipe out there that will make your file modification times in your workspace the same as the last mod time from a git perspective?
14:11 leehambley joined #git
14:11 ELFrederich I'd like to be able to do "ls -altr" and see the last modified file as far as Git is concerned
14:11 chigang_ joined #git
14:12 tremblerz joined #git
14:12 tremblerz Hey all !
14:13 tremblerz I made changes to a file but in the wrong branch.
14:13 flavi0 perlpilot: that's possible since 1.8.2 it seems by using the -b option for submodule add. just found a post explaining it should work to switch an existing submodule over by setting an according config key by hand: http://stackoverflow.com/questions/1777854/git-submodules-specify-a-branch-tag/18799234#18799234
14:13 flavi0 let's see how that works..
14:13 l4v2 joined #git
14:13 tremblerz Can I bring that file to a different branch ?
14:13 _ikke_ ELFrederich: I'm not aware of someth that does that
14:14 tremblerz I haven't done git add either.
14:15 phaleth joined #git
14:17 blackwind_123 joined #git
14:17 _ikke_ tremblerz: !float
14:17 gitinfo tremblerz: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
14:18 stantonk joined #git
14:19 jjasinski joined #git
14:20 BlackMaria joined #git
14:22 kpease joined #git
14:25 kbs joined #git
14:25 clemf joined #git
14:27 narendraj9 joined #git
14:31 stantonk joined #git
14:31 kpease joined #git
14:32 ResidentBiscuit joined #git
14:32 blackwind_123 joined #git
14:34 PioneerAxon joined #git
14:35 dopesong joined #git
14:35 SourTrout joined #git
14:36 Macaveli joined #git
14:37 sangy joined #git
14:38 ELFrederich how can I unset a config via command line?  I can do something like "git -c core.pager=less log foo.sh" but how can I unset the pager so that it all gets dumped to the screen?
14:39 kadoban --unset ?
14:39 kadoban Er, maybe I misunderstood, just looked at your command.
14:41 GodGinrai ELFrederich: couldn't you just pass `cat` as the pager?
14:41 ELFrederich kadoban: yeah; in writing a script I want to get all of the output, I don't want it piped into any pager at all.  I'd like to set this via the command line (not save it globally)
14:41 ELFrederich GodGinrai: that'll work ;-)
14:42 JeroenT joined #git
14:43 airdisa joined #git
14:44 piattino joined #git
14:45 SourTrou_ joined #git
14:45 jaguarmagenta joined #git
14:45 dopesong joined #git
14:46 brandonw joined #git
14:53 meissa joined #git
14:54 elementalest joined #git
14:54 elementalest joined #git
14:54 harish_ joined #git
14:55 meissa how do I list the nearest tag applicable to a commit, on a remote repository ?
14:55 meissa git 2.7.4
14:56 WayToDoor joined #git
14:56 flavi0 left #git
14:56 diegoviola joined #git
14:56 GodGinrai meissa: nearest to a commit, or latest tag?  Latest tag should be fairly simple
14:57 kadoban meissa: fetch and then use some invocation of 'git describe' most likely?
14:57 neovesta joined #git
14:57 kitsu joined #git
14:58 piattino joined #git
14:58 star_prone joined #git
14:58 meissa GodGinrai: latest tag, but specific to a branch
14:59 kitsu Hey! How can I look via git-log of history of HEAD and n newer commits?
14:59 GodGinrai meissa: yea, git-describe sounds like it will do that for you
14:59 zivester joined #git
14:59 GodGinrai kitsu: *newer* commits than HEAD?
15:00 kitsu yep
15:00 kitsu in detached head state
15:00 kadoban kitsu: commits don't really have references that way, so it's not likely to be clean. You can also have several answers to that.
15:00 meissa can I do it without fetching ?
15:01 dopesong joined #git
15:01 _ikke_ No, not really
15:01 kadoban meissa: If you have SSH access perhaps. Otherwise, yeah not really.
15:02 titanium17 joined #git
15:04 eka joined #git
15:05 ack_inc joined #git
15:06 neovesta joined #git
15:06 k3rn31 joined #git
15:06 crose joined #git
15:07 achadwick joined #git
15:08 clemf joined #git
15:08 jeremyhall joined #git
15:09 meissa regarding describe, what is "the abbreviated object name of the most recent commit" ?
15:09 ajpiano joined #git
15:10 GodGinrai meissa: IIRC, it's the shorthash
15:10 GodGinrai not sure tho'
15:11 _ikke_ prefixed with a g
15:11 meissa oh
15:11 meissa right, g isn't a valid shorthash char
15:12 acetakwas joined #git
15:13 neca joined #git
15:13 InfoTest joined #git
15:13 neeca joined #git
15:15 xpk joined #git
15:16 lindenle joined #git
15:17 Topic for #git is now Welcome to #git, the place for git help and aisle 7 cleanups | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.1 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Be careful not to step in the git-gui
15:17 ochorocho__ joined #git
15:17 lindenle joined #git
15:17 Gitzilla joined #git
15:18 jstein_ joined #git
15:18 danslo joined #git
15:18 neovesta joined #git
15:19 supaket joined #git
15:21 leehambley joined #git
15:26 lindenle joined #git
15:27 SourTrout joined #git
15:28 moei joined #git
15:30 foist joined #git
15:30 thiago joined #git
15:31 lindenle_ joined #git
15:31 geoid joined #git
15:32 SourTrou_ joined #git
15:35 scarabx joined #git
15:35 SourTrout joined #git
15:35 liuzhen joined #git
15:36 shertel joined #git
15:39 LeBlaaanc joined #git
15:39 acetakwas joined #git
15:40 subhojit777 joined #git
15:42 lindenle joined #git
15:42 lindenle joined #git
15:43 GandalfTheWizard joined #git
15:44 SourTrou_ joined #git
15:44 EvilPenguin joined #git
15:46 Khisanth joined #git
15:46 endrkd joined #git
15:46 lindenle_ joined #git
15:47 sdothum joined #git
15:53 SourTrout joined #git
15:55 sysanthrope joined #git
15:55 fuchstronaut joined #git
15:56 sdothum joined #git
15:56 SourTrou_ joined #git
15:58 starkhalo joined #git
15:58 leehambley joined #git
15:58 snowkidind joined #git
15:59 mahendra_ joined #git
16:00 Lomex joined #git
16:03 nilg joined #git
16:04 dmto joined #git
16:08 fjbet joined #git
16:08 stantonk joined #git
16:09 Alienpruts joined #git
16:10 GodGinra1 joined #git
16:10 LeMike joined #git
16:12 ericho joined #git
16:13 acetakwas joined #git
16:16 wwalker joined #git
16:16 jimi_sanchez joined #git
16:17 InfoTest joined #git
16:18 paul424 joined #git
16:19 SteffanW joined #git
16:20 acetakwas joined #git
16:23 EvilPenguin joined #git
16:24 PioneerAxon joined #git
16:24 durham joined #git
16:24 Matrixiumn joined #git
16:25 TomyLobo joined #git
16:25 espindol_ joined #git
16:26 SourTrout joined #git
16:26 danimal2 joined #git
16:27 Ahmed90 joined #git
16:27 danimal2 how do i know path where git is installed - centos 7.  i know its installed via git --version thanks
16:27 acetakwas joined #git
16:27 kadoban danimal2: 'which git' can be helpful I guess
16:28 danimal2 ok cool let me try
16:28 kadoban Not sure that'll tell you anything terribly useful though.
16:28 misterli joined #git
16:28 wwalker danimal2: 'which git'  and 'rpm -qi git' and 'rpm -ql git'
16:28 danimal2 ok got it, it says /bin/git
16:28 danimal2 messing around with VS Code on it
16:29 misterli Hello, ive created a git on my server but im always getting permission denid if i try to clone. Ive checked if the folders on the server are owned by git and yes, it is. This is how i did it: passwd git -> changed my server git password. Then ive generated my id_rsa.pub on my Windows box using Git GUI. After that ive copied the content to my server on /var/git/.ssh/authorized_keys but still getting permission denied
16:29 UTAN_dev joined #git
16:29 jimi_sanchez joined #git
16:29 misterli Permission denied (publickey,password).
16:29 hoe` joined #git
16:30 lindenle joined #git
16:30 hoe` Can I make git auto-crlf on push, but not on pull?
16:30 SourTrou_ joined #git
16:31 hoe` I'm on Windows. I do not want my local files to be auto-crlf'ed, but I do want the ones I push to be de-crlf'ed.
16:31 wwalker misterli:  usually, that is a file permission issue.  on the remote machine, ls -ld ~misterli ~misterli/.ssh ~misterli/.ssh/authorized_keys
16:31 wwalker None of those can have write permission in group or other
16:32 Dougie187 joined #git
16:32 lindenle joined #git
16:32 cdg joined #git
16:33 Slush- joined #git
16:33 MrWoohoo joined #git
16:33 durham_ joined #git
16:33 settermjd joined #git
16:33 cdg joined #git
16:34 cdg joined #git
16:34 misterli okay thanks wwalker
16:34 madewokherd joined #git
16:35 misterli Ive recreated all the stuff again and get a "couldnt find remote ref HEAD" error now. Do i need to "push" some data first before using "cloning" it?
16:35 settermjd joined #git
16:35 cdg joined #git
16:35 preyalone joined #git
16:36 anu0 joined #git
16:36 dreiss joined #git
16:38 leehambley joined #git
16:38 LeBlaaanc joined #git
16:40 HoierM joined #git
16:42 Macaveli joined #git
16:43 vuoto joined #git
16:43 RedShift joined #git
16:45 _ikke_ hoe`: autocrlf happens when you add things to the index, not on push or pul
16:46 stantonk joined #git
16:46 jaguarmagenta joined #git
16:46 IWishIKnew joined #git
16:47 WayToDoor joined #git
16:52 LionsMane joined #git
16:52 Naeblis joined #git
16:53 Naeblis Hello. I do "git mergetool --tool=opendiff" but the tool doesn't open. It says "Was the merge successful?" after a while but I didn't do anything?
16:53 tyreld joined #git
16:53 ack_inc joined #git
16:53 Slush- joined #git
16:54 Naeblis how do I get to use opendiff properly? It looks like the tool is running when I grep on ps
16:54 vF3hNGxc47h8 joined #git
16:54 meissa left #git
16:57 t0by joined #git
16:58 PresidentBiscuit joined #git
16:58 Codfection joined #git
16:59 LeBlaaanc joined #git
17:00 Doginal joined #git
17:00 piattino joined #git
17:02 gargola joined #git
17:04 unbalancedparen joined #git
17:04 stonerfish joined #git
17:05 tvw joined #git
17:06 orbisvicis joined #git
17:07 orbisvicis apparently I made all my changes while an interactive (delayed) rebase was in progress
17:07 synthmeat joined #git
17:07 orbisvicis how do I cancel the rebase without losing my changes ?
17:07 stantonk joined #git
17:07 stantonk joined #git
17:07 GodGinra1 joined #git
17:08 cbreak orbisvicis: git stash them?
17:08 zivester joined #git
17:10 artgoeshere joined #git
17:12 Gsham joined #git
17:13 [gmi] joined #git
17:13 k3rn31 joined #git
17:14 nnyk joined #git
17:15 orbisvicis cbreak: thanks
17:18 ochorocho__ joined #git
17:19 emPi joined #git
17:20 mwhooker joined #git
17:22 neovesta joined #git
17:22 f3r70rr35f joined #git
17:23 ChrisMurphy joined #git
17:24 ChrisMurphy left #git
17:24 aep-shoutlet joined #git
17:25 thiago joined #git
17:25 ack_inc joined #git
17:26 ChrisMurphy joined #git
17:27 ChrisMurphy left #git
17:28 piling joined #git
17:29 vuoto joined #git
17:29 subhojit777 joined #git
17:30 Pulp joined #git
17:30 durham joined #git
17:31 settermjd joined #git
17:31 GavinMagnus left #git
17:32 jeremyhall_ joined #git
17:32 neovesta joined #git
17:33 dopesong joined #git
17:34 durham joined #git
17:34 [gmi] joined #git
17:35 lmatteis joined #git
17:35 dopesong joined #git
17:37 danslo_ joined #git
17:39 jimi_ joined #git
17:42 rgrinberg joined #git
17:42 orbitphreak joined #git
17:42 Limes_ joined #git
17:43 ack_inc how does one reverse a commit in a bare repo?
17:43 jknetl joined #git
17:44 _ikke_ easiest is to clone from it, revert it, and push
17:44 rgrinberg joined #git
17:45 orbitphreak joined #git
17:45 msavage joined #git
17:46 ack_inc thank you, i'll try that
17:47 King_Hual joined #git
17:47 King_Hual joined #git
17:47 ochorocho__ joined #git
17:48 linuxmodder joined #git
17:50 Repox joined #git
17:51 piattino joined #git
17:52 skylite joined #git
17:53 fatmarcel joined #git
17:54 mwhooker joined #git
17:56 fuchstronaut joined #git
17:58 Nugget our weekend project for the 13th/14th
17:58 Nugget erp
17:58 Arban joined #git
17:58 D-Boy joined #git
18:00 akkad joined #git
18:00 mwd joined #git
18:01 mwd is it possible to replay a git repo onto the end of another?
18:01 mwhooker joined #git
18:01 mwd eg, i have a git repo that has 10 commits on master, and a second git repo that begins at the HEAD of the first repo and also have a dozen commits
18:02 mwd so i want to rebase the second onto the first
18:02 Eugene mwd - you can fetch between repos and merge, rebase, or cherry-pick commits
18:02 Eugene (Depending upon what you want the final history to look like)
18:02 kaldoran joined #git
18:03 mwd ah, so i'd just export all of the commits from the second and patch them onto the first?
18:03 Sucks joined #git
18:04 mwd (actual use case: stitching the git repo from overleaf onto my original repo)
18:04 Eugene Terminology aside, yes.
18:04 mwd hm ok, excellent. thanks ;)
18:04 Eugene Do you want to do this once, or an ongoing basis?
18:05 mwd a couple times a year if overleaf turns out to be useful
18:05 Eugene rebase is probably the path you want
18:06 SourTrout joined #git
18:09 skylite joined #git
18:12 mwd ok that'll work well then
18:12 mwd thanks
18:12 vuoto_ joined #git
18:13 fatmarcel joined #git
18:14 dsdeiz joined #git
18:15 rahtgaz joined #git
18:15 spudowiar joined #git
18:16 ribasushi joined #git
18:16 f3r70rr35f joined #git
18:16 sha1sum joined #git
18:17 vuoto joined #git
18:17 SourTrou_ joined #git
18:17 pcre joined #git
18:17 oich joined #git
18:18 sha1sum Hey all... I am migrating from Bitbucket to GitHub, so I've mirrored the BB repo with `git clone --mirror` and have it in GitHub. I've also been doing local development for a CI server on the GitHub repo and others have been doing local development on the BB repo...
18:18 sha1sum ...I understand that `git remote update` from the mirrored clone will update the mirror, but can I safely push that to the GitHub repo afterwards?
18:18 sha1sum (without losing my pushed work not present on the BB mirror?)
18:19 zarel joined #git
18:21 Kulrak joined #git
18:21 Kulrak joined #git
18:23 snowkidind joined #git
18:23 mwhooker joined #git
18:23 Literphor joined #git
18:23 cdown joined #git
18:25 moritz sha1sum: if you've pushed commits to both mirrors on the same branches, you'll have to do a merge
18:26 sha1sum moritz: the branches I've been working on are only on the github repository
18:26 moritz sha1sum: then you should be fine
18:27 kfunk joined #git
18:27 sha1sum so just `git push --mirror` once I've changed the Bitbucket remote to GitHub?
18:27 moritz sha1sum: no, push the branches that changed
18:27 moritz changed on bitbucket
18:27 sha1sum ok thanks
18:28 moritz sha1sum: you can also do a 'git push --dry-run --mirror' to see what it would do
18:28 moritz sha1sum: if it doesn't delete any branches, you can safely remove the --dry-run
18:28 sha1sum nice, keep forgetting about the dry-run :)
18:29 xall_ joined #git
18:29 l4v2 joined #git
18:29 Puffball joined #git
18:31 RedneckDonut joined #git
18:31 nnyk_ joined #git
18:33 hyperair joined #git
18:34 settermjd joined #git
18:37 durham_ joined #git
18:39 supaket joined #git
18:42 nilg joined #git
18:42 mwhooker joined #git
18:42 jknetl joined #git
18:43 shaggycat_ joined #git
18:43 pcre_ joined #git
18:44 geoid joined #git
18:45 mischat joined #git
18:45 RedneckDonut joined #git
18:46 ansimation joined #git
18:46 ansimation joined #git
18:47 IWishIKnew_ joined #git
18:47 jaguarmagenta joined #git
18:47 adino joined #git
18:49 gusnan joined #git
18:49 xall_ joined #git
18:52 danimal2 trying to do a commit using my IDE (Visual Studio Code) and i have a permission error. states insufficient permission for adding an object to repository database .git/objects
18:56 HoierM joined #git
18:56 giue joined #git
18:57 pcre joined #git
18:57 durham joined #git
18:58 Eugene danimal2 - you'll need to chown / chmod your local repository to be writeable by your current user
18:58 Eugene Did you perhaps do something like `sudo git fetch`?
18:58 piattino joined #git
18:59 Sasazuka joined #git
19:00 danimal2 ok thanks Eugene. im running a bitnami lampstack on linux box so its a little different than usual. trying to get the bitnami and user permissions right
19:00 Eugene Aha, no idea then. good luck
19:00 Endarked joined #git
19:01 livingstn joined #git
19:01 danimal2 no worries...i'll keep tinkering thanks tho
19:01 SourTrout joined #git
19:02 WayToDoor joined #git
19:02 geoid joined #git
19:02 Lauven joined #git
19:07 yqt joined #git
19:09 Endarked joined #git
19:09 MrWoohoo joined #git
19:09 dsdeiz joined #git
19:12 piattino hi. "why" is resetting path/to/file a git checkout path/to/file rather than git reset path/to/file? am i missing something?
19:13 osse piattino: what do you mean by resetting, there?
19:13 _ikke_ piattino: git reset works mostly with the index, while git checkout works mostly with the working tree
19:14 osse piattino: if you mean discarding changes you've done:  git checkout  is used to get contents from git's "database" and put it on the file system, which in this case is the same as discarding changes
19:14 dsdeiz_ joined #git
19:14 piattino resetting for me is to lose current changes to the file (changes in the working directory) and restoring the last committed version of the file from the tip onto the modified version, overwriting it
19:16 piattino it does not "feel" to me as a checkout as much as it feels like a reset.. but ok. for instance.. i cant do git reset --hard path/to/file, which i find surprising as i can do it on the entire working tree? or am i wrong in that?
19:17 Eugene !unlearn
19:17 gitinfo Users of centralized VCSes will need to unlearn a number of habits in order to learn git. Many commands, such as "checkout" and "revert" bear little in common to those holding the same name in other systems.
19:17 osse piattino: --hard is more of an "afterthought". reset is used to move what HEAD points to. --hard makes it so that the working tree contents are updated to.
19:17 Eugene git's terminology is not the same as svn's.
19:18 osse piattino: there is no doubt that git's UI is not perfect. But as to your original question: discarding changes and checking out a file from the db is effectively the same thing
19:18 osse *updated too
19:21 johnny56 joined #git
19:22 piattino ok. i need to repurpose some terminology right?
19:22 Sasazuka joined #git
19:22 xall_ joined #git
19:22 d5sx43 joined #git
19:22 cjohnson joined #git
19:22 Eugene Yeah, it's different verbs is all.
19:23 Endarked joined #git
19:23 Eugene See also the !xy principle
19:23 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
19:23 cjohnson Is there a way to get git to ignore this warning? Are you sure you want to continue connecting (yes/no)? The authenticity of host 'github.com (192.30.253.113)' can't be established
19:23 cjohnson meaning: auto-approve it
19:23 Eugene cjohnson - that is a warning from ssh, not from git.
19:23 osse piattino: you can use git's alias system as sort of tool. eg. create an alias named 'undo' which is the same as 'checkout HEAD --'
19:24 osse eh, I mean help tool
19:24 cjohnson Eugene: oh doi, thanks. how can I specify ssh options?
19:24 cjohnson or is that possible
19:24 Eugene !multiple_id
19:24 gitinfo git by itself does not allow you to specify which SSH key to use when speaking to a remote. You can use ssh_config+remote hostname tricks to achieve this goal: http://superuser.com/questions/272465/using-multiple-ssh-public-keys
19:24 piattino osse: i prefer to learn the new ways but thanks!
19:24 osse cjohnson: usually ssh will only ask once
19:24 osse per connection
19:24 Eugene Or, `ssh-keyscan myhost.com >> ~/.ssh/known_hosts` will also do it for you
19:24 Eugene Or pushing y once will save it
19:24 ahmedelgabri joined #git
19:24 osse piattino: that's good to hear. the alias would be more of a crutch anyway :p
19:25 cjohnson osse: I'm automating building new servers and the build process hangs on this question for the first time, it's a pain to remember to do every time, was hoping to prime it
19:25 Eugene Or there's probably a horribly-insecure auto accept ssh host key setting that I haven't memorized(don't use that, seriously, it will get you pwned)
19:25 cjohnson Sounds like maybe I can do so in .ssh/config tho
19:25 Eugene Aha, this is the real question that you should have started with
19:25 Eugene Use ssh-keyscan to preload the known_hosts file
19:26 osse ah
19:26 troulouliou_div2 joined #git
19:26 piattino i have tried git reset and "checked out ?!?" a previous commit. now HEAD point to that commit, right? git rev-parse shows that sha1 and --abbrev-ref shows the name of the branch. i had more commits on top on this commit.. have i just lost them? or is there a way to retrieve them again and repoint HEAD and my current branch to the top commit i had before?
19:26 ajf- joined #git
19:26 Eugene Or go set up a SSH CA, or DNSSEC+SSHFP+auto-accept
19:27 osse !detached > piattino
19:27 gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
19:27 cjohnson I was trying to quit coffee and I see now that is a mistake
19:27 piattino osse: is does not show me as detached!
19:27 cjohnson I can just deploy the known_hosts file
19:27 osse piattino: then you're on a branch. maybe a different one
19:27 osse piattino: try !lol to get an overview
19:27 gitinfo piattino: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
19:27 osse (unless the repo is huge, in which case it will just be confusing)
19:28 GodGinrai piattino: Let me understand.  You had this: A -> B -> C -> D -> E.  You wanted this: A -> B -> D -> E.  So you ran `git reset HEAD~3` and are now wondering how to access D and E.  Is this correct?
19:29 piattino osse: that log command was very nice. now my head in just behind in the branch. the commits appear "up there" but there is no ref to reach them directly, just the sha1. do i risk losing those commits sooner or later? admittedly, there is a stash i left "up there", called refs/stash, but not much more in terms of named refs
19:30 osse piattino: it will be there forever if it's reachable by the stash
19:30 Endarked joined #git
19:31 baena joined #git
19:31 osse piattino: but that's not how stashes are meant to be used. if you want to keep it you should create a branch at that point (or move the current one there)
19:31 piattino i had this A>B>C>D>E. i wanted to just try out what reset does and i did git reset C.
19:31 Eugene unreferenced objects are garbage-collected lazily, with a long(6 week? I forget the default) timeout period. man git-gc
19:31 gitinfo the git-gc manpage is available at http://jk.gs/git-gc.html
19:31 osse piattino: to get back: git reset E
19:32 piattino osse: would i have lost the commits had i not left a stash there? unreachable?
19:32 Eugene They'll still be there, and referenced by the !reflog
19:32 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
19:32 Eugene git tries /really/ hard not to lose things. Sometimes it can be a bit of trouble to find them, but they'll be there
19:32 shinnya joined #git
19:33 Eugene Unless, of course, you've got unstashed/uncommited work - git doesn't know about it. So when in doubt: make a commit to save your work
19:33 GodGinrai piattino: For future reference, you really only git reset to something if you are planning on throwing away anything after it.
19:34 osse piattino: unreachable = not reachable (duh), and a commit is reachable if a ref directly to it, or if you can follow the chain of commits from a ref to it
19:34 piattino GodGinrai: thank you. that is interesting. again, something i needed to readjust to i suppose
19:35 piattino thanks guys. osse especially, also GodGinrai
19:35 baena I'm putting a Drupal CMS 'multisite' under git revision control. The 'multisite' aspect simply means unique web-code dirs inside a shared, core-code dir that's the git root of the repo.
19:35 baena I'm trying to figure out the right approach for revision control of the parnet core, and the pwe web-host subproject.  Iiuc, options are: submodules, subtrees & wrappers.  Given the structure of the Drupal project scaffold, I'm not clear which is the 'best' approach.
19:35 baena fwiw, here's a bitmore detail of what I'm looking at: https://www.drupal.org/node/2771671.
19:36 baena Any suggestions?
19:36 acetakwas joined #git
19:36 GodGinrai np
19:36 osse piattino: think of the commit history as a growing graph of nodes on a whiteboard. branches are like sticky notes you place next to a node (typically one at a tip). tags are also like sticky notes but you're not allowed to move them once you've placed them. HEAD is a specialy sticky note that usually points to another sticky note, but sometimes it doesn't.
19:36 LiohAu joined #git
19:37 osse (tangentially related, copy-pasted from a different explanation)
19:37 piattino osse: nice visual/real-world image. thanks for that
19:37 piattino ah.
19:37 baena wow, typing :-( s/parnet core, and the pwe web-host/parent core, and the per web-host/
19:37 GodGinrai baena: can you elaborate on what you mean by "subtree" and "wrapper"?
19:37 osse piattino: so the idea is that if you remove a sticky note then you might end up with a part of the graph leading into nowhere. that's now unreachable. but as Eugene pointed out the reflog can help, altough that's a different beast
19:38 piattino git log shows "index on mybranchname". what does that mean? (i am trying to get back to "normal" after my experimental git reset C)
19:38 Eugene reflog is like looking at the sticky note residue for clues
19:38 osse piattino: that's part of the stash. a stash is technically two commits.
19:39 osse Eugene: hah, nice
19:39 osse I had "reflog is more like a history of where the sticky notes have been in the past" but yours sounds cooler
19:39 lomex joined #git
19:39 piattino osse: oh, i see. that magic stack i kept there hoping to go back to it after the reset (a stash i should have not created, i understand now). what are the 2 commits of a stash?
19:40 osse piattino: when you stash it creates one commit to represent the working tree and one commit to represent what you had staged.
19:40 osse piattino: see man git-stash for the full lesson; I don't quite remember to be honest
19:40 gitinfo piattino: the git-stash manpage is available at http://jk.gs/git-stash.html
19:41 piattino osse: ok. makes sense for them to be separate. thanks a lot. perfect.
19:41 zeroed joined #git
19:41 osse piattino: if you have no interest in it you can drop it with 'git stash pop'
19:42 vishal Eugene: that sticky note analogy needs to be a gitinfo trigger if it isn't already :)
19:42 piattino i did git stash drop
19:42 Eugene !stash
19:42 piattino hopefully equivalent
19:42 mgoodwin Trying to find the difference between a "repo underneath your superproject that you happen to commit" and a submodule - is it just the absence of the .gitmodules file?
19:42 endiruna joined #git
19:42 osse piattino: also, for larger repos and specifical cases it might be wise to remove the '--all' from the nice graphy log above and rather give a direct list of refs, or something like --branches or whathaveyou.
19:42 osse *specific
19:42 Eugene vishal - patches welcome; I'm too lazy right now
19:42 mgoodwin My search results are coming up with a bunch of unrelated submodule/subtree topics
19:42 Kamilion joined #git
19:43 osse piattino: depends. drop is right. pop does something else. my bad.
19:43 baena GodGinrai: Atm, these 2 are what I was looking at, in add'n to git-submodule;  not that I'm at all convinced they're appropriate, yet.
19:43 GodGinrai piattino: `git stash drop` means "I don't want this, get rid of it"; `git stash pop` means "I don't need this on the stack, but I want the changes applied now"
19:43 baena git-submodule (https://github.com/apenwarr/git-subtree/), " An experimental alternative to the git-submodule command. Merges and splits subtrees from your project into subprojects and back."
19:43 Eugene mgoodwin - a "submodule" is tracked in the parent repository, and will be cloned+checkout-ed with the parent. A "repo inside a repo" is untracked. As far as the outer/parent repo is concerned it is just an untracked/ignored directory
19:43 baena Gitslave (http://gitslave.sourceforge.net/) "a wrapper around Git that multiplexes git commits into multiple repositories"
19:44 mgoodwin Really, it isn't for me? When I nest repos `git status` shows the untracked folder and if I add it, it adds the commit hash as it would for a submodule
19:44 Eugene That's because that's how you add a submodule
19:44 piattino GodGinrai: thanks for explaining the difference
19:44 GodGinrai np
19:44 mgoodwin But in this case I can't use `git submodule` to manage, it's like it's half of a submodule
19:45 Endarked joined #git
19:45 Eugene That's because you haven't commited the addition yet
19:45 theskillwithin joined #git
19:45 paul424 joined #git
19:46 yoan joined #git
19:46 GodGinrai baena: I don't think you need to consider those options other than submodules.  But the real question is: "why do you even think you need submodules?"
19:47 LeBlaaanc joined #git
19:47 GodGinrai baena: what benefit are you looking for them to bring you?
19:49 jknetl joined #git
19:49 mgoodwin So as far as I can tell the only difference between a submodule and a nested git repo (whose commit hash has already been added and committed) is that you need to declare the submodule in .gitmodules
19:50 mgoodwin Also reinforced here: https://stackoverflow.com/a/34410102
19:51 Eugene mgoodwin - .gitmodules contains the URL for the subrepository; `git add subrepo/` adds the SHA into the git tree. You need both to get a valid submodule
19:51 GodGinrai why would you nest a git repo without using a submodule?
19:51 mwhooker_ joined #git
19:51 Eugene There is no such thing as a "nested git repository" in git; either it's a submodule or the parent repository doesn't know about it
19:51 mgoodwin It just sort of happened that way
19:51 baena GodGinrai: the dir structure as posted^, I want to be able to make & track changes/revisions of each subdir ("/site{1,2,3}") independently, as WELL as the parent.  Out-of-the-box with Drupal, the parent is the repo root, and commits are made to it.  I.e., changes to any subdir are all tracked in the parent's history -- and, rollbacks, etc are made from the consolidated, single-parent's history.
19:52 mgoodwin It's for my dotfiles and I had some repos in ~/.vim and I, at some point, ended up committing the repo hashes at some point - which works fine when I update those repos manually, but I'd also now like to convert them into submodules
19:54 GodGinrai baena: Sure.  separate repos is not the problem.  I'm just trying to understand why you think you need them to be connected to the core through submodules.
19:56 baena GodGinrai: Because that's what I was told.  As I said above, "not that I'm at all convinced they're appropriate, yet."  That's why I'm in here asking.
19:56 EduardoMartins joined #git
19:56 GodGinrai baena: well, what are you imagining for updating your site?
19:57 GodGinrai baena: do you currently edit it inplace?
19:57 fuchstronaut joined #git
19:58 baena Nope.  Dev, stage & production deployment instances.  Central repository under a gitlab instance. Check out to dev, edit.  Push to central.  Pull to stage, test. etc etc.
20:00 RedneckDonut joined #git
20:00 baena GodGinrai: TBH, I don't care the slightest about submodules, or not.  Just looking for a working solution with separate repos -- starting with that scaffold that you inherit on installe.
20:01 nwkj86 joined #git
20:01 Gsham joined #git
20:02 leehambley joined #git
20:02 Literphor joined #git
20:03 baena It becomes trivial if you do NOT use the 'multisite' biz -- then you just end up with each site having a full core & 1-only web dir.  Each managed separately.  Of course, then you end up with the redundant, unshared core code.  Which is the point of the multisite to start with ....
20:03 cek joined #git
20:03 cek how do I cleanup bloated .git dir assuming I did something wrong and repo actually should contain 1 file.
20:04 anu1 joined #git
20:04 cek for ex., I did git pull kernel.git , then reset back to my changes. Now I want to clean it up.
20:05 mwhooker joined #git
20:09 sballert joined #git
20:09 le_melomane joined #git
20:12 grawity git gc --something
20:12 grawity !factoids
20:12 gitinfo [!triggers] Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.
20:13 oberststen joined #git
20:13 baena cek:  what grawity said.  fyi, https://git-scm.com/docs/git-gc
20:14 cek tried it, but it didn't remove
20:14 grawity I'm on phone IRC, but the general tool is git gc, maybe with --aggressive or something
20:14 Hello71 you need to actually remove all the references
20:15 cek --aggressive is trying to compress that unneeded  stuff
20:15 lindenle joined #git
20:15 xpk_ joined #git
20:15 Hello71 if you have small repo or lots of disk space you can git clone the old repo then delete it
20:15 cek yes, that might work, but hey, what's up with all this
20:16 cek 179M    .git
20:16 EgS joined #git
20:16 Hello71 I think bfg shows big objects.
20:17 acetakwas joined #git
20:17 WaReZ joined #git
20:18 GodGinrai baena: just use separate repos for each, and then use a deploy script that deploys the files to their correct locations.  *or* you can use submodules.  Your choice
20:19 cek rm -rf .git did it.   160K    .git
20:19 grawity lame
20:21 baena GodGinrai: So I'd need to init each of those /site{1,2,3} dirs as repos?
20:21 PioneerAxon joined #git
20:22 zivester joined #git
20:22 GodGinrai baena: yes, but I'd do it separately from within the core repo, and then move the files there on deploy, or include them in core as submodules
20:23 baena GodGinrai: That's my point.  The install scaffold installs those three site dirs under the parent.  They're already populated on install.
20:24 xall_ joined #git
20:24 GodGinrai baena: and?
20:24 GodGinrai baena: you can't move them yourself?
20:26 baena Not without add'l monkeying around.  I'm trying to come up with a reasonable procedure that works WITH the out-of-the-box installed scaffold.  Not tear it apart, and reorganize it, in order to make it work.
20:29 jwest joined #git
20:29 jeremyhall joined #git
20:31 cek left #git
20:32 IWishIKnew joined #git
20:36 mwhooker joined #git
20:41 durham joined #git
20:42 Literphor joined #git
20:43 nwkj86 joined #git
20:43 cyphase joined #git
20:44 rgrinberg joined #git
20:45 mingrammer joined #git
20:45 boombatower joined #git
20:47 jaguarmagenta joined #git
20:48 btree joined #git
20:49 btree left #git
20:51 pcre joined #git
20:51 lindenle joined #git
20:55 kpease joined #git
20:55 pcre joined #git
20:57 V1s1ble joined #git
20:58 vigilvindex joined #git
20:58 inflames joined #git
20:58 Sucks joined #git
20:59 V1s1ble So I'm a little confused on rebasing. We're using Gitlab and we have a feature branch, "TEAMS-deprication". I have a branch from that feature branch, "AssetRefactoring". I'm the only one pushing this branch to Gitlab. Someone merged onto the original TEAMS-deprication and I wanted to pull in their changes, so I ran "git rebase -". It plays my commits ontop of the branch. But if I try to do a "git push" I
20:59 V1s1ble get a conflict
21:00 vigilvindex joined #git
21:00 V1s1ble If I do a status, I get "and have 9 and 3 different commits each, respectively."
21:00 V1s1ble (your branch and origin/AssetRefactoring" have diverged)
21:00 smakarov_ joined #git
21:05 stonerfish joined #git
21:05 gusnan joined #git
21:05 rpd V1s1ble: are you sure yo're trying to push to "origin/AssetRefactoring" and not somewhere else
21:05 V1s1ble yes
21:06 adino joined #git
21:07 rpd idk, you're description is missing some detail I think. You branched from the deprecation branch and then ran `git pull --rebase origin/blah-deprecation`, but you're saying you're "AssetRefactoring" branch has different commits pushed to it
21:07 aidalgol joined #git
21:07 V1s1ble oh..huh...I didn't create this branch from that main branch...aw crap
21:07 rpd yeah
21:07 V1s1ble k, nevermind :-P
21:08 clevodearia joined #git
21:10 d4rklit3 joined #git
21:12 p4trix joined #git
21:17 croberts joined #git
21:17 Rich joined #git
21:17 durham joined #git
21:18 SwiftMatt joined #git
21:19 FuzzySockets joined #git
21:20 neanderslob joined #git
21:23 mwhooker joined #git
21:24 neanderslob joined #git
21:25 EricPoe joined #git
21:26 orbisvicis joined #git
21:27 endiruna joined #git
21:29 Zoxc joined #git
21:29 vigilvindex joined #git
21:29 dpower joined #git
21:29 orbisvicis left #git
21:31 Literphor joined #git
21:32 durham joined #git
21:34 pcre joined #git
21:37 ribasushi joined #git
21:39 tremblerz joined #git
21:40 mingrammer joined #git
21:40 m0viefreak joined #git
21:41 johnmilton joined #git
21:42 HoierM joined #git
21:46 tremblerz joined #git
21:46 johnmilton joined #git
21:49 SourTrout joined #git
21:49 spudowiar joined #git
21:51 mehola joined #git
21:52 Slush- joined #git
21:52 jagob joined #git
21:53 mischat joined #git
21:54 cd-rum joined #git
21:54 ribasushi joined #git
21:55 Dougie187 left #git
21:58 fuchstronaut joined #git
22:01 Slush- joined #git
22:03 sobersabre_ joined #git
22:03 reim joined #git
22:04 stantonk joined #git
22:06 mwhooker joined #git
22:07 elastix joined #git
22:09 nnyk_ joined #git
22:14 joki joined #git
22:17 mellernoia joined #git
22:18 endiruna joined #git
22:18 nfk joined #git
22:20 Literphor joined #git
22:21 cdown joined #git
22:22 choki joined #git
22:25 neanderslob joined #git
22:25 ribasushi joined #git
22:26 spudowiar joined #git
22:32 danimal2 joined #git
22:33 mingrammer joined #git
22:36 Sucks joined #git
22:42 xall_ joined #git
22:42 Literphor joined #git
22:44 ericho joined #git
22:46 neanderslob joined #git
22:46 neanderslob_ joined #git
22:46 GandalfTheWizard joined #git
22:48 jaguarmagenta joined #git
22:52 ribasushi joined #git
22:57 BenderRodriguez joined #git
23:01 fahadash joined #git
23:03 neanderslob joined #git
23:07 spudowiar1 joined #git
23:08 axl__ joined #git
23:11 mwhooker joined #git
23:12 zivester joined #git
23:15 lindenle joined #git
23:20 denimsoft joined #git
23:22 ffabi joined #git
23:23 gfixler joined #git
23:24 star_prone joined #git
23:26 mablae_ joined #git
23:27 Rodya_ joined #git
23:35 cyphase joined #git
23:36 st0opkid joined #git
23:39 LeBlaaanc joined #git
23:40 BryzNSTY joined #git
23:40 jeremyhall joined #git
23:41 wpaulson joined #git
23:43 naught101 joined #git
23:43 nettoweb joined #git
23:45 nettoweb heys guys, In a repo, my frined created one branch and pushed to remote. but I've tried "git pull" and "git fetch" but none of these commands bring his branch
23:45 SourTrout joined #git
23:47 neanderslob joined #git
23:47 nettoweb the branch appers when I run "git ls-remote origin"
23:48 thoraxe joined #git
23:49 fairuz joined #git
23:52 mehola joined #git
23:52 cjohnson nettoweb: git checkout his-branch tells you waht?
23:53 nettoweb well, it worked with git pull --all
23:53 nettoweb cjohnson But I didnt know the name of his branch, I was looking a way to duscover with someting like a fetch
23:59 fuchstronaut joined #git

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