Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-06

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

All times shown according to UTC.

Time Nick Message
00:01 glebm joined #git
00:03 rewt codebam, .gitignore only acts on files that have not been committed... delete those files from the repo (see first example of man git-filter-branch ), and then double check that the patterns in .gitignore match
00:03 gitinfo codebam: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
00:07 tristanp joined #git
00:08 Siegfried joined #git
00:10 fahadash joined #git
00:12 ayjay_t joined #git
00:22 manuel joined #git
00:26 anuxivm joined #git
00:27 manuel joined #git
00:27 pokalyis joined #git
00:27 Balthasar|V20 joined #git
00:27 _cyril_ joined #git
00:29 Pulp joined #git
00:30 aidalgol joined #git
00:31 jason237 joined #git
00:32 tristanp joined #git
00:33 jeffreylevesque joined #git
00:34 ||JD|| joined #git
00:35 xall joined #git
00:36 Tiaan[m] joined #git
00:40 d0nn1e joined #git
00:42 nexus2911 joined #git
00:43 nexus2911 Hello.  somewhat new to git
00:43 nexus2911 I have a project: wp-content/plugins
00:43 nexus2911 wp-content/themes
00:43 spacenomad joined #git
00:44 nexus2911 I could init git in the wp-content directory but I only want to track certain folders and files within /plugins and /themes
00:44 nexus2911 is it possible to create an alias in git and have that alias only point to certain folders within those two parent folders?
00:45 nedbat nexus2911: why only track some of the files?
00:47 nexus2911 nedbat: for example, within plugins, I only want to track the files within the "gamma" directory
00:47 nedbat nexus2911: yes, but why?
00:48 nexus2911 because all the other plugins are third party, not mine so I wont be deving those
00:48 nexus2911 same with themes directory.
00:49 rewt after git init, add only the files you want in the repo
00:49 rewt as long as you don't add any others, they won't be added
00:50 nexus2911 rewt: ok.  thank you
00:50 mrpackethead joined #git
00:50 rewt so don't do things like `git commit -a`... first `git add` then `git commit`
00:50 nexus2911 ok
00:51 tristanp joined #git
00:51 mikecmpbll joined #git
00:52 realz joined #git
00:56 kvd joined #git
00:57 infernix joined #git
00:58 nedbat nexus2911: or add the other directories to .gitignore
00:58 nexus2911 nedbat: correct
00:59 kvd left #git
00:59 nexus2911 rewt: so I went and added the specific directories I wanted to track.  However, when I make a change to one of the files, its not staged for commit.  Do i need to add every file I edit?
01:00 nexus2911 I thought I took care of that with the initial add
01:00 rewt each change needs to be added
01:00 nexus2911 so what was the point of the initial add?
01:01 rewt same as the point of all other adds
01:01 rewt to get the file as it is into the repo
01:02 pothepanda joined #git
01:03 cdown joined #git
01:03 nexus2911 so if it knows file.php is one of the ones that I added to the repo, upon editing the file, why wouldn't I want it tracked?
01:05 nexus2911 not tracked, I mean tracked
01:05 nexus2911 uhhhgggg
01:05 nexus2911 not tracked, I mean staged
01:05 rewt because you may not want to stage that file
01:06 rewt git has no way of knowing what you really want, so it needs you to tell it
01:07 nexus2911 ok
01:07 rewt you may want to edit all files at once and commit them one at a time, or you may want to commit just part of the changes in a file and commit the rest of the changes to that same file in another commit
01:08 nexus2911 I see
01:09 jaguarmagenta joined #git
01:10 Cavallari joined #git
01:14 nexus2911 rewt: thanks again
01:18 Cavallari joined #git
01:21 anuxivm joined #git
01:24 fstd joined #git
01:29 matoro joined #git
01:29 CIAguy- joined #git
01:34 nd- joined #git
01:43 phil22 joined #git
01:43 cdg joined #git
01:44 aeontech joined #git
01:48 cdg joined #git
01:48 meauses joined #git
01:51 railssmith joined #git
01:52 snthsnth joined #git
01:58 infernix joined #git
02:00 pikajude joined #git
02:03 pikajude joined #git
02:11 nbrogan joined #git
02:14 Dougie187 joined #git
02:17 inflames joined #git
02:19 Siegfried joined #git
02:20 inflames joined #git
02:21 mablae joined #git
02:22 finalbeta joined #git
02:23 inflames joined #git
02:25 Limes joined #git
02:27 inflames joined #git
02:28 zumba_addict joined #git
02:28 _cyril_ joined #git
02:34 snowkidind joined #git
02:37 Shentino joined #git
02:41 inflames joined #git
02:43 ToBeCloud joined #git
02:46 pks joined #git
02:46 d^sh joined #git
02:47 pbrewczynski joined #git
02:49 meauses joined #git
02:53 zumba_addict joined #git
03:14 railssmith joined #git
03:16 ayjay_t joined #git
03:21 SwiftMatt joined #git
03:23 cagedwisdom joined #git
03:25 sn0wmonster joined #git
03:26 sn0wmonster Q: i'm trying to update the gh-pages branch of my github repo from terminal, but after authenticating it keeps saying "Everything up-to-date". What command do i use to make sure my updates are being taken into account?
03:28 arescorpio joined #git
03:32 matoro joined #git
03:33 tristanp joined #git
03:33 c^ joined #git
03:34 sn0wmonster okay found it! thanks anyway
03:37 inflames joined #git
03:40 chachasmooth joined #git
03:41 cagedwisdom joined #git
03:41 hexagoxel joined #git
03:45 led_belly joined #git
03:46 kaldoran joined #git
03:46 cdown joined #git
03:47 led_belly joined #git
03:49 led_belly joined #git
03:52 akurniawan joined #git
04:01 jost__ joined #git
04:04 mehola joined #git
04:13 bmahe joined #git
04:15 Vortex34 joined #git
04:16 BenderRodriguez joined #git
04:21 gfixler joined #git
04:23 chandu20 joined #git
04:25 Darren_ joined #git
04:29 _cyril_ joined #git
04:40 User458764 joined #git
04:47 wrouesnel2 joined #git
04:50 meauses joined #git
04:52 renlo joined #git
04:52 Gloomy joined #git
05:14 daey joined #git
05:18 harwood joined #git
05:18 NeverDie joined #git
05:22 yaewa joined #git
05:23 yaewa joined #git
05:24 nilg joined #git
05:24 t-mart joined #git
05:26 ochorocho__ joined #git
05:27 moei joined #git
05:30 systemovich joined #git
05:32 astrofog joined #git
05:33 Cabanossi joined #git
05:37 z3t0 joined #git
05:38 z3t0 can anyone recommend a git client for osx? (free)
05:38 ammunta does it not ship with one
05:38 z3t0 I have used GitHub for Desktop and SourceTree in the past but mostly use the command line nowadays. However, am looking for other options if there are any recommendations
05:38 z3t0 ammunta: well i just mean a gui interface that people can recommend
05:39 z3t0 gitkraken seems impressive
05:46 LeBlaaanc joined #git
05:47 languitar joined #git
05:48 sn0wmonster left #git
05:50 breakdowns joined #git
05:51 breakdowns left #git
05:57 meauses joined #git
06:01 Siegfried joined #git
06:02 ArchNoob joined #git
06:03 pokalyis joined #git
06:05 phaleth joined #git
06:07 meauses joined #git
06:16 pks joined #git
06:25 lukenels joined #git
06:27 ochorocho__ joined #git
06:30 Gloomy joined #git
06:30 _cyril_ joined #git
06:34 jason237 joined #git
06:34 resurtm joined #git
06:36 subhojit777 joined #git
06:37 Siegfried joined #git
06:39 cirkit left #git
06:41 RiPer joined #git
06:48 shinnya joined #git
06:51 _ng joined #git
06:51 ShapeShifter499 joined #git
07:04 LucaTM joined #git
07:05 jfelchner joined #git
07:22 seeknull joined #git
07:28 _cyril_ joined #git
07:28 ochorocho__ joined #git
07:32 PioneerAxon joined #git
07:32 shubhnik joined #git
07:40 zacts joined #git
07:41 subhojit_ joined #git
07:45 laumann joined #git
07:51 spacenomad joined #git
07:51 Jameser joined #git
07:55 grumble joined #git
07:56 diogenese joined #git
07:59 Milos joined #git
07:59 xall_ joined #git
08:00 _vy_ left #git
08:04 jan joined #git
08:05 jknetl joined #git
08:10 phaleth joined #git
08:10 renlo joined #git
08:15 Endarked joined #git
08:17 clemf joined #git
08:19 zumba_ad_ joined #git
08:22 lordjancso joined #git
08:23 ArchNoob joined #git
08:26 sea-gull joined #git
08:26 zeroed joined #git
08:39 apotry joined #git
08:42 subhojit__ joined #git
08:47 pepijndevos left #git
08:50 mar77i joined #git
08:51 ams__ joined #git
08:52 netj joined #git
08:52 the_cybersphinx joined #git
08:52 Ph_ joined #git
08:58 morenoh149 joined #git
09:00 User458764 joined #git
09:00 Domhack joined #git
09:02 beny joined #git
09:05 ahmedelgabri joined #git
09:06 nwkj86 joined #git
09:12 Jackneill joined #git
09:20 bocaneri joined #git
09:24 Anja joined #git
09:24 lindenle joined #git
09:28 phil22 joined #git
09:30 re1 joined #git
09:32 nikivi joined #git
09:35 pks joined #git
09:39 ochorocho__ joined #git
09:40 dodobrain joined #git
09:40 dodobrain joined #git
09:42 akurniawan joined #git
09:48 zulutango joined #git
09:51 King_Hual joined #git
09:59 mischat joined #git
10:01 eivarv joined #git
10:03 dan2k3k4 joined #git
10:05 PioneerAxon joined #git
10:10 parsnip joined #git
10:11 pks joined #git
10:18 skyres joined #git
10:24 m0viefreak joined #git
10:26 Jameser joined #git
10:28 xall_ joined #git
10:30 a_thakur joined #git
10:34 tvw joined #git
10:36 PCatinean joined #git
10:44 jbitdrop joined #git
10:50 liuzhen joined #git
10:53 DojoDomino joined #git
10:54 _ng joined #git
10:54 Limes joined #git
10:54 xall_ joined #git
10:56 ArchNoob joined #git
11:02 jstein_ joined #git
11:03 DojoDomino left #git
11:05 Jameser joined #git
11:06 fiveflowerzz joined #git
11:06 fiveflowerzz hi
11:06 fiveflowerzz is there a way to do releases and then make it available with "git clone https://github.com/user/repo.git::release1.2" ?
11:07 fiveflowerzz or similar thing?
11:20 ochorocho__ joined #git
11:27 bruce_lee joined #git
11:28 satifant joined #git
11:28 snthsnth joined #git
11:30 leeN joined #git
11:33 f4 joined #git
11:35 ramsub07 joined #git
11:36 ramsub07 Hi, I work on two branches currently. By mistake, I have made the change intended for the second branch in the first branch. How do I transfer the changes without committing in the existing branch ?
11:38 mikecmpbll joined #git
11:40 mischat joined #git
11:40 WayToDoor joined #git
11:40 finalbeta joined #git
11:40 joki joined #git
11:45 kenden joined #git
11:48 jozwior joined #git
11:48 Faylite joined #git
11:51 jozwior joined #git
11:53 GavinMagnus joined #git
11:55 Jameser joined #git
11:56 zeroed joined #git
11:56 meauses joined #git
11:57 vrld joined #git
12:02 manuel joined #git
12:02 netj joined #git
12:03 manuel joined #git
12:08 snthsnth joined #git
12:08 i7c joined #git
12:08 felixjet joined #git
12:08 cdg joined #git
12:09 subhojit_ joined #git
12:09 pks joined #git
12:09 pirate21994 joined #git
12:11 cagedwisdom joined #git
12:13 theskillwithin joined #git
12:14 vrld joined #git
12:14 subhojit__ joined #git
12:18 meauses joined #git
12:19 neunon joined #git
12:20 Seveas just check out the branch and !float the changes over
12:20 gitinfo 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.
12:21 kwmiebach__ joined #git
12:22 subhojit777 joined #git
12:24 chandu20 joined #git
12:24 PioneerAxon joined #git
12:25 GavinMagnus left #git
12:28 zeroed joined #git
12:31 macivy joined #git
12:33 resurtm joined #git
12:35 f4 joined #git
12:37 meauses joined #git
12:42 barteks2x joined #git
12:42 kenden joined #git
12:43 robotroll joined #git
12:45 JamesBaxter joined #git
12:46 shubhnik joined #git
12:46 govg joined #git
12:49 netj joined #git
12:51 chandu20 joined #git
12:52 subhojit_ joined #git
12:54 ManiacTwister joined #git
12:54 Kunda_ joined #git
12:58 ManiacTwister joined #git
12:58 snowkidind joined #git
12:58 ieee joined #git
13:01 ManiacTwister joined #git
13:04 kenden joined #git
13:04 ManiacTwister joined #git
13:05 msonntag joined #git
13:07 ManiacTwister joined #git
13:10 ManiacTwister joined #git
13:11 a_thakur joined #git
13:13 ManiacTwister joined #git
13:13 brk_ joined #git
13:13 anuxivm joined #git
13:16 ManiacTwister joined #git
13:17 subhojit__ joined #git
13:18 red82 joined #git
13:18 ManiacTwister joined #git
13:20 ShekharReddy joined #git
13:20 fling joined #git
13:24 nikivi joined #git
13:25 a3Dman joined #git
13:25 HoierM joined #git
13:26 jknetl joined #git
13:27 packetswitcher joined #git
13:31 WayToDoor joined #git
13:33 Domhack joined #git
13:35 oskarkv joined #git
13:36 Kunda_ left #git
13:40 sdothum joined #git
13:42 ManiacTwister joined #git
13:43 ArchNoob joined #git
13:44 ManiacTwister joined #git
13:45 Starky joined #git
13:45 subhojit_ joined #git
13:46 Starky joined #git
13:47 cagedwisdom joined #git
13:49 ManiacTwister joined #git
13:52 Darren_ joined #git
13:52 subhojit__ joined #git
13:55 nikivi joined #git
13:56 doener joined #git
13:56 Starky joined #git
13:57 zeroed joined #git
13:59 Starky joined #git
14:00 f4 joined #git
14:01 shubhnik joined #git
14:05 subhojit_ joined #git
14:06 sdothum joined #git
14:06 sgtbigman joined #git
14:07 zeroed joined #git
14:07 zeroed joined #git
14:12 subhojit__ joined #git
14:12 dreiss joined #git
14:15 JamesBaxter joined #git
14:18 subhojit_ joined #git
14:26 subhojit__ joined #git
14:29 grumble joined #git
14:30 johnny56 joined #git
14:31 JanC_ joined #git
14:32 subhojit_ joined #git
14:33 venmx joined #git
14:35 SwiftMatt joined #git
14:37 kenden joined #git
14:38 subhojit__ joined #git
14:42 mischat joined #git
14:44 p4trix joined #git
14:47 on1x joined #git
14:47 b_ joined #git
14:47 zeroed joined #git
14:48 on1x joined #git
14:49 GavinMagnus joined #git
14:57 subhojit_ joined #git
14:59 vuoto joined #git
15:01 danslo_ joined #git
15:07 barteks2x joined #git
15:10 on1x joined #git
15:11 madewokherd joined #git
15:11 Gitzilla joined #git
15:11 barteks2x joined #git
15:12 hanthings joined #git
15:17 d0nn1e joined #git
15:19 icedwater Hello! I just noticed the git user survey only has results for 2006-2012 and 2016. Was there no survey conducted in between?
15:19 cdg joined #git
15:20 icedwater Sorry if I missed the answer last time, I tabbed out to another channel and didn't check for a reply.
15:20 cdg_ joined #git
15:23 barteks2x joined #git
15:24 justanotheruser joined #git
15:24 dan2k3k4 joined #git
15:24 NeverDie joined #git
15:24 ramsub07 joined #git
15:26 laumann joined #git
15:28 finalbeta1 joined #git
15:28 CheckDavid joined #git
15:31 djb-irc joined #git
15:35 shubhnik joined #git
15:36 thiago joined #git
15:37 PaulCapestany joined #git
15:37 GavinMagnus left #git
15:38 pks joined #git
15:41 mmattice joined #git
15:45 Limes joined #git
15:46 thiago joined #git
15:48 cyberz joined #git
15:48 cyberz hello
15:48 gitinfo cyberz: 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.
15:49 GavinMagnus joined #git
15:49 danslo_ joined #git
15:50 cyberz is there any way to get the "current" sha1 of a commit which has been rebased?
15:50 zeroed joined #git
15:50 zeroed joined #git
15:50 ramsub07 Hi
15:51 ramsub07 I work on two branches currently. By mistake, I have made the change intended for the second branch in the first branch. How do I transfer the changes without committing in the existing branch ?
15:51 cyberz ramsub07 did you commit them?
15:51 ramsub07 cyberz: I don't want to commit them
15:51 cyberz ramsub07 then you can stash them I think
15:51 ramsub07 I want to move to an existing branch like doing it to a newer branch using git checkout -b
15:51 canton7 !float
15:51 gitinfo 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.
15:51 cyberz move to the other branch, and unstash them
15:51 mablae joined #git
15:51 PaulCapestany joined #git
15:51 ramsub07 cyberz: if i stash, I'll lose them, right ?
15:52 moritz no
15:52 moritz they are in your stash
15:52 moritz you can get them back from there with 'git stash apply'
15:52 ramsub07 so first I stash, then I move to the existing branch, then I do `git stash apply`?
15:53 nikivi joined #git
15:53 canton7 you don't necessarily have to use the stash - see gitinfo's message
15:53 canton7 and you'll want 'git stash drop' here rather than 'git stash apply' if you do use the stash
15:53 moritz canton7: uhm, drop deletes it
15:53 moritz canton7: did you mean pop?
15:53 canton7 bleh, yes sorry
15:54 canton7 pop
15:56 Noldorin joined #git
15:57 WayToDoor joined #git
15:57 subhojit__ joined #git
15:58 sdlnv joined #git
16:00 GavinMagnus left #git
16:01 rewt i prefer to git stash apply and then drop instead of just pop, in case something goes wrong and i need the stash again
16:02 canton7 rewt, if the stash fails to apply cleanly, 'pop' won't actually drop it
16:02 nbrogan joined #git
16:03 eivarv joined #git
16:03 rewt there could be conflicts which get resolved incorrectly by mistake
16:03 canton7 if there are conflicts, 'pop' won't drop the stash
16:03 canton7 that's what "fails to apply cleanly" means
16:04 venmx joined #git
16:04 zeroed joined #git
16:04 zeroed joined #git
16:04 subhojit_ joined #git
16:05 cdg joined #git
16:08 SwiftMatt joined #git
16:08 snowkidind joined #git
16:08 bannakaffalatta joined #git
16:08 rewt well, if you like pop that's fine ... i always apply/drop and haven't had any issues with it, but have seen a coworker who likes to use pop have to redo some work because the pop dropped the stash
16:09 canton7 sure, not saying that explicitly applying/dropping is a bad idea, just correcting misinformation
16:09 ojdo joined #git
16:10 rewt "something goes wrong and i need the stash again" is not exactly misinformation
16:10 sweatsuit joined #git
16:10 rewt since that's exactly what happened there
16:11 canton7 sure, but the conflicts stuff is :P
16:11 canton7 anyway, no matter
16:12 canton7 the instructions earlier were to use apply, but didn't mention the drop, which has an end result which the asker won't have wanted
16:12 subhojit__ joined #git
16:12 cyberz let's say I have a commit sha1-a, and that one is getting rebased (eventually various times) and becomes sha1-b. Now, If I git log | grep sha1-a I won't find It because It does no longer belong to the current branch. But If I do git show sha1-a, I can see what was in there. Is there any way I can get to sha1-b only knowing sha1-a ?
16:13 canton7 no
16:13 canton7 there's no link between an old commit, and a rewritten version of it
16:13 canton7 ... but presumably you had the same branch pointed to that commit both times? (either as the tip of the branch, or one of its parents)
16:13 sr___ joined #git
16:13 ArchNoob joined #git
16:14 commonbisque joined #git
16:14 rewt the author name and date would probably be the same, and the message too if it wasn't altered
16:14 cyberz rewt true
16:14 selckin ~xy
16:14 canton7 yeah, you could go searching for a commit which looks similar
16:14 canton7 !xy
16:14 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...
16:15 cyberz that's what I do indeed, I wanted just to know if there's a quicker way
16:15 rewt yeah, why do you want to do that?
16:15 cyberz thanks
16:16 cyberz rewt sometimes I do not rebase immediately, I just commit "fixup sha1"
16:16 rewt what does that mean?
16:16 rewt maybe there's an issue with the workflow
16:17 cyberz maybe
16:17 commonbisque left #git
16:17 barteks2x joined #git
16:17 canton7 cyberz, you're aware of 'git commit --fixup' (and --squash)?
16:18 canton7 cyberz, they use the first line of the commit message rather than the sha, and git rebase -i (and/or --autosquash) knows how to interpret that and will set up the todo list appropriately
16:18 canton7 so it'll handle things being rewritten, and will do the fixup automatically when you next rebase -i
16:18 fees joined #git
16:19 glebm joined #git
16:20 cyberz canton7 no I was not aware: that's great as it is exactly what I'm doing manually! Thank you
16:20 cagmz joined #git
16:21 crazyadm joined #git
16:21 dan2k3k4 joined #git
16:22 canton7 cyberz, awesome :)
16:22 armyriad joined #git
16:22 canton7 cyberz, (btw, this is why it's important to state the X in XY problems)
16:25 Jameser joined #git
16:30 PaulCapestany joined #git
16:33 MrWoohoo joined #git
16:33 anuxivm joined #git
16:36 irco joined #git
16:37 a_thakur joined #git
16:39 anuxivm joined #git
16:40 WayToDoor joined #git
16:41 popmystack joined #git
16:41 PaulCapestany joined #git
16:42 kyan joined #git
16:45 anuxivm joined #git
16:45 _cyril_ joined #git
16:46 fahadash joined #git
16:46 Rickmasta joined #git
16:46 anuxivm joined #git
16:47 sonOfRa joined #git
16:49 cyberz joined #git
16:50 anuxivm joined #git
16:53 PCatinean joined #git
16:53 venmx joined #git
16:56 meauses joined #git
16:58 EricPoe joined #git
16:59 einnjo joined #git
16:59 Learath2 joined #git
17:00 eivarv joined #git
17:03 bluepixel joined #git
17:03 CubiK joined #git
17:03 mustmodify joined #git
17:04 mustmodify Can someone explain to me why it makes sense that `git checkout` should be used to clear out changes from a file and also change the current branch?
17:04 phanimahesh joined #git
17:04 selckin both change working dir
17:04 mustmodify That just seems wrong to me. I mean, I use it all the time and it's part of my thinking. But the more I think about it, the more it seems like one of those words that you know and use all the time, but ... just sounds dumb when repeated over and over.
17:05 mustmodify that's the connection? That's lame.
17:05 mustmodify so does git pull
17:05 mischat joined #git
17:05 selckin go cry with the rest of the internet or accepit and mvoe on
17:05 mustmodify I'm just trying to understand why.
17:05 netj joined #git
17:06 jast it's a poor choice in hindsight, but now we have to live with it
17:06 mustmodify Feel free to stay quiet if you don't have a cogent answer.
17:06 mustmodify see? I can live with that answer.
17:06 mustmodify In Javascript, that's pretty much the answer to every question. :)
17:06 selckin if you spend 5min googling you'de have foudn the 5million other poeple complaining and making new cli interfaces
17:06 jast 'both update the working dir' is how you can remember it, though
17:07 jast with 'git reset' the two modes are slightly harder to reconcile
17:07 jast though I guess you can say that unless you use the --hard option, both modes *don't* update the working dir :}
17:08 jast yeah, there are many frontends tacked onto git that are "clearly superior"/"simpler" according to the authors... and nobody uses them ;)
17:08 Darcidride joined #git
17:09 jast e.g. easygit, gitless (the name is misleading because it's still very clearly built on top of git)
17:09 kbs joined #git
17:11 jast anyway, a somewhat more logical view on the two modes of checkout: the mode with a file argument is a special type of switching operation in which you only change the version of some of the files (and restoring changes from the index is a special case of *that*)
17:11 bernardio joined #git
17:14 a_thakur joined #git
17:15 ajf- joined #git
17:18 nikivi joined #git
17:18 jason237 joined #git
17:18 selckin mustmodify: "Thats lame" was very cogent.
17:19 yohnnyjoe joined #git
17:20 bremner yes, I always have itchy banhammer fingers when people say things like "feel free to keep quiet"
17:21 bremner luckily I mostly control my impulses ;).
17:22 canton7 "<mustmodify> Feel free to stay quiet if you don't have a cogent answer." <-- that's the perfect way to ensure that noone bothers to answer you in case they get moaned at, which in turn is the perfect way to ensure that you're just wasting your own time
17:23 krasimir joined #git
17:24 Lipp joined #git
17:24 InfoTest joined #git
17:25 phanimahesh joined #git
17:26 hanthings joined #git
17:28 aeontech joined #git
17:29 lmatteis joined #git
17:29 NimeshNeema joined #git
17:30 phanimahesh joined #git
17:35 vuoto joined #git
17:35 krasimir hi all . I have a git subtree in folder blog and it has its own .gititnore file , the file includes some paterns for folders that I want to track in the main repo. Is there anyway to force tracking these without modifing the subtree .gitignore file as I push this upstream to another github account
17:35 phanimah1sh joined #git
17:36 sangy joined #git
17:36 jfelchner joined #git
17:37 asgs joined #git
17:40 phanimahesh joined #git
17:41 mischat joined #git
17:42 selckin don't know about subtreee, but you can negate ignores with !pattern and or just force add them
17:43 canton7 left #git
17:43 canton7 joined #git
17:43 _cyril_ joined #git
17:43 cdown joined #git
17:45 matoro joined #git
17:45 underpantz_ joined #git
17:45 vuoto joined #git
17:45 phanimahesh joined #git
17:50 phanimahesh joined #git
17:52 krasimir let me try
17:53 krasimir I tried negating , but the second ignorefile in the subfolder overwrites the negates
17:54 barteks2x joined #git
17:56 gitinfo joined #git
17:58 JanC_ joined #git
18:00 phanimahesh joined #git
18:02 barteks2x_ joined #git
18:05 dan2k3k4 joined #git
18:06 phanimahesh joined #git
18:06 CrazyBonz joined #git
18:08 HoierM joined #git
18:08 nikivi joined #git
18:09 JamesBaxter joined #git
18:10 mns joined #git
18:10 ayjay_t joined #git
18:11 Sleepy63 joined #git
18:11 LeBlaaanc joined #git
18:11 dede_ joined #git
18:14 flupke joined #git
18:15 ArchNoob joined #git
18:16 phanimahesh joined #git
18:16 Goplat joined #git
18:24 shaggycat joined #git
18:25 ayjay_t joined #git
18:28 JamesBaxter joined #git
18:28 _cyril_ joined #git
18:34 nikivi joined #git
18:38 Akamzrazor joined #git
18:39 nikivi joined #git
18:42 resurtm2 joined #git
18:42 mischat joined #git
18:48 bket joined #git
18:49 skered joined #git
18:52 aard_ joined #git
18:56 meauses joined #git
18:57 SteffanW joined #git
18:58 barteks2x joined #git
18:58 Spec-Chum joined #git
18:59 red82 joined #git
19:04 Shakeel_ joined #git
19:05 venmx joined #git
19:06 nwkj86 joined #git
19:06 red82 joined #git
19:07 Spec-Chum joined #git
19:12 Karazhan joined #git
19:13 kamog joined #git
19:13 GodEater` joined #git
19:15 ArchNoob joined #git
19:15 nilg joined #git
19:19 vuoto joined #git
19:19 vuoto joined #git
19:19 matoro joined #git
19:19 vuoto joined #git
19:25 venmx joined #git
19:28 dan2k3k4 joined #git
19:28 jfelchner_ joined #git
19:30 morenoh149 joined #git
19:32 PaulCapestany joined #git
19:33 menip joined #git
19:35 tyreld joined #git
19:39 Oatmeal joined #git
19:39 nfk joined #git
19:40 shubhnik joined #git
19:40 vuoto joined #git
19:41 j2d2 joined #git
19:42 Siegfried joined #git
19:42 Darren_ joined #git
19:42 sea-gull joined #git
19:43 mischat joined #git
19:44 vuoto joined #git
19:44 einnjo joined #git
19:44 manuel joined #git
19:45 vuoto joined #git
19:46 vuoto joined #git
19:47 cagedwisdom joined #git
19:48 vuoto joined #git
19:49 Anja joined #git
19:50 paul424 joined #git
19:50 shubhnik joined #git
19:50 raijin joined #git
19:56 mischat joined #git
19:58 romerocesar joined #git
19:58 CEnnis91 joined #git
19:58 Sonderblade joined #git
20:01 laumann joined #git
20:06 bmahe joined #git
20:06 cdown joined #git
20:10 Faylite joined #git
20:10 BlTCH joined #git
20:11 BlTCH Hi guys I'm trying to port an android app to my tablet. The first thing I must do is this http://pastebin.com/gVmSWZ0Y how can I use git in android terminal?
20:13 moritz BlTCH: aren't android apps usually cross-compiled?
20:13 elementalest joined #git
20:13 elementalest joined #git
20:15 _cyril_ joined #git
20:15 BlTCH moritz: I want to install multirom, that hasn't be compiled for my tablet (it has been written for just few devices actually) but I need really much dual boot since I need some functions that are just in KitKat
20:16 BlTCH Well how can I use git from android terminal?
20:18 Jdtc joined #git
20:19 mellernoia joined #git
20:20 renlo joined #git
20:21 Kulrak joined #git
20:21 Kulrak joined #git
20:22 Regency joined #git
20:22 ExeciN joined #git
20:24 Regency left #git
20:26 qws-user-1228 joined #git
20:27 vuoto joined #git
20:30 blr_ left #git
20:30 converge joined #git
20:30 converge joined #git
20:33 aidalgol joined #git
20:34 mischat joined #git
20:35 King_Hual joined #git
20:35 King_Hual joined #git
20:40 pokalyis joined #git
20:43 jfelchner joined #git
20:44 cagedwisdom joined #git
20:45 Learath2 joined #git
20:47 SwiftMatt joined #git
20:49 overlord_tm joined #git
20:50 romerocesar joined #git
20:51 ArchNoob joined #git
20:54 vuoto joined #git
20:59 diegoaguilar joined #git
21:00 CrazyBonz joined #git
21:00 wrouesnel1 joined #git
21:01 seyhun joined #git
21:02 zeroed joined #git
21:03 energizer joined #git
21:04 energizer How bad an idea is it to put a git repo in dropbox?
21:04 davimore joined #git
21:04 preaction it could result in data loss, and will likely result in regular problems
21:05 energizer ok
21:05 WayToDoor joined #git
21:05 phil22 joined #git
21:05 preaction that said, you could put the work tree in dropbox, and keep the .git dir out of it. it'd still be weird though because of dropbox's merge strategy (it doesn't have one)
21:05 CrazyBonz joined #git
21:07 canton7 energizer, !dropbox
21:07 gitinfo energizer: Use git-remote-dropbox instead of placing your repository directly in the "Dropbox folder", or you'll get sync errors(and eventually, a corrupted repo). https://github.com/anishathalye/git-remote-dropbox
21:07 canton7 (and !dropbox_why)
21:07 gitinfo git uses a lot of frequently-changed small files, which dropbox's synchronization algorithms barf on. Use of multiple dropbox clients compounds this, with hilarious results
21:08 energizer thanks canton7
21:09 nilg joined #git
21:09 ramsub07 joined #git
21:10 mischat joined #git
21:15 _cyril_ joined #git
21:15 ramsub08 joined #git
21:19 cdown joined #git
21:20 cagedwisdom joined #git
21:22 _W_ joined #git
21:24 lindenle joined #git
21:25 venmx joined #git
21:25 nettoweb joined #git
21:25 cdg joined #git
21:26 cdg joined #git
21:28 zeroed joined #git
21:28 zeroed joined #git
21:29 mostlybadfly joined #git
21:35 finalbeta joined #git
21:39 RustyShackleford joined #git
21:40 RustyShackleford here's an issue I run into sometimes
21:40 Siegfried joined #git
21:40 RustyShackleford Working on feature branch X, I submit a pull request. Then I want to move onto my next task, but I want the changes in feature branch X
21:41 RustyShackleford there might be a few more commits on X based on feedback I receive
21:41 inflames joined #git
21:42 RustyShackleford if I git checkout X; git checkout -b newbranch; How do I move newbranch to master after my PR is accepted?
21:43 moritz RustyShackleford: you git fetch; rebase origin/master
21:46 Electrometro joined #git
21:47 energizer logger = logging.getLogger('mylogger'); logger.setLevel(logging.INFO); logger.info('a') .  I thought this would print 'a'. How to do that?
21:47 energizer sorry wrong place
21:51 jstimm joined #git
21:52 robattila256 joined #git
21:53 RustyShackleford moritz: doesn't the rebase reach too far back into history?
21:53 RustyShackleford we squash PR's down to one commit before merging
21:53 pokalyis joined #git
21:53 RustyShackleford so history has diverged also
21:54 romerocesar joined #git
22:09 ramsub07 joined #git
22:09 fahadash joined #git
22:11 finalbeta joined #git
22:14 qasaur joined #git
22:15 cagedwisdom joined #git
22:15 Endarked joined #git
22:17 _cyril_ joined #git
22:18 aidalgol joined #git
22:19 BlessJah 7/7
22:20 ochorocho__ joined #git
22:22 mehola joined #git
22:23 durham joined #git
22:23 Gfurst joined #git
22:27 dviola joined #git
22:28 ayjay_t joined #git
22:29 watabou joined #git
22:31 Siegfried joined #git
22:34 nikivi joined #git
22:35 stevenspasbo joined #git
22:40 Cxcf joined #git
22:42 netj joined #git
22:42 moei joined #git
22:43 Cxcf Hey all, so I'm learning git by using it to track my homework projects. I made an edit to HW6 while on the HW3 branch. When I'm trying to checkout to HW6 I get a "files will be overwritten by checkout" message. Is there a way I can commit those changes to HW6 instead of HW3. Am I not understanding  something about how git works?
22:43 WaReZ joined #git
22:46 venmx joined #git
22:46 Cxcf_ joined #git
22:46 btree joined #git
22:47 dodobrain joined #git
22:47 Cxcf_ left #git
22:49 Cxcf` joined #git
22:51 rmichnik joined #git
22:53 [cust] joined #git
22:54 relipse joined #git
22:55 relipse i'm trying to merge branch recurring into master but it failed with error: unable to create file laravel/recurring/resources/vie​ws/recurring_charges.blade.php: Permission denied and now git status shows a TON of files modified what do i do?
22:55 qasaur joined #git
22:55 relipse why are there all these files modified?
22:55 snthsnth joined #git
22:57 Endarked joined #git
22:57 qasaur joined #git
23:01 Rickmasta joined #git
23:01 barteks2x joined #git
23:02 unreal_ joined #git
23:15 btree left #git
23:18 mustmodify left #git
23:18 _cyril_ joined #git
23:21 Oatmeal joined #git
23:22 cesarvargas joined #git
23:22 alhariel joined #git
23:24 Zoxc joined #git
23:25 a3Dman joined #git
23:27 barteks2x joined #git
23:28 romerocesar joined #git
23:32 svm_invictvs joined #git
23:32 nowhereman joined #git
23:33 ElGrandeAmigo joined #git
23:36 SpeakerToMeat joined #git
23:42 TSS_ joined #git
23:46 qasaur joined #git
23:47 diego1 joined #git
23:48 diego1 joined #git
23:49 barteks2x joined #git
23:50 zumba_ad_ joined #git
23:51 svm_invictvs joined #git
23:52 JanC joined #git
23:53 snthsnth joined #git
23:54 diego1 joined #git
23:54 diego1 joined #git
23:56 diego1 joined #git
23:57 diego1 joined #git
23:57 barteks2x joined #git
23:58 dviola left #git
23:59 EricPoe joined #git

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