Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-21

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

All times shown according to UTC.

Time Nick Message
00:03 anonymuse joined #git
00:10 kriskropd joined #git
00:11 pwnz0r joined #git
00:13 kriskropd joined #git
00:15 SwiftMatt joined #git
00:17 Cxcf joined #git
00:17 Cxcf joined #git
00:19 icedp joined #git
00:21 FuzzySockets joined #git
00:23 trake joined #git
00:24 nickthetait joined #git
00:30 brent__ joined #git
00:32 nettoweb joined #git
00:34 ixjlyons joined #git
00:34 NeXTSUN joined #git
00:35 jmpp_ joined #git
00:36 mindriot101 joined #git
00:36 safe joined #git
00:37 colona joined #git
00:38 stefanct left #git
00:39 Vinnie_win_i joined #git
00:39 j416 joined #git
00:40 ColdKeyboard joined #git
00:41 quackgyver joined #git
00:41 urda joined #git
00:41 pijiu joined #git
00:42 Shentino joined #git
00:42 pijiu joined #git
00:43 mischat joined #git
00:44 ochorocho__ joined #git
00:44 Cxcf joined #git
00:45 Cxcf joined #git
00:47 Vinnie_win joined #git
00:49 danmackay joined #git
00:50 m0ltar joined #git
00:51 thebope_ joined #git
00:51 kermit_ joined #git
00:51 xshuiniu joined #git
00:53 Cxcf joined #git
00:53 Cxcf joined #git
00:58 tyreld joined #git
01:00 FuzzySockets joined #git
01:00 clemf joined #git
01:01 jaafar joined #git
01:02 nettoweb joined #git
01:04 mehola joined #git
01:07 Gsham joined #git
01:08 pkiller joined #git
01:08 rebrec joined #git
01:10 p3lim left #git
01:10 ksu42 joined #git
01:11 dodobrain joined #git
01:13 jstimm joined #git
01:14 Nilesh_ joined #git
01:14 floatingman joined #git
01:15 guideX left #git
01:16 FuzzySockets joined #git
01:20 clemf joined #git
01:21 floatingman joined #git
01:22 markovh joined #git
01:24 svm_invictvs joined #git
01:25 FuzzySockets joined #git
01:25 serialoverflow joined #git
01:25 nan2 joined #git
01:25 Lyqyd joined #git
01:27 jaafar joined #git
01:29 FuzzySockets joined #git
01:31 preaction joined #git
01:31 pkiller joined #git
01:31 dsdeiz joined #git
01:33 CussBot joined #git
01:33 mablae joined #git
01:34 mrpackethead joined #git
01:38 mindriot101 joined #git
01:39 manfredn joined #git
01:39 kermit_ joined #git
01:39 GavinMagnus left #git
01:40 mehola joined #git
01:40 sangy joined #git
01:40 kbs joined #git
01:42 Cxcf joined #git
01:42 Cxcf joined #git
01:43 inflames joined #git
01:44 NeXTSUN joined #git
01:44 kaldoran joined #git
01:45 ochorocho__ joined #git
01:48 r00t66 joined #git
01:50 dsantiago joined #git
01:52 cqi joined #git
01:55 pijiu2 joined #git
01:58 jmpp joined #git
01:58 jmpp joined #git
01:58 cdg joined #git
02:01 Cxcf joined #git
02:01 Jameser joined #git
02:01 Cxcf joined #git
02:02 leeN joined #git
02:08 oaaao joined #git
02:09 oaaao joined #git
02:09 d^sh joined #git
02:11 nokr joined #git
02:12 daurnimator joined #git
02:12 snowkidind joined #git
02:14 thebope_ joined #git
02:17 Cxcf joined #git
02:17 Cxcf joined #git
02:20 kermit_ joined #git
02:29 clemf joined #git
02:31 finalbeta joined #git
02:32 svm_invictvs joined #git
02:35 mrpackethead joined #git
02:38 pks joined #git
02:39 mindriot101 joined #git
02:41 raijin joined #git
02:46 deltab joined #git
02:46 mischat 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.10.2 | 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:53 pwnz0r joined #git
02:55 User458764 joined #git
02:56 FuzzySockets joined #git
02:57 osse joined #git
02:57 Ekho- joined #git
02:57 FuzzySockets left #git
02:58 Ekho joined #git
02:58 hahuang65 joined #git
02:58 Puffball joined #git
02:59 Vampire0 joined #git
03:00 SJr joined #git
03:02 noodle joined #git
03:05 aavrug joined #git
03:07 pwnz0r joined #git
03:07 whomp joined #git
03:07 Xethron joined #git
03:08 whomp when i do a git diff, i see the same file's diff twice. any ideas what the issue is?
03:08 Mobutils joined #git
03:10 sunri5e_ joined #git
03:10 hackel joined #git
03:11 srcerer_ joined #git
03:12 mattp__ joined #git
03:13 unbalancedparen joined #git
03:14 Sc0rpius joined #git
03:14 Mixologic joined #git
03:14 harv joined #git
03:15 ^7heo joined #git
03:16 Sigma joined #git
03:16 glebihan_ joined #git
03:16 Zeedox joined #git
03:17 cagedwisdom joined #git
03:17 kriskropd joined #git
03:17 Arguggi joined #git
03:17 JoshL joined #git
03:17 d^sh joined #git
03:18 Ring0` joined #git
03:19 sdothum joined #git
03:19 Andrew_K joined #git
03:21 Cxcf` joined #git
03:25 chachasmooth joined #git
03:25 hexagoxel joined #git
03:29 Sasazuka joined #git
03:31 User458764 joined #git
03:32 pwnz0r joined #git
03:35 a_thakur joined #git
03:36 mrpackethead joined #git
03:36 Gsham joined #git
03:37 a_thakur_ joined #git
03:41 mindriot101 joined #git
03:41 Komanda523243 joined #git
03:41 Komanda523243 https://github.com/tpyo/amazon-s3-php-class/issues/84#issuecomment-52602674
03:41 Komanda523243 how do i apply a patch in textform like that?
03:41 thiago git apply
03:42 Komanda523243 thiago: uhu
03:42 Komanda523243 index 0b1564b..af4d65c 100644
03:42 Komanda523243 but that line shows which version the patch is meant for right
03:42 Komanda523243 need a bit more handholding
03:43 anonymuse joined #git
03:44 Komanda523243 or can i just checkout the repo, save the patch text in somepatch.patch within the directory and do "git apply somepatch.patch"
03:44 Komanda523243 should that work?
03:44 Kaisyu joined #git
03:45 Siegfried joined #git
03:46 harrymoreno joined #git
03:46 ochorocho__ joined #git
03:49 phanimahesh joined #git
03:51 mrpackethead joined #git
03:55 Komanda523243 the filestructure for which the patch is written is differnet than the filestructure in the repository
03:55 Komanda523243 "error: components/S3Adapter/S3.php: No such file or directory"
03:55 Komanda523243 anyway to ignore that while doing
03:55 Komanda523243 git apply --check 1.patch
03:56 Komanda523243 or do i have to type everything manually
03:57 sdothum joined #git
03:59 a_thakur joined #git
04:04 dreiss joined #git
04:05 thiago Komanda523243: are you sure that patch is for this repository?
04:06 Komanda523243 thiago: yeah
04:06 Komanda523243 the S3 file is there
04:06 thiago you can't patch a file that doesn't exist
04:06 thiago the patch isn't for the commit you're on
04:07 Komanda523243 patch -p1 < somepatch.patch (this gives me lots of failed hunk and also doesnt work :[ )
04:07 Komanda523243 Hunk #28 succeeded at 2027 with fuzz 2 (offset -20 lines).
04:07 Komanda523243 So what do i do, what commit is the patch meant for?
04:07 Komanda523243 sorry i am a noob when it comes to these things
04:08 thiago you tell me
04:08 thiago you got the patch from somewhere
04:08 thiago you have to know what commit it is for
04:09 Komanda523243 commit isnt stored in the patchfile someplace?
04:09 Komanda523243 i assumed this stuff was tightly integrated  11/21/16 05:09:03  -->  pity has joined the room. [pity!~pity@183.17.252.70]
04:14 Vortex35 joined #git
04:15 thebope_ joined #git
04:17 venmx joined #git
04:24 MacWinner joined #git
04:26 cagedwisdom joined #git
04:29 anonymuse joined #git
04:30 robotroll joined #git
04:32 a_thakur joined #git
04:32 nidr0x joined #git
04:35 xall joined #git
04:39 Komanda523243 https://github.com/tpyo/amazon-s3-php-class/issues/84#issuecomment-52602674
04:40 A5101 joined #git
04:40 Komanda523243 git am lastTry.patch
04:40 Komanda523243 Patch format detection failed.
04:40 Komanda523243 i just copied and pasted everything in lastTry.patch
04:40 Komanda523243 why is this not working?
04:42 mindriot101 joined #git
04:42 nonconvergent joined #git
04:43 robattila256 joined #git
04:43 kanzure joined #git
04:44 stupidystupid joined #git
04:46 mischat joined #git
04:46 Kamilion joined #git
04:47 ochorocho__ joined #git
04:52 phroa Komanda523243: try 'apply' instead of 'am'
04:54 cagmz joined #git
04:54 fstd_ joined #git
04:56 GT4066 joined #git
05:00 gmn8719 joined #git
05:01 hahuang65 joined #git
05:12 wxg joined #git
05:12 subhojit777 joined #git
05:12 kadoban joined #git
05:14 dodobrain joined #git
05:15 Cabanossi joined #git
05:16 cust_ joined #git
05:18 NeverDie joined #git
05:19 rscata joined #git
05:22 mda1 joined #git
05:28 a_thakur joined #git
05:30 [cust] joined #git
05:33 pwnz0r joined #git
05:33 ok91 joined #git
05:33 a_thakur joined #git
05:38 jstimm joined #git
05:41 SwiftMatt joined #git
05:41 sbulage joined #git
05:43 mindriot101 joined #git
05:43 sbulage joined #git
05:46 cust_ joined #git
05:47 mischat joined #git
05:48 ochorocho__ joined #git
05:49 enitiz joined #git
05:49 ak5 joined #git
05:50 jfr joined #git
05:51 ak5 I just blasted away my gitlab installation and am wondering if there is any recommended web stuff thats simpler? Maybe not quite cgit? I have had issues with gogs in the past too... Any recommendatons appreciated
05:52 enitiz joined #git
05:54 _ikke_ ak5: web interface required?
06:00 qws-user-1228 joined #git
06:01 jfish611 joined #git
06:02 msonntag joined #git
06:02 ak5 _ikke_: preferred
06:03 ak5 willing to try new workflows thugh
06:03 ak5 though*
06:04 cdown joined #git
06:05 _ikke_ gitolite is very good, but only handles ssh authorization
06:05 _ikke_ No web interface
06:06 ak5 so could I pair that wth say cgit?
06:06 _ikke_ Yeah, that's possible
06:07 _ikke_ I believe gitlab for a long time relied on gitolite
06:07 cdown_ joined #git
06:09 ych joined #git
06:11 _ng joined #git
06:12 a_thakur_ joined #git
06:12 inflames joined #git
06:12 byte512 joined #git
06:13 aidalgol joined #git
06:18 venmx joined #git
06:27 polyrob_ joined #git
06:28 tens0r joined #git
06:29 jstimm joined #git
06:31 rendar joined #git
06:31 pijiu2 joined #git
06:35 a_thakur joined #git
06:37 sitaram _ikke_: "ssh" and "authorization" don't go together.  Gitolite allows both ssh and http authentication, and then uses that info to perform authorization checks on the request
06:38 sitaram s/that info/the authenticated username/
06:38 Anupkumar joined #git
06:40 phanimahesh joined #git
06:43 mindriot101 joined #git
06:44 qt-x joined #git
06:45 overlord_tm joined #git
06:46 LucaTM joined #git
06:47 netj joined #git
06:47 mischat joined #git
06:48 lordjancso joined #git
06:48 A5101 joined #git
06:49 ochorocho__ joined #git
06:54 brillenfux joined #git
06:54 ThomasLocke joined #git
06:54 ThomasLocke joined #git
06:54 lindenle joined #git
06:58 ak5 _ikke_: thanks it looks like a nice unix-y solution
07:00 ericP i renamed a couple of branches followed by `git push -v origin ShEx1:refs/heads/new`. i cloned the repo in /tmp and the rename appears to have worked but my config has [branch "new"] remote=origin merge=old
07:00 ericP sorry, that config is the one in the repo where i did the renames
07:00 Raging_Hog joined #git
07:01 ericP the tests i pulled into /tmp have what i expect: [branch "new"] remote=origin merge=new
07:02 ericP two questions: 1. what does "merge=" affect and 2. how should i update it to be the correct value in my original repo (can i safely edit it in config)?
07:02 troulouliou_div2 joined #git
07:09 a_thakur joined #git
07:09 namnoi38 joined #git
07:09 lb1c joined #git
07:12 freimatz joined #git
07:13 ni291187 joined #git
07:14 ni291187 left #git
07:16 Macaveli joined #git
07:21 brk_ joined #git
07:23 t-mart joined #git
07:24 linuxmodder how to remove a commit by hash with git rm
07:24 acetakwas joined #git
07:25 thiago linuxmodder: you can't
07:25 thiago try as you might, you can't remove a commit with git rm
07:26 thiago linuxmodder: explain what you want to happen
07:27 chele joined #git
07:29 seishun joined #git
07:31 justanotheruser joined #git
07:32 linuxmodder thiago,  essentially squash the history but not sure best way
07:32 linuxmodder so the commits are one not numerous when some were minor seemingly useless edits
07:32 linuxmodder in same branch of saem fork
07:33 pwnz0r joined #git
07:33 t-mart_ joined #git
07:34 akanksha__ joined #git
07:34 re1 joined #git
07:36 clemf joined #git
07:37 JeroenT joined #git
07:38 ToBeCloud joined #git
07:44 mindriot101 joined #git
07:46 re1_ joined #git
07:48 stux|RC-only joined #git
07:48 mischat joined #git
07:48 anonymuse joined #git
07:49 Sceorem joined #git
07:49 ochorocho__ joined #git
07:49 a_thakur joined #git
07:52 auzty joined #git
07:54 ericP does `git push --set-upstream orgin branchname` *only* edit the corresponding "merge=" line in .git/config?
07:55 osse ericP: it'll probably add the section header and such if it's needed
07:56 dreiss joined #git
07:57 brk__ joined #git
07:58 jLnGkOMn joined #git
07:58 ericP osse, makes sense, tx
08:01 t-mart joined #git
08:02 holodoc joined #git
08:02 cdown joined #git
08:03 thekrynn joined #git
08:05 sea-gull joined #git
08:05 danslo joined #git
08:08 rfv joined #git
08:08 XDS2010 joined #git
08:08 GameGamer43 joined #git
08:08 henriquev joined #git
08:08 bcardarella joined #git
08:08 wizonesolutions joined #git
08:08 elijah joined #git
08:08 Iacobus_ joined #git
08:08 daxroc joined #git
08:08 milkshoes joined #git
08:08 cstrahan joined #git
08:08 bbhoss joined #git
08:08 User458764 joined #git
08:08 ELLIOTTCABLE joined #git
08:08 huhlig joined #git
08:09 thierryp joined #git
08:09 XDS2010 joined #git
08:09 User458764 joined #git
08:09 skelterjohn joined #git
08:09 ELLIOTTCABLE joined #git
08:11 sawk joined #git
08:11 derk0pf joined #git
08:11 adac joined #git
08:13 thierryp left #git
08:13 thierryp joined #git
08:16 synchronous joined #git
08:18 m___ joined #git
08:18 mischat_ joined #git
08:18 nostrora joined #git
08:18 venmx joined #git
08:20 Alienpruts joined #git
08:23 ahmedelgabri joined #git
08:23 finalbeta joined #git
08:25 GT4066 joined #git
08:26 los joined #git
08:28 bhuvanaurora joined #git
08:29 encod3 joined #git
08:31 a_thakur joined #git
08:32 JeroenT_ joined #git
08:33 JeroenT_ joined #git
08:34 zeroed joined #git
08:34 zeroed joined #git
08:35 PCatinean joined #git
08:36 _ADN_ joined #git
08:38 brk joined #git
08:39 nettoweb joined #git
08:39 elect joined #git
08:43 raintrap joined #git
08:44 nicksloan joined #git
08:44 SwiftMatt joined #git
08:45 mindriot101 joined #git
08:46 mithenks joined #git
08:46 tens0r joined #git
08:49 jeffreylevesque_ joined #git
08:49 srcerer joined #git
08:49 venmx joined #git
08:49 unbalancedparen joined #git
08:50 qws-user-1229 joined #git
08:50 ochorocho__ joined #git
08:51 nd_ joined #git
08:51 Bengi joined #git
08:53 NimeshNeema joined #git
08:53 hannibalstal joined #git
08:55 serard joined #git
09:00 ocbtec joined #git
09:01 Ciblia joined #git
09:01 clarens0000 joined #git
09:02 djb-irc joined #git
09:03 clarens0000 joined #git
09:03 interrobangd joined #git
09:04 bhuvanaurora joined #git
09:06 Gloomy joined #git
09:07 halbomin joined #git
09:09 JeroenT joined #git
09:12 khfeng_ joined #git
09:14 bongjovi joined #git
09:15 coasterz joined #git
09:15 djb-irc joined #git
09:16 nonconvergent joined #git
09:16 zeroed joined #git
09:16 zeroed joined #git
09:21 mindriot101 joined #git
09:21 CrazyBonz joined #git
09:22 Gabemo joined #git
09:24 djb-irc joined #git
09:24 rominronin joined #git
09:24 jeffreylevesque joined #git
09:26 acetakwas joined #git
09:26 kurkale6ka joined #git
09:26 netj joined #git
09:27 WoodLeg joined #git
09:30 clmsy joined #git
09:32 CrazyBonz joined #git
09:35 djb-irc joined #git
09:35 MrWoohoo joined #git
09:37 Oatmeal joined #git
09:37 mikecmpbll joined #git
09:40 User458764 joined #git
09:41 thebope_ joined #git
09:42 Akimb joined #git
09:42 Akimbas joined #git
09:45 harrymoreno joined #git
09:46 JJjack joined #git
09:46 JJjack i did a soft reset to a commit locally
09:46 a_thakur joined #git
09:47 JJjack how do I pull the remote correctly?
09:47 JJjack i have files in the my working tree
09:48 a_thakur_ joined #git
09:48 adac joined #git
09:48 tobiasvl JJjack: so now you have a !detached head?
09:48 gitinfo JJjack: A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
09:49 hannibalstal joined #git
09:50 dimi1947 joined #git
09:50 rominronin joined #git
09:50 donnib joined #git
09:50 Felishia joined #git
09:51 Felishia guys I screwed node_modules
09:51 Felishia how do I restore it from the develop branch (I'm in another branch)
09:51 Serpent7776 joined #git
09:51 ochorocho__ joined #git
09:51 _ikke_ tobiasvl: soft reset does not result in a detached HEAD
09:51 Felishia also restore package json...
09:51 Felishia :<
09:51 _ikke_ git checkout <branch> path/to/file
09:51 tobiasvl _ikke_: ah, sorry, I misread
09:51 Felishia _ikke_, dat for me?
09:51 _ikke_ Felishia: yes
09:52 solf1re joined #git
09:52 floatingman joined #git
09:53 mindriot101 joined #git
09:53 donnib I have Git LFS in our repo with just one file, when i am in my current branch everything is ok, when i switch to master this GIt LFS file get's modified so my git status indicates it's modified, any idea why it does that ?
09:53 Felishia _ikke_, didn't work
09:53 donnib i tried do an git reset HEAD on the file but still it's shown as modified
09:54 donnib the only way i have been able to get rid of this modification is delete the file then switch branch
09:54 _ikke_ Felishia: What didn't work?
09:54 Felishia _ikke_, the command :<
09:54 donnib but i need to solve the problem because i need to merge things into master and i can't with this file that says it's modified
09:54 _ikke_ Felishia: What did it return?
09:54 Felishia nothing
09:54 _ikke_ And what about the file?
09:55 Felishia git checkout develop node_modules/
09:55 Felishia git checkout origin/develop node_modules/
09:55 Felishia nothing :<
09:55 _ikke_ If it does not return anything, it usually means it did checkout the files
09:56 Felishia _ikke_, I can still see files added
09:57 _ikke_ Felishia: Staged to commit? That's normal
09:57 Felishia no it says it's up to date
09:57 _ikke_ If you want them unmodified, checkout from HEAD
09:57 phanimahesh joined #git
09:57 Felishia I don't see them removed... :<
09:58 _ikke_ Right, that command does not remove files not present in that commit
09:58 Felishia aaah :D
09:58 Felishia ok I removed and then checkout
09:59 Felishia it worked
09:59 Felishia what about a single file now? :3
09:59 _ikke_ What about it?
09:59 JJjack so I should stash, create a new branch,  pull and merge?
10:00 Felishia _ikke_, how do I restore it :3
10:01 _ikke_ JJjack: That's one option
10:01 _ikke_ JJjack: git checkout <branch> file will get the version of that file from that branch into your working tree
10:02 Felishia _ikke_, :D
10:04 bhuvanaurora joined #git
10:04 JJjack can I merge and then use stash apply to bring up the working tree?
10:05 rnsanchez joined #git
10:05 justanotheruser joined #git
10:06 Cicero-MF joined #git
10:07 _ikke_ sure
10:08 rominronin joined #git
10:09 chll_ joined #git
10:10 namnoi38 joined #git
10:11 djb-irc joined #git
10:11 mablae joined #git
10:11 anonymuse joined #git
10:12 ayogi joined #git
10:14 slayerjain joined #git
10:15 jnavila joined #git
10:15 a_thakur joined #git
10:16 howitdo joined #git
10:17 a_thakur_ joined #git
10:18 alcohol joined #git
10:24 _Patrick_ joined #git
10:26 alcohol joined #git
10:26 netj joined #git
10:27 fees joined #git
10:31 mischat joined #git
10:31 zeroed joined #git
10:31 zeroed joined #git
10:32 djb-irc joined #git
10:32 cagedwisdom joined #git
10:32 mischat_ joined #git
10:32 King_Hual joined #git
10:33 SwiftMatt joined #git
10:33 a_thakur joined #git
10:34 WoodLeg joined #git
10:40 Akimbas joined #git
10:41 davix[matrix] joined #git
10:44 jnewt joined #git
10:49 SwiftMatt joined #git
10:51 kineticrootkit[m joined #git
10:51 patrickr[m] joined #git
10:51 unclechu joined #git
10:51 WillianPaiva[m] joined #git
10:51 Remramm joined #git
10:51 M-nated joined #git
10:51 saintaquinas[m] joined #git
10:51 kikijiki[m] joined #git
10:51 M-meznak joined #git
10:51 M-mistake joined #git
10:51 monomon[m] joined #git
10:51 hallogallo[m] joined #git
10:51 Dhanya[m] joined #git
10:51 M-shine joined #git
10:51 mtso[m] joined #git
10:51 srkrishna[m] joined #git
10:51 Ineentho[m] joined #git
10:51 alaeri[m] joined #git
10:51 warrantyvoid joined #git
10:51 aviraldg joined #git
10:51 musicmatze[m] joined #git
10:51 Carlos[m] joined #git
10:51 timlyo[m] joined #git
10:51 Tiaan[m] joined #git
10:51 kjsage[m] joined #git
10:51 M64137[m] joined #git
10:51 ferr joined #git
10:53 pbrewczynski joined #git
10:54 meauses joined #git
10:54 Karazhan joined #git
10:59 Mir4g3 joined #git
11:00 JeroenT joined #git
11:02 Felishia left #git
11:03 JeroenT_ joined #git
11:04 leehambley joined #git
11:06 GavinMagnus joined #git
11:07 JeroenT joined #git
11:08 pijiu2 joined #git
11:10 pijiu2 joined #git
11:11 serard joined #git
11:14 User458764 joined #git
11:17 styler2go joined #git
11:18 GavinMagnus joined #git
11:18 blackwind_123 joined #git
11:19 kedare joined #git
11:21 Fuco joined #git
11:21 Fuco Why can't I specify -n and --sort to `git tag' at the same time? I don't understand the limitation :O
11:23 osse Fuco: works just fine here. Which version are you on?
11:24 Fuco 2.5.0
11:24 osse ok, that's maybe a bit old
11:24 Fuco hm, very well then, I'll update
11:24 osse But still, I found some weird behavior anyway.  git tag -n --sort=foo works, but git tag -n 2 --sort:foo does not. it asks me to give -l, and when I do it prints nothign
11:25 osse git tag -l -n --sort works
11:25 alcohol joined #git
11:26 osse hah, git tag -l -n 2 does not print anythign, even without sort
11:26 Fuco I think you need -n2
11:26 osse ah, yes
11:26 osse silly git
11:26 noidea joined #git
11:28 djb-irc joined #git
11:28 nonconvergent joined #git
11:28 zeroed joined #git
11:29 TomyWork joined #git
11:31 derk0pf joined #git
11:32 gareppa joined #git
11:33 mischat joined #git
11:34 SwiftMatt joined #git
11:36 serard joined #git
11:39 thebope_ joined #git
11:44 Jackneill joined #git
11:44 djb-irc joined #git
11:46 thierryp_ joined #git
11:48 wrouesnel1 joined #git
11:49 dsdeiz joined #git
11:50 tens0r joined #git
11:50 JeroenT joined #git
11:51 xall joined #git
11:52 tensor-dev joined #git
11:53 sdothum joined #git
11:54 ochorocho__ joined #git
11:55 User458764 joined #git
11:56 Rickmasta joined #git
11:57 Rodya_ joined #git
11:58 delboy1978uk joined #git
11:59 Orbitrix joined #git
11:59 delboy1978uk hi guys, due to draconian network policy, i cant git clone from my command line in this office. However, I can git clone from a linux server i have access to, which has a working copy. however I cant push to it, it mentions setting receive.denyCurrentBranch in the rwemote working copy. how do i go about doing that?
11:59 Orbitrix joined #git
12:00 selckin !non-bare
12:00 gitinfo [!bare] A bare repository is used to push/fetch (useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/
12:00 selckin !man git-config
12:00 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
12:00 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
12:01 monty joined #git
12:01 Learath2 joined #git
12:03 JeroenT joined #git
12:04 delboy1978uk selckin: so, are you suggesting that i clone from github to a bare repository on my remote linux server, check out from that repo to my current remote working copy, and set up 2 git hooks, one to push back to github when i push to the bare repo on the remote, and the other to git pull from the remote working copy?
12:05 Peng_ joined #git
12:05 delboy1978uk i need the remote to be a working copy so i can run my test suite
12:06 hahuang65 joined #git
12:07 linuxdaemon joined #git
12:08 delboy1978uk ah. git config receive.denyCurrentBranch ignore seemed to do the trick. i know its not good practice though, but in this office, nothing ever is :-(
12:08 linuxdaemon left #git
12:08 atokon joined #git
12:08 delboy1978uk had to hack my out using a socks5 ssh tunnel just to get on the web/irc
12:10 delboy1978uk ah, you just need to git reset --hard HEAD after pushing to a working copy with the recieve.denyCurrentBranch setting
12:10 JeroenT joined #git
12:10 delboy1978uk all good, thanks again for your help selckin
12:10 selckin delboy1978uk: check sshuttle
12:11 delboy1978uk oh, thanks again, will do
12:11 * delboy1978uk googles
12:11 xall joined #git
12:12 delboy1978uk that looks good, thanks for that
12:12 manuel joined #git
12:13 selckin np
12:15 Cavallari joined #git
12:17 venmx joined #git
12:18 cschneid joined #git
12:22 Vinnie_win joined #git
12:22 a3Dman joined #git
12:24 nostrora joined #git
12:25 nostrora Hey, do you have good resources to learn git online ?
12:25 nostrora online resources* to learn git
12:25 _ikke_ !book
12:25 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
12:25 nostrora !bottomup
12:25 gitinfo 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)
12:25 spb joined #git
12:25 nostrora !cs
12:25 gitinfo "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup
12:26 nostrora !gcs
12:26 gitinfo [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html
12:26 nostrora !parable
12:26 gitinfo 'The git parable' provides some good reasoning behind git.  http://tom.preston-werner.com/2009/05/19/the-git-parable.html
12:26 nostrora Thanks ;)
12:26 nostrora What do you think about : https://www.git-tower.com/learn/git/ebook/en/command-line/introduction ?
12:27 * ilmari quite likes schwern's "git for ages 4 and up" talk: https://archive.org/details/GitForAges4AndUp
12:28 mischat joined #git
12:30 User458764 joined #git
12:30 nostrora what do you think about gitflow ?
12:31 _ikke_ I use it, but others think it's too complicated
12:31 nostrora _ikke_: why too complicated ? it's not a good flow ?
12:32 heroux joined #git
12:33 clauds joined #git
12:33 SkylakeMX joined #git
12:33 lxsameer joined #git
12:33 SkylakeMX Hello people ;)
12:33 gitinfo SkylakeMX: 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:33 lxsameer are stashs belongs to my local repo ? or are they global among all the copies ?
12:34 SkylakeMX silly question, when I added remotes to my git repo, do I automatically update them too when I pull the origin master?
12:35 tobiasvl lxsameer: local
12:35 JeroenT_ joined #git
12:35 lxsameer thanks
12:36 tobiasvl SkylakeMX: no, "origin" is one remote. if you pull from origin master, you don't do anything concerning the other remotes than origin
12:37 SkylakeMX tobiasvl: yes I noted origin master hehe :P so git pull in the master branch is enough, thanks :D
12:37 miklcct_ joined #git
12:37 Orion3k joined #git
12:38 acetakwas joined #git
12:39 ayjay_t joined #git
12:39 zeroed joined #git
12:40 thebope_ joined #git
12:40 rominronin joined #git
12:41 JeroenT joined #git
12:42 xaa joined #git
12:46 t-mart_ joined #git
12:46 fsdgfsdf joined #git
12:47 raijin joined #git
12:48 JJjack joined #git
12:50 jfr joined #git
12:51 jknetl joined #git
12:55 ochorocho__ joined #git
12:55 Frede__ joined #git
12:56 djb-irc joined #git
12:59 lindenle joined #git
13:00 anonzadas joined #git
13:00 synthroid joined #git
13:01 Nilesh_ joined #git
13:01 fmcgeough joined #git
13:04 johnmilton joined #git
13:04 jfr joined #git
13:05 Oatmeal joined #git
13:06 hahuang65 joined #git
13:07 rominronin joined #git
13:13 bsanford joined #git
13:14 t-mart joined #git
13:14 rominronin joined #git
13:14 jfr joined #git
13:15 anonymuse joined #git
13:16 anonymus_ joined #git
13:20 serard joined #git
13:21 Raging_Hog joined #git
13:21 marcogmonteiro joined #git
13:21 bhuvanaurora joined #git
13:21 dharrigan joined #git
13:22 a_thakur joined #git
13:22 dviola joined #git
13:23 xall joined #git
13:24 dharrigan joined #git
13:24 dharrigan joined #git
13:24 dharrigan joined #git
13:25 alcohol joined #git
13:26 noecc joined #git
13:27 nettoweb1 joined #git
13:28 justanotheruser joined #git
13:29 leehambley joined #git
13:29 g105b joined #git
13:30 meauses joined #git
13:31 shubhnik joined #git
13:34 Noldorin joined #git
13:36 jfr joined #git
13:38 GavinMagnus left #git
13:38 paladinn joined #git
13:38 b3kN joined #git
13:38 b3kN joined #git
13:39 nonconvergent joined #git
13:40 f3r70rr35f joined #git
13:41 thebope_ joined #git
13:41 jeffreylevesque joined #git
13:46 wrouesnel1 joined #git
13:47 tvw joined #git
13:54 venmx joined #git
13:54 TinoDidriksen joined #git
13:55 ochorocho__ joined #git
13:57 rnsanchez_ joined #git
13:57 TinoDidriksen What is the best way to share files across branches? Things like individual files in the root folder (.gitattributes, .editorconfig, etc) and individual files in subfolders? Basically, what "svn externals" can do for single files.
13:58 nettoweb joined #git
13:58 grawity I'm not sure if such files really need special 'sharing'?
13:58 rominronin joined #git
13:58 grawity I mean, they already start with the same contents when you branch off; they get updated when you merge a branch, or you can cherry-pick commits; etc.
13:59 grawity no different from actual project files, afaics
13:59 lindenle joined #git
13:59 Oatmeal joined #git
14:00 bhuvanaurora joined #git
14:00 Gloomy joined #git
14:02 TinoDidriksen Right, but I now have diverging branches, and want to take files from one branch and share them with another, without having separate history for the files. I tried moving the files to a new orphan branch, but that went poorly.
14:02 jimi_ joined #git
14:04 vaesper left #git
14:04 nickthetait joined #git
14:06 lindenle joined #git
14:07 rominronin joined #git
14:09 osse TinoDidriksen: you can copy some files from one branch to the other, create a commit with the mesage "Copy some files from branch foo into this branch because (...)"
14:09 osse that's the best you're gonna get
14:10 TinoDidriksen All Google searches say the same, or they recommend subtree/submodule which would seriously complicate the structure and workflow.
14:11 _ikke_ TinoDidriksen: Branches are not meant to keep diverging some changes while not others
14:11 anonymuse joined #git
14:11 JJjack can I merge and then stash apply?
14:12 TinoDidriksen There is a way if I merge and undo-commit until there is a common point of reference, then use that for rebasing. But that requires serious discipline with making changes to the shared files only while that branch is checked out, which is also annoyingly slow.
14:13 Akimb joined #git
14:13 mithenks left #git
14:15 _ikke_ Right, not a good workflow supported by Zabbix
14:15 stux|RC-only joined #git
14:16 ExoUNX joined #git
14:16 TinoDidriksen Well fine, symlinks and subfolders it is...
14:16 selckin copy-paste is bad software engineering if you try to push it down to git level
14:16 selckin *+even
14:17 stux|RC-only joined #git
14:17 _ikke_ s/Zabbix/git :D
14:18 Rodya_ joined #git
14:20 Rodya_ joined #git
14:22 rominronin joined #git
14:23 cdown joined #git
14:23 rominron_ joined #git
14:24 xall joined #git
14:27 Virox I love copy-pasta
14:28 oskarkv joined #git
14:31 chris2 joined #git
14:32 todd_dsm joined #git
14:32 delboy1978uk left #git
14:35 adac joined #git
14:35 anuxivm joined #git
14:36 nonconvergent joined #git
14:36 Vortex34 joined #git
14:37 Brando753-o_O_o joined #git
14:38 krawchyk joined #git
14:38 derk0pf joined #git
14:40 Gsham joined #git
14:41 dharrigan joined #git
14:41 dharrigan joined #git
14:41 lindenle joined #git
14:41 thebope_ joined #git
14:42 namnoi38 joined #git
14:42 Trpger joined #git
14:42 howdoi joined #git
14:43 nonconve1gent joined #git
14:43 Trpger left #git
14:46 NeverDie joined #git
14:48 cdg joined #git
14:50 NeverDie_ joined #git
14:51 boombatower joined #git
14:52 EricPoe joined #git
14:52 ExoUNX joined #git
14:53 eivarv joined #git
14:55 sangy joined #git
14:56 jstimm joined #git
14:57 AaronMT joined #git
14:59 King_Hual joined #git
15:01 Dougie187 joined #git
15:03 thebope_ joined #git
15:03 jstimm joined #git
15:03 lindenle joined #git
15:04 isysd joined #git
15:05 steelsw0rd joined #git
15:10 nonconvergent joined #git
15:11 User458764 joined #git
15:11 User458764 joined #git
15:12 inflames joined #git
15:16 ResidentBiscuit joined #git
15:16 adac joined #git
15:16 Akimbas joined #git
15:17 djb-irc joined #git
15:17 e14 joined #git
15:19 lindenle joined #git
15:19 Starky joined #git
15:21 Rodya_ joined #git
15:22 nicksloan joined #git
15:23 d0nn1e joined #git
15:23 rendar joined #git
15:25 ash_workz joined #git
15:26 tcorneli joined #git
15:27 relipse joined #git
15:30 snowkidind joined #git
15:31 BlessJah what is goto tool for storing secrets (e.g. keys and passwords) in git?
15:31 freimatz hi, how can i list all branches with the hash
15:31 BlessJah git branch --all --contains hash?
15:32 pigeon joined #git
15:32 freimatz doesn't work
15:32 selckin BlessJah: you don't?
15:32 durham joined #git
15:33 BlessJah !config
15:33 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
15:33 sbulage joined #git
15:33 svm_invictvs joined #git
15:34 TinoDidriksen left #git
15:34 osse freimatz: what do you mean
15:35 BlessJah selckin: it's configuration and has to be stored
15:35 freimatz i wish a list of all branches as with "git branch --all" but i want the hash of the branch too
15:35 BlessJah oh, this kind of hash
15:35 BlessJah git branch --all --verbose
15:36 djb-irc joined #git
15:36 freimatz oO - yeah great. I didn't manage to lead RTFM to success :-(
15:37 osse to customize output you can use git for-each-ref
15:37 osse for scripting, for example
15:38 nonconvergent joined #git
15:40 sunri5e joined #git
15:41 tcorneli joined #git
15:44 Es0teric joined #git
15:45 kyan joined #git
15:45 subhojit777 joined #git
15:45 cdg_ joined #git
15:46 Junior joined #git
15:49 katherine joined #git
15:53 sssilver joined #git
15:57 Orbitrix joined #git
15:57 ochorocho__ joined #git
15:58 DieguezZ joined #git
15:58 dsdeiz joined #git
16:02 nicksloan joined #git
16:03 kpease joined #git
16:03 Orbitrix joined #git
16:03 Orbitrix joined #git
16:06 kadoban joined #git
16:08 durham joined #git
16:10 Raging_Hog joined #git
16:10 ojdo joined #git
16:11 tyreld joined #git
16:11 derk0pf joined #git
16:11 madewokherd joined #git
16:11 JeroenT joined #git
16:12 Gloomy joined #git
16:13 JeroenT_ joined #git
16:13 a_thakur joined #git
16:14 svm_invictvs joined #git
16:14 aarobc joined #git
16:15 ksu42 joined #git
16:16 JeroenT joined #git
16:17 Starkythefox joined #git
16:17 rominronin joined #git
16:18 jnavila joined #git
16:19 Starkythefox joined #git
16:20 sdothum joined #git
16:21 finalbeta joined #git
16:22 King_Hual joined #git
16:23 Rodya_ joined #git
16:25 crayon joined #git
16:25 Rodya__ joined #git
16:25 f3r70rr35f joined #git
16:26 e14 joined #git
16:27 ksu42 joined #git
16:28 clemf joined #git
16:28 t-mart_ joined #git
16:29 lindenle joined #git
16:30 timdiels joined #git
16:31 a_thakur_ joined #git
16:31 crayon joined #git
16:31 bhuvanaurora joined #git
16:33 serard joined #git
16:34 xall joined #git
16:34 ochorocho__ joined #git
16:35 bernardio joined #git
16:35 Rodya_ joined #git
16:36 crayon joined #git
16:37 Thorn joined #git
16:38 Akimbas joined #git
16:38 JeroenT joined #git
16:39 Rodya_ joined #git
16:44 t-mart joined #git
16:45 gargola joined #git
16:45 meauses joined #git
16:45 Shakeel_ joined #git
16:46 troulouliou_divn joined #git
16:46 synthroid joined #git
16:46 Learath2 joined #git
16:46 e14 joined #git
16:46 Es0teric joined #git
16:47 troulouliou_divn joined #git
16:47 nettoweb joined #git
16:50 LionsMane joined #git
16:54 raspado joined #git
16:55 JeroenT joined #git
16:58 durham joined #git
16:58 watabou joined #git
16:58 Akimbas joined #git
17:00 nettoweb1 joined #git
17:02 dreiss joined #git
17:03 sangy I remember there was a way for git diff to warn about trailing whitespace, but I can't seem to find it. Did it exist?
17:03 moritz yes!
17:03 sangy oh, --check right!?
17:04 selckin man git-diff
17:04 gitinfo the git-diff manpage is available at http://jk.gs/git-diff.html
17:04 a_thakur joined #git
17:04 moritz man git-config, search for core.whitespace
17:04 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
17:04 paul424 joined #git
17:05 WayToDoor joined #git
17:06 nettoweb joined #git
17:06 timdiels left #git
17:06 a_thakur joined #git
17:07 jbeeze joined #git
17:07 JanC_ joined #git
17:08 romerocesar joined #git
17:08 sangy kk, thanks!
17:10 ocbtec joined #git
17:16 kyan joined #git
17:19 dan2k3k4 joined #git
17:20 Gosi joined #git
17:20 ignarps joined #git
17:22 Qria joined #git
17:22 paul424 joined #git
17:23 naw joined #git
17:25 jimi_sanchez joined #git
17:26 InfoTest joined #git
17:26 WizJin joined #git
17:27 Rodya_ joined #git
17:28 arand__ joined #git
17:30 jimi_ joined #git
17:32 seishun joined #git
17:33 meauses joined #git
17:33 stupidystupid joined #git
17:34 CheckDavid joined #git
17:36 fuzzmz joined #git
17:37 archaic joined #git
17:38 robotroll joined #git
17:39 nikivi joined #git
17:40 JeroenT joined #git
17:41 akushner joined #git
17:47 pwnz0r joined #git
17:48 meauses joined #git
17:50 sbeller joined #git
17:51 denisMone joined #git
17:51 nicoulaj joined #git
17:52 mkoskar joined #git
17:53 drbean_ joined #git
17:55 emg joined #git
17:55 hahuang65 joined #git
17:56 meauses joined #git
17:56 drbean joined #git
17:57 JamesBaxter joined #git
17:57 zeroed joined #git
17:58 thiago joined #git
17:58 publio joined #git
17:58 drbean_ joined #git
18:00 Urbany joined #git
18:00 anonymuse joined #git
18:00 ixjlyons joined #git
18:00 drbean- joined #git
18:01 Faylite joined #git
18:01 SwiftMatt joined #git
18:01 kulelu88 joined #git
18:01 finalbeta joined #git
18:02 done joined #git
18:02 thebope_ joined #git
18:03 austin987 joined #git
18:05 PioneerAxon joined #git
18:05 drbean joined #git
18:07 drbean_ joined #git
18:07 xo_odin joined #git
18:08 crayon joined #git
18:10 d10n-work joined #git
18:10 drbean- joined #git
18:10 Es0teric joined #git
18:11 e14 joined #git
18:13 drbean joined #git
18:15 drbean_ joined #git
18:18 drbean joined #git
18:19 rominronin joined #git
18:19 NeverTired joined #git
18:20 dsantiago joined #git
18:20 joki- joined #git
18:22 emg joined #git
18:24 ajpiano joined #git
18:27 jimi_ joined #git
18:28 nicksloan joined #git
18:28 paul424 joined #git
18:30 f3r70rr35f joined #git
18:30 Guest55 joined #git
18:31 dodobrain joined #git
18:31 sssilver joined #git
18:31 stux|RC-only joined #git
18:31 krillr joined #git
18:31 apotry joined #git
18:32 Mikerhinos joined #git
18:34 pwnz0r joined #git
18:35 dodobrain joined #git
18:36 SwiftMatt joined #git
18:38 r4nd0m-0ne joined #git
18:38 cagedwisdom joined #git
18:39 railssmith joined #git
18:39 devhoag joined #git
18:40 blackjid joined #git
18:40 Es0teric joined #git
18:40 str joined #git
18:40 cdg joined #git
18:42 nanga joined #git
18:42 btree joined #git
18:42 Spec-Chum joined #git
18:42 zeroed joined #git
18:42 zeroed joined #git
18:43 crose joined #git
18:46 finalbeta joined #git
18:47 waterCreature joined #git
18:50 danmackay joined #git
18:50 waterCreature hi, i have this repo i cloned and for some reason that i am not aware of, I received an error message, "fatal error : bad head", so... I deleted the .git folder and now I have no idea how to push the files to the repo.
18:51 leeN joined #git
18:51 waterCreature I did do the git init
18:51 waterCreature and .git folder reappeared and I added the files
18:53 finalbeta joined #git
18:54 jbeeze waterCreature: Deleting the .git folder removes all branches, commits, remote url, etc.
18:54 jbeeze Hence why you can't push to the repo. You gotta set up teh remote-url again
18:55 waterCreature ahh Thanks jbeeze,
18:55 jbeeze git remote set-url origin REMOTE_URL_.GIT
18:55 jbeeze replacing the REMOTE_URL_.GIT with your remote url :)
18:56 Sasazuka joined #git
18:56 jbeeze then type 'git remote -v' to see if it worked
18:56 waterCreature may i ask if it will work with bitbucket?
18:57 rafiki joined #git
18:57 jbeeze Bitbucket and Github are the same thing. They both use git. They're just different ways to view the repos through different GUIs
18:57 waterCreature i just joined this company and they use bitbucket. no idea what is the difference between the two , i thought github allowed private repositories if you pay them?
18:57 jbeeze they work exactly the same way :)
18:57 danmackay joined #git
18:57 jbeeze waterCreature: my first startup used bitbucket. It's usually used because private repos are free and it works with other Atlassian products
18:58 jbeeze Github you need to pay a monthly fee for private repos which some companies don't want to do
18:58 btree left #git
18:58 belak Yeah, the pricing model is the big difference
18:58 belak There are also others, but that's what many people cite
18:58 waterCreature oh,... you mean, bitbucket dont have to pay for  private repos?
18:58 jbeeze They're both hubs for git repositories. They both use the exact same git commands.
18:59 waterCreature sorry, i am a slow thinker
18:59 Sasazuka joined #git
18:59 jbeeze waterCreature: Looks like it's free up to 5 users, then only $10 a month for 10 users... etc etc
19:00 jbeeze but like belak said, one of the main reasons that people use Bitbucket over Github mostly is due to price
19:00 waterCreature ah, I see, Thanks for the insight.
19:00 Efffe joined #git
19:00 troulouliou_div2 joined #git
19:01 Efffe I'm trying to put all the commits from `master` into `staging`. They got out of sync a while ago, but I know I want `master` to "win" on merge conflicts. Any suggestions?
19:01 vdv joined #git
19:01 Efffe I know there is such a thing as merge strategies and such, but I'm not confident in how to do it.
19:02 dsantiag_ joined #git
19:02 jbeeze Efffe: is 'staging' a branch off of 'master' ?
19:02 Efffe I tried `git checkout master; git pull; git checkout staging; git rebase master` but apparently some of the commits never made it over.
19:02 Efffe jbeeze: tbh, I'm not sure.
19:02 Efffe It's a pretty old project.
19:02 jbeeze Efffe: imo, if you have nothing important on this 'staging' branch, i'd make a new bracnh
19:02 GavinMagnus joined #git
19:03 jbeeze especially if you don't know what HEAD it's attached to
19:03 dsantia__ joined #git
19:03 Efffe Right, but I'm not confident there isn't some config stuff somewhere in `staging`.
19:03 jbeeze git checkout master, git checkout -b BRANCH
19:03 finalbeta joined #git
19:03 Efffe But I am confident there are no merge conflicts in whatever config might exist.
19:03 jbeeze why don't you just checkout the staging branch and do 'git merge origin master'
19:03 NeverTired joined #git
19:03 jbeeze and see what moves over?
19:03 leprechau joined #git
19:04 xo_odin joined #git
19:04 Efffe I'm pretty sure without a strategy flag I'd be looking at hundreds of merge conflicts.
19:06 Efffe tbh, I just don't understand whether to use ours/theirs in this situation.
19:07 floatingman joined #git
19:08 dsantiago joined #git
19:09 encod3 joined #git
19:09 msonntag joined #git
19:10 encod3_ joined #git
19:11 dreiss joined #git
19:11 diogenese joined #git
19:11 leehambley joined #git
19:12 shubhnik joined #git
19:12 cdg joined #git
19:12 encod3 joined #git
19:13 prg3_ joined #git
19:14 encod3__ joined #git
19:14 sea-gull_ joined #git
19:14 eivarv joined #git
19:15 rominronin joined #git
19:15 e14 joined #git
19:16 encod3 joined #git
19:16 Cavallari joined #git
19:17 dsantiag_ joined #git
19:18 encod3_ joined #git
19:18 eivarv joined #git
19:18 rominron_ joined #git
19:19 encod3 joined #git
19:21 WoodLeg joined #git
19:24 pwnz0r joined #git
19:24 shgysk8zer0 joined #git
19:25 mischat joined #git
19:26 nedzadhrnjica joined #git
19:28 Akimb joined #git
19:28 gmn8719 joined #git
19:30 stemid left #git
19:30 al-damiri joined #git
19:31 prg3 joined #git
19:31 mizu_no_oto joined #git
19:33 nicksloan joined #git
19:35 paul424 joined #git
19:36 raspado joined #git
19:36 adac joined #git
19:37 kyan joined #git
19:37 raspado_ joined #git
19:38 zeroed joined #git
19:38 zeroed joined #git
19:40 lunix joined #git
19:42 prg3_ joined #git
19:42 m___ joined #git
19:43 hypercube32 joined #git
19:43 hypercube32 joined #git
19:44 m___ joined #git
19:44 jstimm joined #git
19:47 cqi joined #git
19:50 netj joined #git
19:52 cdg joined #git
19:52 sea-gull_ joined #git
19:54 d0nn1e joined #git
19:54 diego3 joined #git
19:55 navidr joined #git
19:56 diego3 joined #git
19:56 Starkythefox joined #git
19:56 diego3 joined #git
19:57 diego3 joined #git
20:01 cdown joined #git
20:01 cek joined #git
20:02 cek How do I hard-reset my branch to point to remote branch?
20:02 cek currently, it spits git pull errors.
20:02 pwnz0r joined #git
20:02 akushner joined #git
20:02 _ikke_ git reset --hard <remote-tracking-branch>
20:02 _ikke_ This would also undo any uncomitted changes
20:02 cek actually , that worked. tnx
20:04 Endarked joined #git
20:04 mizu_no_oto joined #git
20:05 cek How do I export branch history, then apply a history ? much like a patch ,but with commit history
20:05 nwkj86 joined #git
20:05 grawity isn't that also called a patch
20:05 grawity or a patchset / patch series
20:06 _ikke_ cek: Do you need to apply it on the same, or a different repository?
20:07 cek same.
20:07 _ikke_ cek: Perhaps you want to either rebase (move a branch) or cherry-pick (copy commits)
20:07 cek no, i want to push/pull, but wihtout a network
20:07 cek git export branch1..branch2
20:07 cek git checkout branch1
20:07 cek git import branch2
20:07 cek like that
20:07 _ikke_ What do you want to actually achieve?
20:08 e14 joined #git
20:09 m___ joined #git
20:09 GavinMagnus joined #git
20:09 azerus joined #git
20:10 hwoarang joined #git
20:10 hwoarang joined #git
20:10 mischat joined #git
20:13 aard_ joined #git
20:14 jstein_ joined #git
20:14 cek fast-export branch1..branch2 /fast-import  helped.
20:14 cek left #git
20:15 krillr joined #git
20:16 qws-user-1228 joined #git
20:18 aarobc joined #git
20:19 seishun joined #git
20:21 aidalgol joined #git
20:23 VagabondAzulien joined #git
20:23 paul424 joined #git
20:24 blackjid joined #git
20:24 rangergord joined #git
20:24 devhoag joined #git
20:25 dodobrain is it possible to obtain an output similar to --stat on git log , when using git diff ?
20:25 _ikke_ git diff also accepts --stat
20:26 dodobrain left #git
20:26 _ikke_ ..
20:26 dodobrain joined #git
20:26 _ikke_ git diff also accepts --stat
20:27 denisMone joined #git
20:28 fees joined #git
20:28 hhee joined #git
20:30 GavinMagnus joined #git
20:30 mellernoia joined #git
20:31 saml Your configuration specifies to merge with the ref 'refs/heads/dev' from the remote, but no such ref was fetched.    what have i done?
20:31 ojacobson Someone deleted the upstream branch on you
20:31 ojacobson (git push --delete your-remote dev, or something like it)
20:32 saml how can I re-connect to dev?
20:32 ojacobson Does it still exist?
20:33 Gsham joined #git
20:33 saml how can I check  if my origin/dev  is bad?
20:33 dodobrain _ikke_, it does, i found it from the man page. thanks
20:33 dodobrain left #git
20:33 dodobrain joined #git
20:34 dodobrain i need to stop using ctrl-w to delete words on my irc client, grr
20:34 dan2k3k4 joined #git
20:35 saml looks like it's gone (using github interface)
20:35 mellernoia joined #git
20:35 ojacobson There you go
20:35 ojacobson You can't merge a branch that doesn't exist.
20:38 dodobrain on my local branch, if i checkout an older commit and modify that to make a very minor typo correction and commit that, what happens?
20:38 dodobrain does my branch stay as is? (its not pushed anywhere, only local)
20:38 grawity you end up with a !detached head
20:38 gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
20:38 grawity in fact, you ended up detaching the moment you checked out that older commit
20:39 grawity from then on, you're not on that branch anymore
20:39 dodobrain yes, how do i make my branch exactly as before just having all my newere commits being rebased onto that one?
20:39 grawity and any new commits go to an 'unnamed branch'
20:39 nedzadhrnjica joined #git
20:39 kulelu88 left #git
20:40 mellernoia-away joined #git
20:41 noecc left #git
20:45 dodobrain sweet. i created a new commit and just used rebase to reorder and then 'fixup' to squash it into the correct commit
20:49 vuoto joined #git
20:50 jmpp_ joined #git
20:50 jmpp_ joined #git
20:50 m0viefreak joined #git
20:50 Jackneill_ joined #git
20:53 vdv joined #git
20:55 sybariten joined #git
20:55 emg joined #git
20:56 tang^ joined #git
20:57 sybariten okay
20:57 txdv joined #git
20:58 rossome joined #git
20:58 sybariten so allow me ask this, as i ask, like, every time i need to re-learn the basics of git to fundamentally use it
20:59 _ikke_ !book
20:59 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
21:00 sybariten i'm standing in a dir with a repo. I do "git status" and it says someting like "Your branch is up-to-date with 'origin/master'." This repo, or a version of it, eists online too, at bitbucket. Th status commadn doesnt tell me if i'm up to date against the server version, right?
21:00 ojacobson That's correct.
21:00 ojacobson git-status is a purely local operation, against your cached copy of remote branches
21:00 sybariten so what should i do?
21:01 ojacobson That somewhat depends on your goals.
21:01 rossome joined #git
21:02 sybariten well i guess what we wanna do here is make sure that i dont have newer files locally on my laptop, than online at bitbucket
21:02 ViEwHoSANyC42Kt6 joined #git
21:02 ojacobson git-fetch (`git fetch <remote>`) will update your local cache of branches in <remote>
21:04 sybariten and it wont overwrite local files without asking?
21:04 darkbit joined #git
21:08 SwiftMatt joined #git
21:09 rossome joined #git
21:10 nedzadhrnjica joined #git
21:11 dsdeiz joined #git
21:11 ojacobson fetch doesn't touch the work tree
21:12 dsantiago joined #git
21:13 Rodya_ joined #git
21:14 cdown joined #git
21:16 mischat joined #git
21:16 sybariten aha.....   i suppose i might need to mess with git pull...
21:16 sybariten which some people argue does a fetch and a merge
21:16 adac joined #git
21:17 sybariten Which is like greek for me  ;---)
21:17 raspado joined #git
21:17 ojacobson We don't argue
21:17 dsantiago joined #git
21:18 ojacobson It's a statement of fact :) git-rebase is a wrapper for `git fetch` and `git merge`, or `git fetch` and `git rebase`, depending on config and command-line options. You can see it right in the code
21:18 ojacobson anyways.
21:18 ojacobson git-fetch copies names (branches, tags, etc) around, dragging the necessary commits (snapshots of your project) with them when it does
21:18 ojacobson those commits are stored in .git
21:18 ojacobson to apply the changes in them to your local branch, you need to do some branch-converging operation. rebase and merge are the common choices.
21:19 overlord_tm joined #git
21:23 bocaneri joined #git
21:25 ahmed_elgabri joined #git
21:27 WoodLeg joined #git
21:31 Sasazuka__ joined #git
21:31 dikiaap joined #git
21:32 stupidystupid joined #git
21:34 jstimm joined #git
21:34 Faylite_ joined #git
21:35 b1tchcakes joined #git
21:36 Alienpruts joined #git
21:37 m___ joined #git
21:39 emg joined #git
21:44 sea-gull_ joined #git
21:49 mizu_no_oto joined #git
21:49 dpower joined #git
21:50 nwkj86 joined #git
21:51 manuels joined #git
21:51 Learath2 joined #git
21:52 Gsham joined #git
21:53 acetakwas joined #git
21:55 jeffreylevesque joined #git
21:56 hhee joined #git
21:57 abyx joined #git
21:57 tobiasvl ojacobson: you mean tthat git-pull is a wrapper. don't confuse the poor person more ;)
21:58 abyx Hrm, So i've added an SSH key to my github account. Then I created a ~/.ssh/config file with the Host for github.com. Now when i try to pull from one of my repositories it says "fatal: repository '<vaid_link_to_my_repo.git>' not found"
21:58 abyx Any ideas what's up with that?
21:59 abyx ssh -T git@github.com said i successfully authenticated
21:59 kadoban abyx: I suspect you've elided the problematic part in one way or another.
22:00 GavinMagnus left #git
22:01 Hink joined #git
22:02 Eugene Almost certainly a typo somewhere, and censoring the repo name makes it impossible for us to help
22:02 abyx Hrm,additionally i get a "remote: Repository not found."
22:02 abyx i already had this repo cloned before adding an SSH key, if that may affect things?
22:02 Eugene `git ls-remote ssh://git@github.com/Username/Repo.git`
22:03 gottesmm joined #git
22:03 Eugene Assuming that comes back fine(you should get a list of branches/tags) then the issue is in your repo URL somewhere
22:03 abyx Eugene: that lists all of my branches and such
22:04 Eugene `git remote -v` and make sure(use two sets of eyes) the URL matches
22:05 blackwind_123 joined #git
22:05 abyx The repo URL that i get the "not found" error with has a trailing '/', whereas the repo's remote origin does not
22:05 abyx that's the only different
22:05 abyx difference*
22:05 Eugene Tada
22:05 abyx now the question is, where is that trailing slash coming from
22:05 Eugene man git-remote; see set-url for how to fix it
22:05 gitinfo the git-remote manpage is available at http://jk.gs/git-remote.html
22:08 overlord_tm joined #git
22:09 bernardio joined #git
22:09 abyx Wait, if git remote -v shows my fetch/push origin urls as perfectly correct, why would using an SSH connection have the appended slash?
22:10 naw joined #git
22:11 xocket joined #git
22:11 SwiftMatt joined #git
22:16 Vinnie_win_c joined #git
22:16 nicksloan joined #git
22:17 mischat joined #git
22:18 xock_stream joined #git
22:18 lucazz joined #git
22:18 krillr joined #git
22:19 abyx So the issue was my origin was set using https://github.com/blah/blah.git, instead of the `git@github.com:AccountName/repoName.git` format. That fixed it for me
22:21 mischat joined #git
22:22 e14 joined #git
22:23 devhoag joined #git
22:23 blackjid joined #git
22:24 griffindy joined #git
22:24 akushner joined #git
22:26 acetakwas joined #git
22:28 brent__ joined #git
22:29 tvw joined #git
22:30 ToBeCloud joined #git
22:31 leehambley joined #git
22:31 Vinnie_win joined #git
22:31 ToBeCloud joined #git
22:33 nettoweb1 joined #git
22:33 derk0pf joined #git
22:35 phox hm.  thinking I would like the idea of "nested commits" so I can do things more granularly at times but not be left with a mile-long commit log at the top level... assuming (fairly new to git) branching + merging would be the reasonable way to accomplish exactly that?
22:35 ojacobson !workflow
22:35 gitinfo Finding the right workflow for you is critical for the success of any SCM project.  Git is very flexible with respect to workflow.  See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.
22:35 kadoban phox: Yes
22:36 gmn8719 left #git
22:37 phox thanks, both :)
22:40 done joined #git
22:40 evie_hammond joined #git
22:42 NeverDie_ joined #git
22:45 phos1 joined #git
22:46 phos1 How do i merge my local and remote GIT changes? (Someone else did some changes to this branch that need to be merge with my local)
22:46 arescorpio joined #git
22:50 solution_ joined #git
22:52 ochorocho__ joined #git
22:53 anonymus_ joined #git
22:54 raspado joined #git
22:54 kpease_ joined #git
22:55 kpease joined #git
22:55 Dougie187 left #git
22:56 pwnz0r joined #git
22:57 cbreak phos1: git pull does that
22:57 phos1 cbreak: That’s what I did but somehow things are not coming together right
22:58 WaReZ joined #git
23:00 railssmith joined #git
23:00 Bass10 joined #git
23:01 phos1 left #git
23:05 kpease joined #git
23:08 Sasazuka joined #git
23:10 Rodya_ joined #git
23:12 m1dnight_ joined #git
23:15 m1dnight_ joined #git
23:18 mischat joined #git
23:19 jimi_ joined #git
23:20 skunkz joined #git
23:26 raijin joined #git
23:26 phox if I commit something, I can do something else I forgot to do and then do a fixup commit, but is there a way to "undo" exactly what "git commit" did i.e. delete the commit and move my changes back into the working tree?
23:27 tobiasvl phox: !revert
23:27 gitinfo phox: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
23:27 tobiasvl phox: you probably want c) there
23:29 bjoe2k4 joined #git
23:33 dsdeiz joined #git
23:35 phox ok cool, yeah that does pretty much exactly what I want give-or-take undoing 'git add' or the -a in the commit, but yeah that is where I want to be thanks :)
23:36 phox thankya!
23:37 anonymuse joined #git
23:39 cagedwisdom joined #git
23:45 anonymuse joined #git
23:48 m1dnight_ joined #git
23:50 jfelchner joined #git
23:55 AndreSomers joined #git
23:55 Motoko joined #git
23:56 Olipro joined #git
23:57 King_Hual joined #git
23:57 howdoi joined #git
23:59 inflames joined #git

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