Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-14

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

All times shown according to UTC.

Time Nick Message
00:00 cdg joined #git
00:03 baryon joined #git
00:04 ajf- joined #git
00:08 converge joined #git
00:10 teratorn left #git
00:10 howitdo joined #git
00:11 raspado joined #git
00:12 venmx joined #git
00:14 f3r70rr35f joined #git
00:15 asimismo joined #git
00:16 btree joined #git
00:17 jaguarmagenta joined #git
00:17 diogenese joined #git
00:18 BenderRodriguez joined #git
00:19 btree joined #git
00:19 btree left #git
00:20 asimismo I would like to have a clean workspace but I have a file that keeps being automatically marked as deleted. As soon as I discard the change, though, the file shows up marked as deleted again. Any suggestions? I’m on 2.11.0 on Mac.
00:23 diogenese joined #git
00:24 kadoban asimismo: Well, is the file deleted?
00:24 anuxivm joined #git
00:26 asimismo @kadoban It should not be. I just want my workspace to match the index. But every time I discard the change it gets marked again. “git checkout — <file>” should normally do it, no?
00:26 systemovich joined #git
00:26 star_prone joined #git
00:28 DolphinDream joined #git
00:29 kadoban asimismo: What does "it gets marked again" mean? Can you do a !transcript
00:29 gitinfo asimismo: 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
00:30 chardan joined #git
00:31 _28_ria joined #git
00:31 asimismo I’ll work on it—gimme a sec. Meanwhile, can you confirm that “checkout —“ on that file should return it to how it is in the index?
00:32 tmsmith joined #git
00:33 kadoban asimismo: Yes
00:33 BenderRodriguez joined #git
00:33 nivag joined #git
00:36 phroa asimismo: what client are you using, out of curiousity? -- is being rewritten as an en dash
00:37 austin987 joined #git
00:38 asimismo Hmmm… No I think I figured out what’s happenening. I misread what I was seeing. It’s not that the file was deleted and replaced—it’s the contents of the file being changed. It’s that someone committed a .gitattributes change for line endings. So I reset the file and git “fixes” it.
00:38 asimismo @phroa That’s Colloquy. I typed two en-dashes and it changed to an em-dash.
00:39 jooni joined #git
00:39 asimismo Anyone have experience with Liquibase and git, then? I’m afraid if I commit this file with the new line endings then Liquibase will detect it has a different hash code and complain.
00:43 jaguarmagenta joined #git
00:43 Noodlewitt joined #git
00:43 f3r70rr35f joined #git
00:44 asimismo @kadoban Seems moot now if it’s .gitattributes making the change, but this is what I was seeing: https://gist.github.com/anonymous/f19bdf5938bad82b825669a10338416d
00:44 kadoban Ah, yeah line endings get weird
00:45 jaguarmagenta joined #git
00:46 courrier joined #git
00:46 Gsham joined #git
00:46 Lipp joined #git
00:48 a_thakur joined #git
00:50 eb0t joined #git
00:52 e14 joined #git
00:52 thiago joined #git
00:53 buffal0 joined #git
00:57 shgysk8zer0 joined #git
00:59 Darren_ joined #git
01:00 f3r70rr35f joined #git
01:01 diogenese joined #git
01:02 jaguarmagenta joined #git
01:04 ajf- joined #git
01:06 dodobrain joined #git
01:07 qpdb joined #git
01:07 diogenese joined #git
01:11 cyphase joined #git
01:12 Noodlewitt joined #git
01:12 nettoweb joined #git
01:12 linduxed joined #git
01:13 diogenese joined #git
01:15 Sasazuka_ joined #git
01:23 Samual joined #git
01:23 durham joined #git
01:25 nivag joined #git
01:27 holodoc joined #git
01:28 sdothum joined #git
01:29 user_ joined #git
01:30 nivag joined #git
01:31 ejb joined #git
01:32 user_ joined #git
01:33 QuestionTime joined #git
01:34 QuestionTime joined #git
01:34 wxg joined #git
01:37 Sasazuka joined #git
01:44 flippo joined #git
01:45 nivag joined #git
01:47 Sasazuka joined #git
01:48 jmpp joined #git
01:50 ochorocho__ joined #git
01:53 QuestionTime joined #git
01:53 Lipp joined #git
01:55 peeps[lappy] joined #git
01:57 mizu_no_oto joined #git
01:59 QuestionTime joined #git
02:00 dar123 joined #git
02:01 JamesBaxter joined #git
02:02 JanC_ joined #git
02:03 converge joined #git
02:04 floatingman joined #git
02:07 chris2 joined #git
02:10 linduxed joined #git
02:13 venmx joined #git
02:16 d^sh joined #git
02:17 finalbeta joined #git
02:17 f3r70rr35f joined #git
02:20 arescorpio joined #git
02:24 SPhoenixDW joined #git
02:24 DonRichie joined #git
02:29 alyptik left #git
02:30 romerocesar joined #git
02:31 thebope joined #git
02:31 ejb joined #git
02:31 b_rare joined #git
02:36 invisbl joined #git
02:39 mizu_no_oto joined #git
02:39 diogenese joined #git
02:41 Melch joined #git
02:44 Melch I'm trying to figure out how `git show [tag]` and `git show origin [tag]` are referencing two different commits. Driving me a little crazy.
02:46 Melch Somebody else created the tag. I don't believe they force pushed.
02:46 Emperor_Earth joined #git
02:48 d0nn1e joined #git
02:50 pks joined #git
02:50 diogenese joined #git
02:50 nivag joined #git
02:51 ochorocho__ joined #git
02:52 jon-mac joined #git
02:54 aidalgol Does amending a commit update the timestamp?
02:54 navidr joined #git
02:56 dsantiago joined #git
02:59 [Sinner] joined #git
03:01 aavrug joined #git
03:05 johnny56_ joined #git
03:08 mizu_no_oto joined #git
03:10 invisbl_ joined #git
03:18 nopacienc3 joined #git
03:18 nopacienc3 hi
03:19 [0xAA] joined #git
03:20 thiago joined #git
03:24 Andrew_K joined #git
03:25 nopacienc3 how can i diff a file from HEAD~5: with the current version ?
03:27 chachasmooth joined #git
03:28 nopacienc3 nvm
03:28 alex1a joined #git
03:31 thebope joined #git
03:32 JamesBaxter joined #git
03:33 madewokherd joined #git
03:33 sunri5e joined #git
03:35 ulkesh_ joined #git
03:37 Lipp joined #git
03:37 raspado joined #git
03:37 Noodlewitt joined #git
03:38 f3r70rr35f joined #git
03:38 alyptik joined #git
03:39 alyptik left #git
03:40 CuriousMind joined #git
03:40 CuriousMind Hello, I hope everyone is well
03:40 CuriousMind What command do I type which lets you look through the file and save certain parts?
03:40 CuriousMind git add -p?
03:41 SwiftMatt joined #git
03:41 dmc yes
03:42 dmc check the man page when in doubt
03:42 CuriousMind Newbie to git and thanks dmc
03:43 Goplat joined #git
03:44 _August_ joined #git
03:46 fahadash joined #git
03:51 [Saint] joined #git
03:52 venmx joined #git
03:53 oskarkv joined #git
03:54 pks joined #git
03:56 gfixler joined #git
03:57 hexagoxel joined #git
03:59 a_thakur joined #git
04:00 star_prone joined #git
04:01 blackwind_123 joined #git
04:03 mischat joined #git
04:05 netj joined #git
04:05 davimore_ joined #git
04:05 CuriousMind Can someone please refer me to a good git commit convention website?
04:06 f3r70rr35f joined #git
04:06 nopacienc3 left #git
04:08 duderonomy joined #git
04:08 jeffreylevesque joined #git
04:08 buckowski joined #git
04:08 sbulage joined #git
04:09 ashnur joined #git
04:09 ashnur joined #git
04:09 Afforess joined #git
04:10 pelegreno___ joined #git
04:11 catern joined #git
04:12 aavrug joined #git
04:14 fstd_ joined #git
04:15 gnarf joined #git
04:15 Vortex34 joined #git
04:17 jaguarmagenta joined #git
04:17 unbalanced joined #git
04:18 b_rare joined #git
04:19 kfoonamalik joined #git
04:19 saml joined #git
04:25 aruns joined #git
04:28 e14 joined #git
04:30 phroa CuriousMind:  http://git.kernel.org/cgit/git/git.git/tree/Documentation/SubmittingPatches?id=refs/heads/master#n93 and https://github.com/agis-/git-style-guide seems nice from a quick google
04:30 phroa more than anything, explain the _why_
04:30 CuriousMind Thank you phroa, I appreciate it
04:31 CuriousMind I will keep that in mind phroa, thanks a lot
04:32 function joined #git
04:32 tnecniv_ joined #git
04:32 thebope joined #git
04:37 sweatsuit joined #git
04:40 lukky513 joined #git
04:40 Lunatrius joined #git
04:41 unbalanced joined #git
04:43 nikow joined #git
04:46 mischat joined #git
04:47 lindenle joined #git
04:48 subhojit777 joined #git
04:50 Dragonbird joined #git
04:52 pks joined #git
04:52 ochorocho__ joined #git
04:54 howdoi joined #git
04:55 bocaneri joined #git
05:00 AmazeCPK joined #git
05:02 sharms joined #git
05:02 _28_ria joined #git
05:02 AmazeCPK having a problem trying to pull a repo, and unsure where to start
05:03 Gsham joined #git
05:03 llamapixel AmazeCPK:  you have pulled this repo before to this local machine?
05:04 AmazeCPK correct, problem is I modified it somewhere else
05:04 llamapixel git status says you are up or down stream?
05:04 AmazeCPK so really, I just want to pull the db file from my server, to my local machine
05:04 AmazeCPK one sec
05:05 AmazeCPK llamapixel: https://gist.github.com/anonymous/de72317e34b5f6d6092c30657b9fc61d
05:05 llamapixel https://git-scm.com/docs/git-stash  you could try stashing your potential there
05:06 llamapixel then pull
05:06 dreiss joined #git
05:07 AmazeCPK stash on server? or local machine?
05:07 jaguarmagenta joined #git
05:07 llamapixel local untracked
05:07 llamapixel you can add them later
05:07 AmazeCPK https://gist.github.com/anonymous/8989c7205863ed568f77e1d934ce549b
05:08 Atrumx joined #git
05:10 llamapixel so git pull gives you an error?
05:10 llamapixel git branch will show you all branches and what branch you are looking at.
05:10 AmazeCPK correct https://gist.github.com/anonymous/b4bb3594f1488a4e07f2d801a9f8fa87
05:10 mehola joined #git
05:11 AmazeCPK https://gist.github.com/anonymous/2d6a47a728a97731163209ac729541f1
05:14 llamapixel I guess this is a case for git fetch
05:15 Lipp joined #git
05:16 llamapixel https://longair.net/blog/2009/04/16/git-fetch-and-merge/
05:16 AmazeCPK I'll give it a shot. thanks
05:16 Didac joined #git
05:17 AmazeCPK for future reference, what is the correct way of going about my  situation
05:17 AmazeCPK in this instance, I am working on files locally. howver I needed tp pull several images, and a database file from the server
05:17 AmazeCPK all the images are in a given dir
05:19 llamapixel In my scenarios I always pull before a work block
05:19 llamapixel then I git status to see if I am up to date.
05:20 llamapixel Finally at the end of a session I git add . // git commit -m “notes” // git push origin master -vvv  /// if I am working in a master branch and not on my own specific one.
05:21 svm_invictvs joined #git
05:22 systemov` joined #git
05:22 AmazeCPK what does "before a work block" mean?
05:23 llamapixel at the start of commencing a work block ( pull from external git )
05:24 llamapixel When I start to work I assume that anyone has touched the repo in between my last commit
05:24 llamapixel I use something called git cig to check more than one at a time so it becomes a habit. https://github.com/stevenjack/cig
05:26 AmazeCPK awesome, something to look into. thank you so much
05:27 llamapixel it might not solve the current issue but it is a good practice to have on your master GIT folder
05:35 Sample joined #git
05:35 howitdo joined #git
05:36 shgysk8zer0 joined #git
05:39 smithbone joined #git
05:41 testuser2 joined #git
05:44 mrmadcat joined #git
05:46 aruns joined #git
05:46 mischat joined #git
05:48 Cabanossi joined #git
05:50 thiago joined #git
05:53 ochorocho__ joined #git
05:53 dsdeiz joined #git
05:54 jaguarmagenta joined #git
05:55 jaguarmagenta joined #git
05:56 netj joined #git
05:58 ChikaTikka joined #git
05:59 function joined #git
06:01 ChikaTikka Hey I'm having ^M in my files on git diff. I'm on a windows machine and collaborating with people on linux. Vim can't identify ^M in my code either when I tried removing it there. I don't think I can set line ending options in git attributes before I can talk to my collaborators. Any ideas on what I could do? Should I set autocrlf to true?
06:02 justanotheruser joined #git
06:02 thiago yes, you should
06:02 thiago you should do that in your global config, in fact
06:03 Dragonbird joined #git
06:06 testuser2 left #git
06:08 venmx joined #git
06:10 romerocesar joined #git
06:13 ChikaTikka thiago: Hey it worked perfectly. Thanks :)
06:15 acetakwas joined #git
06:16 e14 joined #git
06:16 andrew710 joined #git
06:17 rscata joined #git
06:20 lordjancso joined #git
06:28 kenoob joined #git
06:30 sbulage joined #git
06:32 dreiss joined #git
06:32 davidosomething joined #git
06:34 thebope joined #git
06:34 cyan__ joined #git
06:38 overlord_tm joined #git
06:38 qt-x joined #git
06:38 ploop joined #git
06:45 Takiito joined #git
06:45 Takiito joined #git
06:46 subhojit777 joined #git
06:47 miczac joined #git
06:47 mischat joined #git
06:48 mehola joined #git
06:48 acetakwas joined #git
06:48 lindenle joined #git
06:49 dodobrain joined #git
06:50 romerocesar_ joined #git
06:52 Lipp joined #git
06:54 pks joined #git
06:54 romerocesar joined #git
06:54 dreiss joined #git
06:54 brillenfux joined #git
06:54 mda1 joined #git
06:59 ki0 joined #git
07:00 OOPMan joined #git
07:00 dermoth joined #git
07:02 Raging_Hog joined #git
07:05 sword joined #git
07:07 vdv joined #git
07:10 StuartMI joined #git
07:10 pks joined #git
07:11 finalbeta joined #git
07:13 romerocesar joined #git
07:15 elect_ joined #git
07:15 jaafar joined #git
07:18 romerocesar joined #git
07:22 freimatz joined #git
07:23 aw1 joined #git
07:28 JeroenT joined #git
07:30 satya4ever_ joined #git
07:30 ogny joined #git
07:30 nidr0x joined #git
07:32 spacelord_ joined #git
07:33 roelmonnens joined #git
07:34 buzzLightBeer joined #git
07:34 Raging_Hog joined #git
07:35 jnavila joined #git
07:35 pks joined #git
07:36 thebope joined #git
07:36 Karazhan joined #git
07:41 chele joined #git
07:42 subhojit777 joined #git
07:46 Funeral left #git
07:47 _28_ria joined #git
07:47 Sceorem joined #git
07:47 tvw joined #git
07:48 mischat joined #git
07:49 eduardas_m joined #git
07:49 venmx joined #git
07:49 romerocesar joined #git
07:50 zeroed joined #git
07:50 zeroed joined #git
07:56 venmx joined #git
07:59 anddam left #git
08:00 fatalhalt joined #git
08:05 TomyWork joined #git
08:08 danslo joined #git
08:10 hahuang62 joined #git
08:12 star_prone joined #git
08:12 star_prone joined #git
08:12 ki0 joined #git
08:13 zeroed joined #git
08:13 zeroed joined #git
08:13 cgundersson joined #git
08:18 mischat_ joined #git
08:19 JeroenT joined #git
08:21 ktoverso joined #git
08:21 star_prone joined #git
08:25 FreakySneaky joined #git
08:25 scardonian joined #git
08:26 scardonian joined #git
08:26 lordjancso joined #git
08:27 scardonian joined #git
08:28 scardonian joined #git
08:29 cmalmber joined #git
08:31 tens0r joined #git
08:31 star_prone joined #git
08:32 JeroenT joined #git
08:33 danslo joined #git
08:38 cgundersson joined #git
08:38 Eryn_1983_FL joined #git
08:39 systemovich joined #git
08:40 sbulage joined #git
08:40 [cust] joined #git
08:41 Balliad joined #git
08:41 systemovich joined #git
08:45 hussam joined #git
08:46 Orbitrix joined #git
08:46 Orbitrix joined #git
08:47 Orbitrix joined #git
08:48 QualityAddict joined #git
08:49 derk0pf joined #git
08:50 ProbabilityMoon joined #git
08:54 czart joined #git
08:56 ochorocho__ joined #git
08:56 Lipp joined #git
08:57 MutantMahesh joined #git
08:59 omegak_ joined #git
09:00 derk0pf joined #git
09:01 systemovich joined #git
09:02 theoceaniscool joined #git
09:02 ki0 joined #git
09:03 ki0 joined #git
09:03 mda joined #git
09:04 venmx joined #git
09:04 ToBeCloud joined #git
09:05 omegak joined #git
09:05 zeroed joined #git
09:06 mikecmpbll joined #git
09:06 ronskisika joined #git
09:06 garethdaine joined #git
09:08 ToxicFrog joined #git
09:09 theoceaniscool joined #git
09:09 kfoonamalik joined #git
09:11 hahuang62 joined #git
09:12 re1 joined #git
09:14 encod3 joined #git
09:17 kurkale6ka joined #git
09:19 sweatsuit joined #git
09:19 Flowinho joined #git
09:19 diget joined #git
09:21 Vgr joined #git
09:22 cqi joined #git
09:22 olbat git diff HEAD~5 -- filename ?
09:23 selckin the only valid option for autocrlf is false
09:23 cqi joined #git
09:24 finalbeta joined #git
09:24 dcpc007 left #git
09:26 SteveCharleston joined #git
09:26 doev joined #git
09:26 Snugglebash joined #git
09:26 acetakwas joined #git
09:27 zeroed joined #git
09:27 zeroed joined #git
09:28 doev hi. I try to correct the encoding in gitbash (git for windows). The locals are set to de_DE.utf8 and the window options too. But the tools do not output in the correct encoding, i.e. "ping --help".
09:28 clmsy joined #git
09:28 doev Any ideas?
09:30 roelmonn_ joined #git
09:31 _joes__ joined #git
09:34 mischat joined #git
09:36 kenoob joined #git
09:39 mda1 joined #git
09:40 marcogmonteiro joined #git
09:40 cbreak doev: windows and utf8? :O
09:40 cbreak I don't think that thing can do unicode
09:41 Sample joined #git
09:41 bruce_lee joined #git
09:41 pbrewczynski joined #git
09:43 Gloomy joined #git
09:44 doev why not? git-bash is set to utf8 and my testcode does output utf8 too, locale is set to utf8 ... but for special characters there is only a placeholder.
09:44 cbreak because windows can't handle it
09:44 doev btw. when I start my testapp on windows cmd, it display correct
09:45 maskeraid joined #git
09:45 selckin what does it output in utf8 thats not a special character?
09:45 diogenese joined #git
09:45 doev can I set gitbash to latin1?
09:45 ExeciN joined #git
09:46 Serpent7776 joined #git
09:46 doev ▒▒▒▒ - Test  <== was: äöü - Test
09:49 FabioQ joined #git
09:49 Sceorem__ joined #git
09:51 Lipp joined #git
09:51 grawity doev: change the font
09:52 roelmonnens joined #git
09:53 e14 joined #git
09:53 MattE joined #git
09:55 theoceaniscool joined #git
09:55 Sceorem joined #git
09:58 ToxicFrog joined #git
09:58 mikecmpbll joined #git
09:58 doev I don't think the font is the reason, cause I tested already different ones.
09:59 doev but I found out, that my test code is doing well with latin1. For some other reason the output of the system tools is bad.
09:59 doev i.e. ping
09:59 Seveas doev: we live in 2016, if you don't use utf-8, you're doing it wrong.
10:00 jast windows is perfectly capable of UTF-8 btw
10:01 ^7heo jast: you should specify the version here; windows * doesn't support UTF-8
10:01 mahendratech joined #git
10:02 jast you just don't get API support for UTF-8
10:02 jast which I believe is true in all versions
10:02 achadwick joined #git
10:03 zero85 left #git
10:03 fearless_man joined #git
10:03 jaguarmagenta joined #git
10:04 TomyWork joined #git
10:05 jast the windows API support is for UTF-16 (or UCS-2 in older versions, i.e. NT4 and before)
10:06 venmx joined #git
10:06 derk0pf joined #git
10:06 ^7heo jast: you do realize that windows * includes 3.0 right?
10:07 jast I thought we were talking about operating systems, not toys
10:07 ^7heo ask wikipedia.
10:07 jast anything not based on NT is not worth talking about IMO
10:07 King_Hual joined #git
10:07 Raging_Hog joined #git
10:07 ^7heo jast: and you're confusing anyway. first you say windows, then "not toys"
10:07 ^7heo ... =/
10:07 jast it's true that pre-NT versions of windows didn't have *any* wide character API
10:08 jast from what I remember developing on Win 9x, anyway
10:09 jast well, Windows is a decent operating system these days
10:09 selckin thats like talking about linux 1.x
10:09 jast it's also a tangled mess, but that's normal
10:09 doev its very strange how gitbash and cmd are behave diffrently on differend encodings
10:09 jast I believe we were at 2.x already during the Windows 9x days...
10:11 nopf joined #git
10:11 DieguezZ joined #git
10:11 acidnet joined #git
10:12 ^7heo selckin: it is. but windows == windows. Not the same way that linux == linux. not GNU/Linux, not Linux/Systemd, not...
10:12 howitdo joined #git
10:12 acidnet left #git
10:12 troulouliou_dev joined #git
10:12 ^7heo so yeah, I was just saying for the sake of correctness (and time wasting) that "windows" should be suffixed with its minimum version
10:12 jast doev: to cover all bases, what version of git for windows are you using?
10:12 ^7heo like windows > NT
10:13 jast time wasting... yeah, sounds good, now that I think about it
10:13 ^7heo can't tell if you're sarcastic or using the wrong terms ;)
10:14 jast my work here is done
10:14 jast (my primary job in this channel is to needlessly confuse people)
10:14 chll_ joined #git
10:16 ^7heo jast: gg
10:16 davimore__ joined #git
10:16 mablae_ joined #git
10:17 mkoskar joined #git
10:17 polyrob joined #git
10:18 bongjovi joined #git
10:18 doev jast, git version 2.10.2.windows.1 ... I am not 100% sure about the "git for windows" version
10:19 jast okay, that one is supposed to contain fixes for UTF-8 on windows
10:20 jast the fix was in 2.1, apparently
10:20 jast see if this helps: http://stackoverflow.com/a/36692549
10:21 eduardas_m joined #git
10:21 jast you should be fine with choosing the same locale you did before, rather than 'C' as suggested in that post, as long as you set it in both your shell config and the config for the terminal window
10:22 jast in fact just the terminal config might be enough
10:22 nebg joined #git
10:23 doev hmm, sometimes it is better to controll solutions on stackoverflow. If I force java to output in utf8, it works well with gitbash.
10:25 jast huh... what does java have to do with this?
10:26 rnsanchez joined #git
10:26 mindfart joined #git
10:26 Sceorem_ joined #git
10:26 navidr joined #git
10:28 spykins joined #git
10:29 spykins Hello everyone, I am facing this issue      fatal: story/fixBug cannot be resolved
10:29 timothy joined #git
10:30 Sceorem_ joined #git
10:30 selckin !smart_q
10:30 gitinfo [!smart_questions] You should read http://www.catb.org/esr/faqs/smart-questions.html on how to improve asking and recieving help from the open source community. It will greatly benefit you and you'll get results faster.
10:32 spykins I have this branch story/fixBug on github, when I fetch it, I get story/fixBug -> origin/story/fixBug . When I checkout to story/fixBug locally, I noticed the git branch doesn’t highlight the branch. I see a branch Story/fixBug, the lower case s is replaced with Uppercase S on my system. My terminal still points to story/fixBug though, after working on this branch and I attempt to push to story/fixBug, I face the error  fatal: story/fixBug cannot be resolved
10:33 doev joined #git
10:33 cqi joined #git
10:34 Neon joined #git
10:35 selckin how did you checkout that branch? maybe psot git branch -a output
10:35 doev java encodes the output with system defaults, so I have to set a different one for testing. The code I found on stackoverflow was using "utf-8" but "utf8" was correct.
10:35 cqi joined #git
10:36 spykins Thanks selckin , after git fetch, I just types git checkout story/fixBug
10:37 spykins When I type git branch -a, I see all the remote branches
10:39 Neon I have a weird problem. I was just trying to merge my master into my feature branch, when I got the message "BUG: There are unmerged index entries:". The internet gave me the tip to re-run it with GIT_MERGE_VERBOSITY=5. Basically the situation is as follows: Back then I had a subdir A. In subdirs of A there was the same file sitting at different locations. One time subdir B got introduced with the same file at some
10:39 Neon locations and subdir A got deleted. Git registered this as some file moving apparently. Now this gives me bugs. Here is a gist with the console output of merge with the verbosity. The com_ppdadb folder is non-existent in both branches (master and the current one). Please help me. I have no idea how to solve this. A StackOverflow entry I found suggests deleting the files bugging, but, as I said, they are already gone.
10:40 Neon Here's the SO entry I found: http://stackoverflow.com/questions/6761229/git-produces-bug-there-are-unmerged-index-entries
10:44 Neon So it appears to me the problem is that the files reported as buggy have been moved/renamed in both branches, but to different destinations.
10:49 aavrug joined #git
10:49 mar77i joined #git
10:51 djb-irc joined #git
10:52 converge joined #git
10:53 sylario joined #git
10:58 YuGiOhJCJ joined #git
10:59 Renter oh, that's going to be fun to fix
11:05 nceo joined #git
11:05 JeroenT joined #git
11:10 kfoonamalik joined #git
11:14 mischat joined #git
11:15 danslo_ joined #git
11:16 Lipp joined #git
11:16 manuels joined #git
11:17 f3r70rr35f joined #git
11:17 ams__ joined #git
11:21 Darcidride joined #git
11:22 hahuang62 joined #git
11:32 elect joined #git
11:32 mp3 joined #git
11:32 _August_ joined #git
11:33 ahmedelgabri joined #git
11:35 acetakwas joined #git
11:37 mindfart joined #git
11:37 NeverDie joined #git
11:37 converge joined #git
11:39 thebope joined #git
11:39 Neon Maybe you can help me understand the problem better at least. Aren't these actions like move/rename just "made up" by git when it compares two trees? So at one location the file hash disappears, somewhere else the same hash appears and git be like "hey, this file moved"?
11:41 ki0_ joined #git
11:41 b4x left #git
11:42 Dragonbird joined #git
11:42 nettoweb joined #git
11:46 MutantMahesh joined #git
11:48 canton7 Neon, pretty much, but it compares the contents of the files. There's a (configurable) threshold: if the files share about that % of the same number of lines, it's a copy/rename
11:48 Flowinho joined #git
11:49 Neon canton7: Ah, so it would record a copy/rename +changes, if there are only a few changes. I know for my case, though, that the files match 100%.
11:49 canton7 Neon, it doesn't record copy/rename at all - it's worked out by the commands which display that info
11:49 Neon Yeah, that's what I meant.
11:50 ronskisika joined #git
11:51 kotk joined #git
11:51 Neon I was thinking about how to plumb this problem away, and parallely I try to find out which solution would have the best time/value rate.
11:51 romerocesar joined #git
11:51 MutantMahesh joined #git
11:52 YMQNOcHt2Bxj joined #git
11:52 Neon I could just copy all the changes from the branch to another branch that introduces all changes in one commit, delete the current branch and work with the new one, having all changes lost.
11:52 YMQNOcHt2Bxj left #git
11:52 Neon Change logs that is.
11:52 YMQNOcHt2Bxj joined #git
11:53 Neon Or I try to flatten my current branch using rebase down to the commit where the file was moved, then remove the commit using the method described on https://sethrobertson.github.io/GitFixUm/fixup.html#remove_deep.
11:53 YMQNOcHt2Bxj left #git
11:53 Neon My git log graph doesn't look good. Did too many confusing stuff with branches in the past.
11:54 MutantMa_ joined #git
11:55 nanga joined #git
11:55 nanga joined #git
11:55 buffal0 joined #git
11:56 JeroenT joined #git
11:57 nanga joined #git
11:57 Neon But why can't merge think of these divergent renamings as two copies and one delete?
11:57 nanga joined #git
12:00 ahmed_elgabri joined #git
12:00 nanga joined #git
12:00 nanga joined #git
12:01 mar77i joined #git
12:01 j416 joined #git
12:01 danslo joined #git
12:03 mischat joined #git
12:04 mischat joined #git
12:04 KevinDF joined #git
12:04 jaguarmagenta joined #git
12:06 Lipp joined #git
12:08 CypherEA joined #git
12:09 Wind0r joined #git
12:11 ahmed_elgabri joined #git
12:11 mario__ joined #git
12:12 Akimb joined #git
12:12 nettoweb joined #git
12:12 CypherEA Good morning everyone
12:14 CypherEA I'm having a really annoying issue with GIT. I'm using it through Netbeans. After checking out recent changes from BitBucket, I try to commit - and it created a new [no name] branch, which for some reason won't let me rename or synch with the master.
12:14 CypherEA I need the changes I've made to go to the master branch.
12:14 tobiasvl CypherEA: !gui
12:14 gitinfo CypherEA: 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.
12:14 j416 joined #git
12:14 belak Git doesn't have unnamed branches
12:15 fmcgeough joined #git
12:15 tobiasvl CypherEA: but that said, could it be a !detached_head? how did you check out "recent changes" from Bitbucket?
12:15 gitinfo CypherEA: [!detached] A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
12:15 mischat joined #git
12:19 m___ joined #git
12:20 deadnull joined #git
12:22 clmsy joined #git
12:23 Snugglebash joined #git
12:24 Snugglebash joined #git
12:24 tvw joined #git
12:25 Snugglebash joined #git
12:25 dsdeiz joined #git
12:25 cqi joined #git
12:25 Snugglebash joined #git
12:26 Snugglebash joined #git
12:26 sLite joined #git
12:30 sdothum joined #git
12:35 Sigfrid joined #git
12:37 Sigfrid joined #git
12:37 GavinMagnus joined #git
12:39 Sigfrid joined #git
12:40 thebope joined #git
12:41 GavinMagnus left #git
12:43 f3r70rr35f joined #git
12:44 mischat joined #git
12:45 dsdeiz joined #git
12:47 yetithefoot joined #git
12:49 zeroed joined #git
12:50 Sigfrid joined #git
12:50 DolphinDream joined #git
12:50 systemovich joined #git
12:51 ispn joined #git
12:52 johnmilton joined #git
12:52 mischat joined #git
12:52 Gsham joined #git
12:53 kenoob joined #git
12:53 kenoob joined #git
12:55 ojdo joined #git
12:55 webdev007 joined #git
12:56 systemovich joined #git
12:59 ochorocho__ joined #git
13:00 Schrostfutz joined #git
13:00 roelmonn_ joined #git
13:02 Schrostfutz Hi, I want to integrate two branches that have diverged. The changes of the one branch are relatively small so I tried rebasing it onto the other. This fails however because the files it changed have been renamed in the other branch. Whats the best way to handle this? Simply merging results in a huge merge conflict which I'd like to avoid
13:02 zeroed joined #git
13:03 selckin if you are rewriting history anyway, i sometimes just add a commit with the rename in my branch before rebasing
13:05 kadoban joined #git
13:08 dar123 joined #git
13:08 Tucky joined #git
13:09 _Cyclone_ joined #git
13:11 Tucky Hi, does someone knows why this alias works: cd = !echo "$(git rev-parse --show-toplevel)" while the same with cd instead of echo does nothing?
13:12 osse Tucky: yes. the current directory is not a global thing. it's per process.changing dirs in a different process does nothing
13:12 kfoonamalik joined #git
13:12 _ikke_ It starts a new shell
13:12 _ikke_ So the changes stay in that shell
13:12 _ikke_ Tucky: It should be a shell alias, not a git alias
13:12 _ikke_ grt is an alias for cd $(git rev-parse --show-toplevel || echo ".")
13:12 Tucky ok, I see
13:13 osse I use something like tihs:   cd() { if [[ $1 = :/ ]]; then builtin cd "$(git rev-parse...)"; else builtin cd "$@"; fi; }
13:15 synthroid joined #git
13:15 Tucky Thank you guys
13:15 dar123 joined #git
13:17 bluezone joined #git
13:17 QuinziF joined #git
13:18 Snugglebash joined #git
13:18 Nilesh_ joined #git
13:19 iamtakingiteasy joined #git
13:20 Sigfrid joined #git
13:22 boombatower joined #git
13:24 GavinMagnus joined #git
13:24 hahuang62 joined #git
13:26 mischat joined #git
13:26 GavinMagnus left #git
13:26 mazert joined #git
13:26 Gloomy joined #git
13:27 mischat_ joined #git
13:29 e14 joined #git
13:29 wm4 joined #git
13:29 alhariel joined #git
13:29 wm4 how do I configure the username and email for a git submodule
13:30 wm4 its .git is a "link" to the repo it's contained in (wtf?), so there's no obvious or natural way how this is done
13:30 wm4 also, does "git submodule init" by default only fetch the master branch from the submodule remote or what?
13:31 elect joined #git
13:32 kadoban wm4: Why would you need to configure the username and email specially for a submodule? You really only pick a commit from the remote in a submodule and use that, I don't know of any workflow/model where you should be making commits in the submodule.
13:33 wm4 kadoban: maybe I have to? but using the one from the containing repo would be fine too in my specific use-case
13:35 f3r70rr35f joined #git
13:35 wm4 the thing with the branch was probably PEBKAC
13:36 webdev007 joined #git
13:37 jast you have to be careful if you do actual work inside a submodule, depending on how it's set up. if the submodule references a specific commit, the submodule repo has a detached HEAD and you can easily lose changes you commit
13:37 fees joined #git
13:37 jast so, "ideally", if you need to work in a submodule, you do that in a separate clone of just that repo
13:38 Lipp joined #git
13:39 Dragonbird joined #git
13:40 thebope joined #git
13:42 jeffreylevesque joined #git
13:47 jaguarmagenta joined #git
13:47 alhariel joined #git
13:47 mischat joined #git
13:48 mischat joined #git
13:49 Gsham joined #git
13:55 LionsMane joined #git
13:55 sbulage joined #git
13:57 Mathieu_ joined #git
13:57 kedare joined #git
13:58 PCatinean joined #git
13:58 Ahiiru joined #git
13:59 Ahiiru that' one big channel
14:00 sunri5e joined #git
14:00 Ahiiru hello there, I'm new to git and I can't find a good resource for checking individual commands
14:00 selckin man git-clone
14:00 gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html
14:01 Ahiiru oh, thanks! so it's called manual
14:01 wm4 left #git
14:01 MrB_ left #git
14:01 breezy_ joined #git
14:03 cdg joined #git
14:04 cyan__ joined #git
14:05 howdoi joined #git
14:06 a_thakur joined #git
14:06 zaytsev joined #git
14:07 Zamerick joined #git
14:07 unbalanced joined #git
14:08 anonymuse joined #git
14:08 zaytsev hello. i have several repositories, and i want to merge them into one. to this end i make a new one, add them all to remotes, do fetch --all and perform an octopus merge with the initial empty commit. now i want to backup all old branches as well
14:08 fahadash joined #git
14:08 zaytsev i do cp -r ../$REPO_FQN/.git/refs/remotes/origin/* .git/refs/heads/archive/$REPO_HEAD which sort of works, but git complains that many branches do to not point to valid objects afterward... very confused, how can this be?
14:10 zaytsev maybe i'm missing something, and there is a different, correct way to transplant all branches from one repository to another?
14:11 selckin !mirror
14:11 selckin nope that doesn't do what you want after reading manual myself
14:12 jimi_ joined #git
14:12 ktoverso joined #git
14:12 sunri5e joined #git
14:13 bsanford joined #git
14:13 invisbl joined #git
14:13 zaytsev selckin: exactly
14:14 zaytsev will be trying to do rev-parse on git branch -r in remote repost and git checkout -b ... ... in a loop, but doens't sound all too exciting
14:15 selckin since you said backup, i make tags
14:15 selckin +would
14:17 JeroenT joined #git
14:17 nettoweb joined #git
14:19 jimi_ joined #git
14:21 jimi_ joined #git
14:22 heroux joined #git
14:23 converge joined #git
14:23 converge joined #git
14:25 Ryanar joined #git
14:26 zaytsev ok i don't get it, i've implemented the loop and it works the same way as copying the files, for some branches it's ok
14:26 zaytsev but for some branches i get things like fatal: reference is not a tree: 7e3118e0e307198711a1c5504ccfcb2d65057f1e
14:27 zaytsev so git fetch --all doesn't fetch all blobs from the remote repositry or what>?
14:28 navidr joined #git
14:30 zaytsev git show on the original repository does show the blob?! git show f2e0be4076ff52c0ba69fa5ca3a2f5d23bde2bd7
14:30 ExoUNX joined #git
14:31 theoceaniscool joined #git
14:32 Endarked joined #git
14:32 Darren_ joined #git
14:32 zaytsev in .git/refs/remotes/otherrepo/ i see only master can this be the problem
14:33 donnib joined #git
14:33 donnib Hey
14:33 donnib our bamboo server clones the repository before it builds, i need to do git branch -r but i get nothing back
14:34 donnib how do they do clone without remotes ? is there a way i can get the remotes
14:34 Neelixx joined #git
14:35 invisbl joined #git
14:35 donnib i can also see the origin is not set
14:35 marscher joined #git
14:36 shinnya joined #git
14:36 selckin check last example in man git-fetch
14:36 gitinfo the git-fetch manpage is available at http://jk.gs/git-fetch.html
14:37 invisbl_ joined #git
14:37 ejb joined #git
14:37 invisbl joined #git
14:37 encod3_ joined #git
14:37 jaguarmagenta joined #git
14:39 clmsy joined #git
14:40 jaafar joined #git
14:40 jimi_ joined #git
14:41 nickabbey joined #git
14:41 marscher joined #git
14:41 thebope joined #git
14:41 AaronMT joined #git
14:42 donnib selckin: so that could very well be what they do
14:42 donnib but is there now a way i can get to know the remote branches
14:43 donnib ?
14:43 Nicmavr joined #git
14:43 selckin just look in the bamboo log/config
14:43 _ikke_ donnib: it ls-remote
14:43 _ikke_ git
14:44 mischat joined #git
14:44 donnib _ikke_: let me try that thx
14:44 Guest83887 joined #git
14:46 ShekharReddy joined #git
14:47 Franckapik joined #git
14:47 thiago joined #git
14:47 donnib _ikke_: thank you, that worked
14:48 griffindy joined #git
14:48 zaytsev selckin: for your interest: found out the problem. i need to create local branches from remote tracking branches in each foreign repository, otherwise if i fetch into a third repository, they will not be picked up
14:48 bouncy joined #git
14:50 Franckapik Hi everyone!  I have one question... i explain my situation, i use sourcetree to push commits on github... But now, because i haven't acess to my local computer, i would like to make a push of the files on the remote server directly...
14:50 tobiasvl Franckapik: what do you mean? is "the remote server" different from github here?
14:50 Franckapik What are the step to make the push without deleting history ?
14:51 Franckapik yeah
14:51 Franckapik because i would like to "update" the github repo
14:51 Franckapik i modify the files from the server with another computer
14:51 Franckapik (lol...sorry... this is maybe stupid...)
14:51 tobiasvl log onto the server and push from there?
14:52 Franckapik yes!
14:52 lindenle joined #git
14:52 tobiasvl OK great
14:53 Franckapik with the shell of the server, in the directory, there is no repo when i use git push or something
14:53 JeroenT joined #git
14:53 Franckapik i have no .git file if i understand the msg ... ;)
14:53 tobiasvl uh ok? what is the message?
14:53 Franckapik if i "git log"
14:53 ahmed_elgabri joined #git
14:54 selckin clone the repo, copy your files over it, commit, push
14:54 Franckapik not a git repo (or any of the parent) : .git
14:54 armin joined #git
14:55 achadwick_ joined #git
14:55 Franckapik ok selckin
14:55 Franckapik but there isn't a file where we all the history is in ?
14:55 Franckapik or something which said this is a repo?
14:55 selckin .git
14:55 Franckapik avoiding to clone repo?
14:55 Franckapik lol
14:55 canton7 the .git dir contains all of the history
14:55 Franckapik ok
14:56 ki0 joined #git
14:56 Franckapik should i find it on github for example?
14:56 tobiasvl no
14:56 clmsy joined #git
14:57 Franckapik :(
14:57 ki0 joined #git
14:57 selckin !tutorial
14:57 gitinfo A list of interactive git tutorials: http://try.github.com
14:57 Random832 Franckapik, why don't you want to clone it?
14:58 Franckapik hum
14:58 encod3 joined #git
14:58 Random832 if i understand correctly, you've got a directory that has a copy of the source tree, plus some changes, but is not a git repository
14:58 Franckapik because i'm only on shell... and afraid of it ;)
14:58 Random832 clone into a different directory then copy everything from your current directory into it.
14:58 Random832 or clone into a different directory and move .git
14:58 selckin because following instruction would be too hard
14:59 Franckapik cloning could be not really difficult but then selecting files and coping over it... i don't really know :s
14:59 selckin we can't teach you use a computer
14:59 Franckapik loool thank you
15:00 bsanford joined #git
15:00 Franckapik i was expecting this answer
15:00 miklcct joined #git
15:00 roelmonnens joined #git
15:00 tobiasvl why do you need to select files and copying over it
15:00 Franckapik but i understand... thank you for your help, i will look at cloning directory ;)
15:01 Gsham joined #git
15:01 ochorocho__ joined #git
15:01 Franckapik because the files on server are updated
15:01 spykins joined #git
15:02 Franckapik more recent than the github repo
15:02 tobiasvl I don't understand why that means that you have to copy stuff. just push the newer repo
15:02 _August_ joined #git
15:03 Lipp joined #git
15:03 JamesBaxter joined #git
15:03 Franckapik so, tobiasvl , what is the cmd to do this?
15:03 selckin !vampire
15:03 gitinfo Please don't be a help vampire - we're here to point you in the right direction, not type out the commands verbatim for you. http://slash7.com/2006/12/22/vampires/
15:03 Franckapik because this is on my remote server
15:04 Franckapik and because i upload on it, i don't have a repo on it
15:04 tobiasvl whut
15:04 Franckapik i don't have .git file on it
15:04 tobiasvl OK then we can't help you
15:04 tobiasvl it's not a git problem
15:04 Franckapik thank you !
15:04 tobiasvl why don't you push to the remote server instead of "uploading"?
15:05 r4nd0m0ne joined #git
15:05 Iao joined #git
15:06 tobiasvl but yeah, just do what has been told to you. clone the github repo, replace the files in the clone with the updated files, commit, push. and then later scrap your local repo or reset it so there are no conflicts
15:06 Franckapik because i'm not a Informatiker, and i learn linux shell, nodejs, sql, and git at the same time
15:07 Franckapik and i'm happy to see that there is compartmented channels of each subjects
15:08 prg318 joined #git
15:08 bouncy joined #git
15:08 JeroenT_ joined #git
15:08 Franckapik ok thank you tobiasvl for your help !
15:08 Franckapik i will do this
15:08 tobiasvl good luck
15:08 overlord_tm joined #git
15:09 sharpy joined #git
15:09 Franckapik left #git
15:09 snowkidind joined #git
15:09 DrRobotic joined #git
15:10 e14 joined #git
15:12 AaronMT joined #git
15:13 stamina joined #git
15:13 kfoonamalik joined #git
15:14 roxlu joined #git
15:16 f3r70rr35f joined #git
15:17 finalbeta joined #git
15:17 nickabbey joined #git
15:19 synthroi_ joined #git
15:19 Snugglebash joined #git
15:21 romerocesar joined #git
15:23 converge joined #git
15:23 converge joined #git
15:24 roelmonnens joined #git
15:24 netj joined #git
15:25 hahuang62 joined #git
15:26 sharpy joined #git
15:26 aboccia joined #git
15:28 mischat joined #git
15:29 zaytsev left #git
15:34 ejb joined #git
15:34 nettoweb joined #git
15:35 Dragonbird joined #git
15:41 pR0Ps joined #git
15:42 thebope joined #git
15:43 mda1 joined #git
15:44 thebope joined #git
15:45 ochorocho__ joined #git
15:45 zivester joined #git
15:45 mischat_ joined #git
15:46 Ieoo joined #git
15:47 mischat__ joined #git
15:48 GavinMagnus joined #git
15:48 _Vi joined #git
15:48 finalbeta joined #git
15:49 kfoonamalik joined #git
15:49 d0nn1e joined #git
15:49 aarobc joined #git
15:50 GavinMagnus left #git
15:52 manuels joined #git
15:53 nyuszika7h joined #git
15:54 Dougie187 joined #git
15:57 madewokherd joined #git
16:02 robics joined #git
16:03 mischat joined #git
16:04 Dazzyp joined #git
16:07 subhojit777 joined #git
16:09 asti joined #git
16:09 Silox| joined #git
16:10 asti hello. how do I configure git to use vim for staging?
16:10 ki0 joined #git
16:10 Havj joined #git
16:10 asti stage maybe parts of the changes and so on
16:10 rafalcpp joined #git
16:12 grawity `git add -p`, then use "e" at the desired diff
16:13 asti grawity: okay. thanks
16:13 vrlx joined #git
16:13 roelmonn_ joined #git
16:14 Anja joined #git
16:15 Celelibi Hey guys. I did a few commits without changing my user.email.
16:15 Celelibi How can I fix them?
16:15 Celelibi Including the signoff signature.
16:16 peeps[lappy] joined #git
16:16 mda joined #git
16:17 grawity something like `git filter-branch --env-filter 'if [ "$GIT_AUTHOR_EMAIL" = foo@bar ]; then GIT_AUTHOR_EMAIL=baz@qux; fi; if [ "$GIT_COMMITTER_EMAIL" = foo@bar ]; then GIT_COMMITTER_EMAIL=baz@qux; fi' --msg-filter 'sed "s/foo@bar/baz@qux/"'`
16:17 jstimm joined #git
16:17 mischat joined #git
16:19 Celelibi Hm, I never used filter-branch.
16:20 blackwind_123 joined #git
16:20 Celelibi I was actully more looking at rebase --exec
16:20 grawity now you get the chance to!
16:20 GodGinrai lol
16:20 _August_ joined #git
16:20 Uixw8 joined #git
16:20 Celelibi with commit --reset-author
16:21 perlpilot Celelibi: I probably would have done it "manually" like you
16:22 perlpilot git rebase -i + mark the commits to edit + commit --reset-author
16:22 perlpilot especially if it's on the order of 3 commits
16:23 jbitdrop joined #git
16:24 johnny56_ joined #git
16:24 tnecniv joined #git
16:24 ocbtec joined #git
16:25 crose joined #git
16:27 NaStYdoG joined #git
16:28 geoid_ joined #git
16:30 alex1a joined #git
16:31 roelmonnens joined #git
16:31 somebody_ joined #git
16:32 KtoTo joined #git
16:32 e14 joined #git
16:32 _August_ joined #git
16:33 al-damiri joined #git
16:34 crose joined #git
16:34 mda1 joined #git
16:37 brent__ joined #git
16:37 axisys joined #git
16:38 tang^ joined #git
16:38 crose joined #git
16:39 hanthings_ joined #git
16:39 synthroid joined #git
16:40 chardan joined #git
16:40 romerocesar joined #git
16:41 mjuszczak joined #git
16:42 joshsyn joined #git
16:42 joshsyn why is git so slow in windows
16:42 grawity which parts of git
16:42 _ikke_ joshsyn: Because git uses APIs that are really fast on linux, but not so fast on windows
16:43 grawity some parts are slow because NTFS is slow; rebase is slow because emulating fork/exec on Win32 is slow
16:43 _ikke_ grawity: fixed in the latest version
16:43 _ikke_ the latter
16:43 grawity the one which rewrites rebase in C?
16:43 _ikke_ Yes
16:43 _ikke_ The sequencer part is already done
16:45 _ikke_ iirc, 2.10 already
16:45 rafalcpp joined #git
16:45 rafalcpp joined #git
16:46 romerocesar_ joined #git
16:47 kyan joined #git
16:48 unbalanced joined #git
16:49 jccn joined #git
16:50 romerocesar joined #git
16:52 feodaron joined #git
16:52 Es0teric joined #git
16:52 f3r70rr35f joined #git
16:54 FreakySneaky joined #git
16:56 Lipp joined #git
16:56 thiago joined #git
16:59 leeN joined #git
17:00 Cavallari joined #git
17:00 Glenjamin joined #git
17:00 Glenjamin hi all, is there any advantage to using --force over --force-with-lease?
17:01 kadoban Glenjamin: Can't think of any time I'd want --force instead, ever.
17:01 Glenjamin Nor can I, which got me wondering why it's a different flag at all
17:04 nicksloan joined #git
17:05 FabioQ joined #git
17:05 Starky joined #git
17:06 canton7 Glenjamin, --force came first
17:06 canton7 --force-with-lease is much more recent
17:06 canton7 backwards compatibility is a bitch :)
17:07 Glenjamin right, but is there any reason for `--force` in newer versions not to be an alias for --force-with-lease ?
17:08 Glenjamin the only reason I can think of is if there's some scenario where you'd --force without the lease bit
17:08 _ikke_ backwards compatibility
17:08 _ikke_ git does it's best to not break bc
17:09 Glenjamin right, but for it to be a BC break there'd need to be a scenario where `push --force` was desirable but `push --force-with-lease` was not
17:09 blunaxela joined #git
17:10 _ikke_ A situation which expects force to not reject
17:10 Glenjamin right, so some sort of automated sync script
17:10 howitdo joined #git
17:10 _ikke_ or guis
17:10 _ikke_ or whatever
17:10 Random832 is breaking worse than silently losing data?
17:11 [0xAA] joined #git
17:13 _ikke_ stricktly speaking you don't lose data
17:13 robotroll joined #git
17:13 dreampwnzor joined #git
17:14 Glenjamin as long as the server is keeping reflogs?
17:14 yeloc joined #git
17:15 ych joined #git
17:16 riceandbeans left #git
17:16 Random832 yeah but you will never hear of the fact that there's something in the reflogs you need to recover
17:17 _ikke_ And the one who originally pushed it
17:18 ulrv joined #git
17:19 systemovich joined #git
17:19 cyan__ joined #git
17:20 shgysk8zer0 joined #git
17:21 feodaron joined #git
17:22 jimi_ joined #git
17:23 cjohnson Just because you can't think of a reason to use --force over --force-with-lease doesn't mean nobody anywhere can
17:23 cjohnson that's why BC is a bitch, you can't just say "I don't think it should matter"
17:24 madewokherd joined #git
17:26 hahuang62 joined #git
17:26 zacts joined #git
17:27 Celelibi I have some local changes to some config files that are not to be committed but that should always be present. (Otherwise I wouldn't be able to test.)
17:27 Celelibi How should I do this with git?
17:27 alhariel joined #git
17:29 qqx Celelibi: !configs
17:29 gitinfo Celelibi: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
17:29 Schrostfutz joined #git
17:30 skunkz joined #git
17:31 Random832 cjohnson, the real problem is the fact that interactive use at the command line uses the same commands as scripts/gui
17:31 Random832 so you can't change the semantics of one without changing the semantics of the other
17:32 reverse_light joined #git
17:33 Anja joined #git
17:33 Celelibi qqx: unfortunately, there's a hardcoded path to the config file, and I want to change this too (because I don't want to put it in /etc).
17:33 Celelibi So I have to modify a tracked file.
17:33 svm_invictvs joined #git
17:33 ktoverso joined #git
17:34 Celelibi BTW, the link "local configuration branch" is broken.
17:34 geoid_ joined #git
17:35 ThomasTang joined #git
17:36 _August_ joined #git
17:36 jimi_ joined #git
17:37 dsdeiz joined #git
17:37 cjohnson Random832: sure, just explaining why introducing breaking changes shouldn't be taken lightly
17:37 cdown joined #git
17:38 Salander27 joined #git
17:38 mischat joined #git
17:39 vdl joined #git
17:39 durham joined #git
17:39 cousteau joined #git
17:39 lindenle joined #git
17:41 synthroid joined #git
17:42 tmk joined #git
17:43 nickabbey joined #git
17:45 cousteau is .gitignore recursive?  I have a project with a directory called __others__ whose content I don't want to upload
17:45 TomyWork I'm trying to write an index-filter that removes everything except 4 specific directories from every commit of a repo
17:45 cousteau it's just notes to myself
17:45 TomyWork cousteau in that sense, yes it is
17:45 cousteau ok thanks :)
17:45 TomyWork in fact, it's commonplace to exclude a "target" or "bin" directory recursively
17:45 Siegfried joined #git
17:46 cousteau ok... and what do I do with the Portable Python distribution I'm including on the project?  That one has to be uploaded but is never going to change (I guess)
17:46 cousteau ...I guess ignoring its .pyc files will be enough
17:46 TomyWork cousteau that goes into an artifact storage, not git
17:48 TomyWork I'm trying to write an index-filter that removes everything except 4 specific directories from every commit of a repo. Now "echo !(dir1|dir2|dir3|dir4)" shows me all the directories except those 4, but "git rm --cached '!(dir1|dir2|dir3|dir4)'" tells me "fatal: pathspec '!(dir1|dir2|dir3|dir4)' did not match any files".
17:48 m0viefreak joined #git
17:50 shgysk8zer0_ joined #git
17:51 jimi_sanchez joined #git
17:52 mda joined #git
17:53 Glenjamin cjohnson: I know, that's why I came here to find out what those scenarios were
17:54 thebope_ joined #git
17:56 FabioQ joined #git
17:57 thebope joined #git
17:59 Es0teric joined #git
17:59 thebope_ joined #git
18:00 sea-gull_ joined #git
18:00 SteffanW joined #git
18:01 spacelord_ joined #git
18:01 thebope joined #git
18:01 dar123 joined #git
18:04 menip joined #git
18:04 jimi_ joined #git
18:04 jnavila joined #git
18:06 thebope_ joined #git
18:08 cousteau I'm not sure I explained myself.  The project includes a portable_python/ directory which I obtained from portablepython.com, and I want to include it in my project, but I don't want to ...meh, forget it, I'll just .gitignore *.pyc, I think that'll do it
18:12 roxlu joined #git
18:14 gabbiano joined #git
18:14 GavinMagnus joined #git
18:15 gabbiano left #git
18:20 Glenjamin left #git
18:20 cagedwisdom joined #git
18:20 chardan joined #git
18:20 tmk joined #git
18:22 hilefoks joined #git
18:22 jimi_ joined #git
18:23 hahuang62 joined #git
18:24 hilefoks Is there a way to list all files in the repository that are not ignored by git?
18:25 grawity git ls-files && git ls-files --others --exclude-standard
18:28 Jackneill_ joined #git
18:28 hilefoks thx grawity
18:28 nidr0x joined #git
18:28 geoid_ joined #git
18:29 YuGiOhJCJ joined #git
18:29 durham joined #git
18:30 jimi_ joined #git
18:33 Ruler- joined #git
18:33 kio joined #git
18:34 Dragonbi_ joined #git
18:35 Ruler- Hello, I'm trying to figure out if there is a way to checkout a different branch of one directory in repository but the rest of the repository isn't affected.
18:35 Ruler- Or is using submodules my only option?
18:35 dar123 joined #git
18:35 Domhack joined #git
18:35 zero85 joined #git
18:37 zero85 left #git
18:38 emg Ruler-: why? and subtrees are another option, depending on what you want to do
18:39 mfonda joined #git
18:39 Limes_ joined #git
18:40 joshszep joined #git
18:41 jstimm joined #git
18:41 tmsmith joined #git
18:42 joshszep joined #git
18:42 mrmadcat joined #git
18:42 Ruler- because that's how i need to work. The folders are kinda modules and need to be installed in the correct place. The people from my company didn't bother with submodules so everything is in one repository. This is web dev so if i need to do something and see that it works, I need to have the module installed at the right place. Copying the changes to the installation dir after every change is bothersome so I'd like to use the install dir as a repository.
18:43 Ruler- Dunno how to explain it harder
18:43 joshszep joined #git
18:43 thebope joined #git
18:44 mfonda i have several feature branches created from master, `git checkout -b branch-a ... some commits ... git merge master ...`, same thing for branch-b, branch-c. instead of merging these into back into master, i'd like to instead first merge them into all into a new branch that would then be merged into master. can i simply created a new branch from master and merge them into that, or would that potentially present any issues?
18:44 joshszep joined #git
18:46 physikoi joined #git
18:46 physikoi Hey #git, just a quick question! Where does git store cached files on OSX?
18:47 axl_ joined #git
18:47 bongjovi joined #git
18:47 mda1 joined #git
18:48 jnavila physikoi: what do you mean by "cached files"
18:48 vdv joined #git
18:48 GavinMagnus joined #git
18:49 mrmadcat_ joined #git
18:49 physikoi jnavila: hey, i'm just going off a hunch. Sometimes one has to 'git rm cache' some file. So, i'm assuming this corresponds to a previously cached file. Am i mistaken?
18:50 jnavila physikoi: it's the index
18:50 physikoi jnavila: damn. fubared then
18:50 mda joined #git
18:50 jnavila physikoi: git rm --cached is the index
18:51 physikoi I deleted a file that i wanted to keep but didn't need. i'm guessing that's what "stashing" is for?
18:51 physikoi jnavila: thank you for the info
18:51 qqx physikoi: Is it something that you'd `add`ed to git?
18:51 GavinMagnus left #git
18:51 jnavila physikoi: was the file commited once before?
18:52 physikoi qqx: i don't believe so
18:52 mrmadca__ joined #git
18:52 physikoi jnavila: i think so...maybe if i push it will show up as a previous commit. hmm brb
18:53 dar123 joined #git
18:53 thebope joined #git
18:54 axisys joined #git
18:54 jnavila physikoi: if you rm --cached, the file is still valid in your working copy
18:55 jnavila you cannot git rm --cached something that was never commited.
18:55 qqx physikoi: If you can't find it from a previous commit you can also see !lost.
18:55 gitinfo physikoi: As long as you have `git commit`ed your changes (or even `git add`ed them), your changes will not be lost for over two weeks unless you work really hard at it.  There are two places where "lost" changes can be hiding.  They might be in the reflog (`git log -g`) or they might be in lost&found (`git fsck --unreachable`). Type "!dangling" and "!reflog" into IRC for more info.
18:56 physikoi forgot to say, i also `rm`'d. So git was my last hope
18:56 tmk joined #git
18:56 physikoi not a huge loss...just dumb
18:57 physikoi qqx: what is "!lost"?
18:57 jnavila physikoi: then I'm afraid you're screwed
18:57 physikoi is it a builtin? a git option? neither works for me
18:57 physikoi jnavila: lol
18:57 physikoi yeah, seems so.
18:57 qqx physikoi: That's was a trigger for the gitinfo bot, read what that said.
18:57 jnavila !rm
18:58 qpdb !dangling
18:58 gitinfo Dangling objects represent things added to git which are no longer needed based on the git commands you typed in. This can be normal workflow (rebase, reset, add, etc) or errors you made. Typing "!dangling_commit" "!dangling_blob" and "!dangling_tree" into a query to me will get you more information about each type.
18:58 wizardedit joined #git
18:58 jnavila well that doesn't work with every incantation
18:58 physikoi qqx: oh, i see. more hope. thank you!
18:59 qqx physikoi: As jnavila said if you were able to use `git rm --cached` on the file that indicates that git knew about it, so it should still be recoverable (although that may not be easy).
19:00 ahmed_elgabri joined #git
19:00 Sasazuka joined #git
19:01 physikoi thanks jnavila and qqx. i'm giving your suggestions a shot right now. I'll be sure to report back regardless of outcome :)
19:01 nicksloan joined #git
19:01 inovas joined #git
19:01 physikoi !dangling_commit
19:01 gitinfo A dangling commit is a commit no longer reachable by any branch or tag.  This can happen due to resets and rebases and are normal. `git show SHA` will let you inspect them.  Also this (look for dots w/o children and w/o green label): gitk --all --date-order `git fsck --no-reflog | grep "dangling commit" | awk '{print $3;}'`
19:02 axisys joined #git
19:03 shgysk8zer0_ joined #git
19:04 feodaron joined #git
19:04 physikoi with `git show <SHA>`, is there a way to view in editor?
19:05 physikoi !dangling_blob
19:05 gitinfo A dangling blob is a file which was not attached to a commit.  This is often caused by `git add`s which were superceded before commit or merge conflicts.  Inspect these files with `git show SHA`
19:06 austin987 joined #git
19:07 physikoi omg i found it
19:07 physikoi this is amazing!
19:07 thiago joined #git
19:07 physikoi wow, git is very kind
19:07 qqx That's something I don't hear often.
19:08 tmk anybody use tcpdump command
19:08 mischat joined #git
19:09 Starky joined #git
19:10 raspado joined #git
19:10 dar123 joined #git
19:11 vuoto joined #git
19:12 cagedwisdom joined #git
19:12 duderonomy joined #git
19:15 physikoi qqx: lol. I had no idea git kept track at that level of depth. i'm pretty amazed
19:16 dsantiago joined #git
19:16 kyan joined #git
19:17 madewokherd joined #git
19:18 kadoban physikoi: Yeah, git thankfully makes it quite hard to lose work, if you use it correctly. It's very cool.
19:18 Es0teric joined #git
19:19 physikoi kadoban: for the past few years, i would try git, bang my head, then give up. Finally, in the past six month, it started to click.
19:20 kadoban It can definitely take a while. For the longest time my git usage was very limited, essentially could have been replaced by taking a tarball a couple of times a day. Then I found this place and actually attempted to do more interesting/useful things, heh.
19:20 physikoi As an aside, I'm also amazed by IRC, which, admittedly, I only got into about a year or so ago. As long as you're respectful, you'll generally receive sincere reponses (excluding the occasional troll).
19:20 kadoban It depends on the community/channel, this channel is generally pretty good.
19:20 joki- joined #git
19:20 kadoban But yeah, IRC is great stuff, more people should use it.
19:21 physikoi i've met some nasty people, but i respond to trolls with silence usually.
19:21 kadoban A good policy, yeah.
19:21 physikoi I try to evangelize a bit; i do wonder if Mr. Robot has peaked people's interest.
19:21 matsaman joined #git
19:21 qsx #git is a pretty nice mixture
19:22 qsx not like others where one is yelled at for the slightest off-topic
19:22 qsx but also not a pure troll hole
19:22 physikoi qsx: now i remember, there was one very nasty person on #php once
19:22 nanga joined #git
19:22 physikoi qsx: Generally, is going off topic bad etiquette?
19:22 kadoban physikoi: Haha, maybe. That'd be funny. Though I'm not sure it's made clear on mr. robot what protocol they're using. I mean it's obviously IRC, but is that mentioned much?
19:23 kadoban physikoi: It depends on the channel. I don't think people mind it here unless there's on-topic stuff that's being pushed out. Or if the conversation is stupid.
19:23 physikoi kadoban: i think they actually uttered "IRC". i'm no hacker, but based on my pretty thorough understanding of *nix, it seems pretty authentic
19:23 kadoban Yeah, that show is super authentic from what I know and observed.
19:24 kadoban (which is ... a middling amount)
19:24 physikoi kadoban: with IRC channels, are there mods? Is there a ban-hammer?
19:24 qsx yes
19:24 kadoban There are. In here quite a few people are ops, though it's fairly rare to even see anyone get banned. I don't think we attract too many trolls.
19:24 GodGinrai physikoi: offtopic is normally fine as long as it is not causing problems
19:24 qsx FEAR ME!!1!
19:25 ki0 joined #git
19:25 physikoi kadoban: i'd go all in. most tv programs are very blah; mr robot is good drama (with comedic relief too)
19:25 physikoi GodGinrai: like if it's drowing out on-topic questions? :D
19:25 qsx in #git, the ops usually only wear their special banhammer hats (the @ in front of the nick respectively the +o flag) when needed
19:25 GodGinrai physikoi: if you keep talking about the asshole cop who pulled you over so much that people can't continue with their ontopic conversations, you are likely to get cautioned ;)
19:26 physikoi qsx: oh, you're a mod? :)
19:26 kadoban Yeah, it's a quite amusing show, and seems to have a lot of thought behind it too.
19:26 physikoi qsx: i see
19:26 nanga joined #git
19:26 physikoi GodGinrai: seems fair
19:26 kadoban I think a lot of the regulars in here are, this channel is fairly liberal about giving out ops, heh. I'm an op, though honestly I don't think I even know how to ban people correctly even if it ever came up.
19:26 kadoban I'd probably have to look it up, at which point it's likely too late xD
19:27 qsx kadoban: highlight some of the others :P
19:27 GodGinrai kadoban: maybe it's as simple as /msg gitinfo op
19:27 GodGinrai :P
19:27 jccn joined #git
19:27 physikoi kadoban: maybe not #git, but do some channels require nickserve registration to participate?
19:27 qsx /msg chanserv op #git, to be precise
19:27 GodGinrai physikoi: yes
19:27 axisys joined #git
19:27 kadoban Heh, yeah I more mean the actual ban commands, they seem very intricate and I'm not clear on which one to use xD
19:27 qsx #git does kinda
19:28 GodGinrai qsx: that requires you be on the access list.  I was making a joke about how gitinfo does voicing
19:28 qsx one must be registered to be able to speak or voiced
19:28 qsx the latter by writing .voice to gitinfo
19:28 qsx which is rarely a thing bots can do.
19:28 qsx in fact …
19:28 qsx .voice
19:28 GodGinrai physikoi: for example, you can't join #archlinux or #docker without having a registered nick (and being identified)
19:28 kadoban But ya, a decent number of channels require registration.
19:28 physikoi i asked this earlier, but i think it got lost -- does anyone know how to configure `pager.show` to use emacs?
19:28 cousteau left #git
19:29 GodGinrai that would require me to be an emacs user :P
19:29 physikoi GodGinrai: that makes sense if you're trying to foster genuine dicussion and mitigate the poisonous aspects of anonyminity
19:30 physikoi GodGinrai: kk, what about $EDITOR (whichever)?
19:30 physikoi oh yea, EMACS OR BUST!
19:30 kadoban What's pager.show ? Is that related to core.pager?
19:30 kadoban Oh oh I see, pager.<cmd>
19:31 physikoi kadoban: i could e toally offbasse. I mean when using something like `git show <SHA>`
19:31 kadoban Wouldn't you just set  git config --global pager.show emacs   or something?
19:31 kadoban Or is there more to making emacs handle that correctly you mean?
19:32 kadoban Oh there probably is, duh.
19:32 tmk I am getting error while using git send-email command
19:32 tmk Unable to initialize SMTP properly. Check config and use --smtp-debug. VALUES: server=smtp.gmail.com encryption=tls hello=fedora.localdomain port=587 at /usr/libexec/git-core/git-send-email line 1383.
19:32 _ikke_ gmail is blocking it
19:32 ych joined #git
19:32 physikoi kadoban: emacs responds with `standard input is not a tty`
19:32 tmk _ikke_: i turned on less secure app
19:33 tchan joined #git
19:33 tmk _ikke_:now what else should i do?
19:33 kadoban physikoi: Hmmmm, right :-/ I guess if nothing else you could write a little crappy script that writes the input to a temporary file and then start emacs with it?
19:33 qqx physikoi: I'm not really an emacs user, but the man page on my system suggests that it might help to add `--terminal /dev/tty`.
19:33 matsaman joined #git
19:34 alex1a joined #git
19:34 tmk _ikke_:i also tried to debug this but still getting the same error
19:34 perlpilot physikoi: why do you want to use emacs as your pager BTW?
19:34 GodGinrai physikoi: have you tried `git config --global core.pager 'emacs -'`?
19:34 dreiss joined #git
19:34 chandu20 joined #git
19:34 tmk ping:_ikke_
19:35 lindenle joined #git
19:36 zzz_ joined #git
19:36 GodGinrai tmk: what are you, yoda?  you are unlikely to highlight him w/ that
19:36 GodGinrai try: _ikke_: ping
19:37 tmk oops sorry
19:37 Ozymandy joined #git
19:37 hussam hi. I have a git question. it's more or less related to gnome git. if a project references a certain git submodule revision then one day changes to a newer submodule revision, is git pull --recursive-submodules && sit submodule update enough to get my local tree the updated submodule revision?
19:38 aard_ joined #git
19:38 tmk GodGinrai: I just need someone who can answer my question
19:38 kfoonamalik joined #git
19:39 Aye joined #git
19:39 GodGinrai tmk: then ask, and if someone can, they might answer
19:40 tmk already asked
19:40 tmk I am getting error while using git send-email command
19:40 GodGinrai tmk: oh, indeed you did
19:40 tmk Unable to initialize SMTP properly. Check config and use --smtp-debug. VALUES: server=smtp.gmail.com encryption=tls hello=fedora.localdomain port=587 at /usr/libexec/git-core/git-send-email line 1383
19:40 Balliad joined #git
19:40 ajf- joined #git
19:41 tmk GodGinrai:what do you use for sending patches upstream?
19:41 guampa joined #git
19:42 GodGinrai I haven't worked in any environments where I needed to send patches instead of submitting pull requests
19:42 tmk no problem
19:42 GodGinrai tmk: https://git-scm.com/docs/git-send-email <-- Did you check the gmail example on this page to see if you are following the same steps?
19:43 otvn joined #git
19:44 jor joined #git
19:44 kfoonamalik joined #git
19:45 e14 joined #git
19:46 Akimb joined #git
19:48 jimi_ joined #git
19:48 paul424 joined #git
19:49 nicksloan joined #git
19:49 tens0r joined #git
19:49 d10n-work joined #git
19:51 e14 joined #git
19:53 nd_ joined #git
19:53 inovas joined #git
19:54 tens0r joined #git
19:54 jnavila joined #git
19:55 blunaxela joined #git
19:57 geoid_ joined #git
19:57 jimi_sanchez joined #git
19:58 ki0_ joined #git
19:58 blackwind_123 joined #git
20:01 Jonno_FTW joined #git
20:02 aidalgol joined #git
20:04 CheckDavid joined #git
20:05 Atm0spher1c joined #git
20:05 hahuang65 joined #git
20:06 gusgg joined #git
20:06 felixjet it is normal that inside git status appears files that i have ignored using .gitignore?
20:06 ThiefMaster no. are you sure thy aren't already staged/versioned?
20:07 gusgg how can I git mv all tracked files? "git mv * $DEST" doesn't work because there are untracked files
20:07 ThiefMaster git ls-files with some arguments can probably give you the list of files you are looking for
20:07 crose joined #git
20:07 govg joined #git
20:09 felixjet yup, they were already versioned
20:09 felixjet i deleted them and now they appear stagged to deletion
20:09 theoceaniscool joined #git
20:10 tmk I just used git send-email command i got in the end this--   Result: 250
20:10 tmk Net::SMTP::SSL=GLOB(0x1438488)>>> QUIT
20:10 tmk Net::SMTP::SSL=GLOB(0x1438488)<<< 221 2.0.0 closing connection 64sm89324971pfu.17 - gsmtp
20:10 tmk what does it mean>
20:11 vuoto joined #git
20:12 jimi_ joined #git
20:13 nwkj86 joined #git
20:15 _ikke_ It means the client gave a quit command and the server closes the connection
20:17 synthroi_ joined #git
20:17 danimal2 joined #git
20:17 qqx And the 2xx numbers are status codes indicating success.
20:20 jnewt joined #git
20:20 Electrometro joined #git
20:21 joshszep joined #git
20:22 Es0teric joined #git
20:23 crose joined #git
20:23 johnmilton joined #git
20:31 finalbeta joined #git
20:33 SuperLag joined #git
20:35 derk0pf joined #git
20:36 SuperLag Policy says a new ticket per security remediation that gets reported. Fixes each go into their own feature branch, with the ticket name in the branch. (i.e. akulbe/sec-ticket-1, akulbe/sec-ticket-2). The fixes involve putting RHSA numbers in a file that passes that info to yum as an arg. My question is about branching. Should every branch be off of master? does git know that -2 should be *added* to master,
20:36 SuperLag or will its changes step on -1?
20:36 tmk joined #git
20:36 durham_ joined #git
20:37 Balliad joined #git
20:37 joshsyn joined #git
20:37 hahuang61 joined #git
20:38 dan2k3k4 joined #git
20:38 hussam is "git pull --recurse-submodules=yes" equivalent to just "git pull --recurse-submodules"?
20:38 Klumben joined #git
20:38 matsaman hard to imagine otherwise / easily tested
20:39 SuperLag matsaman: was that to me, or hussam ?
20:41 mojave joined #git
20:42 Electrometro joined #git
20:42 finalbeta joined #git
20:42 romerocesar_ joined #git
20:42 Gloomy joined #git
20:44 diogenese joined #git
20:45 cdg joined #git
20:45 losted joined #git
20:46 losted Hello everyone, I made a lot of merges from branch A to B and now I don't want anything that was push from A in my B branch... is it possible to do this easily? thanks
20:47 jeffreylevesque joined #git
20:48 Eugene losted - !sausage
20:48 gitinfo losted: [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect
20:48 Neelixx joined #git
20:49 Sigfrid joined #git
20:50 overlord_tm joined #git
20:50 kenoob joined #git
20:50 kenoob joined #git
20:51 mojave i swear, i have told git "who i am" multiple times, but it keeps prompting me to do that every time i try to commit?
20:51 tobiasvl mojave: how have you told git who you are?
20:51 tobiasvl are you committing in the same repo every time?
20:51 mojave yes. a lot.
20:51 mojave so much!
20:51 tobiasvl yes but how
20:52 mojave git config --global user.email "you@example.com"  ... git config --global user.name "Your Name"
20:53 Sample joined #git
20:53 Shentino joined #git
20:53 mojave so specifically i'm typing it as "--global user myaccountname.my@email.com" and "git config --global myaccountname.firstname first last
20:54 matsaman to hussam
20:55 mojave and, it even knows! when i type "git config --global -l
20:55 mojave " it displays all information i've given it correctly
20:55 hussam matsaman: not really easy. the submodule is rarely updated
20:55 Balliad joined #git
20:55 mojave i think it's just playing games with me
20:55 diogenese joined #git
20:56 ToxicFrog mojave: neither of those commands look at all correct
20:56 ToxicFrog Neither "user" nor "myaccountname.firstname" is a configuration setting git knows about
20:56 losted Eugene: thanks but I don't understand what action I should do
20:56 tobiasvl mojave: you need to write "git config --global user.email myaccountname.my@email.com" and "git config --global user.name 'First Last'"
20:57 mojave toxic, it seemed to have accepted them.
20:57 ToxicFrog mojave: yeah, but that doesn't mean anything will read those settings
20:57 mojave tobiasvl, which i did
20:57 tobiasvl mojave: not what you have written. "user.name" and "user.email" are not stuff you should substitute out for your actual name and email
20:57 ToxicFrog It just blindly assumes that you want to set them because you're using some external program that wants those settings
20:57 Eugene losted - recreating history is not a simple task; the tl;dr is `git rebase -i`, but there's a lot of reading you ought to do
20:57 tobiasvl mojave: did you? that's not what you said
20:57 qqx mojave: It definitely shouldn't accept "user" as the name of a configuration item.
20:57 jstimm joined #git
20:57 ToxicFrog When it says "user.name" and "user.email", it means exactly that text, not to replace those with your actual name/email
20:57 tobiasvl mojave: can you show the output of "git config --global -l" then?
20:58 mojave i may have totally misinterpreted something
20:58 mojave but sure
20:58 Eugene losted - It generally doesn't matter what your history looks like, from a technical standpoint. This is a point of debate, but I don't care so I just move on with life
20:59 mojave tobias, here http://pastebin.com/5k6AdDJy
20:59 mojave toxicfrog, well, i did not know that!
20:59 peoliye joined #git
20:59 tobiasvl mojave: OK that's completely wrong, yes
20:59 mojave ha ha!
20:59 mojave okay then
20:59 peoliye how can i find out git diff for only c files?
20:59 losted Eugene: ok.. I thought there was a simple command I could run to do that.. I'll read a little more about doing a rebase before commiting to it... thanks!
21:00 tobiasvl mojave: ""git config --global user.email onecouplequestioned.onecouplequestioned@gmail.com" and "git config --global user.name Hydgrangea Mojave"
21:00 mojave right
21:00 * mojave is an idiot
21:00 tobiasvl no worries
21:01 qqx mojave: I'd advise removing the existing content from your git config first.
21:01 Random832 peoliye, try git diff -- '*.c'
21:01 qqx What's in there doesn't look remotely valid.
21:01 mojave qqx, you can't just overwrite it?
21:01 mojave and by you i mean me
21:01 peoliye Random832: doesn't work.
21:01 Random832 (also is this documented anywhere? i tried it and it seems to work)
21:02 qqx The `git config` command will mainly add to existing config.
21:02 Random832 peoliye, are you sure you have .c files that have differences? what does it do does it just not show you anything? are you on windows or unix?
21:03 Ldip joined #git
21:03 netcarver joined #git
21:04 durham joined #git
21:04 qqx peoliye: Are your .c files in the current directory or subdirectories. If the latter you should use '**/*.c' for the pattern.
21:04 peoliye qqx: let me check.
21:04 Random832 qqx, actually it works without that for me if i use quotes to make git interpret the wildcard
21:05 Random832 like \*.c or '*.c' including quotes
21:05 mojave qqx i found it
21:06 lex-ro joined #git
21:06 mojave does this look right? http://pastebin.com/iGZBd2Pk
21:06 Es0teric joined #git
21:06 Random832 qqx, see man gitglossary, search pathspec
21:06 gitinfo qqx: the gitglossary manpage is available at http://jk.gs/gitglossary.html
21:07 Random832 neat
21:07 tmk joined #git
21:07 qqx Random832: You're right, for my test I'd mistakenly used a * at the end of the pattern rather than the beginning.
21:08 peoliye qqx:  when i do git diff it shows up in my diff (c files including) but when i do git diff -- '*.c' it doens't work. Files are in completely different directory.
21:08 Random832 peoliye, oh, if they're in a different directory not under the current one there's something else you have to do
21:08 mojave okay, it's letting me commit files now.
21:09 mojave thanks, guys!
21:09 finalbeta joined #git
21:10 Random832 peoliye, git diff -- ':/**/*.c'
21:10 Random832 my tests before were for files under the current directory
21:10 Dougie187 joined #git
21:10 peoliye Random832: working.
21:10 qqx Random832, peoliye: The **/ isn't actually necessary there. For the same reason it wasn't when I suggested that. :)
21:10 howitdo joined #git
21:10 _nwkj86 joined #git
21:11 qqx So ':/*.c' should be fine.
21:11 peoliye Random832: possible to explain the command?
21:11 Random832 qqx, i couldn't make it work for files under a different subdirectory of the top level
21:11 markus3 joined #git
21:11 Random832 peoliye, see the gitglossary manpage linked above, under "pathspec"
21:11 qqx Random832: Worked for me.
21:13 bouncy joined #git
21:13 _Vi joined #git
21:14 Random832 huh
21:14 dsdeiz joined #git
21:14 dsdeiz joined #git
21:15 Random832 my test pattern started with literal characters and that made it not work for some reason
21:15 Random832 like i was actually testing with ':/a*.py'
21:16 quackgyver joined #git
21:16 Random832 oh, i understand why that didn't work now
21:17 Random832 yeah ':/*.c' will work, and it's all fully explained in the glossary
21:17 Neelixx joined #git
21:18 nikivi joined #git
21:23 romerocesar joined #git
21:23 bumpy joined #git
21:25 BenderRodriguez joined #git
21:26 e14 joined #git
21:27 msonntag joined #git
21:28 richard joined #git
21:29 Guest54964 left #git
21:30 someone_ joined #git
21:31 someone_ what's a good way to get the most recent date/sha for each file in a directory?
21:31 _ikke_ git ls-tree HEAD
21:31 _ikke_ date is not part of that though
21:32 someone_ yeah i figured i'd have to script it a bit
21:32 _ikke_ What do you mean with the date? What date exactly?
21:32 someone_ thanks
21:32 someone_ date of the sha/commit
21:33 _August_ joined #git
21:33 _ikke_ git show <hash> --format="%cd %ad"
21:33 _ikke_ comitter date and author date
21:34 someone_ hm, git ls-tree HEAD returns blob shas and not the commit sha?
21:34 Blkt joined #git
21:36 _ikke_ I thought you were refering to that
21:36 _ikke_ The commit hash is the same for all files
21:36 _ikke_ git rev-parse HEAD
21:37 _ikke_ each commit is a complete snapshot of the working tree
21:38 Snugglebash joined #git
21:38 Siegfried joined #git
21:39 someone_ true, i just want to see the date/commit sha for each file in a directory..  like doing git log for each file individually and just grabbing the top result
21:39 someone_ for each file
21:39 _ikke_ You want the commit that last modified a file
21:39 crose joined #git
21:39 _ikke_ That's not a cheap thing to do,but it can be done
21:40 someone_ yeah i guess it's more of a script
21:41 Es0teric joined #git
21:42 tmk joined #git
21:43 ruby joined #git
21:44 tmk _ikke_: ping
21:45 jast !ping
21:45 gitinfo I only respond to !reply_time
21:45 jimi_sanchez joined #git
21:46 jccn joined #git
21:48 scootergrisen joined #git
21:48 dan2k3k4 joined #git
21:48 Gsham joined #git
21:50 scootergrisen Hi i want to fork https://github.com/lxde/lxqt and then clone the fork. How can i do that? When i run "git submodule update --remote --rebase" git can't find the repoes it seems. "remote: Repository not found."
21:52 nickabbey joined #git
21:54 someone_ here's my solution :P
21:54 someone_ for i in *; do  echo `git log -1 --format="%h %cd" $i` $i; done
21:55 Eryn_1983_FL joined #git
21:57 spacelord_ joined #git
21:58 qqx scootergrisen: Since that repo uses relative URLs for submodules the easiest method would probably be to clone the original repo first, then switch it to your fork.
21:58 converge_ joined #git
21:58 rwb joined #git
21:58 qqx Actually, wait until after initializing the submodules to switch it to your fork.
21:59 nettoweb joined #git
21:59 qqx An alternative would be to clone from your fork, and edit the .gitmodules file to change the relative URLs to absolute ones before initializing the submodules.
22:00 scootergrisen How do i switch to https://github.com/scootergrisen/lxqt ?
22:00 venmx joined #git
22:01 qqx `git remote set-url origin URL`
22:01 synthroid joined #git
22:02 qqx Or you could add a new remote instead. Which may be useful if you want to later fetch new data from the main repo.
22:05 scootergrisen Thanks seems to work
22:05 overlord_tm joined #git
22:05 mjago joined #git
22:06 astrofog joined #git
22:08 robics joined #git
22:10 githelp joined #git
22:10 jimi joined #git
22:12 alyptik joined #git
22:12 githelp Hi has anyone seen git eat commits when doing a merge? I have two branches: master and dev. When doing a git merge --no-ff I correctly get a merge commit but half of my commits from the dev branch have disappeared! I'm at a lost what to search into google. Any ideas?
22:13 pbrewczynski joined #git
22:14 jimi_sanchez joined #git
22:14 f0rks joined #git
22:15 alyptik left #git
22:16 Guest55 joined #git
22:17 spoonUltra joined #git
22:17 prg318 joined #git
22:18 qqx githelp: How are you viewing the history to determine that some commits appear to be missing? That really shouldn't be at all possible.
22:18 spoonUltra so I've been trying to install nano on git bash using instructions from here https://coderwall.com/p/ee-law/use-nano-from-git-bash-on-windows-d but when I try to unzip the zip folder it returns End-of-central-directory signature not found. Wut duz this mean?
22:19 githelp @qqx by git log and from bitbucket. What I've just done is create a new branch cherrypick all the commits and did a merge and i can see those commits now. any idea?
22:22 qqx githelp: !situation
22:22 gitinfo githelp: Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)
22:23 ki0 joined #git
22:24 jimi joined #git
22:24 jpastore joined #git
22:26 jimi_sanchez joined #git
22:29 jast spoonUltra: it means the ZIP file is incomplete
22:29 jast (or corrupted)
22:29 spoonUltra sad day :<
22:29 mischat joined #git
22:30 nikivi joined #git
22:32 jast file works for me btw
22:33 Lipp joined #git
22:33 spoonUltra oh, I was aiming for the latest version, but I prolly didn't hit a valid url
22:36 Lipp joined #git
22:40 dar123 joined #git
22:40 rwb joined #git
22:41 nikivi joined #git
22:42 Sasazuka joined #git
22:42 oskarkv joined #git
22:43 fuchsi joined #git
22:44 fuchsi joined #git
22:44 a_thakur joined #git
22:45 djb-irc joined #git
22:46 mischat joined #git
22:48 kier joined #git
22:48 KtoTo joined #git
22:50 cyan__ joined #git
22:50 dodobrain joined #git
22:51 mischat joined #git
22:52 alyptik joined #git
22:52 Noodlewitt joined #git
22:52 venmx joined #git
22:53 WaReZ joined #git
22:53 mellernoia joined #git
22:54 _jan joined #git
22:54 particleGolem joined #git
22:57 cdown joined #git
22:58 Siegfried joined #git
23:01 Schrostfutz joined #git
23:01 fmeerkoetter joined #git
23:01 dsantiag_ joined #git
23:02 tvw joined #git
23:03 alyptik left #git
23:03 kyan joined #git
23:04 Siegfried joined #git
23:07 sonOfRa Can I change the message of an annotated tag retroactively, or does that count as changing public history?
23:07 djb-irc joined #git
23:07 b3kN joined #git
23:07 b3kN joined #git
23:08 mischat joined #git
23:10 mojave can i just use "push" without  committing?
23:11 kadoban mojave: You can't push uncommited changes or anything if that's what you mean.
23:11 mojave kadoban, yeah, that's what i meant.
23:11 mojave thanks
23:11 kadoban push deals with commits (and tags and branches and such, but those just point to commits)
23:12 mojave so at the very least i must *always* add, commit, and push?
23:12 kadoban mojave: In general, yeah. The only other time you'd really push is if you get the commits from elsewhere, like fetch them from one remote and push to another, etc.
23:13 mojave all right
23:13 mojave but committing does *not* mean i'm sending the updated file to the repository, right?
23:13 Darren_ joined #git
23:13 texasmynsted Here is what I want to do:  I have repo A with dir named foo.  I want to git subtree split that into a new repo named B.  This is fine.  The trick is that I want to make this same split of foo to this same B repo regularly (say weekly)…  I would rather not dump all the revision history from repo B before each new split from A.  Is this possible?
23:14 bouncy joined #git
23:14 kadoban What you're commiting in *is* a repository, but I think what you're calling a repository is the remote repository. Commit and such are all local operations, yeah. They don't leave your computer unless you tell them to.
23:14 Xe mojave: you send only when doing `git push`
23:15 mojave oooh, okay
23:15 mojave xe,  all right
23:15 kadoban texasmynsted: Isn't that 'git subtree push' or something like that?
23:15 diogenese joined #git
23:15 mischat joined #git
23:16 * texasmynsted checking
23:17 sdothum joined #git
23:17 kadoban texasmynsted: Wait ... what does your second to last sentence mean?
23:17 howitdo joined #git
23:19 texasmynsted hmm.  I am not clear what push does but I suspect I do not need a temp local repo to split out a tree, if I use push…
23:19 texasmynsted or something
23:19 Dougie187 joined #git
23:19 ochorocho__ joined #git
23:19 paul424 joined #git
23:21 texasmynsted The net is that I have repo A that I want to stay as is, i.e. I do not want to alter its tree.  I have repo B that I want to reflect a directory of repo A, directory named 'foo'.  On occasion I need to update the revision history in repo B to match the new commits int repo A's foo directory.
23:22 kfoonamalik joined #git
23:23 texasmynsted does that make sense?
23:24 romerocesar joined #git
23:24 ^7heo wat?
23:24 kadoban Okay, yeah that sounds like 'git subtree push' to me. Which is just subtree split + push really. The key to subtree is that splits are repeatable, for the exact same history at least.
23:25 ToBeCloud joined #git
23:25 dzho texasmynsted: I may have misunderstood, but one thing I've seen recommended for that is that you make a branch of B, let's call it B'. In yet another branch you have your updated copy of A. While on B', merge in A.
23:25 bumpy joined #git
23:26 diogenese joined #git
23:26 dzho I guess branch level is not what you want to do though.
23:26 * dzho goes back to lurking.
23:27 [0xAA] joined #git
23:27 thiago joined #git
23:27 Dougie187 left #git
23:28 Siegfried joined #git
23:28 texasmynsted so what happens if I do a git subtree push, then some new commits are added to the foo directory of repo A, then I do the exact same git subtree push?
23:29 Dougie187 joined #git
23:29 texasmynsted where can I see the exact difference between a git subtree split and git subtree push?
23:29 cyan__ joined #git
23:29 Lunatrius joined #git
23:29 kadoban texasmynsted: Nothing bad, the new commits are pushed
23:29 lus joined #git
23:29 kadoban texasmynsted: It's just a split + stuff. The manpage thing should have the details, let's see if this works: man git subtree
23:29 gitinfo texasmynsted: the git manpage is available at http://jk.gs/git.html
23:30 kadoban Nopppe, you have disappointed me gitinfo
23:30 kadoban man gitsubtree
23:30 * kadoban gives up
23:30 kadoban It's probably not in that database since it's a contrib thing I guess.
23:31 texasmynsted here?  https://github.com/git/git/blob/35f6318d44379452d8d33e880d8df0267b4a0cd0/contrib/subtree/git-subtree.sh
23:31 breezy_ joined #git
23:31 texasmynsted I am asking after reading the man page
23:32 kadoban texasmynsted: https://github.com/apenwarr/git-subtree/blob/master/git-subtree.txt looks initially like my local manpage, though I didn't check thoroughly. Is that about what you're reading?
23:33 _August_ joined #git
23:33 kadoban texasmynsted: Anyway it kinda spells out what 'git subtree push' does, it's just a subtree split and then it pushes the resulting commit history to ... where you tell it to.
23:34 kadoban I have a feeling I'm not helping, not sure why not though.
23:34 _August_ joined #git
23:34 dsdeiz joined #git
23:35 texasmynsted yeah that is what the man page looks like
23:36 texasmynsted https://github.com/apenwarr/git-subtree/blob/master/git-subtree.txt#L354
23:37 diogenese joined #git
23:37 texasmynsted I _suppose_ that the repo would not need to be empty but could contain revision history from a prior push
23:38 sdothum joined #git
23:38 kadoban texasmynsted: Yep
23:39 texasmynsted I have been creating a local repo to push revisions to, then pushing from their to the remote.  Seems like that is not needed.  That I could 1. push directly to the remote repo and 2. use git subtree push rather than a git subtree split then a git push
23:39 texasmynsted Is this true?
23:40 kadoban texasmynsted: Yeah, sounds right, the local clone thing of *just* the split history doesn't seem particularly necessary.
23:41 kadoban Only reason I might do it personally would be for like, consistency checking for the first few times, to make sure it looks right before I push it.
23:43 mojave joined #git
23:44 converge_ joined #git
23:44 texasmynsted ok so now what about the source of the split….  I presume that the revisions that I am splitting out are of the branch I am on.  Example:  Repo A, I am on branch oak.  So when I subtree split I should see the revision history from branch oak in repo B.  Right?
23:45 kadoban texasmynsted: Right (just the parts that touch the directory-being-split anyway)
23:45 texasmynsted good
23:46 venmx joined #git
23:47 Poppa joined #git
23:47 robattila256 joined #git
23:48 texasmynsted what happens if I git subtree push, and nothing has changed?
23:48 MacGyver joined #git
23:49 kadoban Not much, it extracts a new history that's the same as the old one and then pushes it which ... doesn't change anything, since it's the same commit.
23:49 texasmynsted good, so it could be automated
23:49 anonymuse joined #git
23:49 kadoban Don't see why not, as long as you don't change history as a rule.
23:49 texasmynsted hmm
23:50 texasmynsted rebases
23:50 texasmynsted what happens if content in 'foo' has been rebased?
23:50 kadoban You get ... probably the same-ish history, modulo the rebase stuff, the commit hashes will be different though.
23:51 kadoban So, then it's unclear what you want to happen really. You can do it, but I probably wouldn't advise it.
23:51 jw4242 joined #git
23:53 texasmynsted what I want is to have the revision history of Repo B to match the revision history of the "split" "foo" directory of repo A, no matter what happened to repo A an the foo directory in repo A.
23:53 mischat joined #git
23:53 texasmynsted I see no command to completely dump all revision history in a remote repo
23:54 mischat joined #git
23:54 kadoban -f I guess, no idea if subtree push takes that option, but I think it does. It'd be easy to work around even if it doesn't.
23:54 texasmynsted I basically want repo C to join repo A on directory foo (as a submodule)
23:54 serialoverflow joined #git
23:54 mischat joined #git
23:55 BrianJ joined #git
23:55 texasmynsted looks like git subtree push does not take any options
23:55 mischat joined #git
23:56 texasmynsted but then it seems like this could be made by two commands: git subtree split, and git push -f
23:56 kadoban Yes
23:56 mischat joined #git
23:57 mischat joined #git
23:58 mischat joined #git
23:58 Koognod joined #git
23:59 mischat joined #git
23:59 Koognod I'm having a noob error and can't figure out how to fix it, would anyone be willing to assist me?
23:59 texasmynsted would that mess up the revision history in the B repo, to push rebased revisions to repo B with force?
23:59 kadoban texasmynsted: define "mess up"?
23:59 FreakySneaky joined #git
23:59 kadoban It seems like it'd mess things up about as much as a usual push -f of rebased history

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