IRCloggy #git 2020-03-01

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-03-01

← Sonicbit left00:00
→ libertyprime joined00:00
→ Sonicbit joined00:01
← xelxebar left00:04
← jetchisel left00:05
← royal_screwup21 left00:09
← Wetmelon left00:14
← libertyprime left00:16
← malina left00:17
← lucasb left00:18
→ mealofdoom joined00:18
mealofdoom hello00:19
gitinfo mealofdoom: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.00:19
→ libertyprime joined00:22
→ nuala joined00:25
PenguinSnail !backup00:26
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/#backups00:26
→ dilfridge joined00:28
← hussam left00:30
← dedowsdi left00:31
← DNS left00:33
← clemons1 left00:34
→ DNS joined00:34
← Khisanth left00:36
← PenguinSnail left00:36
← libertyprime left00:38
← mealofdoom left00:41
→ libertyprime joined00:43
← santagauss left00:47
→ Khisanth joined00:53
→ Wetmelon joined00:53
← brunocarvalho left00:56
← chris349 left00:59
← libertyprime left00:59
→ dedowsdi joined00:59
→ libertyprime joined01:05
← lmat left01:05
→ vicfred joined01:09
← Cabanossi left01:15
← howdoi left01:19
← NODE left01:24
← libertyprime left01:24
→ NODE joined01:25
→ Cabanossi joined01:27
→ libertyprime joined01:30
→ SuperKaramba joined01:30
← BenderRodriguez left01:33
→ dmc joined01:36
← libertyprime left01:45
→ vdamewood joined01:48
← AtumT_ left01:50
→ libertyprime joined01:51
← olddogbarks left01:51
→ Neurognostic joined01:52
← leeN left01:58
← cd left01:59
→ thomasross joined02:05
→ olddogbarks joined02:05
← olddogbarks left02:06
← libertyprime left02:07
Soni why are signatures part of a commit such that you can't sign off on someone's work unless you put a new commit on top?02:07
also, when checking signatures, do old commits matter or can I assume that the whole history is okay because the DAG is cryptographic?02:08
→ crose joined02:10
→ libertyprime joined02:13
→ Sasazuka joined02:19
→ olddogbarks joined02:21
← olddogbarks left02:22
← CCR5-D32 left02:26
→ v0re joined02:27
← m0viefreak left02:27
← libertyprime left02:28
← v0re left02:29
→ libertyprime joined02:33
→ Beam_Inn joined02:34
← Beam_Inn left02:38
← comptroller left02:43
→ gendarme joined02:46
← alip left02:47
← Narrat left02:48
← clime left02:50
gendarme I forgot to add changes to a a commited file, what is the workflow to make those changes show up in the commit?02:50
← libertyprime left02:53
→ dtux joined02:53
mmattice interactive rebase with a fixup02:53
→ comptroller joined02:54
→ jetchisel joined02:54
gendarme ok, thanks02:54
← F0rTex left02:55
→ F0rTex joined02:56
→ libertyprime joined02:58
← Sasazuka left03:00
← emmanuelux left03:00
← Cabanossi left03:13
← vdamewood left03:13
← libertyprime left03:14
→ Cabanossi joined03:16
→ libertyprime joined03:19
→ howdoi joined03:27
← libertyprime left03:29
← lagothrix left03:37
→ lagothrix joined03:38
→ maryo joined03:48
← MoziM left03:56
→ MoziM joined03:58
→ maryo_s joined03:59
← maryo left04:02
← delli3 left04:04
→ wildlander joined04:07
→ justanotheruser joined04:07
← Anthaas left04:08
→ Anthaas joined04:09
← maryo_s left04:13
→ maryo_t joined04:13
→ delli3 joined04:13
← jetchisel left04:16
→ jetchisel joined04:18
← xcm left04:18
→ xcm joined04:19
← dellprecision left04:28
→ gschanuel3 joined04:28
← Helenah left04:31
← gschanuel left04:31
gschanuel3 → gschanuel04:31
→ Helenah joined04:33
← orbyt_ left04:36
→ butterthebuddha joined04:36
← serapath left04:37
→ serapath joined04:37
→ omnireq joined04:38
← omnireq left04:40
→ omnireq joined04:41
→ omnireq_ joined04:45
← Wetmelon left04:46
← omnireq left04:47
← butterthebuddha left04:48
Sonicbit → noxter04:51
← omnireq_ left04:51
noxter → noxx04:52
noxx → paxter04:52
paxter → noxs04:53
→ libertyprime joined04:55
← gendarme left04:59
→ Goplat joined05:00
→ pks_ joined05:02
← pks left05:03
pks_ → pks05:03
← justanotheruser left05:04
→ orbyt_ joined05:04
→ butterthebuddha joined05:06
← sz0 left05:10
noxs → knox05:15
← ferdna left05:16
knox → noxr05:17
noxr → noxer05:18
noxer → Sonicbit05:20
→ ferdna joined05:22
← kupi left05:23
→ justanotheruser joined05:25
← maryo_t left05:28
← butterthebuddha left05:42
← jetchisel left05:42
→ noxer joined05:44
← azwieg103 left05:44
← Sonicbit left05:45
→ omnireq joined05:47
noxer → nox-05:49
→ maryo_t joined05:49
nox- → nocs05:50
nocs → e-nox05:50
← jbauer left05:51
e-nox → noxx05:52
← omnireq left05:52
noxx → mr-nox05:52
mr-nox → noxs05:55
← wildlander left06:02
→ dviola joined06:02
→ Err0r403 joined06:02
→ jetchisel joined06:05
→ wildlander joined06:05
← Err0r403 left06:06
→ Err0r403 joined06:06
← libertyprime left06:07
← thebope left06:09
→ thebope joined06:09
← noxs left06:17
← thebope left06:17
→ Sonicbit joined06:17
← xcm left06:18
→ xcm joined06:18
← mowcat left06:20
caveman → cavetorque06:22
→ mowcat joined06:23
→ omnireq joined06:25
→ omnireq_ joined06:28
← omnireq left06:29
→ envex joined06:29
→ Sonicbit_ joined06:32
cavetorque → caveman06:32
← sidetrack left06:32
← Sonicbit left06:35
← Sonicbit_ left06:37
→ juancri joined06:39
← mowcat left06:40
→ sidetrack joined06:41
→ thebope joined06:43
← omnireq_ left06:45
← sidetrack left06:46
← thebope left06:50
← wildlander left06:51
→ hussam joined06:59
← Goplat left07:00
← mat001 left07:02
← dtux left07:06
→ snowkidimd joined07:08
→ dtux joined07:09
← dtux left07:10
← jelmer left07:13
→ jelmer joined07:14
→ thebope joined07:17
← chiastre left07:21
← thebope left07:22
→ chiastre joined07:24
← jetchisel left07:26
→ roadie joined07:28
→ jetchisel joined07:28
← jetchisel left07:33
← tryte left07:39
→ tryte joined07:40
← maryo_t left07:54
← howdoi left07:56
← Heirlung left08:03
← juancri left08:09
→ Heirlung joined08:09
→ clime joined08:12
→ feriman joined08:16
→ maryo_t joined08:20
← maryo_t left08:20
→ thebope joined08:32
← thebope left08:37
→ dartmouthed joined08:39
← orbyt_ left08:44
→ Lucas_Gray joined08:45
→ lxb joined08:45
← lxb left08:46
→ lxb joined08:46
← lxb left08:46
→ AlexApps99 joined08:47
← AlexApps99 left08:47
→ AlexApps99 joined08:47
← oatmealraisin left08:47
← AlexApps99 left08:48
→ AlexApps99 joined08:48
← roadie left08:52
← ferdna left09:00
← dedowsdi left09:05
→ dedowsdi joined09:08
← AlexApps99 left09:08
→ Gloomeveryday joined09:18
Gloomeveryday Hi, I'm a newbie to git. Any advice? I'm going to setup a GitLab server in an LXC container.09:18
→ Fernando-Basso joined09:21
→ jetchisel joined09:25
j416 Gloomeveryday: try and see™09:28
Gloomeveryday: !book09:28
gitinfo Gloomeveryday: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable09:28
Gloomeveryday Ah, I see.09:28
j416 Gloomeveryday: I'd start without the server.09:28
→ sz0 joined09:28
← clime left09:30
→ KnoP joined09:31
← dedowsdi left09:41
→ dedowsdi joined09:42
← Err0r403 left09:50
← dedowsdi left09:52
→ dedowsdi joined09:53
→ gareppa joined09:55
← gareppa left09:56
← Lucas_Gray left09:58
← luckman212_ left10:00
→ luckman212 joined10:00
→ Lucas_Gray joined10:04
→ Borkr joined10:05
→ xelxebar joined10:08
Gloomeveryday What's the difference between GitLab and other solutions, like Gitea? I'm going to install GitLab in an LXC container.10:09
→ omnireq joined10:13
→ duderono_ joined10:17
← duderonomy left10:20
→ omnireq_ joined10:20
← bookworm left10:20
← Lucas_Gray left10:21
← omnireq left10:21
← feriman left10:23
R2robot You'll just have to do a side by side feature comparison for yourself.10:24
→ feriman joined10:24
→ kleisli joined10:30
→ thebope joined10:33
← thebope left10:37
← raven-au left10:38
→ bookworm joined10:38
← Hello71 left10:39
→ rsrx joined10:40
→ raven-au joined10:42
→ Hello71 joined10:46
→ raven-au_ joined10:47
← raven-au left10:48
raven-au_ → raven-au10:48
→ leeN joined10:50
← raven-au left10:52
→ weird_error joined11:08
→ Lucas_Gray joined11:08
← kleisli left11:14
← rsrx left11:19
→ troulouliou_dev joined11:23
→ theoceaniscool joined11:23
→ jstein joined11:24
← dedowsdi left11:27
→ dedowsdi joined11:29
← g00s left11:29
→ raven-au joined11:30
→ CCR5-D32 joined11:32
→ raven-au_ joined11:36
← dedowsdi left11:36
← raven-au left11:37
→ dedowsdi joined11:37
→ raven-au joined11:39
Gloomeveryday Trying out gitea since I had error messages during the install.11:41
gitea seems nice. Running in an LXC container.11:41
Gotta love mariadb-server everyday11:41
← raven-au_ left11:41
→ m0viefreak joined11:43
← dedowsdi left11:44
← weird_error left11:44
← APic left11:49
→ weird_error joined11:50
← NODE left11:51
→ NODE joined11:52
← KnoP left11:53
→ raven-au_ joined11:56
→ Jitta joined11:56
← raven-au left11:58
raven-au_ → raven-au11:58
← ephemer0l left12:07
← dartmouthed left12:08
← vishal left12:09
→ no_gravity joined12:13
→ vishal joined12:13
no_gravity If there was a huge file in the repo (by accident) up to a certain commit, is it possible to delete that file from the repo history so it takes less space on disk?12:14
BtbN yes, but it will completely rewrite history, so nobody can normaly pull anymore12:16
no_gravity BtbN: Really? Why that?12:17
BtbN Because you rewrote history12:17
no_gravity What would happen if I locate versions of the file in question in the .git dir and rm it?12:17
BtbN The repository would break12:17
no_gravity What does that mean?12:18
BtbN Uhm, that it's broken and cannot be worked with anymore.12:18
no_gravity Which command would fail for example?12:18
BtbN I'd expect most if not all of them to fail if you damage the repository like that.12:18
no_gravity I doubt that..12:19
Why would git check ages old objects on everyday commands.12:19
BtbN Once you commit and push something, it's permanently part of that history. You can rewrite history, but that requires force pushing and will make other people working on the code hate you12:19
no_gravity That would be a different approach.12:20
BtbN Because of how the repository works. It uses delta compression and combines stuff to packs. It _will_ break if you mess around in its internals by deleting files.12:21
Either you accept that file being there, or you rewrite history.12:21
no_gravity Well, lets do it and see if it breaks commands.12:21
→ dedowsdi joined12:21
BtbN ...12:21
If you only want to reduce the size of your local clone, do a shallow clone.12:22
no_gravity So "git status" still works.12:22
Which command might break?12:22
BtbN Any one of them once it comes accross the pack file that you deleted and it's not there.12:22
no_gravity cloning also still works.12:23
BtbN Well obviously, if you re-clone it, it's back.12:23
no_gravity I mean cloning from the modified repo where I delete the object.12:23
BtbN No, that's not gonna work, because cloning transfers every single object12:24
no_gravity It worked. I just did it.12:24
BtbN Yeah, no, that's impossible.12:24
no_gravity Well, its easy to test. And I just tested it.12:24
BtbN So you're telling me you just cloned a file to your local PC that you deleted off the server? I have some trouble beliving that.12:25
no_gravity The file is gone in the cloned repo as well of course.12:25
BtbN unlikely, since clone transfers the full history12:25
no_gravity Well, you can easily try it. I did.12:25
BtbN sure...12:26
Have fun with your messed up repo then if you know better.12:26
j416 cloning will only fetch reachable objects and is an easy way to get rid of data-to-be-gc'd before it gets gc'd12:26
BtbN Sounds very reachable to me12:26
j416 in that case it's easy to test12:27
git cat-file -t <hash>12:27
BtbN If it wasn't reachable, it wouldn't have been cloned in the first place.12:27
j416 or so12:27
← dedowsdi left12:28
no_gravity j416: The file was reachable. Its a file that was in the repo up to certain commit. And then we put it into .gitignore.12:28
j416 didn't read the backlog; removing an object from the repo by manually deleting it from .git/objects/ is a terrible idea12:29
don't do it12:29
no_gravity j416: Well, I just did.12:29
j416 glhf12:29
now try git fsck --full12:29
what BtbN says makes sense.12:30
no_gravity j416: "git fsck --full" reports it as "missig blob"12:30
j416 yeh12:30
BtbN Next time someone else pushes it will be back probably12:30
j416 now try checking out a commit that has that file12:30
no_gravity What would be a "cleaner" way of removing all versions of the file from the repo?12:30
j416 by cleaner I suppose you mean correct12:31
BtbN squash all commits that have it into the first one that does not. Or do a filter-branch that removes it from every commit12:31
j416 filter-branch, rebase, or so12:31
nod12:31
no_gravity You can delete the history of a file with filter-branch?12:32
j416 yes12:32
no_gravity How so?12:32
BtbN By rewriting the entire history of the repository12:32
j416 man git-filter-branch12:32
gitinfo the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html12:32
j416 look for tree filter12:32
BtbN Will require a force-push and every other user will have to manually fix their clone12:32
→ thebope joined12:33
no_gravity BtbN: Thats no problem.12:33
j416 !backup seems appropriate now12:33
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/#backups12:33
BtbN It's probably to late for a backup at this point if there is none already12:34
← Borkr left12:34
j416 nod12:34
I'd try to get that blob back first12:34
no_gravity Thats not a problem either.12:35
Looks simple on first sight: git filter-branch --tree-filter 'rm filename' HEAD12:35
j416 something like that12:35
you'll learn that you need to tweak it a bit12:36
Gloomeveryday gitea is beautiful.12:36
I'm loving the dark theme.12:36
j416 also, you need to run it on all branches you care to remove it from and also all taga12:36
tags*12:36
Gloomeveryday I'm new to git though.12:36
no_gravity j416: There only is one branch, master.12:37
j416 wasn't gitea the thing that bugged out recently; can't remember the detaiis12:37
no_gravity j416: Why all tags?12:37
j416 no_gravity: great12:37
no_gravity: because otherwise the file would be part of the tags?12:37
no_gravity j416: Tags are like branches?12:38
j416 tags reference commits, and you're replacing your commits with new ones and so you'd need to update the tags12:38
no_gravity: similar to branches yes12:38
← thebope left12:38
j416 tags don't move like branch pointers and you can't check them out12:39
no_gravity "The difference between tags and branches are that a branch always points to the top of a development line and will change when a new commit is pushed whereas a tag will not change"12:39
Aha12:39
j416 (when you do "git checkout yourtag", you'll get the underlying commit)12:40
→ mowcat joined12:41
no_gravity Ok. Thanks for all the great info. Gotta go now.12:41
← no_gravity left12:41
← andreas31 left12:42
← jaziz left12:44
← causasui left12:44
→ andreas31 joined12:45
← leeN left12:47
← weird_error left12:48
→ leeN joined12:59
→ dartmouthed joined13:08
← Lucas_Gray left13:10
→ Lucas_Gray joined13:11
→ igemnace joined13:11
→ howdoi joined13:12
→ jess joined13:15
→ APic joined13:20
→ tango_ joined13:24
→ aw1 joined13:33
→ cdown_ joined13:35
← cdown left13:36
cdown_ → cdown13:36
← bvdw left13:37
→ bvdw joined13:37
← dviola left13:41
→ brunocarvalho joined13:42
← Eryn_1983_FL left13:43
→ Wetmelon joined13:48
→ thebope joined13:50
← thebope left13:50
→ thebope joined13:50
→ lucasb joined13:52
→ Eryn_1983_FL joined13:54
← thebope left13:58
← Fernando-Basso left13:59
→ Brainium joined14:08
← random_yanek left14:08
→ donofrio joined14:09
→ roadie joined14:11
→ random_yanek joined14:15
→ HumanGeek joined14:19
← fphilipe_ left14:21
← rustyshackleford left14:21
→ AtumT joined14:22
← Human_G33k left14:22
→ magic_ninja_work joined14:24
→ fphilipe_ joined14:26
← fphilipe_ left14:31
→ cfoch joined14:32
→ thebope joined14:33
→ kleisli joined14:35
→ nwoob joined14:39
nwoob To gitignore a file which is already pushed in repo we can delete the file and then add it to .gitignore14:40
or git rm --cached filename14:41
what's the difference between those to way?14:42
*two14:42
← thebope left14:43
selckin it stages the delete without having to delete the file14:46
nwoob but if someone else pulls then their file will be deleted from local, correct?14:47
→ darkbit joined14:47
selckin yes14:48
← kleisli left14:49
→ omega_doom joined14:49
nwoob is there a way so that file gets ignored but not delete when other people pulls14:50
selckin don't think so14:51
they can just restore it from the repo, so its not that big of a deal14:51
nwoob ok14:52
omega_doom hello. How does git determines if merge has been in the process? In other words how it determines that "merge --continue" needs to be resulted in a new commit?14:52
selckin state stored in .git dir14:53
→ butterthebuddha joined14:55
→ weird_error joined14:55
→ fphilipe_ joined14:59
→ sidetrack joined15:01
omega_doom @selckin: What state? How can i see what is in process now?15:01
← theoceaniscool left15:02
→ dviola joined15:02
upcrime → CocaineMitch15:03
← sidetrack left15:05
← fphilipe_ left15:06
← xcm left15:06
→ xcm joined15:06
→ gareppa joined15:09
← omega_doom left15:10
→ omega_doom joined15:15
→ theoceaniscool joined15:21
→ gnstaxo joined15:35
← Helenah left15:36
→ fphilipe_ joined15:37
← weird_error left15:37
→ Helenah joined15:37
← troulouliou_dev left15:42
← fphilipe_ left15:42
→ pinpox joined15:43
→ javashin joined15:47
← theoceaniscool left15:49
→ theoceaniscool_ joined15:50
→ fphilipe_ joined15:50
← Cabanossi left15:51
→ maryo joined15:52
→ Cabanossi joined15:55
← fphilipe_ left15:57
← NODE left15:59
→ NODE joined16:00
← xcm left16:04
→ xcm joined16:04
→ weird_error joined16:06
→ AtumT_ joined16:08
← AtumT left16:11
← aw1 left16:13
osse omega_doom: afaik is the clue is that .git/MERGE_HEAD exists16:17
→ AtumT joined16:22
← AtumT_ left16:22
→ jim joined16:24
← sz0 left16:28
→ raven-au_ joined16:28
→ fphilipe_ joined16:28
← raven-au left16:29
raven-au_ → raven-au16:29
← NODE left16:35
← Piraty left16:36
→ NODE joined16:36
← ndim left16:39
→ thebope joined16:40
← fphilipe_ left16:40
→ kleisli joined16:41
→ fphilipe_ joined16:43
← maryo left16:44
← thebope left16:45
← Kaivo left16:45
→ Piraty joined16:49
← cfoch left16:52
→ raven-au_ joined16:53
→ ferdna joined16:54
← roadie left16:54
→ archer121 joined16:54
← raven-au left16:55
raven-au_ → raven-au16:55
→ thebope joined16:55
← apathor left16:56
← gareppa left16:58
← misuto left16:59
→ maryo joined17:01
← fphilipe_ left17:03
→ nowhere_man joined17:04
← barteks2x left17:12
CocaineMitch → Hoffmachine17:12
← Jackneill left17:12
→ orbyt_ joined17:14
→ Jackneill joined17:16
→ rustyshackleford joined17:19
← butterthebuddha left17:22
← archer121 left17:26
← javashin left17:28
→ blackandblue joined17:31
→ fphilipe_ joined17:34
← igemnace left17:42
→ igemnace joined17:43
← syr left17:44
→ syr joined17:45
← Lucas_Gray left17:56
→ ndim joined17:59
→ regedit joined18:04
→ Fernando-Basso joined18:06
← nwoob left18:09
→ irrgit joined18:10
→ kryptonunited joined18:12
← blackandblue left18:16
← xcm left18:16
→ xcm joined18:18
← weird_error left18:19
← kreyren left18:19
→ kreyren joined18:19
← kryptonunited left18:20
← Ignacy left18:24
→ dtux joined18:29
← mowcat left18:31
→ mowcat joined18:34
→ emmanuelux joined18:35
→ weird_error joined18:36
← dviola left18:37
→ Ignacy joined18:37
→ Phylock joined18:43
← crose left18:44
← justanotheruser left18:44
← irrgit left18:47
→ clime joined18:47
← Ignacy left18:47
← localhorse left18:51
→ justanotheruser joined18:52
→ Err0r403 joined19:00
← maryo left19:04
← xcm left19:04
→ xcm joined19:05
→ Advant joined19:05
Advant Can someone help me what would be the correct process in this scenario. At this point I only have a master branch. I tagged a commit that up to that point ultimately represents my 2018 version. I'm now still working on the master which to this point represents my 2019 release. If I need to back port a change on the 2018 version and have that change available to any of the commits through the19:08
2019 code portion, how should I do that? Also is a tag a sufficient representation or should have I actually created branches for 2018 and 2019 instead of just tagging on the master19:08
→ Ignacy joined19:09
← snowkidimd left19:10
osse Advant: tagging to mark spescific versions is fine. what you should do is commit the change on master, then cherry-pick it to wherever you need it19:10
Advant ah, ok I got it/ Should have asked here before I messed around19:12
← dtux left19:13
Hoffmachine → duckgoose19:17
duckgoose → Guest717319:19
Guest7173 → Hoff19:19
← theoceaniscool_ left19:22
← fphilipe_ left19:30
← kleisli left19:32
→ dtux joined19:32
← bvdw left19:37
→ bvdw joined19:38
→ g00s joined19:38
← xcm left19:42
→ xcm joined19:43
→ dmtucker joined19:49
← emmanuelux left19:49
← dtux left19:50
sauvin → Boc19:50
→ irrgit joined19:52
→ oatmealraisin joined19:53
← omega_doom left19:54
→ Narrat joined19:55
← puff` left20:01
→ misuto joined20:14
← theorangeone left20:21
← misuto left20:21
← dmtucker left20:23
→ theorangeone joined20:23
→ Lucas_Gray joined20:23
→ dtux joined20:27
← gnstaxo left20:41
→ waveclaw joined20:42
← regedit left20:43
→ gnstaxo joined20:44
→ fphilipe_ joined20:45
→ sidetrack joined20:50
Hoff → \\\\\\\\\\\\\\20:52
← Lucas_Gray left20:54
← dtux left20:57
← jess left20:58
← xcm left20:58
→ xcm joined20:59
← oatmealraisin left20:59
← AtumT left21:00
← shored left21:00
→ shored joined21:01
→ Lucas_Gray joined21:04
← feriman left21:11
→ kleisli joined21:14
← Err0r403 left21:15
→ AtumT joined21:17
← nowhere_man left21:19
← fphilipe_ left21:19
← Lucas_Gray left21:26
→ royal_screwup21 joined21:28
→ lainon joined21:28
← Nokurn left21:29
→ Lucas_Gray joined21:29
→ barteks2x joined21:32
→ AlexApps99 joined21:35
← AlexApps99 left21:35
← xcm left21:37
→ xcm joined21:37
→ fstd_ joined21:40
→ oatmealraisin joined21:41
← fstd left21:44
fstd_ → fstd21:44
← SpeakerToMeat left21:46
← Narrat left21:48
← Lucas_Gray left21:50
← oatmealraisin left21:52
→ Lucas_Gray joined21:52
→ AlexApps joined21:56
→ cd joined21:58
← Jitta left21:58
← AlexApps left21:58
← sidetrack left22:05
→ tryte_ joined22:07
← tryte left22:09
← xcm left22:12
→ oatmealraisin joined22:13
→ xcm joined22:13
← kleisli left22:15
← Bagira left22:18
← foul_owl left22:19
→ foul_owl joined22:20
← oatmealraisin left22:20
→ mononote joined22:22
mononote hello, I want to do a merge with no ff, editing the commit message but I would like to have a list of the edited files in a comment below in the same way as I have it when doing a normal commit, is that possible?22:22
← CCR5-D32 left22:24
→ mikecmpbll joined22:26
→ kleisli joined22:28
\\\\\\\\\\\\\\ → Hoffman22:30
← irrgit left22:30
→ Nokurn joined22:40
→ mat001 joined22:49
mononote so essentially I wanted to do --no-ff & --no-commit, nm22:49
← theorangeone left22:50
→ theorangeone joined22:50
← lucasb left22:51
← Neurognostic left22:54
← kleisli left22:56
→ dtux joined22:57
← dtux left23:02
→ puff` joined23:07
← Phylock left23:14
← NODE left23:15
→ oatmealraisin joined23:16
→ NODE joined23:16
→ sidetrack joined23:17
← gnstaxo left23:18
← mikecmpbll left23:20
← igemnace left23:24
→ dedowsdi joined23:25
→ jaziz joined23:26
→ CCR5-D32 joined23:26
→ irrgit joined23:27
← puff` left23:27
→ puff` joined23:27
← royal_screwup21 left23:28
← sidetrack left23:33
→ OnkelTem joined23:35
OnkelTem Hi all23:35
This command doesn't work on server: git diff --name-status master..23:35
fatal: ambiguous argument 'master..': unknown revision or path not in the working tree.23:35
Git version 2.1123:35
On my local machine git version is 2.1723:36
So do I get that error because of the outdated git on the server?23:36
← puff` left23:37
OnkelTem Or... I have to checkout first maybe. But I guess it must be the current branch23:37
← vicfred left23:38
OnkelTem Oh my god, it's gonna break everything, dumbass23:40
it clones only one branch23:40
Ok, so here is the real question then: if a repository was cloned with --branch option, how to add a new branch now, e.g. master?23:41
← NODE left23:44
→ NODE joined23:45
← Benett left23:46
← brunocarvalho left23:46
→ Benett joined23:47
→ puff` joined23:48
← puff` left23:50
→ puff` joined23:50
← Benett left23:55
→ Benett joined23:55

Logs Search ←Prev date Next date→ Channels Documentation