IRCloggy #git 2022-05-30

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.

2022-05-30

thebombzen joined00:02
dvanloon left00:02
dvanloon joined00:02
Soni left00:09
loulou_ left00:10
igemnace joined00:12
Xenguy joined00:12
oxymoron93 left00:14
Xenguy left00:25
cahoots joined00:26
cahoots left00:34
cixx joined00:34
furrymcg1e joined00:38
cixx left00:39
dvanloon left00:39
dvanloon0 joined00:40
kaiseisei joined00:40
Lord_of_Life left00:42
furrymcgee left00:42
Lord_of_Life joined00:43
w_lehinsun joined00:43
kaiseisei1 joined00:45
kaiseisei left00:45
kaiseisei1kaiseisei00:45
gurkenglas left00:45
Qudit joined00:46
charly left00:48
Qudit left00:49
gurkenglas joined00:49
justsomeguy left00:50
cixx joined00:50
Soni joined00:52
cixx left00:55
gurkenglas left00:58
nehsou^ left01:01
ferdna joined01:01
vicfred left01:05
cahoots joined01:05
Soni left01:06
Soni joined01:07
vicfred joined01:09
cahoots left01:10
aidalgol left01:12
aidalgol joined01:14
thebombzen left01:19
thebombzen joined01:22
loulou_ joined01:28
loulou_ left01:28
loulou_ joined01:28
junebug joined01:36
polo left01:37
polo joined01:38
poloGuest124901:38
cahoots joined01:42
jonosterman joined01:46
cahoots left01:46
charly joined01:53
pretty_dumm_guy left01:55
codaraxis left01:55
igemnace_ joined01:59
boka joined02:00
igemnace left02:01
dsrt^ joined02:03
lemonsnicks left02:04
sudoforge left02:11
justsomeguy joined02:11
sadako joined02:12
igemnace_ left02:15
sadtaco left02:16
cahoots joined02:17
Murr left02:19
lemonsnicks joined02:19
thekingofbandit left02:19
Murr joined02:19
cahoots left02:21
hstct left02:32
hstct joined02:34
BLACK-SABBATH joined02:35
thebombzen left02:42
dtux left02:42
junebug left02:44
vicecea left02:44
biapy left02:45
vicecea joined02:45
m0viefreak left02:49
cixx joined02:51
roadie left02:52
cahoots joined02:53
igemnace joined02:53
Visne left02:55
cixx left02:56
Visne joined02:56
cahoots left02:57
biapy joined03:00
gast0n left03:04
a joined03:05
aGuest642503:05
BLACK-SABBATH left03:06
Guest6425 left03:07
nate1 joined03:07
semediajalah joined03:08
hamburgler joined03:09
cahoots joined03:11
bin101 left03:13
cahoots left03:16
sadako left03:19
Albright left03:21
Albright joined03:21
semediajalah left03:22
bket left03:22
semediajalah joined03:22
bket joined03:25
bin101 joined03:25
nate1 left03:38
cixx joined03:41
szkl joined03:42
tyson2 left03:43
cahoots joined03:46
biapy left03:46
cahoots left03:50
littlebobeep joined03:52
biapy joined03:57
semediiii joined03:59
semediiii left03:59
kirikkuh joined04:00
kirikkuh left04:00
kirikkuh joined04:00
semediajalah left04:01
thiago left04:03
EdFletcher left04:04
oxymoron93 joined04:05
money joined04:06
junebug joined04:06
moneyGuest98904:06
yeirr joined04:07
yeirr left04:11
kirikkuh left04:13
yeirr joined04:13
kopoksirakuh joined04:16
littlebo1eep joined04:16
Guest989 left04:16
littlebobeep left04:17
oxymoron93 left04:17
dsrt^ left04:19
cahoots joined04:19
littlebo1eep left04:21
nate1 joined04:22
cahoots left04:23
igemnace left04:23
igemnace joined04:24
kopoksirakuh left04:25
Saloframes left04:25
igemnace_ joined04:28
bloody left04:29
nate1 left04:30
igemnace left04:30
nate1 joined04:31
bket left04:31
bket joined04:32
littlebobeep joined04:32
dob1 left04:33
dob1 joined04:34
Alex_IRC joined04:35
bket left04:35
nate1 left04:36
bket joined04:37
dsrt^ joined04:37
hamburgler left04:37
Alex_IRC left04:39
cahoots joined04:40
boka left04:40
igemnace_ left04:43
igemnace_ joined04:44
cahoots left04:44
money joined04:44
cixx left04:45
moneyGuest462804:45
cixx joined04:48
Guest4628 left04:49
igemnace joined04:50
igemnace_ left04:52
cixx left04:53
kopoksirakuh joined04:54
Saloframes joined04:54
boka joined04:55
dtux joined04:55
kopoksirakuh left05:00
kopoksirakuh joined05:00
EdFletcher joined05:00
igemnace left05:01
The_Blode joined05:02
dsrt^ left05:02
thebombzen joined05:10
troyt left05:13
cahoots joined05:13
Qudit joined05:13
cahoots left05:17
jla joined05:20
leib joined05:20
hamburgler joined05:20
troyt joined05:21
hamburgler left05:21
hbautista__ left05:22
cixx joined05:23
emico_ joined05:24
kopoksirakuh left05:25
kopoksirakuhaja joined05:26
emico left05:27
piwu left05:28
piwu joined05:29
EvilDMP left05:31
igemnace joined05:32
leib left05:36
leib joined05:37
ferdna left05:37
kopoksirakuhaja left05:38
kopoksirakuh joined05:39
oxymoron93 joined05:45
runlevel_0 joined05:46
squirrel left05:46
cahoots joined05:47
igemnace_ joined05:48
littlebobeep left05:51
szkl left05:51
igemnace left05:51
leib left05:51
dtux left05:51
carl-- joined05:52
cahoots left05:52
anjingaja joined05:54
anjingaja left05:54
anjingaja joined05:54
kopoksirakuh left05:55
carl--- joined05:55
littlebobeep joined05:56
igemnace_ left05:57
carl-- left05:57
carl-- joined05:59
carl--- left06:02
emico__ joined06:04
cahoots joined06:05
emico_ left06:07
cahoots left06:10
skapata left06:13
great_taste left06:16
coot joined06:16
hoochmonger left06:20
led_belly left06:21
dionysus69 joined06:22
cahoots joined06:22
moldorcoder7_ joined06:23
KnoP joined06:23
moldorcoder7 left06:24
foul_owl left06:24
junebug left06:25
madewokherd` joined06:27
theoceaniscool joined06:28
led_belly joined06:28
ferr_ joined06:28
anjingaja left06:29
derfflinger joined06:29
fercell left06:29
cahoots left06:29
madewokherd left06:30
oxymoron93 left06:32
Sulky joined06:33
gnraja joined06:35
emico_ joined06:36
foul_owl joined06:39
emico__ left06:40
palasso joined06:41
Qudit left06:42
igemnace joined06:45
csm3105 joined06:52
sreve joined06:56
joe1 joined06:56
sreve good morning06:56
cahoots joined06:57
csm3105 left06:59
TomyWork joined06:59
sreve My last commit is 'L' and currently HEAD, main and origin/main is on it. I do not like commit L and I want to go back to the last commit before - call it 'B'.06:59
'L' should stay as a dead branch. But I don't want to call it 'main'.07:00
How can I do this?07:00
otisolsen70 joined07:02
cahoots left07:02
csm3105 joined07:03
sreve I think I could create a new branch on commit 'B' and call it 'new-main', but then the names are not as I like to have it.07:03
bookworm checkout a new branch on L, checkout main, reset main to @~07:04
_xor left07:04
igemnace_ joined07:06
sreve bookworm, it asks me for soft/mixed/hard/keep07:06
keep?07:06
bookworm hard, unless you have a dirty repo, then you don't want to do that07:06
The_Blode left07:07
igemnace left07:08
sreve hmm, I cant say, that it was a success. https://i.imgur.com/lCrPSgt.png07:09
iomari891 joined07:10
sreve maybe I should take an hour to read some basics about git.07:10
bookworm I can't see HEAD nor local main in your picture07:10
sreve HEAD is yellow.07:11
bookworm green?07:11
sh0ne joined07:11
sreve Yellow/green/green/ -> HEAD / L / main07:11
bookworm what did you do exactly?07:12
jpnurmi left07:12
bookworm also, drop to a shell for now, a GUI is horrible to help with remotely07:12
as in, use git as a cli tool07:12
sreve can I paste to the chat?07:14
bookworm a pastebin, then paste the link07:14
unless it's a single line07:14
(or two)07:14
AnapodoPsalidaki joined07:14
jpnurmi joined07:15
YuGiOhJCJ joined07:15
osse sreve: in order to update origin/main you have to push --force07:15
bookworm but you seem to have done none of the things I recommended, considering that you neither have a new branch nor reset the current one to its parent so I'm confused as to what you did07:15
sreve what I have done: I created a new branch on the last commit and call it 'L' then I I do 'reset current branch to here' from 'main' to 'L'.07:16
bookworm if main and L are identical, resetting main to L is a noop07:16
cahoots joined07:17
bookworm checkout main; reset --hard @~07:17
that will forcefully reset main to be at the state it had one commit ago07:17
littlebobeep left07:17
sreve ok ... as long I do no 'pull/push' everything stays local, right?07:17
bookworm yes07:18
you don't have untracked changes do you?07:18
sreve no other changes so far.07:19
Sulky_ joined07:19
sreve sorry, I thought '@~' is a placeholder for my new branch name, I didnt know it is meant exactly.07:20
Sulky left07:20
cahoots left07:21
Sulky__ joined07:22
bookworm ah, no. placeholders are by convention shell like, meaning $thing07:23
austin987 joined07:23
jpnurmi left07:23
sreve Can I reset the local repo to the remote one and start new? "git reset --hard"?07:23
igemnace joined07:23
jpnurmi joined07:24
bookworm reset --hard to origin/main, yes07:24
depending on what you call anew07:24
sreve same as I would delete the local one and do a new clone07:24
Sulky_ left07:24
bookworm that's not the same no07:24
sreve ok07:25
well, let me invest some time in a git tutorial.07:25
bookworm as that (new clone) would also delete your other branches etc07:25
.xkcd07:25
ah... bot07:25
igemnace_ left07:26
EvilDMP joined07:27
littlebobeep joined07:29
vladoski joined07:30
jla left07:32
jla joined07:32
ano left07:35
ano joined07:36
zeenk joined07:37
nctcf^ joined07:39
littlebo1eep joined07:42
littlebobeep left07:43
TomyWork left07:50
jonosterman left07:52
cahoots joined07:53
cahoots left07:58
zeenk left07:58
littlebo1eep left08:02
littlebobeep joined08:02
littlebobeep left08:07
littlebo1eep joined08:07
igemnace left08:11
feriman joined08:13
emico__ joined08:13
gnraja left08:15
emico_ left08:17
Masklin joined08:19
Murr left08:19
Murr joined08:19
cahoots joined08:26
mexen joined08:26
masber joined08:27
cahoots left08:31
coot left08:34
coot joined08:40
GNUmoon2 left08:40
nctcf^ left08:40
GNUmoon joined08:45
drogas joined08:47
sreve left08:48
wootehfoot joined08:50
gurkenglas joined08:51
ChmEarl left08:53
wootehfoot left08:57
vimal joined09:00
cahoots joined09:03
cahoots left09:07
OnkelTem left09:08
littlebo1eep left09:18
kaiseisei left09:18
trace1918 joined09:20
littlebobeep joined09:20
kaiseisei joined09:20
pretty_dumm_guy joined09:21
cahoots joined09:21
jmabr joined09:21
csm3105 left09:22
sh0ne left09:25
cahoots left09:26
loulou_ left09:32
TomyWork joined09:37
cahoots joined09:38
twice6 joined09:43
cahoots left09:45
Gaboradon joined09:46
furrymcg1efurrymcgee09:46
twice6 left09:46
twice6 joined09:46
jl4 joined09:46
jla left09:47
jl4jla09:47
humanface joined09:48
sreve joined09:48
gas51627 joined09:48
Rh0nda joined09:50
hsyn joined09:51
Rhonda left09:53
iomari891 left09:55
peirik left09:56
voker57 left09:57
voker57 joined09:57
csm3105 joined10:02
sh0ne joined10:03
g0uZ left10:04
DibbTubberOne joined10:04
sfenik joined10:07
pulse joined10:10
vimal left10:11
sfenik left10:13
targerian1999 joined10:13
g0uZ joined10:15
cahoots joined10:16
targerian1999 left10:18
samuelbernardo left10:19
cahoots left10:20
ThiefMaster joined10:20
samuelbernardo joined10:22
feriman left10:24
gxt left10:26
feriman joined10:26
jaggz joined10:28
drogas left10:29
gxt joined10:32
ackyshake left10:35
Guest1249 left10:37
Guest1249 joined10:37
Guest1249POLO10:38
kaiseisei left10:42
kaiseisei1 joined10:42
drogas joined10:42
Rh0ndaRhonda10:43
kaiseisei1 left10:46
littlebobeep left10:48
DibbTubberOne left10:51
cahoots joined10:52
littlebobeep joined10:54
cdown_ joined10:55
cahoots left10:57
cdown left10:59
cdown_cdown10:59
Yruama joined10:59
AnapodoPsalidi joined11:00
squirrel joined11:01
AnapodoPsalidaki left11:03
bkircher joined11:10
luckman212 left11:11
luckman212 joined11:11
Guest6912 joined11:16
nctcf^ joined11:17
mic4ael left11:18
yeirr left11:19
kenan-office joined11:19
mic4ael joined11:20
dos_ joined11:20
lgc joined11:25
lgc left11:25
leib joined11:25
cahoots joined11:27
vladoski left11:28
f-a joined11:28
f-a git branch -d <feature> deletes (correctly) a local branch, how can I tell it «delete remote branch too»?11:29
dos_ left11:29
dos_ joined11:30
dos_ left11:30
cahoots left11:31
biapy left11:32
aminvakil f-a: git push -d <remote_name> <branchname>11:33
https://stackoverflow.com/a/2003515/383521011:34
bertvvvs joined11:35
cahoots joined11:35
f-a aminvakil: that is an additional command, right? (to type after: git branch -d)11:35
elastic_dog left11:36
aminvakil f-a: judging from upvotes of the answer, i don't think so11:36
f-a that is an interesting metric, let’s see11:37
drbeco left11:39
cahoots left11:40
elastic_dog joined11:41
KnoP left11:41
biapy joined11:41
dos_ joined11:41
dos_ left11:42
money joined11:42
moneyGuest167511:42
Guest1675 left11:43
Guest1675 joined11:43
POLOGuest814011:43
Guest1675POLO11:43
ikke git branch only operates locally11:44
biapy left11:44
hsyn left11:44
GyrosGeier I use "git push origin :branch"11:44
ikke So a 2nd command is required for remote repositories11:44
Csm319_ joined11:45
csm3105 left11:47
f-a the column means «delete»?11:47
biapy joined11:49
elastic_dog left11:49
GyrosGeier f-a, the empty space left of the colon means to update the remote branch from "nothing"11:50
ikke F-a you leave out the source branch11:50
Csm319_ left11:50
boka left11:52
f-a oh, thanks GyrosGeier11:52
osse there's no difference between the two11:53
mitrokov joined11:53
elastic_dog joined11:54
gas51627 left11:58
POLOGambino11:59
]W4R3[kitty joined12:00
enoq joined12:01
hxztnxt joined12:02
nctcf^ left12:03
Guest8140POLO12:04
otisolsen70 left12:05
jazzy left12:05
hxztnxt what is `git merge --squash` for?12:05
KnoP joined12:05
f-a left12:05
Guest72 joined12:07
cahoots joined12:08
otisolsen70 joined12:08
coot left12:09
GyrosGeier it merges and squashes in one go12:10
so it will condense the to-be-merged commits into one12:11
and then merge12:11
if the branch you are merging has a lot of in-between commits that don't work properly, but the end result is good, then that is preferable to the correct history12:12
because git-bisect works best if you can compile and test every commit12:13
cahoots left12:13
GyrosGeier if you do that to one of my feature branches where I've rebased twenty times and made sure that the branch has thirty isolated self-contained commits with long commit messages that each build and pass tests, then I'm going to be angry when you replace that branch with "merged feature X."12:14
boka joined12:17
twice6 left12:19
POLOGuest948512:20
GambinoPOLO12:20
Sulky_ joined12:22
masber left12:22
Sulky__ left12:25
mpldr GyrosGeier knows the pain of working with squashers12:25
hxztnxt i have `feature_a` branch based off master, then master is updated. How can i see the diff of the commits introduced by `feature_a` compared to the commit where master was previously?12:26
jla left12:26
hxztnxt `git diff feature_a..main` wont do it. Instead of main I should write the common ancestor of feature_a and main12:28
how can i get that12:28
?12:28
bloody joined12:29
cdown_ joined12:30
bkircher left12:30
furrymcgee you can checkout the a squashed commit and add a git merge --commit to preserve the parents12:30
bkircher joined12:30
GyrosGeier hxztnxt, git diff $(git merge-base feature_a main)..main12:31
ah wait12:31
ghost89 joined12:31
GyrosGeier git diff $(git merge-base feature_a main)..feature_a12:32
boka left12:32
cdown left12:32
cdown_cdown12:32
Misotauros left12:33
littlebobeep left12:34
ghost89 Hi. Let's say I pushed to a branch I was working on alone. Then I decided to amend the commit, and 'git push --force'. Is that older commit part of git history forever, or does it get GC'ed eventually? I'm thinking it should never be deleted, there's just a different (without a branch name) commit graph somewhere in the repo, right?12:34
so I previously had origin/mybranch at abc123, I pushed def123 which had some bad files, amend def123 into def456, push --force. What happens to def123?12:36
mpldr it will be GC'd eventually as long as there is no remaining ref to it12:36
boka joined12:36
FFY00 left12:38
ghost89 I see. Good to know, thanks.12:38
FFY00 joined12:40
nctcf^ joined12:40
littlebobeep joined12:42
POLOGuest641712:43
Guest9485POLO12:43
Misotauros joined12:43
Sulky__ joined12:43
cahoots joined12:44
Sulky__ left12:44
tyson2 joined12:44
Sulky_ left12:44
Sulky__ joined12:45
Guest6417 left12:46
]W4R3[kitty left12:47
cahoots left12:48
dionysus69 left12:50
dionysus69 joined12:50
Guest72 left12:51
money joined12:51
ikke GyrosGeier: use 3 dots instead of 212:53
POLOJoeyeS12:56
Sulky__ left12:56
Sulky__ joined12:57
hoochmonger joined13:01
nctcf^ left13:02
ano left13:05
sreve left13:06
ano joined13:08
JoeyeSPOLO13:08
zeenk joined13:10
littlebobeep left13:11
ano left13:12
POLO left13:13
ano joined13:14
sreve joined13:16
littlebobeep joined13:18
cahoots joined13:19
argument joined13:20
]W4R3[kitty joined13:21
argument This keeps happening to me every once in a while. I'm in a project that has a few older branches. Create a new branch, do some changes, commit and then push to origin. Looking at github I see it's not only pushed my new stuff, but changes from an older branch too13:22
money left13:22
argument Anyone know why this might be happening? When I did git status I only saw my new changes13:22
(on my new branch)13:22
gildasio left13:23
gurkenglas left13:23
ano left13:23
odoood joined13:23
littlebobeep left13:23
ano joined13:23
cahoots left13:23
gildasio joined13:24
vladoski joined13:26
POLO joined13:26
POLO left13:26
POLO joined13:26
Sulky__ left13:27
Sulky joined13:27
dextercd joined13:31
yeirr joined13:33
ghost89 left13:33
odoood left13:35
yeirr left13:38
coot joined13:40
obiwahn lets say i have a global setting like interactive.diffFilter13:42
and I would want to unset it in a local repo13:42
What must I do? So that the global config is not visible in local configuration13:43
otisolsen70 left13:43
obiwahn I do not want to unset interactive.diffFilter globally just for one project.13:44
m0viefreak joined13:45
vladoski left13:46
otisolsen70 joined13:46
Rashad joined13:47
vladoski joined13:47
cahoots joined13:49
hootch joined13:51
]W4R3[kitty left13:52
dos_ joined13:52
mjt0k joined13:53
frobnic left13:53
cahoots left13:54
humanface left13:59
gas51627 joined14:00
gildasio left14:04
MrMRDubya joined14:05
MrMRDubya left14:05
YuGiOhJCJ left14:07
Rashad left14:07
vladoski left14:08
vladoski joined14:09
gildasio joined14:09
frobnic joined14:09
boka left14:11
tyson2 left14:12
Guest6912 left14:13
Rashad joined14:14
tyson2 joined14:14
otisolsen70 left14:15
vicky joined14:15
csm3105 joined14:18
osse argument: how do you push?14:20
obiwahn: you can try setting it to the empty string in the project14:21
or 'cat' I guess14:21
obiwahn cat is good!14:22
derfflinger left14:22
obiwahn thank you!14:22
vicky I have a bare git repo and there are few remote branches test1, test2, test3. This repo has a test folder which has different tests for each remote branch. Is there was to fetch the data for all remote branches?14:22
boka joined14:23
boka left14:23
boka joined14:23
cahoots joined14:23
osse vicky: fetch already fetches data for all remote branches by defualt14:24
vicky osse: So there is no difference between fetching data from bare git repo and others?14:27
I mean normal git repo14:27
enoq left14:27
cahoots left14:27
kenan-office left14:28
vicky in bare git repo, when I try git fetch, it does not show the files14:29
osse vicky: that's what bare means14:31
gildasio left14:31
joe1 left14:31
osse the data is there though14:31
joe1 joined14:31
vicky osse: Okay14:31
trace1918 left14:31
dos_ left14:33
argument osse: git push origin <name_of_branch>14:34
vicky osse: Is there a way to access the data ?14:34
POLO left14:34
dos_ joined14:34
Rashad left14:37
vicky osse: git clone <path to bare repo> worked14:38
coot left14:41
cahoots joined14:41
hamburgler joined14:44
coot joined14:45
cahoots left14:45
pcarphin left14:46
machaddr joined14:46
leib left14:46
vladoski left14:50
vladoski joined14:51
loulou_ joined14:55
loulou_ left14:55
loulou_ joined14:55
POLO joined14:56
POLOGuest140314:56
Guest1403 left14:56
Guest1403 joined14:56
gildasio joined14:59
justsomeguy left15:03
money joined15:04
coot left15:05
gast0n joined15:07
iomari891 joined15:07
KnoP left15:08
pretty_dumm_guy left15:10
cahoots_ joined15:14
csm3105 left15:17
pretty_dumm_guy joined15:18
cahoots_ left15:18
Guest1403polo15:19
dionysus69 left15:21
iomari891 left15:21
iomari891 joined15:24
thiago joined15:25
gast0n left15:26
ferdna joined15:27
wootehfoot joined15:29
iomari891 left15:29
nctcf^ joined15:30
haise01 joined15:30
coot joined15:31
great_taste joined15:31
theoceaniscool left15:34
iomari891 joined15:36
nctcf^ left15:38
pcarphin joined15:38
gast0n joined15:38
sreve left15:39
rsx joined15:40
hootch left15:41
ferdna left15:41
ferdna joined15:42
iomari891 left15:42
iomari891 joined15:44
cahoots_ joined15:46
gast0n left15:46
cahoots_ left15:50
gildasio left15:52
dos_ left15:53
bob518 joined15:54
money left15:57
great_taste left15:58
gast0n joined15:58
abu joined15:59
madewokherd joined15:59
sudoforge joined16:01
madewokherd` left16:02
Betal joined16:04
rsx left16:06
gurkenglas joined16:07
money joined16:12
theoceaniscool joined16:15
gildasio joined16:19
Sulky left16:21
cahoots_ joined16:21
Sulky joined16:22
derfflinger joined16:23
derfflinger left16:24
derfflinger joined16:25
cahoots_ left16:25
theoceaniscool left16:27
Sulky left16:28
junebug joined16:29
drogas left16:29
Sulky joined16:29
Sulky left16:31
Sulky joined16:31
coot left16:31
great_taste joined16:32
Sulky left16:32
Sulky joined16:33
vladoski left16:34
vladoski joined16:35
Sulky left16:35
Sulky joined16:35
cahoots_ joined16:35
money left16:38
derfflinger left16:41
cahoots_ left16:41
cahoots_ joined16:41
vladoski left16:43
dvanloon joined16:43
dvanloon0 left16:43
umbramalison left16:45
dionysus69 joined16:45
umbramalison joined16:46
riposte left16:46
kadams joined16:48
riposte joined16:49
cahoots_ left16:50
floss-jas left16:50
junebug left16:51
ChmEarl joined16:52
iomari892 joined16:52
iomari891 left16:55
nate1 joined17:01
junebug joined17:02
sympt7 joined17:04
dtux joined17:04
sympt left17:05
hbautista__ joined17:05
sympt7sympt17:06
tyson2 left17:06
gast0n left17:07
gast0n joined17:08
ferdna left17:11
gast0n left17:11
ferdna joined17:13
sobkas joined17:15
coldmountain joined17:15
Sulky left17:19
iomari892 left17:19
Guest70 joined17:20
Guest70 hello \o/17:20
Sulky joined17:20
Guest70 I'm wondering how to initialize a GitHub repository with two empty `main` and `production` branches17:21
cahoots_ joined17:21
Guest70 What I want to achieve is to import a code to `main` branch and create a new pull request to merge from `main` to `production`17:22
It seems like an impossible task to me :(17:22
iomari892 joined17:22
Guest70 git version 2.25.117:23
off^ joined17:23
kenanmarasli joined17:24
gast0n joined17:24
Sulky_ joined17:24
___nick___ joined17:25
cahoots_ left17:25
theoceaniscool joined17:26
Sulky left17:26
bob518 left17:31
TomyWork left17:32
Rashad joined17:35
oxymoron93 joined17:37
terminaldweller left17:41
mexen left17:43
cahoots_ joined17:44
thiago Guest70: what GitHub does when it creates a repository is GitHub's own doing17:47
I don't know if it creates a branch or not17:47
anyway, when you push to it, push whatever you want17:48
what's the difficulty?17:48
terminaldweller joined17:48
mpldr Guest70: initialize your repo, import your main branch by pulling it from another remote, after that it depends on what exactly your situation is. if you dont have a production branch yet but still want a PR, you have to create a branch. Here git checkout --orphan might be worth taking a look at17:48
feriman left17:49
mpldr if the PR is optional, you can just create a branch at main/HEAD and push that17:49
wootehfoot left17:51
feriman joined17:51
Rashad left17:52
Guest70 that's what I tried:17:52
```17:52
$ git switch --orphan production17:52
$ git commit --allow-empty -m "Initial commit on orphan branch"17:52
$ git push -u origin production17:52
```17:52
but than Github tells me that commits in `main` and `production` doesn't match and won't let me to create a pull request from `main` to `production`17:52
cahoots_ left17:52
___nick___ left17:53
machaddr_ joined17:54
Guest70 mpldr if it helps, this is the task I'm trying to do, but I'm failing on the first step :D https://github.com/form3tech-oss/innsecure#instructions17:54
nedbat Guest70: it might be easier to add one README on main, commit it, and start production from there17:54
hxztnxt left17:54
hxztnxt joined17:55
___nick___ joined17:55
Guest70 it's an interview task if anyone is concerned17:55
___nick___ left17:56
cahoots joined17:56
machaddr left17:57
___nick___ joined17:57
cdown_ joined18:03
nate1 left18:03
cahoots left18:04
vicky left18:05
cdown left18:06
cdown_cdown18:06
Guest70 left18:08
blahboybaz joined18:09
YellowSuB left18:09
joe1 left18:10
dionysus69 left18:11
YellowSuB joined18:11
off^ left18:13
jonosterman joined18:13
hxztnxt left18:18
cahoots_ joined18:18
pcarphin left18:18
Murr left18:18
pcarphin joined18:18
Murr joined18:19
machaddr_machaddr18:19
tyson2 joined18:22
mpldr just create an empty commit on there so you have something to do the PR to18:25
cahoots_ left18:26
txtsd left18:27
igemnace joined18:31
junebug left18:31
oxymoron93 left18:33
vicfred left18:35
oxymoron93 joined18:36
skapata joined18:37
skapata left18:37
skapata joined18:37
cahoots_ joined18:40
iomari892 left18:40
vdamewood left18:44
cahoots_ left18:45
vdamewood joined18:45
rgrinberg joined18:45
osse argument: Hmm that's strange. What does git config push.default print?18:53
argument: Sure you're not confusing it with branches that have been pushed before? push will tell you what's pushed each time18:54
tyson2 left18:56
ferdna left19:04
tyson2 joined19:07
jonosterman left19:09
cahoots_ joined19:10
mitrokov left19:11
floss-jas joined19:12
argument osse: It's a branch I've pushed before that is 'tagging along' the push from another branch19:14
It's really weird19:14
happened twice19:14
thought it might me somehow connected to my stash, as I don't know exactly what was in there, but pretty sure that's not the case19:15
oxymoron93 left19:15
argument I created a branch this morning, pushed a one-liner and created a PR for it on Github (did not merge or anything). Later created another branch, did a few changes and pushed, looked at github and saw my one liner was ALSO committed with this branch19:16
cahoots_ left19:16
argument I'll be able to see what git config push.default prints tomorrow19:16
osse hmm, it kinda sounds like you misunderstand branches19:17
in your case it sounds like one branch just follows the other19:17
in the sense that the history is actually just a straight line, with one branch at the end and one in the middle19:17
rewt what did you have checked out when you created the 2nd branch?19:19
argument ugh yeah, I realised now19:19
I must have created the new branch while I was on the earlier one, not on master19:19
Thanks osse and rewt19:19
coldmountain left19:25
cahoots_ joined19:25
vdamewood left19:26
lantech19446 what group does my user need to be in on linux to avoid needing sudo for every damn git command19:28
I'm assuming i can't just move git from /usr/sbin to /usr/bin and have it work19:29
rewt you shouldn't need root to use git... was your inital checkout done as root?19:29
ajak you should operate on git repos with the user you created the repo with19:29
lantech19446 I'm trying to create the repo right now and it's asking for sudo, I've had this problem on other distros too19:30
rewt ... and why is git in /usr/sbin for you??19:30
lantech19446 i'm assuming it is if it's asking for elevation19:30
cahoots_ left19:30
tyson2 left19:30
rewt what does `which git` say?19:30
lantech19446 apparently it's in /usr/bin/git so it makes no sense that it's asking for sudo and it's not like i have other repos on this computer19:31
vdamewood joined19:31
lantech19446 and I created the folder for the repo so i'm already the owner19:32
dextercd What is Git asking exactly?19:32
lantech19446 nope apparently i'm wrong it made root the owner, no idea why let me change that then I should be good19:33
ok all fixed19:35
coot joined19:35
wilz left19:39
wilz joined19:40
cahoots_ joined19:41
skapata left19:44
cahoots_ left19:46
skapata joined19:50
skapata left19:50
skapata joined19:50
blahboybaz left19:59
littlebobeep joined19:59
rgrinberg left20:01
___nick___ left20:03
boka guys mistakenly i commited a 4 files instead of 120:07
but before that i've also previous commit i dont want to change20:08
how can i undo that commit20:08
i'm in magit20:08
argument left20:10
Saloframes left20:11
cahoots_ joined20:11
cahoots_ left20:18
abu left20:18
Murr left20:18
Murr joined20:19
masber joined20:19
littlebobeep left20:20
pretty_dumm_guy left20:24
machaddr left20:28
Guest4391 joined20:29
machaddr joined20:29
ThorMojito joined20:33
hsyn joined20:35
kenanmarasli left20:35
coot left20:38
littlebobeep joined20:41
zebrag joined20:43
cahoots joined20:45
dtux left20:47
machaddr left20:48
sh0ne left20:48
bob518 joined20:48
joe1 joined20:50
cahoots left20:50
dionysus69 joined20:51
bambanxx joined20:53
cahoots joined20:53
pretty_dumm_guy joined20:54
littlebobeep left20:55
thebombzen left20:57
cahoots left20:58
littlebobeep joined20:58
cahoots joined20:58
masber left20:58
led_belly left20:58
thebombzen joined20:59
Saloframes joined21:00
tyson2 joined21:01
mfiano left21:02
cahoots left21:03
mfiano joined21:03
littlebobeep left21:05
jazzy joined21:12
Guest4391 left21:16
littlebobeep joined21:19
trace1918 joined21:24
cahoots joined21:31
cahoots left21:35
joe1 left21:37
bambanxx left21:38
zeenk left21:39
feriman left21:41
howdoi joined21:42
bambanxx joined21:43
trace1918 left21:47
szkl joined21:48
rgrinberg joined21:48
cahoots joined21:50
ThorMojito left21:50
awmv joined21:50
cahoots left21:54
ThorMojito joined21:57
bgs left21:57
Guest5555 joined21:57
bgs joined21:59
crabbedhaloablut left22:00
crabbedhaloablut joined22:00
nate1 joined22:01
ThorMojito left22:01
theoceaniscool left22:01
money joined22:02
money left22:02
junebug joined22:03
rgrinberg left22:04
nate1 left22:06
bambanxx left22:08
cahoots joined22:08
rgrinberg joined22:08
riposte left22:09
riposte joined22:10
ferdna joined22:11
hoochmonger left22:11
cahoots left22:12
palasso left22:13
junebug left22:14
rgrinberg left22:16
thock joined22:17
riposte left22:18
riposte joined22:18
Murr left22:18
Murr joined22:18
thock left22:18
txtsd joined22:19
TitaniumHocker joined22:19
rgrinberg joined22:19
ackyshake joined22:20
carl-- left22:20
dionysus69 left22:21
thebombzen left22:24
dextercd left22:26
thebombzen joined22:26
boka left22:28
vdamewood left22:31
vdamewood joined22:32
cahoots joined22:38
junktext left22:42
cahoots left22:42
junktext joined22:43
BtbN reset to the previous commit, and commit again? If you haven't pushed it anywhere yet.22:45
llh joined22:54
igemnace left22:57
awmv left22:58
rgrinberg left23:01
bgs left23:03
R2robot left23:05
bgs joined23:06
mfiano left23:06
polomoney23:06
haise01 left23:06
mfiano joined23:07
gas51627 left23:08
R2robot joined23:08
sobkas left23:09
sa0 left23:10
m0viefreak left23:10
sa0 joined23:10
cahoots joined23:13
sa0 left23:15
hsyn left23:17
cahoots left23:21
littlebobeep left23:30
keypusher left23:30
keypusher joined23:32
vicfred joined23:33
led_belly joined23:34
EdFletcher left23:39
Sulky_ left23:40
thiago left23:42
cahoots joined23:42
Guest5555 left23:42
Sulky_ joined23:43
cahoots left23:47
zebrag left23:47
riposte left23:49
riposte joined23:50
TitaniumHocker left23:50
littlebobeep joined23:51
moneyGambino23:51
Guest6849 joined23:58

Logs Search ←Prev date Next date→ Channels Documentation