Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-07-18

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

All times shown according to UTC.

Time Nick Message
00:01 brent__ joined #git
00:07 Ofdo joined #git
00:07 Doginal joined #git
00:09 dreiss joined #git
00:10 gopar joined #git
00:11 Maskettaman_yo joined #git
00:13 hotpancakes joined #git
00:14 rohitpaulk joined #git
00:15 blr joined #git
00:18 nixjdm_ joined #git
00:20 diogenese joined #git
00:23 cagomez joined #git
00:25 menip joined #git
00:29 hotpancakes joined #git
00:30 dsdeiz joined #git
00:31 Lyqyd joined #git
00:32 stutter joined #git
00:33 orbyt_ joined #git
00:35 linuxmodder joined #git
00:39 BUSY joined #git
00:40 infernix joined #git
00:41 donught joined #git
00:41 hotpancakes joined #git
00:44 rchavik joined #git
00:45 kadoban_ joined #git
00:46 hotpancakes joined #git
00:46 TheFuzzball joined #git
00:52 brent__ joined #git
00:59 theiostream joined #git
01:03 rohitpaulk joined #git
01:10 buffal0 joined #git
01:10 hotpancakes joined #git
01:10 linuxmodder joined #git
01:16 Cabanossi joined #git
01:17 thebope joined #git
01:18 ecuanaso joined #git
01:18 nixjdm_ joined #git
01:20 thiago joined #git
01:21 jakogut_ joined #git
01:22 finalbeta joined #git
01:28 mniip joined #git
01:30 sunri5e joined #git
01:31 kculpis joined #git
01:31 hotpancakes joined #git
01:35 dave0x6d joined #git
01:36 cqi joined #git
01:37 ahr3n joined #git
01:40 phinxy joined #git
01:47 chase joined #git
01:47 bronson joined #git
01:47 sondr3 joined #git
01:47 digitalway joined #git
01:47 WhiskerBiscuit joined #git
01:47 Murr joined #git
01:47 hotpancakes joined #git
01:48 tunekey joined #git
01:49 jon-mac joined #git
01:51 d^sh joined #git
01:53 futuristic joined #git
01:57 rchavik joined #git
01:58 EvilPenguin joined #git
02:03 chris_wot joined #git
02:04 johnlage_ joined #git
02:05 mikiones_ joined #git
02:05 finalbeta1 joined #git
02:05 cdg joined #git
02:06 tobie_ joined #git
02:06 kculpis joined #git
02:06 sonOfRa_ joined #git
02:06 joeytwiddle joined #git
02:07 cstrahan_ joined #git
02:07 lebster_ joined #git
02:07 nickenchuggets_ joined #git
02:07 trig-ger_ joined #git
02:07 bitslip_ joined #git
02:07 flupke_ joined #git
02:07 t-richards_ joined #git
02:07 prosody_ joined #git
02:07 bambs joined #git
02:07 wenzowski_ joined #git
02:07 SlashLife joined #git
02:07 kireevco_ joined #git
02:07 gyre007_ joined #git
02:07 boxrick1_ joined #git
02:08 jottr joined #git
02:08 discopatrick_ joined #git
02:08 LyndsySimon_ joined #git
02:09 gauss2 joined #git
02:09 Gaga_ joined #git
02:09 fury__ joined #git
02:09 jdsmith1112 joined #git
02:09 MasterNayru joined #git
02:09 ome_ joined #git
02:10 Hello71_ joined #git
02:11 k1ltzman joined #git
02:12 tcsc_ joined #git
02:12 druonysus__ joined #git
02:12 n-st- joined #git
02:12 apeiros_ joined #git
02:12 nellicus_ joined #git
02:12 tomek2 joined #git
02:12 RickyB98|BNC joined #git
02:12 tomek2 joined #git
02:12 zachary1- joined #git
02:12 rxo_ joined #git
02:12 dysfigur- joined #git
02:12 zncmax4 joined #git
02:12 mikar joined #git
02:12 justinmrkva_ joined #git
02:12 bittyx_ joined #git
02:12 Cerise joined #git
02:12 Cerise joined #git
02:12 simon8162 joined #git
02:12 Hogofwar_ joined #git
02:12 strugee_ joined #git
02:12 Matsv- joined #git
02:12 Kidd joined #git
02:12 jimInDevNull_ joined #git
02:12 mgedmin_ joined #git
02:13 matth1askrgr joined #git
02:13 stux|RC joined #git
02:13 AlexanderS_ joined #git
02:13 errr_ joined #git
02:14 Vaelater1 joined #git
02:14 dan2k3k5 joined #git
02:14 armyriad joined #git
02:14 Chaser_ joined #git
02:14 Anthaas joined #git
02:14 rdz joined #git
02:14 sjohnson1 joined #git
02:14 rcn joined #git
02:14 buck1 joined #git
02:14 MacGyver joined #git
02:14 Levex joined #git
02:15 nod joined #git
02:15 fstd_ joined #git
02:15 synthmeat joined #git
02:15 ygeLN joined #git
02:15 chachasmooth joined #git
02:16 BlessJah joined #git
02:16 sjohnson1 left #git
02:16 Devastator_h joined #git
02:17 jameser joined #git
02:17 royal_screwup21 joined #git
02:18 nixjdm_ joined #git
02:18 ColdKeyboard joined #git
02:18 barteks2x joined #git
02:18 swalladge[m]1 joined #git
02:19 flo[m] joined #git
02:19 serialoverflow joined #git
02:19 de-vri-es joined #git
02:19 _ADN_ joined #git
02:19 up_the_irons joined #git
02:19 uebera|| joined #git
02:19 bordeaux_facile joined #git
02:19 steffen joined #git
02:19 theiostream joined #git
02:20 ribasushi joined #git
02:20 ignarps joined #git
02:20 apeiros joined #git
02:20 hue joined #git
02:21 user2468_ joined #git
02:22 qsx joined #git
02:23 jaeckel joined #git
02:23 neunon joined #git
02:25 willardg joined #git
02:26 fgsilveira left #git
02:26 fgsilveira joined #git
02:28 oxguy3 joined #git
02:34 h12o joined #git
02:35 Darren_ joined #git
02:38 cqi joined #git
02:39 linuxmodder joined #git
02:41 shiranuidong joined #git
02:42 royal_screwup21 joined #git
02:44 Bhootrk_ joined #git
02:45 Darren_ joined #git
02:48 valhalla_22 joined #git
02:48 hotpanca_ joined #git
02:49 Vortex35 joined #git
02:50 tnecniv joined #git
02:50 cdg joined #git
02:52 shgysk8zer0 joined #git
02:55 t-mart joined #git
02:56 digitalway joined #git
02:58 artgoeshere joined #git
02:58 seitensei joined #git
02:58 Argylelabcoat joined #git
02:58 kaosine joined #git
02:59 druonysus joined #git
02:59 lelexia joined #git
03:01 Cabanossi joined #git
03:03 digitalway joined #git
03:03 justanotheruser joined #git
03:05 Davey joined #git
03:05 Davey joined #git
03:08 justanotheruser joined #git
03:08 jab416171 joined #git
03:09 jottr joined #git
03:10 digitalway joined #git
03:13 rchavik joined #git
03:13 donmichelangelo joined #git
03:13 valhalla_22 joined #git
03:15 valhalla_22 joined #git
03:15 zumba_addict joined #git
03:16 valhalla_22 left #git
03:16 zumba_addict folks, I want to confirm. I'd like to update my fix branch since I just finished doing a git pull on master. I'm in fix branch. I should run git merge master right?
03:16 valhalla_22 joined #git
03:16 zumba_addict i think git merge origin/master
03:18 nixjdm_ joined #git
03:19 zumba_addict i found another answer. which folks do you prefer, git merge origin/master or git rebase origin/master?
03:19 netj joined #git
03:23 shgysk8zer0 joined #git
03:24 neunon joined #git
03:26 hotpancakes joined #git
03:28 EvilPenguin joined #git
03:29 Miguelngel[m] joined #git
03:30 robotroll joined #git
03:31 hotpancakes joined #git
03:31 chachasmooth joined #git
03:32 fstd_ joined #git
03:33 justan0theruser joined #git
03:37 justan0theruser joined #git
03:37 Bhootrk_ joined #git
03:40 Peuc joined #git
03:41 duderonomy joined #git
03:42 high_fiver joined #git
03:43 bambs joined #git
03:44 bronson joined #git
03:45 Cabanossi joined #git
03:47 Murr joined #git
03:49 valhalla_22 joined #git
03:50 tnecniv joined #git
04:03 ShapeShifter499 joined #git
04:04 sr___ joined #git
04:04 droman0 joined #git
04:06 Timvde joined #git
04:10 jottr joined #git
04:13 sunri5e joined #git
04:15 theiostream joined #git
04:15 chachasmooth joined #git
04:18 nixjdm_ joined #git
04:18 YuGiOhJCJ joined #git
04:18 venmx joined #git
04:19 h12o joined #git
04:20 om_henners joined #git
04:22 t-mart joined #git
04:26 bambs joined #git
04:28 shgysk8zer0 joined #git
04:30 hotpancakes joined #git
04:32 venmx joined #git
04:36 _ikke_ zumba_addict: the latter
04:36 zumba_addict thanks _ikke_
04:37 hahuang65 joined #git
04:37 k0lv joined #git
04:37 _ikke_ merging into a topic branch might be necessary when you cannot rebase (because others are working on the branch), but it causes your history to look messy
04:41 h12o joined #git
04:41 Goplat joined #git
04:41 irqq joined #git
04:42 zumba_addict ah, got it. Sometimes I just scrap my fix branch since I'm not sure what to do. I go back to master and execute checkout -b
04:43 venmx joined #git
04:45 jason237 joined #git
04:46 valhalla_22 joined #git
04:49 valhalla_22 joined #git
04:53 chardan joined #git
04:53 mmattice joined #git
04:55 nat2610 joined #git
04:55 df0 joined #git
04:58 rominron_ joined #git
04:59 EvilPenguin joined #git
04:59 nat2610 Any git hacker the room? I'd like to alter a commit that's 3 commits old. Basically I added an extra line in a file that shouldn't have added then. How can I go back 3 commits amend that commit and put back the  2 commits ? (or is that even the right way to do that ?
04:59 _ikke_ nat2610: interactive rebase
04:59 _ikke_ nat2610: I assume you have not pushed those commits yet?
05:00 bitmod joined #git
05:00 nat2610 I did
05:00 valhalla_22 joined #git
05:00 nat2610 I see I rebase -i then edit the commit ?
05:00 _ikke_ Ok, that might complicate things
05:01 nat2610 the 3rd commit from the top
05:01 _ikke_ is anyone else using this repository?
05:01 nat2610 no
05:01 nat2610 just me
05:01 _ikke_ ok
05:01 _ikke_ git rebase -i HEAD~3
05:01 brent__ joined #git
05:01 _ikke_ You should now see an editory with 3 commits listed
05:02 nat2610 yep
05:02 nat2610 then I do edit on the 3rd one ?
05:02 nat2610 the one I want to alter basically?
05:02 _ikke_ yes
05:02 nat2610 or the first one from that view
05:02 _ikke_ correct
05:02 _ikke_ the top one
05:02 _ikke_ safe and exit the editor
05:03 _ikke_ s/safe/save/
05:05 nat2610 _ikke_:  I see now what I you meant by this might be more compilicated to push
05:05 nat2610 should I do a force push ?
05:05 _ikke_ yes
05:05 wowi42 joined #git
05:06 nat2610 that worked !!!
05:06 nat2610 thanks so much
05:06 nat2610 it was a lot less scary than I first anticipated
05:07 dec0n joined #git
05:07 _ikke_ yea, interactive rebasing makes this process quite easy
05:07 dersand joined #git
05:07 Rodya_ joined #git
05:08 _ikke_ but you generally want to do this before you push the commits
05:08 nat2610 yeah I hear you, thanks again for the hlep
05:08 nat2610 *help
05:09 venmx joined #git
05:10 _ikke_ yw
05:11 jottr joined #git
05:16 Bock joined #git
05:18 nixjdm_ joined #git
05:18 Pseudocrat joined #git
05:18 Pseudocrat joined #git
05:19 jason237 joined #git
05:20 Levex joined #git
05:23 venmx joined #git
05:24 Mowgli joined #git
05:25 telephone joined #git
05:25 telephone joined #git
05:31 exotime joined #git
05:32 imack_ joined #git
05:32 lordjancso joined #git
05:33 neunon joined #git
05:33 BSAlb joined #git
05:33 exotime joined #git
05:34 venmx joined #git
05:34 dayid joined #git
05:35 exotime joined #git
05:36 fatihgenc joined #git
05:37 exotime joined #git
05:38 valhalla_22 joined #git
05:40 alcohol joined #git
05:42 Elronnd left #git
05:45 Cabanossi joined #git
05:45 ahrs joined #git
05:45 bronson joined #git
05:45 dreiss joined #git
05:47 svm_invictvs joined #git
05:48 ThomasLocke joined #git
05:55 a3Dman joined #git
05:55 dag joined #git
05:56 dag hi
05:57 uebera|| joined #git
05:59 rscata joined #git
05:59 hotpancakes joined #git
06:00 freimatz joined #git
06:01 venmx joined #git
06:05 Gurkenglas joined #git
06:05 dagw joined #git
06:06 dagw hi im in master and if i want to do a pull it is not accepting the changes in the remote
06:06 indistylo joined #git
06:06 dagw if i do git status it displays this "Your branch is up-to-date with 'origin/develop'."
06:06 dagw how can i change this to point to master
06:06 dagw any help would be great
06:09 opalepatrick joined #git
06:09 AndreasLutro dagw: git branch --set-upstream-to origin/master
06:11 jason237 joined #git
06:12 jottr joined #git
06:13 Silmarilion joined #git
06:14 dagw AndreasLutro: thanks!
06:14 venmx joined #git
06:16 thiago you may need to reset to origin/master too
06:18 nixjdm_ joined #git
06:18 jceb joined #git
06:23 ahr3n joined #git
06:25 venmx joined #git
06:29 h12o joined #git
06:29 EvilPenguin joined #git
06:29 TomyWork joined #git
06:30 rohitpaulk joined #git
06:31 nd joined #git
06:32 BSab joined #git
06:33 xaa joined #git
06:34 svm_invictvs joined #git
06:35 t-mart joined #git
06:35 BSaboia joined #git
06:36 m4sk1n joined #git
06:37 jknetl joined #git
06:37 elect joined #git
06:38 BSAlb joined #git
06:39 hahuang65 joined #git
06:41 borkr joined #git
06:41 om_henners joined #git
06:41 TomyWork joined #git
06:42 dpl joined #git
06:44 overlord_tm joined #git
06:45 jstein_ joined #git
06:47 sunri5e joined #git
06:47 tarkus joined #git
06:49 ThomasLocke joined #git
06:49 sondr3 joined #git
06:49 jknetl joined #git
06:49 ogny joined #git
06:52 matth1askrgr joined #git
06:52 matth1askrgr joined #git
06:54 Andrew_K joined #git
06:56 sarri joined #git
06:56 sarri joined #git
06:57 schleppel joined #git
06:58 seishun joined #git
07:01 duderonomy joined #git
07:02 Hyp3ri0n joined #git
07:03 trig-ger_ left #git
07:03 ojdo joined #git
07:03 trig-ger joined #git
07:04 Hyp3ri0n joined #git
07:07 ski7777 joined #git
07:10 ZyX-I joined #git
07:12 doev joined #git
07:12 hotpancakes joined #git
07:12 jottr joined #git
07:14 seschwar joined #git
07:17 LordLeBrand joined #git
07:18 nixjdm_ joined #git
07:19 stoner23 joined #git
07:23 tijensse joined #git
07:23 djb-irc joined #git
07:27 nisseni joined #git
07:28 venmx joined #git
07:28 rchavik joined #git
07:31 stoner23 joined #git
07:34 dreiss joined #git
07:37 oskarkv joined #git
07:37 AndreaACME joined #git
07:38 AndreaACME Hi _ikke_ , I tried what we said yesterday
07:38 AndreaACME (revert previous commit of a merge)
07:38 AndreaACME git revert --strategy resolve a4cb46c
07:38 nicoulaj joined #git
07:38 AndreaACME the clean way of tracing an error for a past merge
07:38 AndreaACME but it gave me this ....
07:39 AndreaACME error: Commit a4cb46c688f0eb21c9bb0aea52ce1e6a6de0d014 is a merge but no -m option was given. fatal: revert failed
07:40 sunri5e joined #git
07:41 t-mart joined #git
07:41 Mowgli joined #git
07:42 indistylo joined #git
07:42 xall joined #git
07:43 netj joined #git
07:44 Drzacek joined #git
07:44 Drzacek Hello there
07:44 Drzacek So I see git has this amazing feature called git diff
07:45 jakogut__ joined #git
07:45 Drzacek but not sure how it works
07:46 bronson joined #git
07:47 Drzacek and there is also difftool, which confuses me even more
07:47 Murr joined #git
07:47 marcogmonteiro joined #git
07:47 kurkale6ka joined #git
07:48 AndreaACME AHHH     /usr/share/doc/git-1.8.3.1/howto/revert-a-faulty-merge.txt          explains everything and this is possibly NOT the way I want to go.
07:48 AndreaACME Thanks anyway _ikke_
07:48 inovas joined #git
07:49 AndreaACME Drzacek: I'm not a veteran (at all),  but I can tell you that "diff" is a great command to see differences between WD, index (or SA) and your local Repo
07:49 khatri joined #git
07:49 mikecmpbll joined #git
07:50 AndreaACME It all depends on what you want to do
07:50 Drzacek well, for starts I wanted to comprare what I changed in a file since last commit
07:50 Drzacek but it seems like it can do much more, so I would like an overview of what it could do
07:51 kadoban Drzacek: git diff HEAD -- the_file
07:51 Drzacek I just ran "git difftool" with no arguments, and it opens me all changed files in kdif3
07:51 kadoban For an overview, the manpage I guess goes through quite a bit of the possibilities.
07:51 quackgyver joined #git
07:52 pitastrudl joined #git
07:52 AndreaACME Using diff you need to specify against what commit you want to check .... the last one?  Ok, then:      git diff HEAD^
07:53 AndreaACME ^  is last but one
07:53 AndreaACME HEAD is the last
07:54 oxymoron93 joined #git
07:55 Drzacek I get how the HEAD and ^^^ works, but whats the meaning of -- ?
07:56 eshlox joined #git
07:56 AndreaACME -- is commonly used to indicate the end of the command options. This is especially useful if you want to pass a filename or other argument that begins with -
07:56 AndreaACME basically a separator
07:57 nevodka joined #git
07:57 venmx joined #git
07:58 Drzacek oh
07:59 bambs joined #git
07:59 dege joined #git
07:59 Murii joined #git
07:59 pbandark joined #git
08:00 xPucTu4 joined #git
08:00 Cabanossi joined #git
08:00 EvilPenguin joined #git
08:03 g0d355__ joined #git
08:05 Jason joined #git
08:05 Jason at https://www.kernel.org/pub/software/scm/git/docs/git-branch.html the `git branch` syntax is shown as `git branch my2.6.14 v2.6.14`
08:05 Jason why are there two arguments to git branch?
08:05 shodan` joined #git
08:06 valhalla_22 joined #git
08:07 AndreaACME Jason: I believe the second is a tag
08:08 AndreaACME it specifies from WHERE the branch should start
08:09 venmx joined #git
08:09 Jason AndreaACME: that may be it, i'll try to find more info about it
08:09 Jason my google-fu was failing me :)
08:10 Jason thanks
08:10 rzo1 joined #git
08:11 AndreaACME that command only creates the branch, but doesn't "hop on" into it
08:11 AndreaACME you need to checkout ...
08:12 AndreaACME git checkout -b my2.6.14 v2.6.14        <---  all in one step (create + hop on)
08:13 jottr joined #git
08:15 cstratak joined #git
08:16 jknetl joined #git
08:18 nixjdm_ joined #git
08:18 h12o joined #git
08:18 rohitpaulk joined #git
08:18 hotpancakes joined #git
08:21 zefferno joined #git
08:22 mentazoom joined #git
08:27 cagomez joined #git
08:27 navidr joined #git
08:28 ferr joined #git
08:28 overlord_tm joined #git
08:29 thekrynn joined #git
08:30 tilerendering_ joined #git
08:31 tilerendering_ hi
08:31 gitinfo tilerendering_: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
08:31 aruns joined #git
08:31 tilerendering_ maybe just a small question…
08:32 tilerendering_ I got this directory hosted on my gitolite server. ok a repository. I have a whole newer version of the repository here locally. now, what’s the quickest way of pushing this new version to the repo at the server?
08:33 Jason AndreaACME: nod
08:33 Jason AndreaACME: thanks :)
08:33 ronny tilerendering_: "version of repository" is not a concept that makes sense for git
08:34 ronny do you have new commits locally you want to push upstream, or do you have a entirely new history
08:34 venmx joined #git
08:35 tilerendering_ ronny: a dev cloned the repo, stripped the repo of history- and git-related information, worked on it, and now has a new version of the website I want to push into the repo replacing the old one. so, there is nothing committed yet
08:35 tilerendering_ (btw: I cloned it for the dev)
08:35 chll_ joined #git
08:36 tilerendering_ I guess the first step is to clone the server repo to my workstation, then somehow copy over the contents of the devs directory, commit them and then push them
08:36 tilerendering_ for the “copy” step I m worried that git related information will get lost
08:37 ronny tilerendering_: fist step is a disciplinary action to the dev, second step is make a new clone, copy new data on top of the old data, then push
08:37 durham joined #git
08:40 hahuang65 joined #git
08:41 tilerendering_ ronny: right, any idea on a quick way to locally copy the new directory to the cloned one without losing git related information on the clone?
08:41 linuxmodder joined #git
08:41 tilerendering_ I think that’s the really delicate step to me
08:42 tilerendering_ the directory structure is huge so a cp -r would be just nice, however I fear git related information will then disappear
08:42 tilerendering_ (or is it kept on top of that directory as well?)
08:44 nat2610 joined #git
08:46 pks joined #git
08:47 austin987 joined #git
08:47 venmx joined #git
08:49 bambs_ joined #git
08:49 Tobbi joined #git
08:51 rvgate joined #git
08:52 wandering_vagran joined #git
08:54 glad joined #git
08:56 _ADN_ joined #git
08:57 mentazoom joined #git
09:00 mkoskar joined #git
09:00 timdiels left #git
09:02 brent__ joined #git
09:03 venmx joined #git
09:04 mikiones joined #git
09:04 Anon1921 joined #git
09:04 valhalla_22 joined #git
09:06 austin987 joined #git
09:07 sarbs joined #git
09:07 floppydh joined #git
09:09 zulutango joined #git
09:10 t-mart joined #git
09:10 bambs_ joined #git
09:12 nakulcg joined #git
09:14 jottr joined #git
09:14 nathani_ joined #git
09:14 nakulcg left #git
09:15 _ADN_ joined #git
09:15 doev joined #git
09:16 belmoussaoui joined #git
09:16 mikiones joined #git
09:18 nixjdm_ joined #git
09:18 kadoban joined #git
09:18 venmx joined #git
09:19 rohitpaulk joined #git
09:19 kyan joined #git
09:21 rokups joined #git
09:21 djb-irc joined #git
09:21 LordLeBrand_ joined #git
09:25 hotpancakes joined #git
09:27 frobnic joined #git
09:30 AndreaACME tilerendering_: If you cp -r from the root of your project/repo, you will include the hidden .git directory and that is enough to have ALL commits, tags, refs, everything!
09:30 EvilPenguin joined #git
09:32 venmx joined #git
09:32 tilerendering_ AndreaACME: if I cp -r from the root of the devs “repo” (which has no .git dirs nor files nor anything) to the cloned repo location on my workstation, how will the .git dirs of the clone be preserved?
09:33 valhalla_22 AndreaACME:  cp -R or cp -r small or big one ??
09:33 AndreaACME valhalla_22: same
09:33 AndreaACME both will do
09:33 valhalla_22 ok
09:34 AndreaACME I don't seem to understand why you have no .git dir in your repo
09:35 kurkale6ka joined #git
09:35 AndreaACME I think I'm missing some info
09:35 ronny tilerendering_: is you cp -r into a ceckout from something where .git is removed you cant break stuff
09:35 LordLeBrand_ left #git
09:36 Murii joined #git
09:36 wandering_vagran joined #git
09:37 tilerendering_ ronny: well it s worth a try
09:37 ronny tilerendering_: also if you mane a new checkout, its not like you break somehting you cant loose
09:40 marcogmonteiro joined #git
09:40 irqq joined #git
09:41 FilipNortic joined #git
09:42 hahuang65 joined #git
09:42 LordLeBrand joined #git
09:47 netj joined #git
09:47 Murr joined #git
09:47 bronson joined #git
09:49 dimi1947 joined #git
09:50 ronator joined #git
09:51 jay-m joined #git
09:53 tilerendering_ hm
09:59 venmx joined #git
10:01 kadoban joined #git
10:04 tvw joined #git
10:04 rohitpaulk joined #git
10:04 cebula joined #git
10:06 confluency I want to create a new feature branch whch is based on another feature branch. The project is on GitHub. What is the simplest way for me to create this branch both locally and remotely?
10:07 h12o joined #git
10:08 arahael confluency: 'git branch'?
10:08 arahael confluency: See 'git help branch'.
10:08 confluency Last time I created the branch on GitHub first, but I'm not sure if GitHub always bases the new branch on develop, or on the currently visible branch.
10:08 confluency arahael: yes, I was looking for a more specific explanation.
10:11 mentazoom joined #git
10:11 arahael confluency: Check outthe code. Branch it. Push it
10:11 Ryanar joined #git
10:11 confluency Thanks, I worked it out.
10:12 leah2 joined #git
10:13 venmx joined #git
10:13 chachasmooth joined #git
10:13 kadoban joined #git
10:15 jottr joined #git
10:17 nixjdm_ joined #git
10:19 Zfih joined #git
10:21 cagedwisdom joined #git
10:22 n3wborn joined #git
10:23 rorro joined #git
10:26 venmx joined #git
10:29 chachasmooth joined #git
10:29 hotpancakes joined #git
10:30 tvw joined #git
10:30 linuxmodder joined #git
10:33 DogHackit joined #git
10:35 t-mart joined #git
10:37 vamiry joined #git
10:39 chachasmooth joined #git
10:40 venmx joined #git
10:43 kurkale61 joined #git
10:44 IRQ` joined #git
10:46 synget joined #git
10:48 cdown joined #git
10:51 leeN joined #git
10:52 chachasmooth joined #git
10:53 venmx joined #git
10:54 j08nY joined #git
10:55 mr_sm1th joined #git
10:55 kurkale6ka joined #git
11:01 EvilPenguin joined #git
11:02 z8z joined #git
11:07 venmx joined #git
11:09 Ryanar joined #git
11:09 bambs_ joined #git
11:11 buffal0 joined #git
11:11 tijensse joined #git
11:12 al-damiri joined #git
11:14 sarri joined #git
11:14 sarri joined #git
11:14 ShekharReddy joined #git
11:15 jottr joined #git
11:18 jay-m joined #git
11:18 nixjdm_ joined #git
11:19 muep joined #git
11:21 venmx joined #git
11:23 sarbs joined #git
11:24 h12o joined #git
11:27 tvw joined #git
11:30 tijensse joined #git
11:32 cdown joined #git
11:33 hotpancakes joined #git
11:34 venmx joined #git
11:35 str joined #git
11:36 Andrew_K joined #git
11:38 wohfab joined #git
11:40 aruns__ joined #git
11:42 Cavallari joined #git
11:42 hahuang65 joined #git
11:42 t-mart joined #git
11:43 kurkale6ka joined #git
11:44 izmar joined #git
11:45 izmar When I do git clone --recursive https://github.com/izzyreal/vmpc-all-projects.git, the submodules are all detached from HEAD.
11:46 aruns joined #git
11:47 Murr joined #git
11:47 osse Submodules usually are
11:48 venmx joined #git
11:49 bronson joined #git
11:49 izmar Ok, but it seems like I can't just ignore it
11:50 floppydh joined #git
11:50 wohfab joined #git
11:51 osse What do you mean?
11:52 izmar When it's in that state, can I make a commit from it?
11:52 osse Indide the submodule or outside?
11:53 izmar Inside
11:53 osse Well, yes, but not recommended.
11:54 sarri joined #git
11:54 sarri joined #git
11:54 osse If you make any changes then the outer project is considered modified
11:54 leah2_ joined #git
11:55 izmar I basically want to do some work on machine 1, commit and push, then do some work on machine 2, commit and push, and so on.
11:56 izmar I'm not using multiple branches in any of my modules
11:56 izmar So far I've been doing in submodules: git add <changed-file-or-dir>, git commit, git push
11:57 izmar after that in the outer project (the thing that contains the submodules): git add <submodule dir>, git commit, git push
11:57 manuelschneid3r joined #git
11:57 CheckDavid joined #git
11:58 izmar When I git clone --recursive the outer project to machine 2, that gives the desired dir structure and commits.
11:58 izmar It's just that I'm not sure how to commit and push on machine 2.
11:58 Ryanar joined #git
11:58 tcorneli joined #git
11:59 izmar Is there perhaps a recursive commit and push?
11:59 jameser joined #git
12:01 venmx joined #git
12:02 brent__ joined #git
12:02 belmoussaoui joined #git
12:02 JackFruh joined #git
12:03 inovas joined #git
12:04 netj joined #git
12:04 valhalla_22 joined #git
12:05 izmar osse: I'm getting the behaviour I need if I do git checkout master for a submodule after doing the recursive clone
12:06 belmoussaoui joined #git
12:06 cagomez joined #git
12:06 jameser joined #git
12:06 sarri joined #git
12:06 sarri joined #git
12:09 izmar But I don't want to do that after every clone
12:10 kurkale6ka joined #git
12:12 Tobbi joined #git
12:16 jottr joined #git
12:17 sunri5e joined #git
12:17 nixjdm_ joined #git
12:18 belmoussaoui joined #git
12:18 osse izmar: I don't think you have a choice. How often do you clone?
12:19 osse And maybe using submodules in the first place isn't optimal.
12:20 izmar At the moment I'm cloning quite a lot, because I'm figuring out my higher level approach to my project
12:21 izmar and I don't know much about git
12:21 izmar My project is pretty big and uses 5 to 8 different repositories.
12:22 izmar So I've been trying a structure where one repo is basically a container for all 8 repos
12:22 izmar preserving dir structure
12:22 osse Submodules arent rea meant to be developed in tandem with the super project.
12:23 izmar Ah I see
12:23 izmar What's an alternative?
12:24 cqi joined #git
12:24 irqq joined #git
12:24 osse !subproject
12:24 gitinfo [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
12:25 osse I'm not suew what fits best in this case. Maybe the alternatives are worse
12:25 izmar !gitslave
12:25 gitinfo gitslave ( http://gitslave.sf.net ) is useful to add subsidiary git repositories to a git superproject when you control and develop on the subprojects at more or less the same time as the superproject, and furthermore when you typically want to tag, branch, push, pull, etc. all repositories at the same time.
12:25 osse Honestly I'd go with one huge repo. You can split it later
12:26 kurkale6ka joined #git
12:26 izmar I'd prefer it to stay modular
12:26 irqq is it possible to get `git config -l` output formatted in exactly the same way that is displayed in $EDITOR when `git config -e` ?
12:26 izmar since some of the projects I'm working on can be used without the super project
12:26 izmar Slave sounds good.
12:27 marcogmonteiro joined #git
12:29 osse izmar: I don't think so. What's the use case?
12:29 osse oops, That was for irqq
12:30 Mowgli joined #git
12:31 stutter joined #git
12:31 irqq osse: readable look. I always use git config -e to see my config but it's a bit annoying to have then to exit $EDITOR to get back to shell
12:31 synthroid joined #git
12:31 EvilPenguin joined #git
12:32 oprypin i have 2 commits on top of an old state of master and i want to rebase them onto its new state. one of those commits had since been committed to master and reverted. it's excluded from the rebase but i want to keep it. how?
12:33 h12o joined #git
12:36 jottr joined #git
12:37 osse irqq: cat .git/config
12:38 high_fiver joined #git
12:38 irqq osse: :-/ :-)
12:39 oprypin solved: manually added pick commitid to git rebase -i
12:39 hotpancakes joined #git
12:40 osse irqq: or  GIT_EDITOR=cat git config -e  :p
12:40 vignesh joined #git
12:41 osse irqq: Since obviously git id able to write the config file it should be able to print it too...
12:41 osse Oh well
12:41 sieve joined #git
12:41 sieve Hi
12:41 sieve jobs/Testing-1/config.xml
12:41 sieve jobs/Testing-1/lastStable
12:41 sieve jobs/Testing-1/lastSuccessful
12:42 sieve I am looking for a .gitignore that catches everything except jobs/*/config.xml
12:43 valhalla_22 joined #git
12:43 belmoussaoui joined #git
12:44 sieve jobs/*/*
12:44 sieve !jobs/*/config.xml
12:45 ecuanaso joined #git
12:47 fat_cat joined #git
12:47 masuberu joined #git
12:49 Darcidride joined #git
12:52 jameser joined #git
12:55 valhalla_22 joined #git
12:58 ogny joined #git
12:59 fat_cat joined #git
13:00 Cabanossi joined #git
13:02 in1t3r_ joined #git
13:05 ggherdov Hello. Anyone familiar with qgit and/or gitk (git history viewers) knows if it possible to add a column displaying the commits hashes?
13:05 ggherdov s/it possible/it's possible/
13:05 bambs_ joined #git
13:07 permalac joined #git
13:07 phinxy joined #git
13:10 belmoussaoui joined #git
13:11 in1t3r_ joined #git
13:14 h12o joined #git
13:14 zxd I keep getting these error: index-pack died of signal 112)
13:14 zxd fatal: index-pack failed
13:15 zxd fatal: BUG: total_in mismatch60/325080), 22.44 MiB | 22.39 MiB/s
13:15 zxd fatal: index-pack failed
13:17 zxd git version 1.9.3
13:17 nixjdm_ joined #git
13:18 rohitpaulk joined #git
13:19 ssarah joined #git
13:20 dege joined #git
13:20 sunri5e joined #git
13:21 bsanford joined #git
13:25 relipse joined #git
13:25 JanC joined #git
13:25 fission6 joined #git
13:29 valhall__ joined #git
13:31 h12o joined #git
13:31 in1t3r_ joined #git
13:34 Es0teric joined #git
13:35 Es0teric_ joined #git
13:36 linuxmodder joined #git
13:39 czart_ joined #git
13:41 mikecmpb_ joined #git
13:42 zxd upgraded to  libz.so.1.2.11 git version 2.7.5
13:42 zxd same problem
13:43 h12o_ joined #git
13:43 hahuang65 joined #git
13:44 kroete joined #git
13:45 Cabanossi joined #git
13:46 Dougie187 joined #git
13:47 fission6 joined #git
13:47 Murr joined #git
13:47 Ryanar joined #git
13:48 tcorneli joined #git
13:50 bronson joined #git
13:50 arooni joined #git
13:51 rohitpaulk joined #git
13:53 snowkidind joined #git
13:54 bitmod joined #git
13:54 Tobbi joined #git
13:58 Achylles joined #git
13:59 JackFruh joined #git
13:59 juvenal joined #git
14:00 hotpancakes joined #git
14:01 Ryanar joined #git
14:01 fission6 joined #git
14:02 bsanford joined #git
14:02 EvilPenguin joined #git
14:04 jameser joined #git
14:05 kurkale61 joined #git
14:06 chll_ joined #git
14:06 Darren_ joined #git
14:07 hotpancakes joined #git
14:07 dbolser left #git
14:08 jameser joined #git
14:09 h12o joined #git
14:09 Argylelabcoat joined #git
14:09 kurkale6ka joined #git
14:10 z8z joined #git
14:11 rohitpaulk joined #git
14:12 ogny joined #git
14:13 AaronMT joined #git
14:13 LordLeBrand_ joined #git
14:15 Cabanossi joined #git
14:15 Brski joined #git
14:16 LordLeBrand| joined #git
14:17 jameser joined #git
14:17 Teemo joined #git
14:18 Brski joined #git
14:18 nixjdm_ joined #git
14:21 HardlySeen joined #git
14:24 juvenal joined #git
14:25 LeBlaaanc joined #git
14:27 Ryanar joined #git
14:28 kadoban joined #git
14:29 menip joined #git
14:30 stutter joined #git
14:30 high_fiver joined #git
14:33 dave0x6d joined #git
14:33 mikecmpbll joined #git
14:35 venmx joined #git
14:35 kculpis joined #git
14:36 Argylelabcoat joined #git
14:36 Celelibi joined #git
14:40 shiranuidong joined #git
14:41 kpease joined #git
14:41 brent__ joined #git
14:45 MineCoins joined #git
14:46 sieve joined #git
14:48 venmx joined #git
14:50 donmichelangelo joined #git
14:50 LordLeBrand joined #git
14:50 LordLeBrand joined #git
14:51 t-mart joined #git
14:52 jameser joined #git
14:53 clmsy joined #git
14:53 LordLeBrand_ joined #git
14:55 relipse joined #git
14:56 konsolebox joined #git
14:56 doev joined #git
14:59 hotpancakes joined #git
15:00 johnzorn joined #git
15:01 johnzorn my git install on linux broke, why would I get: git: 'difftool' is not a git command. See 'git --help'.
15:02 venmx joined #git
15:03 Ryanar joined #git
15:03 johnzorn how are the subcommands picked up by git?
15:03 osse johnzorn: Because git+difftool is an external script but it's not found where git expects it to be.
15:03 osse johnzorn: What does git --exec-path  say?
15:04 johnzorn osse: that's it the exec-path got messed up
15:04 AndreaACME Mine works and says:    /usr/libexec/git-core
15:05 AndreaACME (just for reference)
15:05 johnzorn osse: how is the exec path configured?
15:05 osse johnzorn: At compile time
15:05 osse But you can change it
15:06 LordLeBrand joined #git
15:06 LordLeBrand joined #git
15:06 jjasinski joined #git
15:06 osse Maybe yojre running a different git than you expect or something.
15:06 johnzorn osse: ya, it's the GIT_EXEC_PATH that got switched, thanks
15:07 _ikke_ You should not have to set GIT_EXEC_PATH
15:07 osse johnzorn: Usually it's not used at all.
15:08 Teemo left #git
15:08 MacWinne_ joined #git
15:08 juvenal joined #git
15:12 minot joined #git
15:13 sieve joined #git
15:13 konsolebox joined #git
15:13 LordLeBrand_ joined #git
15:15 peterppp joined #git
15:15 synthroid joined #git
15:15 ravior joined #git
15:16 venmx joined #git
15:16 LordLeBrand| joined #git
15:16 ravior How can you see all commits for a file made only on the current branch using 'git log'
15:17 neunon joined #git
15:17 nixjdm_ joined #git
15:19 db8093246 joined #git
15:19 osse ravior: Define "only on the current branch"
15:19 GT4066 joined #git
15:20 z8z joined #git
15:20 thiago joined #git
15:20 osse Does git log -- file do they trick?
15:20 ski7777 joined #git
15:23 Gustavo6046 joined #git
15:23 nowhere_man joined #git
15:24 _ikke_ Only the current branch means excluding all other branches
15:24 mikecmpbll joined #git
15:25 osse https://github.com/Osse/git-scripts/blob/master/git-unique
15:26 Es0teric joined #git
15:26 osse I hope there's a better way to write that
15:26 izmar joined #git
15:27 cagomez joined #git
15:28 relipse joined #git
15:28 VladGh joined #git
15:29 venmx joined #git
15:30 tcorneli joined #git
15:30 floflobel joined #git
15:31 shgysk8zer0 joined #git
15:31 madewokherd joined #git
15:32 ravior osse: The branch I'm on is 'testbranch'. I would like to see all commit history for a specific file made on this branch.
15:32 osse ravior: Myself commands gives you that
15:32 osse Foe git's definition of what is "on a branch"
15:32 EvilPenguin joined #git
15:32 ravior For example a simple git log -- file would show the commits for both branches: commit 2addbc9b56b28bb1d1fe557d448a4eda1664a917 (HEAD -> testbranch)
15:33 ravior commit 516e109ace18ba7d5229db54064af7c34599f3d4 (testbranch1)
15:33 osse The second commit is also on testbranch
15:34 ravior The second one is show on testbranch1 (sorry for the bad names)
15:34 juvenal joined #git
15:34 osse Okay, so then you're want something like the script I posted
15:34 cagomez joined #git
15:35 hotpancakes joined #git
15:35 fission6 joined #git
15:35 ski7777 joined #git
15:36 ski4x7 joined #git
15:37 Neth123 joined #git
15:37 brent__ joined #git
15:37 Neth123 left #git
15:38 Nethereal joined #git
15:38 Nethereal Hey guys, looking for some advice/direction
15:38 Nethereal I have multiple repos (each has a dev/preprod/prod branch), which I want to include as submodules in an overarching repo
15:39 Nethereal i'd like to create dev/preprod/prod branches in the overarching repo, each of which links to the same branch in the submodule repos
15:39 floflobel joined #git
15:39 osse Submodules only track a specific commit
15:40 Nethereal is that a decent way to do things? and if so, how could i have it so that the overarching repo has independant .gitmodules configs per branch?
15:40 shodan` joined #git
15:40 Nethereal osse: ok, is there a better way to acheive what i would like?
15:41 Nethereal repo x, contains repos a,b,c
15:41 Nethereal when i clone repo x, branch: dev, it also gets me the dev branches of a,b, and c
15:41 osse The different branches can use different commits from the submodule
15:41 sunri5e joined #git
15:41 osse So you can still get something similar
15:41 overlord_tm joined #git
15:42 Nethereal at this point, i have the main repo, with the submodules, each of which have dev/preprod/prod branches, but i havent been successful in tying the main repos dev branch into the specific dev branches of the sub modules
15:42 Nethereal what should i be doing?
15:42 rohitpaulk joined #git
15:44 Tobbi joined #git
15:44 osse In each branch of the super repo, checkout the correct commit from the submodule, and then stage it and make a commit in the super repo
15:44 hahuang65 joined #git
15:44 Cerise joined #git
15:44 Cerise joined #git
15:45 osse Each time yij switch commits on a submodule that counts as a change in the super repo, that you can stage and commit
15:46 high_fiver joined #git
15:47 Murr joined #git
15:47 zivester joined #git
15:48 kadoban joined #git
15:49 zmt00 joined #git
15:50 LordLeBrand joined #git
15:50 LordLeBrand joined #git
15:51 bronson joined #git
15:52 Rodya_ joined #git
15:53 ski7777 joined #git
15:54 LordLeBrand_ joined #git
15:55 LordLeBrand| joined #git
15:56 dreiss joined #git
15:56 hotpancakes joined #git
15:56 mentazoom joined #git
15:57 svm_invictvs joined #git
15:57 Es0teric_ joined #git
15:57 LordLeBrand joined #git
15:58 ski7777 joined #git
15:59 dviola joined #git
16:01 z8z joined #git
16:01 cdg joined #git
16:03 ski7777 joined #git
16:03 ahrs joined #git
16:03 cdg_ joined #git
16:04 Gurkenglas joined #git
16:08 h12o joined #git
16:10 ski7777 joined #git
16:10 LordLeBrand_ joined #git
16:10 jstein_ joined #git
16:10 opalepatrick joined #git
16:11 floflobel joined #git
16:12 venmx joined #git
16:13 seishun joined #git
16:14 juvenal joined #git
16:14 orbyt_ joined #git
16:14 Floflobel_ joined #git
16:17 nixjdm_ joined #git
16:18 netj joined #git
16:18 moiyad joined #git
16:19 moiyad left #git
16:20 inovas joined #git
16:20 h12o joined #git
16:20 Noldorin joined #git
16:22 marcogmonteiro joined #git
16:23 duderonomy joined #git
16:26 venmx joined #git
16:30 jceb joined #git
16:30 LordLeBrand joined #git
16:30 LordLeBrand joined #git
16:30 kadoban joined #git
16:30 Es0teric joined #git
16:32 netj joined #git
16:32 shodan` joined #git
16:32 teod joined #git
16:32 Floflobel_ joined #git
16:32 teod hello, I'd like to modify/squash a commit I've pushed to github; Is that doable or not how it works?
16:34 kadoban teod: It's possible, but usually not a good idea once you've pushed. Anyone who might be using the history you already pushed will be annoyed and you'll have to tell them to fix it.
16:34 LordLeBrand_ joined #git
16:34 EvilPenguin joined #git
16:35 teod kadoban: I made a pull request and one of the tests failed due to a formatting error. Would it be better if I simply added a commit fixing the formatting error instead of trying to rebase?
16:36 kadoban teod: Depends on the project you're PRing to I suppose. Some like "clean" history in PRs (aka, change the history like you asked) and some like multiple commits and then clean it up at the end, or not.
16:36 kadoban If it were me I'd probably just do another commit and ask in the PR comments if they want it squashed or not
16:37 SteffanW joined #git
16:37 teod kadoban: ok, thanks for the help
16:37 tnecniv joined #git
16:37 kadoban Anytime
16:38 kadoban Just for future reference, rebase -i  (not to be confused with usual rebase) is how you'd usually squash/edit history if you want to go that way. And then you have to push -f
16:39 LordLeBrand joined #git
16:39 AndreasLutro for simplicity's sake, if your pull request is only 1 commit, you can just `git add` and `git commit --amend`
16:40 orbyt_ joined #git
16:40 kadoban Ah, right, also that.
16:40 df0 joined #git
16:41 LordLeBrand_ joined #git
16:42 djb-irc joined #git
16:42 kbs Interesting. Github q rather than git, but not having tried this before on github, does it preserve the comments/commit history in the PR intact prior to the rebase as well?
16:43 kadoban Hm, that's a good question. I don't think it preserves the commit history in a visible way, but I'm not sure what it does with comments, since I think they can be tied to the commits?
16:44 AndreasLutro the commit history will change, comments won't
16:44 garet joined #git
16:44 SteffanW joined #git
16:44 AndreasLutro if there are comments made to specific lines of code, github is smart at discarding those *if* your new commits have made changes to that line of code
16:45 bgerber joined #git
16:45 garet Hello, so I'm getting this really strange error: fatal: Unable to create '/home/garet/code/thor/.git/index.lock': File exists.
16:45 kbs do you mean the git commit history, or the record of commits in the PR page itself? [or, if you have an example link that woul be awesome as well]
16:45 AndreasLutro well, both
16:45 garet I've gotten it before, and generally just means deleting the file, but no index.lock file exists
16:46 AndreasLutro your PR branch's history will change (you're replacing your existing commit with a new one), and the same applies when you `git push -f`
16:46 garet I tried chmod'ing and chown'ing the dir to resolve any permission errors, nothing is fixing it
16:46 garet tried restarting as well. I'm using ubuntu inside of windows 10. This is the second time I've gotten this exact error within a week
16:46 garet Last time, I just re-cloned the repository and manually moved over the new .git directory. But it was a huge pain since I had a lot of uncommitted files
16:47 garet Which is the case now as well. I'd like to fix it the right way, but every solution online just parrots the same phrase of "remove the index.lock", which is impossible when it doesn't exist
16:47 AndreasLutro garet: run this command, please: `sudo lsof | grep index.lock` - is there any output?
16:47 garet no output
16:48 LordLeBrand joined #git
16:48 AndreasLutro hm
16:48 AndreasLutro what about `stat /home/garet/code/thor/.git/index.lock`
16:48 garet I use git primarily inside my editor (vim) using gitfugitive, not sure if it's to blame or not
16:48 AndreasLutro I don't know either, but you could of course try using the command line
16:48 garet AndreasLutro: https://pastebin.com/raw/MiVdiZzD
16:49 garet Yeah, the commandline is spitting out the same error as fugitive, I just meant that the error was initially recieved from fugitive
16:49 AndreasLutro well ok so the file does exist
16:49 AndreasLutro can you not see it on windows or what?
16:49 garet it does? It says size/blocks are 0?
16:50 AndreasLutro that just means it's an empty file
16:50 AndreasLutro it still exists
16:51 garet I can check to see if it is visible inside windows, it shouldn't be have anything to do with windows since I strictly access this repo from inside the ubuntu filesystem
16:51 AndreasLutro that's exactly right. I'm wondering why you said the file doesn't exist, when it clearly does
16:51 LordLeBrand_ joined #git
16:51 garet nope, not visible inside windows
16:52 garet Because I wasn't sure how to interpret the output of the stat command, I wasn't trying to tell you it didn't exist
16:52 garet I was just confused by the output. I figured if it was 0/0 it meant the file was nonexistent
16:52 AndreasLutro sure. but you said the file doesn't exist before I told you to try stat
16:52 garet I can't see it under ubuntu or windows. I can try switching to root user to see
16:52 garet Because I can't see it under any filesystem. And running `rm -f index.lock` literally tells me "the file doesn't exist"
16:53 AndreasLutro are you in the correct directory?
16:53 garet yes
16:53 AndreasLutro run `pwd`
16:53 AndreasLutro what is the output?
16:53 garet I even copy/pasted the exact path of the index.lock file that git outputs
16:53 arand joined #git
16:54 Cabanossi joined #git
16:54 AndreasLutro that's really strange, could you copy/paste your entire shell history when trying to remove the file just so we're 100% sure it's not some silly mistake?
16:54 garet AndreasLutro: the contents of my .git directory: https://pastebin.com/raw/9j4eUb8k
16:54 indistylo joined #git
16:54 AndreasLutro ok that'll do I guess
16:55 AndreasLutro I suspect this is some sort of weirdness with the windows filesystem, holding on to old non-existant files
16:56 garet hrm, I was under the impression that as long as you don't interact with ubuntu files inside the windows filesytem it would stay completely isolated
16:56 garet I've made that mistake before, and it ended badly lol
16:56 AndreasLutro I don't know how the windows/linux system works so can't comment on that
16:58 garet err, not visible from within the windows command prompt either. Any ideas on how to possibly remedy this?
16:59 garet I could re-clone the repo and copy of the .git dir on that, but I don't wanna lose any uncommitted changes, whats the best way to merge in a new .git dir while keeping changes?
16:59 Ryanar joined #git
16:59 raulp joined #git
16:59 AndreasLutro if you were on linux I'd recommend a filesystem integrity check but no idea if that is even possible on windows/linux
17:00 hudu joined #git
17:01 garet If it's possible in ubuntu, it's possible using windows/linux, the ubuntu installation literally works as a subsystem, I have access to any ubuntu program including apt-get
17:01 garet The only gotcha is that you can't interact with ubuntu files in windows, or else it'll corrupt it
17:01 garet probably due to line ending differences
17:02 juvenal joined #git
17:02 garet would fdisk be the way to do that?
17:02 dendazen joined #git
17:03 kadoban garet: I doubt it
17:04 garet yeah doing a quick google I found this: https://askubuntu.com/a/335825 but it looks like fdisk doesn't even print anything out
17:04 garet maybe ubuntu on windows doesn't actually mount the filesystem like a true ubuntu installation
17:04 AndreasLutro you can check with `mount`
17:05 chardan joined #git
17:06 hotpancakes joined #git
17:06 shodan` joined #git
17:06 kadoban For fdisk to make a lot of sense, it'd have to be a totally separate partition or something. It's probably some weird hybrid thing windows exposes
17:07 venmx joined #git
17:07 kadoban And if you're right that the problem would be due to line endings or something, fdisk wouldn't do anything about that anyway, that's not what it does.
17:08 Rodya_ joined #git
17:09 garet kadoban: gotcha, thanks for the info. The weird thing is, I have kept this repo 100% isolated from windows. So there's no way it's related to a corruption via windows. The only thing I can really blame is vim+gitfugitive. It was literally in the middle of using that when it crashed
17:09 garet I accidentally ran :Gstatus (isntead of :Gcommit) while already inside fugitive's git status window, which caused git to crash and triggered this whole issue
17:09 stoner23 joined #git
17:09 kadoban The usual way you end up with those lock files sticking around is when git or some other tool crashes, so that part makes sense.
17:10 fission6 joined #git
17:10 garet It's just really strange that the file isn't visible
17:10 kadoban I guess if it were me I'd restart the computer and try to delete the file then.
17:10 garet Not under my ubuntu user, root user, or windows user
17:10 garet A reboot was the first thing I tried :/
17:10 hahuang65 joined #git
17:10 kadoban Other than that ... check permissions on the directory maybe? Maybe the error message is just wrong, though that'd be weird.
17:10 garet Is there another way to force delete an invisible file other than `rm -f /filepath`?
17:10 garet because that's not working
17:11 kadoban Don't think so
17:11 garet Yeah, I already ran chown + chmod to give myself every permission possible on the .git dir
17:11 garet I guess the only thing I can really do is reclone the repo and copy over the .git dir
17:11 kadoban ##linux or somewhere might know better, I don't think I've ever experienced that though.
17:11 garet just gotta make sure I don't lose my progress
17:11 ski4x7 joined #git
17:11 snowkidind joined #git
17:12 garet I think last time I was able to merge my uncommitted changes into the repo that way. Just gotta be careful lol
17:12 garet I'm not the best at git fu
17:12 synthroid joined #git
17:12 TbobbyZ joined #git
17:14 ahrs joined #git
17:15 hotpancakes joined #git
17:15 Nethereal hey, did someone reply to my info? i lost the buffer and cant tell who
17:16 pkmoore joined #git
17:16 wilbert joined #git
17:18 nixjdm_ joined #git
17:19 _ikke_ Nethereal: http://tpaste.us/QDP4
17:19 Achylles joined #git
17:21 juvenal joined #git
17:22 Swahili joined #git
17:22 Swahili Hi
17:22 _ikke_ Nethereal: Not that there are public !logs
17:22 gitinfo Nethereal: [!irclog] Public logs of #git are kept at: https://itvends.com/irc/git/ or see stats for the last 30 days: http://itvends.com/irc/git.html or all logs: http://itvends.com/irc/git-all.html
17:23 Swahili Q: I've been working on a branch, created from `master`; master been updated serveral times today; how to rebase and accept all in my branch? my files were worked solely on my branch but I'm having issues when rebasing with conflicts in the same file I've worked, not sure why.
17:23 _ikke_ Swahili: what command(s) did you run?
17:24 Swahili _ikke_: thanks for looking! I usually do: git rebase --interactive branchName
17:24 energizer joined #git
17:25 _ikke_ what kinds of conflicts are you seeing?
17:25 Swahili for each commit I did in the current branch, I have to chose between that and the newest or top commit
17:26 Swahili if that makes sense
17:26 Swahili I'm thinking do the rebase again and everytime it blocks do: git checkout --ours -- filename
17:28 Swahili wait..maybe I did: git rebase --interactive myCurrentBranch,
17:28 gopar joined #git
17:28 _ikke_ that's a noop
17:29 hoangtg joined #git
17:29 Swahili yeah, but just checked history and wasn't the case; so I did git rebase --interactive desiredBranch and seems to be ok, I'll check
17:29 Swahili thinks for your attention by the way!
17:30 Swahili sorry
17:30 _ikke_ Beware that running git checkout --ours might result in you loosing changes from others
17:31 cagomez joined #git
17:32 Swahili _ikke_: ok!
17:32 hoangtg hi, I'm trying to trace which config that actually in effect to ingore some files in my repo with `git check-ignore -v *`, but the `*` pattern does not apply to things like `.idea`, `.ruby-version`, and is non-documented
17:32 maarhart joined #git
17:32 Swahili I usually do, git fetch --all && git rebase --interactive master
17:32 Swahili if this makes sense? in my mind: fetch all from origin, and then rebase
17:32 hoangtg is there a `catch-all` pattern for check-ignore pathname?
17:32 LordLeBrand joined #git
17:32 LordLeBrand joined #git
17:34 nanga joined #git
17:35 nanga joined #git
17:35 tijensse joined #git
17:35 _ikke_ hoangtg: it's your shell that's interpretting the *
17:35 _ikke_ try git check-ignore -v '*'
17:35 TbobbyZ joined #git
17:36 bgerber joined #git
17:36 Vode joined #git
17:36 orbyt_ joined #git
17:39 Bubiah joined #git
17:40 hoangtg _ikke_: thank you. I'm using fishshell and wraping like '*' does not match anything
17:42 _ikke_ hoangtg: try git checkignore -v * .*
17:43 hoangtg _ikke_: oh, it works, I didn't knows that we can specify multiple pathname
17:43 _ikke_ hoangtg: It helps if you realize that fish expands * to multiple filenames already, so to git, it's as if you specified all filenames
17:43 _ikke_ doing multiple patterns just adds more names to the list
17:44 hoangtg _ikke_: however in future if there's more cases that escape that 2 patterns then I'll need to add more, right?
17:44 _ikke_ right, but this should already be exhaustive
17:45 high_fiver joined #git
17:45 Gurkenglas joined #git
17:45 hoangtg yeah, I'm all ok for now, just that concern for a just-in-case future, but anyway it's ok for now. Thank you
17:46 thiago joined #git
17:46 tijensse joined #git
17:47 Murr joined #git
17:47 boombatower joined #git
17:52 shinnya joined #git
17:52 LordLeBrand joined #git
17:52 rohitpaulk joined #git
17:52 bronson joined #git
17:53 svm_invictvs joined #git
17:53 staafl joined #git
17:56 marcogmonteiro joined #git
17:56 LordLeBrand_ joined #git
17:56 davimore joined #git
17:58 TomyLobo joined #git
17:59 Eugene !blog
17:59 gitinfo Blog or Answer posts(like StackOverflow), while helpful and informative, are quite often outdated, give bad advice, or are just plain wrong. Please don't rely solely upon them, or treat them as authoritative. We recommend reading the documentation and consulting multiple sources, such as the expert advice to be found on IRC
18:00 hotpanca_ joined #git
18:01 Doginal joined #git
18:01 tnecniv joined #git
18:01 deep-book-gk_ joined #git
18:03 deep-book-gk_ left #git
18:04 bitBaron joined #git
18:05 Sasazuka joined #git
18:07 tijensse joined #git
18:08 LordLeBrand joined #git
18:08 LordLeBrand joined #git
18:09 Cabanossi joined #git
18:11 jay-m joined #git
18:12 Richard_Cavell joined #git
18:12 Richard_Cavell Hi everyone. I'm a git newbie. I've just created a new repo at https://github.com/richardcavell/6809-strlen and I have some files in a directory on my computer.  How do I connect the directory on my computer to the github repo?
18:13 Eugene Richard_Cavell - do you have the Github client installed already?
18:13 Richard_Cavell I'm using Ubuntu and I use the command line.
18:13 LordLeBrand_ joined #git
18:13 Eugene Ah, even easier!
18:14 nixjdm joined #git
18:14 Eugene `git clone https://github.com/richardcavell/6809-strlen` will clone(create a local copy of the repository) in a new folder named 6809-strlen/
18:14 TbobbyZ joined #git
18:14 Eugene cd into this folder, cp the files you want in
18:15 Eugene `git add <filename>` to "prepare" it, and then `git commit -m "My First Commit"` will create a commit locally(save it)
18:15 Eugene `git push` will send that commit up to Github.
18:16 Achylles joined #git
18:19 druonysus joined #git
18:19 khatri joined #git
18:20 rominron_ joined #git
18:20 Richard_Cavell Eugene: Thank you, sir.
18:20 Richard_Cavell That worked smoothly.
18:21 Eugene !book
18:21 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
18:21 vuoto joined #git
18:22 cagomez joined #git
18:22 raynold joined #git
18:22 JyZyXEL joined #git
18:23 cagomez joined #git
18:23 JyZyXEL why cannot i 'git pull' after i've 'git checkout origin/linux-4.12.y'?
18:23 Eugene JyZyXEL - you are probably !detached
18:23 gitinfo JyZyXEL: 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
18:23 Eugene !reattach
18:23 gitinfo Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue
18:24 KAKMADAFAKA joined #git
18:24 KAKMADAFAKA whats a git
18:24 JyZyXEL Eugene: did the checkout but nope
18:24 h12o joined #git
18:24 Eugene KAKMADAFAKA - !official
18:24 gitinfo KAKMADAFAKA: Some official resources for git. Homepage: http://git-scm.com/ | Source repo: https://www.kernel.org/pub/scm/git/git.git/ (Mirrrored: https://github.com/git/git/) | IRC channel: You're in it. | Mailing list: http://vger.kernel.org/vger-lists.html#git (git@vger.kernel.org, subscription optional)
18:24 KAKMADAFAKA isnt that derogatory
18:25 Eugene Self-deprecating in this use case, but yes
18:25 JyZyXEL im trying to find a reliable way of getting git to follow the latest stable kernel
18:25 LordLeBrand joined #git
18:25 LordLeBrand joined #git
18:25 davimore joined #git
18:25 KAKMADAFAKA windows is vastly superior to git
18:25 Eugene KAKMADAFAKA - we don't do trolls here
18:26 KAKMADAFAKA sry, was just wondering about the best place to get started with git
18:26 KAKMADAFAKA i am really into it
18:26 Eugene JyZyXEL - man git-archive for how to extract a tarball; you probably want to use versioned tags rather than named branches. I don't know what numbers are what nowadays, but you probably want to make a script/regex to find "the latest 2.6.X tag"
18:26 gitinfo JyZyXEL: the git-archive manpage is available at https://gitirc.eu/git-archive.html
18:26 Eugene JyZyXEL - see also the ideas in !deploy
18:26 gitinfo JyZyXEL: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
18:27 JyZyXEL Eugene: well i was thinking something like: git checkout $(git branch -r --no-color | sort -V | tail -n2 | head -n1)
18:27 Phylock joined #git
18:28 Eugene Yeah, that won't end well. If you want to script this you need to use plumbing commands; not user-facing porcelain(checkout bad)
18:28 JyZyXEL the optimal would be if i could just do it with a single command
18:28 Eugene Otherwise you WILL end up in a corner-case that your script doesn't catch
18:28 JyZyXEL like "IS THERE A NEW STABLE KERNEL? YES? NO?"
18:29 JyZyXEL and it should get it if there is :P
18:29 egonsen joined #git
18:29 Eugene That requires intelligent parsing of the kernel developer mailing list
18:29 Eugene Soooooo
18:29 Eugene Honestly, the best I can come up with is to scrape kernel.org for the "Latest Stable kernel:"
18:30 JyZyXEL there should be a 4.y.y branch!
18:30 Eugene And if you're doing that, just fetch the tarball!
18:30 perlpilot left #git
18:30 egonsen hi! i want to contribute code to notepad++ on github. the project does not work with vs 2017 so far until i change 4 settings in some file locally. those local changes prevent me from rebasing because git complains about the untracked file. what can i do?
18:30 julia_c JyZyXEL: there are linux-4.x.y branches
18:30 JyZyXEL julia_c: where!
18:30 perlpilot joined #git
18:31 julia_c JyZyXEL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
18:31 JyZyXEL if im following a 4.x.y branch, then i can use "git -C ... pull" to get the new stuff?
18:31 Eugene The problem with following a branch like this is that the "stable" branch changes over time
18:32 Eugene And there are multiple stable/longterm branches available
18:32 durham joined #git
18:32 JyZyXEL latest stable is the biggest number without rc after it
18:33 Eugene So write that into a regex, if you trust linus enough to not make up a new numbering scheme
18:33 Eugene (I dont)
18:33 julia_c there is also https://www.kernel.org/releases.json in case it's useful to you.
18:34 JyZyXEL julia_c: there are no x.y branches, i don't see them
18:34 Eugene Oh hey thats neat
18:34 Eugene https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/refs/heads
18:34 Eugene (you needed to click the [...] button)
18:35 JyZyXEL no such button here
18:35 Es0teric joined #git
18:35 volestorm joined #git
18:35 Gustavo6046_ joined #git
18:36 JyZyXEL linux-4.12.y is the closest one
18:36 julia_c is that not what you're looking for?
18:36 JyZyXEL im looking for linux-4.x.y
18:36 Cavallari joined #git
18:37 julia_c that does not exist; these branches assume you've already chosen an 'x'
18:38 julia_c "latest" is a bit ambiguous when referring to stable releases
18:38 julia_c would you consider v4.1.42 to be "newer" than v4.11.1, if v4.11 has been EOL'd, and v4.1.42 was tagged long after v4.11.1? (for example)
18:39 JyZyXEL if i fetch the 4.12.2 value from kernel.org json, i wonder if i could use that?
18:39 Cabanossi joined #git
18:39 fat_cat joined #git
18:40 n3wborn sorry for my ignorance but what the x means ?
18:40 julia_c x is the kernels' minor version
18:40 dreiss joined #git
18:41 JyZyXEL i consider latest stable kernel in kernel.org to be the latest stable
18:41 julia_c okay, that's one interpretation of 'latest', if that's what you're looking for: great!
18:42 n3wborn sorry, I thought there was something I had missed but in fact no.
18:43 JyZyXEL following master, you can just use "git pull" to check for new kernels
18:43 JyZyXEL its such a shame it follows into rc's though
18:44 julia_c following master is a different thing than following stable
18:45 julia_c maybe you should back up: what is it you are looking for, at a higher level?
18:45 JyZyXEL master of linux-stable.git
18:45 cagomez joined #git
18:45 julia_c ah, yes; it's just a mirror of linus' tree
18:45 JyZyXEL is there a better tree that doesn't give me the rc's?
18:45 fat_cat joined #git
18:46 julia_c all you are looking for is the official releases?
18:46 JyZyXEL yeah!
18:47 JyZyXEL a git directory following the latest official releases would be nice
18:47 watersoul joined #git
18:47 Gustavo6046 joined #git
18:47 JyZyXEL then i can just check exit value of 'git pull' to see if i need to autobuild a new kernel
18:48 julia_c afaik, nothing of the sort exists.  you basically just are wanting linus's tree w/o rc tags
18:48 johnny56_ joined #git
18:48 julia_c maybe there's a clever way you can construct a filtering refspec; I don't know
18:49 JyZyXEL seems fairly obvious to want that... doesn't everyone?!
18:49 julia_c very few people run official releases.
18:49 JyZyXEL who the heck wants to run rc kernels on their stable machines? crazy!
18:50 julia_c oh, even fewer run rc kernels.
18:50 julia_c most people run _stable_ releases, but this isn't what you are asking for.
18:50 shgysk8zer0 joined #git
18:50 julia_c your mental model is buggy w.r.t. how linux manages its stable trees.
18:50 JyZyXEL what are their _stable_?
18:50 gopar joined #git
18:50 bremner history is for _development_ convenience, not _deployement_ convenience
18:50 julia_c the stable releases are those in the form of 4.x.y
18:51 gopar joined #git
18:51 rorro joined #git
18:51 julia_c which is: linus's official 4.x release, plus cherry-picked fixes from 4.x+; this happens in the branches I linked to before.
18:52 julia_c almost every linux distribution distributes kernels from these trees.
18:53 JyZyXEL bremner put it quite well
18:53 Vargas joined #git
18:54 juvenal joined #git
18:55 JyZyXEL something like "git pull v4.12.2" does not seem to work
18:56 eshlox joined #git
18:56 linuxmodder joined #git
18:56 Lyhqp joined #git
18:56 Eugene !pull
18:56 gitinfo pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull:  http://longair.net/blog/2009/04/16/git-fetch-and-merge/
18:56 Eugene pull is not what you want
18:57 Eugene `git checkout <branch>; git pull` is probably closer, but again, you really don't want to try to do this in an automated manner. Use a deploy tool
18:57 JyZyXEL yeah i want fetch
18:57 JyZyXEL git fetch v4.12.2
18:58 nod joined #git
18:59 Guest23762 joined #git
18:59 Guest23762 left #git
19:00 pkmoore joined #git
19:00 linuxmodder_ joined #git
19:00 wilbert joined #git
19:00 bremner doubt it
19:01 JyZyXEL would "git checkout v4.12.2" download the changes?
19:01 JyZyXEL and what about when v4.12.3 releases, will the command "git checkout v4.12.3" even work?
19:02 JyZyXEL would it download the changes?
19:02 JyZyXEL its impossible to test this crap before there actually are updates :(
19:03 cagomez joined #git
19:04 bremner you need to first download, then checkout
19:04 JyZyXEL you mean fetch?
19:04 bremner yes
19:04 belmoussaoui joined #git
19:04 JyZyXEL what if i fetch out only tags and checkout to the new tag?
19:04 bremner that should work
19:05 JyZyXEL the checkout would trigger download?
19:05 bremner but you'll have to figure out somehow what the new tag.
19:05 bremner no
19:05 bremner checkout has nothing to do with downloading
19:05 chinna_ joined #git
19:05 JyZyXEL how would i get the changes if i only fetch tags?
19:06 JyZyXEL i couldn't checkout to the tag probably?
19:06 bremner you can checkout the tag if you know which tag to check out
19:07 JyZyXEL ok, what about the changes for that tag?
19:07 kadoban Tags typically don't change in any reasonable workflow.
19:07 JyZyXEL if you've only fetched new tags and then checked out onto one of them, at what point are any of the changes done?
19:07 kadoban Oh, you mean the commits referenced.
19:08 JyZyXEL yeah
19:08 bremner tags are snapshots
19:08 bremner well, they point to commits, which are snapshots
19:08 bremner checkout updates the working directory
19:09 tnecniv joined #git
19:09 kadoban Git doesn't fetch tags or branches without also grabbing the history needed for those tags/branches to make sense. You can make it do so if you really try, but by default anyway.
19:09 Cabanossi joined #git
19:09 JyZyXEL yeah i get it now
19:09 indistylo joined #git
19:10 JyZyXEL there doesn't really appear to be any opportunity to use git exit statuses in that case
19:11 hudu joined #git
19:11 linuxmodder joined #git
19:13 Kobaz i forgot what to do here
19:13 _ikke_ JyZyXEL: git is a distributed system. That means when you fetch, it fetches everything at once
19:14 _ikke_ JyZyXEL: if you fetch, you can then travel by plane, and have everything needed to work locally
19:14 _ikke_ The only thing you cannot do is push / fetch
19:16 Kobaz https://pastebin.com/K7RNSvWn
19:16 Kobaz so, since there's no diff, how do i 'clean that up'
19:16 _ikke_ clean what up exactly?
19:18 _ikke_ 2.0 is ahead of it's remote counterpart, so you should push, not pull
19:18 robotroll joined #git
19:20 albel727 joined #git
19:20 linuxmodder_ joined #git
19:21 cagomez joined #git
19:21 netj joined #git
19:23 bgerber joined #git
19:24 Achylles joined #git
19:25 JyZyXEL is there a git command that gives the current version you are at?
19:25 preaction JyZyXEL: git --version
19:25 JyZyXEL no i mean the kernel version
19:25 JyZyXEL that is currently checked out
19:25 preaction git describe
19:25 Kobaz it's ahead 5
19:26 Kobaz but there's no diffs
19:26 Kobaz so how do i nuke all that
19:26 Kobaz it's 'ahead'
19:26 Kobaz there's no diffs
19:26 Kobaz it's ahead just in terms of merge history
19:26 JyZyXEL preaction: perfect!
19:27 _ikke_ Kobaz: !situation
19:27 gitinfo Kobaz: Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)
19:28 UTAN_dev joined #git
19:29 nixjdm_ joined #git
19:32 shgysk8zer0 joined #git
19:32 in1t3r_ joined #git
19:33 cagomez joined #git
19:34 seishun joined #git
19:35 Kobaz i wind up with this often, i wind up with all this fluff in the repo when merges come in
19:38 venmx joined #git
19:38 cam27 joined #git
19:39 hahuang65 joined #git
19:41 belmoussaoui joined #git
19:45 cdown joined #git
19:47 Murr joined #git
19:47 netj joined #git
19:49 cagomez joined #git
19:49 anuxivm joined #git
19:50 Dougie187 joined #git
19:51 strugee joined #git
19:52 sieve joined #git
19:52 belmoussaoui joined #git
19:53 bronson joined #git
19:54 Cabanossi joined #git
19:54 m0viefreak joined #git
19:55 Achylles joined #git
19:56 cagomez joined #git
19:56 seishun joined #git
19:56 bitmod joined #git
19:59 in1t3r_ joined #git
20:00 hudu joined #git
20:02 str joined #git
20:02 druonysus__ joined #git
20:02 dpl joined #git
20:03 cagomez joined #git
20:04 staafl joined #git
20:05 ravior joined #git
20:06 him joined #git
20:06 netj joined #git
20:06 sieve joined #git
20:07 ravior osse: You were right. It was git log -- file. I made a mistake where the second branch was derived from the first, as a result, I was receiving both commits and git (as generous as always), was reminding me that the first commit is the head (the second branch), while the first is where the parent is.
20:07 ravior I was dumb when codding the branching part. Thanks for the help.
20:08 mluser-laptop joined #git
20:09 ZyX-I joined #git
20:09 fatihgenc joined #git
20:11 Tobbi joined #git
20:13 TbobbyZ_ joined #git
20:14 mr_sm1th joined #git
20:15 in1t3r_ joined #git
20:15 SoftLock joined #git
20:16 Cavallari joined #git
20:16 Maskettaman joined #git
20:16 menip joined #git
20:17 sieve joined #git
20:17 juvenal joined #git
20:20 TbobbyZ joined #git
20:21 courrier joined #git
20:23 cagomez joined #git
20:26 HoierM joined #git
20:27 lafleurdubien joined #git
20:28 courrier joined #git
20:28 orbyt_ joined #git
20:29 nixjdm_ joined #git
20:29 Rodya_ joined #git
20:33 venmx joined #git
20:33 Es0teric joined #git
20:34 mns joined #git
20:34 Nicmavr joined #git
20:35 inovas joined #git
20:36 fat_cat joined #git
20:39 durham joined #git
20:40 durham joined #git
20:41 Guest89630 joined #git
20:41 _ADN_ joined #git
20:42 theiostream joined #git
20:42 h12o joined #git
20:42 juvenal joined #git
20:43 druonysus__ joined #git
20:44 druonysus__ joined #git
20:45 djapo joined #git
20:45 djapo is there a way to patch a file from stash
20:47 ssarah joined #git
20:47 rorro joined #git
20:49 neunon joined #git
20:54 venmx joined #git
20:59 belmoussaoui_ joined #git
21:01 misosoup joined #git
21:02 kroete joined #git
21:04 Es0teric_ joined #git
21:06 ertes joined #git
21:06 arand joined #git
21:08 h12o joined #git
21:09 venmx joined #git
21:09 arand joined #git
21:10 orbyt_ joined #git
21:14 TheFuzzball joined #git
21:14 fission6 joined #git
21:16 juvenal joined #git
21:20 hotpancakes joined #git
21:20 cagedwisdom joined #git
21:22 gopar joined #git
21:22 itseris joined #git
21:23 hseg joined #git
21:24 holodoc joined #git
21:25 zartu joined #git
21:25 Alexxx joined #git
21:26 gopar joined #git
21:26 hseg Hi. Just noticed I failed to notice a whitespace error. How do I find all whitespace errors in my repo? (Just enabled pre-commit hook to avoid this in the future)
21:27 hseg (Also, it'd be nice to find the actual commits that introduced these errors)
21:28 Dougie187 joined #git
21:30 nixjdm_ joined #git
21:32 Rodya_ joined #git
21:32 osse hseg: git log -G might help you
21:34 hseg So something along the lines of git log -G "^ +$"
21:34 hseg ?
21:36 osse Yes
21:38 hotpancakes joined #git
21:39 Cabanossi joined #git
21:39 hseg Just realized what happened. I *thought* I had errors because I had whitespace when I edited the patch, but that was probably marking the line as context.
21:40 finalbeta joined #git
21:40 sbeller_ joined #git
21:41 Gurkenglas joined #git
21:41 hotpanca_ joined #git
21:41 Doginal joined #git
21:44 arand joined #git
21:44 hseg OTOH, turns out *another* file had actual whitespace errors
21:47 Murr joined #git
21:49 dermoth joined #git
21:50 valhalla_22 joined #git
21:50 jrnieder joined #git
21:52 qaz joined #git
21:53 tejaswidp joined #git
21:54 bronson joined #git
21:55 BSaboia joined #git
21:56 ngeraedts joined #git
21:57 cliluw How do I cherry-pick commits from another repository into a subdirectory of a repository? I've tried using cherry-pick with the subtree merge strategy but it doesn't seem to work for me.
21:57 neunon joined #git
21:57 cliluw I've already added the second repository as a remote of the current repository.
22:01 svm_invictvs joined #git
22:01 sondr3 joined #git
22:01 h12o joined #git
22:02 cagomez joined #git
22:04 manuelschneid3r joined #git
22:05 tunekey joined #git
22:05 fraktor joined #git
22:06 in1t3r_ joined #git
22:08 cagomez joined #git
22:08 cagomez joined #git
22:08 fraktor I'd like to set up a repository for my computer science homework so that I can properly keep versioned backups. However, I'd like to set up a single repository for each class. Can I use a different branch for each assignment in a class so that the commits for unrelated assignments don't get interleaved?
22:09 cagomez joined #git
22:10 cagomez joined #git
22:11 Rodya_ joined #git
22:13 kadoban joined #git
22:14 Dougie187 left #git
22:15 osse cliluw: git format-patch and git apply have options to modify the paths to the files they claim to patch
22:15 osse --directory, --prefix, something like that
22:16 hseg_ joined #git
22:16 Doginal joined #git
22:16 osse fraktor: Sounds better to use different repos
22:16 confluency fraktor: why don't you just make subdirectories for different assignments?
22:16 cliluw osse: That is so low-level. I was hoping there would be something built-in. Thank you.
22:16 confluency fraktor: for that matter, why not one repo for everything, with subdirectories for classes?
22:16 hahuang65 joined #git
22:17 confluency fraktor: if it's just for you, why bother with individual repos?
22:17 astrofog joined #git
22:17 confluency fraktor: branches should conceptually be used for variations of the same thing, not for different things.
22:18 kadoban_ joined #git
22:18 Ryanar joined #git
22:19 mkoskar joined #git
22:24 energizer joined #git
22:25 cebor joined #git
22:26 rda-mac joined #git
22:27 Rodya_ joined #git
22:28 cagomez joined #git
22:29 cagomez joined #git
22:29 kadoban_ joined #git
22:30 nixjdm_ joined #git
22:30 geojunkieSCI joined #git
22:31 hseg joined #git
22:31 rorro joined #git
22:31 hahuang65 joined #git
22:33 rohitpaulk joined #git
22:34 sleepee joined #git
22:34 fraktor confluency: Let's say that I want to revert a single in-the-past assignment back to a previous version. How can I do that without completely undoing all subsequent assignments if the commits are sequential?
22:36 confluency fraktor: you don;t have to roll back the whole repo. You can get past revisions of a single file or group of files.
22:37 fraktor That's true. I'll just keep separate folders for different assignments.
22:37 fraktor Thanks for your help!
22:37 confluency fraktor: tbh what I would do is host the repo on a hosting service (BitBucket or self-hosted if you care about making it private) and browse through the revisions in the web interface instead of messing with my workspace.
22:40 troyt joined #git
22:40 hseg Is there some way of telling git not to print the relevant lines of a conflict/whitespace error if the file is binary?
22:41 Doginal joined #git
22:43 troyt joined #git
22:43 hotpancakes joined #git
22:43 orbyt_ joined #git
22:44 fat_cat joined #git
22:46 rostero joined #git
22:46 cagomez joined #git
22:47 troyt joined #git
22:50 causasui joined #git
22:50 hseg More importantly - I need to remove a commit that is an ancestor of multiple branches. I could just rebase -i SHA^ and remove that line, for each such branch, but I suspect there's an easier way.
22:50 hseg (commit is unpublished, so no worries there)
22:51 troyt joined #git
22:52 troyt joined #git
22:55 digitalway joined #git
22:56 arand hseg: You can use --onto with rebase to exclude a range of commits without interaction.
22:57 hseg i.e., git rebase --onto SHA^ SHA+ branch, where SHA+ is the successor to SHA?
22:57 tejaswidp left #git
22:57 juvenal joined #git
22:58 Tobbi joined #git
22:59 cagedwisdom joined #git
22:59 arand hseg: I think the start parameter is exclusive in that case, so it might be just SHA^ SHA branch, if I recall...
23:00 hseg Yeah, checking docs that does seem to be the case.
23:01 madewokherd joined #git
23:01 hseg So basically, IIUC I need git for-each-ref --shell --format="git rebase --onto ${SHA}^ $SHA %(refname)" --contains $SHA refs/heads ?
23:02 hseg (which then gets piped to sh)
23:03 troyt joined #git
23:07 hseg Hopefully the created SHAs will be equal, so that this won't cause breakage.
23:08 neunon joined #git
23:09 rigid joined #git
23:09 rigid joined #git
23:09 hseg And no, that failed.
23:09 linuxmodder joined #git
23:10 Achylles joined #git
23:10 kadoban_ joined #git
23:10 tmsmith joined #git
23:16 Joesmo joined #git
23:16 in1t3r_ joined #git
23:20 heroux joined #git
23:21 hseg Yeah, so this wont work. git rebase --onto SHA1 upstream branch1, git rebase --onto SHA1 upstream branch2 with branch1=branch2 will make branch1 and branch2 diverge (have different commits)
23:21 rohitpaulk left #git
23:21 j416 is it just me or is github.com throwing 500s for everyone currently?
23:22 j416 n/m minor service outage reported
23:22 hseg Testing, it appears I need git rebase --onto SHA1 upstream branch1, git rebase --onto branch1 upstream branch2
23:27 dendazen joined #git
23:30 nixjdm_ joined #git
23:32 salamanderrake joined #git
23:32 cdg joined #git
23:33 fibbot joined #git
23:36 jMrL joined #git
23:36 diogenese joined #git
23:39 TbobbyZ_ joined #git
23:42 h12o joined #git
23:42 mentazoom joined #git
23:42 jMrL left #git
23:42 jMrL joined #git
23:44 Rotaerk joined #git
23:45 thiago joined #git
23:45 juvenal joined #git
23:47 cagomez joined #git
23:47 Murr joined #git
23:48 rda-mac joined #git
23:50 TheFuzzball joined #git
23:50 chachasmooth joined #git
23:54 sondr3 joined #git
23:54 cagomez joined #git
23:55 bronson joined #git
23:56 ISmithers joined #git
23:57 belmoussaoui_ joined #git
23:59 chachasmooth joined #git

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