Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-03

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

All times shown according to UTC.

Time Nick Message
00:00 MattMake_ joined #git
00:01 quetz joined #git
00:01 ResidentBiscuit joined #git
00:03 danslo joined #git
00:03 MattMaker joined #git
00:10 ruby_ joined #git
00:10 actinide joined #git
00:10 jagob joined #git
00:12 ruby_ joined #git
00:12 MattMaker joined #git
00:13 JanC_ joined #git
00:14 chid joined #git
00:15 thomas_25 joined #git
00:24 Sasazuka_ joined #git
00:29 ruby_ joined #git
00:30 mingrammer joined #git
00:30 Rodya_ joined #git
00:36 ASOLAr joined #git
00:37 ruby_ joined #git
00:38 thomas_25 joined #git
00:38 ASOLAr joined #git
00:42 d5sx43 joined #git
00:43 Urbany joined #git
00:48 crayon joined #git
00:52 arescorpio joined #git
00:54 ASOLAr joined #git
00:59 noobest_noob joined #git
01:00 noobest_noob left #git
01:01 ruby_ joined #git
01:03 chandu20 joined #git
01:04 flopsec joined #git
01:05 durham_ joined #git
01:11 paulh_ joined #git
01:11 raijin joined #git
01:14 zacts joined #git
01:15 Rodya_ joined #git
01:15 l4v2 joined #git
01:20 BackEndCoder joined #git
01:23 arand joined #git
01:25 ayjay joined #git
01:28 jimi_ joined #git
01:29 str joined #git
01:31 diogenese joined #git
01:34 djh joined #git
01:35 strugee joined #git
01:35 maxb joined #git
01:37 pks joined #git
01:39 strugee greetings! I'm getting extremely weird results when trying to initialize submodules in a repository I've forked (however the issue, IIRC, is present in the upstream repo as well)
01:39 strugee running `git clone git@github.com:e14n/connect-auth.git && cd connect-auth && git submodule init` returns:
01:39 strugee > fatal: No url found for submodule path 'support/expresso' in .gitmodules
01:40 strugee even though there's no .gitmodules file in the repository
01:40 strugee not really sure how that's happening
01:40 strugee I'm on Git 2.9.3 on OS X. anyone have any ideas?
01:40 * strugee is afk but will be back later
01:41 foo left #git
01:41 boombatower joined #git
01:46 boushi joined #git
01:46 ASOLAr joined #git
01:47 drbean joined #git
01:48 e14 joined #git
01:49 e14 joined #git
01:49 d^sh joined #git
01:50 Vampire0_ joined #git
01:50 Shentino joined #git
01:51 swalladge joined #git
01:53 diogenese joined #git
01:55 ruby_ joined #git
02:00 BenderRodriguez joined #git
02:00 WayToDoor joined #git
02:00 shinnya joined #git
02:01 mangolisk joined #git
02:02 mingrammer joined #git
02:04 WhiskerBiscuit joined #git
02:04 danslo joined #git
02:05 Rodya_ joined #git
02:09 ToBeCloud joined #git
02:10 Kake_ joined #git
02:10 Kake_ Is it possible to clone a repo branch to a subdirectory of my repo master clone?
02:13 constant joined #git
02:14 cue273 joined #git
02:14 HoierM joined #git
02:14 Rodya_ joined #git
02:15 MattMaker joined #git
02:16 ruby_ joined #git
02:17 romerocesar joined #git
02:17 BSab joined #git
02:17 mizu_no_oto joined #git
02:19 Aces_Charles joined #git
02:20 ratiotile__ joined #git
02:21 hexagoxel joined #git
02:24 ruby_ joined #git
02:26 atomi joined #git
02:28 newbiee joined #git
02:29 lolmac joined #git
02:29 MattMake_ joined #git
02:29 A5101 joined #git
02:30 fstd_ joined #git
02:31 fakenerd joined #git
02:32 Goplat joined #git
02:34 ruby_ joined #git
02:35 vassagus joined #git
02:36 Dougie187 joined #git
02:38 Shentino joined #git
02:41 holodoc joined #git
02:42 lagothri1 joined #git
02:43 parsnip !snotback
02:43 gitinfo Yum! Oysters!
02:44 cdg joined #git
02:44 parsnip !subrepos
02:44 gitinfo [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
02:46 cdg joined #git
02:46 vassagus joined #git
02:47 WizJin joined #git
02:47 duderonomy joined #git
02:59 boushi_ joined #git
03:00 BackEndCoder joined #git
03:02 mehola joined #git
03:04 chachasmooth joined #git
03:07 clemf joined #git
03:08 archaic joined #git
03:09 gfixler joined #git
03:10 ahr3n joined #git
03:12 madewokherd joined #git
03:12 cagedwisdom joined #git
03:15 Vortex34 joined #git
03:18 nettoweb joined #git
03:20 romerocesar joined #git
03:23 ASOLAr joined #git
03:27 mingrammer joined #git
03:29 cdg joined #git
03:29 paulh_ joined #git
03:32 nettoweb joined #git
03:34 vassagus joined #git
03:34 eizua joined #git
03:37 dsdeiz_ joined #git
03:37 romerocesar joined #git
03:43 holodoc joined #git
03:43 indieross joined #git
03:46 rossome joined #git
03:49 Dougie187 left #git
03:50 stickperson joined #git
03:51 ruby_ joined #git
03:52 boushi joined #git
03:54 ASOLAr joined #git
04:05 danslo joined #git
04:06 sssilver joined #git
04:07 cdg joined #git
04:09 ShapeShifter499 joined #git
04:10 dermoth joined #git
04:11 fakenerd joined #git
04:11 tomog999 joined #git
04:12 stonercoder joined #git
04:12 cdg_ joined #git
04:13 phanimahesh joined #git
04:14 mingrammer joined #git
04:15 johnny56_ joined #git
04:15 Cabanossi joined #git
04:18 dreiss joined #git
04:18 stickperson joined #git
04:19 Limes left #git
04:19 dsdeiz joined #git
04:19 Limes joined #git
04:20 vhost- joined #git
04:21 cagedwisdom joined #git
04:25 Limes joined #git
04:27 ASOLAr joined #git
04:27 Limes left #git
04:27 Limes joined #git
04:31 ruby_ joined #git
04:37 stonercoder joined #git
04:39 cjohnson joined #git
04:39 podbay joined #git
04:39 ojacobson joined #git
04:40 roger_raymond joined #git
04:40 ghostlight joined #git
04:40 ses1984 joined #git
04:40 ajpiano joined #git
04:44 newbiee joined #git
04:46 autofly joined #git
04:46 vassagus_ joined #git
04:52 Limes left #git
04:52 Limes joined #git
04:52 cdg joined #git
04:56 ruby_ joined #git
04:58 daey_ joined #git
04:58 vuoto joined #git
04:58 vassagus joined #git
04:59 phaleth joined #git
05:05 sssilver joined #git
05:09 sssilver joined #git
05:10 stickperson joined #git
05:10 vassagus joined #git
05:12 dsantiago joined #git
05:12 stasmakarov joined #git
05:20 Vivekananda joined #git
05:24 vassagus joined #git
05:25 ruby_ joined #git
05:25 cdg joined #git
05:27 sssilver joined #git
05:31 boushi joined #git
05:31 BSaboia joined #git
05:32 Kicer86 joined #git
05:34 bmahe joined #git
05:36 antiTorture joined #git
05:36 vassagus joined #git
05:36 jaguarmagenta joined #git
05:36 phaleth joined #git
05:38 phaleth joined #git
05:41 cdg_ joined #git
05:43 A5101 joined #git
05:45 LeBlaaanc joined #git
05:48 sssilver joined #git
05:50 vassagus joined #git
05:50 jaggz joined #git
05:55 e14 joined #git
05:55 circ-user-iEC6C joined #git
05:58 ASOLAr joined #git
05:58 vuoto joined #git
05:59 johnny56_ joined #git
06:02 vassagus joined #git
06:02 dreiss joined #git
06:03 ruby_ joined #git
06:05 danslo joined #git
06:06 boushi_ joined #git
06:06 pR0Ps joined #git
06:06 cdown joined #git
06:10 iamtakingiteasy joined #git
06:11 subhojit777 joined #git
06:14 ruby_ joined #git
06:14 ljc joined #git
06:14 ShapeShifter499 joined #git
06:15 vassagus joined #git
06:16 justanotheruser joined #git
06:16 alxlu joined #git
06:16 justanotheruser joined #git
06:18 ruby_ joined #git
06:19 parahumanoid joined #git
06:21 afuentes joined #git
06:23 drinfernoo joined #git
06:24 drinfernoo left #git
06:27 PioneerAxon joined #git
06:28 vassagus joined #git
06:31 fungal joined #git
06:32 thomas_25 joined #git
06:35 thomas_25 joined #git
06:35 parahumanoid left #git
06:37 jagob joined #git
06:39 thiago joined #git
06:48 vuoto joined #git
06:51 sanketdg joined #git
07:06 GandalfTheWizard joined #git
07:07 pR0Ps joined #git
07:09 dsdeiz joined #git
07:12 ljc joined #git
07:13 ljc joined #git
07:13 raven-au joined #git
07:13 justanotheruser joined #git
07:18 jaguarmagenta joined #git
07:24 romerocesar joined #git
07:29 jknetl joined #git
07:32 mycyber joined #git
07:34 bronson joined #git
07:35 t0by joined #git
07:35 xaa joined #git
07:37 mycyber_ joined #git
07:39 johnny56_ joined #git
07:39 Seveas .version
07:39 gitinfo Seveas: .version: still at 2.9.3, not updating topic.
07:40 Seveas jast: your bot is broken.
07:41 _ikke_ I think there is a bit of a delay
07:42 tjone270__ joined #git
07:42 _ikke_ Seveas: I think he has a cron running that updates a local repo
07:42 _ikke_ Not sure how often it runs
07:43 vuoto joined #git
07:43 paulh_ joined #git
07:43 cdg joined #git
07:48 d0nn1e joined #git
07:55 Darcidride joined #git
08:00 thiago joined #git
08:03 dodobrain joined #git
08:06 danslo joined #git
08:07 GavinMagnus joined #git
08:09 mingrammer joined #git
08:09 Bin joined #git
08:13 umbSublime joined #git
08:14 sostenuto joined #git
08:20 guardian joined #git
08:21 guardian hello, I'm trying out Git 2.10.0 and git config --global color.diff.old "red strike" doesn't work for me -- what are the requirements on term? I'm using iTerm2 configured to report xterm-256color
08:24 Topic for #git is now Welcome to #git, the place for git help and post-reductionist industrial exuberance | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Be careful when rewriting history. It may push you to use the dark side of the --force
08:24 bocaneri joined #git
08:26 ahr3n joined #git
08:28 ShapeShifter499 joined #git
08:28 _ikke_ guardian: let me test
08:30 vuoto joined #git
08:34 paulh_ joined #git
08:37 leeN joined #git
08:38 subhojit777 joined #git
08:40 mingrammer joined #git
08:41 _ikke_ guardian: strike is not working for me either
08:41 xaa joined #git
08:42 _ikke_ guardian: it does in xterm (not in urxvt)
08:43 dodobrain joined #git
08:43 boushi joined #git
08:44 guardian works in xterm on mac
08:44 guardian echo -e "\e[9;31mtest\e[0m"
08:44 _ikke_ Yeah
08:45 _ikke_ I think the terminal needs to support it
08:45 thiago that's red, no strike
08:45 dbck joined #git
08:46 _ikke_ echo -en "\033[9mTest"
08:46 thiago but according to wikipedia (https://en.wikipedia.org/wiki/ANSI_escape_code), that's the right escape for strike out
08:47 guardian thiago: \e[9;31m is red strike, \e[31m is red and \e9m[ is strike
08:48 thiago it also says "not widely supported"
08:49 guardian yeah, my curiosity comes from the Github post and the author of the feature uses a Mac: https://cloud.githubusercontent.com/assets/3477155​/18064846/34bdb0f8-6dff-11e6-8ae5-4177e25d5f39.gif
08:50 thiago so you just have to confirm that git did output a 9 in the sequence
08:50 thiago if it did, Git is working perfectly
08:50 thiago talk to your terminal people if it's not showing
08:51 guardian thiago: it does
08:51 guardian _ikke_: thanks for testing it
08:51 stuh84 joined #git
08:56 m0viefreak joined #git
08:56 Gurkenglas joined #git
08:56 sssilver joined #git
08:58 tvw joined #git
08:58 MattMaker joined #git
08:59 Jackneill joined #git
09:00 _ikke_ guardian: no problem
09:01 GavinMagnus joined #git
09:02 BackEndCoder joined #git
09:03 MattMaker joined #git
09:03 stuh84 joined #git
09:03 solf1re joined #git
09:04 GavinMagnus left #git
09:07 Werring joined #git
09:07 flavius joined #git
09:17 SwiftMatt joined #git
09:17 MattMaker joined #git
09:19 cyan__ joined #git
09:20 jaguarmagenta joined #git
09:21 subhojit_ joined #git
09:24 MrWoohoo joined #git
09:25 romerocesar joined #git
09:28 subhojit__ joined #git
09:33 MartyH joined #git
09:35 jim left #git
09:36 MartyH joined #git
09:36 MartyH git config --list shows me (among other things) core.autocrlf=false. I've been led to believe this means "don't perform magic on my line endings" - which is what I want.  I've added a file, which gave me the warning "warning: LF will be replaced by CRLF in tests/run/utf16encoded.scala. The file will have its original line endings in your working directory."
09:36 MartyH what is it warning me for, and should I take action?
09:37 _ikke_ MartyH: Is there a .gitattributes file somewhere?
09:37 thiago joined #git
09:37 MattMaker joined #git
09:38 ryez joined #git
09:38 jost joined #git
09:38 MartyH ah, yes, there is _ikke_. The relevant line seems to be "*.scala   text"
09:39 _ikke_ Right
09:39 _ikke_ is there also an eol attribute somewhere?
09:40 robotroll joined #git
09:40 MartyH yes, but nothing that seems relevant:
09:40 MartyH # Windows-specific files get windows endings *.bat     eol=crlf *.cmd     eol=crlf *-windows.tmpl eol=crlf
09:40 jmd joined #git
09:43 _ikke_ It's odd that it says that LF will be replaced by CRLF
09:44 _ikke_ MartyH: Can you also check core.eol setting?
09:45 subhojit_ joined #git
09:45 MartyH core.eol is not listed in git config --list
09:45 _ikke_ MartyH: What platform are you on?
09:45 MartyH Windows
09:45 Khisanth joined #git
09:46 _ikke_ Ok
09:46 _ikke_ cannot seem to reproduce that warning
09:47 MartyH oddly, when I re-run git add it doesn't give me the warning anymore either
09:47 MartyH so I'll just hope for the best
09:47 MattMaker joined #git
09:48 _ikke_ and safecrlf?
09:49 MartyH the output of git config --list is http://pastebin.com/0igNSmZW
09:49 _ikke_ MartyH: Right, enabling that gives the warning for me
09:49 MartyH (stripped of origin and branch info)
09:49 MartyH convincing git not to do anything with my line endings has been a bit of a constant struggle for me
09:50 _ikke_ MartyH: well, the project (by way of .gitattributes) says it *should* do something with your line endings
09:51 subhojit__ joined #git
09:52 LucaS05 joined #git
09:56 phaleth hi, is there any decent open source app that can run a git server on windows?
09:57 tvw joined #git
09:57 Munt joined #git
09:59 nym joined #git
10:00 thomas_25 joined #git
10:00 Munt_ joined #git
10:02 subhojit_ joined #git
10:02 MattMaker joined #git
10:03 ShapeShifter499 joined #git
10:07 stfn joined #git
10:07 danslo joined #git
10:08 MattMaker joined #git
10:09 harish joined #git
10:09 vuoto joined #git
10:09 e joined #git
10:10 raijin joined #git
10:11 cdg joined #git
10:12 _ikke_ Good question
10:12 jabular joined #git
10:13 MartyH _ikke_ I'm seeing a bunch more warnings about LF getting replaced with CRLF. This does mean that they get committed with CRLF rather than LF right?
10:14 mikecmpbll joined #git
10:14 _ikke_ MartyH: correct
10:15 _ikke_ MartyH: When adding the files to the index, git does the conversion
10:15 MartyH yikes
10:15 _ikke_ MartyH: The converse is also true, when checking out, it should revert it back to LF
10:15 MartyH double yikes
10:16 _ikke_ MartyH: Can you run git check-attr -a <file>, on a file where this happens?
10:17 MartyH "dottydoc/test/BaseTests.scala: text: set"
10:18 romerocesar joined #git
10:18 _ikke_ Hmm, only text is set
10:18 MattMaker joined #git
10:18 _ikke_ Might be a GFW thing that default safecrlf to true or something
10:19 _ikke_ and/or eol to crlf
10:19 m1dnight2 joined #git
10:19 mingrammer joined #git
10:20 zeroed joined #git
10:23 MartyH any advice on how to get out of this situation?
10:24 _ikke_ ah right, core.eol default to native, which would be crlf on windows
10:25 subhojit__ joined #git
10:25 _ikke_ MartyH: Are you at liberty to change the .gitattributes file?
10:25 MartyH "meh". It's written by people who never use windows (and indeed I'm working on it to fix some windows bugs)
10:26 MartyH if the .gitattributes file in itself is a windows bug, a fix would probably be welcome
10:26 _ikke_ Do you see bugs caused by line ending normalization?
10:27 MartyH possibly - at the moment I can't tell for sure
10:27 MattMaker joined #git
10:28 _ikke_ hold on, trying a few things
10:31 MartyH there are a few annoying bugs here and there because of the interplay of line endings in files as they "should" be, line endings annoyingly generated differently by tests completely unrelated to git, and possibly accidental success due to the two accidentally both doing the same wrong thing
10:35 Noldorin joined #git
10:37 harish joined #git
10:39 iron_houzi left #git
10:44 DoITCreative joined #git
10:47 _ikke_ MartyH: So I think with line ending normalization, git will always use LF in the index / repository
10:47 boushi_ joined #git
10:47 MattMaker joined #git
10:48 MartyH that doesn't sound too bad really. Almost everyone/thing can deal with that. It's the crlf's I'm afraid of
10:48 _ikke_ Right
10:49 _ikke_ So do you want to fix it for the project, or only for yourself?
10:50 MartyH for the project is probably for the best
10:51 _ikke_ Then you can do two things
10:52 mizu_no_oto joined #git
10:52 _ikke_ disable normalization entirely, with the chance that someone else will commit crlfs again
10:52 jimi_ joined #git
10:52 _ikke_ or force everyone to use LF
10:53 _ikke_ Leaving things be as it is means that people can have in their working tree whatever they want
10:53 _ikke_ but in the repo it will be LF
10:53 _ikke_ (at least for the files that have text set)
10:53 MartyH forcing "everyone" to go LF will probably be the best
10:54 endiruna joined #git
10:55 MartyH I doubt anyone ever has a problem with files with LF endings
10:55 _ikke_ Except people who insist using notepad :P
10:57 _ikke_ then something like: echo -n "* text eol=lf\n*.png -text\n*.jpg -text"
10:57 _ikke_ something like that
10:57 daurnimator hi
10:57 _ikke_ echo -n "* text eol=lf\n*.png -text\n*.jpg -text" >.gitattributes
10:57 daurnimator someone when I merged a branch
10:58 daurnimator it didn't get marked as a merge...
10:58 daurnimator how can I fix it? (it's been pushed...)
10:58 MattMaker joined #git
10:58 _ikke_ daurnimator: did it say something like fast-forward?
10:58 mizu_no_oto joined #git
10:58 daurnimator _ikke_: no idea. I just realised now (2 weeks later)
10:59 willhunt joined #git
10:59 daurnimator so I guess the question is: how can I --amend a commit to have an extra parent?
10:59 _ikke_ daurnimator: Not without rewriting all following history
10:59 daurnimator _ikke_: I think I'm okay with that.
11:00 _ikke_ Anyone who comitted on top of that commits need to do work
11:00 daurnimator _ikke_: I'm okay with that.
11:00 _ikke_ if they just pull, they will merge the old and new history toegether
11:00 _ikke_ ok
11:00 _ikke_ git replace --graft <commit> <parrent1> <parrent2>
11:01 _ikke_ after that, git filter-branch <branch>
11:01 sin3t joined #git
11:02 vuoto joined #git
11:04 daurnimator the filter-branch seems to have done *much* more than that...
11:04 daurnimator (I'm now seeing "ahead 122, behind 122")
11:06 daurnimator also, 'git replace' doesn't seem to allow for signing
11:06 daurnimator I guess I can amend the replaced commit to sign it.....
11:07 _ikke_ Hmm, I would think git filter-branch would not touch unrelated commits
11:09 subhojit_ joined #git
11:09 govg joined #git
11:10 thiago joined #git
11:12 MattMaker joined #git
11:14 jmd left #git
11:14 ShapeShifter499 joined #git
11:15 PCatinean joined #git
11:20 Noldorin what is $(prefix) in the docs? it's not specified
11:20 mingrammer joined #git
11:20 ojdo joined #git
11:20 jaguarmagenta joined #git
11:20 romerocesar joined #git
11:23 dreamyspell joined #git
11:24 govg joined #git
11:25 canton7 which doc, exactly?
11:25 _ikke_ doc?
11:28 phanimahesh joined #git
11:33 inflames joined #git
11:38 Surfer2010 joined #git
11:38 satbyy joined #git
11:38 satbyy joined #git
11:39 jaguarmagenta joined #git
11:39 Pulp joined #git
11:43 jost_ joined #git
11:44 thiago joined #git
11:45 daurnimator _ikke_: so that 'replace' annotation. can I push that?
11:45 zeroed joined #git
11:45 zeroed joined #git
11:45 ahmedelgabri joined #git
11:45 sdothum joined #git
11:47 _ikke_ daurnimator: technically you can, it's just a ref that you can push, but by default, no one will fetch it
11:47 _ikke_ daurnimator: the filter-branch will 'bake' it into history
11:47 _ikke_ making it permanent
11:48 daurnimator _ikke_: I ended up putting it into history manually
11:49 daurnimator i.e. git reset --hard <commitmadebyreplace> && git cherry-pick <commitsontop>
11:49 daurnimator then force pushed (gasp)
11:49 robotroll joined #git
11:50 AfroThundr joined #git
11:54 thiago joined #git
11:58 stonercoder joined #git
12:03 vuoto joined #git
12:08 danslo joined #git
12:10 rahtgaz joined #git
12:10 ShapeShifter499 joined #git
12:11 zeroed joined #git
12:11 irqq joined #git
12:15 SonikBoom joined #git
12:20 mizu_no_oto joined #git
12:21 tureba joined #git
12:33 subhojit__ joined #git
12:40 govg joined #git
12:41 rgrinberg joined #git
12:45 mizu_no_oto joined #git
13:01 mikecmpbll joined #git
13:01 hfp Hi, I'm trying the new git 2.10 feature where you can set the color for color.old.diff to "red strike", but the output in my terminal is still red, without strikethrough. What am I missing?
13:02 _ikke_ hfp: your terminal needs to support it
13:02 _ikke_ xterm does for example
13:03 rgrinberg joined #git
13:04 relipse joined #git
13:04 relipse i went to do git pull and it tried merging, how do I just reset at the latest and greatest of my branch
13:04 relipse and throw away all local changes
13:05 hfp _ikke_: Oh I thought they all did, but apparently iTerm2 3.0.8 doesn't support it. Thanks.
13:05 shinnya joined #git
13:07 Gianormagantrous joined #git
13:07 _ikke_ relipse: git reset --hard @{u}
13:07 _ikke_ (No undo for uncomitted changes)
13:08 subhojit_ joined #git
13:18 zeroed joined #git
13:20 PioneerAxon joined #git
13:22 Spydar007 joined #git
13:24 vrishab joined #git
13:29 relipse help, i am trying to git rebase master and now it says a patch has been made
13:29 relipse i'm not sure how to fix it
13:31 dodobrain joined #git
13:32 stonercoder joined #git
13:32 GavinMagnus joined #git
13:34 _ikke_ what does git status say?
13:34 _ikke_ (and it's rarely a good idea to rebase master)
13:34 _ikke_ (assuming the commits have already been pushed)
13:38 nwkj86 joined #git
13:38 navidr joined #git
13:39 phaleth joined #git
13:39 subhojit__ joined #git
13:40 govg joined #git
13:40 jaguarmagenta joined #git
13:40 ahmedelgabri joined #git
13:42 subhojit_ joined #git
13:43 spudowiar joined #git
13:44 flaguy48 left #git
13:47 toydestroyer joined #git
13:50 fees joined #git
13:51 a_thakur joined #git
13:51 subhojit__ joined #git
13:52 VagabondAzulien joined #git
13:52 liuzhen joined #git
13:56 stonercoder joined #git
13:56 slayerjain joined #git
13:56 johnmilton joined #git
13:57 toydestroyer_ joined #git
13:58 mkjasinski joined #git
13:59 vrishab joined #git
14:00 subhojit777 joined #git
14:01 m0viefreak joined #git
14:02 edaught joined #git
14:04 subhojit_ joined #git
14:05 Xizor joined #git
14:06 mkjasinski joined #git
14:06 flaguy48 joined #git
14:09 ruby_ joined #git
14:10 Rhonda joined #git
14:10 raijin joined #git
14:10 toydestroyer joined #git
14:13 snowkidind joined #git
14:14 snowkidind joined #git
14:15 PioneerAxon joined #git
14:15 madewokherd joined #git
14:16 vuoto joined #git
14:18 gusnan joined #git
14:18 tabrez joined #git
14:19 pioiytr joined #git
14:20 a_thakur joined #git
14:23 ericsupreme joined #git
14:24 thiago joined #git
14:26 Marcello joined #git
14:29 ratiotile joined #git
14:31 dviola joined #git
14:32 dviola timothy: when are you going to update bitcoin-qt on archlinux?
14:33 _ikke_ dviola: You are in #git :)
14:33 lolmac joined #git
14:33 str joined #git
14:34 dviola ok, sorry about that
14:36 ahmedelgabri joined #git
14:37 rbern joined #git
14:38 nettoweb joined #git
14:42 VagabondAzulien joined #git
14:46 ruby_ joined #git
14:47 reactormonk left #git
14:49 subhojit__ joined #git
14:49 vrishab joined #git
14:50 sbeller joined #git
14:50 l4v2 joined #git
14:52 ruby_ joined #git
14:52 fakenerd joined #git
14:52 a_thakur joined #git
14:54 tabrez joined #git
14:54 a_thakur joined #git
14:54 ahmedelgabri joined #git
14:57 subhojit_ joined #git
15:00 Munt joined #git
15:01 jimi_ joined #git
15:01 Rodya_ joined #git
15:06 andlabs joined #git
15:07 Kingpin_ joined #git
15:09 ahmedelgabri joined #git
15:11 justanotheruser joined #git
15:15 dreiss joined #git
15:17 a_thakur joined #git
15:21 bluezone joined #git
15:22 lolmac joined #git
15:28 jaguarmagenta joined #git
15:29 SwiftMatt joined #git
15:32 i7c dviola, hah I know you.
15:32 romerocesar joined #git
15:34 raijin joined #git
15:35 ruby_ joined #git
15:36 jimi_ joined #git
15:38 cagmz joined #git
15:40 ToBeCloud joined #git
15:46 a_thakur joined #git
15:47 xaa joined #git
15:47 nettoweb joined #git
15:48 thiago joined #git
15:54 zacts joined #git
15:55 romerocesar joined #git
15:57 clemf joined #git
16:00 ahmedelgabri joined #git
16:01 GavinMagnus joined #git
16:02 GavinMagnus left #git
16:03 jaguarmagenta joined #git
16:07 devster31 joined #git
16:08 devster31 joined #git
16:08 devster31 joined #git
16:08 devster31 joined #git
16:09 devster31 joined #git
16:09 devster31 joined #git
16:09 devster31 joined #git
16:10 diogenese joined #git
16:11 HoierM joined #git
16:13 jabular joined #git
16:15 a_thakur joined #git
16:19 a_thakur joined #git
16:20 subhojit__ joined #git
16:20 relipse joined #git
16:23 vuoto joined #git
16:24 e14 joined #git
16:25 thiago joined #git
16:26 vrishab joined #git
16:26 tinajohnson___ joined #git
16:26 irco joined #git
16:27 a_thakur joined #git
16:27 lolmac joined #git
16:29 watabou joined #git
16:29 subhojit_ joined #git
16:32 a_thakur_ joined #git
16:33 sonOfRa joined #git
16:34 abyx joined #git
16:37 subhojit__ joined #git
16:39 dviola i7c: ?
16:39 pioiytr joined #git
16:42 kulelu88 joined #git
16:44 A5101 joined #git
16:45 Rodya_ joined #git
16:47 eizua joined #git
16:49 subhojit_ joined #git
16:53 subhojit__ joined #git
16:54 malber joined #git
16:55 lolmac joined #git
16:57 subhojit_ joined #git
17:01 ahmedelgabri joined #git
17:05 sssilver joined #git
17:07 subhojit__ joined #git
17:07 King_Hual joined #git
17:11 brunodlz joined #git
17:11 johnmilton joined #git
17:14 justanotheruser joined #git
17:24 satbyy joined #git
17:26 thomas_25 joined #git
17:26 p3m joined #git
17:26 laumann joined #git
17:29 Silberling joined #git
17:31 Guest69 joined #git
17:31 cdg joined #git
17:33 dsdeiz joined #git
17:34 pothepanda joined #git
17:37 navidr joined #git
17:38 zivester joined #git
17:39 rvaldes joined #git
17:41 subhojit777 joined #git
17:41 e14_ joined #git
17:49 subhojit777 joined #git
17:53 omegak joined #git
17:53 subhojit_ joined #git
17:54 Silenced joined #git
17:54 Silenced joined #git
17:55 multi_io joined #git
17:58 tabrez joined #git
17:59 subhojit__ joined #git
18:02 rexwin__ joined #git
18:07 newbiee joined #git
18:07 cagedwisdom joined #git
18:08 rexwin__ I am getting Hi username! You've successfully authenticated, but GitHub does not provide shell access.
18:09 rexwin__ how can commit or push changes from command line then
18:09 rexwin__ can somebdy point to a good weblink?
18:09 _ikke_ rexwin__: You should still be able to push from a git repository
18:09 _ikke_ When do you get that error?
18:09 _ikke_ (you should not just ssh into github)
18:10 danslo joined #git
18:10 rexwin__ Permission denied (publickey). fatal: Could not read from remote repository.  Please make sure you have the correct access rights and the repository exists.
18:10 rexwin__ I doing it from my ubuntu machine
18:10 _ikke_ Did you create an ssh key-pair?
18:10 rexwin__ I have added the public keys, yes
18:10 rexwin__ Authenticated to github.com
18:11 _ikke_ git remote -v
18:11 rexwin__ ou've successfully authenticated, but GitHub does not provide shell access.
18:11 rexwin__ origin     git@github.com:Rajasekaran1976/GHide.git (fetch) origin     git@github.com:Rajasekaran1976/GHide.git (push)
18:12 _ikke_ https://github.com/Rajasekaran1976/GHide
18:12 ResidentBiscuit joined #git
18:12 _ikke_ That repository does not seem to exist
18:13 _ikke_ (or is it private?)
18:14 rexwin__ it is public
18:14 zacts joined #git
18:14 mingrammer joined #git
18:14 _ikke_ Well, according to github, there is no repo called GHide
18:15 _ikke_ If it's a new repository, you first need to create it in github
18:15 ahmedelgabri joined #git
18:15 rexwin__ https://www.dropbox.com/s/1snlwlwaosk052j/S​creenshot%202016-09-03%2023.44.43.png?dl=0
18:15 subhojit_ joined #git
18:16 _ikke_ git remote set-url origin git@github.com:Rajasekaran1976/mybashscripts.git
18:16 msonntag joined #git
18:19 vuoto joined #git
18:19 l4v2 I’m almost on chapter 4 of the git documentation, really well writen stuff here
18:20 thadtheman joined #git
18:20 rexwin__ now getting a different set of errors
18:20 rexwin__ https://www.dropbox.com/s/ea7kq4p18jylaym/S​creenshot%202016-09-03%2023.49.40.png?dl=0
18:22 _ikke_ rexwin__: seems like a local permission error
18:22 thadtheman I would like to keep an encrypted git repo of "diary-like" stuff. Things like ToDoLists, med info, etc. I obviously can't use github/bitbucket/gitlab for it because it is encrypted. What can I use?
18:22 FuzzySockets joined #git
18:22 _ikke_ thadtheman: What are you looking for exactly?
18:24 ShapeShifter499 joined #git
18:24 thadtheman _ikke_: What's not clear?
18:24 eivarv joined #git
18:24 _ikke_ What are you looking for that those options you mentioned don't offer/
18:24 _ikke_ ?
18:25 thadtheman _ikke_: I can't use those because the data is encrypted.
18:25 rexwin__ yeah you were right, chmod 777 .git folder resolved the issue
18:25 diphtherial left #git
18:25 _ikke_ rexwin__: chmod 755 is better
18:25 rexwin__ got it
18:26 _ikke_ thadtheman: why?
18:26 _ikke_ thadtheman: Nothing prevents you pushing to those
18:27 rexwin__ left #git
18:27 _ikke_ I'm not aware of any hosted git services that decrypts contents for the web interface
18:28 bremner how would that even work?
18:28 thadtheman _ikke_: Well Ok if I get paid accounts. But for free I would need to be "open-source". If I could store encrypted files, then how could they prevent "closed source" projects from using them but encrypting the project.
18:29 flopsec joined #git
18:29 _ikke_ thadtheman: They can't
18:29 Seveas thadtheman: you don't need to be open source. And bb/gl have private repos for free accounts.
18:29 _ikke_ Seveas: I think he means how would they not prevent you pushing an encrypted repo as a public project
18:30 _ikke_ thadtheman: But there is more then just the repository. Issues, pull requests, wiki would all be public
18:31 _ikke_ And the usefulness of the webinterface would be very small if everything is encrypted
18:31 relipse joined #git
18:32 subhojit__ joined #git
18:32 constant joined #git
18:33 thadtheman _ikke_: encrypted repo, or repo of encrypted files either way. I haven't decided. mainly I'm thinking of dropbox, but I think that the data works better stored as a git repo rather then straight files.
18:34 _ikke_ What is your purpose anyway?
18:35 _ikke_ backup / collaborating / 'syncing' ?
18:35 _ikke_ (dropbox might corrupt repositories)
18:35 _ikke_ I'm doing my best to guess what you want to achieve, because you are not giving me much
18:38 tHEMtZ joined #git
18:38 jason237 joined #git
18:39 thadtheman Well the first two: ToDo lists and medical data.  But also much of my linux configurations ( /etc), passwds for stuff, stuff I'm writing (aka books).  Also I'm not worried about accessing through a web iterface, I don't even worry about that for clear open-source projects.
18:41 _ikke_ You could use private repositories from gitlab or bitbucket
18:42 ahmedelgabri joined #git
18:43 nettoweb joined #git
18:44 Seveas I wouldn
18:44 Seveas I wouldn't put passwords in there. Get a $3/month vps with encrypted volume for your repos.
18:45 justanotheruser joined #git
18:45 _ikke_ Right, paying up and hosting it yourself is much better
18:45 omegak joined #git
18:53 subhojit777 joined #git
18:54 ShapeShifter499 joined #git
18:55 sssilver joined #git
18:56 subhojit_ joined #git
18:59 jason237 joined #git
19:00 e14 joined #git
19:01 justanotheruser joined #git
19:01 subhojit__ joined #git
19:01 justanotheruser joined #git
19:02 eivarv joined #git
19:05 EY__ Whoa! Git for Windows 2.10 has drastically improved the performance of `git rebase -i`.
19:06 _ikke_ yes
19:06 _ikke_ it has
19:06 _ikke_ The maintainer did a lot of work to speed it up
19:06 EY Yep. He wrote a nice blog post about it, too.
19:07 _ikke_ Those patches are now being reviewed to be included upstreak
19:07 _ikke_ upstream*
19:07 EY Still puzzles me why the release notes use the term "learn" to describe a change in git. It makes me think that there is some sort of AI involved.
19:08 durham joined #git
19:08 afuentes joined #git
19:09 mingrammer joined #git
19:10 jknetl joined #git
19:10 BenderRodriguez joined #git
19:10 subhojit_ joined #git
19:11 _ikke_ people like antropomorphisms
19:11 cagedwisdom joined #git
19:12 bremner software likes them too.
19:12 _ikke_ I was looking for the pun in there
19:13 laumann joined #git
19:13 achlys joined #git
19:14 bremner ah I see. nobody likes a showoff.
19:16 subhojit__ joined #git
19:16 _ikke_ Software neither :P
19:18 ilmari don't antropmorphise software, it hates it when you do that
19:18 relipse joined #git
19:19 _ikke_ It also hates other people talking for them
19:21 kadoban joined #git
19:21 InfoTest joined #git
19:21 UTAN_dev joined #git
19:22 hfp_ joined #git
19:22 m0f0x joined #git
19:22 King_Hual` joined #git
19:23 MegaManS1c joined #git
19:23 sssilver_ joined #git
19:23 linduxed_ joined #git
19:24 Lomex joined #git
19:24 spriz joined #git
19:24 justanotheruser joined #git
19:25 InfoTest joined #git
19:25 rezrov joined #git
19:25 SwiftMatt joined #git
19:25 moritz speaking of antropomorphising software. These days I wonder why people think that a self-aware AI is hard
19:25 moritz I write lots of non-AI software, and much of it is self aware
19:26 moritz it knows its own name, version, when it was compiled, various facts about the health of the running instance, number of threads in use etc.
19:26 moritz what's that, if not self-awareness?
19:26 moritz </rant>
19:26 _ikke_ Would it complain if you sigquit or sigkill it?
19:27 moritz _ikke_: not more than you would complain after you've been shot in the head
19:27 lolmac joined #git
19:27 moritz and self preservation != self awareness
19:28 compeman joined #git
19:28 synthmeat joined #git
19:34 } joined #git
19:34 jason237 joined #git
19:34 Sasazuka joined #git
19:35 InfoTest joined #git
19:35 } Hey, lets say I've got some branch with files a, b, c that arent in master (already commited to the branch), whats the proper way to merge them into the master branch one by one with a commit for each one
19:35 } the branch will be deleted after
19:36 moritz }: uhm, don't think in files. Think in commits
19:36 } right, but i dont want to merge the latest commit into master
19:36 moritz }: a merge brings in all commits from the branch. Is that what you want?
19:36 } no
19:36 ayjay so i realize most people ask the opposite, but we have a server using http-backend, and it works if we set do http://user:pass@directory on git remote fetch/push, but i'd rather not hardcore/have passwords in plaintext
19:36 shpew12 joined #git
19:37 } moritz, i want to split the branch into 3 commits basically, discarding all the commits in the branch
19:37 } because it was an experiment that failed more or less
19:37 moritz }: are there commits you want to salvage, or just files?
19:38 } no commits to salvage
19:38 ayjay does anyone know if there a server configuration or flag user can commit to have the server prompt for http authentication without just failing it?
19:38 ayjay there is* i'm sorry my typing is awful, I should proofread
19:38 moritz }: ok. Then on the master branch, do a  git checkout yourbranch a b c; followed by a commit
19:38 } thank you! that sounds perfect
19:39 ayjay2 joined #git
19:39 moritz }: you're welcome. BTW, how do you pronounce your nick?
19:39 } moritz, I dont think I've ever pronounced it...
19:39 } right bracket?
19:40 ayjay haha
19:40 moritz that's kinda a mouth full
19:40 joki joined #git
19:40 moritz "bracky"? :-)
19:40 } sounds good :-)
19:40 ayjay3 joined #git
19:42 ayjay3 left #git
19:42 ckubrak joined #git
19:43 ckubrak Hi guys, is there anyway to get "git status" in one line?
19:43 moritz ckubrak: there are shell functions that give you a kind of short indicator in your prompt, that's one line
19:43 PioneerAxon joined #git
19:43 moritz ckubrak: but in general, the whole information from "git status" is way too much for one line, when many files are involved
19:44 } git status --porcelain | tr '\n' ',' is the only thing i can think of, but why? :-)
19:45 moritz of course you can pipe into perl -pe 'chomp', but that's cheating, no?
19:45 } yeah
19:45 jason237 joined #git
19:45 }{}{}{ joined #git
19:45 astrozyk joined #git
19:45 }{}{}{ i am the true bracky
19:45 } oh noes
19:46 moritz }{}{}{: more like brackeritis
19:46 } I hope it's not contagious
19:46 astrozyk joined #git
19:47 }{}{}{ i'm pretty sure i caught it from you
19:47 }{}{}{ i'll open your close tho
19:47 Silberling86 joined #git
19:47 } Is this how the bracketocalypsis starts?
19:47 moritz "I got it from Agnes" -- any Tom Lehrer fans around here? :-)
19:47 } We've been warned by the mayans
19:48 _ikke_ https://xkcd.com/859/
19:48 } If this keeps spreading, the dangerous "fatal error: extraneous closing brace ('}')" virus will decimate entire nations
19:48 Guest55 joined #git
19:49 cyphase joined #git
19:49 }{}{}{ man i guess my whois gives me away, i'll escape before anyone notices
19:49 nwkj86 joined #git
19:50 _ikke_ Hello ayjay :-)
19:51 ayjay _ikke_, what do you think about prompting for http authentication when using http-backend
19:51 ayjay as opposed to summarily denying the user who otherwise wouldn't wanted to embed their credentials in the URI
19:52 Urbany joined #git
19:53 subhojit_ joined #git
19:54 achlys joined #git
19:54 qanv joined #git
19:56 robotroll joined #git
19:57 zacts joined #git
19:58 achlys joined #git
19:58 vrishab joined #git
19:59 Silberling joined #git
20:00 jason123 joined #git
20:01 jason123 hello git folks
20:01 gitinfo jason123: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
20:01 jason123 I have two separate repositories intended for the same project
20:01 PioneerAxon joined #git
20:01 jason123 they don't share any code owing to some connectivity issues, now resolved, on my raspberry pi
20:02 jason123 but the time has come to make an honest codebase out of them and join them in holy git-rimony
20:02 jason123 is a merge on a temporary 3rd branch the best way to go about this?
20:02 _ikke_ ayjay: Sorry, not really understanding what you mean
20:03 _ikke_ jason123: Is one following the other, or are they both parralel
20:04 ayjay its okay, i'm going through apache docs now. we just use git server with http-backend but we havent' figured out how to force git to prompt for password instead of hardcoding it
20:04 jason123 parallel, they have absolutely 0 in common except that they're intended for use on the same project
20:04 ayjay although i'm not sure now that i just shouldn't have used ssh
20:04 _ikke_ ayjay: You just need to return the correct status code
20:04 Seveas ayjay: don't put a password int he url for the remote, and git will prompt for it if auth is required.
20:04 _ikke_ ayjay: http basic auth basically
20:05 Seveas on the server side: configure basic auth and be done.
20:05 trewe joined #git
20:05 Seveas jason123: add one as a remote to the other, merge.
20:06 justanotheruser joined #git
20:06 ayjay thanks _ikke_, Seveas. I think that's what we did, let me make sure that i am still having the problem despite.
20:06 Seveas might need a subtree merge if there are overlapping files, or if you want the one to be on a subdir of the other
20:10 dreiss joined #git
20:10 vktec Where are git hooks called from? (ie, what's the initial value of $PWD within the hook?)
20:12 _ikke_ vktec: " Before Git invokes a hook, it changes its working directory to either the root of the working tree in a non-bare repository, or to the $GIT_DIR in a bare repository."
20:12 _ikke_ from the man pag
20:13 eivarv joined #git
20:13 vktec _ikke_: Doh, I should've checked there first, thanks
20:14 constant joined #git
20:15 constant joined #git
20:16 constant joined #git
20:17 constant joined #git
20:19 shpew12 joined #git
20:19 mangolisk_ joined #git
20:20 jason237 joined #git
20:20 Lyqyd joined #git
20:21 bmahe joined #git
20:22 mingrammer joined #git
20:23 nettoweb joined #git
20:23 andlabs joined #git
20:24 nwkj86 joined #git
20:25 nwkj86 joined #git
20:25 Rodya_ joined #git
20:27 sonOfRa joined #git
20:31 dreiss joined #git
20:31 Silberling left #git
20:31 noodle joined #git
20:33 rgrinberg joined #git
20:34 achlys joined #git
20:35 armenzg joined #git
20:35 neilthereildeil joined #git
20:36 neilthereildeil how can i get newer from a remote repo and make them part of my master?
20:36 neilthereildeil and any new branches created remotely?
20:37 arand joined #git
20:39 tcsc joined #git
20:43 neilthereildeil how cna i make my master follow the remote master?
20:43 Seveas https://git-scm.com/book/en/v2/​Git-Basics-Working-with-Remotes
20:43 Seveas neilthereildeil: --^
20:43 neilthereildeil right now, when i do git checkout FETCH_HEAD, git status says head is deatched
20:44 Seveas git checkout FETCH_HEAD is pretty much always the wrong thing to do.
20:44 sssilver joined #git
20:45 neilthereildeil Seveas: basiclaly, im not developing code. only reviwing others code. so i need te latest tree from them always
20:45 neilthereildeil there are no commits from me
20:45 _ikke_ git pull would work
20:48 wcpan joined #git
20:50 sssilver_ joined #git
20:50 zacts joined #git
20:50 neilthereildeil _ikke_: i did git pull, but for some reason it thinks my master is different than the remote master
20:50 ckubrak joined #git
20:50 neilthereildeil i wanna track all the changes in the remote master in my master
20:51 teroshan joined #git
20:51 _ikke_ git branch -u origin/master
20:52 neilthereildeil i dont wanna make a seperate branch thoguh, since im not doing any local development
20:52 clemf joined #git
20:53 neilthereildeil i want their master to be my master
20:53 neilthereildeil you can say this is a read-only local copy of their tree
20:53 laumann joined #git
20:53 neilthereildeil when i "git checkout master", i get  a warning that Warning: you are leaving 3 commits behind, not connected to
20:53 neilthereildeil any of your branches:
20:53 jaggz left #git
20:54 neilthereildeil but if its a copy of the remote repo, all their changes in master should appear in my master
20:55 thiago joined #git
20:55 _ikke_ git checkout master && git pull origin master
20:55 _ikke_ It's not that hard
20:56 jason237 joined #git
20:56 chabil joined #git
20:57 GavinMagnus joined #git
20:57 GavinMagnus left #git
20:59 spudowiar joined #git
20:59 mingrammer joined #git
20:59 markelite joined #git
21:00 tvw joined #git
21:01 e14 joined #git
21:01 Noldorin joined #git
21:06 scsix joined #git
21:07 nwkj86 joined #git
21:07 Goplat joined #git
21:09 flashpoint9 joined #git
21:09 WalrusNaib joined #git
21:10 flashpoint9 I wanted to reset my master branch to match origin/master. I ran git fetch origin, then git reset --hard origin/master. However after that it returned HEAD is now at 085a3cg Merge remote-tracking branch 'origin/likes'
21:11 flashpoint9 How come it isn't reseting to master?
21:11 dreiss joined #git
21:12 moritz flashpoint9: why do you think it isn't resetting to master?
21:12 moritz flashpoint9: do a 'git log origin/master' for comparison
21:12 flashpoint9 Oh right its saying im on master right at the merge with the likes branch
21:13 crelix joined #git
21:14 _ikke_ Yes, it's the commit message you see
21:14 WalrusNaib heh
21:15 flashpoint9 moritz: however there is one other weird thing, I had some local files I added in that likes branch and they are still there, it that normal?
21:15 robotroll joined #git
21:15 WalrusNaib I was replying to flashpoint9 but didn't notice I was muted XD
21:15 moritz flashpoint9: only if you didn't commit them
21:15 flashpoint9 ah ok thanks, that cleared up a lot of confusion
21:16 WalrusNaib flashpoint9: Check out this command, it makes it really clear what your repo position is http://stackoverflow.com/a/9074343
21:17 WalrusNaib when I first started with git that made things a lot clearer for me when I felt I was lost
21:17 flashpoint9 WalrusNaib: That's pretty cool, thanks
21:17 WalrusNaib :)
21:19 WalrusNaib btw guys I get an ssl warning going to the site linked in the welcome message https://jk.gs/git/
21:19 WalrusNaib just in case a hundred other people haven't already mentioned it
21:20 _ikke_ works for me
21:21 _ikke_ Signed by letsencrypt
21:22 moritz can confirm
21:22 _ikke_ subject left
21:24 Rodya_ joined #git
21:24 nwkj86 joined #git
21:24 skered joined #git
21:25 trelane joined #git
21:25 skered left #git
21:26 lolmac joined #git
21:26 Guest50633 joined #git
21:27 neilthereildeil left #git
21:28 dsantiago joined #git
21:30 trelane joined #git
21:31 mattcen joined #git
21:37 PaulCapestany joined #git
21:44 atomi joined #git
21:46 Puffball joined #git
21:50 jstein_ joined #git
21:50 SourTrout joined #git
21:51 paws_ joined #git
21:56 d0nn1e joined #git
21:56 elementalest joined #git
21:56 elementalest joined #git
21:57 meZee joined #git
21:57 blackwell joined #git
21:58 dreiss joined #git
22:03 omegak joined #git
22:09 xelxebar joined #git
22:12 astrozyk joined #git
22:12 foist joined #git
22:15 mehola joined #git
22:15 meZee joined #git
22:16 TheMoonMaster_ joined #git
22:20 btree joined #git
22:22 btree left #git
22:24 clemf joined #git
22:29 Raed|Mobile joined #git
22:31 aidalgol joined #git
22:33 e14 joined #git
22:33 cyphase joined #git
22:36 mrlowskill joined #git
22:36 Caelum joined #git
22:45 lolmac joined #git
22:47 mingrammer joined #git
22:49 bket joined #git
22:51 mitzip joined #git
22:52 nettoweb joined #git
22:53 zacts joined #git
22:54 dersand joined #git
22:54 meZee joined #git
22:55 meZee joined #git
22:55 dersand I did a git reset to a commit earlier(all of these commits are local). I then changed my mind and wanted that the reset should again point to head i guess it's called. Looking at reflog, i found the commit and checkout out to it. How can i now make head point to this?
22:55 zacts joined #git
22:56 fahadash joined #git
22:57 Catachan_ joined #git
22:57 Seveas you reset to it
22:58 cstrahan joined #git
22:58 Vampire0 dersand, HEAD is already pointing at it. HEAD always designates the currently checked out commit
22:59 dersand Oh then i mean master
22:59 dersand http://i.imgur.com/t4OmDwa.png should be the same commit
23:00 dersand so master should point to where head is right now
23:00 Vampire0 git branch -f master HEAD
23:01 Seveas or git checkout master; git reset sha1-of-commit-it-should-be
23:01 paulh_ joined #git
23:01 meZee joined #git
23:01 dersand Vampire0: cheers!
23:02 Vampire0 yeah, but why do two commands if you can do one :-D
23:02 Vampire0 yw dersand
23:02 meZee joined #git
23:02 TheMoonMaster joined #git
23:03 Vampire0 Hey Seveas, did you find out already why the anchor-links wont work?
23:03 Vampire0 surely some JavaScript or similar as the anchors are not named like the anchorlinks
23:04 Seveas Vampire0: that's what I thought, but haven't had time to look.
23:04 astrozyk joined #git
23:05 hallamigo joined #git
23:07 hallamigo If I have 2 branches - master and dev, for example, an I modify a file while the dev branch is checked out, why does it show modified under the master branch?  Shouldn't I have to merge the branches for the changes to show in both branches?
23:08 edaught_ joined #git
23:09 Seveas what shows 'modified under the master branch'?
23:09 Vampire0 hallamigo, as long as you do not commit, the change is !floating
23:09 gitinfo hallamigo: [!float] If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
23:10 hallamigo ahh, ok
23:10 cdg joined #git
23:11 hallamigo But if I commit it then I no longer see it in the list of modified files which helps me know what I've changed before pushing.
23:11 Caelum joined #git
23:11 hallamigo Is there a way to do a 'git status' to see what I've commited but not pushed?
23:12 boombatower joined #git
23:12 Seveas git log @{u}..
23:12 Seveas or !lol
23:12 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
23:12 spriz joined #git
23:13 cdg joined #git
23:14 Noldorin joined #git
23:14 hallamigo cool, thanks
23:17 l4v2 joined #git
23:18 Peng joined #git
23:19 eivarv joined #git
23:24 lolmac joined #git
23:29 mehola joined #git
23:32 Peng joined #git
23:33 imMute joined #git
23:35 nidr0x joined #git
23:38 watabou Does the commit-msg hook not run on git commit --verbose?
23:39 watabou It seems to run when I just use `git commit` but always fails when I use `git commit --verbose`. Is there a reason why?
23:40 watabou I'm basically adding text to the $1 file (echo 'references issue#' > $1) in commit-msg hook.
23:41 Peng joined #git
23:41 meZee joined #git
23:42 mingrammer joined #git
23:43 clemf joined #git
23:45 meZee joined #git
23:46 skylite joined #git
23:46 TheMoonMaster joined #git
23:47 aapaaal joined #git
23:47 Peng joined #git
23:50 e14 joined #git
23:57 anuxivm joined #git
23:57 Caelum joined #git

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