Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-05-13

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

All times shown according to UTC.

Time Nick Message
00:00 telephone joined #git
00:00 telephone joined #git
00:00 UTAN_dev joined #git
00:01 tsdev joined #git
00:08 menip joined #git
00:09 btree joined #git
00:10 fstd_ joined #git
00:10 transhuman joined #git
00:12 transhuman hi! I am told that in the torvals/linus tree (ie the linux kernel) that cherry picks for each version, subversion, and release candidate don't exist. How else do I get the snapshot of the tree at each of these increments?
00:14 telephone joined #git
00:14 telephone joined #git
00:17 Vampire0 transhuman, a cherry picking is a command. It takes some commit and applies it onto a commit where it is not yet in the history.
00:18 transhuman ok then maybe I am using the wrong command. I thought that there was snapshots for each release candidate/release? Is there a different way of doing this then? thanks in advance Vampire0
00:18 Vampire0 transhuman, do you mean tags?
00:18 Vampire0 transhuman, like in all VCS I know
00:19 Vampire0 transhuman, a tag is a label for a specific commit
00:19 transhuman maybe, what I found shows cherrypicks but perhaps maybe I will look up git tags then
00:19 Vampire0 transhuman, vor each version of the kernel you find a tag in the repository
00:19 transhuman oh ok
00:20 Vampire0 transhuman, `git ls-remote --refs https://github.com/torvalds/linux`
00:20 Vampire0 transhuman, `git ls-remote --tags --refs https://github.com/torvalds/linux` I meant
00:21 transhuman thanks for the help its appreciated...I actually figured I would just catch crap for even asking this question...thanks for the help
00:21 mquin joined #git
00:26 jaziz joined #git
00:26 VGfreak4 joined #git
00:31 telephone joined #git
00:31 telephone joined #git
00:32 alexandre9099 joined #git
00:33 JanC joined #git
00:33 Vampire0 transhuman, no problem. :-)
00:34 durham_ joined #git
00:34 Rodya_ joined #git
00:35 druonysus joined #git
00:35 btree left #git
00:37 paskl joined #git
00:38 [Kid] joined #git
00:38 digidog joined #git
00:43 peepsalot joined #git
00:46 alexandre9099 joined #git
00:47 dstw joined #git
00:48 PaulCapestany joined #git
00:51 Cabanossi joined #git
00:51 transhuman Vampire0, one more question if I might. do you know is there a quick way to match up all bugzilla reports and threads with a particular file and particular revision?
00:52 transhuman revision of the linux kernel in torvals/linus tree?
00:53 Doruk joined #git
00:54 Doruk joined #git
00:57 navidr joined #git
00:58 telephone joined #git
00:58 telephone joined #git
00:59 Doruk Hello. I'm a Linux noob and used Git for the first time. Where can I get help? I tried to read Reference Manuel and Pro Git, but I need some more help as a noob and I don't want to do something wrong.
00:59 roelmonnens joined #git
01:01 stepho joined #git
01:01 qpdb joined #git
01:02 adymitruk how do I wrap exec properly passing remaining arguments? func git(command string, args ...string) { exec.Command("git", "--work-tree=storage", "--git-dir=storage/.git", command, args...) }
01:02 miha_S7_ joined #git
01:04 adymitruk I'm not sure how to pass on the last variable length of params
01:06 finalbeta joined #git
01:07 adymitruk looking at the append function now..
01:11 moretti joined #git
01:11 telephone joined #git
01:11 telephone joined #git
01:14 Wulf4 joined #git
01:17 Masber joined #git
01:17 cyphase joined #git
01:18 hexagoxel joined #git
01:19 brent__ joined #git
01:21 squimrel joined #git
01:22 Doginal_ joined #git
01:23 dreiss joined #git
01:23 squimrel How do I change the GIT_COMMITTER_* to whatever GIT_AUTHOR_* is of every commit in a branch?
01:23 telephone joined #git
01:23 telephone joined #git
01:24 mohabaks joined #git
01:24 juvenal joined #git
01:25 kent\n joined #git
01:25 Vampire0 transhuman, I have no idea, but I don't think you would even be able to do this by hand, because you would have to make up this information
01:26 Vampire0 Doruk, 1. Git has nothing to do with Linux, it is cross-platform ;-)
01:26 patarr joined #git
01:26 Vampire0 Doruk, 2. there is very little you can do wrong that you cannot undo. There are very little commands in Git that finally destroy data undoably
01:27 Vampire0 Doruk, but to make sure before !try do !backup
01:27 gitinfo Doruk: [!tias] Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.
01:27 gitinfo Doruk: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
01:27 Vampire0 Doruk, regarding help, !just
01:27 gitinfo Doruk: [!just_ask] You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)
01:27 raijin joined #git
01:28 Vampire0 adymitruk, sounds to me not like a git question, but like whatever programming language you use question
01:29 Vampire0 adymitruk, one thing though, instead of `"--work-tree=storage", "--git-dir=storage/.git"` you should simply be able to do `"-C storage"`
01:30 Doruk What is "!try"? Is it a shell command?
01:30 squimrel squimrel: git filter-branch --env-filter 'export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME";export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL";export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"'
01:30 plos joined #git
01:31 Doruk I called myself a linux noob because I don't even know how to use shell.
01:31 Vampire0 Doruk, no, it is an alias for !tias
01:31 gitinfo Doruk: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.
01:31 caper joined #git
01:31 Vampire0 how to use shell: type
01:31 Vampire0 not much more to it
01:31 Vampire0 :-)
01:32 sunri5e joined #git
01:33 Doruk I'm also new on IRC, so I don't what some symbols in your messages mean? Where can I get introduced to IRC?
01:34 Noldorin joined #git
01:35 Vampire0 Doruk, in my messages were only ascii characters, what didn't you understand?
01:35 alexandre9099 joined #git
01:36 Doruk For example, gitinfo said [!just_ask] and I don't know what the exclamation mark and the brackets are for.
01:36 gitinfo You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)
01:37 Vampire0 Doruk, this has nothing to with IRC per se, it is just text
01:37 jstimm joined #git
01:37 Vampire0 Doruk, in this case he told how the main trigger for the message is called, because I used !just to call it, not !just_ask
01:37 gitinfo Doruk: [!just_ask] You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)
01:38 telephone joined #git
01:38 telephone joined #git
01:38 Doruk OK. Thanks for the encouragement, so I'm gonna ask my questions: All I want to do is get the latest version of some software on some directory on my computer. I used the "pull" command for this, but I heard about a "clone" command in Pro Book. I've already downloaded the software, but I'm wondering which actually suited me more.
01:38 Vampire0 Doruk, what do you mean by "downloaded the software" exactly?
01:38 Noldorin joined #git
01:39 Vampire0 Doruk, why don't you simply download a newer version of the software, why do you thing you want to use Git?
01:39 Doruk Also, while using the pull command I used a -u option ignorantly. The documentation says that I wouldn't want to use it normally. Did it do anything bad, or does it not matter?
01:40 Doruk I got the software through the pull command, the project leader invited me to become a beta tester.
01:40 Vampire0 Doruk, -u to pull is internal stuff that shouldn't be used manually, but you didn't break anything
01:40 Doruk Thanks for that info.
01:41 Vampire0 Doruk, you surely did not "get" it by pull, you cannot initially get something with pull
01:41 Doruk I first added it.
01:41 Doruk Is that what you mean?
01:42 Doruk Like I should first use remote add...
01:47 Doruk I did that and then got the software by the pull command.
01:47 Vampire0 o_O
01:47 Vampire0 Doruk, so you did it from behind through the chest into the eye?
01:47 Vampire0 Doruk, if you want to get a remote repository onto your box, you use clone
01:47 Vampire0 Doruk, clone downloads the repository initially to a local version and also sets up the remotes
01:47 Vampire0 Doruk, pull is just a combination of fetch and merge (or fetch and rebase, depends on configuration and parameters). fetch gets the latest changes from the remote repository into the remote tracking branches of your local repository, merge and rebase integrate these changes into your current local branch
01:47 Doruk Then, my only important question is "How can I move the folder one step up?" I used "git init" command in a folder but now I want to create a folder inside it and put the software into that folder. I heard git has a mv command but I wanted to ask about here first.
01:47 Vampire0 Doruk, another question, why isn't the project lead just providing you with a testable artefact instead of making you use Git?
01:47 reality404 joined #git
01:47 Vampire0 Doruk, if you want to move the whole repository, just move it
01:47 Vampire0 Doruk, it doesn't matter where it lies
01:47 Vampire0 Doruk, (as long as the paths inside get not too long for the file system)
01:47 Doruk You seem helpful, should I let you communicate with him, so that he can get your suggestion?
01:47 Doruk I mean the project leader.
01:47 Doruk I don't even know what a testable artefact s.
01:47 Doruk is.
01:47 Vampire0 Doruk, you should test something
01:49 ilbot3 joined #git
01:49 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:49 Vampire0 Doruk, git does not need to adjust
01:50 Vampire0 Doruk, it would be rather ridiculous if it depended on absolute paths
01:50 Doruk And when I move and rename the folders, afterwards, I can use the pull command in the new folder and git will update the software?
01:51 Doruk OK then :)
01:51 Cabanossi joined #git
01:52 Vampire0 Doruk, as I said, as long as we are talking about the top-most folder, the one inside which the .git folder is, you can freely move and rename it as you like
01:52 Doruk It will only download the changes in the repository from now on, yes? So, I won't need to download several GBs anymore.
01:53 adymitruk Vampire0: Thank you! forgot about that option
01:54 squimrel left #git
01:55 d^sh_ joined #git
01:56 Doruk VampireO, Thank you very much :) and good night to you!
01:56 peterbecich joined #git
01:58 telephone joined #git
01:58 telephone joined #git
01:59 meLon joined #git
02:00 transhuman vampire one more question when you do a git clone, does this get the whole of all the tag history (each and every snapshot) or does this only get one snapshot?
02:00 bronson joined #git
02:00 transhuman Vampire0, sorry that was for you
02:00 Vampire0 Doruk, yes, it will only get the condensed diffs
02:01 Vampire0 transhuman, Git is a DVCS with D as in Distributed
02:01 Vampire0 transhuman, that means each clone is a full stand-alone repository with the full history
02:02 Vampire0 transhuman, if you clone (except you tell the clone command to only download one branch or only x commits back in history) then you will get the full history locally
02:03 transhuman oh thats great then...the linux tree is only 4 gig in size, I thought it would be much larger
02:03 Doruk By the way, just for your information, I used the pull command instead of clone because all I know is the things I learned in the Git tutorial: https://try.github.io/levels/1/challenges/1
02:03 telephone joined #git
02:03 telephone joined #git
02:05 kadoban joined #git
02:09 thiago joined #git
02:10 lagothrix joined #git
02:10 transhuman thanks Doruk
02:11 jaziz joined #git
02:16 BryanG4 joined #git
02:17 transhuman git-export http://host.com/git-repo <-t tag or -b branch or -c commit> /local/dir   <<--- am i right in saying this exports to a path one of the commit snapshots? I found this but want to be sure it does what I think it does, and also can I do the same thing locally on the cloned repository?
02:18 Goplat joined #git
02:20 ertes joined #git
02:21 telephone joined #git
02:21 telephone joined #git
02:22 star_prone joined #git
02:23 Vampire0 Doruk, !book !bottomup
02:23 gitinfo Doruk: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
02:23 gitinfo Doruk: 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ikke.info/git.from.bottom.up.pdf
02:25 ojdo joined #git
02:25 Vampire0 transhuman, git-export is not a standard git command. It is some 3rd party utility you installed, so no idea
02:27 caper joined #git
02:28 Doginal joined #git
02:28 patarr joined #git
02:31 durham joined #git
02:31 durham joined #git
02:32 dirtyroshi joined #git
02:33 miha_S7_ joined #git
02:33 hexagoxel joined #git
02:34 madknight joined #git
02:35 Vortex35 joined #git
02:39 telephone joined #git
02:39 telephone joined #git
02:39 Pilfers joined #git
02:44 Hunter1_ joined #git
02:44 lb1c joined #git
02:45 jameser joined #git
02:46 roelmonnens joined #git
02:47 alexandre9099 joined #git
02:51 tourdownunder joined #git
02:51 transhuman Vampire0, this is the git-export script https://github.com/dasch/git-export/blob/master/git-export, I think it does what I want it to do but not sure (I wanted to extend the wrapper script so that it will export at each release candidate commit level (each to a unique subdirectory)
02:53 plos joined #git
02:55 telephone joined #git
02:55 telephone joined #git
02:58 chachasmooth joined #git
03:00 duderonomy joined #git
03:06 Cabanossi joined #git
03:06 Lyqyd joined #git
03:09 JanC joined #git
03:10 telephone joined #git
03:11 telephone joined #git
03:11 dsdeiz joined #git
03:11 dsdeiz joined #git
03:14 Rodya_ joined #git
03:17 theiostream joined #git
03:19 tourdownunder joined #git
03:22 telephone joined #git
03:22 telephone joined #git
03:24 theiostr_ joined #git
03:29 jon-mac joined #git
03:34 telephone joined #git
03:34 telephone joined #git
03:34 Cabanoss- joined #git
03:44 d^sh joined #git
03:47 xall_ joined #git
03:48 theiostream joined #git
03:51 aw1 joined #git
04:02 miha_S7_ joined #git
04:02 NeverDie joined #git
04:03 Doruk left #git
04:03 robattila256 joined #git
04:04 Cabanossi joined #git
04:05 rivarun joined #git
04:06 theiostream joined #git
04:09 causasui joined #git
04:16 Rodya_ joined #git
04:20 theiostream joined #git
04:20 k0nichiwa joined #git
04:23 ayogi joined #git
04:25 Eoii joined #git
04:28 dsdeiz joined #git
04:28 dsdeiz joined #git
04:28 darkbit joined #git
04:29 patarr joined #git
04:33 raspado_ joined #git
04:36 davimore joined #git
04:36 MajorPayne joined #git
04:38 dave0x6d joined #git
04:38 binary106 joined #git
04:42 nd_ joined #git
04:50 Cabanossi joined #git
04:50 ppang joined #git
04:50 yeswanth joined #git
04:50 BorkStick joined #git
04:51 treaki__ joined #git
04:52 Bock joined #git
04:59 salamanderrake joined #git
05:02 theiostream joined #git
05:04 FuzzyWuz_ joined #git
05:06 Ntwiy joined #git
05:10 raijin joined #git
05:11 Nilesh____ joined #git
05:13 singlerider joined #git
05:16 xall_ joined #git
05:16 juvenal joined #git
05:16 Rodya_ joined #git
05:20 Cabanossi joined #git
05:20 dreiss joined #git
05:25 diogenese joined #git
05:32 miha_S7_ joined #git
05:42 jameser joined #git
05:43 tourdownunder joined #git
05:43 lindenle joined #git
05:50 Cabanossi joined #git
05:53 freimatz joined #git
05:57 jaziz joined #git
06:17 tarkus joined #git
06:17 Rodya_ joined #git
06:19 lordjancso joined #git
06:26 Masber joined #git
06:28 Raed|Mobile joined #git
06:30 patarr joined #git
06:32 diogenese joined #git
06:33 SkyPatrol_ joined #git
06:37 dreiss joined #git
06:38 schleppel joined #git
06:40 xanadu_ joined #git
06:46 Hunter1_ joined #git
06:47 grift joined #git
06:48 TomyLobo joined #git
06:50 Cabanossi joined #git
06:50 scoobertron joined #git
06:52 overlord_tm joined #git
06:52 grift joined #git
06:55 Masber joined #git
06:58 blahdodo joined #git
07:02 valhala_22 joined #git
07:03 miha_S7_ joined #git
07:03 valhala_22 joined #git
07:06 Milos joined #git
07:06 mkoskar joined #git
07:07 movesi joined #git
07:09 Junior joined #git
07:13 blahdodo joined #git
07:16 robotroll joined #git
07:18 Rodya_ joined #git
07:18 freddy_ joined #git
07:18 aw1 joined #git
07:20 felGru joined #git
07:30 freddy_ joined #git
07:32 stoopkid joined #git
07:32 freddy_ joined #git
07:33 roelmonnens joined #git
07:33 dave0x6d joined #git
07:34 Murii joined #git
07:35 Cabanossi joined #git
07:38 ppang joined #git
07:39 sgen joined #git
07:41 chubek_ joined #git
07:41 roelmonnens joined #git
07:43 YuGiOhJCJ joined #git
07:47 grift joined #git
07:48 sea-gull joined #git
07:50 Milos joined #git
07:53 netj joined #git
07:53 acetakwas joined #git
07:57 rivarun joined #git
07:58 grift joined #git
07:58 nachoman joined #git
07:58 MineCoins joined #git
08:03 bronson joined #git
08:04 ayogi joined #git
08:07 finalbeta joined #git
08:10 Lauven joined #git
08:11 theoceaniscool joined #git
08:13 om_henners joined #git
08:17 watom joined #git
08:17 m4sk1n joined #git
08:19 Rodya_ joined #git
08:20 MuffinMedic joined #git
08:26 vdv joined #git
08:29 Raed|Mobile joined #git
08:30 patarr joined #git
08:33 miha_S7_ joined #git
08:35 Cabanossi joined #git
08:35 Wulf joined #git
08:36 pratch joined #git
08:36 user1__ joined #git
08:42 freddy_ joined #git
08:44 manuelschneid3r joined #git
08:51 ToBeCloud joined #git
08:52 Introoter joined #git
08:53 samcv joined #git
08:55 mikecmpbll joined #git
08:57 Junior joined #git
08:59 cdown joined #git
08:59 vuoto joined #git
09:01 adac joined #git
09:01 mohabaks joined #git
09:01 nachoman joined #git
09:02 misosoup joined #git
09:03 filcab joined #git
09:08 King_Hual joined #git
09:08 King_Hual joined #git
09:09 aard_ joined #git
09:16 prg3 joined #git
09:18 freddy_ joined #git
09:19 Rodya_ joined #git
09:20 Cabanossi joined #git
09:21 thebope joined #git
09:23 anbz joined #git
09:26 anbz joined #git
09:26 h12o joined #git
09:30 valhala_22 joined #git
09:30 tymczenko joined #git
09:31 vamiry_ joined #git
09:31 tymczenko joined #git
09:34 m0viefreak joined #git
09:35 hariel joined #git
09:37 King_Hual joined #git
09:37 King_Hual joined #git
09:39 King_Hual` joined #git
09:42 brent__ joined #git
09:45 aw1 joined #git
09:47 sea-gull joined #git
09:48 ayogi joined #git
09:55 mirchetto joined #git
09:58 earnestly joined #git
10:04 bronson joined #git
10:04 Gurkenglas joined #git
10:06 a3Dman joined #git
10:08 psprint Can be git fetch; git pull (or git fetch; git merge FETCH_HEAD) different from just git pull? I get weird conflicts, git log ..FETCH_HEAD shows things like "first commit", like if it would want to merge whole history again
10:09 jackrandom joined #git
10:11 psprint lol the histories of my local copy and the remote are different, looks like the autor has overwritten the repo
10:11 adac joined #git
10:13 King_Hual joined #git
10:13 King_Hual joined #git
10:16 noure joined #git
10:18 sausy joined #git
10:18 noure left #git
10:18 ghostdog joined #git
10:20 Rodya_ joined #git
10:24 felGru_ joined #git
10:25 jameser joined #git
10:26 Snugglebash joined #git
10:27 watom left #git
10:27 fahadash joined #git
10:28 psprint Can fetch --quiet still show information on new tags, branches?
10:31 patarr joined #git
10:33 paul424 joined #git
10:33 borkr joined #git
10:34 NicoHood joined #git
10:34 NicoHood does anyone know how to replace a git tag with a signed git tag? i just want to sign an unsigned git tag
10:36 cdown joined #git
10:36 Milos joined #git
10:40 adac joined #git
10:40 grawity `git tag -f`
10:46 ppang joined #git
10:47 D630 joined #git
10:47 ppang joined #git
10:50 jstein_ joined #git
10:51 samcv joined #git
11:02 dendazen joined #git
11:07 sarri joined #git
11:07 sarri joined #git
11:07 strk joined #git
11:07 todder joined #git
11:07 strk is it possible to build git-svn links after cloning a git repository ?
11:08 strk the git repository was created by git-svn run on a different machine
11:10 modlin joined #git
11:12 bremner strk: it's possible, but it's a bit fiddly, requires using some low level git commands
11:12 VGfreak4 joined #git
11:13 GT4066 joined #git
11:13 bremner here's a script I wrote a while ago: http://paste.debian.net/932267/
11:13 King_Hual` joined #git
11:14 bernd27 joined #git
11:14 strk bremner: why do you remove svn-remote.svn section if you cloned from git ?
11:15 earnestea joined #git
11:15 strk I'll need author-file too, now trying with git svn init but it complains Unknown option: authors-file
11:15 bremner strk: probably git-svn complains if I don't do that.
11:16 bremner strk: e.g. when running the script twice
11:16 alhariel joined #git
11:17 strk fatal: No such section!
11:17 strk (when running the script once :)
11:18 * bremner shrugs
11:18 strk anyway yup, second time is fine :)
11:18 EDAKIRI joined #git
11:18 King_Hual joined #git
11:18 King_Hual joined #git
11:18 bremner it was more an answer to "how do I do this", than "here is a great tool"
11:18 strk thank you, now have to figure the last line, what does it do ?
11:19 EDAKIRI joined #git
11:19 strk it looks like I'll need more of those
11:20 strk as I have lines like: <hash> refs/remotes/origin/svn-<xxx>
11:20 Levex joined #git
11:20 strk many of them
11:20 bremner I think git-svn is dumb, and only knows one branch state, that's what the last initializes
11:20 strk and tags too
11:20 Cabanossi joined #git
11:21 valhala_22 joined #git
11:21 Rodya_ joined #git
11:21 darkbit joined #git
11:24 ExpiredDev joined #git
11:24 bremner when you run "git svn rebase", it updates the ref refs/remotes/git-svn ; the last line is doing the moral equivalent of "git reset" on that ref
11:24 valhala_22 joined #git
11:26 gnixev joined #git
11:29 valhala_22 joined #git
11:29 strk I plan to do `git svn fetch` (my mirror script does that) which I understand fetches all branches, not just the current one
11:30 nachoman joined #git
11:30 strk your last line is instead mapping a single branch, is that correct ?
11:31 bremner yes, I've never really attempted to work with multiple branches and git-svn
11:31 finalbeta joined #git
11:31 mohabaks joined #git
11:31 strk also, as I have a working git-svn setup on another machine, is `git show-ref` supposed to show this "git-svn" remote ? (because it doesn't)
11:34 strk gah, I also need authorsfile but git keeps telling me it's invalid
11:34 strk tried: git config svn.authorsfile=`cd .. && pwd`
11:34 strk error: invalid key: svn.authorsfile=...
11:34 bremner yes. git config doesn't use =
11:34 strk ok, this was fixed by using an actual file
11:35 strk git config svn.authorsfile `cd .. && pwd`/authors.git
11:35 Raging_Hog joined #git
11:39 strk uhm, comparing .git/config shows some weird differences
11:39 strk tags = trunk/tags/*:refs/remotes/origin/tags/*
11:39 strk the above looks wrong to me
11:39 strk the local (working) mirror is using
11:39 strk tags = tags/*:refs/remotes/tags/*
11:40 strk also this is weird:   fetch = trunk/trunk:refs/remotes/origin/trunk
11:40 strk locally it is: fetch = trunk:refs/remotes/trunk
11:41 strk and branches:   branches = trunk/branches/*:refs/remotes/origin/*
11:41 strk locally:  branches = branches/*:refs/remotes/*
11:42 SporkWitch is it possible to set up a repo in such a way that some default remotes are included in the clone?
11:42 ExpiredDev SporkWitch, sounds like setting submodules?
11:43 bremner SporkWitch: not really. You can include a script to run
11:43 raijin joined #git
11:43 SporkWitch ExpiredDev: i don't believe so.  It's my main shared config repo; i have a remote "group" set up so I can push to all my servers with one command.  It would be convenient to have that get pulled when i clone it to a new machine as well
11:44 SporkWitch bremner: yeah, that's likely what i will do; i already have a setup script that sets up all the symlinks and whatnot to the stuff in the config repo, just figured i'd see if there was a "right" way first
11:44 mohabaks joined #git
11:44 tvw joined #git
11:44 bremner SporkWitch: as a general principle, you can't clone config in git
11:44 SporkWitch bremner: and i assume you mean having a script in the repo that i then run, not that it would run automatically on clone (that would be a security issue lol)
11:45 Levex joined #git
11:45 SporkWitch bremner: yeah, didn't think so, but figured i'd ask anyway :P
11:45 bremner yeah. Although maybe "git clone --mirror" makes me a liar, a bit
11:50 cebula joined #git
11:51 mohabaks_ joined #git
11:53 crypt0kraken joined #git
11:58 cdown joined #git
12:05 bronson joined #git
12:08 _ADN_ joined #git
12:08 SporkWitch oh? i take it that matches everything EXCEPT remote entries? lol
12:11 King_Hual` joined #git
12:13 EgS joined #git
12:17 strk should `git config svn-remote.svn` show the value of that section ? or how to check if that section is set ?
12:19 Guest72923 joined #git
12:19 miha_S7_ joined #git
12:22 Rodya_ joined #git
12:22 _ADN_ joined #git
12:24 King_Hual_ joined #git
12:26 red82 joined #git
12:28 rivarun joined #git
12:31 Vortex34 joined #git
12:32 patarr joined #git
12:33 dreiss joined #git
12:34 juvenal joined #git
12:35 Cabanossi joined #git
12:35 Hunter1_ joined #git
12:39 crypt0kraken joined #git
12:41 valhala_22 joined #git
12:45 ogny joined #git
12:45 _ADN_ joined #git
12:48 red82 joined #git
12:50 King_Hual joined #git
12:52 freddy_ joined #git
12:52 Wulf left #git
12:55 manuelschneid3r joined #git
12:57 King_Hual joined #git
13:01 Levex joined #git
13:04 plos joined #git
13:04 valhala_22 joined #git
13:04 yaelvaya joined #git
13:05 stonerfish joined #git
13:06 darkbit joined #git
13:06 crypt0kraken joined #git
13:06 h12o joined #git
13:12 xall_ joined #git
13:16 shinnya joined #git
13:16 MarginHu joined #git
13:17 stonerfish joined #git
13:18 thebope joined #git
13:18 zerow joined #git
13:22 warthog9 joined #git
13:22 Rodya_ joined #git
13:23 askb joined #git
13:26 _ADN_ joined #git
13:27 h12o joined #git
13:27 Darcidride joined #git
13:28 kexmex joined #git
13:28 h12o_ joined #git
13:36 ZyX-I joined #git
13:37 jstein_ joined #git
13:39 levex_ joined #git
13:40 jackrandom joined #git
13:42 bernd27 joined #git
13:42 Introoter joined #git
13:45 Acerific joined #git
13:45 Acerific joined #git
13:48 zeroed joined #git
13:50 Cabanossi joined #git
13:50 zeroed joined #git
13:53 LordRyan joined #git
13:59 red82 joined #git
14:05 dave0x6d joined #git
14:06 bronson joined #git
14:07 valhala_22 joined #git
14:08 King_Hual` joined #git
14:08 miha_S7_ joined #git
14:09 alexandre9099 joined #git
14:11 rivarun joined #git
14:16 Snugglebash joined #git
14:16 pratch joined #git
14:17 red82 joined #git
14:18 valhala_22 joined #git
14:19 King_Hual joined #git
14:19 King_Hual joined #git
14:19 phinxy joined #git
14:20 Cabanossi joined #git
14:23 Rodya_ joined #git
14:26 dsdeiz joined #git
14:30 zeroed joined #git
14:30 strk bremner: I've made .git/config look the same as the working one, and did create the refs like you showed, but matching the local (working) one
14:30 strk still, it doesn't look like "git svn fetch" does anything, which is weird
14:30 om_henners joined #git
14:31 misosoup joined #git
14:31 strk it is like "git svn fetch" is not really fetching things (git svn info # reports an older revision)
14:32 strk working version: git version 2.7.4
14:32 strk non-working one: git version 2.1.4
14:32 strk not sure it matters
14:33 patarr joined #git
14:37 crypt0kraken joined #git
14:38 roby10 joined #git
14:38 valhala_22 joined #git
14:40 strk actually, `git svn info` seems to fetch some revisions but stops too early
14:41 zeroed joined #git
14:43 ziombelas joined #git
14:46 strk uhm, even `git svn fetch` actually seems to be doing things, so I must be missing something else
14:46 strk it's just weird that it's fetching revisions like 1873 while the clone from the mirror was at @15392
14:47 strk it sounds like git-svn is not recognizing the metadata found in the git history
14:47 strk even if it's jumping some revs, like it goes from r2102 to r2104 ...
14:47 strk maybe it's following an SVN branch which wasn't pushed to the mirror ?
14:47 zeroed joined #git
14:48 SkyPatrol joined #git
14:48 oskarkv joined #git
14:50 nowhereman joined #git
14:51 leeN joined #git
14:54 safe joined #git
14:54 hashpuppy joined #git
14:57 cads joined #git
14:57 strk Done rebuilding .git/svn/refs/remotes/2.2/.rev_map.b70326c6-7e19-0410-871a-916f4a2858ee
14:58 blackwind_123 joined #git
14:59 wit4r7 joined #git
15:03 valhala_22 joined #git
15:03 dreiss joined #git
15:03 Aifit joined #git
15:04 stepho___ joined #git
15:05 stepho___ joined #git
15:10 NeXTSUN joined #git
15:13 Goplat joined #git
15:16 Gustavo6046 joined #git
15:17 peterbecich joined #git
15:17 h12o joined #git
15:18 tarkus joined #git
15:19 Gurkenglas joined #git
15:20 Cabanossi joined #git
15:21 TbobbyZ joined #git
15:21 valhala_22 joined #git
15:24 dreiss joined #git
15:24 nowhereman joined #git
15:27 valhala_22 joined #git
15:31 nachoman joined #git
15:32 zeroed joined #git
15:34 Tobbi joined #git
15:35 mdw joined #git
15:36 Khisanth joined #git
15:36 mkoskar joined #git
15:38 rivarun joined #git
15:43 nachoman joined #git
15:45 zeroed joined #git
15:50 ogny joined #git
15:52 juvenal joined #git
15:52 NeXTSUN joined #git
15:53 TbobbyZ joined #git
15:54 kexmex joined #git
15:57 robattila256 joined #git
15:58 doener joined #git
16:00 j08nY joined #git
16:00 valhala_22 joined #git
16:02 TbobbyZ joined #git
16:03 ayogi joined #git
16:03 renkon joined #git
16:04 thebope joined #git
16:04 renkon hello. I have committed (and pushed) to a branch which is not master. My question is, how can I make those SAME changes in master?
16:04 renkon the same changes from that commit only
16:04 TbobbyZ joined #git
16:05 lagothrix joined #git
16:05 SteffanW joined #git
16:05 valhala__ joined #git
16:07 zt joined #git
16:07 borkr joined #git
16:07 _ikke_ renkon: man git cherry-pick
16:07 gitinfo renkon: the git-cherry-pick manpage is available at https://gitirc.eu/git-cherry-pick.html
16:08 bronson joined #git
16:09 borkr joined #git
16:10 renkon does that work with two different branches? like from last commit from branch1 to master?
16:10 renkon git checkout master and then git cherry-pick commit?
16:10 oprypin renkon, I don't get that last sentence
16:10 Pulp joined #git
16:11 _ikke_ renkon: you need to specify the specific commit you want to cherry-pick
16:11 oprypin well now it's not last anymore now that you added another
16:11 renkon I commited changes in branch1. I want to apply this last commit to master. Procedure: git checkout master && git cherry-pick [commit] to apply that commit to master too?
16:11 cbreak renkon: it'll copy
16:13 renkon my idea is to copy last commit from branch1 to master too.
16:13 renkon so that would do the trick?
16:13 renkon (sorry, im new in git world)
16:13 oprypin renkon, yeah go for it
16:15 oprypin renkon, that will be a different commit that looks exactly the same, be aware of that
16:15 renkon perfect thats what i wanted
16:15 renkon thank you
16:16 oprypin meaning that if you want to merge that branch later it may not be entirely obvious how
16:16 siamect joined #git
16:16 oprypin or if you only have that one commit difference from master on that branch  you'd just merge it  and not need to copy the commit
16:17 renkon im not planning to merge them, they are like different
16:17 oprypin cool
16:20 zt joined #git
16:21 robotroll joined #git
16:21 renkon http://imgur.com/bNkXffJ I'm having trouble using git checkout, and when using git status almost all files from project seem to be modified
16:21 renkon (in Android studio I can checkout with no problem, but I cant use cherry-pick, or i dont see it on android studio options)
16:23 renkon once in master, git cherry-pick 0900f4296b56d77d074da767652d8ef2497809c5 would be the command right? where that is the commit from the branch
16:24 grift joined #git
16:25 grift joined #git
16:25 aard_ joined #git
16:25 oprypin renkon, right command
16:25 oprypin renkon, this state you're in should make you wary
16:25 oprypin you have many uncommitted changes
16:25 sea-gull joined #git
16:26 sonOfRa joined #git
16:26 oprypin you probably want to save them before changing to another branch
16:26 renkon ok
16:27 k0nichiwa joined #git
16:27 oprypin such changes can sometimes be a side effect of some mistake, not necessarily actual wanted changes
16:27 oprypin also don't throw around  `git checkout --`, that can just discard uncommitted changes
16:28 valhala_22 joined #git
16:28 oprypin it's kinda weird, in fact, that the same command can switch to another branch AND change the contents of files
16:29 grift joined #git
16:30 watabou joined #git
16:30 ghostdog joined #git
16:32 theiostream joined #git
16:34 patarr joined #git
16:34 miczac joined #git
16:34 grift joined #git
16:34 madewokherd joined #git
16:35 grift joined #git
16:37 pks joined #git
16:39 theiostream joined #git
16:40 Noldorin joined #git
16:43 theiostream joined #git
16:45 raijin joined #git
16:48 MineCoins joined #git
16:52 TbobbyZ joined #git
16:54 sonOfRa joined #git
16:55 TbobbyZ joined #git
16:55 patarr joined #git
16:56 grift joined #git
16:57 thiago joined #git
17:00 meLon joined #git
17:02 tymczenko joined #git
17:05 pyuumap joined #git
17:07 red82 joined #git
17:10 roelmonnens joined #git
17:12 daveomcd_ joined #git
17:12 daveomcd_ i accidentally did a "git init" in my folder that holds all of my projects. how can I "undo" this?
17:12 grawity remove the .git directory
17:13 daveomcd_ ahh thanks!
17:16 valhala_22 joined #git
17:19 raijin joined #git
17:20 Cabanossi joined #git
17:22 Cabanossi joined #git
17:23 phinxy joined #git
17:25 polymorphisme joined #git
17:25 YuGiOhJCJ joined #git
17:26 navidr joined #git
17:29 Marquisk2 joined #git
17:36 diogenese joined #git
17:38 NeverDie joined #git
17:39 MineCoins joined #git
17:41 aard_ joined #git
17:42 JimDungo joined #git
17:42 cdown joined #git
17:44 aw1 joined #git
17:47 bket joined #git
17:49 raijin joined #git
17:50 lvb joined #git
17:53 diogenese joined #git
17:55 duderonomy joined #git
17:56 nocbreak joined #git
17:57 TbobbyZ joined #git
17:58 _lvb_ joined #git
17:58 Naan joined #git
18:01 Guest18902 joined #git
18:01 manuelschneid3r joined #git
18:02 Naan hi i deleted a remote branch on a group repo on github and I'm struggling to recover it
18:03 drodger joined #git
18:03 lindenle joined #git
18:03 TbobbyZ joined #git
18:04 ajeremias Naan: somene might have a local copy?
18:05 sucks joined #git
18:06 TbobbyZ_ joined #git
18:07 Naan ajeremias that seems the easiest way thanks
18:07 Murr joined #git
18:07 lagothrix joined #git
18:08 Ryanar joined #git
18:09 bronson joined #git
18:10 diogenese joined #git
18:15 cbreak joined #git
18:16 TbobbyZ joined #git
18:17 ryan_ joined #git
18:18 Seveas Naan: if you had the branch checked out before deleting it, it might be in the HEAD reflog still
18:18 ryan_ left #git
18:19 Naan yeah i did but then i deleted my local repo because i'm a fool and started again
18:19 Naan it's ok apparently it wasn't anything useful
18:20 Nilesh____ joined #git
18:21 darkbit joined #git
18:22 TbobbyZ joined #git
18:24 ertes joined #git
18:26 Rodya_ joined #git
18:27 lindenle joined #git
18:30 skunkz joined #git
18:30 _lvb_ joined #git
18:30 theiostream joined #git
18:31 raijin joined #git
18:31 k0nichiwa joined #git
18:32 Naan it was just a copy of master with no changes whew
18:32 clickjack joined #git
18:32 TbobbyZ joined #git
18:33 TbobbyZ joined #git
18:34 bket joined #git
18:35 TbobbyZ joined #git
18:35 hseg joined #git
18:35 Cabanossi joined #git
18:36 hseg Hi. Accidentally nuked my working directory, but my .git dir stayed safe. Should git checkout HEAD be enough to restore the tracked files into the working directory?
18:37 Hunter1_ joined #git
18:38 TbobbyZ_ joined #git
18:38 jstein_ joined #git
18:41 miha_S7_ joined #git
18:41 hashpuppy joined #git
18:43 Muzer joined #git
18:44 finalbeta joined #git
18:48 _lvb_ joined #git
18:51 tymczenko joined #git
18:54 TbobbyZ joined #git
18:55 Random832 probably hseg
18:56 patarr joined #git
18:57 jozwior joined #git
18:58 roelmonnens joined #git
19:01 skirk joined #git
19:04 jaziz joined #git
19:05 TikityTik joined #git
19:05 cbreak joined #git
19:05 lvb_ joined #git
19:08 nachoman joined #git
19:08 Atomic_FNA4Z joined #git
19:10 sbasso joined #git
19:10 lvb joined #git
19:14 juvenal joined #git
19:15 ogny joined #git
19:15 armyriad joined #git
19:17 hseg OK, thanks
19:17 Murr joined #git
19:20 Cabanossi joined #git
19:20 tango_ joined #git
19:20 moritz or even 'git checkout .', which gives you the last index
19:21 moritz so if you had some 'git add'ed but not committed changes, you'll get them back too
19:23 Atm0spher1c joined #git
19:24 paul424 joined #git
19:24 LVK267 joined #git
19:25 aard_ joined #git
19:27 Rodya_ joined #git
19:27 felGru joined #git
19:29 lvb Hi, I'm quite new to all this and was wondering how does one get started with reviewing mainline code?
19:30 lvb Do you just go through the code and give your feedback or is there some sort of 'checklist' to follow?
19:31 Levex joined #git
19:32 LVK267 joined #git
19:32 AndreasLutro reviewing code changes is not really git-specific and there's no stock answer to what you should look for
19:32 finalbeta joined #git
19:33 livingstn joined #git
19:33 cdown joined #git
19:34 lvb AndreasLutro: I meant particularly on the git mailing list
19:35 AndreasLutro ah
19:37 miha_S7_ joined #git
19:37 Altiare joined #git
19:39 perrier-jouet joined #git
19:40 finalbeta joined #git
19:41 TbobbyZ joined #git
19:43 Eugene lvb - this is primarily a user-support channel; actual git.git development chatter is rare. The mailing list is the best place for such discussions
19:44 Starky joined #git
19:44 Eugene If you happen to find anything outlining the expected user etiquette we would love to add it to the bot here. Its a fairly common question, and I don't know the answer myself. I stopped doing mailing lists a while ago for sanity, heh
19:44 LaptopBrain joined #git
19:46 bernd9000 joined #git
19:46 diogenese joined #git
19:46 caper joined #git
19:48 bernd9000 joined #git
19:49 LVK267 Does anyone here use Git on Windows? My work computer experiences a stack overflow problem in "sh.exe" when attempting a rebase if I'm using the 64-bit distribution of git. If I use 32-bit, it works. Also, if I'm using 64-bit and enabling trace (set GIT_TRACE=1), then it also works. Does anyone know what I should look at?
19:50 bernd9000 joined #git
19:51 kfoonamalik joined #git
19:51 bernd9000 joined #git
19:54 bernd9000 joined #git
19:54 overlord_tm joined #git
19:55 theiostream joined #git
19:56 livingstn joined #git
19:56 lvb Eugene: Ok, thanks for the information, I'll let you know if I find anything
19:57 miha_S7_ joined #git
19:57 zivester joined #git
20:01 Rodya_ joined #git
20:04 TbobbyZ joined #git
20:06 nowhere_man joined #git
20:06 Flowinho joined #git
20:07 JimDungo any idea on where can I find the /hooks folder on linux?, it's not inside the /.git folder
20:08 AndreasLutro JimDungo: `git init` will create .git/hooks for you, but someone might have removed it
20:08 alexemilberg joined #git
20:10 bronson joined #git
20:12 ych joined #git
20:14 caper joined #git
20:15 star_prone joined #git
20:15 cam27 joined #git
20:16 kyan joined #git
20:19 theiostream joined #git
20:20 zerow joined #git
20:21 qaros joined #git
20:28 cdown joined #git
20:30 atomicb0mb joined #git
20:30 finalbeta joined #git
20:36 seyyidt joined #git
20:37 pirate joined #git
20:38 armyriad joined #git
20:39 pirate hello
20:39 gitinfo pirate: 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.
20:39 Stumbler joined #git
20:42 tymczenko joined #git
20:42 trewe joined #git
20:42 nachoman joined #git
20:42 LBV_User joined #git
20:44 theiostream joined #git
20:45 mattcen joined #git
20:45 Random832 joined #git
20:48 SCHAPiE joined #git
20:51 cebula joined #git
20:51 salamanderrake joined #git
20:53 NeverDie joined #git
20:54 seyyidt left #git
20:54 theiostream joined #git
20:56 patarr joined #git
21:04 ertes joined #git
21:04 levex_ joined #git
21:05 theiostream joined #git
21:06 rasto joined #git
21:07 caper joined #git
21:07 jon-mac joined #git
21:09 msonntag joined #git
21:14 Lyqyd joined #git
21:15 boombatower joined #git
21:16 rameerez joined #git
21:18 jimmyrcom joined #git
21:20 cebula joined #git
21:26 nachoman joined #git
21:28 Stumbler joined #git
21:30 kadoban joined #git
21:31 EDAKIRI joined #git
21:32 jnewt joined #git
21:32 Zialus joined #git
21:42 manuelschneid3r joined #git
21:42 livingstn joined #git
21:43 HcsOmot joined #git
21:43 jnewt joined #git
21:43 HcsOmot hi. I've got a personal repo on github, which i forked to an organization. now i've created an additional branch on my personal repo. how do I clone that branch to the org?
21:44 earnestly joined #git
21:44 shinnya joined #git
21:45 dreiss joined #git
21:45 HcsOmot do I first need to create a new branch from master on org side, then pull from the same branch from my personal repo?
21:47 AndreasLutro HcsOmot: add the forked repo as a separate remote, then git push the branch to that remote
21:47 wcpan joined #git
21:47 borkr joined #git
21:49 aidalgol joined #git
21:52 kexmex joined #git
21:52 NicoHood left #git
21:53 roelmonnens joined #git
21:54 HcsOmot AndreasLutro: thanks. used  git remote add <orgname> <repo>. this won't automatically make my local repo track remote for changes on that org, right?
21:55 kadoban joined #git
21:55 AndreasLutro it might in some cases, like if your org has a branch that isn't on the original repo
21:56 AndreasLutro but in general no, the original repo will still be the "default"
21:56 afrg joined #git
21:58 HcsOmot great! org most likely won't have any additional branches, other than those I create on personal. But in case one gets created, I could just pull from it to a new local branch, right? and then push it all together back to personal repo on remote?
22:01 splencer joined #git
22:02 splencer left #git
22:02 OverCoder joined #git
22:02 OverCoder Hello everyone!
22:02 AndreasLutro HcsOmot: sure. use git fetch to fetch branches from all remotes. but you may need to do `git push branch remote_name` if you want to be sure about where you're pushing
22:02 HcsOmot hi
22:02 OverCoder Okay tl;dr, I am in a huge trouble in which, I had that fancy project with so much code in, and then, I did a git init && git add --all
22:03 HcsOmot AndreasLutro: great! thanks! :)
22:03 OverCoder but then I wanted to unstage the files, so I did git rm . -r
22:03 OverCoder and so that removed everything using an actual rm.
22:04 AndreasLutro HcsOmot: you can use git branch --set-upstream-to to change the remote each branch points to
22:04 OverCoder So now, I'm in a pranked state. I tried git stash and git reset but none work as I still have no initial commit
22:04 OverCoder pls help <3
22:04 kfoonamalik joined #git
22:05 AndreasLutro OverCoder: might want to try filesystem recovery, git won't help you here if there's no commits
22:05 OverCoder ok so
22:06 HcsOmot AndreasLutro: oh, great. I didn't know that. i think that actually may be very useful to me :)
22:06 OverCoder that's the kind of response I did not really want.
22:06 * OverCoder dies
22:06 HcsOmot OverCoder: sorry to hear about your trouble.
22:06 HcsOmot me: tries to bring OverCoder back to life
22:07 OverCoder why on earth
22:07 HcsOmot if that's your last option, try not to write to much on disk
22:07 OverCoder would git have such an option
22:07 OverCoder why is git so dumb.
22:08 AndreasLutro so that when you want to remove a file from a repo you don't have to run 2 or 3 commands
22:09 OverCoder right
22:11 bronson joined #git
22:14 theiostream joined #git
22:15 Jackneill joined #git
22:17 AndreasLutro rm --cached will remove from the index without removing from the working tree (filesystem)
22:17 AndreasLutro and git reset can generally be used to "undo" a git add
22:18 OverCoder aaaanyways
22:18 OverCoder that teaches me to backup code before using git in the first place
22:19 AndreasLutro well, certainly when using destructive commands
22:19 OverCoder I never expected `git rm` would end up with an `rm`
22:19 OverCoder so thanks
22:19 robotroll joined #git
22:20 Cabanossi joined #git
22:25 perrier-jouet joined #git
22:27 Jackneill joined #git
22:28 askb joined #git
22:29 diogenese joined #git
22:29 Jackneill joined #git
22:29 moei joined #git
22:33 theiostream joined #git
22:33 kexmex joined #git
22:35 Rodya_ joined #git
22:36 Jackneill joined #git
22:39 tourdownunder joined #git
22:45 MACscr joined #git
22:45 ti2 joined #git
22:46 rivarun joined #git
22:48 zaratustra were you looking for git reset?
22:48 Naan joined #git
22:49 Marumarsu joined #git
22:53 Levex joined #git
22:56 Rodya_ joined #git
22:56 jaggz joined #git
22:56 jaggz I'm trying to undo a commit I did, before I push
22:57 patarr joined #git
22:57 jaggz it's saying I have unstaged changes to this one file though
22:57 jaggz (I made some changes to it, then realized the last commit was bad)
23:02 jaggz fixered it!
23:07 miha_S7_ joined #git
23:15 nachoman joined #git
23:19 qwertyzxcvbn joined #git
23:20 Cabanossi joined #git
23:22 stepho joined #git
23:29 SwiftMatt joined #git
23:29 dreiss joined #git
23:33 Es0teric joined #git
23:36 prg3 joined #git
23:45 grawity joined #git
23:58 thebope joined #git

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