| 2023-06-11 |
| ← very_sneaky left | 00:00 |
| ← hamburgler3 left | 00:00 |
| ← clime left | 00:00 |
| ← remedan left | 00:00 |
| ← vysn left | 00:00 |
| ← hrberg left | 00:00 |
| ← mns left | 00:00 |
| ← reset left | 00:00 |
| → davve joined | 00:00 |
| → yaymukun1 joined | 00:00 |
| → ShaedS joined | 00:00 |
| → Bombe joined | 00:00 |
| → CrtxReavr joined | 00:00 |
| → stockholm joined | 00:00 |
| → mns joined | 00:00 |
| → hrberg joined | 00:00 |
| → akimbo5334308470 joined | 00:00 |
| → theodorc joined | 00:00 |
| → perrierjouet joined | 00:00 |
| → clime joined | 00:00 |
| → elichai2 joined | 00:00 |
| → CodeAgain joined | 00:00 |
| → Ranhir joined | 00:00 |
| → jmer joined | 00:00 |
| → seds joined | 00:00 |
| → ThiefMaster joined | 00:00 |
| → daddy joined | 00:00 |
| → very_sneaky joined | 00:00 |
| → yourfate joined | 00:00 |
| → OnkelTem joined | 00:00 |
| → vysn joined | 00:00 |
| → sunyibo joined | 00:00 |
| → mpldr joined | 00:00 |
| → mtj joined | 00:01 |
| ← seds left | 00:01 |
| → seds joined | 00:01 |
| → xnox joined | 00:01 |
| → acidsys joined | 00:01 |
| ← daddy left | 00:01 |
| → quesker joined | 00:01 |
| → hamburgler joined | 00:02 |
| → Andrew- joined | 00:02 |
| → Anarchic joined | 00:02 |
| → haise01 joined | 00:02 |
| → ryjen joined | 00:02 |
| → OnlineCop joined | 00:02 |
| → daddy joined | 00:02 |
| → jjakob joined | 00:02 |
| → n-st joined | 00:02 |
| → remedan joined | 00:02 |
| → V joined | 00:02 |
| → YoungFrog joined | 00:02 |
| → R2robot joined | 00:02 |
| → robink joined | 00:02 |
| → mkoskar joined | 00:02 |
| → olbat joined | 00:02 |
| ← olbat left | 00:02 |
| → olbat joined | 00:02 |
| → bartman` joined | 00:03 |
| → vlt joined | 00:04 |
| → kantlivelong joined | 00:05 |
| → defjam joined | 00:06 |
| → jaykelly450 joined | 00:06 |
| → sybariten joined | 00:08 |
| → knolle joined | 00:10 |
| ← defjam left | 00:11 |
| → jkatnight joined | 00:12 |
| → vancz joined | 00:15 |
| ← jkatnight left | 00:16 |
| → fstd_ joined | 00:17 |
| ← Atque left | 00:17 |
| → Atque joined | 00:19 |
| fstd_ → fstd | 00:20 |
| ← SuperLag left | 00:22 |
| → rama_ joined | 00:28 |
| ← jaykelly450 left | 00:30 |
| ← rama_ left | 00:34 |
| → Gaboradon joined | 00:36 |
| → defjam joined | 00:42 |
| ← gsi left | 00:46 |
| ← defjam left | 00:46 |
| → zer0bitz joined | 00:47 |
| → gsi joined | 00:47 |
| ← clime left | 00:48 |
| → clime joined | 00:48 |
| ← zer0bitz_ left | 00:49 |
| ← wootehfoot left | 00:55 |
| → ferdna joined | 00:55 |
| ← tirnanog left | 00:57 |
| ← m0viefreak left | 00:57 |
| → defjam joined | 01:00 |
| ← kkawg left | 01:02 |
| → tirnanog joined | 01:02 |
| ← defjam left | 01:06 |
| → gasbag joined | 01:14 |
|
Nexilva[m]
| Hi there | 01:16 |
|
| I've got a pretty crazy problem happening in git. The best way to explain it is with an example: https://bpa.st/K7JHA | 01:16 |
|
| data/global/tiles/Act1/town/ this directory is part of the git repo, tracked and all. If I create a file in this directory, it informs me that there is a new untracked file. | 01:17 |
|
| However, if I edit an existing file in data/global/tiles/Act1/Town/townS1.ds1, after editing the file, I do git status and it does not show any changes | 01:18 |
|
| What is happening? | 01:18 |
| ← vysn left | 01:19 |
| → chandash joined | 01:21 |
|
Nexilva[m]
| I notice on gitlab, the dir is 'town', but on my local PC the dir is called 'Town'. | 01:24 |
|
| I don't understand how it could have changed case. | 01:24 |
| → haxalot joined | 01:25 |
| → SuperLag joined | 01:26 |
| ← SuperLag left | 01:26 |
| → SuperLag joined | 01:26 |
| → vysn joined | 01:29 |
|
Nexilva[m]
| Somehow window renamed my directories to all starting with uppercase | 01:33 |
|
| Capitalized. | 01:33 |
|
| I recloned from remote and now dir names are the proper case. | 01:33 |
| → defjam joined | 01:34 |
| ← gasbag left | 01:35 |
| ← defjam left | 01:38 |
| Andrew- → andrewyu | 01:42 |
| ← cdown left | 01:44 |
| → iomari891 joined | 01:44 |
| → BlessJah joined | 01:45 |
| → junyx joined | 01:49 |
| → BigShip joined | 01:56 |
| ← SuperLag left | 01:57 |
| → SuperLag joined | 01:58 |
| ← SuperLag left | 01:58 |
| → SuperLag joined | 01:58 |
| → aiena__ joined | 01:58 |
|
aiena__
| How do I git stash with a specific name? | 01:58 |
|
| I have some code in incomplete state but I realised that I may have to trash this for a different approach. I want to keep the code but not commit it. | 01:59 |
| ← vandita left | 02:00 |
| ← vysn left | 02:01 |
| → vandita joined | 02:01 |
| → defjam joined | 02:07 |
| → shokohsc58 joined | 02:11 |
| ← defjam left | 02:12 |
| → hbautista joined | 02:12 |
| ← shokohsc5 left | 02:12 |
| shokohsc58 → shokohsc5 | 02:12 |
| → nate2 joined | 02:16 |
| → superheroes joined | 02:24 |
|
rewt
| aiena__, you can create a new branch and commit it there, then checkout the current branch | 02:26 |
| → rama_ joined | 02:31 |
| ← rama_ left | 02:39 |
| → defjam joined | 02:42 |
|
aiena__
| Ok How do I move the last commit I made to a branch. Its currently in master but I dont want it there can --ammend be used for that? | 02:43 |
| → tkazi joined | 02:44 |
| ← Millicent left | 02:46 |
| ← defjam left | 02:46 |
|
aiena__
| I want to remove my last commit and recommit it in a new branch | 02:47 |
| ← gast0n left | 02:47 |
|
aiena__
| its not been pushed anywhere | 02:47 |
| → mika joined | 02:47 |
| → Timvde joined | 02:48 |
| → Millicent joined | 02:53 |
| → jaeckel joined | 02:53 |
| → aiena_ joined | 02:55 |
| → soifou joined | 02:55 |
| ← aiena__ left | 02:57 |
| ← squirrel left | 02:58 |
| → farzat joined | 02:59 |
|
superheroes
| aiena__: hi there, I'm an amateur in using | 03:04 |
|
| git n I believe the way that you would do this, provided you are absolutely certain is by pushing the commit to the branch, and then by using the reset cmd in your own branch | 03:06 |
| → tejr joined | 03:06 |
| → FinnElija joined | 03:11 |
| → defjam joined | 03:15 |
| → throwachimera joined | 03:16 |
| ← Suchiman left | 03:17 |
| ← nate2 left | 03:18 |
|
rewt
| aiena_, just make the new branch (no need to make any commits if it's committed already), and after you checkout master, reset it back to the commit you want it at | 03:19 |
| ← defjam left | 03:19 |
| ← moldorcoder7 left | 03:28 |
| → defjam joined | 03:33 |
| JanC → Guest3921 | 03:34 |
| → JanC joined | 03:34 |
| ← iomari891 left | 03:34 |
| ← Guest3921 left | 03:35 |
| ← defjam left | 03:38 |
| → rama_ joined | 03:43 |
| ← tirnanog left | 03:44 |
| ← chandash left | 03:47 |
| ← rama_ left | 03:47 |
| → YuGiOhJCJ joined | 03:50 |
| → defjam joined | 03:50 |
| ← haxalot left | 03:52 |
| → roadie joined | 03:53 |
| ← defjam left | 03:55 |
| ← nickoe left | 04:03 |
| → nickoe joined | 04:03 |
| → lgc joined | 04:03 |
| ← money left | 04:04 |
| ← lgc left | 04:04 |
| → jacobk_ joined | 04:05 |
| ← jacobk left | 04:05 |
| → hwpplayer1 joined | 04:12 |
| → falafel joined | 04:13 |
| ← junyx left | 04:17 |
| ← hwpplayer1 left | 04:19 |
|
aiena_
| rewt, i was able to reset using 'git reset HEAD~' i found in one answer. Why is there a ~ at the end? | 04:21 |
|
| somtimes they pu ^ or ~1 | 04:24 |
|
| but not sure what those are | 04:24 |
| → defjam joined | 04:24 |
| ← ChmEarl left | 04:25 |
| ← defjam left | 04:29 |
| ← aiena_ left | 04:40 |
| → defjam joined | 04:40 |
| → aiena_ joined | 04:40 |
|
ikke
| man gitrevision | 04:43 |
|
| man gitrevisions | 04:43 |
|
gitinfo
| the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html | 04:43 |
| ← defjam left | 04:45 |
| ← JanC left | 04:47 |
| → JanC joined | 04:48 |
| → jkatnight joined | 04:49 |
|
Nexilva[m]
| On windows, my directory name case has changed, but in remote git repository, its still lower case. How do I correct this? How can I pull again from remote into the same repo so it renames everything to proper case | 04:52 |
| ← jkatnight left | 04:54 |
|
ikke
| NTFS (or the windows layer on top if it) does not care about case, so it lies when you ask to write a file with a different case | 04:54 |
| ← falafel left | 04:55 |
| → defjam joined | 04:56 |
| ← roadie left | 04:56 |
|
Nexilva[m]
| Well I'm having a problem, which is that on remote on gitlab, the case is lower, but on local pc, the directory names are capitalized. When I edit files in the directory, changes are not detected by git. However, if I create a new file in the directory, git tells me there is a new untracked file. All files in all those directories are tracked and on remote repo | 04:57 |
|
| I've got a pretty crazy problem happening in git. The best way to explain it is with an example: https://bpa.st/K7JHA | 04:57 |
|
| Here is an example you can see of the problem. | 04:58 |
| ← JanC left | 04:58 |
|
Nexilva[m]
| On remote and originally the directory for example was called 'town' but on local pc somehow it is now called 'Town'. If I make new files in Town git says there are new untracked files, good so far. If I edit existing and already tracked files in Town and then do git status, git does not show me that any files were ever edited. | 04:59 |
| → JanC joined | 04:59 |
|
Nexilva[m]
| It took me a few days to figure out why my changes were not being committed to remote. Git just doesn't detect it. | 04:59 |
|
| So that's why I'm trying to ensure that git can detect the changes. | 05:00 |
|
| This is what I found out: | 05:01 |
| ← defjam left | 05:01 |
|
Nexilva[m]
| It seems that the directory data/global/tiles/Act1/town/ and the file data/global/tiles/Act1/Town/townS1.ds1 have a difference in case. Git is case-sensitive, but some file systems used by operating systems (such as Windows' default file system, NTFS) are case-insensitive. This can lead to inconsistencies when working with files and directories that only differ in case. | 05:01 |
| ← nattiestnate left | 05:01 |
| → vandita_ joined | 05:02 |
|
Nexilva[m]
| What can you advise? | 05:02 |
| ← JanC left | 05:04 |
| ← vandita left | 05:05 |
| → JanC joined | 05:09 |
| → defjam joined | 05:14 |
| → junyx joined | 05:15 |
| → nate2 joined | 05:15 |
| → falafel joined | 05:18 |
| ← defjam left | 05:18 |
| ← nate2 left | 05:20 |
| ← JanC left | 05:23 |
| → JanC joined | 05:24 |
| ← JanC left | 05:26 |
| → JanC joined | 05:27 |
| ← theobjectivedad left | 05:28 |
| ← junyx left | 05:29 |
| → theobjectivedad joined | 05:29 |
| ← JanC left | 05:30 |
|
Nexilva[m]
| Soon as I renamed the directory to lower case, git told me a file in there was changed. | 05:30 |
| → JanC joined | 05:30 |
| → defjam joined | 05:31 |
|
ljharb
| Nexilva[m]: the solution is usually to always lowercase all directory names | 05:31 |
| → feriman joined | 05:36 |
| ← JanC left | 05:37 |
| → JanC joined | 05:38 |
| → iomari891 joined | 05:40 |
| ← JanC left | 05:40 |
| → JanC joined | 05:41 |
| ← JanC left | 05:43 |
| → JanC joined | 05:44 |
| ← iomari891 left | 05:45 |
| → iomari891 joined | 05:45 |
| ← JanC left | 05:49 |
| → JanC joined | 05:50 |
| ← iomari891 left | 05:50 |
| → haxalot joined | 05:51 |
| → jkatnight joined | 05:54 |
| ← JanC left | 05:55 |
| ← jkatnight left | 05:59 |
| → JanC joined | 06:03 |
| ← JanC left | 06:07 |
| → JanC_ joined | 06:07 |
| ← Gary_Sinise left | 06:07 |
| JanC_ → JanC | 06:07 |
| → wootehfoot joined | 06:08 |
| → Gary_Sinise joined | 06:09 |
| ← haxalot left | 06:11 |
| → haxalot joined | 06:12 |
| ← haxalot left | 06:13 |
| ← ferdna left | 06:14 |
| → ferdna joined | 06:14 |
| → haxalot joined | 06:14 |
| ← haxalot left | 06:14 |
| → roadie joined | 06:27 |
| ← falafel left | 06:30 |
| ← skapata left | 06:32 |
| → jkatnight joined | 06:32 |
| ← jkatnight left | 06:37 |
| → coot_ joined | 06:50 |
| ← hbautista left | 06:51 |
| ← wootehfoot left | 06:57 |
| → hwpplayer1 joined | 07:02 |
| ← hwpplayer1 left | 07:05 |
| → vandita joined | 07:07 |
| ← vandita_ left | 07:10 |
| ← defjam left | 07:10 |
| → wootehfoot joined | 07:15 |
| → nate2 joined | 07:16 |
| ← nate2 left | 07:21 |
| ← bloody left | 07:22 |
| → Inline joined | 07:25 |
| → vdamewood joined | 07:30 |
| ← YuGiOhJCJ left | 07:32 |
| → YuGiOhJCJ joined | 07:32 |
| → defjam joined | 07:39 |
| ← Gary_Sinise left | 07:43 |
| ← defjam left | 07:43 |
| → hwpplayer1 joined | 07:43 |
| ← hwpplayer1 left | 07:44 |
| → vysn joined | 07:51 |
| → defjam joined | 07:51 |
| ← nickoe left | 08:12 |
| → nickoe joined | 08:13 |
| → stengah joined | 08:14 |
| ← Inline left | 08:16 |
| → otisolsen70 joined | 08:17 |
| ← vandita left | 08:31 |
| → vandita joined | 08:32 |
| → weaksauc_ joined | 08:39 |
| → theoceaniscool joined | 08:39 |
| → James0r joined | 08:42 |
| → jkatnight joined | 08:45 |
| ← defjam left | 08:49 |
| ← jkatnight left | 08:50 |
| ← vdamewood left | 08:56 |
| → hwpplayer1 joined | 08:59 |
| → defjam joined | 09:03 |
| → clime1 joined | 09:05 |
| ← Lord_of_Life left | 09:06 |
| → Lord_of_Life joined | 09:08 |
| ← defjam left | 09:08 |
| ← Deknos left | 09:17 |
| → defjam joined | 09:21 |
| ← very_sneaky left | 09:21 |
| ← xFFC left | 09:21 |
| ← defjam left | 09:25 |
| → very_sneaky joined | 09:28 |
| ← thiago left | 09:29 |
| → Suchiman joined | 09:31 |
| → defjam joined | 09:37 |
| ← defjam left | 09:42 |
| → Inline joined | 09:42 |
| → apo joined | 09:44 |
| ← stengah left | 09:45 |
| ← clime1 left | 09:47 |
| → stengah joined | 09:49 |
| → Geronimo joined | 09:51 |
| → weaksauce joined | 09:56 |
| ← weaksauc_ left | 09:56 |
| ← stengah left | 09:56 |
| → sa0 joined | 10:03 |
| → f_|catgirl joined | 10:05 |
| → jkatnight joined | 10:07 |
| ← _sa0sin_ left | 10:07 |
| f_|catgirl → f_ | 10:08 |
| → defjam joined | 10:11 |
| ← jkatnight left | 10:11 |
| ← defjam left | 10:15 |
| ← JanC left | 10:15 |
| → JanC joined | 10:16 |
| ← nickoe left | 10:17 |
| → nickoe joined | 10:17 |
| → xFFC joined | 10:20 |
| → stengah joined | 10:21 |
| ← hwpplayer1 left | 10:23 |
| → defjam joined | 10:28 |
| → vandita_ joined | 10:29 |
| → GoGi joined | 10:31 |
| ← GoGi left | 10:31 |
| → GoGi joined | 10:31 |
| ← vandita left | 10:32 |
| ← defjam left | 10:33 |
| → lgc joined | 10:37 |
| ← lgc left | 10:37 |
| → hwpplayer1 joined | 10:40 |
| → defjam joined | 10:45 |
| ← defjam left | 10:50 |
| ← vishal left | 10:52 |
| → vishal joined | 10:56 |
| → rsx joined | 10:58 |
| → defjam joined | 10:59 |
| → JanC_ joined | 11:15 |
| JanC → Guest8392 | 11:16 |
| ← Guest8392 left | 11:16 |
| JanC_ → JanC | 11:16 |
| → nate2 joined | 11:17 |
| ← nate2 left | 11:22 |
| ← Inline left | 11:34 |
| ← chexum left | 11:39 |
| ← memset left | 11:39 |
| ← Atque left | 11:39 |
| → memset joined | 11:40 |
| → Atque joined | 11:41 |
| → nate2 joined | 11:43 |
| → chexum joined | 11:43 |
| ← nate2 left | 11:48 |
| ← rustyshackleford left | 11:48 |
| ← YuGiOhJCJ left | 11:49 |
| ← chexum left | 11:50 |
| ← memset left | 11:50 |
| → YuGiOhJCJ joined | 11:50 |
| → chexum joined | 11:50 |
| → memset joined | 11:50 |
| ← arch_angel left | 11:54 |
| ← James0r left | 11:56 |
| ← farzat left | 11:56 |
| ← jacobk_ left | 12:02 |
| ← vandita_ left | 12:02 |
| → vandita joined | 12:03 |
| ← hwpplayer1 left | 12:03 |
| ← YuGiOhJCJ left | 12:05 |
| → lucasta joined | 12:05 |
| → YuGiOhJCJ joined | 12:06 |
| → cweiss0765321241 joined | 12:11 |
| → arch_angel joined | 12:13 |
| → hwpplayer1 joined | 12:16 |
| → stenno joined | 12:18 |
| → money joined | 12:21 |
| ← nickoe left | 12:21 |
| → nickoe joined | 12:21 |
| ← stenno left | 12:25 |
| andrewyu → Andrew | 12:29 |
| ← Andrew left | 12:29 |
| → AndrewYu joined | 12:30 |
| → alexherbo2 joined | 12:36 |
| ← feriman left | 12:37 |
| ← very_sneaky left | 12:39 |
| → feriman joined | 12:39 |
| → kkawg joined | 12:41 |
| → Inline joined | 12:42 |
| ← JanC left | 12:53 |
| → AlexKalopsia1 joined | 12:54 |
| → JanC joined | 12:54 |
| ← alexherbo2 left | 12:54 |
| ← Suchiman left | 12:54 |
| → alexherbo2 joined | 12:55 |
| → aiena joined | 12:59 |
| ← PobodysNerfect left | 13:00 |
| ← JanC left | 13:00 |
| ← aiena_ left | 13:01 |
| ← aiena left | 13:04 |
| → SilentGhost joined | 13:04 |
| → JanC joined | 13:06 |
| ← JanC left | 13:07 |
| ← vandita left | 13:09 |
| ← frobnic left | 13:10 |
| → frobnic_ joined | 13:10 |
| ← GoGi left | 13:10 |
| → vandita joined | 13:11 |
| frobnic_ → frobnic | 13:12 |
| ← SilentGhost left | 13:13 |
| → SilentGhost joined | 13:14 |
| → GoGi joined | 13:14 |
| ← GoGi left | 13:14 |
| → GoGi joined | 13:14 |
| → kkawg_ joined | 13:15 |
| ← kkawg left | 13:18 |
| → zeenk joined | 13:19 |
| ← defjam left | 13:22 |
| → visualshock_ joined | 13:23 |
| → Suchiman joined | 13:23 |
| ← kkawg_ left | 13:24 |
| → PobodysNerfect joined | 13:24 |
| → JanC joined | 13:26 |
| ← LuKaRo left | 13:26 |
| ← visualshock left | 13:26 |
| ← JanC left | 13:29 |
| → very_sneaky joined | 13:30 |
| ← SilentGhost left | 13:30 |
| → SilentGhost joined | 13:30 |
| → defjam joined | 13:33 |
| ← theoceaniscool left | 13:37 |
| ← defjam left | 13:38 |
| → cdown joined | 13:39 |
| ← hwpplayer1 left | 13:41 |
| ← ferdna left | 13:42 |
| ← very_sneaky left | 13:43 |
| ← manwithluck left | 13:43 |
| → manwithluck joined | 13:48 |
| → defjam joined | 13:50 |
| → reset joined | 13:51 |
|
superheroes
| do you keep your swap files or do you put in .gitignore? | 13:53 |
|
| why, why not? | 13:53 |
| → very_sneaky joined | 13:55 |
|
superheroes
| I think I'll be ignoring them | 13:56 |
| → akiro joined | 13:57 |
|
superheroes
| the progit manual states that multiple file extension can be ignored in one liners | 13:57 |
|
| such as *.[oa] | 13:57 |
|
| in cases where extensions exceed single characters what would this look like? | 13:58 |
| → stenno joined | 13:59 |
|
superheroes
| does adding folders to .gitignore affect staging> | 14:00 |
|
| ? | 14:00 |
| ← arch_angel left | 14:04 |
| ← vandita left | 14:05 |
| → vandita joined | 14:07 |
| → shokohsc51 joined | 14:08 |
| ← shokohsc5 left | 14:10 |
| shokohsc51 → shokohsc5 | 14:10 |
| ← Inline left | 14:10 |
| ← defjam left | 14:11 |
| → defjam joined | 14:14 |
| ← stenno left | 14:15 |
| ← very_sneaky left | 14:20 |
| → very_sneaky joined | 14:21 |
| ← stengah left | 14:23 |
| → stenno joined | 14:25 |
| → LuKaRo joined | 14:25 |
| ← stenno left | 14:29 |
| → JanC joined | 14:34 |
| → AlexKalopsia19 joined | 14:37 |
| ← AlexKalopsia1 left | 14:39 |
| → Inline joined | 14:41 |
| ← derpydoo left | 14:45 |
| ← memset left | 14:50 |
| ← JanC left | 14:53 |
| → JanC joined | 14:53 |
| → skapata joined | 14:53 |
| ← eoli3n left | 14:54 |
| → eoli3n joined | 14:55 |
| → jaykelly450 joined | 14:57 |
| → XorMan joined | 15:00 |
| ← roadie left | 15:00 |
| ← wootehfoot left | 15:00 |
| → memset joined | 15:03 |
| → AndOrMan joined | 15:06 |
| ← XorMan left | 15:08 |
| ← defjam left | 15:09 |
| ← mpldr left | 15:12 |
| ← vandita left | 15:14 |
| → vandita joined | 15:15 |
| → hwpplayer1 joined | 15:17 |
| → rama_ joined | 15:19 |
| → defjam joined | 15:23 |
| ← rama_ left | 15:24 |
| ← defjam left | 15:28 |
| ← akiro left | 15:29 |
| → rustyshackleford joined | 15:32 |
| ← nickoe left | 15:32 |
| → mpldr joined | 15:35 |
| → junyx joined | 15:40 |
| → defjam joined | 15:41 |
| → nate2 joined | 15:44 |
| → nickoe joined | 15:45 |
| ← nate2 left | 15:49 |
| → jusski joined | 15:51 |
| → ChmEarl joined | 15:54 |
| ← defjam left | 15:55 |
| ← f_ left | 16:01 |
| → thiago joined | 16:03 |
| → vandita_ joined | 16:04 |
| ← vandita left | 16:07 |
| → defjam joined | 16:07 |
| → vandita joined | 16:13 |
| → bloody joined | 16:14 |
| → stengah joined | 16:15 |
| ← vandita_ left | 16:17 |
| ← stengah left | 16:27 |
| ← YuGiOhJCJ left | 16:28 |
| → iomari891 joined | 16:31 |
| → derpydoo joined | 16:32 |
| ← iomari891 left | 16:42 |
| ← bloody left | 16:48 |
| ← defjam left | 16:48 |
| → userxvz joined | 16:48 |
|
userxvz
| hello. >Does "git rebase master" move the current branch on top of local master ? | 16:49 |
|
nedbat
| userxvz: yes | 16:49 |
|
userxvz
| nedbat: thanks | 16:50 |
| → defjam joined | 16:50 |
| ← taupiqueur left | 16:51 |
| ← zeenk left | 16:52 |
|
userxvz
| sfter doing "git rebase master" (current branch is bugfix) I do "git checkout master" and then "git merge bugfix". Is this procedure correct? | 16:54 |
| → duxsco joined | 16:55 |
| ← userxvz left | 16:58 |
| → Celeo joined | 16:59 |
| → chandash joined | 17:00 |
|
nedbat
| user24037: that works, and you should get a fast-forward, so you won't have a merge commit. | 17:01 |
| → userxvz joined | 17:01 |
| → huntm joined | 17:01 |
| ← huntm left | 17:02 |
| → vandita_ joined | 17:03 |
| ← lucasta left | 17:04 |
| ← vandita left | 17:06 |
| ← userxvz left | 17:07 |
| → Rashad joined | 17:08 |
| ← Inline left | 17:08 |
| ← duxsco left | 17:09 |
| → xDemontic joined | 17:13 |
| ← JanC left | 17:15 |
| → JanC joined | 17:16 |
| ← JanC left | 17:18 |
| → Inline joined | 17:19 |
| → JanC joined | 17:19 |
| → bket joined | 17:20 |
| ← defjam left | 17:23 |
| JanC → Guest7282 | 17:24 |
| → JanC joined | 17:24 |
| ← Guest7282 left | 17:25 |
| ← Xenguy left | 17:25 |
| ← JanC left | 17:26 |
| → JanC joined | 17:27 |
| ← JanC left | 17:29 |
| → plsclap joined | 17:30 |
| → JanC joined | 17:30 |
|
plsclap
| hello all, i am trying to use osxkeychain as a credential-helper on the mac and it doesn't seem to be working | 17:31 |
| ← JanC left | 17:32 |
|
plsclap
| for more info, when i run a function that needs a credential (i.e. git push), the command `git credential-osxkeychain get` is ran but isnt successful. And `git credential-osxkeychain store` is never ran - even on a successful password entry | 17:33 |
| → JanC joined | 17:33 |
|
plsclap
| i am NEVER prompted by macOS to enter a password for the keychain, so im assuming im either missing something or it is broken | 17:34 |
| → defjam joined | 17:36 |
| ← JanC left | 17:36 |
|
plsclap
| additionally, whenever i run `git credential-osxkeychain` directly, it indefinitely hangs and does not prompt me for my macOS password at any point | 17:36 |
| → iomari891 joined | 17:36 |
| → JanC joined | 17:36 |
|
plsclap
| any thoughts on why this may be happening? | 17:36 |
| → mven joined | 17:40 |
| ← jaykelly450 left | 17:40 |
| ← JanC left | 17:40 |
| ← money left | 17:40 |
| → JanC joined | 17:41 |
| ← defjam left | 17:41 |
| → money joined | 17:41 |
| ← vysn left | 17:44 |
| → nate2 joined | 17:45 |
| → vandita joined | 17:45 |
| ← hwpplayer1 left | 17:45 |
| ← vandita_ left | 17:45 |
| JanC → Guest3457 | 17:47 |
| ← Guest3457 left | 17:47 |
| → JanC joined | 17:47 |
| → hwpplayer1 joined | 17:48 |
| ← nate2 left | 17:50 |
| → vandita_ joined | 17:50 |
| → JanC_ joined | 17:51 |
| ← JanC left | 17:51 |
| JanC_ → JanC | 17:51 |
| ← hwpplayer1 left | 17:51 |
| → defjam joined | 17:52 |
| ← JanC left | 17:53 |
| → JanC joined | 17:53 |
| ← vandita left | 17:54 |
| → hwpplayer1 joined | 17:55 |
| ← hwpplayer1 left | 17:57 |
| ← defjam left | 17:57 |
| → JanC_ joined | 17:59 |
| → Gary_Sinise joined | 17:59 |
| ← JanC left | 17:59 |
| JanC_ → JanC | 17:59 |
| ← AndOrMan left | 18:00 |
| → iomari892 joined | 18:02 |
| ← PobodysNerfect left | 18:03 |
| → Xenguy joined | 18:03 |
| → JanC_ joined | 18:03 |
| ← JanC left | 18:04 |
| JanC_ → JanC | 18:04 |
| ← iomari891 left | 18:04 |
| → hwpplayer1 joined | 18:06 |
| ← xDemontic left | 18:06 |
| ← JanC left | 18:06 |
| → JanC joined | 18:07 |
| → defjam joined | 18:08 |
| → xDemontic joined | 18:09 |
| ← jusski left | 18:11 |
| ← plsclap left | 18:12 |
| ← JanC left | 18:13 |
| → JanC_ joined | 18:13 |
| JanC_ → JanC | 18:13 |
| → PobodysNerfect joined | 18:14 |
| → gareppa joined | 18:15 |
| ← hwpplayer1 left | 18:21 |
| → SusanTheNerd joined | 18:23 |
| → fflam joined | 18:24 |
| ← SusanTheNerd left | 18:26 |
| → SusanTheNerd joined | 18:27 |
| ← alexherbo2 left | 18:29 |
| ← SusanTheNerd left | 18:29 |
| → SusanTheNerd joined | 18:29 |
| → vandita joined | 18:32 |
| → devmes joined | 18:32 |
| ← rsx left | 18:33 |
| → roadie joined | 18:34 |
| ← vandita_ left | 18:35 |
| → rama_ joined | 18:37 |
| → plsclap joined | 18:39 |
| ← Rashad left | 18:40 |
| → theoceaniscool joined | 18:41 |
| ← rama_ left | 18:41 |
| ← plsclap left | 18:43 |
| ← xDemontic left | 18:45 |
| → rsx joined | 18:46 |
| → rama_ joined | 18:49 |
| → XorMan joined | 18:51 |
| ← rama_ left | 18:54 |
| ← ProperNoun left | 18:58 |
| ← Xenguy left | 19:01 |
| → ProperNoun joined | 19:01 |
| ← PobodysNerfect left | 19:02 |
| → dextercd joined | 19:03 |
| → PobodysNerfect joined | 19:08 |
| → q3lont joined | 19:11 |
| → mpldr__ joined | 19:12 |
| ← mpldr left | 19:12 |
| mpldr__ → mpldr | 19:13 |
| → plsclap joined | 19:13 |
| ← mpldr left | 19:14 |
| → mpldr joined | 19:14 |
| ← plsclap left | 19:18 |
| → jaykelly450 joined | 19:18 |
| ← rsx left | 19:19 |
| → igemnace joined | 19:19 |
| → Xenguy joined | 19:25 |
| → cousteau joined | 19:25 |
| ← theoceaniscool left | 19:31 |
| → plsclap joined | 19:31 |
| ← Inline left | 19:34 |
| ← plsclap left | 19:36 |
| ← w4 left | 19:38 |
| → w4 joined | 19:38 |
| → SleePy joined | 19:43 |
| ← hrberg left | 19:43 |
| → hrberg joined | 19:44 |
| → nate2 joined | 19:46 |
| ← q3lont left | 19:49 |
| → terminalpusher joined | 19:50 |
| ← nate2 left | 19:51 |
| ← vandita left | 19:53 |
| → vandita joined | 19:54 |
| ← terminalpusher left | 19:55 |
| → m0viefreak joined | 19:58 |
| ← money left | 20:00 |
| ← gareppa left | 20:01 |
| → plsclap joined | 20:05 |
| ← DynamiteDan left | 20:08 |
| → DynamiteDan joined | 20:09 |
| ← DynamiteDan left | 20:10 |
| ← plsclap left | 20:10 |
| → DynamiteDan joined | 20:10 |
| ← feriman left | 20:12 |
| ← visualshock_ left | 20:15 |
| → rama_ joined | 20:16 |
| ← junyx left | 20:18 |
| → ackyshake joined | 20:19 |
| ← coot_ left | 20:20 |
| ← rama_ left | 20:20 |
| ← superheroes left | 20:22 |
| → PobodysNerfect_ joined | 20:23 |
| ← JanC left | 20:24 |
| ← PobodysNerfect left | 20:24 |
| ← Xenguy left | 20:25 |
| → JanC joined | 20:26 |
| → plsclap joined | 20:27 |
| → akiro joined | 20:28 |
| ← derpydoo left | 20:32 |
| ← Celeo left | 20:37 |
| ← plsclap left | 20:37 |
| ← jaykelly450 left | 20:40 |
| → plsclap joined | 20:41 |
| ← m0viefreak left | 20:53 |
| → Erisa joined | 21:02 |
| → PobodysNerfect joined | 21:05 |
| → zer0bitz_ joined | 21:05 |
| → delay joined | 21:07 |
| ← PobodysNerfect_ left | 21:07 |
| ← zer0bitz left | 21:08 |
| → peas joined | 21:09 |
| ← delay left | 21:15 |
| ← roadie left | 21:21 |
| ← devmes left | 21:24 |
| → devmes joined | 21:24 |
| ← weko left | 21:26 |
| ← PobodysNerfect left | 21:34 |
| → weko joined | 21:35 |
| ← XorMan left | 21:36 |
| → derpydoo joined | 21:37 |
| → IguanaBob joined | 21:39 |
| → zer0bitz joined | 21:43 |
| → t0mm13b joined | 21:46 |
| ← zer0bitz_ left | 21:46 |
| → nate2 joined | 21:46 |
| → roadie joined | 21:47 |
| ← plsclap left | 21:49 |
| → tirnanog joined | 21:51 |
| ← nate2 left | 21:51 |
| → Xenguy joined | 21:54 |
| ← roadie left | 21:56 |
| → theoceaniscool joined | 21:58 |
| ← nickoe left | 21:59 |
| → nickoe joined | 21:59 |
| → dustinm joined | 22:00 |
| ← JanC left | 22:03 |
| → JanC joined | 22:04 |
| → rosco joined | 22:05 |
| ← otisolsen70 left | 22:09 |
| → XorMan joined | 22:11 |
| → plsclap joined | 22:23 |
| ← defjam left | 22:23 |
| ← plsclap left | 22:24 |
| → defjam joined | 22:24 |
| ← memset left | 22:25 |
| → rama_ joined | 22:30 |
| ← theoceaniscool left | 22:31 |
| → v_ joined | 22:34 |
| ← v_ left | 22:38 |
| ← rama_ left | 22:40 |
| ← igemnace left | 22:44 |
| → nate2 joined | 22:54 |
| → firewyre joined | 22:55 |
| → memset joined | 22:57 |
| ← rosco left | 22:58 |
| ← nate2 left | 22:58 |
| → oprypin joined | 23:02 |
| ← defjam left | 23:03 |
| → rama_ joined | 23:09 |
| ← akiro left | 23:10 |
| → delay joined | 23:12 |
| ← cousteau left | 23:13 |
| ← rama_ left | 23:14 |
| → roadie joined | 23:15 |
| ← iomari892 left | 23:17 |
| ← XorMan left | 23:19 |
| ← Gary_Sinise left | 23:19 |
| → iomari892 joined | 23:22 |
| ← roadie left | 23:26 |
| → junyx joined | 23:30 |
| ← peas left | 23:31 |
| → defjam joined | 23:35 |
| ← defjam left | 23:39 |
| → ferdna joined | 23:40 |
| ← IguanaBob left | 23:49 |
| → defjam joined | 23:51 |
| → vysn joined | 23:53 |
| ← defjam left | 23:57 |
| ← delay left | 23:59 |