Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-05-11

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:00 lagothri1 joined #git
00:04 lagothrix joined #git
00:05 livingstn joined #git
00:06 NeXTSUN joined #git
00:08 joshszep joined #git
00:14 fstd_ joined #git
00:14 justanotheruser joined #git
00:15 madewokherd joined #git
00:21 jim ok... how can I get you either a svg file I did in inkscape or a png?
00:22 mlindner joined #git
00:22 mlindner How do I upgrade a source-installed version of git?
00:22 thiago joined #git
00:22 HoloIRCUser1 joined #git
00:23 jim the source should be under git...
00:23 mlindner git seems to have no uninstall in the makefile
00:23 romank joined #git
00:23 jim ]is there a specific reason you want to upgrade?
00:23 mlindner jim: you're not understanding
00:23 mlindner yes, i want the new features in 2.13
00:23 mlindner i'm on 2.11
00:24 Cabanossi joined #git
00:24 jim you built git from source, then you did make install
00:24 jim ok
00:24 mlindner i installed 2.11 from source previously
00:24 jim "I want X" is just as good a reason as another
00:24 mlindner so how do I uninstall the previous version?
00:25 mlindner i think installing on top of the previous version may have issues
00:25 jim what I usually do, is I will compile whatever (sometimes git) to install into a place like /usr/local/git-inst/ which makes unstalling it as easy as rm -rf thatdir
00:26 jim (and yes, I did have to uninstall that way before)
00:26 mlindner yeah but I'm already stuck
00:27 mlindner also I'm installing to ~/.local/
00:27 mlindner as I don't own the system
00:27 jim the question you ask is "does the makefile provide an uninstall target" and I don't know the answer to that... I do have a suggestion tho
00:27 mlindner and the system git is 1.7.1
00:27 mlindner so its rather ancient
00:28 mlindner jim: it doesn't as far as I can tell
00:28 HoloIRCUser1 left #git
00:28 jim what if you do the make install that you thought might have created issues, and save the output from make, then you can look thru it and uninstall everything by hand
00:28 Harl3k1ng joined #git
00:28 mlindner yuck
00:28 HoloIRCUser1 joined #git
00:28 jim well...
00:29 jim I didn't say it would be an easy suggestion :)
00:29 mlindner anything other than that idea?
00:29 Harl3k1ng Hello guys, I have setup a private git server, however even though my public key is in authorized_keys (and I can ssh to it without typing my password) it still asks me for my password when pushing to it, it asks me for the password of user 'git' which is where the repo is, any help?
00:30 cqi joined #git
00:30 jim thy the make install and test the install, that's one suggestion... another is install into a dir like /usr/local/git-inst, which is presently non existant, so there won't be issues
00:32 jim you're going to have to put /usr/local/git-inst/bin in PATH before the path that leads to the old git, and /usr/local/git-inst/lib in LD_LIBRARY_PATH
00:33 jim here, I'll give you some shell functs that will help (add to these PATHs correctly)
00:34 jstimm joined #git
00:35 jim the bash funcs are here: http://termbin.com/aaf7
00:37 Gsham joined #git
00:39 lvb_ joined #git
00:41 brent__ joined #git
00:42 mlindner hmm
00:42 mlindner what's this when installing
00:42 mlindner I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"
00:42 livingstn joined #git
00:42 mlindner line break at "warning:"
00:46 apax joined #git
00:46 mizu_no_oto joined #git
00:49 ZyX-I joined #git
00:52 TheSimonator joined #git
00:52 safe joined #git
00:54 TikityTik joined #git
00:59 ZexaronS joined #git
01:06 osk joined #git
01:07 salamanderrake joined #git
01:08 finalbeta joined #git
01:08 rominronin joined #git
01:08 movesi joined #git
01:14 jim hi... I'm looking into using filter-branch to do this: http://jam.sessionsnet.org:8000/files/view/pastes/chord-dr-git.png
01:15 jim sec, dunno if you have perm to see it
01:15 jim you should be able to see it
01:16 Wulf4 joined #git
01:17 jwmann joined #git
01:17 roelmonnens joined #git
01:23 stana joined #git
01:26 nevodka joined #git
01:26 apax joined #git
01:26 stana joined #git
01:27 _rht joined #git
01:27 thebope joined #git
01:27 finalbeta joined #git
01:27 macrover joined #git
01:27 miha_S7_ joined #git
01:27 alexandre9099_ joined #git
01:28 stana joined #git
01:28 b0nn so, I have three branches, all forking from the same commit
01:28 b0nn but I don't know what that commit is, and I want to create another branch
01:28 b0nn In order to find the common parent I've gone with: git merge-base 713a10d6633da0741b69a2fb002b373af3199df7 27f7766430f4f597a2a796592dc66468170d911c 2c9412a59379a2296fbff073fa66e7f328b79d17
01:29 b0nn or something to that effect
01:29 stana joined #git
01:29 watabou joined #git
01:29 b0nn I'm really wanting some validation , is someone able to say that the output of that command (a commit hash) is the correct commit to checkout i order to create the new branch?
01:29 SamWhited joined #git
01:30 stana joined #git
01:32 SamWhited Hi all, I need to rebase a branch that diverges from master by a single commit; I want to rebase the branch on master, but I want to keep the working directory identical. Not just in the case of conflicts like -Xtheirs or -Xours would do, but all files even if they can be merged should be what is currently in my working directory. Is there an easy way to force that?
01:34 sunri5e joined #git
01:36 SamWhited I suppose i could literally manually copy/paste, as someone just pointed out OOB, since I'd be rewriting history anyways, but I'm suprised I don't know how to do this off the top of my head so I'd still be curious :)
01:37 thiago joined #git
01:37 Cabanossi joined #git
01:41 mozzarella joined #git
01:48 Goplat joined #git
01:48 maestrojed left #git
01:51 ilbot3 joined #git
01:51 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.13.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:51 bronson joined #git
01:51 cahoots hi, i see that there was a file that got moved to a new dir a while back, but when i do `git log <old path>` i just see the commit where it got moved. any ideas how i can see the older stuff?
01:51 cahoots older changes to the file
01:51 caper joined #git
01:53 kadoban cahoots: --follow
01:53 kadoban Er wait, you're specifying the oldpath? That should show you anyway
01:53 bpna joined #git
01:54 apax joined #git
01:54 cahoots kadoban, yeah i messed up, but good to know that tip :P
01:55 fahadash joined #git
01:57 thebope joined #git
02:01 d^sh joined #git
02:03 justanotheruser joined #git
02:04 TheSimonator joined #git
02:04 pks joined #git
02:10 Nilesh____ joined #git
02:12 lagothrix joined #git
02:17 tanuki joined #git
02:19 om_henners joined #git
02:19 diogenese joined #git
02:22 brent__ joined #git
02:22 SamWhited joined #git
02:24 duderonomy joined #git
02:26 ozcanesen joined #git
02:27 jameser joined #git
02:29 hanneso joined #git
02:30 Hunter1_ joined #git
02:36 hexagoxel joined #git
02:36 lvb_ joined #git
02:37 Vortex35 joined #git
02:39 Gsham joined #git
02:40 rominronin joined #git
02:43 Lyqyd joined #git
02:48 cqi joined #git
02:50 aavrug joined #git
02:50 menip joined #git
02:51 thebope joined #git
02:51 xall_ joined #git
02:53 Cabanossi joined #git
02:54 robattila256 joined #git
02:55 svm_invictvs joined #git
02:57 miha_S7_ joined #git
02:58 pijiu joined #git
02:59 kfoonamalik joined #git
02:59 chachasmooth joined #git
03:01 digidog_ joined #git
03:04 fletom joined #git
03:04 a_thakur joined #git
03:06 tmg joined #git
03:07 red82 joined #git
03:11 dsdeiz joined #git
03:13 red82 so now I have to have a atlassian account to use sourcetree
03:13 red82 thats kind of annoying
03:16 TbobbyZ joined #git
03:17 kfoonamalik joined #git
03:18 stlis joined #git
03:20 Andrew_K joined #git
03:23 Anja_ joined #git
03:27 zachary12 joined #git
03:31 zachary12 joined #git
03:32 zachary12 joined #git
03:37 Cabanossi joined #git
03:38 zachary12 joined #git
03:42 a_thakur joined #git
03:43 madewokherd` joined #git
03:45 thebope joined #git
03:46 stana joined #git
03:47 ozcanesen joined #git
03:50 PtxDK_ joined #git
03:52 om_henners joined #git
03:53 watabou joined #git
03:54 mel00010 joined #git
03:54 dermoth joined #git
04:00 robotroll joined #git
04:01 jarard01 joined #git
04:04 beaky joined #git
04:05 ij joined #git
04:06 alpha_ joined #git
04:06 Neico joined #git
04:06 alpha_ Hello, how to get blob sha in gitlab?
04:07 njbair joined #git
04:07 nd_ joined #git
04:11 rominronin joined #git
04:19 njbair joined #git
04:27 miha_S7_ joined #git
04:31 ayogi joined #git
04:33 canton7 joined #git
04:34 Kulrak joined #git
04:34 Kulrak joined #git
04:35 cschneid joined #git
04:36 BlessJah joined #git
04:37 Cabanossi joined #git
04:38 jnewt_ joined #git
04:38 watabou joined #git
04:38 bilal joined #git
04:39 martinklepsch joined #git
04:39 thebope joined #git
04:41 fluffystub joined #git
04:46 niax joined #git
04:47 a_thakur_ joined #git
04:49 svm_invictvs joined #git
04:49 holodoc joined #git
04:54 fatalhalt joined #git
05:00 j416 alpha_: No idea. In plain git, man git-ls-tree can help.
05:00 gitinfo alpha_: the git-ls-tree manpage is available at https://gitirc.eu/git-ls-tree.html
05:01 imack joined #git
05:02 alpha_ j416: gitinfo figured out way to get it from api:/api/v4/projects/:id/repository/tree but couldn't get it from gitlab page..
05:03 MatthewAllan93 joined #git
05:04 dec0n joined #git
05:05 alexandre9099 joined #git
05:06 _ikke_ !bot
05:06 gitinfo [!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans. Please see https://gitirc.eu/bot for more information about how to (ab)use me.
05:07 maarhart joined #git
05:09 alpha_ _ikke_: :D
05:11 thebird joined #git
05:11 svm_invictvs joined #git
05:11 a_thakur joined #git
05:13 a_thakur_ joined #git
05:15 rscata joined #git
05:18 hashtagstrashtag joined #git
05:20 freimatz joined #git
05:20 TbobbyZ joined #git
05:22 maarhart joined #git
05:22 Bock joined #git
05:23 karols146 joined #git
05:29 dilijev joined #git
05:32 qt-x joined #git
05:33 thebope joined #git
05:35 overlord_tm joined #git
05:36 Anja__ joined #git
05:37 davidomanfredo joined #git
05:42 brent__ joined #git
05:43 QwertyDragon joined #git
05:44 rominronin joined #git
05:44 Pseudocrat joined #git
05:45 bernd9000 joined #git
05:46 jameser joined #git
05:46 User458764 joined #git
05:46 ThomasLocke joined #git
05:46 ThomasLocke joined #git
05:47 King_Hual joined #git
05:48 Raging_Hog joined #git
05:49 Hunter1_ joined #git
05:49 xiengu joined #git
05:50 telephone joined #git
05:50 telephone joined #git
05:52 Hunter1_ joined #git
05:53 bronson joined #git
05:56 lindenle joined #git
05:56 miha_S7_ joined #git
05:57 acetakwas joined #git
06:01 Raging_Hog joined #git
06:01 Raging_Hog joined #git
06:03 Silmarilion joined #git
06:07 dreiss joined #git
06:09 ogny joined #git
06:09 johnny56 joined #git
06:11 JeroenT joined #git
06:14 jfr joined #git
06:14 rchavik joined #git
06:16 bgamari joined #git
06:19 cam27 joined #git
06:19 moei joined #git
06:21 b0nn left #git
06:21 aavrug joined #git
06:22 thebird joined #git
06:22 visual >tfw
06:22 visual >git
06:23 chele joined #git
06:24 roelmonnens joined #git
06:27 thebope joined #git
06:27 JeroenT joined #git
06:30 ertes-w joined #git
06:32 zeroed joined #git
06:32 zeroed joined #git
06:32 rominronin joined #git
06:33 freimatz joined #git
06:34 JeroenT joined #git
06:35 patarr joined #git
06:37 gkatsev_ joined #git
06:40 jameser joined #git
06:46 aw1 joined #git
06:47 dersand joined #git
06:49 ppang joined #git
06:52 Cabanossi joined #git
06:56 flaviodesousa joined #git
06:56 Silenced joined #git
06:58 nomad101 joined #git
06:58 navidr joined #git
06:58 TomyWork joined #git
07:00 j08nY joined #git
07:03 chele joined #git
07:05 roelmonn_ joined #git
07:05 a_thakur joined #git
07:07 Tobbi joined #git
07:11 zeroed joined #git
07:11 thebird joined #git
07:12 Lunatrius` joined #git
07:14 telephone joined #git
07:14 telephone joined #git
07:17 _ikke_ !botsnack
07:17 gitinfo Om nom nom
07:18 a_thakur_ joined #git
07:21 thebope joined #git
07:22 Cabanossi joined #git
07:22 sbulage joined #git
07:24 rivarun joined #git
07:24 zeroed joined #git
07:27 overlord_tm joined #git
07:27 miha_S7_ joined #git
07:28 bfig_ joined #git
07:30 Levex joined #git
07:30 schleppel joined #git
07:34 Introoter joined #git
07:35 zefferno joined #git
07:35 aw1 joined #git
07:39 slidercrank joined #git
07:40 Macaveli joined #git
07:41 elect joined #git
07:41 raynold joined #git
07:42 Tobbi joined #git
07:43 brent__ joined #git
07:44 Levex joined #git
07:44 a_thakur joined #git
07:48 manuelschneid3r joined #git
07:49 tmg joined #git
07:49 rts-sander joined #git
07:52 Ram-Z joined #git
07:54 bronson joined #git
07:58 User458764 joined #git
07:58 JeroenT joined #git
07:58 mikecmpbll joined #git
07:59 AgentCarmichael joined #git
07:59 AgentCarmichael Hello.
07:59 gitinfo AgentCarmichael: 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.
08:00 AgentCarmichael I've just logged into my bitbucket and all my branches are gone for some reason. Why are there commits of some random guy named Daniel Stevens on my bitbucket repo?
08:00 chrisM_1 joined #git
08:01 _ikke_ AgentCarmichael: You'd have to ask atlassian (the company behind bitbucket)
08:01 rts-sander what are the best git aliases
08:02 _ikke_ alias gst='git status -sb'
08:02 AgentCarmichael Ok.
08:02 AgentCarmichael left #git
08:03 rts-sander I like the plain git status better
08:03 rts-sander sometimes I have to type: git commit --amend --no-edit
08:03 rts-sander but git commit --amend then in vim :q is less keystrokes
08:07 davidomanfredo joined #git
08:07 Gurkenglas joined #git
08:07 cristreet joined #git
08:08 marcogmonteiro joined #git
08:08 cristreet left #git
08:11 Doginal joined #git
08:12 j08nY joined #git
08:13 MuffinMedic joined #git
08:15 thebope joined #git
08:16 GT4066 joined #git
08:19 kurkale6ka joined #git
08:19 Raging_Hog joined #git
08:20 clmsy joined #git
08:20 theoceaniscool joined #git
08:20 JeroenT joined #git
08:20 kai1223132123 joined #git
08:22 pbandark joined #git
08:22 YuGiOhJCJ joined #git
08:23 kelvah joined #git
08:24 Levex joined #git
08:27 JeroenT joined #git
08:28 cdown_ joined #git
08:29 cads joined #git
08:30 a_thakur_ joined #git
08:32 zeroed joined #git
08:33 JeroenT joined #git
08:34 sea-gull joined #git
08:36 patarr joined #git
08:36 BorkStick joined #git
08:36 gnixev joined #git
08:37 Cabanossi joined #git
08:38 maxmuster joined #git
08:38 kurkale6ka joined #git
08:40 ayogi joined #git
08:40 roelmonnens joined #git
08:41 chll_ joined #git
08:42 maxmuster is there a way (even if its terrible uncomfortable) to do 'git tag -s' manually, meaning by not using the 'git' cmdline? i have the feeling that git is in this case a wrapper for gpg which signs the tag, but sadly i cant see how gpg is used. when i do 'git tag -s <version>' gpg is run like 'gpg -bsau' but that fails because of the '-u' switch (gpg tells that it does not find the secret key even if its there), just running 'gpg -bsa' asks for m
08:42 maxmuster y passphrase and then does something (i dont know what cause there is no output).
08:42 tarkus joined #git
08:44 P4nther joined #git
08:50 JeroenT_ joined #git
08:51 ZyX-I joined #git
08:51 marcogmonteiro joined #git
08:53 manuelschneid3r joined #git
08:55 cstratak joined #git
08:56 seni joined #git
08:56 ti2 maxmuster: you can create an annotated tag and manually create a detached signature for it (git tag -am 'spam' mytag && git cat-file tag mytag | tee data | gpg --armour --detach-sign >> data) && git update-ref refs/tags/mytag.signed $(git hash-object -w -t tag data)
08:57 miha_S7_ joined #git
08:58 netroxen joined #git
08:58 aielima joined #git
08:58 sshine joined #git
08:59 sbrandner_wyton joined #git
08:59 Silox| joined #git
08:59 sbrandner_wyton joined #git
09:00 sshine heh, the moment you realize that the commit message format "#2: blah" will cause problems when amending. :)
09:02 maxmuster ti2: will git tag -v mytag show that the tag is signed after that?
09:02 ti2 yes
09:03 maxmuster okay i'll try that, thanks
09:04 Raging_Hog joined #git
09:06 JanC_ joined #git
09:07 kai1223132123 left #git
09:07 borkr joined #git
09:09 achadwick joined #git
09:09 maxmuster ti2: i did that, now i have a tag.signed in ./.git/refs/tags/ but git tag -v tag still tells me that 'error: no signature found \n error: could not verify tag'
09:09 thebope joined #git
09:10 markus-k_ left #git
09:11 markus-k joined #git
09:11 maxmuster because it tries to verify the tag file and not the tag.signed file, should i just replace them?
09:11 ti2 maxmuster: well, if you really want to replace your original tag object, then you have to remove the '.signed' suffix from the git-update-ref command
09:11 ti2 or do git tag -v mytag.signed
09:12 maxmuster well i just need that tag signed to proceed here
09:12 maxmuster ah okay
09:12 thebird joined #git
09:12 maxmuster thanks alot
09:12 kaixin joined #git
09:13 MDA2 joined #git
09:13 overlord_tm joined #git
09:15 mda1 joined #git
09:17 maxmuster left #git
09:18 PHPanos joined #git
09:19 zefferno joined #git
09:19 finalbeta joined #git
09:22 Cabanossi joined #git
09:24 xall_ joined #git
09:27 kurkale6ka joined #git
09:30 kurkale6ka joined #git
09:30 MineCoins joined #git
09:32 Ice_Strike joined #git
09:35 kurkale6ka joined #git
09:36 astrofog joined #git
09:39 tarkus joined #git
09:40 JeroenT joined #git
09:40 pijiu joined #git
09:42 Altiare joined #git
09:43 patarr joined #git
09:44 earnestly joined #git
09:45 sotoz joined #git
09:46 davidomanfredo joined #git
09:47 kelvah joined #git
09:47 JeroenT joined #git
09:48 bitmod joined #git
09:49 JeroenT joined #git
09:51 Jitta joined #git
09:52 Snugglebash joined #git
09:56 bronson joined #git
09:59 Tobbi joined #git
10:00 MatthewAllan93 joined #git
10:01 sbasso joined #git
10:02 freimatz joined #git
10:02 cstratak joined #git
10:02 mindfart joined #git
10:02 IRQ` joined #git
10:03 thebope joined #git
10:04 j08nY joined #git
10:05 Renku joined #git
10:05 Renku hi :)
10:05 dostoyevsky joined #git
10:06 overlord_tm joined #git
10:06 dostoyevsky I did "git checkout <commit id>" and now git log doesn't show me the newer commit ids anmoyre...
10:07 tobiasvl dostoyevsky: git log will only show you the commits reachable by HEAD, and your HEAD is now <commit id>
10:07 tobiasvl dostoyevsky: which is a !detached HEAD btw
10:07 gitinfo dostoyevsky: A detached HEAD (aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
10:07 Renku I ran into a strange issue and I was wondering if you had a clue: I made a patch using the command git format-patch, the goal is to apply it on multiple linux servers. In this commit, a file was renamed. When I apply the patch (not using git), the file is not renamed...
10:07 qt-x joined #git
10:07 Renku Do you know if there is an option I forget? I do patch -p2 -d target_dir < 0001_xxx.patch
10:11 AndrewAlexMac joined #git
10:11 pijiu2 joined #git
10:12 leeN joined #git
10:12 pijiu2 joined #git
10:14 bomb-on joined #git
10:16 DuncanT joined #git
10:17 ferr joined #git
10:21 CussBot joined #git
10:22 telephone joined #git
10:22 telephone joined #git
10:24 thebird joined #git
10:25 kurkale6ka joined #git
10:26 ZexaronS joined #git
10:27 TbobbyZ joined #git
10:27 WhereIsMySpoon joined #git
10:27 miha_S7_ joined #git
10:27 kurkale6ka joined #git
10:27 tvw joined #git
10:27 kireevco joined #git
10:28 WhereIsMySpoon Hey, im trying to rebase a dev branch ontop of master, but im getting rejected on push as “tip of current branch is behind remote counterpart” even though I literally just pushed my dev branch and my local and remote of the dev branch are on the same level
10:28 User458764 joined #git
10:28 WhereIsMySpoon Can someone help me to figure out whats going wrong please?
10:29 WhereIsMySpoon Ive pulled master too so thats up to date
10:29 cdown joined #git
10:29 Masber_080 joined #git
10:30 WhereIsMySpoon after running the git rebase master and running git status, it says my branch and origin/my_dev_branch have diverged and that i should use git pull too, which isnt making much sense to me
10:33 romank joined #git
10:34 finalbeta joined #git
10:35 WhereIsMySpoon do i just need to force push?
10:35 WhereIsMySpoon im the only one working on this dev branch, im just making sure its up to date wrt master
10:35 zeroed joined #git
10:37 CussBot joined #git
10:37 JeroenT joined #git
10:37 Tobbi joined #git
10:37 cqi joined #git
10:38 JeroenT joined #git
10:38 Renku WhereIsMySpoon: you shouldn't use rebase on a pushed branch: it rewrite history
10:38 zeroed joined #git
10:38 WhereIsMySpoon Renku: I’m the only one working on this branch
10:38 Renku so you now have two different history : one on your distant repo and one in your local, the two are not compatible
10:38 WhereIsMySpoon then it gets pushed and merged into master later
10:39 WhereIsMySpoon i wanted to rebase it so that there arent issues when merging into master
10:39 Renku you can force push
10:39 Renku but be careful to not use rebase on your shared distant branch =)
10:40 CheckDavid joined #git
10:40 WhereIsMySpoon ofc
10:41 yaiyan joined #git
10:42 zeroed joined #git
10:42 tarkus joined #git
10:45 sbrandner_wyton left #git
10:45 DARSCODE joined #git
10:45 thinkpad joined #git
10:46 basiclaser joined #git
10:47 njbair joined #git
10:47 darkbit joined #git
10:48 darkbit joined #git
10:50 gunnaro joined #git
10:51 PHPanos joined #git
10:51 murii_ joined #git
10:52 kurkale6ka joined #git
10:53 seni1 joined #git
10:56 dsdeiz joined #git
10:56 dsdeiz joined #git
10:56 seni13 joined #git
10:58 kurkale6ka joined #git
11:01 kurkale6ka joined #git
11:02 kurkale6ka joined #git
11:02 rnsanchez joined #git
11:03 finalbeta joined #git
11:04 jleclanche joined #git
11:06 sarri joined #git
11:06 sarri joined #git
11:07 phinxy joined #git
11:07 mkalfon_ joined #git
11:09 pheurton joined #git
11:09 Tobbi joined #git
11:09 pheurton Hi, I'm getting a fatal: index-pack failed
11:09 pheurton when trying to clone a remote repo
11:10 pheurton it happens after the resolving deltas step
11:10 thebope joined #git
11:12 Klumben joined #git
11:12 frew joined #git
11:12 pheurton all I have in my global config is my name, email, and an http.postbuffer
11:13 canton7 pheurton, does the line start with "remote:" ?
11:14 telephone joined #git
11:14 telephone joined #git
11:15 Levex joined #git
11:17 tymczenko joined #git
11:18 kurkale6ka joined #git
11:19 Tobbi joined #git
11:20 QwertyDragon joined #git
11:21 dendazen joined #git
11:26 Darcidride joined #git
11:32 thinkpad joined #git
11:33 sbasso joined #git
11:34 HoierM joined #git
11:34 pheurton canton7: no, just fatal:
11:37 Cabanossi joined #git
11:37 dmj` joined #git
11:37 thebird joined #git
11:37 tmg joined #git
11:38 Cavallari joined #git
11:38 kelvah joined #git
11:39 scottjl_ joined #git
11:39 rchavik joined #git
11:39 User458764 joined #git
11:41 chardan left #git
11:41 swords joined #git
11:42 Furai joined #git
11:42 scottjl joined #git
11:43 roelmonn_ joined #git
11:44 caper joined #git
11:47 sbasso joined #git
11:48 kutenai joined #git
11:49 pheurton I just restarted my machine and it works
11:49 aw1 joined #git
11:49 kurkale61 joined #git
11:52 cbreak pheurton: maybe OOM.
11:52 cbreak git requires a bit of RAM
11:52 cbreak especially if you bloated up your repo by foolishly committing big binary files :D
11:56 pheurton well the repo is ~560mb
11:56 WhereIsMySpoon o.O
11:56 bronson joined #git
11:57 kelvah joined #git
11:57 miha_S7_ joined #git
11:58 Introoter joined #git
12:00 Tobbi joined #git
12:01 simon left #git
12:03 synthroid joined #git
12:03 EugenA joined #git
12:04 EugenA the remote origin of my project has been changed, I need to change it locally and push again. How do I do it?
12:04 TheCycoONE joined #git
12:04 EugenA the new remote origin is empty at the moment
12:04 grawity git remote set-url
12:06 cstratak_ joined #git
12:07 elect joined #git
12:09 PHPanos joined #git
12:10 TheSimonator joined #git
12:12 WhereIsMySpoon left #git
12:20 rokups joined #git
12:20 cam27 joined #git
12:20 kurkale61 joined #git
12:21 bilal joined #git
12:22 Cabanossi joined #git
12:22 iderik joined #git
12:22 thebope joined #git
12:23 kyan joined #git
12:23 EugenA how to set  new remote to default remote?
12:24 h12o joined #git
12:24 slidercrank joined #git
12:24 _dirt joined #git
12:25 Furai joined #git
12:25 iderik joined #git
12:25 plos joined #git
12:26 cbreak EugenA: man git-push, look for -u
12:26 gitinfo EugenA: the git-push manpage is available at https://gitirc.eu/git-push.html
12:26 cbreak EugenA: also look at man git-branch's set-upstream-to
12:26 gitinfo EugenA: the git-branch manpage is available at https://gitirc.eu/git-branch.html
12:29 Oatmeal joined #git
12:30 thebird joined #git
12:30 bilal joined #git
12:31 absence joined #git
12:33 absence when doing reset -p, deleted files are just skipped. how can i make it ask about them as well as hunks?
12:34 finalbeta joined #git
12:34 roelmonnens joined #git
12:35 gugah joined #git
12:36 jeffreylevesque joined #git
12:38 ojdo joined #git
12:38 nicolai86 joined #git
12:39 wrouesnel joined #git
12:39 kiltzman joined #git
12:40 sbasso joined #git
12:41 dsdeiz joined #git
12:41 dsdeiz joined #git
12:41 kurkale6ka joined #git
12:43 seni13 joined #git
12:43 lafleurdubien joined #git
12:43 re1 joined #git
12:45 kurkale61 joined #git
12:47 Stumbler joined #git
12:48 livingstn joined #git
12:48 nicolai86 joined #git
12:48 TheCycoONE joined #git
12:49 dsdeiz joined #git
12:50 HardlySeen joined #git
12:51 tymczenko joined #git
12:53 boxrick1 joined #git
12:53 fission6 joined #git
12:56 a_thakur joined #git
12:56 PHPanos joined #git
12:57 yqt joined #git
12:59 TheCycoONE joined #git
13:00 stana joined #git
13:01 synthroi_ joined #git
13:01 altendky joined #git
13:02 valhala_22 joined #git
13:06 Vampire0 absence, is the deletion really in the index, or just the file deleted in the workspace. What Git version? For me it shows the whole file as hunk and asks to unstage or not
13:07 jameser joined #git
13:07 Vampire0 absence, of course it does not re-add the file to the worktree, because "reset -p" only removes hunks from the index, but does not touch the worktree
13:07 ExoUNX_ joined #git
13:08 Vampire0 absence, you need to checkout the file to get it back to the worktree
13:08 cttttt joined #git
13:08 AndreasLutro joined #git
13:08 qassim joined #git
13:08 a_thakur_ joined #git
13:09 BSaboia joined #git
13:09 worstadmin joined #git
13:10 weltall joined #git
13:10 justin2 joined #git
13:10 DistantStar joined #git
13:11 idr0p joined #git
13:12 fmcgeough joined #git
13:12 ski7777 joined #git
13:12 fission6 is there a way to configure a remote repo to only allow master to push to master to avoid people pushing local feature branches by mistake to master
13:13 valhala_22 joined #git
13:13 bilal joined #git
13:13 Takumo joined #git
13:13 Takumo joined #git
13:16 bronson joined #git
13:16 Vampire0 fission6, not that I know of. At the remote repository you only get the info push SHA-1 x to ref master. There is no way to know which local branch is pushed iirc. You could at most do it on the local repo side, but this cannot be enforced.
13:17 thebope joined #git
13:19 paskl joined #git
13:19 lvb_ joined #git
13:19 jameser joined #git
13:20 Tobbi joined #git
13:21 kexmex joined #git
13:21 paskl I accidentely copied a directory with a .git folder and commited something in a new branch of it, but then I learned I had copied an old version given project. How would I add my new branch (from the old projects version) to the newer one? I am unable to "git pull" as I dont have access.
13:22 JeroenT_ joined #git
13:23 ome joined #git
13:23 red82 joined #git
13:24 nowhereman joined #git
13:25 JeroenT_ joined #git
13:26 valhala_22 joined #git
13:27 miha_S7_ joined #git
13:29 telephone joined #git
13:29 telephone joined #git
13:30 apax joined #git
13:31 TbobbyZ joined #git
13:32 MacGyver joined #git
13:33 Altiare joined #git
13:33 freimatz joined #git
13:33 SporkWitch paskl: how did you copy it in the first place, then?
13:33 synthroid joined #git
13:35 mizu_no_oto joined #git
13:35 oskarkv joined #git
13:36 paskl I have ssh access to the server and copied the whole directory to work on my local machine
13:37 paskl but I was given the wrong server with an old dev version of the project
13:37 paskl I began developing and today I was told I had the wrong version
13:38 paskl my fixes are in a new branch tho, but I dont know how to merge this new branch onto the other master branch
13:39 ziongate hi, brief question: i would move a repo folder with a C module  in to another repo, preserving history. If you have a valid doc/link to learn a good way to do this, welcome.
13:40 bsanford joined #git
13:41 Tobbi joined #git
13:41 bilal joined #git
13:41 ziongate forgot to say the 2 repos are not similar :(
13:42 jameser joined #git
13:42 tarkus joined #git
13:43 paskl git submodule ziongate ?
13:43 bremner !subproject
13:43 gitinfo [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
13:45 ziongate bremner:, paskl, thanks, going to study that :)
13:45 bilal joined #git
13:46 ziongate gitinfo is a great bot :)
13:51 shinnya joined #git
13:51 ziongate mm those seems 4 ways to include a repo in another repo, but i just would move a folder of a repo with 4 files in another repo, preserving history
13:53 JimDungo joined #git
13:53 ziongate my idea is to move the files, (git erasing in one repo, so history is still preserved likely) and adding them as new in the other, is it acceptable ?
13:54 jason237 joined #git
13:55 jameser joined #git
13:55 flupke joined #git
13:55 User458764 joined #git
13:57 a_thakur joined #git
13:57 wenzowski joined #git
13:58 gugah_ joined #git
13:59 fission6 joined #git
13:59 valhala_22 joined #git
14:00 chrisM_1 joined #git
14:01 jameser joined #git
14:01 notebox joined #git
14:02 rishi joined #git
14:03 Es0teric joined #git
14:03 aw1 joined #git
14:04 caper joined #git
14:05 Tobbi joined #git
14:06 Kobaz joined #git
14:09 ResidentBiscuit joined #git
14:09 Es0teric joined #git
14:09 mohabaks joined #git
14:11 Rodya_ joined #git
14:11 thebope joined #git
14:11 fission6 joined #git
14:12 g1itch joined #git
14:13 g1itch What would be necessary to change an author in a repo's history? If I run the command locally and do a 'force push' up to the origin, would everyone have issues pulling after that? Or would they need to just re-clone the repo?
14:13 g1itch Or could I just have everyone run the same rewrite command locally and everything work fine?
14:13 a_thakur joined #git
14:14 dave0x6d joined #git
14:16 Es0teric joined #git
14:17 jameser joined #git
14:18 parliament joined #git
14:18 _ikke_ g1itch: Depends on how much is changed, but might be easier to reclone
14:18 _ikke_ The latter would not work, then everybody would still get a different history
14:18 AaronMT joined #git
14:19 tarkus joined #git
14:19 Klumben joined #git
14:19 Es0teric joined #git
14:20 Gsham joined #git
14:20 TbobbyZ joined #git
14:21 Starky joined #git
14:22 robotroll joined #git
14:22 valhala_22 joined #git
14:23 jameser joined #git
14:24 discopatrick joined #git
14:24 g1itch _ikke_ so best bet is to run command, force push, and have everyone re-clone?
14:24 dreiss joined #git
14:25 murii_ joined #git
14:25 g1itch it's someone's name. We migrated fron SVN to git and someone's name was entered incorrectly. Probably not a huge issue since he doesn't work here anymore, but we are considering it as a possibility
14:26 YuGiOhJCJ joined #git
14:26 mohabaks joined #git
14:26 murph joined #git
14:27 cdg joined #git
14:27 pijiu2 joined #git
14:28 User458764 joined #git
14:28 Es0teric joined #git
14:28 pijiu2 joined #git
14:30 kent\n joined #git
14:30 kelvah joined #git
14:30 pijiu2 joined #git
14:31 Muzer joined #git
14:31 pijiu2 joined #git
14:33 pijiu2 joined #git
14:33 cam27 joined #git
14:34 stoopkid joined #git
14:34 MDA2 joined #git
14:34 pks joined #git
14:35 pijiu2 joined #git
14:35 Silox| joined #git
14:36 xall_ joined #git
14:36 paskl SporkWitch: any idea perhaps?
14:37 d10n-work joined #git
14:37 Cabanossi joined #git
14:37 TbobbyZ joined #git
14:37 chrisM_1 joined #git
14:37 bronson joined #git
14:38 Es0teric joined #git
14:38 TbobbyZ joined #git
14:40 swords joined #git
14:40 SporkWitch paskl: why can't you pull upstream-master to local-master?
14:40 Es0teric joined #git
14:40 dendazen joined #git
14:41 valhala_22 joined #git
14:41 gugah joined #git
14:41 rivarun joined #git
14:43 paskl SporkWitch: I dont have permission to origin server
14:44 marcoslater joined #git
14:45 SporkWitch paskl: if you have no way of getting the upstream then there's nothing you can do
14:46 Dougie187 joined #git
14:47 paskl how about this: create new branch in old project version, copy all contents of new project (without .git) to old version directory, create commit of whats done (im just 2 commits behind actually, so its not a big deal I think), then merge into master
14:47 dminuoso joined #git
14:48 dminuoso Hi. I commit ammended a few times just to realie that I cant push force onto my remote. How can I take what I have and turn it into a new commit with respect to the HEAD of the remote?
14:49 valhala__ joined #git
14:49 dminuoso I was thinking of just doing a git reset origin/master and creating a new commit
14:49 JeroenT joined #git
14:49 dminuoso But Im not entirely sure of whether Im on the right track here.
14:49 al-damiri joined #git
14:50 Es0teric joined #git
14:50 SupaHam joined #git
14:51 dminuoso Oh well actually it makes sense. I suppose I could actually do a merge from the reflog onto origin/master
14:53 a_thakur joined #git
14:55 TbobbyZ joined #git
14:56 Tobbi joined #git
14:56 robotroll joined #git
14:57 miha_S7_ joined #git
14:57 bitmod joined #git
14:58 bsanford joined #git
14:58 Es0teric joined #git
14:59 CheckDavid joined #git
15:00 xall_ joined #git
15:01 Silox| joined #git
15:02 Es0teric joined #git
15:03 Micha_Btz joined #git
15:03 gugah_ joined #git
15:04 Snugglebash joined #git
15:04 Micha_Btz I need a little advance, i want to create a patch from a repo with a commit id, but it generates at least 1500 patches. But i'don't know why.
15:05 mizu_no_oto joined #git
15:05 Micha_Btz this is the tree https://android.googlesource.com/platform/frameworks/av/+/50358a80b1724f6cf1bcdf003e1abf9cc141b122
15:05 Micha_Btz git clone https://android.googlesource.com/platform/frameworks/av
15:05 Vampire0 Micha_Btz, !repro
15:05 gitinfo Micha_Btz: [!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 see
15:05 Micha_Btz git show 50358a80b1724f6cf1bcdf003e1abf9cc141b122
15:05 Micha_Btz commit 50358a80b1724f6cf1bcdf003e1abf9cc141b122
15:05 Micha_Btz Merge: 06f46cabd 79cf158c5
15:05 Micha_Btz Author: Marco Nelissen <marcone@google.com>
15:05 Micha_Btz Date:   Mon Feb 13 14:19:40 2017 -0800
15:05 Micha_Btz resolve merge conflicts of 79cf158c51 to mnc-dev
15:05 Micha_Btz
15:05 Micha_Btz Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643
15:05 roelmonn_ joined #git
15:06 roelmonn_ joined #git
15:07 roelmonn_ joined #git
15:08 Micha_Btz https://gist.github.com/Micha-Btz/26ae273ad40708d7cbfca6056c5f8d67
15:08 durham joined #git
15:08 valhala_22 joined #git
15:08 Micha_Btz I think the have merged a complete branch in this commit or something
15:10 rominronin joined #git
15:10 raffo joined #git
15:11 lindenle joined #git
15:11 bronson joined #git
15:12 Phylock joined #git
15:12 rominronin joined #git
15:13 Rodya_ joined #git
15:14 orbyt_ joined #git
15:15 valhala_22 joined #git
15:16 aw1 joined #git
15:17 j416 Micha_Btz: so you want 9b6b81d36 ?
15:18 j416 The reason you get a ton of patches is explained in man git-format-patch look for "There are two ways to specify"
15:18 gitinfo the git-format-patch manpage is available at https://gitirc.eu/git-format-patch.html
15:19 phinxy joined #git
15:19 j416 Micha_Btz: pass -1, or give it a range instead
15:19 pks joined #git
15:19 j416 Micha_Btz: for example git format-patch 50358a80b172^..50358a80b172
15:19 j416 Micha_Btz: or, git format-patch -1 9b6b81d366e3
15:20 aw1 joined #git
15:21 Micha_Btz hm, i doesn't understand the commit from google. i do simply not know how many patches that are
15:21 osse Micha_Btz: you can count them with rev-list
15:22 osse git rev-list --count 06f46cabd..79cf158c5
15:22 jagob joined #git
15:22 dsdeiz joined #git
15:22 f0ster joined #git
15:22 Micha_Btz ok, how do you get the 06f46cabd and 79cf158c5
15:22 valhala_22 joined #git
15:22 Micha_Btz ?
15:23 j416 those are the parents of 50358a80b172
15:23 pks_ joined #git
15:23 osse Micha_Btz: the "Merge:" line
15:23 osse so from you :p
15:24 j416 also, you probably don't want to generate patches for merge commits, so git rev-list --count --no-merges 06f46cabd..79cf158c5
15:24 j416 which'll give you one commit
15:24 j416 (namely 9b6b81d366e3)
15:25 t-richards joined #git
15:25 roelmonnens joined #git
15:25 bitmod joined #git
15:26 j416 you can verify that the merge commits don't add anything extra by comparing: "git diff 06f46cabd...79cf158c5" with git show 9b6b81d366e3
15:26 j416 (looks the same to me, ergo, 9b6b81d366e3 is the only useful commit)
15:26 Gurkenglas joined #git
15:26 Hunter1_ joined #git
15:26 j416 there's a ton of merges. No idea what that project is up to
15:26 pks joined #git
15:27 Micha_Btz ok, thanks a lot
15:27 bilal joined #git
15:27 j416 Merge "DO NOT MERGE: [..]
15:27 j416 kek
15:27 treehug88 joined #git
15:29 Gustavo6046 joined #git
15:29 j416 72% of the commits in that master branch are merges.
15:29 kurkale6ka joined #git
15:29 sbasso joined #git
15:29 mizu_no_oto joined #git
15:30 j416 I wonder how that happens.
15:30 TbobbyZ joined #git
15:31 j416 A ton of simultaneously supported versions and a ton of bugfixes, I speculate
15:32 kadoban Several of my projects have near 100% of commits in the master branch being merges, by a certain point of view. All actual work goes on in feature branches
15:33 j416 kadoban: yes, I mean _all_ commits reachable from master
15:33 j416 not just first parents
15:33 kurkale61 joined #git
15:34 kadoban Oh okay, then yeah that sounds weird
15:34 j416 $ git rev-list --count --merges master # 23614
15:34 j416 git rev-list --count --no-merges master # 9064
15:35 j416 interesting to say the least
15:35 kadoban Hm, that's over a large set of commits too. Yeah, funny
15:35 brent__ joined #git
15:35 prg318 joined #git
15:35 osse j416: wouldn't that need a --first-parent to be intestering?
15:36 j416 osse: then it'd give mostly all merges I suppose
15:36 bilal joined #git
15:36 red82 I’m trying to wean myself off SourceTree and the only feature that I can’t do better on the command line is commits.  Sourcetree lets me select on a line by line basis what file changes I want to add to a commit, which is great if I’ve been working for a while on serveral bugs at once and I want to break them up into seperate commits.  Anyone have a good link explaining how to do that on the command line?
15:37 j416 osse kadoban: https://www.dropbox.com/s/yuuum7arzy2jddq/mountains.png?dl=0 :)
15:37 osse red82: git add -p gets you very close
15:37 osse as close as it gets
15:37 Introoter joined #git
15:37 j416 -p works great
15:38 j416 there are also editor integrations that make -p a bit easier (or so they say) to work with
15:38 j416 I prefer -p
15:38 red82 thats pretty cool osse  & j416 , never even knew that existed
15:38 duderonomy joined #git
15:38 synthroid joined #git
15:38 xall_ joined #git
15:39 SporkWitch paskl: if you have access to the new version i fail to see why you can't properly merge the upstream changes into your master...
15:39 kadoban j416: pointy xD
15:39 j416 :D
15:43 paskl SporkWitch: how can I do that?
15:43 SporkWitch paskl: you know that directory you're copying with the new stuff? point the clone command at it...
15:43 SporkWitch seriously, why is this a problem?  You either have access or you don't.
15:46 madewokherd joined #git
15:46 Starky joined #git
15:46 a_thakur joined #git
15:47 jzeus joined #git
15:48 m0viefreak joined #git
15:48 paskl oh I didnt know I could use git clone on local folders ._.
15:50 cjohnson don't feel bad it took me a long time to realize that git is a file-driven system
15:51 cjohnson and that git push over ssh really wasn't doing anything special beside pushing files to another location
15:51 cjohnson I kept thinking ssh had git support built in or some git daemon was needed
15:51 cstratak joined #git
15:53 Masber_080 joined #git
15:55 red82 j416: looking at emacs integrations now, thanks again
15:55 cahoots joined #git
15:56 nikio_ joined #git
15:56 qqx cjohnson: Push over ssh *isn't* dealing with files. It runs a "server" process on the remote system.
15:57 nikio_ hello, i have a bit git project but i would only like to clone /sync a subfolder containing a webapp to my vps
15:57 nikio_ how can i do this? I wanna use pull to update the webapp on the server every now and again
15:59 thebope joined #git
15:59 _ikke_ nikio_: git does not allow just cloning a single folder
15:59 _ikke_ nikio_: and using git pull for deployment is not recommended anyway.
16:00 kadoban nikio_: Better to just not bother using git for deployment in the first place
16:00 nikio_ _ikke_, its recommended by some
16:00 _ikke_ nikio_: git archive does allow you to download a subfolder from a single commit as a tar file
16:00 nikio_ a lot of people find it convenient
16:00 nikio_ so do i
16:01 _ikke_ nikio_: Well, then you have to clone the complete repository
16:01 zeroed joined #git
16:01 kadoban Yeah, it's almost as convenient as all the other tools where the answer would be obvious and better in every way.
16:02 rkazak joined #git
16:03 nikio_ kadoban, in my experience trying ¨other tools¨ just causes headache and losing time and additional bloat
16:03 nikio_ i dont wna have to worry about more stuff, i already have git so why not use it?
16:03 _ikke_ nikio_: You don't need to use complicated tools
16:03 cahoots joined #git
16:04 _ikke_ nikio_: I only use git as a source for the code, but not to do the actual deployment
16:04 nikio_ git also allows to easily rollback the webapp
16:04 manuelschneid3r joined #git
16:04 mizu_no_oto joined #git
16:04 nikio_ by git reset HEAD^ --hard
16:04 psprint_ joined #git
16:04 nikio_ its familiar and it works
16:04 _ikke_ until it doesn't
16:04 nikio_ its perfect for my use case
16:04 nikio_ maybe not yours
16:04 nikio_ but are you saying its not possible to just sync with a subfolder?
16:05 miha_S7_ joined #git
16:05 _ikke_ Nope
16:05 nikio_ ive read about stuf like sparse check out etc
16:05 _ikke_ yes, but that still requires a complete clone
16:05 qqx joined #git
16:05 _ikke_ So you don't win much\
16:05 nikio_ well i could just do that
16:05 nikio_ and symlink to the webapp folder
16:05 nikio_ so i dont have to worry about weird folder structures
16:06 nikio_ sounds like an easy solution?
16:07 bronson joined #git
16:07 synthmea1 joined #git
16:07 Micha_Btz left #git
16:07 gugah joined #git
16:08 valhala_22 joined #git
16:10 zzz joined #git
16:11 alexandre9099 joined #git
16:12 j416 cjohnson: well, it is doing something special besides pushing files
16:13 j416 cjohnson: it runs something on the other side to receive the data
16:13 rominronin joined #git
16:13 sandman13 joined #git
16:13 sandman13 left #git
16:14 cjohnson Yeah I get that but ultimately it's still just operating on files, I do get that there is a transport in place
16:14 patarr joined #git
16:15 matsaman joined #git
16:17 freimatz joined #git
16:18 tarkus joined #git
16:20 Bombe When binary files differ, is there any way git can pipe both files through a hexdump (without extensive cli magic)?
16:20 jim hi... if I show you these two pictures of what I want to do, is it clear (here;s the first one: http://jam.sessionsnet.org:8000/files/view/pastes/chord-dr-git-pg1.png)
16:21 miha_S7_ joined #git
16:22 kadoban jim: So chords/ in one, everything else in the other?
16:22 jim yeah... and then I want to do this with the chords one: http://jam.sessionsnet.org:8000/files/view/pastes/chord-dr-git-pg2.png
16:23 jim anything missing?
16:23 kadoban Yes, you can do both of those
16:24 mda1 joined #git
16:24 a_thakur joined #git
16:25 jim ok, so for the first one, would I... make two clones, filter branch out chords on one, filter branch everything else on the other?
16:25 kadoban The one is easier than the other, but neither is very hard. You can just use either --tree-filter or --commit-filter. One of the examples is exactly what you want to do, nuking chords in the one. The other is kind of a combination of two. Yep exactly, start with two copies. You can just copy the directory, you don't really have to clone. But whatever works for you.
16:25 Tobbi joined #git
16:27 jim so if I copy the dir, any remotes will still be pointed correctly? (well, the other is going to a completely separate repo, so I'd delete the remote from that one and make a new one manually, I guess)
16:27 madewokherd joined #git
16:28 kadoban The remotes will indeed still be set if you copy the directory. Not sure that's totally what you're going to want, but it might be. All of history will be different, so if anyone else is using the remotes you're pointing to, you're going to have to communicate with them so they can get things back to a sane state.
16:28 jim can I filter branch out all the files in a dir in one shot?
16:29 jim yeah, I'm thinking of EOLing the current repo and making two totally new ones on github)
16:29 kadoban Not sure what you mean. But filter-branch is extremely powerful, you can do pretty much whatever you want.
16:29 kadoban You can certainly delete a directory and all of its contents
16:29 Altiare joined #git
16:30 govg joined #git
16:30 jim I saw a youtube video where the guy removed one file from the entire history...
16:31 kadoban Pretty much the same concept. The manpage has a few examples, one or two of them being exactly that.
16:32 jim so since I've never used filter branch before... is there a fairly detailed web page on the ins and outs? or is it pretty much the man page?
16:32 j416 cjohnson: doesn't most things that persist to disk? :)
16:32 j416 don't*
16:33 jim is the git book better for filter-branch?
16:33 j416 Bombe: you can define a custom diff driver that'll diff the file(s) in any way you like
16:33 pks joined #git
16:34 kadoban jim: The manpage is the detailed ins and outs. It's available in webpage form if you prefer
16:34 kadoban I'm sure there's other writeups, I dunno.
16:35 jim ok, good enough
16:35 Bombe j416, thanks… for now I just used stash and hexdump. :)
16:35 bsanford joined #git
16:35 dave0x6d joined #git
16:36 j416 mmhm.
16:36 xpk joined #git
16:38 Ice_Strike left #git
16:40 bilal joined #git
16:40 nitric joined #git
16:40 Adylas Hello #git, Using 2.11.0 right now. When doing clone, git is more aggressive with CURL that when doing submodule update. I see : * Ignoring the response-body then try again on clone but on submodule init, it fail and ask for username/password (Using Kerberos) Ideas ?
16:41 valhala_22 joined #git
16:41 jzeus joined #git
16:42 cebula joined #git
16:42 notebox joined #git
16:43 xpk joined #git
16:47 shgysk8zer0 joined #git
16:48 juvenal joined #git
16:49 madewokherd joined #git
16:49 raspado joined #git
16:51 TbobbyZ_ joined #git
16:52 napping joined #git
16:53 thiago joined #git
16:53 thebope joined #git
16:55 napping I'm looking for options to get a sensible view of a commit with many files deleted and a few changed - and some of the modified files only deleting lines.
16:57 napping ah, -D  and --diff-filter. I guess I just had to get farther into the git-show manpage
16:57 valhala_22 joined #git
16:57 ZyX-I joined #git
16:58 dreiss joined #git
17:00 patarr joined #git
17:00 dminuoso left #git
17:00 eehackr joined #git
17:01 livingstn joined #git
17:01 LionsMane joined #git
17:02 SteffanW joined #git
17:04 TikityTik joined #git
17:04 valhala_22 joined #git
17:04 Antimachine joined #git
17:05 nixjdm joined #git
17:06 sea-gull joined #git
17:09 Gambit-_ joined #git
17:09 TbobbyZ joined #git
17:10 Gambit-- joined #git
17:10 Gambit-- joined #git
17:10 Snugglebash joined #git
17:10 Gambit-- Hi folks - can I put something in my git config file to make 'git branch' always use '--sort=-committerdate' by default?
17:11 jab416171 joined #git
17:11 User458764 joined #git
17:12 valhala_22 joined #git
17:12 cagomez joined #git
17:13 bilal joined #git
17:13 eehackr joined #git
17:14 ertes joined #git
17:15 orbyt_ joined #git
17:20 jim is "revision" and "commit" synonimous?
17:20 grawity usually
17:20 jim I'm reading the filter branch manpage
17:21 Doginal joined #git
17:23 duderonomy joined #git
17:23 Adylas Hello #git, Using 2.11.0 right now. When doing clone, git is more aggressive with CURL VS when doing submodule update. See debug output : https://www.diffchecker.com/YP1K690I  I'm trying to find the codepath for this. Any help ?
17:24 Es0teric joined #git
17:24 orbyt_ joined #git
17:24 bronson joined #git
17:24 osse Gambit--: no, but "bramch" is so long anyway, so you can do:  git config --global alias.br 'branch --sort=-committerdate'
17:25 Gambit-- osse, rgr, thanks
17:26 WayToDoor joined #git
17:26 HoierM joined #git
17:27 User458764 joined #git
17:27 finalbeta joined #git
17:28 Ploppz I just `git reset --hard` then switched to a commit. Now `git diff` is dirty.. what can this mean?
17:28 blackwind_123 joined #git
17:28 publio joined #git
17:28 lafleurdubien joined #git
17:31 svm_invictvs joined #git
17:33 cdown joined #git
17:34 dreiss joined #git
17:35 jim doing experiments to see how it works... first one, git filter-branch --subdirectory-filter chords HEAD
17:35 Hunter1_ joined #git
17:36 jim it looks like it took the stuff in chords, moved it to .. and removed everything else
17:37 g1itch left #git
17:41 cam27 joined #git
17:41 Dougie187 left #git
17:42 gopar joined #git
17:44 rominronin joined #git
17:45 MattMaker joined #git
17:45 napping Ploppz: what do you mean "then switched to a commit"? Did you run another command after `git reset --hard` to switch to yet another commit?
17:46 mbrevda joined #git
17:47 telephone joined #git
17:47 telephone joined #git
17:47 thebope joined #git
17:49 napping Ploppz: one thing is that git reset --hard will not delete new files
17:50 nixjdm joined #git
17:50 napping If git reset --hard; git diff shows actual modifications that's a surprise unless you were messing with skip-worktree bits or something
17:51 malmalmal joined #git
17:51 h12o joined #git
17:51 aw1 joined #git
17:52 nowhereman joined #git
17:52 boombatower joined #git
17:52 Es0teric joined #git
17:55 Ploppz I meant I checkout out a commit
17:56 bronson joined #git
17:57 govg joined #git
17:57 xanadu_ joined #git
17:58 napping What did git diff show?
17:59 napping I can only think of added files or if you did something like --assume-unchanged with git update-index before you ran into this
17:59 toothe left #git
18:00 Ploppz ups never mind.. did a git stash pop..
18:03 Adylas Hello #git, Using 2.11.0 right now. When doing clone, git is more aggressive with CURL VS when doing submodule update. See debug output : https://www.diffchecker.com/YP1K690I  I'm trying to find the codepath for this. Any help ? I tried http.emptyauth without much success also.
18:03 dermoth joined #git
18:03 Sasazuka joined #git
18:05 mda1 joined #git
18:08 dsdeiz joined #git
18:08 dsdeiz joined #git
18:09 ZyX-I joined #git
18:12 Atm0spher1c joined #git
18:13 Hunter1_ joined #git
18:14 synthroi_ joined #git
18:15 orbyt_ joined #git
18:17 telephone joined #git
18:17 telephone joined #git
18:17 kfoonamalik joined #git
18:18 rkazak joined #git
18:18 bilal_ joined #git
18:22 tyreld joined #git
18:22 MDA2 joined #git
18:22 Cabanossi joined #git
18:24 mda1 joined #git
18:24 mostlybadfly joined #git
18:24 King_Hual joined #git
18:25 kyan joined #git
18:25 hashtagstrashtag joined #git
18:26 bilal joined #git
18:27 User458764 joined #git
18:27 cdown joined #git
18:30 misosoup joined #git
18:31 rickumali joined #git
18:34 sz0 joined #git
18:35 finalbeta joined #git
18:35 Altiare joined #git
18:36 Altiare joined #git
18:37 juvenal joined #git
18:40 Altiare joined #git
18:41 Anja_ joined #git
18:41 thebope joined #git
18:43 ekinmur joined #git
18:45 ShekharReddy joined #git
18:47 cahoots joined #git
18:47 imack joined #git
18:48 hobodave joined #git
18:49 scorphus joined #git
18:50 nixjdm joined #git
18:50 Acerific joined #git
18:50 Acerific joined #git
18:50 rishi joined #git
18:51 jimmyrcom joined #git
18:52 mizu_no_oto joined #git
18:52 synthroid joined #git
18:52 TomyLobo joined #git
18:53 WayToDoor joined #git
18:53 dsdeiz joined #git
18:53 dsdeiz joined #git
18:53 alexandre9099 joined #git
18:55 jaziz joined #git
18:56 dermoth joined #git
18:58 telephone joined #git
18:58 telephone joined #git
18:59 bilal_ joined #git
19:00 pijiu joined #git
19:02 bilal joined #git
19:05 bilal joined #git
19:07 bfig joined #git
19:08 raynold joined #git
19:11 rkazak joined #git
19:11 finalbeta joined #git
19:11 inflames joined #git
19:12 cagomez joined #git
19:13 valhala_22 joined #git
19:13 unit73e joined #git
19:13 unit73e Hey
19:13 gitinfo unit73e: 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.
19:13 valhala_22 joined #git
19:13 unit73e How do I connect a dangling commit?
19:14 Macaveli joined #git
19:14 grawity if you need it, `git branch <name> <commit-id>`
19:14 Sound joined #git
19:14 grawity usually those are just leftovers from amend or rebase
19:14 Sound joined #git
19:15 unit73e grawity, that's it? thanks. These are from `git svn clone`. The svn guys must have failed to merge or something like that.
19:15 rominronin joined #git
19:15 unit73e we're converting everything to git
19:15 bilal joined #git
19:16 valhala_22 joined #git
19:17 jackrandom joined #git
19:18 pasimoes joined #git
19:18 skarm joined #git
19:18 plasticle joined #git
19:18 valhala_22 joined #git
19:19 Dougie187 joined #git
19:19 Murii joined #git
19:19 pasimoes left #git
19:20 jeffreylevesque joined #git
19:21 wouter0100 joined #git
19:24 ekinmur joined #git
19:24 bilal joined #git
19:27 bilal joined #git
19:27 valhala_22 joined #git
19:30 valhala_22 joined #git
19:30 bfig_ joined #git
19:31 bilal_ joined #git
19:32 miha_S7_ joined #git
19:32 valhala_22 joined #git
19:33 cagomez joined #git
19:35 _ikke_ usually you don't have to care about dangling objects
19:36 thebope joined #git
19:36 thiago joined #git
19:36 valhala_22 joined #git
19:37 rindolf joined #git
19:37 unit73e _ikke_, yeah I know but I bet someone's going to complain about a "subversion tag" that's a dangling commit
19:37 unit73e I figured out what to do after the creating a branch
19:37 rindolf Hi all! Can anyone help with this issue with git fetch - http://paste.debian.net/932066/ ?
19:37 cagomez joined #git
19:37 unit73e I just attach the thing with a rebase
19:38 unit73e after soft reset
19:38 unit73e kind of a cheat but whatever
19:38 dsdeiz joined #git
19:38 shinnya joined #git
19:38 jepler left #git
19:40 finalbeta joined #git
19:40 shgysk8zer0 joined #git
19:40 mikecmpbll joined #git
19:42 ziombelas joined #git
19:43 ZyX-I joined #git
19:46 Bennux joined #git
19:49 valhala_22 joined #git
19:50 nixjdm joined #git
19:52 valhala__ joined #git
19:53 Tobbi joined #git
19:53 rindolf anyone?
19:54 patarr joined #git
19:55 phinxy joined #git
19:55 roelmonnens joined #git
19:56 valhala_22 joined #git
19:57 fahadash joined #git
19:58 bronson joined #git
19:58 up_the_irons joined #git
19:59 satifant joined #git
19:59 unit73e I have no clue rindolf. Can't you just delete and clone again?
19:59 unit73e the dummy solution :p
19:59 Es0teric joined #git
20:00 rindolf unit73e: i have some local branches
20:01 unit73e rindolf, how about removing the remote origin and adding back again?
20:01 unit73e maybe it's an issue with the remote origin
20:01 ZyX-I joined #git
20:02 dilijev joined #git
20:02 rindolf unit73e: maybe it will work - let me try by cp -a'ing the dir
20:02 unit73e yeah that's probably a good idea :p
20:03 valhala_22 joined #git
20:04 aubreypwd_ joined #git
20:06 Rodya_ joined #git
20:06 tvw joined #git
20:08 gopar joined #git
20:08 rindolf unit73e: seems to have worked - mucho gracias!
20:09 unit73e np rindolf
20:11 zzz joined #git
20:12 valhala_22 joined #git
20:13 orbyt_ joined #git
20:14 m4sk1n joined #git
20:15 borkr joined #git
20:15 valhala_22 joined #git
20:16 prg3 joined #git
20:17 Macaveli joined #git
20:19 orbyt_ joined #git
20:23 rindolf unit73e: one assertion fails out of 1,243,710 - so close
20:23 dsdeiz joined #git
20:23 dsdeiz joined #git
20:25 navidr joined #git
20:27 LionsMane joined #git
20:29 grawity joined #git
20:30 thebope joined #git
20:31 telephone joined #git
20:31 telephone joined #git
20:32 chubek_ joined #git
20:34 cdg joined #git
20:35 Noldorin joined #git
20:36 jwarren_ joined #git
20:36 valhala_22 joined #git
20:37 Cabanossi joined #git
20:37 orbyt_ joined #git
20:37 prg3 joined #git
20:39 thebird joined #git
20:40 valhala_22 joined #git
20:40 Doginal joined #git
20:41 Bock joined #git
20:43 Bock joined #git
20:44 brent__ joined #git
20:44 rivarun joined #git
20:45 thiago joined #git
20:45 Doginal joined #git
20:45 valhala_22 joined #git
20:45 meLon joined #git
20:47 rominronin joined #git
20:47 rkazak joined #git
20:48 blackwind_123 joined #git
20:50 nixjdm joined #git
20:50 somebodysf0ster joined #git
20:53 njbair joined #git
20:53 Phylock joined #git
20:53 valhala_22 joined #git
20:54 jeffreylevesque joined #git
20:54 ivan_on_trac The only way to change the commit author is by "git filter-branch --env-filter"? They are old commits. Already sent to a remote repo.
20:54 jwarren_ joined #git
20:55 nilg joined #git
20:58 bronson joined #git
20:58 diriger joined #git
20:59 roelmonnens joined #git
21:00 k0nichiwa joined #git
21:00 ozcanesen joined #git
21:00 k0nichiwa i have a git repo in ".git" how can i clone it
21:00 b1tchcakes joined #git
21:01 foreal joined #git
21:01 LionsMane joined #git
21:02 nedbat k0nichiwa: git clone . ../someplace_else
21:02 miha_S7_ joined #git
21:03 nedbat k0nichiwa: but maybe you didn't mean locally?
21:03 k0nichiwa i just want to check what is actually in the repo
21:03 telephone joined #git
21:03 telephone joined #git
21:03 k0nichiwa so i guess go to another temp directory to clone , and git original_directory/.git
21:03 nikio_ joined #git
21:03 nedbat k0nichiwa: then my line will work.  there's probably a way to get a working tree from that bare repo also.
21:03 k0nichiwa oops git clone original_dir/.git
21:04 k0nichiwa "bare repo" ?
21:04 movesi joined #git
21:07 b1tchcakes joined #git
21:11 roelmonnens joined #git
21:11 k0nichiwa nedbat, do you have a best git tutorial site to recommend
21:12 telephone joined #git
21:12 telephone joined #git
21:12 Doginal joined #git
21:13 cagedwisdom joined #git
21:13 Eugene !tutorial
21:13 gitinfo A list of interactive git tutorials: http://try.github.com
21:13 Eugene Huh, that's new
21:14 davimore joined #git
21:15 Random832 k0nichiwa, if you just want to check you should be able to use git show without having to clone or check out anything
21:15 napping left #git
21:15 dsdeiz joined #git
21:15 Random832 or git ls-tree
21:17 orbyt_ joined #git
21:20 b1tchcakes joined #git
21:21 askb joined #git
21:22 diriger Hello, Everybody. How does git manage SHA-1 hash function collisions, for example when two different files have the same hash?
21:22 Random832 it doesn't.
21:22 Dougie187 left #git
21:22 ZyX-I joined #git
21:23 Random832 http://stackoverflow.com/questions/9392365/how-would-git-handle-a-sha-1-collision-on-a-blob
21:23 diriger Thanks
21:24 thebope joined #git
21:24 Random832 the answers go into quite a lot of depth about what exactly happens, and the implications in various scenarios
21:25 fission6 joined #git
21:25 jzeus joined #git
21:25 Random832 but there's certainly nothing in there that allows both objects to live happily together, and it doesn't look like there's anything that reliably detects the situation and complains (though there are a bunch of different errors it can cause in specific situations)
21:26 mrcrjs joined #git
21:26 macrover joined #git
21:27 mrcrjs joined #git
21:30 h12o joined #git
21:31 k0nichiwa if i git init a local repo into a ".git" dir
21:31 k0nichiwa and then i later create a remote repot on github or whatever
21:31 k0nichiwa can i later link the local .git to the remote ?
21:31 moldy joined #git
21:31 moldy hi
21:31 k0nichiwa ji guess that is called a "push"
21:31 rindolf k0nichiwa: git help remote
21:31 moldy how do i revert a branch to a specific commit without rebasing?
21:31 telephone joined #git
21:31 telephone joined #git
21:32 rindolf k0nichiwa: yes, you can push it there
21:32 moldy i.e. i want to make a new commit that updates the files in the branch to the state of a previous commit
21:32 rindolf moldy: there's git revert
21:33 k0nichiwa maybe it would be easier to first create the remote and then clone it locally
21:33 k0nichiwa would it allow me to push automatically then
21:33 k0nichiwa i better do a tutorial
21:33 mrcrjs joined #git
21:33 k0nichiwa jwhy is git so complicated
21:34 rindolf k0nichiwa: either way works
21:34 moldy rindolf: ok. can you give me an example of how to use it to revert a range of commits?
21:34 k0nichiwa why cant it just be a magic directory that tracks its history of changes
21:34 Snugglebash joined #git
21:34 sgen joined #git
21:35 juvenal joined #git
21:35 sangy I know if --pickaxe and -G and -S on git log but, is there a way to find an *exact* patch for a file in the log? (or just an exact patch for that matter)
21:36 rindolf moldy: I only used it to revert single commits so far
21:36 moldy rindolf: `git revert --no-commit HEAD...$lastgoodcommit`, is that it?
21:36 rindolf moldy: i think so
21:36 moldy rindolf: thanks, i will try that, i think this looks good :)
21:36 rindolf k0nichiwa: because you need explicit commits
21:37 rindolf moldy: you're welcome
21:37 rindolf k0nichiwa: or else  you may break the integrity of your codebase
21:37 mrcrjs joined #git
21:38 rindolf k0nichiwa: I personally still kinda miss the simplicity of the subversion's client/server model.
21:39 unit73e what? subversion is useless
21:40 manuelschneid3r joined #git
21:41 Aeterne joined #git
21:41 somebodysf0ster left #git
21:41 orbyt_ joined #git
21:41 f0ster joined #git
21:41 f0ster thats the whole reason why git is so great, because its not client/server lol
21:42 aidalgol joined #git
21:43 rindolf f0ster: well, git has given me many "WTF?" Moments, including one today
21:44 f0ster rindolf: o rly what happened ?
21:44 unit73e In subversion you can't make mistakes (once you commit it's in the server) so the log is always a mess. Rant over.
21:44 cyphase joined #git
21:45 rindolf f0ster: see http://paste.debian.net/932066
21:45 unit73e btw rindolf did you fix your issue?
21:45 caper joined #git
21:45 rindolf unit73e: i did
21:45 tunekey joined #git
21:46 Dougie187 joined #git
21:48 unit73e cool. I didn't get the assertion thing :p
21:48 unit73e like unit tests or something?
21:50 kadoban joined #git
21:51 nixjdm joined #git
21:51 rindolf unit73e: yes
21:51 rindolf unit73e: which issue do you mean?
21:51 _ADN_ joined #git
21:51 moei joined #git
21:53 SkyPatrol joined #git
21:53 alexandre9099_ joined #git
21:54 h12o joined #git
21:55 unit73e rindolf, I meant the fetch you were trying to do. The assertion had nothing to do with it and I was confused :p
21:56 rindolf unit73e: ah
21:56 unit73e but yeah git is more complex than subversion but once you get it it's actually simple
21:56 rindolf unit73e: the fetch is fine now - thanks
21:57 telephone joined #git
21:57 telephone joined #git
21:57 gopar joined #git
21:59 unit73e k0nichiwa, when you create a github repo the page explains what you have to do to "link" your local repo to the github repo
22:00 unit73e which is basically just saying the (remote) origin of your code is the git repo
22:01 unit73e *the github repo
22:01 unit73e sort off
22:01 mrcrjs joined #git
22:02 ollien left #git
22:03 YuGiOhJCJ joined #git
22:04 kadoban_ joined #git
22:05 Xethron joined #git
22:06 mel00010 joined #git
22:07 Blkt joined #git
22:08 Xethron_ joined #git
22:09 ertes joined #git
22:09 kyan joined #git
22:14 telephone joined #git
22:14 telephone joined #git
22:16 mrcrjs joined #git
22:18 thebope joined #git
22:18 rominronin joined #git
22:22 Cabanossi joined #git
22:25 telephone joined #git
22:25 telephone joined #git
22:27 orbyt_ joined #git
22:28 mel00010 joined #git
22:31 telephone joined #git
22:31 telephone joined #git
22:32 Dougie187 left #git
22:33 orbyt_ joined #git
22:33 miha_S7_ joined #git
22:34 Sasazuka joined #git
22:37 mrcrjs joined #git
22:41 TheSimonator joined #git
22:41 gugah joined #git
22:41 jim Hi... I'm trying to come up with two repos from one, I think I got part of it, here's some pictures: http://jam.sessionsnet.org:8000/files/?folder_id=3692
22:42 jaziz joined #git
22:44 jim the result one basically went from the top of pg1 to the bottom of pg2 in one shot...
22:45 alexandre9099 joined #git
22:45 unit73e lol at your picks
22:46 jim now, I want to get another repo that is the result of going from the top to the bottom right of pg1
22:46 jim are they clear?
22:46 unit73e yeah
22:46 unit73e at least to me they are
22:46 jim couldn't ask for much more than that :)
22:48 jim I spent like 20 mins on em, I think it was worth it
22:49 nikio_ left #git
22:50 jim the result one is basically a "field report" of what happened as a result, I experimented to come up with it, didn't necessarily know what was gonna happen
22:50 mrcrjs joined #git
22:53 Cabanossi joined #git
22:54 Vampire0 jim, I'm not sure what your question is
22:56 jim Vampire0, take a look at http://jam.sessionsnet.org:8000/files/view/pastes/chord-dr-git-pg1.png
22:56 jim how do I get from the top to the bottom right?
22:57 jim that's the question:)
22:57 Vampire0 I **did** look at the pictures, but now I got what the question is :-)
22:58 jim ok :)
22:58 Vampire0 jim, use an --index-filter
22:58 Vampire0 jim, look at man git filter-branch, it has exactly what you need just for a file
22:58 gitinfo jim: the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html
22:59 Vampire0 jim, something like `--index-filter 'git rm --cached --ignore-unmatch chords'` or something like that
22:59 jim can I do a dirful of files in one shot?
22:59 bronson joined #git
22:59 Vampire0 jim, I don't understand what you mean
22:59 Vampire0 jim, you are just deleting one folder, don't you?
22:59 jim Vampire0, yes
23:00 jim because I already got that folder in its own repo
23:00 Vampire0 jim, of course you can delete a folder. You can do anything that you can outside of filter-branch
23:00 Vampire0 jim, yeah, I got that, that's why I told you to delete it
23:00 Vampire0 s/you to/you how to/
23:00 livingstn joined #git
23:01 jaziz1 joined #git
23:01 jim I think I don't understand the theory of operation of filter branch... I got the result by accident kinda... tried somethign that I thought would do the opposite... so I renamed a couple dirs and I'm good
23:02 jim filter-branch is like lisp's map on commits?
23:03 jim I have the original saved, so I can copy it out as often as I want (the original would be the situation at the top of pg1)
23:06 lagothrix joined #git
23:07 TbobbyZ_ joined #git
23:08 Vampire0 jim, I don't know what you mean by "lisp's map on commits"
23:09 Vampire0 jim, filter-branch goes through all refs you tell it to and rewrites every commit like you tell it to
23:09 CheckDavid joined #git
23:10 jim I think that did it (the git rm needed a -r)
23:10 Vampire0 jim, if you use an --index-filter, you can manipulate the index. If you use a --tree-filter you can manipulate the worktree (--index-filter is faster as it does not need a worktree if you can do the operation on the index like `git rm --cached ...`), --msg-filter lets you change the commit message, --env-filter lets you change environment variables to influence committer and author date, name and email, ..
23:10 Vampire0 ...
23:11 Vampire0 jim, yes, of course it does, you are operating on a directory
23:11 tourdownunder joined #git
23:12 thebope joined #git
23:15 HoierM joined #git
23:16 marianina8 joined #git
23:17 jim seems like that one didn't work exactly right, the log shows stuff that happened in chords/
23:17 HoierM joined #git
23:17 jim it did however remove the dir
23:18 todd_dsm joined #git
23:19 mel00010 joined #git
23:21 HoierM joined #git
23:22 HoierM joined #git
23:22 rwp joined #git
23:26 ISmithers joined #git
23:34 HoierM joined #git
23:35 polyrob_ joined #git
23:35 HoierM joined #git
23:36 polyrob_ joined #git
23:36 HoierM joined #git
23:37 HoierM joined #git
23:37 polyrob joined #git
23:38 HoierM joined #git
23:39 brent__ joined #git
23:41 valhala_22 joined #git
23:44 hvxgr joined #git
23:44 strugee joined #git
23:45 alexandre9099 joined #git
23:47 robattila256 joined #git
23:48 macrover left #git
23:49 caper joined #git
23:50 NeXTSUN joined #git
23:50 rominronin joined #git
23:51 druonysus joined #git
23:52 ozcanesen joined #git
23:53 orbyt_ joined #git
23:53 valhala_22 joined #git
23:54 alexandre9099 joined #git
23:56 robotroll joined #git
23:58 valhala_22 joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary