IRCloggy #git 2019-02-15

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.

2019-02-15

← renich_ left00:00
→ jstimm joined00:01
← polyrob left00:03
← finalbeta left00:04
→ polyrob joined00:04
→ orbyt_ joined00:06
← Phylock left00:08
← Achylles left00:09
→ andyhuzhill joined00:14
→ johnny56_ joined00:14
← R2robot left00:15
→ R2robot joined00:16
← mooasaurus left00:18
→ mooasaurus joined00:18
→ renich_ joined00:20
→ RustyShackleford joined00:23
→ Bobdude joined00:39
← xrexeon left00:41
→ Puffball joined00:47
→ mescalin_ joined00:54
← mescalinum left00:56
→ awalvie joined00:56
← awalvie left00:57
→ awalvie joined00:57
→ TheRuckus joined00:58
← orbyt_ left01:00
← mat001 left01:02
← TheRuckus left01:02
← mikecmpbll left01:05
← Bobdude left01:07
→ wxg joined01:07
→ cbreak joined01:08
→ Bobdude joined01:08
→ thiago joined01:10
← \void left01:17
← awalvie left01:17
← yohnnyjoe left01:18
← m0viefreak left01:19
← Dirak left01:20
→ goiko joined01:21
→ orbyt_ joined01:21
← Sasazuka left01:23
→ yohnnyjoe joined01:27
← orbyt_ left01:28
→ awalvie joined01:30
→ TheRuckus joined01:32
→ Karyon joined01:33
→ Goplat joined01:36
← courrier left01:41
← blackmesa1 left01:41
→ blackmesa1 joined01:41
← DavidJOwens left01:42
← blackmesa1 left01:46
← causasui left01:46
→ blackmesa1 joined01:47
← rafasc left01:49
← prg left01:54
→ prg318 joined01:55
← blackmesa1 left01:59
→ igemnace joined02:04
→ blackmesa1 joined02:05
→ puff joined02:08
← blackmesa1 left02:10
← wxg left02:10
→ finalbeta joined02:14
→ wxg joined02:15
← TheRuckus left02:17
← wxg left02:22
← awalvie left02:26
→ orbyt_ joined02:28
← Cabanoss- left02:34
← F0rTex left02:38
→ F0rTex joined02:40
← fstd left02:40
→ fstd joined02:40
← orbyt_ left02:42
→ skyikot joined02:48
→ Cabanossi joined02:48
→ \void joined02:48
← puff left02:48
→ puff joined02:48
← fstd left02:53
→ fstd joined02:53
→ orbyt_ joined02:59
← foul_owl_ left03:00
← z|bandito left03:00
← fstd left03:02
→ fstd joined03:02
← andyhuzhill left03:08
→ andyhuzhill joined03:09
← netj left03:11
→ netj joined03:11
← andyhuzhill left03:13
→ andyhuzhill joined03:14
→ xirhtogal joined03:16
lagothrix → Guest2390003:16
xirhtogal → lagothrix03:16
→ foul_owl_ joined03:16
← Guest23900 left03:18
← Karyon left03:25
← inkbottle left03:27
→ inkbottle joined03:28
→ sgen joined03:33
← voidSurfr left03:36
→ mat001 joined03:36
← jnewt left03:37
→ maryo joined03:38
← maryo left03:39
← mat001 left03:40
← zulutango left03:42
→ wxg joined03:42
→ ypm1 joined03:43
→ zulutango joined03:45
← sgen left03:45
→ CarlFK joined03:48
← zulutango left03:48
→ zulutango joined03:49
← kjartan left03:49
→ mobile_c joined03:51
← orbyt_ left03:53
→ kjartan joined03:54
→ orbyt_ joined03:58
→ NccT joined03:59
CarlFK https://git-scm.com/docs/gitignore I can't figure out if this is what I want: I want an empty foo.conf file that won't get committed if I do "git commit -a" and won't get stepped on if I do "git pull"04:01
is what I want even possible?04:01
→ watabou joined04:04
orbyt_ Yes, add an appropriate pattern in your .gitignore04:05
If you're already tracking foo.conf you'll have to remote it04:06
remove*04:06
→ tactics joined04:13
tactics Hi all04:13
Is there a way to create an alias in git to push with "-u origin" set and where the remote branch name mirrors the local branch name?04:14
Basically, I want to avoid the message: fatal: The current branch Short_flag_for_only_external_hosts has no upstream branch.04:15
To push the current branch and set the remote as upstream, use04:15
git push --set-upstream origin Short_flag_for_only_external_hosts04:15
kadoban tactics: One of the settings for 'push.default' might do something approximately that. 'matching' maybe?04:15
← yohnnyjoe left04:15
kadoban Oh, maybe not. 'current' ?04:16
I am not sure I'm parsing the legalese right there. You could try it though.04:16
tactics yeah04:17
gitese. The most esoteric of languages :)04:17
that looks like it worked04:18
We'll see if it has any ill effects in the next week04:18
Thanks, kadoban!04:18
kadoban Anytime04:18
← Graypup_ left04:19
→ Graypup_ joined04:22
→ v01d4lph4 joined04:23
← orbyt_ left04:30
→ ferdna joined04:35
→ awalvie joined04:36
← dpyro left04:46
→ dpyro joined04:46
← skyikot left04:47
→ mat001 joined04:48
← zampano left04:50
→ zampano joined04:52
→ pks_ joined05:02
RustyShackleford do you know of any good talks/videos on git?05:02
or articles I guess05:02
have some hires at work who are asking for help with git05:03
→ Mattiaslndstrm joined05:03
RustyShackleford they get the basics but want to get better. Unfortunately I'm not the best at explaining clearly haha05:04
← pks left05:04
pks_ → pks05:04
tactics RustyShackleford, there's a really good video on the git internals on YouTube05:05
it is technical, but it also helps you understand how git actually works05:06
RustyShackleford I saw a great video a few years ago but can't find it05:06
would love a link05:06
tactics https://www.youtube.com/watch?v=MYP56QJpDr405:06
I think that's it05:06
RustyShackleford so it was for people who know git, but want to be a poweruser05:06
tactics yeha. that's it. He has two videos of the same talk, different conferences05:06
I'd say it's for having a good mental model of git to begin with >_>05:07
→ dre_ joined05:07
tactics I guess if you call rebasing a power user's tool though :)05:07
RustyShackleford cool i'm gonna watch this guy05:07
he seems smart so far05:07
← govg left05:08
← Mattiaslndstrm left05:08
RustyShackleford rebasing is a little intimidating haha05:08
but I like these guys. They can spot their weaknesses and want to improve05:08
→ rsrx joined05:09
← wxg left05:17
← awalvie left05:18
← boombatower left05:18
→ mven_ joined05:21
→ metrixx joined05:29
→ keepLearning512 joined05:31
← inkbottle left05:33
→ miczac joined05:36
← \void left05:36
→ tsdh joined05:36
← tactics left05:37
← ferdna left05:38
← mven_ left05:41
→ MTecknology joined05:47
MTecknology If I'm on branch foo, and run 'git checkout -b bar foo', should I not have all of the changes included in foo?05:48
→ awalvie joined05:48
← Abbott left05:49
← raffo left05:51
_ikke_ what changes are you referring to?05:51
→ raffo joined05:51
→ Abbott joined05:52
→ awalvie__ joined05:52
← awalvie left05:54
← awalvie__ left05:57
→ awalvie__ joined05:57
MTecknology _ikke_: the commits?06:01
_ikke_ then, yes06:02
← Envil left06:04
← igemnace left06:07
MTecknology then, wtf?06:08
← irqq left06:09
→ alex-dev joined06:10
_ikke_ !situation06:11
gitinfo Please post the url returned by `git log -n 20 --all --graph --format="%h %p %d %s" | curl -F text=@- https://upaste.de/` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)06:11
→ sauvin joined06:14
← rsrx left06:18
← miczac left06:18
→ miczac joined06:21
← craigo left06:21
← alex-dev left06:26
← miczac left06:30
→ alex-dev joined06:36
← awalvie__ left06:36
→ awalvie__ joined06:37
← cbreak left06:39
← Goplat left06:42
← tsdh left06:43
→ tsdh joined06:44
← mat001 left06:48
← surfist left06:49
→ surfist joined06:50
→ SkarmoutsosV joined06:52
← Inline left06:52
→ totte joined06:52
→ flughafen joined06:55
→ andrzejv joined06:55
← alex-dev left06:56
← awalvie__ left06:57
flughafen i made a commit accidently on the master branch, that's not pushed. ids there an easy way to just take it to my next branch?06:57
← dansan_ left06:57
→ Makaveli7 joined06:57
→ dansan_ joined06:58
→ sozuba joined06:58
MTecknology format-patch; apply07:00
→ Dirak_ joined07:01
Moult i've got git-lfs on my local, some random server with lfs-test-server setup and running. i've set a .lfsconfig, .git/config and .gitconfig with [lfs] url = http://myserver.com:9999/ which is where the lfs-test-server is running, but a git push doesn't upload anything to the lfs-test-server. ideas?07:01
git lfs ls-files and .gitattributes shows that indeed i have objects in that repo which are tracked by git lfs07:02
no indication of error on the lfs-test-server side either - i can access /mgmt and add and remove users without issue.07:02
← tsdh left07:02
← andrzejv left07:02
osse flughafen: man git-cherry-pick07:02
gitinfo flughafen: the git-cherry-pick manpage is available at https://gitirc.eu/git-cherry-pick.html07:02
Moult i should note that when i am pushing, i an pushing to a "remote" that is just another clone of the same repo on my local drive. but i don't think that should matter - the remote can be anywhere, right? the remote doesn't have to be the same host as the git lfs server from my understanding07:04
→ andrzejv joined07:04
← netj left07:07
→ netj joined07:08
→ gloomy joined07:09
→ sQVe joined07:09
← sQVe left07:10
← thiago left07:10
→ sQVe joined07:10
→ SerialSmile joined07:11
→ wxg joined07:16
→ blipz joined07:18
→ renich joined07:19
→ mona_x joined07:19
← renich_ left07:20
→ z|bandito joined07:20
→ lowbro joined07:21
← sQVe left07:26
→ sQVe joined07:27
→ rsrx joined07:29
← topdownjimmy left07:30
→ topdownjimmy joined07:31
← Dirak_ left07:35
← sQVe left07:36
→ miczac joined07:36
→ sQVe joined07:38
← mowcat left07:38
→ mven_ joined07:39
← mven_ left07:39
← wxg left07:41
→ Mattiaslndstrm joined07:42
← miczac left07:42
→ wxg joined07:42
← sQVe left07:43
→ sQVe joined07:44
→ chaosruler joined07:46
← jstimm left07:46
← sQVe left07:47
→ esrse joined07:47
→ sQVe joined07:48
← sQVe left07:48
→ sQVe joined07:49
← sQVe left07:50
→ tsdh joined07:50
→ sQVe joined07:50
← Bobdude left07:54
← keepLearning512 left07:55
→ n3wborn joined07:57
← sQVe left07:57
→ sQVe joined07:58
→ chele joined07:59
← kadoban left08:01
← gxt left08:07
← GinoMan2440 left08:07
→ GinoMan joined08:07
← nowhere_man left08:10
← Thominus left08:11
→ cbreak joined08:11
← jim left08:11
← VladGh left08:12
← blipz left08:12
→ __rohit joined08:13
← scarcry left08:14
→ interrobangd joined08:15
→ jim joined08:15
← chaosruler left08:15
→ miczac joined08:17
kadoban- → mud08:22
→ dege joined08:24
→ bolovanos joined08:25
← Some_Person left08:28
← oojacoboo left08:30
← SkarmoutsosV left08:31
← sQVe left08:32
→ sQVe joined08:33
← sQVe left08:33
→ sQVe joined08:34
← sQVe left08:34
→ SkarmoutsosV joined08:35
→ sQVe joined08:35
→ keepLearning512 joined08:35
← SkarmoutsosV left08:38
→ mimajof joined08:47
→ cswl joined08:48
← __rohit left08:51
← thallada left08:52
← kjartan left08:53
← freeman42x left08:53
← Spacew00t left08:54
→ scarcry joined08:55
flughafen osse: thanks.08:56
→ gxt joined08:57
→ kjartan joined08:58
← thunderbirdtr left09:00
→ chaosruler joined09:00
→ thallada joined09:01
← gloomy left09:02
← miczac left09:04
← keepLearning512 left09:05
→ floppydh joined09:06
← luist left09:08
→ theoceaniscool joined09:08
→ Shilace joined09:09
← Shilace left09:10
→ mikecmpbll joined09:13
← im0nde left09:14
→ blackmesa1 joined09:14
→ YuGiOhJCJ joined09:15
→ igemnace joined09:19
→ Bobdude joined09:20
← mona_x left09:20
← brandonkal left09:22
→ miczac joined09:23
← heroux left09:24
→ kapil____ joined09:24
→ heroux joined09:24
→ im0nde joined09:29
→ aw1 joined09:30
← AfroThundr|main left09:30
→ __rohit joined09:31
← SerialSmile left09:31
→ deathwishdave joined09:33
← andyhuzhill left09:33
← Bobdude left09:35
← igemnace left09:36
← Lunatrius left09:40
← ali1234 left09:42
← watabou left09:43
→ Darcidride joined09:47
→ ali1234 joined09:47
→ igemnace joined09:49
→ Lunatrius joined09:52
→ czart joined09:53
→ AfroThundr|main joined09:53
← thallada left09:55
← NccT left09:57
→ watabou joined09:58
→ NccT joined10:00
← chaosruler left10:01
← sQVe left10:01
← NccT left10:03
← watabou left10:03
→ thallada joined10:03
← random_yanek left10:06
← miczac left10:08
← __rohit left10:08
→ gareppa joined10:09
← gareppa left10:13
→ Noti joined10:14
→ random_yanek joined10:15
→ jvava joined10:17
jvava who can please tell me how to implement a code review system with git10:17
→ gloomy joined10:18
← mescalin_ left10:18
← yonder left10:19
← thallada left10:20
→ mescalinum joined10:20
→ keepLearning512 joined10:21
→ mostlybadfly joined10:23
→ paul1us joined10:24
Luyin flughafen: https://github.blog/2015-06-08-how-to-undo-almost-anything-with-git/#once-more-with-branching10:24
flughafen Luyin: thanks, i saw that too10:25
Luyin: i just ended up doing a git reset HEAD~ ; then git stash10:25
paul1us hi all, I am fairly new to VCS. I am currently trying to collaborate with a friend who is sitting next to me, so we would like to share a repository. I created a new one specifically for this purpose, and shared the access with him, however I am not able to manually select typo of privileges he has. Is this weird, or normal?10:25
*type10:26
grawity paul1us: are you talking about GitHub or other hosting site?10:26
on GitHub, collaborators on a personal repository always have full access – only organization repos allow more granular settings10:28
jvava hi, do you know where there is a introduction for implementing a code review system?10:28
grawity 1) open a text editor, 2) write some code, 3) implement the rest of the system10:29
furrymcgee access depends on the protocol, github is git+ssh as far as i know10:29
→ thallada joined10:30
jvava grawity: :-)10:30
← igemnace left10:30
Luyin jvava: http://rurounijones.github.io/blog/2009/03/17/how-to-ask-for-help-on-irc/10:30
jvava: start by reading10:30
← gxt left10:30
jvava done, Luyin10:30
grawity seriously though, that's basically a "take a 3 year course in programming" kind of question10:31
or "just use gerrit"10:31
Luyin :D10:31
→ saidi joined10:31
jvava no, won't use gerrit10:31
← mescalinum left10:31
→ gxt joined10:31
→ sQVe joined10:32
← ali1234 left10:32
jvava I just don't know whether it is right to push a branch to a remote branch to review, after approve, then push the branch to the origin branch.10:33
← totte left10:33
grawity could have asked that straight away10:34
jvava grawity10:35
← sozuba left10:36
jvava then how to do if he push the branch to the origin without approve? I must implement another wrapper to check that?10:37
→ watabou joined10:38
→ irqq joined10:38
→ sozuba joined10:39
← d^sh left10:40
→ d^sh joined10:41
← dre_ left10:41
← thallada left10:42
← andrzejv left10:43
→ nowhere_man joined10:44
→ igemnace joined10:45
← Noti left10:46
← n3wborn left10:49
← gxt left10:50
→ gxt joined10:51
← igemnace left10:51
→ settermjd joined10:52
→ Achylles joined10:53
→ Karyon joined10:54
→ awalvie joined10:59
← lankanmon left11:00
← keepLearning512 left11:00
← deathwishdave left11:01
→ thallada joined11:02
→ __rohit joined11:07
→ craigo joined11:09
→ _xor joined11:09
← thallada left11:10
→ thallada joined11:12
← watabou left11:15
← craigo left11:15
→ deathwishdave joined11:15
→ craigo joined11:16
← thallada left11:17
→ Noti joined11:19
← in1t3r left11:21
→ in1t3r joined11:21
← gloomy left11:22
← Makaveli7 left11:26
← v01d4lph4 left11:27
→ v01d4lph4 joined11:27
→ totte joined11:28
← v01d4lph4 left11:32
← nowhere_man left11:32
→ thallada joined11:34
→ gloomy joined11:35
→ awalvie__ joined11:36
← awalvie left11:40
← gloomy left11:40
← Noti left11:44
← Karyon left11:44
← aw1 left11:46
← dpyro left11:52
← invultri left11:53
← settermjd left11:54
→ craigo_ joined11:56
→ donofrio_ joined11:57
← craigo left11:58
→ settermjd joined11:59
← donofrio left12:00
→ ali1234 joined12:00
→ SkarmoutsosV joined12:00
→ cdown joined12:01
→ gloomy joined12:03
← gloomy left12:03
← thallada left12:04
→ emsjessec joined12:05
← YuGiOhJCJ left12:06
→ miczac joined12:06
← sQVe left12:12
→ Noti joined12:12
← mimajof left12:12
→ lucasb joined12:15
→ thallada joined12:16
→ sQVe joined12:17
← ChinnoDog left12:17
→ gloomy joined12:20
← thallada left12:22
← totte left12:23
← Noti left12:24
← gxt left12:24
→ gxt joined12:25
→ jvava_ joined12:27
← sQVe left12:27
← KnoP left12:33
← fuchstronaut left12:34
← Amadiro left12:34
→ KnoP joined12:34
→ uebera|| joined12:34
→ fuchstronaut joined12:34
← AmShaegar left12:35
← bond left12:35
→ Envil joined12:35
→ Amadiro joined12:35
← evil-god left12:35
→ AmShaegar joined12:35
← gxt left12:36
← SkarmoutsosV left12:37
→ mona_x joined12:37
→ gxt joined12:37
→ evil-god joined12:38
→ theskill_ joined12:39
← theskill_ left12:39
← gloomy left12:40
→ xrexeon joined12:40
← xrexeon left12:40
→ kerframil joined12:41
→ xrexeon joined12:41
→ mescalinum joined12:41
→ gechr joined12:42
→ mimajof joined12:42
→ silenc3r joined12:43
← xrexeon left12:43
→ Murr joined12:43
→ xrexeon joined12:43
→ thallada joined12:44
← wxg left12:45
→ indistylo joined12:46
← miczac left12:47
← hofmann3900 left12:47
← gxt left12:48
→ andrybak joined12:48
→ gxt joined12:49
andrybak hello everyone. It would have been nice if `git rebase --edit-todo` allowed to use option --exec to add a command after rebase is launched.12:50
→ CryptoDavid joined12:50
← indistylo left12:54
← flughafen left12:55
← gxt left12:57
→ indistylo joined12:57
→ Mike11 joined12:57
→ gxt joined12:58
→ Makaveli7 joined12:59
← jcbitter left13:02
← indistylo left13:03
← gechr left13:05
→ gechr joined13:06
← gechr left13:06
← cbreak left13:06
→ cbreak joined13:07
→ yohnnyjoe joined13:08
→ Phylock joined13:09
→ watabou joined13:11
→ indistylo joined13:11
← RustyShackleford left13:12
→ gloomy joined13:14
← rsrx left13:15
← tsdh left13:16
← alcohol left13:16
→ cfoch joined13:17
← jvava_ left13:17
→ tsdh joined13:18
→ Blkt joined13:23
← Mattiaslndstrm left13:28
← irrgit left13:29
→ jstimm joined13:29
→ GinoMan2440 joined13:29
← settermjd left13:30
← GinoMan left13:33
← lowbro left13:33
→ settermjd joined13:34
← settermjd left13:35
→ Mattiaslndstrm joined13:37
→ aw1 joined13:39
→ inkbottle joined13:43
→ tomboy64 joined13:43
← yohnnyjoe left13:43
← watabou left13:44
→ irrgit joined13:44
← dermoth left13:45
tomboy64 i've locked myself out of my git server and forgot the repo-name13:45
→ dermoth joined13:45
tomboy64 can i somehow convince git-shell to list all available repos on the server?13:45
git user@machine info apparently only works with gitolite installed13:46
→ alcohol joined13:46
KindOna i know gitolite can do it when you `ssh` instead of `git` in yeah13:47
i dont know if there's a way to do it natively or if that's jus tstandard behaviour tho13:47
tomboy64 sighs13:48
tomboy64 stupid13:48
← Mike11 left13:48
tomboy64 i'd be greatful for input :D13:48
→ luist joined13:49
← mattcen left13:51
← __rohit left13:51
← floppydh left13:55
← netj left13:55
→ netj joined13:56
→ wxg joined13:57
→ egovirus joined13:57
→ settermjd joined13:58
→ mattcen joined13:59
← Makaveli7 left13:59
→ camsbury joined14:01
→ Anticom joined14:02
→ Karyon joined14:03
← mescalinum left14:05
← Murr left14:07
→ Murr joined14:08
→ watabou joined14:09
→ igemnace joined14:10
→ howell joined14:12
← watabou left14:13
← esrse left14:13
→ chaosruler joined14:15
→ someperson joined14:18
← cd left14:18
← tsdh left14:18
→ keepLearning512 joined14:21
someperson → Some_Person14:23
→ Noti joined14:26
← Mattiaslndstrm left14:27
← Noti left14:28
← wxg left14:29
← ska left14:31
→ sQVe joined14:31
→ miczac joined14:31
→ rafasc joined14:32
→ awkwords joined14:34
← sQVe left14:36
→ sQVe joined14:36
← tomboy64 left14:38
← jelmer left14:40
→ jelmer joined14:40
→ AtumT joined14:40
← sQVe left14:41
→ sQVe joined14:41
← Darcidride left14:43
← sQVe left14:44
→ sQVe joined14:44
→ jcbitter joined14:44
← awalvie__ left14:46
← czart left14:46
→ WhiskerBiscuit joined14:47
← settermjd left14:50
← Karyon left14:52
← sQVe left14:52
← Onionnion left14:53
paul1us grawity, sorry for a veeeery delayed response. I am talking about GitHub. thank you for your answer14:53
← paul1us left14:53
→ Siecje joined14:56
→ Karyon joined14:56
Siecje I want to cherry-pick a commit but there is a conflict. How do I keep the file the same (before applying the cherry-pick)?14:56
_ikke_ git checkout --ours <file>14:57
→ nuc joined14:57
Siecje It is still listed under unmerged paths14:57
just git add now?14:58
rafasc Siecje: yes14:58
← indistylo left14:58
Siecje Awesome thanks.14:59
rafasc that is specific advice for files in a unmerged state. If you want to do the same thing to a file that was merged successfully you need use $checkout HEAD -- file.14:59
→ Makaveli7 joined15:00
← Murr left15:01
→ Murr joined15:01
→ maryo joined15:03
→ boombatower joined15:03
← Achylles left15:05
→ SkarmoutsosV joined15:07
→ Mike11 joined15:07
← Murr left15:08
← Revan- left15:08
→ Murr joined15:09
→ Revan- joined15:10
→ awalvie__ joined15:10
← Some_Person left15:11
← gloomy left15:14
← Tobbi_ left15:15
→ Some_Person joined15:15
← Some_Person left15:16
→ Mattiaslndstrm joined15:16
← jstimm left15:18
→ watabou joined15:19
← cdown left15:21
← Murr left15:23
→ RustyShackleford joined15:23
→ Murr joined15:25
← fstd left15:25
→ fstd joined15:25
← Mattiaslndstrm left15:27
← watabou left15:28
→ Mattiaslndstrm joined15:29
→ thiago joined15:30
→ lacrymology joined15:30
← keepLearning512 left15:32
← fstd left15:32
→ fstd joined15:33
→ vdl joined15:34
→ T_UNIX joined15:34
← miczac left15:35
→ Some_Person joined15:37
→ miczac joined15:37
← Karyon left15:41
→ NccT joined15:41
→ cdown joined15:42
← maryo left15:43
← miczac left15:43
→ maryo joined15:43
← ali1234 left15:44
→ gloomy joined15:49
← Murr left15:52
→ Murr joined15:53
← lacrymology left15:53
← nikivi left15:54
→ nikivi joined15:54
→ watabou joined15:55
← Mattiaslndstrm left16:00
← igemnace left16:00
← yuriii left16:00
← cswl left16:01
← maryo left16:02
← thiago left16:04
← chele left16:07
→ geri joined16:08
→ maryo joined16:10
→ hussam joined16:12
← Jackneill left16:13
→ miczac joined16:13
→ Inline joined16:15
→ mescalinum joined16:16
→ Jackneill joined16:17
← Anticom left16:17
← mona_x left16:18
← fstd left16:21
→ fstd joined16:21
← anderson left16:23
← eldritch left16:23
← miczac left16:23
← Raimondi left16:24
→ aLeSD joined16:24
aLeSD hi all16:25
is it possible to remove part of the history of a repo ?16:25
my case is to remove all the history before a commit.16:25
← Murr left16:31
← rts-sander left16:31
→ Murr joined16:32
← cdown left16:32
← watabou left16:35
← kerframil left16:36
grawity yes, with the caveat that a permanent removal will change every single commit ID that you have left16:39
rafasc aLeSD: possible? yes. Practical? not really.16:39
grawity (which will screw up all forks that other people might have)16:40
rafasc what's the reason behind that choice?16:41
→ mat001 joined16:41
→ fox42 joined16:42
→ Regon joined16:43
→ Achylles joined16:47
← Murr left16:48
→ Murr joined16:49
← Achylles left16:50
metrixx → Guest9309216:51
→ metrixx_ joined16:51
← mat001 left16:52
→ \void joined16:53
← Guest93092 left16:53
← Murr left16:54
→ Murr joined16:55
← mimajof left16:56
← maryo left16:57
→ dpyro joined16:58
→ thiago joined16:58
→ lacrymology joined17:00
→ nowhere_man joined17:01
← mikecmpbll left17:03
← Mike11 left17:04
← cybergeeek left17:05
→ mat001 joined17:06
← gruetzkopf left17:06
→ gruetzkopf joined17:07
→ habbasi joined17:08
→ Raimondi joined17:09
→ mat001_ joined17:10
← mat001 left17:10
← gloomy left17:10
→ causasui joined17:12
← WhiskerBiscuit left17:12
→ eldritch joined17:13
→ Mattiaslndstrm joined17:14
← interrobangd left17:17
→ qswz joined17:19
→ voidSurfr joined17:20
qswz after a git stash pop Conflict, what should I do to resolve it?17:20
→ igemnace joined17:20
qswz wait let me google that first17:20
_ikke_ basically the same to solve any other conflict17:21
← foul_owl_ left17:21
qswz usually I "g a" then "g rbc" (add then rebase continue, or cherry-pick contiue, ..) there's no stash continue17:22
→ anderson joined17:22
qswz g reset does it, after gt add17:22
_ikke_ well, there is no real continue17:23
after the conflicts are solved, you might at most need to do a git add17:24
and git stash drop if you want to remove the stash17:24
← Murr left17:25
→ Murr joined17:26
qswz yea, or ament commit, thanks17:27
amend*17:27
← TomyWork left17:34
→ wyre joined17:35
→ foul_owl_ joined17:36
← Murr left17:36
→ Murr joined17:37
mobile_c how do i fix this17:37
CONFLICT (modify/delete): Scripts/Shell/builtins/printfmacro.h deleted in refs/remotes/origin/master and modified in HEAD. Version HEAD of Scripts/Shell/builtins/printfmacro.h left in tree.17:37
thiago one isde deleted and the other modified it17:37
wyre hi everyone, I have a question, when you do a merge also it is doing implicitly a rebase? I mean, I have got only two branches, master and testing, I've just done a merge, but after a bit change in master, if I do `git checkout testing` and then `git merge master` is git doing also a rebase in testing?17:37
thiago choose what you want to do: keep the modified version or delete it17:37
which one?17:37
mobile_c as im trying to undo a git rm17:38
thiago mobile_c: ok, so keep the modified version17:38
"Version HEAD of Scripts/Shell/builtins/printfmacro.h left in tree."17:38
just git add it again17:38
wyre: a merge is not a rebase17:38
wyre I'm asking that because I would not want to make a commit patch to apply to testing17:38
thiago wyre: however, merging and rebasing do change the base17:38
git merge-base will produce different output before and after17:39
wyre so the most appropriate should be to make a patch?17:39
and apply it to the other branch?17:39
thiago wyre: not necessarily. A merge or a rebase are also valid options.17:40
if your testinb branch is yours only, I'd do a rebase17:40
← redrambles left17:40
mobile_c ig i have commits 094ae4d29b80f5751ec640c59dda069bda861ac0, 5d65b970fe2adf787a407adcb2bdc670a3adf375, and 664cefaa104f87eed5dedb5573fc26872ccf0e9b, if i reset to 664cefaa104f87eed5dedb5573fc26872ccf0e9b then commit will it overwrite the history so that it shows <new commit> then 664cefaa104f87eed5dedb5573fc26872ccf0e9b17:40
wyre thiago, then my point is right? could I place myself in testing branch and run a merge from master?17:41
thiago, it is mine, right :-) it is a personal project, to learn more about git :-)17:41
thiago mobile_c: if you are at 664cefaa104f87eed5dedb5573fc26872ccf0e9b and make a new commit, then git log will show that new commit followed by 664cefaa104f87eed5dedb5573fc26872ccf0e9b17:41
mobile_c ok17:41
thiago wyre: yes, you can also "git merge master"17:41
wyre: it's simpler and has fewer failure modes. I'm just saying that I would personally choose "git rebase master"17:42
→ WhiskerBiscuit joined17:42
wyre I think, the point is ... If I do a merge ... the branches will be connected, so both are the same17:42
then I could continue working on testing, right?17:42
← rafasc left17:42
thiago yes, but the same thing happens for rebase17:42
different method, but achieves similar results17:43
wyre thiago, right! that's why I was asking about that xddd17:43
mobile_c how would i delete the last two commits so 664cefaa104f87eed5dedb5573fc26872ccf0e9b is the head and master17:43
thiago mobile_c: git reset --hard 664cefaa104f87eed5dedb5573fc26872ccf0e9b17:43
wyre ty, thiago :-D17:43
mobile_c as i tried git reset --hard 664cefaa104f87eed5dedb5573fc26872ccf0e9b ; git push17:43
thiago --hard makes reset also check out the commit once it is done moving17:43
mobile_c: it's a history !rewrite, so you will need to force the push17:43
gitinfo mobile_c: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum17:43
mobile_c but i get hint: Updates were rejected because the tip of your current branch is behind17:44
→ mat-manger joined17:46
← diogenese left17:47
← Case_Of left17:47
→ diogenese joined17:47
→ Case_Of joined17:49
→ millerti joined17:49
→ _noblegas joined17:50
→ watabou joined17:50
← sozuba left17:50
mobile_c ok17:51
that works17:51
→ sozuba joined17:53
→ gloomy joined17:53
→ orbyt_ joined17:53
← watabou left17:55
← gxt left17:57
→ gxt joined17:58
← sandlotasn left17:59
← luist left18:01
← awkwords left18:03
→ luist joined18:03
← mat-manger left18:05
→ mat-manger joined18:10
← mat-manger left18:12
← aw1 left18:14
→ YuGiOhJCJ joined18:18
→ miczac joined18:20
→ rath joined18:22
← deathwishdave left18:23
→ aLeSD_ joined18:25
← irqq left18:26
← aLeSD left18:27
← aLeSD_ left18:27
← xrexeon left18:28
→ aLeSD_ joined18:28
← theoceaniscool left18:29
← Eryn_1983_FL left18:29
→ Eryn_1983_FL joined18:29
← [twisti] left18:29
← YuGiOhJCJ left18:30
→ m0viefreak joined18:31
← miczac left18:32
→ awkwords joined18:32
→ watabou joined18:32
← lacrymology left18:33
→ lacrymology joined18:34
← mescalinum left18:35
→ czart joined18:36
← ketas left18:36
→ sgen joined18:36
← watabou left18:37
← foul_owl_ left18:37
→ ketas joined18:42
← Mattiaslndstrm left18:45
→ mescalinum joined18:46
← T_UNIX left18:49
→ cariveri joined18:49
cariveri Hi. How to dump a commit to wokring change?18:50
_ikke_ sorry?18:51
moritz wok ring, sounds like Asian food :D18:52
cariveri Hi. Ive got a trashy commit, that Id like redo. so Id like to dump out the change of that commit to be working directory changes. makes sense?18:52
grawity uh, do you mean discarding the original bad commit?18:53
_ikke_ git reset HEAD~18:53
given it's the last commit18:53
← czart left18:53
→ foul_owl_ joined18:53
cariveri yes last commit.18:53
_ikke_ then that command18:54
← diogenese left18:54
cariveri HEAD~ equals HEAD^1 right?18:54
_ikke_ yes18:55
grawity yes18:55
cariveri ok cool.18:55
grawity more commonly written as HEAD~1 and HEAD^ though18:55
cariveri thx.18:55
← awalvie__ left18:56
← CryptoDavid left18:57
_ikke_ note that HEAD^2 != HEAD~218:57
→ andrew joined18:57
→ yyy joined18:58
← mat001_ left18:59
→ Dirak joined19:02
→ mat001 joined19:04
→ Sasazuka joined19:04
← andrew left19:05
→ andrew joined19:07
← gxt left19:07
← orbyt_ left19:09
← Inline left19:10
← andrew left19:13
← aLeSD_ left19:13
→ orbyt_ joined19:14
← rath left19:15
← yyy left19:16
← mattcen left19:16
→ irqq joined19:17
→ Inline joined19:18
← orbyt_ left19:19
→ andrew joined19:19
→ mattcen joined19:19
← Inline left19:19
→ Inline joined19:20
← Murr left19:23
← sauvin left19:24
→ Murr joined19:24
← andrew left19:25
← gloomy left19:26
← reveller left19:26
→ freeman42x joined19:26
→ orbyt_ joined19:27
← WhiskerBiscuit left19:27
→ watabou joined19:28
→ WhiskerBiscuit joined19:28
→ czart joined19:28
← czart left19:33
→ v01d4lph4 joined19:33
← igemnace left19:34
← Murr left19:36
→ Murr joined19:37
← craigo_ left19:40
→ craigo joined19:40
← cariveri left19:44
← huhlig_ left19:46
→ huhlig_ joined19:47
→ gloomy joined19:48
→ gxt joined19:48
← mattcen left19:50
→ mattcen joined19:50
← heroux left19:51
← qswz left19:51
→ heroux joined19:52
→ plexigras joined19:53
→ CryptoDavid joined19:55
← bolovanos left19:57
→ keepLearning512 joined20:01
← watabou left20:01
← qqx left20:02
→ qqx joined20:03
→ __rohit joined20:07
← v01d4lph4 left20:09
→ mona_x joined20:10
← mona_x left20:12
← VectorX left20:12
→ VectorX joined20:14
← sgen left20:15
← mat001 left20:22
← chaosruler left20:23
→ mat001 joined20:23
→ chaosruler joined20:24
← chaosruler left20:24
→ chaosruler joined20:25
← sozuba left20:25
← mat001 left20:28
← Phylock left20:28
← Murr left20:30
→ Murr joined20:30
← emsjessec left20:30
← howell left20:34
← Dirak left20:35
→ Dirak joined20:39
← Murr left20:41
→ Murr joined20:42
→ Mike11 joined20:44
→ wildlander joined20:46
→ mat001 joined20:48
← orbyt_ left20:52
→ leeN joined20:53
→ orbyt_ joined20:54
→ m1dnight_ joined20:54
← leeN left20:55
→ UTAN_dev joined20:56
→ leeN joined20:57
← kapil____ left20:58
→ AtumT_ joined21:00
← fox42 left21:01
← Murr left21:01
→ Murr joined21:02
← AtumT left21:03
→ mat001_ joined21:03
← eblip left21:05
→ diogenese joined21:06
← mat001 left21:07
← Murr left21:07
→ sythe joined21:07
← egovirus left21:07
→ eblip joined21:08
← gloomy left21:08
→ Murr joined21:08
← orbyt_ left21:09
→ PackageCompare joined21:11
PackageCompare I cannot seem to get git hooks to activate in Windows21:11
← WhiskerBiscuit left21:11
PackageCompare I have the following in a file under /.git/hooks : http://tiny-paste.com/50070/21:12
→ AtumT joined21:13
← AtumT_ left21:14
← leeN left21:15
→ eshlox joined21:16
PackageCompare Ah nevermind I got it21:18
_ikke_ What was it?21:19
→ Karyon joined21:19
← Puffball left21:19
→ thebope joined21:20
← chaosruler left21:21
→ ekh joined21:22
← thebope left21:26
→ oojacoboo joined21:27
← SkarmoutsosV left21:28
ekh Is there a difference between gitflow and github flow? i mean between tutorial that shows `git flow ..` vs `git hf ..`21:32
→ thebope joined21:32
← thebope left21:32
→ mowcat joined21:32
→ thebope joined21:32
_ikke_ ekh: the workflow is different21:33
ekh: main difference is that github flow branches of and merges back into master directly21:33
← silenc3r left21:34
ekh thanks, _ikke_21:34
← luist left21:34
→ sandlotasn joined21:36
← Mike11 left21:38
→ mikecmpbll joined21:39
← Anthaas left21:41
→ Anthaas joined21:42
→ paultreny joined21:44
→ tmm88 joined21:45
← tmm88 left21:45
wyre ideas about how solve this issue with python3?21:46
UnicodeDecodeError: 'utf-8' codec can't decode byte 0xf3 in position 204: invalid continuation byte21:46
← ekh left21:46
wyre I've tried with `u'\0xf3'.encode('latin-1')` but did not work21:46
the character is an 'ó'21:47
python2 works pretty fine21:47
← thebope left21:48
wyre another question ... it is python2 coming next to python3 on windows installer?21:49
ups, sorry :-/21:50
I was talking all afternoon in #python, hehe21:50
I think that was enough :S21:50
← Siecje left21:50
→ Karyon_ joined21:52
← Karyon left21:52
→ orbyt_ joined21:53
→ johnlage joined21:53
→ dre_ joined21:55
← orbyt_ left21:57
→ watabou joined21:58
← thiago left21:58
→ horribleprogram joined21:59
← plexigras left22:04
← goiko left22:04
← cbreak left22:05
→ nocbreak joined22:05
→ kapil____ joined22:06
→ cdown joined22:06
← cdown left22:06
→ cdown joined22:09
← jubal left22:12
← PackageCompare left22:12
→ yyy joined22:12
← awkwords left22:15
→ awkwords joined22:16
← awkwords left22:17
→ n3wborn joined22:18
→ gloomy joined22:18
← keepLearning512 left22:18
← __rohit left22:20
← Inline left22:21
→ Inline joined22:21
← gloomy left22:23
← Inline left22:24
→ orbyt_ joined22:25
→ Inline joined22:25
→ thebope joined22:26
← Inline left22:27
→ thiago joined22:27
→ Inline joined22:27
← thebope left22:28
→ rafasc joined22:29
→ thebope joined22:29
→ hofmann3900 joined22:29
← Inline left22:30
→ Inline joined22:30
← watabou left22:31
→ sgen joined22:31
← mescalinum left22:32
→ mescalinum joined22:32
← mat001_ left22:33
← Inline left22:33
→ Inline joined22:33
← Inline left22:36
→ Inline joined22:36
← Inline left22:39
→ Inline joined22:40
→ mona_x joined22:42
← Inline left22:43
→ Inline joined22:43
← thebope left22:46
← averell left22:46
← Inline left22:46
→ mona_x_ joined22:46
→ Inline joined22:46
← mona_x left22:47
← wadadli left22:48
← Murr left22:49
← Inline left22:49
→ wadadli joined22:49
→ Inline joined22:50
→ Murr joined22:50
← n3wborn left22:51
← iam730 left22:51
← mona_x_ left22:53
← Inline left22:53
← jcbitter left22:53
→ Inline joined22:53
← diogenese left22:53
→ thomasross joined22:53
→ iam730 joined22:54
→ diogenese joined22:55
→ averell joined22:55
← lucasb left22:55
← Inline left22:56
→ Inline joined22:57
← thiago left22:57
← Inline left23:00
→ Inline joined23:00
← Murr left23:02
→ Murr joined23:02
← Inline left23:03
→ Inline joined23:04
← Karyon_ left23:04
→ watabou joined23:06
← Inline left23:07
→ Inline joined23:07
→ mona_x joined23:09
← Inline left23:10
→ Inline joined23:10
← mona_x left23:11
← Inline left23:12
→ Inline joined23:13
→ jcbitter joined23:14
← Murr left23:15
→ Murr joined23:16
← Makaveli7 left23:22
← nocbreak left23:23
← saidi left23:25
← strugee left23:25
← eshlox left23:25
→ strugee joined23:28
→ cbreak joined23:30
← Murr left23:31
→ Murr joined23:31
← sgen left23:33
← craigo left23:33
dansan_ → dansan23:34
→ yonder joined23:36
← yyy left23:39
← watabou left23:39
→ mat001 joined23:39
→ theoceaniscool joined23:44
← geri left23:46
← mat001 left23:49
← cbreak left23:49
← horribleprogram left23:50
← boombatower left23:52
→ cbreak joined23:52
→ Sasazuka__ joined23:54
→ bhelgaas joined23:56
← Sasazuka left23:57

Logs Search ←Prev date Next date→ Channels Documentation