IRCloggy #git 2023-06-11

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-06-11

very_sneaky left00:00
hamburgler3 left00:00
clime left00:00
remedan left00:00
vysn left00:00
hrberg left00:00
mns left00:00
reset left00:00
davve joined00:00
yaymukun1 joined00:00
ShaedS joined00:00
Bombe joined00:00
CrtxReavr joined00:00
stockholm joined00:00
mns joined00:00
hrberg joined00:00
akimbo5334308470 joined00:00
theodorc joined00:00
perrierjouet joined00:00
clime joined00:00
elichai2 joined00:00
CodeAgain joined00:00
Ranhir joined00:00
jmer joined00:00
seds joined00:00
ThiefMaster joined00:00
daddy joined00:00
very_sneaky joined00:00
yourfate joined00:00
OnkelTem joined00:00
vysn joined00:00
sunyibo joined00:00
mpldr joined00:00
mtj joined00:01
seds left00:01
seds joined00:01
xnox joined00:01
acidsys joined00:01
daddy left00:01
quesker joined00:01
hamburgler joined00:02
Andrew- joined00:02
Anarchic joined00:02
haise01 joined00:02
ryjen joined00:02
OnlineCop joined00:02
daddy joined00:02
jjakob joined00:02
n-st joined00:02
remedan joined00:02
V joined00:02
YoungFrog joined00:02
R2robot joined00:02
robink joined00:02
mkoskar joined00:02
olbat joined00:02
olbat left00:02
olbat joined00:02
bartman` joined00:03
vlt joined00:04
kantlivelong joined00:05
defjam joined00:06
jaykelly450 joined00:06
sybariten joined00:08
knolle joined00:10
defjam left00:11
jkatnight joined00:12
vancz joined00:15
jkatnight left00:16
fstd_ joined00:17
Atque left00:17
Atque joined00:19
fstd_fstd00:20
SuperLag left00:22
rama_ joined00:28
jaykelly450 left00:30
rama_ left00:34
Gaboradon joined00:36
defjam joined00:42
gsi left00:46
defjam left00:46
zer0bitz joined00:47
gsi joined00:47
clime left00:48
clime joined00:48
zer0bitz_ left00:49
wootehfoot left00:55
ferdna joined00:55
tirnanog left00:57
m0viefreak left00:57
defjam joined01:00
kkawg left01:02
tirnanog joined01:02
defjam left01:06
gasbag joined01:14
Nexilva[m] Hi there01:16
I've got a pretty crazy problem happening in git. The best way to explain it is with an example: https://bpa.st/K7JHA01:16
data/global/tiles/Act1/town/ this directory is part of the git repo, tracked and all. If I create a file in this directory, it informs me that there is a new untracked file.01:17
However, if I edit an existing file in data/global/tiles/Act1/Town/townS1.ds1, after editing the file, I do git status and it does not show any changes01:18
What is happening?01:18
vysn left01:19
chandash joined01:21
Nexilva[m] I notice on gitlab, the dir is 'town', but on my local PC the dir is called 'Town'.01:24
I don't understand how it could have changed case.01:24
haxalot joined01:25
SuperLag joined01:26
SuperLag left01:26
SuperLag joined01:26
vysn joined01:29
Nexilva[m] Somehow window renamed my directories to all starting with uppercase01:33
Capitalized.01:33
I recloned from remote and now dir names are the proper case.01:33
defjam joined01:34
gasbag left01:35
defjam left01:38
Andrew-andrewyu01:42
cdown left01:44
iomari891 joined01:44
BlessJah joined01:45
junyx joined01:49
BigShip joined01:56
SuperLag left01:57
SuperLag joined01:58
SuperLag left01:58
SuperLag joined01:58
aiena__ joined01:58
aiena__ How do I git stash with a specific name?01:58
I have some code in incomplete state but I realised that I may have to trash this for a different approach. I want to keep the code but not commit it.01:59
vandita left02:00
vysn left02:01
vandita joined02:01
defjam joined02:07
shokohsc58 joined02:11
defjam left02:12
hbautista joined02:12
shokohsc5 left02:12
shokohsc58shokohsc502:12
nate2 joined02:16
superheroes joined02:24
rewt aiena__, you can create a new branch and commit it there, then checkout the current branch02:26
rama_ joined02:31
rama_ left02:39
defjam joined02:42
aiena__ Ok How do I move the last commit I made to a branch. Its currently in master but I dont want it there can --ammend be used for that?02:43
tkazi joined02:44
Millicent left02:46
defjam left02:46
aiena__ I want to remove my last commit and recommit it in a new branch02:47
gast0n left02:47
aiena__ its not been pushed anywhere02:47
mika joined02:47
Timvde joined02:48
Millicent joined02:53
jaeckel joined02:53
aiena_ joined02:55
soifou joined02:55
aiena__ left02:57
squirrel left02:58
farzat joined02:59
superheroes aiena__: hi there, I'm an amateur in using03:04
git n I believe the way that you would do this, provided you are absolutely certain is by pushing the commit to the branch, and then by using the reset cmd in your own branch03:06
tejr joined03:06
FinnElija joined03:11
defjam joined03:15
throwachimera joined03:16
Suchiman left03:17
nate2 left03:18
rewt aiena_, just make the new branch (no need to make any commits if it's committed already), and after you checkout master, reset it back to the commit you want it at03:19
defjam left03:19
moldorcoder7 left03:28
defjam joined03:33
JanCGuest392103:34
JanC joined03:34
iomari891 left03:34
Guest3921 left03:35
defjam left03:38
rama_ joined03:43
tirnanog left03:44
chandash left03:47
rama_ left03:47
YuGiOhJCJ joined03:50
defjam joined03:50
haxalot left03:52
roadie joined03:53
defjam left03:55
nickoe left04:03
nickoe joined04:03
lgc joined04:03
money left04:04
lgc left04:04
jacobk_ joined04:05
jacobk left04:05
hwpplayer1 joined04:12
falafel joined04:13
junyx left04:17
hwpplayer1 left04:19
aiena_ rewt, i was able to reset using 'git reset HEAD~' i found in one answer. Why is there a ~ at the end?04:21
somtimes they pu ^ or ~104:24
but not sure what those are04:24
defjam joined04:24
ChmEarl left04:25
defjam left04:29
aiena_ left04:40
defjam joined04:40
aiena_ joined04:40
ikke man gitrevision04:43
man gitrevisions04:43
gitinfo the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html04:43
defjam left04:45
JanC left04:47
JanC joined04:48
jkatnight joined04:49
Nexilva[m] On windows, my directory name case has changed, but in remote git repository, its still lower case. How do I correct this? How can I pull again from remote into the same repo so it renames everything to proper case04:52
jkatnight left04:54
ikke NTFS (or the windows layer on top if it) does not care about case, so it lies when you ask to write a file with a different case04:54
falafel left04:55
defjam joined04:56
roadie left04:56
Nexilva[m] Well I'm having a problem, which is that on remote on gitlab, the case is lower, but on local pc, the directory names are capitalized. When I edit files in the directory, changes are not detected by git. However, if I create a new file in the directory, git tells me there is a new untracked file. All files in all those directories are tracked and on remote repo04:57
I've got a pretty crazy problem happening in git. The best way to explain it is with an example: https://bpa.st/K7JHA04:57
Here is an example you can see of the problem.04:58
JanC left04:58
Nexilva[m] On remote and originally the directory for example was called 'town' but on local pc somehow it is now called 'Town'. If I make new files in Town git says there are new untracked files, good so far. If I edit existing and already tracked files in Town and then do git status, git does not show me that any files were ever edited.04:59
JanC joined04:59
Nexilva[m] It took me a few days to figure out why my changes were not being committed to remote. Git just doesn't detect it.04:59
So that's why I'm trying to ensure that git can detect the changes.05:00
This is what I found out:05:01
defjam left05:01
Nexilva[m] It seems that the directory data/global/tiles/Act1/town/ and the file data/global/tiles/Act1/Town/townS1.ds1 have a difference in case. Git is case-sensitive, but some file systems used by operating systems (such as Windows' default file system, NTFS) are case-insensitive. This can lead to inconsistencies when working with files and directories that only differ in case.05:01
nattiestnate left05:01
vandita_ joined05:02
Nexilva[m] What can you advise?05:02
JanC left05:04
vandita left05:05
JanC joined05:09
defjam joined05:14
junyx joined05:15
nate2 joined05:15
falafel joined05:18
defjam left05:18
nate2 left05:20
JanC left05:23
JanC joined05:24
JanC left05:26
JanC joined05:27
theobjectivedad left05:28
junyx left05:29
theobjectivedad joined05:29
JanC left05:30
Nexilva[m] Soon as I renamed the directory to lower case, git told me a file in there was changed.05:30
JanC joined05:30
defjam joined05:31
ljharb Nexilva[m]: the solution is usually to always lowercase all directory names05:31
feriman joined05:36
JanC left05:37
JanC joined05:38
iomari891 joined05:40
JanC left05:40
JanC joined05:41
JanC left05:43
JanC joined05:44
iomari891 left05:45
iomari891 joined05:45
JanC left05:49
JanC joined05:50
iomari891 left05:50
haxalot joined05:51
jkatnight joined05:54
JanC left05:55
jkatnight left05:59
JanC joined06:03
JanC left06:07
JanC_ joined06:07
Gary_Sinise left06:07
JanC_JanC06:07
wootehfoot joined06:08
Gary_Sinise joined06:09
haxalot left06:11
haxalot joined06:12
haxalot left06:13
ferdna left06:14
ferdna joined06:14
haxalot joined06:14
haxalot left06:14
roadie joined06:27
falafel left06:30
skapata left06:32
jkatnight joined06:32
jkatnight left06:37
coot_ joined06:50
hbautista left06:51
wootehfoot left06:57
hwpplayer1 joined07:02
hwpplayer1 left07:05
vandita joined07:07
vandita_ left07:10
defjam left07:10
wootehfoot joined07:15
nate2 joined07:16
nate2 left07:21
bloody left07:22
Inline joined07:25
vdamewood joined07:30
YuGiOhJCJ left07:32
YuGiOhJCJ joined07:32
defjam joined07:39
Gary_Sinise left07:43
defjam left07:43
hwpplayer1 joined07:43
hwpplayer1 left07:44
vysn joined07:51
defjam joined07:51
nickoe left08:12
nickoe joined08:13
stengah joined08:14
Inline left08:16
otisolsen70 joined08:17
vandita left08:31
vandita joined08:32
weaksauc_ joined08:39
theoceaniscool joined08:39
James0r joined08:42
jkatnight joined08:45
defjam left08:49
jkatnight left08:50
vdamewood left08:56
hwpplayer1 joined08:59
defjam joined09:03
clime1 joined09:05
Lord_of_Life left09:06
Lord_of_Life joined09:08
defjam left09:08
Deknos left09:17
defjam joined09:21
very_sneaky left09:21
xFFC left09:21
defjam left09:25
very_sneaky joined09:28
thiago left09:29
Suchiman joined09:31
defjam joined09:37
defjam left09:42
Inline joined09:42
apo joined09:44
stengah left09:45
clime1 left09:47
stengah joined09:49
Geronimo joined09:51
weaksauce joined09:56
weaksauc_ left09:56
stengah left09:56
sa0 joined10:03
f_|catgirl joined10:05
jkatnight joined10:07
_sa0sin_ left10:07
f_|catgirlf_10:08
defjam joined10:11
jkatnight left10:11
defjam left10:15
JanC left10:15
JanC joined10:16
nickoe left10:17
nickoe joined10:17
xFFC joined10:20
stengah joined10:21
hwpplayer1 left10:23
defjam joined10:28
vandita_ joined10:29
GoGi joined10:31
GoGi left10:31
GoGi joined10:31
vandita left10:32
defjam left10:33
lgc joined10:37
lgc left10:37
hwpplayer1 joined10:40
defjam joined10:45
defjam left10:50
vishal left10:52
vishal joined10:56
rsx joined10:58
defjam joined10:59
JanC_ joined11:15
JanCGuest839211:16
Guest8392 left11:16
JanC_JanC11:16
nate2 joined11:17
nate2 left11:22
Inline left11:34
chexum left11:39
memset left11:39
Atque left11:39
memset joined11:40
Atque joined11:41
nate2 joined11:43
chexum joined11:43
nate2 left11:48
rustyshackleford left11:48
YuGiOhJCJ left11:49
chexum left11:50
memset left11:50
YuGiOhJCJ joined11:50
chexum joined11:50
memset joined11:50
arch_angel left11:54
James0r left11:56
farzat left11:56
jacobk_ left12:02
vandita_ left12:02
vandita joined12:03
hwpplayer1 left12:03
YuGiOhJCJ left12:05
lucasta joined12:05
YuGiOhJCJ joined12:06
cweiss0765321241 joined12:11
arch_angel joined12:13
hwpplayer1 joined12:16
stenno joined12:18
money joined12:21
nickoe left12:21
nickoe joined12:21
stenno left12:25
andrewyuAndrew12:29
Andrew left12:29
AndrewYu joined12:30
alexherbo2 joined12:36
feriman left12:37
very_sneaky left12:39
feriman joined12:39
kkawg joined12:41
Inline joined12:42
JanC left12:53
AlexKalopsia1 joined12:54
JanC joined12:54
alexherbo2 left12:54
Suchiman left12:54
alexherbo2 joined12:55
aiena joined12:59
PobodysNerfect left13:00
JanC left13:00
aiena_ left13:01
aiena left13:04
SilentGhost joined13:04
JanC joined13:06
JanC left13:07
vandita left13:09
frobnic left13:10
frobnic_ joined13:10
GoGi left13:10
vandita joined13:11
frobnic_frobnic13:12
SilentGhost left13:13
SilentGhost joined13:14
GoGi joined13:14
GoGi left13:14
GoGi joined13:14
kkawg_ joined13:15
kkawg left13:18
zeenk joined13:19
defjam left13:22
visualshock_ joined13:23
Suchiman joined13:23
kkawg_ left13:24
PobodysNerfect joined13:24
JanC joined13:26
LuKaRo left13:26
visualshock left13:26
JanC left13:29
very_sneaky joined13:30
SilentGhost left13:30
SilentGhost joined13:30
defjam joined13:33
theoceaniscool left13:37
defjam left13:38
cdown joined13:39
hwpplayer1 left13:41
ferdna left13:42
very_sneaky left13:43
manwithluck left13:43
manwithluck joined13:48
defjam joined13:50
reset joined13:51
superheroes do you keep your swap files or do you put in .gitignore?13:53
why, why not?13:53
very_sneaky joined13:55
superheroes I think I'll be ignoring them13:56
akiro joined13:57
superheroes the progit manual states that multiple file extension can be ignored in one liners13:57
such as *.[oa]13:57
in cases where extensions exceed single characters what would this look like?13:58
stenno joined13:59
superheroes does adding folders to .gitignore affect staging>14:00
?14:00
arch_angel left14:04
vandita left14:05
vandita joined14:07
shokohsc51 joined14:08
shokohsc5 left14:10
shokohsc51shokohsc514:10
Inline left14:10
defjam left14:11
defjam joined14:14
stenno left14:15
very_sneaky left14:20
very_sneaky joined14:21
stengah left14:23
stenno joined14:25
LuKaRo joined14:25
stenno left14:29
JanC joined14:34
AlexKalopsia19 joined14:37
AlexKalopsia1 left14:39
Inline joined14:41
derpydoo left14:45
memset left14:50
JanC left14:53
JanC joined14:53
skapata joined14:53
eoli3n left14:54
eoli3n joined14:55
jaykelly450 joined14:57
XorMan joined15:00
roadie left15:00
wootehfoot left15:00
memset joined15:03
AndOrMan joined15:06
XorMan left15:08
defjam left15:09
mpldr left15:12
vandita left15:14
vandita joined15:15
hwpplayer1 joined15:17
rama_ joined15:19
defjam joined15:23
rama_ left15:24
defjam left15:28
akiro left15:29
rustyshackleford joined15:32
nickoe left15:32
mpldr joined15:35
junyx joined15:40
defjam joined15:41
nate2 joined15:44
nickoe joined15:45
nate2 left15:49
jusski joined15:51
ChmEarl joined15:54
defjam left15:55
f_ left16:01
thiago joined16:03
vandita_ joined16:04
vandita left16:07
defjam joined16:07
vandita joined16:13
bloody joined16:14
stengah joined16:15
vandita_ left16:17
stengah left16:27
YuGiOhJCJ left16:28
iomari891 joined16:31
derpydoo joined16:32
iomari891 left16:42
bloody left16:48
defjam left16:48
userxvz joined16:48
userxvz hello. >Does "git rebase master" move the current branch on top of local master ?16:49
nedbat userxvz: yes16:49
userxvz nedbat: thanks16:50
defjam joined16:50
taupiqueur left16:51
zeenk left16:52
userxvz sfter doing "git rebase master" (current branch is bugfix) I do "git checkout master" and then "git merge bugfix". Is this procedure correct?16:54
duxsco joined16:55
userxvz left16:58
Celeo joined16:59
chandash joined17:00
nedbat user24037: that works, and you should get a fast-forward, so you won't have a merge commit.17:01
userxvz joined17:01
huntm joined17:01
huntm left17:02
vandita_ joined17:03
lucasta left17:04
vandita left17:06
userxvz left17:07
Rashad joined17:08
Inline left17:08
duxsco left17:09
xDemontic joined17:13
JanC left17:15
JanC joined17:16
JanC left17:18
Inline joined17:19
JanC joined17:19
bket joined17:20
defjam left17:23
JanCGuest728217:24
JanC joined17:24
Guest7282 left17:25
Xenguy left17:25
JanC left17:26
JanC joined17:27
JanC left17:29
plsclap joined17:30
JanC joined17:30
plsclap hello all, i am trying to use osxkeychain as a credential-helper on the mac and it doesn't seem to be working17:31
JanC left17:32
plsclap for more info, when i run a function that needs a credential (i.e. git push), the command `git credential-osxkeychain get` is ran but isnt successful. And `git credential-osxkeychain store` is never ran - even on a successful password entry17:33
JanC joined17:33
plsclap i am NEVER prompted by macOS to enter a password for the keychain, so im assuming im either missing something or it is broken17:34
defjam joined17:36
JanC left17:36
plsclap additionally, whenever i run `git credential-osxkeychain` directly, it indefinitely hangs and does not prompt me for my macOS password at any point17:36
iomari891 joined17:36
JanC joined17:36
plsclap any thoughts on why this may be happening?17:36
mven joined17:40
jaykelly450 left17:40
JanC left17:40
money left17:40
JanC joined17:41
defjam left17:41
money joined17:41
vysn left17:44
nate2 joined17:45
vandita joined17:45
hwpplayer1 left17:45
vandita_ left17:45
JanCGuest345717:47
Guest3457 left17:47
JanC joined17:47
hwpplayer1 joined17:48
nate2 left17:50
vandita_ joined17:50
JanC_ joined17:51
JanC left17:51
JanC_JanC17:51
hwpplayer1 left17:51
defjam joined17:52
JanC left17:53
JanC joined17:53
vandita left17:54
hwpplayer1 joined17:55
hwpplayer1 left17:57
defjam left17:57
JanC_ joined17:59
Gary_Sinise joined17:59
JanC left17:59
JanC_JanC17:59
AndOrMan left18:00
iomari892 joined18:02
PobodysNerfect left18:03
Xenguy joined18:03
JanC_ joined18:03
JanC left18:04
JanC_JanC18:04
iomari891 left18:04
hwpplayer1 joined18:06
xDemontic left18:06
JanC left18:06
JanC joined18:07
defjam joined18:08
xDemontic joined18:09
jusski left18:11
plsclap left18:12
JanC left18:13
JanC_ joined18:13
JanC_JanC18:13
PobodysNerfect joined18:14
gareppa joined18:15
hwpplayer1 left18:21
SusanTheNerd joined18:23
fflam joined18:24
SusanTheNerd left18:26
SusanTheNerd joined18:27
alexherbo2 left18:29
SusanTheNerd left18:29
SusanTheNerd joined18:29
vandita joined18:32
devmes joined18:32
rsx left18:33
roadie joined18:34
vandita_ left18:35
rama_ joined18:37
plsclap joined18:39
Rashad left18:40
theoceaniscool joined18:41
rama_ left18:41
plsclap left18:43
xDemontic left18:45
rsx joined18:46
rama_ joined18:49
XorMan joined18:51
rama_ left18:54
ProperNoun left18:58
Xenguy left19:01
ProperNoun joined19:01
PobodysNerfect left19:02
dextercd joined19:03
PobodysNerfect joined19:08
q3lont joined19:11
mpldr__ joined19:12
mpldr left19:12
mpldr__mpldr19:13
plsclap joined19:13
mpldr left19:14
mpldr joined19:14
plsclap left19:18
jaykelly450 joined19:18
rsx left19:19
igemnace joined19:19
Xenguy joined19:25
cousteau joined19:25
theoceaniscool left19:31
plsclap joined19:31
Inline left19:34
plsclap left19:36
w4 left19:38
w4 joined19:38
SleePy joined19:43
hrberg left19:43
hrberg joined19:44
nate2 joined19:46
q3lont left19:49
terminalpusher joined19:50
nate2 left19:51
vandita left19:53
vandita joined19:54
terminalpusher left19:55
m0viefreak joined19:58
money left20:00
gareppa left20:01
plsclap joined20:05
DynamiteDan left20:08
DynamiteDan joined20:09
DynamiteDan left20:10
plsclap left20:10
DynamiteDan joined20:10
feriman left20:12
visualshock_ left20:15
rama_ joined20:16
junyx left20:18
ackyshake joined20:19
coot_ left20:20
rama_ left20:20
superheroes left20:22
PobodysNerfect_ joined20:23
JanC left20:24
PobodysNerfect left20:24
Xenguy left20:25
JanC joined20:26
plsclap joined20:27
akiro joined20:28
derpydoo left20:32
Celeo left20:37
plsclap left20:37
jaykelly450 left20:40
plsclap joined20:41
m0viefreak left20:53
Erisa joined21:02
PobodysNerfect joined21:05
zer0bitz_ joined21:05
delay joined21:07
PobodysNerfect_ left21:07
zer0bitz left21:08
peas joined21:09
delay left21:15
roadie left21:21
devmes left21:24
devmes joined21:24
weko left21:26
PobodysNerfect left21:34
weko joined21:35
XorMan left21:36
derpydoo joined21:37
IguanaBob joined21:39
zer0bitz joined21:43
t0mm13b joined21:46
zer0bitz_ left21:46
nate2 joined21:46
roadie joined21:47
plsclap left21:49
tirnanog joined21:51
nate2 left21:51
Xenguy joined21:54
roadie left21:56
theoceaniscool joined21:58
nickoe left21:59
nickoe joined21:59
dustinm joined22:00
JanC left22:03
JanC joined22:04
rosco joined22:05
otisolsen70 left22:09
XorMan joined22:11
plsclap joined22:23
defjam left22:23
plsclap left22:24
defjam joined22:24
memset left22:25
rama_ joined22:30
theoceaniscool left22:31
v_ joined22:34
v_ left22:38
rama_ left22:40
igemnace left22:44
nate2 joined22:54
firewyre joined22:55
memset joined22:57
rosco left22:58
nate2 left22:58
oprypin joined23:02
defjam left23:03
rama_ joined23:09
akiro left23:10
delay joined23:12
cousteau left23:13
rama_ left23:14
roadie joined23:15
iomari892 left23:17
XorMan left23:19
Gary_Sinise left23:19
iomari892 joined23:22
roadie left23:26
junyx joined23:30
peas left23:31
defjam joined23:35
defjam left23:39
ferdna joined23:40
IguanaBob left23:49
defjam joined23:51
vysn joined23:53
defjam left23:57
delay left23:59

Logs Search ←Prev date Next date→ Channels Documentation