IRCloggy #git 2020-06-27

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.

2020-06-27

Maxattax left00:00
xcm left00:06
xcm joined00:06
riposte left00:08
tiin57 left00:08
tiin57 joined00:12
tgunr joined00:19
saveNexit left00:19
saveNexit joined00:20
foul_owl joined00:21
oatmealraisin left00:23
riposte joined00:24
tgunr left00:24
blahboybaz left00:26
tgunr joined00:26
riposte left00:27
shush left00:30
shush joined00:31
riposte joined00:31
tgunr left00:32
shush left00:35
tiin57 left00:38
saveNexit left00:38
tgunr joined00:39
tiin57 joined00:41
Spr0cket left00:43
dedowsdi joined00:45
SwiftMatt joined00:45
jzeus joined00:46
kleisli__ left00:49
g00s joined00:50
Hello71 left00:50
Hello71 joined00:50
PavelB joined00:55
tgunr left00:58
Spr0cket joined00:59
Guest20 joined01:01
BrianBlaze left01:02
shush joined01:03
BrianBlaze joined01:04
dedowsdi left01:05
dedowsdi joined01:07
tiin57 left01:08
BrianBlaze left01:08
shush left01:08
rustyshackleford joined01:10
tiin57 joined01:12
SwiftMatt left01:12
BrianBlaze joined01:13
radu242 joined01:19
k3yp- joined01:20
k3yp left01:20
k3yp-k3yp01:21
Maxattax joined01:29
mowcat left01:37
emmanuelux left01:38
tiin57 left01:38
Technodrome joined01:41
causasui left01:41
jelmer left01:41
wootehfoot left01:41
tiin57 joined01:42
dfee left01:50
Spr0cket left01:50
Betal joined01:50
jzeus left01:55
m0viefreak left01:55
shush joined01:55
ams___ left01:55
kleisli__ joined01:56
Sasazuka left01:56
prg318 left01:57
prg318 joined01:58
Brain joined02:02
Spr0cket joined02:02
meLon joined02:04
cyphase left02:05
[Brain] left02:05
Xeago left02:05
Xeago joined02:07
dfee joined02:07
tiin57 left02:08
lagothrixGuest5332202:10
Guest53322 left02:10
lagothrix joined02:10
tiin57 joined02:11
jzeus joined02:16
crose left02:26
Cabanoss- joined02:29
mgedmin left02:30
Cabanossi left02:30
Cabanoss-Cabanossi02:30
mgedmin joined02:35
shush left02:36
jzeus left02:37
shush joined02:38
tiin57 left02:38
davispuh left02:40
_0xDEADBEEF left02:40
jelmer joined02:41
tiin57 joined02:41
shush left02:41
shush joined02:41
SwiftMatt joined02:45
shush left02:49
SpeakerToMeat left02:49
shush joined02:49
SpeakerToMeat joined02:50
kleisli_ joined02:52
kleisli__ left02:54
shush left02:55
onizu joined02:57
libertyprime joined02:57
Brainium left02:58
causasui joined02:58
emdev joined03:01
emdev left03:01
justanotheruser left03:03
PavelB left03:04
lucasb left03:05
cbreak left03:06
maryo_s joined03:06
SwiftMatt left03:07
cbreak joined03:07
tiin57 left03:08
justanotheruser joined03:08
SpeakerToMeat left03:09
SpeakerToMeat joined03:10
tiin57 joined03:12
SwiftMatt joined03:12
jelmer left03:14
jelmer joined03:14
g4570n left03:17
g4570n joined03:18
jzeus joined03:29
SwiftMatt left03:33
gxt___ joined03:34
gxt__ left03:37
tiin57 left03:38
opal left03:41
tiin57 joined03:42
Technodrome left03:46
Cabanossi left03:46
dfee left03:48
Cabanossi joined03:49
Muimi joined03:53
[Brain] joined03:56
darkstardev13 left03:57
Brain left03:58
blahboybaz joined03:59
blahboybaz An initial commit was done on the master branch (first commit). Then a second commit was done on that same branch. Finally $ git rebase -i HEAD~2 was executed from the command line and the response was: fatal: invalid upstream 'HEAD~2' Why?03:59
Can you not squash the first two commits on master into one?04:00
I think I know why but isn't that kinda messed up?04:00
dfee joined04:01
causasui left04:01
darkstardev13 joined04:02
wootehfoot joined04:04
Guest20 left04:05
g4570n left04:07
tiin57 left04:08
opal joined04:09
wootehfoot left04:10
Aelius left04:10
tiin57 joined04:11
Aelius joined04:13
cyphase joined04:16
libertyprime left04:18
Technodrome joined04:21
kaartic joined04:25
Goplat joined04:31
orbyt_ left04:34
Trieste left04:38
tiin57 left04:38
jzeus left04:39
Trieste joined04:40
tiin57 joined04:42
jetchisel left04:47
thevisitor_ left04:50
stitched_unicorn joined04:56
duderonomy joined04:58
stitched_unicorn left05:04
stitched_unicorn joined05:08
tiin57 left05:08
sunova joined05:08
tiin57 joined05:12
Phylock joined05:16
stitched_unicorn left05:16
bocaneri joined05:16
stitched_unicorn joined05:17
mightyjens joined05:31
wymillerlinux left05:32
ferdna joined05:33
tiin57 left05:38
tiin57 joined05:42
blahboybaz If I rebase what I squashed on <source> branch while on <target> branch with $ git rebase <source-branch> then is there a way to also be given the option to write a commit message for this operation?05:47
kaartic left05:52
stitched_unicorn left05:52
dfee left05:52
Phylock left05:54
zebrag left05:57
zebrag joined05:57
dfee joined06:05
st-gourichon-fid joined06:06
tiin57 left06:08
nabil joined06:10
tiin57 joined06:12
st-gourichon-fid left06:21
jaziz1 joined06:35
sunova left06:37
tiin57 left06:38
tiin57 joined06:41
S0l4rb03 joined06:41
libertyprime joined06:45
thiago left06:45
blahboybaz left06:49
calcul0n joined06:50
wootehfoot joined06:50
xcm left06:52
xcm joined06:52
mightyjens left06:53
cpackham joined07:00
Muimi left07:01
tsdh left07:02
tiin57 left07:08
jzeus joined07:09
ferdna left07:10
sahasatvik joined07:12
tiin57 joined07:12
Guest20 joined07:12
jzeus left07:14
jrm left07:15
akem joined07:15
jrm joined07:15
Eryn_1983_FL left07:18
Eryn_1983_FL joined07:20
bolovanos joined07:20
eqw left07:21
eqw joined07:22
mkoskar how to escape ; in git alias definition? e.g., this doesn't work ... test = !echo hello \; echo world07:23
> fatal: bad config ...07:23
rangergord left07:24
ikke mkoskar: I think it should be quoted07:24
mkoskar ah ok ye, ";" works >_>07:24
ikke Just quote the entire alias definition07:24
then you don07:25
don't need to treat ; differently07:25
Maxattax left07:26
mkoskar ah07:28
right07:28
akem left07:30
stitched_unicorn joined07:30
mkoskar I haven't realized git strips one layer of double quotes, hmm that means to really quote e.g., shell var expansion it has to be quoted twice07:32
tiin57 left07:38
bolovanos left07:38
dfee left07:40
tiin57 joined07:41
mat001 left07:56
Guest20 left07:57
quetz joined08:00
tiin57 left08:08
akem joined08:09
theoceaniscool joined08:10
tiin57 joined08:12
sudoforge left08:23
foul_owl left08:30
tiin57 left08:38
Lucas_Gray joined08:41
Goplat left08:41
tiin57 joined08:42
bettencb left08:43
foul_owl joined08:43
dviola left08:48
shored left08:48
shored joined08:51
quetz left08:57
geowiesnot joined09:02
xcm left09:03
xcm joined09:03
jetchisel joined09:08
tiin57 left09:08
justanotheruser left09:11
tiin57 joined09:11
NeoCron joined09:13
Betal left09:14
moo joined09:15
justanotheruser joined09:17
sunova joined09:25
st-gourichon-fid joined09:27
Ignacy left09:33
freddieptf joined09:35
geowiesnot left09:35
sunova left09:36
tiin57 left09:38
tiin57 joined09:41
Ignacy joined09:47
stitched_unicorn left09:51
bolovanos joined09:55
daemon joined09:55
daemon hey all, is there anyway to atomically reset 'master' basically wipe its history without removing any files and make what is present within the directory scope as 'the initial commit' ?09:56
benyoo joined09:59
tiin57 left10:08
tiin57 joined10:11
wootehfoot left10:20
zatumil left10:25
jaziz1 left10:25
zatumil joined10:25
zatumil a grafted commit?10:29
Anticom joined10:33
Muimi joined10:36
tiin57 left10:38
tiin57 joined10:41
xcm left10:52
xcm joined10:52
j416 daemon: yes11:00
daemon: there are multiple ways to go about it; one is reset to the initial commit and amend it.11:00
gato joined11:01
j416 daemon: git reset --soft <your-initial-commit> && git commit --amend -C HEAD11:01
daemon j416, ah thank you11:01
j416 daemon: another way is to squash them with interactive rebase11:02
daemon j416, I actually made an orphan branch, swapped to it did add -A, deleted master, and renamed the orphan master11:03
few ways to do it, it seems :)11:03
j416 sure, that's valid too.11:03
graphicsv left11:03
j416 rm -rf .git && git init # is also a way11:04
!backup of course.11:04
gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups11:04
tiin57 left11:08
tiin57 joined11:11
theorangeone left11:17
theorangeone joined11:18
Guest20 joined11:37
aliss joined11:38
tiin57 left11:38
tiin57 joined11:41
gato left11:46
teut joined11:47
teut $ git commit -m "Provision for multiple type of form upload based on `opt`" bash: opt: command not found11:47
`` are these something in git?11:47
[refactored b54586f] Provision for multiple type of form upload based on 2 files changed, 24 insertions(+), 9 deletions(-)11:47
I too got this11:48
is my code commited or what has happened?11:48
_cipher left11:48
teut I --amended it anyways..11:50
_cipher joined11:50
theoceaniscool left11:52
_cipher left11:55
zatumil ` is a special character in bash11:56
_cipher joined11:57
teut hmm, https://www.google.com/search?safe=active&client=firefox-b-d&sxsrf=ALeKk02VQLnK9RGmonXZ23ypY0JAg51KPA%3A1593258417397&ei=sTH3Xo7sF8-7rQGt_ZWIAg&q=%60+%60+in+git&oq=%60+%60+in+git&gs_lcp=CgZwc3ktYWIQAzICCAAyAggAMgIIADICCAAyAggAMgIIADICCAAyAggAMgIIADICCAA6BwgAEEcQsAM6BggAEBYQHjoCCCZQ7RBYkhVgwhhoAXAAeACAAbYBiAH7A5IBAzAuM5gBAKABAaoBB2d3cy13aXo&scl11:57
ient=psy-ab&ved=0ahUKEwjOiISQ9qHqAhXPXSsKHa1-BSEQ4dUDCAs&uact=511:57
nothing found here11:57
benyoo Can I only put one Folder from the master branch to another branch?11:57
teut yes git add Folder/*11:58
benyoo I have a dist folder which I get after building a website and now I want a release branch with that only dist folder11:58
if I have that folder added and I do `checkout -b release, then only that folder is included?11:59
teut I think switching to a new branch deleting all irrelevant stuff and commiting can be an option11:59
jetchisel left12:00
Spr0cket left12:01
teut left12:01
Spr0cket joined12:02
_cipher left12:03
_cipher joined12:04
tiin57 left12:08
m0viefreak joined12:09
tiin57 joined12:11
shush joined12:15
shush left12:19
benyoo I added a second remote release, how I can add only ONE specific folder to that remote?12:22
from my master12:22
ikke You push entire branches / commits to a remote, not just files / directories12:25
zatumil checkout git subtree split12:25
quetz joined12:28
nedbat benyoo: sounds like trying to use git as a distribution mechanism. better to use other tools12:36
tiin57 left12:38
benyoo maybe yeah, want to make as easy as possible to handle with 3 repos. I created in that dist folder another the third repo where I push it to a release remote. works perfectly12:42
tiin57 joined12:42
aliss left12:43
theoceaniscool joined12:43
coffeejunk left12:44
coffeejunk joined12:45
tgunr joined12:49
kleisli_ left12:50
maryo_t joined12:52
cdown left12:53
cdown joined12:55
maryo_s left12:55
Muimi_ joined13:04
Muimi left13:07
Muimi_Muimi13:07
tiin57 left13:08
mat001 joined13:11
_cipher left13:12
tiin57 joined13:12
m0viefreak left13:13
cd joined13:17
geowiesnot joined13:18
aliss joined13:19
m0viefreak joined13:20
crose joined13:20
kleisli_ joined13:21
libertyprime left13:24
Guest20 left13:27
_cipher joined13:27
JanC_ joined13:38
tiin57 left13:38
JanC left13:38
JanC_JanC13:38
bolovanos left13:39
CodeSlingerPaul joined13:42
tiin57 joined13:42
_cipher left13:43
geowiesnot left13:47
TheWild joined13:49
ShapeShifter499 left13:51
ShapeShifter499 joined13:51
akem left13:51
Muimi left14:06
_cipher joined14:08
tiin57 left14:08
manrasp joined14:11
tiin57 joined14:11
_cipher left14:13
tgunr left14:13
xcm left14:15
xcm joined14:16
wymillerlinux joined14:17
wymillerlinux left14:22
_cipher joined14:29
_cipher left14:30
g4570n joined14:30
ShapeShifter499 left14:31
ShapeShifter499 joined14:31
_cipher joined14:33
_cipher left14:34
qpdb left14:35
zebrag left14:35
zebrag joined14:35
dedowsdi left14:37
tiin57 left14:38
sz0 left14:39
qpdb joined14:39
tiin57 joined14:42
manrasp left14:43
bkuhlmann joined14:44
xcm left14:55
_cipher joined14:56
xcm joined14:56
tgunr joined14:57
_cipher left14:57
blahboybaz joined14:58
blahboybaz I need to delete the remote connection / branch locally but not affect anything in the remote repository. I tried git branch -d origin/master but that gets me "error: branch 'origin/master' not found." (even though it is listed with git branch -r). I saw an article that mentions what I tried (as though it should work) and something like git push origin --delete origin/master but it may be talking about deleting a branch on the14:58
remote. I can not afford to eff up my remote - I only need to remove the remote tracking branches locally. Is there a right way to do this?14:58
albel727 left14:58
cd left14:59
_cipher joined14:59
benyoo left15:01
blahboybaz I see another source says to run: $ git branch -d -r origin/<remote branch name> and it will not affect the remote. Is that right? What I'm doing is I copied a repository I have so I can run a test on the copy but it has to have it's own connection to a different repo on the remote (for the test only).15:04
tiin57 left15:08
tiin57 joined15:11
blahboybaz Nevermind15:12
oojacoboo left15:12
sahasatvik left15:17
rafasc joined15:23
causasui joined15:24
fission6 joined15:26
AtumT joined15:26
AtumT_ joined15:29
AtumT left15:31
tiin57 left15:38
_cipher left15:41
tiin57 joined15:41
thiago joined15:45
gxt___gxt15:49
HumanG33k left15:50
sz0 joined15:50
darkbit joined15:52
HumanG33k joined15:59
HumanG33k left16:00
rafasc left16:00
HumanG33k joined16:01
albel727 joined16:04
tiin57 left16:08
newdimension_newdimension16:09
xcm left16:09
freddieptf left16:09
bettencb joined16:09
tiin57 joined16:11
fission6 left16:12
sudoforge joined16:12
xcm joined16:12
fission6 joined16:13
bkuhlman_ joined16:15
bkuhlmann left16:18
shush joined16:19
_cipher joined16:19
freddieptf joined16:22
rafasc joined16:22
Guest20 joined16:27
holycow joined16:33
holycow left16:35
_cipher left16:36
tiin57 left16:38
_cipher joined16:38
theorangeone left16:40
theorangeone joined16:41
tiin57 joined16:41
orbyt_ joined16:41
rustyshackleford left16:44
maryo_t left16:45
moo left16:46
_cipher left16:47
Lucas_Gray left16:47
maryo_t joined16:48
_cipher joined16:50
rustyshackleford joined16:53
seaef joined16:55
fflam left16:57
fflam joined16:58
novae left17:00
ShapeShifter499 left17:04
ShapeShifter499 joined17:04
fission6 left17:06
tiin57 left17:08
ferdna joined17:09
anton left17:11
tiin57 joined17:11
Anticom left17:12
ShapeShifter499 left17:13
ShapeShifter499 joined17:13
seaef left17:15
fission6 joined17:16
novae joined17:18
shush left17:18
kleisli_ left17:20
doublex left17:21
TheWild hello17:26
psprint joined17:27
psprint left17:27
TheWild ...anyway, I was supposed to ask a question but have solved my problem the other way around.17:28
_cipher left17:28
oriba joined17:32
fission6 left17:37
tiin57 left17:38
HumanG33k left17:38
HumanG33k joined17:39
jonan joined17:40
geowiesnot joined17:41
tiin57 joined17:41
jonan i untracked a file that no longer exists in my directory with git rm --cached (file) due to it being a rather large log file. however the file is still prompted and erroring when attempting to push it into my repo. is there something else i need to do besides deleting its index?17:42
orbyt_ "however the file is still prompted and erroring when attempting" What do you mean by this?17:44
jonan remote: error: File .path/to/biglog is 974.68 MB; error: failed to push some refs etc.17:46
i already deleted this file manually, as well as it is now untracked, so im pretty confused17:46
Cabanossi left17:46
jonan ah whatever, just reset to an earlier head and went from there, not really worth finding out what that was about17:51
Cabanossi joined17:51
inkbottle joined17:52
Nerium joined17:53
wootehfoot joined17:53
zebrag left17:53
Goplat joined17:54
Brain joined17:54
rewt jonan, when you git push, you push all the commits that the remote doesn't alreayd have, and if any one of those has the large file, the whole push will be rejected... I'm guessing you committted the file before deleting it from git, so it was still there in an older commit that was part of the push17:57
[Brain] left17:57
learningc joined17:59
learningc left18:00
geowiesnot left18:00
tiin57 left18:08
tiin57 joined18:11
clara97 joined18:12
seaef joined18:17
bocaneri left18:20
jwest left18:22
SpeakerToMeat left18:25
SpeakerToMeat joined18:26
anton joined18:29
voidSurfr joined18:29
Guest20 left18:31
bocaneri joined18:32
paws_ joined18:33
justanotheruser left18:34
tiin57 left18:38
SWAT left18:39
tiin57 joined18:42
causasui left18:42
Nerium left18:46
kupi joined18:49
jwest joined18:52
aliss left18:56
causasui joined18:57
darkbit left18:57
demeg0 joined19:05
tiin57 left19:08
voidSurfr left19:09
SwiftMatt joined19:10
blahboybaz left19:11
tiin57 joined19:12
voidSurfr joined19:13
_Vi joined19:14
bolovanos joined19:22
orbyt_ left19:24
justanotheruser joined19:30
Nerium joined19:30
daemon left19:30
duderonomy left19:33
quackgyver joined19:36
dfee joined19:38
tiin57 left19:38
SWAT joined19:41
tiin57 joined19:41
duderonomy joined19:46
fission6 joined19:50
Betal joined19:52
aliss joined20:08
tiin57 left20:08
seaef left20:11
tiin57 joined20:11
MrMango17 joined20:12
ash_worksi left20:17
dfee left20:20
jgoutz21 joined20:23
learningc joined20:28
wnbeser joined20:30
benyoo joined20:31
wnbeser left20:32
st-gourichon-fid left20:33
aliss left20:33
SwiftMatt left20:34
bocaneri left20:38
tiin57 left20:38
qCode joined20:38
Technodrome left20:39
causasui left20:39
benyoo left20:40
fission6 left20:40
tiin57 joined20:41
Lucas_Gray joined20:42
jonan left20:45
darkstardev13 left20:46
benyoo joined20:47
darkstardev13 joined20:50
bocaneri joined20:51
jaziz1 joined20:51
demeg0 left21:03
batrick left21:03
dfee joined21:06
batrick joined21:06
Nerium left21:08
tiin57 left21:08
Lucas_Gray left21:10
tiin57 joined21:11
shush joined21:16
jetchisel joined21:16
kleisli_ joined21:20
shush left21:21
ferdna left21:21
freddieptf left21:26
_cipher joined21:29
_cipher left21:32
clara97 left21:32
shush joined21:33
dfee left21:35
akem joined21:36
_cipher joined21:36
tiin57 left21:38
hussar joined21:40
hussar what are some methods of comparing the log and diff history of forks?21:41
i'm trying to avoid having to add them all as branches in one repo21:41
tiin57 joined21:41
akem left21:42
Nerium joined21:43
ikke Well, that's the only way to compare history21:43
afaik there are no tools to compare two separate repositories21:43
especially not remotely21:43
hussar they're all local repos21:44
akem joined21:45
Nerium left21:45
qCode left21:45
shush left21:46
ikke still the first point stands21:46
davve just git log <branchtocmompareto> or git diff <somefile> <somebranch>21:46
might have gotten order wrong on diff21:46
ikke davve: that requires them to fetch one repo into the other21:47
shush joined21:47
davve oh i thought he meant forks not separate remotes21:47
quetz left21:47
davve thats same as fork in github terminology no?21:47
not = and21:48
g00s left21:48
davve sorry21:48
ikke a fork is basically just a clone of a repo21:49
shush left21:52
jgoutz21 left21:52
paws_ left22:03
Fissure joined22:03
tiin57 left22:08
SwiftMatt joined22:09
lucasb joined22:10
Human_G33k joined22:10
tiin57 joined22:11
HumanG33k left22:13
fstd_ joined22:16
SwiftMatt left22:17
fstd left22:20
fstd_fstd22:20
pac1 joined22:20
shush joined22:21
shush left22:26
benyoo left22:29
oriba left22:31
hussar left22:35
hussar joined22:37
tiin57 left22:38
tiin57 joined22:41
TheWild left22:45
kleisli__ joined22:47
kleisli_ left22:50
voidSurfr left22:50
calcul0n left22:55
justache left23:02
_cipher left23:02
hussar left23:03
justache joined23:03
wootehfoot left23:04
hussar joined23:04
Fissure left23:07
tiin57 left23:08
_cipher joined23:11
tiin57 joined23:11
hussar left23:13
ShapeShifter499 left23:16
Ransu joined23:16
hussar joined23:18
jaziz1 left23:19
_cipher left23:26
_cipher joined23:28
Gustavo6046 left23:29
_cipher left23:29
SwiftMatt joined23:30
_cipher joined23:30
Ransu left23:33
ShapeShifter499 joined23:33
foul_owl left23:33
tiin57 left23:38
Gustavo6046 joined23:40
tiin57 joined23:42
foul_owl joined23:46
CodeSlingerPaul left23:51
gschanuel9 joined23:54
tgunr left23:54
gschanuel left23:56
gschanuel9gschanuel23:56

Logs Search ←Prev date Next date→ Channels Documentation