IRCloggy #git 2014-12-21

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2014-12-21

→ devoldmx joined00:00
← zacts left00:00
→ EminenceHC joined00:01
← freeman42 left00:02
← otter768 left00:02
← kadoban left00:03
→ astrofog joined00:03
→ whomp joined00:04
→ saumye joined00:05
← mizu_no_oto left00:06
→ Reskp joined00:09
→ Hestil joined00:09
← EminenceHC left00:10
← Takle_ left00:11
→ Takle joined00:11
→ AmR|EiSa joined00:12
← Reskp left00:13
← Hestil left00:14
→ Anders_J joined00:15
← Takle left00:16
← Gizburdt left00:17
← diegoviola left00:18
← saumye left00:19
→ brucelee joined00:19
→ Gizburdt joined00:19
→ alanwill_ joined00:21
← upene left00:22
← Gizburdt left00:22
← hackel left00:23
← WaReZ left00:25
← devoldmx left00:26
← alanwill_ left00:26
→ saumye joined00:26
→ devoldmx joined00:28
→ kadoban joined00:30
→ watabou joined00:32
← flughafe1 left00:32
→ Guest92 joined00:32
← watabou left00:32
→ watabou joined00:32
→ maestrojed joined00:33
← kadoban left00:33
→ tristanp joined00:36
← nour__ left00:36
→ dreiss joined00:38
← mezod left00:39
← tgunr left00:39
→ CKyle joined00:40
← scriptThis left00:41
← kyb3r_ left00:41
← St_Marx left00:42
← booboy left00:42
→ kyb3r_ joined00:42
→ St_Marx joined00:42
→ tgunr joined00:43
← CheckDavid left00:44
← FreezingCold left00:45
→ FreezingCold joined00:48
← Guest92 left00:48
→ alanwill_ joined00:48
← CKyle left00:49
→ Goplat joined00:50
→ DonVitoCorleone joined00:52
→ DolphinDream joined00:54
→ jottr joined00:56
→ reim joined00:58
← pm90_ left01:00
→ fstd joined01:00
← jottr left01:01
→ Reskp joined01:10
→ Sendoushi joined01:12
← fstd left01:13
→ Orbitrix joined01:13
← Orbitrix left01:13
→ Orbitrix joined01:14
← Reskp left01:14
← Orbitrix left01:14
→ Orbitrix joined01:14
← alanwill_ left01:15
← jgardella left01:15
→ gnfz joined01:15
→ jgardella joined01:16
→ johnny2600 joined01:16
← brucelee left01:16
← tristanp left01:16
← Sendoushi left01:17
→ Takle joined01:17
← devoldmx left01:17
← whomp left01:18
← mikewintermute left01:19
← Takle left01:22
→ sgen_ joined01:22
← robustus left01:22
← Anders_J left01:23
→ CKyle joined01:25
→ CheckDavid joined01:26
→ robustus joined01:26
← s00pcan left01:26
→ intransi_ joined01:27
← ra0 left01:28
→ s00pcan joined01:28
→ brucelee joined01:28
← intransi_ left01:30
← intransit left01:31
→ whomp joined01:31
← mroach left01:32
← reim left01:32
→ fstd joined01:32
← brucelee left01:33
← polyzen left01:33
← CKyle left01:33
→ bollullera joined01:34
→ Guest92 joined01:35
→ devoldmx joined01:35
→ valeriansaliou joined01:36
→ polyzen joined01:36
← fstd left01:37
← Guest92 left01:37
← valeriansaliou left01:40
← Zentdayn left01:42
← johnny2600 left01:43
← dreiss left01:43
→ aah_ joined01:43
→ pibby joined01:45
→ s_e joined01:48
→ listochkin joined01:48
→ spuz joined01:50
← dorkmafia left01:51
← rhombus left01:52
→ ecky--ptang-zoob joined01:52
← listochkin left01:53
→ fstd joined01:53
→ EminenceHC joined01:54
← kirin` left01:54
→ cagedwisdom joined01:54
← spuz left01:55
← EminenceHC left01:58
← s00pcan left01:59
→ otter768 joined01:59
→ Pezmc joined02:00
→ s00pcan joined02:01
← nikio_ left02:01
→ EminenceHC joined02:01
← s00pcan left02:01
→ unomystEz joined02:02
← AmR|EiSa left02:02
→ s00pcan joined02:02
→ AmR|EiSa joined02:03
← otter768 left02:03
→ kirin` joined02:04
→ Sasazuka joined02:07
← Sasazuka left02:07
→ nikio_ joined02:08
← jazzzu left02:08
← EminenceHC left02:09
→ chrisshattuck joined02:09
← bonhoeffer left02:09
→ jazzzu joined02:09
→ hstefan joined02:10
→ Reskp joined02:10
→ kukks joined02:11
← Reskp left02:15
← astrofog left02:16
← electrix left02:16
← whomp left02:16
→ electrix joined02:17
→ hahuang61 joined02:17
→ Takle joined02:18
← bheesham left02:19
→ netcarver joined02:22
→ ra0 joined02:22
← Takle left02:23
→ SumDude joined02:23
→ booboy joined02:23
← gibbs left02:24
← SumDude left02:24
→ t4nk341 joined02:25
→ salimoneus joined02:26
→ CKyle joined02:26
→ jonmorehouse joined02:27
← sebhoss left02:28
← unomystEz left02:29
← CKyle left02:31
→ mroach joined02:31
← AmR|EiSa left02:31
salimoneus so i'd like to do a mirror copy of a git repo from github to my local git "master server". i cloned the github remote repo onto my server, and then have a cron job which just does a "fetch" once per day. should this work ok and result in an exact mirror of the github repo, including all history and everything?02:32
→ preyalone joined02:32
← jonmorehouse left02:32
← t4nk341 left02:33
← netcarver left02:34
→ kossy joined02:36
→ sohail joined02:37
→ whomp joined02:38
→ mizu_no_oto joined02:39
→ drag0nius joined02:40
drag0nius why isn't git 2.x installer provided for windows?02:40
→ sohail` joined02:41
→ harish joined02:41
drag0nius is it not stable/supported or something like that?02:41
← sohail left02:42
→ Vampire0_ joined02:44
→ Dougie187 joined02:44
→ jottr joined02:45
← netj left02:46
← eletuchy left02:46
→ netj joined02:46
→ eletuchy joined02:46
← bollullera left02:47
→ gcristian-casa joined02:49
← jottr left02:49
→ aidalgol joined02:51
← aah_ left02:51
← RDove left02:53
→ apurcell joined02:54
← harish left02:57
salimoneus is git fetch -q all i need to add to a cron to keep a mirror repo fully updated?02:58
← jazzzu left02:58
J1G|Anon126 salimoneus: in theory yes02:58
← apurcell left02:58
J1G|Anon126 wait...02:58
you would need to make the local branches02:59
salimoneus the mirror will never be updated outside of the cron job02:59
J1G|Anon126 salimoneus: are you planning to fetch from this mirror or...?03:00
→ Sendoushi joined03:01
← joelm left03:05
← Sendoushi left03:06
salimoneus no the mirror is just there to serve as a backup in case for instance if github goes away one day without notice (unlikely but backups are always good)03:07
github is the only repo that client will access03:07
← whomp left03:08
→ darkbasic joined03:08
J1G|Anon126 salimoneus: then I suppose that's all you need to do. but restoring the backup will take some work03:09
→ bonhoeffer joined03:10
→ Reskp joined03:11
→ m0viefreak joined03:12
← chrisshattuck left03:12
→ joelm joined03:12
→ tmcmahon joined03:14
→ dreiss joined03:14
← Reskp left03:15
salimoneus hmm interesting, so say for instance if github closes its doors tomorrow, so i reconfigure my "clients" to clone from my mirrored copy, they won't necessarily have an accurate history of the repo?03:16
→ whomp joined03:17
J1G|Anon126 they should03:17
but if you want to restore it to some other Git hosting site, you would need to add the "local" branches on the server and push them03:18
← mroach left03:18
salimoneus the server that is "mirroring" the github repo is also serving as master server for some other repos, so it would just pick up the work for the ones it had been mirroring03:18
→ Takle joined03:18
← mizu_no_oto left03:18
J1G|Anon126 okay03:19
← tmcmahon left03:19
→ mroach joined03:20
← dreiss left03:20
← Takle left03:23
← maestrojed left03:24
← duderonomy left03:24
← johnLate left03:25
← salimoneus left03:27
→ salimoneus joined03:27
← fstd left03:29
← whomp left03:30
→ skorgon joined03:32
← skorgon left03:32
→ skorgon joined03:32
← salimoneus left03:35
→ fstd joined03:35
→ msonntag joined03:37
← mroach left03:39
← fstd left03:41
→ APerson_ joined03:43
→ brucelee joined03:43
→ fstd joined03:45
→ alanwill joined03:45
→ listochkin joined03:48
← LucasTT__ left03:49
→ pppp2 joined03:49
→ aviraldg joined03:50
← listochkin left03:52
→ EminenceHC joined03:53
← Noldorin left03:55
→ in2rd joined03:57
→ arnaud___ joined03:58
← EminenceHC left03:58
→ Sendoushi joined03:58
→ devoldmx3 joined03:58
→ otter768 joined04:00
→ leen^| joined04:00
← devoldmx left04:01
→ EminenceHC joined04:01
← devoldmx3 left04:02
← arnaud___ left04:02
← s_e left04:03
← sgen_ left04:03
← m0viefreak left04:04
→ jonmorehouse joined04:04
← otter768 left04:04
← fstd left04:04
→ s_e joined04:05
→ fstd joined04:05
← Una left04:08
→ arnaud___ joined04:09
← EminenceHC left04:09
← arnaud___ left04:09
→ Reskp joined04:12
← brucelee left04:12
→ qbann0p joined04:16
← Reskp left04:17
← qbann0p left04:17
→ qbann0p joined04:17
→ arnaud____ joined04:18
→ Takle joined04:19
→ astrofog joined04:20
→ APerson__ joined04:21
← APerson__ left04:22
← arnaud____ left04:22
→ APerson__ joined04:22
← Takle left04:24
→ tekkbuzz joined04:25
← APerson_ left04:25
← Sendoushi left04:27
← aviraldg left04:28
← APerson__ left04:28
→ armyriad joined04:30
→ aviraldg joined04:30
← aviraldg left04:31
→ mroach joined04:33
→ jottr joined04:33
→ aviraldg joined04:34
← aviraldg left04:34
→ angelsl joined04:35
→ zouave joined04:35
← gnfz left04:35
← booboy left04:36
← Dougie187 left04:37
← jottr left04:38
→ Una joined04:39
← drag0nius left04:42
→ apurcell joined04:43
→ kcm1700_ joined04:43
→ arnaud____ joined04:44
← kcm1700 left04:45
→ ome joined04:45
→ wookienz joined04:47
← apurcell left04:47
← qbann0p left04:48
→ fandi_ joined04:48
→ Zenith77 joined04:48
← jonmorehouse left04:48
← bonhoeffer left04:50
← Una left04:51
→ fwaokda joined04:52
→ kenneth joined04:52
→ The_Phoenix joined04:53
← fstd left04:56
→ fstd joined04:58
→ Una joined04:58
→ Una_ joined05:02
← DolphinDream left05:03
← Una_ left05:04
→ Rastus_Vernon joined05:04
→ Una_ joined05:04
← Una left05:05
→ jonmorehouse joined05:05
← Una_ left05:07
→ Una joined05:08
← Una left05:09
← armyriad left05:10
← MattMaker left05:11
→ Una joined05:11
→ armyriad joined05:11
→ ehmatthes joined05:12
← sohail` left05:12
→ Reskp joined05:13
← Una left05:14
→ qwebirc92123 joined05:15
← bobmarchman left05:16
→ nnyk_ joined05:16
← Reskp left05:17
→ russt joined05:19
→ Takle joined05:20
→ AndroUser466 joined05:21
→ bobmarchman joined05:22
→ DolphinDream joined05:22
→ intransit joined05:23
→ irqq joined05:24
← Takle left05:25
← irqq left05:32
→ irqq joined05:32
← CheckDavid left05:34
← AndroUser466 left05:37
→ AndroUser466 joined05:37
→ sgen__ joined05:41
→ s8321414 joined05:42
→ jaydubya joined05:43
→ bonhoeffer joined05:44
← CEnnis91 left05:45
→ Floatingman joined05:45
← sgen__ left05:46
→ dreiss joined05:46
← jaydubya left05:47
← intransit left05:49
→ intransit joined05:49
← dreiss left05:51
→ spuz joined05:52
→ EminenceHC joined05:53
→ Literphor joined05:54
← DolphinDream left05:55
← nnyk_ left05:55
← spuz left05:56
→ decimad2 joined05:57
← Literphor left05:57
← in2rd left05:58
← EminenceHC left05:58
← joelm left06:00
← bobmarchman left06:00
→ bobmarchman joined06:00
→ otter768 joined06:01
→ EminenceHC joined06:01
← saumye left06:01
← arnaud____ left06:03
→ joelm joined06:03
→ arnaud____ joined06:04
→ Literphor joined06:05
← otter768 left06:05
← arnaud____ left06:08
→ d1b joined06:08
← EminenceHC left06:09
→ raven-au joined06:09
← kukks left06:10
→ exbuhe joined06:12
→ King_Hual joined06:12
→ Reskp joined06:13
exbuhe hey everyone - I'm trying to setup a server with one common objects directory for all the repositories on it.06:14
→ subhojit777 joined06:14
exbuhe so I've symlinked the objects directory from each test repository I've setup.06:14
but when git prune is called, it deletes objects from other repositories06:14
← Consuela left06:14
exbuhe so I want to tell git prune to *always* call another command which will call 'git rev-parse --all' on all the repositories before pruning06:15
is there a way to do this in the .gitconfig on the server?06:15
→ arnaud____ joined06:15
← jonmorehouse left06:17
← Reskp left06:18
→ asdofindia joined06:19
← electrix left06:20
← lindenle left06:20
→ Takle joined06:21
← raven-au left06:21
→ lindenle joined06:22
→ jottr joined06:22
→ bheesham joined06:23
← exbuhe left06:23
→ raven-au joined06:23
→ exbuhe joined06:24
← Gamecubic left06:25
← King_Hual left06:25
← Takle left06:25
← astrofog left06:26
mahmoud is a branch nothing but a pointer to a commit?06:27
← jottr left06:27
→ reyha joined06:28
exbuhe @mahmoud pretty sure that's the case06:28
mahmoud a tag is also nothing but a pointer to a commit?06:29
exbuhe ummm, I think so as well.06:29
mahmoud redundancy much?06:30
what's the point06:30
exbuhe You can sign a tag.06:30
mahmoud can i sign a commit?06:30
→ AmR|EiSa joined06:31
exbuhe via a tag06:31
mahmoud why can't i just sign any commit?06:31
→ apurcell joined06:32
exbuhe commits only contain data about the current working directory tree and the previous commit06:32
mahmoud so tags are only there to allow signing stuff?06:32
exbuhe http://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work06:32
ummm, well you can also do things like 'tag this commit as official v1.4 release', which is nice for end-users06:32
but largely I think tags are a convenience/candy thing06:33
that online book is really good, I've been reading through bits of it slowly. It helps a lot to follow along with the examples too. In case you haven't seen it before.06:34
preaction there are "annotated tags" and "simple tags". annotated tags are an actual object, simple tags are just a note attached to a commit06:34
← gcristian-casa left06:34
preaction a branch is something you can add commits to. you can't add commits to a tag06:35
exbuhe can you put a sig in a simple tag?06:35
preaction i don't think so06:35
exbuhe hmmm, if you can attach arbitrary data to a simple tag you can sign something, but it's probably much less convenient than using the built-in machinery.06:35
← apurcell left06:36
← aidalgol left06:37
← ecky--ptang-zoob left06:37
← twisted` left06:38
→ dsdeiz joined06:40
← teadrop__ left06:40
→ devoldmx joined06:41
→ teadrop__ joined06:41
→ Consuela joined06:43
→ twisted` joined06:44
← lindenle left06:45
mahmoud why should there be any discremination between branches and tags?06:46
→ binarus joined06:46
exbuhe Branches point at the tip of a branch, tags can point at any commit?06:47
← arnaud____ left06:47
mahmoud ohh06:47
so branches are dynamic pointers?06:47
exbuhe well, I think branches are stored outside the object database, inside 'refs' in '.git', right? but tags are just special objects which point at a specific commit.06:48
so when someone else updates their version of a branch, the server knows that that same branch name now points to a new tip commit by storing it in refs06:49
then you can query the server, and it will tell you the new tip, and you can say 'that doesnt match mine' and get the rest of teh data06:49
preaction branches have a head, that head moves. tags don't move. tags can't move without ugly notices06:49
mahmoud neat06:50
→ sgen__ joined06:50
→ lindenle joined06:50
← sgen__ left06:51
← dm7freek left06:55
→ khaon joined06:55
→ EminenceHC joined06:57
khaon Hello I have a little question I couldn't find an asnwer, or at least the one I found didn't suit my need. I want to merge/import all commits related to the content of a specifiy folder. How can i do so? I dont want two merge the two kernels, I tried readtree. Ofc I can important that manually but i am not interested in doing so, thx u06:58
← preyalone left06:59
→ Dopagod joined06:59
exbuhe @khaon perhaps with a 'sparse checkout'07:00
stackoverflow.com/questions/180052/checkout-subdirectories-in-git07:00
← netj left07:01
exbuhe but I don't think that will grab the commits you want, only the folder itself. You may have to merge it yourself doing that.07:01
→ netj joined07:01
← EminenceHC left07:02
khaon yeah I just wanted in fact to merge a subdir07:02
going to look at your link07:02
checkout a dir wont grab commits07:02
it just imports07:03
→ fatalhalt joined07:03
exbuhe yeah...grabbing the commits related to just a folder seems hard.07:03
So do the two share a common history at some point?07:03
khaon in my case it was f2fs's folder07:03
← osw left07:03
khaon what somewhere surely, one is 3.17 and mine 3.4.y07:03
what-> woot*07:04
← lindenle left07:04
→ dm7freek joined07:04
← alanwill left07:04
exbuhe So 3.17 is ahead of yours, and you want to put your changes in 3.4.y on top of 3.17?07:05
← bonhoeffer left07:06
exbuhe any chance you can do it with a rebase or a branch merge?07:06
→ lindenle joined07:06
khaon well I gues i could merge th whole kernel and reset anything but f2fs folder and its two header, but than what would happen in the merge commit history07:07
← Literphor left07:07
→ koderok joined07:07
→ sudoBacon joined07:07
← J1G|Anon126 left07:07
→ Literphor joined07:07
← joelm left07:08
→ sgen__ joined07:09
→ devoldmx3 joined07:09
← koderok left07:10
→ arnaud____ joined07:10
→ teran joined07:12
exbuhe so, khaon you cloned the 3.4 kernel, then made you changes, and now want your changes on top of 3.17? can't you just make a new branch f2fs.3.4 or something, switch to master branch, 'git pull' to get latest kernel, then 'git merge f2fs.3.4'? Then the mergetool will run you through any conflicts. I'm not sure I understand your situation.07:12
→ _0xAX joined07:12
→ devoldmx27 joined07:12
← devoldmx3 left07:13
← devoldmx left07:13
→ devoldmx joined07:13
→ mikewintermute joined07:13
khaon i have my own nexus 10 android kernel running f2fs from the upstream branch : http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs.git/log/fs/f2fs?h=linux-3.407:14
→ Reskp joined07:14
khaon I wanted to merge the file( already done and working) but i was wondering if ther ewer e a way to merge and pick all the commits07:14
files*07:15
← netj left07:15
→ dm7freek_ joined07:15
→ netj joined07:15
← teran_ left07:15
→ ManikM joined07:15
exbuhe so you want to push your changes to the server, but only for that directory?07:15
→ joo-_ joined07:16
← devoldmx27 left07:17
← sgen__ left07:17
← Literphor left07:17
← dm7freek left07:18
→ Kicer86 joined07:18
← Reskp left07:19
khaon i just want to merge all f2fs commits to have the history that s all07:19
← russt left07:21
← kenneth left07:21
→ dm7freek joined07:21
→ teran_ joined07:21
→ Takle joined07:21
← teran left07:22
← ra0 left07:22
← lindenle left07:23
← dm7freek_ left07:23
← joo-_ left07:23
← Takle left07:26
← toothrot left07:26
→ dorkmafia joined07:27
→ kenneth joined07:27
exbuhe @khaon commits refer to the hash of the previous commit to build up a history, so if you want to clean up your history then it involves rewriting all commits from where you want to start.07:28
perhaps this will help? sethrobertson.github.io/GitFixUm/07:29
← bheesham left07:29
→ lindenle joined07:29
→ CEnnis91 joined07:30
CEnnis91 → Guest648007:30
← devoldmx left07:30
→ jaydubya joined07:31
khaon i see, well there are too many commits then i fear so07:31
→ devoldmx3 joined07:31
← Guest6480 left07:31
→ Guest6480 joined07:32
→ Takle joined07:33
← kenneth left07:33
← lindenle left07:34
→ devoldmx33 joined07:34
← dm7freek left07:35
← FreezingCold left07:35
← jaydubya left07:35
← Guest6480 left07:35
→ Guest6480 joined07:36
→ FreezingCold joined07:36
→ dm7freek joined07:36
← Takle left07:38
→ kenneth joined07:38
← exbuhe left07:38
← Lyqyd left07:38
← madewokherd left07:39
→ lindenle joined07:39
→ dm7freek_ joined07:40
← arnaud____ left07:41
← Dopagod left07:41
← dm7freek left07:43
← dorkmafia left07:45
khaon went afk, i will try again with read tree -m (merge option)07:46
→ dreiss joined07:47
→ dm7freek joined07:47
→ jonmorehouse joined07:48
← kenneth left07:48
← dm7freek_ left07:48
← lindenle left07:49
← raven-au left07:51
→ raven-au joined07:52
→ t4nk839 joined07:52
→ spuz joined07:53
← nikio_ left07:53
→ redrocket joined07:54
← HelloShitty left07:54
→ maestrojed joined07:55
← _0xAX left07:55
← thiago left07:55
t4nk839 hi, i would like to contribute in development of GIT. can someone help me get started.07:55
← spuz left07:58
bremner t4nk839: are you already an expert git user? that seems like the obvious first step.07:58
← raven-au left07:59
← maestrojed left07:59
t4nk839 yeah, i use git .07:59
→ dm7freek_ joined08:00
bremner so what specifically do you want to contribute?08:00
→ EminenceHC joined08:01
→ raven-au joined08:01
→ otter768 joined08:01
← dm7freek left08:02
→ KadeYuy joined08:02
→ devoldmx joined08:03
→ nour__ joined08:03
→ a-l-e joined08:05
← otter768 left08:06
→ hoijuiL joined08:07
← devoldmx33 left08:07
t4nk839 <bremner> i am new to contributing for open source. I have only worked on my own projects.08:08
← tekkbuzz left08:08
← devoldmx left08:08
← mikewintermute left08:09
← EminenceHC left08:09
→ kenneth joined08:10
bremner t4nk839: it usually works that people find some aspect of the software that they personally think could be better (e.g. a bug, or missing feature) and work on that.08:11
→ jottr joined08:11
t4nk839 <bremner>is there any guidelines while contributing for git08:12
bremner t4nk839: there is for low level details like patch formatting. But it sounds like you are asking about something different.08:14
t4nk839: you could start by reading the reviews of other people's patches on the mailing list.08:15
t4nk839 ok.thanks08:15
→ Reskp joined08:15
skorgon there is also a lot to read in the Documentation folder of the git repo08:15
← jottr left08:16
← kenneth left08:16
→ devoldmx joined08:16
→ jceb joined08:17
← dm7freek_ left08:19
→ dm7freek joined08:19
← a-l-e left08:19
→ frank_o joined08:20
← Reskp left08:20
← nginx77 left08:20
← irqq left08:21
← _5kg left08:21
khaon reitering my question , sorry for annoince, its kinda simple but lost to it: http://pastebin.com/MbhfCMJ108:21
frank_o Hi! I'm having trouble making "clean commits" as I usually multitask making tons of unrelated changes to each file before committing. Usually my commit messages are like "1) Add foo, 2) Fix bar, 3) ..."08:22
How do you guys usually operate to prevent this sorta mess? Do you switch between branches or something?08:22
→ FunkyAss joined08:23
bremner no, just don't use commit -a and reorder commits as needed08:23
← bobmarchman left08:23
→ Takle joined08:23
Guest6480 → CEnnis9108:23
← CEnnis91 left08:23
→ CEnnis91 joined08:23
← CEnnis91 left08:23
→ CEnnis91 joined08:23
skorgon commit separate things in separate commits ussing commit --squash or --fixup and at some point i rebase --interactive and make it look nice08:23
→ bobmarchman joined08:23
preaction add -i is my friend in that situation08:23
frank_o Very cool!08:24
khaon how preventing rebasing to remove merges?08:25
each time it makes my current branch x commits behind the forked one even it we are even08:25
→ _5kg joined08:25
bremner see the rebase manpage, there is an option, and caveats08:26
→ dm7freek_ joined08:26
← ManikM left08:26
← dsdeiz left08:26
bremner khaon: maybe you have some other solution. What are you trying to achieve? basicially if you want to preserve merges, merge is a better tool than rebase.08:27
← dm7freek left08:27
← t4nk839 left08:28
khaon well08:28
← bobmarchman left08:28
khaon i have many many conflits doing a merge i just want a fs/f2fs folder containing 8 c files or so but with 250++ commits08:28
and i would have them in my git history08:28
when i speak about rebase i am a bad git user:p08:29
i like rebasing on typo or very low fixes making the merges gone08:29
← devoldmx left08:31
→ dm7freek joined08:32
← hahuang61 left08:33
← Takle left08:33
→ ra0 joined08:34
bremner khaon: it's normal to use rebase for that, maybe you just need to choose a more recent commit to rebase against and not include any merges.08:34
← dm7freek_ left08:35
khaon yes but sometimes it is impossible , like you merge smthing and notice the next day a former commit has to be fixed08:35
i am kinda beginner , i had greg kh book and never read it08:35
- git one)08:35
← fandi_ left08:36
← sudoBacon left08:38
← skorgon left08:39
→ Takle joined08:41
→ kenneth joined08:41
→ mikewintermute joined08:42
→ sarri joined08:47
moritz oh hai08:47
I'd like to write a tool that builds something from git08:47
and you can specify something commitish for which revision to build08:48
so 'thingy build 2014.12', where 2014.12 is a tag name08:48
← s8321414 left08:48
bremner so wrap git-archive?08:48
→ fandi joined08:48
moritz the problem is that when people specify branch names, they say 'thingy build master', but they actually mean origin/master08:49
preaction do they, though?08:49
moritz preaction: yes08:49
preaction origin is a remote. do they really want to build the remote's version of master and not their own version of master?08:49
moritz preaction: this is a git repo cloned only for building, not for local work08:49
preaction you can still create the branches that track the remote08:49
moritz so, my question is: how do I figure out what to pass to 'git checkout'08:50
preaction git branch -a? git ls-remote maybe?08:50
bremner git show-ref and a pile of heuristics?08:50
moritz preaction: but then I have to know that I have to 'git pull' in that case, wheras a 'git pull' will complain in detached HEAD state08:50
preaction so don't detach head08:50
moritz preaction: but that's exactly what 'thingy build <tagname>' will do08:51
preaction temporarily, sure08:51
checkout tagname; build; checkout <previous location>08:51
bremner or just use git-archive and a tempdir08:51
← reyha left08:52
moritz preaction: that's a bit fragile; what if the tool dies before the last checkout?08:52
→ `mx joined08:53
← fandi left08:53
preaction then you're left exactly where it died so that you can diagnose what went wrong08:53
→ rendar joined08:53
moritz wonders if the simplest thing is just to attach an 'origin/' to the front, and if that fails, try again without the origin/08:54
← Goplat left08:55
bremner and if the remote is renamed?08:55
preaction or read the branches you have with git branch -a08:55
moritz bremner: I can assume that won't happen, because it's a repository just for building, not for development work08:56
bremner the next guy will curse your assumptions, but whatever.08:56
preaction ever? nobody will ever develop using it? then why is it a git repo?08:57
moritz preaction: somebody develops and pushes to the remote that the build repo tracks08:57
preaction your tool could just download tarballs from an http location08:58
moritz but the local repo is under the control of my tool, and if somebody messes with the private state of my tool, they can expect my tool to fail08:58
→ wachterjohannes joined08:58
moritz just like firefox will crash if you randomly edit fils in ~/.firefox08:58
→ nnyk_ joined09:00
→ ManikM joined09:02
→ thevishy joined09:03
moritz ok, the solution I'm now using is git rev-parse -q --verify $refspec09:03
erm09:03
git rev-parse -q --verify origin/$refspec09:03
and if that succeeds, I use origin/$refspec, otherwise just $refspec09:03
← ehmatthes left09:04
← nnyk_ left09:05
→ airscape joined09:06
→ dc5ala joined09:07
← AmR|EiSa left09:08
← subhojit777 left09:10
← zouave left09:12
→ AmR|EiSa joined09:12
← kcj left09:12
→ airscape_ joined09:14
→ Reskp joined09:16
→ PCatinean joined09:16
→ fandi joined09:17
← airscape left09:18
← dreiss left09:19
→ jaydubya joined09:19
← Reskp left09:21
← leen^| left09:21
Seveas moritz: if you clone ot with --mirror, there's no 'origin' prefix :)09:22
That's the approach I take in my CI tool09:22
s/ot/it/09:22
moritz Seveas: oh, interesting09:23
→ bobmarchman joined09:24
Seveas also, turn $thingy into a sha1 early on in the process and store the sha1 so you can reliably retry the same commit09:24
← jaydubya left09:25
→ BlaXpirit joined09:26
← mikewintermute left09:26
← ra0 left09:27
← Rastus_Vernon left09:27
← fandi left09:27
→ flughafe1 joined09:30
← bobmarchman left09:30
→ ruukasu joined09:34
→ k4rtik joined09:35
→ petersr joined09:36
→ Anders_J joined09:38
← watabou left09:38
→ khmarbaise joined09:40
→ Reskp joined09:41
→ pantsman- joined09:42
→ n-st joined09:45
→ HelloShitty joined09:47
← ManikM left09:47
← k4rtik left09:49
→ harish joined09:49
← raven-au left09:50
→ denisMone joined09:51
→ r0bby_ joined09:52
→ EminenceHC joined09:53
→ raven-au joined09:54
→ spuz_ joined09:54
← rikko left09:54
← Reskp left09:54
→ FabTG joined09:54
→ skylite joined09:55
← jonmorehouse left09:56
→ Reskp joined09:57
→ osw joined09:57
← EminenceHC left09:58
← Reskp left09:58
→ brucelee joined09:58
← spuz_ left09:59
→ a_le joined09:59
→ jottr joined10:00
→ EminenceHC joined10:01
← khmarbaise left10:02
→ otter768 joined10:02
← jottr left10:04
← EminenceHC left10:06
← michelangelo left10:06
← raven-au left10:06
← harish left10:06
← otter768 left10:07
← skylite left10:09
→ skylite joined10:10
← AndroUser466 left10:11
← n-st left10:12
→ kotopies joined10:14
→ raven-au joined10:14
→ markgrady joined10:14
→ sulaiman joined10:14
← fatalhalt left10:15
sulaiman Hello, I was playing with github pages to build a static website, I have a few commits where I experimented with some jekyll themes. Is it possible to combine all merges into a single commit and proceed from there?10:16
I think it's called rebasing10:17
Seveas sulaiman: yes, with an interactive rebase you can squash all you want :)10:18
→ catsup joined10:20
← catsup left10:21
→ catsup joined10:22
→ mezod joined10:23
→ WaReZ joined10:23
→ Reskp joined10:24
← r0bby_ left10:25
→ r0bby_ joined10:26
→ bobmarchman joined10:26
← kenneth left10:28
→ nikio_ joined10:28
→ corni joined10:29
← bobmarchman left10:31
← AmR|EiSa left10:31
→ shpoont joined10:32
← Reskp left10:33
← wachterjohannes left10:33
→ tgummerer joined10:33
← kyb3r_ left10:34
→ vmiklos joined10:36
→ AmR|EiSa joined10:41
→ himikof joined10:44
← asdofindia left10:46
→ jaydubya joined10:50
← airscape_ left10:51
← Takle left10:51
→ joel_falcou joined10:52
→ airscape joined10:52
← r0bby_ left10:53
→ r0bby_ joined10:54
→ fandi joined10:55
→ Gama11 joined10:56
← markgrady left10:57
→ cultavix joined10:57
← cultavix left10:58
→ lucianangelus joined10:58
← FunkyAss left10:59
→ cultavix joined11:02
→ bheesham joined11:05
← airscape left11:05
← CEnnis91 left11:05
← AmR|EiSa left11:06
→ airscape joined11:07
→ frank_o_ joined11:07
← frank_o left11:07
→ Takle joined11:09
← frank_o_ left11:09
→ AmR|EiSa joined11:09
→ nfk joined11:14
→ airscape_ joined11:14
→ Shusshu joined11:15
← Shusshu left11:15
← airscape left11:16
← cultavix left11:17
→ Kulrak joined11:17
← Kulrak left11:17
→ Kulrak joined11:17
→ airscape joined11:18
→ lindenle joined11:18
→ joo-_ joined11:19
→ jrahmy joined11:19
→ Nizumzen joined11:19
← jrahmy left11:19
← airscape_ left11:21
→ wachterjohannes joined11:22
← flughafe1 left11:22
→ aswen joined11:22
← lindenle left11:22
→ stamina joined11:23
← joo-_ left11:24
→ Jackneill joined11:24
← fr33domlover left11:25
→ CheckDavid joined11:30
← AmR|EiSa left11:31
→ s8321414 joined11:32
← aswen left11:32
→ Gege joined11:34
→ AmR|EiSa joined11:34
→ mizu_no_oto joined11:34
← ap0c left11:36
→ aswen joined11:37
→ nikio__ joined11:39
← mizu_no_oto left11:41
← Walex left11:42
→ khmarbaise joined11:42
→ fr33domlover joined11:42
← nikio_ left11:42
→ Walex joined11:43
← aswen left11:43
← pppp2 left11:44
nikio__ → nikio_11:45
→ jottr joined11:49
→ ManikM joined11:51
← jottr left11:53
→ EminenceHC joined11:54
→ spuz_ joined11:55
→ upene joined11:57
← r0bby_ left11:58
→ r0bby_ joined11:58
← EminenceHC left11:58
← spuz_ left11:59
→ flughafe1 joined11:59
→ EminenceHC joined12:01
→ otter768 joined12:03
← tgunr left12:04
→ alex__ joined12:05
→ reim joined12:05
← EminenceHC left12:06
→ hexagoxel joined12:06
→ metastableB joined12:07
→ Daerist joined12:07
← otter768 left12:08
← KadeYuy left12:08
← brucelee left12:08
← kotopies left12:09
← flughafe1 left12:13
← upene left12:14
→ bobmarchman joined12:15
→ bonhoeffer joined12:17
→ valeriansaliou joined12:17
← cagedwisdom left12:19
← stamina left12:19
← bobmarchman left12:20
← Daerist left12:22
→ Daerist joined12:22
→ teran joined12:24
← r0bby_ left12:25
→ r0bby_ joined12:25
← catsup left12:25
← teran_ left12:27
← teran left12:29
j416 is there a way to ignore the diff of a line of which the only change is an added or removed comma at the end?12:32
yes, I'm talking about diffs of lists where something has been added or removed, causing the addition or removal of a trailing comma on the line before12:32
Daerist → Daerist`12:33
→ m0viefreak joined12:33
→ tvw joined12:34
osse sounds like something I can adapt my "casediff.awk" script to do12:35
→ GHAAFGIQ joined12:37
→ JTABT3RP joined12:37
→ qwebirc92123_ joined12:38
Joost` I submitted a pull request on github, but selected the wrong target branch (i.e. I should've submitted a pull request to :dev) what do you suggest12:39
Is the best way to file a new pull request?12:39
← qwebirc92123_ left12:39
← qwebirc92123 left12:39
→ qwebirc92123 joined12:39
← angelsl left12:40
→ aah_ joined12:40
← reim left12:41
← qwebirc92123 left12:41
→ Reskp joined12:41
→ qwebirc92123 joined12:41
→ catsup joined12:42
→ a_ joined12:42
→ Gamecubic joined12:45
← Anders_J left12:45
← Reskp left12:46
→ Mixologic joined12:46
→ chiromante joined12:47
← dc5ala left12:48
→ joo-_ joined12:49
→ quetz joined12:50
→ aswen joined12:51
← Walex left12:55
← jceb left12:55
→ Walex joined12:57
← khmarbaise left12:58
← fstd left13:00
→ fstd joined13:00
← Takle left13:01
→ monbro joined13:01
osse j416: i got it to work but it will only print the @@ line13:03
← joo-_ left13:03
j416 osse: hm. thanks for trying13:03
osse: I'm thinking maybe color-words with a regex could do it13:04
→ khmarbaise joined13:04
→ lindenle joined13:04
← r0bby_ left13:04
→ ciampix joined13:05
bonhoeffer hey — i’ve been working on a repo and see on govtrack that someone else had made a lot of good changes. how do i merge with a different fork? or at least pull in their updates?13:06
→ joo-_ joined13:06
bonhoeffer my thought is to add the other repo as a remote then merge to that, but i thought github might have some online way to do that13:07
→ ecky--ptang-zoob joined13:08
→ mkoskar joined13:08
preaction bonhoeffer: no, that is what you have to do13:09
→ Takle joined13:09
bonhoeffer cool13:09
but this is helpful: https://github.com/blog/683-cross-repository-compare-view13:09
→ wrouesnel1 joined13:09
osse j416: luckily the reverse isn't so hard: git diff -G ',$'13:09
→ Reskp joined13:11
j416 osse: hm that did't work13:12
osse ahh13:12
stupid git diff13:12
it will still print the other changes in the same file13:12
→ jatt joined13:12
← jatt left13:12
→ jatt joined13:12
j416 osse: git diff --color-wors=[^,]13:15
that kind of did it13:15
← Reskp left13:15
j416 words* even13:15
← aswen left13:16
j416 will try it the next time I encounter such a diff13:16
thanks for the effort o/13:16
→ rhombus joined13:16
← ManikM left13:17
← dm7freek left13:17
sulaiman Seveas, thanks13:17
→ dm7freek joined13:17
→ Embassy joined13:19
osse j416: parsing diff output isn't easy :/ No wonder git-add--interactive is over 1000 lines13:22
← dm7freek left13:23
→ cntrl_ joined13:23
→ dm7freek joined13:23
j416 D:13:23
← shpoont left13:24
→ teran joined13:25
→ russt joined13:25
→ upene joined13:28
← teran left13:29
← AmR|EiSa left13:30
→ daedeloth joined13:31
→ Reskp joined13:32
→ shpoont joined13:32
→ AmR|EiSa joined13:35
→ jottr joined13:37
→ Vile joined13:37
osse i was hoping the "split" ability was something git diff could do by itself13:37
but git-add--interactive makes it up13:37
→ Gizburdt joined13:40
← AmR|EiSa left13:41
← jottr left13:42
← Vile left13:42
← upene left13:43
→ AmR|EiSa joined13:44
← bheesham left13:45
dachary is there a way to ask git checkout to set the last modified time of the file to the time of the last commit that modified it ?13:45
→ emx joined13:46
← polyzen left13:46
Seveas dachary: you can do a post-checkout hook, but it'll be slow until something like peff's blame-tree branch is merged. It's also a very bad idea.13:46
→ polyzen joined13:46
emx is there a way to get a list of files in a directory that were changed since a certain commit?13:46
dachary Seveas: I kind of remember it's not a good idea but I forgot why.13:47
← cntrl_ left13:47
osse emx: git diff --name-only {commit} -- {directory}13:47
emx osse, thanks13:48
Seveas dachary: e.g. checking out master after doing (checkout [email@hidden.address] && make) will then horribly confuse make13:48
make thinks 'source file is older than build product, don't need to rebuild', even though that's obviously false13:48
dachary ah, right ! thanks for refreshing my memory Seveas13:49
← AmR|EiSa left13:50
→ AmR|EiSa joined13:51
← Reskp left13:53
→ EminenceHC joined13:54
← bonhoeffer left13:54
← jatt left13:55
→ spuz_ joined13:55
→ markgrady joined13:55
← AmR|EiSa left13:57
← EminenceHC left13:59
← spuz_ left14:00
← petersr left14:00
→ bobmarchman joined14:01
→ EminenceHC joined14:01
→ k4rtik joined14:01
→ AmR|EiSa joined14:01
→ s8321414_ joined14:02
← AmR|EiSa left14:02
→ andi2 joined14:03
← thevishy left14:03
→ Noldorin joined14:03
← s8321414 left14:04
s8321414_ → s832141414:04
← joo-_ left14:04
→ otter768 joined14:04
→ duderonomy joined14:04
→ jacksparrow007 joined14:05
→ dangerou_ joined14:05
← lindenle left14:05
← bobmarchman left14:06
← HelloShitty left14:06
← sulaiman left14:06
← dangerou_ left14:06
← dm7freek left14:07
→ keko-2 joined14:07
→ Vile joined14:08
→ dm7freek joined14:08
← otter768 left14:09
← keko-2 left14:09
← EminenceHC left14:09
← Vile left14:09
→ bonhoeffer joined14:10
→ netcarver joined14:11
→ joo-_ joined14:12
→ Takle_ joined14:12
→ nastygibbon joined14:14
← Takle left14:15
→ thevishy joined14:15
← denisMone left14:16
→ franklin joined14:17
← joo-_ left14:19
→ joo-_ joined14:21
→ mjuszczak joined14:21
← alex__ left14:22
→ JanC joined14:23
← s8321414 left14:23
← monbro left14:23
→ teran joined14:25
→ harish joined14:29
← teran left14:30
→ chrisgeorge joined14:30
→ Milkweed joined14:31
← mroach left14:34
→ mroach joined14:35
→ haaja joined14:36
← hoijuiL left14:36
← khmarbaise left14:37
← chrisgeorge left14:37
→ khmarbaise joined14:37
→ stfn joined14:38
→ HelloShitty joined14:38
← mjuszczak left14:42
← wrouesnel1 left14:43
→ nnyk_ joined14:43
← franklin left14:44
← Noldorin left14:49
← metastableB left14:51
→ Noldorin joined14:51
← k4rtik left14:53
← netj left14:53
→ Reskp joined14:54
→ netj joined14:54
← bonhoeffer left14:57
← Reskp left14:58
← nikio_ left15:02
→ Artpicre joined15:04
← Milkweed left15:05
→ brucelee joined15:05
→ angelsl joined15:07
→ tomasm- joined15:08
← brucelee left15:10
→ gcristian-casa joined15:10
→ decimad2__ joined15:10
← decimad2 left15:10
tomasm- hey, I've got two projects that use the same (shared) subtree, stored elsewhere on my hard drive, and I seem to keep running into the issue where if I do work on one version of the subtree and commit it to the remote repo, then do some work on the other version (behind "master" at this point), I get issues pushing those changes.... it says "rejected.... failed to push some refs... the tip of your current branch is behind its remote counterpart,15:11
integrate the remote changes before pushing again"... the problem is that when I do a "git pull" it says "up-to-date", which isn't true.15:11
→ BSaboia joined15:12
→ Gama11_ joined15:15
← Gama11 left15:16
← rhombus left15:17
nastygibbon it could be that you are trying to push to somewhere different than where you are pulling from. have you checked where you are pulling/pushing to?15:20
→ nikio_ joined15:20
→ lindenle joined15:20
→ reim joined15:21
→ Akagi201 joined15:22
← mroach left15:25
← lindenle left15:25
← reim left15:25
→ reim joined15:25
← khmarbaise left15:26
→ jottr joined15:26
→ teran joined15:26
→ khmarbaise joined15:27
← aah_ left15:30
← jacksparrow007 left15:30
← teran left15:30
← angelsl left15:31
→ hpprinter100 joined15:31
← jottr left15:31
← pantsman- left15:35
← decimad2__ left15:36
→ diegoviola joined15:36
→ Marcus joined15:36
Marcus → Guest3019115:37
→ Dougie187 joined15:37
→ bonhoeffer joined15:38
← bonhoeffer left15:39
→ decimad joined15:39
← valeriansaliou left15:40
→ from-mars joined15:41
→ Reskp joined15:41
← tomasm- left15:42
→ joelm joined15:42
← Gizburdt left15:43
→ Gizburdt joined15:44
← CheckDavid left15:44
→ rikko joined15:45
→ jacksparrow007 joined15:45
← Reskp left15:46
→ aard joined15:47
→ zivester joined15:48
← ciampix left15:49
→ t0th_-_ joined15:49
→ daivyk joined15:49
→ dsdeiz joined15:49
→ bobmarchman joined15:50
← Gizburdt left15:50
← reim left15:51
→ ehmatthes joined15:53
→ EminenceHC joined15:53
← bobmarchman left15:54
→ Gizburdt joined15:56
→ reim joined15:56
→ spuz joined15:56
→ dreiss joined15:57
← EminenceHC left15:58
← spuz left16:01
→ EminenceHC joined16:01
← Guest30191 left16:01
→ DolphinDream joined16:02
→ Nickeeh joined16:03
← DolphinDream left16:03
→ otter768 joined16:05
→ cultavix joined16:06
← cultavix left16:06
← netj left16:06
→ dorkmafia joined16:06
→ netj joined16:06
← wachterjohannes left16:08
→ CEnnis91 joined16:08
← aard left16:08
← t0th_-_ left16:08
← joo-_ left16:08
→ t0th_-_ joined16:09
← EminenceHC left16:09
← otter768 left16:10
→ Reskp joined16:10
→ RedShift joined16:14
→ toothrot joined16:15
← DARSCODE left16:15
← Gizburdt left16:16
← Kulrak left16:16
→ jonmorehouse joined16:19
Seveas qsuscs: I just released version 2.1 of git-spindle, which should work OOTB. If not, yell and I'll fix it immediately (provided that I'm awake when you yell)16:20
← Reskp left16:21
→ lindenle joined16:22
← russt left16:23
← Embassy left16:23
→ Tomdarkness joined16:23
→ mjuszczak joined16:23
→ gnfz joined16:24
→ kukks joined16:24
→ koderok joined16:26
← koderok left16:26
→ MLM joined16:26
← lindenle left16:26
← pandeiro left16:27
→ teran joined16:27
→ bandroidx joined16:27
← shpoont left16:27
→ shpoont joined16:28
→ Kulrak joined16:30
← Kulrak left16:30
→ Kulrak joined16:30
← teran left16:31
→ endiruna joined16:32
← khmarbaise left16:33
→ azi`_ joined16:34
azi`_ working on my branch I did a git commit and then issued git reset --hard HEAD~1 . is there *any* way I could get the changes back?16:35
it appears that this removed my changes from before16:35
→ tekkbuzz joined16:35
→ zumba_ad_ joined16:36
← mjuszczak left16:36
→ metastableB joined16:38
→ mjuszczak joined16:38
grawity `git reset` to whatever commit ID you need (see `git log -g` and `git reflog` for "past" commits)16:39
ribasushi hi16:39
← m0viefreak left16:39
ribasushi how can I get a list of commits identical to what `git rebase -i <base> <branch>` generates?16:40
← D-Boy left16:40
→ unomystEz joined16:40
_ikke_ ribasushi: git log base branch16:40
euhm16:41
base..branch16:41
→ paulmcquad joined16:41
ribasushi errrr... that won't exclude different-commit-same-tree entries16:41
ribasushi tries anyway...16:41
ribasushi yeah, it's not identical16:42
azi`_ grawity: i did a git reset now but the file in question does not hold the stated changes. what could be going on?16:43
← mjuszczak left16:43
_ikke_ ribasushi: I don't think there is anything identical16:43
ribasushi: you might want to look into man git cherry16:44
gitinfo ribasushi: the git-cherry manpage is available at http://jk.gs/git-cherry.html16:44
← shpoont left16:44
ribasushi _ikke_: errrr there got to be something in the plumbing that generates the file to be edited by rebase -i surely?16:44
→ shpoont joined16:44
osse azi`_: git relog will list the previous commit. git reset to that one16:44
_ikke_ ribasushi: Not necessarily. If rebase itself filters out the duplicates16:44
→ joki joined16:45
_ikke_ but git cherry looks at the patch-id16:45
azi`_ osse: this is how the situation looks right now http://pastebin.com/4ecfgCAL the thing that I did were done under the branch name geodeticStuff16:46
← Kulrak left16:47
→ Reskp joined16:47
← Tomdarkness left16:47
Seveas ribasushi: git rev-list16:48
osse azi`_: git reset --hard 4cd153a16:48
← Consuela left16:48
→ jottr joined16:48
Seveas ribasushi: this is what rebase--interactive.sh calls:16:48
git rev-list $merges_option --pretty=oneline --abbrev-commit \16:48
--abbrev=7 --reverse --left-right --topo-order \16:48
$revisions ${restrict_revision+^$restrict_revision}16:48
→ pheaver joined16:48
Seveas plus a whole bunch more magic16:48
← dorkmafia left16:49
ribasushi Seveas: aha, excellent, thanks a lot16:49
azi`_ osse: hm.. this didn't give me the changes.. what could be going on ? :S16:49
→ bobmarchman joined16:50
← HelloShitty left16:50
← reim left16:52
→ nginx77 joined16:53
→ D-Boy joined16:54
→ BlaXpirit-UA joined16:55
← bobmarchman left16:55
← BlaXpirit-UA left16:55
→ BlaXpirit-UA joined16:55
← Reskp left16:55
→ dregad joined16:56
← airscape left16:56
← BlaXpirit left16:57
osse azi`_: these changes you are taking of, were they committed?16:58
→ ErKa joined16:59
← Walex left16:59
→ Gizburdt joined16:59
→ Kulrak joined17:00
← Kulrak left17:00
→ Kulrak joined17:00
azi`_ osse: yes17:02
← pheaver left17:03
osse azi`_: then they are in the reflog somewhere17:04
azi`_: try 'git reflog {branchname}' instead17:04
← t0th_-_ left17:05
osse azi`_: spot the message of the last commit you made17:06
→ t0th_-_ joined17:06
← t0th_-_ left17:07
← fr33domlover left17:08
→ t0th_-_ joined17:08
← t0th_-_ left17:08
azi`_ osse: thanks17:09
→ t0th_-_ joined17:09
→ LucasTT joined17:10
→ thiago joined17:11
← ome left17:11
→ dorkmafi1 joined17:11
← guide left17:13
→ DolphinDream joined17:13
← Gizburdt left17:14
← BlaXpirit-UA left17:14
→ BlaXpirit joined17:14
→ bobmarchman joined17:14
→ fr33domlover joined17:15
← ehmatthes left17:17
→ mueslo_ joined17:17
→ JohnBat26 joined17:18
→ joelm_ joined17:22
← jonmorehouse left17:22
→ Embassy joined17:23
← devoldmx3 left17:24
← joelm left17:24
→ Reskp joined17:25
→ Hestil joined17:25
← rikko left17:25
← Reskp left17:26
→ arnaud____ joined17:26
← dorkmafi1 left17:27
→ teran joined17:28
→ Reskp_ joined17:28
→ dangerousdave joined17:28
← Hestil left17:29
→ dangerou_ joined17:29
← metastableB left17:29
← nnyk_ left17:29
← DolphinDream left17:30
→ Hestil joined17:30
← teran left17:32
→ tokik joined17:32
→ DolphinDream joined17:33
← Jackneill left17:33
→ Zupoman joined17:33
→ harv joined17:33
→ Gizburdt joined17:33
→ Jackneill joined17:34
→ flughafe1 joined17:34
→ pheaver joined17:35
→ petersr joined17:36
← Reskp_ left17:36
→ r0bby_ joined17:36
← kukks left17:37
← Hestil left17:39
← flughafe1 left17:39
→ Reskp joined17:39
→ irqq joined17:39
← nastygibbon left17:40
→ rikko joined17:40
→ fecktd joined17:40
→ nastygibbon joined17:42
qsuscs Seveas: seems to work with python 317:42
except git hub say17:42
→ Hestil joined17:43
qsuscs Seveas: https://clbin.com/gMzrtp.png17:45
← jacksparrow007 left17:46
→ ChrisWarrick joined17:47
→ ojacobson joined17:50
← Gizburdt left17:50
→ Gizburdt joined17:51
← shpoont left17:51
← fecktd left17:52
← Gizburdt left17:52
→ shpoont joined17:52
← rikko left17:52
→ flughafe1 joined17:52
→ EminenceHC joined17:53
← khaon left17:54
→ ManikM joined17:55
← Hestil left17:56
→ Gizburdt joined17:56
→ spuz joined17:57
← endiruna left17:58
← EminenceHC left17:58
→ HelloShitty joined17:58
→ xcesariox joined17:59
→ Hestil joined18:00
← Reskp left18:00
← WaReZ left18:01
→ EminenceHC joined18:01
→ rpg joined18:01
← spuz left18:02
← Hestil left18:03
← xcesariox left18:03
→ xcesariox joined18:03
→ Reskp joined18:04
→ leen^| joined18:04
← jottr left18:04
→ otter768 joined18:06
osse holy shot18:07
s/ho/hi/18:07
Baden used to be a republic18:08
well... almost I guess18:08
← tokik left18:08
← EminenceHC left18:09
← otter768 left18:11
→ jottr joined18:11
→ Skapadapaduu joined18:11
→ sdegutis joined18:12
← Reskp left18:12
sdegutis I just accidentally hard-reset to HEAD^ and I'm trying to find the commit that used to have my new HEAD as its parent. Is this possible?18:12
← dangerousdave left18:12
osse sdegutis: it is most likely HEAD@{1}. Run git show HEAD@{1}18:12
sdegutis Yep, that's it! Thanks osse!18:13
→ otter768 joined18:13
osse all hail the reflog18:13
← sdegutis left18:13
← r0bby_ left18:14
→ r0bby_ joined18:15
← corni left18:16
← Takle_ left18:17
→ dangerousdave joined18:18
→ skorgon joined18:20
← skorgon left18:20
→ skorgon joined18:20
← bobmarchman left18:20
nastygibbon yeah that reflog is great. I used to copy and paste all of the SHAs into a separate file before I knew about it18:21
→ Hestil joined18:22
→ guide joined18:22
→ Reskp joined18:23
→ madewokherd joined18:24
→ devhoag joined18:24
→ anomalyst joined18:25
← Reskp left18:26
→ listochkin joined18:26
← otter768 left18:27
← paulmcquad left18:27
← gcristian-casa left18:27
→ zadock joined18:28
← xcesariox left18:28
→ teran joined18:29
→ otter768 joined18:29
→ dorkmafi1 joined18:29
→ Goplat joined18:31
qsuscs osse: it was, and before, it was a grand-duchy18:32
(which sounds like grand-douchebaggery or something like that)18:33
← teran left18:33
← intransit left18:35
← CEnnis91 left18:35
← nastygibbon left18:37
→ BSaboia_ joined18:38
→ nastygibbon joined18:39
← a_le left18:40
→ a_le joined18:40
→ meLon joined18:41
→ Malsasa_ joined18:41
Malsasa_ → Malsasa18:41
→ Reskp joined18:41
← meLon left18:41
← BSaboia left18:41
← Reskp left18:41
→ a_le_ joined18:41
← zadock left18:42
→ sgen__ joined18:43
← a_le left18:43
← arnaud____ left18:45
→ Reskp joined18:45
→ Marcus joined18:47
← dorkmafi1 left18:47
Marcus → Guest4606618:47
← otter768 left18:47
→ dorkmafi1 joined18:47
→ cultavix joined18:48
← cultavix left18:48
→ nnyk_ joined18:49
→ cultavix joined18:49
← Hestil left18:49
→ circ-user-L5vam joined18:50
← Malsasa left18:51
→ shpoont_ joined18:52
← Reskp left18:53
← shpoont left18:55
← HelloShitty left18:58
← listochkin left18:58
→ SimpleJack478 joined18:59
SimpleJack478 hello there :)19:00
gitinfo SimpleJack478: 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.19:00
→ Reskp joined19:00
→ APerson_ joined19:00
← Reskp left19:00
← APerson_ left19:01
SimpleJack478 I got a question about git's stash option19:01
→ APerson_ joined19:01
→ listochkin joined19:02
← nastygibbon left19:03
← ManikM left19:03
→ Takle joined19:04
→ meLon joined19:04
← LucasTT left19:04
← Nizumzen left19:04
→ LucasTT joined19:05
← LucasTT left19:05
→ joo-_ joined19:05
→ LucasTT joined19:05
→ anemator joined19:06
← armyriad left19:08
← dregad left19:08
→ armyriad joined19:08
← cultavix left19:09
← dorkmafi1 left19:10
zormit SimpleJack478: cool! just ask it19:11
!backup19:12
gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups19:12
→ WillMtl joined19:12
SimpleJack478 i try to build my own linux system for my Banana Pi and while running a build script an error occured saying „No stash found.“19:13
← irqq left19:13
SimpleJack478 I’m not sure if I should fix this error before continuing or if it isn’t a real error and if I can just go on building19:14
← dangerousdave left19:14
→ irqq joined19:14
← binarus left19:15
→ binarus joined19:15
← r0bby_ left19:16
← Takle left19:16
→ YuGiOh joined19:16
→ r0bby_ joined19:16
YuGiOh hello, when I do a git push, I don't see the changes on the remote repository... Can you help me please?19:17
zormit SimpleJack478: what has git to do with the building process?19:17
ojacobson YuGiOh: "see" how?19:17
← dangerou_ left19:18
→ Takle joined19:18
→ Consuela joined19:18
→ dangerousdave joined19:18
→ Takle_ joined19:19
← LucasTT left19:19
skorgon YuGiOh: does it throw any errors? what does !lol say? how do you have push.default configured? are you pushing ot the correct remote (git remote -v)? how do you push?19:19
gitinfo YuGiOh: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all19:19
→ LucasTT joined19:19
SimpleJack478 it has to do with my building process in the way that I’m not familiar enough with the git command stash and therefore would like to ask here, if the error I received is common while using it19:19
YuGiOh "Everything up-to-date" is the only output I see19:19
→ dangerou_ joined19:20
YuGiOh push.default is configured to "matching"19:20
I am pushing to "origin ssh://yugiohjcj@git.code.sf.net/p/renmod/code"19:21
→ aard joined19:22
YuGiOh how I push : "git push"19:22
← Takle left19:22
→ jceb joined19:23
zormit SimpleJack478: i've never seen this error. So I wouldn't say it's common.19:23
← Takle_ left19:23
← dreiss left19:24
← listochkin left19:24
→ Takle joined19:24
YuGiOh gitinfo, the result of the "git log --oneline --graph --decorate --all" command is here: http://pastebin.com/h7Dr7LD219:24
→ listochkin joined19:24
→ Takle_ joined19:25
→ reim joined19:25
YuGiOh it seems that "HEAD" is corresponding to the modifications I want to commit to the remote repository19:26
skorgon are you on a branch?19:26
→ apurcell joined19:26
SimpleJack478 zormit: verstehe ich es denn richtig, dass stash dafür genutzt wird, den aktuellen stand zwischenzuspeichern um später wieder dorthin zurückkehren zu können?19:27
skorgon i see only HEAD19:27
no branch19:27
YuGiOh I also try : "git push origin master" but I get the same issue19:27
skorgon what does git status say? are you on a branch?19:27
← Takle_ left19:28
skorgon on a sidenote, your commit messages are horrible. usually the first line of a commit message is a short one line summar, so that it looks nice in this oneline log19:28
YuGiOh I got this with "git status" : "# HEAD detached from FETCH_HEAD"19:28
skorgon there you go19:28
YuGiOh so, it seems I am on a branch, isn't it?19:28
← listochkin left19:28
skorgon you aren't on a branch19:28
← The_Phoenix left19:28
YuGiOh oh...19:28
skorgon no you're not19:28
you're !detached19:29
gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach19:29
→ gcristian-casa joined19:29
j416 YuGiOh: 'git branch' will tell you you're on no branch, so will 'git status'19:29
← Takle left19:29
→ rjc joined19:29
→ teran joined19:29
zormit SimpleJack478: yep. so you did "git stash" something?19:29
j416 YuGiOh: and if you're using a git-aware prompt, it'll show you a hash instead of a branch name if your HEAD is detached19:30
skorgon YuGiOh: you need to !reattach/incorporate the changes in some branch and then push. or use git push origin HEAD:<remot_branch>19:30
gitinfo YuGiOh: Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue19:30
j416 </monologue>19:30
→ Takle joined19:31
← apurcell left19:31
→ pantsman- joined19:32
→ wachterjohannes joined19:33
← teran left19:34
← joel_falcou left19:34
→ ManikM joined19:34
flughafe1 → flughafen_19:37
→ booboy joined19:39
← booboy left19:39
→ listochkin joined19:39
→ booboy joined19:39
→ alexruf joined19:40
→ MistrzMag joined19:41
← binarus left19:41
→ Takle_ joined19:41
→ Reskp joined19:41
→ lindenle joined19:41
← Zupoman left19:41
→ binarus joined19:41
→ Bryzzle joined19:42
← binarus left19:42
→ mikeric joined19:42
← r0bby_ left19:43
→ r0bby_ joined19:43
→ binarus joined19:43
← ojacobson left19:43
→ mizu_no_oto joined19:43
← shpoont_ left19:43
YuGiOh thank you problem solved19:44
bye19:44
← nikio_ left19:44
← YuGiOh left19:44
← ErKa left19:44
← Takle left19:45
skorgon !next19:45
gitinfo Another satisfied customer. NEXT!19:45
→ arnaud____ joined19:45
← netj left19:46
← lindenle left19:46
← ecky--ptang-zoob left19:46
→ netj joined19:46
← circ-user-L5vam left19:47
→ rikko joined19:48
← binarus left19:48
SimpleJack478 zormit: yes the script ran the stash cammand by itself19:48
→ binarus joined19:48
→ dorkmafi1 joined19:49
→ ecky--ptang-zoob joined19:49
← arnaud____ left19:50
← mikeric left19:52
→ mikeric joined19:52
← mizu_no_oto left19:53
→ Literphor joined19:53
→ hackel joined19:53
← thiago left19:53
→ EminenceHC joined19:54
← Literphor left19:54
← ManikM left19:54
← rpg left19:54
← t0th_-_ left19:54
← dangerousdave left19:55
← EminenceHC left19:58
→ spuz joined19:58
← anemator left19:59
→ mizu_no_oto joined19:59
← Takle_ left19:59
→ Takle joined19:59
→ kyb3r_ joined19:59
← dangerou_ left19:59
→ dangerousdave joined20:00
→ whomp joined20:01
→ dangerou_ joined20:01
← dorkmafi1 left20:01
← binarus left20:01
→ nrsk joined20:02
→ binarus joined20:02
← spuz left20:03
← mikeric left20:03
← pheaver left20:03
→ EminenceHC joined20:04
← sgen__ left20:05
→ dmiles_afk joined20:05
← Reskp left20:05
SimpleJack478 zormit: those are the commands called by the makefile: https://github.com/bananapi-dev/sunxi-bsp/blob/master/Makefile#L10020:05
→ pheaver joined20:07
← whomp left20:07
→ n-st joined20:08
→ shpoont_ joined20:08
→ nour_ joined20:08
→ dorkmafi1 joined20:09
→ bobmarchman joined20:09
← binarus left20:09
← EminenceHC left20:09
← MLM left20:10
→ binarus joined20:10
← nour__ left20:12
← r0bby_ left20:12
→ r0bby_ joined20:13
zormit SimpleJack478: Actually, I am not familiar with git submodule.20:13
← devhoag left20:14
→ nastygibbon joined20:14
→ aswen joined20:14
zormit I suppose the "no stash found" error is generated in line 108, because you had no changes that were stashed in line 100.20:14
← bobmarchman left20:14
← r0bby_ left20:15
← meLon left20:15
→ r0bby_ joined20:15
→ meLon joined20:15
← SimpleJack478 left20:15
→ devhoag joined20:15
→ SimpleJack478 joined20:16
zormit SimpleJack478: so your answer from my side is: you can go on building.20:16
← devhoag left20:16
→ devhoag joined20:16
Daerist` → Daerist20:17
→ t0th_-_ joined20:17
→ ehmatthes joined20:17
← pheaver left20:18
→ intransit joined20:18
→ Reskp joined20:19
← reim left20:19
SimpleJack478 zormit: I’ll try and tell you if it worked or not. untill then thank you zormit!20:19
→ devoldmx joined20:21
→ t0th_-__ joined20:21
← listochkin left20:21
← t0th_-_ left20:21
→ listochkin joined20:22
→ mikewintermute joined20:22
← Bryzzle left20:24
← t0th_-__ left20:25
→ ap0c joined20:25
← listochkin left20:26
→ dregad joined20:27
← dangerousdave left20:27
← devoldmx left20:28
→ MattMaker joined20:29
← r0bby_ left20:29
→ r0bby_ joined20:29
→ teran joined20:30
← dangerou_ left20:30
← Gizburdt left20:30
→ whomp joined20:31
→ t0th_-__ joined20:31
← mizu_no_oto left20:31
→ bobmarchman joined20:31
→ Walex joined20:33
← MattMaker left20:33
← Walex left20:34
← teran left20:35
← dregad left20:35
← t0th_-__ left20:36
← whomp left20:36
→ pandeiro joined20:37
← wachterjohannes left20:37
← APerson_ left20:40
→ MattMaker joined20:40
→ APerson_ joined20:40
← aswen left20:41
→ brucelee joined20:42
→ CEnnis91 joined20:42
← PCatinean left20:42
→ devoldmx joined20:43
→ CustosL1men joined20:43
← irqq left20:44
→ spuz joined20:45
→ thiago joined20:46
→ apurcell joined20:46
→ otter768 joined20:48
→ Borkr joined20:48
← binarus left20:49
→ Successful joined20:50
← apurcell left20:50
→ cagedwisdom joined20:51
→ binarus joined20:51
← r0bby_ left20:51
→ r0bby_ joined20:52
→ t0th_-__ joined20:52
← otter768 left20:53
← nrsk left20:54
← dorkmafi1 left20:55
→ kgadek joined20:56
→ Walex joined20:56
← t0th_-__ left20:57
→ sq-one joined20:57
← Jackneill left20:57
→ corni joined20:58
← Reskp left20:59
← APerson_ left20:59
→ APerson_ joined20:59
← RedShift left21:00
← r0bby_ left21:00
← Successful left21:00
→ rhombus joined21:00
← gnfz left21:01
→ r0bby_ joined21:01
→ tmcmahon joined21:03
← markgrady left21:04
← skylite left21:04
← kgadek left21:04
→ skylite joined21:05
→ arnaud____ joined21:05
→ kgadek joined21:05
→ crater2150 joined21:05
← jceb left21:06
← tmcmahon left21:06
← APerson_ left21:06
→ Netlynx joined21:08
← skylite left21:08
→ APerson_ joined21:08
→ skylite joined21:08
→ staafl joined21:09
← kgadek left21:09
← arnaud____ left21:09
→ kgadek joined21:10
→ whomp joined21:11
→ macabre joined21:12
→ Phibonacci joined21:14
→ steele joined21:14
← FreezingCold left21:14
← Guest46066 left21:15
→ FreezingCold joined21:15
← r0bby_ left21:15
Phibonacci Hello. Would you know a way to merge a branch A into another branch B but instead of merging the file, replace the conflicting files of B by the files of A ?21:15
→ nicedice joined21:15
→ r0bby_ joined21:15
← whomp left21:16
moritz Phibonacci: merge with -X theirs21:16
← darkbasic left21:17
moritz Phibonacci: though it only resolves the conflicts in favor of A, not the whole files21:17
→ bcoca joined21:17
moritz Phibonacci: if you need that, merge normally, and then do a 'git checkout --theirs $file; git add $file' for a files that show up as having merge conflicts21:17
madduck offby1: SORRY! ;)21:17
← skylite left21:18
→ darkbasic joined21:18
skorgon Phibonacci: isn't that what the 'ours' merge strategy does?21:18
→ skylite joined21:18
moritz skorgon: nope21:19
skorgon oh, it's the other way around21:19
Phibonacci Indeed. Theirs replaced only the conflicted file. I need to replace all of them actually.21:19
moritz oh21:19
Phibonacci I consued myself. :D21:19
confused*21:19
moritz then you do need -s ours, but merge the other way round first21:19
(there's no -s theirs :( )21:19
Phibonacci Oh, ok. Thank you.21:20
→ Zoddo joined21:21
← kgadek left21:22
← petersr left21:22
→ kgadek joined21:23
← APerson_ left21:23
→ teran joined21:25
← chiromante left21:25
→ sysadmin75 joined21:26
→ teran_ joined21:26
→ paulweb515 joined21:27
→ gv joined21:27
mezod → mozed21:27
→ mt joined21:28
mozed → mezod21:28
Phibonacci I don't explain why I don't have the same thing on both Branch A and Branch B. Is there an other method to reset a branch to the same state as another one ?21:28
→ CheckDavid joined21:28
← binarus left21:29
→ Reskp joined21:30
→ kursd joined21:30
← teran left21:30
→ nikio_ joined21:31
Phibonacci this does the trick: git reset --hard origin/mySourceBranch21:31
→ Gizburdt joined21:31
← nikio_ left21:31
→ rm-rf joined21:31
← rikko left21:33
→ dangerousdave joined21:34
← dangerousdave left21:34
→ dangerou_ joined21:34
← quetz left21:34
→ hahuang61 joined21:34
→ chrisgeorge joined21:34
→ nikio_ joined21:34
← chrisgeorge left21:35
skorgon Phibonacci: that !rewrites history. depending on your workflow you may want to avoid that21:35
← Reskp left21:35
gitinfo Phibonacci: [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum21:35
skorgon Phibonacci: alternatively you could just do 'git checkout foo .' and the commit that21:35
→ chrisgeorge joined21:35
→ whomp joined21:36
← Gizburdt left21:36
← thiago left21:37
← DolphinDream left21:37
← netcarver left21:38
← dsdeiz left21:38
← dangerou_ left21:38
← brucelee left21:39
← whomp left21:40
← JohnBat26 left21:41
→ dangerousdave joined21:43
← diegoviola left21:45
→ hoijuiL joined21:48
← hackel left21:49
← bobmarchman left21:53
→ EminenceHC joined21:53
→ bobmarchman joined21:54
← nastygibbon left21:54
← Dougie187 left21:56
→ DolphinDream joined21:56
← mikewintermute left21:56
← sq-one left21:57
→ whomp joined21:57
← EminenceHC left21:58
→ dreiss joined21:58
← osw left21:59
→ nutron joined21:59
→ jazzzu joined22:00
← alexruf left22:01
→ EminenceHC joined22:01
← whomp left22:02
→ freeman42 joined22:04
← devoldmx left22:06
← freeman42 left22:06
→ skylite_ joined22:06
← Takle left22:07
← n-st left22:08
← skylite left22:08
← EminenceHC left22:09
→ n-st joined22:09
← aard left22:11
← dreiss left22:12
→ Takle joined22:13
→ Literphor joined22:13
→ Marcus joined22:14
Marcus → Guest6726522:15
→ stamina joined22:16
→ HelloShitty joined22:19
← Guest67265 left22:19
→ nastygibbon joined22:20
← ColdKeyboard left22:20
→ s8321414 joined22:21
← Literphor left22:21
→ listochkin joined22:23
← macabre left22:23
← DolphinDream left22:24
← nginx77 left22:26
→ FunkyAss joined22:27
← skylite_ left22:27
→ whomp joined22:27
→ skylite joined22:27
→ zarel joined22:28
← skorgon left22:28
→ Literphor joined22:29
← r0bby_ left22:29
→ r0bby_ joined22:29
← zarel left22:29
→ Reskp joined22:30
← FreezingCold left22:31
→ Gizburdt joined22:32
← sysadmin75 left22:32
← whomp left22:34
← armyriad left22:35
→ MLM joined22:35
→ mstsirkin joined22:35
→ apurcell joined22:35
← Literphor left22:35
← Reskp left22:36
→ skylite_ joined22:36
→ rikko joined22:36
→ FreezingCold joined22:36
← Gizburdt left22:36
← ehmatthes left22:36
← Borkr left22:36
← skylite left22:38
→ robbyoconnor joined22:38
← r0bby_ left22:38
← apurcell left22:40
→ tpollard joined22:40
→ mroach joined22:40
→ anemator joined22:42
→ Literphor joined22:42
← anemator left22:44
← hoijuiL left22:45
← thevishy left22:46
→ lindenle joined22:46
→ aswen joined22:49
→ otter768 joined22:49
← Akagi201 left22:50
← Kicer86 left22:51
← lindenle left22:51
→ Gitzilla joined22:51
→ whomp joined22:52
← otter768 left22:53
→ arnaud____ joined22:54
← andi2 left22:57
← rendar left22:57
← Literphor left22:58
← arnaud____ left22:59
← whomp left22:59
← Netlynx left23:00
→ Tommy[D] joined23:00
→ ariver joined23:02
← spuz left23:02
ariver → Guest3457623:02
← nfk left23:04
← HelloShitty left23:04
← Goplat left23:04
→ dreiss joined23:06
→ Literphor joined23:06
→ brucelee joined23:08
← nour_ left23:08
← zivester left23:10
← rjc left23:12
← Gama11_ left23:12
← robbyoconnor left23:13
→ robbyoconnor joined23:13
→ malloc joined23:14
→ Marcus joined23:15
← nastygibbon left23:15
Marcus → Guest9130423:15
→ zivester joined23:15
← kalz left23:16
← mroach left23:17
← dreiss left23:17
→ astrofog joined23:19
→ whomp joined23:19
← robbyoconnor left23:21
→ robbyoconnor joined23:21
← aswen left23:24
← whomp left23:24
→ kalz joined23:26
polyzen → bender23:26
→ johnny2600 joined23:28
← d1b left23:30
← listochkin left23:30
← Zoddo left23:30
→ listochkin joined23:30
← qwebirc92123 left23:30
→ whomp joined23:31
→ Reskp joined23:31
← skylite_ left23:32
→ Gizburdt joined23:33
← Reskp left23:33
→ dorkmafi1 joined23:34
→ khmarbaise joined23:34
→ skylite joined23:34
← listochkin left23:35
← whomp left23:36
← Gizburdt left23:37
← skylite left23:38
→ AmR|EiSa joined23:38
→ skylite joined23:38
← joo-_ left23:38
← n-st left23:42
← Literphor left23:43
← MistrzMag left23:47
→ Fokissed joined23:47
→ angelsl joined23:48
→ razorgirl joined23:48
← dangerousdave left23:48
← AmR|EiSa left23:49
→ devoldmx joined23:49
→ Literphor joined23:49
← robbyoconnor left23:50
→ robbyoconnor joined23:50
← SimpleJack478 left23:50
← brucelee left23:51
← khmarbaise left23:51
← jgardella left23:51
→ jgardella joined23:52
→ skylite_ joined23:53
jottr Hi all. Does someone in here know of good resources on how to create and write good pull requests?23:53
→ EminenceHC joined23:53
← shpoont_ left23:55
→ shpoont joined23:56
← skylite left23:56
← shpoont left23:57
→ shpoont joined23:57
← shpoont left23:57
→ pm90_ joined23:58
→ shpoont joined23:58
← shpoont left23:58
osse jottr: a pull request is not much more than a series of commits. if your commits are good then your pull request will be23:58
→ NBhosting joined23:58
← BSaboia_ left23:58
← EminenceHC left23:58
→ WildBamboo-Josh joined23:58
← mezod left23:59

Logs Search ←Prev date Next date→ Channels Documentation