Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-30

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

All times shown according to UTC.

Time Nick Message
00:01 justan0theruser joined #git
00:01 Siegfried joined #git
00:02 CEnnis91 joined #git
00:08 juvenal joined #git
00:09 gdelfino joined #git
00:10 cyphase joined #git
00:10 ColdKeyboard joined #git
00:11 Gsham_ joined #git
00:12 raijin joined #git
00:14 Masber joined #git
00:15 Siegfried joined #git
00:16 chid joined #git
00:18 Masber joined #git
00:20 User458764 joined #git
00:21 Siegfried joined #git
00:21 ochorocho__ joined #git
00:22 re1 joined #git
00:23 AdDiCt joined #git
00:23 AdDiCt left #git
00:24 kenden joined #git
00:29 cdg joined #git
00:32 dreiss joined #git
00:33 infernix joined #git
00:35 daryl256 joined #git
00:38 fstd_ joined #git
00:38 danslo_ joined #git
00:41 Oatmeal joined #git
00:42 realz joined #git
00:42 mikecmpbll joined #git
00:43 jaguarmagenta joined #git
00:44 mangolisk joined #git
00:46 Kulrak joined #git
00:46 Kulrak joined #git
00:48 Siegfried joined #git
00:49 xall_ joined #git
00:49 Gsham joined #git
00:50 kenden joined #git
00:51 sssilver joined #git
00:55 ahr3n joined #git
00:57 Jameser joined #git
00:57 railssmith joined #git
00:59 irqq joined #git
01:01 Starky joined #git
01:01 flippo joined #git
01:05 StrongJava joined #git
01:05 frivol|C[HL][IE] left #git
01:07 dsantiago joined #git
01:07 frivol|CHI|DEN joined #git
01:07 cyan__ joined #git
01:08 jamick joined #git
01:09 SwiftMatt joined #git
01:15 denimsoft joined #git
01:15 jaguarmagenta joined #git
01:19 werdfriek joined #git
01:20 snthsnth joined #git
01:20 werdfriek Is there a syntax / way to write a gitignore where you do like iptables logic? Where you ignore everything on the first line then exclude specific files or directories from the exclude rule after that?
01:21 mangolisk joined #git
01:21 werdfriek Oh
01:21 werdfriek nevermind - stupid me
01:22 ochorocho__ joined #git
01:25 zulutango joined #git
01:29 fahadash joined #git
01:31 arescorpio joined #git
01:36 User458764 joined #git
01:39 danslo_ joined #git
01:40 cdown joined #git
01:40 qpdb joined #git
01:48 atesc joined #git
01:49 Puffball joined #git
01:50 anuxivm left #git
01:51 mangolisk joined #git
01:54 a3Dman joined #git
01:57 juvenal joined #git
01:57 railssmith joined #git
01:58 Gsham joined #git
01:58 bruce_lee joined #git
02:00 safe joined #git
02:02 netj joined #git
02:03 alhariel joined #git
02:06 Gsham joined #git
02:08 chid joined #git
02:11 mazeto joined #git
02:15 Dougie187 joined #git
02:17 Siegfried joined #git
02:18 finalbeta joined #git
02:23 ochorocho__ joined #git
02:26 mizu_no_oto joined #git
02:31 SwiftMatt joined #git
02:32 boombatower joined #git
02:34 Vampire0 joined #git
02:41 jstimm joined #git
02:41 justanotheruser joined #git
02:46 shmuli joined #git
02:51 d^sh joined #git
02:55 mangolisk_ joined #git
02:56 Prawnzy joined #git
02:56 akurniawan joined #git
02:57 JanC_ joined #git
02:59 mrpackethead joined #git
03:01 darthho0 joined #git
03:01 darthho0 how do I link my computer to github via command line?
03:02 railssmith joined #git
03:04 werdfriek joined #git
03:04 darthho0 nvm
03:05 mizu_no_oto joined #git
03:11 cdg joined #git
03:11 NimeshNeema joined #git
03:13 sunri5e joined #git
03:14 Puffball joined #git
03:15 frobnic joined #git
03:16 Vortex34 joined #git
03:16 Limes joined #git
03:19 xall_ joined #git
03:19 werdfriek joined #git
03:20 prg3 joined #git
03:24 Hink joined #git
03:24 Hink joined #git
03:25 Dougie187 left #git
03:27 railssmith joined #git
03:28 mazeto I have a repo cloned with --depth 1, 'cos I dont want to keep track of 5x the repo's size in history. But as I pull, the .git folder grows in size. So I pulled, deleted the .git folder, and when I want to pull again, I do git init, git remote add origin, but when I pull, it starts to clone the entire repo again! please, someone help me!
03:29 akurniawan joined #git
03:29 joki joined #git
03:30 chachasmooth joined #git
03:30 freekevin joined #git
03:32 Prawnzy joined #git
03:34 Gsham joined #git
03:38 Puffball joined #git
03:39 pks joined #git
03:39 preaction mazeto: it sounds like you don't want to use git for whatever it is you're doing
03:39 MissionCritical joined #git
03:40 danslo_ joined #git
03:41 mazeto preaction, the problem is, the repo's folder is around 4GB big with it's .git folder. and about 700MB without it.
03:41 preaction sounds like it could use some cleanup, and perhaps stop putting huge files in there
03:42 mazeto preaction, the repo is the linux kernel. So it's not my fault. The project is huge by itself.
03:43 preaction you could re-clone it with a shallow clone. you could even re-clone it from your local copy. but pull is always going to add more things to it
03:44 preaction fetch has the options to not fetch everything. check man git fetch. then you'd use merge (pull = fetch + merge)
03:44 gitinfo the git-fetch manpage is available at http://jk.gs/git-fetch.html
03:44 dan2k3k4 joined #git
03:45 hexagoxel joined #git
03:46 mazeto preaction, I'm looking it up...
03:47 Jameser joined #git
03:48 infernix joined #git
03:49 lagothri1 joined #git
03:51 shmuli joined #git
03:57 Prawnzy joined #git
03:59 rbern joined #git
03:59 jimmyrcom joined #git
04:00 mazeto preaction, wow, works like a charm! thank you so much!
04:01 mazeto preaction, fetch --depth 1 was all I needed!
04:01 preaction right. and you probably won't merge so much as reset
04:01 preaction and rebase
04:01 preaction why are you doing it btw? why not just the released sources?
04:01 jost_ joined #git
04:02 Puffball joined #git
04:03 railssmith joined #git
04:05 mazeto preaction, I'm not contributing with the linux kernel, too complicated for me. I tried to read Linux Device Drivers 3rd ed, bad written book. I didn't understand a thing. anyways. I just like to maintain a copy of my favorite programs, and the kernel is/was the biggest one. It's easier and faster to keep up with the updates.
04:11 cdg joined #git
04:12 Masber joined #git
04:14 Vortex35 joined #git
04:19 A5101 joined #git
04:19 Puffball joined #git
04:21 freekevin joined #git
04:21 brillenfux joined #git
04:22 Skoltnik joined #git
04:22 samcv left #git
04:22 watabou joined #git
04:26 justan0theruser joined #git
04:26 Hink joined #git
04:26 Hink joined #git
04:32 aapaaal joined #git
04:34 cdown joined #git
04:34 Prawnzy joined #git
04:35 atesc joined #git
04:35 blackwind_123 joined #git
04:40 infernix joined #git
04:41 NeverTired joined #git
04:41 danslo_ joined #git
04:44 brillenfux joined #git
04:47 mrpackethead joined #git
04:47 jaguarmagenta joined #git
04:48 railssmith joined #git
04:50 Puffball joined #git
04:51 shinnya joined #git
04:56 dreiss joined #git
05:00 jstimm joined #git
05:01 dodobrain joined #git
05:02 SwiftMatt joined #git
05:04 raatiniemi joined #git
05:04 Electrometro joined #git
05:09 xall_ joined #git
05:11 shmuli joined #git
05:14 Masber joined #git
05:17 BenderRodriguez joined #git
05:17 railssmith joined #git
05:17 denimsoft joined #git
05:17 GT4066 joined #git
05:29 ochorocho__ joined #git
05:30 raatiniemi joined #git
05:34 railssmith joined #git
05:34 jrm joined #git
05:34 e14 joined #git
05:35 PioneerAxon joined #git
05:36 govg joined #git
05:40 sssilver joined #git
05:40 Cabanossi joined #git
05:41 nilg joined #git
05:46 netj joined #git
05:47 languitar joined #git
05:52 eka joined #git
06:00 xlegoman joined #git
06:04 Jameser joined #git
06:05 phaleth joined #git
06:15 Jameser joined #git
06:16 pks joined #git
06:18 freimatz joined #git
06:19 Niels_ joined #git
06:22 Jameser joined #git
06:22 meauses joined #git
06:30 werdfriek joined #git
06:32 pks joined #git
06:33 Niels_ joined #git
06:35 mrpackethead joined #git
06:36 tjone270 joined #git
06:37 railssmith joined #git
06:38 LucaTM joined #git
06:38 meauses joined #git
06:42 danslo_ joined #git
06:43 _ng joined #git
06:44 GavinMagnus joined #git
06:50 ahmedelgabri joined #git
06:50 Shentino joined #git
06:51 A5101 joined #git
06:56 Hink joined #git
06:57 GavinMagnus left #git
06:57 Hink joined #git
07:02 Endarked joined #git
07:02 Derperperd joined #git
07:03 atesc joined #git
07:05 shmuli joined #git
07:05 Puffball joined #git
07:08 PioneerAxon joined #git
07:11 cagedwisdom joined #git
07:14 pks joined #git
07:16 howitdo joined #git
07:17 dsantiag_ joined #git
07:18 laumann joined #git
07:21 oskarkv joined #git
07:25 subhojit777 joined #git
07:31 Anja__ joined #git
07:36 LucaTM_ joined #git
07:39 Oebele joined #git
07:49 shmuli joined #git
07:54 ngperfex joined #git
07:54 mehola joined #git
08:01 Ardethian\ joined #git
08:04 Prawnzy joined #git
08:07 User458764 joined #git
08:19 denimsoft joined #git
08:22 overlordtm joined #git
08:23 mrpackethead joined #git
08:23 davimore__ joined #git
08:23 p4trix joined #git
08:26 Cabanossi joined #git
08:27 fatalhalt joined #git
08:27 K1ck3dByC0ns0l3 joined #git
08:32 vuoto joined #git
08:33 Cabanossi joined #git
08:33 Ardethian\ joined #git
08:34 Ardethian joined #git
08:35 chid joined #git
08:35 finalbeta joined #git
08:43 m_____ joined #git
08:44 pks joined #git
08:45 danslo_ joined #git
08:45 brillenfux joined #git
08:49 iamrohit7 joined #git
08:51 iamrohit7 i have three commits in my branch a, b, c with c being the latest. but c only changes a small error message and i would like to have 'c' in 'a'. how do i do it?
08:52 ngperfex joined #git
08:55 jknetl joined #git
08:55 fuchstronaut joined #git
08:55 fuchstronaut joined #git
08:56 kadoban iamrohit7: With git reset -i, you can reorder commits and squash commits together (either keeping or discarding the commit message of the one, as you like)
08:56 usm4n joined #git
08:57 King_Hual joined #git
08:58 fuchstronaut joined #git
08:59 Puffball joined #git
09:01 usm4n_ joined #git
09:05 nidr0x joined #git
09:09 xaa joined #git
09:10 Ardethian\work\ joined #git
09:11 bocaneri joined #git
09:13 WayToDoor joined #git
09:15 nidr0x joined #git
09:20 iamrohit7 kadoban: there doesn't seem to be any -i option to reset
09:20 kadoban iamrohit7: rebase, sorry
09:20 Murii joined #git
09:20 sssilver joined #git
09:20 jaguarmagenta joined #git
09:20 Limes joined #git
09:23 zivester joined #git
09:24 Jackneill_ joined #git
09:24 Anja joined #git
09:25 iamrohit7 kadoban: i don't seem to understand how
09:25 iamrohit7 could you be more specific on how to do it?
09:26 kadoban iamrohit7: Not at the moment, someone else'll have to try. I think the manpage gives quite a bit of info if not.
09:27 ki0 joined #git
09:27 iamrohit7 kadoban: the order i want a->b->c to be is this a->c->b and if it's possible, a, c into a single commit d and then d->c
09:29 iamrohit7 kadoban: sure. thanks for the help
09:29 kadoban iamrohit7: Yes, that is very possible
09:29 davimore_ joined #git
09:34 _ADN_ joined #git
09:38 djb-irc joined #git
09:38 iamrohit7 joined #git
09:39 davimore__ joined #git
09:40 eivarv joined #git
09:42 howdoi joined #git
09:44 Glooomy joined #git
09:45 djb-irc joined #git
09:49 User458764 joined #git
09:50 User458764 joined #git
09:50 drbean_ joined #git
09:51 K1ck3dByC0ns0l3 joined #git
09:52 diogenese joined #git
09:52 cyan__ joined #git
09:52 davimore_ joined #git
09:52 drbean joined #git
09:55 davimore joined #git
09:55 drbean- joined #git
09:57 drbean_ joined #git
09:59 zartu joined #git
09:59 SteffanW joined #git
09:59 drbean joined #git
09:59 t0by joined #git
10:00 peepsalot joined #git
10:00 Balliad joined #git
10:05 drbean_ joined #git
10:08 peeps[lappy] joined #git
10:08 iamrohit7 joined #git
10:08 djb-irc joined #git
10:09 drbean joined #git
10:10 eivarv joined #git
10:12 ki0 joined #git
10:19 Faylite joined #git
10:21 Faylite_ joined #git
10:25 drbean_ joined #git
10:28 stuh84 joined #git
10:28 Aboba__ joined #git
10:29 Puffball joined #git
10:33 fuchstronaut joined #git
10:33 cagedwisdom joined #git
10:42 drbean joined #git
10:46 danslo_ joined #git
10:46 LucaTM joined #git
10:47 davimore joined #git
10:47 satifant joined #git
10:48 davimore_ joined #git
10:48 djb-irc joined #git
10:48 ieee joined #git
10:52 SporkWitch joined #git
10:55 davimore joined #git
10:59 ochorocho__ joined #git
11:06 djb-irc joined #git
11:08 laumann joined #git
11:09 GenZai joined #git
11:10 grayjoc joined #git
11:13 doener joined #git
11:15 linwei joined #git
11:15 subhojit_ joined #git
11:16 Derperperd joined #git
11:18 Puhe joined #git
11:19 Balliad joined #git
11:20 HoierM joined #git
11:27 ahmedelgabri joined #git
11:28 akurniawan joined #git
11:28 raijin joined #git
11:31 eivarv joined #git
11:31 robattila256 joined #git
11:31 nikivi joined #git
11:35 User458764 joined #git
11:37 fahadash joined #git
11:38 aswen joined #git
11:39 ahmedelgabri joined #git
11:40 netj joined #git
11:44 patrick99e99 joined #git
11:47 danslo_ joined #git
11:48 dan2k3k4 joined #git
11:49 freimatz joined #git
11:50 mischat joined #git
11:50 finalbeta joined #git
11:51 mischat joined #git
11:51 cdg joined #git
11:51 mischat joined #git
11:55 cdg_ joined #git
11:59 mischat joined #git
12:00 ochorocho__ joined #git
12:01 KeelOfSteel joined #git
12:01 a3Dman joined #git
12:02 Jellyg00se joined #git
12:06 MasterKrain joined #git
12:08 MasterKrain Hi, anyone on? I was wondering what the difference is between using the windows cmd, and Git Bash
12:08 eivarv joined #git
12:12 ngperfex joined #git
12:14 eivarv_ joined #git
12:14 mischat joined #git
12:16 alhariel joined #git
12:17 ochorocho__ joined #git
12:17 Jameser joined #git
12:17 cbreak joined #git
12:19 moritz they are two different programs
12:19 moritz it's a bit like asking "what's the difference between using linux and windows"
12:21 PocketKiller left #git
12:23 mizu_no_oto joined #git
12:23 Istanbul_Sea joined #git
12:26 Istanbul_Sea joined #git
12:30 PocketKiller joined #git
12:30 eivarv joined #git
12:40 ahmedelgabri joined #git
12:41 jim left #git
12:42 PocketKiller left #git
12:44 pasky joined #git
12:44 patrick99e99 joined #git
12:46 theskillwithin joined #git
12:51 eivarv joined #git
12:53 skunkz joined #git
12:53 eivarv joined #git
12:55 Starky joined #git
12:59 User458764 joined #git
13:04 grayjoc joined #git
13:09 floatingman joined #git
13:09 PioneerAxon joined #git
13:11 jstimm joined #git
13:12 eivarv_ joined #git
13:12 CEnnis91 joined #git
13:13 m0viefreak joined #git
13:14 Prawnzy joined #git
13:14 zartu joined #git
13:18 sdothum joined #git
13:20 Glooomy joined #git
13:21 flavius joined #git
13:22 denimsoft joined #git
13:24 sdothum joined #git
13:25 eivarv joined #git
13:28 InfoTest joined #git
13:28 drbean_ joined #git
13:28 mischat joined #git
13:29 robotroll joined #git
13:29 madewokherd joined #git
13:31 Derperperd joined #git
13:32 Gsham joined #git
13:33 drbean joined #git
13:33 PioneerAxon joined #git
13:35 User458764 joined #git
13:39 drbean_ joined #git
13:40 thecat joined #git
13:41 ahmedelgabri joined #git
13:41 Ravana joined #git
13:41 GavinMagnus joined #git
13:44 drbean joined #git
13:45 drbean_ joined #git
13:47 Karazhan joined #git
13:48 mrpackethead joined #git
13:48 d0nn1e joined #git
13:50 Aboba joined #git
13:52 courrier joined #git
13:52 zartu joined #git
13:53 OtakuSenpai joined #git
13:53 OtakuSenpai what command do i use to rename a file in a repo?
13:55 vannorden joined #git
13:55 bremner man git mv
13:55 gitinfo the git-mv manpage is available at http://jk.gs/git-mv.html
13:57 lindenle joined #git
14:01 _ikke_ which is a shortcut for mv old new && git rm --cached old && git add new
14:06 drbean joined #git
14:07 ayjay_t joined #git
14:09 drbean_ joined #git
14:09 ayjay_t joined #git
14:10 JamesBaxter joined #git
14:10 drbean- joined #git
14:11 modlin joined #git
14:12 andrew710 joined #git
14:12 drbean| joined #git
14:16 madewokherd joined #git
14:18 mischat joined #git
14:21 freimatz joined #git
14:21 mellernoia joined #git
14:22 raijin joined #git
14:24 snowkidind joined #git
14:28 eivarv joined #git
14:29 zartu joined #git
14:30 OtakuSenpai left #git
14:30 mischat joined #git
14:32 xlegoman joined #git
14:32 andrew710 joined #git
14:38 dreiss joined #git
14:39 JamesBaxter joined #git
14:41 gdelfino joined #git
14:41 zivester joined #git
14:42 ahmedelgabri joined #git
14:42 pbrewczynski joined #git
14:43 WayToDoor joined #git
14:52 jbitdrop joined #git
14:54 _ADN_ joined #git
14:58 Goplat joined #git
14:59 a_thakur joined #git
15:00 StrongJava joined #git
15:02 andrew711 joined #git
15:05 zartu joined #git
15:06 _ADN_ joined #git
15:10 JrCs joined #git
15:10 sq-one joined #git
15:11 netj joined #git
15:11 railssmith joined #git
15:13 grayjoc joined #git
15:15 tzhuang joined #git
15:16 Xuefer joined #git
15:19 modlin joined #git
15:21 anonymuse joined #git
15:22 cdg joined #git
15:25 e14 joined #git
15:27 BlaXpirit !mv
15:27 gitinfo [!rename] git does not support explicitly file renaming - the 'git mv' command is shorthand for 'git rm --cached; mv; git add'. All "rename" statistics are generated at runtime when examining history with git-log. See the -M option in the git-log manpage for more info. Also public-inbox.org/git/Pine.L​NX.4.58.0504150753440.7211@ppc970.osdl.org and `diff.renames = true`  in man git-config
15:28 Paker joined #git
15:29 e14_ joined #git
15:29 mizu_no_oto joined #git
15:30 StrongJava joined #git
15:31 mischat joined #git
15:31 shmuli joined #git
15:33 f3r70rr35f joined #git
15:35 bannakaffalatta joined #git
15:37 pks joined #git
15:42 ahmedelgabri joined #git
15:45 modlin joined #git
15:50 cdown_ joined #git
15:51 CEnnis91 joined #git
15:56 Oebele joined #git
15:57 ki0 joined #git
15:58 meauses joined #git
16:00 joki joined #git
16:00 shmuli joined #git
16:02 fahadash joined #git
16:03 anonymuse joined #git
16:04 meauses_ joined #git
16:05 kingpinlz_ joined #git
16:06 nd_ joined #git
16:10 shmuli joined #git
16:10 subhojit777 joined #git
16:12 nettoweb joined #git
16:12 jaguarmagenta joined #git
16:14 GavinMagnus joined #git
16:15 subhojit_ joined #git
16:17 jcalonso_ joined #git
16:19 kbs joined #git
16:21 e14 joined #git
16:22 StrongJava joined #git
16:23 e14_ joined #git
16:24 ych joined #git
16:27 ochorocho__ joined #git
16:32 mischat joined #git
16:32 Remram joined #git
16:32 dpower joined #git
16:34 railssmith joined #git
16:35 nettoweb joined #git
16:37 cdg_ joined #git
16:37 the_cybersphinx joined #git
16:40 davimore joined #git
16:43 ahmedelgabri joined #git
16:46 shmuli joined #git
16:47 dviola joined #git
16:50 gareppa joined #git
16:51 anddam joined #git
16:51 anddam hello
16:51 snappy joined #git
16:51 anddam can I have a conditional user.email while working on repo with a certain origin?
16:52 snappy joined #git
16:52 Seveas you can set it in that repo
16:52 someone235 joined #git
16:53 anddam can I have a global option that is conditional, like my default email is A@foo.invalid but when origin is github.com/someproject then use B@bar.invalid ?
16:53 anddam I mean rather than having it on a per-repo basis
16:53 Seveas no
16:53 Seveas I work around that limitation in a very dodgy way: https://github.com/seveas/dotfi​les/blob/master/.bashrc.d/cd.sh
16:54 anddam ok, thanks
16:54 anddam I mean I have no problem setting it in the specific projects I need but I was curious if it was an option at all
16:55 russo joined #git
16:59 anuxivm joined #git
16:59 xall_ joined #git
16:59 subhojit__ joined #git
17:00 Prawnzy joined #git
17:00 CheckDavid joined #git
17:01 modlin joined #git
17:02 Rwy joined #git
17:05 brillenfux joined #git
17:05 NeverTired joined #git
17:06 Limes joined #git
17:08 usm4n joined #git
17:09 gigq joined #git
17:09 railssmith joined #git
17:09 jknetl joined #git
17:10 werdfriek joined #git
17:10 dan2k3k4 joined #git
17:11 Noldorin joined #git
17:11 xlegoman joined #git
17:13 mizu_no_oto joined #git
17:19 Derperperd joined #git
17:23 King_Hual joined #git
17:24 denimsoft joined #git
17:24 watabou joined #git
17:26 ybden joined #git
17:26 ariston77 joined #git
17:28 vannorden joined #git
17:29 ariston77 left #git
17:29 ariston77 joined #git
17:30 ariston77 left #git
17:32 mischat joined #git
17:33 jaafar joined #git
17:33 patrick99e99 joined #git
17:36 kyan joined #git
17:39 subhojit_ joined #git
17:41 wget joined #git
17:44 shubhnik joined #git
17:45 StrongJava joined #git
17:47 jstimm joined #git
17:48 shubhnik joined #git
17:48 nawwmz joined #git
17:53 laumann joined #git
17:54 Balliad joined #git
17:54 ahmedelgabri joined #git
17:57 cagedwisdom joined #git
17:57 theskillwithin joined #git
17:59 Lorcatar joined #git
17:59 anddam bye
17:59 anddam left #git
18:01 bathtub_shark joined #git
18:02 shymega left #git
18:04 zartu joined #git
18:06 navidr joined #git
18:06 sssilver joined #git
18:08 lindenle joined #git
18:10 Darcidride joined #git
18:11 finalbeta joined #git
18:13 rbern joined #git
18:13 Learath2 joined #git
18:14 jeffreylevesque joined #git
18:17 Balliad joined #git
18:18 magellanicloud joined #git
18:19 doppo joined #git
18:22 kristofferR joined #git
18:22 ki0 joined #git
18:22 mehola joined #git
18:25 vannorden joined #git
18:25 DeltaHeavy joined #git
18:25 toogley joined #git
18:27 meauses joined #git
18:27 meauses_ joined #git
18:28 Darcidride joined #git
18:28 nawwmz joined #git
18:28 atesc joined #git
18:29 ych joined #git
18:31 jstimm joined #git
18:31 foist joined #git
18:33 mischat joined #git
18:34 foist A tree describes a directory that Git keeps track of. How does it make sense for a tag to be of type `tree`?
18:34 _ikke_ foist: A tag can _point_ to a tree
18:34 _ikke_ It can point to any object
18:35 GenZai joined #git
18:36 watabou joined #git
18:36 meauses joined #git
18:36 meauses_ joined #git
18:38 foist I don’t quite get it. Tags are refs, which are just labels for places in history to allow you to navigate the graph easier. What’s the point of tagging a tree?
18:41 foist Seems like a reference to both a place and a time...
18:47 scarabx joined #git
18:47 doener joined #git
18:48 mkoskar joined #git
18:48 BenderRodriguez joined #git
18:49 Sonderblade can this egrep pattern be expressed using git grep: "(^|\s)stack-size($|\s)" ?
18:53 avar git grep -E "(^|\s)stack-size($|\s)" ?
18:53 avar or -P for pcre
18:53 InfoTest joined #git
18:54 avar also I think what you probably mean is '\bstack-size\b'
18:54 irqq joined #git
18:55 ahmedelgabri joined #git
18:58 ayjay_t joined #git
19:03 _ikke_ foist: Not sure about tagging a tree, but tagging an object can make sense
19:03 xameada joined #git
19:04 Sonderblade avar: i didn't know about the -E switch, why isn't it on by default?
19:05 _ikke_ Sonderblade: same behaviour as grep
19:05 bmahe joined #git
19:05 shmuli joined #git
19:07 spm_draget joined #git
19:07 parsnip joined #git
19:09 avar Sonderblade: git config --global grep.extendedRegexp true
19:09 DeltaHeavy left #git
19:09 foist _ikke_: can you elaborate on tagging objects?
19:10 spm_draget Someone copied the contents of a git repository and added it to an SVN repository. Now, after many commits, I have the task to bring those changes back into the git which had developedd independently :( I imported the SVN with 'git svn clone'. I wanted to create a branch in the original git repository, but I need to find the base where the data was copied into the svn repository. But I fail at doing this. Any hints?
19:11 spm_draget I exported the changes that were made in the SVN as patch-files. But I fail to find point in the git repository where those patches apply without errors.
19:13 somiaj joined #git
19:13 somiaj Hello, trying to learn git. I have two patches that didn't get merged into master correctly. I have their sha id numbers, but can't figure out how to combin them into a new git commit. I've tried git merge and apply the patches locally, but git status says there is nothing to be commited.
19:15 dzho somiaj: is there a merge conflict?
19:15 lacour joined #git
19:15 dzho and when you say 'master' you mean, the remote master (probably called "origin")?
19:16 somiaj dzho: not that I know of, they apply locally just fine.
19:16 somiaj dzho: yea the master branch of the origin on github. My branch was merged with master, but two commits on it were not corretly applyed before the merge. I have them in the history and can apply them locally. I just need to get them into a commit so I can put them in a new branch to be merged.
19:16 leprechau joined #git
19:16 dzho are you on local master, then, according to 'git status'?
19:17 somiaj On branch js/fvwm-menu-desktop-new
19:17 somiaj trying to put these commits in a new branch since I can't upload to master directly.
19:17 dzho so, you're working on a clone made directly from the github repo.
19:18 somiaj so I created the branch, I applied the commits with git merge <sha number>
19:18 somiaj yes
19:18 dzho what you probably want to do is, in github, clone to your own 'fork' on github, then clone that locally, then apply your changes to it, then push to your github fork, then generate a pull request from your github fork to the upstream.
19:19 dzho 'fork' being, in this context, what github calls clones that are hosted on github
19:19 dzho it's not a git term as such, so there can be a lot of confusion around that for beginners, imnsho
19:19 n00bdev joined #git
19:20 somiaj yea, I kinda know what github means by fork. Though seems strange to me I can't take these two commits and put them in a single commit in a new branch.
19:20 dzho commits are commits, you don't put them in other commits usually, as such
19:20 Anja joined #git
19:20 dzho you want to put them in a new branch locally?
19:20 somiaj yea, so is there a way to create a branch that is master + these two commits?
19:20 dzho sure
19:20 dzho git checkout -b mynewbranchname
19:21 somiaj well I need to upload it to github so it can be merged with master (since it is setup that commits have to be merged once they pass ab uild check)
19:21 _nwkj86 joined #git
19:21 dzho then make changes to mynewbranchname as appropriate
19:21 dzho you need to stop thinking of "master" as a unitary thing.
19:21 dzho it's just a name of a branch somewhere, maybe upstream, maybe locally
19:22 somiaj dzho: I've done this, I create a new branch. I apply the commits with git merge. After I do that do I just upload the branch since there are no new commits to make?
19:22 dzho in some projects, there may in fact not even be *any* branches named "master"
19:23 dzho instead of "upload" what one does is "push". But as you know now, you can only "push" to a remote to which you have permission.
19:23 somiaj dzho: this is where I got stuck. After I applied the patches to my new branch, I didn't see how to get them uploaded since I'm use to do this through commits, but git status isn't showing any changes (due to using old commits)
19:23 dzho you need to push them to your own branch in your own repo on github
19:23 somiaj okay, so seems that since the commits are already there, I just need to push the branch, that is where I was lost.
19:23 somiaj I was expecting to see changes in git status
19:24 dzho you don't push, at this point.
19:24 dzho if you see the changes in your repo, the only thing you can do is issue a pull request
19:24 dzho this allows the upstream to decide whether they want your commits or not.
19:24 xameada joined #git
19:24 ahmedelgabri joined #git
19:25 denimsoft joined #git
19:25 somiaj dzho: I'm kinda upstream, so I have access. We just have it setup so changes first have to be done in a branch.
19:25 dzho hmm.
19:25 somiaj but I will admit, I am still learning git.
19:25 somiaj and how they have development setup using it
19:26 dzho ok, the only difference here is that you generate your pull request, to yourself in a manner of speaking, and then you accept your own pull request.
19:26 einnjo joined #git
19:26 dzho I am still learning git.
19:26 dzho :-)
19:27 dzho the nice thing about this sort of workflow, where you push to a non-master branch, and then do the PR dance, is that it generates all sorts of nice notifications for other members of the team.
19:27 dzho a lot of this is more github-specific rather than git proper.
19:28 somiaj dzho: yea I'm liking it, just learning how to correctly deal with it.
19:30 manuel joined #git
19:30 joki joined #git
19:30 * dzho nods
19:32 dzho somiaj: anyway, if you have permission to push to a non-master branch of a shared repo, you can still generate a new PR for bringing the commits over from one branch to the other.
19:35 mischat joined #git
19:38 cdown joined #git
19:40 leprechau joined #git
19:41 sssilver joined #git
19:41 kenden joined #git
19:43 Darren_ joined #git
19:44 durham joined #git
19:44 durham joined #git
19:48 leprechau joined #git
19:52 Gsham joined #git
19:55 Mixologic joined #git
19:58 boombatower joined #git
19:59 modlin joined #git
20:00 matoro joined #git
20:00 [Brain] joined #git
20:02 snthsnth joined #git
20:03 cdg joined #git
20:04 netj joined #git
20:04 apotry joined #git
20:04 patrick99e99 joined #git
20:05 GavinMagnus left #git
20:06 Balliad joined #git
20:07 meauses joined #git
20:07 meauses_ joined #git
20:08 Oatmeal joined #git
20:09 ochorocho__ joined #git
20:09 nedbat Seveas: i made a few pull requests against your git cookbook
20:10 nedbat (sorry, merge requests)
20:10 shmuli joined #git
20:10 aidalgol joined #git
20:11 f4 joined #git
20:11 realz joined #git
20:13 modlin joined #git
20:14 SwiftMatt joined #git
20:14 xall_ joined #git
20:15 GavinMagnus joined #git
20:17 jottr joined #git
20:17 Ahmed90 joined #git
20:18 atesc joined #git
20:19 Prawnzy joined #git
20:21 JanC_ joined #git
20:23 GavinMagnus joined #git
20:25 resurtm2 joined #git
20:26 FrameFever joined #git
20:26 modlin joined #git
20:26 Balliad joined #git
20:26 FrameFever when i add a submodule, how can I say that I want to track a certain branch?
20:26 FrameFever e.g. the master branch
20:27 resurtm joined #git
20:30 Emperor_Earth joined #git
20:30 moritz FrameFever: you can't; submodules are pinned to specific commits, not to branches
20:30 shubhnik when i do this --> " shubhnik@shubhnik-Satellite-C655:~/Desktop/gittry$ git clone ~/testing-sample "
20:31 shubhnik this error shows up --> " fatal: repository '/home/shubhnik/testing-sample' does not exist "
20:31 shubhnik why?
20:32 mikecmpbll joined #git
20:33 Faylite_ joined #git
20:34 jottr_ joined #git
20:34 JexSys joined #git
20:36 moritz I'd guess becaseu the repo doesn't exist :-)
20:36 mischat joined #git
20:36 patrick99e99 joined #git
20:37 mizu_no_oto joined #git
20:38 shubhnik testing-sample exists :(
20:38 moritz if it is indeed a git repo, you could try strace, see if you can spot the place where it goes wrong
20:39 shubhnik which one should be a git repo?
20:39 GavinMagnus joined #git
20:39 shubhnik i am first timer,i did this
20:39 shubhnik mkdir gittry in Desktop
20:39 shubhnik than cd gittry
20:39 shubhnik than git init
20:39 shubhnik than git clone ~/testing-sample
20:40 jottr joined #git
20:40 gfixler joined #git
20:40 shubhnik is there any wrong with the above commands?
20:40 canton7 shubhnik, yeah - 'clone' creates a new git repo, but you're trying to clone into a pre-existing git repo
20:41 shubhnik it showing error again
20:41 mischat joined #git
20:42 shubhnik i have testing-sample folder in my Home directory
20:42 GavinMagnus left #git
20:43 DrSlony joined #git
20:43 patrick99e99 joined #git
20:44 davimore joined #git
20:45 DrSlony Hello. What decides which branch one finds oneself on after cloning a project, if that project has no "master" branch? Specifically, we currently have a "master" and "gtk3" branch. Master uses Gtk2. Currently all commits go into master and that gets merged into gtk3 with changes as needed. Now we want to switch the way we work so that all commits go into gtk3, so we could rename "master" to "gtk2" and rename "gtk3" to "master" or just
20:46 DrSlony leave it. If we leave it, there will be no "master" branch. So if someone clones the project, which branch will they find themselves in?
20:47 Endarked joined #git
20:47 tobiasvl DrSlony: what HEAD points to
20:48 FrameFever moritz: I added in my gitmodules submodule following entry
20:48 FrameFever branch = master
20:48 FrameFever git config -f .gitmodules submodule.<path>.branch <branch>
20:50 K1ck3dByC0ns0l3 joined #git
20:51 Xuefer joined #git
20:51 LucaTM_ joined #git
20:51 DrSlony tobiasvl I understand that HEAD changes to point to whichever branch I checkout. But how do I make it point to branch foo so that when someone checks out the code, they land on foo?
20:52 tobiasvl DrSlony: you checkout that branch
20:52 tobiasvl you said it yourself :)
20:52 DrSlony tobiasvl but without checking out, just cloning the repo
20:52 tobiasvl DrSlony: I don't follow
20:53 DrSlony s/someone checks out/someone clones/
20:53 DrSlony ;)
20:53 tobiasvl you can also set HEAD with man git symbolic-ref
20:53 gitinfo the git-symbolic-ref manpage is available at http://jk.gs/git-symbolic-ref.html
20:53 tobiasvl for bare repos
20:54 patrick99e99 joined #git
20:54 DrSlony thank you, i'll study that
20:54 tobiasvl DrSlony: I still don't understand what you mean. without checking out how
20:54 DrSlony tobiasvl: just "git clone git@github.com:Beep6581/RawTherapee.git" for example
20:55 DrSlony currently one will always find oneself in master after doing that
20:55 satifant the remote also has a HEAD... thats what tobiasvl was talking about ;)
20:55 DrSlony i wonder what happens when i rename master to gtk2, and i want people to be on gtk3 when they clone
20:56 satifant after cloning your HEAD (e.g. your checked-out branch) will be the same as the HEAD of the remote you cloned from... :)
20:56 A5101 joined #git
20:56 tobiasvl yes, that is what I meant. sorry if that was not clear.
20:57 DrSlony if i understand the implication correctly, if a repo has a branch "master" but someone commits to branch "foo" and pushes that, and then i clone the repo, are you saying i would be on branch "foo"?
20:59 tobiasvl DrSlony: let's just gloss over that part. I see you use github. on github you set the default branch (ie. the HEAD of the github repo) in the settings on the webpage.
21:00 mrpackethead joined #git
21:01 tobiasvl DrSlony: here https://help.github.com/articl​es/setting-the-default-branch/
21:02 xall_ joined #git
21:02 nettoweb joined #git
21:04 patrick99e99 joined #git
21:06 ych joined #git
21:06 DrSlony tobiasvl true, though that sounds like cheating ;)
21:07 dhollinger joined #git
21:07 DrSlony thank you for the help, time to sleep, good night
21:09 patrick99e99 joined #git
21:09 sssilver joined #git
21:10 nettoweb joined #git
21:13 kimonorouge joined #git
21:13 Balliad joined #git
21:16 pikajude joined #git
21:17 kimonorouge joined #git
21:18 kenden joined #git
21:25 ochorocho__ joined #git
21:25 xall_ joined #git
21:26 Electrometro joined #git
21:27 denimsoft joined #git
21:29 matsaman joined #git
21:30 qws-user-1229 joined #git
21:30 fahadash joined #git
21:31 spm_draget left #git
21:31 johnlage joined #git
21:32 mizu_no_oto joined #git
21:36 jamick joined #git
21:36 aarobc joined #git
21:36 sssilver joined #git
21:37 patrick99e99 joined #git
21:39 snthsnth joined #git
21:39 AfroThundr joined #git
21:39 FrameFever how to I set my submodule to a certain tag?
21:39 raijin joined #git
21:41 tvw joined #git
21:41 danslo_ joined #git
21:42 fuchstronaut joined #git
21:42 mischat joined #git
21:42 Muzer joined #git
21:45 Fissure joined #git
21:45 jaguarmagenta joined #git
21:46 nikivi joined #git
21:48 cdown_ joined #git
21:49 moritz cd path/to/submodule; git checkout thetag
21:49 moritz cd -; git commit path/to/submodule
21:50 matsaman joined #git
21:51 Balliad joined #git
21:52 matsaman joined #git
21:53 e14 joined #git
21:54 nidr0x joined #git
21:55 Goplat joined #git
21:56 fuchstronaut joined #git
21:58 kimonorouge joined #git
22:00 xameada joined #git
22:01 FrameFever left #git
22:02 jozwior joined #git
22:04 Darcidride joined #git
22:08 jaguarmagenta joined #git
22:09 Remram joined #git
22:10 e14 joined #git
22:11 Starky joined #git
22:13 mizu_no_oto joined #git
22:14 KnownSyntax joined #git
22:14 KnownSyntax joined #git
22:19 einnjo joined #git
22:19 nidr0x joined #git
22:20 jottr_ joined #git
22:22 Balliad joined #git
22:23 mizu_no_oto joined #git
22:24 atesc joined #git
22:26 sonikspin joined #git
22:28 atesc joined #git
22:29 Noldorin joined #git
22:30 kimonorouge joined #git
22:31 akurniawan joined #git
22:33 atesc joined #git
22:33 mischat joined #git
22:39 Noldorin joined #git
22:41 mischat joined #git
22:41 Derperperd joined #git
22:41 mizu_no_oto joined #git
22:42 xall_ joined #git
22:42 danslo_ joined #git
22:42 cagedwisdom joined #git
22:43 JamesBaxter joined #git
22:44 FreeWebHosting joined #git
22:45 nidr0x joined #git
22:46 misterpink joined #git
22:47 nettoweb joined #git
22:48 mrpackethead joined #git
22:48 mischat joined #git
22:49 Noldorin joined #git
22:50 aarobc joined #git
22:50 jaeckel joined #git
22:56 alhariel joined #git
22:58 Sasazuka__ joined #git
22:59 alex1a joined #git
23:02 jottr joined #git
23:02 GavinMagnus joined #git
23:07 rkazak joined #git
23:08 thejoecarroll_ joined #git
23:09 jason237 joined #git
23:12 Dohplay joined #git
23:12 Prawnzy joined #git
23:19 Jameser joined #git
23:20 misterpink joined #git
23:21 nd joined #git
23:23 JamesBaxter joined #git
23:25 GavinMagnus joined #git
23:26 xall_ joined #git
23:29 GavinMagnus left #git
23:31 dreiss joined #git
23:32 overlordtm joined #git
23:34 diogenese joined #git
23:40 diogenese joined #git
23:41 mizu_no_oto joined #git
23:43 mischat joined #git
23:43 mischat joined #git
23:44 mischat joined #git
23:45 mischat joined #git
23:45 nettoweb joined #git
23:46 mischat joined #git
23:47 mischat joined #git
23:50 werdfriek joined #git
23:52 akurniawan joined #git
23:55 kbs joined #git
23:55 ISmithers joined #git
23:55 mizu_no_oto joined #git

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