| 2019-08-23 |
| ← de-facto left | 00:01 |
| → de-facto joined | 00:01 |
| ← hussam left | 00:02 |
| ← m0viefreak left | 00:04 |
| → stitched_unicorn joined | 00:05 |
| ← random_yanek left | 00:05 |
| ← lankanmon left | 00:07 |
| → CarlFK joined | 00:08 |
|
rafasc
| jadax: are master is correct here: git push master? HEAD:refs/for/master ? | 00:09 |
| ← jcbitter left | 00:09 |
|
jadax
| sorry, should be git push remote HEAD:refs/for/master | 00:09 |
|
rafasc
| you probably meant your remote. But in any case, it should be the same. | 00:09 |
|
jadax
| so regardless of whether I'm on the branch or in detached HEAD state, the push command would always be the same? | 00:10 |
| → jcbitter joined | 00:10 |
|
rafasc
| yes. the part HEAD:refs/for/master, is called a refspec and is basically a push instruction. | 00:11 |
| → libertyprime joined | 00:11 |
|
jadax
| would it work if I did git push remote master:refs/for/master ? | 00:11 |
|
rafasc
| meaning make refs/for/master in the remote point to the commit my local HEAD is pointing. | 00:11 |
|
jadax
| for simple local master to remote master push | 00:11 |
|
rafasc
| jadax: yes. That's the gist of it. | 00:12 |
|
jadax
| I see | 00:12 |
| ← mowcat left | 00:12 |
|
rafasc
| jadax: you can also delete branches on the remote by pushing nothing to it: git push remote :ref/to/be/deleted | 00:12 |
|
jadax
| that's dangerous | 00:12 |
| ← bluezone left | 00:12 |
|
rafasc
| git push remote :master; would delete master on the remote. | 00:13 |
|
| thought I would mention it in case you were doing things like push remote $VAR:ref/bla/bla | 00:13 |
|
jadax
| thanks | 00:14 |
|
CarlFK
| help? http://paste.ubuntu.com/p/YndYtrM2GD/ error: inflate: data stream error (incorrect header check) | 00:14 |
|
rafasc
| CarlFK: corrupt object :/ | 00:16 |
| ← dege left | 00:17 |
|
rafasc
| do you have another clone of the project? where git cat-file -p 4648502e38141ece2fdc9fdae19c007019557409 succeds? | 00:17 |
|
CarlFK
| probably - gh is pretty up to date.. let me clone it somewhere | 00:18 |
| ← Emperor_Earth left | 00:20 |
|
CarlFK
| http://paste.ubuntu.com/p/nd7VYvscBG/ it's the root dir | 00:20 |
| → Bobdude joined | 00:21 |
| → drbean joined | 00:23 |
| ← drbean_ left | 00:25 |
|
rafasc
| hmmm. it's at tree object.. I think you'll need to unpack it... | 00:26 |
| → lankanmon joined | 00:26 |
| → drbean_ joined | 00:28 |
|
rafasc
| CarlFK: have you try running git fsck? | 00:29 |
|
CarlFK
| no. neat. didn't know that was a thing | 00:30 |
| ← drbean left | 00:31 |
|
rafasc
| on your new clone how many files do you have on .git/objects/pack ? | 00:31 |
|
CarlFK
| 2 carl@twist:~/temp/veyepar$ ls .git/objects/pack; pack-e53ea3ef2ff5418ec61a831709b60065b3147fa8.idx pack-e53ea3ef2ff5418ec61a831709b60065b3147fa8.pack | 00:32 |
|
rafasc
| If that's the only corrupt object, git unpack-objects < pack-<some-hash>.pack | 00:32 |
| → diogenese joined | 00:32 |
|
rafasc
| that should recreate the file at .git/objects/e5/3ea.... | 00:33 |
|
| copy it to the other repo. | 00:33 |
|
| rinse and repeat | 00:33 |
|
CarlFK
| how do I cp .git? (trying to make a backup in ~/temp | 00:34 |
|
rafasc
| !backup | 00:34 |
|
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/#backups | 00:34 |
|
CarlFK
| oh.. my fault.. not enough ..'s | 00:35 |
|
rafasc
| I think you could also tranfers the .pack files and run git repack, but I can't remember how exactly. | 00:36 |
|
CarlFK
| git fsck http://paste.ubuntu.com/p/nMKghhqQBX/ | 00:37 |
|
rafasc
| I think with -ad, but not sure. It's been a while since I experienced corruption. | 00:37 |
| ← greatgatsby left | 00:37 |
|
rafasc
| That's just 5 commits, doable if they're in the other repo. | 00:38 |
| ← pie_ left | 00:39 |
| ← duderonomy left | 00:40 |
| → beastDiv_ joined | 00:43 |
| ← libertyprime left | 00:43 |
|
CarlFK
| my new clone does | 00:47 |
|
jadax
| how many clones do you have? | 00:47 |
|
CarlFK
| my new clone does' have .git/objects/?? | 00:47 |
|
rafasc
| No, new clones have the objects in a packfile. | 00:48 |
|
| you need to run $git unpack-objects <.git/objects/pack/pack-<some-hash>.pack | 00:49 |
| ← lungaro left | 00:49 |
|
CarlFK
| I have my original, a copy in temp/-borked and a clone from gh in temp/-good | 00:49 |
| → lungaro joined | 00:49 |
| ← finalbeta left | 00:50 |
| Guest459543 → effprime | 00:50 |
|
rafasc
| go to temp/-good and run the unpack-objects I mentioned. | 00:50 |
|
CarlFK
| ~/temp/veyepar-good$ git unpack-objects < .git/objects/pack/pack-e53ea3ef2ff5418ec61a831709b60065b3147fa8.pack | 00:50 |
|
| Unpacking objects: 100% (17382/17382), done. | 00:50 |
|
| temp/veyepar-good$ ls .git/objects/ -> info pack | 00:51 |
|
rafasc
| then transfer the offending objects to your original | 00:51 |
|
CarlFK
| I stil don't see .git/objects/?? | 00:52 |
|
rafasc
| hmm. Sorry, my mistake... | 00:53 |
|
| copy that .pack file to your original repo. | 00:53 |
|
| then try git repack -a | 00:53 |
|
CarlFK
| ls veyepar-bork/.git/objects/pack/ has 5 sets of idx/pack and none have the same hash http://paste.ubuntu.com/p/GmKRms4MXD/ | 00:57 |
|
| is that ok? | 00:58 |
|
| I haven't done the repack yet | 00:58 |
|
rafasc
| or alternatively, move that *.pack file out of the pack directory, and run unpack | 00:58 |
|
| mv .git/objects/pack/pack-e53ea3ef2ff5418ec61a831709b60065b3147fa8.pack /tmp/git.pack | 00:59 |
|
| then $git unpack-objects </tmp/git.pack | 00:59 |
|
| CarlFK: yes, that is to be expected. | 01:00 |
|
| CarlFK: and after the repack, you'll probably will get just one. | 01:01 |
|
CarlFK
| in stead of moving to /tmp, this is ok? temp/veyepar-bork$ git unpack-objects < ../veyepar-good/.git/objects/pack/pack-e53ea3ef2ff5418ec61a831709b60065b3147fa8.pack | 01:01 |
| → Giant81 joined | 01:03 |
|
rafasc
| Not sure if that'll work. | 01:03 |
| → Giszmo joined | 01:03 |
|
rafasc
| because you have the objects, they just happen to be corrupt. | 01:03 |
|
CarlFK
| how is that differnt from mv ... /tmp; git unpack.. ? | 01:04 |
|
| pack-e53 is from the fresh clone I just made | 01:04 |
|
rafasc
| because if you move the pack away from the good repo, it will unpack everything. | 01:04 |
|
CarlFK
| ah | 01:04 |
|
rafasc
| but if you try to unpack inside bork, it may check that it already has those objects, and skip the unpack. | 01:05 |
|
| so your files remain corrupt. | 01:05 |
|
CarlFK
| oh, I thought $git unpack-object was done in -borked - I get it now | 01:07 |
| → freeman42y joined | 01:08 |
|
CarlFK
| ok, that woked | 01:09 |
|
rafasc
| run fsck again to make sure | 01:11 |
|
| maybe with --full even, | 01:11 |
| ← freeman42x left | 01:11 |
| ← Sasazuka left | 01:14 |
|
CarlFK
| i've only create the ?? dirs with veyepar-good$ git unpack-objects < /tmp/pack-e53ea3ef2ff5418ec61a831709b60065b3147fa8.pack | 01:15 |
|
| git fsck - Checking object directories: 100% (256/256), done. (no errors) | 01:15 |
| ← ghormoon left | 01:18 |
| ← dartmouthed left | 01:18 |
|
CarlFK
| -borked git fsck http://paste.ubuntu.com/p/nMKghhqQBX/ (from before) do I cp .git/objects/3c/69dbd55866477120ad44062b1a113e161b8a34 from -good and then ... ok, im lost | 01:18 |
|
rafasc
| CarlFK: in your borked, run fsck like before. | 01:20 |
|
CarlFK
| I haven't changed anything in it yet | 01:21 |
|
rafasc
| does it complain about unable to unpack header of .git/objects/3c/69dbd55866477120ad44062b1a113e161b8a34 ? | 01:21 |
| → fairuz joined | 01:21 |
|
rafasc
| if yes, transfer that 3c/69db from good to borked. Do that for every commit. | 01:21 |
| ← beastDiv_ left | 01:22 |
| → ghormoon joined | 01:24 |
| → thiago joined | 01:25 |
| ← iam730 left | 01:27 |
|
CarlFK
| git repack -a ... fatal: unable to read 94595a5a2c884ebec2799e0ee27e02561b28734f | 01:28 |
|
| | 01:28 |
| ← BonusPlay left | 01:28 |
|
CarlFK
| which is the 2nd in broken link from tree 687d8ffd28d5b7616f46affbd82c326a671ac4c7 to blob 94595a5a2c884ebec2799e0ee27e02561b28734f | 01:28 |
| → BonusPlay joined | 01:28 |
|
rafasc
| is 94/59... in the good repo? | 01:29 |
| ← misuto left | 01:29 |
| ← daurnimator left | 01:29 |
|
rafasc
| I think, going the git-repack route is probably easier. | 01:30 |
|
CarlFK
| no hits: veyepar-good$ find .git/ -name 94595a5a2c884ebec2799e0ee27e02561b28734f | 01:30 |
|
rafasc
| If this works: https://git-annex.branchable.com/tips/recovering_from_a_corrupt_git_repository/ | 01:30 |
|
| CarlFK: that doesn't work like that. Because objects are stored in directories | 01:30 |
|
| 94595a5a2c884ebec2799e0ee27e02561b28734f will be at 94/595a5a2c884ebec2799e0ee27e02561b28734f | 01:31 |
|
CarlFK
| ah | 01:31 |
| ← kegster left | 01:31 |
| → kegster joined | 01:32 |
|
CarlFK
| then yes, I have -good .git/objects/94/595a5a2c884ebec2799e0ee27e02561b28734f | 01:32 |
|
rafasc
| CarlFK: I think the link I posted is worth a try, on a separate copy. | 01:32 |
|
| as it will be much easier than copying everything manually, if you have lots of corrupted files. | 01:32 |
|
CarlFK
| that might be the last one | 01:33 |
| ← kezimo left | 01:33 |
|
rafasc
| CarlFK: the problem is that if the corrupt object was a tree, it stopped the transversal. | 01:34 |
|
| and now that you recovered it, it can progress further into finding more corrupt objects. | 01:34 |
| → kezimo joined | 01:34 |
|
CarlFK
| how does this look http://paste.ubuntu.com/p/zb6gSjnSss/ | 01:36 |
| ← wildlander left | 01:37 |
| → cd joined | 01:38 |
|
rafasc
| CarlFK: looks good | 01:38 |
|
CarlFK
| yay! | 01:38 |
|
| thank you for all your time | 01:39 |
| ← BonusPlay left | 01:39 |
| → BonusPlay joined | 01:39 |
|
rafasc
| yw | 01:40 |
| ← Giszmo left | 01:41 |
| → beastDiv_ joined | 01:44 |
| ← diogenese left | 01:52 |
| → Giszmo joined | 01:52 |
| → keepLearning512 joined | 01:56 |
| → daurnimator joined | 01:56 |
| → Goplat joined | 02:00 |
| ← F0rTex left | 02:00 |
| → F0rTex joined | 02:01 |
| → misuto joined | 02:02 |
| ← lankanmon left | 02:02 |
| ← Enphuego left | 02:09 |
| → neightchan joined | 02:09 |
| → diogenese joined | 02:25 |
| ← beastDiv_ left | 02:26 |
| ← causa_sui left | 02:27 |
| → beastDiv_ joined | 02:29 |
| → duderonomy joined | 02:39 |
| ← lagothrix left | 02:44 |
| → lagothrix joined | 02:44 |
| ← stitched_unicorn left | 02:45 |
| → nabil_ joined | 02:45 |
| ← Giszmo left | 02:48 |
| → is_null_1 joined | 02:49 |
| ← is_null__ left | 02:49 |
| ← is_null_ left | 02:49 |
| ← beastDiv_ left | 02:50 |
| → lankanmon joined | 02:50 |
| → finalbeta joined | 02:51 |
| ← rafasc left | 02:58 |
| ← kneeki left | 03:04 |
| → tempate joined | 03:05 |
|
tempate
| Hello. I am having trouble pushing a commit to git. https://bpaste.net/show/zWqQ | 03:06 |
|
| I have removed the vgcore file from src but the problem remains | 03:06 |
|
Ori_B
| hm, is there any documentation on the format of a patch exported with git-format-patch? | 03:07 |
|
| especially around what happens with merge commits. | 03:07 |
| → Giszmo joined | 03:08 |
|
CarlFK
| tempate: I'm guessing it is still in your commit history | 03:10 |
|
tempate
| CarlFK: yes, but I don't know how to remove it | 03:10 |
|
CarlFK
| (don't ask me how to remove it.. im not great.. yeah, that. | 03:10 |
|
tempate
| oh, aite | 03:11 |
|
CarlFK
| https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History "or change the actual content of the commit by adding, removing and modifying files" | 03:12 |
|
| did you git rm vgcore ? | 03:12 |
|
tempate
| it says it doesn't match any files | 03:14 |
|
| I am not sure why | 03:14 |
|
CarlFK
| did you just rm the file? | 03:14 |
|
tempate
| nope | 03:15 |
|
| It says "fatal: pathspec 'vgcore' did not match any files" | 03:15 |
|
CarlFK
| what do you mean by "I have removed the vgcore file from src " | 03:15 |
|
| btw - when I ask if you have done something, that is a question, not advice | 03:16 |
|
tempate
| noted | 03:16 |
|
| I meant I had removed the file from the system, not from git's history | 03:16 |
|
CarlFK
| pretty sure you want to put it back, then use "git rm" to remove it from the fs and git, but im not really sure where you are at now in regards to " don’t amend your last commit if you’ve already pushed it." | 03:18 |
|
tempate
| I can't unremove it though | 03:19 |
|
| it's probably too late for that | 03:19 |
|
| isn't there a way to just cancel the commit? | 03:19 |
|
CarlFK
| (pre-receive hook declined) sounds like you didn't really push | 03:19 |
|
tempate
| nope, I didn't really push | 03:20 |
| → causa_sui joined | 03:20 |
|
CarlFK
| try: git checkout src/vgcore.24272 | 03:20 |
| → beastDiv_ joined | 03:20 |
|
tempate
| pathsec did not find any file known to git | 03:21 |
| ← Aelius left | 03:22 |
|
CarlFK
| is this the dir/file name that you deleted? src/vgcore.24272 | 03:23 |
| → nabil__ joined | 03:23 |
|
tempate
| yes | 03:23 |
|
CarlFK
| well.. if you committed it (which you did else you wouldn't get the error) you can restore it over whatever change you made (like deleting it) | 03:24 |
| → Aelius joined | 03:25 |
| ← bn_work left | 03:25 |
| ← nabil_ left | 03:27 |
|
supernovah
| is there a way to get a terse list of untracked files | 03:27 |
|
CarlFK
| git status ? | 03:27 |
| ← Giszmo left | 03:28 |
| ← beastDiv_ left | 03:28 |
|
supernovah
| for external processing though | 03:30 |
| ← Tawonga left | 03:30 |
|
preaction
| git status --porcelain | 03:30 |
|
supernovah
| tyty | 03:31 |
|
tempate
| CarlFK: how can I? | 03:31 |
| → raatiniemi joined | 03:31 |
|
tempate
| can't I just remove the whole commit and start over? | 03:31 |
|
CarlFK
| probably. I don't know how | 03:32 |
| → Tawonga joined | 03:32 |
| ← neightchan left | 03:39 |
| → nabil_ joined | 03:42 |
| ← diogenese left | 03:43 |
| → libertyprime joined | 03:43 |
| ← nabil__ left | 03:45 |
| → neightchan joined | 03:49 |
| → beastDiv_ joined | 03:50 |
| ← Freshnuts left | 03:55 |
| ← lankanmon left | 03:57 |
| → lankanmon joined | 03:58 |
|
CarlFK
| git status --untracked-files=no does what I want. how do I do that with -u? | 04:01 |
|
| git status -u=no ... fatal: Invalid untracked files mode '=no' | 04:02 |
|
| ah: nvm git status -uno | 04:03 |
| ← Ekho left | 04:05 |
| ← is_null_1 left | 04:21 |
| → kneeki joined | 04:24 |
| → walbo joined | 04:26 |
| ← neightchan left | 04:28 |
| ← hellauer left | 04:29 |
| → fjellfras joined | 04:29 |
| → neightchan joined | 04:33 |
| → fphilipe_ joined | 04:37 |
| ← neightchan left | 04:39 |
| ← beastDiv_ left | 04:41 |
| ← Giant81 left | 04:42 |
| ← jaeckel left | 04:43 |
| → clime joined | 04:48 |
| → lalitmee joined | 04:51 |
| ← orbyt_ left | 04:58 |
| ← walbo left | 05:01 |
| → pks_ joined | 05:02 |
| ← pks left | 05:03 |
| pks_ → pks | 05:03 |
| pr100|afk → pr100 | 05:03 |
| → hussam joined | 05:06 |
| → dartmouthed joined | 05:06 |
| → kneeki|a joined | 05:06 |
| → neightchan joined | 05:06 |
| → jaeckel joined | 05:07 |
| ← ilmostro left | 05:07 |
| → diogenese joined | 05:09 |
| ← kneeki left | 05:10 |
| → finn0 joined | 05:11 |
| ← neightchan left | 05:12 |
| ← fairuz left | 05:13 |
| → Viking667 joined | 05:13 |
|
Viking667
| 'llo again. | 05:13 |
| → sauvin joined | 05:14 |
|
finn0
| Mistakely, I've committed a file which I don't want to. I've a solution, reset head to HEAD~1 by git reset HEAD~1 then, add only those file in staging area which have to commit. But, wonder is there any better solution present than this? | 05:18 |
|
| Means I don't have to go to my previous commit. | 05:19 |
| → JeffH joined | 05:19 |
| → pycer joined | 05:25 |
|
finn0
| *go-back | 05:26 |
| ← yonder left | 05:31 |
| ← JeffH left | 05:32 |
| → TomTom joined | 05:33 |
| → yonder joined | 05:37 |
|
igemnace
| you can git rm the file then git commit --amend | 05:40 |
|
| finn0: ^ | 05:40 |
| → neightchan joined | 05:43 |
| → orbyt_ joined | 05:47 |
|
vdl
| How can I find the merge commit which added a given file? Or even all merge commits which touched that file? | 05:48 |
| ← neightchan left | 05:48 |
| → abbiya joined | 05:49 |
|
vdl
| I can find the commit which added the file with git log --diff-filter=A -- <path> but not the merge commit which took that commit | 05:52 |
| → DWestCoast joined | 05:54 |
| ← lalitmee left | 05:55 |
| → lalitmee joined | 05:55 |
| → Sasazuka joined | 05:55 |
|
j416
| vdl: --merges | 05:56 |
| ← rewt left | 05:57 |
|
j416
| vdl: but you might mean --first-parent | 05:58 |
| → lalit joined | 05:58 |
| → rewt joined | 06:00 |
| ← lalitmee left | 06:00 |
|
vdl
| j416: doesn't work | 06:00 |
| → n3wborn joined | 06:01 |
|
vdl
| I expected git log --merges --diff-filter=A -- <path> to work but it doesn't | 06:03 |
|
| (--first-parent neither) | 06:03 |
| ← orbyt_ left | 06:04 |
| ← pycer left | 06:05 |
|
j416
| !doesntwork | 06:06 |
|
gitinfo
| Sorry to hear it doesn't work, but how about some details? At this point we don't even know whether it did nothing, spit out an error message, or abducted your pet unicorn in a flying saucer. That makes it hard to troubleshoot – unicorn abduction requires a completely different solution than an error message, for instance. So, please be specific... | 06:06 |
|
j416
| vdl: try without the --diff-filter | 06:06 |
| → crose joined | 06:10 |
| → sQVe joined | 06:14 |
| ← kjartan left | 06:14 |
| → kjartan joined | 06:16 |
| → rfuentess joined | 06:18 |
| → Noti joined | 06:19 |
| ← quizzi left | 06:22 |
| ← Sasazuka left | 06:22 |
| → random_yanek joined | 06:23 |
| → vals_ joined | 06:25 |
| → sozuba joined | 06:25 |
| ← n3wborn left | 06:26 |
| ← tango_ left | 06:28 |
| → fjellfras_ joined | 06:31 |
| ← fjellfras left | 06:32 |
| → kneeki|aa joined | 06:33 |
| → quizzi joined | 06:33 |
| → Mattiaslndstrm joined | 06:34 |
| ← kneeki|a left | 06:37 |
| ← random_yanek left | 06:38 |
| ← kegster left | 06:39 |
| → kegster joined | 06:40 |
| → mase-tech joined | 06:40 |
| ← thiago left | 06:41 |
| ← jubal left | 06:41 |
| → jubal_ joined | 06:41 |
| ← jcbitter left | 06:42 |
| → fairuz joined | 06:42 |
| → oatmealraisin joined | 06:43 |
| ← kegster left | 06:43 |
| → gareppa joined | 06:43 |
| → kegster joined | 06:44 |
| → jubal joined | 06:45 |
| ← jubal_ left | 06:45 |
| ← causa_sui left | 06:45 |
| → jcbitter joined | 06:46 |
| ← gareppa left | 06:47 |
| → neightchan joined | 06:51 |
| ← iNs left | 06:51 |
| ← jcbitter left | 06:51 |
| → iNs joined | 06:51 |
| → jcbitter joined | 06:54 |
| ← sQVe left | 06:54 |
| → sQVe joined | 06:55 |
| ← neightchan left | 06:56 |
| pr100 → pr100|afk | 06:59 |
| ← jcbitter left | 07:00 |
| ← rkta left | 07:00 |
| → rkta joined | 07:01 |
| → jcbitter joined | 07:01 |
| → TomyWork joined | 07:01 |
| ← Eryn_1983_FL left | 07:01 |
| ← clime left | 07:04 |
| ← pr100|afk left | 07:06 |
| → Giszmo joined | 07:07 |
| → random_yanek joined | 07:07 |
| → SkarmoutsosV joined | 07:07 |
| ← freeman42y left | 07:11 |
| ← fphilipe_ left | 07:14 |
| ← Giszmo left | 07:16 |
| ← Anthaas left | 07:16 |
| → Anthaas joined | 07:18 |
| ← crose left | 07:24 |
| → database2 joined | 07:24 |
| ← Wulf left | 07:25 |
| ← DWestCoast left | 07:30 |
| → fphilipe_ joined | 07:31 |
| → barteks2x_ joined | 07:33 |
| ← barteks2x left | 07:33 |
| → oxymoron93 joined | 07:33 |
| barteks2x_ → barteks2x | 07:33 |
| ← lalit left | 07:34 |
| → lungaro_ joined | 07:36 |
| → donofrio_ joined | 07:36 |
| → Ekho joined | 07:36 |
| → Nokurn_ joined | 07:36 |
| → jomo_9 joined | 07:36 |
| ← lungaro left | 07:37 |
| ← donofrio left | 07:37 |
| ← jomo_ left | 07:37 |
| ← archpc left | 07:37 |
| ← Nokurn left | 07:37 |
| ← Viking667 left | 07:37 |
| ← wagle left | 07:37 |
| → archpc joined | 07:37 |
| → wagle joined | 07:38 |
| ← database2 left | 07:38 |
| ← fjellfras_ left | 07:41 |
| → hellauer joined | 07:42 |
| ← hellauer left | 07:43 |
| ← arecaceae left | 07:48 |
| → mimajof joined | 07:48 |
| → arecaceae joined | 07:49 |
| ← yonder left | 07:51 |
| → Makaveli7 joined | 07:51 |
| ← keepLearning512 left | 07:51 |
| → stitched_unicorn joined | 07:54 |
| ← Joel left | 07:59 |
| ← stitched_unicorn left | 08:00 |
| → joebobjoe joined | 08:01 |
|
joebobjoe
| hi when I'm doing an interactive rebase am I in a detached head mode? | 08:02 |
|
| someone told me I'm not in detached head mode I'm in rebase mode | 08:02 |
|
_ikke_
| during the rebaes you are certainly in a detached HEAD state | 08:03 |
|
joebobjoe
| knew they were a dumb fucker | 08:05 |
|
| thanks | 08:05 |
| → Joel joined | 08:06 |
|
dodobrain
| lol | 08:15 |
| ← is_null left | 08:15 |
| → floppydh joined | 08:16 |
| ← alystair left | 08:17 |
| → nabil__ joined | 08:19 |
| ← nabil_ left | 08:22 |
| → nabil_ joined | 08:22 |
| ← SwiftMatt left | 08:23 |
| → stitched_unicorn joined | 08:23 |
| → alystair joined | 08:24 |
| ← stitched_unicorn left | 08:24 |
| → lalit joined | 08:24 |
| ← nabil__ left | 08:24 |
| ← Joel left | 08:31 |
| → cdown_ joined | 08:31 |
| → def_jam joined | 08:33 |
| → Joel joined | 08:34 |
| ← cdown left | 08:34 |
| cdown_ → cdown | 08:34 |
| → eb0t_ joined | 08:34 |
| ← eb0t left | 08:34 |
| ← eblip left | 08:34 |
| → firas joined | 08:36 |
| ← firas left | 08:36 |
| ← finn0 left | 08:37 |
| ← Goplat left | 08:38 |
| → dre_ joined | 08:38 |
| ← barteks2x left | 08:39 |
| ← rkta left | 08:41 |
| → rkta joined | 08:41 |
| → feriman joined | 08:42 |
| ← libertyprime left | 08:42 |
| → Eryn_1983_FL joined | 08:43 |
| → keepLearning512 joined | 08:48 |
| ← mase-tech left | 08:48 |
| ← fairuz left | 08:50 |
| ← joebobjoe left | 08:50 |
| → T_UNIX joined | 08:50 |
| → joebobjoe joined | 08:53 |
| → fairuz joined | 08:53 |
| → jottr joined | 08:54 |
| ← Fusl left | 08:55 |
| → Fusl joined | 08:56 |
| ← joebobjoe left | 08:59 |
| ← finalbeta left | 09:01 |
| → finalbeta joined | 09:01 |
| ← Bobdude left | 09:04 |
| ← fairuz left | 09:04 |
| → polman joined | 09:05 |
| → Lucas_Gray joined | 09:06 |
| → ave_milia joined | 09:07 |
| → Viking667 joined | 09:10 |
| ← Lucas_Gray left | 09:11 |
| → Lucas_Gray joined | 09:12 |
| ← kegster left | 09:12 |
| → barteks2x joined | 09:12 |
| → kegster joined | 09:12 |
| → royal_screwup21 joined | 09:13 |
| → clime joined | 09:15 |
| → Bobdude joined | 09:16 |
| → hojang joined | 09:17 |
| ← zamba left | 09:22 |
| ← Bobdude left | 09:22 |
| ← SkarmoutsosV left | 09:24 |
| → zamba joined | 09:25 |
| → figuinhas joined | 09:27 |
| → Wryhder joined | 09:29 |
| ← Lucas_Gray left | 09:30 |
| Wryhder → Lucas_Gray | 09:30 |
| ← raatiniemi left | 09:37 |
| → Atlenohen joined | 09:37 |
| → fjellfras joined | 09:39 |
| ← fjellfras left | 09:39 |
| → fjellfras joined | 09:40 |
| ← hojang left | 09:41 |
| → howdoi joined | 09:45 |
| ← Lucas_Gray left | 09:48 |
| → hojang joined | 09:52 |
| ← zamba left | 09:56 |
| ← Noti left | 09:56 |
| → SteffanW joined | 09:56 |
| → cdown_ joined | 09:58 |
| → zamba joined | 09:58 |
| → Lucas_Gray joined | 09:58 |
| ← alystair left | 10:00 |
| ← cdown left | 10:01 |
| cdown_ → cdown | 10:01 |
| ← inkbottle left | 10:02 |
| → inkbottle joined | 10:02 |
| ← dre_ left | 10:05 |
| → crose joined | 10:06 |
| → ryouba joined | 10:07 |
|
ryouba
| it's a stupid question, but just to (hopefully) alleviate my fears: | 10:07 |
| ← royal_screwup21 left | 10:07 |
|
ryouba
| files under git lfs control *do* get stored in multiple version on the server somewhere, right? | 10:07 |
|
| or only ever the latest version and all prior ones are lost forever? | 10:07 |
| lalit → lalitmee | 10:12 |
| → fstd_ joined | 10:14 |
| jomo_9 → jomo_ | 10:17 |
| → dre_ joined | 10:18 |
| ← fstd left | 10:18 |
| fstd_ → fstd | 10:18 |
| → neightchan joined | 10:18 |
| → Fischmop joined | 10:18 |
| ← dre_ left | 10:19 |
| → malmalmal joined | 10:19 |
|
mrtnt
| I cloned a repo from GitHub and made some changes to some files. Now I would need to make a pull request. As I understand, I need to first create a branch. However, what happens with my changes when I create a new branch? Or should I first commit my changes to master and then create a new branch? | 10:19 |
| → dre_ joined | 10:19 |
|
canton7
| mrtnt, if you create a new branch from your current commit and check it out, your changes will stay just as they are in your working copy | 10:20 |
|
| mrtnt, so you can 'git checkout -b mybranch', then add and commit as normal | 10:20 |
| ← dre_ left | 10:20 |
| → dre_ joined | 10:21 |
|
mrtnt
| canton7: thanks! | 10:22 |
| → randomdude999 joined | 10:23 |
| ← neightchan left | 10:24 |
| ← lankanmon left | 10:32 |
| ← keepLearning512 left | 10:32 |
|
fling
| ryouba: `git clone /on/the/server/somewhere` and see for yourself | 10:33 |
| → nuala joined | 10:34 |
| → lankanmon joined | 10:34 |
| ← Fischmop left | 10:34 |
| ← nuala left | 10:34 |
| ← lalitmee left | 10:34 |
| → nuala joined | 10:35 |
| → lalitmee joined | 10:35 |
| ← nuala left | 10:35 |
| → nuala joined | 10:35 |
| ← randomdude999 left | 10:36 |
| → randomdude999 joined | 10:36 |
| ← randomdude999 left | 10:38 |
| → randomdude999 joined | 10:38 |
| ← nuala left | 10:39 |
| ← omry left | 10:40 |
| → Fischmop joined | 10:42 |
| ← randomdude999 left | 10:42 |
| → randomdude999 joined | 10:43 |
| ← randomdude999 left | 10:44 |
| → randomdude999 joined | 10:45 |
| ← Lucas_Gray left | 10:46 |
| ← Fischmop left | 10:47 |
| → keepLearning512 joined | 10:49 |
| → royal_screwup21 joined | 10:51 |
| ← randomdude999 left | 10:53 |
| → randomdude999 joined | 10:53 |
| ← randomdude999 left | 10:56 |
| → finn0 joined | 10:57 |
| → randomdude999 joined | 10:57 |
| ← malmalmal left | 10:58 |
| → nuala joined | 10:59 |
| ← randomdude999 left | 11:01 |
| → randomdude999 joined | 11:01 |
| → troulouliou_div2 joined | 11:02 |
| ← randomdude999 left | 11:03 |
| → randomdude999 joined | 11:03 |
| ← randomdude999 left | 11:05 |
| ← lacrymol1gy left | 11:05 |
| → emsjessec joined | 11:05 |
| → randomdude999 joined | 11:05 |
| ← randomdude999 left | 11:06 |
| → randomdude999 joined | 11:06 |
| → nerosnm joined | 11:06 |
| ← randomdude999 left | 11:10 |
| → randomdude999 joined | 11:10 |
| ← royal_screwup21 left | 11:12 |
| → Lucas_Gray joined | 11:15 |
| ← nuala left | 11:17 |
| ← Lucas_Gray left | 11:19 |
| ← randomdude999 left | 11:20 |
| → randomdude999 joined | 11:20 |
| → nuala joined | 11:22 |
| ← randomdude999 left | 11:22 |
| → randomdude999 joined | 11:22 |
| ← randomdude999 left | 11:23 |
| ← fjellfras left | 11:23 |
| → randomdude999 joined | 11:23 |
| → Lucas_Gray joined | 11:24 |
| ← tonythomas left | 11:25 |
| ← dre_ left | 11:26 |
| → leeN joined | 11:27 |
| ← Viking667 left | 11:27 |
| ← totte left | 11:28 |
| ← finn0 left | 11:30 |
| → finn0 joined | 11:31 |
| ← randomdude999 left | 11:35 |
| ← abbiya left | 11:35 |
| → randomdude999 joined | 11:36 |
| ← randomdude999 left | 11:37 |
| → randomdude999 joined | 11:38 |
| → Aquazi joined | 11:42 |
| → subopt joined | 11:42 |
|
ryouba
| fling: there's thousands of files with paths/names like /var/opt/gitlab/gitlab-rails/shared/lfs-objects/ff/c7 ... they don't really answer my question. | 11:44 |
| ← randomdude999 left | 11:45 |
|
tempate
| Hello. I am having trouble pushing my latest commit. https://bpaste.net/show/zWqQ | 11:46 |
| → randomdude999 joined | 11:46 |
|
tempate
| I have deleted the vgcore file on src but it is still not letting me push | 11:46 |
|
| it looks like it is in the commit's history or something | 11:46 |
| ← randomdude999 left | 11:47 |
| → tgunr joined | 11:47 |
| → randomdude999 joined | 11:47 |
|
fling
| ryouba: I thought the files are there if a path is clonable | 11:47 |
|
ryouba
| hmm | 11:49 |
|
| i'll have to test without gitlab and some pristine repo via ssh | 11:49 |
| ← winny left | 11:49 |
|
tempate
| I would like to remove all the commits that haven't yet been pushed, but I don't know how to do it | 11:50 |
| → royal_screwup21 joined | 11:52 |
| ← randomdude999 left | 11:52 |
| → randomdude999 joined | 11:53 |
| → VladGh joined | 11:53 |
| → beastDiv_ joined | 11:56 |
| → MACscr joined | 11:56 |
| ← randomdude999 left | 11:56 |
| → randomdude999 joined | 11:56 |
|
tempate
| can someone help me out? | 11:57 |
| → Laban joined | 11:57 |
| ← beastDiv_ left | 11:57 |
|
ryouba
| tempate: crude but effective (i don't know a better way myself unfortunately) if you really want to irreversibly erase all that info: "cd your-clone ; rm -rf * ; git checkout *". i'm sure i'll be lynched now. | 11:59 |
|
Laban
| Howdy! How can I see when a specific line was changed across commits? It's a version line and I'd like to go back in history and tag each version change. | 11:59 |
| ← randomdude999 left | 12:00 |
| → randomdude999 joined | 12:00 |
| → AtumT joined | 12:00 |
| ← Lucas_Gray left | 12:02 |
| ← randomdude999 left | 12:02 |
| → randomdude999 joined | 12:03 |
| → Lucas_Gray joined | 12:03 |
|
tempate
| ryouba: what would rm -rf * do? | 12:04 |
|
| I don't want to remove the files themselves, just restart git's history to the latest commit | 12:04 |
|
ryouba
| tempate: what it says on the packaging - it deletes the entire working copy. but then the next command restores the entire working copy to the state of the latest (locally available) commit. of course, if you had created new files that had never been committed, those are then gone, too. | 12:07 |
|
tempate
| I have... | 12:08 |
| → learningc joined | 12:08 |
|
ryouba
| okay, then don't run that. in my crude world, i would manually move those onto my desktop first and then move them back afterwards. | 12:09 |
| ← randomdude999 left | 12:09 |
| → randomdude999 joined | 12:09 |
|
tempate
| I would expect it to be a command for such a simple task | 12:09 |
| → SkarmoutsosV joined | 12:11 |
| ← Lucas_Gray left | 12:12 |
|
ryouba
| like i said, that's just *my* lazy, redneck, crude, way of dealing with this. | 12:13 |
|
| (still hoping for someone knowledgable to bash my head in) | 12:13 |
| ← hojang left | 12:18 |
| → neightchan joined | 12:19 |
| ← VladGh left | 12:20 |
| ← neightchan left | 12:24 |
| ← randomdude999 left | 12:26 |
| → randomdude999 joined | 12:27 |
| → Lucas_Gray joined | 12:28 |
| ← bremner left | 12:30 |
| → pyfgcr joined | 12:31 |
| ← igemnace left | 12:31 |
| ← randomdude999 left | 12:32 |
|
henrebotha[m]
| Laban: `git log -L1,2:README.md` will show you the history of commits that touched lines 1 through 2 of README.md | 12:32 |
| → bremner joined | 12:32 |
| → randomdude999 joined | 12:32 |
| ← randomdude999 left | 12:36 |
| → randomdude999 joined | 12:37 |
| → rsrx joined | 12:38 |
| → rafasc joined | 12:38 |
| → sz0 joined | 12:39 |
| ← Makaveli7 left | 12:42 |
| → neightchan joined | 12:43 |
| ← neightchan left | 12:49 |
| ← randomdude999 left | 12:52 |
| → randomdude999 joined | 12:52 |
| ← xcm left | 12:54 |
| ← randomdude999 left | 12:54 |
| → randomdude999 joined | 12:54 |
| → xcm joined | 12:56 |
| ← SkarmoutsosV left | 12:58 |
| → random_y1 joined | 13:00 |
|
Laban
| Thanks henrebotha[m] | 13:02 |
|
| Any idea on how to find which commit set a line to 'MinorVersion = 51' ? | 13:03 |
| ← inkbottle left | 13:03 |
| ← random_yanek left | 13:03 |
| ← randomdude999 left | 13:03 |
| → inkbottle joined | 13:03 |
| ← lalitmee left | 13:03 |
| → randomdude999 joined | 13:04 |
| ← As4xk left | 13:06 |
|
Laban
| I'm strongly thinking that my previous co-workers just skipped that version :p | 13:06 |
| → As4xk joined | 13:06 |
| → abraxxas joined | 13:07 |
| ← randomdude999 left | 13:08 |
| → randomdude999 joined | 13:08 |
| ← cbreak left | 13:11 |
| → cbreak joined | 13:12 |
|
rafasc
| Laban: git log -S or -G | 13:12 |
| ← randomdude999 left | 13:13 |
| → randomdude999 joined | 13:13 |
| ← caskd left | 13:14 |
| ← randomdude999 left | 13:18 |
| → randomdude999 joined | 13:18 |
| → caskd joined | 13:19 |
| ← randomdude999 left | 13:21 |
| → randomdude999 joined | 13:22 |
|
canton7
| Laban, 'git gui blame path/to/file' | 13:22 |
|
| (or just 'git blame', but it's a little harder to use) | 13:22 |
|
rafasc
| canton7: also forgot git log -L, which may be the best one for this use case. | 13:24 |
| → kerframil joined | 13:25 |
| ← keepLearning512 left | 13:25 |
| ← randomdude999 left | 13:26 |
| → randomdude999 joined | 13:26 |
|
oxymoron93
| it was mentioned few lines before you came rafasc , so you guys covered it all now :D | 13:27 |
|
Laban
| Found it by narrowing down the commits of version 50 and 52. :) | 13:28 |
| → hellauer joined | 13:29 |
| ← leeN left | 13:32 |
| ← finn0 left | 13:35 |
| → finn0 joined | 13:35 |
| ← randomdude999 left | 13:36 |
| → randomdude999 joined | 13:36 |
| ← randomdude999 left | 13:39 |
| → randomdude999 joined | 13:39 |
| → Mike11 joined | 13:41 |
| ← floppydh left | 13:42 |
| → john2496 joined | 13:43 |
| ← finn0 left | 13:45 |
| ← Mike11 left | 13:45 |
| ← randomdude999 left | 13:47 |
| → randomdude999 joined | 13:47 |
| → finn0 joined | 13:48 |
| ← caskd left | 13:53 |
|
kadz[m]
| Hi. I just realized that my feature branch is based on an older master branch. I have pushed the branch to GitHub and opened a pull request. I have updated my master branch and done a `git rebase master` on my feature branch. Will running `git push` affect my commit history or will it just update the branch and keep the commit logs intact? | 13:54 |
| ← randomdude999 left | 13:54 |
|
kadz[m]
| By intact I mean that the logs would show my commits at the top as new and the older commits as those from the new master branch? | 13:54 |
| → randomdude999 joined | 13:54 |
| ← comptroller left | 13:57 |
| ← randomdude999 left | 13:57 |
| → randomdude999 joined | 13:57 |
| → caskd joined | 13:57 |
| → greggerz joined | 13:59 |
| ← caskd left | 14:01 |
| → keepLearning512 joined | 14:02 |
| → caskd joined | 14:02 |
|
moritz
| what you'll get from a git push is a [rejected] | 14:02 |
|
| because you've re-written history that had been published before | 14:03 |
|
| if nobody else has worked on that, you can git push --force-with-lease | 14:03 |
|
rafasc
| the "branch" and the "logs" are the same thing.. It is not something that is kept on the side. | 14:03 |
| → boombatower joined | 14:05 |
| → BeerLover joined | 14:05 |
|
oxymoron93
| also, commits will be new, their datestamp will change, but authorship datestamp should remain? | 14:05 |
| ← omnireq left | 14:05 |
|
rafasc
| By same I mean that git log is a tool that lets visualize the commits in a branch. It isn't some sort of logfile that tracks commits made. | 14:05 |
| → comptroller joined | 14:06 |
| ← randomdude999 left | 14:08 |
| → randomdude999 joined | 14:08 |
| ← Xiti left | 14:09 |
| ← shored left | 14:10 |
| → shored joined | 14:10 |
| → Xiti joined | 14:10 |
| → courrier joined | 14:11 |
| ← finn0 left | 14:13 |
|
markzen
| in this commnd: git push origin origin:refs/heads/new_feature_name | 14:13 |
|
| how is the src part of the refspec resolved? | 14:13 |
|
| I understand "git push origin master:/ref/heads/meister" | 14:14 |
| ← randomdude999 left | 14:14 |
|
markzen
| ie. when the src part if a ref | 14:14 |
|
_ikke_
| afaik it resolves to the default branch (pointed to by HEAD) for that remote | 14:14 |
|
rafasc
| markzen: some commands resolve remote names to refs/remotes/<remote_name>/HEAD | 14:14 |
|
_ikke_
| ^ | 14:14 |
| → randomdude999 joined | 14:14 |
|
markzen
| makes sense, thks | 14:15 |
|
rafasc
| But I am not sure if it would work in refspecs, I assume it does from your question. | 14:15 |
|
markzen
| yeah | 14:15 |
|
rafasc
| I would not rely on that, because the presence is remote_name/HEAD is not very reliable. | 14:16 |
| ← royal_screwup21 left | 14:16 |
| ← randomdude999 left | 14:16 |
|
rafasc
| if you clone, it creates it, but if you init+remote add, it doesn't. | 14:16 |
| → randomdude999 joined | 14:16 |
|
rafasc
| it's also different on normal vs bare repos... | 14:17 |
|
markzen
| good point | 14:17 |
|
| not planning on using it, just wanted to understand it | 14:17 |
|
rafasc
| sure, that is certainly something that caught me offguard the first time I encountered. | 14:18 |
| ← nerosnm left | 14:24 |
| ← learningc left | 14:24 |
| ← Xiti left | 14:25 |
| → thiago joined | 14:25 |
| ← tempate left | 14:25 |
| ← figuinhas left | 14:27 |
| → figuinhas joined | 14:28 |
| → royal_screwup21 joined | 14:28 |
| ← randomdude999 left | 14:30 |
| → randomdude999 joined | 14:31 |
| ← clime left | 14:32 |
| ← randomdude999 left | 14:34 |
| → randomdude999 joined | 14:34 |
| ← mikeputnam left | 14:36 |
| ← sweatsuit left | 14:36 |
| ← figuinhas left | 14:37 |
| ← randomdude999 left | 14:37 |
| → randomdude999 joined | 14:37 |
| → figuinhas joined | 14:38 |
| → Giant81 joined | 14:38 |
| → sweatsuit joined | 14:41 |
| → finn0 joined | 14:42 |
| → __that__ joined | 14:44 |
|
__that__
| HI all | 14:44 |
|
| is there a way to import the content of one branch into another and only the content and not the history, via git? | 14:45 |
| → learningc joined | 14:45 |
|
__that__
| I have been doing plenty of tests on a branch in which I am only interested in the final content... Not the commits | 14:46 |
|
rafasc
| __that__: yes, use merge --squash other_branch | 14:46 |
|
__that__
| wow --squash, never heard of. Thanks | 14:47 |
| ← oxymoron93 left | 14:48 |
| ← abraxxas left | 14:48 |
| → abraxxas joined | 14:53 |
| → nerosnm joined | 14:53 |
| → Xiti joined | 14:54 |
| ← sQVe left | 14:57 |
| ← nerosnm left | 14:57 |
| → dege joined | 14:57 |
| ← nuala left | 14:58 |
| → subopt_ joined | 15:00 |
| ← subopt left | 15:02 |
| ← finn0 left | 15:03 |
| → finn0 joined | 15:04 |
| ← randomdude999 left | 15:05 |
| → randomdude999 joined | 15:05 |
| ← randomdude999 left | 15:06 |
| → randomdude999 joined | 15:07 |
| ← SteffanW left | 15:07 |
| ← feriman left | 15:08 |
|
mrtnt
| I have a 2FA in GitHub enabled. Am I correct, that personal access tokens are the only way to authenticate in case of HTTPS and 2FA? | 15:09 |
|
jast
| mrtnt: yes | 15:13 |
|
| assuming you're talking about repo fetch/push | 15:14 |
| ← randomdude999 left | 15:14 |
| → randomdude999 joined | 15:15 |
|
mrtnt
| jast: yes. So I guess if 2FA is enabled, then one should use SSH protocol for fetch/push? | 15:15 |
| ← randomdude999 left | 15:16 |
| → randomdude999 joined | 15:16 |
|
jast
| mrtnt: it certainly makes things easier | 15:16 |
|
mrtnt
| jast: mhmh. Thanks! | 15:16 |
|
jast
| I very much prefer SSH anyway - I use SSH keys for a bunch of things already, so I don't really have any extra effort compared to typing an HTTP password all the time or storing it on the filesystem somewhere | 15:18 |
| → nerosnm joined | 15:18 |
| → bluezone joined | 15:18 |
| ← mimajof left | 15:20 |
| ← realies left | 15:21 |
| ← greggerz left | 15:22 |
| → raffo joined | 15:27 |
| ← nerosnm left | 15:29 |
| ← rfuentess left | 15:31 |
| ← finn0 left | 15:31 |
| ← BeerLover left | 15:32 |
| → finn0 joined | 15:32 |
| ← kezimo left | 15:34 |
| ← jottr left | 15:35 |
| ← randomdude999 left | 15:39 |
| → randomdude999 joined | 15:40 |
| → jottr joined | 15:40 |
| → mowcat joined | 15:43 |
| ← mowcat left | 15:43 |
| ← TomyWork left | 15:43 |
| → mowcat joined | 15:43 |
| → User_ joined | 15:46 |
| ← polman left | 15:46 |
| → polman joined | 15:46 |
| ← randomdude999 left | 15:48 |
| → randomdude999 joined | 15:48 |
| ← learningc left | 15:48 |
| ← thiago left | 15:50 |
| ← royal_screwup21 left | 15:50 |
| ← randomdude999 left | 15:52 |
| ← jottr left | 15:52 |
| → randomdude999 joined | 15:53 |
| → invisbl joined | 15:53 |
| → jottr joined | 15:54 |
| → Bobdude joined | 15:56 |
| ← jottr left | 15:59 |
| → dijitol joined | 16:00 |
| → escherial joined | 16:01 |
| ← escherial left | 16:01 |
| ← randomdude999 left | 16:01 |
| → randomdude999 joined | 16:02 |
| ← subopt_ left | 16:03 |
| → nerosnm joined | 16:03 |
| ← javaJake left | 16:05 |
| ← User_ left | 16:06 |
| → escherial joined | 16:06 |
| → javaJake joined | 16:07 |
| ← abraxxas left | 16:10 |
| → omnireq joined | 16:12 |
| ← nerosnm left | 16:13 |
| ← Lucas_Gray left | 16:14 |
| ← vavkamil left | 16:14 |
| ← randomdude999 left | 16:15 |
| → randomdude999 joined | 16:15 |
| → subopt joined | 16:19 |
| ← finn0 left | 16:27 |
| → igemnace joined | 16:27 |
| → thiago joined | 16:30 |
| ← randomdude999 left | 16:32 |
| → randomdude999 joined | 16:32 |
| → jottr joined | 16:33 |
| → Tie-1000 joined | 16:33 |
| ← pyfgcr left | 16:35 |
| ← jottr left | 16:37 |
| → clime joined | 16:37 |
| ← sz0 left | 16:39 |
| ← __that__ left | 16:39 |
| ← randomdude999 left | 16:39 |
| ← sweatsuit left | 16:39 |
| → randomdude999 joined | 16:39 |
| → sweatsuit joined | 16:41 |
| → impermanence joined | 16:42 |
| ← TimWolla left | 16:43 |
| → Inline joined | 16:45 |
| → n3wborn joined | 16:46 |
| → pie_ joined | 16:46 |
| → nerosnm joined | 16:49 |
| → TimWolla joined | 16:50 |
| ← randomdude999 left | 16:51 |
| → randomdude999 joined | 16:52 |
| → Phylock joined | 16:53 |
| ← Atlenohen left | 16:55 |
| ← irrgit left | 16:59 |
| → is_null joined | 16:59 |
| ← emg left | 16:59 |
| ← randomdude999 left | 17:01 |
| → randomdude999 joined | 17:01 |
| → flaviodesousa joined | 17:01 |
| ← flaviodesousa left | 17:02 |
| ← pie_ left | 17:02 |
| ← nerosnm left | 17:03 |
| → irrgit joined | 17:04 |
| ← randomdude999 left | 17:04 |
| ← Tie-1000 left | 17:04 |
| → Tie-1000 joined | 17:05 |
| → randomdude999 joined | 17:05 |
| ← dijitol left | 17:08 |
| ← crose left | 17:10 |
| → jottr joined | 17:10 |
| → kneeki|a joined | 17:10 |
| ← shored left | 17:10 |
| → shored joined | 17:10 |
| ← kneeki|aa left | 17:12 |
| ← fphilipe_ left | 17:12 |
| ← keepLearning512 left | 17:13 |
| → nerosnm joined | 17:15 |
| ← jottr left | 17:16 |
| → randomdude999_ joined | 17:19 |
| ← randomdude999 left | 17:19 |
| randomdude999_ → randomdude999 | 17:19 |
| ← nerosnm left | 17:22 |
| ← shored left | 17:22 |
| → shored joined | 17:23 |
|
sphalerite
| is there a way to show dates in git reflog? | 17:23 |
|
_ikke_
| sphalerite: git log -g | 17:23 |
|
sphalerite
| _ikke_: awesome, thanks! Amazing response time :D | 17:24 |
|
_ikke_
| :-) | 17:24 |
|
| man git as a service ;-) | 17:24 |
|
gitinfo
| the git manpage is available at https://gitirc.eu/git.html | 17:24 |
| → jottr joined | 17:26 |
|
sphalerite
| _ikke_: oh, hm, that shows commit dates, not reflog dates :/ I want to find out when I moved from one branch to another, so I can go back to a zfs snapshot before I broke stuff. Oh hey, I'm XYing, aren't I?? | 17:28 |
|
_ikke_
| ;-) | 17:30 |
|
sphalerite
| any idea how I can do that? ;) | 17:30 |
| → pie_ joined | 17:30 |
|
_ikke_
| hold on | 17:30 |
| ← jottr left | 17:31 |
|
vishal
| something like git reflog --pretty='%cd %h %gd %gs' | 17:31 |
| → orbyt_ joined | 17:31 |
|
sphalerite
| vishal: hm nope, that displays the commit date, not the checkout date | 17:32 |
| → alystair joined | 17:32 |
| → nerosnm joined | 17:32 |
|
_ikke_
| Strange, the only thing I can think of is directly looking at .git/logs/HEAD | 17:32 |
|
rafasc
| the reflog does store the date.. | 17:32 |
|
vishal
| hmm true | 17:33 |
|
_ikke_
| it does, but I don't see any option to show the reflog date | 17:33 |
|
rafasc
| but yeah, I don't think log is able to parse it. | 17:33 |
|
_ikke_
| It does parse reflog entries, it just does not expose it for some reason | 17:33 |
|
| maybe someones scratch to it | 17:33 |
| ← TomTom left | 17:34 |
| ← nerosnm left | 17:36 |
|
_ikke_
| Am I crazy? What's the git mailing list archive maintained by Eric Wong? | 17:37 |
|
| ah | 17:37 |
|
| https://public-inbox.org/git/ | 17:37 |
|
| Somehow I had public-info.org in my head | 17:37 |
| → dijitol joined | 17:39 |
| ← m1rror left | 17:39 |
| → m1rror joined | 17:40 |
|
rafasc
| is public inbox from maintained by Eric Wong? | 17:41 |
| → nerosnm joined | 17:41 |
|
rafasc
| strange sense of dejavu there, I was reading his email on deprecating git-filter-branch when you asked. spooky | 17:42 |
| → vlooe joined | 17:43 |
| ← dijitol left | 17:43 |
| → dijitol joined | 17:44 |
|
_ikke_
| yes, it is | 17:44 |
| ← dijitol left | 17:45 |
| ← liori left | 17:46 |
| → liori joined | 17:47 |
| ← nerosnm left | 17:48 |
| → wildlander joined | 17:53 |
|
vlooe
| I have a really slow repo here on windows/cygwin. a simple git status needs 10s. Other repos on this machine are much "faster" | 17:55 |
| ← duderonomy left | 17:55 |
|
bin_bash
| rip | 17:55 |
| → nerosnm joined | 17:56 |
|
vlooe
| i guess it is related to the amount of submodules in this repo | 17:56 |
| ← Tie-1000 left | 17:56 |
| → Tie-1000 joined | 17:57 |
| ← figuinhas left | 17:57 |
| ← thiago left | 17:58 |
| ← nerosnm left | 18:00 |
| → Sasazuka joined | 18:01 |
| → TomyLobo joined | 18:01 |
| ← cd left | 18:01 |
| → jottr joined | 18:04 |
| ← ave_milia left | 18:05 |
| → gareppa joined | 18:08 |
| → keepLearning512 joined | 18:08 |
| ← jottr left | 18:09 |
| ← randomdude999 left | 18:09 |
| → randomdude999_ joined | 18:09 |
| randomdude999_ → randomdude999 | 18:09 |
| → thiago joined | 18:10 |
| ← randomdude999 left | 18:11 |
| → randomdude999 joined | 18:11 |
| ← Tie-1000 left | 18:15 |
| → Tie-1000 joined | 18:17 |
| ← pie_ left | 18:17 |
| ← courrier left | 18:18 |
| ← randomdude999 left | 18:19 |
| → randomdude999 joined | 18:20 |
| ← randomdude999 left | 18:23 |
| → randomdude999 joined | 18:23 |
| ← randomdude999 left | 18:24 |
| ← haasn left | 18:24 |
| → randomdude999 joined | 18:25 |
| ← john2496 left | 18:27 |
| → jottr joined | 18:28 |
| ← Aquazi left | 18:28 |
| ← sauvin left | 18:28 |
| → freeman42x joined | 18:29 |
| → haasn joined | 18:30 |
| ← orbyt_ left | 18:30 |
| ← T_UNIX left | 18:30 |
| ← randomdude999 left | 18:31 |
| → randomdude999 joined | 18:31 |
| → SpeakerToMeat joined | 18:32 |
| ← randomdude999 left | 18:32 |
| → randomdude999 joined | 18:33 |
| ← SpeakerToMeat left | 18:35 |
| ← clime left | 18:40 |
| ← randomdude999 left | 18:40 |
| → randomdude999 joined | 18:41 |
| ← troulouliou_div2 left | 18:42 |
| → SpeakerToMeat joined | 18:43 |
| ← shored left | 18:43 |
| → shored joined | 18:44 |
| ← randomdude999 left | 18:45 |
| → randomdude999 joined | 18:45 |
| → pie_ joined | 18:46 |
| → lalitmee joined | 18:47 |
| ← lalitmee left | 18:48 |
| → lalitmee joined | 18:49 |
| ← shored left | 18:49 |
| → shored joined | 18:50 |
| → nuala joined | 18:51 |
| → shiza joined | 18:51 |
| ← randomdude999 left | 18:52 |
| ← thiago left | 18:52 |
| → realies joined | 18:52 |
| → randomdude999 joined | 18:52 |
| ← pie_ left | 18:55 |
| ← n3wborn left | 18:55 |
| ← randomdude999 left | 18:55 |
| → randomdude999 joined | 18:56 |
| → finn0 joined | 18:57 |
| → SkarmoutsosV joined | 18:57 |
| ← Giant81 left | 18:59 |
| → nerosnm joined | 19:02 |
| ← nerosnm left | 19:04 |
| → nerosnm joined | 19:05 |
| → Revan- joined | 19:08 |
| → Giant81 joined | 19:11 |
| → pie_ joined | 19:14 |
| → iam730 joined | 19:16 |
| → thiago joined | 19:17 |
| → clime joined | 19:20 |
| ← JanC left | 19:21 |
| → JanC joined | 19:21 |
| ← pie_ left | 19:23 |
| ← justanotheruser left | 19:23 |
| ← fflam left | 19:23 |
| ← MACscr left | 19:24 |
| → justanotheruser joined | 19:24 |
| ← shored left | 19:24 |
| → shored joined | 19:24 |
| → MACscr joined | 19:25 |
| → pie_ joined | 19:26 |
| ← omnireq left | 19:26 |
| → omnireq joined | 19:28 |
| ← vlooe left | 19:28 |
| ← Cabanossi left | 19:30 |
| ← pie_ left | 19:31 |
| → Cabanossi joined | 19:32 |
| ← Mattiaslndstrm left | 19:32 |
| → fflam joined | 19:36 |
| ← randomdude999 left | 19:37 |
| → randomdude999 joined | 19:38 |
| → savolla joined | 19:38 |
| ← savolla left | 19:39 |
| ← is_null left | 19:39 |
| ← randomdude999 left | 19:42 |
| → randomdude999 joined | 19:42 |
| ← randomdude999 left | 19:43 |
| ← tomaw left | 19:44 |
| → randomdude999 joined | 19:44 |
| ← nuala left | 19:45 |
| → tomaw joined | 19:46 |
| ← khisanth_ left | 19:46 |
| → orbyt_ joined | 19:49 |
| ← nerosnm left | 19:51 |
| → nowhere_man joined | 19:53 |
| ← rafasc left | 19:54 |
| → nerosnm joined | 19:55 |
| → d1rewolf joined | 19:55 |
| → raatiniemi joined | 19:55 |
| ← emsjessec left | 19:56 |
| → fphilipe_ joined | 19:57 |
| → kneeki joined | 19:58 |
| ← randomdude999 left | 19:58 |
| → randomdude999 joined | 19:59 |
| → khisanth_ joined | 19:59 |
| ← kneeki|a left | 20:00 |
| → is_null joined | 20:00 |
| → pie_ joined | 20:01 |
| → Ignacy joined | 20:06 |
| ← nerosnm left | 20:07 |
| ← randomdude999 left | 20:08 |
| ← gareppa left | 20:08 |
| → randomdude999 joined | 20:09 |
| ← orbyt_ left | 20:10 |
| → daydreamm joined | 20:10 |
|
daydreamm
| hello friends, I have deleted a file from my `master` branch and pushed it, but then on another branch the file exists (and I want it to exist) but then when I merge than other branch to master, the file doesn' appear, and it's not being recognised by git, what do? | 20:11 |
| ← randomdude999 left | 20:12 |
| → TomTom joined | 20:12 |
| → randomdude999 joined | 20:12 |
| → troulouliou_div2 joined | 20:13 |
| ← keepLearning512 left | 20:15 |
| ← randomdude999 left | 20:15 |
|
alystair
| what's the correct way to squash two commits that weren't one after the other? | 20:15 |
|
_ikke_
| alystair: interactive rebase | 20:15 |
| → randomdude999 joined | 20:15 |
| ← SpeakerToMeat left | 20:17 |
| → m0viefreak joined | 20:19 |
| ← Tie-1000 left | 20:19 |
| → SpeakerToMeat joined | 20:19 |
| → Tie-1000 joined | 20:21 |
| → orbyt_ joined | 20:23 |
| → nerosnm joined | 20:25 |
| ← cbreak left | 20:31 |
| → nabil__ joined | 20:31 |
| → cbreak joined | 20:32 |
| ← nabil_ left | 20:33 |
| ← nerosnm left | 20:34 |
| → mase-tech joined | 20:34 |
| → nabil_ joined | 20:37 |
| → keepLearning512 joined | 20:38 |
| ← keepLearning512 left | 20:39 |
| → shored1 joined | 20:39 |
| ← nabil__ left | 20:40 |
| ← shored left | 20:40 |
| → Freshnuts joined | 20:40 |
| ← kneeki left | 20:40 |
| → kneeki joined | 20:42 |
| ← MACscr left | 20:44 |
| → arinov joined | 20:45 |
| ← howdoi left | 20:45 |
| ← randomdude999 left | 20:47 |
| → randomdude999 joined | 20:48 |
| ← sozuba left | 20:50 |
| ← daydreamm left | 20:51 |
| ← polman left | 20:52 |
| ← nowhere_man left | 20:55 |
| → lmariscal joined | 20:57 |
| ← kneeki left | 20:58 |
| → Narrat joined | 20:59 |
| → kneeki joined | 20:59 |
| ← randomdude999 left | 21:00 |
| ← subopt left | 21:00 |
| → randomdude999 joined | 21:00 |
| ← randomdude999 left | 21:01 |
| → randomdude999 joined | 21:02 |
| ← shabius left | 21:03 |
| → daydreamm joined | 21:04 |
| ← daydreamm left | 21:12 |
| ← is_null left | 21:13 |
| → shabius joined | 21:14 |
| ← shabius left | 21:14 |
| → shabius joined | 21:15 |
| → abraxxas joined | 21:15 |
| ← randomdude999 left | 21:15 |
| → randomdude999 joined | 21:15 |
| ← randomdude999 left | 21:16 |
| ← SkarmoutsosV left | 21:16 |
| → randomdude999 joined | 21:17 |
| → feriman joined | 21:18 |
| ← hellauer left | 21:19 |
|
seven-eleven
| if I force pushed an ammended commit during a pull request, do I have to notify people that I rewrote the history? i noticed that the changes on the pull request on github were instantly, but someone might have pulled the old version right? | 21:20 |
| ← meLon left | 21:20 |
|
vishal
| seven-eleven: someone might have, in case they're basing workl on your in-progress work (ususally unlikely, but there are valid exceptions of course) | 21:21 |
| ← pie_ left | 21:21 |
|
vishal
| normally if the flow is fork/commit/push/pull-request, then force pushing is ok | 21:22 |
| → dijitol joined | 21:22 |
|
seven-eleven
| mhm | 21:22 |
|
vishal
| the PR gets updated automatically, and nothing is a problem since nothing has been merged into upstream at that point | 21:22 |
|
seven-eleven
| right | 21:22 |
|
| sounds like i dont need to notify anybody, they just see the suggested changes immediately | 21:22 |
| ← diogenese left | 21:22 |
|
vishal
| right | 21:22 |
|
seven-eleven
| oh it actually says in the PR that I "forced pushed ...:master branch from ..." | 21:23 |
| ← randomdude999 left | 21:24 |
| → randomdude999 joined | 21:24 |
| → daydreamm joined | 21:25 |
| ← mase-tech left | 21:26 |
| → greatgatsby joined | 21:28 |
| ← randomdude999 left | 21:32 |
| → randomdude999 joined | 21:33 |
| ← randomdude999 left | 21:34 |
| → randomdude999 joined | 21:35 |
| ← octav1a left | 21:36 |
| ← Cabanossi left | 21:37 |
| → MoziM joined | 21:38 |
| ← randomdude999 left | 21:40 |
| → randomdude999 joined | 21:41 |
| → pie_ joined | 21:42 |
| → Cabanossi joined | 21:42 |
| ← randomdude999 left | 21:42 |
| → yonder joined | 21:43 |
| → randomdude999 joined | 21:43 |
| → MACscr joined | 21:45 |
| ← pie_ left | 21:50 |
| ← randomdude999 left | 21:51 |
| → pie_ joined | 21:52 |
| → randomdude999 joined | 21:52 |
| ← randomdude999 left | 21:54 |
| → randomdude999 joined | 21:54 |
| ← invisbl left | 21:55 |
| ← dege left | 21:58 |
| ← greatgatsby left | 21:59 |
| ← daydreamm left | 22:02 |
| ← freeman42x left | 22:02 |
| ← archpc left | 22:03 |
| ← _xor left | 22:04 |
| → _xor joined | 22:04 |
| → Oatmeal joined | 22:06 |
| → rafasc joined | 22:07 |
| ← shored1 left | 22:10 |
| → shored joined | 22:10 |
| ← randomdude999 left | 22:14 |
| ← lalitmee left | 22:16 |
| ← Phylock left | 22:17 |
| → archpc joined | 22:18 |
| ← im0nde left | 22:23 |
| → im0nde joined | 22:23 |
| → invisbl joined | 22:24 |
| ← invisbl left | 22:28 |
| → daydreamm joined | 22:28 |
| ← daydreamm left | 22:33 |
| → scientes joined | 22:34 |
| ← pie_ left | 22:35 |
| ← finn0 left | 22:37 |
| → pie_ joined | 22:40 |
| ← abraxxas left | 22:40 |
| ← arinov left | 22:42 |
| ← dijitol left | 22:42 |
| → Guess59061 joined | 22:43 |
| ← iam730 left | 22:48 |
| ← thiago left | 22:49 |
|
Guess59061
| Where do I see the history of a release post on GitHub? https://github.com/dtag-dev-sec/tpotce/releases/tag/16.10 This is a release post. In the title it says "Deprecated". Presumably it didn't have that before, so where can I see when that piece of information was edited in? | 22:49 |
| ← BonusPlay left | 22:50 |
| → BonusPlay joined | 22:50 |
| → diogenese joined | 22:51 |
|
jast
| Guess59061: I believe GitHub has its own metadata (i.e. outside the git repo) for releases and I'm not seeing them making a history of the changes available anywhere | 22:52 |
|
Guess59061
| jast: Oh, I see... Okay, thank you very much. I couldn't find that information anywhere either... | 22:54 |
|
jast
| btw in git itself, tags don't have history, either | 22:56 |
|
| so if you were to overwrite a git tag, the old one is kind of gone | 22:56 |
|
Guess59061
| Thanks for telling me. | 22:56 |
| ← Guess59061 left | 22:57 |
| ← ravndal left | 22:59 |
| → ravndal joined | 23:02 |
| ← omnireq left | 23:05 |
| ← feriman left | 23:07 |
| ← BonusPlay left | 23:07 |
| → BonusPlay joined | 23:07 |
| → braderhart joined | 23:08 |
| ← cbreak left | 23:12 |
| → cbreak joined | 23:12 |
| ← boombatower left | 23:14 |
| → duderonomy joined | 23:23 |
| ← dartmouthed left | 23:26 |
| ← shored left | 23:29 |
| → shored joined | 23:29 |
| ← rsrx left | 23:32 |
| → dre_ joined | 23:34 |
| → sgen joined | 23:34 |
| ← dre_ left | 23:37 |
| → Atlenohen joined | 23:41 |
| → kezimo joined | 23:42 |
| → rwp joined | 23:43 |
|
rwp
| I have a sandbox on master that is behind origin/master by several commits. How can I advance it exactly one commit toward origin/master? | 23:45 |
| → thiago joined | 23:48 |
|
rwp
| Nevermind. Eventually I deduced that "git merge <commit>" where <commit> was the next toward origin/master was the way to do this. | 23:54 |
| → iam730 joined | 23:58 |
| ← kezimo left | 23:58 |
| ← pie_ left | 23:59 |