Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-01

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

All times shown according to UTC.

Time Nick Message
00:00 sagerdearia joined #git
00:01 jcalonso joined #git
00:01 a3Dman joined #git
00:03 Ryanar joined #git
00:05 cdown joined #git
00:09 CalimeroTeknik joined #git
00:10 nettoweb joined #git
00:11 fatalhalt joined #git
00:11 autrilla left #git
00:16 eivarv joined #git
00:18 zyxep joined #git
00:18 Mixologic joined #git
00:18 watersoul_ joined #git
00:19 arooni joined #git
00:19 rafalcpp joined #git
00:19 g5pw joined #git
00:20 lus_ joined #git
00:21 tvw joined #git
00:21 cdown joined #git
00:21 grawity joined #git
00:21 xameada joined #git
00:21 zero85 joined #git
00:21 hyperair joined #git
00:22 rishi` joined #git
00:22 thekrynn joined #git
00:22 Celelibi joined #git
00:24 sea-gull joined #git
00:24 denimsoft joined #git
00:25 ghostlight joined #git
00:27 nanga joined #git
00:27 nanga joined #git
00:28 causasui joined #git
00:28 Gsham joined #git
00:28 causasui joined #git
00:30 e14 joined #git
00:30 Tykling joined #git
00:31 Gsham joined #git
00:32 cdown joined #git
00:33 btree left #git
00:34 Ryanar joined #git
00:36 anonymuse joined #git
00:36 sdothum joined #git
00:37 sangy joined #git
00:39 Ryanar joined #git
00:40 sdothum joined #git
00:40 Learath2 joined #git
00:40 Blkt joined #git
00:41 raijin joined #git
00:42 sdothum joined #git
00:45 CussBot joined #git
00:47 anuxivm left #git
00:48 e14 joined #git
00:48 jstimm joined #git
00:50 Darren_ joined #git
00:52 hahuang61 joined #git
00:53 Ryanar joined #git
00:53 Rumbles_ joined #git
00:58 shmuli joined #git
01:01 tristanp joined #git
01:02 snthsnth joined #git
01:03 holodoc joined #git
01:03 f4_ joined #git
01:04 Ryanar joined #git
01:04 e14 joined #git
01:08 boombatower_ joined #git
01:11 f4_ joined #git
01:12 f4_ joined #git
01:12 f4_ joined #git
01:12 f4_ joined #git
01:13 Ryanar joined #git
01:13 f4_ joined #git
01:15 Gsham joined #git
01:21 JamesBaxter joined #git
01:21 HoierM joined #git
01:26 Goplat joined #git
01:27 sssilver joined #git
01:32 jcalonso joined #git
01:32 leeN joined #git
01:32 GavinMagnus left #git
01:34 sagerdearia joined #git
01:35 fstd_ joined #git
01:37 Khisanth joined #git
01:37 durham_ joined #git
01:37 fahadash joined #git
01:40 Eugene joined #git
01:40 snowkidind joined #git
01:40 ayjay_t joined #git
01:41 watabou joined #git
01:42 Eugene joined #git
01:43 atesc joined #git
01:44 Raed|Mobile joined #git
01:44 shmuli joined #git
01:44 Darren_ joined #git
01:45 atesc joined #git
01:45 liuzhen joined #git
01:48 Jameser joined #git
01:50 tristanp joined #git
01:52 Vadtec left #git
01:52 a3Dman joined #git
01:53 xameada joined #git
01:55 Hello71 joined #git
02:00 enckse joined #git
02:00 _cyril_ joined #git
02:00 nettoweb joined #git
02:01 akurniawan joined #git
02:02 enckse joined #git
02:03 watabou_ joined #git
02:06 nettoweb1 joined #git
02:07 WhiskerBiscuit joined #git
02:09 inflames joined #git
02:10 jcalonso joined #git
02:11 raijin joined #git
02:13 steven_a_s joined #git
02:14 JamesBaxter joined #git
02:15 llamapixel Looking for a solution that will take a commit tag line and push it to a google spreadsheet automatically…  I have one that pipes the commits to csv at the moment.  IFTTT ?
02:15 llamapixel git log --date=local --pretty=format:"%h%x09%an%x09%ad%x09%s" > commits.local.tsv.txt
02:16 Ryanar joined #git
02:17 mehola joined #git
02:18 mizu_no_oto joined #git
02:25 Ryanar joined #git
02:26 anonymuse joined #git
02:26 tristanp joined #git
02:30 _cyril_ joined #git
02:31 finalbeta joined #git
02:32 nivag joined #git
02:33 cokefenta joined #git
02:33 jaguarmagenta joined #git
02:36 bronson joined #git
02:36 mizu_no_oto joined #git
02:36 Rodya_ joined #git
02:37 pokalyis_ joined #git
02:41 dsantiago joined #git
02:46 Ryanar joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and public-access television programming | Please take the git survey: https://jk.gs/gsurv | 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 | git-bisect: No, not like that. Grow up.
02:49 d^sh_ joined #git
02:50 inflames joined #git
02:51 ayjay_t joined #git
02:51 einnjo joined #git
02:52 liuzhen joined #git
02:53 dreiss joined #git
02:53 hahuang61 joined #git
02:54 JamesBaxter joined #git
02:55 shmuli joined #git
02:55 e14 joined #git
02:56 d0nn1e joined #git
02:56 tmz joined #git
02:57 Quantbo joined #git
02:59 e14 joined #git
02:59 Gonzo89_ joined #git
03:00 diogenese joined #git
03:02 ome joined #git
03:07 aavrug joined #git
03:08 aavrug joined #git
03:08 Rodya_ joined #git
03:08 khfeng joined #git
03:12 sunri5e joined #git
03:13 mehola joined #git
03:13 zumba_addict joined #git
03:15 User458764 joined #git
03:15 zumba_addict joined #git
03:16 snthsnth joined #git
03:17 e14 joined #git
03:23 Rodya_ joined #git
03:23 jaguarmagenta joined #git
03:24 e14 joined #git
03:24 jcalonso joined #git
03:25 nawwmz joined #git
03:27 einnjo joined #git
03:27 Ryanar joined #git
03:28 NeverTired joined #git
03:28 cagmz joined #git
03:29 inflames joined #git
03:32 chachasmooth joined #git
03:33 e14 joined #git
03:35 scarabx joined #git
03:37 atomi joined #git
03:37 cqi joined #git
03:37 cdown joined #git
03:41 BSAlb joined #git
03:42 cdown joined #git
03:43 hexagoxel joined #git
03:46 lagothri1 joined #git
03:50 eivarv joined #git
03:51 svm_invictvs joined #git
03:54 einnjo joined #git
03:55 eka_ joined #git
03:57 bmahe joined #git
03:58 a_thakur joined #git
04:00 jost_ joined #git
04:00 cyan__ joined #git
04:01 tristanp joined #git
04:01 jcalonso joined #git
04:03 danlovesppipes joined #git
04:07 sssilver joined #git
04:10 NeverDie_ joined #git
04:11 dreiss joined #git
04:12 PaulCapestany joined #git
04:12 asadefrango joined #git
04:14 Vortex35 joined #git
04:16 _cyril_ joined #git
04:18 slixpk joined #git
04:18 PaulCapestany joined #git
04:19 shubhnik joined #git
04:23 SwiftMatt joined #git
04:24 theskillwithin joined #git
04:27 rkazak joined #git
04:28 ayjay_t joined #git
04:31 tristanp joined #git
04:32 sssilver joined #git
04:33 asadefrango left #git
04:35 ArchNoob joined #git
04:37 sssilver_ joined #git
04:37 bronson joined #git
04:38 jcalonso joined #git
04:39 subhojit777 joined #git
04:40 eivarv joined #git
04:40 dreiss joined #git
04:45 atesc joined #git
04:52 User458764 joined #git
04:54 hahuang61 joined #git
04:56 smithbone joined #git
04:58 eivarv joined #git
05:00 Andrew_K joined #git
05:03 darkbit joined #git
05:04 cqi joined #git
05:04 nilg joined #git
05:04 crazyhorse18 joined #git
05:05 crazyhorse18 i've got node_modules   node_modules/* and node_modules/**/* in my .gitignore in the root of my git repo
05:05 crazyhorse18 but they are still showing up in git status?
05:11 zumba_addict joined #git
05:12 rscata joined #git
05:13 brillenfux joined #git
05:16 jcalonso joined #git
05:21 bronson joined #git
05:22 ngperfex joined #git
05:25 rkazak joined #git
05:28 leeN joined #git
05:28 qws-user-1229 joined #git
05:32 Limes joined #git
05:34 rchavik joined #git
05:34 User458764 joined #git
05:36 liuzhen joined #git
05:38 Cabanossi joined #git
05:40 ngrin joined #git
05:41 eizua joined #git
05:42 hahuang61 joined #git
05:42 lindenle joined #git
05:46 jfr joined #git
05:50 moritz crazyhorse18: !ignore_tra
05:50 gitinfo crazyhorse18: [!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
05:50 peepsalot joined #git
05:51 modulitos left #git
05:52 aavrug joined #git
05:54 jcalonso joined #git
05:54 austin_laptop joined #git
05:54 shpew12 joined #git
05:54 shpew12 joined #git
05:55 pks joined #git
05:58 _ng joined #git
05:59 peeps[work] joined #git
06:03 _ng joined #git
06:05 rkazak joined #git
06:09 zulutango joined #git
06:09 dreiss joined #git
06:12 thiago joined #git
06:14 lb joined #git
06:15 User458764 joined #git
06:17 watabou joined #git
06:20 masuberu joined #git
06:20 mmlb joined #git
06:23 acetakwas joined #git
06:25 akushner joined #git
06:26 freimatz joined #git
06:28 eivarv joined #git
06:31 a_thakur joined #git
06:31 liuzhen joined #git
06:32 jcalonso joined #git
06:32 shmuli joined #git
06:33 matoro joined #git
06:33 NeverDie joined #git
06:42 LucaTM joined #git
06:46 brillenfux_ joined #git
06:47 resurtm joined #git
06:48 dminuoso_ joined #git
06:49 jaguarmagenta joined #git
06:49 demize joined #git
06:51 kenden joined #git
06:56 qt-x joined #git
06:58 bocaneri joined #git
06:59 Raging_Hog joined #git
07:02 _cyril_ joined #git
07:04 chele joined #git
07:08 pouet joined #git
07:08 timvisher joined #git
07:10 jcalonso joined #git
07:13 resurtm joined #git
07:15 dan2k3k4 joined #git
07:16 howitdo joined #git
07:21 rendar joined #git
07:23 TomyWork joined #git
07:26 apotry joined #git
07:28 TomyWork hi
07:29 jknetl joined #git
07:31 GoZoner joined #git
07:32 TomyWork "git diff --numstat ver1..ver2 {dir1,dir2}" works, but "git diff --numstat ver1..ver2 {dir1,dir2}'/**/main/java'" doesn't, even though there are main/java directories somewhere in the tree and they're even shown by the first command
07:33 TomyWork doesnt git diff support globstar patterns?
07:34 a_thakur joined #git
07:37 irqq joined #git
07:40 elect joined #git
07:41 aidalgol joined #git
07:45 User458764 joined #git
07:45 iamrohit7 joined #git
07:46 iamrohit7 joined #git
07:46 shpew12 I'm trying to use a pre-receive hook, but it isn't executing and I can't figure out why. It's executable, in the hooks folder.
07:47 jcalonso joined #git
07:48 offtopik joined #git
07:49 kenden joined #git
07:51 leeN joined #git
07:56 shubhnik joined #git
07:59 systemovich joined #git
08:00 corsibu joined #git
08:03 shpew12 joined #git
08:04 xcesariox joined #git
08:06 danslo joined #git
08:11 resurtm joined #git
08:11 dan2k3k4 joined #git
08:13 cdg joined #git
08:17 ffett joined #git
08:18 laumann joined #git
08:18 mangolisk joined #git
08:18 done joined #git
08:19 rossome joined #git
08:19 a_thakur joined #git
08:23 bernardio joined #git
08:24 vannorden joined #git
08:26 jcalonso joined #git
08:26 shmuli joined #git
08:29 acetakwas joined #git
08:31 mar77i I've done something strange...
08:31 mar77i I have a commit and I typed git pull
08:32 mar77i now the commit is gone from the log but I can type git checkout and it's there as "detached HEAD" commit.
08:33 mar77i is there a simple way I can put this commit back to the top of the history?
08:34 Balliad joined #git
08:35 mar77i ah yeah, git suggested creating a branch for this one.
08:36 ngrin joined #git
08:37 tobiasvl mar77i: it shouldn't just have disappeared … did you just run "git pull", nothing else?
08:37 tobiasvl git pull merges the remote (tracking branch) with your local, it doesn't throw away anything
08:39 resurtm joined #git
08:39 kimonorouge joined #git
08:40 howdoi joined #git
08:40 courrier joined #git
08:44 peepsalot joined #git
08:44 cdg_ joined #git
08:45 mar77i uh
08:48 dan2k3k4 joined #git
08:48 mar77i okay. urm no I think I really git pulled, because... because git push didn't work.
08:48 mar77i I can't scroll back to the error message any more. I might have diverged upstream.
08:50 denimsoft joined #git
08:50 inflames joined #git
08:51 mar77i commits to a divergent downstream aren't lost. is that what the git dev meant with "others do it wrong"? :)
08:51 jephsf joined #git
08:51 ahmed_elgabri joined #git
08:52 peeps[work] joined #git
08:52 jbitdrop joined #git
08:53 PCatinean joined #git
08:53 tobiasvl hehe. well, if you really git pulled, the divergent history will have been merged and the commit you were "missing" should still have been in the new merged history
08:56 pran joined #git
09:01 jozwior joined #git
09:03 p_d joined #git
09:03 encod3 joined #git
09:04 mikecmpbll joined #git
09:07 SJr joined #git
09:12 chrisml joined #git
09:12 pitastrudl joined #git
09:12 PHPanos joined #git
09:14 mindfart joined #git
09:16 cyan__ joined #git
09:19 manuel_ joined #git
09:23 jcalonso joined #git
09:25 svm_invictvs joined #git
09:29 fees joined #git
09:29 K1ck3dByC0ns0l3 joined #git
09:30 kurkale6ka joined #git
09:30 GT4066 joined #git
09:31 nettoweb joined #git
09:42 elect joined #git
09:42 clmsy joined #git
09:43 ski7777 joined #git
09:43 Jackneill_ joined #git
09:43 felixjet joined #git
09:44 pluszak joined #git
09:44 trick-or-t0by joined #git
09:45 pluszak joined #git
09:45 phil22 joined #git
09:45 phil22 hello
09:46 phil22 let's say I want to pick move some commits from a branch to master, and than rebase the branch on top of master
09:46 phil22 is cherry-pick && rebase the best approach?
09:47 tobiasvl phil22: sounds good, or you can use !interactive_rebase
09:47 gitinfo phil22: Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.
09:48 flaviodesousa joined #git
09:50 felixjet joined #git
09:52 shmuli joined #git
09:52 Xethron joined #git
09:52 liuzhen joined #git
09:55 Xethron left #git
09:55 Xethron joined #git
09:56 _cyril_ joined #git
09:59 bruce_lee joined #git
10:01 nilg joined #git
10:01 zumba_addict joined #git
10:04 alcohol interactive rebase is so much fun
10:04 alcohol until you screw up
10:04 alcohol then it is not so much fun anymore
10:04 rnsanchez joined #git
10:06 Raging_Hog rebase makes you ask questions like "Who am I?" and "Where did I come from?"
10:08 jozwior joined #git
10:17 Shentino joined #git
10:18 le_melomane joined #git
10:18 anuxivm joined #git
10:19 canton7 alcohol, then you learn about 'git rebase --abort' and 'git reflog' :)
10:21 mda1 joined #git
10:22 GavinMagnus joined #git
10:22 User458764 joined #git
10:23 nidr0x joined #git
10:25 alhariel joined #git
10:25 a3Dman_ joined #git
10:28 ghostlight joined #git
10:28 mehola joined #git
10:30 dan2k3k4 joined #git
10:31 brillenfux joined #git
10:32 ngrin_ joined #git
10:35 ThunderChicken joined #git
10:35 ThunderChicken joined #git
10:35 musicmatze joined #git
10:35 re1 joined #git
10:35 bronson joined #git
10:35 PHPanos joined #git
10:36 msonntag joined #git
10:37 ngrin joined #git
10:38 alcohol canton7: yes, abort is my friend
10:39 irco joined #git
10:40 ngperfex joined #git
10:41 corsibu joined #git
10:41 konit joined #git
10:43 nikivi joined #git
10:43 puregreen joined #git
10:44 doener joined #git
10:46 corsibu joined #git
10:46 liuzhen joined #git
10:46 shmuli joined #git
10:48 mostlybadfly joined #git
10:48 puregreen I had a merge in progress, then I used “git stash save” and “git stash pop”; now git seems to have forgotten that I was doing a merge at all (I simply have lots of “changes to be committed”, but that's all). What can I do to fix it?
10:49 puregreen (To be honest, I'm not sure I even have to fix it, actually. Perhaps just doing a commit would be fine. The problem is that I don't have a good model of how merge commits work and how they differ from ordinary commits, and so I'm afraid that it would screw things up later.)
10:50 crazyhorse18 joined #git
10:50 encod3 joined #git
10:50 le_melomane joined #git
10:50 davix[matrix] joined #git
10:55 unclechu joined #git
10:55 Remramm joined #git
10:55 kikijiki[m] joined #git
10:55 M-meznak joined #git
10:55 M-shine joined #git
10:55 M-mistake joined #git
10:55 saintaquinas[m] joined #git
10:55 Ineentho[m] joined #git
10:55 Dhanya[m] joined #git
10:55 musicmatze[m] joined #git
10:55 monomon[m] joined #git
10:55 hallogallo[m] joined #git
10:55 aviraldg joined #git
10:55 alaeri[m] joined #git
10:57 Renter joined #git
10:59 compeman joined #git
11:00 chele joined #git
11:00 impulse joined #git
11:00 enckse joined #git
11:00 le_melomane joined #git
11:02 GavinMagnus left #git
11:02 wizonesolutions joined #git
11:02 felowe joined #git
11:03 cloudcell_ joined #git
11:03 techntoke__ joined #git
11:03 cory___ joined #git
11:04 a_thakur joined #git
11:04 wcpan joined #git
11:05 stfn joined #git
11:05 raijin joined #git
11:05 skyres joined #git
11:06 laumann joined #git
11:08 bremner joined #git
11:08 CIAguy joined #git
11:08 eggoez joined #git
11:09 bremner joined #git
11:09 ThomasLocke joined #git
11:11 mt joined #git
11:11 ieee joined #git
11:12 laumann joined #git
11:12 ochorocho__ joined #git
11:15 GavinMagnus joined #git
11:17 ronny joined #git
11:17 User458764 joined #git
11:19 impulse what's -a do in git commit -a?
11:19 davix[matrix] joined #git
11:20 tobiasvl impulse: man git commit
11:20 gitinfo impulse: the git-commit manpage is available at http://jk.gs/git-commit.html
11:20 tobiasvl "Tell the command to automatically stage files that have been modified and deleted, but new files you have not told Git about are not affected."
11:20 impulse oh there we go
11:20 impulse thanks
11:20 konit joined #git
11:21 bernardio joined #git
11:22 impulse actually man git commit doesn't say anything about it
11:22 gitinfo the git-commit manpage is available at http://jk.gs/git-commit.html
11:23 tobiasvl impulse: what I quoted was copied directly from there
11:23 impulse oh on the site
11:23 tobiasvl or in your shell
11:23 impulse i thought you meant type that in the shell
11:23 meth joined #git
11:23 tobiasvl yeah that should work too
11:23 led_belly joined #git
11:23 impulse oh it's man git-commit
11:23 gitinfo the git-commit manpage is available at http://jk.gs/git-commit.html
11:23 impulse not git commit
11:23 Renter both work
11:24 tobiasvl both work here
11:24 impulse not for me
11:24 tobiasvl you can also use "git help commit" though
11:24 impulse not in shell
11:24 Renter what OS are you using?
11:24 impulse oh ok
11:24 impulse linux
11:24 Renter which linux
11:24 impulse gentoo
11:25 impulse man git commit just takes me to the main git manpage. i needed man git-commit
11:25 gitinfo the git-commit manpage is available at http://jk.gs/git-commit.html
11:25 gitinfo the git-commit manpage is available at http://jk.gs/git-commit.html
11:25 unclechu joined #git
11:25 kikijiki[m] joined #git
11:25 saintaquinas[m] joined #git
11:25 Remramm joined #git
11:25 M-shine joined #git
11:25 M-meznak joined #git
11:25 monomon[m] joined #git
11:25 Ineentho[m] joined #git
11:25 musicmatze[m] joined #git
11:25 Dhanya[m] joined #git
11:25 M-mistake joined #git
11:25 aviraldg joined #git
11:25 hallogallo[m] joined #git
11:25 alaeri[m] joined #git
11:25 kjsage[m] joined #git
11:25 M64137[m] joined #git
11:26 tobiasvl strange. like I said, it works here. but oh well
11:26 Renter what's your man --version ?
11:26 impulse 1.6g
11:26 Karazhan joined #git
11:27 sunri5e joined #git
11:27 Renter Try upgrading to 2.7 ish
11:28 impulse what's new? they added colors or something?
11:28 bremner or something.
11:29 ilmari they added support for looking for 'foo-bar' when you type 'man foo bar'
11:29 bremner that's not actually a git feature.
11:29 ilmari that's a man-db feature
11:29 bremner oh, sorry, missed context
11:29 lucazz joined #git
11:29 ilmari which is what we were talking about
11:29 ilmari and foo_bar, and possibly other permutations
11:30 bremner I wondered how anyone could be running git 1.6 ;)
11:30 dmadaan__ joined #git
11:30 lucazz hi guys
11:30 ilmari 1.6<letter> i the old man, man-db is at 2.7
11:30 lucazz noob question
11:31 ilmari man-db 2.5.6 (26 August 2009) added the hyphen version, 2.5.8 (15 November 2010) added underscore
11:32 samy_ joined #git
11:32 samy_ hi, I was working on a branch and wanted to rebase. In master some changes have been done on the same files which gives me merge conflicts. How can I apply the changes I did above the changes in the master now
11:32 paws_ joined #git
11:32 tobiasvl samy_: !eek
11:32 gitinfo samy_: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
11:33 samy_ I tried doing a reset --soft and then git stash then did a rebase but even then I can't spply my stash
11:33 iamrohit7 joined #git
11:34 introx joined #git
11:34 introx_ joined #git
11:34 lucazz I've written this beatiful, magical pre-push hook that will disable all force pushes and so on
11:35 lucazz but how do I push it to the remote origin?
11:35 tobiasvl lucazz: you cannot, hooks aren't tracked
11:35 tobiasvl scp/rsync
11:36 bronson joined #git
11:36 samy_ how can I resolve these errors during a rebase warning: squelched 53 whitespace errors warning: 58 lines add whitespace errors.
11:36 _ikke_ lucazz: That would otherwise be a security issue, anyone being able to push code that is executed automatically
11:36 _ikke_ samy_: Those are warnings, not errors
11:36 iamrohit7 hi. my pull request has been accepted and i deleted the devel branch from github. then i used checkout master in my local repository. since then i get HEAD detached at 'origin/master'. how do i fix it? i tried instructions from google but it's still there.
11:37 _ikke_ iamrohit7: !transcript
11:37 gitinfo iamrohit7: Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
11:38 le_melomane joined #git
11:38 lucazz hmm
11:38 lucazz bummer
11:38 Jellyg00se joined #git
11:39 tobiasvl iamrohit7: also perhaps link to the instructions from google that you followed
11:39 ThomasLocke joined #git
11:40 fmcgeough joined #git
11:41 athaller joined #git
11:43 iamrohit7 tobiasvl: there's no error now. not sure why. thanks.
11:43 _ikke_ Note that if you are on a detached HEAD, it means that any commits you make don't belong to any branch, and might get lost
11:43 Darcidride joined #git
11:43 iamrohit7 _ikke_:^
11:43 tobiasvl iamrohit7: all right, nice. also see !remote_tracking_branch for next time
11:43 gitinfo iamrohit7: Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branch>'
11:44 kugel joined #git
11:44 iamrohit7 tobiasvl: sure, thanks.
11:45 lindenle joined #git
11:46 introx joined #git
11:46 introx_ joined #git
11:46 introx joined #git
11:47 introx joined #git
11:47 sq-one joined #git
11:47 dmadaan__ left #git
11:48 introx joined #git
11:50 jstimm joined #git
11:51 dan2k3k4 joined #git
11:53 gunnaro joined #git
11:56 noctux joined #git
11:58 Siegfried joined #git
11:58 User458764 joined #git
12:01 johnmilton joined #git
12:03 treehug88 joined #git
12:05 Starky joined #git
12:05 Starky joined #git
12:06 synthroid joined #git
12:06 corsibu joined #git
12:07 le_melomane joined #git
12:07 Darcidride joined #git
12:07 Mixologic_ joined #git
12:09 tvw joined #git
12:12 encod3 joined #git
12:15 a_thakur joined #git
12:15 cariveri joined #git
12:16 cariveri hi. whats the precondition to reach a git daemon on a lan server? User configuration?
12:17 BSaboia joined #git
12:17 grawity you need a LAN, and a running git-daemon
12:17 Pazzaz joined #git
12:17 zumba_addict joined #git
12:17 grawity do not confuse git-over-ssh, which uses user accounts, with git-daemon, which doesn't
12:19 skunkz joined #git
12:20 cariveri grawity: that was the case.  I tried something like git://lanIP/reponame   . on the server the repo was put to service with something like: git-daemon --basepath=fullqualified_path_to_repo
12:20 vannorden joined #git
12:21 ArchNoob joined #git
12:22 ochorocho__ joined #git
12:23 zumba_addict joined #git
12:23 demize --base-path, and was actually the path to the repo passed?  If so, a clone with /reponame won't work.
12:23 cariveri demize: how is it correct?
12:24 dermoth_ joined #git
12:24 demize You're supposed to give it the base path the repo is in.
12:24 demize So if your repo is under /srv/git/foo.git you use --base-path=/srv/git
12:25 demize And then you can clone with /foo.git
12:25 PHPanos joined #git
12:25 cariveri demize: well then also other repos in that base are avilable, not?
12:25 _cyril_ joined #git
12:26 a_thakur joined #git
12:26 demize Not unless you use --export-all.
12:27 demize git-daemon requires a file called git-daemon-export-ok to exist in the repo by default.
12:28 cariveri demize: say there is /srv/repo{1,2}   then git clone /repo1 and /repo2 will work not? since git-daemon --base-path=/srv/ . not?
12:28 a_thakur joined #git
12:31 demize I'm confused as to what you're really asking.  If you have a base path of /srv and create an empty file called git-daemon-export-ok in /srv/repo1 then you can clone from /repo1 but not /repo2.
12:32 jozwior joined #git
12:32 cariveri demize: imagine there is two repos below that base-path
12:33 demize I replied with a scenario using your example.
12:33 encod3 joined #git
12:34 cariveri demize: I seem to say that if there is one repo on the server in that base-path then you can clone it . but what is there is many repos in that base path /srv/ ? I cnnot clone other repos there?
12:34 cariveri demize: you seem to say ...
12:35 corsibu joined #git
12:35 shubhnik joined #git
12:35 rivarun joined #git
12:35 demize I've explicitly explained how it works multiple times now.
12:35 demize By default it will not export any repository.
12:35 demize You have to explicitly create an empty file called git-daemon-export-ok in every repository you want exported.
12:36 Vinnie_win joined #git
12:37 bronson joined #git
12:37 algae joined #git
12:39 ochorocho__ joined #git
12:39 akurniawan joined #git
12:39 inflames joined #git
12:40 kajnc joined #git
12:45 submitnine joined #git
12:46 jeffreylevesque joined #git
12:46 nikivi joined #git
12:46 vannorden joined #git
12:48 sdothum joined #git
12:49 achlys joined #git
12:52 kenden joined #git
12:55 ki0 joined #git
12:59 cariveri demize: ok. so either touch git-daemon-export-ok  OR git daemon --verbose --base-path=/srv --export-all /srv/my-repo.git &
13:00 horatiohb joined #git
13:01 sq-one joined #git
13:02 cdown joined #git
13:02 ochorocho__ joined #git
13:03 JamesBaxter joined #git
13:04 horatiohb When I try "git clone https://github.com/rails/rails.git" nothing happens and the command just times out. Several SO pages out there suggest remedies (try giving your username, try a credential helper, etc.), but none of them work for me. Any ideas?
13:04 _ikke_ horatiohb: GIT_TRACE=1 git clone ...
13:04 _ikke_ what does that return?
13:05 grawity I don't see how any of those 'remedies' can help with timeouts
13:06 horatiohb _ikke_: it gives four lines of trace output, but is now hanging.
13:06 horatiohb The last line of trace output is...
13:06 horatiohb trace: built-in: git 'fetch-pack' '--stateless-rpc' '--stdin' '--lock-pack' '--thin' 'https://github.com/rails/rails.git/'
13:07 grawity can you `git ls-remote` that URL without timeouts, or access it via some web browser?
13:07 horatiohb For the record, I can curl the url.
13:07 geoid joined #git
13:07 vannorden joined #git
13:08 horatiohb grawity: the git ls-remote works.
13:08 akurniawan joined #git
13:08 horatiohb it doesn't hang
13:08 horatiohb or timeout
13:08 grawity probably not a MTU issue then
13:08 grawity (for the record, GIT_CURL_VERBOSE=1 shows exactly what git is requesting)
13:08 EmeraldExplorer joined #git
13:09 Seveas you could also try cloning over ssh
13:09 Dougie187 left #git
13:09 horatiohb Seveas: ssh works. But I need https.
13:10 horatiohb Seveas: clarification: I haven't tried ssh with this particular repo.
13:11 ExoUNX joined #git
13:12 mar77i urm.
13:12 Balliad joined #git
13:12 mar77i I did another stupid, it seems.
13:12 terens joined #git
13:12 terens hello
13:12 zumba_addict joined #git
13:12 terens git clone --depth 1 repo does this fetch from master by default?
13:13 jaafar joined #git
13:13 mar77i "Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded." and uncommitted changes. but the changes are in fact kind of half the way to the new origin/master. I'd like to fast-forward HEAD to origin/master, so I can see what of the changes on the other side is left
13:14 osse terens: it fetches from whatever HEAD is pointing to in the remote repo. In the majority of cases that's master
13:14 mar77i can I somehow just forward without checkout?
13:14 osse mar77i: git stash; git merge; git stash pop
13:14 mar77i yes I tried that
13:14 betandr_ joined #git
13:15 kimonorouge joined #git
13:15 mar77i and got leftover files.
13:15 NeverDie joined #git
13:15 mar77i files that are new in the repo from origin/master, but those same files are also in the working tree already.
13:16 osse at least git status said you're up to date with origin/master now, right?
13:17 mar77i ah wait, merge.
13:18 mar77i no. http://ptpb.pw/kO1T
13:20 osse there's nothing you can do about that other than what git says
13:20 osse move them, merge, move them back
13:20 mar77i I'll try adding these files before stashing, maybe
13:21 astrofog joined #git
13:21 fuchstronaut joined #git
13:22 akurniawan joined #git
13:22 kbs joined #git
13:22 revoltingPeasant joined #git
13:22 mar77i now we're talking! thanks. :)
13:22 Ryanar joined #git
13:23 User458764 joined #git
13:26 ochorocho__ joined #git
13:26 Jellyg00se joined #git
13:33 ochorocho__ joined #git
13:34 cdg joined #git
13:34 rbern joined #git
13:34 myhau joined #git
13:34 red82 joined #git
13:36 MrMojito joined #git
13:36 MrMojito joined #git
13:36 Ardethian\ joined #git
13:38 ochorocho__ joined #git
13:39 d10n-work joined #git
13:41 fahadash joined #git
13:42 Ardethian\ joined #git
13:43 Ardethian\ joined #git
13:43 Es0teric joined #git
13:43 Ardethian\ joined #git
13:44 Ardethian\work joined #git
13:44 ShekharReddy joined #git
13:47 fuchstronaut joined #git
13:47 kajnc joined #git
13:47 kimonorouge joined #git
13:48 kajnc joined #git
13:49 bannakaffalatta joined #git
13:50 sea-gull joined #git
13:50 anonymuse joined #git
13:51 meth joined #git
13:51 rnsanchez_ joined #git
13:54 courrier_ joined #git
13:54 tang^ joined #git
13:55 mischat joined #git
13:57 corsibu joined #git
13:59 crazyhorse18 joined #git
13:59 BSAlb joined #git
14:01 boombatower joined #git
14:01 Oatmeal joined #git
14:04 corsibu joined #git
14:07 al-damiri joined #git
14:07 robattila256 joined #git
14:09 jozwior joined #git
14:10 AaronMT joined #git
14:12 jottr joined #git
14:12 kbs joined #git
14:14 ResidentBiscuit joined #git
14:14 stefanct joined #git
14:16 snufft joined #git
14:17 crose joined #git
14:17 stefanct i am looking for a command similar to what "git branch --list --contains ..." does but for certain refspecs and not ordinary branches
14:17 e14 joined #git
14:18 stefanct background is that i want to keep some "hidden" refspecs of the upstream repo to create version strings from them
14:18 mischat joined #git
14:18 stefanct thus git branch does not work on these refspecs because they are in their own namespace within refs/
14:20 joki- joined #git
14:20 revoltingPeasant how do I revert to a previous state in the reflog? I did `git checkout HEAD@{6}` but I'm still seeing the code that I want to discard
14:21 tobiasvl revoltingPeasant: "seeing it" how? what does git status say?
14:21 tobiasvl maybe you want "git checkout --force HEAD@{6}" (warning: will throw away stuff, but it seems that's what you want)
14:24 revoltingPeasant tobiasvl: that was it, thanks. what exactly is going on there?
14:24 NimeshNeema joined #git
14:24 kyan joined #git
14:24 tobiasvl revoltingPeasant: man git checkout
14:24 gitinfo revoltingPeasant: the git-checkout manpage is available at http://jk.gs/git-checkout.html
14:24 nikivi joined #git
14:24 tobiasvl -f/--force: "When switching branches, proceed even if the index or the working tree differs from HEAD. This is used to throw away local changes."
14:25 revoltingPeasant thanks again
14:25 tobiasvl git tries very hard not to lose your uncommited changes, unless you tell it to (with --hard or --force)
14:25 revoltingPeasant ah I see
14:26 shubhnik joined #git
14:26 _cyril_ joined #git
14:28 vuoto joined #git
14:29 jcalonso_ joined #git
14:30 Starky joined #git
14:31 ki0_ joined #git
14:33 usm4n joined #git
14:34 AlexMax I have a question - why do people suggest archiving old branches as a archive/<branchname> tag?
14:34 AlexMax won't that just clutter the tag list?
14:36 osse AlexMax: presumably they mean something like refs/archive/branchname, in which case they won't show up
14:36 ochorocho__ joined #git
14:36 drozdziak1 joined #git
14:36 AlexMax osse: http://stackoverflow.com/a/1309934
14:36 drozdziak1 left #git
14:36 mischat_ joined #git
14:37 Ryanar joined #git
14:37 bronson joined #git
14:38 _Maru_ joined #git
14:39 dviola joined #git
14:39 osse AlexMax: in that case... this sounds weird, and yes it will clutter
14:39 kimonorouge joined #git
14:41 LionsMane joined #git
14:42 sangy joined #git
14:42 lykinsbd joined #git
14:42 ash_workz joined #git
14:43 nawwmz joined #git
14:43 shaggycat joined #git
14:44 mangolisk joined #git
14:45 inflames joined #git
14:45 ngperfex joined #git
14:45 crayon joined #git
14:47 shmuli joined #git
14:47 jottr joined #git
14:49 nikivi joined #git
14:49 matsaman joined #git
14:49 ochorocho__ joined #git
14:49 dreiss joined #git
14:52 shinnya joined #git
14:55 kojeve joined #git
14:55 b1tchcakes joined #git
14:56 Starky joined #git
14:57 jaguarmagenta joined #git
14:57 foist joined #git
14:58 jottr joined #git
14:59 pokalyis joined #git
15:00 mischat joined #git
15:01 Orbitrix joined #git
15:02 nanga joined #git
15:02 nanga joined #git
15:02 StrongJava joined #git
15:05 Balliad joined #git
15:06 Orbitrix joined #git
15:06 skunkz joined #git
15:08 eka joined #git
15:10 kadoban joined #git
15:11 dwmw2_gone joined #git
15:13 jcalonso joined #git
15:14 todd_dsm joined #git
15:14 kbs joined #git
15:15 todd_dsm hey guys, having a hard time with my first clone during an auto build, "Host key verification failed". Before that a "-keyscan github.com >> /.ssh/known_hosts""
15:16 todd_dsm Before that a "-keyscan github.com >> ~/.ssh/known_hosts is done but the clone still fails.
15:16 todd_dsm can't help but think I'm missing something. What's the proper way to accomplish this task?
15:17 todd_dsm * ssh-keyscan github.com >> ~/.ssh/known_hosts
15:17 ochorocho__ joined #git
15:18 grawity StrictHostKeyChecking=no
15:19 ocbtec joined #git
15:19 todd_dsm grawity: that's just exported to the environment?
15:19 grawity no, see `man ssh_config`
15:19 todd_dsm okay, thank you
15:19 ocbtec joined #git
15:20 madewokherd joined #git
15:20 cdown joined #git
15:20 a3Dman joined #git
15:23 jstimm joined #git
15:23 tyreld joined #git
15:23 GavinMagnus left #git
15:24 aarobc joined #git
15:25 Balliad joined #git
15:26 Orbitrix joined #git
15:27 phaleth joined #git
15:27 kimonorouge joined #git
15:27 ngperfex joined #git
15:28 Darren_ joined #git
15:28 jcalonso_ joined #git
15:29 shubhnik joined #git
15:31 cdown joined #git
15:32 jeremyhall joined #git
15:32 mikecmpb_ joined #git
15:33 abyx joined #git
15:33 mkoskar joined #git
15:33 emg joined #git
15:34 pks_ joined #git
15:34 abyx Hrm, so say i have a branch that i've created a PR with... I then created a duplicate of that branch (git checkout -b my_branch_2 my_branch) then rebased from master on the new branch. How can i have that rebasing be reflected in the PR?
15:34 matsaman joined #git
15:35 eka joined #git
15:35 _ikke_ You mean that you rebased the feature branch on the master branch?
15:37 Es0teric joined #git
15:37 abyx i ran a `git rebase master`
15:37 _ikke_ right
15:37 _ikke_ A force push of this branch would automatically update the PR on most systems
15:41 berndl joined #git
15:41 shmuli joined #git
15:41 GoZoner joined #git
15:41 ec\ joined #git
15:42 Orbitrix joined #git
15:43 Remramm joined #git
15:43 Remramm joined #git
15:45 subhojit777 joined #git
15:45 nettoweb joined #git
15:53 qws-user-1228 joined #git
15:53 jfran joined #git
15:54 hahuang61 joined #git
15:57 eivarv joined #git
15:58 shmuli joined #git
16:00 mischat_ joined #git
16:00 Noldorin joined #git
16:01 e14 joined #git
16:04 cdown joined #git
16:04 _cyril_ joined #git
16:06 kyan joined #git
16:06 abyx Hm, so i force pushed to the PR branch and now i see all of the previous commits from master + my feature commits in the PR. Is this intended?
16:07 nipnop joined #git
16:08 Masber joined #git
16:08 rishi` joined #git
16:09 mquin_ joined #git
16:09 ojdo joined #git
16:09 Learath2 joined #git
16:09 Raging_Hog joined #git
16:09 PaulCape_ joined #git
16:09 up_the_irons joined #git
16:09 addshore joined #git
16:09 sim642 joined #git
16:09 Raed joined #git
16:09 GameGamer43 joined #git
16:10 zero7 joined #git
16:10 Tee_Pee joined #git
16:10 boxrick1_ joined #git
16:10 spr0tsuki joined #git
16:10 Lewix joined #git
16:10 Lewix joined #git
16:10 Lewix joined #git
16:10 autofly joined #git
16:10 rideh joined #git
16:10 blahdodo joined #git
16:10 EmeraldExplorer joined #git
16:10 svm_invictvs joined #git
16:10 toydestroyer joined #git
16:11 matumbo joined #git
16:11 ski7777 joined #git
16:11 mischat joined #git
16:12 khfeng_ joined #git
16:14 mmlb joined #git
16:14 achlys joined #git
16:14 resurtm joined #git
16:15 akushner joined #git
16:15 matumbo Hello, how does git try to find gpg for signing commits? I've git
16:15 matumbo version 2.7.4 installed and gpg version 2.1.13. When trying to sign
16:15 matumbo a commit I get a message: "error: cannot run gpg: No such file or
16:15 matumbo directory"
16:15 JanC_ joined #git
16:16 kimonorouge joined #git
16:16 matumbo sorry for the chopped up text
16:16 ohcibi joined #git
16:16 canton7 type 'gpg' in your terminal. What happens?
16:17 kpease joined #git
16:17 einnjo joined #git
16:18 robotroll joined #git
16:18 matsaman joined #git
16:18 matumbo I can start to type a message
16:18 rtail joined #git
16:19 matumbo could selinux be the problem?
16:19 User458764 joined #git
16:20 lindenle joined #git
16:21 overlord_tm joined #git
16:21 minibar joined #git
16:22 ken4ward joined #git
16:22 ken4ward left #git
16:24 nettoweb joined #git
16:25 SwiftMatt joined #git
16:25 overlord_tm joined #git
16:26 huntleja joined #git
16:27 betandr_ left #git
16:27 matumbo I found a solution by adding gpg.program = /usr/bin/gpg2 to ~/.gitconfig.
16:27 overlord_tm joined #git
16:27 rnsanchez joined #git
16:28 rtail left #git
16:28 ahmedelgabri joined #git
16:30 anonymuse joined #git
16:34 canton7 matumbo, did you type 'gpg' or 'gpg2' in your terminal? or is the former symlinked to the latter?
16:35 matumbo I typed gpg and when running "which gpg" it says: alias gpg='gpg2'
16:35 matumbo /usr/bin/gpg2
16:35 kutenai joined #git
16:36 canton7 ah, 'gpg' is a shell alias. that makes sense
16:36 jozwior joined #git
16:38 bronson joined #git
16:39 ochorocho__ joined #git
16:39 matumbo When trying to clone a local repo on my server from another device I get an error message saying: "Invalid remote: origin" Any clue what that could mean?
16:40 canton7 !repro
16:40 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
16:41 cdown joined #git
16:41 akushner joined #git
16:42 CheckDavid joined #git
16:43 nitric joined #git
16:45 eric joined #git
16:47 ki0 joined #git
16:47 kimonorouge joined #git
16:54 shmuli joined #git
16:54 aard_ joined #git
16:54 nikivi joined #git
16:55 laumann joined #git
16:55 meauses joined #git
16:56 slappy16 joined #git
16:57 wizardedit when using git svn, is there a builtin way to get 'svnversion' compatible output? I've come up with: git svn info | grep ^Revision | cut -d ' ' -f2, but hoping for something cleaner
16:57 ieee joined #git
16:57 myhau joined #git
16:58 armin so what's the preferred way to integrate an existing git repository clone (non-bare) into my project, which should reside in a sub-folder?
16:58 durham joined #git
16:59 armin submodules? gitmodules?
16:59 osse wizardedit: git svn info | awk '$1 == "Revision" { print $2}' \o/
16:59 wizardedit osse, heh, touche :)
17:00 dan2k3k4 joined #git
17:00 durham joined #git
17:00 mischat_ joined #git
17:00 kadoban armin: I tend to like git subtree
17:00 mischat_ joined #git
17:02 mischat__ joined #git
17:02 durham_ joined #git
17:02 shmuli joined #git
17:02 introx joined #git
17:03 mischa___ joined #git
17:05 mischat joined #git
17:05 hahuang61 joined #git
17:06 durham joined #git
17:07 sssilver joined #git
17:08 crayon joined #git
17:10 huntleja left #git
17:10 dreiss joined #git
17:12 vannorden joined #git
17:12 oskarkv joined #git
17:15 anonymuse joined #git
17:16 User458764 joined #git
17:16 kyan joined #git
17:17 hahuang61 joined #git
17:19 akushner joined #git
17:20 sangy is there a way to push to .git/refs/xxx instead of .git/refs/heads/xxx?
17:21 grawity no
17:21 grawity afaik, git-receive-pack explicitly disallows that
17:21 e14 joined #git
17:22 sangy aw, damnit. I've got the github blues again
17:23 Mobutils joined #git
17:24 sangy for some reason I updated the base branch on a PR and the diff is not updated on the PR. I see that they hold refs/pull/##/merge for this. I wanted to update it manually to see if the diff updates. Anyone got any ideas (#github is of no help)
17:24 yaki29 joined #git
17:24 shmuli joined #git
17:24 yaki29 left #git
17:25 jcalonso joined #git
17:25 Starky joined #git
17:26 fatalhalt joined #git
17:26 Groscheri joined #git
17:27 ki0 joined #git
17:29 sangy I ended up pushing an empty tree and then force pushing HEAD^ if anyone is curious
17:29 matsaman if nobody is now, people finding the log in the future will be =)
17:31 algun joined #git
17:31 sangy Cool :)
17:32 flavius joined #git
17:34 hariel joined #git
17:34 cdown__ joined #git
17:34 vannorden joined #git
17:35 shubhnik joined #git
17:36 eivarv joined #git
17:37 thiago joined #git
17:39 cdg joined #git
17:40 jnareb joined #git
17:40 JanC joined #git
17:41 navidr joined #git
17:42 Es0teric joined #git
17:43 OnBrokenWings joined #git
17:43 pks joined #git
17:44 vuoto joined #git
17:47 Electrometro joined #git
17:49 Ryanar joined #git
17:49 raatiniemi joined #git
17:49 mricon joined #git
17:51 mricon if I have repoA and I clone it with "git clone --mirror repoA mirrorA" and repoA HEAD changes to point at a different branch, is there a way to update the HEAD in mirrorA accordingly?
17:52 anonymuse joined #git
17:57 Sasazuka__ joined #git
17:58 tyreld joined #git
18:02 le_melomane joined #git
18:02 jottr joined #git
18:02 Es0teric joined #git
18:03 mischat_ joined #git
18:04 anonymuse joined #git
18:06 shmuli joined #git
18:08 done joined #git
18:08 ych joined #git
18:10 ahmedelgabri joined #git
18:12 meauses joined #git
18:13 Learath2 joined #git
18:15 diogenese joined #git
18:16 tyreld joined #git
18:17 meauses__ joined #git
18:17 meauses_ joined #git
18:18 paws_ joined #git
18:18 paul424 joined #git
18:19 akushner joined #git
18:21 Ryanar joined #git
18:22 Starky joined #git
18:22 _ikke_ mricon: No, there isn't an automatic way to do that
18:23 durham joined #git
18:25 Es0teric joined #git
18:25 satifant joined #git
18:25 satifant joined #git
18:26 e14 joined #git
18:26 realz joined #git
18:26 kpease joined #git
18:27 WhiskerBiscuit joined #git
18:28 OnBrokenWings joined #git
18:28 JuJUBee joined #git
18:28 JuJUBee Howdy all.  I'm a git noob.  I have a couple of projects (web) that I want to keep on git for backup reasons.
18:29 b1tchcak_ joined #git
18:29 JuJUBee From what I can tell from reading, I will have a local repository as well as a local working directory and a remote repository (github)?
18:29 ShekharReddy joined #git
18:29 lucazz hi guys
18:29 lucazz another noob question
18:30 ToxicFrog JuJUBee: typically, the local working directory comes with the local repository
18:31 lucazz say, if I setup a pre-receive, which is a server-side, hook for it to make a few checks and whatnot, the output off this check, if any, will be displayed on the user who just pushed code to the origin, right?
18:31 durham joined #git
18:31 JuJUBee ToxicFrog, so my public_html/projectName folder can be both local working and repo?
18:31 ToxicFrog JuJUBee: oh, wait, this the actual dir you serve from?
18:31 JuJUBee Right
18:32 ToxicFrog You can do that, but it's bad practice because it exposes the entire repo to the web, including stashes/feature branches/etc that you may not want published.
18:32 ToxicFrog By "local working directory" I thought meant "directory you use for development before pushing to the server"
18:32 JuJUBee ToxicFrog, so that would mean I have a clone of my working directory in my local repo location?
18:33 cagedwisdom joined #git
18:33 JuJUBee ToxicFrog, that is what I meant...
18:33 ToxicFrog Yeah, I think what you originally said is correct.
18:34 JuJUBee I have a public_html/projectName folder on my laptop where I test before scp'ing to the actual web server
18:34 ToxicFrog Although "working directory" implies "directory associated with a git repo", not "directory you serve from"; I think that's what originally confused me.
18:34 JuJUBee Sorry I neglected to state that I develop on test machine.
18:34 ToxicFrog A typical setup for this, AIUI, is to have a local (non-bare) repo you do the work on, and on the server, a bare repo somewhere outside the wwwroot with a hook that automatically deploys the serving files when you push to the "prod" branch or whatever.
18:35 ToxicFrog (or you can keep using scp and just exclude the .git dir)
18:35 ToxicFrog !deploy has some notes on this kind of setup, I think
18:35 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
18:36 ToxicFrog lucazz: I believe so, yes.
18:36 lucazz ok
18:36 lucazz thanks ToxicFrog
18:36 JuJUBee Im not looking to deploy using git, just have a synced copy of everything I can access anywhere.
18:37 ToxicFrog JuJUBee: ok, so in that case things are simpler -- have a bare repo somewhere you can push to/pull from (github works fine for this), have a local non-bare repo anywhere you want to work on it, and don't copy the .git dir along with everything else when you deploy.
18:37 ToxicFrog The working directory comes with the non-bare repo.
18:39 bronson joined #git
18:40 JuJUBee ToxicFrog, any good tutorials on git you could suggest?  I don't really understand it yet.
18:40 ldlework Pro Git
18:40 ldlework Its free
18:41 JuJUBee i've tried a few videos online but nothing is really helping.  They all seem to assume some knowledge of git.
18:41 JuJUBee ldlework, That for me?
18:41 Seveas JuJUBee: yeah
18:41 JuJUBee K, Ill take  a look
18:46 shruggar joined #git
18:47 publio joined #git
18:48 vannorden joined #git
18:49 msonntag joined #git
18:52 stomplee joined #git
18:54 lacour joined #git
18:57 lordjancso joined #git
18:57 VagabondAzulien joined #git
19:00 msonntag joined #git
19:01 lungaro can I ignore certain files somehow from getting cloned?
19:01 lungaro some A*Hole put like 60MB of binaries into the repo and now i'm tired of things taking a long time
19:01 lungaro i've sinced removed them but .git is still huge of course
19:02 moritz lungaro: you can git clone with --depth=1 or so
19:02 lungaro can I just purge the history?
19:02 moritz or any depth really where the large files aren't present
19:02 lungaro gotcha
19:02 kadoban lungaro: Yes, though it's not the simplest thing in the world.
19:02 moritz you can, but that's rewriting published history, aka "bad stuff"
19:02 lungaro yeah
19:03 lungaro this was arguably worse cause its wasting everyones time and was wrong
19:03 Ryanar joined #git
19:03 moritz the technique is simple (if you install bfg, but everyone dealing with changed SHA1s is nasty)
19:03 lungaro what is bfg?
19:03 xall joined #git
19:04 kadoban lungaro: A useful tool that does something similar to some invocations of 'git filter-branch'
19:04 kadoban Otherwise it has the same downsides though.
19:04 moritz https://rtyley.github.io/bfg-repo-cleaner/
19:04 lungaro thanks
19:04 moritz and it's much faster than git-filterbranch :-)
19:08 diogenese joined #git
19:08 gho5t joined #git
19:09 TomyLobo joined #git
19:10 laumann joined #git
19:11 mikecmpbll joined #git
19:11 phil22 joined #git
19:11 rbern joined #git
19:12 chris123456 joined #git
19:12 Starky joined #git
19:13 jstimm joined #git
19:17 kimonorouge joined #git
19:17 matoro joined #git
19:19 huntleja joined #git
19:20 einnjo joined #git
19:22 tyreld joined #git
19:22 kyan joined #git
19:24 cdg joined #git
19:26 tristanp joined #git
19:27 Mobutils left #git
19:30 cagedwisdom joined #git
19:30 AaronMT joined #git
19:30 fatalhalt_ joined #git
19:30 tvw joined #git
19:33 re1 joined #git
19:34 durham_ joined #git
19:37 Ryanar joined #git
19:38 nicoulaj joined #git
19:38 nicoulaj_ joined #git
19:39 nicoulaj joined #git
19:40 terens_ joined #git
19:41 Es0teric joined #git
19:42 kimonorouge joined #git
19:42 nettoweb joined #git
19:42 red82 joined #git
19:44 aarobc joined #git
19:44 JanC_ joined #git
19:46 yaki29 joined #git
19:46 shaggycat joined #git
19:46 yaki29 left #git
19:48 nettoweb1 joined #git
19:49 catern joined #git
19:49 catern left #git
19:51 crayon joined #git
19:52 joki- joined #git
19:52 meauses joined #git
19:52 ochorocho__ joined #git
19:53 shpew12 joined #git
19:56 huntleja joined #git
19:57 crayon joined #git
19:59 resurtm joined #git
20:00 sea-gull_ joined #git
20:01 mricon left #git
20:01 crayon joined #git
20:04 Doginal joined #git
20:06 _nwkj86 joined #git
20:06 offtopik joined #git
20:08 kyan joined #git
20:12 qguv joined #git
20:12 ciechomke joined #git
20:13 phil22 joined #git
20:13 Sasazuka__ joined #git
20:14 railssmith joined #git
20:15 manuels joined #git
20:15 ciechomke joined #git
20:16 gesker joined #git
20:16 jottr joined #git
20:16 ciechomke joined #git
20:17 GoZoner joined #git
20:18 tyreld joined #git
20:19 abyx joined #git
20:19 Vampire0 joined #git
20:19 ciechomke joined #git
20:19 mischat joined #git
20:21 ochorocho__ joined #git
20:22 ki0 joined #git
20:22 e14 joined #git
20:22 Limes joined #git
20:23 ciechomke joined #git
20:23 kenden joined #git
20:24 sangy joined #git
20:24 crayon joined #git
20:25 nilg joined #git
20:26 Faylite joined #git
20:32 Anja_ joined #git
20:33 Vampire0 joined #git
20:34 xall joined #git
20:34 aidalgol joined #git
20:35 finalbeta joined #git
20:40 bronson joined #git
20:41 King_Hual joined #git
20:41 jozwior joined #git
20:42 Gsham joined #git
20:48 kimonorouge joined #git
20:49 Darcidride joined #git
20:50 hashpuppy joined #git
20:51 Gianormagantrous joined #git
20:51 Gianormagantrous joined #git
20:52 jlebar joined #git
20:54 anonymuse joined #git
20:55 konit joined #git
20:56 sssilver joined #git
20:58 gesker_ joined #git
20:59 sssilver_ joined #git
21:00 kyan joined #git
21:01 Sasazuka_ joined #git
21:02 Sal joined #git
21:03 Sal can someone please help? i get a push rejected to bitbucket
21:03 finer joined #git
21:04 huntleja left #git
21:04 Sal i made a lot of directory structure changes on my project on pc, then i commit to a local .git and the i wanted to push to bitbucket like i always did
21:04 Sal but now i get that message
21:05 Sal Push rejected: Push to origin/master was rejected
21:06 Seveas the rest of the output will tell you why
21:06 Sal don't have it
21:07 Sal i'm getting this message from inside intellij
21:07 Random832 try a pull
21:07 Random832 also try using the command line to get more information
21:07 Seveas then try without intellij
21:07 Seveas !gui
21:07 gitinfo Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
21:07 Sal a pull will overwrite my project with old stuff
21:07 Gsham joined #git
21:07 jottr joined #git
21:07 Seveas no, it will not. That's not what pull does.
21:08 Sal ok, i'll make a copy first
21:09 kenden_ joined #git
21:11 tyreld joined #git
21:11 resurtm joined #git
21:17 laumann joined #git
21:17 tobiasvl Sal: !pull
21:17 gitinfo Sal: pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull:  http://longair.net/blog/2009/04/16/git-fetch-and-merge/
21:18 tobiasvl so pull will perform a merge of the two histories, nothing will be overwritten
21:18 barteks2x joined #git
21:18 a3Dman joined #git
21:19 rkazak joined #git
21:20 b1tchcakes joined #git
21:22 e14 joined #git
21:24 matoro joined #git
21:26 iosnerd joined #git
21:26 shpew12 joined #git
21:28 davidfetter_ge joined #git
21:28 davidfetter_ge !split
21:28 gitinfo To split an unpushed commit: git rebase -i <id>^; (change the corresponding line from 'pick' to 'edit'; save and quit); git reset --soft HEAD~; (stage and commit changes for first commit; stage and commit changes for second commit); git rebase --continue
21:28 Ryanar joined #git
21:28 davidfetter_ge that's handy.
21:30 King_Hual joined #git
21:30 King_Hual joined #git
21:33 tzhuang joined #git
21:36 Darcidride joined #git
21:36 Ryanar joined #git
21:37 Sasazuka__ joined #git
21:38 bronson joined #git
21:42 pokalyis_ joined #git
21:44 jmpp joined #git
21:44 jmpp joined #git
21:45 pokalyis joined #git
21:45 mischat joined #git
21:45 red82 joined #git
21:47 Ryanar joined #git
21:48 mischat joined #git
21:48 PsionTheory joined #git
21:50 AlexP11223 joined #git
21:52 LinusU joined #git
21:53 d0nn1e joined #git
21:54 anuxivm joined #git
21:54 red82 joined #git
21:54 inflames joined #git
21:55 CheckDavid joined #git
21:55 justanotheruser joined #git
21:56 pokalyis joined #git
21:56 theskillwithin joined #git
21:58 LinusU Hello! I'm trying to build an adaptive editor for git. For example I want to present a nice responsive terminal UI for editing the rebase todo. I'm running into one problem though, how to know which command is currently running.
21:58 t0by joined #git
21:58 LinusU The idea is that my command can be set as the core.editor
21:58 LinusU and then I can display the nice editor when rebase is being run
21:59 LinusU and delegate to the default $EDITOR if some other command is ran, e.g. commit
21:59 Ryanar joined #git
22:00 _ikke_ LinusU: I think at most you can look in .git for some of the state files
22:00 pokalyis joined #git
22:00 LinusU Ah cool, that's actually an interesting approach
22:00 theskill_ joined #git
22:00 LinusU Another idea I had was using getppid() and getting the invokation for the parent command :D
22:01 LinusU Any pointers on where to start exploring the format inside .git?
22:02 rewt just the presence of certain files should indicate what's happening... look at the dir contents while performing different things
22:02 ilmari you can look at how magit does it, it picks the right mode when I have $EDITOR set to emacsclient
22:03 sangy joined #git
22:03 ilmari the name of the file tells you something too
22:04 ilmari e.g. git rebase -i opens a file called 'git-rebase-todo'
22:05 theskillwithin joined #git
22:05 LinusU Nice, already some leads
22:05 LinusU It seems like there is a env variable called GIT_SEQUENCE_EDITOR which potentially has something to do with rebasing as well
22:06 kulelu88 joined #git
22:06 LinusU :facepalm:
22:06 LinusU Just realised that that isn't what GIT_SEQUENCE_EDITOR is
22:06 LinusU That is for editors that reads from stdin and writes to stdout
22:06 LinusU Should have gotten that from the name :D
22:07 blackwind_123 joined #git
22:07 LinusU Actually, seems like the basename of the filename is a quite giving approach
22:07 LinusU Seems to be COMMIT_EDITMSG when editing a commit message
22:09 LinusU and, as said, git-rebase-todo for rebasing todo editing
22:10 LinusU Thanks a lot ilmari, I can't believe I haven't noticed this before :)
22:10 LinusU Just assumed that it would be some temporary file...
22:10 thiago joined #git
22:11 clandestino joined #git
22:12 a3Dman_ joined #git
22:12 LinusU Interesting observation: it seems like COMMIT_EDITMSG isn't being cleaned up, so after at least one commit has been done, that file will always be there...
22:12 e14 joined #git
22:13 WayToDoor joined #git
22:15 Ryanar joined #git
22:16 Sal joined #git
22:16 Sal ok did the pull
22:16 a3Dman- joined #git
22:16 Sal but this is what i get when i try the push again
22:16 Sal https://goo.gl/3WCF9f
22:16 abyx joined #git
22:16 avar LinusU: It's not pro-actively cleaned up, and this is a feature in some cases
22:16 abyx How can i get the change log from a commit and apply it to another commit ? i think it's called a patch orrrr ?
22:16 Sal can someone help?
22:17 avar abyx: git commit -c <commit>, gets the author info/time too though
22:17 avar could use it with --reset-*
22:17 xkr47 joined #git
22:17 abyx basically i want to take all the file changes that were made in 1 commit and apply them to another branch
22:18 Sal Seveas, still there?
22:18 fmcgeough joined #git
22:21 e14 joined #git
22:22 e14_ joined #git
22:23 avar abyx: git cherry-pick <commit>
22:24 e14__ joined #git
22:24 CubiK joined #git
22:25 Sal can someone help me a tell me what to do here: https://goo.gl/3WCF9f
22:26 a3Dman- joined #git
22:27 justanotheruser joined #git
22:27 nettoweb joined #git
22:28 sdothum joined #git
22:28 moei joined #git
22:29 _ikke_ You need to integrate the remote changes first before you can push (or you need to force push (with care), if you changed already pushed commits)
22:30 phil22 joined #git
22:30 tobiasvl Sal: did you really git pull earlier? what command did you run and what was the result?
22:30 barteks2x joined #git
22:30 Sal tobiasvl, yep
22:30 Sal 18thousand objects
22:30 tobiasvl as the message you're now getting says, you have not merged in the changes (ie. pulled)
22:30 elastix joined #git
22:30 tobiasvl well, ie. merged, I should say
22:30 Sal i can do it again
22:31 tobiasvl Sal: please gist the actual output you got when pulling earlier
22:31 tobiasvl or now
22:31 Sal what i did was just write git pull
22:31 Sal is that it?
22:31 Sal just that?
22:31 tobiasvl depends what branch you are on, what remote you want to pull from
22:31 tobiasvl I see you run "git push origin master" instead of just "git push" so
22:31 Sal origin master
22:31 Sal didn't change it
22:32 tobiasvl please gist your output
22:32 Sal https://goo.gl/wz8f6b
22:32 Sal there it is
22:32 shmuli joined #git
22:32 tobiasvl OK, so it's telling you what to do
22:33 svm_invictvs joined #git
22:33 tobiasvl the local branch you're on does not know what remote branch it should pull from (or push to, for that matter, which is why you have to write "git push origin master" instead of just "git push") by default
22:33 Sal https://goo.gl/iTMt60
22:33 huntleja joined #git
22:33 Ryanar joined #git
22:34 tobiasvl yes. please do what git pull tells you to do
22:34 Sal i tried that too
22:34 Sal i'm trying to, but have no idea what it really wants
22:35 Sal unrelated histories
22:35 tobiasvl is your repo a clone of the remote repo?
22:35 Sal i have a .git in my project dir
22:35 tobiasvl yes... well...
22:35 Sal and from this, i connected a bitbucket
22:35 tobiasvl how?
22:36 Sal with the remote
22:36 tobiasvl how did you do this?
22:36 Sal i think
22:36 shmuli_ joined #git
22:36 Sal i don't remember now, it was almost 2 years ago
22:38 anonymuse joined #git
22:38 tobiasvl does your local repository share history with the bitbucket repository?
22:38 mizu_no_oto joined #git
22:38 tobiasvl are they related?
22:39 tobiasvl or did you just add a bitbucket repository as a remote to a local git repository you had?
22:39 durham joined #git
22:40 Sal tobiasvl, have no idea of what you're asking. are there any commands i can type to see my situation?
22:40 Sal there surely is a command that can answer your question
22:40 tobiasvl I'm simply asking if your repository has anything to do with the Bitbucket repository
22:41 tobiasvl well, "git pull" is the command that has likely answered my question
22:41 Sal all i know, is that on every changem, i first commit the project and the i push it
22:41 tobiasvl and that has worked before?
22:41 Sal always
22:41 whomp joined #git
22:41 ahrs joined #git
22:42 Sal this week, i had to change my project directory structure, and i did the commit that wiorked, but push didin't
22:42 tobiasvl OK, that sounds very relevant. how did you change your project directory structure?
22:42 Sal https://goo.gl/3lKpQX
22:42 Sal does that help?
22:43 Sal i deleted some dirs and added others
22:43 tobiasvl not really, I already knew that the bitbucket repo was a remote
22:43 tobiasvl did you touch .git at all?
22:43 Sal also, i move some root dirs to a lower level
22:43 Sal yes, i copied it from the old directory dir
22:44 tobiasvl what's "the old directory dir"
22:44 whomp hi, when i merged master this last time, instead of adding all the master commits and then leaving me with the unresolved bits at the end, it seems to have taken all changes from master and lumped them into this merge conflict fix stage
22:44 tobiasvl and what was the rationale behind moving .git
22:44 Sal it was a dir with the same name as the new and that now has a .old suffix to its name
22:45 whomp is there some setting i should use with `git merge master`?
22:45 tobiasvl Sal: that doesn't tell me anything
22:45 tobiasvl Sal: let's take a step back. pushing doesn't work because the bitbucket repo has commits that you don't have locally. pulling doesn't work because the bitbucket repo's history does not have common history with your local repo.
22:45 sammyo joined #git
22:46 DaviFelth joined #git
22:46 Sal ok, this is what i did: i renamed dir to abc.old and created a new dir abc
22:46 tobiasvl Sal: somehow, I suspect you've broken your local repo, or moved a different repo's .git directory into your repo, or something. I'm not sure.
22:46 tobiasvl what is abc?
22:46 Sal i copied .git from abc.old to abc
22:46 tobiasvl aha.
22:46 Sal dir name
22:46 DaviFelth left #git
22:46 tobiasvl yes, but is it a git repo? was abc.old a clone of the bitbucket numispedia repo?
22:46 sammyo joined #git
22:47 red82 joined #git
22:47 Sal i don't know if it was a clone. all i know is that they had both the same content
22:48 Sal don't know if that in git talk is called a clone or what
22:48 whomp it's like it's forcing it to be a squash merge
22:48 tobiasvl whomp: does !eek help? I'm not sure I understand your situation
22:48 gitinfo whomp: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
22:48 nipnop left #git
22:49 Sal ok, let me first see the video. if i have to stay up all night to learn this, i'll make it first creating a new bitbucket repository
22:50 Sal thanks, let me see it
22:50 snthsnth joined #git
22:50 Pazzaz joined #git
22:50 tobiasvl Sal: that wasn't for you
22:50 Sal oh
22:50 Sal :)
22:51 tobiasvl Sal: but for you, perhaps a !book would be in order, seeing as you lack some basic git concepts
22:51 gitinfo Sal: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
22:51 Sal tobiasvl, i just have to resolve to get back to work
22:51 Sal no time for reading and learning
22:51 Sal if nobody can help, i will start a new repository
22:52 tobiasvl it's hard to help when you don't know what a clone is, and when you've moved your repo metadata around without explaining why, or without understanding or being able to convey what you have done
22:52 Sal or just keep local .git dir and take out the bitbucket part, because i already have 2 backups going on the project
22:53 Sal tobiasvl, as i said, there probably is a command that i could type and that will let you know what you need to know
22:53 tobiasvl really?
22:53 tobiasvl which one
22:53 mischat joined #git
22:53 Sal so, just tell me what to check
22:54 Sal ok, yes, lets say its a clone
22:54 Sal now?
22:54 tobiasvl great, then everything works
22:54 Sal is there anything i can do to solve this?
22:54 Sal no, because push doesn't work
22:54 tobiasvl then maybe it's not a clone, who knows
22:54 Sal ok, then its not a clone
22:55 Sal now?
22:55 Sal are we going to stop on this "to be or not to be" problem?
22:55 tobiasvl then you are trying to merge stuff from a totally different repo
22:56 tobiasvl well, you can run "git log", find the hash ID of the first commit of the log, and then go to the bitbucket repo in your browser, scroll down to the first commit there, and see if the IDs match
22:56 huntleja left #git
22:56 Sal ok, good
22:56 Sal i'll do it right now
22:57 tobiasvl you can run "git pull origin master --allow-unrelated-histories" if you truly want to ignore all of git's warnings up until now and merge the unrelated histories, but I won't vouch for what happens then because I don't know the statuses of your repos
22:57 tobiasvl but if you're clear on what has happened then that might be OK
22:57 Sal https://goo.gl/wyWvMx
22:57 Sal is the green number the hash id?
22:58 tobiasvl yes, but that's the latest commit, not the first commit
22:58 tobiasvl unless there is only one commit
22:58 SwiftMatt joined #git
22:58 mda1 joined #git
22:58 tobiasvl go to the end of the list, or just run "git log --reverse" and look at the top one (as that reverses the order)
22:59 Sasazuka joined #git
22:59 Ryanar joined #git
22:59 Sal i did reverse, and seems to give me the same results
22:59 tobiasvl then there is only one commit in the git repo
22:59 Sal https://goo.gl/YWt2a0
23:00 tobiasvl your local git repo has only that one commit in its entire history
23:00 tobiasvl is that correct?
23:00 tobiasvl I assume the bitbucket repo has more commits
23:00 Sal ok, so i lost all my previous commits?
23:00 tobiasvl seems like it
23:00 Sal yes, that could be
23:00 Sal damn
23:00 tobiasvl what did you do with your old .git directory?
23:01 Sal i have backups, what if i copy the.git dir from a backup?
23:01 crayon joined #git
23:01 crayon joined #git
23:01 Sal will that mess up more?
23:01 weylin joined #git
23:01 tobiasvl does it contain any commits that you have never pushed to bitbucket?
23:01 tristanp joined #git
23:02 Sal it could, not sure
23:02 Sal i usually commit after each work
23:02 tobiasvl sure, but do you push after each commit
23:02 Sal yes,
23:02 Sal i have them to execute together
23:03 tobiasvl OK, in that case, the backup should not have anything that bitbucket doesn't?
23:03 Sal i can try? right?
23:03 Sal yes, thats right too
23:03 tobiasvl well if you put back the .git backup you would lose the commit you made today
23:03 tobiasvl so if bitbucket truly has everything, there's no need to retrieve the backup, but only you can know that
23:03 Sal so, you're saying that i can could fill the local.git from the bitbucket?
23:03 tobiasvl yes
23:03 Sal great!
23:04 tobiasvl "git pull origin master --allow-unrelated-histories"
23:04 Sal do i need to delete the .git first?
23:04 tobiasvl no, that would make you lose the commit you made today
23:04 Sal ok, i'll do that
23:04 tobiasvl I would advise you never to touch your .git directory (don't move it, don't delete it) unless you know what you're doing
23:04 tobiasvl that's where the actual git repo is stored
23:04 Ardethian joined #git
23:05 mda1 joined #git
23:05 Sal got a lot of conflicts
23:05 tobiasvl the actual code files are just a bonus
23:05 Sal is that normal forcing it?
23:05 tobiasvl depends what you did in your local commit
23:05 tobiasvl but seeing as you've moved stuff around, that sounds normal
23:05 shpew12 joined #git
23:05 tobiasvl !eek
23:05 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
23:06 Sal Automatic merge failed; fix conflicts and then commit the result.
23:06 jeffreylevesque joined #git
23:06 Sal listen, can't i just start a new local repo from bitbucket and then i'll do a global add from my project?
23:07 Sal to put in last changes?
23:08 abcdef joined #git
23:10 Corosauce joined #git
23:11 tobiasvl sure you can
23:11 Sal wont that be easier?
23:12 tobiasvl perhaps. give it a shot
23:13 Sal ok, i'll try
23:13 Ryanar joined #git
23:13 e14 joined #git
23:14 mkoskar joined #git
23:14 JanC_ joined #git
23:15 skyres joined #git
23:16 snowkidind joined #git
23:16 akushner joined #git
23:17 Ryanar joined #git
23:19 Ryanar joined #git
23:25 tristanp_ joined #git
23:26 madewokherd joined #git
23:27 yaewa joined #git
23:28 Sal i deleted the .git
23:28 Sal did a git init
23:29 Sal the a git remote add origin https://.....
23:29 Sal and now i'm doing a git pull
23:30 Viddax joined #git
23:31 puff joined #git
23:32 snypz joined #git
23:32 snypz left #git
23:33 SwiftMatt joined #git
23:33 Ice_Strike2 joined #git
23:38 przemoc joined #git
23:38 przemoc joined #git
23:38 Marbug_ joined #git
23:38 _ADN_ joined #git
23:39 nd joined #git
23:42 aidalgol joined #git
23:44 llamapixel Sal: In macosx make sure you empty the trash if going that way.
23:44 llamapixel if using os x
23:46 Viddax joined #git
23:47 WhiskerBiscuit joined #git
23:49 ochorocho__ joined #git
23:51 red82 joined #git
23:51 stefanct left #git
23:52 terens_ joined #git
23:54 hahuang61 joined #git
23:54 denimsoft joined #git
23:55 dodobrain joined #git
23:56 Sonderblade joined #git
23:57 Shentino joined #git

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