Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-09

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

All times shown according to UTC.

Time Nick Message
00:00 garyserj ToxicFrog: so how do you see all of staging and not just the differences between staging and head?
00:00 saul joined #git
00:01 MattMaker joined #git
00:03 h12o joined #git
00:05 unbalancedparen joined #git
00:09 drodger joined #git
00:13 Jaggz left #git
00:15 Cabanossi joined #git
00:16 ToxicFrog No idea. That's not something I've ever needed to do.
00:20 mostlybadfly joined #git
00:24 PresidentBiscuit joined #git
00:25 kyan joined #git
00:32 kexmex joined #git
00:33 star_prone joined #git
00:34 flaguy48_ joined #git
00:37 peepsalot joined #git
00:38 ivanfon joined #git
00:42 BSaboia joined #git
00:54 hagridaaron joined #git
00:58 scoobert1on joined #git
00:58 livingstn joined #git
00:58 sbasso joined #git
01:01 MattMaker joined #git
01:02 tgies joined #git
01:08 a3Dman joined #git
01:10 fstd_ joined #git
01:10 fstd_ joined #git
01:11 Cthalupa joined #git
01:14 star_prone joined #git
01:18 garyserj the documentation for "git commit" says "Stores the current contents of the index in a new commit".  Is "current contents of the index" another way of saying the contents that have been added to the index that aren't contained in the HEAD?
01:19 hahuang61 joined #git
01:20 tmg garyserj: perhaps you're looking for ls-tree
01:20 pabs3 joined #git
01:20 ToxicFrog tmg: wait, you can ls-tree the index? What do you pass as the treeish?
01:20 ToxicFrog garyserj: no, it means the current contents of the index. Commits are stored as snapshots, not diffs.
01:21 ToxicFrog If you 'git add .; git commit', the resulting commit contains the entire state of the working tree, *not* just the bits that changed since the last commit.
01:22 sunri5e joined #git
01:22 finalbeta joined #git
01:22 hagridaaron joined #git
01:22 Tobbi joined #git
01:24 bitslip_ joined #git
01:24 ToxicFrog `git status` and `git diff` show the differences because 90% of the time that's the only part you're interested in.
01:24 ToxicFrog (likewise `git show`)
01:26 pks joined #git
01:28 Cthalupa joined #git
01:29 Cabanossi joined #git
01:29 hagridaaron joined #git
01:29 pabs3 is gitk still developed in the git repository? I've been trying to get a simple gitk patch in for a while, posted it 3 times so far: http://public-inbox.org/git/?q=gitk%3A+use+right+colour+for+remote+refs+in+the+%22Tags+and+heads%22+dialog
01:31 kbeflo joined #git
01:31 MattMaker joined #git
01:32 tmg ToxicFrog: it's ls-files, not ls-tree
01:33 alexggordon joined #git
01:36 flaguy48_ joined #git
01:37 a3Dman joined #git
01:37 hfp_work joined #git
01:37 sunri5e joined #git
01:38 hfp joined #git
01:41 SwiftMatt joined #git
01:46 thiago joined #git
01:46 a_thakur joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:57 PresidentBiscuit joined #git
01:58 hagridaaron joined #git
02:02 a3Dman joined #git
02:06 h12o joined #git
02:13 lagothri1 joined #git
02:14 dendazen joined #git
02:14 hexagoxel joined #git
02:15 jameser joined #git
02:17 marianina8 joined #git
02:18 xall joined #git
02:23 a3Dman joined #git
02:24 aidalgol joined #git
02:25 chachasmooth joined #git
02:25 ojdo joined #git
02:26 star_prone joined #git
02:27 wagle_ joined #git
02:27 menip joined #git
02:28 a_thakur joined #git
02:28 TikityTik joined #git
02:31 chipotle joined #git
02:34 chachasmooth joined #git
02:35 peepsalot joined #git
02:35 Thorn__ joined #git
02:36 jagob joined #git
02:36 Thorn__ left #git
02:37 chachasmooth joined #git
02:38 drodger joined #git
02:39 chachasmooth joined #git
02:42 chachasmooth joined #git
02:42 a_thakur joined #git
02:44 bjarki left #git
02:44 d4rkl0rd joined #git
02:44 chris3492 joined #git
02:44 Xandaros joined #git
02:45 d4rkl0rd joined #git
02:46 a3Dman joined #git
02:54 pionen joined #git
02:56 metaQuux joined #git
02:56 raijin joined #git
02:56 Vortex34 joined #git
02:57 cam27 joined #git
02:57 pabs3 joined #git
03:00 shinnya joined #git
03:00 pabs3 joined #git
03:01 a3Dman joined #git
03:01 netj joined #git
03:04 pabs3 I have a git repo where the history of the remote version of the repo has been completely rewritten. is there a way to compare the history of the two repos and see which commits differ?
03:05 metaQuux left #git
03:05 chachasmooth joined #git
03:05 pabs3 most of them appear to be exactly the same except the commit id
03:08 masuberu joined #git
03:13 dsdeiz joined #git
03:15 peepsalot joined #git
03:16 d4rkl0rd joined #git
03:18 d4rkl0rd_1 joined #git
03:18 pabs3 joined #git
03:19 jimi_ joined #git
03:19 hahuang61 joined #git
03:19 d4rkl0rd joined #git
03:20 hvxgr joined #git
03:20 gk_1wm_su joined #git
03:23 gk_1wm_su left #git
03:23 JanC_ joined #git
03:24 pabspabspabs joined #git
03:25 Qo027 joined #git
03:25 h12o joined #git
03:26 d4rkl0rd_2 joined #git
03:26 njbair joined #git
03:26 raijin joined #git
03:26 Goplat joined #git
03:27 d4rkl0rd joined #git
03:28 a_thakur joined #git
03:28 inflames joined #git
03:31 Emperor_Earth joined #git
03:33 ethali joined #git
03:43 kristofferR joined #git
03:44 Cabanossi joined #git
03:44 gk_1wm_su joined #git
03:46 drodger joined #git
03:47 a3Dman joined #git
03:47 gk_1wm_su left #git
03:50 dreiss joined #git
04:08 dsdeiz joined #git
04:08 dsdeiz joined #git
04:12 Nilesh_ joined #git
04:14 desnudopenguino left #git
04:14 a3Dman joined #git
04:17 masuberu joined #git
04:23 ShapeShifter499 joined #git
04:24 fakenerd joined #git
04:26 pavelpopov joined #git
04:28 Cabanossi joined #git
04:28 robattila256 joined #git
04:42 njbair joined #git
04:45 rubyonrailed joined #git
04:46 navidr joined #git
04:49 justanotheruser joined #git
04:49 njbair joined #git
04:54 PioneerAxon joined #git
04:57 a_thakur joined #git
05:08 bruce_lee joined #git
05:08 bruce_lee joined #git
05:10 dendazen joined #git
05:11 alexggordon joined #git
05:14 Cabanossi joined #git
05:20 njbair joined #git
05:20 hahuang61 joined #git
05:21 Peuc joined #git
05:26 a_thakur joined #git
05:26 nomike31 joined #git
05:29 jesst joined #git
05:29 diogenese joined #git
05:30 waveclaw joined #git
05:34 raijin joined #git
05:43 pks joined #git
05:47 zefferno joined #git
05:50 MrWoohoo joined #git
05:53 h12o joined #git
05:57 Noldorin joined #git
05:57 chipotle joined #git
06:01 _ng joined #git
06:05 Introoter joined #git
06:10 jesst joined #git
06:20 pks joined #git
06:23 rivarun joined #git
06:33 jesst_ joined #git
06:40 fmeerkoetter joined #git
06:43 Cabanossi joined #git
06:51 pwnz0r joined #git
06:53 dimi1947 joined #git
06:53 chris3492 joined #git
06:54 sbulage joined #git
06:54 User458764 joined #git
06:56 FartMan696969 joined #git
06:56 FartMan696969 omfg http://tinyurl.com/le5v3v6 amazing link everyone click it
06:56 FartMan696969 its lesbian fetish porn lol
06:57 PresidentBiscuit joined #git
07:00 schleppel joined #git
07:02 zefferno joined #git
07:03 mmlb joined #git
07:03 FartMan696969 dammit they kickbanned me on #minecraft for mass pinging
07:03 FartMan696969 time to try here
07:03 FartMan696969 gitinfo,  belak,  da5id,  emaz,  garyserj,  mjuhl,  Nitesh,  Shavik,  [diecast],  _28_ria,  __builtin,  __main__,  __name__,  _cyril_,  _ikke_,  _ng,  _Patrick_,  _rgn,  _Vi,  _W_,  `mx,  a3Dman,  Aaeriele,  Aaron1011,  abh:
07:04 FartMan696969 ablackack,  aboccia,  abra0,  aca20031,  AciD`,  acln,  adamm,  addshore,  adgtl-,  adymitruk,  aendrew,  ahammond,  ahf,  ahrs,  aidalgol,  ajpiano,  akkad,  AKPWD,  albel727,  alcohol,  aleb,  AlexanderS,  alexandre9099,  AlgorithmWizard,  AlHafoudh:
07:04 FartMan696969 alphor,  altendky,  am2on,  am55,  ams__,  anbz,  anderson,  Andre_work,  andres,  AndrewGazelka,  andschwa_,  angseus,  angular_mike_,  Anja,  Ankhers,  anolir,  anonnumberanon,  anry,  Anthaas_,  APic,  arand,  arand__,  Ardethian,  Arguggi_,  ariver:
07:04 FartMan696969 Arkaniad,  armin,  armyriad,  Arokh,  arooni,  artgoeshere,  asd5a,  ashnur,  aspiers,  AstralStorm,  Atm0spher1c,  atomi,  atrus-,  austin987,  AustinMatherne,  avar,  averell,  aviraldg,  Awesomecase,  axisys,  azerus,  b0nn,  babilen,  BackEndCoder,  bambams:
07:04 FartMan696969 bannakaffalatta,  barq,  barteks2x,  batrick,  bauruine,  bbhoss,  bcardarella,  bcc,  bdeferme,  bdesmet,  beaky,  BeerSerc,  bejeb,  BenderRodriguez,  Bengi,  berndj,  beuker,  bgamari,  bgerber,  Bigcheese,  Bilge-,  BinGOs,  bipolar,  bitslip_,  bittyx:
07:05 FartMan696969 bjoe2k4_,  bket,  bl0m1_,  bl0w3d_0ut,  BlackPanx,  blahdodo,  BlaXpirit,  BlessJah,  Blkt,  blr,  BlueMatt,  bluepixel,  blueyed,  Bock,  bodie_,  Bombe,  bond,  BooK,  boshhead,  boubou,  bouncy,  boxrick1,  boz_v1,  brandonw_,  bratchley:
07:05 FartMan696969 bremner,  brennz,  brewmaster,  brokensyntax,  brschaefer,  bruce_lee,  bsanford,  bttf,  Bucciarati,  buck1,  bumbar,  bwn,  byte512,  c0,  c0ded,  Cabanossi,  caffeinatedcode,  caliculk,  CalimeroTeknik,  Calinou,  canton7,  Captain_Beezay,  carousel,  catern,  Cathy:
07:05 FartMan696969 catsup,  causasui,  cbreak,  cebor,  Celelibi,  CEnnis91,  Cerise,  cfoch-always,  chachasmooth,  chadi,  chamunks,  Chaser,  Chinorro,  chovy,  chris3492,  chrisml,  chrysa,  chu,  cite,  cjohnson,  cliluw,  cloudcell_,  cmalmber,  cmn,  cmosguy:
07:06 FartMan696969 coasterz,  codebam,  codedmart,  ColdKeyboard,  colona,  comps,  contracode,  Cork,  covey,  crater2150,  creppe,  cschneid,  cspotcode,  cstrahan,  Cthalupa,  cttttt,  CussBot,  cust,  CustosLim3n,  cwillu_at_work,  cworth,  cwre,  cxreg,  cydrobolt,  cyphase:
07:06 FartMan696969 d-fence_,  d1b_,  daishan,  dan2k3k4,  Dandelock:
07:06 FartMan696969 LMFAO http://tinyurl.com/le5v3v6
07:06 FartMan696969 LOL FETISH PORN LESBIANS http://tinyurl.com/le5v3v6
07:06 FartMan696969 http://www.xvideos.com/video6324820/three_teen_hotties_zap_each_other_
07:07 sbasso joined #git
07:07 g0d355__ joined #git
07:07 baratheon joined #git
07:09 dreiss joined #git
07:09 asd5a Time for a gline?
07:10 marianina8 joined #git
07:11 jesst_ joined #git
07:11 dmc asd5a, close
07:11 Seveas or a life...
07:11 AciD` a +r on this chan would solve this in an instant
07:11 ismithers joined #git
07:12 zefferno joined #git
07:12 asd5a Clearly the Adkins of freenode are more merciful than me
07:12 asd5a But that reminds me I need to check my umode
07:13 asd5a The spammer sent notices
07:15 griff joined #git
07:17 mehola joined #git
07:17 javahorn joined #git
07:18 javahorn Hi
07:18 baratheon left #git
07:21 hahuang61 joined #git
07:22 t0by joined #git
07:25 sbasso joined #git
07:25 zefferno joined #git
07:27 pks joined #git
07:32 YuGiOhJCJ joined #git
07:34 Plippz joined #git
07:37 pks joined #git
07:43 xaa__ joined #git
07:43 tnecniv joined #git
07:46 Ploppz `git submodule update --recursive`  failed ("Direct fetching of that commit failed" in one of the submodules), even though I had just run `git fetch --recurse-submodules`
07:48 cyphase joined #git
07:49 sbasso joined #git
07:51 raijin joined #git
07:57 jagob joined #git
07:58 Cabanossi joined #git
08:00 Milos joined #git
08:05 __main__ joined #git
08:06 raijin joined #git
08:07 TbobbyZ joined #git
08:07 TbobbyZ joined #git
08:09 Endarked joined #git
08:11 vuoto joined #git
08:14 rivarun joined #git
08:16 flavius joined #git
08:16 ok91 joined #git
08:18 mehola joined #git
08:18 raijin joined #git
08:18 Seveas Ploppz: smells like the host for that submodule needs allowreachablesha1inwant sent
08:24 sbasso joined #git
08:26 Milos joined #git
08:26 Ploppz I think the problem might have been that I wasn't checked out on master in one of the submodules. Is that plausible, Seveas ?
08:29 netj joined #git
08:30 alexggordon joined #git
08:30 Seveas plausible, because that's entirely normal. Submodules are check out onto a specific commit, not a branch.
08:32 bannakaf_ joined #git
08:33 TbobbyZ joined #git
08:36 borkr joined #git
08:38 govg joined #git
08:40 Ploppz Seveas: so it should not be a problem that I was not checkout out on master ?
08:46 Seveas correct
08:46 rumble joined #git
08:48 kbeflo joined #git
08:49 User458764 joined #git
08:54 ispn joined #git
08:55 jonez joined #git
08:56 pks joined #git
09:00 vuoto joined #git
09:01 neunon joined #git
09:01 Milos joined #git
09:01 a3Dman joined #git
09:03 aax joined #git
09:11 marianina8 joined #git
09:12 Jackneill joined #git
09:18 PaulCapestany joined #git
09:20 neunon joined #git
09:21 overlord_tm joined #git
09:22 SteffanW joined #git
09:22 hahuang61 joined #git
09:23 ismithers joined #git
09:28 ronny hi
09:28 masuberu joined #git
09:28 TbobbyZ joined #git
09:29 ronny is there a inexpensive way to figure the current branch /what branch the current checkout "belongs" to?
09:31 drodger joined #git
09:31 catsup joined #git
09:32 catsup joined #git
09:33 leeN joined #git
09:36 sbasso joined #git
09:41 grawity git symbolic-ref HEAD
09:41 inflames joined #git
09:41 grawity with fallback to `git rev-parse --short HEAD` in case it's not actually on a branch
09:42 rivarun joined #git
09:43 neunon joined #git
09:46 vuoto joined #git
09:46 HoloIRCUser3 joined #git
09:52 neunon joined #git
09:53 TbobbyZ joined #git
09:56 Tobbi joined #git
09:57 Cabanossi joined #git
10:01 King_Hual joined #git
10:02 neunon joined #git
10:02 Murii joined #git
10:04 EDAKIRI joined #git
10:06 bitslip joined #git
10:10 neunon joined #git
10:11 alexandre9099 joined #git
10:11 thinkpad joined #git
10:11 karols146 joined #git
10:12 mikecmpbll joined #git
10:13 kristofferR joined #git
10:15 Acerific joined #git
10:16 thinkpad joined #git
10:16 kbeflo_ joined #git
10:17 earnestly joined #git
10:18 ZyX-I joined #git
10:19 mehola joined #git
10:20 neunon joined #git
10:20 nickel_dime_look joined #git
10:21 ertes joined #git
10:24 choki joined #git
10:26 courrier joined #git
10:30 lolopolosko joined #git
10:31 lolopolosko joined #git
10:32 lolopolosko joined #git
10:32 ok91 joined #git
10:32 re1 joined #git
10:33 dersand joined #git
10:33 lolopolosko joined #git
10:34 lolopolosko joined #git
10:35 lucasem joined #git
10:35 raijin joined #git
10:38 kexmex joined #git
10:48 rorro joined #git
10:50 CheckDavid joined #git
10:52 exotime joined #git
10:52 jesst_ joined #git
10:54 getxsick joined #git
10:55 aielima joined #git
10:58 PresidentBiscuit joined #git
10:59 alexandre9099 joined #git
11:01 chris3492 joined #git
11:03 sbasso joined #git
11:12 ShapeShifter499 joined #git
11:14 Leonardo-1 joined #git
11:15 Leonardo-1 left #git
11:17 Impaloo joined #git
11:24 hahuang61 joined #git
11:29 pks joined #git
11:30 drodger joined #git
11:34 tmg joined #git
11:35 h12o joined #git
11:36 drodger joined #git
11:43 buzzLightBeer joined #git
11:47 wm4 joined #git
11:48 wm4 what's a good way to rebase a feature branch to the current branch and checking it out at the same time? I usually do "git checkout branchname && git rebase master", but that's annoying because it makes my editor reload everything and the build system will rebuld everything
11:49 wm4 you could also do it manually by cherry-picking all commits into the current branch, and then renaming all the branch labels
11:49 leah2 joined #git
11:50 telephone joined #git
11:50 telephone joined #git
11:51 rokups joined #git
11:51 cdown joined #git
11:52 _Vi joined #git
11:55 alexggordon joined #git
11:56 jesst joined #git
11:57 sarri joined #git
11:57 sarri joined #git
11:59 Cabanossi joined #git
12:01 alexandre9099_ joined #git
12:04 bwn joined #git
12:05 robotroll joined #git
12:11 User458764 joined #git
12:12 stoopkid joined #git
12:12 shinnya joined #git
12:13 am55 joined #git
12:13 Tobbi joined #git
12:16 ethali joined #git
12:17 h12o joined #git
12:20 mehola joined #git
12:23 steve joined #git
12:23 dsantiago joined #git
12:27 Cabanossi joined #git
12:29 _ikke_ wm4: git rebase takes a 2nd parameter that tells git what branch it should 'checkout'
12:29 p4trix joined #git
12:31 earnestly _ikke_: Making the branch the 3rd parameter in `git rebase master branchname'?
12:32 jimi_ joined #git
12:32 MineCoins joined #git
12:35 utrack joined #git
12:35 _ikke_ well, rebase is a subcommand, making master the 1st argument, and branchname the 2nd
12:35 wagle joined #git
12:36 GingerGeek joined #git
12:36 GingerGeek joined #git
12:36 utrack joined #git
12:37 earnestly Fair enough
12:37 ethali joined #git
12:38 utrack joined #git
12:42 telephone joined #git
12:42 telephone joined #git
12:44 utrack joined #git
12:44 h12o joined #git
12:47 rorro joined #git
12:47 wm4 _ikke_: which one? I don't see how I can achieve what I want with a single rebase command (unless the feature branch is already checked out, which would be against the point of this)
12:48 leah2 joined #git
12:48 raijin joined #git
12:49 Raed|Mobile joined #git
12:50 karols146 joined #git
12:51 _ikke_ wm4: git rebase master feature would first checkout feature, and then rebase onto master
12:51 ojacobson however if your editor and build are triggered by writes then the checkout isn't the issue
12:51 ojacobson rebase will cause a number of spurious builds as it reconstitutes the branch, with or without an initial checkout
12:52 wm4 ojacobson: usually manually doing what I want avoids too much annoyance for editor/rebuilds
12:53 karols146 joined #git
12:53 j416 wm4: can you not set your editor to not rebuild directly on change but wait for a second or two?
12:54 j416 or maybe manually trigger a build..?
12:54 kbeflo joined #git
12:54 j416 my editor does _nothing_ when files change; I quite prefer it this way
12:57 canoon joined #git
12:58 Gustavo6046 joined #git
12:58 a3Dman joined #git
12:58 xall joined #git
12:59 kbeflo_ joined #git
12:59 Gustavo6046 joined #git
12:59 kexmex joined #git
13:03 miklcct joined #git
13:03 karols146 joined #git
13:06 eihabarabia joined #git
13:08 bl0w3d_0ut joined #git
13:09 rominronin joined #git
13:09 chipotle joined #git
13:12 karols146 joined #git
13:13 marianina8 joined #git
13:13 eahmedshendy joined #git
13:18 TikityTik joined #git
13:20 thebope joined #git
13:21 ordolizard joined #git
13:23 nomike31 joined #git
13:25 hahuang61 joined #git
13:26 Mysterious_Light joined #git
13:29 neunon joined #git
13:30 ReptilianBrain joined #git
13:31 bannakaffalatta joined #git
13:34 Vaelatern How might I, using libgit2, figure out if a commit hash is an ancestor of the current HEAD? What I want to do is be able to, given a hash, try and check out that commit (so all workers are in the same place).
13:35 Vaelatern There is git_commit_nth_gen_ancestor but that is probably the Wrong Way to do this, especially with a lot of commits.
13:39 Starky joined #git
13:39 MillerBoss joined #git
13:40 karols146 joined #git
13:45 Mysterious_Light Hello! I am git newbie. Today I decided to study git rebase. I cloned git repo with ~100 commits, ran git rebase -i --root and closed a text editor. Nothing is expected (because no change is made). An error "could not apply 07cdbaf..." occured. Why? What does that mean?
13:45 rosiu joined #git
13:48 prg3 joined #git
13:52 _ikke_ Mysterious_Light: are there merge commits?
13:53 cam27 joined #git
13:54 Mysterious_Light no, they are commits in the middle of a commit chain
13:54 Jackneill_ joined #git
13:55 Mysterious_Light It seems I misunderstood your question
13:56 _ikke_ Right, are there any merges in the project
13:56 _ikke_ Note that git rebase by default linearizes history, which can cause these kinds of conflicts
13:56 Mysterious_Light Yes, there are merge commits and several branches
13:56 Mysterious_Light Am I correct that git rebase flattens a history of all the branches whose commits are reachable directly from the head?
13:57 ZyX-I joined #git
13:58 _ikke_ It takes all commits, and applies them one after the other, not recreating any merges
13:58 _ikke_ (there is a --preserve-merges parameter)
13:59 dendazen joined #git
14:00 howdoi joined #git
14:01 eizua joined #git
14:04 ReptilianBrain joined #git
14:04 roby10 joined #git
14:05 pks joined #git
14:07 nd_ joined #git
14:08 PresidentBiscuit joined #git
14:10 fees joined #git
14:12 bl0w3d_0ut joined #git
14:19 Marumarsu joined #git
14:19 Zialus joined #git
14:20 felixjet joined #git
14:20 vuoto joined #git
14:20 mehola joined #git
14:22 User458764 joined #git
14:23 User458764 joined #git
14:26 r0ry joined #git
14:26 r0ry` joined #git
14:29 aax joined #git
14:31 marianina8 joined #git
14:33 thebope joined #git
14:34 wm4 left #git
14:37 mda1 joined #git
14:38 tristanp joined #git
14:38 Marumarsu joined #git
14:38 tristanp joined #git
14:40 drodger joined #git
14:42 mikecmpbll joined #git
14:44 dreiss joined #git
14:45 SwiftMatt joined #git
14:47 tristanp joined #git
14:50 nowhereman joined #git
14:51 ziombelas joined #git
14:51 Marumarsu joined #git
14:54 Marumarsu joined #git
14:54 ethali joined #git
14:55 drodger joined #git
14:55 onla joined #git
14:55 onla I am trying to make a backup of local repository to another drive
14:56 onla I tried with `pass git remote add passi /media/onla/passi` and it gave no output, and then I pushed and it says it seems not to be a repository https://ptpb.pw/x7IJ
14:56 j416 !backup
14:56 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
14:57 jimi_ joined #git
15:00 TheDcoder joined #git
15:01 iamthad joined #git
15:02 kexmex joined #git
15:03 TheDcoder Hi, I have a question regarding the phrasing which should be used in commit summery. In this article: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html it is recommended that "Fix" should be used instead of "Fixed". I am using "Fixed" for all of my commits until now... do you think I should start using "Fix"? What would be the best option?
15:04 _ng joined #git
15:04 xub joined #git
15:05 onla I wonder if this is a problem when copying files with cp -a "cp: failed to preserve ownership for ‘/media/onla/.password-store040917’: Function not implemented" This happens with all files I copy to the usb key so it's not related to git etc, but I wonder how it affects in this case
15:06 xub left #git
15:06 grawity onla: did you `git init [--bare]` that new repository first?
15:06 BSaboia joined #git
15:07 onla grawity: no. But I guess I use this cp -a that j416's message says as it's simpler. Although I would need to do a new cp later if things changed and copy everything again, and not just changes but that's not problem I guess
15:08 HuskyApocalypse joined #git
15:08 j416 TheDcoder: "Fix".
15:09 grawity onla: you both are kinda missing the point here
15:09 onla me and? :)
15:10 chris3492 joined #git
15:10 capuk joined #git
15:10 onla so if I did the git init on the new repository, then the things I did should work and should be a viable option?
15:10 TheDcoder onla: you and j416
15:10 j416 ?
15:11 TheDcoder that message was a reply to onla, not related to my question :)
15:11 Uneliasmarsu joined #git
15:11 TheDcoder Thanks for the input j416
15:11 j416 yes but what do I have to do with that
15:12 unbalancedparen joined #git
15:12 dvaske_ joined #git
15:12 TheDcoder (s)he mentioned you in her question
15:12 onla gitinfo's message it was i'm sorry
15:12 TheDcoder oh, so wrong mention
15:13 j416 ¯\_(ツ)_/¯
15:13 TheDcoder ¯\_(ツ)_/¯
15:14 onla i'm running these commands through pass, so I wonder if I should `pass git init --bare` or just `git init --bare`
15:15 TheDcoder what is pass?
15:15 onla I mean I was instructed to run `pass git remote add <name> <path>
15:15 onla password storing program, the working dir has a .git dir inside it
15:16 TheDcoder you should use pass if you are instructed to use it
15:16 TheDcoder you know better
15:17 j416 onla: perhaps the person instructing you to do that could help you out more or point you to relevant documentation
15:17 raijin joined #git
15:17 TheDcoder left #git
15:18 karols146 joined #git
15:19 onla yeah, i'm asking but they afk now
15:19 onla https://matrix.org/_matrix/media/v1/download/matrix.org/WyIXrxYOBVpxMaxwaXihfNCN
15:21 kbeflo__ joined #git
15:23 Marumarsu joined #git
15:23 Starky joined #git
15:23 kbeflo__ joined #git
15:24 mda1 joined #git
15:26 kbeflo__ joined #git
15:26 nicolai86 joined #git
15:26 hahuang61 joined #git
15:26 Uneliasmarsu joined #git
15:28 Marumarsu joined #git
15:29 onla oh well. not like i'm making much changes there. I'll stay with what the !backup says. I guess i'm fine I just need to change back the ownership and rights when I return my backups and hope it works as I guess it likely is (no test needed!) thanks
15:29 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
15:29 Cabanossi joined #git
15:30 Tobbi joined #git
15:30 Zialus joined #git
15:30 onla left #git
15:30 kbeflo joined #git
15:31 Marumarsu joined #git
15:32 madewokherd joined #git
15:33 Vaelatern Onionnion: pass git  because magic
15:33 Vaelatern oh, wrong tab-complete
15:37 BSAlb joined #git
15:37 maxxe left #git
15:41 xall joined #git
15:42 BSab joined #git
15:43 t0by joined #git
15:44 Marumarsu joined #git
15:47 Goplat joined #git
15:55 rwb joined #git
15:55 Marumarsu joined #git
15:57 karols146 joined #git
15:58 Cabanossi joined #git
16:00 karols146 joined #git
16:02 gugah joined #git
16:05 karols146 joined #git
16:06 Marumarsu joined #git
16:09 Acerific joined #git
16:09 Acerific joined #git
16:09 tango_ joined #git
16:09 peterbecich joined #git
16:11 drodger joined #git
16:11 menip joined #git
16:16 exotime joined #git
16:16 marianina8 joined #git
16:17 digidog joined #git
16:18 masuberu joined #git
16:19 orbyt_ joined #git
16:21 mehola joined #git
16:28 marianina8 joined #git
16:30 d4rkl0rd_1 joined #git
16:32 MineCoins joined #git
16:32 pks joined #git
16:34 carousel joined #git
16:38 kexmex joined #git
16:38 pifon joined #git
16:41 ok91 joined #git
16:43 micwa joined #git
16:43 netj joined #git
16:44 r0ry joined #git
16:46 carousel joined #git
16:48 cdg joined #git
16:49 afuentes joined #git
16:52 osk joined #git
16:53 re1 joined #git
16:55 thiago joined #git
16:55 thiago joined #git
16:56 qqx joined #git
16:57 Lyqyd joined #git
16:58 d4rkl0rd joined #git
17:04 JanC_ joined #git
17:04 Endarked joined #git
17:05 dreiss joined #git
17:05 nowhereman joined #git
17:06 svm_invictvs joined #git
17:09 nexemacs joined #git
17:10 publio joined #git
17:19 safe joined #git
17:22 karols146 joined #git
17:26 Acerific joined #git
17:26 YuGiOhJCJ joined #git
17:27 hahuang61 joined #git
17:27 digidog joined #git
17:28 cdown joined #git
17:29 tnecniv joined #git
17:30 nomike31 joined #git
17:30 marianina8 joined #git
17:32 Tobbi joined #git
17:33 sword joined #git
17:39 hhee2 joined #git
17:40 armyriad joined #git
17:41 cam27 joined #git
17:42 theoceaniscool joined #git
17:43 cdown joined #git
17:44 Cabanossi joined #git
17:47 raijin joined #git
17:48 thanwer_ joined #git
17:50 diogenese joined #git
17:51 Isla_de_Muerte joined #git
17:52 sbasso joined #git
17:52 agusyc joined #git
17:56 gugah joined #git
18:05 mda1 joined #git
18:05 jottr joined #git
18:07 agusyc joined #git
18:10 duderonomy joined #git
18:10 star_prone joined #git
18:11 sbasso joined #git
18:12 Mysterious_Light joined #git
18:13 ertesx joined #git
18:13 kbeflo joined #git
18:13 MineCoins joined #git
18:15 DuckMaestro joined #git
18:16 bitri joined #git
18:19 freimatz joined #git
18:19 DonMario joined #git
18:19 snowalpaca joined #git
18:20 DonMario left #git
18:22 mehola joined #git
18:24 User458764 joined #git
18:29 PresidentBiscuit joined #git
18:31 sbasso joined #git
18:33 doener joined #git
18:33 TheOrangeOne joined #git
18:34 Sound joined #git
18:35 cdown joined #git
18:36 gunnaro joined #git
18:36 unborn joined #git
18:36 unborn guys how to remove all commits history?
18:37 blackwind_123 joined #git
18:37 bremner rm -r .git
18:37 Sushi left #git
18:37 bremner but, uh, backups first !
18:37 r0ry joined #git
18:38 _ikke_ cd ..
18:38 _ikke_ git init new-repo
18:38 Sound_ joined #git
18:41 unborn something like rm -r .git then init the repo and then git remote add stash https://whatever.git and last git push --force stash master?
18:44 Rogue0ne joined #git
18:48 wget joined #git
18:48 wget joined #git
18:50 inflames joined #git
18:57 bastelfreak joined #git
18:57 robotrolll joined #git
18:58 felixjet joined #git
18:58 ndowens08 joined #git
18:58 t0by joined #git
18:58 t0by joined #git
18:59 nexxus6 joined #git
18:59 ndowens08 git rebase -i is acting weird, trying to squash latest two commits which should be git rebase -i HEAD~2 but doesn't show commits, if it do HEAD~3, sometimes HEAD~4, it does but will include other non-related commits if i push; how do fix this?
19:00 jesst joined #git
19:00 selckin merges?
19:01 bremner unborn: all that stashing and pushing seems unrelated to your original question. You need to "git add ." and commit, as usual when starting a new repo
19:01 ndowens08 haven't merged anything; it is a branch just created
19:01 exotime joined #git
19:03 Starky joined #git
19:03 sbasso joined #git
19:04 dermoth_ joined #git
19:06 rwp ndowens08, Even if you just created a new branch the old branch may have had merges on it. Sounds like it by your description of the behavior.
19:06 rwp ndowens08, Try this to see what it looks like: git log --oneline --graph --decorate --color
19:07 Endarked joined #git
19:08 ndowens08 rwp: it shows them next to each other and one connected to it that looks "tabbed" over
19:08 ndowens08 right below the two i want to squash
19:11 karols146 joined #git
19:14 Starky joined #git
19:17 Peuc joined #git
19:23 livingstn joined #git
19:24 Silenced joined #git
19:25 drodger joined #git
19:27 hahuang61 joined #git
19:28 Epicblood joined #git
19:28 Noldorin joined #git
19:31 garyserj when a file is in staging, ok it means a file is in staging.. But when we delete a file and stage that deletion.. what does it mean "staging a deletion"?
19:31 garyserj like, does staging contain a)files b)things saying a file has been deleted?
19:32 dermoth joined #git
19:32 sbasso joined #git
19:32 sq-one joined #git
19:32 chris3492 joined #git
19:32 kexmex joined #git
19:34 robotroll joined #git
19:34 nowhere_man joined #git
19:35 stevenbenner joined #git
19:35 _ikke_ garyserj: The staging area is just a diff between the index, the working tree and the current commit
19:36 _ikke_ garyserj: when you stage a removed file, the file entry is removed from the index
19:38 Cthalupa joined #git
19:39 BenderRodriguez When adding a git submodule , if I make a change on the parent repo and push it to remote, does the submodule also get included?
19:40 k1rov_reporting joined #git
19:40 _ikke_ BenderRodriguez: included in what way?
19:43 Cabanossi joined #git
19:45 fbz joined #git
19:46 ivanfon joined #git
19:47 Mysterious_Ligh1 joined #git
19:48 InfoTest joined #git
19:50 davimore joined #git
19:50 Mysterious_Light joined #git
19:50 theiostream joined #git
19:52 Ploppz .gitmodules doesn't say anything about the particular commit, so I had the impression it will just take the latest commit. But apparently there is information somewhere about which commit should be checked out. Where is this?
19:52 Ploppz the particular commit of submodules *
19:52 j416 Ploppz:
19:52 j416 in the tree
19:52 Ploppz what tree? the working tree?
19:52 ziombelas joined #git
19:53 MineCoins joined #git
19:53 j416 no
19:53 m1dnight_ joined #git
19:53 j416 in the tree linked to by your commit
19:54 j416 internally, so to speak
19:54 j416 like any other file
19:54 _ikke_ git ls-tree HEAD path/to/submodule shows the entry
19:54 Ploppz didn't know there is a tree inside a single commit (or did I misunderstand?).
19:55 Ploppz thanks
19:55 _ikke_ Ploppz: a commit points to a tree, which contains a recursive tree structure pointing to all blobs and other things that are included in the commit
19:55 Starky joined #git
19:56 BSaboia joined #git
19:56 MineCoins joined #git
19:58 sbasso joined #git
19:58 j416 Ploppz: find the git object model in the docs on git-scm.com
19:59 star_prone joined #git
19:59 j416 might be interesting to you
20:00 finalbeta joined #git
20:00 Endarked joined #git
20:03 avar With `git branch --list <pattern>` is there a way to make the <pattern> match the remote name of the name?
20:03 avar AFAICT not, e.g. to get the branches on the "avar" remote that branched off 2.12.0: git branch --contains v2.12.2 | grep remotes/avar/
20:04 avar I was hoping 'refs/remote/avar*' or 'remotes/avar/*' would work, but apparently not...
20:04 kir0v joined #git
20:04 s17 I have a pull request which I have just reviewed.  it has many files, but one of them has an incorrect change.  do i just approve and merge, then edit that file myself?
20:05 _ikke_ avar: use git for-each-ref
20:05 _ikke_ git for-each-ref refs/remotes/avar
20:06 avar oh sweet, hadn't thought of that use for fer, duh
20:06 YottaByte joined #git
20:06 _ikke_ s17: Hard to tell
20:06 _ikke_ s17: Up to you basically
20:07 s17 I think that is the easiest route :/
20:07 s17 it's just one line wrong
20:08 re1_ joined #git
20:08 dirtyroshi joined #git
20:09 spaceraspi joined #git
20:10 Mission-Critical joined #git
20:12 Bob8989|2 joined #git
20:12 Bob89893 joined #git
20:14 kegster joined #git
20:15 scoobertron joined #git
20:18 manuelschneid3r joined #git
20:19 orbyt_ joined #git
20:19 Mysterious_Light joined #git
20:23 s17 and notified the other devs, of course ;)
20:23 mehola joined #git
20:26 g105b joined #git
20:27 PresidentBiscuit joined #git
20:27 hhee joined #git
20:28 Mysterious_Light joined #git
20:28 savgnobl joined #git
20:30 zeroed joined #git
20:30 zeroed joined #git
20:31 _28_ria joined #git
20:32 overlord_tm joined #git
20:34 Guest81707 joined #git
20:35 lmatteis joined #git
20:37 mmlb joined #git
20:37 Doginal left #git
20:39 tyrese joined #git
20:40 tyrese hi
20:40 tyrese so I did checkout -b new-branch
20:40 chipotle joined #git
20:40 tyrese then checkout new-branch
20:40 tyrese now how do i upload the branch to the repo?
20:40 tyrese it's talking about adding a new remote, but what's a remote?
20:41 tyrese i already accidently uploaded the new branch to master
20:44 star_prone joined #git
20:45 ndowens08 left #git
20:49 rudi_s !doc
20:49 gitinfo A list of useful documentation of all kinds is here:  http://git-scm.com/documentation -- or try the wiki at  http://git.wiki.kernel.org/.  Also try typing "!book" "!cs" "!bottomup"  "!parable" "!best_practices" or "!vcbe" or "!designers" here in IRC.  !book is probably the most helpful.
20:49 rudi_s !book
20:49 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
20:49 theiostream joined #git
20:49 rudi_s tyrese: ^ have a look at basic documentation, pro git is quite good.
20:50 LeBlaaanc joined #git
20:51 jesusmartinb joined #git
20:52 tyrese so I did what the basics said
20:52 tyrese git checkout -b photoview, then git checkout photoview. so i'm in the branch. I made changes, but when I type git push, it uploads it to master
20:54 tyrese what am I doing wrong?
20:57 svg-nobl joined #git
20:57 tyrese when i do git push -u origin, it says branch master set up to track remote branch master from origin.
20:58 _ikke_ tyrese: after git checkout -b new-branch, you do no have to do another chekcout
20:58 _ikke_ tyrese: Did you commit yet?
20:59 tyrese gonna delete the branch and start over
20:59 tyrese lol
20:59 rudi_s !backup
20:59 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
20:59 tyrese yeah so it says im 1 ahead of master
21:00 tyrese but if I git push it, itll go to master but it's an entirely different library and it'll break master
21:00 kir0v joined #git
21:00 savg-nobl joined #git
21:01 _ikke_ tyrese: what does git branch -vv return?
21:01 kir0v joined #git
21:01 Guest81707 joined #git
21:01 tyrese * master    867b651 [origin/master: ahead 1] added photoview library
21:01 tyrese photoview 8dcae93 added photoview library
21:02 kir0v joined #git
21:02 _ikke_ So you comitted on master, and then created the branch?
21:02 _ikke_ (And you checked out master currently)
21:02 tyrese oh
21:02 tyrese my bad
21:02 tyrese i was trying to delete it
21:03 kir0v joined #git
21:03 tyrese says the same thing
21:03 kir0v joined #git
21:04 _ikke_ What command are you executing?
21:04 tyrese git branch -vv
21:05 sunri5e joined #git
21:06 _ikke_ And before that?
21:06 marianina8 joined #git
21:07 tyrese git checkout -b photoview
21:07 _ikke_ tyrese: You only have to use -b once, when you create a new branch
21:07 tyrese how can I go into master and delete pending commits
21:07 _ikke_ git checkout master; git reset --keep HEAD~
21:08 _ikke_ That will reset master back one commit
21:08 _ikke_ (You can also use origin/master instead of HEAD~ to make it equal to what remote has)
21:10 tyrese ok so how do i force delete this branch
21:10 tyrese so i can start over
21:11 hugdru joined #git
21:11 tyrese i have everything backed up
21:11 _ikke_ git branch -D <branchname>
21:12 ws2k3 joined #git
21:13 tyrese so
21:13 tyrese ty for the helop
21:13 tyrese so I want to make a new branch
21:13 tyrese i will type git checkout -b photoview, right?
21:14 tyrese sorry to ask so many questions, i've just never had to do this before
21:16 Ploppz when working on a project `foo` with submodules `bar` and `baz` - and I do changes only inside `bar` and `baz`, how do I go about committing and sending pull requests?
21:18 jost_ joined #git
21:19 Ploppz I guess the first thing is to commit in `bar`. Then do I fork `bar` and add my url as a remote, push to my fork, and in the end send a pull request in the original `bar` repo?
21:19 Ploppz I guess after that I have to commit `foo` to point to the latest commits in `bar` (forget `baz`) and send a PR
21:20 griff joined #git
21:22 zivester joined #git
21:23 tyrese hey _ikke_ got it work
21:23 NightMonkey joined #git
21:23 tyrese thank you for the help homie
21:25 Atm0spher1c joined #git
21:28 PresidentBiscuit joined #git
21:28 hahuang61 joined #git
21:32 NightMonkey joined #git
21:33 iqubic joined #git
21:34 iqubic I'm trying to set up an upstream remote repo, and I can't seem to push to it.
21:34 iqubic I did the standard things like: "git remote add origin https://github.com/IQubic/morse.git"
21:35 iqubic and then I tried: "git push -u origin master
21:35 iqubic And that gives me the following errors: error: src refspec master does not match any.
21:35 iqubic error: failed to push some refs to 'https://github.com/IQubic/morse.git'
21:37 telephone joined #git
21:37 telephone joined #git
21:38 iqubic I feel stupid. I need to make an initial commit before pushing to a remote repo.
21:38 bariscant joined #git
21:40 pbrewczynski_ joined #git
21:40 timvisher joined #git
21:42 moei joined #git
21:42 scoobertron joined #git
21:48 mentazoom joined #git
21:48 iqubic left #git
21:50 i7c You need at least one commit that "master" points to.
21:50 i7c Oh, he’s gone.
21:56 aax joined #git
21:58 rosiu joined #git
21:59 Cabanossi joined #git
22:02 theiostream joined #git
22:02 cdown_ joined #git
22:04 tnecniv joined #git
22:04 cbreak joined #git
22:10 HoierM joined #git
22:11 nomike31 joined #git
22:14 snits joined #git
22:16 askb joined #git
22:20 mehola joined #git
22:25 ZyX-I joined #git
22:28 tristanp joined #git
22:28 osk joined #git
22:28 PresidentBiscuit joined #git
22:29 pandeiro joined #git
22:30 MattMake_ joined #git
22:32 tmsmith joined #git
22:33 netj joined #git
22:36 tmsmith joined #git
22:37 sven1 joined #git
22:42 prg3 joined #git
22:43 sunrunner20 joined #git
22:48 anuxivm joined #git
22:49 jstimm joined #git
22:54 dreiss joined #git
22:58 Cabanossi joined #git
23:02 nomike31 joined #git
23:05 tsetair joined #git
23:17 cam27 joined #git
23:18 tmg joined #git
23:22 pietv joined #git
23:29 Cabanossi joined #git
23:29 PresidentBiscuit joined #git
23:29 hahuang61 joined #git
23:35 SwiftMatt joined #git
23:42 Kaisyu joined #git
23:44 Noodlewitt joined #git
23:46 NoOutlet joined #git
23:50 drodger joined #git
23:53 netj joined #git
23:53 _28_ria joined #git
23:54 sven1 joined #git
23:56 _28_ria joined #git
23:56 chris3492 joined #git

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