IRCloggy #git 2022-05-07

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2022-05-07

→ littlebobeep joined00:00
← audiocat left00:01
← Sasazuka left00:04
← R2robot left00:04
← junktext left00:05
→ R2robot joined00:10
← lechner left00:12
← osXnut left00:12
← dionysus69 left00:14
→ dionysus69 joined00:14
→ lechner joined00:15
→ sa0 joined00:20
→ Codaraxis_ joined00:24
← Codaraxis left00:28
→ hiroot joined00:30
← parsnip left00:31
parsnip0 → parsnip00:31
→ Guest9866 joined00:31
← drbeco left00:32
→ kaiseisei joined00:32
→ drbeco joined00:32
→ g0uZ joined00:33
← jinsun left00:34
→ alxe_what_up[m] joined00:34
Guest9866 → parsnip200:35
← parsnip left00:38
parsnip2 → parsnip00:38
→ Guest1076 joined00:39
← Guest1076 left00:40
→ parsnip0 joined00:40
← dea_ left00:40
← nattiestnate left00:41
← bertvvvs left00:43
← vicfred left00:44
← bish0p_dl left00:46
→ bish0p_dl joined00:46
← sa0 left00:50
← g0uZ left01:06
← gurkenglas left01:13
Sqaure → Authority01:15
Authority → Sqaure01:16
← dionysus69 left01:16
→ dionysus70 joined01:16
dionysus70 → dionysus6901:18
→ Laplace joined01:21
→ nattiestnate joined01:22
← duxsco left01:23
← nattiestnate left01:23
→ nattiestnate joined01:23
→ rgrinberg joined01:24
← x_kuru left01:33
→ audio joined01:37
← hiroot left01:37
← nattiestnate left01:40
← arosen left01:48
→ hiroot joined01:50
← bn_work left01:55
→ g0uZ joined02:06
→ Vonter joined02:10
→ thebombzen joined02:12
← nyah left02:12
← FinnElija left02:13
→ finn_elija joined02:13
finn_elija → FinnElija02:13
← pretty_dumm_guy left02:15
← rgrinberg left02:15
← dionysus69 left02:17
→ dionysus69 joined02:17
← defjam left02:23
→ defjam joined02:25
← bish0p_dl left02:26
← zebrag left02:29
→ Codaraxis__ joined02:32
← Codaraxis_ left02:36
← pulse left02:57
← gast0n left03:01
← bloody left03:10
→ rgrinberg joined03:10
← dionysus69 left03:18
→ dionysus70 joined03:18
dionysus70 → dionysus6903:20
← igemnace left03:25
→ igemnace joined03:31
← mven left03:34
→ mven joined03:35
→ jinsun joined03:38
→ aniruddha joined03:41
← Laplace left03:41
→ yeirr joined03:44
← dsrt^ left03:50
→ lagash joined03:55
← mannequin left03:57
← sudoforge left04:04
→ sudoforge joined04:05
← kadobanana left04:07
→ kadobanana joined04:08
← hbautista_ left04:13
← gooble_gobble_1 left04:16
→ dionysus70 joined04:19
← dionysus69 left04:19
dionysus70 → dionysus6904:19
→ gooble_gobble joined04:20
→ coot joined04:27
← squirrel left04:45
→ sa0 joined04:48
← john left04:49
← gooble_gobble left04:52
→ cvmn joined04:54
← tyson2 left04:55
→ dsrt^ joined05:01
← rgrinberg left05:10
← skapata left05:12
→ julius3 joined05:15
→ EvilDMP joined05:16
← dionysus69 left05:20
→ dionysus69 joined05:20
← sa0 left05:22
← Shentino left05:22
→ nate1 joined05:23
→ Shentino joined05:24
← hamburgler left05:30
→ Toxmi joined05:36
Toxmi I'm maintinging my dotfiles across multiple devices with basically git push/pull. However, there are some corner cases where I for example have specific setting for xinitrc on machine B while it's different for machine A.05:37
Currently, I'm using branches for that. But that's painful and I need to re-apply general commits to other machiens as well and take care of switching, etc.05:38
What is the best practice for this? I mean some git workflow that works best for such situations05:38
ikke Toxmi: this is not something git is designed to handle05:38
so there is not good workflow around it05:39
Toxmi ikke: I've saw Gnu stow for it, but I like and familiar with git syatem/jargon05:39
ikke I personally use chezmoi05:39
which uses git to store the config05:39
but the git repo is not directly in the homedir05:40
Toxmi what if I maintain a streamline trunk and cherrypick(?) relevent commits from machine branches to that trunk. When switch to another machine just bring those commits to that branch05:40
ikke: I'll check it05:41
ikke Lot of manuall work figuring out what to cherry-pick where05:41
and what has and has not been applied05:41
Toxmi ikke: exactly what bringe me here to ask :)05:41
ikke My general recommendation is not to use plain git05:41
Toxmi yea, I see why05:42
ikke There are other pitfalls, like accidentially running git clean -f in you homedir (or any subdir that is not a repo on its own)05:42
Toxmi ikke: I put it in dotfile and symlink stuff there05:43
ikke right, that's at least better05:43
chezmoi does not use symlinks, but updates the files when you run chezmoi apply05:43
It supports templated dotfiles, so you can easily apply different settings on different systems05:44
and a lot more05:44
Toxmi I definitely need to check it out05:44
thanks05:44
← bket left06:00
← ano left06:00
← GNUmoon left06:00
→ ano joined06:01
→ GNUmoon joined06:01
← baffodoro left06:02
← julius3 left06:02
→ bket joined06:02
← AnapodoPsalidaki left06:03
→ madewokherd` joined06:06
→ atrigent joined06:07
← madewokherd left06:09
← thiago left06:11
← atrigent left06:12
→ atrigent joined06:14
← sudoforge left06:16
← Toxmi left06:17
← atrigent left06:18
← dionysus69 left06:21
→ atrigent joined06:21
→ dionysus69 joined06:21
← littlebobeep left06:32
← cvmn left06:34
→ theoceaniscool joined06:35
→ han-solo joined06:35
→ zeenk joined06:35
← EvilDMP left06:37
← mw_ left06:40
→ mw_ joined06:40
→ abu joined06:41
← mw_ left06:41
→ mw_ joined06:42
← abu left06:48
utis is there a way to merge only files that are already in the target branch?06:48
→ littlebobeep joined06:49
← great_taste left06:51
→ haise01 joined06:58
← nate1 left07:02
→ john joined07:04
ikke Not automatically07:07
→ derfflinger joined07:14
_angelo_ → bigendian07:19
→ sa0 joined07:20
← dionysus69 left07:22
→ dionysus70 joined07:22
→ raindrop joined07:23
← igemnace left07:24
dionysus70 → dionysus6907:24
→ vimal joined07:26
→ onizu joined07:26
← raindrop left07:28
← Masklin left07:29
→ palasso joined07:38
← dionysus69 left07:40
→ dionysus70 joined07:41
dionysus70 → dionysus6907:43
← thekingofbandit left07:45
→ nate1 joined07:45
← dionysus69 left07:46
→ dionysus69 joined07:46
→ Rashad joined07:47
← nate1 left07:50
← dionysus69 left07:52
→ dionysus70 joined07:53
dionysus70 → dionysus6907:55
→ dionysus70 joined07:59
← dionysus70 left08:00
← aniruddha left08:00
← dionysus69 left08:02
→ dionysus69 joined08:02
← dionysus69 left08:06
→ dionysus69 joined08:06
→ TheCatBehemoth joined08:07
← audio left08:09
→ hans_ joined08:09
← dionysus69 left08:12
→ dionysus70 joined08:12
→ bkircher joined08:13
dionysus70 → dionysus6908:15
← dionysus69 left08:18
→ dionysus70 joined08:18
dionysus70 → dionysus6908:21
← dionysus69 left08:24
→ dionysus69 joined08:24
← kaiseisei left08:26
→ iomari891 joined08:29
→ nate1 joined08:30
← dionysus69 left08:30
→ dionysus69 joined08:30
→ kaiseisei joined08:32
← sa0 left08:32
← Rashad left08:34
← dionysus69 left08:35
← nate1 left08:35
→ Gaboradon joined08:38
→ jinsun__ joined08:38
← jinsun__ left08:39
→ jinsun__ joined08:40
← jinsun left08:41
→ Rashad joined08:43
→ mannequin joined08:50
← Betal left08:51
→ zer0bitz joined08:54
← jancoow left08:56
→ EvilDMP joined08:56
→ jancoow joined08:57
← jancoow left08:58
← Andrew left08:59
→ jancoow joined09:00
→ Andrew joined09:00
← Andrew left09:00
→ Andrew joined09:00
← EvilDMP left09:00
→ YuGiOhJCJ joined09:04
→ mitrokov joined09:04
→ jancoow6 joined09:05
← jancoow left09:05
jancoow6 → jancoow09:05
← YuGiOhJCJ left09:09
← jancoow left09:10
→ jancoow joined09:12
→ vitali64 joined09:13
← jancoow left09:18
← malteger left09:18
→ han-solo_ joined09:19
← very_sneaky left09:20
→ jancoow joined09:20
← han-solo left09:22
← goldfish left09:22
→ feriman joined09:24
→ very_sneaky joined09:24
→ feriman_ joined09:28
← jinsun__ left09:33
→ laureee joined09:34
← Rashad left09:35
→ jinsun joined09:37
← feriman left09:39
← feriman_ left09:39
han-solo_ → han-solo09:40
→ t0mm13b_ joined09:50
← t0mm13b left09:51
← ghost43 left09:53
← t0mm13b_ left09:53
→ ghost43 joined09:53
→ jclsn joined09:53
→ feriman joined09:54
→ EvilDMP joined09:57
→ Rashad joined09:59
← jinsun left10:02
→ dionysus69 joined10:03
→ t0mm13b joined10:10
← dansan left10:10
← EvilDMP left10:12
→ stats4647 joined10:14
→ kenanmarasli joined10:18
← stats4647 left10:19
← derfflinger left10:21
← kyshoc left10:28
→ kyshoc joined10:28
← kyshoc left10:28
→ kyshoc joined10:28
→ sa0 joined10:30
← redbool left10:31
← kenanmarasli left10:32
→ kenanmarasli joined10:32
→ t0mm13b_ joined10:33
← t0mm13b_ left10:33
← t0mm13b left10:35
← kaiseisei left10:38
← yeirr left10:39
← littlebobeep left10:43
→ Lord_of_Life_ joined10:49
← moldorcoder7 left10:49
← Lord_of_Life left10:49
Lord_of_Life_ → Lord_of_Life10:50
← palasso left10:51
→ igemnace joined10:52
← john left10:53
→ palasso joined10:54
← palasso left10:54
→ john joined10:54
→ moldorcoder7 joined10:58
← sa0 left11:02
← jazzy left11:05
← jazzy2 left11:05
→ ALowther joined11:05
← igemnace left11:06
← ALowther left11:10
→ ryp joined11:10
→ jinsun joined11:13
← jclsn left11:13
← laureee left11:14
→ jclsn joined11:16
→ duxsco joined11:17
→ derfflinger joined11:21
→ littlebobeep joined11:22
→ dea_ joined11:22
← derfflinger left11:25
← hiroot left11:27
→ nate1 joined11:29
→ flupe joined11:31
← TheCatBehemoth left11:33
← nate1 left11:33
← littlebobeep left11:36
← flupe left11:36
← duxsco left11:42
→ duxsco joined11:42
← duxsco left11:44
→ srinidhi joined11:44
→ duxsco joined11:46
← duxsco left11:46
→ duxsco joined11:47
→ tyson2 joined11:52
← duxsco left11:53
→ duxsco joined11:53
→ TheCatBehemoth joined11:56
→ Sulky joined12:02
→ t0mm13b joined12:23
← vdamewood left12:27
← duxsco left12:32
→ duxsco joined12:35
→ pulse joined12:36
← duxsco left12:37
← eroux left12:38
→ palasso joined12:38
eqw Is there a CLI/TUI tool for exploring https://remote/repo.git without downloading it entirely?12:38
→ lgc joined12:39
→ ized joined12:40
→ natrys joined12:40
ikke No, as git does not provide a way to do that over the protocol12:40
← john left12:41
bremner you could use a text based browser if the remote supports browsing via https (e.g. via cgit, or github, or ...)12:42
← lgc left12:44
acagastya eqw: if it uses soft-serve, then you could.12:47
But that is a whole different tool around git.12:48
https://github.com/charmbracelet/soft-serve -- but you probably don't need this.12:49
← palasso left12:49
→ rsx joined12:50
→ ffyuanda joined12:53
← extrowerk left12:54
→ extrowerk joined12:55
furrymcgee git clone --depth 1 does not download entirely12:58
→ robigan joined13:01
→ wootehfoot joined13:01
→ stats4647 joined13:05
← ized left13:09
← fling left13:11
← robigan left13:18
→ fling joined13:18
→ nyah joined13:19
→ EvilDMP joined13:19
→ derfflinger joined13:22
← coot left13:23
← han-solo left13:24
→ dea__ joined13:25
← shailangsa left13:25
← derfflinger left13:26
← dea_ left13:28
← EvilDMP left13:30
→ sudoforge joined13:34
← rsx left13:36
← TheCatBehemoth left13:39
← mitrokov left13:39
→ TheGuestMovie joined13:40
← TheGuestMovie left13:41
→ pretty_dumm_guy joined13:43
→ wakeup joined13:44
→ shailangsa_ joined13:51
← dionysus69 left13:53
→ nate1 joined13:57
→ EvilDMP joined14:00
← wootehfoot left14:01
← nate1 left14:02
→ agumonkey joined14:06
agumonkey hello14:06
→ SteveR joined14:07
← EvilDMP left14:07
agumonkey I have a weird question, does git can interpret some comments in files to skip a line14:07
ikke Not built-in14:08
→ EvilDMP joined14:08
agumonkey if I need to add a dangerous line in a file to debug, and I want this to never be commited. can I write "//*GIT* ignore-next-line"14:08
ikke You can probably do something with clean/smudge filters or custom diff drivers14:08
No14:08
agumonkey ikke: with normal hooks then ?14:08
ikke You can at least prevent accidental committing it with a pre-commit hook14:09
agumonkey ok14:09
ikke (if you don't habitually use --no-verify)14:09
← SteveR left14:09
agumonkey linters have this trick habit of adding metalevel comments to instruct them on the fly14:09
ikke git is not a linter14:09
agumonkey i thought maybe git also did this but no biggy14:09
ikke: please14:10
you helped me, but linter or vcs, it's a generic trick14:10
thanks14:10
→ xkuru joined14:11
← EvilDMP left14:13
→ otisolsen70 joined14:14
← hans_ left14:19
← kenanmarasli left14:20
→ kenanmarasli joined14:20
← dea__ left14:24
→ gast0n joined14:24
→ roadie joined14:26
→ duxsco joined14:28
← theoceaniscool left14:28
← zeenk left14:28
← Techcable left14:29
→ Techcable joined14:31
→ igemnace joined14:34
← srinidhi left14:37
→ gurkenglas joined14:38
← duxsco left14:39
→ duxsco joined14:40
→ yeirr joined14:51
→ rhe7 joined14:51
→ Jenna64bit joined14:52
→ cluelessperson_ joined14:52
→ gooble_gobble joined14:52
→ squirrel joined14:53
← dsrt^ left14:53
← igemnace left14:53
→ ndorf_ joined14:55
→ bambams_ joined14:55
→ thiago joined14:56
← makara1 left14:56
← cluelessperson left14:56
← fdisotto left14:56
← DavidTucker[m] left14:56
← marstaik[m] left14:56
← LalitKumar[m] left14:56
← rsify left14:56
← yuu[m] left14:56
← ronny left14:56
← Fernando-Basso left14:57
← randm left14:57
← mrkajetanp left14:57
← Sqaure left14:57
← Kobaz left14:57
← bleb left14:57
← ueberall left14:57
← chorduser left14:57
← epicout left14:57
← ephemer0l left14:57
← rudi_s left14:57
← Jenna16bit left14:57
← MiniontobyPI left14:57
← hendry left14:57
← ndorf left14:57
← vodkra left14:57
← Arsen left14:57
← ljharb left14:57
← JayDoubleu_ left14:57
← relipse left14:57
← Albright left14:57
← infl00p45 left14:57
← tomek_ left14:57
← wacko_ left14:57
← goblin left14:57
← rhe left14:57
← bambams left14:57
← Yorick_ left14:57
← bartman left14:57
Rhvs → Rhys14:57
rhe7 → rhe14:57
Rhys → 076AABGU714:57
→ makara1 joined14:57
→ fdisotto joined14:57
→ DavidTucker[m] joined14:57
→ marstaik[m] joined14:57
→ rsify joined14:57
→ LalitKumar[m] joined14:57
→ yuu[m] joined14:57
→ ronny joined14:57
→ Fernando-Basso joined14:57
→ randm joined14:57
→ mrkajetanp joined14:57
→ bleb joined14:57
→ Kobaz joined14:57
→ ueberall joined14:57
→ chorduser joined14:57
→ epicout joined14:57
→ ephemer0l joined14:57
→ rudi_s joined14:57
→ MiniontobyPI joined14:57
→ hendry joined14:57
→ vodkra joined14:57
→ Arsen joined14:57
→ ljharb joined14:57
→ JayDoubleu_ joined14:57
→ relipse joined14:57
→ Albright joined14:57
→ infl00p45 joined14:57
→ tomek_ joined14:57
→ wacko_ joined14:57
→ goblin joined14:57
→ Yorick_ joined14:57
→ bartman joined14:57
← relipse left14:57
→ Square joined14:59
→ relipse joined15:00
→ sa0 joined15:00
→ skapata joined15:00
← skapata left15:00
→ skapata joined15:00
← hendry left15:02
→ hendry joined15:03
→ justsomeguy joined15:03
← jclsn left15:08
← justsomeguy left15:11
→ jclsn joined15:11
→ madewokherd joined15:16
← jclsn left15:17
← madewokherd` left15:19
← Murr left15:20
→ Murr joined15:21
→ derfflinger joined15:21
→ bish0p_dl joined15:22
→ jclsn joined15:23
← derfflinger left15:25
→ malteger joined15:28
← sa0 left15:34
→ nate1 joined15:36
→ coot joined15:40
← crabbedhaloablut left15:43
→ crabbedhaloablut joined15:44
→ derfflinger joined15:45
→ agumonke` joined15:54
← agumonkey left15:55
→ rgrinberg joined15:55
← hsiktas[m] left16:00
wakeup I have a repo 2 commits16:01
I want to edit (split) the first commit16:01
how do I do that?16:01
I cannot use git rebase16:01
ikke git rebase --root -i16:01
wakeup i mean git rebase -i --root does do what I want16:01
ikke but16:02
wakeup I tried to replace "pick" with "edit" for the first commit16:02
but then it seems I am editing the second one16:02
how do I reset the first commit?16:02
git reset HEAD^ doesn't work?16:03
ikke correct, because that does not exist (the root commit does not have a parent)16:03
wakeup so what do I have to do?16:03
← Null_A left16:05
→ TheCatBehemoth joined16:06
→ reset joined16:07
→ vicfred joined16:07
← derfflinger left16:07
→ nctcf^ joined16:10
foo Is there a way to view git log on a file *and* see changes?16:12
ikke git log -p -- path/to/file16:13
foo ikke: thank you! Well, that's odd. I am trying to find when someone deleted a specific line but I'm not seeing it in any of this.16:15
← kenanmarasli left16:15
← mannequin left16:16
ikke foo: add in a --all --full-history for good measure16:16
foo ikke: ah, thanks, this shows it.16:17
← MatthewG left16:17
→ hamburgler joined16:21
← ffyuanda left16:21
→ infogulch joined16:22
→ robigan joined16:24
← cyberpear left16:27
← Xenguy left16:30
← bodiccea left16:35
→ hans_ joined16:36
→ opz0r joined16:38
→ audio joined16:39
← roadie left16:41
→ roadie joined16:42
cbreak wakeup: you can just make a new first-commit16:43
wakeup: git checkout --orphan branchnamehere16:43
then commit stuff.16:43
you can get state from the other branch with git checkout otherbranchname -- filenameshere16:43
← yeirr left16:46
← roadie left16:47
← stats4647 left16:47
← ick left16:53
← robigan left16:55
→ EvilDMP joined16:56
→ robigan joined16:57
← tyson2 left16:58
→ Sulky_ joined17:00
← Sulky left17:02
→ Guest141 joined17:06
← Guest141 left17:06
→ Guest982738 joined17:07
→ great_taste joined17:07
→ bodiccea joined17:09
→ Xenguy joined17:11
← robigan left17:11
→ roadie joined17:12
← nate1 left17:17
← koo5 left17:18
→ koo5 joined17:19
→ roadie` joined17:22
← fling left17:23
← roadie left17:23
→ bloody joined17:23
→ AnapodoPsalidaki joined17:23
← bodiccea left17:23
→ spinningCat joined17:25
spinningCat hey17:25
← nctcf^ left17:26
spinningCat i cannot push my work to github i got this error error: src refspec master does not match any17:26
how can i solve this error?17:26
← wakeup left17:26
← roadie` left17:26
ikke spinningCat: what does `git branch` return?17:27
← Guest982738 left17:28
spinningCat main17:28
hmm17:28
should i write git push -u origin main17:29
?17:29
ikke es17:29
yes17:29
spinningCat that was master17:29
i hope it will work17:29
why master is changed to main?17:31
ikke people consider the master insensitive17:31
spinningCat I see17:32
→ sa0 joined17:32
← spinningCat left17:38
← otisolsen70 left17:44
→ henistein joined17:47
← gildasio left17:47
→ mannequin joined17:47
← henistein left17:48
→ roadie` joined17:49
← rgrinberg left17:49
→ gildasio joined17:49
← elastic_dog left17:53
→ srinidhi joined17:55
→ bob518 joined17:55
→ bodiccea joined17:56
→ duxco joined17:57
← bodiccea left17:57
→ elastic_dog joined17:58
← duxsco left17:58
← roadie` left18:00
← thebombzen left18:01
← sa0 left18:04
→ roadie` joined18:06
← jjakob left18:09
← roadie` left18:11
→ jjakob joined18:12
→ littlebobeep joined18:13
← jjakob left18:13
→ cdown_ joined18:15
cbreak master shouldn't ever change to main automatically18:16
→ jjakob joined18:16
ikke They probably cloned a repo created on github18:16
which defaults to main18:17
cbreak a fresh clone: very likely18:17
but hontestly, both names are dumb.18:17
I give my branches honest names18:17
like dev/will-break, feature/not-implemented, release/2, ...18:17
→ roadie` joined18:18
← jjakob left18:21
→ jjakob joined18:24
→ dea_ joined18:27
← bdeferme2 left18:29
← jjakob left18:29
→ bdeferme2 joined18:32
← iomari891 left18:34
→ han-solo joined18:36
← littlebobeep left18:42
→ jjakob joined18:42
← frobnic left18:43
→ frobnic joined18:43
← roadie` left18:43
← Xenguy left18:43
← skered left18:44
← duxco left18:45
← bkircher left18:46
→ rgrinberg joined18:46
← vicfred left18:47
→ littlebobeep joined18:50
← han-solo left18:52
→ han-solo joined18:56
→ stats4647 joined19:02
← bdeferme2 left19:03
→ bodiccea joined19:04
→ a1eaiactaest joined19:04
← bodiccea left19:05
→ bodiccea joined19:05
→ bdeferme2 joined19:07
← stats4647 left19:07
→ tyson2 joined19:08
← rgrinberg left19:10
← AnapodoPsalidaki left19:11
→ fling joined19:13
← tyson2 left19:23
← agumonke` left19:27
→ Xenguy joined19:29
→ tyson2 joined19:31
→ palasso joined19:34
← vitali64 left19:35
→ jazzy2 joined19:36
→ jazzy joined19:36
← hoochmonger left19:43
→ rgrinberg joined19:45
← vimal left19:46
→ dcompoze joined19:49
← dcompoze left19:50
→ jinsun__ joined19:53
→ bagels joined19:53
→ otisolsen70 joined19:54
← jinsun left19:56
← axisys left19:59
→ sa0 joined20:03
← palasso left20:10
← rgrinberg left20:22
← tyson2 left20:23
→ rgrinberg joined20:27
audio → audiobirb20:27
← haise01 left20:30
← sa0 left20:34
← opz0r left20:40
→ abu joined20:41
← analoq left20:52
→ skered joined20:52
→ analoq joined20:54
← otisolsen70 left21:00
→ wakeup joined21:02
wakeup I have this message "Your branch and 'origin/main' have diverged"21:02
because I did a rebase and didn't yet push force21:02
is there a way to undo this last rebase?21:02
and make my local repo equal to the remote and keeping the working changes that I made21:03
?21:03
→ vicfred joined21:03
wakeup maybe this https://stackoverflow.com/questions/134882/undoing-a-git-rebase21:05
← feriman left21:05
wakeup I will regret this git reset hard but ok21:07
actually, no21:08
← rgrinberg left21:10
wakeup let's say that I am developing a program that is written in C++ and Python and also uses latex21:11
is it a good idea to copy the gitignores from C++ and Python and latex and put them in the same file and use that?21:11
byt gitignores I mean those provided by github21:11
what if e.g. one thing that is ignored by Python is required by C++?21:11
that's my concern21:12
b21:13
https://stackoverflow.com/questions/10274424/best-practice-for-using-multiple-gitignore-files21:13
the guy only suggests to do what I said21:15
but I don't know if that's always safe21:15
← vicfred left21:15
→ hamburgler2 joined21:18
← Murr left21:20
← hamburgler left21:20
→ Murr joined21:20
← TheCatBehemoth left21:23
bagels wakeup: you can combine them and generally trust github's gitignores, in my experience. just combine them. you'll be alright. and just ensure what you want added to your commits is being added.21:23
→ TheCatBehemoth joined21:24
← audiobirb left21:30
→ audio joined21:34
→ stats4647 joined21:38
← dea_ left21:40
← majors left21:41
← stats4647 left21:42
→ majors joined21:43
→ zeenk joined21:43
← srinidhi left21:44
→ thebombzen joined21:47
← EvilDMP left21:49
← han-solo left21:50
← a1eaiactaest left21:50
← nightstrike left21:51
→ MajorBiscuit joined21:54
← natrys left21:58
← MajorBiscuit left21:59
← coot left22:00
→ tyson2 joined22:05
← squirrel left22:08
← audio left22:09
→ audio joined22:09
→ fercell joined22:14
← wakeup left22:14
← ferr_ left22:14
→ duxsco joined22:16
→ rgrinberg joined22:17
← hamburgler2 left22:17
→ hamburgler joined22:17
← shailangsa_ left22:23
→ whatsupdoc joined22:25
→ YuGiOhJCJ joined22:30
← jinsun__ left22:41
→ jinsun joined22:41
duxsco can you recommend a diff configuration that results in something similar than that shown by github? https://github.com/duxsco/gentoo-installation/commit/7b86017ce9e1793d700db12fb6d21e53df2fb13a22:48
... for example22:48
← TheCatBehemoth left22:49
→ shailangsa joined22:49
→ duxco joined22:53
← duxsco left22:55
← rgrinberg left22:57
→ rgrinberg joined22:58
← hans_ left22:59
→ zebrag joined22:59
← rgrinberg left23:11
→ hbautista_ joined23:12
← onizu left23:16
← Murr left23:19
→ Murr joined23:20
→ bertvvvs joined23:26
← mannequin left23:30
→ rgrinberg joined23:31
← Techcable left23:38
→ Techcable joined23:39
→ museee joined23:40
→ wakeup joined23:51
→ m_ joined23:56
→ m__ joined23:56

Logs Search ←Prev date Next date→ Channels Documentation