Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-12

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

All times shown according to UTC.

Time Nick Message
00:00 Mobutils joined #git
00:01 Vampire0 lebster, well, if you do --no-ff, there IS a difference between merging feat1 to develop and pushing develop and pushing feat1 to develop
00:02 Vampire0 With --no-ff you force Git to create a merge commit even if it could be a fast-forward merge just forwarding the develop branch to the top of the feat1 branch which you essentially also so when directly pushing feat1 to develop
00:04 lebster Ic Ic. Yeah I'd like to keep a merge commit so I can see it in the history
00:05 romerocesar joined #git
00:05 VladGh joined #git
00:06 Vampire0 then you need to merge
00:09 romerocesar_ joined #git
00:11 madebymarkca joined #git
00:12 jaafar joined #git
00:17 ayjay_t joined #git
00:17 qpdb joined #git
00:28 jstimm joined #git
00:30 tesuji_ joined #git
00:36 ekinmur joined #git
00:36 nidr0x joined #git
00:40 rubie joined #git
00:41 Gitzilla joined #git
00:43 mehola joined #git
00:48 chrisshattuck joined #git
00:52 pioiytr_ joined #git
00:56 optraz_ joined #git
00:57 chrisshattuck joined #git
01:02 somaReverse joined #git
01:02 somaReverse Hi
01:02 somaReverse How can I reset a path that contains unstaged changes?
01:03 ekinmur joined #git
01:04 Vampire0 somaReverse, you mean you want to restore the state stored in the index and discard further local changes for some file or folder?
01:04 somaReverse yes
01:04 Vampire0 somaReverse, man git checkout like git checkout -- file
01:04 gitinfo somaReverse: the git-checkout manpage is available at http://jk.gs/git-checkout.html
01:05 mizu_no_oto joined #git
01:05 somaReverse Vampire0: Oh, I mean to delete untracked files too.
01:05 finalbeta joined #git
01:08 fguillot joined #git
01:12 ochorocho__ joined #git
01:15 hahuang61 joined #git
01:18 clemf joined #git
01:19 pks joined #git
01:19 ome joined #git
01:20 chrisshattuck joined #git
01:23 DaddyEric joined #git
01:23 cqi joined #git
01:30 runlevl4 joined #git
01:30 diogenese joined #git
01:31 Vampire0 somaReverse, to delete untracked files man git clean like git clean -f for only files git clean -fd for also directories git clean -fdx for also ignored
01:31 gitinfo somaReverse: the git-clean manpage is available at http://jk.gs/git-clean.html
01:31 snowkidind joined #git
01:32 howdoi joined #git
01:36 rgrinberg joined #git
01:37 rgrinberg joined #git
01:40 d^sh joined #git
01:41 qws-user-1229 joined #git
01:41 Vampire0_ joined #git
01:45 arescorpio joined #git
01:45 DJ_Spies joined #git
01:45 mfilippov joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and NP-hard problems | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Now with more indirect cycling giraffes!
01:50 kingpinlz_ joined #git
01:56 a_thakur joined #git
01:57 guilherme joined #git
01:58 andlabs joined #git
02:03 mfilippov joined #git
02:06 evanwang joined #git
02:07 dimi1947 joined #git
02:07 hexagoxel joined #git
02:08 constant joined #git
02:11 watabou joined #git
02:12 fstd_ joined #git
02:13 mfilippov joined #git
02:13 ochorocho__ joined #git
02:13 eizua joined #git
02:14 boombatower joined #git
02:15 Raed joined #git
02:15 fakenerd joined #git
02:17 liuzhen joined #git
02:18 gccostabr joined #git
02:19 constant joined #git
02:20 kristian_on_linu joined #git
02:20 kristian_on_linu hi all
02:20 gitinfo kristian_on_linu: 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.
02:20 kristian_on_linu I have a 101 question ... when I have removed a file locally, how do I push to it gets removed on the remote as well?
02:21 chrisshattuck joined #git
02:24 Mobutils joined #git
02:25 ojdo joined #git
02:29 raijin joined #git
02:31 lagothrix joined #git
02:31 mfilippov joined #git
02:32 kyan joined #git
02:34 texasmynsted joined #git
02:36 imacinto joined #git
02:36 imacinto joined #git
02:41 dsdeiz joined #git
02:43 rubie joined #git
02:46 rubie joined #git
02:46 imacinto joined #git
02:49 mfilippov joined #git
02:51 MattMaker joined #git
02:52 MattMaker joined #git
02:52 Gurkenglas joined #git
02:55 cqi joined #git
02:56 hahuang61 joined #git
02:57 ksefchik joined #git
02:58 justrohu joined #git
02:58 mfilippov joined #git
02:59 sangy joined #git
03:02 chrisshattuck joined #git
03:02 Dougie187 left #git
03:03 chachasmooth joined #git
03:05 aavrug joined #git
03:05 dsantiago joined #git
03:06 hahuang61 joined #git
03:08 mfilippov joined #git
03:10 chrisshattuck joined #git
03:13 ochorocho__ joined #git
03:14 Vortex35 joined #git
03:15 mizu_no_oto joined #git
03:16 ShekharReddy joined #git
03:17 mfilippov joined #git
03:20 zivester joined #git
03:25 imacinto joined #git
03:25 imacinto joined #git
03:26 mfilippov joined #git
03:27 dreiss joined #git
03:33 inflames joined #git
03:35 mfilippov joined #git
03:40 johntramp joined #git
03:42 david007 joined #git
03:45 inflames joined #git
03:47 imacinto joined #git
03:48 snthsnth joined #git
03:50 a_thakur joined #git
03:53 Motoko joined #git
03:53 Motoko joined #git
03:54 mfilippov joined #git
03:54 chrisshattuck joined #git
03:56 dreiss joined #git
03:58 dsdeiz joined #git
04:00 imacinto joined #git
04:00 imacinto joined #git
04:00 dermoth joined #git
04:03 mfilippov joined #git
04:07 Mobutils joined #git
04:08 madebymarkca joined #git
04:10 daynaskully joined #git
04:11 dsdeiz joined #git
04:12 dsdeiz joined #git
04:13 dsdeiz joined #git
04:13 dsdeiz joined #git
04:13 MattE joined #git
04:14 rscata joined #git
04:21 mfilippov joined #git
04:30 mfilippov joined #git
04:33 Humanoid joined #git
04:34 tinajohnson___ joined #git
04:35 Humanoid When I execute "git diff", instead of getting text output to stdout, it runs less and displays non-ascii data with ESC characters.
04:36 sparetire joined #git
04:36 duderonomy joined #git
04:37 PasiFist joined #git
04:38 azerus joined #git
04:39 navidr joined #git
04:39 ochorocho__ joined #git
04:39 MattMaker joined #git
04:40 mizu_no_oto joined #git
04:42 overlord_tm joined #git
04:46 ksefchik joined #git
04:46 Anupkumar joined #git
04:49 mfilippov joined #git
04:49 kadoban krabat: 'git add the_file' to stage just that or 'git add -A .' will add that removal and more.
04:49 kadoban krabat: As a shortcut, you can 'git rm the_file'
04:49 kadoban Or they left ... sorry, ignore that.
04:50 grawity Humanoid: yes, those are 'colors'; is that a problem?
04:50 grawity Humanoid: or do you mean that less doesn't /interpret/ them as colors?
04:51 Humanoid Both.  less doesn't interpret them as colors, instead I see ESC typed out, and also, I don't want to be using less at all.
04:51 chrisshattuck joined #git
04:51 Humanoid I'm reading the pro git book, and when he types git diff, he gets a nice output on the command line.
04:51 Humanoid Did git change the default behaviour since the last version of the pro git book?
04:51 grawity examples shown in books tend to be edited for clarity
04:52 grawity anyway
04:52 grawity 1) if $LESS is set, consider either unsetting it, or add the -R option there
04:52 grawity 2) set $GIT_PAGER to cat
04:52 romerocesar joined #git
04:53 daey_ joined #git
04:54 Humanoid ok, thanks!
04:56 greendo joined #git
04:57 azerus joined #git
04:58 Humanoid It's odd that git is using a pager by default.  Most programs just output to stdout, and anybody who wants to use a pager can just pipe the output to a pager like "mycommand | less" on an as-needed basis.
04:58 dec0n joined #git
04:59 preaction which means you run the command twice: once without and then once with the pager
05:02 Humanoid I usually know in advance whether I want a pager or not, so I never run the command twice.  Also, my terminal has scrolling capabilities, so I can easily scroll up without using a pager.
05:02 preaction so disable it in your gitconfig then
05:02 Cabanossi joined #git
05:04 Humanoid I guess I'm the only one who thinks it's odd.
05:04 dhollinger joined #git
05:05 dreiss joined #git
05:05 kadoban It seems like a better default than not, and if you don't want it to, you can change it. So it doesn't seem too weird to me, no.
05:06 gargola joined #git
05:07 preaction i ended up configuring less to exit if there was less than a screenful of output (PAGER="less -F"
05:07 mfilippov joined #git
05:08 hahuang61 joined #git
05:16 stuh84 joined #git
05:17 ahr3n joined #git
05:25 _ng joined #git
05:26 nilg joined #git
05:27 Limes left #git
05:28 thiago most people just think that it's the best idea since sliced bread
05:28 Limes joined #git
05:29 mangolisk_ joined #git
05:30 mangolisk__ joined #git
05:30 ffabi joined #git
05:33 Limes joined #git
05:34 Silenced joined #git
05:34 mfilippov joined #git
05:35 Limes left #git
05:36 Silenced joined #git
05:36 Limes joined #git
05:40 sostenuto joined #git
05:41 jceb joined #git
05:41 meejah Humanoid: I actually wish *every* git command did the auto-pager thing ;) (e.g. "git status" doesn't)
05:44 mfilippov joined #git
05:47 mingrammer joined #git
05:49 jstimm joined #git
05:50 mingrammer joined #git
05:50 eivarv joined #git
05:51 ffabi joined #git
05:52 chrisshattuck joined #git
05:53 ThomasLocke joined #git
05:54 romerocesar_ joined #git
05:56 zeroed joined #git
05:58 ffabi joined #git
05:58 romerocesar joined #git
06:00 energizer joined #git
06:00 Raging_Hog joined #git
06:02 sostenuto joined #git
06:04 zeroed joined #git
06:04 ffabi joined #git
06:09 chele joined #git
06:10 dreamyspell joined #git
06:11 Macaveli joined #git
06:12 roelmonnens joined #git
06:12 mariuscc joined #git
06:12 jgrasser_ joined #git
06:18 qt-x joined #git
06:20 JeroenT joined #git
06:23 satya4ever joined #git
06:26 lalilulelo joined #git
06:29 yuhlw_ joined #git
06:32 t0by joined #git
06:34 ksefchik joined #git
06:38 evanwang_ joined #git
06:38 eduardas_m joined #git
06:39 ochorocho__ joined #git
06:44 Junior joined #git
06:46 cyan__ joined #git
06:47 jknetl joined #git
06:47 danslo joined #git
06:48 fees joined #git
06:50 ProbabilityMoon joined #git
06:52 Sceorem joined #git
06:53 rj1 joined #git
06:53 chrisshattuck joined #git
06:56 vuoto joined #git
07:00 submitnine joined #git
07:00 [Brain] joined #git
07:01 kaldoran joined #git
07:02 ahmedelgabri joined #git
07:03 d0nn1e joined #git
07:04 Fijit joined #git
07:04 a_thakur joined #git
07:06 a_thakur joined #git
07:07 ash_workcb joined #git
07:09 hahuang61 joined #git
07:15 dimi1947 joined #git
07:16 roxlu_ joined #git
07:23 Darcidride joined #git
07:23 mfilippov joined #git
07:24 elect joined #git
07:25 Balliad joined #git
07:26 overlord_tm joined #git
07:27 JeroenT joined #git
07:28 rominronin joined #git
07:29 ahmed_elgabri joined #git
07:30 djb-irc joined #git
07:32 vuoto joined #git
07:33 ferr joined #git
07:36 randy_ joined #git
07:36 randy_ left #git
07:37 FilipNortic_ joined #git
07:38 mfilippov joined #git
07:39 dreiss joined #git
07:40 _nwkj86 joined #git
07:42 ochorocho__ joined #git
07:42 zeroed joined #git
07:42 zeroed joined #git
07:44 encod3 joined #git
07:50 GavinMagnus joined #git
07:50 aidalgol joined #git
07:51 Alienpruts joined #git
07:51 a_thakur joined #git
07:53 imacinto joined #git
07:53 CheckDavid joined #git
07:55 cdown joined #git
07:55 ash_workcb joined #git
07:56 stasmakarov joined #git
07:57 dreiss joined #git
07:57 rastos2 joined #git
08:00 laumann joined #git
08:02 BadSnappa joined #git
08:03 imacinto joined #git
08:03 vuoto joined #git
08:04 Meteorhead joined #git
08:06 aspiers_ left #git
08:06 aspiers joined #git
08:07 saedelaere joined #git
08:07 chll_ joined #git
08:07 GT4066 joined #git
08:09 ash_workcb left #git
08:09 ash_workz joined #git
08:10 rafalcpp_ joined #git
08:10 imacinto joined #git
08:10 imacinto joined #git
08:13 King_Hual joined #git
08:15 snthsnth joined #git
08:15 marcogmonteiro joined #git
08:16 King_Hual joined #git
08:16 King_Hual joined #git
08:17 chele joined #git
08:18 bongjovi joined #git
08:19 BlackPanx joined #git
08:20 hellyeah joined #git
08:20 hellyeah i know it is really simple but i will share my github projects with someone. how can i obtain this information? is it github.com/username ?
08:21 shmuli joined #git
08:21 JeroenT joined #git
08:21 _ADN_ joined #git
08:22 hellyeah yes
08:22 ksefchik joined #git
08:23 Ezzy joined #git
08:24 Fuco joined #git
08:27 menace joined #git
08:29 paws_ joined #git
08:30 shmuli joined #git
08:30 a_thakur joined #git
08:34 shmuli joined #git
08:36 kurkale6ka joined #git
08:38 esc joined #git
08:38 esc joined #git
08:39 lidow joined #git
08:40 testild joined #git
08:40 harish joined #git
08:44 imacinto joined #git
08:44 a3pq51 joined #git
08:45 Glooomy joined #git
08:45 snthsnth joined #git
08:46 gb is there a way to regain your password for an ancient login on github that was created from a domain long since left behind?
08:47 gb ie the email i'd have used would no longer exist on it
08:47 selckin register the domain again
08:48 selckin maybe github support can help you if you can prove you have access to the private ssh key
08:48 shmuli joined #git
08:48 romerocesar joined #git
08:48 gb i never loged into it with a key
08:48 lss8 joined #git
08:48 gb this is going back to 2010
08:49 darkbit joined #git
08:49 selckin wrong channel anyway, but you're probably out of luck
08:50 gb k just figured it'd be better to create repos in my old github login then to create another
08:50 selckin you should be able to get the email back and go from there
08:50 saedelaere joined #git
08:56 MafiaInc joined #git
09:00 notebox joined #git
09:02 vuoto_ joined #git
09:06 rafalcpp_ joined #git
09:07 vuoto joined #git
09:07 vuoto_ joined #git
09:09 trudko joined #git
09:10 trudko hi everyone I run git config --global core.filemode false then git status but I still got files whose file rights has changed like: diff --git a/CHANGELOG.md b/CHANGELOG.md  old mode 100644 new mode 100755
09:10 hahuang61 joined #git
09:11 shirty joined #git
09:11 bongjovi Hello. I have a global config with correct details I use for most projects, but I need to use a different user.name and user.email for a specific repo, do I need to set this config for the directory before I run git init?
09:12 vuoto__ joined #git
09:14 moritz bongjovi: no, you can do it afterwards
09:14 moritz bongjovi: git init doesn't record username/email, only commit does
09:14 bongjovi okay great, thanks moritz
09:18 chibbol|2 joined #git
09:22 earational joined #git
09:23 earational hey
09:25 _ikke_ hai
09:26 JeroenT joined #git
09:27 shmuli joined #git
09:27 irqq joined #git
09:28 Macaveli joined #git
09:29 skylite_ left #git
09:30 skylite joined #git
09:30 Sadeukko joined #git
09:30 ShapeShifter499 joined #git
09:32 menace left #git
09:33 vrishab joined #git
09:35 mariuscc joined #git
09:37 vrishab How to diff between 2 revs. I use 'git diff rev1..rev10'
09:37 vrishab but it doesn't included newly added files
09:37 mflow joined #git
09:38 stamina joined #git
09:38 eihabarabia joined #git
09:41 mflow left #git
09:42 ochorocho__ joined #git
09:43 rafalcpp_ joined #git
09:47 mingrammer joined #git
09:49 harish joined #git
09:50 nilg joined #git
09:54 imacinto joined #git
09:54 jknetl joined #git
09:55 checkItOut joined #git
09:57 m0nkmaster joined #git
10:03 Tomatosoup- joined #git
10:03 Tomatosoup- how can i browser local repository from old commit state?
10:05 a_thakur joined #git
10:05 SoleSoul joined #git
10:05 danslo joined #git
10:06 cbreak Tomatosoup-: git checkout <oldcommithere>
10:06 cbreak then, to go back: git checkout <branchname>
10:06 cbreak don't make changes while in the past :)
10:06 SoleSoul Hi. I have a local repo which I use to pull changes from a p4 repo and push them to another public git repo. The code in p4 moved to another location in the depot. Is it possible to change the p4 location my local git repo pulls from or do I have to create a new git repo now?
10:06 Tomatosoup- cbreak: that was simple. thanks
10:07 SoleSoul (I use git p4)
10:08 canton7 Tomatosoup-, make sure you check out a branch again before doing any changes
10:09 Tomatosoup- canton7: i have zsh, so branch/commit name is displayed in my terminal
10:09 canton7 cool, that helps
10:10 trudko hi everyone I run git config --global core.filemode false then git status but I still got files whose file rights has changed like: diff --git a/CHANGELOG.md b/CHANGELOG.md  old mode 100644 new mode 100755
10:11 lolmac joined #git
10:18 tabrez joined #git
10:19 TomyWork is there a way to stage all lines matching a certain pattern?
10:20 _ikke_ TomyWork: No built-in way iirc
10:20 Anticom joined #git
10:20 TomyWork hmm, can i use a script to auto-edit hunks that would be presented in interactive mode?
10:21 EvilDMP left #git
10:21 Tomatosoup- left #git
10:22 al-damiri joined #git
10:26 dimi1947 joined #git
10:27 rahtgaz joined #git
10:28 mingrammer joined #git
10:32 _nwkj86 joined #git
10:33 lidow joined #git
10:37 nikivi joined #git
10:43 dvl left #git
10:43 imacinto joined #git
10:44 TomyWork i wrote something crude to do it :)
10:45 barduck joined #git
10:47 King_Hual` joined #git
10:48 King_Hual` joined #git
10:49 mingramm_ joined #git
10:50 drbean joined #git
10:50 imacinto joined #git
10:53 tabrez joined #git
10:56 checkItO_ joined #git
10:57 GavinMagnus joined #git
10:58 greendo joined #git
10:58 mingrammer joined #git
10:58 knittl I remember an open bug report about the 'git bash' icon missing from the context menu on windows. Does anybody have a link?
10:59 JeroenT joined #git
11:00 canton7 https://github.com/git-for-windows/git/issues/870 ?
11:00 canton7 searching the issue list on github brought that up
11:00 nwkj86 joined #git
11:01 chibbol|2 joined #git
11:01 mizu_no_oto joined #git
11:01 knittl canton7: thanks. looks exactly like it
11:01 shmuli joined #git
11:03 knittl current dev build fixes it already
11:03 knittl very nice. thanks a lot
11:04 zweiball joined #git
11:05 shmuli joined #git
11:07 zweiball Hey there! I'm sure it has been asked a lot, but ... What exactly is the reason git does not support clone resumes? I'm having a hard time getting the kernel sources of the wandboard over the network (very unstable) and wasted all morning with it unfortunately. Now I'm curious as to the "why"
11:10 bremner is fetch resumeable? that would seem to solve most of the problem if so
11:10 _ikke_ No, it's not
11:11 hahuang61 joined #git
11:11 bremner I guess there is some limitation about restarting packs
11:11 _ikke_ the pack is created in memory, and dies with the process
11:11 zweiball Afaik no git command is resumeable
11:11 bremner well, if you have some of the objects, they are used, which is a weak kind of resume
11:11 kevinfagan joined #git
11:12 _ikke_ zweiball: The best soluation is to try to get a git bundle, which you can download via a resumable protocol
11:12 _ikke_ solution*
11:13 zweiball _ikke_: I'm looking into it. Thanks for the hint
11:13 jeffreylevesque joined #git
11:14 zweiball I'm surprised no one thought about making the git clone process resumeable since it is a simple copy over http/https/ssh/*
11:14 bremner no it isn't
11:15 _ikke_ git creates a packfile with only the objects you need
11:15 _ikke_ which can be different each time you fetch
11:15 danslo joined #git
11:17 zweiball Hm, I may have to read up on git once i find the time.
11:19 zweiball The .zip download of github works grade with 2.4MB/s instead of 300kb/s via git clone
11:19 zweiball *great (I don't know what is up with my spelling today. Must be a case of the mondays)
11:19 osse zweiball: the zip does not contain a repo
11:20 zweiball osse: That's true.
11:21 jceb joined #git
11:22 osse hmm. maybe it's hosted on a different server or somethign
11:22 osse sound strange though
11:23 bremner or wacky firewalls
11:23 _ikke_ Makes sense. These archives are usually precreated, so probably come off fast file servers
11:23 obadz joined #git
11:23 bremner although both should be on https in the normal case
11:23 zweiball Yep ... Looks like a different server https://codeload.github.com/wandboard-org​/linux/zip/wandboard_imx_4.1.15_1.1.0_ga
11:23 osse they are? :O
11:23 obadz is there somewhere a doc with exhaustive documentations of the the config options in ~/.gitconfig ?
11:23 osse obadz: man git-config
11:23 gitinfo obadz: the git-config manpage is available at http://jk.gs/git-config.html
11:23 bremner man git config
11:23 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
11:23 bremner in short, yes
11:24 obadz ah yes thx
11:24 zweiball I can't test it right now (traceroute and all other tools are blocked in the company network)
11:24 zweiball But the subdomain alone looks like it is a different server
11:25 rnsanchez joined #git
11:25 govg joined #git
11:25 zweiball And the git clone command: Receiving objects:  17% (766428/4344631), 663.93 MiB | 190.00 KiB/s
11:26 bremner what protocol?
11:26 osse are we talking about the zip download thingy for an arbitrary commit?
11:27 zweiball bremner: https with sslverify false
11:28 zweiball osse: Yes. git clone vs the zip download
11:28 osse *those* are pregenerated!? :O
11:28 _ikke_ I don't think for arbitrary commits, just tags
11:28 _ikke_ Not sure though
11:28 bremner I guess the speed diff is a question for github, which you'll probably not get answered
11:30 zweiball Yep, that's what I thought. But you helped my in any case by pointing to git pack files which I will read about in a few days to understand better
11:30 bremner zweiball: blame your local network, I'm getting 20 MiB/s to that repo
11:31 bremner or something in between your local network and github, obviously
11:31 zweiball braderhart: Meh! Not what I wanted to head :>
11:31 lacrymology joined #git
11:31 zweiball *hear
11:31 user__ joined #git
11:32 bremner and clone is finished
11:33 bremner interesting, I didn't know the connection to my house was that fast ;)
11:33 zweiball Hehe ... It's going places :)
11:35 yac joined #git
11:36 Gurkenglas joined #git
11:37 zweiball I found the bottleneck
11:37 zweiball It's my memory.
11:37 dimi1947 joined #git
11:37 _ikke_ You have a computer-neural interface?
11:38 fahadash joined #git
11:38 zweiball Yes. Kind of. I'm gifted with spiritual powers ;)
11:38 zweiball No, I just tried downloading the same repo directly onto an USB flash drive and suddenly I get 4MBits
11:38 zweiball s/downloading/cloning
11:39 bremner oh. network file system?
11:39 buzzLightBeer joined #git
11:39 obadz left #git
11:40 zweiball It is a SDHC card which (obviously) is not as fast as advertised
11:40 zweiball That's obviously way better: Receiving objects:  17% (765635/4344631), 662.97 MiB | 6.17 MiB/s
11:41 zweiball -obviously
11:43 GyrosGeier hm
11:43 GyrosGeier is there a way to clone a full version tree, but without the actual data?
11:43 GyrosGeier i.e. just commit objects
11:43 ochorocho__ joined #git
11:44 selckin !bare
11:44 gitinfo 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/
11:44 darkbit joined #git
11:44 GyrosGeier no
11:45 GyrosGeier just commits, no tree/blob
11:45 _ikke_ nope, there isn't
11:45 Wind0r joined #git
11:45 _ikke_ git does not allow you to fetch arbitrary objects
11:46 danslo joined #git
11:46 GyrosGeier I'd like to generate a web page showing the version tree of a project, so I don't need the actual data -- just the commit messages and parent relationships
11:54 imacinto joined #git
11:54 imacinto joined #git
11:55 lidow left #git
11:55 zweiball Copying to my VM and scp'ing is way faster ... What the heck.
11:55 obadz joined #git
11:56 zweiball *Cloning to my VM and scp'ing to the target
11:56 obadz is there an easy way to pull all branches that have a remote tracking branch? git pull -a doesn't seem to
11:56 saedelaere joined #git
11:58 gajus I am getting 'The previous cherry-pick is now empty, possibly due to conflict resolution.'
11:58 gajus I can keep the commit but using --allow-empty
11:58 gajus how do I remove the commit?
11:58 gajus is it `git rebase --skip`
11:58 gajus ?
11:58 gajus Looks like it
11:59 sdothum joined #git
12:00 GyrosGeier gajus, yes
12:01 imacinto joined #git
12:02 PCatinean joined #git
12:02 Darcidride_ joined #git
12:03 gajus Thank you
12:03 dendazen joined #git
12:06 tlaxkit joined #git
12:07 m0viefreak joined #git
12:10 kevinfagan joined #git
12:11 gniourf joined #git
12:13 nwkj86 joined #git
12:14 tabrez joined #git
12:16 bruce_lee joined #git
12:16 earational joined #git
12:16 snits joined #git
12:19 Silenced joined #git
12:19 Silenced joined #git
12:20 raijin joined #git
12:20 jceb joined #git
12:21 JeroenT joined #git
12:21 berndl joined #git
12:22 imacinto joined #git
12:23 Anticom joined #git
12:26 dviola joined #git
12:27 synthroid joined #git
12:29 nwkj86 joined #git
12:30 thierryp joined #git
12:30 tlaxkit joined #git
12:31 Anticom joined #git
12:32 dsdeiz joined #git
12:32 dsdeiz joined #git
12:34 Blkt joined #git
12:35 Silenced joined #git
12:35 Silenced joined #git
12:37 jimi_ joined #git
12:40 Darcidride joined #git
12:40 fguillot joined #git
12:41 Akimb joined #git
12:42 Noldorin joined #git
12:42 dsdeiz joined #git
12:42 dsdeiz joined #git
12:42 shmuli joined #git
12:43 imacinto joined #git
12:44 nwkj86 joined #git
12:45 uranellus hey, how can I list all latest revs from all branches?
12:45 _ikke_ git for-each-ref
12:46 cdown joined #git
12:47 rafalcpp joined #git
12:49 zivester joined #git
12:50 ekinmur joined #git
12:51 osse branch -v
12:52 guilherme joined #git
12:52 griffindy joined #git
12:53 crised joined #git
12:53 govg joined #git
12:53 crised I added a new file to my repo .eslintrc.js, would this be automatically ignored?
12:53 mkoskar joined #git
12:54 LBV_User joined #git
12:55 bremner not unless it fits an existing ignore patter
12:55 bremner n
12:55 nwkj86 joined #git
12:56 osse I just had a horrible idea. Add a gitattribute thing that can make git read certain files and parse ignore info out of them
12:56 Jellyg00se joined #git
12:56 selckin sounds like gitignore ..
12:59 rgrinberg joined #git
13:00 romerocesar joined #git
13:02 p4trix joined #git
13:03 JamesBaxter joined #git
13:03 GodGinrai joined #git
13:03 cdg joined #git
13:05 andlabs joined #git
13:08 nikivi joined #git
13:08 ExoUNX joined #git
13:09 liuzhen_ joined #git
13:09 ExoUNX joined #git
13:10 ExoUNX joined #git
13:10 wrouesnel joined #git
13:10 finalbeta joined #git
13:11 malesca joined #git
13:11 hahuang61 joined #git
13:11 lb1c joined #git
13:13 nettoweb joined #git
13:14 testild joined #git
13:15 nettoweb joined #git
13:18 nettoweb joined #git
13:20 GavinMagnus left #git
13:20 relipse joined #git
13:22 blackwind_123 joined #git
13:25 jceb joined #git
13:25 tjone270 joined #git
13:26 tjone270 joined #git
13:34 nwkj86 joined #git
13:37 zx2c4 joined #git
13:37 zx2c4 disaster happened
13:37 zx2c4 i need to pull a remote sha1 commit ref
13:37 zx2c4 how do i do it
13:38 osse you mean pull abcd1234 instead of masteR?
13:38 AaronMT joined #git
13:39 nwkj86 joined #git
13:40 imacinto joined #git
13:40 zx2c4 yea
13:40 zx2c4 osse, yea
13:40 rnsanchez_ joined #git
13:42 Ryanar joined #git
13:42 noidea joined #git
13:43 osse zx2c4: you're screwed
13:43 osse unless you have shell access, or know a guy who knows a guy who has shell access
13:43 finalbeta joined #git
13:44 ochorocho__ joined #git
13:44 obadz is there an easy way to pull all branches that have a remote tracking branch? git pull -a doesn't seem to do it
13:44 roxlu_ joined #git
13:45 zx2c4 alright
13:45 zx2c4 ill do it manually
13:45 zx2c4 thanks anyway
13:45 zx2c4 left #git
13:45 osse zx2c4: do what,xskvfdafsawe'
13:45 osse obadz: https://github.com/Osse/git-sc​ripts/blob/master/git-fflocals
13:45 osse git fetch && git fflocals
13:45 lb1c ssh into the box and scraping the object from the lost-found section
13:46 obadz osse: no way to do it without a script?
13:46 osse obadz: yes, by doing what the script does by hand
13:46 obadz :-/
13:46 osse git push . origin/foo:foo  for all foo
13:46 obadz I'm looking to pull, not push
13:46 osse i know
13:47 osse see what the push destination is
13:47 osse it's an ancient trick than until recently only monks in tibet knew about
13:48 osse or you can do   git branch -f foo foo@{u}
13:48 osse (after checking that it's a fast-forward)
13:49 obadz right
13:49 obadz seems like there should be some kind of git pull --all-branches or something
13:49 obadz no offence to your script
13:50 nd_ joined #git
13:50 osse i wrote that script because I agree
13:50 emg joined #git
13:50 osse but in any case it will only work for fast-forwards
13:51 nettoweb joined #git
13:51 osse also, I would recommend not creating local branches you don't need.
13:52 imacinto joined #git
13:52 imacinto joined #git
13:52 sangy joined #git
13:54 shmuli joined #git
13:55 jaafar joined #git
13:56 obadz looks like git pull --all should do something
13:56 obadz according to http://stackoverflow.com/questions/10​312521/how-to-fetch-all-git-branches
13:56 obadz but when I purposefully rewind my branch, it doesn't fast forward it again
13:57 osse it just passes --all to git fetch
13:57 Gsham joined #git
13:57 nwkj86 joined #git
13:58 shaggycat joined #git
13:59 unibyte joined #git
13:59 obadz and then pulls local copies of remote branches into local branches no?
13:59 Gsham joined #git
13:59 imacinto joined #git
13:59 imacinto joined #git
13:59 Zamerick joined #git
14:01 JeroenT_ joined #git
14:02 osse no
14:02 Khisanth joined #git
14:02 obadz only on the currently checked out branch?
14:02 nwkj86 joined #git
14:03 osse it's what pull always has done, isn't it?
14:03 dendazen joined #git
14:04 obadz well yeah but you'd think the flag would matter
14:04 osse it does matter
14:04 obadz only to fetch
14:04 osse yes
14:05 notebox joined #git
14:05 trimosier joined #git
14:07 relipse joined #git
14:09 JeroenT joined #git
14:09 richardlitt joined #git
14:10 richardlitt hey there
14:10 Dougie187 joined #git
14:10 guampa joined #git
14:10 richardlitt I am trying to download the git mailing list archives, and finding it difficult. gmane appears to be down, and marc bans robots
14:10 richardlitt Anyone know how I could do this?
14:13 chris2 git clone --mirror https://public-inbox.org/git
14:14 johnmilton joined #git
14:15 johnmilton joined #git
14:20 cdown joined #git
14:21 richardlitt What is `--mirror`?
14:21 selckin !man git-clone
14:21 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
14:21 gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html
14:21 richardlitt Found it, cool. https://stackoverflow.com/questions/​3959924/whats-the-difference-between​-git-clone-mirror-and-git-clone-bare
14:22 richardlitt Ah. I did `man git` instead of `man git-clone`. Silly mistake. Thanks, selckin
14:22 gitinfo the git manpage is available at http://jk.gs/git.html
14:22 gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html
14:22 circ-user-tvPeC joined #git
14:22 ShekharReddy joined #git
14:24 rubie joined #git
14:24 phaleth joined #git
14:25 davidosomething joined #git
14:27 uranellus _ikke_: thanks
14:28 jeffreylevesque joined #git
14:28 tjj joined #git
14:28 govg joined #git
14:30 ResidentBiscuit joined #git
14:31 morenoh149 joined #git
14:32 ronskisika joined #git
14:33 stamina joined #git
14:33 nwkj86 joined #git
14:34 shinnya joined #git
14:34 richardlitt chris2: That is for the git repo, itself; I need the mailing list archive
14:34 chris2 ... it contains all messages
14:36 richardlitt Where? I'm sorry, having some difficulty with this
14:36 richardlitt I see a git.git dir where I cloned it
14:36 chris2 yes
14:36 chris2 type git ls-files
14:36 richardlitt Nothing printed to stdout
14:37 chris2 hmm, let me clone it
14:37 chris2 git ls-files HEAD ?
14:37 mycyber joined #git
14:37 JeroenT joined #git
14:37 richardlitt chris2: nothing. Here are my last few commands: https://gist.github.com/RichardLit​t/b7b4d5ac7ad443d5c5f565dfda735a91
14:38 chris2 git ls-tree -r HEAD
14:38 robotroll joined #git
14:38 chris2 should list loads of shuff
14:39 guampa joined #git
14:39 richardlitt chris2: gah! All the blobs
14:39 chris2 git show HEAD:<file> will show the message
14:39 richardlitt Ok; how do I move it into normal text?
14:39 richardlitt I want to be able to search through all of the text
14:39 chris2 git grep should work
14:39 richardlitt Which is why I'm not using an out of the box search on one of mirrors
14:39 chrisshattuck joined #git
14:40 chris2 git grep $whatyouwant HEAD
14:40 achadwick joined #git
14:40 chris2 the archives are quite well indexed by google tho
14:40 richardlitt Hmm. Cool. Can you help me understand how this works? I've not run across this type of git archive before
14:40 richardlitt Where are the files stored, and why in this format?
14:40 cyan__ joined #git
14:41 chris2 its just a git repo
14:41 chris2 you could check it out, but then you have a bazillion files on disk
14:41 chris2 and the filenames are the hash of the message id i think
14:41 acqyl joined #git
14:41 chris2 there are tools on public-inbox.org to work with it
14:42 acqyl left #git
14:43 renan_ joined #git
14:43 dimi1947 joined #git
14:45 ochorocho__ joined #git
14:45 chris2 ah nice, git log also shows all mails in order
14:45 nwkj86 joined #git
14:46 richardlitt hmm
14:46 richardlitt So, I'm a bit unfamiliar with git grep
14:46 Gitzilla joined #git
14:47 richardlitt For each line, I see HEAD:<short hash>/<hash>: word word match  word word
14:47 richardlitt How do I check out the rest of the message?
14:47 chris2 git show HEAD:shorthash
14:48 chris2 or use git grep -C99999 for the whole message as context :)
14:48 moritz uhm, git grep searches in the content of files, and typically doesn't show messages at all, no?
14:48 chris2 the message is the file
14:49 zivester joined #git
14:49 HardlySeen joined #git
14:50 moritz git grep -l ... | xargs cat
14:50 imacinto hehe cat
14:50 richardlitt Yeah; I want to see all of the surrounding context for each line I get back
14:50 relipse joined #git
14:50 osse don't be a fool. git grep -zl | xargs -0 cat
14:50 chris2 richardlitt: ok, i think https://public-inbox.org/git/all.mbox.gz will download everything as a mbox, but dont destroy the server please
14:50 chris2 osse: its a bare repo
14:51 osse tell that to moritz
14:51 moritz isn't there a git cat-file ?
14:51 chris2 yes
14:51 moritz thereyago
14:51 renan_ left #git
14:51 richardlitt thanks chris2, downloading
14:51 Anupkumar joined #git
14:52 osse show and cat-file on a blob are more or less the same thing
14:52 fmcgeough joined #git
14:53 renan joined #git
14:53 renan There is this commit.gpgsign configuration that automatically GPG signs commits. Is there a similar config for signing tags? Not an cli argument, but a .gitconfig config.
14:54 earational joined #git
14:54 fahadash joined #git
14:56 M-shine joined #git
14:58 deadprez joined #git
14:59 drbean_ joined #git
15:01 NeverDie joined #git
15:01 clemf joined #git
15:01 kadoban joined #git
15:02 NeverDie joined #git
15:02 Seveas renan: tag.forceSignAnnotated
15:03 markmarkmark if I did a git svn clone of a huge subversion repository (that took over 24 hours to clone) can I put the resulting git repo on a flash drive and freely distribute that to my co workers? so we all get a copy of the git-svn version of the svn repository?
15:03 markmarkmark basically, I have cloned it and no one else wants to take the time if they don't have to
15:06 fakenerd joined #git
15:07 nedbat how can I figure out when git got the -C option?
15:07 preaction markmarkmark: yes, you can share the directory and everything should be fine (from the git side at least, not sure about the svn side)
15:07 renan Seveas: thanks!
15:08 shmuli joined #git
15:09 InfoTest joined #git
15:09 markmarkmark preaction: cool beans
15:10 shmuli_ joined #git
15:11 nedbat that is, the global -C to specify the git directory?
15:12 osse nedbat: who is "I" ?
15:12 osse a script? a hook? the user?
15:12 hahuang61 joined #git
15:12 nedbat osse: me personally. A user says that git complains about an unknown option -C, and I want to know how crazy old their git might be.
15:13 osse nedbat: that's easy. their crazy old git is 1.9.4 or earlier
15:13 nedbat osse: how did you determine that?
15:13 osse nedbat: oh I misunderstood the question to begin with.
15:13 nedbat I searched Documentation/RelNotes, and didn't see it.
15:13 osse nedbat: I looked it up in my brain, because I already knew :P
15:14 nedbat osse: i guess "easy" is a relative term :)
15:14 osse the way I usually find these things out is finding the commit that introduces the feature then running tag --contains
15:15 osse nedbat: also, I'm wrong. It's 1.8.5
15:15 nwkj86 joined #git
15:15 thiago joined #git
15:16 dmto joined #git
15:16 nedbat osse: and it's in the 1.8.5.txt release notes! Thanks.
15:17 dreiss joined #git
15:17 deadprez joined #git
15:18 osse nedbat: git log --grep=-C --grep=directory --all-match. Then search helplessly around in the pager. Find 44e1e4d67d. git tag --contains {that thing}. Earliest tag: 1.8.5. Ez.
15:18 osse sometimes it also works blaming the line that introduces the specific option to the option parser.
15:19 osse That works in this case too. Goddammit, should've used that initially.
15:19 danslo joined #git
15:20 cdown joined #git
15:20 _nwkj86 joined #git
15:21 Electrometro joined #git
15:21 satbyy joined #git
15:21 tyreld joined #git
15:23 Electrometro joined #git
15:24 nedbat osse: wow, "easy" :)
15:25 Gloomy joined #git
15:26 jeffl35 joined #git
15:28 jeffl35 joined #git
15:28 Macaveli joined #git
15:29 raspado joined #git
15:30 ahmedelgabri joined #git
15:31 Electrometro joined #git
15:31 t0by joined #git
15:32 overlord_tm joined #git
15:33 nettoweb joined #git
15:34 jknetl joined #git
15:34 osse nedbat: it was only easy because I knew (though it turns out I didn't)
15:35 ksefchik joined #git
15:35 osse nedbat: but also influenced by that I thought you meant you wanted to detect the usage of -C from within a script somehow
15:35 osse which I think would definitely be harder
15:35 nedbat osse: yeah, i can see the ambiguity now.
15:37 kyan joined #git
15:40 ochorocho__ joined #git
15:40 thebloggu joined #git
15:41 crayon joined #git
15:41 crayon joined #git
15:42 synthroid joined #git
15:43 nikivi joined #git
15:43 axl_ joined #git
15:45 jceb joined #git
15:47 crayon joined #git
15:50 madewokherd joined #git
15:56 fakenerd_ joined #git
15:58 terminal_echo joined #git
16:02 crayon joined #git
16:03 Brain joined #git
16:03 cdg joined #git
16:03 gusnan joined #git
16:04 sharkz_ joined #git
16:05 jknetl joined #git
16:06 nwkj86 joined #git
16:11 deadprez joined #git
16:14 lacrymology joined #git
16:15 romerocesar joined #git
16:15 nwkj86 joined #git
16:17 _nwkj86 joined #git
16:20 danslo joined #git
16:21 NeverDie joined #git
16:23 nitric joined #git
16:24 deadprez joined #git
16:25 guilherme joined #git
16:26 dreiss joined #git
16:28 mycelium joined #git
16:29 SwiftMatt joined #git
16:31 thiago joined #git
16:34 duderonomy joined #git
16:34 copumpkin left #git
16:35 EvilPenguin joined #git
16:36 ansimation joined #git
16:38 leeN joined #git
16:39 Jon28 joined #git
16:39 durham joined #git
16:41 tabrez joined #git
16:43 BSaboia joined #git
16:46 Ryanar joined #git
16:47 gargola joined #git
16:49 dmto joined #git
16:49 finalbeta joined #git
16:50 dmto left #git
16:55 robotroll joined #git
16:55 romerocesar_ joined #git
16:56 InfoTest1 joined #git
16:59 Gsham joined #git
16:59 energizer joined #git
17:00 emg joined #git
17:00 chrisshattuck joined #git
17:02 anth0ny joined #git
17:04 Noldorin joined #git
17:05 mrwat joined #git
17:06 Adjo joined #git
17:07 kpease joined #git
17:07 tom[] joined #git
17:09 finalbeta joined #git
17:10 sgrover joined #git
17:11 mrwat joined #git
17:13 hahuang61 joined #git
17:13 UTAN_dev joined #git
17:13 kpease joined #git
17:14 duderono_ joined #git
17:18 madebymarkca joined #git
17:20 ksefchik joined #git
17:22 SteffanW joined #git
17:22 bttf joined #git
17:25 terminal_echo joined #git
17:27 raijin joined #git
17:28 dreiss joined #git
17:28 bttf joined #git
17:29 sgrover How do I review what files changed for a branch that has not been touched for 5 months?  The branch was not merged to the develop branch, and now we need that functionality.  But the develop branch continued to evolve and we need to review if the branch still makes sense with the current state of the develop branch.
17:30 sgrover Simple merge and deal with the conflicts?
17:30 Sasazuka joined #git
17:30 sgrover (merge develop into the branch, before going the other way....)
17:30 jimi_ joined #git
17:31 Remram[m] joined #git
17:31 Ineentho[m] joined #git
17:31 M-mistake joined #git
17:31 M-meznak joined #git
17:31 aviraldg joined #git
17:32 energizer I think I just lost some files to git-annex, can somebody possibly help me retrieve them?
17:34 stuh84 joined #git
17:36 osse sgrover: git log mainbranch..oldbranch
17:36 osse sgrover: that'll show all commits unique to the oldbranch. Add -p and --stat or --name-only or whatever you like
17:36 jost joined #git
17:37 deadprez joined #git
17:39 whitby joined #git
17:39 UTAN_dev_ joined #git
17:40 sgrover osse: Thanks.  That narrowed it down to only two commits.  Makes things manageable.  Now to figure out how I'm going to do the review... (Magento events, etc. come into play... time consuming...)
17:41 osse sgrover: for reviews I find it helpful to look at the diff and read the commit message... :P
17:42 DTekk joined #git
17:42 sgrover It's not so much the code itself, it's where the core objects the code depends on have changed.  We need to evaluate if the changes work well with those newer core objects, or if there are other considerations now that were not accounted for 5 months ago...
17:43 Xorg_Xalargsky joined #git
17:43 osse sgrover: git branch testmergelol oldbranch; git checkout master; git merge testmergelol.
17:43 osse alternatively; git branch testrebaselol oldbranch; git checkout testrebaselol; git rebase master
17:44 sgrover But, yep.. I generally love the DIFF for analyzing code differences...
17:44 osse best way to evaluate these things is often to just try it
17:44 osse unless it's some sort of ginormous code base that takes weeks to compile etc.
17:44 sgrover I'm thinking more along lines of git checkout oldbranch; git merge develop; And fix the conflicts one at a time... :)
17:45 osse that works too
17:45 osse then you're merging the "other way" but it doesn't really matter in terms of conflicts
17:46 sgrover by bringing develop into the old branch, I can see what is wrong without impacting the develop code.  Once I get that stabilized, I can merge INTO develop, and only the changes will merge.
17:47 osse oh right
17:47 osse I should have suggested: git branch testmergelol master; git checkout testmergelol; git merge oldbranch
17:48 sgrover (the old branch was built when we were using a feature branch paradigm, and we've since switched to using the gitflow paradigm... So the old way is buying us some options here... to fix a problem introduced by the old way.. :) )
17:48 osse but it's not like if you merge into develop then suddenly all other developer's develop branch around the world with magically change right under them
17:48 notebox joined #git
17:48 sgrover Not until I push my changes to the central repo...
17:49 guampa joined #git
17:49 sgrover gotta luv auto-deployments.
17:49 rgrinberg joined #git
17:49 osse and surely you wouldn't do that until you get it stabilized, as you call it
17:50 sgrover yep..
17:50 osse so then it doesn't matter which way you merge
17:50 griffindy joined #git
17:50 sgrover Not when this is the only task I'm working on until this is done...
17:50 energizer I think I'm in a situation where some files are stored only in an objects dir, and I've otherwise lost them. Is there a way I can get them out?
17:51 nilg joined #git
17:51 osse sgrover: hence the "testmergelol" branch, so you can get back to develop anytime.
17:52 osse sgrover: note I don't really care what you do. Do what makes sense. It's just that when I read "without impacting the develop code" I get the impression that you somehow think the world will end if you merge into develop
17:52 nilez joined #git
17:52 osse in which case it's a misunderstanding of how git works
17:53 vrishab joined #git
17:53 ShekharReddy joined #git
17:54 sgrover osse: no.  no disaster if I keep things on my local box.  But the central repository's "develop" branch is auto deployed to staging servers and used as "the source" for other developers.  It's the snapshot of the current state of the art for the code.
17:55 dsantiago joined #git
17:55 sgrover That's not a GIT issue - that's an internal integration issue - backed by Git...
17:56 sgrover so more a policy thing than anything.  And if something DOES go wrong, we can revert that commit...
17:56 osse but develop on your computer is not the same as develop in the central repo
17:56 multi_io joined #git
17:56 sgrover agreed.  Unfortunately it seems that you and I understand that.  I'm slowly bringing the rest of my team around to that way of thinking.... :)
17:56 osse heh
17:57 osse you can make them want to understand by temping them with stuff like "you can even have branches named after racial slurs and no one will ever know"
17:58 Emi joined #git
17:58 choki joined #git
17:58 sgrover They are using git as a source for code, then immediately branching into a "feature branch", creating a silo/snapshot that later needs to be integrated.  That caused this problem.  The code was ready to be integrated back into the main branch - and was, when a higher priority came along requireing a different branch to be integrated - that silo of info did not have my branche's code.
17:58 GodGinrai until someone sees their merge commit
17:58 stomplee joined #git
17:58 sgrover My branch was never re-introduced and got missed.
17:59 GodGinrai that says "merging I_hate_my_boss into master"
17:59 sgrover GodGinrai: only if you do a straight push, and not a rewrite...
17:59 osse Sometimes I name my branches something utterly stupid, and when the feature gets serious I just keep it. When I merge it I edit the commit message to make it look like it add an Enterprise Edition Professional branch name all along.
17:59 sgrover er.. rebase
17:59 troulouliou_div2 joined #git
17:59 osse *look like it HAD a
18:00 cagedwisdom joined #git
18:00 GodGinrai osse: lol
18:01 osse git merge lol-data; git commit --amend and change to  "Merge branch 'async-data-retrieval'"
18:04 ahmed_elgabri joined #git
18:04 osse I once had the F word in a comment during a code review. max lulz
18:06 elastix joined #git
18:07 laumann joined #git
18:08 kadoban osse: One of my coworkers recently had "remove 'fuck' from comments" as a commit message, which I thought was quite amusing.
18:09 irqq joined #git
18:09 osse heh, doesn't get more permanent than that
18:09 osse I for one need a certain amount of childishness etc. or else it gets unbearable
18:10 kadoban Yeah, the silliness of my comments and such seems to increase as the seriousness of the code does.
18:10 zivester joined #git
18:11 KevinMGranger / this could kill someone lol
18:11 KevinMGranger Darn it, client ate my first slash
18:11 kadoban Haha
18:12 jknetl joined #git
18:14 nikivi joined #git
18:15 Salander27 joined #git
18:16 cagedwisdom joined #git
18:17 emg joined #git
18:18 WayToDoor joined #git
18:19 GenZai joined #git
18:21 rubie joined #git
18:21 danslo_ joined #git
18:22 mohabaks joined #git
18:23 aard_ joined #git
18:23 duderonomy joined #git
18:24 synthroi_ joined #git
18:26 satbyy joined #git
18:26 satbyy joined #git
18:26 dodobrain joined #git
18:27 t0by joined #git
18:29 hfp Hi! I have a project that I'm splitting in two. One subdirectory will become its own repo, and a submodule in the original project. I'd like to remove any commits and any files related to that now submodule from the original repo it was in. It contains private information and I'm open sourcing the project, but not the submodule. 2 questions: if a public repo refers to a private submodule, will someone that
18:29 hfp doesn't have access to the private module have issue using the project? How do I remove any commit and every file that is now in the submodule from the public project?
18:30 hfp By any issue, I mean: will they have a problem cloning the project and replacing the submodule's content with their own content?
18:31 mohabaks_ joined #git
18:31 GodGinrai hfp: they will have issue using the project if the private submodule is necessary for the open source project to function
18:32 dimi1947 joined #git
18:32 madebymarkca joined #git
18:32 GodGinrai hfp: I wouldn't include the private repo as a submodule if you are opensourcing the other process.  Just include something in your build process that pulls the compiled binary of the private code from some public site
18:33 kadoban hfp: What is the submodule? Does it even work without that?
18:33 GodGinrai assuming your code is built to work that way
18:33 SourTrout joined #git
18:34 Emperor_Earth joined #git
18:35 Fuco left #git
18:35 newbiee joined #git
18:35 hfp GodGinrai, kadoban: Yes it works. What I want to opensource is the tooling around the project (a set of Gulp tasks), and what is to become the submodule is the directory containing personal documents managed by the gulp tasks. The tool will work with any documents found in src/, I just don't want to ship my own provate stuff with the tool. So I extracted the docs to their own repo (they are plain text, versioned
18:36 hfp and I don't want to lose that). I want to share the tool and still use it for my own needs. You both recommend not making the submodule public and have a script do the cloning?
18:36 hfp s/provate/private
18:37 kadoban A submodule doesn't seem right. I think I'd make them completely separate, and in your version of the repo, you could do a subtree add or whatever to get your content in with the surrounding stuff or whatever.
18:38 osse a private submdoule will be an inconvenience for everyone else. just one thing they need to change. and makes it harder to follow upstream
18:38 hfp kadoban: I thought about a submodule because my content is versioned. Unless I'm missing something, if I don't use a submodule I'd have to copy-paste the files every time they change in their repo, correct?
18:38 newbiee I want to know how can i achieve this. I am downloading some source code from a server and it has some folders with there own .git I want to individually push some folders to our git server with the history intact. How can i do it? I don’t have .git for each of the folders as .git for those folders are in higher level directory.
18:39 fahadash joined #git
18:39 kadoban hfp: Not with 'git subtree', it should work fine.
18:40 dodobrain joined #git
18:43 aard__ joined #git
18:44 barduck joined #git
18:45 hfp kadoban: hmmm. My use case is this: in my tooling repo, I have a task that watches the tex files in src/. Whenever they change, it recompiles it so that the PDF file I have open in a viewer is overwritten and the viewer reloads it instantly. Will I still be able to do that with a subtree? The tex files are versioned, and I want their versioning to be separate from the public tooling.
18:46 ansimation joined #git
18:47 nettoweb joined #git
18:47 hfp Will I be able to work on my tex files from ./src/ or will I have to edit the tex files in the private repo and then run a command in the tool repo to get the latest changes from the private repo in src/ ?
18:47 cstratak joined #git
18:48 cyan__ joined #git
18:49 mingrammer joined #git
18:51 cbreak a submodule is a normal git repository
18:51 cbreak hfp: the only special thing about them is the binding
18:52 cbreak other than that, you commit, push, fetch, ... separately in them
18:52 cbreak from the outer repository, it is treated like a non-mergeable opaque "file"
18:52 cbreak i.e. you have to commit updates to it in the outer too
18:53 energizer joined #git
18:53 hfp cbreak: Right, I meant whether I'll be able to do that with a subtree. I have used submodules before, but never subtrees.
18:55 finalbeta joined #git
18:58 saedelaere joined #git
18:59 clr hfp: seems like src/ should be an independent repo, no direct coupling: git clone <private repo> src
19:00 clr hfp: if you run that in the root directory of your tool, your private repo is src/
19:02 RominRonin joined #git
19:07 nettoweb joined #git
19:07 hfp clr: good point, I didn't realize you could clone a repo in a repo. Then I just have to add src/ to the outer repo's gitignore and be done with it? Anything I do in src/ will be committed to its independent inner repo?
19:08 deadprez joined #git
19:09 actinide joined #git
19:11 kyan joined #git
19:13 clr hfp: i think that's all you need to do.  then others that use your tool will use it in the same way you do
19:13 hahuang61 joined #git
19:14 swiftgeek joined #git
19:16 hfp clr: yes, sounds like the best solution. Thanks!
19:16 swiftgeek I think i have found bug in git-am - while committing code and formatting patch works with \" in name, git-am adds that escape slash in committer
19:16 _ikke_ in what name?
19:16 ksefchik joined #git
19:17 swiftgeek _ikke_: Sebastian "Swift Geek" Grzywna :P
19:17 deadprez joined #git
19:17 swiftgeek i switched to ' now to not cause issues, but nevertheless behaviour is inconsitent
19:17 romerocesar joined #git
19:17 swiftgeek *inconsistent
19:18 _ikke_ Ok, but where do you use that name?
19:18 _ikke_ In what part of the patch?
19:18 swiftgeek From: "Sebastian \"Swift Geek\" Grzywna" <swiftgeek@gmail.com>
19:19 swiftgeek that's fine, it's escaped there as it should be
19:21 MacWinner joined #git
19:21 stamina joined #git
19:22 swiftgeek i guess i should send bug report to git@vger.kernel.org ?
19:22 danslo_ joined #git
19:22 deadprez joined #git
19:22 _ikke_ I'm trying to find out of I can reproduce it
19:23 swiftgeek what small repo could i use to to create patch? :P
19:23 dimi1947 joined #git
19:24 drognan joined #git
19:27 drognan I'm trying to have a central repo for web file where I push them and then can see the changes on the website, I find I'm having to do git checkout --detach and then git checkout master to be able to see my pushed changes, what I am doing wrong?
19:28 rahtgaz joined #git
19:28 SwiftMatt joined #git
19:28 swiftgeek _ikke_: http://dpaste.com/1E96NED
19:29 barduck_ joined #git
19:30 _ikke_ swiftgeek: so you expect the comitter to be Sebastian "Swift Geek" Grzywna?
19:30 swiftgeek yes
19:30 kyan joined #git
19:30 swiftgeek that's what happens on git commit
19:31 _ikke_ fg
19:31 _ikke_ oops :P
19:31 Darren_ joined #git
19:31 swiftgeek _ikke_: https://review.coreboot.org/cgit/coreboot.git/com​mit/?id=7e516fbb47daf2affc72135db68f2c9bd8b97dd5
19:32 swiftgeek in .gitconfig i have name = Sebastian \"Swift Geek\" Grzywna
19:33 Brain joined #git
19:36 MasterBob joined #git
19:40 nilg joined #git
19:43 vuoto joined #git
19:43 Darcidride_ joined #git
19:44 mingrammer joined #git
19:46 ahmed_elgabri joined #git
19:47 moneylotion joined #git
19:47 _ikke_ swiftgeek: Send an e-mail to the list, if I have time, I'll try to look at it
19:48 swiftgeek so you reproduced it?
19:48 MasterBob left #git
19:48 _ikke_ Yeah, I just get quotes in the committer
19:48 swiftgeek ?
19:49 swiftgeek _ikke_: this is the result of applying with git-am http://git.savannah.gnu.org/cgit/libreboot.git/co​mmit/?id=8c207e3c1e77eb8a633e6d37db2f943ad3d8fed4
19:49 swiftgeek (git log shows those slashes as well)
19:49 _ikke_ yes
19:50 swiftgeek "git-am includes escape characters from 'From' field" is this fine as title?
19:51 swiftgeek i'm really anxious about sending bug reports directly to mailing list ^^'
19:51 _ikke_ swiftgeek: Don't be
19:51 _ikke_ The mailing list is really friendly
19:52 shruggar joined #git
19:52 swiftgeek yeah i'm just not great with writing stuff in letter form :P
19:52 ams__ joined #git
19:55 Nik joined #git
19:55 Topic for #git is now Welcome to #git, the place for git help and NP-hard problems | Please take this survey: https://tinyurl.com/GitSurvey2016 | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/gio.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Now with more indire
19:56 Topic for #git is now Welcome to #git, the place for git help and NP-hard problems | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/gio.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Now with more indirect cycling giraffes!
19:56 overlord_tm joined #git
19:56 Darcidride__ joined #git
20:03 sparr left #git
20:03 sparr joined #git
20:03 sparr joined #git
20:04 sparr I have a submodule defined in .gitmodules with a url that invokes a specific section of my ~/.ssh/config for authentication purposes. I can `git clone` that URL just fine, but attempting to do `git submodule init && git submodule update` leads to the repo not being found, as if I was using the wrong credentials. Am I missing a step?
20:06 codezomb joined #git
20:08 afuentes joined #git
20:08 pii joined #git
20:09 drognan solved my problem with post-receive
20:09 drognan left #git
20:09 cdg joined #git
20:11 Sasazuka joined #git
20:13 _ikke_ swiftgeek: Seeing your e-mail :-)
20:15 energizer left #git
20:17 DJ_Spies joined #git
20:17 roxlu_ joined #git
20:18 zeroed joined #git
20:20 netj joined #git
20:22 catbeard left #git
20:22 swiftgeek _ikke_: when i touch windows machines i trigger BSOD in hours top xD
20:23 spudowiar joined #git
20:26 _nwkj86 joined #git
20:30 danslo_ joined #git
20:31 madewokherd` joined #git
20:31 VagabondAzulien joined #git
20:32 skylite_ joined #git
20:33 actinide joined #git
20:34 griffindy joined #git
20:35 SwiftMatt joined #git
20:38 mingrammer joined #git
20:38 romerocesar joined #git
20:39 romerocesar joined #git
20:40 boombatower joined #git
20:45 dsdeiz joined #git
20:45 dsdeiz joined #git
20:47 terminal_echo joined #git
20:49 zeroed joined #git
20:50 [Brain] joined #git
20:50 hellyeah joined #git
20:50 Sasazuka__ joined #git
20:51 chrisshattuck joined #git
20:52 lacrymology joined #git
20:53 Brain joined #git
20:53 snthsnth joined #git
20:55 greendo joined #git
20:56 guilherme joined #git
20:57 robogoat joined #git
20:57 deadprez joined #git
20:59 roxlu_ joined #git
20:59 energizer joined #git
21:00 nilez joined #git
21:01 netj joined #git
21:01 roxlu_ joined #git
21:02 r4z joined #git
21:04 njbair joined #git
21:05 nonconvergent joined #git
21:05 nonconvergent Hi.
21:05 Guest51141 joined #git
21:08 nonconvergent If I cherrypick a whole bunch of commits, will they keep their relative order?
21:08 nonconvergent Some of them involve deleting files.
21:10 EvilPenguin joined #git
21:10 hellyeah joined #git
21:11 Marbug joined #git
21:13 satifant joined #git
21:14 hahuang61 joined #git
21:16 neilthereildeil joined #git
21:17 neilthereildeil i remember i forked a branch based on another branch. how can i view where and how that happened?
21:17 jwest joined #git
21:18 noctux joined #git
21:18 Ryanar joined #git
21:20 Guest51141 left #git
21:22 karstensrage joined #git
21:22 [Brain] joined #git
21:23 eindoofus joined #git
21:23 sgrover neilthereildeil: git logs ??  There are arguments you can pass to help isolate the branches...
21:23 eindoofus hi, can anyone point me towards a git resource for using git with others? i already know some of the basics of git from working alone, but i've never had to branch, merge, etc.
21:24 sgrover git log mainbranch..oldbranch  (thanks to osse for the earlier post on this...)
21:24 e14 joined #git
21:24 eindoofus i'm going to be starting a group project soon that requires such knowledge
21:24 sgrover https://www.atlassian.com/git/
21:24 eindoofus thanks sgrover
21:26 sgrover If you ignore the Atlassian specific parts they word things rather clearly.  (i.e. they will refer to Bitbucket, Jira, etc in their docs, but it's rare and usually related to the topic at hand.)
21:28 sgrover And when you are just starting out, I found this one especially useful... https://www.atlassian.com/git/​tutorials/comparing-workflows/  - I personally prefer the "GitFlow" workflow.  The Feature Branch workflow introduces some bottlenecks I'd rather not deal with.  The Forking Workflow is how most open source projects function...
21:31 sgrover the details can be subtle though and takes a bit of experience and lots of reading.  And being slapped in the face with a situation you had only previously read about.. :)
21:31 ahr3n joined #git
21:32 umbSublime joined #git
21:32 ShapeShifter499 joined #git
21:32 romerocesar joined #git
21:32 dvl joined #git
21:35 qws-user-1229 joined #git
21:36 deadprez joined #git
21:36 aidalgol joined #git
21:37 jimi_ joined #git
21:38 rubie joined #git
21:39 peepsalot i have a branch that many devs besides me have commited to, if i merge this branch into master, its going to look like I made all the changes that everyone else made?
21:39 AnarchyAo joined #git
21:39 peepsalot as a single commit?
21:40 sgrover peepsalot: no
21:40 dvl I want to create a repo in which I pull from one repo (our private repo) and push to another repo (on github). I'm expecting to do something like 'git pull && git push'.  Push works, pull gives me 'cannot be used without a working tree' https://gist.github.com/dlangille​/912abc35abf3d42594839d1ddb10bdc6
21:40 sgrover It will do a single commit saying you made the merge.  But all the previous un-merged commits will be moved over with the details of who did it and when.
21:41 sgrover dvl: add a remote for github.  Then you can do something like git pull origin mybranch; git push github mybranch;
21:41 peepsalot sgrover, well i already did the merge but haven't pushed it yet.  i wanted to review what it would show for my commit changes so i did this:  git diff COMMIT^ COMMIT
21:42 sgrover you can also just do git log
21:42 sgrover That will show you the commits and their messages.
21:42 sgrover unless you are rebasing, the commits will stay intact
21:42 energizer joined #git
21:43 aidalgol joined #git
21:43 peepsalot that diff command shows everyone's commits, is there a way to show what i changed during conflict resolution only?
21:44 sgrover peepsalot: that is rebasing.  I'm not familar with doing a rebase, but that is it's intent - allow you to sum up multiple happenings in one commit.  It amounts to rewriting history though, which is frowned on in most circumstances.  Rebase does make sense for scenarios like yours though... IMO
21:44 dvl sgrover: Yes, I had already done a 'git remote add push_mirror git@github.com:dlangille/TestForPushing'.  I suspect I'm missing the corresponding command for the local repo.
21:45 peepsalot sgrover, no i didn't rebase, i've done a regular merge.  i just want to know if there's a to see the diff of juts the things i had to conflict resolve
21:46 sgrover dvl: git remote by itself will show you what remotes are set up.  git remote show [remote_name] will show you the details for a specific remote.
21:47 Topic for #git is now Welcome to #git, the place for git help and all your base | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/gio.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-prune: not as tasty as git-cherry, but much better for you
21:47 chrisshattuck joined #git
21:47 sgrover peepsalot: ahh... k.  Ignore my last.  That's a different need.  I normally handle that manually (i.e. isolate a list of the files involved, then git diff them directly...)
21:49 peepsalot ok
21:49 sgrover peepsalot: see http://stackoverflow.com/questions/14​717120/list-all-modified-files-in-git​-merge-commit-even-the-fast-forwarded
21:49 peepsalot man, i'm just nervous to do my first huge push to remote master
21:50 sgrover peepsalot: why?  your merge can be reverted or reset if needed....
21:50 neilthereildeil sgrover: the text interface isnt very explanatory
21:50 neilthereildeil im looking at gitk, but dont see any lines connecting the branches
21:51 overlord_tm joined #git
21:52 sgrover neilthereildeil: The best tool I've seen for managing branches would be SourceTree.  There is also GitKraken, but I haven't been able to get that working on my local box (ubuntu and an .so linking issue...)
21:52 umbSublime joined #git
21:53 peepsalot sgrover, i don't really know, something about everyone warning that rewriting public history is bad
21:53 mizu_no_oto joined #git
21:53 sgrover peepsalot: that refers to the "rebase" way to merge changes.
21:53 peepsalot resetting isn't rewriting history?
21:54 sgrover If you do a reset - the commit/merge is just removed as if it never happened.  Reverting creates reversing entries to remove the changes - maintaining the history.
21:54 sgrover There is a time and place for both.  But both are usually when an "oops" has happened, and a little manual intervention is understandable.
21:55 peepsalot ok
21:56 madewokherd joined #git
22:00 vrishab joined #git
22:01 fguillot joined #git
22:02 dvl sgrover: Tried 'git pull origin master' based on what I saw in 'git remote'... get told "fatal: /usr/local/libexec/git-core/git-pull cannot be used without a working tree" see  https://gist.github.com/dlangille​/912abc35abf3d42594839d1ddb10bdc6
22:04 CheckDavid joined #git
22:05 andlabs joined #git
22:05 cdown joined #git
22:06 blackwind_123 joined #git
22:06 elastix joined #git
22:09 terminal_echo joined #git
22:10 tlaxkit joined #git
22:11 guilherme joined #git
22:11 terminal_echo joined #git
22:12 nevodka joined #git
22:13 ksefchik joined #git
22:14 mingrammer joined #git
22:16 dsdeiz_ joined #git
22:22 Dougie187 left #git
22:27 crayon joined #git
22:27 crayon joined #git
22:27 sangy joined #git
22:27 Chunk2 joined #git
22:28 energizer joined #git
22:29 energizer joined #git
22:30 zacts joined #git
22:31 danslo_ joined #git
22:33 neanderslob joined #git
22:33 brainiznull joined #git
22:34 tgunr joined #git
22:34 dvl solution to my pull from one repo, then mirror to another is 'git remote update'.  See https://gist.github.com/dlangille​/912abc35abf3d42594839d1ddb10bdc6
22:34 ShapeShifter499 joined #git
22:34 actinide joined #git
22:37 chrisshattuck joined #git
22:38 netj joined #git
22:39 jimi_ joined #git
22:41 energizer joined #git
22:41 nettoweb joined #git
22:42 MattMaker joined #git
22:43 diogenese joined #git
22:45 thiago joined #git
22:45 sgrover dvl: when you see "... cannot be used without a working tree"  change "git pull origin" to git pull origin master". (or whatever branch name makes sense.)  OR you can use something like "git pull origin $(git symbolic-ref --short -q HEAD)" to pull whatever the current branch is... (doesn't always work...)
22:46 jeffreylevesque joined #git
22:46 sgrover but you found a solution.. so, that's probably moot advice now...
22:47 actinide joined #git
22:49 ksefchik joined #git
22:51 JamesBaxter joined #git
22:52 ItSANg___ joined #git
22:55 dvl sgrover: Yes, a solution, thank you.  They are not always the better solution though.
22:56 sgrover :)  "right" and "right enough" are often miles apart - and it rarely matters IMO...
22:56 dvl sgrover: I am mirroring the entire repo, not just the branch.  e.g. internal repo on GHE which devs access  -> mirror on another server -> github.  Why?  security.
22:56 prawnzy joined #git
22:59 mizu_no_oto joined #git
22:59 newbiee https://gist.github.com/lttlrck/9628955 using this to rename the remote branch but i have several origins. How can i specify my origin?
23:01 kadoban newbiee: "origin" is just the name of a remote. You don't have several origins, you have at most one.
23:01 Perspicaciosity joined #git
23:01 newbiee kadoban: i mean i have several remotes
23:02 kadoban newbiee: Run the commands as many times as you like, filling in different remote names instead of "origin"
23:02 newbiee kadoban: i want to change branch name in a specific remote.
23:02 kadoban Then use the name of that remote.
23:02 newbiee ok
23:03 Sasazuka__ joined #git
23:04 newbiee kadoban: http://ideone.com/tPJDlp getting this error.
23:09 energizer joined #git
23:09 mingrammer joined #git
23:12 inflames joined #git
23:14 choki joined #git
23:15 hahuang61 joined #git
23:16 mablae__ joined #git
23:22 ochorocho__ joined #git
23:22 ffabi joined #git
23:24 astrofog joined #git
23:24 durham_ joined #git
23:28 diogenese joined #git
23:30 snthsnth joined #git
23:35 nonconvergent joined #git
23:36 Falkor_ joined #git
23:37 ahr3n joined #git
23:40 jstimm joined #git
23:42 dsantiago joined #git
23:42 Gsham joined #git
23:42 neunon joined #git
23:44 JamesBaxter joined #git
23:44 actinide joined #git
23:44 nettoweb joined #git
23:44 medeirosthiiago joined #git
23:44 _Patrick_ joined #git
23:45 inflames joined #git
23:46 deadprez joined #git
23:47 justinf_ joined #git
23:48 mellernoia joined #git
23:49 justinf_ left #git
23:49 deadprez_ joined #git
23:50 dsdeiz joined #git
23:52 Zamerick joined #git
23:53 shinnya joined #git
23:53 King_Hual joined #git
23:53 jason237 joined #git
23:54 snthsnth joined #git
23:57 prawnzy joined #git
23:58 durham joined #git
23:59 nodd joined #git

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