IRCloggy #git 2018-12-28

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.

2018-12-28

← Toadisattva left00:00
← greggerz left00:02
← finalbeta left00:04
← mat001 left00:04
→ Wetmelon joined00:05
← perrier-jouet left00:08
← oojacoboo left00:11
→ thiago joined00:13
→ ski7777 joined00:17
← dege left00:18
→ wgrant joined00:22
→ jetchisel joined00:22
→ heebul joined00:26
← heebul left00:26
→ kapil____ joined00:28
→ andyhuzhill joined00:29
→ treehug88 joined00:33
← n3wborn left00:34
→ oojacoboo joined00:34
← chandoo left00:36
← mikecmpbll left00:37
→ JoeA2552 joined00:40
→ Guest44017 joined00:41
← quesker left00:41
→ orbyt_ joined00:42
← netj left00:42
→ netj joined00:42
← cbrt64 left00:44
→ cbrt64 joined00:45
→ ph88 joined00:47
← limarfrek left00:48
← Guest44017 left00:48
ph88 as part of a library i'm making i need the PCRE2 source code. However this is in a subversion repository. Now i'm not sure what is the best thing to do. Let the users download the source code as part of the build process from subversion (this is probably complicated). Or include an archive file for a release. Or unpack the PCRE2 release files in my own project. My own project is based on git00:51
← andyhuzhill left00:54
→ andyhuzhill joined00:54
→ kerframil joined00:56
→ ferdna joined00:58
← andyhuzhill left00:58
→ andyhuzhill joined00:59
← plexigras left00:59
← Copenhagen_Bram left01:00
← keep_learning_M left01:01
→ Copenhagen_Bram joined01:02
jrnieder ph88ph88: interesting question. Can you say more about why you need the PCRE2 source code, as opposed to linking to it as a library?01:03
→ quesker joined01:04
← thiago left01:07
→ Bobdude joined01:19
ph88 jrnieder, because the library that comes with ubuntu doesn't have the right compilation options set. And also i need cross platform support for windows01:20
Maple__ → Maple01:22
← JoeA2552 left01:26
← al-damiri left01:27
→ JoeA2552 joined01:27
← \void left01:29
← JoeA2552 left01:29
→ Mattiaslndstrm joined01:30
→ JoeA2552 joined01:36
← JoeA2552 left01:36
← cbrt64 left01:38
← andyhuzhill left01:39
→ andyhuzhill joined01:39
→ JoeA2552 joined01:43
← andyhuzhill left01:43
→ andyhuzhill joined01:44
← orbyt_ left01:46
← dfee left01:48
← JoeA2552 left01:49
→ esrse joined01:50
ph88 be back later01:52
← ph88 left01:52
← syntaxfree left01:56
→ prakashdanish joined01:57
→ JoeA2552 joined01:58
← netj left01:59
→ netj joined01:59
→ finalbeta joined02:01
← Jakegit left02:02
← Regon left02:02
← jrnieder left02:07
→ dfee joined02:08
← DolphinDream left02:09
← JoeA2552 left02:10
→ JoeA2552 joined02:10
← kus_ubuntui686 left02:15
← rewt left02:15
→ rewt`` joined02:15
rewt`` → rewt02:15
← secretmessage left02:15
← philippirrip left02:15
→ DolphinDream joined02:17
→ cbrt64 joined02:17
← DolphinDream left02:17
← sybariten left02:18
← Zexaron left02:21
← cbrt64 left02:22
← dfee left02:28
→ andyhuzhill_ joined02:29
← YuGiOhJCJ left02:30
→ cbrt64 joined02:31
← Olipro left02:32
← andyhuzhill left02:33
andyhuzhill_ → andyhuzhill02:33
→ Olipro joined02:34
→ andyhuzhill_ joined02:34
← andyhuzhill left02:38
← andyhuzhill_ left02:39
→ wreed joined02:39
→ andyhuzhill joined02:40
← cbrt64 left02:40
← CheckDavid left02:41
→ andyhuzhill_ joined02:44
→ Umeaboy joined02:46
Umeaboy Hi!02:46
→ orbyt_ joined02:46
← kapil____ left02:47
← andyhuzhill left02:47
andyhuzhill_ → andyhuzhill02:47
← Essadon left02:49
← veegee left02:50
→ naoey joined02:53
← andyhuzhill left02:53
← Mattiaslndstrm left02:55
← kerframil left02:56
← orbyt_ left02:57
→ Goplat joined03:00
→ kapil____ joined03:04
→ orbyt_ joined03:07
← lagothrix left03:11
→ lagothrix joined03:11
← Milos left03:11
→ dfee joined03:11
← sgen_ left03:11
→ Milos joined03:12
→ matsaman joined03:14
→ andyhuzhill joined03:14
→ yyy joined03:14
→ bongozig joined03:15
→ keep_learning_M joined03:17
← matsaman left03:20
← yyy left03:22
← andyhuzhill left03:22
← Copenhagen_Bram left03:26
→ andyhuzhill joined03:29
← prakashdanish left03:34
→ Copenhagen_Bram joined03:35
← keep_learning_M left03:37
← tarkus left03:40
→ boombatower joined03:42
→ Toadisattva joined03:43
→ keep_learning_M joined03:47
→ zumba_ad_ joined03:50
zumba_ad_ looks like I found the culprit. It's git bundle create. What is this for?03:51
← JoeA2552 left03:52
← andyhuzhill left03:54
← oojacoboo left03:54
← midnightmagic left03:54
→ andyhuzhill joined03:54
← orbyt_ left03:55
← libertyprime left03:57
← andyhuzhill left03:58
→ andyhuzhill joined03:59
→ shaarad joined04:00
→ midnightmagic joined04:01
→ craigo joined04:02
← craigo left04:03
Umeaboy zumba_ad_: What repo are you trying to initialize?04:04
← shaarad left04:04
zumba_ad_ what do you mean initialize?04:04
looking at the ps output, looks like git bundle is affected and not the culprit04:05
→ shaarad joined04:05
zumba_ad_ the state is D when using htop or top meaning uninterruptible04:05
→ thebope joined04:08
→ sgen_ joined04:09
→ KnoP joined04:10
→ libertyprime joined04:14
← KnoP left04:16
← mobile_c left04:18
← shaarad left04:19
← wreed left04:20
← justanotheruser left04:21
→ Kaisyu joined04:23
→ wreed joined04:23
→ mobile_c joined04:27
→ JanC_ joined04:28
← JanC left04:29
JanC_ → JanC04:29
→ justanotheruser joined04:34
← shicks_ left04:35
← andyhuzhill left04:38
← boombatower left04:40
→ andyhuzhill joined04:44
← Copenhagen_Bram left04:53
→ Cabanoss- joined04:54
← thebope left04:55
← Cabanossi left04:56
← andyhuzhill left04:57
→ Neophyliam joined04:58
→ KeyJoo joined04:59
→ andyhuzhill joined04:59
← wreed left05:00
→ sydbarret joined05:00
→ pks_ joined05:01
← pks left05:02
pks_ → pks05:02
← GreenJello left05:03
← manuelschneid3r left05:06
← Anthaas left05:08
← Neophyliam left05:08
→ Anthaas joined05:09
← mowcat left05:16
→ sauvin joined05:19
← m0viefreak left05:22
← justanotheruser left05:23
← andyhuzhill left05:29
→ andyhuzhill joined05:29
← quipa_ left05:30
← armyriad left05:30
← andyhuzhill left05:33
→ andyhuzhill joined05:34
→ GreenJello joined05:36
← gde33 left05:38
→ howdoi joined05:40
→ keepLearning512 joined05:42
→ Laxtour joined05:43
← andyhuzhill left05:48
← Laxtour left05:49
→ no-n joined05:49
← mooasaurus left05:50
→ mooasaurus joined05:50
→ andyhuzhill joined05:51
← andyhuzhill left05:54
→ andyhuzhill joined05:54
→ MACscr joined05:55
← andyhuzhill left05:57
→ gde33 joined05:57
← ferdna left05:58
→ andyhuzhill joined05:58
← Toadisattva left05:58
← andyhuzhill left05:59
← Chaser left06:00
→ Chaser joined06:04
← Chaser left06:05
→ Chaser joined06:05
← Chaser left06:05
← xcm left06:06
→ Chaser joined06:06
→ xcm joined06:06
→ mat001 joined06:09
→ andyhuzhill joined06:10
→ cbrt64 joined06:12
← andyhuzhill left06:14
→ andyhuzhill joined06:15
← sgen_ left06:17
→ irc_viewer_test joined06:22
→ thebope joined06:24
→ ttl joined06:24
→ billtsui joined06:25
→ JoeA2552 joined06:25
→ BenderRodriguez joined06:25
← sydbarret left06:32
← JanC left06:46
← Umeaboy left06:46
→ JanC joined06:46
→ Makaveli7 joined06:46
← mattcen left06:50
← Bobdude left06:50
← Makaveli7 left06:53
← JoeA2552 left06:54
→ mattcen joined06:57
← GreenJello left06:58
→ GreenJello joined06:59
← GreenJello left07:04
→ ph88 joined07:04
ph88 as part of a library i'm making i need the PCRE2 source code. However this is in a subversion repository. Now i'm not sure what is the best thing to do. Let the users download the source code as part of the build process from subversion (this is probably complicated). Or include an archive file for a release. Or unpack the PCRE2 release files in my own project. My own project is based on git07:04
← keepLearning512 left07:08
→ kerframil joined07:15
← dfee left07:16
_ikke_ A lot of projects / languages also have dedicated package managers07:16
s/package/dependency07:17
→ keepLearning512 joined07:18
ph88 _ikke_, yes i have stack, what about it ?07:18
← foul_owl left07:20
→ foul_owl joined07:22
→ JoeA2552 joined07:22
← keepLearning512 left07:23
_ikke_ ph88: those are typically used to make sure everyone has the correct dependencies installed07:23
ph88 _ikke_, there is no PCRE2 package on hackage, i would be creating the first07:24
← watabou left07:29
← andyhuzhill left07:29
→ oxymoron93 joined07:30
→ andyhuzhill joined07:30
← andyhuzhill left07:33
→ sydbarret joined07:33
→ andyhuzhill joined07:33
← lightstalker left07:38
← andyhuzhill left07:39
→ lightstalker joined07:39
← JoeA2552 left07:39
→ andyhuzhill joined07:40
← irc_viewer_test left07:41
← Goplat left07:42
← jetchisel left07:45
← thebope left07:49
→ thebope joined07:50
→ geekodour08 joined07:50
← thebope left07:54
→ JoeA2552 joined07:55
← sydbarret left07:56
→ thebope joined07:56
← kapil____ left07:57
← immae left07:59
→ bneo99 joined08:01
← kadoban left08:02
← mat001 left08:04
→ Silmarilion joined08:06
← ttl left08:07
→ ttl joined08:08
← wootehfoot left08:10
→ immae joined08:12
→ mat001 joined08:12
ph88 be back later08:19
← ph88 left08:19
← ttl left08:21
→ keepLearning512 joined08:22
→ Makaveli7 joined08:23
→ jakogut_ joined08:23
← Silmarilion left08:26
← mat001 left08:28
→ SlashLife joined08:28
→ n3wborn joined08:31
← thebope left08:31
← foul_owl left08:32
→ thebope joined08:32
← omn left08:33
→ Mike11 joined08:33
→ omn joined08:34
← thebope left08:36
→ Envil joined08:40
→ thebope joined08:40
d3v_null → devzero08:42
→ foul_owl joined08:44
← thebope left08:44
← andyhuzhill left08:50
→ marataziat joined08:51
→ cswl joined08:57
→ justanotheruser joined09:02
← Wetmelon left09:06
→ Zexaron joined09:19
→ thebope joined09:20
← Makaveli7 left09:25
→ veegee joined09:26
← zumba_ad_ left09:30
← keep_learning_M left09:31
→ keep_learning_M joined09:32
→ kapil____ joined09:35
← esrse left09:35
← flying_sausages left09:39
→ Noti joined09:40
← Noti left09:43
← dpyro left09:49
→ yyy joined09:49
← thebope left09:53
← jakogut_ left09:53
→ mikecmpbll joined09:55
→ acidjnk joined10:00
← mikecmpbll left10:02
→ totte joined10:05
→ flying_sausages joined10:06
→ Makaveli7 joined10:07
← totte left10:07
← billtsui left10:16
→ ttl joined10:16
← ttl left10:16
→ ttl joined10:17
← catsup left10:18
→ catsup joined10:19
← catsup left10:19
← libertyprime left10:20
→ catsup joined10:20
→ Noti joined10:20
→ totte joined10:21
← keepLearning512 left10:28
← xcm left10:29
→ xcm joined10:29
← powerbit left10:29
→ powerbit joined10:32
← powerbit left10:32
← ttl left10:32
→ powerbit joined10:35
← powerbit left10:35
← Kaisyu left10:37
← marataziat left10:39
→ powerbit joined10:39
← JoeA2552 left10:44
→ thebope joined10:48
→ blacknta_ joined10:53
← blacknta_ left10:53
→ blackntan-airboo joined10:54
→ keepLearning512 joined10:55
→ quipa joined10:56
← quipa left10:58
→ quipa joined10:59
← xcm left11:04
→ xcm joined11:05
← Makaveli7 left11:06
→ Makaveli7 joined11:06
← KeyJoo left11:12
← xcm left11:13
→ xcm joined11:13
→ crimastergogo joined11:17
← keepLearning512 left11:20
→ keepLearning512 joined11:21
← thebope left11:22
← geekodour08 left11:24
→ Copenhagen_Bram joined11:25
→ KeyJoo joined11:26
→ geekodour08 joined11:27
← keepLearning512 left11:29
← yyy left11:32
→ keepLearning512 joined11:32
→ deltam joined11:39
← cd left11:48
← xcm left11:48
→ xcm joined11:49
← Noti left11:50
→ thebope joined11:50
← crimastergogo left11:51
→ crimastergogo joined11:58
← Mike11 left12:07
→ jnavila joined12:17
← thebope left12:24
→ yyy joined12:24
→ plexigras joined12:26
→ YuGiOhJCJ joined12:32
→ Anticom joined12:42
→ flying_penguin joined12:44
← donofrio left12:47
→ perrier-jouet joined12:48
← keepLearning512 left12:53
→ mostlybadfly joined12:54
← blackntan-airboo left12:56
→ blackntan_airboo joined12:56
anddam jim: sorry for the delay, I left the office before you further replied yesterday12:59
← xcm left13:04
→ xcm joined13:05
→ lucasb joined13:08
← oxymoron93 left13:09
→ oxymoron93 joined13:10
← blackntan_airboo left13:21
→ ph88 joined13:23
ph88 as part of a library i'm making i need the PCRE2 source code. However this is in a subversion repository. Now i'm not sure what is the best thing to do. Let the users download the source code as part of the build process from subversion (this is probably complicated). Or include an archive file for a release. Or unpack the PCRE2 release files in my own project. My own project is based on git13:23
→ ArSn joined13:24
→ manuelschneid3r joined13:24
← ArSn left13:24
→ ArSn joined13:26
→ mowcat joined13:30
← cbrt64 left13:31
← crimastergogo left13:32
← KeyJoo left13:37
← YuGiOhJCJ left13:39
xcm → Guest2467913:41
← Guest24679 left13:41
→ xcm joined13:41
← bsaboia left13:42
→ m0viefreak joined13:43
→ dviola joined13:47
← jnavila left13:51
→ shaarad joined13:54
→ cbrt64 joined13:54
← shaarad left13:55
→ wreed joined14:00
→ shaarad joined14:01
→ AtumT joined14:04
← Makaveli7 left14:07
← n3wborn left14:08
→ GreenJello joined14:11
← xcm left14:12
→ xcm joined14:12
→ ngui joined14:17
moritz ph88: how big is that source code?14:18
ph88 moritz, i don't know if i have tools installed to measure the size of the source code14:18
moritz ph88: just do a 'du -sch path/to/pcre2/*'14:19
ph88 https://bpaste.net/show/186cbd71b07414:20
don't mind the build directory i generated it14:20
https://ftp.pcre.org/pub/pcre/pcre2-10.32.tar.bz214:20
→ donofrio joined14:20
← ngui left14:21
→ ngui joined14:22
→ tmokros joined14:24
moritz hm, 3.6M in src/, that's quite a bit14:24
I'd download it via curl or wget from https://ftp.pcre.org/pub/pcre/pcre2-10.32.tar.bz2 as part of the build process14:25
← xcm left14:26
→ mikecmpbll joined14:26
← donofrio left14:26
→ xcm joined14:26
← tmokros left14:27
Anticom Hey guys. I've got a problem that bugs me for a while now: I've got a .gitconfig in a subdir on my machine that is the root for all work-related stuff. All i do in that .gitconfig is override user.name and user.email. Now we've got a company github account with private repos. I'm invited to a repo x but i can't pull/push from it using git scheme but only https which requires me to enter my credentials over and over again14:28
What am i missing, how to diagnose and how to fix this?14:28
moritz first of all, the names in .gitconfig are not used for authentication at all14:29
← qqx left14:29
moritz second, why can't you use SSH-based pulling? firewall?14:29
← dviola left14:30
Anticom moritz: it's a secondary github account we're required to use. Don't ask, some smart ass decided we're not allowed to use our regular private github account everyone has already14:30
moritz ok, but could you still use SSH?14:31
_ikke_ Anticom: Note that user.name and user.e-mail settings don't have anything to do with authenticating to github (or anything else for that matter)14:31
Anticom moritz: i think i meant ssh for pulling14:31
basically the non-https link github is offering14:31
_ikke_ Anticom: So what's the issue you are trying to solve14:31
→ qqx joined14:32
moritz Anticom: you could generate a different key pair for that second user, and then set GET_SSH_COMMAND='ssh -i /path/to/privkey'14:32
Anticom moritz: hm i've got the 2nd keypair already14:32
however if possible at all i'd like to use that key whenever i'm working on projects in that sub-dir14:33
moritz there are several options. One is the environment variable I mentioned14:33
(I'm sure there are shell functions to (un)set variables when you enter and leave directories, haven't googled it myself yet)14:34
another is to use an alias for github in the git URLs, and define that alias in your ~/.ssh/config14:34
Anticom hm i somewhat like your last idea but it doesn't seem very portable14:35
moritz afk&14:35
→ TJ- joined14:37
← PioneerAxon left14:37
← geekodour08 left14:38
→ keepLearning512 joined14:38
→ geekodour08 joined14:39
← kerframil left14:39
← geekodour08 left14:40
→ geekodour08 joined14:41
← mattcen left14:41
← wreed left14:42
← geekodour08 left14:42
→ geekodour08 joined14:43
→ jnavila joined14:43
← winny left14:48
→ mattcen joined14:49
→ winny joined14:49
← winny left14:50
→ winny joined14:50
→ venmx joined14:54
→ SwiftMatt joined14:56
← SwiftMatt left14:57
← esotericnonsense left14:58
← ArSn left14:59
→ ArSn joined14:59
→ esotericnonsense joined15:00
→ PioneerAxon joined15:04
← yyy left15:06
→ yyy joined15:07
→ Guest44017 joined15:07
← oxymoron93 left15:10
cjohnson I'm doing a rebase and end up with a file that says both modified15:10
However inside the file I don't find any <<< markers15:11
what does this mean15:11
← ngui left15:12
→ ngui joined15:12
cjohnson text file not binary, no special encoding15:12
Oh you know what, I know what it is. In one branch I renamed that file and replaced it with a symlink to the renamed version15:13
How can I make sure the upstream changes are getting applied to the renamed version?15:13
→ wreed joined15:13
→ crimastergogo joined15:14
→ Essadon joined15:15
← ngui left15:16
← GreenJello left15:17
→ ngui joined15:17
→ stitched_unicorn joined15:24
← crimastergogo left15:30
← cswl left15:31
→ crimastergogo joined15:31
→ donofrio joined15:31
→ sgen_ joined15:32
→ Toadisattva joined15:33
← kapil____ left15:34
→ tunlezaH joined15:34
← sgen_ left15:36
← donofrio left15:37
→ dpyro joined15:37
← tunlezaH left15:38
← wreed left15:39
← ngui left15:42
→ ngui joined15:42
→ AbleBacon joined15:45
← ngui left15:46
→ ngui joined15:47
← ngui left15:49
→ mescalinum joined15:51
→ zackel joined15:51
→ blip99 joined15:52
← lightstalker left15:52
← liefer left15:53
blip99 hi, trying to `git push -f origin testing` and I get the message error: src refspec preview does not match any.15:53
error: failed to push some refs to '<http:/....repo_..`15:53
→ liefer joined15:53
← Puffball left15:53
blip99 ah the workaround was to use syntax `origin mybranch:remotebranch`, ie renaming15:56
→ ngui joined15:56
← zackel left15:56
← ngui left15:56
→ ngui joined15:57
← ngui left15:59
→ ngui joined16:00
← crimastergogo left16:00
→ armyriad joined16:02
→ prakashdanish joined16:02
→ zackel joined16:02
← zackel left16:04
→ zackel joined16:04
→ al-damiri joined16:05
← zackel left16:06
→ zackel joined16:06
← zackel left16:07
→ zackel joined16:08
→ thebope joined16:08
← ESpiney left16:10
← prakashdanish left16:11
→ dfee joined16:15
← zackel left16:16
→ zackel joined16:16
← howdoi left16:19
← zackel left16:21
→ zackel joined16:21
→ hbautista joined16:22
← dfee left16:24
→ chandoo joined16:24
→ greggerz joined16:25
→ GreenJello joined16:26
← lucasb left16:27
→ c3llulardaxius joined16:33
c3llulardaxius → c3llular16:33
→ \void joined16:35
← zackel left16:36
← th3m1s left16:36
→ zackel joined16:36
→ prakashdanish joined16:39
← GreenJello left16:40
← ngui left16:45
← stitched_unicorn left16:48
anddam how do I remove some remote branches?16:49
← mikecmpbll left16:50
_ikke_ git push --delete <remote> <branchname>16:51
← prakashdanish left16:52
← hahuang6- left16:52
← shaarad left16:53
→ yap joined16:53
yap hi16:54
gitinfo yap: 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.16:54
yap I'm trying to push to a gitlab server authenticating using kerberos. I get "remote: HTTP Basic: Access denied". It works if I use the same server from windows. Can anyone help me troubleshooting this or could at least tell me if there is a way of getting a more verbose output?16:56
→ kapil____ joined16:58
_ikke_ kerberos is not basic auth16:59
→ crimastergogo joined16:59
_ikke_ are you trying to just pass a username and password?17:00
yap fatal: Authentication failed for 'https://:@gitlab.17:00
i'm not sure how i'm supposed to tell git to authenticate using kerberos17:01
→ Goplat joined17:01
← zackel left17:02
→ zackel joined17:02
_ikke_ What OS are you using as client?17:02
← Anticom left17:03
anddam _ikke_: thanks, I want to be sure that the branch has been merged tho'17:03
_ikke_ check git branch -r --merged17:03
xcm → Guest6450117:03
← Guest64501 left17:03
→ xcm joined17:03
← zackel left17:03
_ikke_ this checks if the branches are merged into the current branch17:03
→ hays_ joined17:04
anddam _ikke_: my issue is that my source is a mercurial repo whence I push to a git remote using hg-git17:04
← hays left17:04
anddam _ikke_: I am sure that the branches got merged on mercurial side, not sure why gitlab is showing a non-merged graph17:04
what is that factoid suggested here when asking for help?17:05
→ zackel joined17:05
_ikke_ !just_ask?17:05
gitinfo You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)17:05
→ sanscoeur joined17:09
← Fusl left17:10
← zackel left17:11
→ zackel joined17:11
yap _ikke_: linux17:12
_ikke_ yap: Did you setup kerberos?17:12
→ ilogger2 joined17:13
_ikke_ I mean client side17:14
kerberos is not just username/password authentication17:14
yap _ikke_: client side yes17:14
I use it for svn17:14
so I have a valid ticket17:15
→ Fusl joined17:17
→ crimastergogo joined17:20
→ thiago joined17:21
→ orbyt_ joined17:23
→ hays_ joined17:23
→ natechan joined17:24
→ dfee joined17:31
← hays_ left17:31
→ zackel joined17:31
← thiago left17:33
→ thiago joined17:35
← zackel left17:35
→ zackel joined17:36
zackel → noboruma17:37
← noboruma left17:39
→ zackel joined17:39
zackel → noboruma17:40
← crimastergogo left17:40
→ oojacoboo joined17:40
→ crimastergogo joined17:40
← dfee left17:42
anddam _ikke_: no I mean what is the git log --oneline --graph … that is suggested around here17:43
← noboruma left17:45
→ zackel joined17:46
→ hays_ joined17:46
zackel → noboruma17:48
← noboruma left17:48
→ jakogut_ joined17:49
→ sveinse joined17:53
→ xcm joined17:54
→ no_maam joined17:55
sveinse If the following commands are run: git fetch; git checkout; git merge, and assuming it is checking out the same branch as the working copy is already on, will it be any different from running a plain git pull?17:56
→ Richard_Cavell joined17:57
→ lightstalker joined17:57
→ noboruma joined18:00
← noboruma left18:02
→ Regon joined18:02
→ noboruma joined18:04
→ matsaman joined18:05
← noboruma left18:05
→ Wetmelon joined18:06
→ noboruma joined18:10
← xcm left18:13
→ RazeLighter777 joined18:14
→ xcm joined18:14
→ JoeA2552 joined18:15
→ Hello71 joined18:17
→ liefer joined18:17
← crimastergogo left18:20
← matsaman left18:20
→ sq-one joined18:21
→ fission6 joined18:28
→ CarlFK joined18:31
→ crimastergogo joined18:33
→ kadoban joined18:33
→ quipa joined18:35
← thiago left18:37
→ thiago joined18:39
← quipa left18:39
→ quipa joined18:39
→ mescalinum joined18:41
← lightstalker left18:41
← mescalinum left18:42
← crimastergogo left18:43
→ donofrio joined18:43
← quipa left18:43
→ crimastergogo joined18:43
→ quipa joined18:43
← donofrio left18:45
→ donofrio joined18:45
→ Noti joined18:46
→ c3llular joined18:46
→ mescalinum joined18:47
← RazeLighter777 left18:48
← quipa left18:48
← crimastergogo left18:48
→ quipa joined18:48
→ crimastergogo joined18:49
→ PioneerAxon joined18:51
← JoeA2552 left18:51
← donofrio left18:52
← quipa left18:52
→ jnavila joined18:54
→ quipa joined18:54
SmashingX how can I get rid of the changes I have done so far?18:54
← quipa left18:55
← crimastergogo left18:56
→ crimastergogo joined19:00
→ JoeA2552 joined19:00
→ jokajak joined19:02
← PioneerAxon left19:03
→ PioneerAxon joined19:03
← PioneerAxon left19:04
→ PioneerAxon joined19:05
→ thebope joined19:08
← PioneerAxon left19:08
← c3llular left19:09
→ GreenJello joined19:09
→ PioneerAxon joined19:10
← PioneerAxon left19:11
→ PioneerAxon joined19:12
← thebope left19:12
← Noti left19:12
→ fassl joined19:14
← crimastergogo left19:19
← mescalinum left19:20
moritz SmashingX: did you commit them? if not, "git stash" is a good way19:20
→ crimastergogo joined19:21
SmashingX but git stash saves them in a stash19:21
I didn't commit them19:21
I did "git checkout ."19:22
It seem slike it did the job19:22
← fission6 left19:33
→ wyre joined19:34
wyre hi everyone, :-)19:34
→ publio joined19:34
wyre I'm working in local to learn, and I was wondering ... can I modify any commit message? even an older than latest?19:34
lupine you can rewrite history as much as you like19:35
wyre I mean, I know I can modify the latest commit with --amend, but I want modfy most older commit19:35
lupine the moment you try to share that history with someone else, you're going to have fun19:35
wyre in local of course19:35
grawity wyre: there are tools to rewrite old commits, but doing so requires rewriting *every* later commit that happened after it19:35
wyre: see 'git rebase', 'git filter-branch'19:35
also see !rewriting for what happens if you do this19:36
gitinfo [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum19:36
wyre I just get edit the messages19:36
not the changes done19:36
I mean ... I don't want to introduce different code19:36
→ hays joined19:36
wyre I just want* sorry19:36
grawity what you want to edit is irrelevant19:36
you change a commit in *any* way at all, it still counts as a change19:36
wyre mm ok19:37
grawity whether you change the files or the message or the date or the author, the commit's hash changes, so the following commit also has to be changed (to link back to the updated hash), and so on all the way to the latest commit19:38
← hays_ left19:39
wyre grawity, mmm ok, I get it :-D19:41
ty, see you in #archlinux ;-P19:41
haasn Does --pickaxe-all even do anything? It seems like this is already the default behavior19:42
→ kmels joined19:43
haasn oh nevermind, it does do something, I just wasn't scrolling down far enough19:43
→ dege joined19:46
→ fission6 joined19:50
← fission6 left19:53
← thiago left19:55
← kmels left19:55
→ kmels joined19:56
→ mescalinum joined19:56
← kmels left19:57
→ kmels joined19:57
→ thiago joined19:58
→ greatgatsby joined19:58
→ Guest44017 joined20:00
← JoeA2552 left20:01
← crimastergogo left20:06
→ mobile_c joined20:08
→ AtumT_ joined20:11
CarlFK what do you call the process of fixing a patch that won't apply because the base has changed too much?20:14
→ diegoaguilar joined20:15
→ lucasb joined20:18
→ justanotheruser joined20:19
→ Toadisattva joined20:20
→ jottr joined20:25
→ AtumT joined20:25
← AtumT_ left20:26
→ keepLearning512 joined20:30
→ dansan_ joined20:31
→ totte joined20:32
← kmels left20:37
→ kmels joined20:37
← kmels left20:40
davidfetter reverse engineering20:50
→ iam730 joined20:51
→ planigan joined20:53
→ netj joined20:56
→ Sleepy63 joined20:56
→ thebope joined20:56
j416 cumbersome20:57
← Toadisattva left21:02
→ cd joined21:02
← sveinse left21:07
← keepLearning512 left21:12
CarlFK lol21:12
so not rebase?21:12
→ polydo_s joined21:15
teward CarlFK: no, that's called reverse engineering.21:15
:P21:15
← polydo_s left21:16
CarlFK huh. so the message to the autor is "hey, your 2 year old patch wont apply. please reverse engineer it so we can apply it." ?21:16
teward CarlFK: well in that case 'redo' the patch makes more sense21:17
you didn't tell us *when* the patch was made ;)21:18
→ boombatower joined21:18
← liefer left21:18
→ liefer joined21:19
← GreenJello left21:19
→ Mattiaslndstrm joined21:20
→ dpyro joined21:21
→ GreenJello joined21:26
→ _acalbaza joined21:27
← xcm left21:27
→ xcm joined21:27
_acalbaza is there a way to copy contents of another git repo into my working dir? i have a skeletal repository that i want to reuse without messing with the index on my working repo21:28
← netj left21:28
→ netj joined21:28
_ikke_ _acalbaza: sorry, it's not really clear to me what you want to achieve21:32
← jottr left21:33
→ shabius joined21:35
← shabius left21:36
→ shabius joined21:39
→ buzzlewoo joined21:40
_acalbaza _ikke_: i was looking for a way to copy files from one repo into another. i have a number of repos that will look similar. i wanted to base new ones off an existing repo structure and files21:43
_ikke_ Do you just want to have the files?21:44
_acalbaza _ikke_: yes21:44
_ikke_ _acalbaza: you can use man git archive to get a tarbal of the files21:45
gitinfo _acalbaza: the git-archive manpage is available at https://gitirc.eu/git-archive.html21:45
_ikke_ which you can then extract wherever you want21:45
_acalbaza _ikke_: gotcha21:45
thanks21:45
← thebope left21:49
→ thebope joined21:49
← thebope left21:53
→ ph88 joined21:56
← xcm left21:57
→ xcm joined21:58
← fassl left22:05
← Mattiaslndstrm left22:10
→ yyy joined22:11
→ thebope joined22:14
→ jottr joined22:16
← thebope left22:19
→ polydo_s joined22:20
→ Mattiaslndstrm joined22:23
→ RoriconKnight joined22:26
← jottr left22:26
← thiago left22:29
→ devzero joined22:29
→ thiago joined22:30
→ thebope joined22:39
← sq-one left22:39
← GreenJello left22:42
→ YuGiOhJCJ joined22:42
→ GreenJello joined22:43
→ jottr joined22:45
→ johnny56_ joined22:48
← justanotheruser left22:49
→ Copenhagen_Bram joined22:50
→ dre_ joined22:51
← mescalinum left22:52
→ cebor joined22:53
← AtumT left22:59
→ JoeA2552 joined23:00
→ kapil____ joined23:02
← jnavila left23:04
← thiago left23:04
← mobile_c left23:10
← GreenJello left23:12
→ paraxial joined23:13
← _acalbaza left23:23
→ milksteak joined23:24
→ gtristan joined23:25
← JoeA2552 left23:26
→ powerbit joined23:32
← powerbit left23:32
← boombatower left23:34
← milksteak left23:35
→ manuelschneid3r joined23:35
→ powerbit joined23:37
← buzzlewoo left23:42
← lucasb left23:48
← yyy left23:48

Logs Search ←Prev date Next date→ Channels Documentation