| 2021-09-12 |
| → gadget joined | 00:02 |
| ← Xeago left | 00:03 |
| → catern joined | 00:05 |
| → christall joined | 00:09 |
| ← christall left | 00:14 |
| → christall joined | 00:22 |
| → thiago joined | 00:24 |
| ← christall left | 00:25 |
| → christall joined | 00:28 |
| ← shored1 left | 00:30 |
| → shored joined | 00:32 |
| ← christall left | 00:33 |
| → Xeago joined | 00:35 |
| ← R2robot left | 00:38 |
| ← gast0n left | 00:39 |
| → FFY00_ joined | 00:39 |
| ← FFY00 left | 00:39 |
| → R2robot joined | 00:40 |
| ← FFY00_ left | 00:43 |
| → FFY00_ joined | 00:43 |
| ← FFY00_ left | 00:54 |
| → jazzy2 joined | 00:57 |
| → christall joined | 00:57 |
| → Sazhen86 joined | 00:59 |
| → FFY00 joined | 00:59 |
| ← christall left | 01:02 |
| → bkay joined | 01:04 |
| ← beshr left | 01:04 |
| → appll joined | 01:05 |
| ← appll left | 01:05 |
| ← Sazhen86 left | 01:09 |
| → pulse joined | 01:14 |
| → odoood joined | 01:18 |
| → bolsonarogay joined | 01:21 |
| → codebam_ joined | 01:22 |
| ← codebam_ left | 01:23 |
| ← codebam left | 01:25 |
| → Tylerdurden joined | 01:28 |
|
Tylerdurden
| Hello | 01:28 |
| → Izem joined | 01:29 |
| ← Tylerdurden left | 01:30 |
| → christall joined | 01:31 |
| → ___nick___ joined | 01:32 |
| ← supernovah left | 01:33 |
| ← vysn left | 01:34 |
| → ninjin joined | 01:34 |
| → codebam joined | 01:34 |
| ← codebam left | 01:35 |
| → supernovah joined | 01:35 |
| ← nyah left | 01:35 |
| ← R2robot left | 01:35 |
| → codebam joined | 01:35 |
| → bambanxx joined | 01:35 |
| ← christall left | 01:36 |
| ← codebam left | 01:36 |
| → codebam joined | 01:40 |
| ← odoood left | 01:45 |
| → XV8 joined | 01:46 |
| ← supernovah left | 01:49 |
| → Maxattax97 joined | 01:49 |
| → supernovah joined | 01:50 |
| → sargon joined | 01:52 |
| ← pretty_dumm_guy left | 01:54 |
| ← ZacSharp left | 01:59 |
| ← Izem left | 02:10 |
| → Izem joined | 02:17 |
| → vdamewood joined | 02:22 |
| → christall joined | 02:23 |
| → codebam_ joined | 02:24 |
| ← codebam_ left | 02:25 |
| → codebam_ joined | 02:27 |
| ← christall left | 02:27 |
| ← codebam_ left | 02:28 |
| ← zebrag left | 02:33 |
| ← Izem left | 02:35 |
| → codebam_ joined | 02:37 |
| ← codebam_ left | 02:38 |
| → codebam_ joined | 02:38 |
| ← codebam_ left | 02:40 |
| ← thiago left | 02:40 |
| ← sgn left | 02:41 |
| ← Maxattax97 left | 02:41 |
| → codebam_ joined | 02:42 |
| → sgn joined | 02:42 |
| ← codebam_ left | 02:42 |
| → codebam_ joined | 02:55 |
| ← codebam_ left | 02:55 |
| → codebam_ joined | 02:56 |
| → gnoo joined | 02:57 |
| ← codebam_ left | 02:57 |
| → codebam_ joined | 02:58 |
| ← codebam_ left | 02:58 |
| → junktext joined | 02:59 |
| ← FinnElija left | 03:01 |
| → codebam_ joined | 03:02 |
| → FinnElija joined | 03:03 |
| ← codebam_ left | 03:03 |
| → codebam_ joined | 03:03 |
| ← codebam_ left | 03:05 |
| ← sgn left | 03:06 |
| → sgn joined | 03:07 |
| ← FFY00 left | 03:07 |
| → codebam_ joined | 03:08 |
| ← codebam_ left | 03:08 |
| → reddishblue[m] joined | 03:08 |
| ← onichomp left | 03:22 |
| → FFY00 joined | 03:23 |
| → onichomp joined | 03:25 |
| ← onichomp left | 03:26 |
| → onichomp joined | 03:26 |
| ← zulutango left | 03:27 |
| → zulutango joined | 03:29 |
| → FH_thecat joined | 03:29 |
| → thiago joined | 03:46 |
| ← jimklimov1 left | 03:47 |
| → ghost43 joined | 03:48 |
| ← anton left | 03:49 |
| → TheJollyRoger joined | 03:49 |
| → cmc joined | 03:49 |
| → nattiestnate joined | 03:50 |
| ← nattiestnate left | 03:51 |
| → AnAverageHuman joined | 03:52 |
| → ano joined | 03:58 |
| → gxt joined | 03:58 |
| → ferdna joined | 04:00 |
| → anton joined | 04:01 |
| → christall joined | 04:07 |
| ← epolanski left | 04:09 |
| ← christall left | 04:11 |
| ← igemnace left | 04:14 |
| → odoood joined | 04:18 |
| → xiongxin8802 joined | 04:19 |
| ← xiongxin8802 left | 04:28 |
| → xiongxin8802 joined | 04:28 |
| ← pulse left | 04:35 |
| → hqdruxn08 joined | 04:37 |
| ← hqdruxn08_ left | 04:41 |
| → pulse joined | 04:42 |
| ← pyeveryt_ left | 04:44 |
| → mat001_ joined | 04:44 |
| → pyeveryt_ joined | 04:45 |
| ← xiongxin8802 left | 04:45 |
| ← anton left | 04:46 |
| → anton joined | 04:46 |
| ← sgn left | 04:47 |
| ← odoood left | 04:47 |
| → sgn joined | 04:47 |
| ← mat001 left | 04:48 |
| ← pyeveryt_ left | 04:50 |
| → aniruddha joined | 04:58 |
| ← AnAverageHuman left | 05:18 |
| → Doraemon joined | 05:19 |
| → pyeverything joined | 05:20 |
| ← neocron left | 05:22 |
| → Sazhen86 joined | 05:33 |
| ← ferdna left | 05:33 |
| AndrewYu → xeroxIRC | 05:33 |
| xeroxIRC → Guest591 | 05:33 |
| Guest591 → AndrewIRC | 05:34 |
| ← pyeverything left | 05:36 |
| → pyeveryt_ joined | 05:36 |
| ← pyeveryt_ left | 05:38 |
| ← Tobbi_ left | 05:38 |
| ← Murr left | 05:38 |
| → Murr joined | 05:39 |
| → atrigent joined | 05:39 |
| → pyeverything joined | 05:39 |
| ← pyeverything left | 05:44 |
| ← EvilDMP left | 05:45 |
| → Gurkenglas joined | 05:51 |
| ← atrigent left | 05:51 |
| ← gnoo left | 05:59 |
| ← bambanxx left | 06:02 |
| → christall joined | 06:08 |
| ← bket left | 06:09 |
| → ferz joined | 06:12 |
|
ferz
| Hi | 06:12 |
| ← christall left | 06:13 |
|
ferz
| I've a git main repository and on the same filesystem a cloned repository for a branch where I've made changes. I need to push from the second changes to the first one: | 06:15 |
|
| http://paste.scsys.co.uk/595865 | 06:15 |
| → EvilDMP joined | 06:15 |
|
ferz
| I want to keep changes on the master branch on the first repos, but drop DocAdvisor changes on it to import full set of changes from the secondary repos. | 06:17 |
|
| DocAdvisor is the branch | 06:17 |
|
| How can I fix this situation? | 06:18 |
| → bket joined | 06:20 |
| → fercell joined | 06:25 |
| ← ferr_ left | 06:25 |
| → fling joined | 06:29 |
| ← _xor left | 06:33 |
| → hackinghorn joined | 06:36 |
| ← Vonter left | 06:43 |
|
Marmotte
| ferz: to use the same repository in several local directories, you can use worktrees (see git help worktree) | 06:45 |
|
| your current issue is that the branch is checked out (= "active"), so git refuses to push changes in it | 06:45 |
| → Vonter joined | 06:45 |
| → teut joined | 06:45 |
|
Marmotte
| you can push in another branch name, then pull that branch on the other repo : git push origin HEAD:other_name | 06:46 |
|
| then, I would suggest to switch to using worktrees (this is as simple as "git worktree add /path branch-name") | 06:47 |
|
ferz
| Marmotte: thank you | 06:47 |
| → igemnace joined | 06:47 |
| ← FH_thecat left | 06:48 |
|
teut
| Uploaded file: https://uploads.kiwiirc.com/files/992f8e64844f13f4ac53172ec18f2ab8/image.png | 06:49 |
|
| I got the following on github , I followed the step1 commands | 06:49 |
|
| now my colleague's branch is there locally, now am I rebasing or merging it? | 06:50 |
| → atrigent joined | 06:50 |
|
teut
| https://dpaste.org/RUFZ after those step 1 commands I tried | 06:51 |
| → pyeveryt_ joined | 06:51 |
|
teut
| Uploaded file: https://uploads.kiwiirc.com/files/4a98ecb6bf11636c0bc037a912d4406d/pasted.txt | 06:51 |
|
| git log on his branch shows this | 06:52 |
|
| here his and mine commits are both , and at the top are my 2-3 commits that are which I pushed after receiving the pull request | 06:54 |
| ← pulse left | 06:54 |
|
teut
| if its his branch then why are there my new commits? | 06:54 |
| ← EvilDMP left | 06:57 |
| → Codaraxis joined | 07:00 |
|
Marmotte
| teut: the log you pasted only shows your "master" branch, not the branch your colleague proposed to merge | 07:04 |
|
teut
| how can it be my master branch? | 07:05 |
|
| Uploaded file: https://uploads.kiwiirc.com/files/522c5db64fb3e1af31731e4ad56dcd69/image.png | 07:05 |
| ← unluckyshrubbery left | 07:05 |
| ← junktext left | 07:05 |
|
teut
| thats the collegue's name | 07:05 |
|
Marmotte
| git explicitely says these branches are all references to the same commit : (HEAD -> vishal2612200-master, origin/master, master) | 07:05 |
|
teut
| ea* | 07:05 |
| → dcompoze joined | 07:05 |
| ← dcompoze left | 07:06 |
|
teut
| what will it look like in the graph diagram? | 07:06 |
|
Marmotte
| you created a branch on your local repository named "vishal2612200-master" from your local "master" branch, then nothing was applied to this branch | 07:06 |
|
teut
| yes this happened | 07:06 |
|
| oh right i didnt realize it | 07:07 |
|
Marmotte
| https://pastebin.com/raw/mkvJu71Y | 07:07 |
|
teut
| I branched to this new branch from my master | 07:07 |
|
Marmotte
| if you often work with his branches, you can add his repo as a remote : git remote add vishal https://github.com/vishal2612200/NirogGyanCompanyWebsite | 07:07 |
|
| then you will be able to use his branches (merge, checkout, etc.) using vishal/branch_name | 07:08 |
|
| (instead of "origin", which is the default remote's name) | 07:08 |
|
| probably your GitHub's repository on you computer | 07:08 |
|
teut
| cool, I ll do that now | 07:09 |
|
| thanks for the help | 07:09 |
|
Marmotte
| https://pastebin.com/12jAVe7v | 07:10 |
|
| here I have your repo as "origin", and his repo as "vishal" | 07:10 |
|
| you can use "git fetch remote_name" to download new commits from a single remote, or "git remote update" to download new commits from all configured remotes | 07:11 |
|
| teut: last thing, it seems you forced push your master branch, this is not recommended for public branches | 07:12 |
|
teut
| ya I did it | 07:12 |
|
| I do not know why I was getting a conflict in pushing | 07:12 |
| ← zmt01 left | 07:13 |
|
Marmotte
| I think you will need to rebase your colleague's branch on your new master then, because merging them will re-add your old overwritten commits, and this often creates big conflits issues :P | 07:13 |
|
teut
| does doing a squash does it? | 07:13 |
|
Marmotte
| (this also makes history harder to read) | 07:13 |
|
teut
| I mean squash created conflicts? | 07:13 |
|
| yes , I had intentions of rebasing only | 07:14 |
|
| I never use "merge" | 07:14 |
|
Marmotte
| conflits appear because git sees changes applied on the same lines both sides, and cannot decide itself which changes is the right to keep | 07:14 |
|
| squash will pack all changes in a single commit, but will not avoid the conflict | 07:15 |
| ← pyeveryt_ left | 07:16 |
|
teut
| the conflict for which I used a force push, I dont know of any other reason than the squash that I performed | 07:16 |
|
| Uploaded file: https://uploads.kiwiirc.com/files/fb91ba956191c8a25279f83959964839/pasted.txt | 07:17 |
|
| this has become a mess suddenly , I m just starting with collaborative git | 07:17 |
|
| until now I only used solo git | 07:18 |
|
| https://dpaste.org/3xHy | 07:19 |
|
| can you tell what git status i telling? | 07:20 |
|
| is | 07:20 |
| → hbautista joined | 07:23 |
| ← jab416171 left | 07:24 |
| → jab416171 joined | 07:26 |
|
teut
| I used PS C:\Users\Dell\OneDrive\Desktop\niroCompanyWebsite\nirogyyan-company-website> git rebase master after successfully rebasing on vishal's branch | 07:32 |
|
| but his changes are not visible in my branch | 07:32 |
|
| my master branch | 07:32 |
| → srinidhi joined | 07:34 |
| ← skapata left | 07:37 |
| → EvilDMP joined | 07:38 |
| ← jetchisel left | 07:42 |
| → pyeveryt_ joined | 07:43 |
| ← pyeveryt_ left | 07:50 |
| ← Doraemon left | 07:55 |
| → xiongxin8802 joined | 07:58 |
| ← teut left | 08:04 |
| ← Sazhen86 left | 08:05 |
| → theoceaniscool joined | 08:07 |
| → meator joined | 08:11 |
| ← codebam left | 08:13 |
| ← ZachGibbens left | 08:18 |
| ← theoceaniscool left | 08:19 |
| → ZachGibbens joined | 08:19 |
| ← ghost43 left | 08:20 |
| → ghost43 joined | 08:21 |
| CycoCid → Kulrak | 08:23 |
| → john_johnk joined | 08:26 |
| ← hbautista left | 08:27 |
| pizdets_ → pizdets | 08:37 |
| → rsx joined | 08:41 |
| ← srinidhi left | 08:41 |
| → Codaraxis_ joined | 08:42 |
| ← thiago left | 08:45 |
| ← Codaraxis left | 08:46 |
| → mat001 joined | 08:51 |
| → ddrtns^ joined | 08:52 |
| ← mat001_ left | 08:54 |
| → mat001_ joined | 08:55 |
| → Sazhen86 joined | 08:57 |
| ← meator left | 08:57 |
| ← mat001 left | 08:58 |
| → meator joined | 08:59 |
| ← bolsonarogay left | 09:00 |
| → jimklimov joined | 09:04 |
| → jimklimov1 joined | 09:05 |
| → vysn joined | 09:06 |
| → unluckyshrubbery joined | 09:06 |
| ← EvilDMP left | 09:07 |
| ← jimklimov left | 09:08 |
| → pyeveryt_ joined | 09:08 |
| → bolsonarogay joined | 09:12 |
| → zer0bitz joined | 09:15 |
| → srinidhi joined | 09:18 |
| ← aniruddha left | 09:18 |
| ← pyeveryt_ left | 09:20 |
| ← meator left | 09:22 |
| → meator joined | 09:24 |
| ← Vonter left | 09:24 |
| ← lgc left | 09:25 |
| → Vonter joined | 09:26 |
| ← hnOsmium0001 left | 09:35 |
| → theoceaniscool joined | 09:39 |
| ← ttree left | 09:42 |
| → R2robot joined | 09:42 |
| → Guest83 joined | 09:44 |
| ← Guest83 left | 09:45 |
| ← R2robot left | 09:49 |
| → aniruddha joined | 09:59 |
| → natrys joined | 10:07 |
| → pyeverything joined | 10:17 |
| → Crispy joined | 10:19 |
| ← lemonsni- left | 10:19 |
| → lemonsnicks joined | 10:20 |
| ← john_johnk left | 10:21 |
| ← Sazhen86 left | 10:21 |
| ← onichomp left | 10:24 |
| → pretty_dumm_guy joined | 10:25 |
| ← pyeverything left | 10:25 |
| → john_johnk joined | 10:31 |
| ← bolsonarogay left | 10:33 |
| → R2robot joined | 10:35 |
| ← R2robot left | 10:36 |
| → bolsonarogay joined | 10:43 |
| ← AbleBacon left | 10:43 |
| → jetchisel joined | 10:46 |
| ← john_johnk left | 10:47 |
| → R2robot joined | 10:49 |
| ← zer0bitz left | 10:50 |
| → mat001 joined | 10:54 |
| ← ferz left | 10:54 |
| ← sargon left | 10:55 |
| → zer0bitz joined | 10:56 |
| ← mat001_ left | 10:57 |
| → subopt joined | 10:58 |
| subopt → _subopt | 10:58 |
| ← meator left | 10:58 |
| → john_johnk joined | 10:59 |
| → mat001_ joined | 10:59 |
| ← Codaraxis_ left | 10:59 |
| ← ackyshake left | 11:00 |
| → pyeveryt_ joined | 11:01 |
| ← mat001 left | 11:03 |
| ← R2robot left | 11:03 |
| → meator joined | 11:03 |
| → AnapodoPsalidaki joined | 11:05 |
| → ferz joined | 11:10 |
| ← pyeveryt_ left | 11:11 |
| → pyeveryt_ joined | 11:11 |
| ← pyeveryt_ left | 11:13 |
| → pyeveryt_ joined | 11:14 |
| ← Vonter left | 11:15 |
| → Vonter joined | 11:17 |
| ← wgrant left | 11:18 |
| ← pyeveryt_ left | 11:18 |
| → _xor joined | 11:24 |
| ← xiongxin8802 left | 11:24 |
| → xiongxin8802 joined | 11:25 |
| → wgrant joined | 11:30 |
| ← AnapodoPsalidaki left | 11:33 |
| → R2robot joined | 11:34 |
| → Adoi joined | 11:35 |
| ← Murr left | 11:38 |
| → Murr joined | 11:38 |
| ← Adoi left | 11:41 |
| jazzy2 → jazzy | 11:43 |
| → R2robot_ joined | 11:47 |
| → gnoo joined | 11:48 |
| ← R2robot left | 11:48 |
| → christall joined | 11:59 |
| → mat001 joined | 11:59 |
| ← R2robot_ left | 12:01 |
| ← mat001_ left | 12:03 |
| ← christall left | 12:04 |
| → pyeveryt_ joined | 12:04 |
| ← Vonter left | 12:09 |
| → Vonter joined | 12:10 |
| → hubble joined | 12:15 |
| ← Gustavo6046 left | 12:22 |
| → Gustavo6046 joined | 12:22 |
| → pelle joined | 12:26 |
| → Brumaire joined | 12:27 |
| ← pelle left | 12:34 |
| ← xiongxin8802 left | 12:35 |
| → xiongxin8802 joined | 12:36 |
| ← bodiccea left | 12:40 |
| → bodiccea joined | 12:40 |
| ← elastic_dog left | 12:42 |
| → elastic_dog joined | 12:47 |
| → pelle joined | 12:48 |
| ← john_johnk left | 12:49 |
| → thiago joined | 12:49 |
| → pelle_ joined | 12:50 |
| ← pelle left | 12:50 |
| ← pelle_ left | 12:50 |
| → john_johnk joined | 12:52 |
| → pelle joined | 12:52 |
| ← pelle left | 12:56 |
| ← thiago left | 13:00 |
| ← pyeveryt_ left | 13:04 |
| → kenanmarasli joined | 13:08 |
| → mat001_ joined | 13:11 |
| _subopt → subopt | 13:14 |
| ← mat001 left | 13:14 |
| subopt → _subopt | 13:15 |
| ← Brumaire left | 13:15 |
| → mat001 joined | 13:16 |
| → Brumaire joined | 13:16 |
| → christall joined | 13:18 |
| ← mat001_ left | 13:19 |
| → gareppa joined | 13:23 |
| ← gareppa left | 13:24 |
| → frm joined | 13:30 |
| → enoq joined | 13:31 |
| ← frm left | 13:36 |
| → pyeveryt_ joined | 13:38 |
| → Guest74 joined | 13:42 |
| ← hubble left | 13:44 |
|
Guest74
| .random | 13:44 |
|
gitinfo
| <cbreak> password generator: <cbreak> dd if=/dev/random bs=512 count=8 | openssl base64 [2] | 13:44 |
|
Guest74
| .random | 13:45 |
|
gitinfo
| tails (chosen by fair coin flip) [4] | 13:45 |
|
Guest74
| .random | 13:45 |
|
gitinfo
| < cbreak-work> you can only clone from existing repositories [24] | 13:45 |
|
Guest74
| .random | 13:45 |
|
gitinfo
| < jast> chmod +x .gitignore [32] | 13:45 |
|
Guest74
| .random | 13:45 |
|
gitinfo
| < cbreak-work> you can only clone from existing repositories [23] | 13:45 |
|
Guest74
| .random | 13:45 |
|
gitinfo
| Please donate more random statements to feed the bot. You don't want the bot to starve, do you? Well, if you don't donate, it will, and it'll be your fault, and you'll have to suffer the accusing stares from everyone else in the channel. [6] | 13:45 |
|
Guest74
| .random | 13:45 |
|
gitinfo
| tails (chosen by fair coin flip) [4] | 13:45 |
|
Guest74
| .random | 13:45 |
|
gitinfo
| bbbbbbaaaaaaaaaddddd [9] | 13:45 |
|
Guest74
| .random | 13:45 |
|
gitinfo
| bbbbbbaaaaaaaaaddddd [9] | 13:45 |
|
Guest74
| .random | 13:45 |
|
gitinfo
| <vork> Is there a git gc --rampage? [13] | 13:45 |
|
Guest74
| .random | 13:45 |
|
gitinfo
| Want to see a neat effect? Watch http://www.youtube.com/watch?v=0JVJsPpg1-8 -- ideally in fullscreen. when looking away at the end, look at your hand. I promise this is not a shock video. [16] | 13:45 |
| ← christall left | 13:48 |
| → pulse joined | 13:48 |
|
meator
| Howcan I get access permissions for a cgit repo? | 13:50 |
| ← Brumaire left | 13:50 |
| → Brumaire joined | 13:51 |
|
meator
| s/Howcan/How can/ | 13:51 |
|
Guest74
| .random | 13:51 |
|
gitinfo
| that's normal. Next patient! [18] | 13:51 |
|
Guest74
| .random | 13:51 |
|
gitinfo
| <+Eugene> Welcome to #git, where the history is made-up and the merges don't matter. [29] | 13:51 |
|
Guest74
| .random | 13:51 |
|
gitinfo
| <EugeneKay> jast - We wish you a merry gitmas <jast> aww, thanks <jast> and a happy new fork! <EugeneKay> And cheers to all who celebrate SVNukkah [22] | 13:51 |
|
Guest74
| .random | 13:51 |
|
gitinfo
| < cbreak-work> you can only clone from existing repositories [24] | 13:51 |
|
Guest74
| .random | 13:51 |
|
gitinfo
| <+Eugene> Welcome to #git, where the history is made-up and the merges don't matter. [29] | 13:51 |
|
Guest74
| .random | 13:51 |
|
gitinfo
| Things aren't working or working badly? Blaming Java, PHP or Rails is a good default. [20] | 13:51 |
|
Guest74
| .random | 13:51 |
|
gitinfo
| Want to see a neat effect? Watch http://www.youtube.com/watch?v=0JVJsPpg1-8 -- ideally in fullscreen. when looking away at the end, look at your hand. I promise this is not a shock video. [16] | 13:51 |
|
Guest74
| .random | 13:51 |
|
gitinfo
| man(){open "https://stackoverflow.com/search?q=$*"} [36] | 13:51 |
|
Guest74
| .random | 13:52 |
|
gitinfo
| <bremner> if it makes you feel better, I was going to mention reselling Linus's poop on ebay. But I restrained myself because that would be immature. [21] | 13:52 |
| ← xiongxin8802 left | 13:52 |
| → jwillikers joined | 13:52 |
| → xiongxin8802 joined | 13:53 |
|
cbreak
| Guest74: there's no need to spam here | 13:53 |
| → hubble joined | 13:53 |
|
Guest74
| im not trying to spam sorry this is my first time using the gitinfo bot and im curious about the random command | 13:53 |
|
| is there a way to use the bot in a way that won't spam public channels? | 13:54 |
| ← Guest74 left | 13:54 |
|
cbreak
| you can try /w it | 13:55 |
| → Guest73 joined | 13:56 |
| → chenxuezhao joined | 13:59 |
| → sharperguy joined | 13:59 |
|
sharperguy
| is there a tool similar to git gui but using ncurses? I'm mainly talking about the fact that staging/unstaging changes is so much quicker to do in git gui than with 'git add -p' and 'git commit' commands | 14:00 |
| ← Guest73 left | 14:00 |
|
pjb
| sharperguy: there's magit https://github.com/magit/magit ; not really ncurses, but emacs, which in a terminal is about the same. | 14:04 |
|
cbreak
| sharperguy: tig? | 14:05 |
| → WhatsApp joined | 14:06 |
|
sharperguy
| tig is really nice for viewing commit history but does it let you stage/unstage changes and make commits? | 14:06 |
| → mat001_ joined | 14:10 |
|
cbreak
| you need a gui for that? :O | 14:12 |
|
| git add / git commit can do that | 14:12 |
| ← mat001 left | 14:13 |
| → hornhack joined | 14:15 |
| → mat001 joined | 14:15 |
| → christall joined | 14:16 |
| ← hackinghorn left | 14:17 |
| ← mat001_ left | 14:18 |
| ← frobnic left | 14:22 |
| → frobnic joined | 14:24 |
|
meator
| Is it possible to find out if a repository is world writable? | 14:25 |
|
bremner
| a repository where? this is something external to git | 14:26 |
|
meator
| On the internet. How is this external to git? | 14:27 |
|
bremner
| because the details depend on how the repo is hosted | 14:27 |
|
sharperguy
| cbreak, git gui allows you to commit individual lines from files rather than the whole file. You can do this with the command line tools too, but i find it a lot faster with git gui. It's also a very lightweight tool, but the downside is it doesnt work over ssh etc | 14:28 |
|
bremner
| pretty sure cbreak knows that. | 14:29 |
|
sharperguy
| well he asked | 14:29 |
|
bremner
| meator: I guess the answer is "not in general", but if you give more details you might get a more useful answer | 14:30 |
|
cbreak
| I use git add -p | 14:31 |
|
| not sure how a gui can improve on that | 14:31 |
|
| especially onel imited to curses | 14:31 |
|
bremner
| e.g. magit is definitely better than add -p | 14:31 |
|
| at least I find add -p very fiddly to add a single line | 14:32 |
|
meator
| Oh. I have thought that git handles that. For example, let's talk about this repository: https://git.joeyh.name/index.cgi/moreutils.git/. | 14:32 |
|
bremner
| meator: OK, since I know joeyh, I can answer that it almost certainly is not world writable. But what is your real question? | 14:32 |
|
| Are you penetration testing random repos? | 14:32 |
| ← CommunistWolf left | 14:33 |
|
bremner
| or you just want to know how to send a patch? | 14:33 |
|
sharperguy
| thing about git add -p is you have to go through the file sequentially one hunk at a time rather than being able to see and overview of changes and just jump to the one you want | 14:34 |
|
meator
| I was just curious. I have thought that git manages these permissions. | 14:35 |
|
bremner
| meator: very few git repos are world (internet) writable. | 14:36 |
| ← christall left | 14:41 |
| → EvilDMP joined | 14:43 |
| → absc joined | 14:45 |
| ← absc left | 14:45 |
| ← chenxuezhao left | 14:46 |
| → chenxuezhao joined | 14:48 |
| ← enoq left | 14:48 |
| ← EvilDMP left | 14:50 |
| ← Brumaire left | 14:51 |
| → poprostumieciek joined | 14:56 |
| → ferdna joined | 14:56 |
| → AnAverageHuman joined | 14:56 |
| ← hubble left | 15:00 |
| ← meator left | 15:06 |
| ← pyeveryt_ left | 15:09 |
| → pyeveryt_ joined | 15:10 |
| ← pizdets left | 15:10 |
| → pizdets joined | 15:10 |
| → hnOsmium0001 joined | 15:11 |
| ← fflam left | 15:13 |
| → fflam joined | 15:19 |
| ← poprostumieciek left | 15:23 |
| ← kenanmarasli left | 15:25 |
| → kenanmarasli joined | 15:25 |
| → zmt01 joined | 15:27 |
| → christall joined | 15:30 |
| → poprostumieciek joined | 15:32 |
| ← xiongxin8802 left | 15:34 |
| ← chenxuezhao left | 15:39 |
| ← christall left | 15:40 |
| ← WhatsApp left | 15:41 |
| gjnoonan_ → gjnoonan | 15:42 |
| → ChmEarl joined | 15:42 |
| → chexum joined | 15:46 |
|
eschwartz
| bremner: magit requires emacs, which is quite often a major dealbreaker... | 15:49 |
| → Cleverness joined | 15:53 |
|
bremner
| eschwartz: sure. just a proof of concept though, that curses / TUI can do that particular job | 15:53 |
|
eschwartz
| hmm, true | 15:53 |
| ← vysn left | 15:55 |
| → mat001_ joined | 15:56 |
| ← mat001 left | 15:58 |
| → txtsd joined | 15:58 |
| ← stkrdknmibalz left | 16:00 |
| → poprostumieciek_ joined | 16:04 |
| ← poprostumieciek left | 16:05 |
| → AnapodoPsalidaki joined | 16:07 |
| ← average left | 16:11 |
| poprostumieciek_ → poprostumieciek | 16:20 |
| poprostumieciek → poprostumieciek_ | 16:20 |
| poprostumieciek_ → poprostumieciek | 16:20 |
| ← pulse left | 16:35 |
| → stkrdknmibalz joined | 16:36 |
| ← rsx left | 16:41 |
| → meator joined | 16:50 |
| → AbleBacon joined | 16:53 |
| ← gnoo left | 16:53 |
| → pulse joined | 16:54 |
| ← jazzy left | 16:55 |
| ← Xenguy left | 16:57 |
| → daoudr joined | 17:02 |
| _subopt → subopt | 17:02 |
| ← QtScripter left | 17:10 |
| → R2robot joined | 17:13 |
| → mat001 joined | 17:15 |
| ← mat001_ left | 17:18 |
| ← R2robot left | 17:22 |
| → ackyshake joined | 17:24 |
| → Xenguy joined | 17:25 |
| → Xaldafax joined | 17:26 |
| → R2robot joined | 17:27 |
| → skapata joined | 17:33 |
| ← skapata left | 17:33 |
| → skapata joined | 17:33 |
| → absc joined | 17:35 |
| ← atrigent left | 17:36 |
| → atrigent joined | 17:38 |
| → average joined | 17:39 |
| ← poprostumieciek left | 17:40 |
| → codebam joined | 17:40 |
| ← codebam left | 17:41 |
| ← absc left | 17:43 |
| → thetourist108 joined | 17:44 |
| → codebam joined | 17:45 |
| ← cweiss left | 17:48 |
| ← atrigent left | 17:52 |
| → codebam_ joined | 17:57 |
| ← codebam left | 17:57 |
| codebam_ → codebam | 17:57 |
| ← codebam left | 17:57 |
| ← meator left | 17:58 |
| → meator joined | 17:58 |
| ← daoudr left | 17:58 |
| ← john_johnk left | 18:00 |
| → codebam joined | 18:00 |
| ← hornhack left | 18:01 |
| ← codebam left | 18:01 |
| → john_johnk joined | 18:02 |
| ← AnAverageHuman left | 18:03 |
| → codebam joined | 18:03 |
| ← codebam left | 18:04 |
| → codebam joined | 18:05 |
| ← codebam left | 18:06 |
| → codebam joined | 18:07 |
| ← codebam left | 18:07 |
| → codebam joined | 18:08 |
| ← codebam left | 18:09 |
| → mat001_ joined | 18:10 |
| → codebam joined | 18:10 |
| ← codebam left | 18:11 |
| ← kenanmarasli left | 18:11 |
| → codebam joined | 18:11 |
| → AlwaysAGuest joined | 18:11 |
| ← codebam left | 18:12 |
| ← Strom left | 18:13 |
| ← mat001 left | 18:13 |
| ← elibrokeit left | 18:13 |
| → Strom joined | 18:14 |
| → elibrokeit joined | 18:15 |
| → atrigent joined | 18:15 |
| ← john_johnk left | 18:19 |
| → codebam joined | 18:20 |
| → john_johnk joined | 18:21 |
| ← palasso left | 18:23 |
| → AnAverageHuman joined | 18:23 |
| ← R2robot left | 18:23 |
| → otisolsen70 joined | 18:26 |
| ← pyeveryt_ left | 18:29 |
| → pyeveryt_ joined | 18:31 |
| → dskullz joined | 18:34 |
| ← pyeveryt_ left | 18:35 |
| ← betelgeuse left | 18:36 |
| ← dskull left | 18:36 |
| ← TheJollyRoger left | 18:36 |
| → TheJollyRoger joined | 18:37 |
| → betelgeuse joined | 18:37 |
| ← meator left | 18:38 |
| ← dskullz left | 18:39 |
| → christall joined | 18:41 |
| → absc joined | 18:41 |
| ← christall left | 18:46 |
| ← ddrtns^ left | 18:46 |
| ← Xenguy left | 18:51 |
| Trieste_ → Trieste | 18:53 |
| ← ferz left | 18:54 |
| → dskull joined | 18:58 |
| → pyeveryt_ joined | 19:00 |
| → cweiss joined | 19:02 |
| ← fflam left | 19:04 |
| ← XV8 left | 19:05 |
| → vysn joined | 19:06 |
| → Karel joined | 19:09 |
|
Karel
| Is there any way to get HEAD to still show up when doing git log --oneline --graph --branches? It's specifically the --branches that seems to remove HEAD from consideration. | 19:10 |
| → ferz joined | 19:10 |
|
ikke
| does git log --oneline --graph --branches HEAD work? | 19:11 |
|
Karel
| Ah yeah it does, thanks a lot! | 19:12 |
| → odoood joined | 19:14 |
| → ttree joined | 19:23 |
| → tdsltl^ joined | 19:25 |
| → Maxattax97 joined | 19:26 |
| → ZacSharp joined | 19:27 |
| → fflam joined | 19:28 |
| → thiago joined | 19:29 |
| ← odoood left | 19:30 |
| → mat001 joined | 19:30 |
| ← AnAverageHuman left | 19:31 |
| → computeiro joined | 19:31 |
| ← absc left | 19:32 |
| ← mat001_ left | 19:34 |
| → odoood joined | 19:34 |
| → XV8 joined | 19:34 |
| ← srinidhi left | 19:35 |
| ← XV8 left | 19:35 |
| ← zer0bitz left | 19:39 |
| ← codebam left | 19:39 |
| → codebam joined | 19:41 |
| → AnAverageHuman joined | 19:46 |
| ← average left | 19:49 |
| ← aniruddha left | 19:58 |
| ← molt left | 19:58 |
| → molt joined | 19:58 |
| ← odoood left | 20:01 |
| ← codebam left | 20:03 |
| → codebam joined | 20:05 |
| ← computeiro left | 20:05 |
| ← sa left | 20:06 |
| → gordonfish- joined | 20:07 |
| → sa joined | 20:07 |
| ← gordonfish left | 20:10 |
| ← rahl left | 20:15 |
| → rahl joined | 20:17 |
| ← AlwaysAGuest left | 20:18 |
| ← pyeveryt_ left | 20:24 |
| → pyeveryt_ joined | 20:25 |
| ← bolsonarogay left | 20:27 |
| ← pyeveryt_ left | 20:30 |
| → mat001_ joined | 20:42 |
| ← mat001 left | 20:44 |
| → pyeverything joined | 20:48 |
| → odoood joined | 20:52 |
| → hbautista joined | 20:56 |
| → Gustavo6046_ joined | 20:57 |
| ← Gustavo6046 left | 20:58 |
| → Lord_of_Life_ joined | 20:59 |
| Gustavo6046_ → Gustavo6046 | 21:00 |
| ← odoood left | 21:00 |
| ← Lord_of_Life left | 21:00 |
| Lord_of_Life_ → Lord_of_Life | 21:00 |
| ← theoceaniscool left | 21:01 |
| ← john_johnk left | 21:03 |
| → bolsonarogay joined | 21:03 |
| → john_johnk joined | 21:03 |
| → squirrel joined | 21:06 |
| → zebrag joined | 21:13 |
| → Xenguy joined | 21:15 |
| ← Gurkenglas left | 21:22 |
| → Brumaire joined | 21:29 |
| ← natrys left | 21:32 |
| ← Gustavo6046 left | 21:32 |
| → cfjk5 joined | 21:34 |
| cfjk5 → cfjk | 21:34 |
| ← ZacSharp left | 21:34 |
| → mat001 joined | 21:36 |
| → ZacSharp joined | 21:36 |
| → Gustavo6046 joined | 21:37 |
| ← mat001_ left | 21:39 |
| ← otisolsen70 left | 21:47 |
| → lgc joined | 21:47 |
| ← subopt left | 21:49 |
| ← Brumaire left | 21:51 |
| → jimklimov joined | 22:00 |
| ← jimklimov1 left | 22:03 |
| → jimklimov1 joined | 22:04 |
| ← jimklimov left | 22:05 |
| ← jwillikers left | 22:09 |
| ← Misotauros left | 22:13 |
| ← jimklimov1 left | 22:17 |
| ← Gustavo6046 left | 22:21 |
| → Gustavo6046_ joined | 22:21 |
| Gustavo6046_ → Gustavo6046 | 22:23 |
| ← ZacSharp left | 22:24 |
| → Misotauros joined | 22:24 |
| ← Karel left | 22:29 |
| ← ___nick___ left | 22:37 |
| ← m0viefreak left | 22:37 |
| → odoood joined | 22:42 |
| → christall joined | 22:43 |
| ← john_johnk left | 22:44 |
| → BlessJah_ joined | 22:45 |
| ← christall left | 22:47 |
| ← BlessJah left | 22:48 |
| → NeoCron joined | 22:49 |
| → mat001_ joined | 22:55 |
| ← NeoCron left | 22:57 |
| ← mat001 left | 22:59 |
| ← pizdets left | 23:04 |
| → pizdets_ joined | 23:04 |
| → onichomp joined | 23:07 |
| ← AnAverageHuman left | 23:16 |
| → AnAverageHuman joined | 23:26 |
| ← dgw left | 23:27 |
| → dgw joined | 23:30 |
| ← woink left | 23:35 |
| ← durham left | 23:36 |
| → mat001 joined | 23:40 |
| ← mat001_ left | 23:43 |
| → woink joined | 23:43 |
| → mat001_ joined | 23:44 |
| ← mat001 left | 23:47 |
| ← Samian left | 23:56 |
| → Samian joined | 23:56 |
| ← haskl[error] left | 23:57 |
| → haskl joined | 23:58 |
| ← vysn left | 23:58 |