IRCloggy #git 2019-05-19

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-05-19

dfee left00:02
abraxxas joined00:03
Crocodillian left00:05
eb0t joined00:05
Crocodillian joined00:06
greatgatsby left00:08
eb0t left00:08
ferdna joined00:09
kjartan left00:09
nowhereman left00:10
nowhereman joined00:10
kjartan joined00:14
bashfulshell joined00:15
boombatower left00:16
dkh joined00:16
victorqueiroz left00:17
eva left00:18
notdaniel left00:19
boombatower joined00:22
pR0Ps joined00:23
eblip left00:27
__rohit joined00:27
dkh left00:29
eblip joined00:29
n3wborn left00:34
eb0t joined00:36
abraxxas left00:41
freeman42x left00:41
Narrat left00:48
eb0t left00:51
__rohit left00:52
eb0t joined00:53
blackandblue left00:55
eblip left01:01
duderonomy joined01:06
kusmario left01:09
silverballz left01:20
orbyt_ left01:32
andrybak left01:43
kusmario joined01:43
DuckyDev left01:47
F0rTex left01:47
F0rTex joined01:48
orbyt_ joined01:50
nowhereman left01:52
andrybak joined01:58
scx joined02:06
scx Hello02:06
gitinfo scx: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.02:06
orbyt_ left02:07
scx Is there any difference between "/build" and "build" or "build/" in .gitignore?02:08
I to ignore the "build" directory from root location.02:08
I want to*02:08
Lucas_Gray left02:11
andrybak left02:12
cdown left02:15
Fusl left02:15
Fusl joined02:16
zulutango left02:20
orbyt_ joined02:20
zulutango joined02:22
milkt_ joined02:28
silverballz joined02:29
orbyt_ left02:30
milkt left02:30
scientes left02:34
milkt_ left02:36
milkt joined02:36
m0viefreak left02:44
mattcen left02:47
lagothrixGuest6295502:51
Guest62955 left02:51
lagothrix joined02:51
libertyprime left02:59
mattcen joined03:03
magic_ninja left03:14
magic_ninja joined03:14
mowcat left03:19
libertyprime joined03:21
boombatower left03:28
xcm left03:38
xcm joined03:39
random_yanek left03:39
magic_ninja left03:42
jcbitter left03:42
random_yanek joined03:43
cd joined03:44
jcbitter joined03:45
bambanx joined03:48
meLon left03:58
Achylles left04:01
royal_screwup21 joined04:02
meLon joined04:08
kusmario left04:13
inkbottle left04:16
gadget joined04:17
kusmario joined04:19
kjartan left04:22
kjartan joined04:26
dfee joined04:27
gadget left04:35
ricekrispie joined04:36
ricekrispie2 left04:39
royal_screwup21 left04:58
xcm left05:10
xcm joined05:12
g00s joined05:17
fatalhalt left05:20
dartmouthed joined05:22
snthsnth joined05:26
kapilp joined05:31
ghoti left05:35
RoriconKnight joined05:38
Phylock joined05:59
mohsen_1 joined06:16
xcm left06:17
xcm joined06:18
R2robot left06:31
xcm left06:32
xcm joined06:32
R2robot joined06:43
dfee left06:48
bambanx left06:51
ferdna left06:57
clime joined07:00
kosnick joined07:04
z|bandito joined07:05
thiago left07:05
Mr__Anderson joined07:10
kosnick left07:11
nic-hartley left07:18
nowhereman joined07:20
dfee joined07:25
dfee left07:26
plexigras joined07:26
RoriconKnight left07:26
mud left07:30
mat001 left07:31
hofmann3900 left07:31
dfee joined07:39
gloomy joined07:40
savolla joined07:41
reikdas joined07:42
reikdas Hi, I had a question. Suppose I am working on 2 branches separately, b1 and b2. b1 got merged into master. b2 had commits after this merge as well. Now I want to merge b2 and master. When I am in b2, git pull origin master gives a merge conflict as it should. But, when I go to the file and try to fix the conflicts, I notice that the code under HEAD is not the code that is in master. How do I solve this?07:43
OtakuSenpai joined07:46
moritz reikdas: if you are in b2 and merge master, then HEAD is b207:50
that's just the way it is, nothing to solve07:50
if you don't like that, go to master and merge b2 instead07:50
same thing, just the hunk names turned around07:50
g00s left07:51
supernov1h joined07:52
nowhereman left07:54
xelxebar left07:57
Shentino left07:59
Newami left08:00
kapilp left08:01
n3wborn joined08:04
bashfulshell left08:04
Shentino joined08:07
Goplat left08:07
clime left08:09
ricekrispie2 joined08:10
xelxebar joined08:10
xcm left08:10
ricekrispie left08:11
DuckyDev joined08:11
xelxebar left08:12
xcm joined08:16
abraxxas joined08:17
alip left08:18
kapilp joined08:18
dfee left08:22
xelxebar joined08:24
xelxebar left08:26
igemnace joined08:30
oojacoboo joined08:30
rsrx joined08:32
igemnace left08:35
gloomy left08:38
xelxebar joined08:42
gloomy joined08:48
plexigras left08:50
DuckyDev left08:50
Bobguy left08:52
Muzer left08:57
bebbet left08:58
bebbet joined08:59
plexigras joined09:00
fphilipe joined09:01
DuckyDev joined09:02
osse joined09:04
OtakuSenpai left09:04
rohit[m] joined09:05
Muzer joined09:06
gxt joined09:19
catsup left09:20
catsup joined09:20
igemnace joined09:21
catsup left09:21
catsup joined09:21
DuckyDev left09:28
reikdas left09:29
xelxebar left09:29
fphilipe left09:29
DuckyDev joined09:30
OtakuSenpai joined09:30
xelxebar joined09:31
eckon left09:35
eckon joined09:37
xelxebar left09:40
xelxebar joined09:40
xelxebar left09:47
Spr0cket left09:48
jcbitter left09:50
pd09041999 joined09:52
gloomy left10:00
lankanmon left10:01
oojacoboo left10:02
mohsen_1 left10:06
grufelous joined10:09
barteks2x_ joined10:19
barteks2x left10:20
barteks2x_barteks2x10:21
polman joined10:27
netj left10:29
netj joined10:29
arecaceae left10:29
arecaceae joined10:29
DuckyDev left10:33
DuckyDev joined10:46
kjartan left10:50
dviola joined10:53
mohsen_1 joined10:54
kjartan joined10:55
lankanmon joined10:55
m0viefreak joined11:04
n3wborn left11:05
AtumT joined11:05
Nawab joined11:07
OtakuSenpai left11:08
Neel joined11:12
Neel left11:12
Nawab left11:12
Achylles joined11:16
czart joined11:18
Noti joined11:20
agowa338 joined11:21
kgrandly left11:25
fphilipe joined11:25
oojacoboo joined11:27
is_null joined11:30
oojacobo_ joined11:30
fphilipe left11:30
oojacoboo left11:32
eblip joined11:38
martin-_-_ joined11:39
martin-_-_ hi11:39
I need a git web hosting software11:39
sbeyer joined11:39
milkt left11:44
magic_ninja joined11:45
kgrandly joined11:49
__rohit joined11:49
__rohit hey! How can I uninstall git that was build from sources?11:50
scientes joined11:55
_rohit joined11:57
OtakuSenpai joined11:59
__rohit left12:00
grufelous left12:00
OtakuSenpai left12:00
OtakuSenpai joined12:00
Fusl left12:00
Fusl joined12:01
oojacobo_ left12:02
_rohit__rohit12:04
Globe_Bloater martin-_-_ if you want to self host take a look at https://gitea.io12:04
R2robot martin-_-_: https://gitea.io12:04
greatgatsby joined12:06
xcm left12:08
xcm joined12:08
vishal left12:09
vishal joined12:10
n3wborn joined12:11
queip left12:15
wootehfoot joined12:16
barteks2x left12:16
zulutango left12:17
Atlenohen joined12:17
queip joined12:19
rustyshackleford left12:26
SkarmoutsosV joined12:28
hays joined12:29
xcm left12:30
xcm joined12:30
clime joined12:33
moritz __rohit: did you install to a custom directory? If yes, just delete it12:34
if no: that's generally a bad idea12:34
__rohit moritz: I am afraid it was installed to $HOME12:35
moritz: what can I do now?12:36
moritz __rohit: my best guess would be to run "make install" again, and record what path it copies12:36
then delete those files and paths12:36
__rohit whoa that tedious12:36
s/that/that's/12:37
eva joined12:37
pR0Ps left12:38
pR0Ps joined12:41
moritz always install with a prefix12:42
(generally; not just git)12:43
__rohit IKR but sometimes people make mistakes :p12:44
AmShaegar left12:46
AmShaegar joined12:46
queip left12:47
pd09041999 left12:49
wootehfoot left12:51
moritz otoh, uninstalls are notoriously risky12:52
wootehfoot joined12:52
AmShaegar left12:52
moritz I have written installers for software I wrote, but never uninstallers. Wasn't worth the risk of accidentally deleting the wrong bin/ directory12:52
AmShaegar joined12:53
queip joined12:53
xelxebar joined12:53
xelxebar left12:55
rsrx left12:56
weird_error joined12:58
pd09041999 joined13:00
kapilp left13:01
TJ- joined13:01
n3wborn left13:01
kp__ joined13:01
Inline left13:04
eva left13:05
kp__ left13:06
kp__ joined13:06
sbeyer left13:07
jstein_ joined13:12
jstein_jstein13:12
weird_error left13:14
clime left13:24
fphilipe joined13:26
mat001 joined13:29
fphilipe left13:31
Fernando-Basso joined13:32
dviola left13:35
cbreak left13:47
cbreak joined13:47
Spr0cket joined13:49
random_yanek left13:51
Tawonga left13:55
tasdinq joined13:56
random_yanek joined13:58
hk239 joined14:05
hk239 hi14:05
gitinfo hk239: 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.14:05
hk239 Is it normal that when you download a repository as a .zip file, it doesn't correspond with the contents of the repository?14:05
more specifically I opened this link: https://github.com/ufoai/ufoai , and clicked download, saved the .zip, but it didn't contain the /base folder and was possibly missing other files as well14:06
rohit[m] left14:08
Noti left14:08
rohit[m] joined14:09
__rohit left14:09
Newami joined14:11
R2robot i never download the zips, but yeah, seems like it's not in there14:11
xcm left14:11
xcm joined14:12
Karyon hk239, base is not exported. Read -> https://github.com/ufoai/ufoai/blob/master/.gitattributes14:12
bashfulshell joined14:13
hk239 Okay, thanks14:17
I just didn't know it doesn't automatically correspond with the repository14:17
Didn't occur to me it was possible, and well it didn't take that long to figure out, luckily.. Just cloned the repository with gitkraken14:17
supernov1h left14:19
Karyon hk239, no problem. They wanted those directories excluded from the archive so they set the export-ignore attribute14:20
hk239 Yeah I understand it now14:21
Thanks though14:21
rohit[m] left14:21
Karyon no problem :)14:21
tasdinq left14:22
weird_error joined14:23
Xeyame left14:23
OtakuSenpai left14:24
yyy joined14:26
xcm left14:29
xcm joined14:32
kp__ left14:33
clime joined14:37
czart left14:40
oatmealraisin joined14:42
alyptik left14:42
James0r left14:44
OtakuSenpai joined14:47
ferdna joined14:57
neure joined14:58
neure hi14:58
can i make git diff show a bit more context14:58
in1t3r left14:58
neure like couple of more lines?14:58
j416 probably14:58
man git-diff14:58
gitinfo the git-diff manpage is available at https://gitirc.eu/git-diff.html14:58
Habbie (-U)14:58
neure im reading it14:58
j416 search for context14:59
neure thanks, -U indeed14:59
so I just accidentally made a few commits to wrong branch15:02
what is the simplest way to move them to a different branch?15:02
all local15:03
Habbie i'm not an expert, but i would cherrypick them onto the other branch15:03
then reset this branch15:03
3 commits back15:03
neure i did checkout -b from where i was, looks like the commits showed up there15:04
so i just need to go back and the remove the commits15:04
j416 that would just create a new branch15:04
yes15:04
neure for this I'd like oneliner: show changes (diff) for a commit15:05
j416 neure: git show <commit>15:07
weird_error left15:08
mulberrysince joined15:14
Atlenohen Hey15:16
How do I check again the pending interactive rebase conflicts ? Like a list of the filenames where the >>>> are ?15:17
git status won't show15:17
Habbie i'm pretty sure git status should show15:17
i'm also pretty sure rebase --continue would show but that's scary15:17
Atlenohen I greped, so I know it's only one, but I had many in other cases so I might double check in git sometimes15:18
j416 git status should definitely show them15:18
unless you added them or so15:18
ghoti joined15:18
j416 in which case, grep is your friend15:18
Atlenohen Oh there is, Unmerged Paths ?15:18
j416 yes15:18
something like that15:19
Atlenohen as "both modified"15:20
there is one other "Changes not staged for commit" at a folder path "folder (new commits)"15:21
I guess it stops before rebasing further so after continue it'll do the rest so that's what that is then.15:22
allright look good15:23
alyptik joined15:23
fphilipe joined15:27
neure I have two different local repositories, can I / how do I cherry pick commit from one to another?15:29
nedbat neure: they are different repos? Or different clones of the same repo?15:31
neure different clones of same repo15:32
I cloned a repo at github but realized i need to fork it before I can make a PR15:32
fphilipe left15:32
weird_error joined15:32
neure so now I have local changes to the original and I would need to move those to the fork15:32
Habbie you can push branches from one to the other, locally15:36
(or pull)15:36
PHPanos joined15:39
SkarmoutsosV left15:40
kjartan left15:43
kjartan joined15:47
JoeA2552 joined15:49
Sonderblade joined15:49
xelxebar joined15:51
freeman42x joined15:52
xelxebar left15:53
xelxebar joined15:54
weird_error left15:56
nowhereman joined15:57
PHPanos left15:59
czart joined16:05
oatmealraisin left16:15
nowhereman left16:16
rougeth joined16:17
thiago joined16:20
mbwgh joined16:30
mbwgh left16:31
fatalhalt joined16:31
Fernando-Basso left16:33
weird_error joined16:38
savolla left16:47
Fischmiep joined16:50
bashfulshell left16:52
mbwgh joined16:53
jcbitter joined16:54
victorqueiroz joined16:57
mbwgh How can I "interleave branches" during an interactive rebase? I am trying to use rebase -i to create a branch, apply some commits, and merge the branch into the parent branch again. But I only get weird results. I have narrowed it down to the fact that wrapping all the "picks" between "exec git checkout -b feature" and "exec git checkout master && git merge --no-ff feature" will NOT actually create a feature16:57
bubble, and simply apply everything on top of master. What am I doing wrong?16:57
Fischmiep left16:58
jubal_ left17:00
Fischmiep joined17:01
Fischmiep left17:02
sozuba joined17:03
Lucas_Gray joined17:04
mbwgh left17:07
Fischmiep joined17:07
lagothrix left17:07
in1t3r joined17:07
rougeth hey people, how can I stage hunks automatically based on a pattern (regex maybe)?17:07
thiago I don't think you can automatically stage hunks17:08
jubal joined17:08
pd09041999 left17:09
sweatsuit left17:09
mooasaurus left17:10
mooasaurus joined17:10
OtakuSenpai left17:11
sweatsuit joined17:11
SkarmoutsosV joined17:12
mulberrysince left17:16
Ivoz joined17:21
Fischmiep left17:22
Ivo left17:23
Fischmiep joined17:24
Fischmiep left17:25
orbyt_ joined17:25
Bobguy joined17:25
fphilipe joined17:28
jessec joined17:28
dviola joined17:29
jessec question, I have a repo I've cloned in the past on windows and it's always kicked in git-lfs and pulled the additional files, cloning it today on 2.21.0 it doesn't seem to be doing that, trying to work out if something changed, if I'm hallucinating what happened or if something else might be broken17:30
fphilipe left17:33
Lucas_Gray left17:33
jessec I guess gfw is a separate build so I'll try their gittr17:34
scratch that, found the open issue on github17:36
Lucas_Gray joined17:37
oatmealraisin joined17:38
neure left17:39
Atlenohen left17:45
sbeyer joined17:51
peipito joined17:52
pR0Ps left17:52
greyline joined17:53
greyline what happens, when you have checkouted to a previous commit, and it placed the "top of the branch" into a new branch, and i can't set the head back to the top?17:55
*hi all17:55
when I try to discard .vs/projectname/v15/Server/sqlite3/storage.ide and storage.ide-wal, it says: git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks checkout -- .vs/projectname/v15/Server/sqlite3/storage.ide error: unable to unlink old '.vs/projectname/v15/Server/sqlite3/storage.ide': Invalid argument17:55
so I can't discard or remove those files, and thus I can't set the head back to the top of the branch17:56
what to do?17:56
pR0Ps joined17:57
cd left17:57
Lucas_Gray left18:02
Lucas_Gray joined18:02
borkr joined18:04
yyy left18:05
agowa339 joined18:10
jessec left18:11
wootehfoot left18:12
perrier-jouet joined18:12
agowa338 left18:12
wootehfoot joined18:14
davcon joined18:18
oatmealraisin left18:19
davcon left18:19
davcon joined18:21
Goplat joined18:22
denahv joined18:23
gitinfo set mode: +v18:24
wootehfoot left18:24
pR0Ps left18:27
clime left18:30
lagothrix joined18:35
iNs left18:38
iNs joined18:39
barteks2x joined18:40
oatmealraisin joined18:44
fatalhalt left18:49
pR0Ps joined18:50
fatalhalt joined18:54
fatalhalt left18:56
agowa338 joined18:58
fatalhalt joined18:59
agowa339 left19:00
hofmann3900 joined19:01
azwieg103 left19:01
weird_error left19:04
fatalhalt left19:05
victorqueiroz left19:07
oatmealraisin left19:09
Jitta joined19:10
Inline joined19:10
fatalhalt joined19:11
welovfree joined19:11
n3wborn joined19:12
profmac left19:14
AtumT_ joined19:17
AtumT left19:19
czart left19:22
d^sh left19:23
dfee joined19:23
d^sh joined19:24
orbyt_ left19:26
JoeA2552 left19:27
profmac joined19:27
fphilipe joined19:29
AtumT joined19:30
AtumT_ left19:31
m1dnight_ left19:31
hhes left19:33
m1dnight_ joined19:33
fphilipe left19:33
dege joined19:36
boombatower joined19:44
Achylles left19:46
g00s joined19:47
bikes joined19:49
yyy joined19:50
Darcidride joined19:54
kjartan left19:55
davcon left20:00
kjartan joined20:00
mven left20:02
mven joined20:03
Darcidride_ joined20:03
Darcidride left20:04
n3wborn left20:04
n3wborn joined20:06
martin-_-_ left20:06
Sonderblade left20:06
dfee left20:09
orbyt_ joined20:09
welovfree left20:10
Lucas_Gray left20:17
bashfulshell joined20:22
dfee joined20:23
dfee left20:23
fatalhalt left20:28
fatalhalt joined20:32
royal_screwup21 joined20:36
clime joined20:37
denahvdenahv__20:38
denahv__denahv20:38
James0r joined20:40
mohsen_1 left20:43
jelmer left20:48
James0r left20:50
JonelethIrenicus left20:52
jelmer joined20:55
omnireq left20:56
oatmealraisin joined20:57
borkr left20:57
orbyt_ left20:59
boombatower left21:07
smitop joined21:08
borkr joined21:08
SCHAPiE left21:09
greyline left21:09
weird_error joined21:12
barteks2x left21:14
SCHAPiE joined21:14
borkr left21:15
dermoth left21:15
dermoth joined21:16
James0r joined21:16
igemnace left21:20
greatgatsby left21:21
royal_screwup21 left21:23
mattcen left21:25
fphilipe joined21:26
Mr__Anderson left21:28
jcbitter left21:30
mattcen joined21:31
jcbitter joined21:31
fphilipe left21:31
dege left21:31
magic_ninja left21:35
sunrunner20 left21:35
jcbitter left21:36
jcbitter joined21:37
mattcen left21:39
mattcen joined21:42
jcbitter left21:43
oatmealraisin left21:43
sunrunner20 joined21:43
jcbitter joined21:44
orbyt_ joined21:45
fstd_ joined21:47
Darcidride_ left21:47
CryptoDavid joined21:48
fstd left21:51
fstd_fstd21:51
Achylles joined21:51
z|bandito left21:51
plexigras left21:53
elichai2 joined21:56
orbyt_ left21:58
weird_error left22:02
cfoch joined22:04
SCHAPiE left22:06
weird_error joined22:09
greatgatsby joined22:10
SCHAPiE joined22:12
yyy left22:15
hussam left22:16
abraxxas left22:18
meLon left22:18
im0nde_ joined22:22
im0nde left22:22
sauvin left22:23
sauvin joined22:25
weird_error left22:26
sbeyer left22:28
SkarmoutsosV left22:28
SkarmoutsosV joined22:29
bikes left22:29
AtumT left22:29
inkbottle joined22:30
weird_error joined22:32
bashfulshell left22:32
inkbottle left22:34
Cabanossi left22:35
inkbottle joined22:35
weird_error left22:37
ProbabilityMoon joined22:38
weird_error joined22:39
jstein left22:41
ProbabilityMoon left22:42
TJ- left22:46
Cabanossi joined22:47
ProbabilityMoon joined22:47
SkarmoutsosV left22:48
ProbabilityMoon left22:49
weird_error left22:49
dirgeable left22:50
weird_error joined22:51
Jitta left22:52
gadget joined22:52
meejah left22:52
xcm left22:56
xcm joined22:57
gde33 left22:58
ravndal left22:58
gde33 joined22:58
dfee joined22:59
Rovanion left23:00
gadget left23:00
ZyX-I left23:01
ravndal joined23:01
fphilipe joined23:02
justanotheruser left23:04
moldybits left23:05
fphilipe left23:07
milkt joined23:08
leeN left23:10
Rovanion joined23:10
victorqueiroz joined23:10
Phylock left23:11
rustyshackleford joined23:13
leprechau left23:16
SleePy left23:18
SleePy joined23:19
planigan left23:22
n3wborn left23:24
planigan joined23:25
boombatower joined23:30
jstimm left23:32
weird_error left23:34
irc_viewer_test joined23:34
agowa339 joined23:36
agowa338 left23:39
royal_screwup21 joined23:43
khisanth_ left23:44
weird_error joined23:47
orbyt_ joined23:48
dodobrain joined23:50
dartmouthed left23:51
dfee left23:51
freeman42x left23:52
m0viefreak left23:55
irc_viewer_test left23:56
CryptoDavid left23:58

Logs Search ←Prev date Next date→ Channels Documentation