| 2021-06-26 |
| ← Sasazuka left | 00:05 |
| ← skapata left | 00:06 |
| ← Torr left | 00:07 |
| ← FFY00 left | 00:27 |
| → FFY00 joined | 00:28 |
| ← chexum left | 00:32 |
| → chexum joined | 00:33 |
| ← orbyt left | 00:39 |
| ← pulse left | 00:40 |
| → apauli joined | 00:42 |
| → Nalt joined | 00:44 |
| ← alzgh left | 00:45 |
| ← PaMeDa left | 00:45 |
| ← ano left | 00:46 |
| → ano joined | 00:47 |
| ← thiago left | 00:56 |
| → nate1 joined | 01:00 |
| ← FFY00 left | 01:02 |
| → FFY00 joined | 01:02 |
| ← nate1 left | 01:04 |
| ← hegstal left | 01:16 |
| → pete443_ joined | 01:31 |
| ← pete443 left | 01:33 |
| ← hnOsmium0001 left | 01:38 |
| → aquijoule_ joined | 01:51 |
| ← richbridger left | 01:54 |
| → hnOsmium0001 joined | 02:03 |
| ← pretty_dumm_guy left | 02:21 |
| → Guest53 joined | 02:22 |
| ← Guest53 left | 02:23 |
| ← zebrag_ left | 02:28 |
| → finn_elija joined | 02:32 |
| ← FinnElija left | 02:32 |
| finn_elija → FinnElija | 02:32 |
| → rewrit3 joined | 02:34 |
| ← cdown left | 02:35 |
| → twinsignal joined | 02:37 |
| ← twinsignal left | 02:41 |
| → Codaraxis_ joined | 02:45 |
| → structoha joined | 02:48 |
|
structoha
| hey, i wonder if it is a good practice to use cloud drives for git-repos sync | 02:49 |
| ← Codaraxis left | 02:49 |
|
Soni
| how do you get the accidental commit on main out of main? | 03:04 |
|
| (not pushed) | 03:04 |
|
| git checkout -b feature/whatever and then what? | 03:04 |
|
| hmm, switch back to main and git reset --hard HEAD~1? | 03:06 |
|
| yay, it worked! | 03:06 |
| ← jsrnop left | 03:20 |
| ← Wuzzy left | 03:30 |
|
mackerman
| structoha: No, putting a .git on a file sync service is a bad idea. | 03:30 |
|
| !dropbox_why | 03:30 |
|
gitinfo
| git uses a lot of frequently-changed small files, which dropbox's synchronization algorithms barf on. Use of multiple dropbox clients compounds this, with hilarious results | 03:30 |
|
structoha
| alright thx, i guess i will add the files and exclude the .git | 03:31 |
|
mackerman
| An archived repo in one file is a different matter. man git bundle | 03:31 |
|
gitinfo
| the git-bundle manpage is available at https://gitirc.eu/git-bundle.html | 03:31 |
|
mackerman
| Work tree file sync seems like a bad idea too. The sync will introduce changes that are not in the history. | 03:32 |
|
structoha
| i will give git bundle a try, i dont see another solution for now | 03:34 |
|
| thank you | 03:34 |
|
mackerman
| Multiple file sync clients, one of which checks out a different work tree, that gets synced, then the other copy has changes, but for the wrong branch (!) | 03:35 |
|
structoha
| ya i guess i shouldnt mix the two solutions at all probably | 03:36 |
| ← Lord_of_Life left | 03:39 |
| → Lord_of_Life joined | 03:40 |
|
mackerman
| git hosting is bettter at providing a real git remote. Actual cold backups are better backups than leaving an online copy in a file share. | 03:40 |
| → dimi1947 joined | 03:41 |
|
structoha
| And you recommend to use git-bundle for the referred cold backups? | 03:41 |
| ← dimi1947 left | 03:43 |
|
mackerman
| git bundle generantes an archive file with history. Good for any kind of file transfer you like, the usual network protocol not required. | 03:43 |
|
| Backup software should be able to handle a .git directory with work tree. | 03:44 |
|
| But many frequently changed small files is not good for most file sync solutions. | 03:45 |
| → jsrnop joined | 03:45 |
|
structoha
| I just tested on mega cloud, looks horrible :O | 03:45 |
| ← anton left | 03:50 |
| → anton joined | 03:51 |
|
mackerman
| Backblaze backups appear to be excluding .git on my Windows box. | 04:00 |
|
structoha
| hmmmmm | 04:00 |
|
mackerman
| I push my work to a remote, but that might be less backed up than I thought. | 04:00 |
|
structoha
| exactly same here | 04:01 |
|
mackerman
| Maybe later I'll ask support why. | 04:01 |
|
structoha
| am deploying my backup on mega cloud currently | 04:03 |
|
| backblaze sounds very promising but i am not sure why i would switch | 04:03 |
| ← apauli left | 04:08 |
| ← AbleBacon left | 04:10 |
| → nate1 joined | 04:13 |
| → Vonter joined | 04:15 |
| → Crassus joined | 04:21 |
| ← nate1 left | 04:23 |
| ← Crassus left | 04:28 |
| ← Scotty_Trees left | 04:32 |
| → madewokherd` joined | 04:40 |
| ← madewokherd left | 04:43 |
| ← structoha left | 04:48 |
| → AnAverageHuman joined | 04:52 |
| ← reset left | 04:52 |
| ← PuercoPop left | 05:03 |
| → Codaraxis__ joined | 05:08 |
| → UsrLocalLibera joined | 05:08 |
|
UsrLocalLibera
| Hi, what does "business logic" mean to you guys? | 05:10 |
| ← Codaraxis_ left | 05:12 |
| ← vicfred left | 05:22 |
| → jkl joined | 05:27 |
| → Guest9 joined | 05:28 |
| ← arcatech left | 05:32 |
| → forgotmynick joined | 05:40 |
| → onizu joined | 05:41 |
|
onizu
| hi | 05:42 |
|
| when I do 'git fetch' I am getting a new branch there, which I want to merge. But it's not yet available in 'git branch' | 05:42 |
|
| Do I need to 'git pull' for that? | 05:42 |
| ← gast0n left | 05:42 |
|
onizu
| Hope it will not merge with 'master' | 05:42 |
|
| I did 'git checkout remoteBranch' | 05:46 |
|
| then 'git checkout master' and then 'git merge --no-ff remoteBranch'. Is this the right way? Or should there had been a 'git pull' somewhere in the process? | 05:47 |
| ← Vonter left | 05:52 |
| ← lgc left | 05:54 |
| → Vonter joined | 05:54 |
|
ikke
| onizu: no, git pull is not what you want in this case | 05:54 |
|
onizu
| hi ikke , ok | 05:55 |
|
| when is 'git pull' used then? | 05:55 |
| ← thunfisch left | 05:55 |
| → hmmmas joined | 05:55 |
|
ikke
| git pull is fetch + merge | 05:56 |
|
| (merge by default, it can also be rebase) | 05:56 |
|
onizu
| I see | 05:57 |
|
| so no, I don't want to merge right away | 05:57 |
| → YuGiOhJCJ joined | 05:57 |
|
ikke
| note that you do not necesarily have to checkout that branch (which causes git to automatically create a 'local' branch) | 05:58 |
| → FH_thecat joined | 05:58 |
|
ikke
| you could just do: git fetch, git merge origin/<branchname> | 05:58 |
|
onizu
| I see | 05:58 |
|
ikke
| but your approach is fine | 05:59 |
|
onizu
| so in that case I need to specify the origin | 05:59 |
|
ikke
| when you fetch branches from origin, git creates so called remote tracking branches | 06:00 |
|
onizu
| it would make sense to avoid checkout, as that remote branch was created by me on another computer, so I know what's there | 06:00 |
|
ikke
| they all have the remote name prefixed | 06:00 |
|
onizu
| I see | 06:00 |
|
| ikke: to be safe, I only pushed the new branch to remote and didn't merge with master on the other computer. But if I were sure of merging those changes, I get an option on GitHub to 'create pull request' from my new branch after I push, should I go for it? | 06:02 |
|
ikke
| if you just want to merge it, you could've already merged it locally | 06:03 |
|
| creating a merge request just to directly merge it seems a bit excessive | 06:04 |
| ← ThorMojito left | 06:04 |
|
ikke
| (it's different if you have some kind of CI process attached to the pull request) | 06:04 |
|
onizu
| ok | 06:06 |
| ← AnAverageHuman left | 06:25 |
| ← Guest9 left | 06:26 |
| → furrymcgee joined | 06:30 |
| → raindrop joined | 06:41 |
| ← sudoforge left | 06:43 |
| → Crassus joined | 06:51 |
| ← ndim left | 06:52 |
| → ndim joined | 06:54 |
| ← ndim left | 06:58 |
| ← ferdna left | 07:00 |
| ← unluckyshrubbery left | 07:04 |
| → ndim joined | 07:04 |
| → structoha joined | 07:14 |
| ← hbautista left | 07:15 |
| ← structoha left | 07:19 |
| → ubique joined | 07:33 |
| ← Crassus left | 07:35 |
| → SirRippovMaple6 joined | 07:35 |
| ← SirRippovMaple6 left | 07:36 |
| → SirRippovMaple6 joined | 07:38 |
| ← SirRippovMaple6 left | 07:38 |
| → Guest9 joined | 07:41 |
| → SirRippovMaple6 joined | 07:50 |
| ← SirRippovMaple6 left | 07:51 |
| ← dmang left | 08:01 |
| → dmang joined | 08:02 |
| ← dmang left | 08:07 |
| → lionkor joined | 08:09 |
| → dmang joined | 08:15 |
| ← af left | 08:29 |
| → dviola joined | 08:31 |
| → Adoi joined | 08:33 |
| ← ndim left | 08:34 |
| → ndim joined | 08:34 |
| ← Guest9 left | 08:36 |
| ← tsujp left | 08:38 |
| ← FH_thecat left | 08:50 |
| → af joined | 08:51 |
| → arash joined | 08:54 |
| → alzgh joined | 08:57 |
| ← lionkor left | 08:57 |
| → SirRippovMaple6 joined | 08:58 |
| → ubique_ joined | 08:58 |
| ← SirRippovMaple6 left | 08:59 |
| ← forgotmynick left | 09:00 |
| → SirRippovMaple6 joined | 09:00 |
| ← SirRippovMaple6 left | 09:00 |
| → Crassus joined | 09:01 |
| ← ubique left | 09:01 |
| → SirRippovMaple6 joined | 09:02 |
| → ubique joined | 09:04 |
| ← ubique_ left | 09:04 |
| ← jazzy left | 09:05 |
| ← SirRippovMaple6 left | 09:06 |
| ← milosz left | 09:06 |
| → unluckyshrubbery joined | 09:07 |
| → SirRippovMaple6 joined | 09:08 |
| ← SirRippovMaple6 left | 09:08 |
| → SirRippovMaple6 joined | 09:13 |
| ← hnOsmium0001 left | 09:18 |
| ← arash left | 09:18 |
| ← xayto_ left | 09:26 |
| → xayto joined | 09:27 |
| ← Betal left | 09:31 |
| → Scotty_Trees joined | 09:32 |
| → Lunatrius` joined | 09:34 |
| ← Lunatrius left | 09:35 |
| ← UsrLocalLibera left | 09:37 |
| → thunfisch joined | 09:41 |
| ← Adoi left | 09:53 |
| → Codaraxis_ joined | 09:54 |
| ← Codaraxis__ left | 09:58 |
| → Codaraxis__ joined | 10:05 |
| ← Codaraxis_ left | 10:08 |
| → apauli joined | 10:16 |
| → arash joined | 10:20 |
| → dshikoh joined | 10:22 |
| ← dshikoh left | 10:23 |
| ← Lunatrius` left | 10:26 |
| → Lunatrius joined | 10:26 |
| → Adoi joined | 10:26 |
| ← Vonter left | 10:33 |
| → pulse joined | 10:36 |
| → raindrop22 joined | 10:37 |
| ← raindrop left | 10:41 |
| ← chexum left | 10:45 |
| → pretty_dumm_guy joined | 10:45 |
| → jimklimov joined | 10:47 |
| ← jimklimov1 left | 10:50 |
| → Vonter joined | 10:50 |
| ← Vonter left | 10:58 |
| → Vonter joined | 11:01 |
| → kenanmarasli joined | 11:15 |
| ← Strom left | 11:16 |
| → Strom joined | 11:17 |
| ← raindrop22 left | 11:19 |
| ← hmmmas left | 11:27 |
| → cdown joined | 11:30 |
| ← arash left | 11:54 |
| → arash joined | 11:57 |
| → skapata joined | 11:57 |
| ← adlternative left | 12:11 |
| ← jinsun left | 12:11 |
| → Cleverness joined | 12:12 |
| → jinsun joined | 12:12 |
| ← Cleverness left | 12:14 |
|
Taro42
| I have a question about --verify-signatures: Do I really need to set the trust level of every public key to 5 / ultimate? I tried anything less than 5 and git complained about it being untrustworthy. This is weird because ultimate trust usually implies that I'm the owner, but there may be other keys that I trust, but I wouldn't want to set it to set that trust level regardless. | 12:19 |
|
| e.g. git pull --verify-signatures | 12:19 |
| → unixbhaskar joined | 12:20 |
|
cehteh
| Taro42: no you should not | 12:29 |
|
| that would totally break its purpose | 12:29 |
|
Taro42
| cehteh: then how could I do git pull --verify-signatures for other people's keys? | 12:30 |
| ← Adoi left | 12:31 |
|
cehteh
| when you dont have a trust chain (which is safely established, not by setting things brainless to trusted) then it is expected that validation fails | 12:31 |
|
| you just cant establish trust then, forcing it to do so would be pointless | 12:32 |
| → UsrLocalLibera joined | 12:33 |
|
Taro42
| cehteh: I mainly need it to verify commits on a server | 12:36 |
|
| there are multiple people contributing | 12:36 |
|
cehteh
| then you have to validate their keys .. possibly in a personal meeting, and sign their keys | 12:36 |
| ← jimklimov left | 12:37 |
| → lispmacs joined | 12:37 |
|
lispmacs
| hi, can I use some git command to help me merge two files that are not in a git repository? | 12:38 |
| → jimklimov joined | 12:41 |
|
Taro42
| cehteh: ah, just gpg --sign-key is enough? I only know them over the Internet. | 12:41 |
|
cehteh
| no its not enough | 12:41 |
|
| thats malpractice | 12:41 |
|
| when you cant establish a trust then then you cant | 12:41 |
|
| you need some secret channel where you negotiate the key, private meeting, telephone call, carrier pidgeon .. whatever | 12:42 |
|
| in theory you can just sign anyone elses key, but you never really verified their identity, thus a man in the middle could sneak in and coerce you into trusting the wrong key | 12:44 |
|
Taro42
| cehteh: the only purpose of this is not to trust the gitlab server | 12:44 |
|
| nothing else | 12:44 |
|
| I agree, there are better ways to do this | 12:44 |
|
cehteh
| and by that the whole thing becomes compromised, people who rely on you to do this carefully are in danger too | 12:44 |
|
| when you cant establsih trust then just start without it | 12:44 |
|
| when you have some private reson to trust some key then you can do a local/private signature, but be very careful with that | 12:45 |
|
| lispmacs: you can git diff between any 2 files ... as much or less that helps, there are better tools for the job | 12:47 |
|
| Taro42: for sure you do not want ultimate trust | 12:48 |
| → hoochmonger joined | 12:49 |
|
Taro42
| ok, I'll create private keys for each server instead | 12:49 |
|
cehteh
| not private keys but private signatures | 12:50 |
| → cdown_ joined | 12:51 |
|
cehteh
| man gpg see lsign | 12:51 |
| ← tejr left | 12:54 |
| → tejr joined | 12:56 |
| → vdamewood joined | 12:58 |
|
Taro42
| ah okay, thank you cehteh. this is delving into #gnupg territory, so I'll stop here ;) | 12:58 |
| ← dviola left | 13:00 |
| → Torr joined | 13:15 |
| ← xkr47 left | 13:17 |
| ← Scotty_Trees left | 13:19 |
| ← pretty_dumm_guy left | 13:22 |
| → pretty_dumm_guy joined | 13:23 |
| ← Torr left | 13:24 |
| → Torr joined | 13:25 |
| ← Taro42 left | 13:25 |
| → adlternative joined | 13:31 |
| → reset joined | 13:34 |
| → qunzhong_luxian joined | 13:37 |
| ← qunzhong_luxian left | 13:41 |
| ← unixbhaskar left | 13:44 |
| → hegstal joined | 13:49 |
| → hegstal_ joined | 13:50 |
| → madewokherd joined | 13:50 |
| ← hegstal left | 13:51 |
| hegstal_ → hegstal | 13:53 |
| → BaD_CrC joined | 13:54 |
| ← madewokherd` left | 13:55 |
| → AnAverageHuman joined | 14:10 |
| → dms489 joined | 14:12 |
| → Deneb joined | 14:13 |
| ← Deneb left | 14:15 |
| ← cdown_ left | 14:17 |
|
dms489
| Since upgrading to Ubuntu 20.04, I have been locked out of github. Error is "remote: invalid user name or password." Github shows my user name and project correctly. Any ideas? | 14:18 |
|
ikke
| dms489: what does git config credential.helper return? | 14:19 |
|
dms489
| nothing! | 14:20 |
|
| git config --list seems OK | 14:24 |
| → gas51627 joined | 14:25 |
|
dms489
| although if has 4 odd lines about remote. [stuff] | 14:26 |
| → zebrag joined | 14:27 |
| → tionij joined | 14:28 |
| ← YuGiOhJCJ left | 14:30 |
| ← ubique left | 14:31 |
| → AbleBacon joined | 14:31 |
|
dms489
| Was my post above seen by @ikke as a reply | 14:33 |
|
| ? | 14:33 |
| ← Crassus left | 14:34 |
|
ikke
| yes | 14:34 |
|
| Just thinking what it can be | 14:34 |
|
| Something must be providing a username and password | 14:34 |
|
dms489
| Sorry to bug you. I'm new here. | 14:34 |
| ← FinnElija left | 14:34 |
|
dms489
| I thought that was cthe config stuff. | 14:35 |
|
| I'm quite happy to rip everything out and start over. I have the project backed up, and a dead tree copy of the Chacon / Straub book. | 14:37 |
| → ebeip90 joined | 14:38 |
| → FinnElija joined | 14:38 |
| ← ebeip90 left | 14:38 |
| → ebeip90 joined | 14:38 |
|
dms489
| Should I give you the whole dialog? | 14:40 |
|
ebeip90
| Hello all! I love git diff's --function-context / -W feature, but there are certain file extensions where Git just decides to show the whole file. I would like to disable the --function-context for specific extensions. I know Git has some sort of support for this, as using --function-context to diff a .txt file behaves as if the flag was not specified. How can I add more extensions to ignore / bypass this feature? | 14:41 |
|
nedbat
| ebeip90: you want a gitattributes file: https://git-scm.com/docs/gitattributes | 14:43 |
| → Kill-Anirnals joined | 14:44 |
|
ebeip90
| @nedbat: I have a ~/.gitattributes file, but there's no documented way to disable Git's attempt to interpret the contents of the file with -W/--function-context. The file format in question just HAPPENS to look like C, e.g. has nested {{}}. The file format starts with a C-style comment, and the first non-comment character is a '{', and the file ends with '}' -- so the "git diff --function-context" shows the whole file. I tried setting "*.ext | 14:45 |
|
| diff=text" (and txt) but this didn't resolve the issue. | 14:45 |
|
| I also tried setting "git config --global diff.ext.command '!git diff -C5'" to try to force Git to use a different diff driver (to circumvent -W) but this didn't work either. | 14:47 |
| → Guest42 joined | 14:47 |
|
ikke
| dms489: do you get a dialog? | 14:49 |
|
dms489
| I said the wrong thing. I meant to show you all the steps from 'git init' to the disaster. | 14:51 |
|
ikke
| dms489: Is your remote http or ssh? | 14:54 |
|
dms489
| git fetch https://github.com/dms489/Portal | 14:55 |
| → Xenguy joined | 14:56 |
|
dms489
| I did set up SSH also. | 14:56 |
|
gas51627
| Hi. Sorry another question about git rev-list. Why is P included in "--full-history without parent rewriting" mode? P is treesame to O, so it should be excluded. http://imgur.com/a/GHUPeuU | 14:57 |
| → nate1 joined | 15:00 |
| ← SirRippovMaple6 left | 15:00 |
| → GeorgeK joined | 15:04 |
| → herbas joined | 15:04 |
| ← nate1 left | 15:05 |
| ← herbas left | 15:05 |
| ← dms489 left | 15:06 |
| → xkr47 joined | 15:10 |
| → Adoi joined | 15:10 |
| → dms489 joined | 15:11 |
| ← Guest42 left | 15:12 |
| → Guest42 joined | 15:12 |
|
dms489
| (Sigh!) finger trouble. Is ikke still here? | 15:14 |
| → oriba joined | 15:16 |
| ← Adoi left | 15:18 |
| → cliluw joined | 15:18 |
| → Adoi joined | 15:19 |
| → vicfred joined | 15:20 |
| ← Adoi left | 15:20 |
| ← rewrit3 left | 15:21 |
| → Adoi joined | 15:21 |
| ← BaD_CrC left | 15:23 |
| → Adois joined | 15:27 |
| → EvilDMP joined | 15:28 |
| ← Guest42 left | 15:29 |
| ← Adoi left | 15:31 |
|
ebeip90
| @nedbat: Managed to resolve it with a custom diff command. It wasn't working originally because I was unaware that "git log" needs "--ext-diff" in order to use the diff.ext.command from ~/.gitconfig. | 15:31 |
|
| If anybody is curious, I also made it so that the diff output looks like the normal "git diff" output by moving the temporary files around and re-creating the directory path. For the curious: https://gist.github.com/zachriggle/ed4eb9a6e5880eaf78dd7d29817e1313 | 15:35 |
|
EvilDMP
| I've never found a very good workflow for this... I'm working on a local branch; I push to my fork, and make a PR to upstream. Before I continue working locally, I want to synchronise my local branch with upstream/main. What is a clean way to overwrite everything in my local branch with upstream/main? | 15:35 |
|
ebeip90
| @EvilDMP: "overwrite everything"? git fetch upstream; git reset --hard upstream/main; | 15:36 |
|
EvilDMP
| does the trick perfectly thank you ebeip90 . | 15:38 |
| → Adoi joined | 15:38 |
| ← Adois left | 15:42 |
| → marink joined | 15:43 |
| → fef joined | 15:45 |
| ← m0viefreak left | 15:45 |
| ← Adoi left | 15:48 |
| ← zebrag left | 15:49 |
| → Wuzzy joined | 15:49 |
| → kenanmarasli_ joined | 15:51 |
| ← kenanmarasli left | 15:53 |
| ← arash left | 15:54 |
| → structoha joined | 15:54 |
| ← anton left | 15:54 |
| ← ano left | 15:55 |
| → arash joined | 15:55 |
| → ano joined | 15:55 |
| → anton joined | 15:55 |
| ← schmillin left | 15:57 |
| ← ebeip90 left | 15:58 |
| → schmillin joined | 16:00 |
| ← structoha left | 16:00 |
| → pycurious joined | 16:00 |
|
pycurious
| I'm looking for a software to generate statistics from a repo for number of lines committed per month per developer | 16:00 |
| → jstein joined | 16:01 |
|
fef
| any guidelines on git commit messages | 16:05 |
|
ikke
| !clean | 16:05 |
|
gitinfo
| [!clean_message] It helps to write clean commit messages. http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html explains how. | 16:05 |
|
pycurious
| git-quick-stats seems to be good for me. | 16:05 |
| → hnOsmium0001 joined | 16:05 |
| ← tionij left | 16:06 |
| → Guest53 joined | 16:12 |
| ← cliluw left | 16:15 |
| → cliluw joined | 16:16 |
| → stkrdknmibalz joined | 16:16 |
| → arcatech joined | 16:20 |
| ← Guest53 left | 16:20 |
| ← cliluw left | 16:20 |
| kenanmarasli_ → kenanmarasli | 16:23 |
| → nate1 joined | 16:25 |
| → lgc joined | 16:27 |
|
gas51627
| Finally managed to construct a git log command that shows really all changes to the path | 16:29 |
| ← nate1 left | 16:30 |
| → structoha joined | 16:33 |
| ← structoha left | 16:33 |
| → structoha joined | 16:33 |
| ← lgc left | 16:39 |
| ← iamtheranger left | 16:42 |
| → iamtheranger joined | 16:42 |
| ← iamtheranger left | 16:43 |
| → iamtheranger joined | 16:44 |
| → gast0n joined | 16:48 |
| → Guest42 joined | 16:50 |
| → ferdna joined | 16:53 |
| ← Guest42 left | 16:54 |
| ← pretty_dumm_guy left | 17:03 |
|
natechan
| Is there a way to leave the repo in its current state and generate a diff/patch file that includes (1) staged (2) unstaged and (3) untracked files which can be applied? I'm fine with losing the distinction between staged and unstaged when applying the patch. | 17:05 |
|
ikke
| To get a diff of untracked filed, you need to at least add them with --intent-to-add | 17:06 |
| → Codaraxis joined | 17:06 |
| → xall joined | 17:06 |
|
natechan
| Thanks @ikke! I was hoping there was a way that would leave the repo untouched. That said, I guess the new files still aren't staged with that done, so it's almost like not changing the state. | 17:08 |
| ← dms489 left | 17:09 |
| ← Codaraxis__ left | 17:09 |
|
ikke
| it would only affect the index in a minor way | 17:09 |
| ← AnAverageHuman left | 17:13 |
| → RedNifre joined | 17:29 |
|
RedNifre
| Hey, git people. | 17:35 |
| ← structoha left | 17:36 |
|
RedNifre
| I have a funny idea: See, I have some ancient code from 20 years ago and wanted to put it on Github. I think it would be funny if the code was actually commited 22.7.2001 23:30, 4 years before the release of git. Is that possible? | 17:39 |
|
| Same for repository creation etc., if those events even have different dates. | 17:39 |
|
| I was thinking about using a VM with a wrong system date for that, but maybe git allows for date overrides? | 17:40 |
| ← fef left | 17:41 |
| → chexum joined | 17:44 |
|
marink
| RedNifre, look into git commit --date, and/or GIT_AUTHOR_DATE/GIT_COMMITTER_DATE environment variables | 17:45 |
| ← EvilDMP left | 17:49 |
| → ThorMojito joined | 17:52 |
| → madewokherd` joined | 17:52 |
| ← arash left | 17:56 |
| ← madewokherd left | 17:56 |
| → EvilDMP joined | 17:58 |
| → jazzy joined | 17:59 |
| → cliluw joined | 18:01 |
| ← EvilDMP left | 18:02 |
| ← bket left | 18:05 |
| → arash joined | 18:05 |
| → lgc joined | 18:09 |
| → AnAverageHuman joined | 18:10 |
| → Betal joined | 18:10 |
| ← arash left | 18:10 |
| → bongobrown joined | 18:12 |
| ← arcatech left | 18:12 |
| ← gothicserpent left | 18:12 |
| → bket joined | 18:12 |
| CommunistWolf → CapitalistWolf | 18:15 |
| CapitalistWolf → CommunistWolf | 18:15 |
| → Guest9 joined | 18:20 |
| ← SirRippovMaple left | 18:23 |
| → SirRippovMaple joined | 18:25 |
| → EvilDMP joined | 18:29 |
| → SirRippovMaple6 joined | 18:31 |
| ← SirRippovMaple6 left | 18:33 |
| → SirRippovMaple6 joined | 18:34 |
| ← marink left | 18:40 |
| → Adoi joined | 18:43 |
| ← Kill-Anirnals left | 18:44 |
| ← gas51627 left | 18:44 |
| → natrys joined | 18:49 |
| ← SirRippovMaple6 left | 18:50 |
| ← anton left | 18:51 |
| → SirRippovMaple6 joined | 18:51 |
| ← bongobrown left | 18:52 |
| ← SirRippovMaple6 left | 18:53 |
| → bongobrown joined | 18:54 |
| → SirRippovMaple6 joined | 18:54 |
| ← UsrLocalLibera left | 18:54 |
| jkl → jkl1337 | 18:58 |
| → sudoforge joined | 19:00 |
| jkl1337 → jkl | 19:00 |
| ← jkl left | 19:01 |
| → jkl joined | 19:01 |
| ← vdamewood left | 19:02 |
| ← SirRippovMaple left | 19:03 |
| → dunderprotos joined | 19:05 |
| → SirRippovMaple joined | 19:05 |
| → BUSY joined | 19:08 |
| ← dunderprotos left | 19:09 |
| ← SirRippovMaple6 left | 19:10 |
| → dunderprotos joined | 19:10 |
| ← dunderprotos left | 19:12 |
| → SirRippovMaple6 joined | 19:13 |
| → anton joined | 19:13 |
| ← SirRippovMaple6 left | 19:14 |
| ← pulse left | 19:14 |
| ← SirRippovMaple left | 19:16 |
| → SirRippovMaple joined | 19:19 |
| → daemon joined | 19:33 |
| ← Strom left | 19:34 |
|
daemon
| hey all if I am on a previous commit, in this example: git checkout 920db7e1fe156002d8e3933c7feb7256f08ff837 - how do I make this the most up to date master (remove all commits that followed) - this has no remote/origin its local only | 19:34 |
|
| I am also not on a branch this is all on master | 19:34 |
| → Strom joined | 19:36 |
| ← daemon left | 19:37 |
| → thiago joined | 19:41 |
| → vdamewood joined | 19:46 |
|
rewt
| if you want to force master to that hash, and you've already checked it out, `git branch -D master; git checkout -b master; git push -fu;` ... delete local master; create local master at current commit; force push and create tracking | 19:46 |
| → welovfree joined | 19:47 |
| ← SirRippovMaple left | 19:50 |
| ← yuljk left | 19:50 |
| → yuljk joined | 19:51 |
| → SirRippovMaple joined | 19:53 |
| ← Vonter left | 19:53 |
| → xkuru joined | 19:58 |
| → Vonter joined | 19:59 |
| ← welovfree left | 20:01 |
| ← SirRippovMaple left | 20:04 |
| ← pycurious left | 20:04 |
| → SirRippovMaple joined | 20:08 |
| → pycurious joined | 20:08 |
| → GNUcifer joined | 20:11 |
| → arcatech joined | 20:13 |
| ← cehteh left | 20:15 |
| GNUcifer → cehteh | 20:15 |
| ← Guest9 left | 20:16 |
| ← Adoi left | 20:18 |
| → Crassus joined | 20:27 |
| ← furrymcgee left | 20:28 |
| ← Vonter left | 20:32 |
| → frk joined | 20:46 |
| ← frk left | 21:00 |
| → structoha joined | 21:02 |
| → Scotty_Trees joined | 21:03 |
| ← seand left | 21:18 |
| ← bongobrown left | 21:19 |
| ← vdamewood left | 21:28 |
| ← natrys left | 21:41 |
| → Vonter joined | 21:47 |
| ← FinnElija left | 21:58 |
| → seand joined | 21:58 |
| → a6a45081-2b83 joined | 21:59 |
| ← Vonter left | 22:00 |
| → FinnElija joined | 22:02 |
| ← structoha left | 22:08 |
|
inkbottle[m]
| `git diff HEAD~1 HEAD~2`, is there a shortcut for that? | 22:16 |
|
canton7
| git show HEAD~ | 22:17 |
| ← Murr left | 22:17 |
| → Murr joined | 22:17 |
| → rewrit3 joined | 22:19 |
| ← Nalt left | 22:20 |
| → schmillin_ joined | 22:20 |
| ← ferdna left | 22:23 |
| ← schmillin left | 22:24 |
| → unixbhaskar joined | 22:24 |
| ← a6a45081-2b83 left | 22:25 |
| ← Crassus left | 22:27 |
| ← pycurious left | 22:30 |
| → debsan joined | 22:47 |
| Gustavo6046 → Gustavo6046|bloo | 22:54 |
| Gustavo6046|bloo → Gustavo6046|oops | 22:54 |
| Gustavo6046|oops → Gustavo6046 | 22:54 |
| ← alzgh left | 22:56 |
| → Adoi joined | 22:56 |
| ← AnAverageHuman left | 22:56 |
| → Nalt joined | 23:03 |
| ← tsdh left | 23:03 |
| ← onizu left | 23:06 |
| → Kaedenn joined | 23:07 |
|
Kaedenn
| What does Github use to format markdown into HTML, and how can I obtain that for offline use? | 23:07 |
|
bremner
| buy github? | 23:09 |
|
| dunno really. You'd think that kind of tool would be available. Look for github flavoured markdown | 23:10 |
|
| there are several third party formatters that claim to understand it | 23:10 |
| ← seand left | 23:12 |
| → tsdh joined | 23:12 |
| → jlombera joined | 23:12 |
| ← jlombera left | 23:14 |
|
Kaedenn
| I'm using pandoc but either github keeps changing their CSS or there's something wrong with their spec | 23:15 |
| → alzgh joined | 23:15 |
|
Kaedenn
| ...wait, the number of hyphens in the alignment row of a table specifies the column's width?! | 23:16 |
| LSD → acidsys | 23:18 |
| → jlombera joined | 23:19 |
|
Betal
| Kaedenn: you might not get answers here because #git != ##github | 23:21 |
|
Kaedenn
| ah ok, thanks | 23:21 |
| → gothicserpent joined | 23:22 |
| → AnAverageHuman joined | 23:24 |
| ← rewrit3 left | 23:28 |
| ← jstein left | 23:29 |
| ← unixbhaskar left | 23:32 |
|
inkbottle[m]
| `git rebase -i HEAD~2` to change the commit message of `HEAD~1`. What "command" do I have to chose to do that? (I've done two commits with dummy messages, and I want to make a single commit of them, and I want to use a sensible message, and I want to use rebase.) | 23:36 |
| ← kenanmarasli left | 23:38 |
| → Crassus joined | 23:39 |
| ← Nalt left | 23:40 |
|
rewt
| inkbottle[m], `git rebase -i --keep-base HEAD~2` will let you keep the original base (so not really a rebase) and let you do anything you can do during a regular interactive rebase, including `reword` | 23:40 |
| → Nalt joined | 23:40 |
|
inkbottle[m]
| okay, keep-base, thanks. | 23:42 |
| → venmx joined | 23:50 |
| ← alzgh left | 23:50 |
|
inkbottle[m]
| Hum, I forgot ordering was reversed. Never mind I made only dummy changes. | 23:55 |