Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-05

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

All times shown according to UTC.

Time Nick Message
00:00 grumble joined #git
00:00 geoid joined #git
00:05 eb0t joined #git
00:09 rdavila joined #git
00:09 Noldorin joined #git
00:10 dreiss joined #git
00:14 Aelius joined #git
00:15 Aelius hey all, how can I set up a clone url like so ssh://git@git.zx2c4.com/cgit
00:15 Aelius how did he accomplish that?
00:19 eb0t joined #git
00:20 eb0t joined #git
00:20 scorphus joined #git
00:22 bremner he made a user named git, and installed some software, possibly gitolite, in that user
00:23 jast !gitolite
00:23 gitinfo Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/
00:23 bremner or just ssh
00:24 CussBot joined #git
00:25 texinwien_ joined #git
00:30 ochorocho__ joined #git
00:32 PioneerAxon joined #git
00:33 neilslinger[m] joined #git
00:33 umpc joined #git
00:34 neilslinger[m] left #git
00:34 SourTrout joined #git
00:35 CussBot joined #git
00:37 sangy joined #git
00:39 mda1 joined #git
00:40 buffal0 joined #git
00:45 HoierM joined #git
00:45 [0xAA] joined #git
00:46 nidr0x joined #git
00:46 realz joined #git
00:46 User458764 joined #git
00:49 SourTrout joined #git
00:53 venmx joined #git
00:55 dodobrain joined #git
00:56 j416 joined #git
00:57 _28_ria joined #git
01:01 geoid joined #git
01:01 boombatower joined #git
01:02 msm joined #git
01:11 boombatower joined #git
01:12 Nilesh_ joined #git
01:14 inflames joined #git
01:15 Deamon joined #git
01:15 MrWoohoo joined #git
01:17 shgysk8zer0 joined #git
01:18 mizu_no_oto joined #git
01:21 hahuang62 joined #git
01:22 tvw joined #git
01:25 bn0t__ joined #git
01:32 d0nn1e joined #git
01:34 kerrick joined #git
01:35 Gsham joined #git
01:36 pypi_ joined #git
01:36 hahuang65 joined #git
01:36 heftig joined #git
01:37 mizu_no_oto joined #git
01:38 heftig joined #git
01:41 qpdb joined #git
01:48 anonymuse joined #git
01:52 tvw joined #git
01:53 dsdeiz joined #git
01:54 cqi joined #git
01:56 jaguarmagenta joined #git
01:58 Ferdroid left #git
01:59 ghostlight joined #git
01:59 dmarr_ joined #git
02:01 Limes_ joined #git
02:02 shgysk8zer0 joined #git
02:02 geoid joined #git
02:02 Vampire0_ joined #git
02:04 dmarr_ left #git
02:10 pks joined #git
02:12 neil__ joined #git
02:12 tvw joined #git
02:13 neil__ left #git
02:15 BSaboia joined #git
02:15 lindenle joined #git
02:18 tmsmith_ joined #git
02:18 bn0t_ joined #git
02:19 davix[matrix] joined #git
02:19 mizu_no_oto joined #git
02:21 txdv joined #git
02:23 Aelius bremner: no
02:23 Aelius bremner: how did he get the /cgit url, as oppsed to /absolute/path
02:24 aw1 joined #git
02:27 bremner gitolite can do that, fwiw.
02:27 aw1 how do i retrieve tracked files from a specified branch and commit without a checkout to that branch and commit? i ask this because i was trying to write a script that would stash the unsaved changes in whichever branch i started in ... go to specified branch and commit.. deploy from there.. git checkout back to starting branch and then unstash the changes ... but as luck would have it ... things went awry
02:28 aw1 specified branch and commit <--- commit is a used as a noun *not* a verb
02:30 phroa git show -- commitish:/path/to/file
02:31 aw1 phroa, that is just one file ... i have to deploy the whole web app
02:32 Sheogorath[m] joined #git
02:32 unclechu joined #git
02:32 Tiaan[m] joined #git
02:32 kineticrootkit[m joined #git
02:32 M-nated joined #git
02:32 patrickr[m] joined #git
02:32 Remramm joined #git
02:32 saintaquinas[m] joined #git
02:32 Start[m] joined #git
02:32 WillianPaiva[m] joined #git
02:32 kikijiki[m] joined #git
02:32 daopu[m] joined #git
02:32 mtso[m] joined #git
02:32 M-shine joined #git
02:32 M-mistake joined #git
02:32 malo[m] joined #git
02:32 samwise[m] joined #git
02:32 Dhanya[m] joined #git
02:32 M-meznak joined #git
02:32 hallogallo[m] joined #git
02:32 mei[m] joined #git
02:32 monomon[m] joined #git
02:32 am2on joined #git
02:32 Ineentho[m] joined #git
02:32 warrantyvoid joined #git
02:32 musicmatze[m] joined #git
02:32 alaeri[m] joined #git
02:32 aviraldg joined #git
02:32 srkrishna[m] joined #git
02:32 timlyo[m] joined #git
02:32 Carlos[m] joined #git
02:32 kjsage[m] joined #git
02:32 phroa not sure I can help you with that.  _maybe_ git-subtree?
02:32 M64137[m] joined #git
02:32 eltopo[m] joined #git
02:32 aw1 phroa, no worries. thanks.
02:34 finalbeta joined #git
02:35 Karazhan joined #git
02:38 pypi__ joined #git
02:39 dikiaap joined #git
02:40 Oatmeal joined #git
02:41 dodobrain umm.. how do i cherry-pick but have it appear as a new commit done just now ?
02:42 lindenle joined #git
02:46 pks joined #git
02:46 webdev007 joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:50 stnly joined #git
02:51 chachasmooth joined #git
02:53 venmx joined #git
02:55 Emperor_Earth joined #git
02:56 bn0t_ joined #git
02:57 jmpp joined #git
02:57 jmpp joined #git
02:59 cdg joined #git
03:01 bn0t__ joined #git
03:02 chachasmooth joined #git
03:02 geoid joined #git
03:06 Aelius left #git
03:09 romerocesar joined #git
03:11 re1_ joined #git
03:11 steelsw0rd joined #git
03:13 bmahe joined #git
03:13 aavrug joined #git
03:21 mizu_no_oto joined #git
03:22 sangy joined #git
03:22 venmx joined #git
03:24 SwiftMatt joined #git
03:25 diogenese joined #git
03:30 PasiFist joined #git
03:32 diogenese joined #git
03:33 Brando753-o_O_o joined #git
03:38 NoctoNeural joined #git
03:39 Dragonbird joined #git
03:40 fatalhalt joined #git
03:40 mizu_no_oto joined #git
03:42 geoid joined #git
03:43 NoctoNeural left #git
03:45 BSAlb joined #git
03:45 sunri5e joined #git
03:46 Vangelis joined #git
03:47 chachasmooth joined #git
03:48 peepsalot joined #git
03:49 bn0t_ joined #git
03:50 howdoi joined #git
03:53 _leb joined #git
03:56 _Cyclone_ joined #git
03:58 scrambo[m] joined #git
03:58 NoctoNeural joined #git
04:00 NoctoNeural left #git
04:01 shgysk8zer0 joined #git
04:03 chachasmooth joined #git
04:03 hexagoxel joined #git
04:03 justan0theruser joined #git
04:09 chachasmooth joined #git
04:11 chachasmooth_ joined #git
04:13 SwiftMatt joined #git
04:15 Vortex34 joined #git
04:16 Random832 dodobrain, cherry-pick -n and commit afterwards
04:17 astrofog joined #git
04:17 Random832 but why
04:17 dodobrain Random832, i had some commits in a very old branch that never got merged
04:17 dodobrain i just wanted to pull a couple of them in
04:18 dodobrain and when i did cherry pick, the dates were still showing originals
04:18 Random832 right, and why don't you want that
04:18 dodobrain because i edited them a bit as well?
04:19 dodobrain and then git commit --amend simply kept the original date
04:20 Random832 ah
04:20 dodobrain :)
04:26 svm_invictvs joined #git
04:26 fstd_ joined #git
04:27 NoctoNeural joined #git
04:27 NoctoNeural left #git
04:32 sostenuto joined #git
04:32 bn0t__ joined #git
04:34 Andrew_K joined #git
04:34 dreiss joined #git
04:36 shgysk8zer0 joined #git
04:37 darkbit joined #git
04:38 chachasmooth joined #git
04:38 robotroll joined #git
04:39 pmonk3y joined #git
04:41 _Cyclone_ joined #git
04:44 chachasmooth_ joined #git
04:45 PaulCapestany joined #git
04:51 dan2k3k4 joined #git
04:51 chachasmooth joined #git
04:53 dreiss joined #git
04:55 subhojit777 joined #git
04:57 sdothum joined #git
05:00 Remramm joined #git
05:00 Remramm joined #git
05:02 PioneerAxon joined #git
05:03 xall joined #git
05:05 Klumben joined #git
05:06 arnsa joined #git
05:06 Mobutils joined #git
05:07 jaguarmagenta joined #git
05:09 bn0t_ joined #git
05:11 kyan joined #git
05:15 BSab joined #git
05:16 Bigcheese_ joined #git
05:18 einnjo joined #git
05:21 Klumben joined #git
05:22 sostenuto joined #git
05:23 alyptik joined #git
05:23 Dragonbird joined #git
05:23 ReptilianBrain joined #git
05:24 Mobutils_ joined #git
05:25 gigq joined #git
05:25 ayogi joined #git
05:25 jbondhus joined #git
05:29 ayogi joined #git
05:30 jstimm joined #git
05:39 pks joined #git
05:54 McKraken_zzzzz joined #git
05:55 lukky513 joined #git
05:55 Ranhir joined #git
05:56 Slush- joined #git
05:56 Hogofwar joined #git
05:56 davidstrauss joined #git
05:56 gusnan joined #git
05:58 Cabanossi joined #git
05:58 sbulage joined #git
06:05 a3Dman joined #git
06:07 dodobrain joined #git
06:10 xberg joined #git
06:13 mseyne joined #git
06:14 baryon joined #git
06:18 austin987 joined #git
06:19 dreaddymck joined #git
06:21 rscata joined #git
06:25 chachasmooth joined #git
06:28 msonntag joined #git
06:30 ShapeShifter499 joined #git
06:31 ghostlight joined #git
06:32 User458764 joined #git
06:33 overlord_tm joined #git
06:33 _28_ria joined #git
06:35 isysd joined #git
06:37 bn0t__ joined #git
06:39 WayToDoor joined #git
06:39 navidr joined #git
06:41 umpc joined #git
06:44 tnecniv_ joined #git
06:45 LucaTM joined #git
06:45 Cabanossi joined #git
06:45 Dazzyo joined #git
06:46 Xarodon_ joined #git
06:47 jargan joined #git
06:47 ndimitrij joined #git
06:47 Pieter__ joined #git
06:47 arand_ joined #git
06:48 qpdb joined #git
06:48 rendar joined #git
06:48 muelli joined #git
06:48 Renter_ joined #git
06:49 lkurusa joined #git
06:49 BSAlb joined #git
06:49 tokkee_ joined #git
06:49 brandonw joined #git
06:50 plasticb1y joined #git
06:50 jbondhus_ joined #git
06:50 aboccia joined #git
06:50 Atm0sphe1 joined #git
06:51 ThomasLocke joined #git
06:51 ThomasLocke joined #git
06:51 felher_ joined #git
06:51 geoid joined #git
06:52 ethanol joined #git
06:52 idmistir_ joined #git
06:53 xcesariox joined #git
06:53 dmc joined #git
06:54 m1dnight2 joined #git
06:54 netj joined #git
06:54 AndrewAlexMac joined #git
06:55 Garen_ joined #git
06:55 bodie_ joined #git
06:55 SleePy joined #git
06:56 dmc joined #git
06:57 iliv joined #git
06:58 rwp joined #git
06:58 snthsnth joined #git
06:58 obiwahn joined #git
07:00 ghostlight joined #git
07:00 dermoth joined #git
07:01 d^sh joined #git
07:01 Raging_Hog joined #git
07:03 GT4066 joined #git
07:03 OOPMan joined #git
07:05 Nikitaw99 joined #git
07:07 d^sh joined #git
07:07 MrMojito joined #git
07:10 _28_ria joined #git
07:13 iliv joined #git
07:14 pmonk3y joined #git
07:16 pmonk3y joined #git
07:20 cyan__ joined #git
07:22 drbean joined #git
07:28 zero85 joined #git
07:30 chele joined #git
07:30 zero85 joined #git
07:31 brk_ joined #git
07:33 zero85 joined #git
07:33 JeroenT joined #git
07:34 freimatz joined #git
07:35 zero85 joined #git
07:37 lindenle joined #git
07:37 jmpp joined #git
07:38 zero85 joined #git
07:40 qt-x joined #git
07:40 zero85 joined #git
07:40 moei joined #git
07:40 Sceorem joined #git
07:40 seishun joined #git
07:41 rivarun joined #git
07:42 mikecmpbll joined #git
07:42 tnecniv joined #git
07:43 finalbeta joined #git
07:48 dan2k3k4 joined #git
07:48 drbean joined #git
07:48 dwts joined #git
07:49 xall joined #git
07:50 lordjancso joined #git
07:55 Nugget joined #git
07:56 pks joined #git
07:56 Alienpruts joined #git
07:57 GodEater joined #git
07:57 GodEater joined #git
07:57 texinwien_ joined #git
08:00 askb joined #git
08:01 baryon joined #git
08:02 Silenced joined #git
08:03 m1dnight_ joined #git
08:04 Balliad joined #git
08:05 eduardas_m joined #git
08:05 asgh joined #git
08:06 danslo joined #git
08:06 LucaTM joined #git
08:07 asgh joined #git
08:07 jas4711 joined #git
08:09 PtxDK joined #git
08:12 asgh joined #git
08:13 tanuki joined #git
08:15 davix[matrix] joined #git
08:15 M-nated joined #git
08:15 Carlos[m] joined #git
08:15 timlyo[m] joined #git
08:15 Start[m] joined #git
08:15 Dhanya[m] joined #git
08:15 kjsage[m] joined #git
08:15 patrickr[m] joined #git
08:15 malo[m] joined #git
08:15 scrambo[m] joined #git
08:16 zero85 joined #git
08:16 _ng joined #git
08:17 PCatinean joined #git
08:17 nowhereman joined #git
08:18 zero85 joined #git
08:19 Mobutils_ joined #git
08:21 heftig is there any good post on creating kernel-style patchsets?
08:21 heftig i mean how to structure the commits, not format-patch
08:22 zero85 joined #git
08:23 Emperor_Earth_ joined #git
08:24 SwiftMatt joined #git
08:25 BSaboia joined #git
08:25 zero85 joined #git
08:27 alyptik joined #git
08:27 Synthead joined #git
08:28 zero85 joined #git
08:28 _ikke_ Anything in particular?
08:29 _ikke_ Tools like git add -p help
08:29 selckin logically independent small changes per commit that compile and pass all tests
08:29 _ikke_ right
08:31 zero85 joined #git
08:31 ilogger2 joined #git
08:31 idmistir joined #git
08:31 idmistir joined #git
08:32 mikecmpbll joined #git
08:32 feodaron joined #git
08:33 anry joined #git
08:33 zero85 joined #git
08:33 PaulePanter joined #git
08:34 monty joined #git
08:36 dminuoso left #git
08:37 cebor joined #git
08:39 Mir4g3 left #git
08:40 zeroed joined #git
08:40 zeroed joined #git
08:44 flaviodesousa joined #git
08:46 NimeshNeema joined #git
08:47 ispn joined #git
08:49 troyt joined #git
08:52 jaguarmagenta joined #git
08:55 SpeakerToMeat joined #git
08:56 darkcar joined #git
08:57 bn0t_ joined #git
08:59 muelli joined #git
09:01 cdown joined #git
09:02 elect_ joined #git
09:02 diogenese joined #git
09:02 moop joined #git
09:03 bn0t__ joined #git
09:03 PasiFist joined #git
09:03 willlondon joined #git
09:06 xberg_ joined #git
09:06 Sceorem_ joined #git
09:06 encod3 joined #git
09:07 Sceorem__ joined #git
09:07 Gloomy joined #git
09:07 Brando753-o_O_o joined #git
09:08 mazert joined #git
09:09 marcogmonteiro joined #git
09:09 Synthead joined #git
09:12 mazert hello, on my remote repository, i have branches master and B. I want to have B on my computer, who has only master. I tried to simply git pull origin B, but i've got merge conflicts. I need to create B branch manually on the computer ?
09:12 sarbs joined #git
09:14 dimi1947 joined #git
09:18 mar77i_ joined #git
09:18 PCatinean joined #git
09:20 cdown_ joined #git
09:21 iliv joined #git
09:21 jknetl joined #git
09:21 Sceorem__ joined #git
09:22 ahmedelgabri joined #git
09:22 AfroThundr joined #git
09:23 ethanol mazert: git fetch --all && git checkout B
09:23 ethanol might not need the --all
09:24 ethanol its just my habit cause i usually have 2 remotes at least, so ignore that :<
09:24 clmsy joined #git
09:24 mikecmpb_ joined #git
09:24 ethanol mazert: when you do git pull B, you are telling git to basically fetch and then merge remote branch B into your local currently checked out branch (master)
09:26 ramsub07 joined #git
09:26 xberg joined #git
09:27 mazert ethanol: i've got the same problem when executing git checkout : error: Your local changes to the following files would be overwritten by checkout
09:28 xberg_ joined #git
09:28 mazert and after git fetch, if I do a git branch : only master is displayed
09:28 mazert ethanol: ok i see about git pull
09:28 PasiFist joined #git
09:30 ethanol mazert: git branch -a
09:30 ethanol should show remote branches too
09:30 ethanol mazert: if git checkout fails it is probably because you have uncommitted changes
09:30 ethanol commit those (or stash them) before trying to checkout another branch
09:31 Brando753-o_O_o joined #git
09:32 mazert ethanol: ah.. you are right, i used dropbox before. I understand now the problem :p
09:32 quetz joined #git
09:33 cqi joined #git
09:34 kier joined #git
09:35 bn0t_ joined #git
09:35 mindfart joined #git
09:37 giraffe joined #git
09:39 davix[matrix] joined #git
09:40 ferr1 joined #git
09:41 meZee joined #git
09:42 jnavila joined #git
09:44 mazert so the easiest solution is too remove .git and git pull origin B
09:45 mazert * remove the projects entirely
09:47 mindriot101 joined #git
09:48 _ikke_ Removing the repository is almost never the right solution
09:48 _ikke_ And not necessary either
09:48 cyan__ joined #git
09:49 darkcar joined #git
09:51 mazert _ikke_: yes maybe i can merge the actual files with the remote branch by force
09:53 pks joined #git
09:54 kurkale6ka joined #git
09:54 unclechu joined #git
09:54 Sheogorath[m] joined #git
09:54 patrickr[m] joined #git
09:54 kineticrootkit[m joined #git
09:54 M-nated joined #git
09:54 Remramm joined #git
09:54 Tiaan[m] joined #git
09:54 Mher[m] joined #git
09:54 WillianPaiva[m] joined #git
09:54 Start[m] joined #git
09:54 kikijiki[m] joined #git
09:54 saintaquinas[m] joined #git
09:54 samwise[m] joined #git
09:54 malo[m] joined #git
09:54 hallogallo[m] joined #git
09:54 M-shine joined #git
09:54 M-meznak joined #git
09:54 M-mistake joined #git
09:54 mtso[m] joined #git
09:54 monomon[m] joined #git
09:54 Dhanya[m] joined #git
09:54 mei[m] joined #git
09:54 am2on joined #git
09:54 Ineentho[m] joined #git
09:54 srkrishna[m] joined #git
09:54 musicmatze[m] joined #git
09:54 aviraldg joined #git
09:54 warrantyvoid joined #git
09:54 alaeri[m] joined #git
09:54 timlyo[m] joined #git
09:54 scrambo[m] joined #git
09:54 Carlos[m] joined #git
09:54 daopu[m] joined #git
09:54 kjsage[m] joined #git
09:54 M64137[m] joined #git
09:54 eltopo[m] joined #git
09:56 King_Hual joined #git
09:57 brillenfux joined #git
09:58 hussam joined #git
09:58 Karazhan joined #git
09:59 chll_ joined #git
09:59 arnsa joined #git
10:00 NimeshNeema joined #git
10:03 danslo joined #git
10:04 darkcar joined #git
10:06 iliv joined #git
10:06 finalbeta joined #git
10:11 rnsanchez joined #git
10:18 jnavila joined #git
10:21 achadwick joined #git
10:22 irqq joined #git
10:25 User458764 joined #git
10:26 seishun joined #git
10:27 rorro joined #git
10:28 Synthead joined #git
10:28 lordjancso joined #git
10:29 rnsanchez joined #git
10:33 scarabx joined #git
10:36 sarbs joined #git
10:40 ronny left #git
10:50 navidr joined #git
10:51 Nugget joined #git
10:51 rbern joined #git
10:56 darkcar joined #git
10:56 satifant joined #git
10:57 govg joined #git
10:57 babilen joined #git
11:01 systemovich joined #git
11:02 User458764 joined #git
11:03 paladinn joined #git
11:04 JeroenT joined #git
11:04 eb0t joined #git
11:05 Snugglebash joined #git
11:07 eb0t joined #git
11:07 YuGiOhJCJ joined #git
11:08 nowhereman joined #git
11:10 mseyne joined #git
11:12 deadnull joined #git
11:13 buffal0 joined #git
11:13 darkcar joined #git
11:18 _ADN_ joined #git
11:19 Ediz joined #git
11:19 ixian joined #git
11:22 buffffal00 joined #git
11:26 rorro joined #git
11:28 eduardas_m joined #git
11:30 Ediz Hello, I removed a config file using git rm and added it to .gitignore and then created the file again with config details inside. When I checkout to other branches, this file gets removed. I'd like it to be kept. is there a way to do this?
11:31 alhariel joined #git
11:31 Ediz I basically would like to have other versions on the file on other clones. but checkout to other branch destroys it.
11:35 iDanoo joined #git
11:35 iDanoo joined #git
11:35 King_Hual` joined #git
11:37 JeroenT joined #git
11:37 eb0t joined #git
11:40 osse Ediz: Checkout should warn you any fail. Do you use checkout -f?
11:41 spacelord_ joined #git
11:41 Ediz no
11:41 Ediz I create the file, change branch, go back, its gone
11:41 f4 joined #git
11:42 Snugglebash joined #git
11:42 Snugglebash joined #git
11:43 Snugglebash joined #git
11:44 Snugglebash joined #git
11:45 Snugglebash joined #git
11:45 osse That sounds very strange. It's untracked right.
11:45 osse ?
11:46 Snugglebash joined #git
11:46 osse Did you commit after rm?
11:46 Snugglebash joined #git
11:47 Ediz I'll rm now, use rm --cached aswell, add to gitignore and try again
11:47 Ediz idk
11:47 eb0t joined #git
11:47 jaguarmagenta joined #git
11:47 osse You don't know? Did you forget?
11:49 Ediz osse, now I removed the file
11:49 Ediz nothing to commit
11:50 Ediz its in gitignore
11:50 axisys joined #git
11:50 vvyy joined #git
11:50 Ediz I want to create it, and keep it on branch change, but I want it to be ignored on pull/push
11:52 ramsub07 joined #git
11:53 eb0t joined #git
11:53 Ediz osse, I create the file, change branch, change back and it disappears
11:54 osse Ediz: !repro
11:54 gitinfo Ediz: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
11:55 eb0t joined #git
11:55 nowhereman joined #git
12:03 danslo joined #git
12:10 jeffreylevesque joined #git
12:11 jnavila joined #git
12:15 johnnyfive joined #git
12:16 Lotlot joined #git
12:17 jknetl joined #git
12:18 _Cyclone_ joined #git
12:20 tobiasBora joined #git
12:20 tobiasBora Hello,
12:20 _28_ria joined #git
12:21 Snugglebash joined #git
12:21 rorro joined #git
12:22 osse is there anybody in there?
12:22 osse just nod if you can hear me
12:24 tobiasBora I would like to know if there is a way to automatiquely keep in sync (in a matter of 2-3 seconds) a git repo with a folder (I own the client and the server)
12:24 cdown joined #git
12:25 King_Hual joined #git
12:25 tobiasBora I would like to be able to do that first when the folder is on the git server, and also if possible when the serveur is elsewhere.
12:25 JeroenT joined #git
12:26 tobiasBora I could do a git pull every 2 seconds, but it's quite CPU/bandwidth consuming…
12:27 zeroed joined #git
12:27 llamapixel Why do you need such aggressive pulls tobiasBora ?
12:29 bremner automatic pulls are a bad idea, for the reasons outlined in !deploy
12:29 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
12:29 King_Hual joined #git
12:30 lordjancso joined #git
12:31 djb-irc joined #git
12:33 moop joined #git
12:34 Nilesh_ joined #git
12:34 idmistir Can I do git submodule add module1 module2 module3 to do many at once?
12:35 tobiasBora I know git is not a deployment tool, but actually I vould like to deal with saltstack ninions/master, and if I want to write my code on my computer and "git" it, I always need to run dirty rsync commands to push it on my server… So git tools for deployment would be nice (I saw git hoock, I will read your link breamer)
12:35 idmistir I'm going through the man page for it but I can't find a reference
12:38 nettoweb joined #git
12:39 willlondon joined #git
12:40 dsdeiz joined #git
12:40 nowhereman joined #git
12:40 quackgyver joined #git
12:41 fmcgeough joined #git
12:42 felixjet joined #git
12:42 Mathieu_Du joined #git
12:43 sdothum joined #git
12:44 Mathieu_Du Hey #git o/
12:44 gitinfo Mathieu_Du: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
12:44 aleb hi!
12:44 Mathieu_Du Is there a simple way to not track changes to a single file, but instead only keep the latest version ?
12:45 zeroed joined #git
12:45 Mathieu_Du I've had multiple use cases for this, in that case the file in question is a C file generated by a tool which the maintainer of the library doesn't want to make a hard requirement
12:46 Mathieu_Du https://github.com/jgm/cmark/issues/167 for reference
12:46 bremner !config
12:46 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
12:46 bremner sounds similar, anyway...
12:47 bremner I think the short answer is there is no _simple_ way.
12:48 djb-irc joined #git
12:48 bremner although using a template is not that hard in most scenarios involving a build system
12:48 Mathieu_Du bremner, hm thanks, however I don't think the template approach really fits that use case
12:49 Mathieu_Du iirc I encountered a project where a non-fast-forward branch was maintained , it contained a single commit which was amended when this kind of files changed
12:50 bremner if that's your idea of simple...
12:50 Mathieu_Du On setup, the user was expected to retrieve these files by checking out the branch, copying them and checking out back to the master branch
12:50 Mathieu_Du That really isn't, but ou just said "there's no simple way" :)
12:51 bremner that's a lot of work to avoid "cp template.c real.c"
12:51 PioneerAxon joined #git
12:51 bremner especially since make can trivially do the latter
12:51 bremner *shrug* you know your constraints, I don't
12:52 Mathieu_Du Hm bremner as I said I'm not sure how this applies here :)
12:53 Mathieu_Du afaiu, changes to the template in this scenario *will be tracked* by git
12:53 bremner yes. you don't edit the template, you edit the copy
12:53 bremner that's the whole point
12:53 Mathieu_Du right, but that doesn't apply here, because you're not supposed to edit this file
12:53 synthroid joined #git
12:53 Mathieu_Du It's generated C source code
12:54 bremner so you either generate it, or failing having the right tools for that, copy from the template
12:55 Mathieu_Du That's how things are done currently
12:56 Mathieu_Du My question was about not  tracking changes to this file, having git strictly be used as a distribution mechanism for it
12:56 tvw joined #git
12:57 bremner well, maybe someone else can understand your problem better, I have to run.
12:57 Mathieu_Du sure, thanks
12:58 johnmilton joined #git
13:03 moestevens joined #git
13:06 PioneerAxon joined #git
13:11 nisseni joined #git
13:11 snufft joined #git
13:12 jnavila joined #git
13:12 nisseni I know this isn't git-related. But I can't find answers. I'm using bit bucket and accidentily forgot to ignore a huge gz-file which got into the repo. Now bitbucket says I exceeded the limit of 1gb and has a read-only permission. So I can't remove the file and commit. I'm not able to remove it from bitbucket eithr.
13:12 mindriot101 joined #git
13:12 nisseni Anyone had this problem, and if so, how did you solve it?
13:14 mindriot_ joined #git
13:15 xberg joined #git
13:16 derk0pf joined #git
13:18 PioneerAxon joined #git
13:18 zeroed joined #git
13:19 rchavik joined #git
13:20 snufft joined #git
13:21 mlangenberg joined #git
13:27 clmsy joined #git
13:28 willlondon joined #git
13:28 Snugglebash joined #git
13:29 lvns joined #git
13:29 maret joined #git
13:29 bsanford joined #git
13:31 elect joined #git
13:32 eftov joined #git
13:32 snufft joined #git
13:34 Guest4459 joined #git
13:34 elect__ joined #git
13:34 Guest4459 joined #git
13:34 Guest4459 hi. Is it possible to remove all the privioust commits
13:34 Guest4459 only keep the current files in git
13:35 ramsub07 hello, i did a git stash by mistake. how to correct it ?
13:35 ramsub07 revert it *
13:36 Gamecubic joined #git
13:36 mlangenberg What’s the easiest way to copy a subdirectory of a read-only remote repo into my project, and keep this up to date?
13:36 LucaTM left #git
13:37 mlangenberg I’m looking into a sparse checkout, is that the right direction?
13:38 rwb joined #git
13:39 jast ramsub07: git stash pop should do the trick
13:40 ki0 joined #git
13:42 xall joined #git
13:44 dreaddymck joined #git
13:46 tobiasBora I would like to know how to deal with a this use case :
13:47 tobiasBora let's imagine I have two branchs, one for debugging (for example a python django website in debug mode)
13:47 tobiasBora and the master branch contains the production website
13:48 jaguarmagenta joined #git
13:48 tobiasBora I would like to merge the debugging branch to production
13:49 tobiasBora except for the file which contains the debug configuration.
13:49 tobiasBora How could I do that ?
13:49 rorro joined #git
13:49 Mobutils joined #git
13:50 anuxivm joined #git
13:50 Masber joined #git
13:51 mindfart joined #git
13:52 Ryanar joined #git
13:54 pypi__ joined #git
13:54 irco joined #git
13:56 xall joined #git
13:57 qqx joined #git
13:57 leeN joined #git
13:58 re1 joined #git
13:58 rts-sander joined #git
13:58 moritz tobiasBora: you wouldn't use separate branches, but rather configuration
13:59 moritz tobiasBora: so there's a config file (not under version control along with the code) that enables or disables debugging, and all the code is in one brancch
13:59 rnsanchez_ joined #git
14:00 moritz tobiasBora: and if you want the configuration under version control as well (good idea) you put it into a separate repo, and use a mechanism that allows you to have separate configuration per environment
14:00 moritz like Ansible, Puppet, Chef, Salt, whatever
14:01 irqq_ joined #git
14:03 noecc joined #git
14:03 ShekharReddy joined #git
14:04 osse I agree with this guy
14:05 a_thakur joined #git
14:06 dcpc007 joined #git
14:06 cdg joined #git
14:07 cyan__ joined #git
14:07 cdown joined #git
14:10 ExoUNX joined #git
14:11 cdg joined #git
14:15 netj joined #git
14:15 cdown joined #git
14:17 darkcar joined #git
14:17 jimi_ joined #git
14:17 khfeng_ joined #git
14:17 tobiasBora moritz: ok thank you. It's possible to have 2 git repos in the same folder ?
14:19 delboy1978uk joined #git
14:19 nivag joined #git
14:20 Eryn_1983_FL joined #git
14:20 petersaints joined #git
14:20 delboy1978uk so i try to deploy my ticket running some merge script on our remote dev server, but there are conflicts. I though if i downloaded the conflicting files, that my IDE could use the diff tool. but even though my file has <<<<  etc ===== etc >>>>> it does not recognise that this file is in conflict. i guess there is something in .git that says 'hey, we're trying to merge and have conflicts' on the remote?
14:21 Starky joined #git
14:21 delboy1978uk is there a way i can make my IDE see that this file is conflicting>?
14:21 Snugglebash joined #git
14:22 rwb joined #git
14:22 jast if your local git has conflict markers in files and doesn't recognize that the files are conflicted/unmerged, someone probably actually committed those conflict markers, so now they're in the file's history
14:23 delboy1978uk jast: but the merge happened on the remote!
14:23 delboy1978uk i just downloaded the conflicting files
14:23 jast oh, now I understand
14:23 jast I'm a bit slow today ;)
14:23 Gsham joined #git
14:24 jast git records some extra state about merges in its index, and that's what it uses to recognize what's unmerged
14:24 nikivi joined #git
14:24 jast if you're feeling adventurous, you can copy the .git/index file from the server to get the index state, too
14:24 selckin seems kinda crazy workflow tho, why not merge locally
14:24 mlangenberg joined #git
14:24 jast yeah, it's probably a good idea to figure out some alternative way to do this in the future
14:27 rwb joined #git
14:29 donught joined #git
14:29 jaguarmagenta joined #git
14:29 cdown_ joined #git
14:31 iliv joined #git
14:32 nowhereman joined #git
14:33 delboy1978uk selckin: nothing in here is simple. everything is crazy. :-(
14:37 dviola joined #git
14:37 delboy1978uk jast: i'll try that, but i think i'll back up my .git first just in case
14:37 jast can't hurt
14:37 cdg_ joined #git
14:38 delboy1978uk so i just need to copy the index?
14:38 Eryn_1983_FL joined #git
14:39 Andrii[m] joined #git
14:39 jast it's not guaranteed to work out perfectly, unfortunately
14:39 jast if some auto-merges happened, the server's index will be referring to objects you don't have yet in your local repo
14:40 petersaints joined #git
14:40 delboy1978uk i have both branches pre merghe locally
14:40 delboy1978uk in fact!
14:40 jast yeah, and that's enough as long as no automatic merges of parts of files happened during your merge on the server
14:40 jast but you'll only know by trying it :)
14:41 delboy1978uk i could just attempt the merge locally, probably get the same conflicts, resolve them, upload the files, run the deploy ticket script, and just reset my branches and pull from remote
14:41 jozwior joined #git
14:42 nowhereman joined #git
14:43 anonymuse joined #git
14:43 HoierM joined #git
14:44 xall joined #git
14:45 amitprakash joined #git
14:45 tax joined #git
14:45 Snugglebash joined #git
14:46 Gloomy joined #git
14:47 delboy1978uk left #git
14:49 LionsMane joined #git
14:50 King_Hual joined #git
14:51 danemacmillan joined #git
14:51 sigma__ joined #git
14:51 ToBeCloud joined #git
14:52 sigma__ If I perform a rebase and there are conflicts, is there a way to list those conflicts so I can see which files are affected and then confirm that I've addressed them all?
14:52 sigma__ I typically just look for the word CONFLICT in the rebase output.
14:52 nicksloan joined #git
14:52 Es0teric joined #git
14:54 fmcgeough joined #git
14:54 sigma__ This seems to work well: git diff --name-only --diff-filter=U
14:56 osse sigma__: git status lists all conflicts. when you've resolved a file, git add it, and it disappears from git status
14:56 sigma__ osse: The "unmerged paths" section?
14:56 osse yes
14:56 sigma__ osse: Thanks.
14:58 petersaints left #git
14:59 _Cyclone_ joined #git
14:59 dimi1947 joined #git
15:00 nisseni I'm trying this file to remove some files: https://confluence.atlassian.com/bitbucket/reduce-repository-size-321848262.html - however, it's not working
15:00 User458764 joined #git
15:00 nicksloan joined #git
15:01 sigma__ left #git
15:01 e14 joined #git
15:02 snowkidind joined #git
15:03 Snugglebash joined #git
15:05 hahuang65 joined #git
15:06 Dougie187 joined #git
15:07 re1_ joined #git
15:08 meLon joined #git
15:08 nickabbey joined #git
15:09 Dougie187 joined #git
15:09 Gsham joined #git
15:11 boombatower joined #git
15:11 al-damiri joined #git
15:12 fees joined #git
15:12 manuels joined #git
15:13 fahadash joined #git
15:13 ResidentBiscuit joined #git
15:14 ResidentBiscuit joined #git
15:14 inflames joined #git
15:14 GodGinrai joined #git
15:15 ybden joined #git
15:16 g105b_ joined #git
15:18 lvns joined #git
15:19 govg joined #git
15:19 steve joined #git
15:21 nd_ joined #git
15:21 overlord_tm joined #git
15:23 bn0t__ joined #git
15:23 lvns joined #git
15:25 DrRobotic joined #git
15:26 lvns_ joined #git
15:27 LionsMane joined #git
15:27 ejb joined #git
15:29 GodGinrai joined #git
15:30 nikivi can someone help me understand why I can't push nor pull changes from my repo
15:30 nikivi I tried running all of the commands : http://hastebin.com/ucesakucez
15:30 xberg joined #git
15:31 nikivi and here is the repository : https://github.com/nikitavoloboev/nikitavoloboev.github.io
15:31 JeroenT joined #git
15:31 serialoverflow joined #git
15:31 GodGinrai nikivi: Well, I'm sure you realized that the original problem was that your master branch had no upstream set.
15:32 ExoUNX joined #git
15:32 aw1 joined #git
15:33 nikivi I may have missed setting upstream, you are right
15:33 GodGinrai nikivi: the next problem is that you are trying to push changes that are not a fastforward merge for the upstream
15:33 AaronMT joined #git
15:33 hashpuppy joined #git
15:33 GodGinrai nikivi: the best bet is to set your upstream and pull down (or fetch) the upstream's branch
15:33 GodGinrai nikivi: complete the merge there
15:33 GodGinrai nikivi: then push
15:34 blackjid joined #git
15:34 nikivi GodGinrai thank you, I am trying to find the command to set upstream and find it a bit confusing
15:35 Endarked joined #git
15:35 GodGinrai that git-branch command at the end of the pull message should do it
15:35 GodGinrai nikivi: replace <branch> with master, tho[
15:35 GodGinrai *tho'
15:35 nikivi http://hastebin.com/exizeluwaz
15:36 nikivi how can I not have access rights
15:36 nikivi if I created the git repo and and the folder
15:36 osse because it doesn't exist
15:36 cdown_ joined #git
15:36 GodGinrai nikivi: git-pull specifies remote, then master
15:36 GodGinrai nikivi: your remote is "origin", not "master"
15:36 ash_workz joined #git
15:37 rwb joined #git
15:37 GodGinrai well, remote, then branch (which for you is master)
15:37 nikivi I see now, thank you all
15:37 GodGinrai np
15:37 nikivi I merged successfully but still can't push
15:38 nikivi fatal: The current branch master has no upstream branch.
15:38 GodGinrai yea, just run that command you ran earlier
15:38 GodGinrai `git push --set-upstream origin master`
15:38 liyuanhua joined #git
15:40 gchristensen joined #git
15:40 liyuanhua joined #git
15:40 c0ded joined #git
15:40 nikivi thank you once again, this worked :)
15:40 liyuanhua joined #git
15:41 lindenle joined #git
15:42 Es0teric joined #git
15:43 rumbler31 joined #git
15:45 clmsy joined #git
15:47 mindriot101 joined #git
15:48 nicksloan joined #git
15:48 red82 joined #git
15:52 BSaboia joined #git
15:52 jwest joined #git
15:53 ejb joined #git
15:54 mindriot_ joined #git
15:54 subhojit777 joined #git
15:54 cdown joined #git
15:55 sdothum joined #git
15:56 d0nn1e joined #git
15:57 mada joined #git
15:58 mada Hi, what's the relevant manpage to check the globbing syntax for commands like git show and diff? I got some unfortunate compiled+minified js files that make looking at old commits a pain.
15:58 a_thakur joined #git
15:59 osse mada: what globbing syntax?
15:59 osse git diff foo bar -- '*.js'  you mean?
15:59 canton7 jast, your certificate on jk.gs just expired
16:00 lvns joined #git
16:01 _ikke_ Probably to forgot to run the LE renew script
16:01 _ikke_ (or it failed somehow)
16:01 nowhereman joined #git
16:01 grawity mada: I wonder if you could configure git to diff the un-minified versions instead
16:01 mada osse: yes. I'd say the most complex thing I want is to exclude either directories or patterns
16:01 grawity or at least prettyprinted
16:02 rchavik joined #git
16:02 grawity though personally I just mark them as -diff sometimes
16:02 mada I think -- . '!:**/*.(js|map)' or similar
16:02 grawity e.g. echo "*.js -diff" >> .git/info/attributes
16:02 grawity that way they still show up in the full diff but merely as a 'Binary file changed'
16:02 mada oh that's great
16:03 leeN joined #git
16:03 * grawity does that for .po translations usually >_>
16:03 grawity they don't clutter the shortstat after `git pull`, either
16:03 osse mada: man gitglossary, under pathspec
16:03 gitinfo mada: the gitglossary manpage is available at http://jk.gs/gitglossary.html
16:04 mada osse: thank you, will check that out as well.
16:04 vuoto joined #git
16:04 venmx joined #git
16:05 vuoto joined #git
16:08 byte512 joined #git
16:09 mada Ah, this is so goooood. My quality of life has improved so much
16:09 mada grawity: thanks!  :)
16:10 osse Don't your unminified js files also end in .js ?
16:11 brent__ joined #git
16:11 grawity maybe they're coffeescript
16:11 grawity adjusting the wildcards to fit is left as an exercise to the reader
16:11 apotry joined #git
16:11 ojdo joined #git
16:12 mada Adjusting the path is the easy part, but yeah they're .coffee files.
16:12 netj joined #git
16:12 osse ah
16:12 mada Fortunately these minified files end up in a /build directory, so the path is trivial
16:12 osse i suggest putting /build outside of the repo :P
16:13 GodGinrai ugh coffeescript
16:13 mada I suggest the same, but it's not my decision to make
16:13 grawity or gitignoring it
16:13 lvns joined #git
16:13 dreiss joined #git
16:13 * osse prefers arabicascript
16:13 Andrii[m] left #git
16:13 guest___ joined #git
16:14 GodGinrai I can understand typescript
16:14 GodGinrai but coffeescript just drives me crazy
16:14 noecc left #git
16:14 blackwind_123 joined #git
16:14 osse I understand everything except sql
16:14 mada GodGinrai: it's an awful language, to be honest.
16:14 e14 joined #git
16:15 GodGinrai mada: coffeescript?  Then why do you use it?
16:15 mada Is everyone here their own boss?
16:15 GodGinrai osse: https://dogescript.com/
16:16 mada GodGinrai: It's my job. I don't make these calls
16:16 GodGinrai mada: so you are inheriting pre-existing code?
16:16 osse mada: sort of. we're about 5 people on this project. but the boss is fairly clueless so easy to persuade
16:16 sd_ joined #git
16:17 mada Hardly inheriting. I work on a pre-existing codebase that I don't own
16:17 sd_ I accidentally removed my branch in git. Is it completely gone?
16:17 GodGinrai osse: similar situation for me.  Although our boss isn't clueless, but values our opinions :)
16:17 Darren_ joined #git
16:17 osse sd_: the branch is lost, but not the content it referred to. are you able to scroll up to the delete command?
16:18 sd_ scroll up?
16:18 sd_ how can the content not be lost?
16:18 GodGinrai sd_: the branch (pointer) is lost, but the content it pointed to could probably be found
16:18 osse sd_: Yes I mean scroll up. as in the terminal where you typed git branch -d.
16:18 mada I see. In our case we're 2 people on this project and the other projects, so big changes like "remove coffee codebase" are nigh impossible to consider
16:18 osse sd_: the content is not lost because git is lazy and doesn't empty the recycle bin often
16:18 Remramm joined #git
16:18 Remramm joined #git
16:19 GodGinrai sd_: branches are just pointers to commits.  Deleting a branch just deletes the pointer.  The commits it pointed to are not removed, unless nothing else refers to them when the garbage collector runs
16:19 sd_ So how do i restoe the branch?
16:19 sd_ and how does this affect people that branched from a commit on the branch that is now deleted?
16:20 GodGinrai mada: What about slowly converting coffee files to regular js as tech debt?
16:20 osse sd_:  how to restore it depends... can you scroll up??  It doesn't affect anyone else
16:20 e14 joined #git
16:20 cjohnson sd_: git branch   only modifies your local branches, not remotes
16:20 sd_ we found the commit
16:21 GodGinrai sd_: if other people have the branch, then they still have the commit, so there is no problem for them
16:21 converge joined #git
16:21 converge joined #git
16:21 sd_ how do we recreate the branch?
16:21 mada GodGinrai: that could work  :)  maybe I'll try and sell it to the boss, though he does like coffeescript so..
16:21 osse sd_: in that case type 'git branch branchname {commithashhere}'
16:21 cjohnson if your local branch has no changes that weren't already pushed you could just git checkout the branch again
16:21 cjohnson and it would pull from remote
16:21 rominronin joined #git
16:22 jstimm joined #git
16:23 sd_ i deleted branch X locally then instead of pushing X i pushed y like so: git push origin :Y which ndeleted Y instead of X :(
16:23 g_zen joined #git
16:24 thiago joined #git
16:24 NeverDie joined #git
16:24 sd_ git branch Y aab6b5d8849cf95418959ffa56f95f386ce33742  ?
16:24 sd_ then push that?
16:25 grawity that'd work, yes
16:25 osse actually if you don't need Y locally you can  git push origin aab6b5d8849cf95418959ffa56f95f386ce33742:refs/heads/Y
16:25 sd_ actually I have the local copy left of Y, can i jus tpush it then?
16:26 grawity sure
16:27 derk0pf joined #git
16:27 kpease joined #git
16:28 kpease_ joined #git
16:28 aarobc joined #git
16:28 jstimm joined #git
16:28 kbs joined #git
16:28 mindriot101 joined #git
16:30 shinnya joined #git
16:31 sd_ thanks!
16:32 nickabbey joined #git
16:32 xall joined #git
16:34 saml joined #git
16:36 pbrewczynski joined #git
16:36 zivester joined #git
16:36 Dragonbird joined #git
16:37 ochorocho__ joined #git
16:40 m0ltar joined #git
16:41 Dragonbi_ joined #git
16:43 jccn joined #git
16:44 Darcidride joined #git
16:45 alfism joined #git
16:48 TomyWork joined #git
16:49 e14 joined #git
16:49 anuxivm joined #git
16:50 Dragonbird joined #git
16:50 giraffe joined #git
16:50 ramsub07 joined #git
16:50 Siegfried joined #git
16:50 jaguarmagenta joined #git
16:51 rooftopjoe joined #git
16:52 Spacew00t joined #git
16:52 rooftopjoe if i modify my last commit in my local repository, how do i sync github with that? do i push again?
16:52 Cavallari joined #git
16:52 troulouliou_div2 joined #git
16:52 Tanfrieze joined #git
16:53 rooftopjoe oh, all i can change about a commit is its message?
16:54 rooftopjoe nvm i don't want to rebase it
16:54 cjohnson if you rewrite history and you have already pushed, you have to force push
16:55 cjohnson note that this will have negative effects on anybody else who has checked that branch out
16:55 Darcidride joined #git
16:56 LBV_User joined #git
16:57 ayogi joined #git
16:58 toogley joined #git
16:59 Starky joined #git
16:59 Electrometro joined #git
16:59 svm_invictvs joined #git
17:00 rominron_ joined #git
17:00 vrlx joined #git
17:02 dreaddymck joined #git
17:04 finalbeta joined #git
17:04 dsteplight__ joined #git
17:05 guest___ joined #git
17:05 adymitruk joined #git
17:06 adam__ joined #git
17:07 bn0t_ joined #git
17:07 krillr joined #git
17:07 ahmedelgabri joined #git
17:08 adam__ joined #git
17:08 jnavila joined #git
17:09 shgysk8zer0 joined #git
17:10 oskarkv joined #git
17:10 fbwnnd joined #git
17:11 robattila256 joined #git
17:12 rooftopjoe cjohnson: presumably, they will need to clone the repo again because i expect the hashes to change. also, it should also have the same effect on people using it as a submodule.
17:12 rooftopjoe not sure how things like branching work.
17:13 User458764 joined #git
17:13 rooftopjoe i don't think it would cause a problem in that case
17:13 jnavila_ joined #git
17:13 nicksloan joined #git
17:13 GodGinrai rooftopjoe: yes.  This is why you are not supposed to change history for anything you've made public
17:13 rooftopjoe GodGinrai: well, sometimes there are justified reasons
17:14 ash_workz can you issue a git command to a specific directory without cd
17:14 ash_workz can you issue a git command to a specific directory without cd'ing to that directory first?
17:14 GodGinrai rooftopjoe: Very rarely.  But when you do need to do it, make sure you properly communicate to everyone so that they can fix their branches
17:14 nikivi joined #git
17:14 osse ash_workz: git -C dir cmd
17:14 rooftopjoe GodGinrai: yep
17:14 ash_workz osse: I see, and I assume that `cmd` doesn't repeat `git`?
17:14 rooftopjoe for the record, i'm thinking about legal reasons
17:15 GodGinrai osse: oh wow, I wasn't aware of the
17:15 osse ash_workz: yes. cmd is log or diff or whatever
17:15 GodGinrai *that
17:15 osse GodGinrai: since 1.9.5 i think
17:15 ash_workz osse: thanks! :)
17:15 GodGinrai I always just used `cd dir; git cmd`
17:15 osse noob
17:15 osse cd dir && git cmd  at least
17:15 osse :p
17:15 rooftopjoe well, why aren't you in that directory if you're working there?
17:15 rooftopjoe :)
17:15 rooftopjoe i've never even needed -C.
17:16 xall joined #git
17:16 GodGinrai osse: oh good point, the short-circuiting would prevent weird git behavior
17:16 StuartMI joined #git
17:16 rooftopjoe well
17:16 robattila256 joined #git
17:16 GodGinrai rooftopjoe: you'll use something like that more often in automation.  Or if you are working in a directory separate from the git dir and need to check something in it
17:17 mayank98 joined #git
17:17 rooftopjoe i don't automate my commits with scripts because i often need to do things like git status to check if everything is alright, etc.
17:18 rooftopjoe so for every commit i need to pay attention
17:18 GodGinrai rooftopjoe: not automating commits, but automating other things (clones, tests, etc.)
17:18 _leb joined #git
17:18 rooftopjoe what tests?
17:18 mayank98 joined #git
17:18 GodGinrai rooftopjoe: tests for your codebase, for example, for CI
17:18 Guest38903 joined #git
17:18 rooftopjoe yes but what features does git offer to help with CI?
17:19 rooftopjoe because that sounds useful to know.
17:19 Guest38903 joined #git
17:19 LionsMane joined #git
17:19 GodGinrai rooftopjoe: git diff, for checking the PR branch against master, etc.
17:20 rooftopjoe oh. nothing too fancy, i guess.
17:20 GodGinrai anything too fancy is likely something I haven't discovered yet :P
17:20 adam__ left #git
17:21 mda1 joined #git
17:21 madewokherd joined #git
17:21 mayank98 joined #git
17:21 hhee joined #git
17:22 guest___ joined #git
17:22 Xarodon joined #git
17:22 rooftopjoe i've never really done continuous integration. nor testing, lol.
17:22 bn0t__ joined #git
17:22 rooftopjoe i've been meaning to get into these proper engineering practices more.
17:23 adymitruk joined #git
17:23 nickabbey joined #git
17:23 GodGinrai rooftopjoe: CI is interesting
17:24 Snugglebash joined #git
17:24 rooftopjoe i understand the general concept, just haven't really look at what tools are available out there, what workflows people use,etc.
17:24 GodGinrai rooftopjoe: it's useful for keeping the really stupid commits from wasting time
17:25 mindriot101 joined #git
17:26 tvw joined #git
17:28 xpk joined #git
17:28 xpk joined #git
17:29 mayank98 joined #git
17:30 mayank98 hi
17:31 mayank98 joined #git
17:31 Es0teric joined #git
17:32 mayank98 left #git
17:34 mayank98 joined #git
17:35 TomyWork joined #git
17:35 bn0t_ joined #git
17:35 mayank98 joined #git
17:36 Walex joined #git
17:36 autofly joined #git
17:36 romerocesar joined #git
17:37 isysd joined #git
17:37 guest____ joined #git
17:38 robotroll joined #git
17:38 sea-gull joined #git
17:39 tax joined #git
17:40 osse for d in ~/myrandomclonesofstuff/*/; do git -C "$d" fetch; done
17:40 InfoTest joined #git
17:41 osse saves you from the overhead of  (cd "$d" && git fetch)  because creating a subshell is much more expensive that network traffic
17:41 grawity really
17:41 Salander27 joined #git
17:41 grawity in which world
17:41 kbs` joined #git
17:41 osse the one where jokes are not apparent
17:42 crayon joined #git
17:42 nickabbey joined #git
17:42 ash_workz heh
17:42 Snugglebash joined #git
17:43 GodGinrai joined #git
17:43 kadoban joined #git
17:43 ayogi joined #git
17:43 ash_workz `git log --all` "Pretend as if all the refs in refs/ are listed on the command line as <commit>." -- what does this mean exactly?
17:43 leb joined #git
17:44 Dragonbird joined #git
17:44 nettoweb1 joined #git
17:44 davidosomething joined #git
17:44 GodGinrai joined #git
17:45 jas4711 joined #git
17:45 deadnull joined #git
17:47 ash_workz /imply
17:48 ash_workz I mean, is that going to include commit messages from other branches?
17:48 grawity yes
17:48 grawity since branches are refs in refs/heads/
17:48 ash_workz I see
17:48 tang^ joined #git
17:49 tmsmith_ joined #git
17:49 geko joined #git
17:51 ash_workz zzz
17:51 ash_workz I'm so tired
17:51 ash_workz do I caffeinate?
17:51 svm_invictvs joined #git
17:52 steelsw0rd joined #git
17:53 jnavila_ joined #git
17:55 nickabbey joined #git
17:55 jstimm joined #git
17:57 osse ash_workz: depends. what time is it?
17:57 e14 joined #git
17:59 GodGinrai ash_workz: just drink lots of water
17:59 GodGinrai ash_workz: gets oxygen into your system
18:00 ki0 joined #git
18:00 ash_workz GodGinrai: been doing that
18:00 ash_workz I've been peculiarly tired lately
18:00 GodGinrai ash_workz: have you been getting sleep?
18:01 ash_workz GodGinrai: yeah; it hasn't been terrible lately... mostly because I'm so god damn tired
18:01 kbs` left #git
18:01 ash_workz I'd rather be working, but I've just been way too exhausted
18:02 Rodya_ joined #git
18:02 GodGinrai Maybe you just need to crash on a weekend sometime
18:02 ZeroZeroZeroZero joined #git
18:02 scarabx joined #git
18:03 durham joined #git
18:03 ash_workz maybe
18:04 spacelord_ joined #git
18:04 ash_workz thyroid disease: " symptoms include unexplained weight loss, feeling warm all the time, ... Other symptoms include weight gain due to water retention, feeling cold all the time (even in warmer weather)"
18:04 ash_workz w
18:04 ash_workz t
18:04 ash_workz f
18:04 ZeroZeroZeroZero left #git
18:05 synthroi_ joined #git
18:05 osse maybe it's diabeetus
18:05 kbs joined #git
18:05 leb joined #git
18:05 ZeroZeroZeroZero joined #git
18:06 ash_workz oooh, no that's me being stupid; I didn't read it well enough
18:06 ash_workz Hyperthyroidism vs Hypothyroidism
18:07 ash_workz the former being less weight/warm
18:09 jfran joined #git
18:11 GodGinrai ash_workz: self diagnosis often just creates more trouble for doctors
18:12 GodGinrai ash_workz: they often end up with people convinced they have something they don't
18:12 nidr0x joined #git
18:12 ash_workz ¯\_(ツ)_/¯
18:13 GodGinrai I just got the unicode values for all of that, so I have no idea what you were trying to do there <.<
18:13 Noldorin joined #git
18:13 osse I recently had mono. Not fun.
18:13 GodGinrai osse: so I've heard
18:14 derk0pf joined #git
18:14 GodGinrai osse: at the same time, there are likely some who are jealous, because getting mono normally implies you have a social life :P
18:14 iDanoo joined #git
18:14 iDanoo joined #git
18:14 lindenle joined #git
18:15 osse lol
18:15 osse In reality it's a about as contagious as the common cold
18:16 ahmedelgabri joined #git
18:17 vvyy left #git
18:17 Dragonbi_ joined #git
18:19 jstimm joined #git
18:20 Learath2 joined #git
18:21 cheater joined #git
18:21 cheater hi
18:22 YuGiOhJCJ joined #git
18:22 re1 joined #git
18:23 chardan joined #git
18:23 cheater does anyone know how to use git against irmin stores? here's what the irmin store i have looks like: https://0bin.net/paste/GxQ9W2xgYvxCTZT0#
18:23 cheater i would like to look at the branches etc
18:25 ilmari cheater: it looks like you've left off the encryption key from the URL
18:26 rorro joined #git
18:26 ash_workz is there a common abbreviation for "branch"
18:26 ash_workz ?
18:26 GodGinrai irmin?
18:27 GodGinrai ash_workz: abbreviation to be used where?
18:27 sea-gull joined #git
18:27 GodGinrai ash_workz: in road names, br is often used.  However, br is also used for "bridge"
18:27 lungaro is there a way to search for files changed across any remote branch?
18:27 ash_workz GodGinrai: thanks :)
18:27 GodGinrai lungaro: across remote branches?
18:27 GodGinrai ash_workz: np
18:28 masak here's a short way to write "branch": ⽀
18:28 masak :P
18:28 lungaro GodGinrai,I want to see `git log --stat` for every remote branch
18:28 lungaro if not it'd be an easy tool, albiet an annoying one to write
18:28 jost joined #git
18:29 converge joined #git
18:29 osse lungaro: git log --stat --remotes
18:29 lungaro Nice!
18:29 lungaro thanks osse.. i'll add that to my cheat sheet
18:30 osse https://www.youtube.com/watch?v=zYt0WbDjJ4E
18:30 lungaro lol
18:32 jj96 joined #git
18:33 jj96 Hi, can anyone explain what does this do git am < /path/to/.patch
18:33 Dragonbird joined #git
18:34 GodGinrai jj96: https://git-scm.com/docs/git-am
18:34 atrus 'git am' takes (A)pplies a (M)ailbox of git-formatted patches. the "< somefile" syntax tells your shell to provide that file as input, as if it was typed.
18:35 kpease joined #git
18:35 GodGinrai atrus: that's a shiny spoon you've got there
18:35 marcogmonteiro joined #git
18:35 atrus GodGinrai: noted :)
18:37 marcogmonteiro joined #git
18:37 nettoweb joined #git
18:38 fmcgeough joined #git
18:38 rsage joined #git
18:38 GodGinrai atrus: might your name be from Atrus, son of Gehn?
18:39 atrus GodGinrai: that's the reference, yeah :)
18:39 d5sx43 joined #git
18:39 GodGinrai good choice :)
18:39 atrus this being about the once-every-two-years event where somebody gets it
18:39 GodGinrai lol
18:40 GodGinrai well, nowadays, there are less and less people who know anything about Myst
18:40 GodGinrai since Cyan isn't trying to continue the series
18:41 Cavallari joined #git
18:41 atrus i'd rather see a comic/book than another game in that universe, frankly. obduction was pretty cool to see them explore a new space.
18:41 GodGinrai Oh yea, I've been waiting forever for the Book of Marrim
18:41 GodGinrai I've been meaning to try obduction
18:42 baryon joined #git
18:43 GodGinrai I was really excited for the Myst movie, and then it never happened :\
18:43 venmx joined #git
18:43 kbs` joined #git
18:44 cagedwisdom joined #git
18:44 cheater ilmari: sorry. let me see if i can find a better uri
18:44 sssilver joined #git
18:44 darkcar joined #git
18:45 cheater ilmari: does this work better? https://0bin.net/paste/GxQ9W2xgYvxCTZT0#FCDCURqF7l+A2G0HYwpWrOmXFmvZmaMNzR7hYKmvwMn
18:45 ilmari yes
18:46 tnecniv joined #git
18:47 thiago joined #git
18:48 ilmari cheater: that doesn't look like a git repository. are you using the irmin.git storage backend?
18:48 f4_ joined #git
18:48 relipse joined #git
18:49 _leb joined #git
18:50 bn0t__ joined #git
18:50 finalbeta joined #git
18:50 Limes_ joined #git
18:50 aollier joined #git
18:51 jaguarmagenta joined #git
18:51 guest____ joined #git
18:52 Dougie187 left #git
18:52 Dougie187 joined #git
18:53 chardan joined #git
18:53 netj joined #git
18:54 tyreld joined #git
18:55 Shentino joined #git
18:56 xall joined #git
18:58 nettoweb joined #git
18:58 jrnieder joined #git
18:58 overlord_tm joined #git
18:59 baryon joined #git
19:01 publio joined #git
19:02 rorro joined #git
19:02 cheater ilmari: i'm using irmin from ocaml code - are you saying we need to select a specific backend for it to use a format git can understand?
19:04 cdown joined #git
19:04 baryon joined #git
19:04 LionsMane joined #git
19:04 TomyLobo joined #git
19:05 Stag joined #git
19:05 Rodya_ joined #git
19:06 Stag Hi folks, say I have a branch1 and feature1(which was checked out from branch1)...and some other feature was merged with branch1, how can I update base for feature1 ?
19:07 osse Stag: git checkout feature1; git rebase branch1
19:07 osse unless i misunderstand the question
19:07 osse updating the base (or re-basing) is just what rebase does
19:08 sssilver joined #git
19:08 dreiss joined #git
19:08 Sasazuka joined #git
19:08 cdown_ joined #git
19:09 Stag osse, I think it's rebase, I just didn't understand the part where say I have a file removed from branch1 from a previous merge and have the same file edit in feature1, how will it treat the file ?
19:09 tnecniv joined #git
19:09 nettoweb joined #git
19:09 lektrik joined #git
19:09 donught joined #git
19:10 adymitruk joined #git
19:10 osse Stag: git will treat it as a conflict that you have to resolve
19:11 rsage joined #git
19:13 Stag osse, great, thanks
19:13 Balliad joined #git
19:13 _noblegas joined #git
19:13 venmx joined #git
19:15 troulouliou_div2 joined #git
19:16 nowhereman joined #git
19:17 lvns joined #git
19:17 rsage_1 joined #git
19:19 e14_ joined #git
19:19 MrMojito1 joined #git
19:20 WayToDoor joined #git
19:20 Vgr_ joined #git
19:20 Vgr_ joined #git
19:20 red82_ joined #git
19:20 ELFreder1ch joined #git
19:20 systmkor_ joined #git
19:20 dustinm| joined #git
19:21 dmj`_ joined #git
19:21 GameGamer43_ joined #git
19:21 angelsl_ joined #git
19:21 quackgyver_ joined #git
19:21 zeller_ joined #git
19:21 danmackay_ joined #git
19:21 xall_ joined #git
19:21 Iacobus__ joined #git
19:22 kenansul- joined #git
19:22 miklcct_ joined #git
19:22 Andre_work joined #git
19:22 bcardarella_ joined #git
19:22 drizztbsd joined #git
19:22 qqx_ joined #git
19:22 faux___ joined #git
19:23 anry_ joined #git
19:23 phox_ joined #git
19:23 geko_ joined #git
19:23 Jupelius_ joined #git
19:23 sea-gull_ joined #git
19:23 Gaga joined #git
19:23 salamanderrake_ joined #git
19:23 acln_ joined #git
19:23 Slush-_ joined #git
19:23 rawtaz_ joined #git
19:23 Levex joined #git
19:23 kanzure_ joined #git
19:23 axisys_ joined #git
19:23 spb_ joined #git
19:23 vals_ joined #git
19:23 cheater_ joined #git
19:24 rsage joined #git
19:24 hegge_ joined #git
19:24 Es0teric joined #git
19:24 Zoxc_ joined #git
19:25 venmx joined #git
19:25 rfv_ joined #git
19:26 jstimm joined #git
19:26 kwmiebach___ joined #git
19:26 acr4_ joined #git
19:26 resetpacket joined #git
19:26 cyberz_ joined #git
19:26 harwood_ joined #git
19:26 meZee- joined #git
19:26 nebg_ joined #git
19:26 idmistir_ joined #git
19:26 quizzmaster joined #git
19:26 hexagoxel_ joined #git
19:26 iDanoo_ joined #git
19:26 compeman_ joined #git
19:26 sweatsuit_ joined #git
19:27 zncmax4 joined #git
19:27 duartepe- joined #git
19:27 BackEndCoder_ joined #git
19:27 SegFaultAX_ joined #git
19:27 EugeneKay joined #git
19:27 traxo-xx- joined #git
19:27 jrnieder joined #git
19:27 acln_ joined #git
19:28 unixdork joined #git
19:28 leonarth_ joined #git
19:28 storrgie_ joined #git
19:28 synthroid joined #git
19:29 HalfEatenPie_ joined #git
19:29 SJr joined #git
19:29 xall_ joined #git
19:29 pikajude joined #git
19:29 sunri5e joined #git
19:29 Slick joined #git
19:30 markelite joined #git
19:30 Tsutsukakushi joined #git
19:30 enckse joined #git
19:31 lucz joined #git
19:31 flavius joined #git
19:31 hecliunyx joined #git
19:31 ilmari cheater: presumably yes. the README at https://github.com/mirage/irmin doesn't make it obvious what the default store is
19:31 kutenai joined #git
19:32 Jackneill joined #git
19:32 jccn joined #git
19:33 stealthii joined #git
19:33 mquin joined #git
19:33 wizardedit joined #git
19:33 flaviodesousa joined #git
19:34 coasterz joined #git
19:34 ionelmc joined #git
19:34 alphor_ joined #git
19:34 cdown joined #git
19:34 APic joined #git
19:34 madduck_ joined #git
19:34 crater2150 joined #git
19:34 Mher[m] joined #git
19:34 nickabbey joined #git
19:34 steve joined #git
19:34 saintaquinas[m] joined #git
19:34 musicmatze[m] joined #git
19:35 sssilver_ joined #git
19:35 Ragnor joined #git
19:35 scrambo[m] joined #git
19:35 cheater ilmari: thanks. it turns out i was looking in the wrong place. that place is not the irmin store. the other place has a .git in it and it works :)
19:35 cheater thanks though :)
19:36 alphor_ to whoever owns jk.gs , your cert expired today. idk if let's encrypt does it automatically.
19:36 rsage joined #git
19:36 Vortex34 joined #git
19:37 _flow__ joined #git
19:38 bouncy joined #git
19:39 crose joined #git
19:39 Rodya_ joined #git
19:40 _ikke_ jast
19:41 nickabbey joined #git
19:42 tnecniv joined #git
19:43 SwiftMatt joined #git
19:43 jnewt_ i'm trying to figure out how to use git subtree split, but can't find any examples where the result is multiple branches of a folder.  is it possible, or do you have to do one branch at a time?
19:44 dreiss joined #git
19:45 Balliad joined #git
19:45 synthroi_ joined #git
19:45 raspado joined #git
19:46 dsantiago joined #git
19:48 Shentino joined #git
19:49 Eioc joined #git
19:49 acln joined #git
19:52 ghostlight joined #git
19:53 dsantiago joined #git
19:53 rorro joined #git
19:53 King_Hual joined #git
19:56 Dii joined #git
19:57 xall_ joined #git
19:58 hfp_work joined #git
19:59 tnecniv joined #git
20:01 peeps[lappy] joined #git
20:02 cdown joined #git
20:02 DrRobotic joined #git
20:02 jrnieder joined #git
20:04 raspado joined #git
20:05 kireevco joined #git
20:06 leeN joined #git
20:06 devster31 joined #git
20:06 navidr joined #git
20:06 ribasushi joined #git
20:08 madewokherd joined #git
20:09 jccn joined #git
20:10 Gloomy joined #git
20:10 hhee joined #git
20:10 cdesai joined #git
20:11 tax joined #git
20:11 tnecniv joined #git
20:13 kyan joined #git
20:14 panzergame joined #git
20:16 johnmilton joined #git
20:16 panzergame Hello everyone, i have three branches A, B and C. A and B depends of C but at a different state/version. I want to merge A to B without pulling the C commits from one of the most recent branch. It is possible ? Thanks in advance.
20:17 nickabbey joined #git
20:18 lvns joined #git
20:18 GodGinrai panzergame: let me make sure I get this straight
20:18 GodGinrai C -> A
20:18 GodGinrai C -> B
20:18 jnavila_ joined #git
20:18 GodGinrai but the point you branched B from C was different from when you branched A off
20:19 GodGinrai am I correct so far?
20:19 panzergame GodGinrai: exactly
20:19 GodGinrai ok, so you want to merge A and B
20:19 GodGinrai what is this about pulling C commits from a recent branch?
20:20 GodGinrai Do you mean that B has commits from C that you don't want when merging A and B?
20:20 panzergame yes, is that
20:20 panzergame in this case i got more conflicts
20:20 GodGinrai well, what you would do then, is rebase B off of the commit A branches from
20:21 GodGinrai then merge A and B
20:21 GodGinrai this is assuming A and B are not already public
20:21 Vinnie_win_x joined #git
20:21 Atm0spher1c joined #git
20:21 GodGinrai if so, changing history like that can cause tons of problems for other users
20:21 panzergame GodGinrai: the issue is that both A and B are long branch with a lot of merges to C.
20:21 GodGinrai in which case, it is better to bite the bullet and just deal with the conflicts
20:22 GodGinrai oh
20:22 GodGinrai you've done merges
20:22 GodGinrai yea, there's not really a way to do that, then
20:22 GodGinrai you just have to fix the conflicts
20:22 GodGinrai unless you want to cherrypick the commits from B you want into a branch based off of A
20:23 panzergame i go to resolve conflicts then, GodGinrai thanks for the help :)
20:23 GodGinrai np
20:23 cyberz_ left #git
20:24 f4_ joined #git
20:25 cyberz joined #git
20:25 fees joined #git
20:25 kpease joined #git
20:27 rwb joined #git
20:28 rwp left #git
20:28 jrnieder joined #git
20:29 idmistir joined #git
20:30 durham_ joined #git
20:31 jimi_ joined #git
20:31 durham_ joined #git
20:31 acln left #git
20:31 kireevco trying to wrap my head around: I need to push changes of a file from 1 repo to others: > sourcerepo/file.txt: targetrepoA/file.txt, targetrepoB/file.txt, targetrepoC/file.txt
20:31 stomplee joined #git
20:32 Flowinho joined #git
20:34 irqq joined #git
20:34 dan2k3k4 joined #git
20:34 GodGinrai kireevco: are they separate versions of the same repo?
20:35 davimore left #git
20:36 davimore joined #git
20:36 rsage joined #git
20:37 Dougie187 joined #git
20:37 rsage joined #git
20:38 Dougie187 joined #git
20:41 aidalgol joined #git
20:41 toogley joined #git
20:41 dreiss joined #git
20:41 scarabx joined #git
20:42 axisys joined #git
20:45 nivag joined #git
20:46 _ADN_ joined #git
20:46 overlord_tm joined #git
20:47 Endarked joined #git
20:48 rsage_1 joined #git
20:50 lvns joined #git
20:50 venmx joined #git
20:51 isysd joined #git
20:52 jaguarmagenta joined #git
20:53 m0viefreak joined #git
20:55 ramsub07 joined #git
20:55 e14 joined #git
20:57 xberg joined #git
20:59 faux___ joined #git
20:59 raspado joined #git
21:00 faux___ joined #git
21:03 adymitruk joined #git
21:04 Bbe joined #git
21:04 tnecniv joined #git
21:04 adymitruk joined #git
21:04 durham joined #git
21:06 breezy_ joined #git
21:06 adam__ joined #git
21:07 kireevco GodGinrai: no, different repos
21:08 devanshmanu__ joined #git
21:09 GodGinrai kireevco: sorry, gotta leave work.  Maybe someone else can help you with your issue.
21:10 kireevco GodGinrai: basically, here's the story. there are bunch of app repos, and there is a set of files that go into all of them. I controle those files (like agent configs, etc). And I want to be able to change one source file only,
21:11 GodGinrai kireevco: make a repo for your configs, and scripts to deploy them.  Don't store them in the other repos
21:11 GodGinrai that's my suggestion
21:11 GodGinrai anyway, cya
21:11 kireevco GodGinrai: thanks.
21:12 adam__ joined #git
21:15 dsdeiz joined #git
21:15 dsdeiz joined #git
21:16 WaReZ joined #git
21:17 ghostlight joined #git
21:19 Eqe7 joined #git
21:19 shpew12 joined #git
21:21 cdg joined #git
21:21 ash_workz so, I've arrived at a peculiar situation
21:22 ash_workz at least it's peculiar to me
21:23 faux___ joined #git
21:23 ash_workz I did `git branch <newbranchname>` which I think creates a new branch with the changes you've made since you last changed your current branch.... no?
21:24 muelli joined #git
21:24 Eeh joined #git
21:25 jstimm joined #git
21:27 NeverDie joined #git
21:29 e14 joined #git
21:30 Spec-Chum joined #git
21:32 BrianBlaze420 left #git
21:32 ash_workz I mean
21:32 HoierM joined #git
21:33 isysd joined #git
21:34 ash_workz anyway, I did that and then I did git diff newbranch lastbranch and its showing me commits from eons ago
21:34 ramsub07 left #git
21:34 synthroid joined #git
21:35 alhariel joined #git
21:35 fahadash joined #git
21:36 venmx joined #git
21:37 ash_workz unless I am misunderstanding something about `git diff`
21:38 TikityTik joined #git
21:39 byte512 joined #git
21:39 TikityTik Why is it that when I make a new branch via git checkout -b <branch>, that I need to also specify a branch name when doing: git push origin <branch>?
21:39 nickthetait joined #git
21:39 TikityTik Why is it not automatically the same name?
21:40 TikityTik depending on what branch I am at
21:41 _ikke_ TikityTik: git checkout -t is what you want
21:42 rbern joined #git
21:42 TikityTik _ikke_: I've already done git checkout -b though
21:43 jstimm joined #git
21:43 ash_workz can I `git diff`all files in a specific directory?
21:43 j416 ash_workz: pass the directory as an argument.
21:44 j416 ash_workz: git diff ref..ref2 -- directory
21:44 j416 ash_workz: anything after -- is a path. You can use it to disambiguate.
21:44 ash_workz `git diff foo_branch bar_branch -- * ?
21:44 j416 ash_workz: * is not a directory
21:44 DrRobotic joined #git
21:45 ash_workz ah
21:45 ash_workz j416: so, for the future, multiple filenames wont work?
21:45 j416 your shell will typically expand it to all the files in the current directory
21:45 alhariel joined #git
21:45 m0viefreak you can pass quoted globs
21:45 TikityTik _ikke_: am i able to do git checkout -t if I already done git checkout -b?
21:45 m0viefreak git diff understands them
21:45 j416 ash_workz: it'll work, but it's not what you want if you want to diff a directory.
21:46 m0viefreak git diff foo_branch bar_branch -- 'foo/*'
21:46 ash_workz j416: okay, just checking
21:46 ash_workz j416: thanks
21:46 ash_workz I'm surprised single quotes work
21:46 m0viefreak that is useful if the directory does not currently exist, but did in the refs you are diffing
21:46 j416 ash_workz: your shell won't include a file called ".foo", for instance, when expanding *
21:46 _ikke_ TikityTik: git branch -u <upstream> <name> is better when you already created the branch
21:46 ash_workz j416: ?
21:47 j416 ash_workz: single-quoting it will pass it directly to git instead of your shell expanding it
21:47 ash_workz j416: I see
21:47 j416 ash_workz: as m0viefreak mentions
21:47 j416 ash_workz: I don't quite understand your question.
21:47 j416 ash_workz: care to put some words before '?'?
21:47 ash_workz j416: oh, it just clicked; .foo is a git file?
21:48 j416 any file
21:48 j416 .banana
21:48 j416 .cookiemonster
21:48 j416 doesn't matter
21:48 Es0teric joined #git
21:48 ash_workz your shell won't include a file called ".foo", for instance, when expanding * -- this is in the example of a * expansion? what *would* it included?
21:48 ash_workz -d
21:49 j416 a file that doesn't start with .
21:49 ash_workz oh
21:49 ash_workz hidden files
21:49 ash_workz I don't know why I interpreted that as file extensions
21:49 ash_workz sorry
21:49 j416 :)
21:50 j416 ash_workz: "." is the current directory.
21:50 j416 ash_workz: you can do "git diff foo_bar bar_branch -- ."
21:50 ash_workz yeah :D
21:50 j416 er
21:50 j416 foo_branch
21:51 TikityTik if I make a new branch to make a feature, is it bad practice to push changes if the code doesn't run or if the application is broken?
21:51 j416 TikityTik: I do that all the time. But I make sure that no one bases their work off of it.
21:51 TikityTik j416: how do you do that?
21:51 kadoban TikityTik: Depends on the standards of the project. Usually that's not a problem
21:51 j416 TikityTik: I just tell them don't do it
21:51 kadoban TikityTik: By communicating with your peers
21:51 TikityTik LOL
21:52 TikityTik don't you get too many branches from too many features?
21:52 j416 I typically do it by means of vibrating the air around me at specific frequencies.
21:53 j416 TikityTik: only if you work on too many features at once.
21:53 TikityTik Is that an ability of a stand?
21:53 kadoban TikityTik: Not really, there's a limited number of features that tend to get worked on.
21:53 darkcar joined #git
21:53 j416 TikityTik: you would of course remove the branch after it has been merged (or thrown away)
21:53 TikityTik well are you able to delete a branch from a repo once the feature is done?
21:53 j416 yes.
21:53 TikityTik and it stays in history?
21:54 nettoweb joined #git
21:54 j416 the branch itself won't say, but if its history is merged to another branch, then that will of course be preserved
21:54 j416 (as long as the other branch lives)
21:54 ash_workz I'm still confused about this; if I diff branches foo and bar: `git diff foo bar` that'll show all the latest files on branch foo that differ from the latest files on branch bar?
21:54 kadoban Sure, you can just merge with --no-ff and then delete the feature branch eventually if appropriate
21:54 TikityTik how would that look at github if you merged a branch with the master branch and deleted the first branch after merge?
21:55 j416 ash_workz: yes
21:55 j416 TikityTik: remember that branches are only pointers to commits
21:55 kadoban TikityTik: About the same as if you didn't delete the branch afterwards really, AFAIK. I don't know github's interface that much though.
21:55 j416 TikityTik: removing a branch is like removing a label. The content is still there.
21:56 j416 TikityTik: except, if content (commits) are unlabelled (no branch or tag etc that references them) for too long, the janitor will come and garbage collect
21:56 watersoul joined #git
21:56 jstimm joined #git
21:56 ash_workz so if bar was created from foo recently using `git branch bar` then it should be impossible for `git diff foo bar` to show changes to files which were made years ago, right?
21:56 j416 wow that was so metaphorical
21:56 adam__ joined #git
21:56 ash_workz I guess, unless those files were changed directly
21:57 j416 ash_workz: it would only show the changes between the two branch heads, correct
21:57 ash_workz I mean... no
21:57 _leb joined #git
21:57 j416 ash_workz: it would be the same as if you compared the contents of two directories, each with the files of the last commit in each branch
21:57 ash_workz like, it wouldn't matter if the files were changed directly, if I did `git branch bar` while on foo, then that would bring those changes over to bar, right?
21:58 j416 ash_workz: technically no changes are moved
21:58 * ash_workz testing
21:58 j416 ash_workz: "git branch bar" creates a branch called "bar" that references the same commit as you are currently on.
21:58 isysd joined #git
21:59 adam__ joined #git
21:59 NeverTired joined #git
21:59 davix[matrix] joined #git
21:59 Gsham joined #git
21:59 ash_workz j416: hmm
22:00 askb joined #git
22:00 ash_workz j416: when I did `touch example; git branch bar; git checkout bar;` "example" existed
22:00 j416 sure.
22:01 j416 example does not magically become part of a branch just because you create the file
22:01 Random832 ash_workz, yes but it wasn't committed in the first branch and it's still not committed in the new branch
22:01 ash_workz j416: hmm
22:01 * ash_workz thinking
22:02 j416 ash_workz: only commits are "part of branches"
22:02 chardan joined #git
22:02 j416 ash_workz: commits reference trees of files and other trees (directories)
22:03 j416 ash_workz: a branch references a commit
22:03 Jupelius joined #git
22:03 ash_workz okay, so, this clearly has something to do with my lack of knowledge on how `git diff` works
22:03 _ikke_ git diff looks at trees
22:03 _ikke_ 2 trees
22:03 thiago joined #git
22:03 j416 ash_workz: technically I suppose the term would be "branch head", and the branch would include the commit history, but almost.
22:03 ash_workz I don't get why I am seeing changes that were made years on ago on a branch that was created last month
22:04 j416 ash_workz: is the repo public?
22:04 j416 ash_workz: (can we try it?)
22:04 ash_workz j416: no
22:04 j416 alright.
22:04 ash_workz :\
22:04 _ikke_ git diff does not look at commit history
22:04 _ikke_ Just at precicely 2 commits
22:04 j416 ash_workz: if you "git checkout foo" and look at those files, then "git checkout bar" and look at those files, there will be a difference.
22:05 j416 ash_workz: that difference is exactly what "git diff foo bar" will give you
22:05 _ikke_ right
22:05 ash_workz j416: yes, but its the differences that confuse the crap outta me
22:05 ash_workz how about this
22:05 ash_workz I'll say what I think is going on, and someone tell me if that'
22:05 ash_workz s plausible
22:06 blackwind_123 joined #git
22:06 refried_ joined #git
22:06 Noldorin joined #git
22:07 BSaboia joined #git
22:07 DropItLikeItsHot joined #git
22:08 NeverTired joined #git
22:08 ash_workz I think changes were made to files on foo but not committed; sometime later I did `git branch bar` which perserved those changes, and then I commited everything on this branch, there by showing discrepencies in the diff containing changes that are several years old
22:09 j416 ash_workz: "I think changes were made to files on foo but not committed; sometime later I did `git branch bar` which perserved those changes" <- this sounds like a mistake
22:10 j416 ash_workz: "git branch bar" will not commit changes
22:10 ash_workz j416: what I mean is, there were modified files not commited on foo from years back; I then did `git branch bar` *and* committed everything on bar
22:11 j416 sounds like that's the reason you have a diff, then
22:11 j416 ash_workz: I assume you did "git checkout bar" before committing.
22:11 atrus ash_workz: "example" isn't any more a part of your git repository than a random file in your home directory or on your desktop. git basically doesn't know it exists, and never does anything with it. that's also why they don't show up in 'git diff'.
22:11 ash_workz j416: yeah
22:11 j416 nod
22:11 ash_workz j416: at least, that's wht I think happened
22:12 ash_workz thanks j416
22:12 ash_workz I know I can be frustrating
22:12 ash_workz :\
22:12 j416 not at all
22:13 j416 I hope things were cleared up
22:13 ash_workz yeah, I am going to hunt around a bit to ensure what should be where
22:13 j416 now what's a good pair of computer speakers
22:13 * j416 googles around
22:14 ash_workz `git diff foo bar` ++hello --world means foo contains world and bar contains hello, right?
22:15 j416 where does that say?
22:15 j416 care to show a full diff output?
22:15 j416 or parts of it
22:15 j416 (pastebin)
22:16 ash_workz j416: I can't really; but I'll copy and paste something with gibberish
22:16 j416 ash_workz: "git diff --stat foo bar" might give you a better idea of what files changed
22:16 cheater left #git
22:16 Ram-Z_ joined #git
22:17 cyberz joined #git
22:18 ash_workz sorry; I am being ultra confusing right now, i know
22:18 j416 no need for excuses
22:18 j416 might I also recommend !book
22:18 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
22:18 ash_workz :D
22:20 paul424 joined #git
22:20 Dougie187 joined #git
22:20 Vinnie_win joined #git
22:20 j416 ash_workz: in essence: "git diff foo bar" shows the difference between foo and bar, i.e. what changes you would need to do to foo to get to the state of bar.
22:21 ash_workz j416: I figured it out
22:21 ash_workz j416: I was just having a major brain fart
22:21 j416 ash_workz: so, lines prepended with "+" mean that those changes would need to be added to get to the state bar, and lines prepended with "-" would need to be removed.
22:21 uag joined #git
22:21 ash_workz j416: my question was really really really simple and rudimentary.. the way I asked it didn't even make sense
22:22 rbern joined #git
22:22 Sheogorath[m] joined #git
22:22 patrickr[m] joined #git
22:22 kineticrootkit[m joined #git
22:22 Tiaan[m] joined #git
22:22 M-nated joined #git
22:22 unclechu joined #git
22:22 Remramm joined #git
22:22 saintaquinas[m] joined #git
22:22 Start[m] joined #git
22:22 WillianPaiva[m] joined #git
22:22 Mher[m] joined #git
22:22 kikijiki[m] joined #git
22:22 samwise[m] joined #git
22:22 hallogallo[m] joined #git
22:22 malo[m] joined #git
22:22 mei[m] joined #git
22:22 M-mistake joined #git
22:22 M-shine joined #git
22:22 mtso[m] joined #git
22:22 Dhanya[m] joined #git
22:22 monomon[m] joined #git
22:22 M-meznak joined #git
22:22 scrambo[m] joined #git
22:22 am2on joined #git
22:22 Ineentho[m] joined #git
22:22 Carlos[m] joined #git
22:22 timlyo[m] joined #git
22:22 srkrishna[m] joined #git
22:22 musicmatze[m] joined #git
22:22 warrantyvoid joined #git
22:22 aviraldg joined #git
22:22 alaeri[m] joined #git
22:22 daopu[m] joined #git
22:22 kjsage[m] joined #git
22:22 M64137[m] joined #git
22:22 eltopo[m] joined #git
22:23 Karazhan joined #git
22:23 ash_workz j416: thanks for clarifying that though :)
22:23 j416 sorry if that was too basic
22:23 j416 it's hard to know the level of those who ask.
22:23 PaulePanter joined #git
22:23 ash_workz j416: no, it's not, my brain is just seriously malfunctioning
22:23 j416 heh
22:23 Karazhan joined #git
22:24 darkcar joined #git
22:24 ash_workz j416: the crazy part is not only is what you're saying basic, but merely saying the words of I what was really trying to do (which was in fact `git diff file`) is basically as clear as it gets
22:25 j416 ash_workz: "git diff file" (assuming "file" is a file) is quite different, though.
22:26 ash_workz j416: my understanding is a diff between the latest two commits
22:26 ash_workz s/(is)/\1:
22:26 j416 that'd be incorrect
22:27 ash_workz /._.\
22:27 Wasp joined #git
22:27 * ash_workz reads git diff
22:27 * ash_workz reads git help diff
22:27 j416 "git diff -- file" (or "git diff file" if "file" is not ambiguous (i.e. name of both file and ref (branch))) compares your index (stuff that you staged for committing) to your work tree state (stuff that you have not committed and not (yet) staged for committing
22:27 fstd joined #git
22:27 j416 )
22:28 monokrome joined #git
22:28 ash_workz okay, I got it
22:28 j416 ash_workz: "git status" will give you info on what stuff you staged for committing and what's not
22:29 j416 ash_workz: staging meaning using "git add" to add something
22:29 j416 anyway, work through the book. I think it'll be worth your time.
22:31 Wasp Hey, I re-wrote the history of my git repo according to https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
22:32 ash_workz j416: thanks again :)
22:32 j416 ash_workz: o/
22:32 Wasp but: if I check git log I have still the old history in the tree, eventhough it is unconnedcted
22:32 nowhereman joined #git
22:33 j416 Wasp: "in the tree"?
22:33 j416 Wasp: "tree" has special meaning in git world, so might be confusing to use this word for other things
22:33 Wasp ah wait, maybe i overlooked "git commit-tree :)
22:33 j416 not quite sure what you mean
22:34 j416 are you simply doing "git log" or are there more arguments?
22:34 Wasp assume I have just init commit so I have it twice in the tree. One with the old email and one with the new email
22:34 hplar joined #git
22:34 j416 what do you mean by "tree"?
22:34 Wasp but there is no line between these two "trees"
22:35 j416 where do you see this information?
22:35 Wasp commit: A -> B -> C
22:35 j416 I am guessing you mean commit graph?
22:35 j416 right
22:35 Wasp "git log"
22:35 j416 just "git log" or something more?
22:36 tmsmith_ joined #git
22:36 Wasp right, it's not a tree even though even git calls it that way
22:36 j416 git does not call the commit graph a tree.
22:36 Wasp what else to check for?
22:36 j416 you could start by answering the question
22:37 Wasp it think it is clear by now what I talk about
22:37 j416 not to me
22:37 Wasp commit history
22:37 j416 yes, but please answer the question
22:37 j416 23:34:13         j416 | are you simply doing "git log" or are there more arguments?
22:38 _leb joined #git
22:38 Wasp what is the quesion. In fact I ask a quesion about how to git rid of the old commit history
22:38 j416 ^
22:38 Wasp after performing `git filter-branch ..` to replace my email
22:39 j416 you can tell me if you don't understand the question and I will try to clarify
22:40 Wasp no i look for my stupid alias
22:40 astrofog joined #git
22:40 Wasp no idea git git log with some options
22:40 Wasp including graph
22:40 j416 alright. Does those options include '--all'?
22:40 Wasp i just wanna vanish my email from all over the place
22:40 j416 Do*
22:41 Wasp maybe
22:41 j416 it sounds like you have more branches or tags referencing the commits you just replaced for one branch
22:41 Wasp "git help alias" doesnt exist
22:41 j416 you need to make sure that all branches are updated
22:41 fstd joined #git
22:41 j416 alias isn't a git command
22:41 Wasp ya i know
22:41 j416 but I got the info I needed
22:41 j416 (if you want to know, it's in man git-config)
22:41 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
22:41 cyberz joined #git
22:42 j416 but there's your answer anyway
22:42 Wasp does this include remote branches?
22:42 j416 of course
22:42 j416 you need to update all branches (and tags) that somehow reference the commits you want to change
22:42 Wasp or is it maybe just related to prevews `git stash`
22:43 j416 "git stash" is unrelated.
22:43 nettoweb1 joined #git
22:44 j416 ("git stash" creates commits in a separate refspace, but typically the author info in those is irrelevant since they won't be part of your real commit history anyway)
22:47 tmsmith_ joined #git
22:49 adam__ joined #git
22:53 jaguarmagenta joined #git
22:53 durham_ joined #git
22:54 Wasp j416: sorry doesn't work
22:55 aw1 joined #git
22:55 j416 !doesntwork
22:55 gitinfo Sorry to hear it doesn't work, but how about some details? At this point we don't even know whether it did nothing, spit out an error message, or abducted your pet unicorn in a flying saucer. That makes it hard to troubleshoot – unicorn abduction requires a completely different solution than an error message, for instance. So, please be specific...
22:55 Darcidride joined #git
22:55 Wasp I removed all remote branches via "git branch -dr <branch>"
22:56 Wasp should work by my logik already
22:56 Wasp logic
22:56 Wasp anyway perforemd `git remote rm <branch>`for all of them as well
22:56 Wasp in fact there is only my local master left
22:57 talkJS i ran;   git branch -dr origin/testbranch .  It didn't delete.
22:57 Wasp stiil can see the commits `git log --all`
22:58 bremner uh. git remote rm? what version of git is that?
22:58 faux___ joined #git
22:58 j416 Wasp: none of those commands will remove the branch from the remote server
22:58 Wasp talkJS: had exatly the same problem: remove origin and maybe ad remotes in the beginnin accoding to `git branch -r`
22:58 j416 Wasp: (but that is unrelated to them showing up or not in "git log --all"(
22:58 j416 )
22:59 Wasp so what? probably there are allot of remote servers out there
22:59 nonconvergent joined #git
22:59 j416 Wasp: so you will just forget that there was a remote and not use it anymore?
22:59 j416 fair enough
22:59 Wasp by understanding I removed all refering data from my repository IF not how to?
23:00 j416 check what branches or tags still refer to the commits and update those.
23:00 Wasp ah tags
23:00 Wasp all right
23:00 j416 "git log --oneline --all --decorate" will probably give you a hint.
23:00 j416 tags yes.
23:00 nonconvergent If I merge --squash from branch A to branch B, then merge --squash from A to C, is the squashed commit hash the same on B and C?
23:00 arescorpio joined #git
23:01 fmeerkoetter joined #git
23:01 darkcar joined #git
23:01 j416 nonconvergent: a spontaneous guess would be no, but try it
23:02 nonconvergent I was thinking I want to avoid it because I didn't know and 2) the answer might be no, in which case two separate commits with the same changes, which is a problem when if I merge C to A
23:02 nonconvergent Or if I'm just comparing the two.
23:02 j416 nonconvergent: you can always undo the merge if it turns out different from what you wanted
23:02 j416 nonconvergent: unless you shared your changes with other people (by pushing them to someplace) in which case altering history becomes less convenient
23:03 madduck_ left #git
23:03 timvisher joined #git
23:04 Learath2 joined #git
23:04 Wasp okay: all tags gone as well. History still alice
23:04 Wasp alive
23:05 Wasp so no branches, no remotes, no tags
23:05 Wasp what is missing?
23:05 j416 other branches
23:05 Wasp @j416
23:05 Wasp which others?
23:05 j416 where do you see your other history?
23:05 Wasp still `git log --all`
23:06 j416 add --decorate
23:06 j416 you'll see the ref names
23:07 Wasp one ist still the tag (anyway!) and refs/stash
23:07 j416 drop your stash then
23:07 j416 and I hope you did a !backup before destroying all that history, just in cas
23:07 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
23:07 j416 case*
23:08 Wasp why is the ref with the tag stiill there?!
23:08 j416 because the tag is still there
23:08 Wasp what is `git tag -d <foo..>`for though?
23:09 j416 for deleting a tag.
23:09 Wasp okay but it seems it does not. In fact it just doesn't display it anymore
23:09 j416 what does just "git tag" say?
23:10 Wasp It's like kids do: putting the hands in front of their eyes and preteding the world is gone
23:10 Wasp nothing
23:10 j416 then there are no tags
23:10 iDanoo joined #git
23:10 j416 why do you think it is still there?
23:10 iDanoo joined #git
23:10 Wasp it's empty of course
23:10 nowhereman joined #git
23:11 Wasp because i can see it in the git log
23:12 j416 Wasp: does it say "tag: foo" ?
23:12 cluelessperson joined #git
23:12 j416 Wasp: or just "foo"?
23:12 cluelessperson Hey guys, how can you get the current release from a git remote repo?
23:12 cluelessperson so I can check    if local != remote:  upgrade;
23:13 Wasp there is still a reference, you know that
23:13 ejb joined #git
23:13 Wasp okay, seems complicated: so how to delete the ref?
23:14 j416 start by answering the question
23:14 Wasp I mean thats what a tag is in basic, isn#t it?
23:14 Wasp refs/original/refs/tags/v003a
23:14 Wasp thats written
23:14 j416 aha.
23:14 j416 that is the state before your filter-branch
23:14 j416 filter-branch keeps a backup.
23:14 Jesuspiece joined #git
23:14 Wasp okay how to remove the backup?
23:15 _ADN_ joined #git
23:15 mizu_no_oto joined #git
23:15 j416 Wasp: man git-filter-branch search for "Remove the original refs" and you'll find an example
23:15 gitinfo Wasp: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
23:16 Jesuspiece joined #git
23:19 Ediz joined #git
23:20 talkJS If i have a local file that needs merged, is there a way to say no... lets just use remote's?
23:20 talkJS without having to try and merge it?
23:21 j416 talkJS: git merges commits, not files
23:21 apotry joined #git
23:21 j416 talkJS: important distinction
23:21 tmsmith_ joined #git
23:22 j416 talkJS: (yes it does merge files, but only as an effect of merging a commit)
23:22 talkJS i deleted a branch, added it.   on the server.. git pull wants me to resolve the conflicts.
23:22 j416 talkJS: you probably want: git merge --abort ; git pull --rebase
23:23 talkJS ah sweet
23:23 Wasp woooo finaly
23:23 faux___ joined #git
23:24 Wasp okay thanks for your quick help j416
23:24 j416 talkJS: next time, it's quite handy to work on a separate branch, that way you won't end up with diverged history issues like that and you can easily rebase your branch on the branch you aim to merge it into later, regularly
23:24 j416 Wasp: good that it worked out o/
23:25 ams__ joined #git
23:25 Wasp so it is *not* only about branches, and remotes .. in fact at least I am not sure, especially about the remotes thing
23:25 Wasp doesn't makes sence to me
23:25 Wasp make*
23:25 j416 branches and tags are not the only kind of refs
23:25 Wasp sense*
23:25 j416 but they are probably the most common
23:26 j416 what was in origin/ was also branches and tags, just under a different namespace
23:26 j416 er not origin
23:26 j416 what was in original/ was also branches and tags, just under a different namespace
23:26 dsdeiz joined #git
23:28 Wasp Is this a quesion? If yes I don't get it.
23:28 j416 not a question
23:28 j416 "the things that were in original/ were also branches and tags, just under a different namespace"
23:28 durham joined #git
23:29 cluelessperson Hello?
23:29 j416 it's me
23:29 cluelessperson How can you get the current release version number from a remote git ?
23:29 j416 what do you mean by "release"?
23:29 j416 "git describe" might do what you want but I'm not sure what you want.
23:30 j416 might as well be "git rev-parse HEAD"
23:30 cluelessperson j416, you can tag releases, right?
23:30 j416 you can tag anything
23:30 j416 well, any commit at least.
23:31 cluelessperson best I've got is
23:31 cluelessperson "git status url.git" | grep "up-to-date"
23:32 j416 cluelessperson: if you are interested in getting the latest tagged version, you can perhaps check man git-tag for --sort and sort it how you wish (depending on how your versions look), then pick the last one
23:32 gitinfo cluelessperson: the git-tag manpage is available at http://jk.gs/git-tag.html
23:32 madewokherd joined #git
23:32 j416 assuming you only want version tags, and you want to skip other tags if any
23:48 rwb joined #git
23:50 talkJS i did a git commit --amend and now i can't push.
23:50 talkJS What should i do?
23:52 talkJS should i git pull --rebase?
23:53 rwb joined #git
23:54 j416 talkJS: you'll need to force-push for that to work, but !rewrite
23:54 gitinfo talkJS: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
23:55 * j416 zzZ o7
23:55 talkJS lesson learned, i won't ever --amend
23:55 * j416 zzZ o/
23:55 j416 amending is fine unless you shared the commits you're amending with someone.
23:55 talkJS i did ;  git commit ; git push ; git commit --amend
23:55 j416 (and in that case it's fine if those people are aware of it and how to get out of the situation)
23:56 j416 ^
23:56 * j416 off to bed fr o/
23:56 talkJS cheers
23:58 tmsmith joined #git

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