IRCloggy #git 2017-05-01

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.

2017-05-01

→ rameerez joined00:01
→ askb joined00:01
← d^sh left00:01
→ cads joined00:01
← bitmod left00:02
→ bitmod joined00:02
→ d^sh joined00:03
→ ok91 joined00:07
← chachasmooth left00:07
← tnecniv left00:08
→ chachasmooth joined00:09
→ lowercas_ joined00:10
← raijin left00:11
← ok91 left00:11
→ shgysk8zer0 joined00:12
← lowercaseman left00:12
→ cagomez joined00:13
← exotime left00:14
→ tsetair joined00:14
→ exotime joined00:15
← Wulf left00:16
← rameerez left00:18
→ mizu_no_oto joined00:18
← fxrs left00:18
→ fxrs joined00:19
→ raijin joined00:23
← mizu_no_oto left00:25
← Cabanossi left00:26
← mrkake left00:26
→ miczac_ joined00:26
→ Cabanossi joined00:26
gitinfo set mode: +v00:27
← bilal left00:27
→ bilal joined00:27
→ mrkake joined00:27
→ jaziz joined00:27
← TheSimonator left00:28
→ mizu_no_oto joined00:29
→ rameerez joined00:29
→ al-damiri joined00:30
← dave0x6d left00:31
← mizu_no_oto left00:31
→ mizu_no_oto joined00:33
← gnixev left00:33
→ fstd_ joined00:34
← fstd left00:34
fstd_ → fstd00:34
→ m1dnight_ joined00:35
→ Calinou joined00:35
← rameerez left00:35
→ ndim joined00:36
← raijin left00:36
→ jeffreylevesque joined00:37
→ Achylles joined00:37
← dmc left00:39
← Calinou left00:40
→ dmc joined00:41
→ rameerez joined00:43
← exotime left00:45
← Hunter1 left00:45
← mizu_no_oto left00:45
→ Hunter1 joined00:45
← rameerez left00:47
← netj left00:50
→ raijin joined00:50
→ netj joined00:50
→ exotime joined00:51
← ToBeCloud left00:51
← theoceaniscool left00:52
← raijin left00:54
← ojdo left00:55
→ justanotheruser joined00:55
→ Calinou joined00:56
← barbos left00:56
← justan0theruser left00:57
← qpdb left01:00
→ qpdb joined01:00
← spb left01:01
→ ojdo joined01:02
→ madewokherd` joined01:05
← madewokherd left01:05
→ cagomez_ joined01:07
← gugah left01:08
← Calinou left01:08
← cagomez left01:08
← gableroux left01:10
→ rameerez joined01:10
→ gableroux joined01:10
← d^sh left01:11
→ finalbeta joined01:12
← rameerez left01:13
→ d^sh joined01:13
← miczac_ left01:14
→ kbeflo joined01:17
→ rameerez joined01:20
← anuxivm left01:21
← cagomez_ left01:21
→ raijin joined01:21
← MattMaker left01:22
→ otiose joined01:22
→ hacman joined01:23
→ CG_ joined01:25
← Cabanossi left01:25
← Tobbi left01:25
← rameerez left01:26
→ kbeflo_ joined01:26
→ Cabanossi joined01:26
→ gugah joined01:26
← miczac left01:26
← kbeflo_ left01:27
← kbeflo left01:27
← otiose left01:27
→ tnecniv joined01:27
→ kbeflo joined01:27
→ jason237 joined01:28
→ MattMaker joined01:28
→ Calinou joined01:28
→ raynold joined01:29
← chipotle left01:30
← thiago left01:31
→ cqi joined01:32
→ thiago joined01:33
← yqt left01:33
← Anja__ left01:33
→ firef1y joined01:36
← jnewt left01:36
← Calinou left01:39
← CG_ left01:43
← sunri5e left01:44
→ Anja__ joined01:45
→ mizu_no_oto joined01:45
← shgysk8zer0 left01:45
← ilbot3 left01:45
→ sunri5e joined01:46
→ plasticle joined01:48
→ ilbot3 joined01:49
← publio left01:50
→ Stumbler joined01:54
← mentazoom left01:56
matt|home hello. im a little confused about branching - if i create a new branch in git, and i have files in 'master', it won't automatically copy all those files to the new branch or anything right? it's just like a blank reference or whatever?01:57
← ertes left01:57
→ gablerou_ joined01:57
cjohnson !list01:57
gitinfo [!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git01:57
→ ertes joined01:58
← cqi left01:59
← SantaClauze left02:00
← dermoth left02:00
← caper left02:00
← pks left02:00
→ dermoth joined02:00
← gableroux left02:00
← earnestly left02:01
← howdoi left02:03
← Gustavo6046 left02:04
→ pks joined02:04
Vampire0 matt|home, a branch is just a post-it note that is attached to a commit. If you create a new branch, you just peel off a new post-it note from the block, note the branch name on it and stick it to a certain commit. By default this is the commit that is currently checked out if you don't tell the command to use a different commit or use `git checkout --orphan` to create a new branch without history on next02:04
commit02:04
→ tubal joined02:05
matt|home o.o02:05
Vampire0 matt|home, so the answer to your question would be "no", it is not just a blank reference02:05
→ brent__ joined02:05
matt|home i see.. thanks vam02:05
vampire002:06
tubal Hello. git newb. Trying to push to my repo on github, but it fails with Authentication failed for... I'm quite sure I'm getting the pw right. What else might I be getting wrong?02:06
cl was: config push --set-upstream myproject master02:08
Vampire0 You're welcome matt|home02:09
gitinfo matt|home: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.02:09
matt|home o.O02:09
Vampire0 tubal, !repro02:09
gitinfo tubal: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see02:09
matt|home .karma matt|home02:10
gitinfo the karma of the given users is shrouded in the mists of uncertainty.02:10
matt|home .karma vampire002:10
gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 33 (2 in past 30 days) (4 given out)02:10
matt|home cheers ;P02:10
← chachasmooth left02:11
→ ShapeShifter499 joined02:12
→ dave0x6d joined02:12
→ chachasmooth joined02:13
→ Vortex34 joined02:13
← gugah left02:14
tubal https://gist.github.com/anonymous/570c0a23bfd7dba62c1511f1b570bf0502:15
← maroloccio left02:15
→ maroloccio joined02:16
← Vortex35 left02:16
← dirtyroshi left02:17
← cads left02:17
→ mentazoom joined02:18
→ Calinou joined02:18
← mentazoom left02:19
Vampire0 tubal, what is `config push ...`?02:19
tubal Oh... sorry. Vampire0: config is an alias: /usr/bin/git --git-dir=$HOME/.myconfig --work-tree=$HOME02:20
← Anja__ left02:22
→ otiose joined02:23
tubal .karma Vampire002:24
gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 33 (2 in past 30 days) (4 given out)02:24
Vampire0 tubal, hm, then the only explanations I have are, that either your password does not fit the username (maybe wrong keyboard layout?) or you have two-factor authorization enabled02:25
tubal Ah! 2FA! That's probably it. ... So, what? Disable 2FA?02:26
← otiose left02:28
← YuGiOhJCJ left02:29
← Hunter1 left02:31
→ Hunter1 joined02:31
← Achylles left02:31
→ sturner joined02:34
← sturner_ left02:35
→ otiose joined02:36
Vampire0 tubal, there are multiple ways. Two options are to use SSH URLs and a certifcate instead of HTTPS URLs, or to create a personal access token that you then use instead of the password on your settings page02:38
tubal, disabling 2FA would of course also be an option, but it is not necessary if you pick one of the other methods02:39
← Tykling left02:39
tubal Thanks, Vampire0. It did seem to defeat the purpose of 2FA. I'll see what I can find re SSH URLs and token auth.02:40
.karma Vampire002:40
gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 33 (2 in past 30 days) (4 given out)02:40
← otiose left02:40
tubal Thanks Vampire0.02:40
.karma Vampire002:40
gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 33 (2 in past 30 days) (4 given out)02:40
← hexagoxel left02:41
← webdev007 left02:42
← lb1c left02:44
→ lb1c joined02:44
← Hunter1 left02:46
→ gugah joined02:46
→ Hunter1 joined02:46
→ hexagoxel joined02:46
← cdown left02:47
→ Tykling joined02:48
→ cdown joined02:48
← moei left02:48
→ mjuszczak joined02:48
→ howdoi joined02:49
Vampire0 tubal, ten times makes on karma point ;-)02:52
tubal Ah.02:52
→ durham joined02:53
tubal Vampire0 thanks.02:53
→ f1nch_ joined02:53
← Stumbler left02:53
Vampire0 yw02:55
TikityTik Lets say I want to delete a bunch of files from my last commit that I already pushed, how do I do so?02:56
do I have to rebase?02:56
→ lagothrix joined02:56
← brent__ left02:56
← lagothri1 left02:58
← al-damiri left02:59
Vampire0 TikityTik, if you are aware of !rewrite, just use `--amend` option to man git commit02:59
gitinfo TikityTik: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum02:59
TikityTik: the git-commit manpage is available at https://gitirc.eu/git-commit.html02:59
TikityTik wtf02:59
those were a lot of highlights02:59
Vampire0 all with helpful information03:00
→ thiago_ joined03:00
TikityTik does git usually use a lot of space?03:01
I notice .git/objects is 87 MiB03:01
← prg3 left03:02
← thiago left03:02
thiago_ → thiago03:03
tubal So, https://help.github.com/articles/changing-a-remote-s-url uses the address [email@hidden.address] What is the value of OTHERREPOSITORY supposed to be? And, I thought I wanted to change the URL for REPOSITORY?03:06
→ prg3 joined03:07
Grievre tubal: "origin" is the name of the remote you're changing, OTHERREPOSITORY is the repo you're changing it to point to03:12
← MattMaker left03:12
→ chipotle joined03:12
tubal Ah. Right. Thanks Grievre.03:13
← thiago left03:14
→ thiago joined03:15
← njbair left03:18
Grievre tubal: if you want to actually change a repo's url on github that's more of a github question, but I think you could easily just create a new repo, pull from the old one, push to the new one and then delete the old repo03:18
You might lose some data doing that and you might need special flags to actually pull/push everything03:18
→ njbair joined03:20
← m0viefreak left03:24
← Cabanossi left03:24
→ Doginal joined03:25
→ Cabanossi joined03:26
← Bhootrk_ left03:28
tubal I am really in the git weeds.03:28
→ YuGiOhJCJ joined03:31
← thiago left03:32
← Kerwin_chain left03:37
← fragMental left03:37
← Lyqyd left03:38
← mizu_no_oto left03:45
→ fragMental joined03:50
← gablerou_ left03:52
← sturner left03:55
← tsetair left03:56
→ lowercaseman joined04:01
← lowercas_ left04:01
→ altendky joined04:02
→ lowercas_ joined04:03
← hvxgr left04:03
← YuGiOhJCJ left04:03
← lowercaseman left04:05
→ lowercaseman joined04:05
← gugah left04:07
← lowercas_ left04:08
→ danimal2 joined04:08
→ moei joined04:12
→ astrofog joined04:13
→ fakenerd joined04:14
→ cads joined04:15
← misosoup left04:16
→ chandu20 joined04:17
← helium-3 left04:18
→ Bass10 joined04:19
← Bass10 left04:19
→ dilfridge joined04:19
rwp TikityTik, git is quite space efficient. As compared with other systems I have used. But have you done a 'git gc' to garbage collect lately?04:21
TikityTik never heard of that command04:21
← jimmyrcom left04:23
← Cabanossi left04:25
→ ok91 joined04:26
→ Cabanossi joined04:26
→ Patrick__ joined04:28
→ kbeflo_ joined04:29
gitinfo set mode: +v04:30
← ok91 left04:30
← aidalgol left04:31
Patrick__ Hello?04:32
gitinfo Patrick__: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.04:32
← kbeflo left04:33
← Patrick__ left04:34
→ kbeflo__ joined04:36
→ otiose joined04:36
→ bobofat joined04:38
gitinfo set mode: +v04:39
← fakenerd left04:39
← kbeflo_ left04:40
← danimal2 left04:40
← otiose left04:41
→ mizu_no_oto joined04:43
← bobofat left04:44
← kbeflo__ left04:46
→ kbeflo__ joined04:47
← kbeflo__ left04:49
→ kbeflo_ joined04:49
← johnflux left04:51
← kbeflo_ left04:54
← mjuszczak left04:56
→ freimatz joined04:58
← menip left05:01
→ kafnjr joined05:02
← kafnjr left05:03
← njbair left05:04
→ fakenerd joined05:06
← Hunter1 left05:09
→ Hunter1 joined05:09
← Cabanossi left05:09
→ fakenerd_ joined05:10
→ MattMaker joined05:10
→ dviola joined05:10
justanotheruser → OfficialJustan05:10
→ Cabanossi joined05:11
← fakenerd left05:12
→ nickel_dime_look joined05:14
tubal status is showing a modified path (despite my not having touched it). Nonetheless, I ran checkout -- that/weird/path ... but it is still showing as modified. Why might that be?05:14
← oskarkv left05:15
← mizu_no_oto left05:15
← raijin left05:20
→ indistylo joined05:20
→ rootman123 joined05:20
→ zefferno joined05:25
← Hunter1 left05:27
← nickel_dime_look left05:27
→ Hunter1 joined05:27
→ Garen_ joined05:28
← tnecniv left05:29
rwp tubal, Is it possible that you added it to the .gitignore file after having committed it?05:30
← kusznir left05:31
→ kusznir joined05:31
← wcstok left05:31
← mel00010 left05:33
→ mel00010 joined05:34
← chandu20 left05:34
← Cabanossi left05:39
→ Cabanossi joined05:41
→ podlech joined05:48
→ durham_ joined05:49
← durham left05:49
tubal Thanks rwp. That doesn't seem to be so.05:50
→ kafnjr joined05:52
← madewokherd` left05:54
→ di0_ joined05:55
← atomi left05:55
← snowkidind left05:56
← durham_ left05:56
→ nickel_dime_look joined05:57
tubal .karma rwp06:00
gitinfo the Genuine Real Life Karma™ REST API results are back! r‍wp: 1 (0 in past 30 days) (0 given out)06:00
← kafnjr left06:03
rwp Sorry that wasn't what you ran into tubal. Thanks for the karma regardless.06:05
So 'git status' shows the path as changed and no other paths changed?06:05
→ circ-user-dfkWJ joined06:06
tubal yeah. the path is a directory.06:06
rwp A directory?06:06
tubal yes.06:06
rwp That means the directory has appeared in the working copy and is not committed into the .git repository yet.06:06
tubal but it'sa dir with a dir that was committed.06:07
→ tnecniv joined06:07
rwp Can you pastebin the git status output so that we could have a look at it?06:08
← rootman123 left06:08
tubal https://paste.ubuntu.com/24491020/06:10
← freimatz left06:11
rwp And "vim-gruvbox" is a directory? (I am not a vim user so don't recognize it.)06:13
→ danimal2 joined06:13
← podlech left06:14
→ aw1 joined06:15
rwp That doesn't look like a directory to me. When I try to create a test case for this I see: https://vomitb.in/AoPIMFClSq06:15
← aw1 left06:16
rwp See the trialing '/' at the end? That denotes it being a directory. Your paste has quite different information.06:16
It doesn't say untracked files. It says changes not staged for commit.06:16
→ aw1 joined06:16
rwp What does "git diff .vim/bundle/vim-gruvbox" say?06:16
Anything interesting?06:16
→ rokups joined06:17
← aw1 left06:18
← leeN left06:20
→ rossome joined06:20
rwp In any case since that is the only file listed as changed you should be able to restore to the last checked in state using !reset--hard06:20
gitinfo You can go back to the last commit, or any other commit (effectively getting rid of commits which can cause issues, see !rewrite), using 'git reset --hard' with an optional commit/ref argument. This will irrevocably destroy all uncommitted changes, so please be careful!06:20
← danimal2 left06:20
tubal https://paste.ubuntu.com/24491046/06:20
→ schleppel joined06:22
rwp It's a subproject! That undoubtedly explains it. However I am probably the least knowledgable person here about submodules.06:22
https://www.git-scm.com/book/en/v2/Git-Tools-Submodules06:22
→ lowercas_ joined06:25
← lowercaseman left06:25
tubal I wonder how it became that. Perhaps because it's a git repo itself?06:25
← altendky left06:27
rwp I haven't any experience working with submodules. Just haven't overlapped with them. So I am lacking in experience to say.06:27
I can only point you to the documentation. Or hope that others in the channel will be able to help you with it.06:27
→ lowercaseman joined06:28
rwp But presumably you created a nested project there at some point.06:28
→ johnflux joined06:29
← johnflux left06:29
→ johnflux joined06:29
rwp I would be inclinded to "history | less" to browse my history to see what I had done previously and see if there were clues there. (shrug)06:29
← dviola left06:29
← circ-user-dfkWJ left06:29
→ roelmonnens joined06:30
← lowercas_ left06:30
→ zeroed joined06:31
← chipotle left06:31
tubal thanks rwp.06:31
→ Kerwin_chain joined06:33
→ lowercas_ joined06:33
← roelmonnens left06:34
→ vrach joined06:34
← Hunter1 left06:35
→ Hunter1 joined06:35
→ slkth joined06:35
← lowercaseman left06:36
→ Wulf joined06:37
→ otiose joined06:37
← Kerwin_chain left06:37
→ leeN joined06:38
tubal rwp: you're right. submodule. The odd thing is, there are four other such directories, sisters of the one in question, and no complaints from git about them. Hrm.06:39
Anyway, time for the sleeps.06:39
rwp It thinks your local version is modified. That is what makes that one different from the others.06:39
I'm not a vim user and so am twice removed from using that gruvbox theme. But it is possible that vim modified it just as a normal course of running. (don't know)06:40
But since it is locally modified it shows up in the status.06:40
→ freimatz joined06:41
rwp Get some sleep. When you are awake tomorrow ask the channel again about submodules and I am sure there will be knowledgable people to help then.06:41
→ Nevik joined06:41
rwp I'm just not knowledgeable about them so don't know how to help further.06:41
← otiose left06:43
→ a_thakur joined06:46
← Hunter1 left06:47
→ Hunter1 joined06:47
← tubal left06:48
→ soc joined06:52
soc hey06:52
can someone help me running some statistics on git06:52
I'm trying to figure out the changes between a certain period of time grouped by authors (minus merge commits)06:53
← Cabanossi left06:54
→ tocky joined06:54
→ Cabanossi joined06:56
← zeroed left07:00
→ zeroed joined07:00
← zeroed left07:00
→ zeroed joined07:00
← dreiss left07:00
← bket left07:03
soc git shortlog -s -n 123..345 gets me the number of commits, can I also get the number of lines changed?07:05
→ dvaske joined07:07
← alcohol left07:08
→ dvaske_ joined07:08
→ alcohol joined07:10
→ _ng joined07:11
← dvaske left07:11
→ z8z joined07:12
→ zulutango joined07:15
rwp soc, Use 'diffstat' to report that?07:15
← zefferno left07:15
soc I found git log --format='%aN' | sort -u | while read name; do echo -en "$name\t"; git log --author="$name" --pretty=tformat: --numstat 947797e..a02b913 | awk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf "added lines: %s, removed lines: %s, total lines: %s\n", add, subs, loc }' -; which seems to be doing what I want ...07:15
:-)07:15
← safe left07:18
→ zefferno joined07:18
→ Keverw joined07:19
→ dersand joined07:20
← tohuw left07:22
← zefferno left07:22
← Keverw left07:22
→ dvaske joined07:24
→ zefferno joined07:25
← Goplat left07:25
→ Aljone joined07:26
→ kbeflo_ joined07:26
Aljone hey guys i was installing new gitlab on myserver07:26
→ ISmithers joined07:27
→ King_Hual joined07:27
Aljone i have an old one also and i want to clone a project completely with all its history to the new server, how do i do that?07:27
→ bket joined07:28
← dvaske_ left07:28
← astrofog left07:29
← tnecniv left07:37
← dka left07:38
← zeroed left07:38
→ zeroed joined07:39
← lowercas_ left07:42
→ tymczenko joined07:42
j416 Aljone: rsync?07:44
Aljone: or, clone it with --bare and then push with --mirror07:45
← jaziz left07:46
→ lowercaseman joined07:47
→ dka joined07:51
→ m4sk1n joined07:52
← mel00010 left07:54
← bilal left07:55
← a_thakur left07:55
→ bilal joined07:55
← zeroed left07:57
← bilal left07:59
→ mikecmpbll joined07:59
← alexandre9099 left07:59
→ zeroed joined07:59
→ bilal joined08:02
← TikityTik left08:03
→ User458764 joined08:05
→ miczac joined08:05
gitinfo set mode: +v08:06
→ jagob joined08:07
← ISmithers left08:09
→ ok91 joined08:09
← ok91 left08:14
← mda1 left08:17
→ mda1 joined08:18
→ roelmonnens joined08:18
→ navidr joined08:19
← jagob left08:20
← roelmonnens left08:22
← bilal left08:22
→ bilal joined08:23
→ sea-gull joined08:23
← tymczenko left08:25
→ danimal2 joined08:26
← fakenerd_ left08:28
← bilal left08:28
→ bilal joined08:29
← z8z left08:30
← cdown left08:32
← nowhereman left08:37
→ nowhereman joined08:37
→ otiose joined08:38
← zefferno left08:38
← dvaske left08:39
← bilal left08:43
← miczac left08:43
→ kjsaihs joined08:43
← otiose left08:43
→ z8z joined08:43
→ bilal joined08:44
→ clmsy joined08:46
→ chandu20 joined08:48
→ zefferno joined08:48
→ Tobbi joined08:48
→ xaa joined08:49
→ miczac joined08:49
gitinfo set mode: +v08:49
→ satifant joined08:50
← Hunter1 left08:52
→ Hunter1 joined08:53
← z8z left08:53
← zeroed left08:57
→ Greivre joined08:58
← Grievre left08:58
→ platzhirsch joined08:59
platzhirsch When do you use merge and when rebase? It feels like when a rebase involves many breaking changes/conflicts a merge seems more appropriate..?08:59
ij You use rebase when you have commits X, Y stemming from Z and you want to change that Z to Z' and the X, Y can probably be put on Z' without much trouble.09:02
← miczac left09:02
→ masuberu joined09:02
ij So you've been developing a branch for a while and you're ready to merge, but it's been a month and the parent is ancient, so you rebase your branch on the latest master and request merging, so the merge lines wouldn't be infinite.09:02
→ miczac joined09:04
gitinfo set mode: +v09:04
ij Rebase and merge are very different.09:04
→ zeroed joined09:05
ij Is my answer any good?09:05
← sarri left09:06
→ sarri joined09:09
← sarri left09:09
→ sarri joined09:09
← Cabanossi left09:09
← kbeflo_ left09:09
← bilal left09:09
→ Guest55823 joined09:09
→ apotry joined09:10
platzhirsch ij: isn't that prone to a lot of work, I usually rebase all the time so they don't diverge so much to begin with09:10
→ Acerific joined09:11
platzhirsch and I guess the question arises from without much trouble... if I need to force push something I would run into the possibility of creating conflicts if other people are working on this branch as well09:11
→ Murii joined09:11
→ Cabanossi joined09:11
→ z8z joined09:11
← indistylo left09:12
← Hunter1 left09:12
← chandu20 left09:12
→ Hunter1 joined09:12
← dedicated left09:12
← tocky left09:12
→ atomi joined09:12
← Burgerz left09:13
← johnflux left09:16
→ bilal joined09:16
← Atm0spher1c left09:16
platzhirsch oh right The golden rule of git rebase is to never use it on public branches.09:21
→ grayjoc joined09:22
← Raging_Hog left09:22
→ mentazoom joined09:22
→ vamiry_ joined09:22
← vamiry left09:23
vamiry_ → vamiry09:23
← z8z left09:25
← finalbeta left09:26
→ finalbeta joined09:26
→ chipotle joined09:28
→ indistylo joined09:28
← bilal left09:28
→ bilal joined09:29
← clmsy left09:31
← atomi left09:32
→ ISmithers joined09:33
→ atomi joined09:33
← User458764 left09:33
← bilal left09:33
→ bilal joined09:34
→ chandu20 joined09:35
← mindfart left09:35
→ MineCoins joined09:36
← leeN left09:39
→ earnestly joined09:40
← finalbeta left09:41
→ finalbeta joined09:41
← bilal left09:42
→ bilal joined09:42
→ spb joined09:44
j416 platzhirsch: rebase before merge is a good idea in my book09:45
platzhirsch: as you say, rebase of branches that others are also working on is a bad idea (unless all others got the message and agree with you)09:45
platzhirsch yeah..09:46
j416 platzhirsch: rebasing often as opposed to seldom is good, it'll give you less headache as you say09:46
→ lohfu joined09:47
j416 platzhirsch: why rebase before merge? because otherwise you're more likely to end up with merge conflicts (syntactic or semantic) and solving those in the merge commit can be confusing both for the person resolving the conflict (perhaps it's not you, and then it'll be even more confusing), and for the future people who search the history for clues and find that a particular piece of code was introduced by a09:47
merge commit, which doesn't say much09:47
platzhirsch: this is my take on it; others may have different opinions, of course.09:48
platzhirsch it's more like, I just did a merge to a feature branch instead of a rebase, what I usually do, because this branch is currently also used by someone else09:49
j416 platzhirsch: and it's of course also about time, sometimes rebasing something complex can be more time-consuming and not worth it, in which case perhaps just merging it is ok09:49
platzhirsch: it's always a balance of what's worth it09:49
platzhirsch: right.09:49
platzhirsch: I almost never merge _to_ feature branches09:49
platzhirsch: I prefer to rebase them09:50
platzhirsch: but then I'm usually ok with helping others in the team to fix any potential screwups that happened because of my rebase09:51
platzhirsch: (hopefully it doesn't happen, because I managed to convey the action beforeand)09:51
hand*09:52
platzhirsch: but if you do rebase branches shared by others in your team, be prepared to fix their issues when they do things in odd ways -- because there will be a few screw ups every now and then09:52
platzhirsch Agreeing with all of your points :D09:52
j416 haha09:53
platzhirsch: in my view, the most important things are proper history and getting there without much hassle09:54
if you've a lot of ad-hoc merges here and there, history becomes harder to read09:54
structured merging according to some set rules, is good09:55
← chipotle left09:58
→ cdown joined09:58
platzhirsch that's why I started bitching around that everyone should start use rebase.. it's shocking how uncommon it still is10:00
← mattcen left10:03
→ tocky joined10:04
← danimal2 left10:06
← ISmithers left10:06
→ mkoskar joined10:09
→ mattcen joined10:11
← mikecmpbll left10:13
← rokups left10:22
← apotry left10:23
→ chipotle joined10:24
← zefferno left10:24
→ astrofog joined10:25
→ mikecmpbll joined10:28
→ fakenerd joined10:33
← Shock_ left10:33
→ danimal2 joined10:34
→ Shock_ joined10:34
← sunri5e left10:36
→ sunri5e joined10:38
← Cabanossi left10:38
← danimal2 left10:38
→ otiose joined10:40
→ crater2150 joined10:40
→ Cabanossi joined10:41
→ theoceaniscool joined10:42
← otiose left10:44
← atomi left10:46
← tocky left10:48
→ atomi joined10:49
← bilal left10:52
→ sq-one joined10:53
→ bilal joined10:54
← miczac left10:55
→ alexandre9099 joined10:56
→ danimal2 joined10:56
← ZyX-I left10:57
→ m0viefreak joined10:58
→ ZyX-I joined10:58
← danimal2 left11:00
→ miczac joined11:01
gitinfo set mode: +v11:02
→ blackwind_123 joined11:04
→ danimal2 joined11:04
→ borkr joined11:07
miczac Hi, I'm not sure what the -cached option in git rm is doing. When untracking a file, all changes so far still remain, so I could look them up when checking out to an earlier commit?11:08
← danimal2 left11:09
← Cabanossi left11:10
→ Cabanossi joined11:11
→ ok91 joined11:11
j416 miczac: it will record the file as deleted, in the index, but not touch the file itself11:12
miczac: the history of your files remains, yes. This is the whole point of version tracking.11:12
miczac is there a way to have it untracked in a way as if it never was tracked?11:13
m0viefreak miczac: not without rewriting history11:15
miczac reason is, I started to track a data file, which wasn't a good idea. It's growing large and changes frequently and actually there's no point in trakcing it11:15
→ romank joined11:15
miczac and .git is large because of it11:16
← romank left11:16
_ikke_ miczac: !bfg11:16
gitinfo miczac: A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)11:16
→ romank joined11:16
miczac thx!11:17
← bilal left11:17
← romank left11:19
→ romank joined11:19
← jeffreylevesque left11:21
← netj left11:22
→ netj joined11:22
→ GT4066 joined11:24
→ User458764 joined11:26
← User458764 left11:26
→ User458764 joined11:27
← askb left11:27
→ misosoup joined11:28
→ askb joined11:28
→ sturner joined11:30
← dave0x6d left11:31
← soc left11:32
← zeroed left11:35
← Hunter1 left11:36
→ Hunter1 joined11:36
→ jstein_ joined11:36
← Hello71 left11:37
→ nidr0x joined11:37
→ SantaClauze joined11:38
← robattila256 left11:38
jstein_ → jstein11:39
→ danimal2 joined11:40
→ zeroed joined11:40
← zeroed left11:40
→ zeroed joined11:40
← romank left11:42
← sturner left11:42
→ sturner_ joined11:42
→ jagob joined11:42
← User458764 left11:44
→ ixpict joined11:44
→ caper joined11:44
← caper left11:45
→ anuxivm joined11:46
→ xco joined11:46
→ romank joined11:46
xco hi. when i do “git pull” and i see there’s been new changes that i successfully pulled, is there a way to something LIKE “git diff” to see the new changes pulled in?11:47
← sq-one left11:47
← danimal2 left11:47
→ Hello71 joined11:47
→ jeffreylevesque joined11:48
_ikke_ xco: it's easier when you fetch first11:48
xco: because the pull also merged that history in11:48
→ johnflux joined11:48
← johnflux left11:48
→ johnflux joined11:48
_ikke_ but something like git diff HEAD@{1} @{u} should work immediately after the pull11:49
xco so then i’d need to do “git fetch” then “git diff"?11:49
_ikke_ git fetch and then git diff @{u}11:49
← maroloccio left11:49
← Shock_ left11:50
→ Shock_ joined11:50
xco awesome, thanks :)11:50
← askb left11:51
_ikke_ or git log -p HEAD..@{u} to see it per commit11:51
xco sounds good i’ll try11:52
← jstein left11:53
← romank left11:55
← CussBot left11:55
→ CussBot joined11:56
→ User458764 joined11:59
→ romank joined11:59
→ lukasdboer_ joined11:59
→ circ-user-dfkWJ_ joined12:00
← theoceaniscool left12:00
← anuxivm left12:00
→ maroloccio joined12:01
→ gableroux joined12:04
← raynold left12:04
← freimatz left12:05
← gableroux left12:05
← MattMaker left12:05
← circ-user-dfkWJ_ left12:05
→ gableroux joined12:05
→ synthroid joined12:05
→ circ-user-dfkWJ joined12:06
→ leeN joined12:07
← romank left12:10
← rwb left12:11
→ dvaske joined12:12
← rewt left12:12
→ HoierM joined12:12
→ freimatz joined12:14
→ romank joined12:14
→ dglambert joined12:15
→ dave0x6d joined12:18
miczac Hi, lack of routine just got me confusing w/ the meaning of terms when reading man pages: "working tree" is the current files I have at hands ... so "removing from working tree" is deleting the file from disk?12:18
← dermoth left12:19
→ dermoth joined12:20
← Murii left12:20
→ D4R5C0D3 joined12:21
→ Gustavo6046 joined12:22
← chipotle left12:22
← sturner_ left12:23
← maroloccio left12:24
→ maroloccio joined12:24
→ Stumbler joined12:27
→ caper joined12:27
_ikke_ correct12:27
← chandu20 left12:29
← gableroux left12:34
→ gableroux joined12:34
→ chipotle joined12:35
← gableroux left12:36
→ gableroux joined12:37
miczac thx!12:37
→ LordRyan joined12:38
→ otiose joined12:40
← MineCoins left12:40
← otiose left12:45
→ jtoy joined12:46
→ danimal2 joined12:49
Peetz0r → DrsPeetz0r12:50
← vrach left12:50
← slkth left12:52
→ bailon joined12:52
← danimal2 left12:54
← zulutango left12:55
→ tocky joined12:56
DrsPeetz0r → Peetz0r12:57
← ok91 left12:58
← maroloccio left12:58
→ dvaske_ joined12:59
→ Achylles joined13:00
→ livingstn joined13:01
← Achylles left13:01
→ Achylles joined13:01
→ tsetair joined13:01
← dvaske left13:02
→ barbos joined13:02
← Achylles left13:02
→ thiago joined13:02
← ixpict left13:03
→ Achylles joined13:03
miczac oh wow, didn't think of that: git rm just effects the current branch? So need to be careful checking out to a different branch since the file still is there? So I'd need to do git rm (--cached) again?13:04
→ rwb joined13:04
→ MattMaker joined13:05
_ikke_ it affects only the index (and the next commit made). Previous commits and commits in other branches still have the file13:06
→ cdg joined13:06
miczac so in any case git checkout apparently warns me of any still exsting files being git rm-ed on the current branch. Ok, good to know, trying not to mess up now. ;)13:07
← Gustavo6046 left13:08
← User458764 left13:08
← Cabanossi left13:09
← MattMaker left13:11
→ Sound joined13:11
→ Cabanossi joined13:11
Sound → Guest7199213:11
← Guest71992 left13:11
→ Sound_ joined13:12
→ Gustavo6046 joined13:12
→ Vortex35 joined13:12
← bouncy left13:13
← Vortex34 left13:15
→ TheSimonator joined13:15
→ bouncy joined13:17
← ertes left13:18
→ YuGiOhJCJ joined13:22
← bannakaffalatta left13:22
→ ayogi joined13:23
← grift left13:23
→ wcstok joined13:23
→ davimore_ joined13:23
→ Glooomy joined13:24
← davimore left13:24
→ mjuszczak joined13:24
→ gugah joined13:24
← gugah left13:24
davimore_ → davimore13:24
→ justin2 joined13:25
→ snowkidind joined13:25
→ maroloccio joined13:25
→ grift joined13:25
→ raijin joined13:28
← ayogi left13:28
→ lamont joined13:28
→ danimal2 joined13:29
→ User458764 joined13:30
ws2k3 im trying to clone an older release of mcrouter but this is not working: git clone -b release-35-0 --single-branch clone https://github.com/facebook/mcrouter.git what am i doing wron here?13:32
→ Dougie1871 joined13:32
→ ok91 joined13:32
→ MineCoins joined13:32
→ rastos2 joined13:33
← Dougie187 left13:34
← rastos2 left13:34
← ojdo left13:35
→ LeBlaaanc joined13:35
→ njbair joined13:37
← tocky left13:38
← mostlybadfly left13:38
← danimal2 left13:38
← chipotle left13:38
→ zerow joined13:38
← jagob left13:38
← LeBlaaanc left13:39
→ tocky joined13:39
→ NeXTSUN joined13:39
← romank left13:40
← gableroux left13:42
thiago ws2k3: can you tell us what happens when you run that?13:42
→ gableroux joined13:43
← barbos left13:43
→ rmesta joined13:44
→ rmesta1 joined13:44
← sunri5e left13:44
→ sunri5e joined13:45
→ romank joined13:45
→ ChiLL_SurF joined13:47
← rmesta left13:48
← laumann left13:48
→ Es0teric joined13:50
→ thallada joined13:51
← Cabanossi left13:54
← ResidentBiscuit left13:54
→ Cabanossi joined13:56
→ laumann joined13:56
qqx ws2k3: You have "clone" a second time right before the URL. Remove that and it should work.13:58
← cdg left13:59
→ tnecniv joined13:59
→ ResidentBiscuit joined13:59
→ cdg joined13:59
← dvaske_ left14:00
→ dvaske joined14:01
← tnecniv left14:01
→ Archangel joined14:01
← Archangel left14:02
gitinfo set mode: +v14:02
dglambert yo14:02
hmm, my voice got shut off14:02
← nickel_dime_look left14:02
→ Cerebr0 joined14:03
Cerebr0 Hey ! If i clone a project on github, where is it stored in my computer ? I'm in debian btw14:03
← circ-user-dfkWJ left14:04
ResidentBiscuit The directory you cloned in14:04
Cerebr0 So when i don't specify any directory, it just clones in my home folder14:05
in the name of the project ?14:05
← dvaske left14:06
→ pbrewczynski_c joined14:06
→ kpease joined14:06
← jason237 left14:06
→ circ-user-dfkWJ joined14:07
ResidentBiscuit If you are in the home directory when you run it14:07
→ otiose joined14:07
← cust left14:08
Cerebr0 Okay ! thanks14:10
← Cerebr0 left14:10
→ fahadash joined14:11
→ jagob joined14:13
→ LeBlaaanc joined14:14
miczac I'm removing a test-branch w/ git branch -d testbranch . I get the warning "error: The branch 'testbranch' is not fully merged." prompting me to use -D . "not fully merged" is meant with respect to master?14:15
→ ronny joined14:15
→ cdown_ joined14:15
→ wandering_vagran joined14:15
← prg3 left14:16
← ok91 left14:17
← stoopkid left14:17
← cdown left14:18
cdown_ → cdown14:18
→ circ-user-dfkWJ_ joined14:18
→ prg3 joined14:19
→ oleo joined14:20
→ LionsMane joined14:21
← circ-user-dfkWJ left14:21
→ overlord_tm joined14:22
→ acetakwas joined14:23
← NeXTSUN left14:24
→ cdown_ joined14:24
→ a3Dman joined14:25
→ gablerou_ joined14:27
→ snowalpaca joined14:27
→ nickel_dime_look joined14:27
← cdown left14:27
cdown_ → cdown14:27
→ Lunatrius` joined14:27
→ snowalpa_ joined14:27
← snowalpa_ left14:27
cjohnson I think it's just 'not merged into any branch'14:28
meaning, there are some commits in that branch in which the branch is the last remaining reference to14:28
if you were to merge branch b into branch c then try to delete b, it wouldn't complaing since b is no longer the last remaining ref14:28
but then if you went to delete c as well, that's when it would complain14:29
← Es0teric left14:30
← gableroux left14:30
← Lunatrius left14:30
Lunatrius` → Lunatrius14:30
← snowalpaca left14:31
← overlord_tm left14:33
← romank left14:33
← LeBlaaanc left14:35
→ iota_pi joined14:35
miczac ok, that's fine. testbranch is a copy of another branch to test a merge from master. So that should be fine.14:36
← User458764 left14:36
← justin2 left14:36
→ romank joined14:37
→ Es0teric joined14:39
→ Lunatrius` joined14:40
→ vdl joined14:41
→ mmlb joined14:43
← armyriad left14:43
← Lunatrius left14:43
Lunatrius` → Lunatrius14:43
→ armyriad joined14:44
← am55 left14:46
→ am55 joined14:47
← am55 left14:47
→ am55 joined14:47
→ aruns__ joined14:47
← acetakwas left14:48
→ Octalot joined14:48
→ MDA2 joined14:48
← indistylo left14:49
→ raffo joined14:49
← prg3 left14:50
→ Ricaz joined14:50
→ tymczenko joined14:50
→ NeXTSUN joined14:50
← mda1 left14:51
→ theoceaniscool joined14:53
→ prg3 joined14:54
→ jstein_ joined14:54
← smccully left14:54
→ cqi joined14:55
→ Sp4rKy joined14:55
→ indistylo joined14:56
Sp4rKy → Guest4590414:56
← aruns__ left14:56
jstein_ → jstein14:57
→ TikityTik joined14:58
← oleo left14:58
← nickel_dime_look left14:59
← wandering_vagran left15:00
← Es0teric left15:00
← cdown left15:01
→ Es0teric joined15:01
← raijin left15:01
→ al-damiri joined15:03
← monjwf left15:04
→ cdown joined15:04
→ cagomez joined15:04
→ Burgerz joined15:04
→ jason237 joined15:05
→ lewix joined15:05
→ acetakwas joined15:06
→ MattMaker joined15:07
→ oleo_ joined15:08
← tocky left15:08
← ResidentBiscuit left15:09
← Cabanossi left15:09
→ raijin joined15:09
← oleo_ left15:09
→ oleo_ joined15:09
oleo_ → oleo15:09
→ tubal joined15:11
→ Cabanossi joined15:11
← MattMaker left15:12
→ cdown_ joined15:12
→ nickel_dime_look joined15:12
→ wandering_vagran joined15:12
← cdown left15:12
cdown_ → cdown15:12
oleo → Guest7055115:12
→ Abbott joined15:13
Guest70551 → oleo15:14
Abbott I want to delete a branch, set my branch as master, and rename the current master branch to "deprecated". Would this actually be a manner of renaming branches, or would it be more appropriate to fork a branch from current master right now called "deprecated", merge my branch into master and keep all of my changes, and then delete the third branch15:15
← synthroid left15:15
→ cha18000000 joined15:16
← cha18 left15:16
← cha1800 left15:16
cha18000000 → cha1815:17
→ cha1800 joined15:17
← cha18 left15:17
cha1800 → cha1815:17
← kpease left15:17
→ cha1800 joined15:18
← cagomez left15:18
→ User458764 joined15:18
→ lightstalker joined15:18
cbreak Abbott: renaming works if you want to rewrite history\15:18
→ oskarkv joined15:19
→ jnavila joined15:20
← HoierM left15:20
→ boombatower joined15:22
← zeroed left15:24
→ Noldorin joined15:24
← _ng left15:24
→ Spacew00t joined15:24
Abbott I guess I didn't think of that15:26
→ israelpattison joined15:26
→ zeroed joined15:26
← zeroed left15:26
→ zeroed joined15:26
← dave0x6d left15:27
← Guest45904 left15:29
← Spacew00t left15:31
→ gugah joined15:32
→ blackjid joined15:34
← jason237 left15:34
→ HoierM joined15:35
→ sq-one joined15:35
← D4R5C0D3 left15:35
→ synthroid joined15:35
← Stumbler left15:36
cjohnson Regarding mailing list, I submitted an email about a bug/misunderstanding for git clean/git status and .gitignore15:37
At this point the discussion is beyond my comprehension15:37
Is it normal for me to just quietly watch and hope people take up the cause and figure osmething out?15:37
← misosoup left15:37
cjohnson I only know how to use git I am not a C/C++ programmer15:37
Or is it expected that the submitter sort of sticks around to rally and project manage?15:38
→ jason237 joined15:38
_ikke_ thread: https://public-inbox.org/git/CAJZjrdXfcaUrJXbAoPtRtvigouZ2eNyNsZ=2WtSY20_D+Ow6qw@mail.gmail.com/T/#t15:38
→ felixsanz_ joined15:38
_ikke_ cjohnson: What part are you strugling with?15:38
← gablerou_ left15:39
← am55 left15:39
→ gableroux joined15:39
→ ozcanesen joined15:39
→ am55 joined15:40
← am55 left15:40
→ am55 joined15:40
→ ertes joined15:40
cjohnson oh not that I'm struggling, I just don't really have any more input to provide beyond answering questions anybody might have for me15:41
→ brent__ joined15:41
← oleo left15:41
→ oleo joined15:41
cjohnson I am not even remotely familiar with git's internals to be able to help guide the decision making process at this point15:41
← freimatz left15:41
← TheSimonator left15:41
← Es0teric left15:42
_ikke_ RIght, it's normal that a more technical disussion follows to see if something needs to be changed and where the problem lies15:42
→ Es0teric joined15:43
→ publio joined15:43
cjohnson Oh yeah I get that for sure... I just have never used a mailing list before or contributed to a major open source project like git so I wasn't sure if it was normal for the submitter to just submit and then go silent while smarter people figure it out amongst themselves. Just making sure I'm not violating customs ha15:43
→ ResidentBiscuit joined15:44
← ResidentBiscuit left15:44
cjohnson sounds like not15:44
thanks _ikke_ I'm just overthinking things I think. too much coffee15:44
_ikke_ It would be unreasonable if everyone reporting bugs was expecting to fully understand the underlying mechanisms and contribute to the actual solution15:44
← Gustavo6046 left15:44
_ikke_ expected*15:44
→ ResidentBiscuit joined15:44
← ResidentBiscuit left15:44
→ madewokherd joined15:44
→ freimatz joined15:44
→ ResidentBiscuit joined15:45
← ResidentBiscuit left15:45
→ ResidentBiscuit joined15:45
← ResidentBiscuit left15:45
← ozcanesen left15:45
→ shinnya joined15:45
→ ResidentBiscuit joined15:46
← ResidentBiscuit left15:46
→ ResidentBiscuit joined15:46
→ Ferdroid joined15:46
← cha1800 left15:46
→ JanC_ joined15:47
→ Gustavo6046 joined15:47
cjohnson lol fair15:48
JanC → Guest4299615:49
← Guest42996 left15:49
JanC_ → JanC15:49
← oleo left15:52
→ gaucheph joined15:52
→ menip joined15:53
← lewix left15:54
← felixsanz_ left15:55
→ kpease joined15:55
→ Introoter joined15:55
→ TbobbyZ joined15:56
→ lewix joined15:56
← tymczenko left15:56
← Ferdroid left15:57
→ dreiss joined15:57
← ZyX-I left15:59
→ justin2 joined15:59
← am55 left16:00
→ ZyX-I joined16:00
→ rkazak joined16:00
→ am55 joined16:00
← am55 left16:00
→ am55 joined16:00
→ ok91 joined16:00
← maroloccio left16:00
→ pandeiro joined16:01
→ lindenle joined16:02
← sea-gull left16:02
→ raspado joined16:03
← TbobbyZ left16:03
→ mel00010 joined16:04
← platzhirsch left16:05
← menip left16:05
← jason237 left16:06
← Glooomy left16:06
→ paws_ joined16:07
← freimatz left16:08
→ lipvig joined16:09
→ eb0t joined16:09
→ Eoxza joined16:10
→ Ferdroid joined16:10
← Es0teric left16:11
← circ-user-dfkWJ_ left16:11
→ Gloomy joined16:11
← lipvig left16:11
→ circ-user-3LMm1 joined16:11
→ awc737 joined16:14
circ-user-3LMm1 How do you delete a remote branch locally?16:16
Random832 git push remote :branchname16:16
j416 wouldn't be remote then would it16:16
← zeroed left16:16
j416 if it's local16:16
← boombatower left16:16
j416 ponders16:16
← madewokherd left16:16
← m0viefreak left16:16
cbreak git remote prune16:16
j416 ah, I suppose that's what is meant16:17
Random832 i guess the question is what exactly you mean by that16:17
j416 circ-user-3LMm1: git fetch --prune is nice too16:17
Random832 do you want to remove the branch *from the remote*, or remove a local branch that is tracking the remote16:17
j416 circ-user-3LMm1: you can set fetch to prune by default with config. See man git-config search for fetch and prune16:17
gitinfo circ-user-3LMm1: the git-config manpage is available at https://gitirc.eu/git-config.html16:17
→ durham joined16:17
Random832 I read 'locally' as meaning what local command can delete a branch from a remote (as opposed to ssh-ing there and running git branch -d) but i suppose you might not have meant that16:18
→ boombatower joined16:18
← sq-one left16:19
→ AlkindiX joined16:19
→ madewokherd joined16:20
→ hobodave joined16:21
← Eoxza left16:22
← AlkindiX left16:22
→ Es0teric joined16:22
→ freimatz joined16:23
← cqi left16:23
→ Aeterne joined16:24
← User458764 left16:24
← Aven left16:26
→ tymczenko joined16:26
← am55 left16:26
→ am55 joined16:27
← am55 left16:27
→ am55 joined16:27
← am55 left16:28
→ SteffanW joined16:28
→ am55 joined16:28
← am55 left16:28
→ am55 joined16:28
→ nitric joined16:28
← njbair left16:29
→ njbair joined16:29
← kpease left16:30
← YuGiOhJCJ left16:30
→ tristanp_ joined16:32
→ tinanoo1 joined16:32
← am55 left16:32
→ srcerer_ joined16:33
→ oleo_ joined16:33
→ Tyklol joined16:33
→ SR3ject joined16:33
→ Shakeel__ joined16:33
→ am55 joined16:34
← am55 left16:34
→ am55 joined16:34
← Es0teric left16:34
← oleo_ left16:34
← madewokherd left16:35
→ tijensse_ joined16:35
→ oleo_ joined16:35
→ rominronin joined16:35
→ rizonz_ joined16:36
→ wwalker_ joined16:36
→ madewokherd joined16:36
→ nadley_ joined16:36
→ AustinIncognito joined16:36
→ pigeon_ joined16:36
→ gkatsev_ joined16:37
← King_Hual left16:37
→ visual_ joined16:37
→ TheSimonator joined16:38
← oleo_ left16:39
→ oleo_ joined16:39
← mjuszczak left16:39
→ DomeMasterYolo16 joined16:39
→ _cyril__ joined16:39
gitinfo set mode: +v16:39
DomeMasterYolo16 Hi everyone16:39
gitinfo DomeMasterYolo16: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.16:39
← am55 left16:39
DomeMasterYolo16 I'm using git-archive and its working great16:40
→ cwre_ joined16:40
→ vamiry_ joined16:40
DomeMasterYolo16 only problem is further down one of my subdirectories is another git repo16:40
archive removes the git repo for the subdirectory16:40
→ dsantiag_ joined16:40
DomeMasterYolo16 is there a way to stop it doing this?16:40
→ bcc_ joined16:40
→ tabakhase__ joined16:40
← Gloomy left16:41
← paws_ left16:41
← Noldorin left16:41
← jnavila left16:41
← LionsMane left16:41
← ronny left16:41
← tsetair left16:41
← blackwind_123 left16:41
← mkoskar left16:41
← vamiry left16:41
← grayjoc left16:41
← satifant left16:41
← xaa left16:41
← m4sk1n left16:41
← dka left16:41
← Tykling left16:41
← plasticle left16:41
← nd_ left16:41
← hashpuppy left16:41
← peepsalot left16:41
← nadley left16:41
← tristanp left16:41
← Random832 left16:41
← maestrojed left16:41
← rodarmor left16:41
← thinkpad left16:41
← daxroc left16:41
← Cork left16:41
← ionelmc left16:41
← Ownix left16:41
← GameGamer43 left16:41
← zifnab left16:41
← msm left16:41
← SReject left16:41
← CustosLimen left16:41
← jjasinski left16:41
← srcerer left16:41
← Walex left16:41
← hexa- left16:41
← tabakhase left16:41
← rizonz left16:41
← frankkahle left16:41
← cwre left16:41
← johnnyfive left16:41
← marlinc left16:41
← auv left16:41
← SlashLife left16:41
← Shakeel_ left16:41
← Hobbyboy left16:41
← barteks2x left16:41
← _cyril_ left16:41
← sevenever left16:41
← spacemud left16:41
← Anthaas left16:41
← wwalker left16:41
vamiry_ → vamiry16:41
← tymczenko left16:41
→ johnnyfive joined16:41
→ frankkahle joined16:41
→ incredible joined16:42
→ Gabemo joined16:42
→ nd joined16:42
→ blackwind_123 joined16:42
→ madduck joined16:42
→ Orphis joined16:42
→ SlashLife joined16:42
→ Neo joined16:42
→ CustosLimen joined16:42
→ utrack joined16:42
→ rodarmor joined16:42
→ mkoskar joined16:42
→ Es0teric joined16:42
→ spacemud joined16:43
← TheSimonator left16:43
→ Ownix joined16:43
→ hashpuppy joined16:43
→ GameGamer43 joined16:43
→ sevenever joined16:43
→ m4sk1n joined16:43
→ barteks2x joined16:43
→ zifnab joined16:43
→ ionelmc joined16:43
→ daxroc joined16:43
→ owlbynight joined16:44
→ hexa- joined16:44
→ Anthaas joined16:44
→ Bombe joined16:44
→ msm joined16:44
→ anderson joined16:44
→ kpease joined16:44
kadoban Doesn't appear so to me. Which makes sense, because to git it's not part of the same repo, as far as I understand.16:44
→ Hobbyboy joined16:44
→ marlinc joined16:45
→ svm_invictvs joined16:45
← shinnya left16:45
→ tyreld joined16:46
→ thinkpad joined16:46
← tabakhase__ left16:46
→ Cork joined16:46
→ paws_ joined16:46
→ tabakhase joined16:46
→ hsiktas joined16:47
→ auv joined16:47
→ peepsalot joined16:47
→ satifant joined16:47
← satifant left16:47
→ satifant joined16:47
→ maarhart joined16:47
→ dka joined16:47
← dka left16:48
→ ronny joined16:48
→ Walex joined16:48
→ tsetair joined16:48
→ dka joined16:48
→ cdown_ joined16:49
→ stealthii joined16:49
→ plasticle joined16:49
← rkazak left16:49
→ LionsMane joined16:49
← theoceaniscool left16:50
← TSS_ left16:50
← maarhart left16:50
→ Maxel joined16:50
← cdown left16:51
cdown_ → cdown16:51
→ LeBlaaanc joined16:51
← borkr left16:51
→ Iacobus joined16:51
← gaucheph left16:51
→ ToeSnacks joined16:52
→ sea-gull joined16:53
→ cdown_ joined16:55
→ cust joined16:55
→ tnecniv joined16:55
→ ojdo joined16:55
→ TSS_ joined16:57
← israelpattison left16:57
→ synthroi_ joined16:57
← cdown left16:57
cdown_ → cdown16:57
→ borkr joined16:58
← tubal left16:58
← LionsMane left16:58
← rizonz_ left16:59
← Ferdroid left16:59
→ marianina8 joined17:00
← oleo_ left17:00
← synthroid left17:01
← sea-gull left17:02
→ altendky joined17:03
→ jason237 joined17:04
→ Random832 joined17:04
→ batrick joined17:04
→ oleo__ joined17:04
← acetakwas left17:05
→ mikkel- joined17:05
← mikkel- left17:05
← otiose left17:05
← indistylo left17:07
← iffraff left17:07
→ sea-gull joined17:07
Eugene DomeMasterYolo16 - nope, that's intended behaviour. submodules are not included in archive, because it is a separate repository.17:07
→ MattMaker joined17:08
Eugene Found with some random googling for "git archive submodule": https://github.com/Kentzo/git-archive-all17:08
→ gopar joined17:08
← Es0teric left17:10
← storrgie left17:11
← enckse left17:11
_cyril__ → _cyril_17:11
→ Es0teric joined17:11
→ TheSimonator joined17:11
← VladGh_ left17:11
← diogenese left17:12
→ enckse joined17:12
← jtoy left17:12
← MattMaker left17:12
→ diogenese joined17:12
→ overlord_tm joined17:13
→ storrgie joined17:13
← feodoran left17:13
← lowercaseman left17:15
← cha18 left17:16
→ felixsanz_ joined17:16
← oleo__ left17:16
→ oleo__ joined17:16
→ cha18 joined17:16
→ mjuszczak joined17:17
→ VladGh joined17:18
← felixsanz left17:18
← wandering_vagran left17:18
→ acetakwas joined17:18
→ synthroid joined17:19
→ NeverDie joined17:19
← synthroi_ left17:21
→ jtoy joined17:22
← gableroux left17:23
→ gableroux joined17:23
→ otiose joined17:24
← nickel_dime_look left17:25
← mel00010 left17:25
→ rkazak joined17:26
← borkr left17:27
→ gnixev joined17:27
→ felixsanz joined17:30
← felixsanz left17:31
← acetakwas left17:31
→ johnflux_ joined17:31
← johnflux left17:31
→ Murii joined17:32
← Es0teric left17:32
→ Es0teric joined17:33
→ sgen joined17:34
→ gaucheph joined17:34
→ Stumbler joined17:35
→ porfiriopaiz joined17:36
← Es0teric left17:37
→ Es0teric joined17:37
→ LionsMane joined17:37
← gugah left17:38
→ nickel_dime_look joined17:38
→ Discovery joined17:39
→ SegFaultAX joined17:39
← Stumbler left17:39
← rkazak left17:40
→ gugah joined17:41
→ mel00010 joined17:42
→ h8r3d joined17:42
→ King_Hual joined17:44
← gaucheph left17:44
← Es0teric left17:45
→ Es0teric joined17:45
→ gaucheph joined17:46
← Es0teric left17:47
→ Es0teric joined17:48
← robotroll left17:49
← h8r3d left17:50
→ King_Hual` joined17:52
→ User458764 joined17:53
→ Stumbler joined17:54
← Cabanossi left17:55
← King_Hual left17:55
→ Cabanossi joined17:56
→ cworth joined17:57
← diogenese left17:59
← chubek_ left17:59
← marianina8 left17:59
← King_Hual` left17:59
→ King_Hual` joined18:00
← King_Hual` left18:01
→ Nloox joined18:01
→ Sasazuka joined18:02
→ maroloccio joined18:03
→ WayToDoor joined18:03
← Nloox left18:03
→ hobodave_ joined18:03
← planigan left18:03
→ King_Hual joined18:04
← King_Hual left18:04
→ King_Hual joined18:04
→ SupaHam joined18:04
← circ-user-3LMm1 left18:04
→ marianina8 joined18:05
→ planigan joined18:06
← hobodave left18:06
→ maestrojed joined18:07
→ aielima joined18:07
→ xaa joined18:07
→ dviola joined18:08
→ raynold joined18:09
→ Yuv joined18:09
→ h8r3d joined18:10
→ PioneerAxon_ joined18:11
← cdg left18:11
→ acetakwas joined18:11
→ math-alpha joined18:12
→ am55 joined18:12
← PioneerAxon left18:12
← Es0teric left18:12
← oprypin left18:13
→ oprypin joined18:14
← NeXTSUN left18:14
← Burgerz left18:15
→ tymczenko joined18:15
← hobodave_ left18:16
→ iskander joined18:17
← caper left18:17
← math-alpha left18:17
← iskander left18:18
→ ter0 joined18:18
→ Maxel_ joined18:19
← ter0 left18:19
← Yuv left18:19
→ circ-user-3LMm1 joined18:20
← ok91 left18:20
→ diogenese joined18:21
← m4sk1n left18:21
← Maxel left18:22
→ hobodave joined18:22
← ShapeShifter499 left18:23
← mentazoom left18:23
→ kiltzman joined18:25
texasmynsted I have a branch bar, that was created by branching branch foo. The foo branch had some history re-written with a rebase and force pushed. I have local changes that I captured in a stash18:27
I changed to the foo branch and git reset —hard origin to fix it18:28
But I am not sure how to fix my bar branch18:28
← leah2 left18:28
texasmynsted I tried merging in foo, but of course I got conflicts...18:28
→ leah2 joined18:28
_ikke_ can you rebase bar?18:28
texasmynsted Right now the only changes are changes between what foo used to look like and what it does now. All my changes still live in a stash18:29
← Sauvin left18:30
_ikke_ so what's the status of branch bar then?18:30
→ Arokh joined18:30
← kpease left18:30
texasmynsted It is in conflict with multiple files18:30
→ aard joined18:30
texasmynsted from the "auto-merge"18:30
→ Glooomy joined18:30
← peepsalot left18:30
→ mvensky joined18:31
texasmynsted How can I back out the merge that is still in conflict and then fix or replace bar then apply my stash?18:31
_ikke_ git merge --abort18:31
← Glooomy left18:31
→ Es0teric joined18:32
→ filcab joined18:32
texasmynsted ok, now for the bar brach. Just git branch -D?18:32
_ikke_ git checkout -B bar foo?18:33
← Minty_ left18:34
texasmynsted Not sure18:34
→ kpease joined18:34
texasmynsted If the commit that the stash was created from no longer exists, what happens?18:34
ok I renamed the bar branch to bar-old18:35
← LeBlaaanc left18:36
DomeMasterYolo16 Thanks Eugene18:36
madewokherd if the stash exists, it should keep its parent commits alive, even if the original branch does not18:36
texasmynsted ok18:37
seems ok18:37
created new bar branch and popped the changes off the stash stack18:37
← njbair left18:37
→ borkr joined18:38
_ikke_ a stash lives on its own18:38
→ njbair joined18:38
_ikke_ It does not hold a reference to a commit considered by gc18:39
a weak ref if you will18:39
← kpease left18:41
← User458764 left18:41
← romank left18:42
← acetakwas left18:43
→ [cust] joined18:44
← cust left18:44
→ kpease joined18:44
← texasmynsted left18:45
← Murii left18:45
→ texasmynsted joined18:47
→ romank joined18:47
→ rkazak joined18:49
texasmynsted thank you18:50
→ d10n-work joined18:51
qqx _ikke_: Are you sure about that? I haven't tested it, but I'd expect stash references to be considered by gc.18:51
← raspado left18:52
qqx Although since at least the non-latest ones are reflogs they would eventually expire.18:52
But until the expiration it should guarantee that objects don't go away.18:52
→ nixjdm joined18:53
← marianina8 left18:54
_ikke_ you are right18:54
← Hunter1 left18:54
→ Hunter1 joined18:54
→ marianina8 joined18:54
← marianina8 left18:59
→ User458764 joined18:59
→ dvaske joined19:02
→ marianina8 joined19:02
← rkazak left19:03
← GT4066 left19:04
← finalbeta left19:06
→ finalbeta joined19:06
← romank left19:08
→ MattMaker joined19:08
← al-damiri left19:09
← alexandre9099 left19:09
← Hunter1 left19:09
→ Hunter1 joined19:10
← mjuszczak left19:10
→ felGru joined19:12
← mel00010 left19:12
→ romank joined19:12
← jeffreylevesque left19:12
→ mjuszczak joined19:13
← MattMaker left19:13
← TheSimonator left19:15
→ b1tchcakes joined19:16
→ indistylo joined19:17
→ TheSimonator joined19:17
→ tubal joined19:18
→ yqt joined19:20
b1tchcakes hi. i was wondering if someone could help me on a git/testing question. I might be overthinking this. i have a project in /project and as i am building that project I am trying to also create a /project/library which I will eventually push to github so that it can be maintained separately. but i'm trying not to switch back and forth between the app and library right now so i was wanting to see how I could accomplish this. in19:23
other words, the /project would have a git repo but then the /project/library would have a separate one inside of that, and commiting the /project would ignore the /project/library. hope that makes sense.19:23
kadoban You can nest repos like that if you want. That's what happens by default if you just create a repo inside of another one.19:23
← circ-user-3LMm1 left19:23
kadoban I have a feeling I'm missing some part of your question though.19:24
By the way, that name really sucks.19:24
← Cabanossi left19:24
b1tchcakes i am using pho storm, so if i want to create a separate library I have to leave one project and move to another, edit the code, and then switch back to the main project. so in a way, i am just trying to keep all the files on the screen open at once, and then when the library is more refined I can just pull it out and move it to an independent location and pull it in via composer.19:25
← tnecniv left19:25
→ Cabanossi joined19:26
← gaucheph left19:26
→ robotroll joined19:26
kadoban Hmm, not really sure the answer to that. It sounds a bit like git subtree (a contrib command), but I'm not sure.19:27
→ woodi_ joined19:27
→ gaucheph joined19:28
gitinfo set mode: +v19:29
woodi_ hello everybody, I have a question about git hook, can anyone help?19:30
→ FuzzyWuz_ joined19:31
← h8r3d left19:32
woodi_ Ding...19:32
bremner woodi_: !ask19:32
gitinfo woodi_: Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.19:32
→ peepsalot joined19:33
→ NeXTSUN joined19:34
woodi_ I ran a git server, and want to do somethin in post receive hooks to show the client wat was updated or which part was updated....19:34
← rmesta1 left19:34
→ tnecniv joined19:35
→ rkazak joined19:35
woodi_ examined "oldrev newrev ref" but not worked19:35
← robotroll left19:36
← tnecniv left19:38
← nickel_dime_look left19:39
← gopar left19:39
woodi_ I ran a git server, and want to do somethin in post receive hooks to show the client wat was updated or which part was updated,examined "oldrev newrev ref" but not worked19:40
← peepsalot left19:40
→ tnecniv joined19:41
→ raspado joined19:41
← johnflux_ left19:41
← salamanderrake left19:41
bremner Can you be more specific about what didn't work?19:42
woodi_ I wanted to manipulated updated files and what was added or limited, I examined " git log " too but wanted to know is any better solution19:43
→ gopar joined19:44
madewokherd git diff --name-only ?19:45
→ jnewt joined19:45
→ LeBlaaanc joined19:47
← WayToDoor left19:48
← livingstn left19:48
woodi_ I used "git diff --name-only ?" and got this error => remote: error: cannot run hooks/post-receive: No such file or directory19:49
← TheSimonator left19:50
← cads left19:51
→ darkfrog joined19:51
← Sound_ left19:51
darkfrog I can't search Google for this without getting information about LFS. I'm writing a CMS for managing files (mostly media like videos and images so very large). Apart from creating a Git repo per file stored and committing my changes after each change of the file is there a better way to manage file versioning?19:53
...and is Git going to be okay at versioning very large binary files?19:53
or am I overthinking this and should just stop worrying about diffing and focus on just creating copies?19:54
→ livingstn joined19:55
woodi_ @darkfrog I thought you are answering me ;^)19:55
darkfrog woodi_: I just joined so I don't even know what you wrote.19:56
bremner woodi_: it sounds like your hook is not found by git.19:56
check the name19:56
jast also the #! line19:57
woodi_ when I change the command to something simpler like "echo", It works19:57
I can not handle hook inputs19:57
jast side note, I'm pretty sure the '?' was not meant literally, just to indicate a "maybe you want to use this command?"19:57
woodi_ if it has any!19:58
← aielima left19:58
jast darkfrog: for things like video, you could just keep a copy of each version as a separate file (or use something like git-lfs). there's not much of an advantage of putting it in a repository, and there are some disadvantages for larger files19:59
woodi_ what should I put into my script, u know it made me crazy19:59
← ahrs left20:00
→ m4sk1n joined20:00
bremner woodi_: have you read man githooks?20:00
gitinfo woodi_: the githooks manpage is available at https://gitirc.eu/githooks.html20:00
→ ahrs joined20:00
→ m0viefreak joined20:00
bremner it tells you how the arguments are passed to each hook20:01
← indistylo left20:01
darkfrog jast: thanks...that's what I was starting to think, I just wanted someone else to say it. ;)20:01
jast generic hook advice: !hook_pitfalls20:02
gitinfo Guidelines for writing hooks: 1. Consume all input (cat >/dev/null if you don't want it). 2. If you use any 'cd', also 'unset GIT_DIR'. 3. Don't git-pull in a hook (or any other script).20:02
jast darkfrog: you can quote me on it if you like, please provide attribution as follows: "random person on IRC" ;)20:03
← rwb left20:04
darkfrog jast: I'll add it to the end of the book I'm writing about random people I talk to on the internet. :-p20:04
← rkazak left20:05
→ anuxivm joined20:05
← mjuszczak left20:05
jast splendid20:06
← rominronin left20:06
woodi_ bremner_ @gitinfo_ : thankQ so much20:06
← Khisanth left20:07
← schleppel left20:09
← Cabanossi left20:09
→ shgysk8zer0 joined20:10
← b1tchcakes left20:10
→ alexandre9099 joined20:11
→ cdg joined20:11
→ Cabanossi joined20:11
→ tormachris joined20:12
← marianina8 left20:13
← jtoy left20:14
→ marianina8 joined20:14
← Achylles left20:18
gkatsev_ → gkatsev20:18
← dersand left20:19
← daynaskully left20:20
← dvaske left20:20
← woodi_ left20:20
→ Khisanth joined20:21
→ jtoy joined20:21
→ IndigoTiger joined20:21
← brent__ left20:22
→ cagomez joined20:23
← tnecniv left20:25
← Es0teric left20:25
→ tnecniv joined20:25
← tnecniv left20:25
→ tnecniv joined20:25
→ peepsalot joined20:27
→ rkazak joined20:27
→ kegster joined20:28
← King_Hual left20:28
← tnecniv left20:28
→ causasui joined20:28
← causasui left20:28
→ causasui joined20:28
← eb0t left20:28
Eugene jast - I see your domain is back, congratulations20:29
→ King_Hual joined20:29
← King_Hual left20:29
→ King_Hual joined20:29
→ jeffreylevesque joined20:29
→ tnecniv joined20:30
→ daynaskully joined20:30
← astrofog left20:31
→ Es0teric joined20:31
→ duderonomy joined20:33
← cagomez left20:33
← marianina8 left20:33
→ marianina8 joined20:34
← lewix left20:34
→ lmat joined20:35
← Doginal left20:36
← dglambert left20:37
← rkazak left20:37
← Introoter left20:38
→ aidalgol joined20:38
→ Atm0spher1c joined20:39
← tnecniv left20:40
→ tnecniv joined20:40
→ lewix joined20:41
→ lyxus joined20:41
← kpease left20:41
→ Es0teric_ joined20:42
← MineCoins left20:42
→ hust921 joined20:42
← freimatz left20:43
← FuzzyWuz_ left20:44
← sea-gull left20:44
← tnecniv left20:44
← fakenerd left20:45
→ fakenerd joined20:46
← navidr left20:46
← synthroid left20:47
→ jimmyrcom joined20:48
← Stumbler left20:49
jast Eugene: yeah, wasn't cheap but I guess that makes it even more of a learning experience20:49
Eugene Missed/forgot the renewal?20:49
jast yep20:50
Eugene br0tip: create a systems@ inbox somewhere. Have all your crap like that sent there. I abuse gmail filters to sort it a bit, then scan once a month for important-looking things20:50
jast I did actually see the first reminder, 90 days in advance20:51
the rest got caught in my spam filter's "unsure" category20:51
Eugene Brutal20:51
← fakenerd left20:51
jast and I was kind of busy with my leg refusing to do what it's supposed to do. (excuses, excuses)20:51
Eugene !logs20:52
gitinfo [!irclog] Public logs of #git are kept at: https://itvends.com/irc/git/ or see stats for the last 30 days: http://itvends.com/irc/git.html or all logs: http://itvends.com/irc/git-all.html20:52
← tbstbs left20:52
Eugene I don't know if the old logs are coming back, but I did that ^20:52
thiago my registrar reminded me every day for the last 7 days before a domain expired20:52
90 days, 60 days, 30, 15, 7, 6, 5, ...20:52
jast yeah, I got a boatload of reminders, too20:52
→ Otkd joined20:52
Eugene All the emails in the world don't matter if google thinks its spam20:52
jast on the up side, I found another registrar that does automatic renewals using direct debit20:53
plus the domain is cheaper there20:53
Eugene My last "trouble" with registrars was one not existing anymore 10 years later when i went back to renew20:53
jast that's one nice thing about .de domains, there's a system in place for that kind of scenario20:54
→ manuelschneid3r joined20:54
Eugene Since then I renew everything yearly20:54
There is for .org too, just a PITA20:54
→ jaziz joined20:54
jast basically you pay any registrar a fee and then the admin-c gets a special auth code via snail mail20:54
Eugene I had to find a FedEx store to send a fax20:55
→ cagomez joined20:55
jast urg20:55
anyway, problem solved, reminder for domain transfer set up for next year20:55
Eugene I like the new bot domain anyway. Nicer separation20:56
jast yeah, I thought this was a good opportunity to clean up a little20:56
→ rkazak joined20:57
jast and .eu is a nice compromise between not too country-specific and affordable :)20:57
→ tnecniv joined20:57
← tnecniv left20:57
→ ok91 joined20:57
← fatalhalt left20:58
← dreiss left20:58
← SteffanW left20:59
→ ertesx joined20:59
→ ftzdomino joined20:59
→ durham_ joined21:00
→ BSaboia joined21:01
ftzdomino i checked out a repo with git svn and it failed a bunch of times for various reasons. I've now got a ton of files in the .git dir prefixed with Git_svn_delta, Git_svn_hash, and Git_git_blob. it looks like these were all created repository->temp_acquire(). can i safely delete them?21:01
← LionsMane left21:02
← ertes left21:03
ertesx → ertes21:03
← di0_ left21:03
← madewokherd left21:03
← durham left21:03
→ gablerou_ joined21:04
← Es0teric_ left21:04
→ fatalhalt joined21:04
← durham_ left21:04
→ rmesta joined21:04
← kjsaihs left21:05
→ brent__ joined21:06
← thiago left21:06
→ Vasya666 joined21:07
← hacman left21:07
← Discovery left21:07
← gableroux left21:07
← gablerou_ left21:08
→ misosoup joined21:09
→ MattMaker joined21:09
← User458764 left21:10
← pandeiro left21:10
→ durham joined21:10
→ Ryanar joined21:10
← ChiLL_SurF left21:12
← romank left21:12
← King_Hual left21:14
← tymczenko left21:14
→ Sadeukko joined21:14
← Otkd left21:15
→ Maxels joined21:15
← MattMaker left21:16
→ romank joined21:16
→ sentriz joined21:17
→ gableroux joined21:17
← Guest55823 left21:18
→ sea-gull joined21:18
← Maxel_ left21:19
← mattcen left21:19
→ nicolai86 joined21:20
→ jccn joined21:20
← gableroux left21:22
← durham left21:22
→ rwb joined21:23
← awc737 left21:23
← Vasya666 left21:23
← nicolai86 left21:24
← Cabanossi left21:24
← lewix left21:25
→ Cabanossi joined21:26
→ mattcen joined21:27
→ askb joined21:27
→ nicolai86 joined21:29
→ LionsMane joined21:30
← fatalhalt left21:30
← Sadeukko left21:31
→ tnecniv joined21:32
← gnixev left21:33
→ fatalhalt joined21:33
→ gnixev joined21:35
→ Achylles joined21:35
← raijin left21:36
→ Maxel_ joined21:41
→ durham joined21:41
→ TheSimonator joined21:43
← sea-gull left21:43
← [cust] left21:44
→ mjuszczak joined21:44
← Maxels left21:45
← Maxel_ left21:46
→ Stumbler joined21:47
→ al-damiri joined21:47
← gaucheph left21:48
← rkazak left21:50
← LionsMane left21:50
← finalbeta left21:51
← Hunter1 left21:51
← romank left21:51
→ rkazak joined21:51
→ Hunter1 joined21:51
← Es0teric left21:52
→ cust joined21:54
← mjuszczak left21:56
← ResidentBiscuit left21:56
← jnewt left21:57
→ caper joined21:58
← jtoy left21:58
→ ResidentBiscuit joined21:59
→ jtoy joined22:00
→ bilal joined22:00
← blackwind_123 left22:03
→ MattMaker joined22:04
→ blackwind_123 joined22:05
← ok91 left22:05
← jtoy left22:05
← Dougie1871 left22:05
← KP580BM1 left22:06
← aard left22:07
→ DomeMasterYolo17 joined22:07
← hust921 left22:07
← DomeMasterYolo16 left22:07
← bilal left22:09
← manuelschneid3r left22:09
→ _builtin joined22:09
← ResidentBiscuit left22:09
← TheSimonator left22:09
→ dreiss joined22:10
→ bilal joined22:10
→ TheSimonator joined22:10
← __builtin left22:12
← bilal left22:14
→ bilal joined22:15
← misosoup left22:16
← miczac left22:17
← fahadash left22:17
← satifant left22:18
← dreiss left22:20
← xaa left22:20
→ shgysk8zer0_ joined22:21
← cagomez left22:21
← mattcen left22:21
→ cagomez joined22:22
← kent\n left22:22
→ jakesyl_mobile joined22:22
→ lowercaseman joined22:22
← Cabanossi left22:23
→ mel00010 joined22:23
← lyxus left22:23
← cagomez left22:23
→ kent\n joined22:24
→ mattcen joined22:24
→ cagomez joined22:24
← livingstn left22:24
← hobodave left22:25
← cust left22:26
→ madewokherd joined22:26
→ Cabanossi joined22:26
→ lyxus joined22:27
← nixjdm left22:28
← cagomez left22:29
← felixsanz_ left22:29
→ felixsanz joined22:30
felixsanz → Guest7262022:30
← yqt left22:30
→ Celeron_ joined22:31
← jagob left22:31
→ robattila256 joined22:32
← Muzer left22:32
← Vinnie_win_t left22:32
← Stumbler left22:33
→ Stumbler joined22:34
→ bannakaffalatta joined22:34
← Guest72620 left22:35
→ mellernoia joined22:35
→ dreiss joined22:35
→ venmx joined22:35
→ felixsanz_ joined22:36
→ ISmithers joined22:38
← jstein left22:39
← gugah left22:39
← TheSimonator left22:39
← Stumbler left22:41
→ tocky joined22:42
← caper left22:43
← Celeron_ left22:45
→ Vitriox joined22:45
← masuberu left22:48
→ sz0 joined22:48
→ masuberu joined22:49
← Vitriox left22:49
→ Arquino joined22:49
← Joel left22:49
→ LBV_User joined22:49
← oleo__ left22:50
→ Muzer joined22:50
← Arquino left22:52
→ Arquino joined22:52
← cdown left22:52
→ raijin joined22:52
← Sasazuka left22:53
← Arquino left22:54
→ Sasazuka joined22:54
→ nd_ joined22:54
→ Stumbler joined22:54
→ Arquino joined22:55
← Cabanossi left22:55
← lyxus left22:56
→ Cabanossi joined22:56
Arquino → Manolon22:56
Manolon → Altiare22:57
← Altiare left22:57
← borkr left22:57
← venmx left22:57
→ dirtyroshi joined22:57
← nd left22:58
← Stumbler left22:59
← raijin left22:59
→ Altiare joined22:59
← rmesta left23:00
← Octalot left23:01
← Altiare left23:01
→ Altiare joined23:01
→ jtoy joined23:01
→ gableroux joined23:02
← nitric left23:03
→ oleo_ joined23:03
← gableroux left23:04
→ gableroux joined23:05
→ jstein_ joined23:06
← jtoy left23:07
→ salamanderrake joined23:07
← jstein_ left23:08
← Altiare left23:08
← masuberu left23:09
→ Altiare joined23:09
← mikecmpbll left23:09
→ safe joined23:11
← LeBlaaanc left23:11
← gopar left23:12
← ISmithers left23:12
← mel00010 left23:12
→ gopar joined23:12
→ livingstn joined23:13
→ masuberu joined23:13
← bannakaffalatta left23:14
← cdg left23:14
← gopar left23:16
→ gopar joined23:16
→ ISmithers joined23:17
← livingstn left23:18
← akkad_ left23:20
← shgysk8zer0 left23:20
← shgysk8zer0_ left23:21
← Hunter1 left23:21
→ Hunter1 joined23:22
← tocky left23:23
← prg3 left23:25
← masuberu left23:26
→ prg3 joined23:26
← paws_ left23:27
← Altiare left23:28
→ dilijev joined23:29
→ tocky joined23:32
← firef1y left23:32
→ dsdeiz joined23:32
← dsdeiz left23:32
→ dsdeiz joined23:32
→ firef1y joined23:33
← jaziz left23:33
→ eb0t joined23:34
← firef1y left23:36
← Tobbi left23:36
← marianina8 left23:37
→ firef1y joined23:38
→ marianina8 joined23:39
→ raijin joined23:41
← tocky left23:41
→ Noodlewitt joined23:43
← oleo_ left23:43
_builtin → __builtin23:45
→ oleo joined23:48
← tubal left23:49
→ johnflux_ joined23:50
→ mel00010 joined23:51
← raijin left23:51
→ tubal joined23:51
← darkfrog left23:54
← Cabanossi left23:54
→ Cabanossi joined23:56
← Acerific left23:56
← firef1y left23:56
→ firef1y joined23:57
kutenai I have a diff tool that will give me a nice comparison of two folders, allowing me to drill down to any of the changed files.23:58
How can I "checkout" all files from HEAD into a reference directory that I can compare against my current working files?23:59
→ raijin joined23:59
kutenai I don't need a bare repo or anything, just a 'snapshot' of HEAD to a different dir, or a local ignored directory.23:59
I hope that is clear23:59
Vampire0 kutenai, you could e. g. use man git worktree23:59
gitinfo kutenai: the git-worktree manpage is available at https://gitirc.eu/git-worktree.html23:59

Logs Search ←Prev date Next date→ Channels Documentation