Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-06

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

All times shown according to UTC.

Time Nick Message
00:00 ToBeCloud joined #git
00:00 ToBeCloud joined #git
00:00 ToBeCloud joined #git
00:00 SporkWitch joined #git
00:01 ToBeCloud joined #git
00:02 tgies joined #git
00:02 ToBeCloud joined #git
00:03 raijin joined #git
00:04 tlolczyk joined #git
00:05 drodger joined #git
00:05 lindenle joined #git
00:07 tgies joined #git
00:08 compeman joined #git
00:12 tgies joined #git
00:12 CJKinni joined #git
00:15 Gitzilla joined #git
00:15 meloc joined #git
00:16 meloc joined #git
00:17 tgies joined #git
00:17 ajf- joined #git
00:18 denimsoft joined #git
00:23 compeman joined #git
00:24 pwnz0r joined #git
00:27 tgies joined #git
00:28 eletuchy joined #git
00:32 Mateo_W joined #git
00:34 jerematic joined #git
00:36 compeman joined #git
00:37 tgies joined #git
00:38 kus joined #git
00:38 GavinMagnus left #git
00:38 raijin joined #git
00:42 tgies joined #git
00:47 GavinMagnus joined #git
00:47 tgies joined #git
00:48 macabre joined #git
00:48 maroloccio joined #git
00:49 GavinMagnus left #git
00:49 maroloccio hi. i want to "tag" (i.e. not git tag, tag as in "add an annotation label") 3 commits in different branches so that later on i can search for all commits with that "label". what should i use?
00:50 drodger joined #git
00:50 AfroThundr joined #git
00:52 ojacobson you'll have to invent something
00:52 dreiss joined #git
00:53 ojacobson either a tag/branch namespace, your own refs namespace, or some metadata convention for log messages or notes
00:56 maroloccio ojacobson: you mean, assume the tag is "nice-code", i'd need to tag as "branch1-nice-code", "branch2-nice-code", ...?
00:56 rewt joined #git
00:56 maroloccio ojacobson: or just add something like this to all commit messages: Tags: [], Tags: [nice-code], Tags: [nice-code, magic-code], ...
00:57 tgies joined #git
00:57 ojacobson nice-code/<hash>, nice-code/<another hash>, etc maybe
00:57 maroloccio ojacobson: is there a way for a ref-type object to point to multiple commits?
00:57 ojacobson no.
00:57 ojacobson ("yes, but you _really_ don't want it.")
00:57 maroloccio trees can refer to multiple files via subsequent git hash-object sha1 hashes..
00:58 ojacobson (FETCH_HEAD is, I believe, special-cased.)
00:58 compeman joined #git
00:58 maroloccio so i was thinking.. maybe even refs can refer to multiple commits, somehow
00:58 ojacobson nope.
00:58 maroloccio although i do understand a commit points to a tree which points to objects, etc..
00:58 ojacobson you could have a ref point to a tree, whose entries are the commits you want, but you'd need to write tooling to deal with that structure
00:59 cagedwisdom joined #git
00:59 maroloccio no i am looking for something already baked in
00:59 barteks2x joined #git
01:00 maroloccio but is it really absurd to just want to annotate certain commits? e.g. all commits found to be "musical" or "hamburger-worthy"
01:00 rkazak joined #git
01:00 ojacobson !xy perhaps i dunno. i would be tempted to use branch names like/this to create a namespace, since there are already tools for working with that (git log --decorate, git show-ref, git for-each-ref, etc)
01:00 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...
01:00 ojacobson I mean, git-bisect is a great example of other ways to annotate commits; you could look at that for inspiration
01:00 ojacobson particularly at the way bisect/good/* work
01:01 przemoc joined #git
01:01 romerocesar joined #git
01:01 mischat joined #git
01:02 tgies joined #git
01:02 Ahmed90 joined #git
01:04 maroloccio so you mean checkout all the commits i wanna annotate (detached head style), check content, make new branches stemming from those commits and call them something like.. apple/1, apple/2, ... to denote apple-flavoured commits, then use git log --decorate=full to search for apple commits?
01:04 maroloccio and then other branches like banana/1 banana/2 ... for banana flavoured commits?
01:05 ojacobson basically.
01:05 maroloccio well git for-each-ref would be extremely useful there, you are right. nice pointer and nice idea
01:06 ojacobson You only need to check out individual commits if you need to inspect them; that's near-exactly the approach git-bisect uses using refs/bisect/bad or refs/bisect/good/HASH to label individual commits as it goes
01:06 maroloccio yes, i did say "check content".
01:06 maroloccio otherwise i can just branch from a given commit without changing my working dir, right?
01:06 ojacobson er good-* not good/* but you get the idea
01:07 maroloccio i think i od
01:07 tgies joined #git
01:07 maroloccio thanks for your brainstorming help ojacobson
01:07 ojacobson o/
01:08 ojacobson to strictly answer your question earlier, there is one ref-like thing that regularly contains multiple hashes, but _the vast majority_ of git tools treat it as if it contains a single hash, even then
01:08 maroloccio which is
01:08 ojacobson so it wouldn't help you, and i don't think the tool generalizes (I think FETCH_HEAD is the only special ref of that form)
01:12 romerocesar joined #git
01:13 CJKinni joined #git
01:17 fstd_ joined #git
01:17 JZA joined #git
01:22 romerocesar joined #git
01:22 tgies joined #git
01:22 BSaboia joined #git
01:22 BSaboia joined #git
01:25 axiom_1 joined #git
01:27 checkItOut joined #git
01:27 tgies joined #git
01:29 pks joined #git
01:30 liuzhen joined #git
01:32 tgies joined #git
01:33 iamthad joined #git
01:34 jerematic joined #git
01:34 jstimm joined #git
01:35 dermoth joined #git
01:39 Rodya_ joined #git
01:39 drodger joined #git
01:40 checkItOut joined #git
01:45 checkItOut joined #git
01:45 tgies joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and hostage situations | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | I will be executing hostages until there are more https://madeitwor.se/git-jokes
01:48 wald joined #git
01:51 d4rklit3 joined #git
01:52 tgies joined #git
01:54 waldowalden joined #git
01:54 Fr4n joined #git
01:57 zivester joined #git
01:57 tgies joined #git
01:59 d4rklit3 joined #git
02:00 checkItOut joined #git
02:02 JZA joined #git
02:02 tgies joined #git
02:03 checkItOut joined #git
02:03 drbean_ joined #git
02:04 romerocesar_ joined #git
02:05 compeman joined #git
02:05 prefix joined #git
02:05 checkItOut joined #git
02:06 Rodya_ joined #git
02:07 prefix joined #git
02:09 jaguarmagenta joined #git
02:09 hexagoxel joined #git
02:12 tgies joined #git
02:14 CJKinni joined #git
02:15 pmort joined #git
02:16 eletuchy joined #git
02:16 Mateo_W joined #git
02:17 tematibr joined #git
02:17 tgies joined #git
02:20 attente_ left #git
02:21 chachasmooth joined #git
02:22 tgies joined #git
02:23 rubyonrailed joined #git
02:24 jaguarma_ joined #git
02:25 pwnz0r joined #git
02:26 dreiss joined #git
02:27 tgies joined #git
02:30 mizu_no_oto joined #git
02:32 akiva joined #git
02:33 Fr4n joined #git
02:35 mmlb joined #git
02:37 rchavik joined #git
02:37 watabou joined #git
02:37 tgies joined #git
02:41 pizzaops joined #git
02:41 rkazak joined #git
02:42 tgies joined #git
02:43 Limes_ joined #git
02:47 madewokherd joined #git
02:47 romerocesar joined #git
02:47 tgies joined #git
02:51 odingodner joined #git
02:52 tgies joined #git
02:54 ekinmur joined #git
02:55 cd83x joined #git
02:56 sctskw joined #git
02:58 dreiss joined #git
03:00 tlolczyk joined #git
03:01 Grimm_ joined #git
03:02 tgies joined #git
03:04 ril joined #git
03:04 aavrug joined #git
03:05 linuxmint joined #git
03:05 lindenle joined #git
03:07 tlolczyk joined #git
03:07 tgies joined #git
03:07 sitaram_ nhawdge: if you promise not to get offended by the title, http://gitolite.com/gitolite/ips.html
03:08 linuxmint joined #git
03:10 tlolczyk joined #git
03:11 eletuchy joined #git
03:11 franl joined #git
03:12 tgies joined #git
03:13 MattMaker joined #git
03:14 sitaram_ nhawdge: and it's not gitolite being unhelpful, it's ssh.  That's life; ssh is powerful and has lots of ways to trip people up.  The gitolite docs have two large-ish pages on ssh: http://gitolite.com/gitolite/glssh.html and http://gitolite.com/gitolite/sts.html but they both demand attention and time to learn if you are totally new to ssh tricks
03:17 tgies joined #git
03:21 CEnnis91 joined #git
03:21 lindenle joined #git
03:21 k3rn31 joined #git
03:22 rewt joined #git
03:22 tgies joined #git
03:25 tlolczyk joined #git
03:25 tolland joined #git
03:27 tgies joined #git
03:30 eletuchy joined #git
03:30 lindenle joined #git
03:32 tgies joined #git
03:33 david007 joined #git
03:35 raijin joined #git
03:35 Fr4n joined #git
03:37 morenoh149 joined #git
03:37 tgies joined #git
03:37 lindenle joined #git
03:39 ajf- joined #git
03:48 bibek left #git
03:50 clemf joined #git
03:57 italoacasas joined #git
03:58 robotroll joined #git
04:04 raijin joined #git
04:08 MattMaker joined #git
04:11 arooni joined #git
04:11 rkazak joined #git
04:14 PaulCape_ joined #git
04:18 hahuang65 joined #git
04:19 nnyk joined #git
04:24 UTAN_dev joined #git
04:24 Cabanossi joined #git
04:24 boombatower joined #git
04:24 hahuang61 joined #git
04:28 cd83x joined #git
04:30 santa-fire joined #git
04:30 d4rklit3 joined #git
04:33 eletuchy joined #git
04:35 eletuchy_ joined #git
04:35 raven-au_ joined #git
04:37 eletuch__ joined #git
04:37 drodger joined #git
04:39 APic joined #git
04:40 nilg joined #git
04:41 Mateo_W joined #git
04:42 lindenle joined #git
04:42 drodger joined #git
04:43 ISmithers joined #git
04:44 ISmithers Can someone suggest a good workflow for me? I have projects I'm migrating from TFS to Bitbucket. I'm running into an issue whereby the repositories cannot have the same name.
04:45 ISmithers But we have multiple versions of Third-party Assemblies which must have the name "Third-party Assemblies".
04:45 ISmithers In TFS they live under different projects called 1.3, 1.4 etc. But in Bitbucket/Git there is nothing like that. So how best to set them up?
04:46 italoacasas joined #git
04:47 lindenle joined #git
04:50 ISmithers I feel like maybe they should be branches.
04:50 ISmithers But this one in particular is just a set of third party dlls, so we have little need for the historicity. Which makes me think they should be a fork instead, buuuuuut, then I'm back to needing a unique name.
04:53 italoacasas joined #git
04:53 mikehunt joined #git
04:54 rubyonrailed joined #git
04:54 lindenle joined #git
04:56 tematibr joined #git
05:00 noodle joined #git
05:00 subhojit777 joined #git
05:00 holodoc joined #git
05:00 tlolczyk joined #git
05:01 eletuchy joined #git
05:01 alex1a joined #git
05:04 ajf- joined #git
05:06 GingerGeek joined #git
05:06 GingerGeek joined #git
05:06 EvilJStoker joined #git
05:07 ochorocho__ joined #git
05:07 dwmw2_gone joined #git
05:08 kadoban joined #git
05:08 lindenle joined #git
05:08 Kulrak joined #git
05:08 Kulrak joined #git
05:09 jackburton joined #git
05:10 _nadim joined #git
05:13 mikehunt joined #git
05:13 tvw joined #git
05:16 radsy joined #git
05:16 a3Dman joined #git
05:18 moei joined #git
05:18 lindenle joined #git
05:23 noodle joined #git
05:25 lindenle joined #git
05:26 mariuscc joined #git
05:26 qt-x joined #git
05:28 hubertus_quack joined #git
05:28 obiwahn joined #git
05:29 obiwahn hi, i have a ref to a non existent remote branch in my repo
05:29 obiwahn how do i get rid of it
05:29 ojacobson git fetch --prune <remote>
05:33 interne7y joined #git
05:36 mischat_ joined #git
05:37 howdoi joined #git
05:37 interne7y joined #git
05:38 slavka`_ joined #git
05:39 slavka`_ hey guys... even after rebase i have heaps of changes when doing a diff against the branch that i just rebased off
05:39 ThomasLocke joined #git
05:39 slavka`_ is that normal... is merge the best for these situations?
05:41 compeman joined #git
05:42 kadoban slavka`_: What diff command are you doing? Why wouldn't it have differences … there's commits in the branch on top of the base branch, no?
05:43 eletuchy joined #git
05:44 eletuchy joined #git
05:45 Karunamon joined #git
05:46 eletuchy_ joined #git
05:47 mehola joined #git
05:48 rkazak joined #git
05:51 eletuchy joined #git
05:56 eletuchy_ joined #git
05:56 Raging_Hog joined #git
05:57 zeroed joined #git
05:57 obiwahn thanks
05:59 eletuchy joined #git
06:00 slavka`_ well, it just looks like the rebase hasnt been applied
06:01 apotry joined #git
06:02 djb-irc joined #git
06:05 eletuchy_ joined #git
06:08 muthu joined #git
06:08 ochorocho__ joined #git
06:08 eletuchy joined #git
06:10 rscata joined #git
06:10 d4rklit3 joined #git
06:10 Robert_Wiley joined #git
06:12 star_prone joined #git
06:13 ciampix joined #git
06:22 zeroed joined #git
06:24 freimatz joined #git
06:25 emPi joined #git
06:25 JZA hi how can I commit changes to my local git
06:26 JZA I did a git init, and git add, but I get: Either specify the URL from the command-line or configure a remote repository using
06:26 JZA do I need a remote repository
06:26 osse no
06:26 JZA can I just have a local repo
06:26 osse you did something else
06:26 osse git add does produce that message
06:27 JZA git push
06:27 JZA you are right
06:28 lamppid joined #git
06:30 osse JZA: if you only want a local repo then you don't need git push
06:30 yuhlw joined #git
06:30 JZA so if I want to work locally I only need to commit right?
06:31 osse that command is specifically for communication with a remote repo
06:31 osse yes
06:31 osse push, pull, fetch and ls-remote are on your blacklist. everything else is fine.
06:32 Raging_Hog joined #git
06:34 dreiss joined #git
06:37 b1tchcakes joined #git
06:37 Macaveli joined #git
06:38 jerematic joined #git
06:43 MutantMahesh joined #git
06:51 zarel joined #git
06:51 eletuchy joined #git
06:55 hahuang61 joined #git
06:56 JeroenT joined #git
06:57 spriz joined #git
07:02 Sceorem joined #git
07:03 romerocesar joined #git
07:04 mehola joined #git
07:05 encod3 joined #git
07:05 jknetl joined #git
07:06 cdown joined #git
07:08 Fijit joined #git
07:12 romerocesar joined #git
07:15 fscala joined #git
07:15 maroloccio joined #git
07:17 xbob joined #git
07:18 circ-user-cauxT joined #git
07:18 ahmedelgabri joined #git
07:19 xorox90 joined #git
07:23 fahadash joined #git
07:23 nilsi joined #git
07:26 Ediz joined #git
07:27 furnate joined #git
07:27 cdown joined #git
07:28 stuh84 joined #git
07:28 _0xAX joined #git
07:29 _0xAX joined #git
07:30 Waskeend joined #git
07:30 compeman joined #git
07:31 eletuchy joined #git
07:32 yuhlw joined #git
07:33 phunkren_ joined #git
07:34 rominronin joined #git
07:35 MafiaInc joined #git
07:37 JeroenT joined #git
07:39 jerematic joined #git
07:39 phunkren_ left #git
07:41 hekto joined #git
07:41 jagob joined #git
07:41 mflow joined #git
07:46 biertie joined #git
07:46 stonerfish joined #git
07:48 fees joined #git
07:49 GavinMagnus joined #git
07:49 eletuchy joined #git
07:50 gfixler joined #git
07:52 leeN joined #git
07:53 eletuchy_ joined #git
07:54 eijk joined #git
07:55 eletuch__ joined #git
07:57 SanSe_Ya joined #git
07:57 eletuchy joined #git
07:59 eletuchy joined #git
08:00 jceb joined #git
08:01 PCatinean joined #git
08:01 ocbtec joined #git
08:03 cyan__ joined #git
08:05 liranp joined #git
08:05 SanSe_Ya left #git
08:06 Rish joined #git
08:08 liranp joined #git
08:08 realz joined #git
08:09 liranp joined #git
08:09 pizzaops joined #git
08:09 MLM joined #git
08:10 compeman joined #git
08:11 Alienpruts joined #git
08:11 jagob joined #git
08:11 JeroenT joined #git
08:12 xai joined #git
08:12 a_thakur joined #git
08:12 _pix joined #git
08:14 encod3 joined #git
08:17 ediz_ joined #git
08:18 TSS_ joined #git
08:18 StormLrd joined #git
08:19 eletuchy joined #git
08:20 clmsy joined #git
08:20 marcogmonteiro joined #git
08:21 doener joined #git
08:22 Lynxium joined #git
08:26 JeroenT joined #git
08:28 Jellyg00se joined #git
08:31 eletuchy joined #git
08:36 mischat joined #git
08:36 kurkale6ka joined #git
08:38 kutsuya joined #git
08:39 encod3_ joined #git
08:39 acetakwas joined #git
08:42 King_Hual joined #git
08:45 nnyk joined #git
08:45 fracting joined #git
08:47 liranp joined #git
08:48 JeroenT joined #git
08:50 troulouliou_div2 joined #git
08:51 nardev joined #git
08:52 JeroenT joined #git
08:53 eletuchy joined #git
08:53 paul424 joined #git
08:57 weckl joined #git
08:58 UbuntuDude joined #git
08:59 nardev joined #git
08:59 eletuchy joined #git
08:59 UbuntuDude why git people used CHECKOUT as a keyword to do many different functionalities like creating branch, moving to another branch and reset the recent commit?
08:59 UbuntuDude or is just the lack of English language for proper words
09:00 jhass checkout always results in the same action, modifying your working tree
09:00 jhass to a committed state
09:00 jhass it just has shortcuts to do other things before that, delegating to other commands internally
09:01 eletuchy_ joined #git
09:01 JeroenT_ joined #git
09:02 WayToDoor joined #git
09:02 ferr joined #git
09:02 eijk_ joined #git
09:04 mdw joined #git
09:04 eletuchy joined #git
09:04 heftig jhass: there is a difference between changing HEAD and changing the working tree, though
09:05 compeman joined #git
09:05 heftig well, relinking HEAD, I mean
09:06 eletuch__ joined #git
09:06 a_thakur joined #git
09:06 heftig manipulating what HEAD points to (if it's a symref) seems to be more reset's domain
09:07 jhass yet, is there any checkout command that does not result in a (possible) change of your working tree?
09:07 JeroenT joined #git
09:09 heftig hm
09:09 eletuchy joined #git
09:09 jhass conceptually I mean, git checkout -b foo bar with HEAD != bar would, that the default for bar is HEAD just makes git checkout -b foo never do it in practice
09:09 heftig jhass: is there a command (other than git symbolic-ref) that "checks out" another branch without touching the index and wt?
09:09 osse UbuntuDude: git branch is used to create a branch. checkout just has a shortcut to both create and checkout a new branch.
09:09 hahuang61 joined #git
09:09 osse not sure how you can use checkout to reset
09:09 cbreak reset does not change which thing HEAD points to, it changes the thing HEAD points to.
09:09 jhass heftig: not sure :/
09:10 cbreak (among other things :)
09:10 JeroenT joined #git
09:10 heftig cbreak: yes, that's what i meant; what i said was ambiguous
09:10 cbreak checkout does the opposite
09:10 upstream joined #git
09:11 jast it does do different things but its actions always target the working tree, possibly among other things
09:11 eletuchy_ joined #git
09:11 jast the two main functions are: checking out files vs. checking out a branch
09:11 josuebrunel joined #git
09:12 jhass the latter involves checking out files in the general case though
09:12 jast that's what I meant in my first sentence
09:13 jast reset, on the other hand, mainly targets the current branch (mode A) and the index (mode B)
09:13 nnyk joined #git
09:13 heftig hm, to check out a branch without touching the wt, i guess i'd do: git symbolic-ref HEAD refs/heads/somebranch; git reset --mixed
09:13 akiva joined #git
09:13 dimi1947 joined #git
09:13 pol123456 joined #git
09:14 eletuchy joined #git
09:15 heftig jast: combining those two functions does seem like an overload of reset, though
09:16 eletuch__ joined #git
09:16 jast yes... but once you understand what the two modes are, it doesn't really cause any problems
09:20 eletuchy joined #git
09:21 discopatrick joined #git
09:23 eletuchy_ joined #git
09:24 mrkake joined #git
09:24 xpl0iter joined #git
09:25 eletuch__ joined #git
09:25 xpl0iter Hi I was working a branch(abc) on a different system. Now how can I get the contents of that branch to my system2. System2 already has the master branch. But the branch "abc" has some updates. Can someone please help me?
09:26 jhass xpl0iter: how did you  get the master branch to system2 initially?
09:27 xpl0iter jhass I just cloned it the first time.
09:27 xpl0iter Then I did git pull
09:27 jhass git fetch; git checkout abc; git pull
09:27 xpl0iter Ok thanks let me try that
09:28 eletuchy joined #git
09:28 xpl0iter jhass, It is saying: There is no tracking information for the current branch.
09:28 xpl0iter Please specify which branch you want to merge with.
09:28 jhass git pull origin abc then
09:29 xpl0iter Its saying : fatal: Couldn't find remote ref log-in-log-out. fatal: The remote end hung up unexpectedly
09:29 ericP joined #git
09:29 xpl0iter well login log out is "abc"
09:30 eletuchy_ joined #git
09:30 xpl0iter jhass,
09:30 Raging_Hog joined #git
09:30 jhass so you didn't clone it from system1 after all?
09:30 dimi1947 usually...when making changes to a branch,,,you make one commit for all for them or you split it in many branches...what is your practice?
09:30 xpl0iter jhass, I cloned it in the beginning, when I just had the master branch. I remember doing that. Its been sometime
09:31 tobiasvl dimi1947: you mean split it in many commits? each commit should be an "atomic" change of some sort
09:31 jhass xpl0iter: but did you clone it from the location that now has log-in-log-out ?
09:31 zeroed joined #git
09:31 xpl0iter jhass, yes I believe so. :(
09:31 david007 joined #git
09:31 dimi1947 tobiasvl:yes split it in many commits...
09:32 jhass dimi1947: if possible a commit should be fairly minimal, but the project should work as much as possible, ideally fully at every committed state
09:32 xpl0iter jhass, so do I delete everything from my current system and do a git clone?
09:32 jhass xpl0iter: sorry this all too vague to help you further then
09:33 jhass shouldn't usually be necessary
09:33 eletuchy joined #git
09:33 eijk joined #git
09:33 jast dimi1947: generally more commits is better, but only if each commit makes sense as a unit. think of the commit history as a story that explains how the project came to be what it is. in hindsight nobody cares about silly mistakes and extremely wild experiments, so each commit should express something relevant to future developers
09:33 jhass xpl0iter: if you want to remove some vagueness, git remote -v might help
09:33 dimi1947 jhass:so when you are saying "fairly minimal" I suppose you mean that each commit must be associated with as a few changes as possible...
09:33 jast you don't want a bunch of 'fix typo' commits, but you probably also don't want a huge 'implement these 97 features', either
09:34 jhass dimi1947: well, to some degree, it should still be coherent towards the bigger picture, it should be obvious why the change was made here
09:34 eletuch__ joined #git
09:34 xpl0iter jhass, remote -v shows 2 lines, origin <url> (fetch) and the other with (push and another
09:35 xpl0iter not needed in the last sentence: "and another"
09:35 xpl0iter Sorry
09:35 jhass dimi1947: however that's the result, of course we don't work perfectly. I usually commit locally to a feature branch every time I stop working on something, often already preshaping the history I want using git add -p / git commit -p; then do fixup commits towards them and git rebase -i once I'm done
09:36 jhass xpl0iter: yeah, that I knew before
09:36 jhass so staying vague, sorry not able to help you
09:36 heroux joined #git
09:36 xpl0iter jhass, so clone will be the best idea I guess?
09:37 jhass I wouldn't call it best
09:37 jhass given your unwillingness or inability to share actual details and learn what's necessary to debug on your own, perhaps your only option though
09:37 joki joined #git
09:38 eletuchy joined #git
09:38 xpl0iter jhass, I don't have any unwillingness.:O So can you please let me know once again, what information do you need?
09:38 MutantMahesh joined #git
09:38 jast xpl0iter: so, you have two different clones and want to transport a branch from one to the other?
09:38 jhass the output of git remote -v, literally and unchanged, would be a good start
09:39 mariuscc joined #git
09:40 watabou joined #git
09:41 eletuchy_ joined #git
09:41 xpl0iter jhass, http://imgur.com/oflfASa
09:41 xpl0iter jast, I have two systems. One with master and the other with another branch(which is the updates I made to master)
09:42 xpl0iter I need to get the branch to the other system'
09:42 jhass xpl0iter: ok, given I doubt you work on bitbucket directly, you did push your branch to bitbucket?
09:42 jast okay. in the target system, do you have SSH access to the source system?
09:42 Jellyg00se joined #git
09:43 xpl0iter jhass, can I check that in bitbucket.com? I can login and check
09:43 jast actually I guess another relevant question is, would you mind pushing your branch to bitbucket? because that makes it quite easy to get it from A to B
09:43 xpl0iter jast, no
09:43 jast and you can delete it from bitbucket when you're done
09:43 xpl0iter jast, the system with the updated branch is inaccessible at the moment.
09:43 ruskie joined #git
09:44 jast well that will make it difficult to access the updated branch, I guess :}
09:44 jhass xpl0iter: just run git push origin log-in-log-out on the system that has the branch
09:44 jhass xpl0iter: then repeat the commands I already gave you
09:44 eletuchy joined #git
09:45 natefur joined #git
09:46 xpl0iter jhass, ok thanks. I will have to wait then, because that system is inaccessible atm. So I guess, I haven't pushed the branch(although I thought I did it)?
09:46 jhass xpl0iter: well git fetch; git branch -a might give a hint
09:47 xpl0iter yeah its not there :(
09:48 robogoat joined #git
09:50 nilg joined #git
09:50 hahuang61 joined #git
09:52 m1dnight1 joined #git
09:52 UbuntuDude left #git
09:57 xpl0iter jhass, yeah that worked, thanks a lot. :)
09:57 xorox90 joined #git
09:58 interne7y joined #git
10:00 bruce_lee joined #git
10:02 gechr joined #git
10:02 charolastra_____ left #git
10:03 gechr joined #git
10:04 rubyonrailed joined #git
10:07 gechr joined #git
10:07 tvw joined #git
10:08 fracting joined #git
10:08 hikka joined #git
10:10 EY joined #git
10:12 romankl joined #git
10:12 nettoweb joined #git
10:13 romankl joined #git
10:13 cdown joined #git
10:13 circ-user-IZb89 joined #git
10:16 bollullera joined #git
10:16 nnyk_ joined #git
10:18 garethdaine joined #git
10:20 mykespb joined #git
10:20 kedare joined #git
10:23 acetakwas joined #git
10:26 Raging_Hog joined #git
10:27 eletuchy joined #git
10:27 TSS_ joined #git
10:28 tlaxkit joined #git
10:30 ronskisika joined #git
10:32 ediz_ left #git
10:33 subhojit777 joined #git
10:35 sostenuto joined #git
10:37 djb-irc joined #git
10:38 m0nkmaster joined #git
10:40 m_antis joined #git
10:41 jerematic joined #git
10:45 hahuang61 joined #git
10:47 Macaveli_ joined #git
10:49 thiago joined #git
10:49 zincrokx joined #git
10:50 zincrokx joined #git
10:50 JeroenT joined #git
10:51 zincrokx joined #git
10:51 JeroenT joined #git
10:56 jagob joined #git
10:56 aswen joined #git
10:58 denimsoft joined #git
10:59 djb-irc joined #git
11:00 mizu_no_oto joined #git
11:02 m0nkmaster joined #git
11:04 JeroenT joined #git
11:06 lolmac joined #git
11:06 CussBot_ joined #git
11:06 uhmgawa joined #git
11:07 johnmilton joined #git
11:12 iqpi joined #git
11:14 Rodya_ joined #git
11:14 DirtyF joined #git
11:14 jhgundersen joined #git
11:18 sdothum joined #git
11:21 m0nkmaster joined #git
11:21 iqpi hi guys I have this branches: master (working in production, development snapshots), development (where new features are merged) from development I create new branches for new fixes or features. Sometimes quick hotfixes are neede to by applied in master but they cannot be made from development because at this moment development is like 500 commits ahead of master due to a new high order version which is not
11:21 iqpi ready yet. So a hotfix branch should be created from master, make there the hotfix, then merge the hothix branch in master, but what happen now with development? should I make a rebase from master, or should I merge the hotfix branch inside development aswell, and then rebase my newFeature branch with development?
11:22 eletuchy joined #git
11:24 lb iqpi doesn't make that much of a difference. in the end, the fix is in the dev branch. you could also cherry-pick the commit into development and carry on. it's basically your choice and the only difference is , what the history looks like
11:25 jhass I would merge master into development and then rebase any feature branches
11:26 jhass keeps merging development into master later completely conflict free
11:26 nnyk_ joined #git
11:27 watabou joined #git
11:28 fscala joined #git
11:28 zarel joined #git
11:29 iqpi thank you very much lb and jhass I've done the hotfix from master, then rebase development with master and had dozens of conflicts, so I aborted and tried the other way, merge the hotfix in development copy, and then, merge the development copy to a master copy having no issues although the log was a mess
11:30 jhass iqpi: you might also be interested in the git flow concept, which basically formalizes what you're already doing
11:30 lb iqi yeah sorry, the way jhass said is much cleaner as cherrypicking or something like that. i'd do it the jhass way myself
11:30 jhass http://nvie.com/posts/a-succ​essful-git-branching-model/
11:31 jhass there's tools to enforce it even
11:32 jast fwiw I'd do it the same way
11:33 MadHatter42 joined #git
11:33 cyan__ joined #git
11:33 iqpi thank you guys, you were very helpfull :D
11:36 hahuang61 joined #git
11:38 jknetl joined #git
11:39 sostenuto joined #git
11:41 Shashikant86 joined #git
11:42 jerematic joined #git
11:42 romerocesar joined #git
11:42 lindenle joined #git
11:42 raijin joined #git
11:44 nnyk_ joined #git
11:48 reactormonk joined #git
11:48 mikecmpbll joined #git
11:49 edude03 joined #git
11:49 pungi-man joined #git
11:50 acetakwas joined #git
11:50 jceb joined #git
11:51 _pix joined #git
11:52 fracting joined #git
11:52 cdown joined #git
11:54 zeroed joined #git
11:55 paul424 How do I get diff since some commit say fbfab238484a9422a765ad9fad2b964c3d2ac38f ?
11:55 paul424 git diff fbfab238484a9422a765ad9fad2b964c3d2ac38f , would do the job  ?
11:55 moritz paul424: !tias
11:55 gitinfo paul424: 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.
11:56 qsx in doubt man gitrevisions
11:56 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
11:56 josuebrunel joined #git
11:56 sostenuto !backup
11:56 gitinfo 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.c​om/GitBestPractices/#backups
11:57 paul424 moritz: something shows up, whether it is what I want is another pair of thing ...
11:57 jast diff with one commit argument compares your current working tree against that commit
11:58 sostenuto meh, I was expecting something more sophisticated
11:58 jast you can diff against your current topmost commit, too: git diff abc123 HEAD
11:58 interne7y joined #git
11:58 jast sostenuto: not for experimentation :)
11:59 hubertus_quack joined #git
11:59 rnsanchez joined #git
12:01 Rooxo joined #git
12:02 shiriru joined #git
12:05 rubyonrailed joined #git
12:05 Sceorem joined #git
12:07 barteks2x joined #git
12:11 paul424 jast: What I want is too have a diff of all commits since some commit
12:11 paul424 jast: Do you get me ?
12:12 ncd|leeN joined #git
12:15 JeroenT joined #git
12:17 hahuang61 joined #git
12:17 domgetter joined #git
12:20 synthroid joined #git
12:22 rwb joined #git
12:23 JanC joined #git
12:25 perlpilot joined #git
12:26 garethdaine joined #git
12:29 SebastianFlyte joined #git
12:30 watabou joined #git
12:31 jceb joined #git
12:31 mischat_ joined #git
12:31 livingstn joined #git
12:33 djb-irc joined #git
12:33 jeffreylevesque joined #git
12:33 a_thakur joined #git
12:34 jknetl joined #git
12:37 diegoaguilar joined #git
12:37 hikka joined #git
12:38 jknetl joined #git
12:39 subhojit777 joined #git
12:39 liquidjamm joined #git
12:39 a_thakur joined #git
12:40 madewokherd joined #git
12:43 jerematic joined #git
12:45 hpfmn joined #git
12:45 hpfmn hi
12:45 gitinfo hpfmn: 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.
12:46 hpfmn how is it possible that git fails to merge during a rebase even if that file didn't change in the other branch on that I try to rebase
12:48 DirtyF joined #git
12:48 deadnull_ joined #git
12:49 fmcgeough joined #git
12:51 hpfmn I also wonder why it starts to apply the first patch a second time
12:51 Phreya joined #git
12:52 UrsoBranco joined #git
12:52 m0nkmaster joined #git
12:53 DirtyF hi
12:53 gitinfo DirtyF: 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.
12:53 DirtyF can't figure out how to continue a rebase
12:53 DirtyF > fatal: cannot resume: .git/rebase-apply/author-script does not exist.
12:54 CJKinni` joined #git
12:55 m0nkmaster joined #git
12:57 LionsMane joined #git
12:58 tcurdt I want to squash some commits. I was thinking "git rebase -i <sha>"  but the list does not show the author?! Is there a way to add the author to the list?
12:58 tobiasvl tcurdt: not to the list, no. do a git log first to see the authors I guess
12:59 interne7y joined #git
12:59 tobiasvl the rebase list just contains action and sha
12:59 tcurdt urgh
13:00 m0nkmaster joined #git
13:00 jimi_ joined #git
13:01 italoacasas joined #git
13:01 EY joined #git
13:02 CEnnis91 joined #git
13:02 MutantMahesh joined #git
13:02 hpfmn yeah for some reason git is applying the patched from the branch two times
13:02 tcurdt tobiasvl found this https://gist.github.com/yurial/1909363 ... but did not find where to apply it to yet
13:04 tobiasvl Since git 2.6.0 you can add a config variable rebase.instructionFormat to do this.
13:04 tobiasvl from the second gist there
13:04 tobiasvl perhaps try that?
13:04 tobiasvl new to me
13:05 hpfmn I deleted one commit via git rebase -p --onto SHA^ SHA
13:06 hpfmn could that cause some trouble when I try to rebase the branch now?
13:07 drodger joined #git
13:08 hahuang61 joined #git
13:08 jhass shouldn't
13:08 jhass in doubt just -i
13:10 hpfmn jhass: yes the commits before the one I delete git tries to pick double
13:10 yqt joined #git
13:10 settermjd joined #git
13:10 hpfmn but they also have another sha
13:11 baraba joined #git
13:11 Gamecubic joined #git
13:11 jhass just remove them in the editor
13:12 knutstrut joined #git
13:12 hpfmn yep I did that
13:12 floatingpoint joined #git
13:12 tcurdt tobiasvl works!
13:12 hpfmn jhass: can you explain what might have happend - but thank you
13:13 jhass mmh, not sure, I never use --onto so I haven't internalized its behavior. I think you rebased A B C onto B, resulting in A B A' B' C'
13:14 dtyo joined #git
13:14 npo1 joined #git
13:15 npo1 left #git
13:16 JeroenT joined #git
13:17 FunkyAss joined #git
13:17 setuid joined #git
13:18 apotry joined #git
13:18 Fr4n joined #git
13:18 rnsanchez_ joined #git
13:20 ekinmur joined #git
13:21 garethdaine joined #git
13:22 fracting joined #git
13:24 doebi is there a seperate channel for git-annex or is it ok to ask questions in here?
13:24 exarch joined #git
13:26 bremner doebi: there is a #git-annex on oftc. You can ask here, but answers might be better there.
13:26 bremner depends on the question.
13:27 doebi bremner: alright thanks, will join oftc then.
13:27 subhojit777 joined #git
13:28 thiago_ joined #git
13:29 tinanoo joined #git
13:29 Kulrak joined #git
13:29 Kulrak joined #git
13:29 esc joined #git
13:29 esc joined #git
13:30 cdg joined #git
13:31 DirtyF okay, had to abort the rebase and redo it all over again, and it manges to finish this time, weird error.
13:31 dopesong joined #git
13:34 macefr joined #git
13:34 EY joined #git
13:36 kaichogami joined #git
13:38 raijin joined #git
13:39 droidicus joined #git
13:40 noidea joined #git
13:42 mikecmpb_ joined #git
13:42 Ahmed90 joined #git
13:42 kaichogami I have single file f on branch A and B. I created them differently with the same name. Since mergetool only sees the diff is there any way I can put the contents of f from branch A after branch B f content without losing history?
13:43 kaichogami In case the its not clear, let me know.
13:43 heftig kaichogami: you want to merge A into B?
13:44 italoacasas joined #git
13:44 jhass or both into master?
13:44 kaichogami Yes, but merge doesn't work. I want all the contents of file f into B.
13:45 heftig git merge A; git show B:f > f; git show A:f >> f; git add f; git commit
13:45 rgrinberg joined #git
13:45 Darcidride joined #git
13:46 heftig this will attempt a merge (fails due to the conflict), overwrites f with the version of B, appends the version of A, adds f and commits the merge
13:46 drodger joined #git
13:47 Darcidride joined #git
13:47 fracting joined #git
13:49 espindola joined #git
13:50 dimi1947 joined #git
13:52 nilg joined #git
13:52 zarel joined #git
13:52 btyne79 joined #git
13:54 raininja joined #git
13:54 roflin joined #git
13:55 frem_ joined #git
13:55 ash_workz joined #git
13:59 lindenle joined #git
13:59 LeMike joined #git
13:59 AaronMT joined #git
13:59 jwest joined #git
14:01 ahmedelgabri joined #git
14:01 Ravana joined #git
14:02 github938 joined #git
14:02 kaichogami @heftig that worked beautifully. Thanks for your help!
14:02 rubyonrailed joined #git
14:03 eletuchy joined #git
14:04 dopesong joined #git
14:05 Rodya_ joined #git
14:05 odingodner joined #git
14:09 zeroed joined #git
14:12 sword joined #git
14:15 mmlb joined #git
14:16 odingodner joined #git
14:18 madewokherd joined #git
14:19 toogley joined #git
14:19 phaleth joined #git
14:20 kpease joined #git
14:21 Juzzika joined #git
14:21 Tsutsukakushi joined #git
14:22 JackFruh joined #git
14:24 d4rklit3 joined #git
14:24 thiago joined #git
14:25 mohabaks joined #git
14:25 kpease joined #git
14:26 pullphinger joined #git
14:27 mehola joined #git
14:28 laris joined #git
14:28 tlaxkit joined #git
14:29 MafiaInc joined #git
14:29 CheckDavid joined #git
14:30 unbalancedparen joined #git
14:31 cyan__ joined #git
14:31 watabou joined #git
14:32 dopesong joined #git
14:32 mmlb joined #git
14:33 morenoh149 joined #git
14:35 BSAlb joined #git
14:35 NeverDie joined #git
14:37 troulouliou_div2 joined #git
14:37 ciampix joined #git
14:38 NeverDie_ joined #git
14:39 peepsalot joined #git
14:39 todd_dsm joined #git
14:41 odingodner joined #git
14:42 aavrug joined #git
14:43 drodger joined #git
14:46 JeroenT_ joined #git
14:46 JeroenT joined #git
14:47 rkazak joined #git
14:52 d4rklit3 joined #git
14:53 axiom_1 joined #git
14:54 dreiss joined #git
14:54 bollullera joined #git
14:54 mehola joined #git
14:54 NeverDie joined #git
14:55 TomyLobo joined #git
14:56 kus joined #git
14:56 fracting joined #git
14:58 morenoh149 left #git
14:59 zivester joined #git
15:00 uhmgswa^2 joined #git
15:00 interne7y joined #git
15:00 drodger joined #git
15:00 dimi1947 joined #git
15:00 kilo_bravo joined #git
15:01 barteks2x joined #git
15:02 AaronMT joined #git
15:02 clemf joined #git
15:06 bango2 joined #git
15:06 toogley joined #git
15:07 liranp joined #git
15:08 Rodya_ joined #git
15:09 bongjovi joined #git
15:10 uhmgswa^2 left #git
15:10 przemoc joined #git
15:11 d4rklit3 joined #git
15:11 bongjovi I reverted a commit and now all other modified files are no longer tracked... how do I fix this?
15:11 uhmgawa joined #git
15:11 marchelzo joined #git
15:11 marchelzo hello
15:11 ericP left #git
15:12 clemf joined #git
15:12 watabou joined #git
15:12 synthroid joined #git
15:13 toogley joined #git
15:15 marchelzo i need help understanding something. i'm following a git tutorial and it has introduced git cherry-pick through the following example: it starts out with http://puu.sh/piSVP/c4333dcbeb.png and then runs cherry-pick C2 C4 to end up with http://puu.sh/piSXw/839471785b.png
15:15 marchelzo what i don't understand is why cherry-pick C2 C4 would be different from simple doing cherry-pick C4
15:15 dmto joined #git
15:16 tyreld joined #git
15:16 thiago_ joined #git
15:16 i7c cherry-pick C4 would only append the commit C4, without C2 C3.
15:16 perlpilot marchelzo: um ... because cherry-pick C4 would only get the C4 commit?  (I don't understand what you don't understand)
15:17 WayToDoor joined #git
15:17 toogley joined #git
15:17 osse marchelzo: cherry-pick does not get/copy the snapshot represented by C4, but the changes between C4 and the previous
15:17 bongjovi How do I update/check for untracked/unstaged files?
15:17 marchelzo but i thought commits weren't diffs, they were snapshots of the repository, and since C4 comes after C2, should cherry-picking C2 followed by C4 be the same as just getting C4?
15:17 bongjovi I have lots of unstaged files that disappeared when I reverted the last commit
15:18 marchelzo osse: oh, that explains it
15:18 perlpilot marchelzo: you're thinking of SVN  ;)
15:18 drodger joined #git
15:18 hahuang61 joined #git
15:18 milki bongjovi: you cannot restore untracked files
15:19 cyan__ joined #git
15:19 milki bongjovi: you can check for untracked files with git status though
15:19 osse marchelzo: "Given one or more existing commits, apply the change each one introduces, recording a new commit for each."
15:19 bongjovi super confused... I had about 30 unstaged files and git status is now only showing 1
15:19 Gitzilla joined #git
15:19 marchelzo osse: i suppose it would be useless if it applied the snapshot and not the changes
15:19 skapunker joined #git
15:19 bongjovi I reverted the last commit, which created a stash, which I then deleted
15:19 bongjovi I'm not really sure what that did
15:20 elastix joined #git
15:20 i7c If you want the exact same snapshot, just checkout the other branch. :P
15:20 i7c Or reset your branch to that one for that matter.
15:20 marchelzo i7c: right
15:21 marchelzo ok, that makes sense
15:21 marchelzo thank you
15:21 Ranhir joined #git
15:23 ajf- joined #git
15:23 tvw joined #git
15:24 toogley joined #git
15:25 eletuchy joined #git
15:26 JeroenT_ joined #git
15:26 ril joined #git
15:27 JeroenT joined #git
15:27 ahmedelgabri joined #git
15:28 toogley joined #git
15:28 bongjovi can anyone help me understand why git status says nothing to commit when I know changes have been made to several files?
15:30 perlpilot bongjovi: Are you sure git is tracking those files?
15:31 bongjovi has been for the past 2 months
15:31 osse bongjovi: git log --stat -- path/to/one/of/them
15:32 elastix joined #git
15:32 bongjovi oh wtf
15:32 bongjovi this is a really old file?
15:33 bongjovi well i mean I've lost all the changes I made
15:34 bongjovi osse: that shows the initial commit I made for that file
15:34 r4z3r joined #git
15:34 bongjovi and I just opened the file and all the unstaged changes I made have been reverted
15:34 JJM joined #git
15:34 osse that explains why git status says there are no changes to that file, then
15:35 osse because there are none
15:35 eletuchy_ joined #git
15:35 bongjovi is it possible to get all the changes back?
15:35 osse depends on how you got rid of them
15:35 bongjovi I reverted the latest commit
15:35 bongjovi and then i got a notification about a stash that had been created
15:35 bongjovi which I deleted
15:36 osse it was created for you? :S
15:36 osse at the bottom of man git-stash there's a procedure for recovering deleted stashes
15:36 gitinfo the git-stash manpage is available at http://jk.gs/git-stash.html
15:36 JJM_ joined #git
15:36 JeroenT_ joined #git
15:37 bongjovi I'm trying something called GitKraken
15:37 reactormonk How can I squash changes between HEAD and a specific commit into a commit, such that specific commit + commit has the same working tree as HEAD?
15:37 eletuch__ joined #git
15:37 Gsham joined #git
15:37 milki was kicked by Eugene: There are no new jokes!
15:37 osse reactormonk: git reset --soft {earliest commit} && git commit --amend
15:37 toogley joined #git
15:37 acetakwas joined #git
15:38 phy1729 Eugene: I submitted new jokes weeks ago!
15:38 hashpuppy joined #git
15:39 Eugene My hunger for comedy knows no bounds
15:39 bongjovi osse: no luck with that
15:39 reactormonk osse, nice one
15:39 drodger joined #git
15:39 osse bongjovi: then, depending on how gitkraken works (I don't know), you might be utterly fucked
15:40 alexbligh1 joined #git
15:40 bongjovi oh dear
15:40 eletuchy joined #git
15:41 ptnecniv joined #git
15:41 mustmodify joined #git
15:41 PCatinean joined #git
15:41 mustmodify Without rebasing, creating new branches, or whatever, assuming I haven't pushed out the commit, can I change a commit message from like 3 commits ago?
15:42 ThiefMaster yes, do an interactive rebase
15:42 ThiefMaster git rebase -i HEAD~4
15:42 mustmodify interactive rebase
15:42 mustmodify ok I'll check it out. Thanks.
15:42 bongjovi osse: do you know what I should be seeing when I use that procedure?
15:42 ThiefMaster then mark that commit as r (reword) instead of pick
15:42 osse bongjovi: what exactly did you do? you reverted a commit? then gitkraken created a stash for you?
15:42 eletuchy_ joined #git
15:42 italoacasas joined #git
15:42 osse and you deleted it ?
15:42 bongjovi yes
15:42 ThiefMaster if you have the commit hash you can also use whatever^ insteadof HEAD~n
15:43 ThiefMaster (HEAD~n goes back n commits, you need to point to at least one commit before the one you want to change, whatever^ goes to the commit before whatever)
15:43 osse bongjovi: maybe git reflog
15:44 bongjovi I reverted, and gitkraken asked if I wanted to immediately commit the reverted changes
15:44 osse no wait, the changes were untracked
15:44 bongjovi I hit no as it was an accidental revert
15:44 ptnecniv left #git
15:44 bongjovi and then a stash was created, which I deleted
15:44 eletuch__ joined #git
15:44 osse whyyyy
15:44 JeroenT joined #git
15:45 bongjovi I thought it would just get me back to where I was before.. :(
15:45 bongjovi lost changes to 15 files
15:46 osse bongjovi: can you expand on "no luck with that" ?
15:47 bongjovi sorry, so I just got two messages
15:47 bongjovi Checking object directories: 100% (256/256), done.
15:47 bongjovi Checking objects: 100% (1233/1233), done.
15:47 bongjovi I ran git fsck --unreachable | grep commit | cut -d\  -f3 | xargs git log --merges --no-walk --grep=WIP
15:47 eletuchy joined #git
15:48 alexbligh1 joined #git
15:48 bongjovi oh, git fsck --no-reflog | awk '/dangling commit/ {print $3}' has given me some hashes
15:48 gechr_ joined #git
15:49 bongjovi looking at the top answer here http://stackoverflow.com/questions/8933​2/how-to-recover-a-dropped-stash-in-git
15:49 rominronin joined #git
15:50 durham joined #git
15:51 eletuchy_ joined #git
15:51 toogley joined #git
15:51 skripth4cker joined #git
15:51 diegoviola joined #git
15:51 d4rklit3 joined #git
15:51 mdw joined #git
15:51 osse git show  {those hashes}
15:52 mustmodify left #git
15:52 mustmodify joined #git
15:52 mustmodify ThiefMaster: thanks.
15:52 bongjovi osse: thanks, i'll do that now
15:53 eletuch__ joined #git
15:55 eletuchy joined #git
15:56 bongjovi it osse: I used gitk as suggested on that stackoverflow page and I can see the changes now
15:56 bongjovi might have just saved my life
15:57 understatment648 joined #git
15:57 durham joined #git
15:57 mustmodify left #git
15:58 eletuchy_ joined #git
15:58 jasom left #git
15:58 alexbligh1 joined #git
15:59 espindola joined #git
16:00 eletuch__ joined #git
16:00 PCatinean joined #git
16:01 bongjovi osse: looks like a bit of a mess... http://i.imgur.com/3mBuo7Q.png
16:01 _nadim joined #git
16:02 lindenle joined #git
16:02 bongjovi the highlighted item is where I want to get back to
16:02 eletuchy joined #git
16:02 lindenle joined #git
16:02 bollullera left #git
16:03 hahuang61 joined #git
16:04 synthroid joined #git
16:06 eletuchy_ joined #git
16:06 synthroid joined #git
16:06 themayor joined #git
16:08 fracting joined #git
16:08 eletuchy joined #git
16:09 robotroll joined #git
16:09 alexbligh1 joined #git
16:10 joshc joined #git
16:11 italoacasas joined #git
16:11 eletuchy_ joined #git
16:11 PCatinean joined #git
16:13 bittin joined #git
16:13 eletuch__ joined #git
16:14 nilsi joined #git
16:14 osse bongjovi: git checkout -p f4c623f and answer yes or no ass appropriate
16:14 nadim joined #git
16:14 SteffanW joined #git
16:15 bongjovi osse: "Apply this hunk to index and worktree", no notification about the unstaged files, is that OK?
16:15 watabou joined #git
16:16 eletuchy joined #git
16:16 imachuchu joined #git
16:17 liquidjamm joined #git
16:18 mdw joined #git
16:19 eletuchy_ joined #git
16:20 ncthom91 joined #git
16:21 mehola joined #git
16:22 PCatinean joined #git
16:22 KevinMGranger joined #git
16:22 osse bongjovi: look at the diff. do you want it?
16:22 osse you'll get many such questions
16:22 bongjovi it's just one line from the commit I wanted to revert
16:22 bongjovi that's all I was prompted for
16:22 eletuchy joined #git
16:24 wviana_ joined #git
16:25 osse I give up
16:25 bongjovi no problem, thanks for your help
16:25 osse the things called "auto stash" sound more likely
16:26 bongjovi i'm considering just copy pasting all the changes from gitk
16:26 eletuchy_ joined #git
16:26 osse gitk is showing them?
16:26 osse and you know it' showing f4c623f ?
16:26 toogley joined #git
16:27 bongjovi each of those f4c623f shows different files
16:27 mehola joined #git
16:27 subhojit777 joined #git
16:27 osse ohh f4c623f isn't the hash
16:27 osse find out the hash from the gui and do git checkout -p {that hash}
16:27 bongjovi !
16:28 eletuch__ joined #git
16:28 al-damiri joined #git
16:28 bongjovi thank you so much osse
16:29 bongjovi that's done it
16:29 wviana joined #git
16:29 pwnz0r joined #git
16:30 circ-user-gLnzD joined #git
16:30 toogley joined #git
16:31 eletuchy joined #git
16:34 toogley joined #git
16:34 githogori joined #git
16:34 eletuchy_ joined #git
16:35 bango2 joined #git
16:35 Juzzika joined #git
16:35 ToBeCloud joined #git
16:37 robotrolll joined #git
16:37 eletuchy joined #git
16:37 circ-user-gLnzD_ joined #git
16:38 toogley joined #git
16:39 eletuch__ joined #git
16:40 romerocesar joined #git
16:41 Raging_Hog joined #git
16:42 UbuntuDude joined #git
16:42 eletuchy joined #git
16:44 eletuchy_ joined #git
16:45 UbuntuDude I'm not able to distinguish the difference between these two commands git remote add origin <url> vs git push --set-upstream origin <url>
16:45 Aut0maton joined #git
16:46 jhass the fomer doesn't do a push
16:46 jhass actually how do they do the same at all?
16:47 johnmilton joined #git
16:47 shinnya joined #git
16:47 eletuchy joined #git
16:48 UbuntuDude so the second could be considered as the 1st plus one push .. is that right?
16:48 durham joined #git
16:48 jhass no, not at all
16:49 jhass you can't even do the second if the first never happened, it's just that git clone <url> does the first one already
16:49 eletuch__ joined #git
16:50 Aut0maton joined #git
16:51 rominronin joined #git
16:51 Aut0maton joined #git
16:52 eletuchy joined #git
16:52 NeverDie joined #git
16:53 blackwind_123 joined #git
16:54 mischat joined #git
16:54 dopesong joined #git
16:55 eletuchy_ joined #git
16:55 dopesong joined #git
16:55 circ-user-gLnzD joined #git
16:56 rnsanchez_ joined #git
16:56 italoacasas joined #git
16:56 eletuch__ joined #git
16:58 mehola joined #git
16:59 hahuang61 joined #git
17:00 rgrinberg joined #git
17:00 eletuchy joined #git
17:00 interne7y joined #git
17:01 eletuchy_ joined #git
17:04 eletuch__ joined #git
17:05 johnmilton joined #git
17:05 circ-user-gLnzD_ joined #git
17:06 ciampix joined #git
17:06 eletuchy joined #git
17:07 ejb joined #git
17:07 rahtgaz joined #git
17:09 mdw_ joined #git
17:10 eletuchy_ joined #git
17:12 eletuchy joined #git
17:12 gsingh joined #git
17:13 diogenese joined #git
17:15 eletuchy_ joined #git
17:16 Sasazuka joined #git
17:17 eletuch__ joined #git
17:18 Grimm_ joined #git
17:18 eletuchy joined #git
17:19 sharpy joined #git
17:19 pungi-man joined #git
17:21 eletuchy_ joined #git
17:22 jceb joined #git
17:23 romerocesar joined #git
17:24 bsanford joined #git
17:24 przemoc joined #git
17:24 nitin joined #git
17:25 eletuchy joined #git
17:26 AaronMT_ joined #git
17:26 bsanford_ joined #git
17:26 ahmedelgabri joined #git
17:29 dreiss joined #git
17:30 Limes_ joined #git
17:33 jimi_ joined #git
17:33 EvilPenguin joined #git
17:34 zincrokx joined #git
17:36 zincrokx joined #git
17:39 eletuchy joined #git
17:40 rahtgaz joined #git
17:40 sargas joined #git
17:40 Dazzyo joined #git
17:45 col joined #git
17:46 EvilPenguin joined #git
17:46 floatingpoint joined #git
17:47 Gsham joined #git
17:47 nilg` joined #git
17:50 rominronin joined #git
17:52 zincrokx joined #git
17:53 wviana joined #git
17:53 zincrokx joined #git
17:53 Dyonisos joined #git
17:53 Dyonisos joined #git
17:54 zincrokx joined #git
17:54 Dyonisos joined #git
17:55 blackjid joined #git
17:55 dreiss joined #git
17:59 synthroid joined #git
17:59 fracting joined #git
18:00 zarel joined #git
18:00 GavinMagnus left #git
18:03 PCatinean joined #git
18:11 SwiftMatt joined #git
18:12 elastix1 joined #git
18:13 espindol_ joined #git
18:14 wviana joined #git
18:15 kadoban joined #git
18:16 FunkyAss joined #git
18:17 k3rn31 joined #git
18:17 netj joined #git
18:19 codeman joined #git
18:20 ahmedelgabri joined #git
18:22 djb-irc joined #git
18:23 treehug88 joined #git
18:24 nkouevda joined #git
18:26 m0viefreak joined #git
18:26 liquidjamm joined #git
18:28 LionsMane joined #git
18:28 djb-irc joined #git
18:29 LionsMane joined #git
18:30 netj joined #git
18:30 annoymouse joined #git
18:30 yqt joined #git
18:30 fracting joined #git
18:31 paul424 joined #git
18:33 italoacasas joined #git
18:35 multi_io joined #git
18:35 SwiftMatt joined #git
18:37 netj joined #git
18:37 k3rn31 joined #git
18:37 nwkj86 joined #git
18:38 inflames joined #git
18:39 jerematic joined #git
18:41 nurey joined #git
18:42 EvilPenguin joined #git
18:42 nurey looking for the command that i would have needed to execute to accomplish what i now see in `git branch`: dev -> zoophoria-dev
18:42 romankl joined #git
18:43 nurey `git checkout dev` places me into zoophoria-dev
18:44 fracting joined #git
18:44 garethdaine joined #git
18:45 Fr4n joined #git
18:45 crayon joined #git
18:45 romankl joined #git
18:49 watersoul joined #git
18:49 kutsuya joined #git
18:50 heftig joined #git
18:51 rominronin joined #git
18:51 JZA left #git
18:51 d4rklit3 joined #git
18:54 mikecmpbll joined #git
18:55 wald joined #git
18:56 aguimaraes1986 joined #git
18:56 KevinMGranger !man git-symbolic-ref
18:56 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
18:56 gitinfo the git-symbolic-ref manpage is available at http://jk.gs/git-symbolic-ref.html
18:57 _nadim joined #git
18:58 GavinMagnus joined #git
18:59 Nryc joined #git
18:59 PCatinean joined #git
19:01 paul424 joined #git
19:01 nadim joined #git
19:01 interne7y joined #git
19:03 tjone270 joined #git
19:06 annoymouse joined #git
19:06 CEnnis91 joined #git
19:07 thiago joined #git
19:08 ToBeCloud joined #git
19:08 CheckDavid joined #git
19:09 KevinMGranger nurey: ^ that's for you btw
19:09 marc_v92 joined #git
19:09 gsingh joined #git
19:10 dmarr joined #git
19:10 SleePy joined #git
19:10 SleePy joined #git
19:10 strayArch joined #git
19:12 Gsham joined #git
19:12 netj joined #git
19:16 toogley joined #git
19:17 grift joined #git
19:17 astrofog joined #git
19:18 Limes_ joined #git
19:18 ahmedelgabri joined #git
19:19 kevwil joined #git
19:22 mykespb joined #git
19:25 treehug88 joined #git
19:27 strayArch joined #git
19:27 IWishIKnew joined #git
19:29 spudowiar joined #git
19:30 crayon joined #git
19:30 macefr joined #git
19:32 stuh84 joined #git
19:35 imachuchu joined #git
19:35 anli joined #git
19:35 ekinmur joined #git
19:36 anli I want to merge a pull request that someone made on a repo into my own fork of that repo, is that possible?
19:36 anli Oh, this is github talk
19:36 anli Must enter #github
19:36 Eugene anli - sure; add the upstream repo as a remote(man git-remote), then use !guthub_pull
19:36 gitinfo anli: the git-remote manpage is available at http://jk.gs/git-remote.html
19:36 Eugene !github_pull
19:36 gitinfo To easily see Github Pull Requests in your local repo, use this fetchspec trick: https://gist.github.com/piscisaureus/3342247
19:36 anli Eugene: true, that was an easy one!
19:36 anli thanks however
19:36 Eugene !next
19:36 gitinfo Another satisfied customer. NEXT!
19:36 anli hehe
19:37 anli Hm, cant see the git url of his fork...
19:37 anli I just had to search for it, never mind
19:38 Eugene The pull/ ref will exist on the repo that has the PR open(eg, the one that was originally Forked-from)
19:38 Eugene That's the one you'll need to add
19:38 anli yes
19:38 anli I had to click a button to see the url
19:39 MadHatter42 joined #git
19:39 anli Hm, did I have to create a branch of my own to switch to his branch?
19:39 skripth4cker joined #git
19:39 Eugene Yes, you'll need to make a new branch in your local repo
19:40 Eugene `git checkout -b mybranch upstream\foobranch` or such
19:40 dunpeal joined #git
19:40 DeanF joined #git
19:40 anli thx
19:40 anli Well, I need to create my own branch then
19:41 b0nn joined #git
19:41 anli Cannot just checkout upstream/foobranch without getting a corresponding branch (of any name) locally
19:42 editshare-ericf joined #git
19:42 dunpeal Hi. We use Github, and in our workflow, we create pull requests for every merge to master. 1) Is that broken / over-engineered?  2) What's the easiest way to push the one-shot branch we create to origin?
19:42 cd83x joined #git
19:43 dunpeal (Since the only purpose of these one-shot branches is for the PR, --set-upstream seems a bit of an overkill)
19:43 b0nn hi all, I'm trying to do something a bit weird. I am working from home, I have access to my company's git server through a VPN, and I want to clone our repo. The URL on my work machine is git@git.work.machine, I cannot git clone because I do not have a password for the git user (I _think_ I use the ssh key on my work machine when i am at work)
19:43 b0nn so, do I transfer the ssh key to my home machine, will that give me access?
19:43 pwnz0r joined #git
19:44 jonmorehouse joined #git
19:44 nnyk_ joined #git
19:44 dunpeal b0nn: if you are never asked for a password, then yes, you are most likely using a key, in which case yes, properly setting up that same key on your home machine should grant you the same access.
19:45 b0nn ok, I am concerned about using two private keys on my home machine, is that possible?
19:46 jhass yes, see IdentifyFile in man ssh_config
19:46 dunpeal yeah, plenty of people use more than one key
19:46 b0nn dunpeal: jhass: thanks
19:46 _nadim joined #git
19:48 marchelzo joined #git
19:49 elastix1 joined #git
19:49 _nadim joined #git
19:53 lindenle joined #git
19:53 rominronin joined #git
19:54 fscala joined #git
19:57 abs25 joined #git
19:58 abs25 hello, is there a way to have my own custom git command?, like "git deploy <branch name>" and have this run my shell script for autodeployment?
19:59 GavinMagnus joined #git
19:59 kadoban abs25: Sure, you can add subcommands. The easiest way is an alias, look for alias in man git config
19:59 gitinfo abs25: the git-config manpage is available at http://jk.gs/git-config.html
19:59 bruce_lee joined #git
20:00 MistahKurtz joined #git
20:00 abs25 kadoban: I know about aliases, but is there a way to make alias for "git deploy" and not git-deploy
20:01 abs25 oh wait, git alisase can be made to run shell scripts?
20:01 kadoban Yeah they can do whatever, IIRC you prefix with a ! to run shell commands.
20:01 kadoban abs25: If it's more complicated, you can also just put a shell script called git-deploy in the same directory as where git's other subcommand scripts are, and that'll work.
20:02 kulelu88 joined #git
20:03 abs25 kadoban: where would that be?
20:03 KevinMGranger Anywhere in your $PATH ;)
20:03 kadoban abs25: Depends on how you installed I think. `which git-commit` or something like that should tell you.
20:03 kadoban KevinMGranger: Actially, IIRC, I though they had to be in the same place?
20:04 rgrinberg joined #git
20:04 KevinMGranger I'm almost certain it doesn't have to be, let me try real quick
20:05 KevinMGranger Anywhere in $PATH
20:05 kadoban jast: Looks like the TLS cert on jk.gs expired, just FYI.
20:06 KevinMGranger The next question is, where is this behavior documented
20:07 boombatower joined #git
20:07 fenugrec joined #git
20:09 boombatower joined #git
20:11 eletuchy joined #git
20:11 diegoviola joined #git
20:11 Waskeend joined #git
20:11 diegoviola joined #git
20:13 eletuchy_ joined #git
20:14 ochorocho__ joined #git
20:14 axiom_1 joined #git
20:14 eletuch__ joined #git
20:15 nfk joined #git
20:18 Gsham joined #git
20:20 eletuchy joined #git
20:22 eletuchy_ joined #git
20:22 ncthom91 joined #git
20:23 mdw joined #git
20:23 ahr3n joined #git
20:24 mdw joined #git
20:24 eletuch__ joined #git
20:26 imao joined #git
20:26 jstimm joined #git
20:27 BSAlb joined #git
20:28 eletuchy joined #git
20:30 eletuchy_ joined #git
20:30 satifant joined #git
20:30 EduardoMartins joined #git
20:31 ynanm joined #git
20:31 radsy joined #git
20:31 diegoviola joined #git
20:31 durham_ joined #git
20:34 rvsjoen joined #git
20:39 inflames joined #git
20:39 rvsjoen_ joined #git
20:39 knutstrut joined #git
20:40 ojdo joined #git
20:41 danchr joined #git
20:41 circ-user-QQDbL joined #git
20:41 Mobutils joined #git
20:45 djb-irc joined #git
20:45 bluepixel joined #git
20:45 osse KevinMGranger: Documentation/howto/new-command.txt in the repo. The Makefile makes it into a HTML page but there is no equivalent man page
20:45 osse strange
20:46 romerocesar joined #git
20:46 tomog999_ joined #git
20:46 Chill_Surf joined #git
20:50 dsop_ left #git
20:50 diegoaguilar joined #git
20:50 dsop joined #git
20:51 King_Hual joined #git
20:51 King_Hual joined #git
20:53 dunpeal left #git
20:54 rominronin joined #git
20:55 GavinMagnus joined #git
20:55 Sonderblade joined #git
20:56 _28_ria joined #git
20:57 ekinmur joined #git
20:57 mehola joined #git
20:58 EvilPenguin joined #git
20:58 dopesong joined #git
20:58 Sonderblade joined #git
21:00 nettoweb joined #git
21:00 tristanp joined #git
21:01 allcentury joined #git
21:01 allcentury hola #git - I'm trying to find the last commit (author/timestamp) of each file in my repo.  Any ideas?
21:02 interne7y joined #git
21:03 ojacobson find . -type f -print -exec git log --oneline -1 {} \;
21:03 LaT0rtue joined #git
21:05 rnsanchez_ joined #git
21:06 GavinMagnus left #git
21:06 bruce_lee joined #git
21:06 bruce_lee joined #git
21:06 hahuang65 joined #git
21:09 pandeiro joined #git
21:09 gsingh_ joined #git
21:12 Rodya_ joined #git
21:13 pandeiro joined #git
21:16 Yizs joined #git
21:16 ahmedelgabri joined #git
21:19 Seveas_ left #git
21:21 SimonNa joined #git
21:21 Seveas joined #git
21:22 edude03 joined #git
21:24 kane45 joined #git
21:25 AaronMT joined #git
21:26 BrunoSaboia joined #git
21:28 CheckDavid joined #git
21:30 philipp64|work joined #git
21:31 Eugene allcentury - !last
21:31 gitinfo allcentury: git-last is a script which will give you a GitHub-like view of the current directory(showing the last commiter of each dir/file): https://madeitwor.se/scripts/​blob/master/bash/git-last.sh
21:31 philipp64|work Is this the right place to get help on git-send-email?  I'm having issues with it bombing out when trying to upstream netdev patches...
21:32 Eugene Yes, but it's a lesser-used command and I can't guarantee you an answer.
21:33 philipp64|work okay....  I'm using it with a local server (sendmail) with a self-signed server cert...   The EHLO/STARTTLS works fine... Then the "MAIL FROM" ($smtp->mail(...)) mysteriously (and abruptly) bombs.
21:34 romerocesar joined #git
21:34 drodger joined #git
21:35 philipp64|work Log is here... http://paste.fedoraproject.org/375546/65248863/
21:35 eletuchy joined #git
21:36 philipp64|work Never liked Net::Cmd or Net::SMTP... always thought the response handling was weak...
21:38 madewokherd joined #git
21:39 mikecmpbll joined #git
21:39 EvilPenguin joined #git
21:39 Seveas philipp64|work: which git version?
21:40 spriz joined #git
21:41 Seveas hmm, and is there anything useful in the sendmail logs? At first glance it looks like sendmail just kills the connection without sending an error.
21:42 ToBeCloud joined #git
21:42 franl joined #git
21:44 Pyrogerg joined #git
21:46 mehola joined #git
21:47 marchelzo joined #git
21:47 dopesong_ joined #git
21:48 arooni joined #git
21:48 nevodka joined #git
21:50 eletuchy joined #git
21:50 rgrinberg joined #git
21:51 durham joined #git
21:52 miklcct joined #git
21:54 rudedogg joined #git
21:54 aidalgol joined #git
21:55 rominronin joined #git
21:56 rudedogg Hi all, I have a question about how I should structure something with git. I have a project, and I need to split it into two "versions" which are separate. My idea for the workflow is I do bugfixes and features on master, and then pull them down into the two versions.
21:57 mdw joined #git
21:58 rudedogg This is for a mac app, I want to have a version for selling outside the app store, and have a version for in the app store. I can't have the libraries I use for the outside of the store version show up in the store version.
21:58 bremner in a sane world, you wouldn't check libraries into git
21:59 rudedogg Is the easiest way to do that to use master for bugfixes/features, and then use two branches for the different versions? Then I cherry pick fixes/features into each?
22:01 philipp64|work Seveas: http://paste.fedoraproject.org/375558/25046414/ and... it's git 2.5.5.
22:02 Vinnie_win_l joined #git
22:02 rudedogg bremner: I don't think I have a choice
22:03 mellernoia joined #git
22:03 aidalgol joined #git
22:04 jstimm joined #git
22:04 siprbaum joined #git
22:04 d4rklit3 joined #git
22:05 blackwind_123 joined #git
22:07 GavinMagnus joined #git
22:07 diogenese joined #git
22:10 Seveas philipp64|work: hmm, I don't speak digest-md5, but "Jun  6 15:33:41 mail sendmail[554]: AUTH: sasl_decode error=-1" makes me think git send-email and sendmail disagree about how it should be spoken. Line 37 of your initial log also looks like you're sending an empty line, which it mail not like
22:11 watabou joined #git
22:13 ISmithers joined #git
22:14 Seveas philipp64|work: and for another shot in the dark: if Authen::SASL is not installed, try installing it. It looks like that will change git send-email's behaviour.
22:16 finisherr joined #git
22:18 mischat joined #git
22:19 finisherr What is the appropriate way to pull down a remote branch that is not yet present locally?
22:19 finisherr for a while I would create a local branch then git pull origin branch_name
22:19 finisherr of the same name
22:21 rudedogg finisherr: I'm here with a question and not a regular, but I always do git pull on master, which creates the remote branch locally, and then git checkout {branch}
22:22 finisherr if you do git branch, all you'll see in this case is develop
22:22 Guest70232 joined #git
22:22 finisherr i think i have to do git checkout --track origin/branch_name possible
22:22 finisherr s/possible/possibly
22:23 rudedogg ooo I see, hopefully someone with more experience will chime in :)
22:23 finisherr That did the trick
22:23 finisherr There was a point in time when I didn't have to do that, anyway, it beats my old method
22:24 kadoban finisherr: If you just do 'git checkout the-branch' and there's no local branch of that name, and there's one remotely at one remote, it'll automatically do it.
22:24 kadoban It automatically sets it up to track and such as well.
22:24 finisherr I've seen where it would error about the local branch not existing or something
22:24 finisherr this is in the context of travis-ci
22:25 kadoban Maybe if the remote hasn't been fetched from or something, or if there's multiple remotes with the same branch name it likely won't just pick one.
22:25 nwkj86 joined #git
22:27 finisherr bah, doesn't work in travis-ci for some reason
22:27 finisherr i'll fetch --all first
22:29 tomboy64 joined #git
22:29 fenugrec left #git
22:30 finisherr ahh, it's because it's starts in a detached state for some reason
22:33 mikecmpbll joined #git
22:33 Noldorin joined #git
22:38 Fr4n joined #git
22:41 eletuchy joined #git
22:42 ensyde__ joined #git
22:42 ochorocho__ joined #git
22:42 mdw joined #git
22:45 liuzhen joined #git
22:45 baraba joined #git
22:47 _28_ria joined #git
22:49 WaReZ joined #git
22:49 liuzhen joined #git
22:54 aidalgol Man, those git jokes (linked to in the /topic) are *terrible*. :P
22:55 mikecmpbll joined #git
22:57 bremner no u
22:57 rominronin joined #git
22:58 dfr33zy joined #git
23:03 interne7y joined #git
23:08 dmto joined #git
23:09 gsingh_ joined #git
23:10 italoacasas joined #git
23:12 jimi_ joined #git
23:14 reim joined #git
23:15 KrisBoutilier joined #git
23:16 nettoweb joined #git
23:16 hahuang65 joined #git
23:16 yuhlw joined #git
23:18 EvilPenguin joined #git
23:18 hexafluoride joined #git
23:19 hexafluoride after changing some unstaged files I now get this whenever I try to do git anything
23:19 gsingh__ joined #git
23:19 hexafluoride fatal: unordered stage entries in index
23:19 hexafluoride git status, git diff and git ls-files don't work
23:19 hexafluoride it just happened suddenly
23:19 nettoweb joined #git
23:20 hexafluoride help pls ;_;
23:21 hexafluoride googling doesn't return anything
23:21 kadoban hexafluoride: You have any uncommited changes you need to save?
23:21 hexafluoride yep
23:21 kadoban Then I dunno :-/
23:22 hexafluoride what if I didn't?
23:22 kadoban Definitely make a backup I guess … that's not something that's supposed to happen.
23:22 hexafluoride is my HDD crapping itself maybe
23:22 nettoweb joined #git
23:22 kadoban You can just delete the index, it's somewhere in .git/ that I could probably find, but that's going to get rid of any staged changes at a minimum
23:22 kadoban That would be my guess, or a computer otherwise going to hell somehow. Other guesses would be a git bug, but that doesn't happen much, especially not that severe.
23:23 eletuchy_ joined #git
23:24 ahmedelgabri joined #git
23:24 nettoweb joined #git
23:25 netj joined #git
23:25 NeverDie joined #git
23:25 eletuch__ joined #git
23:26 hexafluoride kadoban, well, deleting the index file solved my problem since the changes were unstaged
23:26 hexafluoride I guess I should still take HDD backups though
23:26 hexafluoride thanks!
23:26 kadoban Yeah. Sure, you're welcome.
23:27 nilsi joined #git
23:27 nettoweb joined #git
23:27 ahr3n_ joined #git
23:29 eletuchy joined #git
23:29 nettoweb joined #git
23:30 alex1a_ joined #git
23:30 eletuchy_ joined #git
23:31 codeman joined #git
23:31 philipp64|work Seveas: On Fedora I already had perl-Authen-SASL installed.  Need to figure out where the blank line is coming from...
23:31 nettoweb joined #git
23:34 eletuchy joined #git
23:36 eletuchy_ joined #git
23:38 eletuch__ joined #git
23:38 mattfoo joined #git
23:38 philipp64|work Seveas: the latest Net::SMTP has a ::starttls() method, but git-send-email doesn't use it... I'll try patching the script to use it.
23:40 jstimm joined #git
23:42 eletuchy joined #git
23:43 mehola joined #git
23:43 allcentury joined #git
23:45 eletuchy_ joined #git
23:47 eletuch__ joined #git
23:49 eletuchy joined #git
23:52 eletuchy_ joined #git
23:53 _28_ria joined #git
23:55 eletuchy joined #git
23:57 eletuch__ joined #git
23:58 rominronin joined #git

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