| 2020-04-26 |
| ← tgunr left | 00:00 |
| ← azwieg103 left | 00:03 |
| → azwieg103 joined | 00:03 |
| → troulouliou_div2 joined | 00:05 |
| ← mauz555 left | 00:05 |
| ← relipse left | 00:06 |
| ← tiin57 left | 00:11 |
| ← davispuh left | 00:12 |
| → nabil joined | 00:12 |
| → nowhere_man joined | 00:13 |
| → tiin57 joined | 00:14 |
| ← nabil left | 00:17 |
| ← xinming left | 00:20 |
| → xinming joined | 00:21 |
| ← silverwhitefish left | 00:24 |
| → mauz555 joined | 00:25 |
| → relipse joined | 00:27 |
| ← mauz555 left | 00:30 |
| → silverwhitefish joined | 00:30 |
| ← silverwhitefish left | 00:34 |
| → Xeyame joined | 00:39 |
| → sgn joined | 00:40 |
| → roadie joined | 00:40 |
| ← tiin57 left | 00:41 |
| ← wootehfoot left | 00:44 |
| → tiin57 joined | 00:44 |
| ← roadie left | 00:47 |
| → jaziz joined | 00:48 |
| ← yawkat left | 00:50 |
| ← AtumT left | 00:51 |
| ← lucasb left | 00:53 |
| → silverwhitefish joined | 01:02 |
| → Technodrome joined | 01:02 |
| → yawkat joined | 01:03 |
| ← azwieg103 left | 01:04 |
| ← mowcat left | 01:07 |
| ← m0viefreak left | 01:09 |
| → navidr joined | 01:10 |
| ← causasui left | 01:10 |
| ← tiin57 left | 01:11 |
| ← Brainium left | 01:13 |
| → tiin57 joined | 01:14 |
| ← cd left | 01:27 |
| → causasui joined | 01:29 |
| ← ferdna left | 01:31 |
| ← zalt__ left | 01:34 |
| → roadie joined | 01:35 |
| ← braj left | 01:36 |
| ← roadie left | 01:39 |
| ← tiin57 left | 01:41 |
| ← g00s left | 01:41 |
| → tiin57 joined | 01:44 |
| ← led_belly left | 01:46 |
| → pandakekok9 joined | 01:55 |
| ← gambl0re left | 01:58 |
| ← xinming left | 02:00 |
| → xinming joined | 02:01 |
| ← stevenbenner left | 02:01 |
| ← troulouliou_div2 left | 02:04 |
| → blahboybaz joined | 02:08 |
|
blahboybaz
| Really stupid question.. does HEAD move from one branch to another when you checkout different branches? | 02:09 |
| ← pandakekok9 left | 02:11 |
| ← tiin57 left | 02:11 |
|
dayu
| blahboybaz: no, it simply point to the new branch. | 02:12 |
|
blahboybaz
| dayu: That's kinda what I meant | 02:13 |
| ← xinming left | 02:13 |
| → xinming joined | 02:13 |
| → tiin57 joined | 02:14 |
|
blahboybaz
| If I make a new branch I'm just creating a named pointer to the commit the the branch comes off of (in other words, the branch HEAD is pointing to when the new branch is created) right? But HEAD still points to the branch I'm on until I switch to the new branch I just created. When I do a checkout <new-branch> then HEAD points to the new branch (in other words, points to the named pointer which is pointing to the commit where HEAD | 02:16 |
|
| was when I created the branch). Is this accurate? | 02:16 |
|
| Is there some way to output the memory address of all the pointers in a repository at any given moment? | 02:17 |
| ← SpeakerToMeat_ left | 02:18 |
| → gambl0re joined | 02:18 |
| ← bettencb left | 02:21 |
| → edwardly joined | 02:25 |
|
rafasc
| blahboybaz: you are correct. | 02:25 |
| lagothrix → Guest14287 | 02:26 |
| ← Guest14287 left | 02:26 |
|
rafasc
| Also, you can see all references with: git for-each-ref | 02:26 |
| → lagothrix joined | 02:26 |
|
rafasc
| or git show-ref. | 02:27 |
| ← darkbit left | 02:29 |
| → roadie joined | 02:29 |
| → SpeakerToMeat_ joined | 02:29 |
| ← roadie left | 02:34 |
| ← Cabanossi left | 02:37 |
|
blahboybaz
| rafasc: thanks | 02:38 |
|
| Is it possible to stash only some of the changes that were done prior to a commit? | 02:40 |
| ← tiin57 left | 02:41 |
|
blahboybaz
| So say I make 3 changes, I stash one of them stage and commit the other 3, then unstash the first one to do something more with it. | 02:41 |
| → Cabanossi joined | 02:43 |
| → tiin57 joined | 02:44 |
|
dornick
| git stash push pathspec | 02:44 |
|
blahboybaz
| oh | 02:45 |
|
| dornick: And I'm guess a stash follows you to other branches the same as uncommitted work does? | 02:45 |
|
dornick
| or you can do git stash save --patch | 02:45 |
|
blahboybaz
| If I switch to another branch without commiting the work follows me there and gets committed to whatever branch I'm on when I perform the commit. | 02:47 |
|
| This makes it possible to perform work on one branch and commit it on a different branch but I wonder if involving stash gets me the same result | 02:48 |
|
dornick
| similar result yes | 02:48 |
|
blahboybaz
| well gooollly! | 02:49 |
|
| I think what I thought was a mistake a week ago turns out to be my answer :) | 02:49 |
| → YuGiOhJCJ joined | 02:51 |
|
blahboybaz
| Stashed is stashed right? I should also be able to merge while somethign is stashed and not have theh stashed work become a part of the merge? | 02:54 |
| ← SpeakerToMeat_ left | 02:55 |
| → nabil joined | 02:59 |
| → ferdna joined | 02:59 |
| ← danielzgtg left | 03:00 |
| → SpeakerToMeat_ joined | 03:01 |
| → zalt__ joined | 03:08 |
| ← dartmouthed left | 03:10 |
|
rafasc
| yes. What is stashed lives in a complete different place. | 03:10 |
| ← tiin57 left | 03:11 |
| ← royal_screwup21 left | 03:11 |
| → tiin57 joined | 03:14 |
| ← akem left | 03:16 |
| ← dayu left | 03:19 |
| ← Narrat left | 03:20 |
| → roadie joined | 03:23 |
| → bettencb joined | 03:23 |
| → miklcct joined | 03:24 |
| ← miklcct left | 03:26 |
| ← roadie left | 03:28 |
| → led_belly joined | 03:29 |
| → danielzgtg joined | 03:31 |
| ← smichel17 left | 03:33 |
| → ferche23 joined | 03:33 |
| → miklcct joined | 03:36 |
| ← tiin57 left | 03:41 |
| → tiin57 joined | 03:44 |
| ← cbreak left | 03:44 |
| → cbreak joined | 03:46 |
| ← miklcct left | 03:47 |
| → miklcct joined | 03:47 |
| → vdamewood joined | 03:49 |
| → aw1__ joined | 03:51 |
| ← atrigent left | 03:52 |
| ← aw1_ left | 03:54 |
| ← navidr left | 03:58 |
| ← zalt__ left | 03:58 |
| → chandoo joined | 04:00 |
| → atrigent joined | 04:03 |
| ← tiin57 left | 04:11 |
| → tiin57 joined | 04:14 |
| → roadie joined | 04:18 |
| ← dmc left | 04:18 |
| ← SpeakerToMeat_ left | 04:19 |
| → dmc joined | 04:21 |
| ← roadie left | 04:22 |
| ← mnglssrspndr left | 04:25 |
| → mauz555 joined | 04:25 |
| ← xinming left | 04:27 |
| ← rafasc left | 04:27 |
| → xinming joined | 04:27 |
| → braj joined | 04:29 |
| ← nabil left | 04:29 |
| ← mauz555 left | 04:29 |
| → SpeakerToMeat_ joined | 04:31 |
| ← LionsMane left | 04:35 |
| ← tiin57 left | 04:40 |
| → inkbottle joined | 04:43 |
| ← xinming left | 04:43 |
| → freeman42x joined | 04:44 |
| ← zebrag left | 04:44 |
| → xinming joined | 04:44 |
| → tiin57 joined | 04:44 |
| ← Wetmelon left | 04:52 |
| ← Cabanossi left | 04:54 |
| ← relipse left | 04:56 |
| ← Technodrome left | 04:59 |
| → jgrim joined | 05:01 |
| → Metalsutton joined | 05:01 |
| ← PikaChokeMe left | 05:01 |
| → pks_ joined | 05:01 |
| → Cabanossi joined | 05:02 |
| → roadie joined | 05:02 |
| ← pks left | 05:03 |
| pks_ → pks | 05:03 |
| → Timvde joined | 05:04 |
| ← SpeakerToMeat_ left | 05:04 |
| ← chandoo left | 05:04 |
| ← ferche23 left | 05:05 |
| ← freeman42x left | 05:05 |
| → freeman42x joined | 05:07 |
| ← roadie left | 05:07 |
| → buttercrust joined | 05:07 |
| ← freeman42x left | 05:10 |
| → navidr joined | 05:10 |
| ← tiin57 left | 05:10 |
| → nabil joined | 05:12 |
| ← nabil left | 05:12 |
| ← fitzgerald1337 left | 05:12 |
| → SpeakerToMeat_ joined | 05:14 |
| → tiin57 joined | 05:14 |
| → B_m_N joined | 05:15 |
| → roadie joined | 05:15 |
| → florekm joined | 05:17 |
|
blahboybaz
| Does a fork remain up to date with changes made to the original repo it was forked from? | 05:19 |
| ← sinhue left | 05:20 |
|
_W_
| blahboybaz: depends what you mean by "fork", but mostly, no, unless you make it so. E.g. a clone *can be* kept up to date with a remote it was cloned from, using git pull | 05:21 |
| ← SpeakerToMeat_ left | 05:24 |
| → calcul0n joined | 05:24 |
|
blahboybaz
| _W_: If I fork a remote repo I get a remote copy of that repo but what if, while I'm doing work based off my fork, there are changes also going on in the remote repo the fork was created from? Now the work I have done (and later wish to contribute) doesn't work because the code base I was working from (my fork) became out of date before I completed my work. | 05:24 |
|
| If the fork were to reflect changes (stay in sync) with the repo it was forked from that would not be an issue. | 05:25 |
|
_W_
| blahboybaz: this is a general way to use git that every developer working in a team experience as a common practice - though one generally don't talk of forks in this context | 05:25 |
|
| the general procedure is to notice that you are out of date, and do a git pull | 05:25 |
|
blahboybaz
| :) | 05:26 |
|
| I see | 05:26 |
|
| right on | 05:26 |
|
_W_
| (after which you can push, if applicable) | 05:26 |
|
blahboybaz
| thanks for clearing that up | 05:26 |
|
bkhl
| The usual term for your local "fork" is just "repository" or "local repository". | 05:29 |
|
| Normally the issue to worry about is not the differences between repositories, but between branches. | 05:30 |
| ← braj left | 05:32 |
| → SpeakerToMeat_ joined | 05:34 |
| → relipse joined | 05:35 |
| ← R2robot left | 05:36 |
| ← roadie left | 05:36 |
| → R2robot joined | 05:37 |
| ← dhollinger left | 05:38 |
| → TomTom joined | 05:40 |
| ← tiin57 left | 05:40 |
| → dhollinger joined | 05:41 |
| ← jgrim left | 05:42 |
| ← thiago left | 05:42 |
| → roadie joined | 05:42 |
| → Beam_Inn_ joined | 05:43 |
| ← g4570n left | 05:44 |
| → tiin57 joined | 05:44 |
| ← SpeakerToMeat_ left | 05:44 |
| ← Goplat left | 05:44 |
| ← B_m_N left | 05:47 |
| Beam_Inn_ → B_m_N | 05:47 |
| ← Maxattax left | 05:47 |
| → freeman42x joined | 05:51 |
| ← freeman42x left | 05:51 |
| → SpeakerToMeat_ joined | 05:51 |
| → freeman42x joined | 05:52 |
| ← umask077 left | 05:59 |
| → umask077 joined | 06:00 |
| ← freeman42x left | 06:02 |
| ← SpeakerToMeat_ left | 06:04 |
| ← xcm left | 06:04 |
| → xcm joined | 06:04 |
| ← tiin57 left | 06:11 |
| → SpeakerToMeat_ joined | 06:12 |
| → tiin57 joined | 06:14 |
| → g00s joined | 06:14 |
| ← blahboybaz left | 06:16 |
| → feriman joined | 06:21 |
| → mingdao joined | 06:25 |
| ← NightQuest left | 06:30 |
| ← SpeakerToMeat_ left | 06:39 |
| ← tiin57 left | 06:41 |
| → tiin57 joined | 06:44 |
| → SpeakerToMeat_ joined | 06:50 |
| ← valoga left | 06:53 |
| → felix_221986 joined | 06:59 |
| → Heirlung joined | 07:03 |
| ← SpeakerToMeat_ left | 07:04 |
| ← Betal left | 07:05 |
| ← tiin57 left | 07:11 |
| ← umask077 left | 07:13 |
| → SpeakerToMeat_ joined | 07:14 |
| → umask077 joined | 07:14 |
| → tiin57 joined | 07:14 |
| ← Shentino_ left | 07:18 |
| ← SpeakerToMeat_ left | 07:19 |
| ← reprazent left | 07:23 |
| ← umask077 left | 07:23 |
| → umask077 joined | 07:23 |
| → finalbeta joined | 07:24 |
| → Phylock joined | 07:25 |
| ← bettencb left | 07:27 |
| → reprazent joined | 07:28 |
| → Shentino joined | 07:31 |
| → zalt__ joined | 07:32 |
| → calcul0n_ joined | 07:32 |
| ← calcul0n left | 07:35 |
| ← Metalsutton left | 07:36 |
| ← reprazent left | 07:37 |
| → solars joined | 07:37 |
| → Forlorn_ joined | 07:39 |
| → SpeakerToMeat_ joined | 07:40 |
| ← tiin57 left | 07:40 |
| ← Shentino left | 07:41 |
| → tiin57 joined | 07:44 |
| ← umask077 left | 07:44 |
| → Beam_Inn_ joined | 07:45 |
| → umask077 joined | 07:45 |
| ← B_m_N left | 07:48 |
| Beam_Inn_ → B_m_N | 07:48 |
| → pinpox joined | 07:49 |
| → freeman42x joined | 07:50 |
| → Abbott` joined | 07:50 |
| ← Abbott left | 07:51 |
| Abbott` → Abbott | 07:51 |
| → reprazent joined | 07:53 |
| ← iam730 left | 07:53 |
| ← xinming left | 07:55 |
| → xinming joined | 07:55 |
| ← gambl0re left | 07:58 |
| → VPS joined | 08:03 |
| → tgunr joined | 08:03 |
| ← tiin57 left | 08:11 |
| → jrm2 joined | 08:12 |
| ← finalbeta left | 08:13 |
| ← jrm left | 08:13 |
| jrm2 → jrm | 08:13 |
| → tiin57 joined | 08:14 |
| ← relipse left | 08:15 |
| → Darcidride joined | 08:18 |
| ← tgunr left | 08:18 |
| → clime joined | 08:20 |
| ← B_m_N left | 08:22 |
| → B_m_N joined | 08:22 |
| ← xinming left | 08:24 |
| → xinming joined | 08:24 |
| → finalbeta joined | 08:28 |
| ← clime left | 08:29 |
| ← inkbottle left | 08:34 |
| → zebrag joined | 08:34 |
| ← Forlorn_ left | 08:34 |
| ← localhorse left | 08:38 |
| → darkbit joined | 08:39 |
| → Technodrome joined | 08:39 |
| ← tiin57 left | 08:40 |
| → tiin57 joined | 08:44 |
| → Metalsutton joined | 08:45 |
| → Beam_Inn_ joined | 08:46 |
| ← B_m_N left | 08:48 |
| Beam_Inn_ → B_m_N | 08:48 |
| → Forlorn_ joined | 08:51 |
| ← ferdna left | 08:53 |
| ← xinming left | 08:56 |
| → xinming joined | 08:57 |
| → clime joined | 08:58 |
| ← Forlorn_ left | 09:00 |
| → Jackneill joined | 09:05 |
| → nika joined | 09:05 |
| → tonythomas joined | 09:06 |
| ← xinming left | 09:07 |
| → xinming joined | 09:08 |
| → p0a joined | 09:09 |
|
p0a
| Hello if I have a remote repository in my hard drive | 09:09 |
|
| and I wish to update it from github how do I do that? | 09:09 |
|
| git pull? | 09:09 |
| ← tiin57 left | 09:10 |
| → tiin57 joined | 09:14 |
| ← Metalsutton left | 09:18 |
| ← Phylock left | 09:23 |
|
j416
| p0a: by remote repository I suppose you mean local repository; git fetch. (pull is fetch + merge). | 09:25 |
| ← dmc left | 09:30 |
| → caskd joined | 09:35 |
| ← clime left | 09:35 |
| → Phylock joined | 09:37 |
| ← nowhere_man left | 09:40 |
| ← tiin57 left | 09:40 |
| ← causasui left | 09:41 |
| → dmc joined | 09:44 |
| → tiin57 joined | 09:44 |
| → Xiti` joined | 09:47 |
| → Shentino joined | 09:49 |
| ← Jackneill left | 09:49 |
| → Jackneill joined | 09:50 |
| ← Xiti left | 09:51 |
| ← vdamewood left | 09:52 |
| → SCHAPiE joined | 09:56 |
| ← dhollinger left | 10:00 |
| → dhollinger joined | 10:01 |
| → akem joined | 10:06 |
| ← akem left | 10:06 |
| → akem joined | 10:07 |
| ← FH_thecat left | 10:08 |
| ← tiin57 left | 10:10 |
|
p0a
| j416: thank you | 10:14 |
|
| i mischaracterized it though, I meant that I have cloned a remote repo | 10:14 |
| → tiin57 joined | 10:14 |
| → crose joined | 10:15 |
| ← dskull left | 10:16 |
| → dskull joined | 10:16 |
|
das-g[m]
| It depends on what you mean by "update", p0a. If you want the changes from remote in your local working tree, "git pull" or "git pull --ff-only" might indeed be what you want. | 10:17 |
|
| "git fetch" makes the changes known to your local repository and stores them in its database but doesn't yet change the working tree. | 10:19 |
|
| See https://help.github.com/en/github/using-git/getting-changes-from-a-remote-repository and https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes | 10:22 |
| ← lord| left | 10:29 |
| → clara97 joined | 10:30 |
| ← xinming left | 10:32 |
| → xinming joined | 10:32 |
| → tgunr joined | 10:32 |
| ← pks left | 10:34 |
| → pks joined | 10:35 |
| → nabil joined | 10:35 |
| ← jetchisel left | 10:37 |
| → fstd_ joined | 10:38 |
| ← navidr left | 10:38 |
| ← Technodrome left | 10:39 |
| → jetchisel joined | 10:39 |
| ← tiin57 left | 10:41 |
| ← p0a left | 10:41 |
| ← fstd left | 10:42 |
| fstd_ → fstd | 10:42 |
| → Pixi__ joined | 10:43 |
| ← aw1__ left | 10:44 |
| → tiin57 joined | 10:44 |
| ← Xiti` left | 10:47 |
| ← albel727 left | 10:49 |
| ← Darcidride left | 10:51 |
| → bettencb joined | 10:51 |
| ← Shentino left | 10:52 |
| ← misuto left | 10:56 |
| → misuto joined | 10:57 |
| → Tawonga joined | 11:00 |
| → cim209 joined | 11:01 |
| → eb0t_ joined | 11:01 |
| → eblip joined | 11:01 |
| ← def_jam left | 11:02 |
| ← eb0t left | 11:03 |
| eb0t_ → eb0t | 11:03 |
| ← freeman42x left | 11:03 |
| ← tgunr left | 11:04 |
| → aw1 joined | 11:05 |
| → Brainium joined | 11:07 |
| ← tiin57 left | 11:10 |
| ← mightyjens left | 11:11 |
| → Narrat joined | 11:11 |
| → mooasaurus joined | 11:12 |
| → tiin57 joined | 11:14 |
| ← gxt left | 11:16 |
| → smichel17 joined | 11:19 |
| → sudomake joined | 11:21 |
| ← g00s left | 11:26 |
| → Shentino joined | 11:32 |
| → Darcidride joined | 11:34 |
| ← nabil left | 11:35 |
| → pandakekok9 joined | 11:36 |
| ← eblip left | 11:37 |
| ← Darcidride left | 11:39 |
| ← sudomake left | 11:39 |
| → sudomake joined | 11:39 |
| → eblip joined | 11:40 |
| ← tiin57 left | 11:40 |
| → Forlorn_ joined | 11:41 |
| → Lucas_Gray joined | 11:42 |
| ← YuGiOhJCJ left | 11:42 |
| → tiin57 joined | 11:44 |
| → salsa20 joined | 11:44 |
| ← salsa20 left | 11:50 |
| → salsa20 joined | 11:51 |
| → aw1_ joined | 11:51 |
| ← xinming left | 11:52 |
| → xinming joined | 11:53 |
| ← aw1 left | 11:54 |
| ← Shentino left | 11:54 |
| ← kupi left | 11:55 |
| → Shentino joined | 11:57 |
| → Darcidride joined | 11:57 |
| ← sudomake left | 12:02 |
| → sudomake joined | 12:02 |
| → Technodrome joined | 12:05 |
| ← andreas303 left | 12:07 |
| → andreas303 joined | 12:10 |
| → fission6 joined | 12:10 |
| → m0viefreak joined | 12:10 |
| ← tiin57 left | 12:10 |
| → tiin57 joined | 12:14 |
| ← Shentino left | 12:24 |
| ← sudomake left | 12:25 |
| → sudomake joined | 12:25 |
| ← fission6 left | 12:28 |
| ← xinming left | 12:28 |
| → raven-au_ joined | 12:28 |
| ← raven-au left | 12:29 |
| raven-au_ → raven-au | 12:29 |
| → dionysus69 joined | 12:29 |
| → xinming joined | 12:30 |
| → Achylles joined | 12:34 |
| → fission6 joined | 12:34 |
| → albel727 joined | 12:35 |
| → figuinhas joined | 12:36 |
| ← clara97 left | 12:40 |
| ← salsa20 left | 12:40 |
| → tgunr joined | 12:40 |
| ← tiin57 left | 12:41 |
| ← feriman left | 12:41 |
| → tiin57 joined | 12:44 |
| ← ExeciN left | 12:45 |
| ← tgunr left | 12:45 |
| ← Lucas_Gray left | 12:46 |
| ← sudomake left | 12:47 |
| → sudomake joined | 12:47 |
| → Lucas_Gray joined | 12:49 |
| ← Forlorn_ left | 12:50 |
| ← atrigent left | 12:50 |
| ← akem left | 12:55 |
| → akem joined | 12:58 |
| ← caterfxo left | 12:58 |
| → vishal joined | 12:58 |
| → rawr joined | 13:00 |
| ← fission6 left | 13:02 |
| ← syr left | 13:06 |
| → dviola joined | 13:06 |
| ← Trieste left | 13:07 |
| → syr joined | 13:08 |
| ← jaziz left | 13:08 |
| → Trieste joined | 13:09 |
| ← sudomake left | 13:10 |
| → sudomake joined | 13:10 |
| ← tiin57 left | 13:10 |
| ← xinming left | 13:13 |
| → xinming joined | 13:13 |
| → tiin57 joined | 13:14 |
| ← zalt__ left | 13:15 |
| ← syr left | 13:16 |
| ← crose left | 13:16 |
| ← roadie left | 13:16 |
| ← dedowsdi left | 13:18 |
| → dedowsdi joined | 13:19 |
| → Forlorn_ joined | 13:19 |
| ← cdown left | 13:21 |
| → caterfxo joined | 13:24 |
| → dartmouthed joined | 13:25 |
| ← Ignacy left | 13:27 |
| ← felix_221986 left | 13:28 |
| → tgunr joined | 13:30 |
| → syr joined | 13:30 |
| → clara97 joined | 13:32 |
| ← sudomake left | 13:32 |
| → sudomake joined | 13:32 |
| → roadie joined | 13:38 |
| → Ignacy joined | 13:40 |
| ← tiin57 left | 13:41 |
| → ZRocket joined | 13:41 |
| ← akem left | 13:41 |
| → Shentino joined | 13:42 |
| → tiin57 joined | 13:44 |
| → Shentino_ joined | 13:47 |
| ← Shentino left | 13:47 |
| ← rustyshackleford left | 13:49 |
| ← Lucas_Gray left | 13:49 |
| → akem joined | 13:54 |
| ← rardiol left | 13:54 |
| ← sudomake left | 13:55 |
| ← ZRocket left | 13:55 |
| → sudomake joined | 13:55 |
| → ZRocket joined | 13:55 |
| → AtumT joined | 13:55 |
| ← zebrag left | 13:56 |
| → zebrag joined | 13:56 |
| → nabil joined | 13:56 |
| → valoga joined | 13:58 |
| ← sudomake left | 14:02 |
| → felix_221986 joined | 14:06 |
| → bookworm joined | 14:07 |
| ← tejr left | 14:08 |
| ← tiin57 left | 14:11 |
| → nowhere_man joined | 14:12 |
| → tiin57 joined | 14:14 |
| ← nabil left | 14:14 |
| → jstein joined | 14:15 |
| → nabil joined | 14:16 |
| → tejr joined | 14:17 |
| → nabil_ joined | 14:20 |
| → thiago joined | 14:20 |
| ← dedowsdi left | 14:23 |
| ← nabil left | 14:23 |
| ← tonythomas left | 14:26 |
| → Aquazi joined | 14:26 |
| → fitzgerald1337 joined | 14:28 |
| ← dviola left | 14:28 |
| ← calcul0n_ left | 14:31 |
| → calcul0n joined | 14:31 |
| → ephemer0l joined | 14:33 |
| ← smichel17 left | 14:35 |
| → cd joined | 14:36 |
| ← Darcidride left | 14:39 |
| ← tiin57 left | 14:40 |
| → tiin57 joined | 14:44 |
| ← pandakekok9 left | 14:47 |
| → Beam_Inn_ joined | 14:47 |
| → DelPhyinf joined | 14:48 |
| ← B_m_N left | 14:49 |
| ← roadie left | 14:49 |
| Beam_Inn_ → B_m_N | 14:49 |
| → roadie joined | 14:50 |
| → rardiol joined | 14:54 |
| → chandoo joined | 14:57 |
| → Betal joined | 14:59 |
| → inkbottle joined | 14:59 |
| ← zebrag left | 14:59 |
| ← TomTom left | 15:00 |
| ← tgunr left | 15:02 |
| → crose joined | 15:03 |
| ← nowhere_man left | 15:10 |
| ← tiin57 left | 15:10 |
| → arf` joined | 15:11 |
| → nowhere_man joined | 15:12 |
| → davispuh joined | 15:14 |
| → tiin57 joined | 15:14 |
| → calcul0n_ joined | 15:15 |
| ← nabil_ left | 15:17 |
| ← calcul0n left | 15:18 |
| → g4570n joined | 15:20 |
| ← arf` left | 15:24 |
| → Wetmelon joined | 15:28 |
| ← filcab left | 15:28 |
| → tonythomas joined | 15:29 |
| → filcab joined | 15:30 |
| ← filcab left | 15:32 |
| → courrier joined | 15:37 |
| ← tiin57 left | 15:40 |
| → foo joined | 15:43 |
| ← vicfred left | 15:43 |
|
foo
| I'm pretty sure this is true, but can someone confirm. If I'm in branchA, and I do git rebase master, and I see a conflict... <<<<<<< HEAD ... refers to code that was on master, correct? | 15:43 |
| ← Phylock left | 15:44 |
| → tiin57 joined | 15:44 |
|
pandem
| head usually refers to the current branch | 15:44 |
| ← Achylles left | 15:45 |
|
m0viefreak
| during a rebase you are not really on any branch, so in the case of a rebase conflict HEAD refers to whatever changes are already there before conflicting changes are applied | 15:46 |
|
| so yes, practically that would typically mean "what was already in master" | 15:47 |
|
foo
| ahh. thanks pandem and m0viefreak | 15:47 |
|
| yeah, that makes sense, since the branch name after that is on branchA | 15:47 |
| → Beam_Inn_ joined | 15:49 |
| → Maxattax joined | 15:50 |
| ← B_m_N left | 15:52 |
| Beam_Inn_ → B_m_N | 15:52 |
| ← xinming left | 15:53 |
| → TheFuzzball joined | 15:54 |
| → xinming joined | 15:54 |
| → royal_screwup21 joined | 15:58 |
| ← ZRocket left | 16:03 |
| → tgunr joined | 16:04 |
| ← Shentino_ left | 16:04 |
| → perrier-jouet joined | 16:07 |
| ← felix_221986 left | 16:08 |
| → filcab joined | 16:10 |
| ← tiin57 left | 16:11 |
| → sidetrack joined | 16:13 |
| ← foo left | 16:13 |
| → tiin57 joined | 16:14 |
| → rustyshackleford joined | 16:16 |
| → jacklsw joined | 16:17 |
| ← theorangeone left | 16:25 |
| ← caterfxo left | 16:25 |
| → theorangeone joined | 16:25 |
| ← royal_screwup21 left | 16:27 |
| ← m0viefreak left | 16:27 |
| → m0viefreak joined | 16:27 |
| ← tgunr left | 16:29 |
| ← jetchisel left | 16:30 |
| ← yawkat left | 16:32 |
| ← TheFuzzball left | 16:34 |
| → yawkat joined | 16:34 |
| → ferdna joined | 16:34 |
| ← Kaivo left | 16:36 |
| → iam730 joined | 16:36 |
| → HumanG33k joined | 16:39 |
| ← courrier left | 16:40 |
| ← roadie left | 16:40 |
| ← HumanG33k left | 16:40 |
| ← tiin57 left | 16:40 |
| → roadie joined | 16:41 |
| → HumanG33k joined | 16:41 |
| → caterfxo joined | 16:42 |
| → royal_screwup21 joined | 16:43 |
| → tiin57 joined | 16:44 |
| ← Abbott left | 16:45 |
| → gambl0re joined | 16:47 |
| → CodeSlingerPaul joined | 16:49 |
| ← clara97 left | 16:52 |
| ← xinming left | 16:52 |
| → gareppa joined | 16:54 |
| → xinming joined | 16:54 |
| ← gareppa left | 16:56 |
| ← dhollinger left | 16:56 |
| ← gambl0re left | 16:57 |
| → dhollinger joined | 16:58 |
| ← sidetrack left | 17:00 |
| → sidetrack joined | 17:00 |
| → mowcat joined | 17:02 |
| ← plitter left | 17:03 |
| ← B_m_N left | 17:06 |
| → Goplat joined | 17:06 |
| ← sidetrack left | 17:06 |
| ← jacklsw left | 17:10 |
| ← tiin57 left | 17:11 |
| → Abbott joined | 17:11 |
| → sidetrack joined | 17:13 |
| → tiin57 joined | 17:14 |
| ← perrier-jouet left | 17:15 |
| ← sidetrack left | 17:16 |
| ← darkbit left | 17:18 |
| ← Forlorn_ left | 17:20 |
| → gambl0re joined | 17:22 |
| → perrier-jouet joined | 17:23 |
| ← inkbottle left | 17:26 |
| → karstensrage joined | 17:27 |
| → no_gravity joined | 17:28 |
|
no_gravity
| I am often surprised how git diff diffs text. | 17:28 |
|
| For example: "contains thousands" -> "contains tens of thousands" | 17:29 |
| → zebrag joined | 17:29 |
|
no_gravity
| Will be diffed as: "contains t{+ens of t+}housands" | 17:29 |
|
| Why not put the diff at the first possible position? | 17:29 |
|
Hello71
| --patience | 17:30 |
|
no_gravity
| That would then be: "contains{+ tens of} thousands" | 17:30 |
|
| Hello71: Is that a parameter? | 17:30 |
| → AppleGaming joined | 17:30 |
|
no_gravity
| Hello71: Results in the same output. | 17:31 |
| → SuperL4g joined | 17:33 |
| → plitter joined | 17:35 |
| → feriman joined | 17:35 |
|
Hello71
| actually I think you want --anchored=" " | 17:35 |
| ← SuperLag left | 17:35 |
|
no_gravity
| Hello71: No difference. | 17:36 |
| → clara97 joined | 17:40 |
| ← tiin57 left | 17:40 |
| ← mowcat left | 17:41 |
| → mowcat joined | 17:41 |
| ← no_gravity left | 17:44 |
| → tiin57 joined | 17:44 |
| ← fflam left | 17:46 |
| → null1337 joined | 17:46 |
| → fflam joined | 17:47 |
| → grenbriar joined | 17:49 |
| → afuentes joined | 17:53 |
| → cdown joined | 17:56 |
| ← SpeakerToMeat_ left | 17:59 |
| ← CodeSlingerPaul left | 18:00 |
| ← AppleGaming left | 18:03 |
| ← Wetmelon left | 18:03 |
| ← finalbeta left | 18:03 |
| → juvenal joined | 18:06 |
| → Shentino_ joined | 18:06 |
| → causasui joined | 18:06 |
| → SpeakerToMeat_ joined | 18:09 |
| ← Shentino_ left | 18:09 |
| → Shentino joined | 18:09 |
| ← tiin57 left | 18:10 |
| → tgunr joined | 18:13 |
| ← ndim left | 18:14 |
| → tiin57 joined | 18:14 |
| ← xinming left | 18:15 |
| → xinming joined | 18:15 |
| → finalbeta joined | 18:17 |
| → Wetmelon joined | 18:18 |
| → Led_Zeppelin joined | 18:19 |
|
Led_Zeppelin
| for tagging. is there a particular schematic I should use for easier incremnting? currently using git tag v0.0; | 18:19 |
| → escodebar joined | 18:21 |
| ← perrier-jouet left | 18:27 |
| ← tgunr left | 18:29 |
| ← SpeakerToMeat_ left | 18:29 |
| ← justanotheruser left | 18:30 |
| ← rardiol left | 18:30 |
|
rewt
| with git you can only create the tag; it's up to you how you generate what that tag is | 18:31 |
| → rardiol joined | 18:31 |
| → TomTom joined | 18:33 |
|
Led_Zeppelin
| got it. | 18:35 |
| ← xinming left | 18:35 |
| → xinming joined | 18:35 |
| → SpeakerToMeat_ joined | 18:40 |
| ← tiin57 left | 18:40 |
| → t2mkn joined | 18:44 |
| → tiin57 joined | 18:44 |
| ← denisse left | 18:46 |
| → justanotheruser joined | 18:46 |
| → alephZer0 joined | 18:48 |
| → clime joined | 18:51 |
|
nedbat
| Led_Zeppelin: you can tell git to sort tags as version numbers: https://andy-carter.com/blog/sort-git-tags-by-ascending-and-descending-semver | 18:51 |
| → calcul0n joined | 18:52 |
| ← calcul0n_ left | 18:54 |
| ← tonythomas left | 18:56 |
| ← royal_screwup21 left | 18:57 |
| → royal_screwup21 joined | 19:02 |
| ← SpeakerToMeat_ left | 19:04 |
| → perrier-jouet joined | 19:06 |
| → Kobaz joined | 19:06 |
|
Kobaz
| is there a 'git stash' for untracked files? | 19:06 |
|
| oh | 19:07 |
|
| look at that | 19:07 |
|
| git stash --include-untracked.... thanks! | 19:07 |
| ← tiin57 left | 19:10 |
| → tiin57 joined | 19:14 |
| → SpeakerToMeat_ joined | 19:14 |
| → kris7ian joined | 19:15 |
| ← perrier-jouet left | 19:15 |
|
kris7ian
| so I have a branch with 2 commits, I want one of them into master how do I do that? | 19:15 |
| ← royal_screwup21 left | 19:15 |
|
kris7ian
| cherry pick? | 19:15 |
|
osse
| kris7ian: yes that's one way | 19:16 |
|
| usually the best way | 19:16 |
|
ikke
| if it's the first commit (ie the other commit comes later), you could just merge that commit in | 19:16 |
| → bladane joined | 19:17 |
| → user217_ joined | 19:17 |
| → royal_screwup21 joined | 19:17 |
| ← SpeakerToMeat_ left | 19:19 |
| → rafasc joined | 19:23 |
| ← escodebar left | 19:25 |
| ← royal_screwup21 left | 19:27 |
| → perrier-jouet joined | 19:29 |
| ← diogenese left | 19:30 |
| → diogenese joined | 19:30 |
| ← tiin57 left | 19:40 |
| → tiin57 joined | 19:44 |
| → SpeakerToMeat_ joined | 19:45 |
| ← Abbott left | 19:50 |
| ← Wetmelon left | 19:50 |
| → Abbott joined | 19:50 |
| ← perrier-jouet left | 19:51 |
| ← finalbeta left | 19:52 |
| → jetchisel joined | 19:53 |
| ← aw1_ left | 19:53 |
| → perrier-jouet joined | 19:56 |
| → Wetmelon joined | 19:57 |
| → vdamewood joined | 19:57 |
| → lucasb joined | 19:59 |
| ← xcm left | 20:02 |
| → xcm joined | 20:03 |
| ← tiin57 left | 20:10 |
| → royal_screwup21 joined | 20:10 |
| → johnny56 joined | 20:13 |
| → tiin57 joined | 20:14 |
| ← SpeakerToMeat_ left | 20:16 |
| → SpeakerToMeat_ joined | 20:16 |
| ← rardiol left | 20:19 |
| → rardiol joined | 20:20 |
| ← clara97 left | 20:22 |
| ← Narrat left | 20:23 |
| → kupi joined | 20:28 |
| ← tryte left | 20:33 |
| → tryte joined | 20:33 |
| ← xinming left | 20:35 |
| → xinming joined | 20:37 |
| → vicfred joined | 20:39 |
| → tgunr joined | 20:40 |
| ← tiin57 left | 20:40 |
| → BPL joined | 20:41 |
| ← Pixi__ left | 20:42 |
| ← roadie left | 20:43 |
| ← nika left | 20:44 |
| → tiin57 joined | 20:44 |
| → Xiti joined | 20:46 |
| → freeman42x joined | 20:46 |
| → roadie joined | 20:46 |
| ← roadie left | 20:51 |
| ← kris7ian left | 20:56 |
| ← bettencb left | 20:58 |
| ← feriman left | 20:58 |
| → bettencb joined | 21:03 |
| SuperL4g → SuperLag | 21:03 |
| → relipse joined | 21:05 |
| → kris7ian joined | 21:05 |
| ← justanotheruser left | 21:07 |
| ← tiin57 left | 21:11 |
| ← xinming left | 21:11 |
| → dfee joined | 21:12 |
| → xinming joined | 21:13 |
| → tiin57 joined | 21:14 |
| → aliss joined | 21:18 |
| → justanotheruser joined | 21:22 |
| ← justanotheruser left | 21:23 |
| ← mowcat left | 21:23 |
|
SuperLag
| if you fork a repo, do you still get changes from the original? | 21:24 |
| → justanotheruser joined | 21:25 |
| → shabius_ joined | 21:25 |
|
ikke
| SuperLag: not automatically | 21:25 |
|
| you need to use a local repo to fetch from upstream and push to your fork | 21:25 |
| → roadie joined | 21:26 |
| ← dfee left | 21:27 |
| ← shabius left | 21:28 |
| ← DelPhyinf left | 21:33 |
| ← Technodrome left | 21:38 |
| ← roadie left | 21:38 |
| → dfee joined | 21:38 |
| ← tiin57 left | 21:40 |
| ← TomTom left | 21:43 |
| → tiin57 joined | 21:44 |
| → g00s joined | 21:45 |
| ← g00s left | 21:45 |
| ← royal_screwup21 left | 21:45 |
| ← Aquazi left | 21:46 |
| ← gambl0re left | 21:52 |
| ← tgunr left | 22:03 |
| → NightQuest joined | 22:05 |
| ← haritz left | 22:07 |
| → shabius joined | 22:09 |
| ← tiin57 left | 22:10 |
| → Jck_true0 joined | 22:12 |
| ← shabius_ left | 22:12 |
| → haritz joined | 22:13 |
| ← calcul0n left | 22:13 |
| → tiin57 joined | 22:13 |
| → roadie joined | 22:21 |
| ← aliss left | 22:27 |
| ← kris7ian left | 22:27 |
| xcm → Guest93180 | 22:30 |
| ← Guest93180 left | 22:30 |
| → xcm joined | 22:30 |
| → Nilgeist joined | 22:33 |
| → gambl0re joined | 22:33 |
| ← roadie left | 22:34 |
| → Cabanoss- joined | 22:36 |
| ← Cabanossi left | 22:37 |
| Cabanoss- → Cabanossi | 22:37 |
| → AppleGaming joined | 22:38 |
| ← afuentes left | 22:39 |
| ← tiin57 left | 22:40 |
| → atrigent joined | 22:41 |
| ← AppleGaming left | 22:44 |
| → tiin57 joined | 22:44 |
| → AppleGaming joined | 22:44 |
| ← xinming left | 22:45 |
| → xinming joined | 22:46 |
| → Technodrome joined | 22:48 |
| ← vdamewood left | 22:48 |
| ← xSke left | 22:52 |
| ← BPL left | 22:53 |
| ← xinming left | 22:56 |
| → BPL joined | 22:57 |
| ← SpeakerToMeat_ left | 22:57 |
| ← Karyon left | 22:57 |
| ← dionysus69 left | 22:57 |
| → xinming joined | 22:58 |
| → SpeakerToMeat_ joined | 22:58 |
| → Karyon joined | 22:59 |
|
Hello71
| that's the point of a "fork" | 22:59 |
|
cbreak
| it's a clone | 22:59 |
| → TomyWork joined | 23:00 |
| → nabil joined | 23:09 |
| → xSke joined | 23:09 |
| ← tiin57 left | 23:10 |
| → dedowsdi joined | 23:11 |
| ← xinming left | 23:13 |
| → xinming joined | 23:13 |
| → tiin57 joined | 23:13 |
| ← xSke left | 23:14 |
| → xSke joined | 23:14 |
| ← bladane left | 23:15 |
| → roadie joined | 23:16 |
| ← nabil left | 23:22 |
| ← BPL left | 23:23 |
| ← m0viefreak left | 23:23 |
| ← roadie left | 23:30 |
| ← dmc left | 23:31 |
| ← jetchisel left | 23:31 |
| → jetchisel joined | 23:35 |
| ← tiin57 left | 23:40 |
| → tiin57 joined | 23:44 |
| ← lucasb left | 23:49 |
| → dmc joined | 23:52 |