IRCloggy #git 2023-11-18

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.

2023-11-18

Quack joined00:00
nate4 joined00:04
hinderaker left00:05
techietrash joined00:06
Th|ef left00:08
Th|ef joined00:09
luca left00:09
rama_ left00:10
Pixi__ joined00:12
nate4 left00:13
chiselfuse left00:14
Aminda left00:14
Mikaela joined00:14
wurstwasser left00:14
eqw left00:14
eqw joined00:15
chiselfuse joined00:15
jacobk left00:15
vinleod joined00:20
vdamewood left00:20
nate4 joined00:29
wurstwasser joined00:33
pretty_dumm_guy left00:34
nate4 left00:34
de-facto left00:36
rama_ joined00:39
rama_ left00:39
rama_ joined00:39
Gary_Sinise joined00:44
de-facto joined00:45
ThorMojito joined00:45
z1haze joined00:46
abubakarsadiq left00:48
nate4 joined00:49
bambanxx joined00:50
henry40408 left00:50
henry40408 joined00:50
henry40408 left00:53
henry40408 joined00:53
nate4 left00:54
jacobk joined00:55
kurahaupo left00:58
ThorMojito left01:04
wurstwasser left01:07
raffaele left01:08
raffaele joined01:09
hinderaker joined01:10
gsi_ joined01:13
gsi left01:17
dsrt^ left01:18
dsrt^ joined01:21
kurahaupo joined01:22
nate4 joined01:23
crabbedhaloablut left01:24
m0viefreak left01:25
nate4 left01:31
nate4 joined01:43
nate4 left01:48
gcarlos8 joined01:57
hinderaker left02:02
Minvera left02:03
vinleodvdamewood02:03
mataga left02:04
hinderaker joined02:04
jklfds left02:09
kurahaupo left02:10
z1haze left02:10
mataga joined02:10
mataga left02:10
mataga joined02:10
jklfds joined02:12
ThorMojito joined02:14
ThorMojito left02:14
ferdna joined02:15
peirik joined02:15
CAT_S joined02:16
BUSY joined02:17
jklfds left02:17
ThorMojito joined02:18
ferdna left02:20
hinderaker left02:21
hinderaker joined02:21
ThorMojito left02:22
rama_ left02:23
zoorat joined02:25
jkl left02:26
jkl joined02:27
jklfds joined02:30
utkojhamela left02:32
utkojhamela joined02:32
___nick___ left02:33
___nick___ joined02:35
___nick___ left02:35
keypushe- joined02:36
adanwan left02:36
vdamewood left02:37
adanwan joined02:37
vdamewood joined02:37
keypusher left02:37
___nick___ joined02:37
keypushe-keypusher02:40
nate4 joined02:42
bloody left02:42
nate4 left02:47
jklfds left02:51
nate4 joined02:54
utkojhamela left02:57
utkojhamela joined02:58
nate4 left03:00
cbreak left03:03
cbreak joined03:03
kurahaupo joined03:03
jklfds joined03:03
dob1 joined03:06
jklfds left03:09
gnoooooo____ joined03:11
adanwan left03:16
adanwan joined03:17
gnoooooo____ left03:17
gnoooooo____ joined03:17
sam113101 joined03:17
xx left03:19
vdamewood left03:19
vdamewood joined03:20
jklfds joined03:21
finn_elija joined03:23
FinnElija left03:23
finn_elijaFinnElija03:23
gnoo left03:27
nate4 joined03:29
gnoooooo____gnoo03:29
hbautista joined03:31
hbautista left03:32
FinnElija left03:33
FinnElija joined03:33
dev4449 joined03:33
insidesources left03:34
nate4 left03:34
hbautista joined03:34
nicksloan left03:40
jklfds left03:41
utkojhamela left03:45
utkojhamela joined03:45
nate4 joined03:46
myme joined03:46
YuGiOhJCJ joined03:49
rosco joined03:50
jklfds joined03:52
edr left03:58
aiena joined04:00
derpydoo left04:03
jklfds left04:04
jklfds joined04:04
bambanxx left04:07
stenno left04:09
JanC left04:14
JanC joined04:14
JayBeeFOSS left04:17
JayBeeFOSS joined04:18
jklfds left04:18
YuGiOhJCJ left04:19
YuGiOhJCJ2 joined04:19
jklfds joined04:31
thiago left04:39
rosco left04:40
zoorat left04:41
nicksloan joined04:43
nicksloan left04:43
nate4 left04:49
jklfds left04:50
aiena left04:51
hbautista left04:56
SpawnsSpawns_Carpeting04:57
ZMarkGC left05:01
jklfds joined05:03
jklfds left05:08
cdown left05:09
jklfds joined05:15
stagas left05:19
raffaele left05:19
raffaele joined05:20
jacobk left05:22
cloaker left05:22
rainystorm joined05:34
Vonter left05:37
Vonter joined05:38
ZMarkGC joined05:40
ferdna joined05:46
criswell left05:48
criswell joined05:49
criswell left05:52
criswell joined05:53
drew left05:54
drew joined05:55
utkojhamela left06:02
utkojhamela joined06:03
rosco joined06:09
stagas joined06:13
purpleidea left06:18
jklfds left06:19
CalimeroTeknik joined06:24
vdamewood left06:27
vdamewood joined06:28
Vonter left06:28
jklfds joined06:32
rsx joined06:35
qqq left06:44
Betal left06:46
jklfds left06:51
mven left06:53
mven joined06:53
dev4449 left06:54
gnoo left06:56
luca joined07:03
jklfds joined07:04
jklfds left07:10
jklfds joined07:13
jklfds left07:18
Norkle joined07:31
jklfds joined07:32
fstd_ joined07:35
baldpope_ joined07:35
donofrio_ joined07:36
ossifrage_ joined07:36
Anu0 joined07:36
blmt4 joined07:36
thelounge6619582 joined07:36
infogulch8 joined07:36
yuckey2d0 joined07:36
Jck_true6 joined07:36
leftyfb_ joined07:37
scottgy joined07:37
rom1v_ joined07:37
jrm2 joined07:37
lojik2 joined07:37
Xlusive_ joined07:37
phogg` joined07:37
samuelb joined07:37
Thaodan_ joined07:37
Visor_ joined07:37
dob1_ joined07:37
redlegion_ joined07:37
Noisytoot left07:37
Noisytoot joined07:37
flocks_ joined07:38
corelax_ joined07:38
mns_ joined07:38
ephemera__ joined07:38
Abrax- joined07:38
hrberg_ joined07:39
qsx joined07:39
weko_ joined07:39
colona_ joined07:39
chuanshi_ joined07:40
gvg__ joined07:40
TeXMaster joined07:40
Soliton_ joined07:40
esc23 joined07:40
user24031 joined07:40
user24031 left07:40
user24031 joined07:40
bket_ joined07:40
multi_io_ joined07:40
sq joined07:40
ndimitrij joined07:40
Quack left07:41
pretty_dumm_guy joined07:43
j416_ joined07:43
jab416171_ joined07:43
Quack joined07:44
dob1 left07:44
CAT_S left07:44
yuckey2d left07:44
j416 left07:44
Visor left07:44
ephemera_ left07:44
donofrio left07:44
Thaodan left07:44
rom1v left07:44
lojik left07:44
squirrel left07:44
Soliton left07:44
blmt left07:44
chuanshi left07:44
hrberg left07:44
colona left07:44
Xlusive left07:44
bket left07:44
ndim left07:44
ossifrage left07:44
scottg489 left07:44
leftyfb left07:44
phogg left07:44
tomboy64 left07:44
esc left07:44
thelounge661958 left07:44
splud left07:44
flocks left07:44
gvg_ left07:44
Jck_true left07:44
Oblomov left07:44
multi_io left07:44
jrm left07:44
Anu left07:44
infogulch left07:44
jab416171 left07:44
samuelbernardo left07:44
redlegion left07:44
fstd left07:44
weko left07:44
baldpope left07:44
Abrax left07:44
qsx` left07:44
corelax left07:44
user24037 left07:44
mns left07:44
Xlusive_Xlusive07:44
thelounge6619582thelounge66195807:44
Jck_true6Jck_true07:44
jrm2jrm07:44
infogulch8infogulch07:44
redlegion_redlegion07:44
j416_j41607:44
Visor_Visor07:44
blmt4blmt07:44
Soliton_Soliton07:44
yuckey2d0yuckey2d07:44
Anu0Anu07:44
fstd_fstd07:44
Gary_Sinise left07:46
tomboy64 joined07:50
splud joined07:51
CAT_S joined07:52
Quack left07:52
jklfds left07:53
kurahaupo left07:57
Quack joined07:57
reset left08:03
jklfds joined08:05
jklfds left08:10
stagas left08:13
stagas joined08:13
jrm left08:18
jrm joined08:18
kurahaupo_ joined08:21
raffaele left08:22
crabbedhaloablut joined08:22
raffaele joined08:22
jklfds joined08:22
Rashad joined08:26
schne1der joined08:29
hrberg_ left08:33
jklfds left08:42
jklfds joined08:43
jmd joined08:43
___nick___ left08:51
jklfds left08:53
jklfds joined08:57
jklfds left09:02
stenno joined09:02
warmana joined09:04
jklfds joined09:05
schne1der left09:06
vdamewood left09:06
nerdman joined09:06
vdamewood joined09:06
nerdman does topic branch mean branch without commits?09:07
gnoo joined09:10
jklfds left09:10
ikke No, it means a branch dedicated to a specific topic (feature, bugfix, improvement, etc)09:11
zoorat joined09:13
__singing_cats__ joined09:14
warmana1 joined09:15
warmana left09:18
warmana1warmana09:18
jklfds joined09:22
CoOlGhOsT joined09:23
skapata left09:24
mane joined09:26
warmana1 joined09:29
__singing_cats__ left09:29
CalimeroTeknik left09:29
CalimeroTeknik joined09:29
abubakarsadiq joined09:29
nerdman ikke: thanks09:30
warmana left09:31
warmana1warmana09:31
Aryan Hi, how can I make 'git diff' to not show colorful, instead use '+/>' ?09:49
git diff {commit1} {commit2}09:49
ikke git diff --no-color09:50
Aryan still colorful09:53
ikke cannot reproduce09:54
bookworm imb4 pager is bat or some such09:54
Aryan what do you mean?09:56
ikke If you use `bat` as a pager, it will color the output itself, regardles of what git does09:56
git -c core.pager=bat diff --no-color will show the colored output from bat09:59
millefy joined10:00
nate4 joined10:01
Aryan I used --no-pager. it's the one I wanted.10:02
Lord_of_Life_ joined10:02
Lord_of_Life left10:04
ikke Note that git does this automatically already when you write to a file or other command10:04
git diff | cat10:04
Novi left10:04
ikke for example10:04
xx joined10:05
Novi joined10:05
hyperair left10:05
Lord_of_Life_Lord_of_Life10:05
f_ left10:06
f_ joined10:07
Aryan +++10:07
nate4 left10:12
coot joined10:14
hyperair joined10:14
xx left10:19
Aryan ikke, just so you know, I wanted to do this "git diff HEAD~1 main Sub7.txt | grep '+' | sed 's/+//g'"10:20
ikke Ok, so you just want show the added lines10:20
Aryan ikke, yes, is there any easier ways than this?10:21
xx joined10:21
navi joined10:21
rosco left10:25
lllh joined10:26
llh left10:28
hyperair left10:29
jmd left10:31
flom84 joined10:38
hyperair joined10:39
Rashad left10:39
hans__ joined10:51
ggGuest left10:58
_sa0sin_ left10:59
sa0 joined10:59
ggGuest joined10:59
jacobk joined11:00
nate4 joined11:03
pretty_dumm_guy left11:04
vancz joined11:06
pretty_dumm_guy joined11:06
hyperair left11:07
obiwahn joined11:07
Rashad joined11:07
flom84 left11:07
nate4 left11:08
CoOlGhOsT left11:11
erty joined11:15
keypusher left11:16
keypushe- joined11:16
hyperair joined11:16
keypushe-keypusher11:19
jmd joined11:20
dsimic left11:20
dsimic joined11:22
matheusmoreira joined11:24
aristaware44 joined11:29
YuGiOhJCJ2 left11:29
YuGiOhJCJ2 joined11:30
aristaware44aristaware411:30
jmd left11:43
jmd joined11:44
peirik_ left11:45
peirik_ joined11:45
peirik- joined11:47
xx left11:50
peirik_ left11:50
xx joined11:51
YuGiOhJCJ2 left11:51
abubakarsadiq left11:52
zetef joined11:55
dnh joined11:56
lucasta joined11:56
m0norail_ joined11:58
jmd left11:59
dnh left12:02
vishal left12:03
YuGiOhJCJ2 joined12:04
aminvakil left12:05
jmd joined12:06
vishal joined12:06
aminvakil joined12:06
jmd left12:06
jmd joined12:06
darkAffinity left12:07
zetef left12:08
zetef joined12:08
aiena joined12:11
aiena left12:12
aiena joined12:12
xx left12:14
nate4 joined12:15
xx joined12:16
keypushe- joined12:19
fossdd left12:19
keypusher left12:20
nate4 left12:20
fossdd joined12:20
keypushe-keypusher12:22
osse Aryan: Might want to add ^ to those regexes to not match int c = a + b12:24
I can't think of an easier way off the top of my head. You could parse the numbers from the headers but I don't think that really accomplishes anything12:25
Aryan +++++12:29
vdamewood left12:41
vdamewood joined12:43
m0viefreak joined12:44
genesis1523 joined12:46
aiena left12:48
jmd left12:49
jmd joined12:50
jmd left12:51
jmd joined12:52
jmd left12:52
jmd joined12:52
jmd left12:53
jmd joined12:54
arahael left12:57
nate4 joined12:59
dnh joined13:00
Rashad left13:01
nate4 left13:04
genesis1523 left13:05
Non-ICE joined13:11
peirik- left13:14
peirik_ joined13:14
peirik- joined13:17
peirik_ left13:18
peirik- left13:18
ossifrage_ossifrage13:19
peirik_ joined13:19
hans__ left13:20
dnh left13:26
peirik- joined13:30
peirik_ left13:33
Aryan i want to make that little commands to a script, but I encountered an error13:34
fatal: not a git repository (or any parent up to mount point /)13:34
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).13:34
I already set the PWD value to the git directory13:36
peirik- left13:36
peirik_ joined13:37
peirik- joined13:38
nate4 joined13:38
Aryan #!/bin/bash -eu13:39
PWD=/home/aryan/V2ray-Configs13:39
git pull13:39
git diff HEAD~1 main Sub7.txt | grep '+' | sed 's/+//g' | pbcopy13:39
ikke You cannot set PWD to change the directory13:39
Aryan can you explain more?13:40
ikke PWD=/home/aryan/V2ray-Configs does not change what the current directory is13:40
Aryan ok13:40
what should I do ?13:40
ikke use cd13:40
Aryan cd in a bash script?13:41
ikke yes13:41
(an alternative would be exporting GIT_DIR and GIT_WORK_TREE, but cd is simpler13:41
peirik_ left13:42
nate4 left13:43
peirik- left13:44
peirik_ joined13:44
Aryan weird13:48
first time it executed properly13:49
but now...13:49
aryan@Archian:~/.local/bin$ v2pull.sh13:49
fatal: not a git repository: '/home/aryan/V2ray-Configs/'13:49
maybe because it doesn't have any new commits13:50
derpydoo joined13:51
Aryan why13:53
jsut a simple script13:53
mane left13:55
geirha you're sure there is a git repository in that dir? because git seems to disagree with that13:57
nate4 joined13:59
nate4 left14:04
Aryan yes, it's a clone repository14:06
vdamewood left14:07
vdamewood joined14:09
pretty_dumm_guy left14:10
zoorat left14:11
zoorat joined14:11
Aryan ah14:11
the error was because of the GIT_DIR variable14:11
as he said cd is enough14:12
iomari891 joined14:15
project104 joined14:17
project10 left14:19
project104project1014:19
mane joined14:23
nate4 joined14:29
Aryan when i do git status14:33
it says 'up-to-date'14:34
nate4 left14:34
Aryan but when I do git pull it gets newer commits.14:34
why is that?14:34
schne1der joined14:35
nicksloan joined14:40
nicksloan left14:45
ikke git status does not talk to the remote14:45
FH_thecat left14:45
ikke it shows the status of your branch compared to the tracking branch14:45
YuGiOhJCJ2 left14:46
ThorMojito joined14:49
pickanick joined14:50
bloody joined14:50
dev4449 joined14:56
_xor joined14:56
nicksloan joined14:59
mns_mns15:04
pickanick left15:05
Nixkernal left15:07
pickanick joined15:07
Nixkernal joined15:07
raffaele left15:11
Novi left15:12
raffaele joined15:12
Novi joined15:13
delay joined15:16
rsx left15:16
leftyfb_leftyfb15:17
leftyfb left15:17
leftyfb joined15:17
nicksloan left15:19
Pixi__ left15:22
nerdman left15:22
hbautista joined15:22
jacobk left15:24
ThorMojito left15:26
Nixkernal left15:30
Vonter joined15:31
nate4 joined15:37
ThorMojito joined15:38
Nixkernal joined15:42
nate4 left15:43
mane left15:44
ThorMojito left15:45
Vonter left15:45
Vonter_ joined15:45
mane joined15:46
Tlsx joined15:47
PantelicGR joined15:49
FH_thecat joined15:50
Tlsx left15:51
fflam joined15:52
Betal joined15:58
Gary_Sinise joined16:07
dumbledoor joined16:08
wootehfoot joined16:13
Novi left16:14
Novi joined16:15
_sa0sin_ joined16:17
dumbledoor Is it ok and common to squash multiple non - consecutive commits together? Let's say I'm working on a project which has all filenames in kebab-case.ext. I want them in camelCase.ext so do that and do `commit -m "convert kebab to camel"`. then i go ahead and do some other work and do `commit -m "minor bug fixes"`. later i find out that only16:18
converted file names in the project's root directory to camelCase and not the subdirectories, so i fix that and `commit -m "convert kebab to camel for subdirectories also". now would it make more sense to let the commit history be as it is or to squash the commits?16:18
nate4 joined16:19
sa0 left16:20
nate4 left16:24
Pixi joined16:26
Gary_Sinise left16:29
utkojhamela left16:30
dumbledoor TL:DR; Are you one of the guys who does atomic commits. If so, the number of commits on your project must become very big. So, do you squash commits together or let it be as it is?16:31
ferdna left16:31
utkojhamela joined16:32
ikke I do regularly fixup commit16:33
but I already create them with git commit --fixup16:33
But I don't generally squash commits together16:33
dumbledoor thanks for you reponse. a first glance on git commit --fixup looks daunting. i'll go checkout it out now16:35
yuckey2d left16:35
nate4 joined16:36
nate4 left16:41
ikke It creates a new commit but just with a special commit message referring to the commit you want to fix16:49
then you do git rebase -i --autosquash <base> and git will automatically mark those commits as fixup commits in the correct order16:49
dumbledoor does this change the order of commits in git log16:51
ikke The commits you make with --fixup will not be in the history aftwards16:51
dumbledoor i see.16:52
davidsenk joined16:53
yuckey2d joined16:53
mataga left16:54
vdamewood left16:55
dumbledoor left16:58
_xor left16:59
hbautista left17:01
_xor joined17:01
nate4 joined17:06
zetef left17:09
nate4 left17:11
dob1_ to push a branch to remote do I need to be in that branch?17:12
rkta no17:12
dob1_ ah ok17:12
ikke You do need to explicitly tell what branch to push17:14
jmd Yeah, unfortunately git does not yet have a --do-what-i-mean option.17:15
peirik- joined17:20
pick joined17:20
pickanick left17:20
pickpickanick17:21
peirik_ left17:21
peirik- left17:21
peirik_ joined17:21
peirik- joined17:24
_xor left17:24
_xor joined17:24
dob1_dob117:24
peirik_ left17:26
Novi left17:26
Novi joined17:28
zoorat left17:37
lucasta left17:40
kurahaupo_kurahaupo17:42
rageshkrishna joined17:43
rageshkrishna left17:46
skapata joined17:47
vlm joined17:47
iomari891 left17:56
dev4449 left18:04
kostkon left18:04
wurstwasser joined18:09
kurahaupoCurriedHippo18:10
CurriedHippokurahaupo18:11
peirik- left18:15
erty left18:18
kostkon joined18:19
peirik_ joined18:21
nate4 joined18:26
Quack left18:26
nicksloan joined18:28
Quack joined18:30
nate4 left18:31
gildasio left18:33
gildasio joined18:34
aiena joined18:35
chexum left18:35
chexum joined18:36
Quack left18:39
Quack joined18:40
m_antis joined18:42
saohh joined18:49
mane left18:50
saohh left18:50
wurstwasser left18:51
bambanxx joined18:53
Abrax-Abrax18:54
bambanxx left18:54
Rashad joined18:56
Quack left18:59
xxpor joined19:01
cespare joined19:07
Quack joined19:09
stats4647 joined19:11
nate4 joined19:13
genesis1523 joined19:16
nate4 left19:18
Quack left19:26
nate4 joined19:27
mane joined19:31
nate4 left19:31
squealingcode joined19:33
genesis1523 left19:34
abubakarsadiq joined19:36
peirik_ left19:36
peirik_ joined19:37
peirik_ left19:38
peirik_ joined19:39
xxpor left19:43
Rashad left19:47
thiago joined19:49
nate4 joined19:49
xxpor joined19:52
squealingcode left19:53
nate4 left19:55
Quack joined19:55
rainystorm left20:04
Quack left20:06
stats4647 left20:14
jmd left20:17
utkojhamela left20:17
jmd joined20:18
delay left20:18
jacobk joined20:21
Quack joined20:24
reset joined20:40
zetef joined20:57
nate4 joined20:58
genesis1523 joined21:03
nate4 left21:03
jacobk left21:04
henry40408 left21:04
henry40408 joined21:04
jklfds left21:05
zetef left21:05
zetef joined21:06
genesis1523 left21:07
jklfds joined21:09
jklfds left21:14
Quack left21:18
rapmoc left21:22
jklfds joined21:25
Quack joined21:26
rapmoc joined21:30
wurstwasser joined21:36
jinsun_ joined21:40
jinsun left21:40
jinsun_jinsun21:40
rapmoc left21:43
keypushe- joined21:43
keypusher left21:44
utkojhamela joined21:44
vlm left21:45
theobjectivedad left21:45
jklfds left21:45
jmd left21:46
keypushe-keypusher21:46
theobjectivedad joined21:51
aiena left21:53
jklfds joined21:57
nate4 joined21:59
nate4 left22:04
fossdd left22:05
fossdd joined22:07
mane left22:09
mane joined22:10
rama_ joined22:11
utkojhamela left22:15
mane left22:15
rama_ left22:16
jklfds left22:21
pickanick left22:22
pickanick joined22:22
jklfds joined22:33
wurstwasser left22:36
arahael joined22:38
jklfds left22:38
troyt joined22:40
nate4 joined22:47
jklfds joined22:52
nate4 left22:53
delay_net joined22:53
falafel_ joined22:53
falafel_ left23:01
falafel joined23:02
squealingcode joined23:05
falafel left23:07
jklfds left23:11
schne1der left23:12
derpydoo left23:14
coot left23:15
rama_ joined23:16
raffaele left23:19
raffaele joined23:19
rama_ left23:21
wootehfoot left23:22
squealingcode left23:23
jklfds joined23:26
manwithluck left23:26
manwithluck joined23:26
sqsquirrel23:29
PantelicGR left23:29
nate4 joined23:30
nate4 left23:34
darkAffinity joined23:34
cdsloif^ joined23:37
wurstwasser joined23:41
arahael left23:43
jklfds left23:45
arahael joined23:51
Quack left23:52
charly left23:53
crabbedhaloablut left23:56
jklfds joined23:57

Logs Search ←Prev date Next date→ Channels Documentation