| 2020-12-25 |
| ← unluckyshrubbery left | 00:02 |
| → eoli3n joined | 00:04 |
| ← sticks left | 00:05 |
| → jabster28 joined | 00:05 |
| → jaziz joined | 00:07 |
| ← thiago left | 00:10 |
| → thiago joined | 00:11 |
| ← jabster28 left | 00:11 |
| → Zining joined | 00:11 |
| ← aliss left | 00:12 |
| → watabou joined | 00:13 |
| → sgn joined | 00:16 |
| ← tiin57 left | 00:18 |
| → RaceCondition joined | 00:20 |
| ← RaceCondition left | 00:20 |
| → RaceCondition joined | 00:20 |
| ← RaceCondition left | 00:20 |
| → RaceCondition joined | 00:21 |
| ← RaceCondition left | 00:21 |
| → RaceCondition joined | 00:22 |
| ← RaceCondition left | 00:22 |
| → tiin57 joined | 00:22 |
| ← al3x27 left | 00:24 |
| → arcatech joined | 00:25 |
| → royal_screwup21 joined | 00:28 |
| ← mowcat left | 00:29 |
| ← royal_screwup21 left | 00:33 |
| → cloud69 joined | 00:34 |
| → jabster28 joined | 00:36 |
| ← jabster28 left | 00:41 |
| ← crose left | 00:46 |
| ← OnkelBlade left | 00:47 |
| → sentinal8473 joined | 00:48 |
| ← tiin57 left | 00:48 |
| ← cbreak left | 00:50 |
| → Maxattax joined | 00:50 |
| ← eoli3n left | 00:52 |
| → tiin57 joined | 00:52 |
| ← theoceaniscool left | 00:53 |
| → jabster28 joined | 00:55 |
| ← gavlee left | 00:55 |
| ← zmt00 left | 00:56 |
| ← Maxattax left | 00:57 |
| → zmt00 joined | 00:58 |
|
shush
| Is there a way to create a merge commit without moving the branch? | 01:00 |
| ← zmt00 left | 01:01 |
|
nedbat
| shush: you can make another branch | 01:02 |
|
shush
| Make another branch and then delete it? | 01:02 |
|
| Or merge then reset the branch back | 01:02 |
| ← pikapika left | 01:03 |
|
shush
| What I'm trying to do is create a merge commit and tag it | 01:03 |
| ← nikivi left | 01:03 |
| ← acetakwas left | 01:03 |
| → cd joined | 01:03 |
| → zmt00 joined | 01:04 |
| ← POQDavid left | 01:04 |
|
nedbat
| you want to merge the branch but keep developing the branch independently? | 01:04 |
| → nikivi joined | 01:05 |
| → acetakwas joined | 01:05 |
| ← nikivi left | 01:06 |
| ← acetakwas left | 01:07 |
| → POQDavid joined | 01:07 |
| → kupi joined | 01:08 |
| → pikapika joined | 01:09 |
| ← POQDavid left | 01:10 |
| → acetakwas joined | 01:11 |
| → royal_screwup21 joined | 01:11 |
| ← pikapika left | 01:12 |
| ← jabster28 left | 01:12 |
| → kalbasit joined | 01:13 |
| ← acetakwas left | 01:14 |
| → POQDavid joined | 01:15 |
| → pikapika joined | 01:15 |
| ← POQDavid left | 01:15 |
| → acetakwas joined | 01:16 |
| ← pikapika left | 01:16 |
| → pikapika joined | 01:18 |
| → nikivi joined | 01:18 |
| ← tiin57 left | 01:18 |
| ← acetakwas left | 01:19 |
| ← nikivi left | 01:19 |
| ← pikapika left | 01:20 |
| → tiin57 joined | 01:22 |
| → lukedashjr joined | 01:23 |
| ← watabou left | 01:23 |
| ← luke-jr left | 01:23 |
| → pikapika joined | 01:23 |
| → eoli3n joined | 01:24 |
| ← pikapika left | 01:25 |
| → pikapika joined | 01:26 |
| lukedashjr → luke-jr | 01:27 |
| ← pikapika left | 01:30 |
| → pikapika joined | 01:31 |
| ← arcatech left | 01:33 |
| ← pikapika left | 01:34 |
| ← m0viefreak left | 01:34 |
| → pikapika joined | 01:35 |
| ← pikapika left | 01:37 |
| → acetakwas joined | 01:37 |
| → pikapika joined | 01:38 |
| ← pikapika left | 01:38 |
| → pikapika joined | 01:39 |
| → nikivi joined | 01:40 |
| → jabster28 joined | 01:40 |
| ← eoli3n left | 01:40 |
| ← nikivi left | 01:40 |
| ← pikapika left | 01:41 |
| ← acetakwas left | 01:42 |
| → arcatech joined | 01:43 |
| → pikapika joined | 01:44 |
| → acetakwas joined | 01:44 |
| ← jabster28 left | 01:45 |
| ← acetakwas left | 01:45 |
| ← pikapika left | 01:47 |
| qpdb → Guest56907 | 01:47 |
| ← Guest56907 left | 01:47 |
| → Technodrome joined | 01:47 |
| → qpdb joined | 01:47 |
| ← tiin57 left | 01:48 |
| → jabster28 joined | 01:49 |
| → wmey joined | 01:50 |
| → tiin57 joined | 01:51 |
| ← arcatech left | 01:53 |
| ← jabster28 left | 01:54 |
| → pikapika joined | 01:55 |
| ← pikapika left | 01:56 |
| → pikapika joined | 01:57 |
| → jabster28 joined | 01:58 |
| ← pikapika left | 01:59 |
| → POQDavid joined | 02:02 |
| ← jabster28 left | 02:03 |
| → acetakwas joined | 02:05 |
| ← cdown left | 02:10 |
| → jabster28 joined | 02:13 |
| ← puff left | 02:14 |
| → puff joined | 02:15 |
| → nikivi joined | 02:15 |
| → pikapika joined | 02:17 |
| ← jabster28 left | 02:18 |
| ← tiin57 left | 02:19 |
| → tiin57 joined | 02:22 |
| → arcatech joined | 02:30 |
| ← tff^ left | 02:31 |
| ← F0rTex left | 02:32 |
| → F0rTex joined | 02:33 |
| ← kalbasit left | 02:37 |
| ← cliluw left | 02:38 |
| → kalbasit joined | 02:38 |
| ← arcatech left | 02:42 |
| → jabster28 joined | 02:42 |
| → arcatech joined | 02:46 |
| ← royal_screwup21 left | 02:47 |
| → royal_screwup21 joined | 02:48 |
| ← tiin57 left | 02:48 |
| ← thiago left | 02:51 |
| → tiin57 joined | 02:52 |
| → tsrt^ joined | 02:52 |
| ← royal_screwup21 left | 02:53 |
| → sticks joined | 02:54 |
| ← jabster28 left | 02:54 |
| ← sticks left | 02:59 |
| → kalbasit_ joined | 03:02 |
| → watabou joined | 03:02 |
| ← kalbasit left | 03:03 |
| ← zebrag left | 03:04 |
| ← bruce_lee left | 03:04 |
| → bruce_lee joined | 03:04 |
| ← bruce_lee left | 03:04 |
| → bruce_lee joined | 03:04 |
| → Maxattax joined | 03:05 |
| ← Maxattax left | 03:05 |
| → zebrag joined | 03:06 |
| → Goplat joined | 03:09 |
| ← watabou left | 03:13 |
| → mat001 joined | 03:14 |
| → xirhtogal joined | 03:16 |
| lagothrix → Guest33303 | 03:16 |
| ← Guest33303 left | 03:16 |
| xirhtogal → lagothrix | 03:16 |
| ← kalbasit_ left | 03:17 |
| → kalbasit joined | 03:18 |
| ← tiin57 left | 03:19 |
| ← mat001 left | 03:19 |
| → royal_screwup21 joined | 03:21 |
| → tiin57 joined | 03:22 |
| → jabster28 joined | 03:24 |
| ← Zining left | 03:25 |
| ← zsoc left | 03:26 |
| ← royal_screwup21 left | 03:26 |
| ← cads left | 03:29 |
| ← jabster28 left | 03:29 |
| → cads joined | 03:37 |
| → jabster28 joined | 03:41 |
| ← puff left | 03:41 |
| → puff joined | 03:42 |
| ← nomadicmathmo left | 03:48 |
| ← tiin57 left | 03:48 |
| ← jabster28 left | 03:49 |
| → tiin57 joined | 03:51 |
| ← shush left | 03:53 |
| → drbean joined | 03:53 |
| → shush joined | 03:54 |
| → Guest20 joined | 03:55 |
| → watabou joined | 03:56 |
| ← cads left | 03:58 |
| ← shush left | 03:58 |
| → royal_screwup21 joined | 04:01 |
| ← royal_screwup21 left | 04:07 |
| ← fachinformatiker left | 04:09 |
| → jabster28 joined | 04:11 |
| → fachinformatiker joined | 04:12 |
| ← fachinformatiker left | 04:12 |
| → fachinformatiker joined | 04:12 |
| ← Rez__ left | 04:14 |
| ← jabster28 left | 04:16 |
| ← tiin57 left | 04:18 |
| → uniminin joined | 04:20 |
| → tiin57 joined | 04:22 |
| → jabster28 joined | 04:25 |
| ← Technodrome left | 04:26 |
| ← jabster28 left | 04:30 |
| → shush joined | 04:34 |
| → vicfred joined | 04:38 |
| ← shush left | 04:40 |
| ← fifihyperbola left | 04:44 |
| ← kupi left | 04:47 |
| ← indy left | 04:48 |
| ← tiin57 left | 04:48 |
| → archpc- joined | 04:48 |
| ← archpc left | 04:49 |
| ← Masklin left | 04:50 |
| ← squirrel left | 04:50 |
| ← vancz left | 04:50 |
| → Masklin joined | 04:50 |
| → vancz joined | 04:50 |
| ← badeball left | 04:50 |
| → indy joined | 04:50 |
| ← ribasushi left | 04:51 |
| → royal_screwup21 joined | 04:52 |
| → badeball joined | 04:52 |
| → tiin57 joined | 04:52 |
| → ribasushi joined | 04:54 |
| → squirrel joined | 04:54 |
| ← royal_screwup21 left | 04:57 |
| → jabster28 joined | 05:07 |
| ← uniminin left | 05:09 |
| ← Guest20 left | 05:09 |
| ← jabster28 left | 05:12 |
| ← tkazi left | 05:16 |
| → tkazi joined | 05:16 |
| ← tiin57 left | 05:18 |
| → tiin57 joined | 05:22 |
| → jabster28 joined | 05:22 |
| ← kerframil left | 05:22 |
| ← jabster28 left | 05:27 |
| ← howdoi left | 05:30 |
| ← cloud69 left | 05:34 |
| ← qassim left | 05:36 |
| → qassim joined | 05:36 |
| → YuGiOhJCJ joined | 05:44 |
| → royal_screwup21 joined | 05:45 |
| ← jungdongho left | 05:45 |
| ← AnAverageHuman left | 05:46 |
| ← ilmostro left | 05:46 |
| ← tiin57 left | 05:48 |
| ← royal_screwup21 left | 05:50 |
| → tiin57 joined | 05:52 |
| ← random_yanek left | 05:53 |
| → jabster28 joined | 05:54 |
| ← andytoshi left | 05:54 |
| → andytoshi joined | 05:54 |
| ← jabster28 left | 06:00 |
| → jabster28 joined | 06:00 |
| ← PJBoy left | 06:02 |
| → random_yanek joined | 06:03 |
| → SuperLag joined | 06:04 |
| ← vicfred left | 06:05 |
| → Guest20 joined | 06:08 |
| ← jabster28 left | 06:08 |
| → vicfred joined | 06:10 |
| → jabster28 joined | 06:13 |
| ← tiin57 left | 06:19 |
| ← jabster28 left | 06:21 |
| → jabster28 joined | 06:21 |
| → tiin57 joined | 06:22 |
| → royal_screwup21 joined | 06:22 |
| → OnkelBlade joined | 06:22 |
| ← arcatech left | 06:26 |
| ← royal_screwup21 left | 06:27 |
| ← vicfred left | 06:30 |
| ← kfoonamalik left | 06:37 |
| → cliluw joined | 06:38 |
| → theoceaniscool joined | 06:39 |
| ← fatalhalt left | 06:40 |
| ← cliluw left | 06:43 |
| → jungdongho joined | 06:47 |
| ← tiin57 left | 06:48 |
| ← jabster28 left | 06:51 |
| → jabster28 joined | 06:51 |
| → tiin57 joined | 06:52 |
| ← jabster28 left | 06:59 |
| → greggerz_ joined | 06:59 |
| ← jungdongho left | 07:02 |
| ← greggerz__ left | 07:02 |
| → jabster28 joined | 07:02 |
| → cliluw joined | 07:08 |
| ← cliluw left | 07:13 |
| → shush joined | 07:15 |
| ← tiin57 left | 07:18 |
| → royal_screwup21 joined | 07:19 |
| ← shush left | 07:21 |
| → tiin57 joined | 07:22 |
| ← jabster28 left | 07:22 |
| → mat001 joined | 07:23 |
| → jabster28 joined | 07:23 |
| ← royal_screwup21 left | 07:24 |
| → qwerty joined | 07:33 |
| ← jabster28 left | 07:33 |
| → jabster28 joined | 07:34 |
| ← jabster28 left | 07:41 |
| → jabster28 joined | 07:43 |
| ← bn_work left | 07:48 |
| ← tiin57 left | 07:48 |
| → tiin57 joined | 07:52 |
| ← wrobinson left | 07:55 |
| ← jabster28 left | 08:02 |
| → jabster28 joined | 08:02 |
| ← Guest20 left | 08:02 |
| ← Goplat left | 08:03 |
| → Guest20 joined | 08:09 |
| ← luke-jr left | 08:11 |
| ← madewokherd left | 08:12 |
| → luke-jr joined | 08:14 |
| ← jabster28 left | 08:16 |
| → jabster28 joined | 08:16 |
| ← tiin57 left | 08:18 |
| → rcoote joined | 08:21 |
| → tiin57 joined | 08:21 |
| → cbreak joined | 08:31 |
| → darkbit joined | 08:32 |
| → calcul0n joined | 08:39 |
| → al3x27 joined | 08:39 |
| ← Deknos left | 08:41 |
| ← mat001 left | 08:43 |
| ← drbean left | 08:43 |
| → mat001 joined | 08:43 |
| → oxymoron93 joined | 08:45 |
| → amahl joined | 08:46 |
| → vicfred joined | 08:47 |
| ← mat001 left | 08:48 |
| → AugustusCaesar24 joined | 08:48 |
|
AugustusCaesar24
| hello everyone | 08:48 |
| ← tiin57 left | 08:48 |
|
AugustusCaesar24
| i made a git repo and then needed to revert and made some changes and want to push that but it is not letting me | 08:49 |
|
| should i force push it? | 08:49 |
|
oxymoron93
| !rewrite AugustusCaesar24 | 08:50 |
|
gitinfo
| Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum | 08:50 |
|
AugustusCaesar24
| its only me working on the repo right now and its private to me so far | 08:51 |
|
| oxymoron93 | 08:52 |
|
oxymoron93
| then, yeah, in order to overwrite previous history, `--force` option is necessary. | 08:52 |
| → tiin57 joined | 08:52 |
|
oxymoron93
| don't know what's the agreement about --force-with-lease versus --force | 08:53 |
|
AugustusCaesar24
| i dont know either actually | 08:56 |
|
jaziz
| alright so I'm reading that local repo consists of three 'trees' maintained by git | 09:00 |
|
| working directory, index, and HEAD | 09:00 |
|
| what exactly is the staging area? | 09:00 |
|
| I know working directory is exactly what it describes, and HEAD points to most recent commit | 09:00 |
| ← Betal left | 09:05 |
| → wrobinson joined | 09:07 |
| ← gigasu_shida left | 09:16 |
| → shush joined | 09:17 |
| ← Guest20 left | 09:17 |
| ← tiin57 left | 09:18 |
| → royal_screwup21 joined | 09:20 |
| → Guest20 joined | 09:21 |
|
oxymoron93
| index is basically the staging area, you could think of it as a commit-to-be, so when you run git commit, whatever is in staging area gets translated to commit object. you use git add to add stuff to it. It's a stage in preparation for new commit object. Have you checked the !book jaziz | 09:21 |
|
gitinfo
| 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 !parable | 09:21 |
| → tiin57 joined | 09:22 |
|
jaziz
| oxymoron93, ooo so it's where everything goes when you git add | 09:24 |
|
| I haven't read the book, but I'll check it out | 09:25 |
| ← royal_screwup21 left | 09:25 |
| ← shush left | 09:26 |
| ← hnOsmium0001 left | 09:29 |
| ← vicfred left | 09:34 |
| ← jabster28 left | 09:43 |
| → jabster28 joined | 09:44 |
| ← Oslander left | 09:45 |
| → Oslander joined | 09:47 |
| ← tiin57 left | 09:48 |
| → feriman joined | 09:50 |
| → tiin57 joined | 09:51 |
| ← jabster28 left | 09:54 |
| ← Daddy left | 09:54 |
| ← bruce_lee left | 09:54 |
| → jabster28 joined | 09:55 |
| ← novae left | 09:55 |
| → mat001 joined | 09:58 |
| ← jabster28 left | 10:00 |
| ← rosco_y left | 10:00 |
| ← AugustusCaesar24 left | 10:01 |
| → finalbeta joined | 10:01 |
| ← mat001 left | 10:02 |
| → jabster28 joined | 10:11 |
| → cdown joined | 10:16 |
| → jnavila joined | 10:18 |
| ← tiin57 left | 10:18 |
| → _noblegas joined | 10:19 |
| → novae joined | 10:20 |
| → cdown_ joined | 10:21 |
| → tiin57 joined | 10:22 |
| ← cdown left | 10:24 |
| cdown_ → cdown | 10:24 |
| ← qqx left | 10:25 |
| → misha joined | 10:25 |
| misha → Guest94851 | 10:25 |
| → eoli3n joined | 10:26 |
| → qqx joined | 10:26 |
| ← novae left | 10:27 |
| ← Guest94851 left | 10:29 |
| → novae joined | 10:30 |
| → Deknos joined | 10:36 |
| novae → chemsmith | 10:45 |
| ← tiin57 left | 10:48 |
| → tiin57 joined | 10:52 |
| ← eoli3n left | 11:06 |
| ← sentinal8473 left | 11:08 |
| ← watabou left | 11:09 |
| ← FFY00 left | 11:12 |
| → FFY00 joined | 11:13 |
| → rsx joined | 11:15 |
| ← tiin57 left | 11:18 |
| ← cd left | 11:19 |
| → royal_screwup21 joined | 11:21 |
| → tiin57 joined | 11:22 |
| → greggerz__ joined | 11:23 |
| → herren joined | 11:24 |
| → Technodrome joined | 11:24 |
| ← Lunatrius left | 11:25 |
| ← greggerz_ left | 11:25 |
| ← royal_screwup21 left | 11:26 |
| ← feriman left | 11:30 |
| → flashmozzg joined | 11:32 |
| → flashmozg joined | 11:34 |
| → drbean joined | 11:35 |
| → feriman joined | 11:36 |
| ← haritz left | 11:36 |
| → haritz joined | 11:37 |
| ← haritz left | 11:37 |
| → haritz joined | 11:37 |
| ← flashmozzg left | 11:37 |
| ← g00s left | 11:42 |
| ← cdown left | 11:44 |
| ← tiin57 left | 11:48 |
| → tiin57 joined | 11:51 |
| → Muimi joined | 11:52 |
| → thiago joined | 11:52 |
| ← Mattiaslndstrm left | 11:53 |
| → Mortir joined | 11:56 |
| → danilam joined | 11:58 |
| ← flashmozg left | 11:59 |
| ← thiago left | 12:00 |
| → thiago joined | 12:02 |
| ← benfelin left | 12:06 |
| ← fachinformatiker left | 12:11 |
| → crose joined | 12:11 |
| → fachinformatiker joined | 12:14 |
| ← fachinformatiker left | 12:14 |
| → fachinformatiker joined | 12:14 |
| → Lunatrius joined | 12:15 |
| → flashmozg joined | 12:17 |
| ← tiin57 left | 12:18 |
| → tiin57 joined | 12:22 |
| ← danilam left | 12:22 |
| ← YuGiOhJCJ left | 12:23 |
| → aliss joined | 12:26 |
| ← andy25225 left | 12:28 |
| → sgn1 joined | 12:28 |
| → Kaisyu joined | 12:28 |
| ← jabster28 left | 12:29 |
| ← sgn left | 12:29 |
| → fifihyperbola joined | 12:33 |
| → kupi joined | 12:35 |
| → cdown joined | 12:36 |
| → andy25225 joined | 12:37 |
| ← cdown left | 12:41 |
| ← wyre left | 12:45 |
| ← tiin57 left | 12:48 |
| → cdown joined | 12:49 |
| → wyre joined | 12:50 |
| → tiin57 joined | 12:52 |
| ← Guest20 left | 12:55 |
| → royal_screwup21 joined | 12:58 |
| → nomadicmathmo joined | 13:05 |
| → Borkr joined | 13:07 |
| ← staafl_r19 left | 13:08 |
| ← sweatsuit left | 13:11 |
| → staafl_r19 joined | 13:11 |
| → jabster28 joined | 13:13 |
| → danilam joined | 13:17 |
| ← tiin57 left | 13:18 |
| ← flashmozg left | 13:20 |
| → tiin57 joined | 13:22 |
| → sweatsuit joined | 13:23 |
| → shush joined | 13:23 |
| ← jabster28 left | 13:26 |
| ← bket left | 13:27 |
| → nomadicmathmo1 joined | 13:28 |
| ← nomadicmathmo left | 13:28 |
| nomadicmathmo1 → nomadicmathmo | 13:28 |
| ← shush left | 13:28 |
| → bket joined | 13:30 |
| ← vdamewood left | 13:31 |
| → calcul0n_ joined | 13:31 |
| ← calcul0n left | 13:33 |
| → Daddy joined | 13:38 |
| ← feriman left | 13:43 |
| ← tiin57 left | 13:48 |
| → feriman joined | 13:49 |
| → tiin57 joined | 13:51 |
| ← drbean left | 13:52 |
| → m0viefreak joined | 14:00 |
| → jabster28 joined | 14:02 |
| → cliluw joined | 14:03 |
| → kadobanana joined | 14:04 |
| ← mud left | 14:04 |
| ← cliluw left | 14:08 |
| → endiruna joined | 14:10 |
| ← eltoozero left | 14:12 |
| → mud joined | 14:14 |
| → eltoozero joined | 14:14 |
| ← kadobanana left | 14:15 |
| ← tiin57 left | 14:18 |
| ← Borkr left | 14:20 |
| ← jaziz left | 14:21 |
| → tiin57 joined | 14:21 |
| → Borkr joined | 14:22 |
| ← dpflick left | 14:23 |
| → flashmozg joined | 14:23 |
| ← danilam left | 14:25 |
| → Dieux joined | 14:27 |
| → dionysus69 joined | 14:32 |
| ← jabster28 left | 14:37 |
| ← Kaisyu left | 14:38 |
| ← royal_screwup21 left | 14:39 |
| → kadobanana joined | 14:40 |
| → royal_screwup21 joined | 14:40 |
| ← mud left | 14:41 |
| ← royal_screwup21 left | 14:45 |
| ← perrier-jouet left | 14:45 |
| ← tiin57 left | 14:48 |
| → tiin57 joined | 14:51 |
| ← kadobanana left | 14:53 |
| → royal_screwup21 joined | 14:55 |
| → Tabstar joined | 14:56 |
| ← Tabmow left | 14:57 |
| ← Borkr left | 14:57 |
| Tabstar → Tabmow | 14:57 |
| → perrier-jouet joined | 15:00 |
| ← perrier-jouet left | 15:03 |
| ← kupi left | 15:04 |
| → kadobanana joined | 15:04 |
| ← featurive left | 15:05 |
| → danilam joined | 15:06 |
| → f-chymera joined | 15:06 |
| → perrier-jouet joined | 15:07 |
| ← Tabmow left | 15:07 |
| ← flashmozg left | 15:08 |
| ← chymera left | 15:09 |
| → featurive joined | 15:14 |
| → AnAverageHuman joined | 15:14 |
| ← OnkelBlade left | 15:15 |
| ← royal_screwup21 left | 15:16 |
| → royal_screwup21 joined | 15:17 |
| ← Muimi left | 15:17 |
| ← royal_screwup21 left | 15:18 |
| ← f-chymera left | 15:18 |
| → royal_screwup21 joined | 15:18 |
| ← tiin57 left | 15:18 |
| ← cdown left | 15:19 |
| → chymera joined | 15:19 |
| → benfelin joined | 15:20 |
| ← adlternative left | 15:22 |
| → tiin57 joined | 15:22 |
| ← royal_screwup21 left | 15:23 |
| → mat001 joined | 15:23 |
| ← dionysus69 left | 15:24 |
| → fuzzface joined | 15:26 |
| → sentinal8473 joined | 15:27 |
| → greggerz_ joined | 15:28 |
| ← greggerz__ left | 15:31 |
| ← mescalinum left | 15:33 |
| ← fifihyperbola left | 15:33 |
| ← andy25225 left | 15:35 |
| → mescalinum joined | 15:37 |
| → flashmozg joined | 15:42 |
| ← danilam left | 15:45 |
| → andy25225 joined | 15:46 |
| ← zefferno_ left | 15:47 |
| ← tiin57 left | 15:48 |
| → danilam joined | 15:50 |
| → madewokherd joined | 15:51 |
| → tiin57 joined | 15:52 |
| ← flashmozg left | 15:53 |
| → Maxattax joined | 15:53 |
| → royal_screwup21 joined | 15:54 |
| → cd joined | 15:54 |
| ← oxymoron93 left | 15:55 |
| → dudek joined | 15:57 |
| ← royal_screwup21 left | 15:59 |
| → liefer joined | 15:59 |
| → dionysus69 joined | 16:00 |
| ← Dieux left | 16:01 |
| → Dieux joined | 16:02 |
| → zefferno joined | 16:04 |
| → lmmx joined | 16:04 |
| → cdown joined | 16:08 |
| ← benfelin left | 16:17 |
| ← tiin57 left | 16:18 |
| → PJBoy joined | 16:18 |
| → elibrokeit joined | 16:19 |
| ← _noblegas left | 16:20 |
| → tiin57 joined | 16:21 |
| ← Atlenohen left | 16:25 |
| ← feriman left | 16:25 |
| → feriman joined | 16:28 |
| → Tabmow joined | 16:29 |
| → kayprish joined | 16:30 |
| → jabster28 joined | 16:33 |
| → flashmozg joined | 16:35 |
| ← zefferno left | 16:35 |
| ← bket left | 16:36 |
| ← ghost43 left | 16:37 |
| ← nomadicmathmo left | 16:37 |
| → ghost43 joined | 16:38 |
| ← jabster28 left | 16:38 |
| → nomadicmathmo joined | 16:38 |
| ← danilam left | 16:38 |
| ← gadget left | 16:39 |
| → bket joined | 16:40 |
| ← kayprish left | 16:41 |
| → zefferno joined | 16:42 |
| ← maxwilliamson left | 16:45 |
| → maxwilliamson joined | 16:45 |
| → royal_screwup21 joined | 16:46 |
| ← zefferno left | 16:47 |
| ← tiin57 left | 16:48 |
| ← royal_screwup21 left | 16:49 |
| → royal_screwup21 joined | 16:49 |
| → tiin57 joined | 16:51 |
| → Mattiaslndstrm joined | 16:53 |
| sgn1 → sgn | 16:56 |
| ← Tabmow left | 16:56 |
| ← flashmozg left | 16:57 |
| → shush joined | 17:00 |
| ← mat001 left | 17:01 |
| ← royal_screwup21 left | 17:03 |
| → Tabmow joined | 17:03 |
| → royal_screwup21 joined | 17:03 |
| → fifihyperbola joined | 17:06 |
| → Kofola joined | 17:08 |
| ← royal_screwup21 left | 17:09 |
| ← Kofola left | 17:09 |
| → zsoc joined | 17:09 |
| ← zsoc left | 17:09 |
| → zsoc joined | 17:09 |
| ← rustyshackleford left | 17:18 |
| ← tiin57 left | 17:18 |
| ← aliss left | 17:19 |
| → tiin57 joined | 17:22 |
| ← fachinformatiker left | 17:22 |
| ← sentinal8473 left | 17:23 |
| → Guest20 joined | 17:24 |
| ← Guest20 left | 17:26 |
| → fachinformatiker joined | 17:26 |
| ← fachinformatiker left | 17:26 |
| → fachinformatiker joined | 17:26 |
| → royal_screwup21 joined | 17:27 |
| ← calcul0n_ left | 17:30 |
| → mat001 joined | 17:32 |
| ← rsx left | 17:32 |
| → Guest20 joined | 17:38 |
| → nomadicmathmo1 joined | 17:43 |
| → Xenguy joined | 17:43 |
| ← nomadicmathmo left | 17:45 |
| nomadicmathmo1 → nomadicmathmo | 17:45 |
| ← wunderba_ left | 17:46 |
| → wunderbar joined | 17:47 |
| ← tiin57 left | 17:48 |
| ← yitz left | 17:48 |
| ← wunderbar left | 17:52 |
| → tiin57 joined | 17:52 |
| → DougC joined | 17:52 |
| → wunderbar joined | 17:52 |
| → kerframil joined | 17:54 |
| → rustyshackleford joined | 18:04 |
| ← shush left | 18:04 |
| ← nomadicmathmo left | 18:07 |
| → nomadicmathmo joined | 18:07 |
| → sgn1 joined | 18:07 |
| ← sgn left | 18:09 |
| ← DougC left | 18:10 |
| ← royal_screwup21 left | 18:12 |
| → royal_screwup21 joined | 18:12 |
| → OnkelBlade joined | 18:14 |
| ← royal_screwup21 left | 18:18 |
| ← tiin57 left | 18:18 |
| → tiin57 joined | 18:22 |
| ← moldorcoder7 left | 18:23 |
| → moldorcoder7 joined | 18:24 |
| → sgn joined | 18:24 |
| ← nomadicmathmo left | 18:26 |
| → nomadicmathmo joined | 18:26 |
| ← endiruna left | 18:26 |
| ← sgn1 left | 18:28 |
| ← Guest20 left | 18:28 |
| ← lmmx left | 18:29 |
| → jabster28 joined | 18:33 |
| → lmmx joined | 18:34 |
| ← mat001 left | 18:35 |
| → sgn1 joined | 18:36 |
| ← sgn left | 18:38 |
| ← jabster28 left | 18:38 |
| ← lmmx left | 18:40 |
| → Lord_of_Life_ joined | 18:42 |
| ← Lord_of_Life left | 18:45 |
| Lord_of_Life_ → Lord_of_Life | 18:45 |
| → vicfred joined | 18:48 |
| ← tiin57 left | 18:48 |
| → hnOsmium0001 joined | 18:48 |
| → tiin57 joined | 18:52 |
| ← sgn1 left | 19:00 |
| → sgn joined | 19:01 |
| ← mescalinum left | 19:04 |
| → gadget joined | 19:13 |
| ← andy25225 left | 19:14 |
| → andy25225 joined | 19:16 |
| → kes joined | 19:16 |
| ← tiin57 left | 19:18 |
| → tiin57 joined | 19:22 |
| → jabster28 joined | 19:25 |
| → watabou joined | 19:26 |
| ← Technodrome left | 19:29 |
| → calcul0n_ joined | 19:30 |
| → Goplat joined | 19:36 |
| ← amahl left | 19:39 |
| ← nomadicmathmo left | 19:39 |
| → Betal joined | 19:41 |
| ← meropyri left | 19:41 |
| → meropyri joined | 19:41 |
| ← kes left | 19:46 |
| → ferdna joined | 19:48 |
| ← tiin57 left | 19:48 |
| ← moldorcoder7 left | 19:50 |
| ← jabster28 left | 19:50 |
| ← watabou left | 19:52 |
| → tiin57 joined | 19:52 |
| ← PJBoy left | 19:58 |
| ← darkbit left | 20:05 |
| → cads joined | 20:06 |
| → arcatech joined | 20:06 |
| → moldorcoder7 joined | 20:06 |
| → gonzo joined | 20:10 |
| → watabou joined | 20:11 |
| ← fachinformatiker left | 20:12 |
| → cads2 joined | 20:12 |
| → cdown_ joined | 20:13 |
| ← cdown left | 20:13 |
| cdown_ → cdown | 20:14 |
| → fachinformatiker joined | 20:15 |
| ← fachinformatiker left | 20:15 |
| → fachinformatiker joined | 20:15 |
| ← keiser left | 20:15 |
| ← moldorcoder7 left | 20:17 |
| ← tiin57 left | 20:18 |
| → Newami joined | 20:19 |
| ← Newami left | 20:22 |
| → tiin57 joined | 20:22 |
| → mat001 joined | 20:24 |
| → royal_screwup21 joined | 20:24 |
| → bol_out joined | 20:24 |
| ← royal_screwup21 left | 20:27 |
| → royal_screwup21 joined | 20:27 |
| ← mat001 left | 20:28 |
| ← austin987 left | 20:32 |
| ← royal_screwup21 left | 20:32 |
| ← ferdna left | 20:37 |
| → moldorcoder7 joined | 20:38 |
| ← tejr left | 20:39 |
| → tejr joined | 20:40 |
| ← tejr left | 20:40 |
| → gioyik joined | 20:44 |
| → shabius_ joined | 20:45 |
| → tejr joined | 20:45 |
| ← powerhouse left | 20:45 |
| ← gonzo left | 20:46 |
| → austin987 joined | 20:46 |
| → kupi joined | 20:48 |
| → gonzo joined | 20:48 |
| ← shabius left | 20:48 |
| ← tiin57 left | 20:48 |
| → adder joined | 20:51 |
|
adder
| hello, i want to sign all previous commits, i came across this https://stackoverflow.com/questions/41882919/is-there-a-way-to-gpg-sign-all-previous-commits and tried this command: git rebase --exec 'git commit --amend --no-edit -n -S' -i --root | 20:51 |
|
| however, i think it duplicated my history | 20:51 |
| → dermoth_ joined | 20:51 |
| → tiin57 joined | 20:52 |
| ← dermoth left | 20:52 |
| dermoth_ → dermoth | 20:52 |
| ← gonzo left | 20:53 |
| ← fifihyperbola left | 20:54 |
| ← cads left | 20:54 |
| ← cads2 left | 20:55 |
| → powerhouse joined | 20:55 |
|
osse
| adder: it will rewrite all commits | 20:55 |
|
adder
| yeah but in my log i see the entire history twice | 20:55 |
|
osse
| the history will look duplicated if e.g. you haven't pushed yet show the log of master and origin/master at the same time | 20:56 |
|
adder
| yeah i haven't pushed | 20:56 |
|
| i want to ask, will commit dates be preserved? | 20:56 |
|
osse
| author date, yes. commit date, no. | 20:56 |
|
| Imo. what you are doing isn't really worth doing. If you just sign the newest commit then you have effectively signed all commits leading up to it | 20:57 |
|
adder
| okay, i won't do it then. thank you | 20:59 |
|
osse
| de nada | 21:03 |
| → cads2 joined | 21:06 |
| → cads joined | 21:06 |
| → Xenguy_ joined | 21:14 |
| ← Xenguy_ left | 21:15 |
| ← austin987 left | 21:16 |
| ← Xenguy left | 21:17 |
|
energizer
| what gets hashed into the sha of an annotated tag? | 21:17 |
|
osse
| energizer: the hash of the tag object itself | 21:18 |
| ← tiin57 left | 21:18 |
|
energizer
| osse: but not the commit it points to? | 21:18 |
|
osse
| annotated tags have their own type of object, similar to a commit | 21:18 |
|
| energizer: correct | 21:18 |
|
energizer
| thanks | 21:18 |
|
| i have another question but it might not make sense at first (or indeed at all) | 21:19 |
|
| suppose i have two commits each containing my.txt , in the first commit it's a\nb and in the second commit it's b\na | 21:20 |
|
| er a\nb\n and b\na\n | 21:21 |
| → keiser joined | 21:21 |
| → tiin57 joined | 21:21 |
| → jungdongho joined | 21:22 |
|
energizer
| as we know, git stores snapshots, not diffs | 21:22 |
|
osse
| :O | 21:22 |
| ← keiser left | 21:22 |
|
osse
| (kidding) | 21:22 |
|
energizer
| but, i think it actually does store diffs, in packfiles, right? | 21:23 |
|
osse
| it uses some sort of delta compression when creating the packfiles, yes. | 21:23 |
|
| But I don't think it's a diff in the patch sense | 21:24 |
|
energizer
| how do you mean? | 21:24 |
|
| well i know what you mean | 21:25 |
|
| https://git-scm.com/docs/pack-format | 21:25 |
|
| can i make my own pack format? | 21:26 |
| ← arcatech left | 21:28 |
| → arcatech joined | 21:31 |
| → gonzo joined | 21:35 |
| ← calcul0n_ left | 21:35 |
| → mescalinum joined | 21:36 |
| → Mental_Inflation joined | 21:38 |
| ← arcatech left | 21:38 |
| ← Mental_Inflation left | 21:38 |
| → royal_screwup21 joined | 21:40 |
| ← cdown left | 21:44 |
| → cdown joined | 21:44 |
| ← envex left | 21:44 |
| → arcatech joined | 21:44 |
| ← Abdullah left | 21:45 |
| → keiser joined | 21:45 |
| → envex joined | 21:45 |
| ← keiser left | 21:47 |
| ← rcoote left | 21:47 |
| → sserra joined | 21:48 |
| ← tiin57 left | 21:48 |
| ← cads left | 21:49 |
| ← cads2 left | 21:50 |
| ← royal_screwup21 left | 21:50 |
| → cads2 joined | 21:50 |
| → cads joined | 21:50 |
| → royal_screwup21 joined | 21:50 |
| → tiin57 joined | 21:51 |
|
Seveas
| sure, why not. But you'll need to patch git to use it :) | 21:53 |
|
| energizer: a tag object contains the hash oof the object (usually commit) it points to. So the sha of the tag does take this commit into account. | 21:54 |
|
osse
| energizer: I mean that it's more like a general purpose compression (it can "diff" any version of any file with any other, not just one file against the prior version of itself) | 21:54 |
| ← royal_screwup21 left | 21:55 |
| → royal_screwup21 joined | 21:55 |
| ← natechan left | 22:00 |
| ← royal_screwup21 left | 22:05 |
| → royal_screwup21 joined | 22:05 |
| → natechan joined | 22:06 |
| ← cads2 left | 22:09 |
| ← cads left | 22:09 |
| ← envex left | 22:12 |
| ← gonzo left | 22:14 |
| ← tiin57 left | 22:18 |
| ← royal_screwup21 left | 22:18 |
| → royal_screwup21 joined | 22:19 |
| → cads2 joined | 22:22 |
| → cads joined | 22:22 |
| → tiin57 joined | 22:22 |
| ← foul_owl left | 22:23 |
| ← royal_screwup21 left | 22:23 |
| → Newami joined | 22:24 |
| ← prit left | 22:25 |
| ← kwilczynski left | 22:25 |
| ← disruptivenl left | 22:25 |
| ← Tabmow left | 22:26 |
| → disruptivenl joined | 22:26 |
| ← Newami left | 22:26 |
| ← dunk left | 22:26 |
| ← zalun left | 22:27 |
| ← jungdongho left | 22:27 |
| ← Maxattax left | 22:28 |
| ← NightStrike left | 22:31 |
| ← SrPx left | 22:31 |
| → zalun joined | 22:31 |
| → dunk joined | 22:31 |
| → kwilczynski joined | 22:31 |
| → NightStrike joined | 22:32 |
| → SrPx joined | 22:32 |
| → prit joined | 22:34 |
| → PJBoy joined | 22:34 |
| ← feriman left | 22:34 |
| ← tiin57 left | 22:48 |
| ← Mortir left | 22:51 |
| → tiin57 joined | 22:51 |
| → fifihyperbola joined | 22:56 |
| ← perrier-jouet left | 22:56 |
| ← jnavila left | 22:58 |
| → Xenguy joined | 23:17 |
| → nomadicmathmo joined | 23:18 |
| ← tiin57 left | 23:18 |
| ← zsoc left | 23:21 |
| → tiin57 joined | 23:22 |
| ← nomadicmathmo left | 23:26 |
| ← Mattiaslndstrm left | 23:29 |
| → nomadicmathmo joined | 23:37 |
| → nomadicmathmo1 joined | 23:39 |
| → ferdna joined | 23:40 |
| ← nomadicmathmo left | 23:42 |
| nomadicmathmo1 → nomadicmathmo | 23:42 |
| ← tiin57 left | 23:48 |
| Hash → chmod | 23:50 |
| → perrier-jouet joined | 23:51 |
| → tiin57 joined | 23:52 |
| ← dionysus69 left | 23:52 |
| → jungdongho joined | 23:56 |
| → jaziz joined | 23:58 |