Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-15

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

All times shown according to UTC.

Time Nick Message
00:00 Tobbi joined #git
00:01 r3c0d3x joined #git
00:01 Whiskey i look in to it
00:02 Whiskey git diff --name-only commit~1 commit is always last commit ?
00:02 karstensrage joined #git
00:03 _ikke_ replace commit with HEAD
00:03 ozmage joined #git
00:03 griffindy joined #git
00:04 Whiskey yeh that works
00:04 Whiskey how do i get out the commit id?
00:04 madewokherd joined #git
00:04 Whiskey as it need it every time
00:04 _ikke_ git rev-parse HEAD
00:04 Whiskey like git diff --name-only HEAD~1 cca929e7f2d4648799acc34b97b41f34b2da3ef8
00:05 Whiskey ok good
00:05 Whiskey git archive HEAD -- <pass <- what happens if i run that in .git folder?
00:05 Whiskey does the archive come in .git then
00:06 bgerber joined #git
00:06 miczac joined #git
00:09 Whiskey git archive HEAD -- <pass Start.tcl give me filename or dir don´t exist
00:09 vrishab joined #git
00:09 kadoban_ What is <pass supposed to be?
00:10 Whiskey aha
00:10 Whiskey well it just output the filename for me if its git archive HEAD -- Start.tcl
00:10 amincd joined #git
00:10 Whiskey in terminal
00:10 amincd hi, how can I see the diff between two commits without typing out the entire commit ID?
00:10 kadoban amincd: man gitrevisions might help
00:10 gitinfo amincd: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
00:11 amincd I want to do something like: "git diff 18b1ka* oa8b*"
00:11 mischat joined #git
00:11 amincd but right now I need to copy and paste each respective commit ID
00:11 kadoban You can abreviate them at least. You only have to specify enough of the prefix to make it unambiguous.
00:12 amincd kadoban: how do you abbreviate them?
00:12 kadoban By typing the first few characters, 5 or 6.
00:12 kadoban Or any of the other ways to specify from that page.
00:13 amincd so I'm trying this and it's not working: git diff 18b1 oa8b
00:13 ozmage joined #git
00:13 amincd am I missing something?
00:13 kadoban oa8b isn't a shaid
00:13 amincd it's another characters to be unambiguious
00:13 amincd *guous
00:13 amincd *enough characters
00:13 kadoban perhaps 0a8b, check again and see what it actually is.
00:13 matoro joined #git
00:14 amincd kadoban: ok got it: it needs to be at least 4 characters from the commit id
00:14 amincd thanks
00:15 brent__ joined #git
00:15 markelite joined #git
00:15 cagomez joined #git
00:16 madewokherd joined #git
00:17 joshszep joined #git
00:17 d1z joined #git
00:21 thebope joined #git
00:23 dwmw2_gone joined #git
00:25 nettoweb joined #git
00:25 Whiskey why do i see the file in my terminal when i do "git archive HEAD -- Start.tcl"
00:28 hahuang61 joined #git
00:28 bgerber joined #git
00:29 codebam joined #git
00:31 bgerber joined #git
00:32 Iacobus__ joined #git
00:33 Awesomecase joined #git
00:33 Electrometro joined #git
00:34 Sasazuka joined #git
00:37 ResidentBiscuit joined #git
00:40 rwp Whiskey, The default output file format is a tar file with the binary tar header. That should not be thrown to the terminal or the binary characters might interact badly with your terminal.
00:41 rwp You see the file because the file is in the tar archive uncompressed at that point.
00:41 rwp If you want to see it the way you should see it then view it as a tar archive with: git archive HEAD -- Start.tcl | tar tvf -
00:42 Whiskey and the tar is saved where?
00:44 _ikke_ Nowhere unless you write it to disk
00:44 Eugene `git archive` outputs the tarfile to stdoud. Use redirection to send it to a file
00:44 mda1_ joined #git
00:44 Eugene stdout
00:45 Whiskey so its created and deleted :D
00:45 _ikke_ It's created in memory
00:45 _ikke_ the tar is a streaming format
00:46 Whiskey naaa
00:46 Whiskey git archive HEAD -- Start.tcl | tar czf commit.tar.gz -C /home/whiskey/
00:46 _ikke_ git archive HEAD -- Start.tcl --format=tar.gz >/home/whiskey/commit.tar.gz
00:47 Whiskey good :D
00:48 Whiskey is that compress level 9?
00:48 Whiskey git archive HEAD -- Start.tcl --format=tar.gz master -9 > /home/whiskey/commit.tar.gz maybe
00:48 _ikke_ gzip -cn by default
00:49 _ikke_ You can also use -o instead of redirection btw
00:49 _ikke_ git archive HEAD -- Start.tcl -o /home/whiskey/commit.tar.gz
00:51 Whiskey is it max compression still?=
00:51 _ikke_ You can pass -9 like you suggested
00:51 _ikke_ Note sure if that works for gzip though
00:52 Whiskey git archive HEAD -- Start.tcl --format=tar.gz -9 > /home/whiskey/commit.tar.gz
00:52 Whiskey not work
00:52 Whiskey git archive HEAD -- Start.tcl -o -9 /home/whiskey/commit.tar.gz not work
00:52 _ikke_ You should not place it after -o
00:53 Whiskey no wait
00:53 Whiskey yeh
00:53 _ikke_ because that should take the filename
00:53 Whiskey and the other one last
00:53 Whiskey hmm
00:53 matoro joined #git
00:54 Whiskey well before or last don´t work
00:54 _ikke_ !doesn't
00:54 gitinfo [!doesntwork] 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...
00:54 Whiskey git archive HEAD -- Start.tcl -o /home/whiskey/commit.tar.gz -9
00:54 Whiskey git archive HEAD -- Start.tcl -9 -o /home/whiskey/commit.tar.gz
00:55 Whiskey before and last is quite good details
00:57 Puffball joined #git
00:57 pur3eval joined #git
00:58 dendazen joined #git
00:59 gugah joined #git
00:59 annoymouse joined #git
01:01 dave0x6d joined #git
01:04 cliluw joined #git
01:05 joshszep joined #git
01:06 Kaisyu joined #git
01:14 nettoweb joined #git
01:14 thiago joined #git
01:15 swords joined #git
01:21 qqx joined #git
01:21 joshszep joined #git
01:21 jimi_ joined #git
01:28 pur3eval joined #git
01:35 Klumben joined #git
01:36 Cthalupa joined #git
01:36 cqi joined #git
01:39 nettoweb joined #git
01:40 zezba9000 left #git
01:41 Ryanar joined #git
01:50 ozmage joined #git
01:50 Cthalupa joined #git
01:51 DASwar joined #git
01:52 zzz joined #git
01:54 DASwar joined #git
01:57 zacts joined #git
01:57 gelei007 joined #git
01:57 f3r70rr35f joined #git
02:00 duderonomy joined #git
02:00 brent__ joined #git
02:02 raijin joined #git
02:08 finalbeta joined #git
02:09 snowalpaca joined #git
02:11 shgysk8zer0_ joined #git
02:12 snowalpaca joined #git
02:13 Cthalupa joined #git
02:14 Squarism should cherrypicking take forever or is my ide buggy?
02:15 bremner try it on the command line, then you will know.
02:15 pks joined #git
02:22 thebinary joined #git
02:23 durham joined #git
02:23 jameser joined #git
02:24 arescorpio joined #git
02:25 jstimm joined #git
02:25 Nilesh_ joined #git
02:26 durham joined #git
02:29 hahuang61 joined #git
02:30 elsevero joined #git
02:33 dsantiago joined #git
02:34 Vampire0_ joined #git
02:34 githogori joined #git
02:36 Wulf4 joined #git
02:37 thebinary joined #git
02:38 aidalgol joined #git
02:43 jason237 joined #git
02:47 DolpheenDream joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and a bag of wheeee | 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 | Are you even reading this? Prove it by submitting to https://madeitwor.se/git-jokes
02:52 d^sh joined #git
02:52 thib joined #git
02:54 pur3eval joined #git
02:56 prg3 joined #git
02:58 thebinary joined #git
02:58 durham joined #git
02:59 Gsham joined #git
03:00 shgysk8zer0_ joined #git
03:01 Garen joined #git
03:02 finalbeta1 joined #git
03:02 gelei007 joined #git
03:02 ojdo joined #git
03:03 iujeorqecvbxanan joined #git
03:03 nopacien13 joined #git
03:03 Ovsyanka joined #git
03:04 unbalancedparen joined #git
03:04 GameGamer43_ joined #git
03:04 daxroc_ joined #git
03:04 WillMoogle_ joined #git
03:04 jleclanche_ joined #git
03:04 shennyg_ joined #git
03:04 mda1 joined #git
03:04 l2y_ joined #git
03:04 dem joined #git
03:04 BlaXpirit_ joined #git
03:04 boxrick1_ joined #git
03:05 Onionnion_ joined #git
03:05 belak_ joined #git
03:05 boombatower_ joined #git
03:05 ulkesh_ joined #git
03:06 Celelibi_ joined #git
03:06 ome_ joined #git
03:06 d^sh_ joined #git
03:06 jophish_ joined #git
03:06 sunny256_ joined #git
03:06 todd_dsm_ joined #git
03:06 sts_ joined #git
03:06 daishan joined #git
03:06 Juri_Agarin joined #git
03:06 bttf_ joined #git
03:06 resetpacket joined #git
03:06 spm_draget joined #git
03:06 Seveas_ joined #git
03:06 heroux_ joined #git
03:06 Mir4g3_ joined #git
03:06 Pie_Napple joined #git
03:06 RickyB98|BNC joined #git
03:06 gnarf_ joined #git
03:06 barq_ joined #git
03:06 XVar` joined #git
03:06 angseus_ joined #git
03:06 colona joined #git
03:06 axisys_ joined #git
03:06 rainrawr_ joined #git
03:06 catsup_ joined #git
03:06 telephone_ joined #git
03:06 avarab joined #git
03:06 avarab joined #git
03:06 gusnan joined #git
03:06 gusnan joined #git
03:06 ugjka joined #git
03:06 dwmw2_go` joined #git
03:06 solution1 joined #git
03:06 Potatoes joined #git
03:06 fuchstro1aut joined #git
03:06 rideh- joined #git
03:06 qguv_ joined #git
03:06 rawburt_ joined #git
03:06 MaekSo_ joined #git
03:06 _cyril__ joined #git
03:06 rudi_s_ joined #git
03:06 jokajak` joined #git
03:07 spb_ joined #git
03:07 Groscheri joined #git
03:07 brandonw_ joined #git
03:07 Atm0sphe1 joined #git
03:07 malide1 joined #git
03:07 VladGh_ joined #git
03:07 LeMike joined #git
03:07 Renter joined #git
03:07 Salander27 joined #git
03:07 danmackay_ joined #git
03:07 jab416171_ joined #git
03:07 qsx joined #git
03:07 up_the_irons joined #git
03:07 Salander27 joined #git
03:07 mkoskar joined #git
03:07 msonntag joined #git
03:07 tuor_ joined #git
03:08 SupaHam joined #git
03:08 bittyx joined #git
03:08 ugglan joined #git
03:08 parasite_ joined #git
03:08 roflin joined #git
03:08 simon816 joined #git
03:08 hide joined #git
03:08 lungaro joined #git
03:08 Hello71 joined #git
03:08 MaekSo_ left #git
03:08 SoulOfTheInterne joined #git
03:08 Sheogorath[m] joined #git
03:08 GodEater joined #git
03:08 GodEater joined #git
03:08 MaekSo joined #git
03:08 hiq[m] joined #git
03:08 Kulrak joined #git
03:08 Kulrak joined #git
03:09 saintaquinas[m] joined #git
03:09 eblip joined #git
03:09 sfan786_ joined #git
03:09 bjoe2k4 joined #git
03:10 setuid joined #git
03:10 steven joined #git
03:11 mehdi___ joined #git
03:11 CEnnis91 joined #git
03:11 marlinc joined #git
03:12 wizonesolutions joined #git
03:14 codedmart joined #git
03:15 raynold joined #git
03:16 aidalgol joined #git
03:16 milkshoes joined #git
03:16 fahadash joined #git
03:17 johnny56_ joined #git
03:17 Vortex34 joined #git
03:19 mda1_ joined #git
03:19 infernix joined #git
03:21 anuxivm left #git
03:22 fstd_ joined #git
03:23 shinnya joined #git
03:23 hexagoxel joined #git
03:23 LeBlaaanc joined #git
03:25 ExeciN joined #git
03:25 bocaneri joined #git
03:26 aviraldg joined #git
03:26 aviraldg joined #git
03:28 chachasmooth joined #git
03:34 bocaneri joined #git
03:37 winfli joined #git
03:40 duderonomy joined #git
03:44 scoobertron joined #git
03:45 Anja joined #git
03:45 Gsham joined #git
03:45 Pursuit joined #git
03:46 mizu_no_oto joined #git
03:48 orzo joined #git
03:48 puff Good evening.
03:50 govg joined #git
03:50 puff I set the git origin on my new repo to the git@github.com form, but I appear to have forgotten my ssh passphrase.  I'll work on figuring that out tomorrow, but for now I just want to change the git origin to the https:// form and get it uploaded.
03:51 phroa git remote set-url <name> <url> (man git-remote)
03:51 gitinfo the git-remote manpage is available at http://jk.gs/git-remote.html
03:53 puff Thanks!
03:53 puff Running now, cool.
03:58 hahuang61 joined #git
04:00 sunri5e joined #git
04:01 venmx joined #git
04:01 RobW_MI joined #git
04:02 puff Hm, there are two really large files in there that should have been deleted.  Github chokes on them and I get "failed to push some refs".  I did "git rm logs/stupid_large_file/etc" and then git commit, but still get the same error.
04:03 RobW_MI left #git
04:04 digitalw00t joined #git
04:04 thiago that didn't remove it from history
04:04 thiago there's probably a factoid in the bot with the answer
04:04 thiago puff: but you can see man git-filter-branch for an example of how to do it
04:04 gitinfo puff: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
04:05 thiago or you can use git rebase -i to edit the commit that introduced those files
04:05 puff thiago: It was a git init-db.
04:05 puff thiago: I guess I could just blow away .git, delete the log files, and start over from scratch.
04:05 Peetz0r joined #git
04:05 mohabaks joined #git
04:06 puff Did the errors prevent any of the push from going through?
04:06 puff Looks like it did.
04:07 Taikibansei joined #git
04:08 puff Kinda monkey patching,b ut.
04:08 jstimm joined #git
04:09 puff Wait, not monkey patching... what's phrase for when people make a backup copy of their working files?  e.g. "cp -a myproject myprojectbackupincaseIscrewupthisgitcommand"?
04:10 puff Cool, blowing away the .git, rm'ing the logs and starting from scratch went smoothly.
04:10 puff thiago: Thanks again.
04:11 cqi joined #git
04:12 Hello71 copying.
04:12 Hello71 !sens
04:12 gitinfo [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/
04:13 aw1 joined #git
04:15 Goplat joined #git
04:17 jeffreylevesque joined #git
04:18 Derperperd joined #git
04:18 puff Hello71: I think ojacobson or somebody used some colorful phrase for it, "rescue repo" or something.
04:25 cluelessperson joined #git
04:26 mizu_no_oto joined #git
04:29 Emperor_Earth joined #git
04:29 govg joined #git
04:31 Cabanoss- joined #git
04:32 zzz joined #git
04:37 gonzolo joined #git
04:44 endiruna2 joined #git
04:44 hobodave joined #git
04:44 mehola joined #git
04:48 svm_invictvs joined #git
04:48 hexagoxel joined #git
04:50 dwmw2_gone joined #git
04:54 jimklo joined #git
04:55 MineCoins joined #git
04:59 belak_ joined #git
05:01 elmcrest joined #git
05:02 angular_mike_ joined #git
05:08 Lc0rE joined #git
05:09 ayogi joined #git
05:10 raspado joined #git
05:11 mgver joined #git
05:11 gelei007 joined #git
05:12 mgver joined #git
05:13 mohabaks joined #git
05:16 ruxu joined #git
05:22 Pursuit joined #git
05:28 pks joined #git
05:31 ozmage joined #git
05:31 jameser joined #git
05:32 gelei007 joined #git
05:33 cdown joined #git
05:34 jab416171 joined #git
05:35 DolpheenDream joined #git
05:41 jameser joined #git
05:43 pks joined #git
05:51 jameser joined #git
05:55 sbulage joined #git
05:57 xall joined #git
05:57 MineCoins joined #git
05:58 PioneerAxon joined #git
06:01 venmx joined #git
06:02 dec0n joined #git
06:05 qt-x joined #git
06:07 brent__ joined #git
06:11 patarr joined #git
06:12 rscata joined #git
06:12 mohabaks joined #git
06:15 muthu joined #git
06:15 raijin joined #git
06:17 ertesx joined #git
06:18 checkItOut joined #git
06:21 scoobert1on joined #git
06:25 MrWoohoo joined #git
06:26 snowalpaca joined #git
06:26 snowalpaca joined #git
06:27 snowalpaca joined #git
06:29 mgver joined #git
06:30 Raging_Hog joined #git
06:30 snowalpa_ joined #git
06:31 snowalpaca joined #git
06:33 zacts joined #git
06:35 guidov joined #git
06:36 zeroed joined #git
06:36 zeroed joined #git
06:38 guidov Instead of creating a branch first, I accidentally made changes to my master branch of a forked repo, and issued a pull request to upstream with these changes (now accepted). Is there any way to sync my fork master with the upstream master now?
06:41 molloy guidov: have you tried checking out master (assuming it mirrors your fork master) then running git pull upstream master?
06:41 fatalhalt joined #git
06:44 ertes joined #git
06:44 dec0n joined #git
06:44 guidov molloy, i thought i had tried that already, but your strategy seems to work. thanks! (kind of a newbie still :) )
06:45 dersand joined #git
06:45 hobodave joined #git
06:46 dreiss joined #git
06:46 zeroed joined #git
06:50 overlord_tm joined #git
06:51 netj joined #git
06:52 vivu joined #git
06:53 cqi joined #git
06:53 vivuroy joined #git
06:53 checkItO_ joined #git
06:54 checkIt__ joined #git
06:55 molloy np guidov glad it helped :)
06:55 checkItO_ joined #git
06:57 checkItOut joined #git
06:59 ThomasLocke joined #git
07:04 acetakwas joined #git
07:09 navidr joined #git
07:10 matoro joined #git
07:12 peterR`` joined #git
07:13 lb1c joined #git
07:14 JeroenT joined #git
07:15 chachasmooth joined #git
07:17 ilian joined #git
07:18 ihradek joined #git
07:18 lordjancso joined #git
07:19 utanapischti joined #git
07:19 ilian left #git
07:23 xall joined #git
07:24 Elliott[m] joined #git
07:27 nd_ joined #git
07:27 elsevero joined #git
07:30 jokester joined #git
07:30 chele joined #git
07:31 jagob joined #git
07:31 ronskisika joined #git
07:32 elsevero_ joined #git
07:32 checkItOut joined #git
07:33 b100s joined #git
07:35 jnavila joined #git
07:40 sarri joined #git
07:40 sarri joined #git
07:40 freimatz joined #git
07:42 pks joined #git
07:44 Tobbi joined #git
07:51 alexs77 joined #git
07:52 Alienpruts joined #git
07:53 jay-m joined #git
07:55 jay-m joined #git
07:56 checkItOut joined #git
07:58 checkItO_ joined #git
07:59 Tobbi joined #git
08:02 venmx joined #git
08:03 miczac joined #git
08:04 alexs77 Hi. I'm having problems using Git submodules. I 1st cloned an internal repo with submodules. Next, I updated the repo with submodules like so: "git submodule update --remote". This changed the revision of a submodule to a quite old one. Why is that? Commands I ran: http://de.pastebin.ca/3767975
08:05 metachr0n joined #git
08:05 theoceaniscool joined #git
08:06 chipotle joined #git
08:12 patarr joined #git
08:12 cyphase_eviltwin joined #git
08:14 jast alexs77: if you use --remote, the version from the 'master' (or default) branch in the submodule repo is used. maybe the default branch didn't get updated in a while? you can set your own branch to use: git config submodule.foo.branch mybranch
08:18 Tobbi joined #git
08:20 MattMaker joined #git
08:21 govg joined #git
08:23 brent__ joined #git
08:27 bket joined #git
08:28 venmx joined #git
08:28 alexs77 jast: my submodule is in path "cookbooks/ew". How do I invoke git config in this case? I suppose, it would modify the .gitmodules file? I did: "git config submodule.cookbooks/ew.branch sdfsdf", but this didn't do anything, it seems.
08:28 Tobbi joined #git
08:29 pks joined #git
08:30 jast alexs77: I'm not actually sure what the name would be, look in .git/config (you should have a section [submodule "name here"] with a 'path' and 'url' entry with it)
08:31 muthu_ joined #git
08:33 alexs77 jast: i've got there: "[submodule "cookbooks/ew"] url = git@srv:cookbooks/ew.git". Now I ran "git config submodule.cookbooks/ew.branch sdfsdf". This modified the correct "section". But in .gitmodules, it still has a line "branch = some-old-branch". is git config not changing this file?
08:35 jimklo joined #git
08:36 rasto joined #git
08:40 venmx joined #git
08:44 Balliad joined #git
08:44 guardian` left #git
08:44 guardian joined #git
08:45 GodGinrai joined #git
08:46 guardian hello, I have a remote configured with an OLD url that redirects to a NEW url. When I fetch I get to see "warning: redirecting to NEW" <-- is it something Git added recently or is it the remote server that prints this message?
08:47 selckin https://github.com/git/git/blob/d7dffce1cebde29a0c4b309a79e4345450bf352a/remote-curl.c#L319
08:47 _ikke_ It's a git message
08:47 alexs77 jast: nevermind. turns out, a colleague manually modified the .gitconfig file without informing me. thanks a lot for your help, it was helpful :)
08:47 jast alexs77: correct. .gitmodules is not actually used by git once you've done 'git submodule init' (or cloned recursively, or whatever)
08:48 alexs77 jast: thanks ;)
08:48 jast if you want the change to propagate to others, manually update .gitmodules and have everyone re-init their submodules
08:48 _ikke_ guardian: it's farily recent
08:48 _ikke_ git:github:50d3413740d1da599cdc0106e6e916741394cc98
08:48 gitinfo Git web link: https://github.com/50d3413740d1da599cdc0106e6e916741394cc98
08:49 guardian thank you
08:49 _ikke_ git:github:git/git/50d3413740d1da599cdc0106e6e916741394cc98
08:49 gitinfo Git web link: https://github.com/git/git/50d3413740d1da599cdc0106e6e916741394cc98
08:49 guardian I find it useful :)
08:49 jast oh right, I wanted to make the syntax of that less insane
08:49 _ikke_ haha :D
08:50 Vampire0 joined #git
08:52 clmsy joined #git
08:52 jast git:: master:Documentation/
08:52 jast okay, needs some more work
08:53 jast git:: master:Documentation/
08:53 gitinfo Git web link: https://github.com/git/git/commits//
08:53 Tobbi joined #git
08:54 pihpah joined #git
08:54 jantje Hi. We have a fairly large repository (+15years of history, lots of commits) and after a 'git gc' we see 'push' times to mirrors increased to +70 seconds. I think it's due to the .pack size which is ~11GB, but I'm not sure how things looked before. I'm using git 2.8.4 and there is a bitmap index (though, I seem multiple .pack files, so I'm not sure if bitmaps are working?)
08:54 jantje (the previous push times to these mirrors were < 5 seconds)
08:55 xaa joined #git
08:56 llamapixel git is circa 2005
08:56 ThomasLocke joined #git
08:56 ThomasLocke joined #git
08:56 _ikke_ jantje: Hmm, this is something I have very little experience with
08:57 _ikke_ jantje: The mailing list might prove more helpfull in this case. They know quite more about the innerworkings what might causing this
08:58 selckin jantje: what protocol?
08:58 jast git:: master:Documentation/
08:58 gitinfo Git web link: https://github.com/git/git/tree/master/Documentation/
08:58 jast there we go, that should be easier to use
08:58 jast whitespace is optional
08:58 selckin i believe the logic to determine the diff and what to upload is differend between http git+ssh etc
08:58 jantje _ikke_: ok, but I always find mailing lists tricky. So public ;-)
08:59 jast testing: git[github jast/gitinfo] master:gitinfo.pl
08:59 gitinfo Git web link: https://github.com/jast/gitinfo/blob/master/gitinfo.pl
09:00 _ikke_ jantje: this channel is public too :-).\
09:00 _ikke_ But they are quite helpful
09:00 zzz joined #git
09:03 Not-963f joined #git
09:04 diogenese joined #git
09:05 jantje my objects/packs/ dir contains multiple .pack files and similarely named .keep files, not sure if they're used as they're unchanged for over a year.
09:07 _ikke_ You might want to repack it into  single pack then
09:08 _ikke_ git repack
09:08 skunkz joined #git
09:09 jantje so they're not unused left-overs from git-repack itselve?
09:09 miczac joined #git
09:09 jast I've added examples for the gitlink syntax to the bot's website
09:09 _ikke_ jast: thanks
09:10 marcogmonteiro joined #git
09:10 MrMojit0 joined #git
09:10 Karazhan joined #git
09:11 Karazhan joined #git
09:11 Guest73521 joined #git
09:12 mikecmpbll joined #git
09:12 p4trix joined #git
09:12 def_jam joined #git
09:12 eb0t_ joined #git
09:13 netj joined #git
09:13 muthu__ joined #git
09:15 thunderbirdtr joined #git
09:15 JeroenT joined #git
09:16 skunkz_ joined #git
09:16 denisMone joined #git
09:16 rscnyv joined #git
09:17 Snugglebash joined #git
09:17 muthu_ joined #git
09:17 Tobbi joined #git
09:18 sweatsuit joined #git
09:19 ertes joined #git
09:20 muthu joined #git
09:20 tvl joined #git
09:26 ribasushi joined #git
09:28 str joined #git
09:30 Jellyg00se joined #git
09:30 jay-m joined #git
09:31 _ADN_ joined #git
09:32 Dumblez0r joined #git
09:35 suttonwilliamd__ joined #git
09:38 borkr joined #git
09:38 manuelschneid3r joined #git
09:39 finalbeta joined #git
09:39 seni joined #git
09:40 gelei007 joined #git
09:43 Naan joined #git
09:43 ruxu joined #git
09:47 ph88 left #git
09:47 nettoweb joined #git
09:53 Masber_080 joined #git
09:55 mar77i hmm. how can I look through removed lines in past comits? I somewhat know what path I modified, but not at all what commit that was done
09:55 mar77i something like git blame but for lines that aren't remaining
09:56 djb-irc joined #git
09:56 ferr1 joined #git
09:56 zulutango joined #git
09:57 osse mar77i: git log -p -- file
09:57 osse use -S to search for a specific string
09:57 rivarun joined #git
09:58 jantje _ikke_: apparently splitting up the pack file in 256mb chunks makes it a whole lot better, but then no bitmaps
10:00 acetakwas joined #git
10:02 _ikke_ Hmm
10:05 flaviodesousa joined #git
10:05 nickabbey joined #git
10:09 thebinary joined #git
10:09 afuentes joined #git
10:10 Karazhan joined #git
10:12 mischat joined #git
10:13 patarr joined #git
10:13 mikecmpbll joined #git
10:13 Whiskey git archive master | 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on $directories(latest)/mycode.tar.7z <-- how can i make that work?
10:14 Whiskey current it just pack the folder its executed in
10:14 djb-irc joined #git
10:14 Whiskey thats fun :D
10:17 thebinary joined #git
10:17 jast Whiskey: -si
10:17 jast that's a 7z option, not a git option
10:19 Darcidride joined #git
10:21 scoobertron joined #git
10:21 jay-m joined #git
10:23 Drzacek joined #git
10:23 Drzacek ls
10:23 Drzacek ls
10:23 Drzacek sry, wrong window!
10:23 Drzacek Hello
10:24 Drzacek I have problem with cloning my repo from remote (on network drive) - I can clone just fine on my laptop, but on other machine I get error - rather obvious one - about not having enough free space
10:24 jast hi :)
10:25 jast so, free up some space, I guess...
10:25 Drzacek bare repo on remote is ~360mb big, the working dir (aka cloned repository) on my laptop is ~500mb big. On the other machine I have about 1.5gb free space left
10:25 tvw joined #git
10:25 jast not all of the free space is necessarily available for applications
10:26 Drzacek so does the git do some uncompressing while copying project, and then compress it back, or I don't understand something
10:26 jast in Linux filesystems, usually a percentage of total disk space is reserved for system/superuser usage
10:26 Drzacek jast, damn
10:26 jast normally the pack file is simply streamed to disk
10:26 govg joined #git
10:26 jast is this a Linux system we're talking about?
10:26 Drzacek yes
10:26 chll_ joined #git
10:26 Drzacek okay, I know where the problem is
10:26 Drzacek and I feel silly again
10:27 jast ah well, as long as you figure things out that's all that matters
10:27 Drzacek I was working the whole time with single-partition system (worked well for me in this case). But some time ago I changed it and made separate home partition. OK all is clear now
10:27 jast great
10:28 Tobbi joined #git
10:28 Drzacek guess no way to resize the partitions if they are non LVM?
10:30 c0c0 joined #git
10:30 durre joined #git
10:31 tcorneli joined #git
10:32 jast if there is free space right after the partition, you can resize it, but it's a bit fiddly
10:33 Rico left #git
10:33 Vampire0_ joined #git
10:34 Whiskey jast: si?
10:35 jast Whiskey: -si, it's a flag for 7z to make that thing you want to do work
10:35 Whiskey then i get Can't allocate required memory!
10:36 jast then maybe your compression settings are too extreme
10:36 Whiskey not really
10:36 jast how much code are we talking about here, anyway?
10:36 Whiskey not mutch
10:37 Whiskey 200 files in 75 files in 300KiB
10:37 Whiskey so thats nothing
10:37 Whiskey sorry, 75 files in 300KiB
10:38 jast that's strange, then... but I don't know 7z that well. try with less options just to see if it will work at all: ... | 7z a -si foo.7z
10:39 jast oh, I see, in that mode it seems to want to generate a 7z-compressed tarball, not a 7z archive
10:39 brent__ joined #git
10:39 jast if you do absolutely want to use the 7z format I think it's not going to be possible without creating some temporary files
10:39 Whiskey yeh that work
10:40 Whiskey but it won´t pack the files as them are
10:41 dsdeiz joined #git
10:42 acetakwas joined #git
10:43 marcogmonteiro joined #git
10:45 Whiskey strange
10:46 GodGinrai joined #git
10:47 cyphase joined #git
10:48 Karazhan joined #git
10:48 hobodave joined #git
10:53 ankit01ojha joined #git
10:54 patarr joined #git
10:58 muldover joined #git
10:59 netj joined #git
11:00 leeN joined #git
11:00 govg joined #git
11:07 serialoverflow joined #git
11:09 Tobbi joined #git
11:10 _Cyclone_ joined #git
11:11 stamina joined #git
11:12 BackEndCoder joined #git
11:13 raspado joined #git
11:21 monk12|2 joined #git
11:22 chipotle joined #git
11:22 algun__ joined #git
11:23 nimbleark joined #git
11:28 miczac joined #git
11:29 finalbeta1 joined #git
11:31 peepsalot joined #git
11:33 basy joined #git
11:33 ToBeCloud joined #git
11:33 seni joined #git
11:36 mischat_ joined #git
11:37 pbrewczynski joined #git
11:39 Tobbi joined #git
11:42 ephimetheus joined #git
11:49 dec0n joined #git
11:53 Snugglebash joined #git
11:54 jay-m joined #git
11:54 darkbit joined #git
11:55 mischat joined #git
11:57 jameser joined #git
12:06 Peetz0r joined #git
12:07 jameser joined #git
12:08 JeroenT joined #git
12:08 fletom joined #git
12:08 cyphase joined #git
12:11 JeroenT joined #git
12:11 cyphase joined #git
12:13 cyphase joined #git
12:13 ocbtec joined #git
12:14 aw1 joined #git
12:16 jameser joined #git
12:16 mischat_ joined #git
12:18 aax joined #git
12:19 Cavallari joined #git
12:20 Tobbi joined #git
12:20 Snugglebash joined #git
12:22 wootehfoot joined #git
12:23 chipotle joined #git
12:24 a3Dman joined #git
12:25 mischat joined #git
12:26 Darcidride joined #git
12:26 CheckDavid joined #git
12:27 jimi_ joined #git
12:27 ispn joined #git
12:27 neeri joined #git
12:29 sevenever joined #git
12:29 YuGiOhJCJ joined #git
12:30 re1 joined #git
12:31 JeroenT joined #git
12:32 finalbeta joined #git
12:32 Midas joined #git
12:35 b100s hi2all
12:36 b100s can i find out are there any branchs point on specific commit?
12:39 Midas left #git
12:39 Midas joined #git
12:39 Midas left #git
12:40 jeromeico joined #git
12:40 osse b100s: git branch --points-at adf35fa3
12:40 DolpheenDream joined #git
12:41 b100s osse, unknown option
12:41 modin b100s: git branch --contains SHA
12:41 b100s modin, a lot brnaches
12:41 moritz git log -1 --decorate adf35fa3
12:41 osse b100s: too old git then
12:42 osse modin: that's not the same
12:42 modin true
12:42 Rh0nda left #git
12:42 Kehet joined #git
12:42 Rhonda joined #git
12:42 Rhonda joined #git
12:44 JeroenT joined #git
12:46 oaao joined #git
12:47 GodGinrai joined #git
12:48 mizu_no_oto joined #git
12:49 raijin joined #git
12:50 miklcct joined #git
12:51 marcogmonteiro joined #git
12:52 PCatinean_ joined #git
12:52 jameser joined #git
12:54 xaa joined #git
12:54 a3Dman joined #git
12:56 brent__ joined #git
12:57 rnsanchez joined #git
12:58 jameser joined #git
12:59 bruce_lee joined #git
13:00 byte512 joined #git
13:00 dendazen joined #git
13:01 synthroid joined #git
13:01 boombatower joined #git
13:03 Derperperd joined #git
13:05 aax joined #git
13:05 ShoaibJahejo joined #git
13:05 Cavallari1 joined #git
13:07 Tobbi joined #git
13:07 jameser joined #git
13:08 JeroenT joined #git
13:10 JeroenT joined #git
13:15 Gloomy joined #git
13:15 daynaskully joined #git
13:19 ShoaibJahejo joined #git
13:19 kentnl Is there a narrower version of --pickaxe-regex -S  ?  I want to check for lines that add/remove a specific character, but all I can manage to do is match all changes on lines that *contain* that character, ... which is more than I want.
13:20 kentnl eg: "([~ ]foo)"  because I want instances where " foo" became "~foo", but instead I'm getting lines where "~foo" didn't change, but other characters on the line did.
13:22 black_silence joined #git
13:22 dviola joined #git
13:23 ShoaibJahejo joined #git
13:23 inflames joined #git
13:24 mischat_ joined #git
13:24 mischat_ joined #git
13:25 black_silence hey. some time ago mergetool stopped working, always tells me there are no files that need merge but in status I see unmerged files and conflict markers in those files. any idea how to debug mergetool and get it working again?
13:26 ShoaibJahejo joined #git
13:27 Impaloo joined #git
13:27 miczac_ joined #git
13:27 _ikke_ git config -l
13:27 serialoverflow joined #git
13:27 re1_ joined #git
13:28 wiesel joined #git
13:29 kentnl black_silence: specify the path to the problem file or its parent directory
13:29 kentnl <git mergetool --tool=foo ./problem/file>
13:30 kentnl I fought that sucker so long and all the advice in the world didn't help
13:30 GodGinrai joined #git
13:31 black_silence kentnl: thanks. that's rather easy but I don't really understand why it doesn't default to the current directory anymore.
13:31 acetakwas joined #git
13:31 Gustavo6046 joined #git
13:31 Gustavo6046 hi
13:31 gitinfo Gustavo6046: 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.
13:31 black_silence "git mergetool ." instead of "git mergetool" is a weird change
13:32 Gustavo6046 I need to delete 3 commits on a github repo: the original fuck-up, the reversal, and the reversal reversal
13:32 kentnl I recall it being something to do with rerere, but yeah, I really wish I knew what was wrong too. I got lucky :/
13:32 _ikke_ 'git mergetool' works for me
13:32 osse Gustavo6046: are there commits later than those three in that branch ?
13:32 Gustavo6046 nope
13:32 black_silence it used to work for me too for years
13:32 Gustavo6046 oh and sorry for the bad word
13:32 osse Gustavo6046: then force-push the fourth latest commit
13:33 Gustavo6046 ok
13:33 Gustavo6046 I use github desktop
13:33 aax joined #git
13:33 Gustavo6046 but I'll try using git bash
13:33 kadoban joined #git
13:33 Snugglebash joined #git
13:33 black_silence "git reset --hard HEAD~3 && git push -f" I'd say?
13:34 RxMcDonald joined #git
13:34 RxMcDonald Hi, anyone knows how to find in which commit a file got deleted?
13:35 osse RxMcDonald: git log -- path/to/file
13:35 _ikke_ RxMcDonald: git log --diff-filter=D <path>
13:35 Gustavo6046 I am not very good with git commands, sorry
13:35 Gustavo6046 I guess it's "git force-push" followed by something
13:36 osse git push -f origin branch~3:branch
13:36 tobiasvl Gustavo6046: black_silence gave you the command
13:36 Gustavo6046 oh ok
13:36 tobiasvl or osse gave an alternate one
13:36 Gustavo6046 thanks
13:36 Gustavo6046 I'll try one and then the other
13:36 Gustavo6046 if the first doesn't works
13:36 osse the reset --hard is most likely desirable too. go with what black_silence said
13:37 Gustavo6046 ok
13:37 osse make sure you have the correct branch checked out
13:37 Gustavo6046 Is this push.default thing a big error?
13:37 Gustavo6046 ok
13:37 Gustavo6046 done
13:38 Gustavo6046 thank you
13:38 black_silence the push.default is only a notice afair
13:39 Gustavo6046 oh ok.
13:39 black_silence you can set a proper value to get rid of the notice
13:40 jeromeico joined #git
13:41 Gustavo6046 ok
13:41 Gustavo6046 ty
13:41 justanotheruser joined #git
13:41 venmx joined #git
13:41 str joined #git
13:45 marcogmonteiro joined #git
13:45 jantje joined #git
13:45 navidr joined #git
13:48 jeromeico hello, when I do npm install but I got these errors : " git_dir too big "and " file name too long " https://postimg.org/image/bgcfmf84d/
13:51 hobodave joined #git
13:51 ocbtec joined #git
13:51 Tobbi joined #git
13:52 thebird joined #git
13:52 kadoban jeromeico: Probably ask the node people
13:53 bsanford joined #git
13:54 jeromeico kadoban ok thanks
13:54 canton7 jeromeico, windows has a limit on the lengths of paths. Looks like the git repo you're trying to clone has paths which exceed that limit (when placed in C:\Users\Jerome\AppData\Roaming\npm-cache\_git-remotes, at least"
13:55 canton7 hmm, git doesn't seem to think that the core.longpaths option is a thing
13:55 eroussel joined #git
13:56 jeromeico canton7 i did git config --system core.longpaths true but it still doesn't work : /
13:56 kadoban I don't think it's going to matter though, even that one part that doesn't look like a git message says "Filename too long"
13:58 jeffreylevesque joined #git
14:01 jay-m joined #git
14:02 mkoskar joined #git
14:02 mischat joined #git
14:02 moei joined #git
14:04 treia joined #git
14:05 cdg joined #git
14:05 jimi_ joined #git
14:06 gugah joined #git
14:06 Tobbi joined #git
14:09 gugah joined #git
14:10 prg3 joined #git
14:10 King_Hual joined #git
14:10 King_Hual joined #git
14:12 cdown_ joined #git
14:12 cdg_ joined #git
14:14 theoceaniscool joined #git
14:15 tlaxkit joined #git
14:15 jrm joined #git
14:16 theoceaniscool_ joined #git
14:18 ResidentBiscuit joined #git
14:19 ruxu joined #git
14:23 j0hn joined #git
14:24 Drzacek left #git
14:24 Gsham joined #git
14:24 jeromeico joined #git
14:24 nowhere_man joined #git
14:25 raijin joined #git
14:25 l4v2 joined #git
14:26 Dougie187 joined #git
14:27 tusharmalik joined #git
14:27 Guest7944 Hi, i'm experiencing real slowness in git on OSX, i'm pretty sure it wasn't like this yesterday but i don't know what changed. I don't think its related to internet connection because even performing an stash will take up to 12 seconds. Here's a trace with details: http://pastebin.com/Cy1Xzgp8
14:28 tobiasvl NFS?
14:28 moritz Guest7944: are you maybe low on RAM?
14:28 Tobbi joined #git
14:29 Guest7944 i'm not swapping but i'm using 10gb out of 16
14:30 moritz should be enough free ram to have a decent buffer cache
14:30 mischat_ joined #git
14:30 ShekharReddy joined #git
14:31 mischat_ joined #git
14:32 Gustavo6046 joined #git
14:32 sonOfRa joined #git
14:32 Zoxc joined #git
14:33 jrm joined #git
14:34 j0hnasd joined #git
14:34 Ryanar joined #git
14:34 bomb-on joined #git
14:35 GodGinrai joined #git
14:36 j0hnasd sorry, it was me who was asking about the slowness, accidentaly closed the wrong tab
14:37 moritz j0hnasd: is a network file system involved? has the repo grown significantly during the last 24h?
14:37 moritz is your partition or disk nearly full?
14:37 j0hnasd moritz: nope, just tried on an empty git repo
14:38 osse j0hnasd: prepend GIT_TRACE=1 to your commands
14:38 j0hnasd moritz: 771G free
14:39 mgedmin if I had a nickel for every time I painstakingly split my changes with git add -p and then do a git commit -a ...
14:40 moritz ... you'd be called nickeledim :-)
14:41 j0hnasd moritz: osse: http://pastebin.com/YxxsYDxJ
14:41 jimi_ joined #git
14:42 osse hmm that didn't take so long
14:42 j0hnasd it took 2 seconds now to do the stash
14:42 j0hnasd let me get up the services that were using my ram and see if that triggers it
14:42 BackEndCoder joined #git
14:43 moritz but 2 seconds on a nearly empty repo is still unusually slow
14:43 moritz I'd expect more like 0.2s on a modern-ish machine
14:43 j0hnasd oh i know how to trigger it
14:43 j0hnasd i have 2 git versions installed
14:44 j0hnasd i recently installed one from git-scm.com because my git (apple build or something) was hanging my terminals
14:45 j0hnasd /usr/bin/git --version git version 2.10.1 (Apple Git-78)
14:45 j0hnasd usr/local/bin/git --version git version 2.10.1
14:45 j0hnasd oops missed an slash
14:45 osse maybe Apple added sleep(10)
14:46 j0hnasd nope, it's the /usr/local/bin/git which is slower
14:46 j0hnasd but i'm affraid that if i use the apple build my terminal will crash again
14:46 crose joined #git
14:47 j0hnasd http://pastebin.com/P2GTJcRh
14:47 j0hnasd that is using the latest git from git-scm
14:48 griffindy joined #git
14:48 Murr joined #git
14:52 thebird joined #git
14:52 hobodave joined #git
14:52 Tobbi joined #git
14:53 troulouliou_div2 joined #git
14:53 kpease joined #git
14:57 thebird joined #git
15:03 traxo-xx joined #git
15:03 Es0teric joined #git
15:05 dendazen joined #git
15:07 borkr joined #git
15:08 thebope joined #git
15:08 Derperperd joined #git
15:09 ResidentBiscuit joined #git
15:09 suttonwilliamd__ joined #git
15:09 MACscr_ joined #git
15:10 j0hnasd joined #git
15:12 LeBlaaanc joined #git
15:12 kikero joined #git
15:13 jgrasser joined #git
15:14 raspado joined #git
15:14 marc_v92 joined #git
15:17 nettoweb joined #git
15:18 acetakwas joined #git
15:19 eroux joined #git
15:25 AaronMT joined #git
15:27 mischat joined #git
15:27 timvisher joined #git
15:27 mischat joined #git
15:31 Eryn_1983_FL joined #git
15:31 Vampire0 joined #git
15:31 zumba_addict joined #git
15:31 zumba_addict hey folks, what is the ideal way of pulling only a specific file from a git repo?
15:31 Tobbi joined #git
15:32 whitby zumba_addict: sparse checkout?
15:32 zumba_addict is this good? git checkout HEAD -- main.c
15:32 zumba_addict oh, i need to specify the repo link
15:33 zumba_addict for example, I want to download the CHANGELOG from git@github.com:lodash/lodash.git, how do I do that?
15:34 _ikke_ zumba_addict: Git has no way of pulling single files from a remote repository
15:34 zumba_addict oh
15:34 skunkz joined #git
15:35 zumba_addict so the solutions here are hacky - http://stackoverflow.com/questions/2466735/how-to-checkout-only-one-file-from-git-repository
15:35 black_silence wget https://github.com/lodash/lodash/blob/master/CHANGELOG ?
15:36 whitby That
15:36 whitby Or try http://stackoverflow.com/a/4909267/1267663
15:36 DammitJim joined #git
15:36 zumba_addict or I can git clone the branch and have the directory be included in .gitignore
15:36 DammitJim what is the recommended way to backup git repositories?
15:36 DammitJim I'm looking at this from the sysadmin perspective
15:36 DammitJim I do backups of the VM with Veeam, but also want to perform file level backups
15:37 whitby DammitJim: tarballs
15:37 Gustavo6046 VirtualBox ftw
15:39 bremner DammitJim: I just block pushes (using gitolite), then use standard backup software
15:39 DammitJim oh ok, so no exports or anything like that?
15:39 DammitJim someone was telling me to clone my repo to another server
15:40 shinnya joined #git
15:42 bremner depends on the level of safety you need.
15:42 venmx joined #git
15:42 ToxicFrog DammitJim: cloning/pushing will back up your commit history, but not your .git/config (remotes, pull/merge configuration) or .git/hooks
15:42 ToxicFrog Or untracked/uncommitted changes.
15:42 mgedmin http://jefferai.org/2013/03/29/distillation/ is a fun story about broken backups that tried to just mirror the git repos
15:43 DammitJim oh gosh
15:43 aliencat joined #git
15:43 DammitJim here is the dumbest question of the day
15:44 aliencat hey I wanna pull something without commiting my changes, how can I do it?
15:44 Xe DammitJim: 42
15:44 tan1k joined #git
15:44 whitby aliencat: pull --autostash
15:45 mischat_ joined #git
15:45 aliencat there are no --autostash command
15:46 whitby You mean flag?
15:46 aliencat yeah
15:46 whitby `git pull --autostash`
15:46 aliencat no such thing
15:46 thebird joined #git
15:46 Darren_ joined #git
15:46 aliencat error: unknown option `autostash'
15:47 whitby There is such a thing. You might be using an older version of Git.
15:47 mischat_ joined #git
15:47 aliencat git version 2.7.4
15:47 whitby In which case, `git stash; git pull; git stashpop`
15:47 aliencat git: 'stashpop' is not a git command.
15:47 aliencat ./
15:47 aliencat :/
15:47 ToxicFrog 'git stash pop'
15:48 ToxicFrog It was a typo.
15:48 whitby Sorry, yeah
15:48 whitby ToxicFrog is right
15:48 aliencat error: Your local changes to the following files would be overwritten by merge:
15:49 aliencat even if I do git stash
15:49 aliencat or git stash pop
15:49 black_silence you have files that are not added but would be overwritten
15:49 patarr joined #git
15:49 black_silence stash doesn't save them
15:49 aliencat so what should I do?
15:49 whitby Commit them probably :)
15:50 black_silence either move them or add then stash
15:50 trelane joined #git
15:50 trelane joined #git
15:50 aliencat ok I deleted the file :/
15:50 black_silence that's also a solution
15:51 aliencat seems to work now, thanks
15:51 RxMcDonald left #git
15:52 shgysk8zer0_ joined #git
15:54 maap joined #git
15:54 hobodave joined #git
15:55 Es0teric joined #git
15:55 Khisanth joined #git
15:58 robotroll joined #git
15:59 noteness joined #git
15:59 zzz joined #git
16:00 ckb joined #git
16:00 Snugglebash joined #git
16:04 sbulage joined #git
16:06 bahamas joined #git
16:06 tang^ joined #git
16:07 salamanderrake joined #git
16:08 bahamas hello. I have this weird situation where I have several repos with similar (identical) files. I made some changes into one repo and I want to apply them to the other repos. I did git diff > cleanup.patch; git apply -p1 ../cleanup.patch, but 0 files are modified. how can I make this work?
16:08 bomb-on joined #git
16:09 bahamas I could use patch, but git knows how to keep changes in the same file, while patch creates files for each rejected chunk
16:09 Vampire0_ joined #git
16:09 DammitJim what do you guys think about git bundle?
16:11 Es0teric joined #git
16:11 Darcidride joined #git
16:12 Tobbi joined #git
16:13 qqx When I need to use git bundle I find it to be a pain, but not nearly as much of a pain as if it wasn't an option.
16:14 moritz bahamas: do those repos have a common history
16:14 overlord_tm joined #git
16:16 Vampire0 joined #git
16:16 maap left #git
16:17 bahamas moritz: no
16:20 brent__ joined #git
16:21 bahamas moritz: is this happing because git apply looks at the commit hashes? can I make it ignore those?
16:22 moritz bahamas: is what happening?
16:23 nckpz joined #git
16:23 bahamas moritz: the fact that git apply doesn't apply my diff
16:24 jimklo joined #git
16:24 Snugglebash joined #git
16:25 moritz likely not
16:25 moritz I guess the patch doesn't apply cleanly
16:25 rancyd joined #git
16:28 bahamas moritz: shouldn't it say something about an error? I'm using git apply --check
16:28 PresidentBiscuit joined #git
16:30 Derperperd joined #git
16:30 Anticom joined #git
16:30 BackEndCoder joined #git
16:32 Darren_ joined #git
16:33 raspado joined #git
16:33 sathed joined #git
16:34 thebird joined #git
16:36 moritz bahamas: if git apply --check doesn't report an error, git apply should work
16:36 moritz but --check explicitly suppresses application of the patch
16:36 MineCoins joined #git
16:40 BackEndCoder joined #git
16:40 eroussel joined #git
16:40 publio joined #git
16:44 ertes joined #git
16:45 gugah joined #git
16:46 synthroid joined #git
16:48 reconx86 joined #git
16:48 durre joined #git
16:49 bahamas moritz: well, when I use git apply without --check nothing happens. no file is changed
16:50 DolphinDream howdy
16:50 Guest85 joined #git
16:50 DolphinDream how do you cherrrypick and add a SHA of the commit you cherrypick to the message ?
16:51 robattila256 joined #git
16:52 miczac joined #git
16:52 marc_v92 joined #git
16:52 durham joined #git
16:53 durham joined #git
16:56 moritz DolphinDream: it's like, totally in the man page
16:56 moritz DolphinDream: man git cherry-pick
16:56 gitinfo DolphinDream: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html
16:56 moritz I could read it and look up the option, but you can do that too :-)
16:58 jccn joined #git
16:58 MrLawrence joined #git
17:01 JanC_ joined #git
17:02 svm_invictvs joined #git
17:04 borkr joined #git
17:04 Celelibi How can I see kn HEAD some statistics about the author of the lines of code?
17:04 Celelibi Something like git blame, but just statistics.
17:05 svm_invictvs joined #git
17:08 YuGiOhJCJ joined #git
17:08 dave0x6d joined #git
17:09 cagmz joined #git
17:11 madewokherd joined #git
17:13 cdown joined #git
17:16 noteness left #git
17:16 jozwior joined #git
17:16 noteness joined #git
17:16 mischat joined #git
17:16 Snugglebash joined #git
17:19 tyreld joined #git
17:19 SirOliver joined #git
17:20 SirOliver joined #git
17:21 MineCoins joined #git
17:21 Murii joined #git
17:23 thebope joined #git
17:24 svm_invictvs joined #git
17:25 jerv_ joined #git
17:26 solarfly joined #git
17:27 Snugglebash joined #git
17:27 POQDavid_ZNC joined #git
17:27 Tobbi joined #git
17:27 Snugglebash joined #git
17:28 jerv_ left #git
17:28 jerv joined #git
17:28 jerv I want to write commit information to a sql db after the commit has been pushed to the server. It looks like the `post-update` hook is what I'm looking for. I was wondering, does the remote repo wait with updating new refs until all `post-update` hooks are ran?
17:29 freddymungo joined #git
17:30 jerv E.g. say master gets updated to c1 and then to c2 (i.e. c1 is an ancestor of c2), goes git ensure that the my `post-update` hook for c1 will finish before it will run the hook for c2? Or should I implement locking?
17:31 canton7 jerv, bear in mind that post-receive supercedes post-update
17:31 dviola joined #git
17:32 jerv canton7: I only want to write if refs are updated though (i.e. commit is not rejected)
17:32 diego2 joined #git
17:32 diego2 joined #git
17:33 canton7 jerv, hmm? they're invoked at the same time. The difference is that post-receive supercedes post-update, and it gets more info (both the old a new values for all refs, and their names)
17:33 nowhere_man joined #git
17:33 raynold joined #git
17:33 canton7 and no, I don't believe there's anything to stop two post-receive/post-update hooks being run at the same time
17:33 Whiskey git archive master <- how do i do to unpack this files to a specefic folder?
17:34 canton7 Whiskey, first example in man git archive
17:34 gitinfo Whiskey: the git-archive manpage is available at http://jk.gs/git-archive.html
17:34 phy1729 joined #git
17:35 Whiskey i don´t get it
17:35 canton7 what don't you get?
17:35 phy1729 If git rev-list --objects --all | grep <blobid>   comes up empty, but it still exists (verified with cat-file) after git reflog expire --expire=now --all && git gc --prune=now --aggressive    what might be the cause / how can I figure out the path name (so I can add it to lfs)
17:35 Whiskey git archive HEAD | (cd /var/tmp/) <- will that unpack them in var/temp
17:36 Whiskey i don´t see why the example use prefix for last directory
17:36 mischat joined #git
17:36 canton7 Whiskey, "use prefix for last directory"?
17:36 canton7 you asked how to extract a tar file to a specific directory. The example shows you how - cd to that directory, then extract the tar as normal
17:36 Whiskey yeh it what it says
17:37 Whiskey oo so it always come as a tar?
17:37 jost__ joined #git
17:37 canton7 '--format=tar' makes it output a tar, yes
17:37 chardan joined #git
17:37 Whiskey yes i do get that, but whitout it just output it
17:37 canton7 it defaults to tar if you don't give it an output filename
17:37 canton7 "it just output it"?
17:38 Whiskey yeh, i can see all files in my console
17:38 canton7 I appreciate there might be a language barrier here, but please make an effort to clearly express yourself
17:39 Whiskey but i use git archive master
17:39 invisbl joined #git
17:39 NeXTSUN joined #git
17:40 canton7 Whiskey, 'git archive master' sends the tar archive to stdout
17:40 Whiskey yeh is it no way to unpack it that way
17:40 canton7 pipe it to tar, as the first example does
17:41 Whiskey git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -) <-- what is junk?
17:41 Whiskey Create a tar archive that contains the contents of the latest commit on the current branch, and extract it in the /var/tmp/junk directory.
17:41 Whiskey i don´t get it
17:41 canton7 `--prefix=<prefix>/ Prepend <prefix>/ to each filename in the archive. `
17:42 canton7 look, if you want to extract all files to '/foo/bar', do 'git archive master | (cd /foo/bar && tar xf -)'
17:42 venmx joined #git
17:42 Whiskey exactly
17:42 Whiskey thanks
17:43 canton7 where's the confusion?
17:44 BSaboia joined #git
17:47 Whiskey nothing in that one
17:50 Tobbi joined #git
17:51 vuoto joined #git
17:52 lmat joined #git
17:54 digidog joined #git
17:54 marc_v92 joined #git
17:56 jbitdrop joined #git
17:58 SirCmpwn joined #git
17:59 jmesmon joined #git
17:59 dsantiago joined #git
18:00 jmesmon Is there a way to have `git log` decorate commits that are in the reflog with `HEAD@{1}` (and similar) in the same way that it decorates other refs when `--decorate` is passed?
18:00 mischat joined #git
18:01 jmesmon [no specific format needed, just would like to be able to see at a glance when something is in the reflog in some cases]
18:01 canton7 jmesmon, there's -g, but I don't know of a way to merge together the normal history and the reflog
18:02 brent__ joined #git
18:03 a_l_e joined #git
18:03 jmesmon canton7: `--reflog` already allows me to include the logs from each commit in the reflog, I'm not looking for the history of the reflog (as `-g`/`--walk-reflog` sounds like it provides), I'm just looking for markers on the commits.
18:04 * jmesmon has never used --walk-reflog, so doesn't know the exact purpose
18:04 mikecmpbll joined #git
18:05 jmesmon looks like it shows the same commits as `git reflog`, but in a different format. Not really what I'm after.
18:06 tcorneli joined #git
18:06 canton7 btw - "decorate commits that are in the reflog with `HEAD@{1}` (and similar)" - do bear in mind that *all* commits will be in at least 2 reflogs
18:07 canton7 ok, that's not true for commits which were fetched from elsewhere - ignore that
18:09 grym how can i use `git describe` to get the most current tag?  (not the most current commit, which seems to be the default )
18:09 bket joined #git
18:10 bomb-on joined #git
18:11 jmesmon ya, most commits for the repo I'm working with aren't in the reflog. they're fetched.
18:11 jmesmon grym: how do you define "most current"?
18:12 canton7 grym, you just want the latest tag name for a given commit? something like `git describe $(git rev-list --tags --max-count=1`
18:12 canton7 that will walk backwards through the history of the current branch until the first tag it finds
18:15 grym jmesmon: the reachable tag whose date is most close to nwo
18:15 grym now*
18:16 grym canton7: that's what i want, i think
18:17 jmesmon That may hinge on what order `git rev-list --tags` returns tags in. I can't find a reference to their sort order.
18:18 Spinkzeit joined #git
18:18 POQDavid_ZNC joined #git
18:19 ayogi joined #git
18:19 ayogi joined #git
18:20 jmesmon grym: canton7: perhaps `git tag --sort taggerdate | tail -n1`
18:20 thiago joined #git
18:21 Spinkzeit joined #git
18:22 grym jmesmon: thanks!
18:23 bgerber joined #git
18:23 z1haze_work joined #git
18:23 POQDavid_ZNC left #git
18:24 z1haze_work Hi, I have a repository that has like 5 commits on it, I dont want any of them, I actually just want to override everything with my new code. how would I do that?
18:24 POQDavid joined #git
18:24 marc_v92 z1haze_work: git push --force
18:24 govg joined #git
18:25 z1haze_work how do i remove those other commits though?
18:25 DolphinDream how do you cherrrypick and append the SHA of the commit you cherrypicked to the message ?
18:25 hahuang61 joined #git
18:25 GodGinrai joined #git
18:25 marc_v92 z1haze_work: The --force tag overwrites the entire repository you're pushing to.
18:25 marc_v92 With whatever its own history is.
18:25 z1haze_work so the whole history of commits will be gone?
18:25 z1haze_work alright thank you
18:25 GodGinrai z1haze_work: wait
18:25 bittin_ joined #git
18:25 marc_v92 z1haze_work https://git-scm.com/docs/git-push#git-push---force
18:26 GodGinrai z1haze_work: you are trying to get rid of commits that are local?
18:26 z1haze_work no, remote
18:26 z1haze_work my local is what i want to be on the remote
18:26 GodGinrai then yes, what marc_v92 suggested is correct
18:26 bittin_ joined #git
18:26 bittin_ at a small Git and Gitcourse at KTH, at Stockholm Powershell usergroup :)
18:26 z1haze_work alright thanks
18:26 GodGinrai beware, that this is a giant f you to anyone who also uses the repo
18:26 winfli joined #git
18:27 z1haze_work ok its brand new
18:28 winfli joined #git
18:29 zezba9000 joined #git
18:29 zezba9000 any idea why running "git gc" never quits and hangs on Windows?
18:30 ochorocho joined #git
18:30 hyperair joined #git
18:30 zezba9000 sometimes it does, sometimes it doesn't
18:31 marc_v92 joined #git
18:31 zezba9000 it seems like it finishes but never quits
18:32 zezba9000 ...thus I can't invoke it from an external app and wait for it to finish
18:32 zezba9000 ...because it sometimes never does
18:33 duderonomy joined #git
18:33 matoro joined #git
18:35 _ADN_ joined #git
18:35 kdeal joined #git
18:36 thebird joined #git
18:37 [ADN] joined #git
18:37 thebird joined #git
18:38 zezba9000 nvr mind
18:38 zezba9000 it was because I wasn't reading stdout
18:38 zezba9000 err error out I mean
18:39 thebinary joined #git
18:40 joshszep joined #git
18:40 eroussel joined #git
18:42 kasual joined #git
18:45 Ryanar joined #git
18:47 hobodave joined #git
18:49 zezba9000 ..although git gc can hang in git bash because of this
18:50 jimi_ joined #git
18:51 Es0teric joined #git
18:53 gugah joined #git
18:53 snowalpaca joined #git
18:53 bongjovi joined #git
18:53 d5sx43 joined #git
18:54 jstimm joined #git
18:56 Gsham joined #git
18:58 SirOliver joined #git
18:59 jnavila joined #git
18:59 nixjdm joined #git
19:02 brent__ joined #git
19:03 jccn joined #git
19:03 wizardedit joined #git
19:03 wizardedit joined #git
19:04 freddymungo joined #git
19:05 thiago joined #git
19:06 MattMaker joined #git
19:07 p4trix joined #git
19:07 Sasazuka joined #git
19:12 LiftLeft joined #git
19:12 mda1_ joined #git
19:15 Puffball joined #git
19:16 Rodya_ joined #git
19:17 matoro joined #git
19:19 scoobertron joined #git
19:20 sveinse left #git
19:21 wizardedit joined #git
19:22 TomyLobo joined #git
19:23 tinanoo joined #git
19:23 marc_v92 joined #git
19:23 fschuindt joined #git
19:24 webstrand joined #git
19:26 fschuindt I have merged master in a working branch and introduced some changes after it. How can I remove the merge commit from my branch and keep the changes? I've changed different files from those merged.
19:26 suttonwilliamd_ joined #git
19:26 m4sk1n joined #git
19:28 webstrand joined #git
19:28 jmesmon fschuindt: you can use git rebase with some arguments (depending on your setup) to remove the merge.
19:29 salamanderrake can you see an difference here that would cause git to refuse to switch branches?
19:30 salamanderrake could this be causing it, *.bat eol=crlf , inside the .gitattributes file?
19:31 duderonomy joined #git
19:32 HardlySeen joined #git
19:33 cdg joined #git
19:36 b100s joined #git
19:39 ecuanaso joined #git
19:40 bomb-on joined #git
19:41 manuelschneid3r joined #git
19:42 thebope joined #git
19:42 Zarthus joined #git
19:43 venmx joined #git
19:45 ResidentBiscuit joined #git
19:45 bathtub_shark joined #git
19:46 Rodya_ joined #git
19:46 Gustavo6046 joined #git
19:49 fatalhalt joined #git
19:49 cr34ton joined #git
19:53 Rodya_ joined #git
19:54 robotroll joined #git
19:55 systemovich joined #git
19:59 Gsham joined #git
19:59 thebope joined #git
20:02 kyan joined #git
20:04 grym left #git
20:04 ash_workz joined #git
20:04 WaReZ joined #git
20:07 invisbl joined #git
20:08 veki joined #git
20:12 thebope_ joined #git
20:15 nowhere_man joined #git
20:16 b100s joined #git
20:16 aw1 joined #git
20:19 shgysk8zer0_ joined #git
20:22 freddymungo joined #git
20:22 SirOliver joined #git
20:24 aidalgol joined #git
20:24 tvw joined #git
20:25 todd_dsm joined #git
20:26 acetakwas joined #git
20:28 thebird joined #git
20:29 bz joined #git
20:30 cygn9128d joined #git
20:31 cygn9128d left #git
20:36 Gloomy joined #git
20:39 marc_v92 joined #git
20:40 [ADN] joined #git
20:40 jorgevidaurre joined #git
20:40 veki left #git
20:42 venmx joined #git
20:42 thebope joined #git
20:43 Anja joined #git
20:45 thebope_ joined #git
20:47 madhur joined #git
20:48 SuprDewd joined #git
20:49 [Brain] joined #git
20:50 pooby joined #git
20:50 strugee joined #git
20:52 cdg joined #git
20:55 jmesmon salamanderrake: providing an error message & `git status` might allow us to give some feedback.
20:58 diogenese joined #git
21:00 le_melomane joined #git
21:01 roygbiv joined #git
21:02 b100s joined #git
21:02 BackEndCoder joined #git
21:02 Ryanar joined #git
21:02 dviola joined #git
21:03 jnavila joined #git
21:04 dsdeiz joined #git
21:07 Masber_080 joined #git
21:10 m0viefreak joined #git
21:16 bz left #git
21:19 henriquev joined #git
21:19 jeffreylevesque joined #git
21:19 nowhere_man joined #git
21:19 Sasazuka_ joined #git
21:22 solarfly joined #git
21:22 shgysk8zer0_ joined #git
21:23 GodGinrai joined #git
21:23 cdg joined #git
21:24 NeXTSUN joined #git
21:25 cdg joined #git
21:27 askb joined #git
21:28 puff Anyone have tips on checking an eclipse workspace into git?
21:28 jstimm joined #git
21:28 nowhere_man joined #git
21:30 synthroi_ joined #git
21:34 snowalpaca joined #git
21:34 ocbtec joined #git
21:34 nowhere_man joined #git
21:34 snowalpa_ joined #git
21:39 NwS joined #git
21:40 cdg joined #git
21:41 thebope joined #git
21:41 nowhere_man joined #git
21:44 nettoweb joined #git
21:45 Es0teric joined #git
21:46 nettoweb1 joined #git
21:46 alex1a joined #git
21:47 DammitJim did someone say on here that one can just tar the git repository and use that as a backup?
21:47 tsdev joined #git
21:47 ojacobson DammitJim: sure, provided you ensure no writes are in progress at the time.
21:47 ojacobson (Techncially you can take a tar mid-push or mid-commit, but it's tricky to ensure that the refs and objects are observed in a consistent state)
21:50 DammitJim ojacobson, thank you. something to consider...
21:50 DammitJim do I hear that git bundle is a good option?
21:51 ojacobson I don't know, I can't hear what you hear.
21:51 ojacobson However, git-bundle, git-clone, and tar all do _different things_, so you should pick the one/s that match your continuity and disaster-recovery nees
21:51 ojacobson needs
21:53 satifant joined #git
21:55 Atm0spher1c joined #git
21:58 jnavila joined #git
21:59 de-vri-es joined #git
21:59 oskarkv joined #git
22:02 denis_M joined #git
22:05 BlackFox joined #git
22:06 cdg joined #git
22:07 GavinMagnus joined #git
22:08 Xethron joined #git
22:08 cdg joined #git
22:09 blackwind_123 joined #git
22:09 MineCoins joined #git
22:10 Es0teric joined #git
22:15 thebope_ joined #git
22:19 SwiftMatt joined #git
22:21 GavinMagnus left #git
22:22 lungaro if I wanted a git alias which ran a bash command to determine a flags argument, can I do this?
22:22 thierryp joined #git
22:22 Eugene lungaro - yup. Start the alias with !, which indicates that it is to be executed by the shell instead of as a git subcommand
22:22 noteness joined #git
22:22 lungaro sweet
22:22 lungaro thanks
22:22 Eugene man git-config has a section under alias.*
22:22 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
22:22 lungaro i knew I saw the syntax somwehre, just escaped me
22:23 cdown joined #git
22:24 cdg_ joined #git
22:24 matoro joined #git
22:26 cdg_ joined #git
22:26 anioth joined #git
22:31 crose joined #git
22:32 peeps[lappy] joined #git
22:32 metachr0n joined #git
22:35 crayon joined #git
22:35 tonyyarusso joined #git
22:38 bomb-on joined #git
22:39 metachr0n joined #git
22:41 theoceaniscool_ joined #git
22:42 peterbecich joined #git
22:43 brent__ joined #git
22:43 Droolio joined #git
22:44 gugah joined #git
22:47 Gloomy joined #git
22:48 Gsham joined #git
22:48 Gloomy joined #git
22:49 Gloomy joined #git
22:50 Gloomy joined #git
22:50 meZee joined #git
22:50 Gloomy joined #git
22:51 matoro joined #git
22:51 gugah joined #git
22:52 jeffreylevesque_ joined #git
22:53 peterbecich joined #git
22:53 ISmithers joined #git
22:56 meZee joined #git
22:58 jeffreylevesque_ joined #git
22:59 zzz joined #git
22:59 peterbecich joined #git
23:00 thebope joined #git
23:01 fmeerkoetter joined #git
23:03 rxo_ joined #git
23:03 svm_invictvs joined #git
23:03 Dougie187 left #git
23:03 ertes joined #git
23:04 SirOliver joined #git
23:05 scoobert1on joined #git
23:06 thebope joined #git
23:07 jimi_ joined #git
23:07 thebope joined #git
23:12 chipotle joined #git
23:18 Sasazuka joined #git
23:18 BenderRodriguez joined #git
23:19 matoro joined #git
23:19 puff Does "git add ." ignore .files?
23:22 Ryanar joined #git
23:23 rxo_ joined #git
23:23 jaith joined #git
23:24 Nerbrun joined #git
23:24 venmx joined #git
23:24 ocbtec joined #git
23:25 jaith I'm hoping someone can confirm or advise an approach I want to take. I have a web project with some basic source code in /some/path -- this is not yet a working directory. I want to create a repo at /var/git/project and commit my source code from /some/path to the repo at /var/git/project
23:25 Kaisyu joined #git
23:25 preaction jaith: why?
23:26 llamapixel No it is more like an internal command for all files to git puff
23:26 johnny56_ joined #git
23:26 jaith I'm guessing I should a) init a bare repo in /var/git/project and then go to /some/path, do a git init and then change the remote to /var/git/project
23:26 jaith preaction: the repo is to be shared with other people, so I want the central repo where we collaborate to be at /var/git
23:27 jaith preaction: i want to use /some/path is my working directory
23:27 Vasistha joined #git
23:27 Rodya_ joined #git
23:27 preaction so, what i do in this situation is i have a bare repo on the server (that'd be your /var/git thing), and then i set up a post-receive hook to check out the files into the /var/www web directory where they can be served. i would not let people actually do _work_ in the prod web directory
23:29 Gustavo6046_ joined #git
23:29 jaith preaction: I don't need the hook yet. Just want to set up the centralized repo. Question is about how to turn an existing directory full of source code into working dir and commit to the centralized repo
23:29 Vasistha I have one branch in a repo; and I have another "version" of that repo, with a different branch. How to I pull a branch into my repo, without basing it on an existing branch? I'd like it to be "pure", exactly as it is in the repo I'm copying from, without modifications from the pulling repo
23:29 ResidentBiscuit joined #git
23:30 preaction jaith: create a bare repo in /var/git. init a blank repo in /home/jaith/website. copy /some/path to /home/jaith/website. commit. push to the /var/git remote
23:30 jaith preaction: e.g., /var/git/ is repo to share with my partners, /some/path is where my current laravel project is on my workstation
23:30 preaction ... so... you're hosting prod on your workstation?
23:30 peterbecich joined #git
23:30 jaith preaction: no, not hosting on my workstation....i was simplifying for convenience. /var/git is on a server somewhere
23:30 preaction in any case, i'd still use a bare repo to synchronize a bunch of other people's work. using a normal repo implies that people can work in that directory, and that's terrible
23:31 howitdo joined #git
23:31 preaction and, frankly, i'd use !gitolite to handle everything about hosting a git server
23:31 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/ Quick example: http://gitolite.com/gitolite/overview.html#basic-use-case
23:32 jaith preaction: what you describe is more or less what I want to do. question: if my working directory was not originally cloned from /var/git, how do I make some working directory push to /var/git?  I need to assign a remote, yes?
23:32 mike__ joined #git
23:32 jaith preaction: I plan to just use ssh protocol for access to /var/git on the server. It has worked swell in the past. I know there's a little permission stuff to deal with but I've managed in the past
23:33 preaction gitolite manages ssh access to repos, yes
23:33 preaction and yes, if your repo was not originally cloned from the remote, you add a new remote
23:36 ecuanaso joined #git
23:37 jaith preaction: what path would you ordinarily use for shared git repos on a server with a handful of websites?
23:37 jaith preaction: just wondering if there's some customary file path
23:37 preaction since i use gitolite, i use /home/git
23:38 jaith preaction: thanks
23:39 BenLubar joined #git
23:41 BenLubar I added this filter with a corresponding gitattributes line "foo.txt filter=utf-16 merge=union" to my project: http://pastebin.com/raw/ZAmVUUH3 How do I rebase other branches that edited that text file?
23:41 Gustavo6046 joined #git
23:43 BenLubar a normal rebase is giving me "warning: Cannot merge binary files: foo.txt ((null) vs. (null))" and not adding the changes to the file
23:46 todd_dsm joined #git
23:57 peeps[lappy] joined #git

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