Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-02

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

All times shown according to UTC.

Time Nick Message
00:03 tgies joined #git
00:04 jstimm_ joined #git
00:04 L8D joined #git
00:07 tgies joined #git
00:08 benwbooth joined #git
00:08 Akagi201 joined #git
00:08 lrvick joined #git
00:09 raijin joined #git
00:14 oliverio__ joined #git
00:15 Noldorin joined #git
00:17 thiago joined #git
00:17 JanC_ joined #git
00:17 tgies joined #git
00:18 SpeakerToMeat joined #git
00:19 raininja joined #git
00:22 tgies joined #git
00:24 Xomnom thanks! I used stash
00:24 Xomnom btw maybe this channel should use that mode that hides joins and leaves
00:25 kellytk joined #git
00:25 preaction i'm pretty sure no such mode exists
00:26 ojacobson can't, in fact
00:26 ojacobson JOIN and PART messages on the wire are used to keep the nickname list for a channel in sync on each client; not sending those would massively break every IRC client
00:26 kellytk I learned about a branching model using Git flow where "master" is the development branch and "releases" is the stable branch.  The point was that cloning repo should leave a person with dev state (master in this case) among others.  I'd appreciate opinions of it
00:26 LeBlaaanc joined #git
00:27 ojacobson actual "joined" and "left" messages printed to screen are generated on the client, so the channel can't suppress them.
00:27 tgies joined #git
00:28 ochorocho__ joined #git
00:28 nidr0x joined #git
00:28 preaction kellytk: develop is the development branch in a default git-flow branching model. master is the release source. releases are releases which can have hotfixes. i consider the model to be overkill.
00:29 kellytk preaction: I'm familiar with Git flow's defaults, what I've described is a modification to those defaults
00:29 preaction okay, that wasn't clear. still sounds like overkill
00:30 ojacobson kellytk: relabelling the branches is one way to do that
00:30 tomog999 joined #git
00:30 ojacobson changing the default branch to develop is another
00:32 ojacobson I've never found git-flow's master/develop split very convincing, so I tend not to have this problem :)
00:32 kellytk Thanks, I'm familiar with how to implement it, I'm curious what others think about the design
00:32 tgies joined #git
00:33 mellernoia joined #git
00:34 dreiss joined #git
00:37 interne7y joined #git
00:38 tgies joined #git
00:42 L8D joined #git
00:43 tgies joined #git
00:44 cd83x joined #git
00:44 zhiwliu joined #git
00:48 tgies joined #git
00:48 zhiwliu left #git
00:50 SwiftMatt joined #git
00:50 Khisanth joined #git
00:50 garyserj joined #git
00:51 hahuang61 joined #git
00:52 SteenJobs joined #git
00:52 kadoban joined #git
00:53 tgies joined #git
00:53 DirtyCajun joined #git
00:54 dmto joined #git
00:54 boudicca joined #git
00:54 przemoc joined #git
00:55 nettoweb joined #git
00:58 tgies joined #git
00:59 showaz joined #git
01:03 tgies joined #git
01:04 Tanger_ joined #git
01:05 jbondhus joined #git
01:05 var_x @Xomnon  Your IRC client should be able to filter them.  for example I use weechat and it can filter join/leave for anyone who hasn't talked recently:  https://weechat.org/files/doc/weechat_faq.en.html#filter_irc_join_part_quit
01:06 var_x he says just now noticing he's a complete idiot and that Xomnom left
01:08 tgies joined #git
01:08 dmto joined #git
01:10 douglasc_ joined #git
01:11 liuzhen joined #git
01:12 justanotheruser joined #git
01:12 dreiss joined #git
01:12 JJM joined #git
01:13 tgies joined #git
01:13 steven_a_s joined #git
01:15 bremner a friendly, helpful, idiot though ;)
01:16 jbitdrop joined #git
01:18 tgies joined #git
01:19 mizu_no_oto joined #git
01:20 ash_workz github should make public gists publicly editable by being passed/marked as just "suggestions"
01:20 dmto joined #git
01:20 ash_workz I think that would fix readme.md's faster
01:21 steven_a_s joined #git
01:22 preaction you can click the Edit button on any repo, which will automatically fork. is that what you mean?
01:23 tgies joined #git
01:27 madewokherd joined #git
01:27 EvilPenguin joined #git
01:28 tgies joined #git
01:32 fuchstronaut joined #git
01:33 tgies joined #git
01:36 pks joined #git
01:38 interne7y joined #git
01:38 cd83x joined #git
01:40 diegoaguilar joined #git
01:41 JayCroesus joined #git
01:46 tgies joined #git
01:47 dreiss joined #git
01:48 tgies joined #git
01:51 NwS joined #git
01:51 mmlb joined #git
01:53 cd83x joined #git
01:53 tgies joined #git
01:54 italoacasas joined #git
01:54 rnsanchez_ joined #git
01:55 raijin joined #git
01:56 Akagi201 joined #git
01:58 rkazak joined #git
02:01 drbean_ joined #git
02:03 _rnsanchez_ joined #git
02:03 tgies joined #git
02:06 italoacasas joined #git
02:06 aidalgol joined #git
02:06 rnsanchez_ joined #git
02:06 mizu_no_oto joined #git
02:06 Hz joined #git
02:08 Goplat joined #git
02:10 raininja joined #git
02:10 faux___ joined #git
02:11 Noldorin joined #git
02:11 son joined #git
02:13 tgies joined #git
02:14 hexagoxel joined #git
02:14 Lynxium joined #git
02:16 Dougie187 joined #git
02:18 tgies joined #git
02:21 liuzhen joined #git
02:23 tgies joined #git
02:26 fstd_ joined #git
02:27 ril joined #git
02:28 watersoul joined #git
02:28 tgies joined #git
02:28 ochorocho__ joined #git
02:31 jaguarmagenta joined #git
02:31 nevodka joined #git
02:32 watersoul joined #git
02:32 mizu_no_oto joined #git
02:33 tgies joined #git
02:34 liuzhen joined #git
02:38 tgies joined #git
02:39 interne7y joined #git
02:43 arescorpio joined #git
02:44 Tim-SEM joined #git
02:46 chachasmooth joined #git
02:48 Limes_ joined #git
02:48 tgies joined #git
02:52 hahuang61 joined #git
02:53 Calrik joined #git
02:53 tgies joined #git
02:58 Literphor joined #git
02:58 tgies joined #git
03:02 aavrug joined #git
03:05 kenansulayman joined #git
03:05 Infamous joined #git
03:08 d4rklit3 joined #git
03:08 tgies joined #git
03:12 malide joined #git
03:13 Tanger_ joined #git
03:13 kisonecat joined #git
03:14 livingstn joined #git
03:15 dodobrain joined #git
03:18 tgies joined #git
03:19 T4nk5bb0t what is tag based branching? How do I use tags?
03:20 k3rn31 joined #git
03:21 ojacobson where did you come across the phrase "tag-based branching"?
03:23 tgies joined #git
03:25 dreiss joined #git
03:26 zivester joined #git
03:26 floatingpoint joined #git
03:27 L8D joined #git
03:28 SteenJobs joined #git
03:28 tgies joined #git
03:29 Dougie187 left #git
03:29 rgrinberg joined #git
03:30 david007 joined #git
03:30 piling joined #git
03:31 T4nk5bb0t ojacobson, Sorry, feature based branching but I don't want to do it by creating a branch for ever release. I want to tag the release. I am just trying ot understand tagging. I know how to create a tag, but I don't understand completely how it works.
03:31 T4nk5bb0t ojacobson, It seems like a tag is commit based.
03:31 T4nk5bb0t ojacobson, Correct?
03:31 ojacobson tags and branches are both ways of labelling a single commit
03:32 ojacobson branches advance when you check them out and create a new commit; tags do not (and some tags can carry extra metadata around)
03:32 ojacobson combs48,kept
03:32 ojacobson ah, shit.
03:32 T4nk5bb0t ojacobson, Oh, ok, that makes sense.
03:32 T4nk5bb0t ojacobson, So if I want to say that version 5.0 is after this merge, I do that this create a tag in my main branch, right?
03:32 dmj` joined #git
03:33 T4nk5bb0t ojacobson, That meaning I merge the branch into my main branch, then I checkout my main branch, pull from remote, create the tag, push the tag
03:33 fuchstronaut joined #git
03:33 T4nk5bb0t ojacobson, Is that the right way to think of it?
03:33 tgies joined #git
03:34 ojacobson you would tag the commit that you wish to declare to be the canonical "5.0" version
03:34 ojacobson it can be on a branch, or not, as you see fit; commits have no fixed relationship with branches
03:35 drodger joined #git
03:35 fission6 joined #git
03:38 Yaphetspy joined #git
03:39 tgies joined #git
03:40 interne7y joined #git
03:41 SuperflyR6 joined #git
03:41 netj joined #git
03:44 tgies joined #git
03:45 robotroll joined #git
03:46 sangy joined #git
03:47 mehola joined #git
03:49 T4nk5bb0t ojacobson, Interesting.. sorry, didn't see the messages! I was programming.
03:50 T4nk5bb0t ojacobson, So, are commits time ordered in git? So, if I create a tag for a certain commit, every commit before that would be included?
03:51 fission6 joined #git
03:51 _ikke_ yes, each commit has a reference to its parent
03:51 _ikke_ (or parents, incase of a merge commit)
03:52 rainbyte joined #git
03:52 _ikke_ But this only ounts for commits reachable by that commit. Commits on a diferent branch would not be
03:54 T4nk5bb0t _ikke_, Wait, I thought that ojacobson was saying that commits have nothing to do with branches but a branch is a reference to a commit.
03:54 tgies joined #git
03:54 jbitdrop_ joined #git
03:54 thalleralexander joined #git
03:54 dmto joined #git
03:55 T4nk5bb0t _ikke_, interesting. If I have 4 feature branches and when I finish the fourth one, I would like to create a tag to say that those 4 feature branches are associated with release branch 5.0, where do I create the tag?
03:55 drodger joined #git
03:55 ojacobson On some commit that includes all four feature branches.
03:55 ojacobson Creating one if necessary.
03:55 _ikke_ T4nk5bb0t: Typically done by merging them into a common branch
03:55 ojacobson A tag identifies a single commit, just like a branch does. The semantics of a tag are that the name will continue to identify that commit forevermore, unlike a branch (which changes over time as new commits appear)
03:56 T4nk5bb0t ojacobson _ikke_ I merge them all into (lets call it main)  main branch.
03:56 zivester joined #git
03:56 T4nk5bb0t once they are merged, what do I do to create this new release tag?
03:56 T4nk5bb0t i need to create it in main, right?
03:56 T4nk5bb0t and then push it from local main to remote main
03:56 _ikke_ yes, because that contains all the changes
03:56 kellytk What is the correct config to instruct GitHub to clone a branch other than "master" by default?
03:56 _ikke_ git tag -a <version>
03:57 ojacobson 'git tag -a v5.0` will tag the current commit (and ask for a tag message)
03:57 _ikke_ kellytk: In the settings for the repository, you can set the default branch
03:57 ojacobson 'git tag -a v5.0 some-commit' will tag some other commit.
03:57 T4nk5bb0t _ikke_, ojacobson I understand!!! thanks! :)
03:57 kellytk _ikke_: This isn't something one configures in the repo proper?
03:58 _ikke_ kellytk: You could in the remote repository would you have access to it (this is something per repository, not something you can set locally and push for example)
03:58 kellytk The repo is originating now on my HD, I'll later share it up on GitHub, FWIW
03:59 tgies joined #git
04:01 _ikke_ You need to change where HEAD points to on the remote repository, which defaults to master
04:02 kellytk Thanks _ikke_
04:04 Infamous joined #git
04:04 kenansulayman joined #git
04:04 tgies joined #git
04:04 a_thakur joined #git
04:08 SwiftMatt joined #git
04:08 ochorocho__ joined #git
04:09 tgies joined #git
04:13 xelxebar joined #git
04:14 tgies joined #git
04:16 son_ joined #git
04:21 orbitphreak joined #git
04:22 Garen joined #git
04:22 mehola joined #git
04:23 monoprotic joined #git
04:23 monoprotic joined #git
04:23 grassass joined #git
04:23 Goplat joined #git
04:23 armenzg joined #git
04:23 bluezone joined #git
04:24 neanderslob joined #git
04:25 dmto joined #git
04:28 Cabanossi joined #git
04:29 tgies joined #git
04:34 tgies joined #git
04:36 son joined #git
04:36 k3rn31 joined #git
04:38 peey joined #git
04:38 dodobrain is there a way to list the dir tree (of a specified path) from a different branch?
04:38 dodobrain something like "git ls ./foo/somedir"
04:38 kellytk left #git
04:39 dodobrain err.. i meant git ls otherbranch:./foo/somedir
04:41 interne7y joined #git
04:41 nilg joined #git
04:43 toogley joined #git
04:44 hahuang61 joined #git
04:46 dodobrain ah theres an ls-tree command
04:48 lindenle joined #git
04:49 tgies joined #git
04:53 SwiftMatt joined #git
04:56 subhojit777 joined #git
04:56 tax joined #git
04:57 dmto joined #git
04:57 _ikke_ yeah
04:58 b1tchcakes joined #git
04:59 tgies joined #git
05:04 mda1 joined #git
05:04 tgies joined #git
05:04 wanders joined #git
05:05 shinnya joined #git
05:07 dmto joined #git
05:09 tgies joined #git
05:19 tgies joined #git
05:24 sauvin joined #git
05:24 eletuchy joined #git
05:24 tgies joined #git
05:30 espindola joined #git
05:30 a3Dman joined #git
05:30 Raging_Hog joined #git
05:32 qt-x joined #git
05:33 Yaphetspy joined #git
05:35 tgies joined #git
05:35 a_thakur joined #git
05:36 nilg` joined #git
05:38 faux___ joined #git
05:41 dmto joined #git
05:41 interne7y joined #git
05:42 tobiasBora joined #git
05:44 tgies joined #git
05:46 MattMaker joined #git
05:47 settermjd joined #git
05:48 cd83x joined #git
05:49 tgies joined #git
05:53 whatisfreenode joined #git
05:54 dmto joined #git
05:54 tgies joined #git
05:57 howdoi joined #git
05:58 infra-red joined #git
05:58 TomyLobo joined #git
05:59 tgies joined #git
06:00 emPi joined #git
06:01 rscata joined #git
06:04 ronskisika joined #git
06:04 tgies joined #git
06:05 infra-red joined #git
06:06 Raging_Hog joined #git
06:06 Macaveli joined #git
06:08 david007 joined #git
06:08 freimatz joined #git
06:09 ochorocho__ joined #git
06:09 SwiftMatt joined #git
06:09 tgies joined #git
06:14 Repox joined #git
06:14 tgies joined #git
06:14 Macaveli joined #git
06:19 mariuscc joined #git
06:19 tgies joined #git
06:20 Xe joined #git
06:25 Infamous joined #git
06:28 kenansulayman joined #git
06:30 tgies joined #git
06:33 liuzhen_ joined #git
06:37 sauvin joined #git
06:37 dmto joined #git
06:37 raijin joined #git
06:39 tgies joined #git
06:40 rominronin joined #git
06:42 cd83x joined #git
06:42 interne7y joined #git
06:42 faux___ joined #git
06:43 faux___ joined #git
06:43 mda1 joined #git
06:44 raijin joined #git
06:44 JeroenT joined #git
06:44 Sceorem joined #git
06:45 dreiss joined #git
06:46 JeroenT joined #git
06:48 outluck joined #git
06:50 Repox joined #git
06:50 exawatts joined #git
06:54 t0by joined #git
06:54 mda1 joined #git
06:54 lindenle joined #git
06:54 tgies joined #git
06:56 dmto joined #git
06:58 david007 joined #git
06:59 MattMaker joined #git
06:59 tgies joined #git
07:04 ramsub07 joined #git
07:05 tgies joined #git
07:05 eijk_ joined #git
07:07 nnyk_ joined #git
07:07 Psych joined #git
07:10 encod3 joined #git
07:10 tgies joined #git
07:12 a_thakur joined #git
07:12 JeroenT_ joined #git
07:12 JeroenT__ joined #git
07:13 liuzhen joined #git
07:14 Ozd joined #git
07:15 tgies joined #git
07:15 Jeroen___ joined #git
07:16 Akagi201 joined #git
07:20 JeroenT joined #git
07:22 ahmedelgabri joined #git
07:24 ferr joined #git
07:24 roxlu joined #git
07:24 dopesong joined #git
07:26 infra-red joined #git
07:26 Juzzika joined #git
07:27 Balliad joined #git
07:28 ki0 joined #git
07:30 tgies joined #git
07:30 ki0 joined #git
07:31 stuh84 joined #git
07:32 isxek joined #git
07:33 eletuchy_ joined #git
07:33 TomyWork joined #git
07:34 DevAntoine joined #git
07:35 fuchstronaut joined #git
07:35 MattMaker joined #git
07:35 tgies joined #git
07:36 Gonzo89 joined #git
07:37 cd83x joined #git
07:37 ramsub07 joined #git
07:40 tgies joined #git
07:42 Akagi201 joined #git
07:43 interne7y joined #git
07:44 JeroenT joined #git
07:45 tgies joined #git
07:48 GavinMagnus joined #git
07:48 JeroenT_ joined #git
07:49 elastix joined #git
07:50 nnyk_ joined #git
07:51 baraba joined #git
07:51 JeroenT__ joined #git
07:52 bonerx2k joined #git
07:54 Limes__ joined #git
07:54 tgies joined #git
07:56 ThomasLocke joined #git
07:57 qt-x joined #git
07:58 kurkale6ka joined #git
07:58 qt-x joined #git
08:00 tgies joined #git
08:00 mykespb joined #git
08:00 bonerzs joined #git
08:01 JeroenT joined #git
08:05 josuebrunel joined #git
08:05 tgies joined #git
08:06 Ozd left #git
08:06 djb-irc joined #git
08:07 nnyk_ joined #git
08:08 acetakwas joined #git
08:10 ochorocho__ joined #git
08:10 tgies joined #git
08:10 JeroenT_ joined #git
08:11 MattMaker joined #git
08:14 cyan__ joined #git
08:14 ToxicFrog joined #git
08:14 fracting joined #git
08:15 tgies joined #git
08:16 moriko joined #git
08:16 bongjovi joined #git
08:16 Alienpruts joined #git
08:17 leehambley joined #git
08:17 Asenar joined #git
08:18 JeroenT joined #git
08:19 Hanumaan joined #git
08:19 netj joined #git
08:20 tgies joined #git
08:23 guardianJ joined #git
08:24 cagedwisdom joined #git
08:25 tgies joined #git
08:26 Jellyg00se joined #git
08:27 marcogmonteiro joined #git
08:27 ahmed_elgabri joined #git
08:29 cdown joined #git
08:30 tgies joined #git
08:30 rahtgaz joined #git
08:31 cd83x joined #git
08:31 cdown_ joined #git
08:34 a_thakur joined #git
08:35 Hanumaan I have 2 git repositories to be shared is it bad to keep one git repository folder into another?
08:35 tgies joined #git
08:35 hegge joined #git
08:38 bq joined #git
08:38 SimonNa joined #git
08:39 fwdit joined #git
08:39 bq say i have some source code I want to post onto github as a new project. what is the easiest way to do this?
08:39 dopesong joined #git
08:39 grawity git init; git add .; git commit -m "initial commit"
08:39 bq the source code is not versioned using git.
08:39 troulouliou_div2 joined #git
08:39 grawity hence why I started with "git init"
08:40 tgies joined #git
08:41 bq grawity: then something push?
08:41 grawity yes
08:41 grawity github shows instructions once a new repo is created there
08:41 grawity basically `git remote add origin https://github.com/bq/mylittleproject; git push -u origin master` for the initial setup
08:41 fuchstronaut joined #git
08:42 nnyk_ joined #git
08:42 guardianJ left #git
08:43 skylite_ joined #git
08:44 interne7y joined #git
08:44 PCatinean joined #git
08:45 tgies joined #git
08:47 MattMaker joined #git
08:47 kamkha joined #git
08:47 Dro joined #git
08:48 MadHatter42 joined #git
08:48 a3Dman joined #git
08:48 yuhlw joined #git
08:50 dan2k3k4 joined #git
08:50 tgies joined #git
08:51 yuhlw joined #git
08:51 kamkha hey all. I have a branch that looks like: ...—A—B—C, and I wanted to split commit A up into multiple commits, so I rebased back to A, reset, then re-added all of the work in many different commits (let's say ...—A1—A2—A3). Somewhere along the way, though, it looks like the rebase was cancelled, as trying to continue gives me "No rebase in progress?". So, I've got my branch of ...—A—B—C and this detached state I'm in n
08:51 kamkha How can I get my branch to be ...—A1—A2—A3—B—C?
08:52 tobiasvl hm. well if you note the SHAs of A1, A2 and A3 you could check out C again and !rebase_interactive and insert them?
08:53 tobiasvl !interactive_rebase
08:53 gitinfo Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.
08:54 eletuchy joined #git
08:54 King_Hual joined #git
08:54 King_Hual joined #git
08:55 kamkha tobiasvl: ah all right, I'll give that a go
08:55 tgies joined #git
08:55 tobiasvl probably better ways to do it
08:55 anu0 joined #git
08:55 yuhlw joined #git
08:56 nd joined #git
08:56 pol123456 joined #git
08:57 paul424 joined #git
08:58 dopesong joined #git
09:00 dopesong_ joined #git
09:00 mischat joined #git
09:00 kamkha tobiasvl: hmm, how can I add existing commits via interactive rebase? I can edit A and then reset its changes, but then how can I play back A1, A2, etc. (I have the list of SHAs), and still be able to continue the rebase afterwards?
09:00 tgies joined #git
09:02 tobiasvl kamkha: just remove A from the list (delete the line) and add A1, A2 and A3 as separate lines in its stead with "pick" in front, I believe
09:04 Lvjasha joined #git
09:04 i7c kamkha, did you run rebase --continue at some point during your initial attempt?
09:05 tgies joined #git
09:05 kamkha i7c: honestly, I'm not too sure what happened during the original rebase attempt (someone who wasn't me was splitting the commits and I came back to that detached HEAD state with no rebase in progress)
09:08 JayCroesus joined #git
09:08 outluck left #git
09:09 i7c Okay I see.
09:09 kamkha tobiasvl: that worked perfectly — thanks!
09:10 skylite_ joined #git
09:10 tgies joined #git
09:10 kamkha I've never used interactive rebase to insert completely detached commits before. it seems handy.
09:11 a3Dman joined #git
09:12 grawity this is both seemingly obvious and somehow evil
09:12 grawity I like it
09:12 i7c :D
09:12 kamkha I was also a bit of an idiot just now and inserted the A1, A2, A3, ..., in reverse order because the output of my `git log` and `git rebase -i` use different chronological orderings. whoops. easy enough to fix with yet another rebase.
09:13 circ-user-G1EtM joined #git
09:15 tgies joined #git
09:15 dopesong joined #git
09:16 liamonade joined #git
09:17 rnsanchez_ joined #git
09:20 acetakwas joined #git
09:20 JeroenT_ joined #git
09:20 tgies joined #git
09:23 MattMaker joined #git
09:25 JeroenT joined #git
09:25 cd83x joined #git
09:25 tgies joined #git
09:25 guardianJ joined #git
09:27 lubarch joined #git
09:30 joki joined #git
09:30 tgies joined #git
09:30 phanimahesh Interactive rebase is awesome. I blatantly do whatever I want to my code and do a rebase -i just before pushing.
09:31 phanimahesh Can't live without it.
09:33 d4t4 joined #git
09:34 d4t4 joined #git
09:34 nnyk_ joined #git
09:34 d4t4 joined #git
09:35 jatin30 joined #git
09:35 d4t4 joined #git
09:35 tgies joined #git
09:35 jatin30 how to sync local repo?
09:36 phanimahesh jatin30: What do you mean by sync? Can you be a little specific?
09:36 eijk_ joined #git
09:36 d4t4 joined #git
09:37 tobiasvl !crosspost
09:37 gitinfo Note: The above question was posted in both #git and #github
09:38 jatin30 synchornize. I made a new git repository on my system and pushed it to github. Now I have added a few folders which also i need to push but before that I was asked to sync my local repo , maybe it means that my local repo should look exactly like my remote
09:38 d4t4 joined #git
09:39 d4t4 joined #git
09:39 eletuchy_ joined #git
09:40 ramsub07 joined #git
09:40 tgies joined #git
09:41 zincrokx joined #git
09:41 fuchstronaut joined #git
09:42 settermjd joined #git
09:42 eletuch__ joined #git
09:45 interne7y joined #git
09:45 dimi1947 joined #git
09:48 eletuchy joined #git
09:50 tgies joined #git
09:51 LeMike joined #git
09:53 eletuchy_ joined #git
09:55 tgies joined #git
09:57 son joined #git
09:57 eletuchy joined #git
09:58 JeroenT_ joined #git
09:59 phanimahesh jatin30: You probably want to do a `git pull`, but can't say for sure without more info.
09:59 JeroenT__ joined #git
09:59 MattMaker joined #git
10:00 settermjd joined #git
10:00 phanimahesh jatin30: Are you using git commandline or any wrappers on top of it? git doesn't use ambiguous terms like 'sync' IIRC.
10:00 tgies joined #git
10:01 eletuchy_ joined #git
10:01 jatin30 phanimahesh: can I dm  you?
10:02 lukeer joined #git
10:02 lb how do i limit the output of git log to show commits which have "searchstring" in the actual changeset (not the message)? --grep only filters to logmessages from what i see in the docs?
10:04 tobiasvl lb: git log -S or -G
10:04 tobiasvl man git log
10:04 gitinfo the git-log manpage is available at http://jk.gs/git-log.html
10:04 eletuchy joined #git
10:04 tobiasvl -G is most relevant
10:04 boingy aka 'pickaxe'
10:05 tgies joined #git
10:06 JeroenT joined #git
10:06 nitesh_ joined #git
10:07 nitesh How do I find out which commit has gone into which version of the product. I mean , "git log" gives all the patches , but which patch went into which version, how can we find out
10:07 rochus joined #git
10:07 jatin30 I have made some folders in my local repo and I am unable to push it on my test branch on github remote repository
10:07 eletuchy_ joined #git
10:07 tobiasvl nitesh: what's a "version"?
10:07 tobiasvl a tag?
10:07 tobiasvl jatin30: !repro
10:07 gitinfo jatin30: [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
10:07 bgamari joined #git
10:07 lukeer Sorry if that's trivial, but I just don't get it: Colleague copied the repo to his laptop, worked at a customer's and committed to its repo copy. I stayed and also committed. Both to our respective master branch. How can I merge the copy-master branch back into my base-master?
10:08 guardianJ joined #git
10:08 rochus hello everyone. is there a smart way to track some git settings? for instance the .git/description file, or any gitweb.* or cgit.* configuration. I don't want to access the bare repository on the server to actually change these settings
10:09 tobiasvl lukeer: you use vague terms. what does "copy" mean, did your colleage _clone_ the repo? when yousay he "commited to its repo copy", you mean he didn't push? what does it mean that you "stayed"?
10:09 tobiasvl lukeer: but in general, if you have to different repos, you pull from him. or, often, he pushes to a central repo and you pull from that
10:09 tobiasvl pull will perform a merge
10:10 eletuchy joined #git
10:10 phanimahesh I assume the copy refers to a ordinary filesystem level copy, and there have been commits on both copies made independently.
10:10 Akagi201 joined #git
10:10 ochorocho__ joined #git
10:10 phanimahesh So yep, push one, pull from the second, then push second
10:10 tgies joined #git
10:11 phanimahesh jatin30: Others will be able to help if you can share a transcript here, instead of a dm.
10:12 eletuch__ joined #git
10:12 jatin30 tobiasvl: My local repository look like this - http://imgur.com/4S1lpoi and my github repo looks like this http://imgur.com/aNgnUu6 when even It ran ok
10:13 tobiasvl not sure what I'm looking for in those screenshots, but your local repo has more files I guess
10:13 tobiasvl !repro
10:13 gitinfo [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
10:13 eletuchy_ joined #git
10:16 weckl joined #git
10:18 jatin30 It ran ok as you can see here http://paste.linux.chat/view/4d302bed
10:18 eletuchy joined #git
10:18 EY__ joined #git
10:19 cd83x joined #git
10:21 jatin30 tobiasvl: My question is when i pushed the changes there were some new folders which I made which did not appear in my github repo. why is that when the command ran ok like you can see here http://paste.linux.chat/view/4d302bed
10:22 eletuchy_ joined #git
10:23 jhass jatin30: so you created a new branch? you have to switch to it on Github too
10:24 jhass oh you did, nvm
10:25 jhass your transcript doesn't show creating nor committing any folders
10:25 jhass note that git doesn't track empty folders
10:25 tgies joined #git
10:25 eletuchy joined #git
10:25 jatin30 ok!
10:25 CussBot joined #git
10:26 jatin30 but the fact that i mad a change to my local repo(i made some new empty folders) should be tracked and pushed to github as well right?
10:27 jhass no
10:27 jhass again, git doesn't track empty folders
10:27 tobiasvl !directory
10:27 gitinfo Git does not track directories, only files in directories.  Create a nonce file as a placeholder (eg .gitignore) to create the directory or create the directory as part of a post-checkout hook
10:27 guardianJ joined #git
10:28 eletuchy_ joined #git
10:30 tgies joined #git
10:31 eletuch__ joined #git
10:32 ocbtec joined #git
10:33 eletuchy joined #git
10:33 guardianJ left #git
10:35 MattMaker joined #git
10:35 _rnsanchez_ joined #git
10:35 tgies joined #git
10:36 eletuchy_ joined #git
10:38 ToBeCloud joined #git
10:38 eletuchy joined #git
10:39 ToBeCloud joined #git
10:39 guardianJ joined #git
10:40 Orion3k joined #git
10:40 eletuch__ joined #git
10:40 tgies joined #git
10:41 dan2k3k4 joined #git
10:42 EY joined #git
10:43 JeroenT joined #git
10:43 guardianJ left #git
10:43 eletuchy joined #git
10:45 tgies joined #git
10:46 interne7y joined #git
10:46 CustosLimen hi
10:46 CustosLimen how do I not build the gui ?
10:47 sdothum joined #git
10:48 osse CustosLimen: you mean gitk?
10:48 ahmed_elgabri joined #git
10:48 CustosLimen yes
10:48 CustosLimen nvm
10:49 osse make NO_TCLTK=1
10:49 CustosLimen this also worked: ./configure --without-tcltk
10:50 dopesong_ joined #git
10:50 osse ah
10:50 osse normal you don't use ./configure with git
10:50 fission6 joined #git
10:50 tgies joined #git
10:53 M-sbts joined #git
10:55 ciampix joined #git
10:55 lukeer tobiasvl: Sorry for the ambiguity. Have some definitions: "copy" as in copying a file or directory, the old, non-vcs way. "commit to his repo" means that he has a copy of the whole repo. He changes some code and then performs "$git commit -a". So the master on the laptop is changed. No "$git push" here since there's no connection from the remote site to the original repo in our home base. I...
10:55 lukeer ..."stayed" at the base. I didn't visit the customer with him.
10:55 dopesong joined #git
10:56 Lauven joined #git
10:56 tobiasvl lukeer: ok, so what's your question? how you can merge his code with yours with no connection between the repos?
10:57 jhass lukeer: worst case you copy his repo back to your machine and do git merge ../copy master
10:58 lukeer tobiasvl: Basically, yes. I have my repo here. I changed some code since the time he copied it. And I have his changed repo on a flash drive. And I want to keep my changes and to include his as well.
10:58 nnyk_ joined #git
10:58 tobiasvl ok, so you have his repo. then do what jhass said
10:59 tobiasvl git merge $PATH_TO_HIS_REPO master
10:59 CustosLimen osse, what do I use ?
10:59 bgamari joined #git
10:59 CustosLimen osse, I'm on solaris 10 - with nothing extra
10:59 osse CustosLimen: just make
11:00 CustosLimen osse, I see
11:00 CustosLimen osse, will consider that thanks
11:00 osse CustosLimen: where did you get the configure script from ? Normally you have to generate that in the first place
11:00 lukeer tobiasvl: Thanks a lot. I was not aware of this variant of merge until now.
11:00 CustosLimen ok so next question - I need to verify that git tar.gz is ok - but I don't have pgp
11:00 osse I mean with a clean copy o the sources
11:00 tgies joined #git
11:00 tobiasvl CustosLimen: md5?
11:00 CustosLimen osse, when I unpacked git-2.8.3.tar.gz it was just in there
11:00 tobiasvl safe enough at least
11:01 CustosLimen tobiasvl, I can do md5 - but where is a list of md5sums ?
11:02 jhass CustosLimen: sha256 okay too? https://www.kernel.org/pub/software/scm/git/sha256sums.asc
11:02 tobiasvl yeah, I forgot that they actually stopped using md5, so ignore my "safe enough" comment. sha256 should be safe ;)
11:03 tobiasvl of course, without PGP you can't verify the sig of the sha256 list…
11:03 eijk_ joined #git
11:04 jhass fetching it over HTTPS gives some security at least
11:05 tlaxkit joined #git
11:06 settermjd joined #git
11:06 tgies joined #git
11:06 bgamari joined #git
11:06 Nikhita joined #git
11:07 osse CustosLimen: hmmmmmmmmmmmmmmmmmmmmmmmm......... I don't think you can have gotten that straight from upstream then.
11:07 osse or maybe
11:07 artemisart joined #git
11:09 lb tobiasvl dammit i knew it was there somewhere. didn't scroll down enough :/ thanks
11:11 davisonio joined #git
11:11 tgies joined #git
11:11 guardianJ joined #git
11:11 MattMaker joined #git
11:12 acetakwas joined #git
11:13 raijin joined #git
11:13 cd83x joined #git
11:15 johnmilton joined #git
11:16 tgies joined #git
11:16 davisonio joined #git
11:19 EY joined #git
11:19 Haris joined #git
11:19 Haris hello all
11:19 Haris how to checkout or clone to the previous commit ?
11:21 Ediz joined #git
11:21 peepsalot joined #git
11:22 xbob joined #git
11:23 eletuchy joined #git
11:24 k3rn31 joined #git
11:25 i7c git checkout HEAD~
11:25 i7c (the term "clone" makes no sense here, I think)
11:25 tgies joined #git
11:27 Zerock joined #git
11:28 Haris HEAD~ will choose prev commit ?
11:28 dopesong joined #git
11:28 EY joined #git
11:29 Zerock Is there a way I can have Git not track submodule revisions? What I mean is, I have a repo with a submodule, but when I push to the server, I don't want it to push the actual submodule hash. I don't want to have to make a new commit every time the submodule has an update.
11:30 dopesong joined #git
11:31 deadnull_ joined #git
11:31 bremner well, the obvious way is don't use submodules, just nested repos
11:32 encod3 joined #git
11:32 rkazak joined #git
11:33 sostenuto joined #git
11:33 Heisenberg1276 joined #git
11:34 Repox_ joined #git
11:35 wrouesnel1 joined #git
11:35 tgies joined #git
11:36 Zerock I think that's evading the problem rather than solving it. I recall once cloning a repo that had instructions to do a git submodule init to pull them down.
11:36 qsx and submodules are fixed to a specific commit by design
11:36 nnyk_ joined #git
11:37 bremner I guess I don't understand what the problem is, other than submodules don't work like you wish they did.
11:37 qsx i give you a hint: submodules are most likely not the solution for the problem you face :)
11:37 * bremner tells qsx to get out of his brain
11:38 qsx bremner: wat
11:41 tgies joined #git
11:41 GavinMagnus Re
11:41 bremner thank god you're back.
11:42 k3rn31 joined #git
11:42 qsx very well, i guess i can leave then :)
11:44 Zerock left #git
11:45 SimonNa joined #git
11:45 guardianJ joined #git
11:46 tgies joined #git
11:47 interne7y joined #git
11:48 MattMaker joined #git
11:49 mizu_no_oto joined #git
11:51 tgies joined #git
11:51 chris2 i need to write a script that does a git commit on an totally unconfigured box
11:51 chris2 and just git commit --author 'a <b>' fails with "empty ident name (for <(null)>) not allowed"
11:53 Somelauw joined #git
11:53 Somelauw I have done a git clone with --depth 1. Is there a way to extend the depth of this clone further?
11:54 toothrot joined #git
11:55 grawity fetch --depth=1000
11:55 Somelauw thanks
11:55 Nikhita left #git
11:55 grawity (note that it's --depth, not --deepen, so if you already have 1000 commits, the next time you'll need --depth=2000 or so)
11:56 grawity there's also --unshallow to download everything
11:56 tgies joined #git
11:57 Rish joined #git
11:58 fission6 joined #git
11:58 skakelaar joined #git
11:58 snufft joined #git
11:59 a_thakur joined #git
11:59 KevinMGranger Whoa, I thought shallow repos were permanently stuck that way? Did I make that up?
11:59 kugel joined #git
12:00 skakelaar Good afternoon. In what tense should commit messages be written in?
12:01 tgies joined #git
12:01 fission6 joined #git
12:02 tobiasvl skakelaar: usually, something like "Adds new functionality"
12:02 tobiasvl not sure what that tense is called in English
12:02 tobiasvl but the common way is to describe what the commit does if applied
12:03 Sceorem joined #git
12:04 thiago joined #git
12:05 nettoweb joined #git
12:06 tgies joined #git
12:06 osse KevinMGranger: the ability to unshallow is more recent
12:06 osse KevinMGranger: so a couple of years ago they were permanently stuck that way :)
12:06 KevinMGranger That's what I thought. cool stuff
12:07 skakelaar Great thanks. So best pratice is to use present tense. Hence, the message can be objectively understood in which ever direction it would be approached in
12:08 KevinMGranger Another common style is... idk what it's called either, but as if it were a command. "Add new functionality". As in, reading the commits in order tells the code what to do
12:08 grawity the imperative
12:08 grawity in comparison, present tense in commit messages is quite rare
12:08 cd83x joined #git
12:08 dsfreak93 joined #git
12:08 skakelaar @grawity thank you for the correction
12:09 grawity imperative is most common ("do foo"), then past tense ("did foo")
12:09 bitkiller joined #git
12:09 Grievre "git bisect" sounds like what a british samurai does when someone annoys them
12:09 tobiasvl grawity: really? I thought my example was very common…
12:09 synthroid joined #git
12:09 tobiasvl maybe I should read up on that
12:11 Grievre I write in imperative in my comments but in past tense in my commit messages
12:11 KevinMGranger I've seen both widely used
12:11 Grievre well, okay, let's be more specific
12:11 KevinMGranger I've seen ALL the tenses
12:11 tgies joined #git
12:11 ochorocho__ joined #git
12:11 Grievre "don't squabnicate when the frunkle is rigid" or "Changed FooModule to not squabnicated when the frunkle is rigid"
12:11 Grievre those are the two common forms of commit messages for me
12:12 Grievre of course a lot of my commit messages are just "duh" or "oops"
12:12 Grievre (I know, I know, it's bad)
12:12 ncd|leeN joined #git
12:12 Grievre (it's just humiliating to type out what you're fixing when it's a really dumb mistake on your own part)
12:13 grawity tobiasvl: on the contrary, I can't even remember when I've last seen it
12:13 ElChicoNube joined #git
12:13 Grievre use past tense when the verb is what you did with the code, use imperative when the verb is what the code does
12:14 skakelaar So can we agree that imperative is best practice?
12:14 grawity more or less, yes
12:14 skakelaar because the message has to do with change
12:15 skakelaar it should be approachable from any direction in time
12:15 skakelaar I always thought the infinitive would be better, IMO
12:16 grawity that would sound outright weird
12:16 skakelaar Thank you ladies and gents. Have a productive day
12:16 grawity although, on the other hand
12:16 grawity now that I think of it, they're actually similar in some ways
12:18 acetakwas joined #git
12:18 tvw joined #git
12:19 Calrik joined #git
12:19 rwb joined #git
12:21 jeffreylevesque joined #git
12:21 _pix joined #git
12:22 drodger joined #git
12:23 djb-irc joined #git
12:24 MattMaker joined #git
12:25 JJM joined #git
12:28 fuchstronaut joined #git
12:28 k3rn31 joined #git
12:29 KevinMGranger On the other other hand i have a git alias for commit --no-edit --allow-empty-message because I'm a bad person
12:30 Haris is "HEAD~" meant "as is" in the above ?
12:31 liquidjamm joined #git
12:31 T4nk5bb0t KevinMGranger, You are a bad person! >.<
12:32 KevinMGranger heh I only do that locally before doing a big squish. Commit early, commit often, then clean up before pushing
12:32 boingy Haris: tilde means ancestor whereas caret means parent
12:32 T4nk5bb0t That sounds so cumbersome. I don't know why.
12:33 T4nk5bb0t boingy, When do I need to worry about ~ and ^?
12:34 _ikke_ T4nk5bb0t: man gitrevisions
12:34 gitinfo T4nk5bb0t: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
12:35 EvilDMP joined #git
12:35 T4nk5bb0t _ikke_, I forget that man pages exist. I dev on windows.
12:36 boingy T4 when HEAD is a merge commit or not. When merge commit: HEAD^ is the first parent (branch merge into) and HEAD^2 is the second parent. HEAD~ is the nearest upstream commit in a linear ancestry
12:37 t-mart__ joined #git
12:38 T4nk5bb0t boingy, So, I have master, I create a main (example) branch from master and then a V1.0 branch from main.  if I am in V1.0, then HEAD^ refers to main and HEAD^2 refers to master?
12:38 j416 T4nk5bb0t: HEAD~ == HEAD~1 == HEAD^1 == HEAD^
12:38 osse T4nk5bb0t: if you haven't created any commits then they are all equal
12:39 T4nk5bb0t I think I am getting it. Everything in git is commit based. Branches are just references to certain commits.
12:39 osse correct
12:39 j416 yes.
12:39 T4nk5bb0t This has probably been my biggest break through in git.
12:39 j416 T4nk5bb0t: "branch heads" would perhaps be a better term to use; the branch would be the series of commits that lead up until the branch head
12:40 T4nk5bb0t j416, ok
12:40 j416 T4nk5bb0t: (and several branch heads can of course share the same history)
12:40 j416 T4nk5bb0t: but, in general I guess we just say branches and don't worry about the terminology too much
12:40 T4nk5bb0t j416, Right, as soon as you merge from V1.0 to main, they both share that history.
12:41 j416 T4nk5bb0t: then main has the history of V1.0, but not the other way round.
12:41 j416 T4nk5bb0t: (necessarily)
12:41 T4nk5bb0t right
12:42 shades joined #git
12:42 T4nk5bb0t j416, Thanks!
12:42 boingy T4nk5bb0t HEAD is a reference i.e. a pointer that means what commit you are. IIRC HEAD is not related to branches. caret and tilde are used by git-diff and git-log to isolate segment of a repository
12:42 T4nk5bb0t I am glad ya'll are here. I read and read and read but sometimes I just don't exactly understand what the article says and it is difficult to ask an article something. :)
12:42 j416 T4nk5bb0t: a merge is just a regular commit with some state, the only thing that sets it apart from a non-merge commit is that has more than one parent reference
12:43 j416 T4nk5bb0t: (well, and that it typically has something like "Merge foo into bar" as its subject, but this does not necessarily mean that it actually _is_ a merge commit (someone may have fucked up)
12:46 T4nk5bb0t thanks!
12:47 dhcpfreely left #git
12:48 interne7y joined #git
12:48 diegoaguilar joined #git
12:48 solars quick question: if you're working on a feature branch off dev, and the usual workflow is to commit, merge to dev, push dev - how do you handle it if someone commited to origin/dev in the meantime? if I'm on dev I just do git pull --rebase, but what if I commited the feature branch because I didn't notice the change?
12:48 d0nn1e joined #git
12:49 Haris guys does HEAD~ mean previous commit ?
12:49 j416 solars: work on a separate branch, keep that rebased on dev
12:49 daguilaraguilar joined #git
12:49 T4nk5bb0t solars, Don't take what I say as the truth but it does sound like a rebase to me.
12:49 j416 Haris: first parent, yes
12:49 Haris in git checkout HEAD~
12:49 zadock joined #git
12:49 j416 solars: git pull --rebase would work as well, but it's nicer to have a branch
12:49 Haris I'm not on master branch. I'm on a different branch
12:49 Haris which is active
12:50 L8D joined #git
12:50 son joined #git
12:50 ahmedelgabri joined #git
12:51 solars j416, you mean, switch to dev git pull; switch to feature; stash && git rebase dev?
12:51 j416 solars: without the stash, yes
12:51 solars j416, just trying to optimize my way of doing things
12:51 solars j416, alright, thanks for the input
12:51 j416 solars: git commit whateveryouhave && git fetch && git rebase origin/dev
12:51 nnyk_ joined #git
12:52 j416 solars: it's handy to have everything committed before you start moving around
12:52 j416 solars: then you won't shoot yourself in the foot
12:52 solars j416, right, that makes sense
12:53 Cata|Work joined #git
12:55 fmcgeough joined #git
12:58 lindenle joined #git
13:00 MattMaker joined #git
13:00 Kulrak joined #git
13:00 Kulrak joined #git
13:01 jerematic joined #git
13:02 NeverDie joined #git
13:02 cd83x joined #git
13:02 spaceone hi
13:03 spaceone i need to search the stash which contains a special string
13:03 spaceone how can i do this?
13:03 cdown joined #git
13:04 drodger joined #git
13:04 lukeer "$git merge $PATH_TO_OTHER_REPO master" Doesn't work as expected. It just displays an error "merge: $PATH_TO_OTHER_REPO - not something we can merge". The other repo has been file-system-copied from my repo and both repos have changes committed to them since. Using git 1.9.5.msysgit.1.
13:04 lukeer Notice there's no "fatal" within the error message
13:05 JeroenT joined #git
13:06 selckin spaceone: dunno, but can just script it:  for i in $(git stash list | cut -d':' -f1); do echo $i; git stash show -p $i | grep needle; done
13:07 boingy spaceone: git diff -Sstring stash@{0} HEAD or git diff -Gregexp stash@{0} HEAD
13:07 Iqv joined #git
13:08 osse lukeer: you want git pull.
13:08 osse lukeer: ''git merge foo bar'' considers both foo and bar to be branches to merge
13:08 spaceone boingy: this is only for the first stash
13:09 fracting joined #git
13:09 mikecmpbll joined #git
13:09 spaceone selckin: this seems to match every stash
13:09 boingy spaceone: multiple stashes?
13:10 lukeer So it'll be "$git pull $PATH_TO_OTHER_REPO master" then?
13:10 espindola joined #git
13:10 spaceone boingy: of course.. i have about 1000 stashes
13:10 drodger joined #git
13:10 osse lukeer: assuming your intention is to get the master branch of OTHER_REPO and merge it into the current branch in your local repo, yes.
13:10 osse this is exactly what pull is for
13:11 eletuchy joined #git
13:11 selckin spaceone: it prints the stash and then the grep output, so the one above matched needle, you can do something better but too lazy to type that out
13:11 lukeer Osse: Your assumption is correct. I'm on master branch and want to get the changes of the master branch of a repo that has been copied off mine.
13:12 spaceone selckin: -p doesn't work somehow for me
13:12 NeverDie_ joined #git
13:12 spaceone there is not diff printed
13:12 lukeer Osse: Changes have been made to both master branches since the copying.
13:13 selckin spaceone: if you don't know how grep works ic an't help you
13:13 spaceone git version 2.1.4
13:13 spaceone selckin: :D:D i know how grep works
13:13 spaceone selckin: but git doesn't print a diff
13:13 spaceone probably my version is to old
13:13 spaceone too*
13:14 lubarch left #git
13:14 a_thakur joined #git
13:14 spaceone with show -v it works
13:14 spaceone thakns
13:15 davisonio joined #git
13:16 lukeer Osse: That worked. Thanks.
13:16 cdown joined #git
13:17 v0lksman I'm trying to clean up a repo and remove a bunch of branches that are no longer needed.  https://dpaste.de/p2C9
13:17 rnsanchez_ joined #git
13:17 v0lksman so how do you delete these remote branches?  (I'm using GitLab as a central)
13:18 jhass v0lksman: git push origin :comment_spam
13:18 jhass basically it say "push nothing to ..."
13:18 cdown joined #git
13:19 v0lksman jhass: thanks, but I get this still:  https://dpaste.de/jVFf
13:21 burzum joined #git
13:21 jhass git fetch --prune ?
13:22 fuchstronaut joined #git
13:22 v0lksman jhass: perfect!!! thanks!
13:22 cdown joined #git
13:23 jimi_ joined #git
13:23 jimi_ joined #git
13:24 ribasushi joined #git
13:26 fracting joined #git
13:26 burzum left #git
13:31 nnyk_ joined #git
13:32 cdg joined #git
13:33 jaguarmagenta joined #git
13:35 Macaveli_ joined #git
13:35 k3rn31 joined #git
13:36 JJM joined #git
13:36 MattMaker joined #git
13:37 unbalancedparen joined #git
13:38 JeroenT joined #git
13:39 j416 I have two independent repos, and I want to merge on into the other, into a subdir, keeping the history of it, so that I end up with effectively two orphan histories merged into one. How can I?
13:40 j416 (s/repos/branches of repos/)
13:41 phanimahesh How do you want to interleave the commits?
13:41 j416 phanimahesh: not at all
13:41 j416 phanimahesh: I want to keep them as-is.
13:41 j416 history should look like a V
13:42 hiennaj joined #git
13:42 mikecmpbll joined #git
13:43 checkItOut joined #git
13:43 j416 thinking I could just merge with --no-commit and move things into place, hm.
13:43 j416 might be most clear
13:43 phanimahesh Oh. I have never done such a thing.
13:43 Macaveli joined #git
13:44 Akagi201 joined #git
13:44 phanimahesh Yep. That will probably work. Unless git errors out sying no common ancestor
13:44 j416 phanimahesh: but you made me think; I might filter-branch to move it all into the right subdir first, to make for a more comprehensible history
13:45 rgrinberg joined #git
13:45 checkItOut joined #git
13:46 Kulrak joined #git
13:46 Kulrak joined #git
13:47 phanimahesh joined #git
13:47 Dougie187 joined #git
13:48 chitopunk joined #git
13:49 interne7y joined #git
13:49 k3rn31_ joined #git
13:49 italoacasas joined #git
13:51 phanimahesh https://github.com/andreyvit/git-subdir looks like it'll do what you want.
13:53 mangolisk joined #git
13:55 zivester joined #git
13:55 encod3 joined #git
13:56 cd83x joined #git
13:57 JeroenT joined #git
13:58 checkItO1t joined #git
13:59 T4nk5bb0t joined #git
14:00 Macaveli_ joined #git
14:01 toogley joined #git
14:03 marc_v92 joined #git
14:04 peepsalot joined #git
14:04 Literphor joined #git
14:05 floatingpoint joined #git
14:05 yqt joined #git
14:06 eletuchy joined #git
14:06 ahmedelgabri joined #git
14:07 AaronMT joined #git
14:09 L8D joined #git
14:10 ash_workz joined #git
14:10 Kulrak joined #git
14:10 Kulrak joined #git
14:11 Noldorin joined #git
14:12 fuchstronaut joined #git
14:12 |meta joined #git
14:12 ochorocho__ joined #git
14:12 MattMaker joined #git
14:12 nnyk_ joined #git
14:13 ribasushi joined #git
14:14 ramsub07 joined #git
14:15 madewokherd joined #git
14:15 dhollinger joined #git
14:18 phaleth joined #git
14:19 fedexo joined #git
14:20 lrvick joined #git
14:20 mylord joined #git
14:21 checkItO1t joined #git
14:21 Sendoushi joined #git
14:22 nnyk_ joined #git
14:23 CEnnis91 joined #git
14:23 drodger joined #git
14:25 durham joined #git
14:29 ciampix joined #git
14:31 mmlb joined #git
14:31 djb-irc joined #git
14:33 WayToDoor joined #git
14:33 JeroenT joined #git
14:34 mikecmpb_ joined #git
14:35 JeroenT joined #git
14:36 Kulrak joined #git
14:36 Kulrak joined #git
14:38 CJKinni joined #git
14:38 hiennaj left #git
14:38 JeroenT_ joined #git
14:39 Seveas j416: git subtree is your friend
14:39 Seveas it's in git.git/contrib, but some distros ship it
14:39 j416 Seveas: nah, I just filter-branched it and merged it now; thanks
14:39 cd83x joined #git
14:39 j416 Seveas: subtree seems too much for what I needed
14:39 Seveas that works too :)
14:40 j416 yeh
14:40 kevwil joined #git
14:40 j416 the other repo is going away anyway
14:40 EY___ joined #git
14:41 Sansa994 joined #git
14:41 nnyk_ joined #git
14:41 drodger joined #git
14:41 Gitzilla joined #git
14:44 checkItOut joined #git
14:45 dcpc007 left #git
14:47 phanimahesh What do you mean you filter-branched? How can it help? Just read the man page, and i can not think ofanything
14:48 Seveas I'm guessing a tree or index filter that moves all files.
14:48 MattMaker joined #git
14:49 interne7y joined #git
14:50 fracting joined #git
14:51 r00tWearsRedHats joined #git
14:51 djb-irc joined #git
14:51 danchr joined #git
14:52 endiruna joined #git
14:52 checkItOut joined #git
14:52 Orion3k joined #git
14:53 phanimahesh Okay. Filter-branch to move everything into subdir, and then merge?
14:54 danchr joined #git
14:55 gigabomb joined #git
14:55 Seveas could be done with merge -s subtree as well :)
14:56 ramsub07 joined #git
14:57 gigabomb joined #git
14:57 gigabomb joined #git
14:58 sangy joined #git
14:58 mbrzuzy joined #git
14:59 phanimahesh cool.
14:59 jim_carry joined #git
14:59 jim_carry hello
14:59 gitinfo jim_carry: 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.
14:59 raijin joined #git
15:00 eletuchy joined #git
15:01 marc_v92 joined #git
15:01 j416 phanimahesh: yes
15:02 frem_ joined #git
15:02 j416 Seveas: seems filter-branching first makes for a more convenient history; a little less accurate of course, but no need to --follow every time
15:05 monoxane joined #git
15:05 clemf joined #git
15:06 [diecast] joined #git
15:06 Seveas j416: ooh, excellent point
15:06 ochorocho__ joined #git
15:07 j416 :)
15:07 ToeSnacks joined #git
15:07 jleclanche joined #git
15:07 zero7 joined #git
15:07 cstrahan joined #git
15:07 checkItOut joined #git
15:08 imdsm_ joined #git
15:08 cloudcell__ joined #git
15:08 bango2 joined #git
15:08 fss joined #git
15:08 dmto joined #git
15:09 checkItOut joined #git
15:09 DarkMukke joined #git
15:09 paperziggurat joined #git
15:10 jeffreylevesque joined #git
15:11 hashpuppy joined #git
15:11 kilo_bravo joined #git
15:13 checkItOut joined #git
15:13 fracting joined #git
15:13 Akagi201 joined #git
15:14 bollullera joined #git
15:14 TankAbb0t joined #git
15:14 bollullera left #git
15:15 phanimahesh joined #git
15:16 toogley joined #git
15:16 King_Hual joined #git
15:16 King_Hual joined #git
15:17 toogley joined #git
15:17 monoxane joined #git
15:17 fracting joined #git
15:17 SwiftMatt joined #git
15:18 EY joined #git
15:19 dreiss joined #git
15:20 espindola joined #git
15:20 k3rn31 joined #git
15:21 fracting joined #git
15:21 fission6 joined #git
15:22 kus joined #git
15:22 dmj joined #git
15:22 netj joined #git
15:24 MattMaker joined #git
15:24 fracting joined #git
15:26 phanimahesh joined #git
15:28 checkItOut joined #git
15:28 fracting joined #git
15:29 checkItOut joined #git
15:32 phanimahesh joined #git
15:33 phanimahesh joined #git
15:34 jaguarmagenta joined #git
15:38 phanimahesh joined #git
15:41 L8D joined #git
15:42 kpease joined #git
15:43 fuchstronaut joined #git
15:43 synthmeat joined #git
15:45 k3rn31_ joined #git
15:50 nofacade joined #git
15:50 lindenle joined #git
15:50 SteenJobs joined #git
15:50 interne7y joined #git
15:50 grift left #git
15:51 eijk joined #git
15:53 tyreld joined #git
15:54 rgrinberg joined #git
15:54 eletuchy joined #git
15:54 L8D joined #git
15:56 SteffanW joined #git
15:57 InfoTest joined #git
15:58 josuebrunel joined #git
15:59 madewokherd joined #git
15:59 L8D joined #git
16:00 Haris left #git
16:00 Pyrogerg joined #git
16:00 MattMaker joined #git
16:01 EY joined #git
16:01 JZA joined #git
16:02 cyan__ joined #git
16:03 leehambley joined #git
16:05 nilg joined #git
16:05 synthroid joined #git
16:06 LeBlaaanc joined #git
16:08 subhojit777 joined #git
16:08 jstimm_ joined #git
16:09 liquidjamm joined #git
16:10 ribasushi joined #git
16:11 hiennaj joined #git
16:12 mylord left #git
16:13 satifant joined #git
16:13 anberg joined #git
16:15 Darcidride joined #git
16:16 Gonzo89 joined #git
16:17 roadgear joined #git
16:17 peepsalot joined #git
16:18 EY joined #git
16:19 checkItOut joined #git
16:20 davisonio joined #git
16:20 livingstn joined #git
16:21 blackwind_123 joined #git
16:21 fscala joined #git
16:25 paul424 joined #git
16:25 zacsek joined #git
16:26 Literphor joined #git
16:28 imachuchu joined #git
16:29 grift joined #git
16:29 drodger joined #git
16:30 drbean joined #git
16:30 jottr joined #git
16:31 charolastra__ joined #git
16:31 sLite joined #git
16:31 d4t4 joined #git
16:32 GavinMagnus left #git
16:34 bruce_lee joined #git
16:34 TomyLobo joined #git
16:34 davisonio joined #git
16:36 MattMaker joined #git
16:37 drbean joined #git
16:42 nidr0x joined #git
16:44 circ-user-ij72Z joined #git
16:44 IWishIKnew joined #git
16:44 infra-red joined #git
16:44 nitin_ joined #git
16:45 jim_carry joined #git
16:45 fedexo joined #git
16:48 tristanp joined #git
16:48 Darcidride joined #git
16:48 eletuchy joined #git
16:50 orbitphreak joined #git
16:52 bewilled joined #git
16:54 durham joined #git
16:54 trelane joined #git
16:54 fuchstronaut joined #git
16:54 trelane is there a good cheatsheet for git?
16:54 trelane preferably laminated/hardcopy
16:55 pwnz0r joined #git
16:55 nilg` joined #git
16:55 yqt joined #git
16:56 Hedgework trelane: I have one at the house you can have.
16:56 trelane Hedgework, excellent!
16:56 Hedgework np
16:56 jimi_ joined #git
16:58 hahuang61 joined #git
16:59 bewilled Hello all. I want to save the totalility of a remote git repository with all of it's branches. This is because there's a lot of branches I will delete( clean up ) for ends of organization. What command do I need to use to get all of those remote git branches and save them locally?
16:59 phanimahesh git clone ?
17:00 phanimahesh Pulls in all branches by default.
17:00 CJKinni` joined #git
17:01 LeBlaaanc joined #git
17:02 bewilled phanimahesh: nice, then I'll save the downloaded folder in backup space to keep all the files.
17:02 KellerFuchs joined #git
17:02 Hedgework bewilled: Yep, it's that easy. :)
17:02 bewilled phanimahesh: many thanks. I'll get to it asap
17:03 elsevero joined #git
17:03 jbitdrop joined #git
17:03 orbitphreak joined #git
17:04 kadoban joined #git
17:04 [gmi] joined #git
17:05 benwbooth joined #git
17:05 cd83x joined #git
17:07 darkfrog joined #git
17:07 Pyrogerg I'm confused. git status shows a number of changes not staged for commit, mostly deleted and modified files. I can't figure out how to add them.
17:08 ocbtec joined #git
17:08 darkfrog I just did a git reset to remove several revisions back to an older commit, but my origin/master is still stuck at the original HEAD.  How do I get the new HEAD to be origin/master?
17:08 Pyrogerg I've tried git add * and git add <filename>, but they still show up as not staged.
17:09 mbrzuzy joined #git
17:10 hahuang61 joined #git
17:10 ki0 joined #git
17:11 perlpilot Pyrogerg: you've got files that were part of the repo, but were deleted and you want them back
17:11 perlpilot ?
17:13 Pyrogerg No, they were deleted because they were renamed. Don't want them back with their original names.
17:13 MattMaker joined #git
17:13 Pyrogerg +perlpilot^
17:14 ojacobson Pyrogerg: either upgrade git (in which case '--all' is the default) or try 'git add --all <paths>'
17:15 ojacobson in older versions, 'git add' will add new and modified files, but not removals
17:15 ojacobson '--all' causes it to include removals as well (and I have an alias, "git this", for "git add --all :/")
17:15 Pyrogerg ojacobson: I updated git to 2.8.1 yesterday, so that's probably not an issue.
17:15 ojacobson then, !transcript
17:15 gitinfo Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
17:16 Pyrogerg git add --all did the trick
17:16 diogenese joined #git
17:16 Dyonisos joined #git
17:18 ciampix joined #git
17:19 SteffanW joined #git
17:19 editshare-ericf joined #git
17:20 ramsub07 joined #git
17:20 ajf- joined #git
17:20 ajf- is there a form of git checkout that is equivalent of copying the .git/ directory over ?
17:20 ajf- no change in files. just get me .git and tell me what is different
17:20 darkfrog left #git
17:21 dsop joined #git
17:21 jhass ajf-: I'm not sure I follow, are you looking to diff a branch in one repo to one in another repo?
17:22 ajf- no, suppose I have a project that is tracked in git. then, I have a copy of that project somewhere, not tracked in git, and it could have differences.
17:22 ajf- I usually would copy .git over, and then I'll just get a diff that shows what is different
17:23 _rnsanchez_ joined #git
17:23 ojacobson git init . && git remote add origin /path/to/existing/repo && git fetch --all
17:23 ajf- I was wondering if there is a way to do that without having a checked out copy of the project (no .git/ directory available to copy from)
17:23 ojacobson you really don't want to copy .git
17:23 ajf- ah, yeah I guess that's it
17:23 ojacobson .git has things in it like hooks and submodule repos that are awkward when copied
17:23 Eugene ajf- - the tool you're looking for is `diff`.
17:23 ojacobson yeah, or diff -r -u path-a path-b
17:23 ajf- no but the goal is not to be able to do a diff
17:24 Eugene Or rsync --dry-run
17:24 ajf- just get it in git without losing things
17:24 ajf- and then check out a branch with the changes,etc.
17:24 Eugene Either you make it a repo and git can deal with it, or it isn't a repo and you can't use git tools. There's no magic bullet
17:24 Eugene !xy
17:24 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
17:27 rhubarbIsCrunchy joined #git
17:28 jasom ajf-: if you just want a new branch in git that is identical to some external files, then make a new branch, delete everything, copy those files in and add them.
17:28 ajf- the first suggestion by ojacobson seems to be exactly what I need
17:28 jasom ajf-: sounds good
17:29 sbeller "GIT_DIR=a/b/.git GIT_WORK_TREE=c/d/ git diff HEAD" or such
17:29 sbeller no need to copy stuff around
17:29 jasom sbeller: duh! I feel stupid now
17:30 sbeller Git is a tool designed to make people feel stupid ;)
17:30 sbeller I have these moments all the time
17:30 Eugene Nothing about git was designed; stop anthromorphizing it
17:33 sbeller okay ¯\_(ツ)_/¯ Let's say it just came to existence, then?
17:33 akiva joined #git
17:34 EvilPenguin joined #git
17:34 kpease joined #git
17:34 jaguarmagenta joined #git
17:35 SteenJobs joined #git
17:35 ferr joined #git
17:36 ki0 joined #git
17:36 jasom Eugene: sbeller was anthropomorphizing the git developers, not git...
17:37 jottr_ joined #git
17:37 nilg` joined #git
17:37 hahuang61 joined #git
17:38 kpease joined #git
17:39 Lauven joined #git
17:42 L8D joined #git
17:42 eletuchy joined #git
17:44 jottr joined #git
17:45 marshmn joined #git
17:45 sklvch joined #git
17:46 kpease joined #git
17:46 Sasazuka joined #git
17:48 realz joined #git
17:49 MattMaker joined #git
17:49 mda1 joined #git
17:49 SteffanW joined #git
17:51 Macaveli joined #git
17:55 davisonio joined #git
17:55 L8D joined #git
17:57 knutstrut joined #git
17:57 elementary joined #git
17:58 SwiftMatt joined #git
17:59 sklvch left #git
18:00 m0viefreak joined #git
18:00 elementary hi everyone :)
18:00 gitinfo elementary: 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.
18:02 elementary left #git
18:03 ahmedelgabri joined #git
18:05 Repox joined #git
18:08 rnsanchez joined #git
18:10 BSaboia joined #git
18:12 annoymouse joined #git
18:12 annoymouse I just completely botched a merge and I'm trying to undo it
18:12 annoymouse I've already pushed it to origin also
18:13 tobiasvl annoymouse: then reverting would be best. man git revert
18:13 gitinfo annoymouse: the git-revert manpage is available at http://jk.gs/git-revert.html
18:13 annoymouse tobiasvl: I did git revert -m 1 <commit>
18:13 annoymouse But I'm not really sure which commit I should be choosing
18:13 tobiasvl the merge commit
18:15 annoymouse Would that be the one with the message: "Merge branch '<branch>' of https://github.com/<user>/<repo> into <branch>"?
18:15 tobiasvl yes
18:15 tobiasvl that's the commit you want reverted, right?
18:15 annoymouse tobiasvl: I want to undo the entire merge
18:15 tobiasvl yes
18:15 annoymouse So I did that
18:15 tobiasvl good
18:16 annoymouse Now `git status` is telling me that: "Your branch and 'origin/sheets2gdrive' have diverged, and have 1 and 1 different commit each, respectively."
18:16 _nadim joined #git
18:16 annoymouse How do I deal with that tobiasvl?
18:16 prsn joined #git
18:16 tobiasvl you merge
18:17 annoymouse git merge origin/<branch>?
18:17 nettoweb joined #git
18:17 tobiasvl did you fetch from the remote branch recently? if so, the new commit on origin/sheets2gdrive is probably someone else's work that got pushed before you reverted
18:17 tobiasvl if not, did you do a git reset at any point while trying to figure this out?
18:17 tobiasvl annoymouse: I would rebase
18:18 annoymouse tobiasvl: I fetched immediately before I merged
18:18 annoymouse I think it might be the merge commit
18:18 eletuchy joined #git
18:18 annoymouse And I did not do a reset
18:18 nwkj86 joined #git
18:19 tobiasvl but it says 1 and 1 different commit, so each branch has a commit the other doesn't have?
18:19 tobiasvl take a look at origin/sheets2gdrive then in that case maybe
18:19 tobiasvl the commit on your branch is obviously the revert commit, but I wonder what the remote-tracking branch has that you don't
18:20 tobiasvl but you can probably just rebase your branch on origin/sheets2gdrive.
18:20 durham joined #git
18:20 drodger joined #git
18:20 annoymouse That's what I did
18:20 eletuchy_ joined #git
18:20 tobiasvl ok, so now they don't diverge and you can push the revert?
18:20 durham joined #git
18:21 annoymouse tobiasvl: On branch sheets2gdrive. Your branch is up-to-date with 'origin/sheets2gdrive'.
18:21 annoymouse So not quite
18:21 annoymouse and my last commit is still showing the merge
18:22 toogley joined #git
18:23 sjohnson left #git
18:23 annoymouse tobiasvl: Ik that this is a terrible idea, but could I just nuke whatever I've done in the past hour
18:23 eletuchy joined #git
18:24 jhass does anybody else have a clone of the remote?
18:24 annoymouse Move back my HEAD to point to the commit before all of this happened?
18:24 annoymouse jhass: Yes, but not of this branch
18:24 annoymouse actually no
18:24 annoymouse This is a "fork" on GitHub
18:25 annoymouse So people have clones of the upstream repo, but not of my remote repo
18:25 Pulp joined #git
18:25 MattMaker joined #git
18:25 eletuch__ joined #git
18:26 BSaboia joined #git
18:26 annoymouse jhass: Also I have an open PR to upstream from this branch
18:26 BSaboia joined #git
18:26 annoymouse I really f***ed up this time
18:26 t0by joined #git
18:27 jhass I'm confused, let me put differently, does anybody have a local branch/clone of the stuff you want to undo?
18:27 annoymouse Not to my knowledge
18:28 jhass then I'd argue it's okay to force push, git log to find out the commit you want to back to, git reset --hard <sha> to do so, git push -f origin sheets2gdrive to push
18:28 StuartMI joined #git
18:28 jhass site note: your github PR will automatically close if you make your branch even with upstream
18:28 eletuchy joined #git
18:29 annoymouse How would my branch be even with upstream? I have 40+ commits that upstream won't have until I merge
18:30 rahtgaz joined #git
18:30 jhass how would I know?
18:30 jhass could be that you only had 2-3 commits and want to git reset --hard behind them
18:30 eletuchy_ joined #git
18:30 annoymouse No
18:31 annoymouse I want to move my branch back to my last commit from yesterday
18:31 annoymouse *local
18:31 annoymouse Push that to the remote branch
18:31 davisonio joined #git
18:31 annoymouse and then I'll worry about the PR to upstream seperately
18:32 ochorocho__ joined #git
18:33 eletuchy joined #git
18:34 multi_io joined #git
18:34 jhass so do as I said above ;)
18:34 annoymouse jhass: Okay. that's done
18:35 annoymouse Thanks a bunch
18:35 jhass yw
18:35 annoymouse Could you help me do what I was originally intending to do before all of this happened?
18:35 eletuch__ joined #git
18:35 jhass which is?
18:35 annoymouse There are 18 commits on upstream/master that I want to integrate into my local branch
18:36 annoymouse I did git fetch upstream && git rebase upstream/master I think
18:36 realz joined #git
18:36 jhass personally I prefer a rebase based workflow, but with 40+ against 18 commits that could be quite tedious
18:36 jhass sounds good
18:37 jhass git mergetool and git rebase --continue until git stops complaining
18:37 jhass git push -f to your branch
18:37 jhass alternatively if upstream is okay with that you can just git merge upstream/master
18:38 jhass that'll give a single conflict resolution point and will likely resolve more conflicts on its own
18:38 UTAN_dev joined #git
18:39 eletuchy joined #git
18:40 jstimm_ joined #git
18:42 fuchstronaut joined #git
18:42 eletuchy_ joined #git
18:42 t0by joined #git
18:44 settermjd joined #git
18:45 mikecmpbll joined #git
18:45 eletuchy joined #git
18:46 nofacade joined #git
18:47 aard_ joined #git
18:47 eletuch__ joined #git
18:49 leehambley joined #git
18:49 LeBlaaanc joined #git
18:50 dan2k3k4 joined #git
18:51 Winter_ joined #git
18:51 McNozes joined #git
18:51 eletuchy joined #git
18:52 cd83x joined #git
18:53 eletuchy_ joined #git
18:57 eletuchy joined #git
18:57 nettoweb joined #git
18:58 jottr joined #git
18:58 toogley joined #git
19:00 eletuchy_ joined #git
19:00 nevodka joined #git
19:00 paul424 joined #git
19:01 MattMaker joined #git
19:01 wcpan joined #git
19:02 eletuchy joined #git
19:02 beneggett joined #git
19:04 Chill_Surf joined #git
19:05 eletuchy_ joined #git
19:07 eletuch__ joined #git
19:08 danteJ joined #git
19:09 ozzloy joined #git
19:09 soc42 joined #git
19:09 yqt joined #git
19:12 jim_carry joined #git
19:12 eletuchy joined #git
19:13 ammaar left #git
19:14 eletuchy_ joined #git
19:15 circ-user-utVty joined #git
19:15 mda1 joined #git
19:18 eletuchy joined #git
19:19 hahuang61 joined #git
19:20 mda1 joined #git
19:21 hahuang65 joined #git
19:21 soc42 joined #git
19:22 aard_ joined #git
19:22 pwnz0r joined #git
19:24 mase-tech joined #git
19:26 ams__ joined #git
19:28 rgrinberg joined #git
19:28 NeverDie joined #git
19:28 bitkiller left #git
19:30 ash_workz you can't anchor links in a gist using markdown right?
19:30 ash_workz like I can't create a definition list and link to specific lines without using headers, right?
19:31 Calrik joined #git
19:31 Eugene ash_workz - no idea. !tryit ;-)
19:31 gitinfo ash_workz: [!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.
19:31 Eugene Gists are free
19:31 ash_workz Eugene: this is not a tias situation
19:32 mischat joined #git
19:33 Eugene How would it not be?
19:35 jaguarmagenta joined #git
19:36 atomicb0mb joined #git
19:36 ash_workz Eugene: the question is really, "If there is a way to create an intra-doc link within a .md gist without using headers, *how* would you do that?" -- I've tired everything I know already
19:37 MattMaker joined #git
19:37 espindol_ joined #git
19:37 ash_workz Eugene: using headers: https://gist.github.com/anonymous/9ca69a11cacc3dd2776643834b9b7387
19:38 hahuang65 joined #git
19:38 jstimm_ joined #git
19:38 benwbooth joined #git
19:38 davisonio joined #git
19:38 Eugene AFAIK only Headers will create an anchor point in github's markdown, so you can't. You might be able to do something with hiding the header?
19:38 mog joined #git
19:38 mog hi
19:39 osse my name is
19:39 mog mog!
19:39 ash_workz Eugene: interesting idea
19:39 Seveas barf!
19:39 unbalancedparen joined #git
19:39 ash_workz Eugene: I thought maybe there was some way to create an reference in markdown that works on gists or something
19:39 Eugene Seveas - https://vomitb.in ?
19:40 Seveas Eugene: no, barf the mog
19:40 Seveas https://www.youtube.com/watch?v=7Ffk0Z4xMRI
19:41 mog i have a few git repos lets call them A B C and i want to put them in a new git repo D  but i want to perserve the branches of A B and C is that at all doable ?  i have been trying git-stitch-repo but cant figure out how to merge them together
19:41 dodobrain joined #git
19:42 Eugene Do you wantthem to appear inside of A/ B/ and C/ in your repo D? Or merge it all together in one big blob?
19:43 mog so previously repo D had a folder called src that did a git clone of a b and c
19:43 mog so trying to clone that behavior but the end result being one repo
19:43 SteenJobs joined #git
19:43 mog they each will still be in their own dir so src/A/ src/B/ etc
19:44 Eugene !subtree
19:44 gitinfo The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.
19:44 ril joined #git
19:44 ash_workz I love how india's TLD is widely know for being bins :)
19:45 mog Eugene, will that solve my branches issue? there is still active work being done in many branches so i need people to be able to do a fresh clone of this new repo and pickup where they were
19:45 ash_workz and British Indian Ocean Territory is input/output
19:46 benwbooth joined #git
19:46 jottr_ joined #git
19:46 cd83x joined #git
19:46 shinnya joined #git
19:47 espindola joined #git
19:47 Shentino joined #git
19:47 KeyWeeUsr joined #git
19:48 hahuang65 joined #git
19:48 KeyWeeUsr git 2.7.4.windows.1 from github when "git diff" and rightclicked at the text, git console seems to catapult itself really bad :D
19:49 KeyWeeUsr is it bug or what?
19:49 Seveas could be, try the latest git version
19:49 ash_workz Eugene: the only way I know to hide text in .md files is to use empty links which would subsequently cause an invalid reference for the actual link
19:50 KeyWeeUsr ok thanks.. where can I send an issue if it's still there?
19:50 _ikke_ ash_workz: And <!-- does not work?
19:50 ash_workz _ikke_: I thought not... I'll try
19:51 lmat I merged  feature  into master recently. It was busted. Some research revealed that master had a problem when I did the merge. The problem was fixed on master. Now, I want to "move" my merge up to the new master.
19:51 lmat Everything in the merge is fine. The fix didn't touch anything that the merge touched.
19:51 lmat The merge was difficult, so I would rather not have to do it again.
19:52 _ikke_ Hmm, a challenge
19:53 lmat _ikke_: perhaps   git rebase -p  will help?
19:53 ash_workz _ikke_: yeah, doesn't work; `<!-- # header-link -->` provides no reference and `# <!-- header link -->` shows the comment.
19:54 emmerich joined #git
19:54 NeverDie_ joined #git
19:54 interne7y joined #git
19:54 kadoban I guess you could save a copy of the id of the merge commit, go back and redo the merge, but to fix conflicts just checkout files from the existing merge, being careful not to mess with the fixed ones?
19:55 lmat kadoban: come on now :-)
19:55 nick123 joined #git
19:55 kadoban What, that saves you from the annoying parts doesn't it?
19:56 lmat kadoban: It does. However, it introduces a new annoying part.
19:57 lmat kadoban: To be fair, I'm sure your method would work, and wouldn't require the difficult merge logic again. I'm hoping for an elegant solution though, if one exists ;-)
19:57 kadoban A few checkout/checkout -p does'nt sound bad to me *shrug*
19:58 lmat kadoban: With that logic, I might be still using SVN ;-)
20:00 NeverDie joined #git
20:01 lmat _ikke_: got it?
20:02 Orion3k joined #git
20:02 lmat _ikke_: git rebase -p isn't so great.    git co merge-commit;  git rebase -p --onto master merge-commit; tries to do the right thing, but none of the logic from the original merge commit is saved, so the conflicts all have to be resolved again.
20:02 lmat _ikke_: Not too bad, though, as kadoban points out.
20:04 mda1 joined #git
20:06 espindola joined #git
20:10 arooni joined #git
20:11 BernhardPosselt joined #git
20:12 BernhardPosselt i did a git pull and now im stuck with a merge conflict (binary file)
20:12 ramsub08 joined #git
20:12 BernhardPosselt is there a nice way to just accept the version from the source I've pulled from?
20:12 johnmilton joined #git
20:13 ojacobson git checkout --theirs path/to/file
20:13 MattMaker joined #git
20:14 BernhardPosselt then just add and commit?
20:14 _ikke_ aye
20:15 benwbooth joined #git
20:16 BernhardPosselt thanks :)
20:16 BernhardPosselt im only used to rebase
20:16 BernhardPosselt xD
20:17 anberg joined #git
20:18 radsy joined #git
20:19 pwnz0r joined #git
20:21 nardev joined #git
20:21 cd83x joined #git
20:22 nadim joined #git
20:24 Atlantic777 joined #git
20:24 inflames joined #git
20:25 Atlantic777 I have a branch which diverged from the master branch by 3 commits. I created series of 3 patches with git format-patch master and that went ok. On the other computer I am on the same commit (the feature branch was rebased before creating patch series). I create new branch out of master and try git am <path_to_the_patch_series_folder> but nothing happens.
20:26 Atlantic777 But, if I write git am <path_to_the.patch> it applies it. Everything goes fine with all 3 patches in series when I apply them one by one.
20:26 Atlantic777 Any ideas what I am doing wrong?
20:26 osse Atlantic777: are they in alphabetical order?
20:27 Atlantic777 osse: they are prefixed with zero padded number.
20:28 _ikke_ "If you suppy a directory it will be treated as Maildir"
20:28 _ikke_ I doubt patches in a directory qualify as Maildir
20:28 _ikke_ just do git am dir/*.patch
20:29 Atlantic777 oh, that can be a problem
20:29 Atlantic777 brb, got to get out of the office
20:29 circ-user-utVty left #git
20:29 hahuang65 joined #git
20:30 mog left #git
20:32 liquidjamm joined #git
20:33 NeverDie_ joined #git
20:34 fscala joined #git
20:36 robbyoconnor joined #git
20:38 Gitzilla joined #git
20:38 Vgr_ joined #git
20:38 jstimm_ joined #git
20:39 lmat _ikke_: Did you forget about git rerere?
20:39 BernhardPosselt left #git
20:39 ash_workz joined #git
20:40 _ikke_ lmat: I hardly ever use it, so yeah
20:40 _ikke_ but iirc you have to enable it
20:40 _ikke_ ie, enable it for it to start recording resolutions
20:41 lmat _ikke_: yeah, just saw that :-)
20:42 wviana joined #git
20:45 settermjd joined #git
20:46 espindola joined #git
20:46 nnyk_ joined #git
20:46 wcpan joined #git
20:47 tomog999_ joined #git
20:48 hahuang65 joined #git
20:49 NeverDie joined #git
20:49 MattMaker joined #git
20:50 ojdo joined #git
20:54 johnmilton joined #git
20:55 interne7y joined #git
20:55 exarch joined #git
20:56 ochorocho__ joined #git
20:58 robbyoconnor joined #git
21:00 MattMaker joined #git
21:01 L8D joined #git
21:01 oliverio joined #git
21:01 oliverio joined #git
21:02 d4rklit3 joined #git
21:03 benegget_ joined #git
21:04 boombatower joined #git
21:05 happy-dude joined #git
21:05 bruce_lee joined #git
21:06 WayToDoor joined #git
21:09 atomicb0mb joined #git
21:12 m0viefreak joined #git
21:14 CheckDavid joined #git
21:15 blackwind_123 joined #git
21:18 nettoweb joined #git
21:18 _nadim joined #git
21:21 espindola joined #git
21:22 LeBlaaanc joined #git
21:23 fuchstronaut joined #git
21:25 t-mart_ joined #git
21:26 MattMaker joined #git
21:26 realz__ joined #git
21:26 elsevero joined #git
21:28 dmto_ joined #git
21:28 eletuchy_ joined #git
21:29 espindola joined #git
21:31 espindola joined #git
21:32 eletuchy joined #git
21:32 alexio joined #git
21:32 mischat joined #git
21:34 hahuang65 joined #git
21:34 eletuchy_ joined #git
21:35 aswen joined #git
21:36 jaguarmagenta joined #git
21:36 ash_workz joined #git
21:36 eletuch__ joined #git
21:37 MacWinner joined #git
21:38 nadim joined #git
21:39 mohabaks joined #git
21:39 eletuchy joined #git
21:42 shaggycat joined #git
21:43 eletuchy_ joined #git
21:43 mda1 joined #git
21:44 _nadim joined #git
21:45 eletuch__ joined #git
21:46 eletuchy joined #git
21:49 adrian_broher joined #git
21:50 eletuchy_ joined #git
21:51 espindola joined #git
21:52 eletuchy joined #git
21:53 yqt joined #git
21:54 eletuch__ joined #git
21:55 jimi_ joined #git
21:56 interne7y joined #git
21:56 SwiftMatt joined #git
21:58 eletuchy joined #git
21:59 Padawan joined #git
21:59 Padawan How to remove  submodule? i search google but find to many diff answers
21:59 eletuchy_ joined #git
22:00 Padawan as in git 2.3
22:00 Dougie187 left #git
22:01 sbeller depends what you mean by "remove"
22:01 sbeller remove from local disk or from project history
22:01 Padawan both
22:02 Padawan there is this new fork of the submodule ill be submoduling
22:02 MattMaker joined #git
22:03 Padawan and i dunno how different the fork already is
22:03 _nadim joined #git
22:03 eletuchy joined #git
22:03 realz_ joined #git
22:03 Padawan some people are saying deinit --force, other are saying a serie of steps
22:04 rahtgaz joined #git
22:04 _nadim joined #git
22:05 eletuch__ joined #git
22:05 sbeller you could just point the URL to the different fork, or rm && add again.
22:05 sbeller to remove a submodule from Git, try "git submodule deinit --force <path>" to get it first removed from the disk and then "git rm <path>" to wipe it from the work tree, that git rm command will modify the .gitmodules file for you and remove the submodule entry
22:05 sbeller (which you can then commit and carry on)
22:06 sbeller So I think as a condensed form "git rm -f <path>" is what you want
22:07 Padawan thanks
22:07 am55 joined #git
22:08 eletuchy joined #git
22:09 nadim joined #git
22:10 Matsv left #git
22:10 eletuchy_ joined #git
22:10 beneggett joined #git
22:12 nevodka joined #git
22:13 nevodka I have a working build on one branch, I merged it into our main branch, and that build fails
22:13 nevodka and when I try to do the merge again it says up to date
22:13 nevodka how can I redo the merge so that the main branch is the same as the hotfix one?
22:14 nevodka the main branch is protected too obviously so I can't just hard reset anything
22:14 soerenb_ joined #git
22:15 hahuang65 joined #git
22:18 cbreak nevodka: hard reset the branch you are on to HEAD~1
22:18 cbreak then merge again
22:18 cbreak git doesn't have protection for local branches
22:18 cbreak nevodka: how about you just fix the bug though?
22:18 cbreak in a new commit?
22:19 cbreak you can get changes from the branch with git checkout -p branchname
22:20 reim joined #git
22:24 reim joined #git
22:26 reim joined #git
22:27 mda1 joined #git
22:28 reim joined #git
22:29 LeBlaaanc joined #git
22:30 endiruna joined #git
22:33 orbitphreak joined #git
22:33 eletuchy joined #git
22:36 nevodka joined #git
22:38 rkazak joined #git
22:39 MattMaker joined #git
22:39 dreiss joined #git
22:40 rancyd joined #git
22:42 xlegoman joined #git
22:43 MistahKurtz joined #git
22:43 rancyd joined #git
22:44 hahuang65 joined #git
22:45 titanium17 joined #git
22:47 dmto joined #git
22:49 Auoe joined #git
22:53 espindola joined #git
22:54 WaReZ joined #git
22:57 interne7y joined #git
22:58 spudowiar joined #git
23:00 avar joined #git
23:00 SteenJobs joined #git
23:06 neanderslob joined #git
23:07 crayon joined #git
23:09 ril joined #git
23:12 Winter_ joined #git
23:14 sangy joined #git
23:15 MattMaker joined #git
23:15 drodger joined #git
23:16 ki0 joined #git
23:17 bittin joined #git
23:19 realz_ joined #git
23:19 annoymouse joined #git
23:20 madewokherd joined #git
23:21 ffabi joined #git
23:21 Juzzika joined #git
23:25 mablae__ joined #git
23:25 srpx joined #git
23:26 srpx I have a file that is different on all repos (config.json). How can I keep git from asking me to push the changes on it?
23:27 Sc0rpius what about just don't track the file? that is remove it from the repo, but keep the local file
23:27 italoacasas joined #git
23:27 kadoban_1ufYVpS srpx: !config
23:27 gitinfo srpx: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
23:28 Sc0rpius git rm --cached <file>
23:28 Sc0rpius and that's it
23:28 Sc0rpius configuration files should not be tracked
23:30 MattMaker joined #git
23:32 hahuang65 joined #git
23:33 Garen joined #git
23:34 MattMake_ joined #git
23:35 srpx Sc0rpius, kadoban_1ufYVpS : but then how do the user gets the initial file to edit?
23:35 kadoban_1ufYVpS srpx: The link you got spells out a couple of ways to handle that.
23:36 srpx oh ok
23:37 jaguarmagenta joined #git
23:39 jeffreylevesque joined #git
23:42 mattfoo joined #git
23:49 EvilPenguin joined #git
23:51 pwnz0r joined #git
23:52 Noldorin joined #git
23:53 MattMaker joined #git
23:53 fahadash joined #git
23:53 arescorpio joined #git
23:54 MattMaker joined #git
23:55 acetakwas joined #git
23:57 Literphor joined #git
23:57 interne7y joined #git

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