Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-02

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

All times shown according to UTC.

Time Nick Message
00:00 parsnip0 joined #git
00:02 zumba_addict joined #git
00:02 red82 joined #git
00:03 mda1 joined #git
00:04 Lyqyd joined #git
00:04 Mixologi- joined #git
00:04 dodobrain joined #git
00:05 zumba_addict joined #git
00:07 shpew12 joined #git
00:07 tristanp joined #git
00:11 zumba_addict joined #git
00:12 matoro joined #git
00:13 snthsnth joined #git
00:14 tristanp joined #git
00:18 shpew12 joined #git
00:19 tristanp_ joined #git
00:21 f3r70rr35f joined #git
00:21 dhollinger joined #git
00:22 anuxivm left #git
00:24 Viddax joined #git
00:28 sangy joined #git
00:29 HoierM joined #git
00:32 skyres joined #git
00:33 mehola joined #git
00:37 mozzarella joined #git
00:39 nckpz joined #git
00:40 Gsham joined #git
00:41 GavinMagnus joined #git
00:43 heroux joined #git
00:44 boz_v1 joined #git
00:46 railssmi_ joined #git
00:46 johnny56 joined #git
00:47 thiago joined #git
00:47 Darren_ joined #git
00:51 e14 joined #git
00:54 jottr joined #git
00:55 shaggycat joined #git
01:01 FilipNortic__ joined #git
01:03 atesc joined #git
01:04 Ryanar joined #git
01:04 GavinMagnus left #git
01:05 Siegfried joined #git
01:05 tristanp joined #git
01:05 erkan joined #git
01:06 mizu_no_oto joined #git
01:07 Nevik joined #git
01:09 Ryanar joined #git
01:09 jottr joined #git
01:11 drbean joined #git
01:11 WebDawg joined #git
01:12 Mir4g3 joined #git
01:12 anonnumberanon joined #git
01:13 Exagone313 joined #git
01:16 akurniawan joined #git
01:16 hue joined #git
01:16 ammunta joined #git
01:17 ammunta is git-archive output intended to be reproducible, or is it just coincidental
01:18 matthiaskrgr joined #git
01:21 infernix joined #git
01:22 watabou joined #git
01:23 thiago ammunta: it's intended to be reproducible by everyone
01:23 crazyhorse18 joined #git
01:23 thiago it even includes the SHA-1 of the commit if you archive the commit
01:24 ammunta is it intended to be bitwise identical across versions though
01:24 ammunta empirically, it *is*, I just have no idea who to ask whether that's something to rely on
01:24 madprocess joined #git
01:25 thiago modulo updates to the application itself that may correct bugs or add file format extensions
01:27 madknight joined #git
01:32 fstd_ joined #git
01:35 skyres joined #git
01:40 pks joined #git
01:45 Gsham joined #git
01:46 red82 joined #git
01:46 arescorpio joined #git
01:47 Goplat joined #git
01:48 e14 joined #git
01:49 zumba_addict joined #git
01:50 denimsoft joined #git
01:51 cqi joined #git
01:54 terens_ joined #git
01:55 hahuang61 joined #git
01:56 zumba_addict joined #git
01:57 akurniawan joined #git
01:57 liuzhen joined #git
01:58 bruce_lee joined #git
02:00 shpew12 joined #git
02:02 jstimm joined #git
02:08 mizu_no_oto joined #git
02:10 Vampire0_ joined #git
02:11 parsnip0 joined #git
02:13 parrotriver joined #git
02:14 ajp_ joined #git
02:15 bronson joined #git
02:15 durham_ joined #git
02:18 zumba_addict joined #git
02:18 shpew12 Is git-web the best?
02:20 Vampire0 Depends on how you define "best"
02:21 shpew12 Would you recommend using it? Do you have any opinions on it?
02:22 lalilulelo joined #git
02:22 nawwmz joined #git
02:23 shpew12 I guess i'm just looking for opinions
02:23 raijin joined #git
02:24 ajp_ joined #git
02:24 Jameser joined #git
02:25 ajp_ left #git
02:25 ajp_ joined #git
02:25 ajp_ left #git
02:25 Vampire0 No, I have no opinion.
02:26 ayjay_t joined #git
02:26 ayjay_t i heard gitlist had a really nice ui but i'm not sure its being maintained
02:26 duckgoose left #git
02:26 ayjay_t i would assume gitweb has the largest userbase/maintainer base so thats +1 for gitweb
02:27 ayjay_t and then i think you can use gitlab? i'm not sure though, and they use ruby which i'm not sure you want to set up
02:27 Vampire0 shpew12, but maybe !host can help you
02:27 gitinfo shpew12: [!gitolite] Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/
02:27 Vampire0 shpew12, !host_gui I meant
02:27 gitinfo shpew12: There are several options for self-hosting git repositories with a web GUI: !gitblit !gitlab !rhode_code !gerrit and !gogs. Keep in mind that these all take far more work than a (non-GUI) !gitolite install. An overview of nearly all GUIs is available at: https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools
02:27 ayjay_t wow Vampire0 that was fancy
02:28 Vampire0 what?
02:28 phroa options and opinions might change based on how "one-click" you want your web interface, shpew12
02:28 finalbeta joined #git
02:29 phroa and any other requirements you might have besides "best"
02:29 dreiss joined #git
02:30 phroa for instance, do you need to host repositories with the same tool that offers the web UI?
02:30 ayjay_t Vampire0: using the bot command mid-sentence, very suave, like the equivalent of IRC breaking out in song Grease-style
02:30 ayjay_t i'd never heard of gitolite though, thats cool
02:31 shpew12 I've got a server setup using http right now in commandline, I'm just looking for something so that you can browse through code visually without having to clone everything.
02:31 phroa it's pretty great
02:31 menip joined #git
02:31 shpew12 But i won't complain if it has other features
02:32 Guest63015 joined #git
02:34 ayjay_t klaus seems pretty easy
02:38 gfixler joined #git
02:43 mmlb joined #git
02:48 d^sh joined #git
02:49 crazyhorse18 joined #git
02:54 ochorocho__ joined #git
02:54 railssmith joined #git
02:55 pks joined #git
03:00 DreamsandCode joined #git
03:00 Dietr1ch joined #git
03:02 aavrug joined #git
03:04 asdofindia joined #git
03:04 aavrug joined #git
03:04 dreamseeker_ joined #git
03:10 jottr joined #git
03:10 sunri5e joined #git
03:15 bronson joined #git
03:18 User458764 joined #git
03:19 User458764 joined #git
03:30 aa___ joined #git
03:31 Noldorin joined #git
03:31 chachasmooth joined #git
03:37 roadrunneratwast joined #git
03:38 roadrunneratwast hi.  if i checkout a repo that has several branches.  should i be able to switch to one of the branches?  i try "git checkout <branch>" but i am stuck on master
03:38 SwiftMatt joined #git
03:41 wxg joined #git
03:41 roadrunneratwast ok.  i can checkout just the branch i guess
03:42 roadrunneratwast no
03:42 roadrunneratwast wrong i canno
03:42 roadrunneratwast t
03:42 shpew12 joined #git
03:42 roadrunneratwast how do i get the branches in a checkout?
03:44 lindenle joined #git
03:44 roadrunneratwast ok.  i was able to checkout the branch
03:45 roadrunneratwast but i had to obliterate master
03:45 lagothrix joined #git
03:45 roadrunneratwast i couldn't pull from the working directory, which contained master, to get the other branches
03:45 hexagoxel joined #git
03:46 haway joined #git
03:47 qws-user-1228 joined #git
03:50 darkbit joined #git
03:53 justanotheruser joined #git
03:55 mehola joined #git
03:55 hahuang61 joined #git
03:56 xall joined #git
03:59 phanimahesh joined #git
03:59 fatalhalt joined #git
04:00 jost__ joined #git
04:08 watabou_ joined #git
04:08 zumba_addict joined #git
04:10 dsantiago joined #git
04:13 cagmz joined #git
04:13 acln joined #git
04:15 Vortex34 joined #git
04:16 bronson joined #git
04:22 sssilver joined #git
04:25 ki0 joined #git
04:29 phroa !book
04:29 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
04:31 atesc joined #git
04:32 zumba_addict joined #git
04:34 durham joined #git
04:41 ayjay_t hey does the hooks folder apply for local and remote commands both?
04:42 kadoban ayjay_t: What do you mean remote commands?
04:43 lindenle joined #git
04:43 pks joined #git
04:43 ayjay_t like if you have a client and you git add remote origin git/http-url
04:43 ayjay_t and then u do a push
04:43 ayjay_t it hooks pre-receive
04:44 ayjay_t would the same hook get called on the server for git push if the "url" is a local file system url
04:44 Andrew_K joined #git
04:44 thiago all hooks are local
04:44 thiago period
04:45 nawwmz joined #git
04:45 ayjay_t ?oh hey thiago
04:45 thiago understand this: all hooks are local
04:45 ayjay_t yeah i hear you
04:46 ayjay_t but they definitely still apply when your pushing to a remote repository, so i'm assuming that we're skirting the intention of my question and discussing the inner workings. which i support.
04:46 thiago the hooks in that repository are run, not yours
04:47 kadoban ayjay_t: If you are pushing to some remote, none of the hooks you have in the repo you're pushing *from* do anything. Only hooks on the remote in the repo you're pushing to.
04:47 thiago if you want something to happen, scp the script to the remote server
04:47 darkbit joined #git
04:49 ayjay_t well no i was just arguing with sysadmin who thought that pre-receive was only gonna get called for pushes over http not for local pushes
04:49 phanimahesh joined #git
04:49 thiago it's run for any pushes
04:49 ayjay_t yeah thats what i thought, thanks for confirming
04:49 thiago the point is that the receiving repository doesn't care where it came from
04:50 thiago the only difference is cloning
04:50 jaguarmagenta joined #git
04:50 thiago when you clone with a file path, it's not a local-remote split. It's a file operation.
04:50 thiago if you clone with a file:// URI, then, it's local-remote
04:53 ayjay_t probablem is sysadmin is on the server, sshed, and wants to be able to push to the repository there. so if we git remote add /var/* it works, it's fine. but if we git remote add origin http:/... it doesn't work
04:53 subhojit777 joined #git
04:53 ayjay_t no helper
04:53 ayjay_t but push works fine with a http:// address as long as its off-site
04:55 ayogi joined #git
04:55 pks joined #git
04:58 thiago use file:// then
05:01 ayjay_t yeah no we don't want to lol
05:02 ayjay_t its a git plugin for wordpress depending on REMOTE_USER
05:03 jaguarmagenta joined #git
05:04 ayjay_t of all the dum stuff we do :-O
05:04 didik_swn joined #git
05:04 ayjay_t embedded systems to javascript lol
05:05 didik_swn left #git
05:05 didik joined #git
05:06 phroa http://localhost... ?
05:06 ayjay_t maybe
05:07 subhojit777 There are two tags A and B. I want to see only the commits that A is ahead of B. Is there any way to do it?
05:07 ayjay_t we came to a conclusion in the office tho
05:07 phroa subhojit777: man git-cherry should do
05:07 gitinfo subhojit777: the git-cherry manpage is available at http://jk.gs/git-cherry.html
05:07 subhojit777 Actually I want to do use the commit diff as release not
05:07 subhojit777 *note
05:07 cqi joined #git
05:08 svm_invictvs joined #git
05:11 subhojit777 Thanks :) that helped
05:12 dreiss joined #git
05:12 pks joined #git
05:12 dietr1ch joined #git
05:13 rscata joined #git
05:14 lindenle joined #git
05:15 phanimahesh joined #git
05:16 resurtm joined #git
05:18 a_thakur joined #git
05:19 Siegfried joined #git
05:20 ngperfex joined #git
05:21 cqi joined #git
05:26 bmahe joined #git
05:28 theskillwithin joined #git
05:30 nilg joined #git
05:33 pks joined #git
05:34 heroux joined #git
05:35 liuzhen joined #git
05:36 a_thakur joined #git
05:37 a_thakur joined #git
05:37 Cabanossi joined #git
05:38 terens_ joined #git
05:41 pijiu joined #git
05:42 ngrin joined #git
05:43 _cyril_ joined #git
05:43 glebihan joined #git
05:49 Limes joined #git
05:49 ome joined #git
05:54 shubhnik joined #git
05:55 ochorocho__ joined #git
05:56 hahuang61 joined #git
05:57 bronson joined #git
05:59 zulutango joined #git
05:59 atesc joined #git
06:00 overlord_tm joined #git
06:00 dermoth joined #git
06:00 rchavik joined #git
06:03 bocaneri joined #git
06:05 tristanp_ joined #git
06:05 durham joined #git
06:07 didik joined #git
06:09 meauses joined #git
06:11 qt-x joined #git
06:13 Anupkumar joined #git
06:26 ki0 joined #git
06:27 rendar joined #git
06:31 jozwior joined #git
06:36 User458764 joined #git
06:37 sea-gull_ joined #git
06:40 Masber joined #git
06:41 jaafar joined #git
06:41 ThomasLocke joined #git
06:42 dhollinger joined #git
06:42 akushner joined #git
06:44 Endarked joined #git
06:45 ki0 joined #git
06:47 dsdeiz joined #git
06:47 shpew12 joined #git
06:51 didik joined #git
06:55 acetakwas joined #git
06:56 jozwior joined #git
06:56 LucaTM joined #git
06:58 meauses joined #git
06:59 Raging_Hog joined #git
07:03 dan2k3k4 joined #git
07:03 User458764 joined #git
07:03 grift joined #git
07:07 brillenfux joined #git
07:07 PCatinean joined #git
07:07 meauses joined #git
07:10 nicoulaj joined #git
07:10 barteks2x joined #git
07:10 bronson joined #git
07:10 gesker joined #git
07:16 freimatz joined #git
07:16 des_consolado left #git
07:17 sea-gull_ joined #git
07:17 SwiftMatt joined #git
07:18 netj joined #git
07:19 Ryiya_ joined #git
07:20 apotry joined #git
07:21 flavius joined #git
07:26 chele joined #git
07:28 elect joined #git
07:30 iamrohit7 joined #git
07:32 iamrohit7 i used git clone --reference to clone a repository and deleted the reference repository. now i get an error 'object directory /home/rk/mozilla-servo/servo/.git/objects does not exist; check .git/objects/info/alternates.' how do i fix it?
07:35 kadoban iamrohit7: Sounds pretty expected, right?
07:35 avera joined #git
07:35 jnavila joined #git
07:36 iamrohit7 kadoban: i don't understand what it means.
07:36 jknetl joined #git
07:39 kadoban iamrohit7: You told it "hey look over here for objects, and don't bother copying them", and then you deleted the place you told it to look.
07:39 vuoto joined #git
07:41 iamrohit7 kadoban: i looked at .git/objects/info/alternates and there's only the reference repository's path. does it mean i have to clone again from remote?
07:42 kadoban iamrohit7: There's probably some other way to fix it. I don't know what that way is personally.
07:45 iamrohit7 kadoban: ah. thanks.
07:45 corsibu joined #git
07:46 Sceorem joined #git
07:46 deltab joined #git
07:47 eduardas_m joined #git
07:51 acetakwas joined #git
07:54 ThomasLocke joined #git
07:56 submitnine joined #git
07:57 hahuang61 joined #git
08:00 tvw joined #git
08:00 omegak joined #git
08:02 vmiklos joined #git
08:06 danslo joined #git
08:06 tgp_ joined #git
08:09 meth joined #git
08:10 pluszak left #git
08:12 shruggar joined #git
08:14 PHPanos joined #git
08:16 TomyWork joined #git
08:19 eduardas_m joined #git
08:20 corsibu joined #git
08:23 k200 joined #git
08:23 dan2k3k4 joined #git
08:23 k200 i replaced a image file. how do i make sure its checked into commit? if i do add -p it says only binary file changed.
08:24 j416 k200: git status
08:24 k200 git status shows it as modified.
08:24 k200 becuse it is modified. i replaced it with new image. same name.
08:24 j416 k200: git add thatfile
08:24 tobiasvl k200: git status probably tells you how to add it. it should be git add
08:25 tobiasvl k200: you can't git add -p a binary file, it has no hunks
08:25 k200 ok
08:25 tobiasvl binary doesn't diff very well you know
08:25 kimonorouge joined #git
08:25 jozwior joined #git
08:25 _ikke_ It does, but not human readable :P
08:25 ki0 joined #git
08:26 tobiasvl :)
08:26 _ikke_ binary diff is a thing
08:27 morfin joined #git
08:27 morfin hello
08:27 Balliad joined #git
08:27 morfin how git generates commit hashes?
08:28 _ikke_ git hash-file -t <type> <file>
08:28 _ikke_ hash-object I mean
08:28 morfin huh?
08:28 morfin so it hash all files and combine hashes?
08:28 ciechomke joined #git
08:29 _ikke_ Each file is hashed. Then a tree is created that contains the filenames types and hashes of all files, and is hashed
08:29 _ikke_ recursively
08:29 overlord_tm joined #git
08:30 _ikke_ and then a commit object is created which contains meta data, parent commit (if any) and root tree hash, and is hashed itself
08:31 grawity https://git-scm.com/book/en/v2/Git-Internals-Git-Objects
08:31 grawity pictures
08:31 _ikke_ Who needs pictures when you have a thousand words :P
08:32 _ng joined #git
08:34 sweatsuit joined #git
08:34 halbomin joined #git
08:37 MrMojito joined #git
08:38 corsibu joined #git
08:40 ahmedelgabri joined #git
08:41 laumann joined #git
08:43 kedare joined #git
08:43 zeroed joined #git
08:43 zeroed joined #git
08:45 jozwior joined #git
08:46 a3Dman joined #git
08:46 dan2k3k4 joined #git
08:46 Guest66535 joined #git
08:46 Guest66535 joined #git
08:46 avera joined #git
08:49 gr8kodr joined #git
08:49 PHPanos joined #git
08:50 rahtgaz joined #git
08:50 acetakwas joined #git
08:51 corsibu joined #git
08:51 finalbeta joined #git
08:52 gr8kodr could anyone help with configuration of gitweb please?
08:53 gr8kodr I have a local CentOS machine with git + gitweb installed, which I want to use as the server for my internal network
08:54 Mattias joined #git
08:56 gr8kodr with the defaults, gitweb is currently serving from /var/www/git - I want to change it to serve from /home/gitserver/ but I don't know which files I need to edit
08:57 flaviodesousa joined #git
08:58 corsibu joined #git
09:00 darkbit joined #git
09:00 gr8kodr apologies ... the main repo should be /home/gitserver but actual projects would be under /home/gitserver/contributor/project ... this is the first time I have tried to create a centralised repository
09:04 meth joined #git
09:06 ahmed_elgabri joined #git
09:06 encod3 joined #git
09:07 meth joined #git
09:07 meth joined #git
09:08 zeroed joined #git
09:08 zeroed joined #git
09:08 marcogmonteiro joined #git
09:08 kurkale6ka joined #git
09:09 cwillu_at_work joined #git
09:10 mehola joined #git
09:10 bronson joined #git
09:12 meth joined #git
09:12 Darcidride joined #git
09:16 Mattias I have this weird thing happening in several repos this week. I make changes to files, any file, any repo, maybe the first time it'll detect changes, but after I push and then make more changes, git no longer detects any change to any file.
09:17 GavinMagnus joined #git
09:17 Mattias I have to use --no-assume-unchanged on the files I edit to actually have git detect the change. Not sure why it happens. Even after I git clone the repo again it detects no changes.
09:18 Mattias Anything that might cause this? Some setting in git?
09:19 GavinMagnus left #git
09:20 clmsy joined #git
09:22 robotroll joined #git
09:23 _ikke_ WHat OS?
09:23 mikecmpbll joined #git
09:24 ocbtec joined #git
09:24 jbitdrop joined #git
09:24 ocbtec joined #git
09:25 Mattias _ikke_: Ubuntu 16.04
09:25 Mattias git version is 2.7.4
09:26 Mattias At home I don't have any issues, also on Ubuntu 16 -.-
09:33 phanimahesh joined #git
09:34 User458764 joined #git
09:35 User458764 joined #git
09:37 omegak joined #git
09:38 mischat joined #git
09:39 ShapeShifter499 joined #git
09:44 _cyril_ joined #git
09:44 jottr joined #git
09:46 Serpent7776 joined #git
09:50 meth joined #git
09:55 meth joined #git
09:58 quentin joined #git
09:58 hahuang61 joined #git
09:58 ferr joined #git
09:58 Meteorhead joined #git
09:58 ShekharReddy joined #git
10:00 brandonw joined #git
10:02 liuzhen joined #git
10:04 qws-user-1228 joined #git
10:05 fuchstronaut joined #git
10:06 _ikke_ joined #git
10:06 resurtm joined #git
10:08 lb1c joined #git
10:08 usm4n joined #git
10:11 Oiabz joined #git
10:11 bronson joined #git
10:12 Geee` left #git
10:12 qt-x joined #git
10:15 tvw joined #git
10:18 cdg joined #git
10:19 mischat joined #git
10:20 phanimahesh joined #git
10:22 meauses joined #git
10:23 djb-irc joined #git
10:23 xall joined #git
10:25 fmcgeough joined #git
10:25 ThomasLocke joined #git
10:29 tfrangio joined #git
10:31 miklcct joined #git
10:31 djb-irc joined #git
10:31 Iueo joined #git
10:34 ayogi joined #git
10:36 nawwmz joined #git
10:42 corsibu joined #git
10:43 kadoban_ joined #git
10:45 fuchstronaut joined #git
10:47 ronskisika joined #git
10:47 corsibu joined #git
10:48 gareppa joined #git
10:49 kadoban_ joined #git
10:49 eduardas_m joined #git
10:50 Daic joined #git
10:54 rishi joined #git
10:57 corsibu joined #git
10:58 ochorocho__ joined #git
10:59 Ryanar joined #git
10:59 fuchstro1aut joined #git
10:59 ronskisika joined #git
11:00 d0nn1e joined #git
11:01 King_Hual joined #git
11:02 phanimahesh joined #git
11:05 Vigr joined #git
11:07 fuchstronaut joined #git
11:11 BSaboia joined #git
11:12 raijin joined #git
11:14 wjj joined #git
11:17 lindenle joined #git
11:18 xaa joined #git
11:19 _main_ joined #git
11:19 jdiez joined #git
11:20 jdiez hi, I'm trying to use git submodules to manage the dependencies of a software package, but I'm running into trouble if I try to delete the submodule and recreate it afterwards
11:20 jdiez https://gist.github.com/jdiez17/49b7850eeac73ce07e7214a9f4e04e6c
11:20 alcohol joined #git
11:20 jdiez lines 1-10: I create a release folder and add a submodule
11:21 jdiez after that: "oops, I made a mistake, I'll start again"
11:21 jdiez but the 'submodule add' command fails. it only works after I delete .git/modules/lht-win32/...
11:21 jdiez I would have expected git rm -rf (line 13) to do that. What am I doing wrong?
11:22 geoid_ joined #git
11:24 myhau joined #git
11:26 rominronin joined #git
11:28 __main__ joined #git
11:29 phanimahesh joined #git
11:30 dan2k3k4 joined #git
11:31 tjone270 joined #git
11:32 meauses joined #git
11:33 _main_ joined #git
11:36 dsdeiz joined #git
11:36 qt-x joined #git
11:40 __main__ joined #git
11:40 corsibu joined #git
11:40 a3Dman joined #git
11:42 CheckDavid joined #git
11:44 xelxebar joined #git
11:48 _main_ joined #git
11:48 dsdeiz joined #git
11:48 dsdeiz joined #git
11:54 JamesBaxter joined #git
11:54 mruiz joined #git
11:55 sdothum joined #git
11:55 MrMojito1 joined #git
11:56 phanimahesh joined #git
11:57 corsibu joined #git
11:57 ExoUNX joined #git
11:58 fahadash joined #git
11:58 laumann joined #git
11:59 __main__ joined #git
12:03 synthroid joined #git
12:06 synthroi_ joined #git
12:10 troulouliou_div2 joined #git
12:10 troulouliou_div2 joined #git
12:10 johnmilton joined #git
12:11 halbomin joined #git
12:12 bronson joined #git
12:12 bruce_lee joined #git
12:12 CubiK joined #git
12:14 morfin i am wondering how do i use git and Nginx hmm
12:15 grawity morfin: `man git http-backend` has examples
12:15 gitinfo morfin: the git-http-backend manpage is available at http://jk.gs/git-http-backend.html
12:15 grawity morfin: assuming you want push/fetch
12:17 kenden joined #git
12:23 drbean_ joined #git
12:23 tvw joined #git
12:24 brett_ joined #git
12:24 pks joined #git
12:26 jeffreylevesque joined #git
12:31 uranellus joined #git
12:31 uranellus joined #git
12:34 thesha joined #git
12:38 cdg joined #git
12:38 BSAlb joined #git
12:38 jozwior joined #git
12:39 BSab joined #git
12:40 User458764 joined #git
12:40 zeroed joined #git
12:40 zeroed joined #git
12:42 manuels joined #git
12:42 ych joined #git
12:43 tlaxkit joined #git
12:43 eroussel joined #git
12:44 mischat joined #git
12:45 skunkz joined #git
12:56 barteks2x joined #git
12:57 e14 joined #git
12:57 kingarmadillo joined #git
12:57 darkbit joined #git
12:57 nettoweb joined #git
12:57 kingarmadillo Is there a way to show that a file was moved in git history instead of deleted? I used git mv, thought i did, but it didnt seem to save the file history.
12:58 grawity git log --follow, I think
12:59 kingarmadillo is there a way to keep the original file's history with the new file?
13:00 User458764 joined #git
13:00 selckin git doesn't track renames, it only has support to detect it -C -M --follow etc
13:00 kingarmadillo ok thanks
13:01 grawity in other words
13:01 grawity the history is not per-file
13:01 corsibu joined #git
13:01 selckin or it is :)
13:02 grawity it's not
13:02 grawity it's a bunch of "the whole repo looked like this" snapshots
13:02 corsibu joined #git
13:04 chele joined #git
13:05 barteks2x joined #git
13:07 _ikke_ That means git can even track partial code moves
13:07 _ikke_ ie, when using git blame
13:09 grawity if you know the right incantation to make it do so...
13:10 _ikke_ with tig it's easy
13:12 tvw joined #git
13:12 topi`_ left #git
13:13 topi` joined #git
13:13 topi` I have 2 branches in my repo, one is devel and other is for a customer (somewhat patched) ... is there a nice way to merge the fixes I made for the customer to the devel branch? I want to drop out the customer-specific bits.
13:13 topi` I realize cherry-pick can achieve this, but there must be a way to drop out some commits from a merge?
13:13 _ikke_ No, not an easy/automated way
13:13 topi` what about creating a temporary branch, cherrypicking everything there, and then merging THAT on top of devel?
13:13 _ikke_ topi`: A merge doesn't merge a range of commits
13:14 _ikke_ it merges exactly 2 commits, with help of a 3rd. What happened in between does not matter
13:14 _ikke_ topi`: sure, that would work. You are basically just creating a new branch
13:15 akurniawan joined #git
13:15 sweatsuit joined #git
13:17 Ankhers joined #git
13:18 nfk joined #git
13:20 WayToDoor joined #git
13:22 f0g joined #git
13:24 topi` I wanted to use merge --no-ff to get all the commits pulled in
13:24 topi` so that if I do "git log" under [devel], I would see all those fixes right there
13:24 _ikke_ If history is diverged, that already happens
13:24 topi` hmm
13:25 topi` they do have a common ancestor, but that diverged A LONG time ago :)
13:25 mischat joined #git
13:25 topi` and since the source code is python, it's likely there are lots of discrepancies between e.g. amount of whitespace because of elimination of unnecessary if's etc etc :)
13:26 topi` (python code is a pain to resolve conflicts from, since you easily make mistakes at the level of whitespcae)
13:26 _ikke_ righy
13:27 barteks2x joined #git
13:27 djb-irc joined #git
13:28 lamont joined #git
13:28 meth joined #git
13:29 tinanoo joined #git
13:31 Learath2 joined #git
13:31 User458764 joined #git
13:32 nikivi joined #git
13:33 avera joined #git
13:34 barteks2x joined #git
13:34 eroussel joined #git
13:35 eduardas_m joined #git
13:35 bronson joined #git
13:36 synchronous joined #git
13:37 wrouesnel joined #git
13:37 underpantz joined #git
13:39 cdg_ joined #git
13:39 nettoweb joined #git
13:40 WayToDoor joined #git
13:40 dan2k3k4 joined #git
13:40 barteks2x joined #git
13:41 Es0teric joined #git
13:43 zeroed joined #git
13:45 LucaTM_ joined #git
13:46 Rickmasta joined #git
13:46 Rickmasta Hey guys, I'm trying to set up git on a remote server
13:47 Rickmasta and whatever I do, the files never show up on the remote server.
13:47 selckin !non-bare
13:47 gitinfo [!bare] A bare repository is used to push/fetch (useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/
13:47 Rickmasta When I push it shows them being uploaded but then nothing ever shows up.
13:47 selckin !deploy
13:47 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
13:47 grawity that's the usual way VCS servers work, yes
13:47 grawity even distributed ones
13:47 Rickmasta but I did git init --bare
13:47 grawity right
13:47 codedmart joined #git
13:47 grawity so you only have the 'database'
13:48 selckin define "nothing shows up"
13:48 grawity that's what a bare repo *is*
13:48 codedmart I am trying to merge master into a feature branch, but it seems a bunch of my changes are gone when I merge? What is the best way to resolve this?
13:48 Rickmasta Isn't it supposed to upload my current files to the directory when I push
13:49 selckin no.
13:49 Rickmasta I'm confused
13:50 selckin read the links
13:50 zeroed joined #git
13:50 grawity think of it as uploading something like a zip archive of the files
13:50 boombatower joined #git
13:50 arooni joined #git
13:50 _ADN_ joined #git
13:51 zeroed joined #git
13:51 zeroed joined #git
13:52 jfr joined #git
13:52 Rickmasta oh ok
13:52 tvw joined #git
13:53 Rickmasta So when you do a push to heroku, that's actually something that theyre taking care of and not git itself?
13:53 _ikke_ Rickmasta: correct
13:53 _ikke_ they use something like a hook to deploy the application
13:53 _ikke_ at least, initiate a deploy
13:53 Rickmasta Gotcha, that's why I was confused.
13:53 selckin the thing that happens when you push to heroku is what they are selling
13:54 Rickmasta So what is the way that git is intended to be used?
13:54 ieee joined #git
13:54 selckin not for what heroku does
13:54 _ikke_ deployment is outside of gits scope
13:56 dwmw2_gone joined #git
13:56 Rickmasta So what is the proper flow when using git?
13:56 skunkz joined #git
13:56 Rickmasta Pull when you're ready and manually deploy?
13:56 grawity or use one of the half-a-dozen !deploy methods
13:56 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
13:57 grawity some of them do a `git pull` from the 'server' to the web dir
13:57 _ikke_ which is not recommended
13:57 grawity not literally, no
13:58 selckin Rickmasta: you've been mailing yourself with fedex and are now asking what a car is for
13:58 Rickmasta haha
13:58 grawity but the specific usages as in that page are fine
13:59 ych joined #git
13:59 hahuang61 joined #git
14:00 joki joined #git
14:00 IrishPrime joined #git
14:01 IrishPrime joined #git
14:02 stemid left #git
14:02 tristanp joined #git
14:02 manuels joined #git
14:03 sangy joined #git
14:04 e14 joined #git
14:05 mischat joined #git
14:05 phanimahesh joined #git
14:07 al-damiri joined #git
14:09 hariel so theres a repository on github, say 'foo', and a fork 'foo-fork', also on github
14:10 Aoup joined #git
14:10 hariel is there a way to have a single repository on my machine having both the original and the fork files
14:10 grawity git remote add
14:10 selckin git remote add fork github.com/qsdflqsdfjkqsdfs
14:11 cdown joined #git
14:11 hariel oh thanks :)
14:11 hariel after having cloned the original one, right?
14:12 selckin whtaever order you want
14:12 albel727 joined #git
14:12 Noldorin joined #git
14:12 ungular joined #git
14:13 dimi1947 joined #git
14:14 lss8 joined #git
14:14 _ikke_ you can even init a repo, add both remotes and fetch
14:15 pirate21994 joined #git
14:15 a_thakur joined #git
14:15 Emperor_Earth joined #git
14:16 ResidentBiscuit joined #git
14:16 shubhnik joined #git
14:16 AaronMT joined #git
14:16 djb-irc joined #git
14:16 bsanford joined #git
14:17 hariel i see
14:17 rivarun joined #git
14:19 sweatsuit joined #git
14:22 tvw joined #git
14:22 Ryanar joined #git
14:22 albel727 joined #git
14:24 zumba_ad_ joined #git
14:24 ShekharReddy joined #git
14:25 User458764 joined #git
14:26 phanimahesh joined #git
14:29 Darren_ joined #git
14:30 navidr joined #git
14:31 robotroll joined #git
14:35 Oatmeal joined #git
14:37 corsibu joined #git
14:37 dendazen joined #git
14:37 ochorocho__ joined #git
14:38 barteks2x joined #git
14:38 Rickmasta So how do I stop checkout from changing all of the permissions on my files?
14:38 meauses joined #git
14:39 victorhe joined #git
14:40 nedbat Rickmasta: what permissions are changing?
14:42 nckpz joined #git
14:43 pthreat joined #git
14:43 pthreat *how* do I IGNORE a file in git ...
14:43 pthreat adding it to .gitignore doesn't do anything
14:43 Rickmasta nedbat: file permissions
14:44 nckpz joined #git
14:44 nedbat Rickmasta: yes, those are the only kind of permissions that files have.  Can you be more specific? Owner? group? mode?
14:44 shinnya joined #git
14:44 nedbat pthreat: if the file has already been committed, then adding it to gitignore doesn't start ignoring it.
14:45 tobiasvl pthreat: !ignore_untracked
14:45 gitinfo pthreat: [!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
14:45 pthreat Ok so let's say I have a configuration file that needs to be changed frequently but not commited
14:46 pthreat i.e a configuration file
14:46 * Rickmasta Sorry nedbat, I just took a screenshot https://i.imgur.com/1EWbPD8.png
14:46 pthreat what's the "git" approach
14:47 kadoban pthreat: !config ?
14:47 gitinfo pthreat: [!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
14:47 Rickmasta Changes every file to 775?
14:47 rivarun joined #git
14:49 eroussel joined #git
14:49 pthreat cp config.file $HOME; git checkout config.file; git commit -a -m 'Message'; git pull; git push; cp $HOME/config.file .; echo "It's ridiculous that I have to do such things"
14:49 pthreat whatevz
14:49 pthreat left #git
14:51 robattila256 joined #git
14:51 ArchNoob joined #git
14:51 LionsMane joined #git
14:52 jmpp joined #git
14:52 jmpp joined #git
14:52 hariel joined #git
14:53 barteks2x joined #git
14:53 InfoTest joined #git
14:55 matsaman joined #git
14:55 isysd joined #git
14:55 flavius joined #git
14:55 Kulrak left #git
14:55 Kulrak joined #git
14:58 Vampire0 Rickmasta, Git explicitly does not track any file permissions besides executable flag. I think if git checkout changes a file it deletes it and recreates it with the new content, which will give it the default file permissions for your environment and then sets the executable bit as recorded.
14:58 phaleth joined #git
14:58 Rickmasta yup
14:58 Rickmasta Changing the default right now. Thanks
14:58 Vampire0 Rickmasta, or in other words !perm :-)
14:58 gitinfo Rickmasta: [!permissions] Git does not store full UNIX permissions, even if it makes it look like it does. In fact, the only mode-related info Git stores is whether a given file is executable. Anything else is taken care of by your umask and the core.sharedRepository setting. See also !configfiles
14:59 Vampire0 you're welcome Rickmasta
14:59 gitinfo Rickmasta: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
14:59 dviola joined #git
14:59 saml joined #git
15:00 Rickmasta lol Thank you Vampire0
15:00 Ryanar joined #git
15:02 mischat joined #git
15:02 Roland joined #git
15:03 HoierM joined #git
15:04 cdown joined #git
15:05 Shentino joined #git
15:06 AlexP11223 if I change email via git filter-branch in my local repo (not pushed anywhere yet) and publish it on github, is there are any way to recover the old email?
15:06 barteks2x joined #git
15:07 _ikke_ AlexP11223: No, if you make sure to change both author and comitter fields, then there is no way to recover it from those commits
15:07 bsanford joined #git
15:07 selckin there is no risk of it uploading old packs either?
15:07 aarobc joined #git
15:07 kurolox joined #git
15:08 _ikke_ selckin: No, git calculates what it needs to push based on the reachability from the refs
15:08 selckin nice
15:09 kurolox Hello! I'm trying to include every directory in a .gitignore except a few I actually want to include. It doesn't seem to be working though.
15:09 kurolox This is my gitignore. https://ghostbin.com/paste/wyr9o
15:09 kurolox It works for the README.md or the gitignore, but not for the folders and their content.
15:10 diego3 joined #git
15:10 diego3 joined #git
15:12 diego3 joined #git
15:12 diego3 joined #git
15:14 inflames joined #git
15:15 jknetl joined #git
15:15 nawwmz joined #git
15:18 lindenle joined #git
15:18 ych joined #git
15:19 nedbat kurolox: what is telling you that it isn't working?
15:20 kurolox well, none of the files from folders like i3blocks or wallpapers aren't appearing as modifier or unadded when I do git status
15:20 kurolox so I assume that they aren't being tracked because of the gitignore
15:21 Spydar007 joined #git
15:22 nedbat kurolox: were these files already tracked in git?
15:22 cdown joined #git
15:24 delboy1978uk joined #git
15:24 delboy1978uk how to rerere forget everything?
15:24 barteks2x joined #git
15:24 xall joined #git
15:25 e14 joined #git
15:25 Vampire0 kurolox, !gitignore_whitedir
15:25 gitinfo kurolox: A global/directory .gitignore blacklist with a (potentially) subdirectory whitelist is not easy to specify in git. However, something like `echo -e '/*\n!/a/\n/a/*\n!/a/b/\n/a/b/*\n!/a/b/c/' > .gitignore` (ignore everything but a/b/c directory) or `echo -e '*\n!*/\n!*.c' > .gitignore` (ignore everything but *.txt files) may do what you want.
15:26 dreiss joined #git
15:26 matsaman joined #git
15:27 Vampire0 kurolox, so if your i3blocks directory is in the root of the hierarchy, it should work like you have it I think, but not if they are in subdirectories
15:27 kurolox it's in the root
15:28 myhau joined #git
15:31 leeN joined #git
15:31 barteks2x joined #git
15:31 crose joined #git
15:31 Vampire0 kurolox, your syntax is wrong. A line starting with # is a comment, but not everything after a # in a line is a comment
15:31 Vampire0 kurolox, move your comments to own lines and it should wokrk
15:31 Vampire0 s/wokrk/work/
15:32 Vampire0 kurolox, you even can remove some of the lines like 3, 9 and 11
15:33 fahadash joined #git
15:33 nikivi joined #git
15:33 djb-irc joined #git
15:34 pks_ joined #git
15:35 sssilver joined #git
15:37 davidfetter_ge joined #git
15:41 tyreld joined #git
15:42 kpease joined #git
15:44 jknetl joined #git
15:45 subhojit777 joined #git
15:47 berndl joined #git
15:49 jccn joined #git
15:50 Viddax left #git
15:50 mischat_ joined #git
15:51 e14 joined #git
15:52 nikivi joined #git
15:53 eivarv joined #git
15:55 djb-irc joined #git
15:59 inflames joined #git
15:59 SourTrout joined #git
15:59 danslo joined #git
15:59 jknetl joined #git
16:00 danslo joined #git
16:00 hahuang61 joined #git
16:00 nettoweb joined #git
16:01 thiago joined #git
16:04 Ryanar joined #git
16:04 Starky joined #git
16:05 m___ joined #git
16:08 mischat joined #git
16:09 ojdo joined #git
16:11 cdg joined #git
16:11 djb-irc joined #git
16:12 soumyadip joined #git
16:13 _cyril_ joined #git
16:15 svm_invictvs joined #git
16:15 soumyadip are there any mirror sites to download git windows installer?
16:15 TomyLobo joined #git
16:16 ilmari soumyadip: is https://git-scm.com/download/win not working for you?
16:16 jfran joined #git
16:17 soumyadip ilmari: no the download starts.but the speed tapers down to zero after a while.I have tried several times with chrome and some download managers
16:18 johntramp joined #git
16:19 red82 joined #git
16:19 MeltedLux joined #git
16:20 lindenle joined #git
16:20 soumyadip ilmari: so i thought it could me an amazon aws issue, i googled for a mirror but was unable to find one
16:21 wfjhweifuhi joined #git
16:21 User458764 joined #git
16:21 diogenese joined #git
16:21 Overand joined #git
16:21 ilmari I very much doubt it's aws that's being slow
16:22 * ilmari just downloaded it a sustained 9.2MB/s
16:22 jknetl joined #git
16:22 ilmari from two completely different locations (.uk and .no)
16:23 wfjhweifuhi left #git
16:23 Noldorin joined #git
16:24 Overand Hey folks - I've got an odd one. I've got a git repository that at one point I copied a file from it to give to a user at some point in the past. What I'd like to do is compare that file against the repo and try to figure out 'when' it's from
16:24 madewokherd joined #git
16:24 Overand I guess essentially diffing it against the version of it from the various commits
16:25 Overand Is there a reasonable way to do that, either on the CLI or potentailly gitk
16:25 soumyadip ilmari: I am from india. Internet is slow here, the speed started from 50KB/s and then tapered to 0 B/s.. Video and other stuff getting downloaded fine @ around 1MB/s
16:26 moritz Overand: you can do a bit of scripting
16:26 soumyadip @Overand if you got atom. you can use the git time line extension
16:27 Overand BOth of those are good sounding options to have in my toolbelt.
16:27 jaafar joined #git
16:27 Overand I've never really touched atom, I should probably give it a try. And yeah, I can probably do soe scripting
16:27 moritz git rev-list HEAD -- thefile # to get all commits reachable from HEAD that touch the file
16:27 peeps[work] i have a build process that clones from git and builds a bunch of files in that working directory tree.  instead of cloning every time, if I do a git checkout -f, that would have the same result as cloning into a fresh directory, clearing any of these leftover build files for me?
16:27 Overand Do I have to do anything "fiddly" to diff a file against a prior commit?  (Do I have to check out from that commit and then do it externally?)
16:27 kyan joined #git
16:27 moritz and then you can make a small loop with git cat-file to get the version from git, diff it
16:28 jfran joined #git
16:28 Overand moritz: In this case, essentially all the commits will have touched the file
16:28 Overand AH! git-cat!
16:28 Overand I didn't know that was a thing, and am unsurprised.
16:28 Overand That'll be perfect I bet
16:28 Overand (er, cat-file.  you know what i mean)
16:28 moritz note that you can also get the same from git show
16:28 moritz git show $sha1:$path
16:29 Overand hm. What's different between cat-file and show?
16:29 Overand (I'll google that)
16:29 Random832 Overand: show does fancy stuff with commits
16:30 ilmari Overand: git diff <commit> -- <file>
16:30 moritz basically, git show is porcelain, cat-file is plumbing
16:30 moritz so cat-file is safer for scripting, I guess
16:31 ych joined #git
16:34 bronson joined #git
16:36 bket joined #git
16:37 grawity except for cat-file -p which is halfway
16:38 hafeez3000 joined #git
16:39 meauses joined #git
16:39 Random832 i'd hope it's still safe for scripting, so that you don't have to parse the binary format of tree objects
16:39 Random832 if you want to do your scripting in awk or example
16:40 Random832 you know what i've never understood? why the hash is binary but the mode is text in tree objects
16:41 _ikke_ Random832: perhaps an optimization
16:41 Random832 but why not also binary mode
16:41 InfoTest joined #git
16:41 grawity Random832: well, on recent versions yes
16:41 grawity it used to mangle tags though
16:41 _ikke_ mangle tags?
16:42 Overand tangle mag
16:42 delboy1978uk left #git
16:43 durham joined #git
16:43 mykespb joined #git
16:43 Overand Oooooh boy, I just did "umount -l /"
16:44 durham joined #git
16:45 cagedwisdom joined #git
16:45 Overand haha, fortunately just on my workstation. ANYWAY, thanks for the pointers!
16:48 durham joined #git
16:49 isysd joined #git
16:50 kyan joined #git
16:50 sssilver joined #git
16:53 akushner joined #git
16:53 cdown joined #git
16:54 soumyadip left #git
16:55 matsaman what's the procedure to stop tracking file/s and remove them from your local directory _without_ forcing a git pull by someone else on the team losing those files?
16:55 cdown_ joined #git
16:56 geoid_ joined #git
16:56 durham joined #git
16:57 moritz matsaman: there is none
16:58 nitric joined #git
16:58 moritz matsaman: you do a 'git rm', commit, push. They pull, the file is gone in their working copy
16:58 matsaman seriously? =P
16:58 moritz matsaman: if you delete a tracked file, that deletion is propagated
16:58 nikivi joined #git
16:59 matsaman I don't want it tracked
16:59 mehola joined #git
16:59 matsaman it's going to be on .gitignore
16:59 matsaman but I don't want other people to lose their files
17:00 meauses joined #git
17:01 rendar joined #git
17:01 Ryanar_ joined #git
17:02 moritz well, they can always restore it from the last tracked revision
17:02 moritz it's not like a git rm loses data
17:02 grawity if they have local changes
17:02 grawity then they just won't be able to `git pull`
17:02 grawity i.e. git won't merge the deletions
17:03 grawity if they *don't* have local changes
17:03 ochorocho__ joined #git
17:03 grawity then they can `git checkout HEAD^ file1 file2` etc.
17:03 overlord_tm joined #git
17:04 nikivi joined #git
17:04 hackal joined #git
17:04 matsaman the humanity =P
17:05 railssmith joined #git
17:05 aniasis joined #git
17:05 hackal Hello, what could be a reason for getting public key error on one repository when I different repositories work with no problems under the same system/account?
17:06 akushner joined #git
17:06 eroussel joined #git
17:06 cyphase joined #git
17:06 Gsham joined #git
17:07 aniasis Hello.  When I try to cherry pick commits from another remote it never adds files to the commit.  Why?
17:07 matsaman so they'd do git checkout @{1} -- file && git rm --cached file ?
17:07 _cyril_ joined #git
17:07 matsaman moritz: grawity: ^ right?
17:08 sssilver joined #git
17:10 romerocesar joined #git
17:11 Es0teric joined #git
17:12 Samual joined #git
17:12 matsaman yeah =)
17:12 LarArT joined #git
17:12 matsaman thanks
17:12 crayon joined #git
17:13 CtrlC creating a branch using "git branch -b name" will copy the files from master to "name" too. right?
17:14 t0by joined #git
17:14 matsaman CtrlC: if you're already on master, yes
17:14 CtrlC Thanks.
17:14 matsaman I mean, "copy" as git does a "copy"
17:14 matsaman as far as you're concerned, you will have two copies, yes, both which can then be independently modified
17:14 CtrlC So I can continue what I did on master there without effecting master.
17:14 matsaman yes indeed, lovely innit?
17:15 CtrlC truly. I'm leaving my wife for it.
17:15 matsaman CtrlC: whoops
17:15 matsaman sorry it's git checkout -b
17:15 matsaman not git branch -b
17:15 crayon joined #git
17:15 matsaman something which many people find counterintuitive =P but that's how it is
17:15 CtrlC yeah checkout. my bad.
17:15 matsaman =)
17:15 matsaman but yes, that
17:17 CtrlC Thanks.
17:19 oskarkv joined #git
17:21 ayjay_t joined #git
17:22 WhiskerBiscuit joined #git
17:22 Mobutils joined #git
17:22 jeremyhall joined #git
17:23 LarArT /set buffers.look.hotlist_counter on
17:26 Mobutils joined #git
17:27 resurtm joined #git
17:28 dimi1947 joined #git
17:28 irco joined #git
17:31 jstimm joined #git
17:32 barteks2x joined #git
17:34 Motoko joined #git
17:35 Es0teric joined #git
17:35 LarArT joined #git
17:35 dreiss joined #git
17:35 hahuang61 joined #git
17:35 alhariel joined #git
17:36 barteks2x_ joined #git
17:36 jas4711 joined #git
17:39 renlo joined #git
17:39 corsibu joined #git
17:39 dsantiago joined #git
17:40 corsibu joined #git
17:40 renlo if I use git (not git lfs) to track a binary which is ~12 mb, whenever I change the file the size of the repository will get pretty big wont it?
17:40 grawity depends on the file's type
17:40 grawity but usually yes
17:40 meauses joined #git
17:40 grawity especially for compressed types
17:40 Learath2 joined #git
17:40 renlo if I set the .gitattributes file so that it is a binary, it will still get pretty large?
17:40 LarArT joined #git
17:40 grawity yes
17:41 grawity git's storage layer really doesn't care whether it is binary or not
17:41 grawity it stores everything the same way
17:41 grawity if two versions are similar, it uses delta compression
17:41 canton7 the .gitattributes stuff just tells git whether it can diff or merge the file - it doesn't control how the file is stored
17:41 dsantiago joined #git
17:41 grawity if they're too different, it has to store both copies whole
17:41 grawity most text files only change very little
17:41 grawity most binary files change a lot
17:42 synthroid joined #git
17:42 lmat What does the "100" mean in "create mode 100644"?
17:42 larrybolt joined #git
17:42 renlo so, we are having trouble with git lfs working with Jenkins. Coworker wants us to stop using git lfs entirely and just have git track the file. I think this would balloon the repository...so I guess I am right
17:43 grawity lmat: the file type (010 = regular file) plus the setuid/sticky bits (0 = none)
17:43 grawity lmat: see `man stat`
17:45 whomp joined #git
17:46 lmat grawity: Thanks!
17:52 Limes joined #git
17:52 encod3 joined #git
17:52 Faylite joined #git
17:53 matsaman really, it doesn't just make bigger deltas?
17:53 shpew12 joined #git
17:54 railssmi_ joined #git
17:54 WayToDoor joined #git
17:54 grawity up to a certain limit
17:54 grawity at some point, it becomes more expensive to have a huge delta than just have two copies
17:54 grawity see e.g. the pack.* settings
17:55 matsaman mmm, heuristics
17:55 chris123456 joined #git
17:56 yehowyad_ joined #git
17:57 Sasazuka joined #git
17:58 morfin joined #git
17:59 User458764 joined #git
17:59 nettoweb joined #git
18:00 zumba_ad_ joined #git
18:00 synthroi_ joined #git
18:02 barteks2x joined #git
18:05 meauses joined #git
18:05 jiud joined #git
18:07 jstimm joined #git
18:07 nowhere_man joined #git
18:07 thiago joined #git
18:08 hashpuppy joined #git
18:10 ki0 joined #git
18:11 ngrin_ joined #git
18:12 ruby_ joined #git
18:12 WhiskerBiscuit joined #git
18:14 OnBrokenWings joined #git
18:16 rgrinberg joined #git
18:18 ngrin__ joined #git
18:18 LucaTM joined #git
18:19 Xethron joined #git
18:20 [Brain] joined #git
18:20 ArchNoob joined #git
18:22 matoro joined #git
18:22 rapha joined #git
18:22 rapha hi!
18:22 renlo joined #git
18:22 kulelu88 joined #git
18:23 rapha is it possible to "convert" a folder containing a submodule into a full-featured clone outside it's parent?
18:24 grawity just copy it out
18:24 _ikke_ rapha: Yes. The parents .git/modules or .git/submodules should contain the repository
18:24 Vampire0 rapha a submodule IS a clone of some standalone repository, just clone the same thing outside the parent
18:24 grawity then check what its .git points to
18:24 grawity and replace the .git file with a copy of the actual directory
18:24 rapha okay, so i just move the .git/modules/whatever directory into my submodule's folder and call it .git there?
18:25 grawity yes
18:25 rapha thank you!
18:25 pdgwien joined #git
18:26 rapha ah, and wrt the parent repo it'll just be like noone had ever done "git submodule update", right?
18:26 grawity oh, probably also do `git config --unset core.worktree` afterwards.
18:26 resurtm joined #git
18:26 sangy joined #git
18:28 rapha aha ... what does that do?
18:28 ayjay_t joined #git
18:29 grawity removes a setting from .git/config
18:29 grawity which is, well I've no idea why it's there
18:29 rapha lol okay :)
18:29 grawity I guess it makes sense for submodules – it's kind of the opposite of how the .git pointer works
18:29 rorro joined #git
18:30 crelix joined #git
18:31 snthsnth joined #git
18:33 rapha grawity: oh so you mean to issue that command in the newly emancipated submodule, not the former parent?
18:34 grawity yes
18:34 rorro joined #git
18:34 Vampire0 grawity, rapha well, if the .git folder is in parents .git/modules/whatever and the actual worktree and not in a directory named .git with the worktree in the same root, you can tell git with core.worktree where the worktree is so you don't have to specify it on each run as parameter or environment variable
18:35 barteks2x joined #git
18:35 skunkz joined #git
18:36 Es0teric joined #git
18:36 rapha it's not yet the correct invocation it seems: "fatal: Could not chdir to '../../../../corpora/the_quran_by_aaya': Datei oder Verzeichnis nicht gefunden"
18:36 rapha it seems to somehow be remembering its original location
18:39 SourTrout joined #git
18:40 rapha hmm perhaps i wouldn't have had to do all this moving around. is there a way i can tell git to ignore a repo's submodules when operating (add, commit, pull, push) on the parent repo itself? the problem is that the submodules are really f****** huge and the machine just can't cope anymore, that's why i wanted to separate them out
18:40 joki- joined #git
18:41 encod3 joined #git
18:43 Vampire0 rapha, as far as I understood submodules, operating on the parent shouldn't touch the submodule. The parent only has a concrete SHA of the state of the submodule that is integrated and if you want some other version of the submodule, you have to add that new SHA to the parent and commit it.
18:43 EmeraldExplorer joined #git
18:43 tobiasvl that is correct
18:43 rapha Vampire0: i thought that was the case, too. however "git commit" just brought my whole machine down so hard i had to reset it cold.
18:44 rapha ... and now that the submodules are outside of the parent's tree, all is normal again.
18:45 milki wow
18:46 shpew12 joined #git
18:46 rapha milki: yup :}
18:47 Vampire0 o_O
18:48 EricPoe joined #git
18:48 bronson joined #git
18:48 Domhack joined #git
18:49 rapha aha, the worktree reset doesn't work because the reset command looks in the old worktree path
18:49 jstein_ joined #git
18:49 rapha i think i'll just remove the config option by hand
18:49 rapha yup, that does it
18:49 kenden joined #git
18:50 yaelvaya joined #git
18:51 sea-gull_ joined #git
18:52 Domhack joined #git
18:53 e14 joined #git
18:53 mikecmpbll joined #git
18:54 CtrlC a private repo cloned to a local system, is there anyway to identify who did the cloning?
18:54 nwkj86 joined #git
18:54 gkatsev file owner?
18:55 CtrlC gkatsev, I mean like the bitbucket user.
18:55 sssilver joined #git
18:55 gkatsev ah
18:55 Domhack joined #git
18:56 tobiasvl CtrlC: the remote URL might still contain the bitbucket username? it can easily have been changed or deleted though
18:56 QwertyDragon joined #git
18:57 isysd joined #git
18:57 Domhack joined #git
18:57 CtrlC tobiasvl, which url you mean exactly? the one in "git clone url"?
18:58 tobiasvl I'm not aware of any "git clone url"
18:58 einnjo joined #git
18:58 Hello71 the mandatory parameter to the git clone command
18:58 CtrlC tobiasvl, that's the clone command. what's wrong?
18:58 aard_ joined #git
18:58 bronson joined #git
18:58 CtrlC I mean finding out based on the files on the disk. we don't know what command got executed.
18:58 tobiasvl I never mentioned a command
18:59 tobiasvl I mean the URL for the remote repository
18:59 tobiasvl in .git/config, look under [remote "origin"]
18:59 Hello71 technically "remote" is also a git command
18:59 Hello71 (sub-)
18:59 Domhack joined #git
18:59 mmlb joined #git
18:59 tobiasvl alright, let me rephrase. the URL for the remote might still contain the bitbucket username
19:00 tobiasvl either look in .git/config or run "git remote -v"
19:00 CtrlC Thank you. that's great. what else?
19:00 tobiasvl nothing else that I can think of
19:00 tobiasvl that's the only place the username might have been used
19:00 dreiss joined #git
19:00 bauruine_ joined #git
19:00 belak If you know it was cloned over ssh and you have the ssh key that was used, you can ssh -T git@bitbucket.org to show you which user that ssh key belongs to
19:01 tobiasvl ah, that's cool
19:02 JanC_ joined #git
19:02 CtrlC I'm just trying to make a cloned repo untraceable. I don't think ssh keys would be a problem.
19:04 CtrlC So for now, changing the config file should do the job I think.
19:04 Es0teric joined #git
19:05 tobiasvl did we just help you steal company secrets
19:05 Vampire0 seems so
19:05 durham joined #git
19:05 Vampire0 CtrlC, you can probably simple ask Bitbucket to look into the logs who did clone the repo
19:06 CtrlC lol no. it's for deployment.
19:06 Vampire0 CtrlC, if it will be about stolen company secrets a court will for sure tell them to look
19:06 CtrlC No no one is stilling anything. :D
19:06 belak Untraceable?
19:06 BSab joined #git
19:07 tobiasvl ¯\_(ツ)_/¯
19:07 belak Vampire0: yeah, it doesn't happen often, but if you need that you can make a request via support
19:07 durham joined #git
19:07 jeremyhall joined #git
19:09 nidr0x joined #git
19:11 thiago joined #git
19:11 VagabondAzulien joined #git
19:11 danslo_ joined #git
19:13 barteks2x joined #git
19:13 snthsnth joined #git
19:13 skunkz joined #git
19:14 jottr_ joined #git
19:19 Balliad joined #git
19:21 santaclaus joined #git
19:22 santaclaus In bash I can do `ls -l *blah*<tab>` and if theres a file someblah.txt it will complete to that.  I want to do the same with `git checkout *blah*` so it completes to a branch someblah, is it possible?  (Currently my git tab completion only works from the start, so `git checkout some<tab>` would work, but in this case I only know the "blah" part)
19:22 ash_workz joined #git
19:26 sicelo joined #git
19:26 phil22 joined #git
19:27 irco joined #git
19:29 e14 joined #git
19:29 ams__ joined #git
19:30 Rodya_ joined #git
19:32 Shentino joined #git
19:35 johnmilton joined #git
19:35 Ryanar joined #git
19:35 Jackneill_ joined #git
19:35 barteks2x_ joined #git
19:36 jottr joined #git
19:36 sssilver joined #git
19:40 barteks2x joined #git
19:42 cdown joined #git
19:42 mischat joined #git
19:42 moritz santaclaus: I think this is because the argument to 'git checkout' can be either a file or a branch
19:43 meauses joined #git
19:44 barteks2x joined #git
19:45 akushner joined #git
19:47 santaclaus moritz: so there's no way to tab complete if you only know the middle of a branch?
19:47 barteks2x joined #git
19:47 LarArT joined #git
19:47 moritz santaclaus: with the default tab completion; I'm sure there are ways to modify the completion behavior if you're willing to dig into the completion scripts
19:48 santaclaus I was just wondering of someone had already figured this out...  Did some googling but didn't find much
19:48 santaclaus s/of/if
19:48 santaclaus s/s\/of\/if/s\/of\/if\//
19:48 santaclaus (sorry)
19:49 ngrin joined #git
19:50 nilg joined #git
19:50 jrnieder joined #git
19:52 myhau joined #git
19:52 Bass10 joined #git
19:53 Balliad joined #git
19:54 LarArT joined #git
19:54 Skryll joined #git
19:55 TheFakeMarco joined #git
19:56 synthroid joined #git
19:56 Surfer2010 joined #git
19:58 ahmed_elgabri joined #git
19:58 _ADN_ joined #git
19:58 satifant joined #git
19:59 m0viefreak joined #git
20:00 sunri5e joined #git
20:01 jstimm joined #git
20:03 LarArT joined #git
20:04 ciechomke joined #git
20:05 HoierM joined #git
20:05 pvpc joined #git
20:05 Bass10 joined #git
20:06 dbkaplun joined #git
20:07 aax joined #git
20:07 dbkaplun is it possible to set a special author/committer name when origin contains internal.domain.com?
20:07 tyreld joined #git
20:07 Gsham joined #git
20:08 thiago joined #git
20:08 barteks2x joined #git
20:09 User458764 joined #git
20:09 tobiasvl dbkaplun: well you can have a hook that declines the push if that is not the casse
20:09 tobiasvl case
20:09 Starkythefox joined #git
20:10 marcoh12 joined #git
20:10 Masber joined #git
20:11 Bass10 joined #git
20:12 jstimm joined #git
20:14 TheFakeMarco Hi, i want to abort merge, but for non auto merged files, but i want to keep auto merged files. How can I do that?
20:15 dodobrain joined #git
20:16 jstimm joined #git
20:16 moritz TheFakeMarco: care to rephrase that?
20:18 myhau joined #git
20:18 jstimm joined #git
20:20 Starky joined #git
20:21 TheFakeMarco I've done a git pull and there was some clonflicts and merged files. So, i want to keep auto merged files, but undo the merge for files with conflicts
20:22 tobiasvl "undo the merge" – do you want to do a merge or not?
20:22 tobiasvl you can still do the merge, but with your version of the conflicted files
20:22 tobiasvl the thing that makes it a "merge" is how the history ends up looking
20:23 TheFakeMarco I don't want to solve conflicts, i want to leave conflict files untouched
20:23 tobiasvl yes, but what do you want the resulting commit to look like? a merge commit?
20:23 hahuang61 joined #git
20:23 TheFakeMarco Half merged
20:24 tobiasvl let's try again. what do you want the resulting history to look like? not the code. forget the code. what you're asking is easily achieved in the working directory.
20:24 tobiasvl how you do it depends on what you mean by "undoing the merge" and "half merged"
20:25 afuentes joined #git
20:25 TheFakeMarco I want to take auto merged files ok?
20:25 tobiasvl take them where?
20:26 tobiasvl what do you wish to do with them in the future
20:26 TheFakeMarco But i don't want to merge files with conflicts
20:27 TheFakeMarco tobiasvl: if my kernel compiles maybe push them
20:27 tobiasvl you can't merge files, you can merge histories
20:27 TheFakeMarco How?
20:27 tobiasvl you can do whatever you want with the files that conflict, but do you want to abort the merge (you used the term "undo"), or do you want to go through with the merge with the versions of the files you wish?
20:28 jstimm joined #git
20:28 TheFakeMarco I want to merge non-conflict files
20:28 jmpp_ joined #git
20:28 jmpp_ joined #git
20:30 Sasazuka joined #git
20:30 tobiasvl there is no more information in that statement than earlier. you're not clarifying what you want.
20:30 jeremyhall joined #git
20:31 ki0_ joined #git
20:31 jstimm joined #git
20:31 tobiasvl but OK, I'll guess at what you want. all the auto-merged files are staged? then run "git stash save --keep-index" to stash the ones with conflicts, and then you can commit
20:32 tobiasvl if the resulting commit is what you want to achieve, "git stash drop" to get rid of the stash
20:32 manuels joined #git
20:33 Gsham joined #git
20:33 TheFakeMarco Yes, i want to save only auto merged files
20:33 jstimm joined #git
20:35 rkazak joined #git
20:36 TheFakeMarco Thanks, i will try tomorrow, now i don t have my pc here :D
20:37 jottr_ joined #git
20:38 Pyrogerg joined #git
20:39 cdg joined #git
20:39 red82 joined #git
20:42 Faylite_ joined #git
20:42 refried_ joined #git
20:43 jeffreylevesque joined #git
20:43 ki0 joined #git
20:44 clemf joined #git
20:45 _cyril_ joined #git
20:47 danslo_ joined #git
20:48 cdg joined #git
20:49 icio joined #git
20:49 Gsham joined #git
20:50 aarobc joined #git
20:51 mycelium joined #git
20:54 cmosguy joined #git
20:56 crayon joined #git
21:01 zumba_ad_ joined #git
21:01 Bass10 joined #git
21:02 ki0_ joined #git
21:02 snthsnth joined #git
21:04 aidalgol joined #git
21:05 cyan__ joined #git
21:05 meonkeys joined #git
21:05 meonkeys public-access television programming?
21:05 alex1a joined #git
21:06 * meonkeys is confused about the topic, or just doesn't get the joke
21:06 shpew12 joined #git
21:06 shmuli joined #git
21:06 meonkeys anyway, I just dropped in to let y'all know that it appears the main mailing list archive is down. http://news.gmane.org/gmane.comp.version-control.git.user
21:07 meonkeys ...returns a 404. http://dir.gmane.org/gmane.comp.version-control.git.user works, but none of the links to read archives work
21:08 Random832 iirc gmane's been going through some issues the last few months.
21:08 Random832 it's a bit unfortunate that the git list uses that as its primary archive, but there are some alternatives listed at http://vger.kernel.org/vger-lists.html#git
21:08 meonkeys Random832: ah, thanks!
21:09 Random832 wait, git.user isn't the same thing as the main git list is it
21:09 _ikke_ Nope
21:09 ki0 joined #git
21:09 meonkeys oh, hmm. http://dir.gmane.org/gmane.comp.version-control.git shows 7 lists, but "gmane.comp.version-control.git.user" has the most messages by a factor of 10
21:09 meonkeys er, 5
21:09 Random832 it might be https://groups.google.com/forum/#!forum/git-users ?
21:10 _ikke_ https://public-inbox.org/git/
21:10 _ikke_ ^
21:12 fiveflowerzz joined #git
21:12 fiveflowerzz Hi!
21:12 gitinfo fiveflowerzz: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
21:13 fiveflowerzz I have some experience with github but, now I'd like to use git on my own server, without web interface
21:13 ayjay_t joined #git
21:13 fiveflowerzz How can i create a git server on my (distant) server, and accept two users (myself and another guy) ?
21:14 batrick joined #git
21:14 preaction fiveflowerzz: !gitolite is the easiest, but you can also just do straight-up ssh
21:14 gitinfo fiveflowerzz: Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/
21:15 fiveflowerzz preaction: what's the ssh version?
21:15 preaction git remote add ssh://example.com/path/to/directory
21:16 fiveflowerzz I already SSH my server (because I have no physical access to my server, which is in a datacenter)
21:16 preaction and git clone ssh://example.com/path/to/directory
21:16 fiveflowerzz I'd like to have 2 users : myself and a friend, does this mean I should create a SSH access to my friend?
21:16 preaction yes
21:16 nilg joined #git
21:16 cagedwisdom joined #git
21:17 preaction (so, give them a regular account on your machine)
21:17 grawity if you have 2 users, you probably should use gitolite
21:17 fiveflowerzz what kind of access? i don't want him to have access to my files on the server, I want to give only git access
21:17 ki0 joined #git
21:18 preaction they'd need to be able to run the git commands on the server. you can restrict their access to just those things. or you can use gitolite which doesn't require them to have a real account on your server
21:18 fiveflowerzz then gitolite seems better
21:18 fiveflowerzz is it safe ?
21:19 preaction safe how?
21:19 fiveflowerzz security-wise
21:19 MrWoohoo joined #git
21:19 preaction like, do you want me to go through the risks inherent in having a machine plugged in to the Internet, or do you just want me to say "yes"?
21:19 meonkeys left #git
21:20 fiveflowerzz :)
21:20 bronson joined #git
21:21 moritz it's like, behind ssh
21:21 preaction i can otherwise say i've got 2 gitolite servers, and have used gitolite in a number of organizations without security issue, but that assumes that we have ever been actually targeted
21:21 tvw joined #git
21:21 moritz and ssh is one of the services I trust most be secure
21:22 preaction right. gitolite is basically a bunch of stuff in .ssh/authorized_keys and some Perl scripts
21:22 moritz (also, it uses only pubkey authentication, so weak passwords aren't an issue per se)
21:22 manuels joined #git
21:22 fiveflowerzz so if i want to give access to my friend to my gitolite thing, i need to create a ssh account for him ?
21:22 preaction no
21:22 NeverDie joined #git
21:22 preaction but he will need an ssh key
21:23 preaction you need to create an ssh account for _gitolite_
21:23 fiveflowerzz preaction: waht is a ssh key again?
21:23 preaction man ssh-keygen
21:23 matsaman joined #git
21:24 preaction its the key that you use for ssh. it's like a password, but usually much bigger because humans can't type 4096 characters in the ssh login timeout
21:24 fiveflowerzz i'm reading it... such a key doesn't offer access to the machine, right?
21:24 preaction ssh keys are for authentication: I am who I say I am because I have this key
21:24 preaction what someone is allowed to _do_ because they are authenticated is up to the system
21:24 fiveflowerzz ok... but this means i should create a specific ssh user, right?
21:25 preaction for _gitolite_!
21:25 preaction read the gitolite install docs, they go through all this!
21:25 moritz fiveflowerzz: yes, one, that's shared for all users of your git repos
21:26 fiveflowerzz but then, with this key, my friend can try to log to the machine if he has the key, no?
21:26 preaction _no_
21:26 preaction i mean, he can _try_, but it will fail because there is no real account for him
21:27 moritz fiveflowerzz: note that your friend has a different key than you have
21:27 Gsham joined #git
21:27 preaction he will log in to the gitolite user's account, which will restrict him to running only git commands (which git does automatically and he cannot do manually). he doesn't get a shell, so he doesn't get to look at things
21:27 thiago joined #git
21:27 fatalhalt joined #git
21:27 fiveflowerzz ok
21:28 aarobc joined #git
21:29 ki0 joined #git
21:30 jstimm joined #git
21:31 barteks2x joined #git
21:32 thanatos1970 joined #git
21:32 zivester joined #git
21:32 ki0 joined #git
21:33 JackFruh joined #git
21:34 ki0 joined #git
21:37 pikajude joined #git
21:38 tom[] joined #git
21:38 hanneso joined #git
21:39 ki0 joined #git
21:40 Vampire0 joined #git
21:40 Learath2 joined #git
21:43 ki0 joined #git
21:43 jottr joined #git
21:44 ki0_ joined #git
21:47 EricPoe joined #git
21:49 danslo_ joined #git
21:49 e14 joined #git
21:50 talkJS joined #git
21:50 talkJS I did git commit, git push, git commit --amend, git push.   How do I fix this?
21:50 johnmilton joined #git
21:52 xall joined #git
21:52 LaptopBrain joined #git
21:52 Shentino joined #git
21:53 talkJS git pull, git add, git commit fixed.
21:54 Vampire0_ joined #git
21:55 geko joined #git
21:55 grawity more like created a bigger mess, if you look at it with gitk
21:55 grawity after a history rewrite (including --amend), you need to `git push --force`
21:55 raijin joined #git
21:55 grawity pulling would just merge the pre-rewrite and post-rewrite histories into one mess
21:56 moritz talkJS: !public
21:56 gitinfo talkJS: [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
21:57 dreiss joined #git
22:03 thiago joined #git
22:04 GavinMagnus joined #git
22:05 renlo joined #git
22:07 blackwind_123 joined #git
22:07 cjohnson Let's say for argument that git commits have ordered number instead of a hash. Let's say I'm on commit 7, and the remote repo gets a lot of work. It's up to commit 34. When I run a git pull, is there any way to look through and see that I used to be on 7 before I was on 34?
22:07 cjohnson after running a git pull I should say.
22:08 cjohnson Or is my better option to branch before pulling if I need a safe way back (without knowing which commit specifically I was on)
22:08 acetakwas joined #git
22:10 kadoban cjohnson: Well, the reflog I guess, but that's local only and doesn't last forever. I'd say you should try hard to find a workflow that doesn't require you remembering which exact commit you were on when you pulled, or whatever.
22:11 cjohnson kadoban: Well this isn't for anything I work on. I've got an arch machine where I rely on some AUR packages. For each of my aur packages, I maintain a clone of that package's git repo
22:11 cjohnson to update, I will go into the repo, run a git pull && makepkg -csri
22:11 cjohnson I just want to know, if something goes wrong, which commit I should go back to
22:11 cjohnson so a local log only would be perfectly fine
22:11 cjohnson how would I use the reflog to detect this?
22:11 kadoban cjohnson: Then the reflog should work, if you just check 'git reflog' or 'git reflog whateverbranch' it should give you the info you want
22:11 cjohnson awesome
22:11 cjohnson thanks :)
22:11 kadoban Anytime
22:12 renlo joined #git
22:12 TheFakeMarco left #git
22:13 TheFakeMarco joined #git
22:13 Groscheri joined #git
22:16 hahuang61 joined #git
22:17 discopatrick joined #git
22:17 justanotheruser joined #git
22:18 TheFakeMarco left #git
22:21 skunkz joined #git
22:21 cmbrnt joined #git
22:22 ayjay_t joined #git
22:22 johnmilton joined #git
22:23 theskillwithin joined #git
22:25 lacour joined #git
22:25 troulouliou_div2 joined #git
22:28 JanC joined #git
22:30 davidfetter_ge joined #git
22:32 manuels joined #git
22:33 nwkj86 joined #git
22:33 albel727 joined #git
22:35 dmin7b5 joined #git
22:36 aard_ joined #git
22:36 re1 joined #git
22:36 rbern joined #git
22:37 nettoweb joined #git
22:37 johntramp joined #git
22:37 slappy16 joined #git
22:37 red82 joined #git
22:38 sea-gull_ joined #git
22:38 Sasazuka joined #git
22:39 [ADN] joined #git
22:39 imanc how come all ( ? )  the docs say "don't rewrite history and push to remote repos", yet people tend to do this regularly on feature branches  on say github
22:45 Siegfried joined #git
22:46 kadoban imanc: Because many people use github as little more than their personal backup location or something and assume nobody else is using it.
22:49 danslo_ joined #git
22:51 ToBeCloud joined #git
22:51 preaction imanc: it depends on if people are relying on that history yet. if they are, it becomes much harder to do things like pull/push/merge if history gets rewritten. so it's fine to do locally, it's fine to do in your own fork on github, it's fine as long as nobody else is working on that branch too
22:53 imanc preaction:  I guess if it's in a feature branch that maybe only a single dev has worked on, and CI tools have checked out and run tests again, it's OK
22:53 preaction right. so i do it all the time in branches, because i like clean histories and i don't care about making more work for the other people involved until it's in master
22:56 anuxivm joined #git
22:56 cjohnson same. I force push rebased features until such time that htey get merged in
22:56 cjohnson then I will stop doing that, and if additional changes need made, instead I will make a hotfix branch
22:57 cdown joined #git
22:57 einnjo joined #git
22:59 cdg joined #git
23:02 nettoweb joined #git
23:02 flaviodesousa joined #git
23:02 mizu_no_oto joined #git
23:04 mischat joined #git
23:04 dendazen joined #git
23:09 Shentino joined #git
23:10 barteks2x joined #git
23:11 e14 joined #git
23:11 rindolf joined #git
23:12 sangy joined #git
23:12 renlo joined #git
23:13 re1 joined #git
23:13 rindolf Hi all! How can I combine «git pull --ff-only upstream master ; git fetch upstream ; git fetch upstream --tags» into one command?
23:13 Gsham joined #git
23:14 preaction git fetch upstream should be implied by git pull --ff-only upstream master; but otherwise you need that second one
23:14 preaction (well, last one)
23:14 matoro joined #git
23:16 Faylite_ joined #git
23:17 nettoweb joined #git
23:18 SwiftMatt joined #git
23:20 GavinMagnus left #git
23:24 e14 joined #git
23:24 zivester joined #git
23:25 DoctorMonocular joined #git
23:26 t4nk489 joined #git
23:26 DoctorMonocular hey everyone, I'm having a weird problem -- I have a repo on github that I can push and pull from
23:27 DoctorMonocular I have a new coworker who has access on github to same repo
23:27 DoctorMonocular he pulled the code from it
23:27 DoctorMonocular now when he tries to push, it says the remote repo doesn't exist
23:27 DoctorMonocular we've looked over  his config with a fine toothed comb, and it's identical to mine
23:27 Pyrogerg joined #git
23:27 DoctorMonocular and his ssh key is correctly installed with ithub
23:27 DoctorMonocular I'm at a loss
23:28 einnjo joined #git
23:31 Mettiumettiu joined #git
23:31 DoctorMonocular he created a dummy repo on his own account, pulled it down, committed something, then successfully pushed
23:33 re1 joined #git
23:33 phil22 joined #git
23:35 madewokherd joined #git
23:36 Pyrogerg_ joined #git
23:37 eroussel joined #git
23:37 dsdeiz joined #git
23:38 shasha joined #git
23:38 shasha hi to all
23:38 gitinfo shasha: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
23:41 Aboba joined #git
23:42 Gsham joined #git
23:45 zumba_ad_ joined #git
23:46 shasha i've a question regarding git development, are there some chance that "refactoring" (i.e only improving readability) of full functional code is accepted as contribution?
23:46 kadoban shasha: Not a lot of git devs here. I'd probably try the mailing list and such.
23:48 shasha kadoban: thanks! i will try
23:49 e14 joined #git
23:51 jottr joined #git
23:51 BSaboia joined #git
23:54 danslo joined #git
23:59 zumba_ad_ joined #git

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