Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-29

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

All times shown according to UTC.

Time Nick Message
00:00 BlessJah bekks: do you need to track those notes?
00:00 imachuchu bekks: so tag the release in git and write a script to remove the files you don't want (and commit the script). From git's point of view that's still a version of the tools, and you can then easily create a release from tag by running the script
00:00 unborn oh BlessJah thanks for offer but I do not use windows from xp time.. and I do not think so I will use it in future.. I only repair that stuff, but never use it
00:01 bekks BlessJah: it would be great to track them, yes.
00:02 BlessJah bekks: then either do as imachuchu said (commit/tag all, create tarball with subset), or create separate repository
00:02 unborn and last question.. do I have to always pull from remote, update my files and then push? or I can just always use push command if I hold original repo I created?
00:03 BlessJah !subtree or !submodule might be solution, but it requires some changes to workflow
00:03 gitinfo The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.
00:03 gitinfo git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules
00:03 grawity well, you can push directly if you're sure there's nothing to pull
00:03 imachuchu also the great thing about commiting/tagging all is that you can from one checkout create multiple tarballs for multiple users just by running multiple scripts, without needing to worry about which tool is in which repo
00:03 bekks I guess I could "hook" what imachuchu said with a gitlab runner running on tags. Whenever a tag is submitted, I could just check that out, remove the unwanted files, set a version string in the files, and put them into a tarball.
00:03 grawity or you can push, see if it throws an error, and *then* pull/merge/etc. the commits from server, and push again
00:04 imachuchu unborn: your local repo is just a peer of the remote repo. When you add/commit you are just changing your local repo, fetching/pushing is just sharing work with another repo
00:04 LiMp^ joined #git
00:04 unborn so always pull and then push
00:05 BlessJah unborn: are you the only contributor?
00:05 unborn imachuchu: basically once I upload my repo to remote (my home server) I would like to remove it from my laptop
00:05 bekks BlessJah: imachuchu: is that a somehow usable/sane approach for "releasing" the tarballs?
00:05 unborn yes only me
00:05 unborn BlessJah: ^^^
00:06 arescorpio joined #git
00:06 BlessJah unborn: then usually you dont need pull/fetch, pull is only needed when remote has new commits you dont have locally
00:06 unborn so next time i need it to change anything in source code I just clone the repo to my laptop and then push changes out.. is that how it works?
00:06 BlessJah bekks: imachuchus solution with script? sure, it will work
00:07 BlessJah unborn: why would you remove the repo and clone it everytime?
00:07 bekks BlessJah: And the caveat I've learned is: I can tag my workspace set only, not just a subset of files?
00:08 unborn BlessJah: because the updates happens only when my client is asking me to make changes to website code etc..and its not frequent
00:08 BlessJah you can tag commit (snapshot), which contains everything you commited
00:10 BlessJah unborn: do as you wish, I keep locally repos i rarely use because a) I use them b) sometimes offline c) most of them are small enough
00:11 imachuchu bekks: sounds fine, but you can also use git archive to get a tarball of any particular commit, no reason to checkout
00:12 unborn BlessJah: perhaps you right, the question was if I push them to remote and for example my hdd dies I would be still able to clone them back and then push them out with updated code right? I think I will test this right a way :)
00:13 imachuchu unborn: you can also use a shallow clone to just copy over recent commits. Note that it's a bit of an advanced topic cause there's tons of things they can't do, but if you only need to change a few things then it might be for you
00:14 BlessJah bekks: git archive will produce tar, which you may further edit (http://xkcd.com/1168/)
00:15 fling joined #git
00:15 bekks imachuchu: I found this example for git archive (here: https://git-scm.com/docs/git-archive#git-archive-codegitarchive--formattar--prefixgit-140v140gzipgtgit-140targzcode): git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz
00:16 BlessJah unborn: yep that's how it works, you push to remote so others (you) could clone/fetch later
00:16 bekks imachuchu: the predix defines which prefix path to put into the tarball, the "v1.4.0" defines the tag to be used" - correct?
00:16 grawity sounds about right
00:17 imachuchu bekks: no idea
00:17 imachuchu bekks: !tias
00:17 gitinfo bekks: 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.
00:18 BlessJah oh, there is optional <path> argument - list of paths to be included
00:18 BlessJah TIL
00:20 bekks That can be useful, for excluding "notes/" from the tarball.
00:22 BlessJah it recognized -o name.tar.gz, and trailing slash in prefix is required unless you want v1.4.0Makefile
00:23 grumble joined #git
00:23 bronson joined #git
00:24 bekks So I got it right that v1.4.0 is tag I want to archive?
00:24 BlessJah bekks: you can use git ls-tree --name-status v1.4.0 to get list of files/dirs in that tag (instead of hardcoding everything but notes)
00:25 BlessJah and yes, v1.4.0 is tagged commit you want to archive
00:25 mmlb joined #git
00:26 bekks Thanks a lot! I guess I can now script that whole thing, using https://docs.gitlab.com/ce/ci/variables/README.html#predefined-variables-environment-variables
00:28 unborn yeah that worked! superb! thank you very much guys for providing me those valuable info.. and I am sorry for idiotic questions.. im just new to all of this. Thank you !
00:28 BlessJah no problem
00:28 imachuchu unborn: no problem, we're more then happy to help!
00:29 Darren_ joined #git
00:30 raspado joined #git
00:37 bannakaffalatta joined #git
00:38 GavinMagnus joined #git
00:39 ResidentBiscuit joined #git
00:39 jagob joined #git
00:39 dsdeiz joined #git
00:39 m0viefreak joined #git
00:41 d0nn1e joined #git
00:42 jimi_ joined #git
00:43 eb0t joined #git
00:44 bekks thanks again, BlessJah and imachuchu, for your patience. I'll try out the TIL, and come back soon :)
00:46 uu joined #git
00:55 Rodya_ joined #git
01:04 jccn joined #git
01:07 Juanito[m] left #git
01:07 netj joined #git
01:07 paws_ joined #git
01:08 GavinMagnus left #git
01:10 skl joined #git
01:13 menip joined #git
01:15 lukff joined #git
01:15 cdown joined #git
01:16 skl anyone know if there's a way to statistics about a specific folder, how many commits and changes were done inside the folder, along with users and such that did those changes?
01:24 bronson joined #git
01:25 ratdeptrai joined #git
01:27 rivarun joined #git
01:29 yanome joined #git
01:31 jimi_ joined #git
01:33 Phrohdoh joined #git
01:33 anonymuse joined #git
01:36 Phrohdoh Locally I have 'Makefile' but on github it is 'makefile' https://gist.github.com/Phrohdoh/574747f533c0ab093dbdc4b5bd835b1a they are the same rev, can anyone explain this?
01:36 Phrohdoh https://github.com/Phrohdoh/OpenAOE/tree/2ff6260a070754b2dc0df5484b8c7c7a4db02b32 is the repo btw
01:39 lukff joined #git
01:40 lukff joined #git
01:45 cdown joined #git
01:46 cyphase joined #git
01:46 Goplat joined #git
01:50 yaewa joined #git
01:51 ruby joined #git
01:52 Random832 Phrohdoh, are you on a case-insensitive filesystem (windows or mac)?
01:52 Phrohdoh macOS
01:53 Phrohdoh I've since `git mv`'d them.
01:53 Random832 also what does 'git show 2ff6260a:' give you
01:54 Phrohdoh `git show 2ff6260a:` contains 'makefile'
01:54 Random832 case-insensitive filesystems are a pain
01:54 Random832 you're stuck with that revision having makefile in it unless you rewrite history
01:54 morenoh149 joined #git
01:54 Random832 probably you added it with "git add makefile"
01:55 Random832 and it didn't care that the real name was different
01:55 Phrohdoh I did a `git add .`
01:55 Random832 and what was the filename in the dir at the time you added it
01:56 Phrohdoh Logic tells me it was makefile but memory says it was Makefile
01:56 Darren_ joined #git
01:56 Phrohdoh And in my head the `git status` backs that up
02:00 andrew710 joined #git
02:01 Phrohdoh left #git
02:01 Nilesh_ joined #git
02:02 ppppp5 joined #git
02:03 Limes_ joined #git
02:06 cagedwisdom joined #git
02:10 howitdo joined #git
02:12 finalbeta joined #git
02:12 aw1 joined #git
02:14 xaviergmail joined #git
02:15 johnmilton joined #git
02:16 jstimm joined #git
02:18 jimi_ joined #git
02:19 unreal joined #git
02:21 polyrob joined #git
02:23 d^sh_ joined #git
02:25 bronson joined #git
02:25 pijiu joined #git
02:29 bb010g joined #git
02:32 raspado joined #git
02:33 ochorocho__ joined #git
02:34 ome joined #git
02:37 dhollinger joined #git
02:39 Vampire0_ joined #git
02:40 menip joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:51 davimore_ joined #git
02:52 aavrug joined #git
02:55 looper joined #git
02:58 netj joined #git
03:01 metachr0n joined #git
03:04 ShapeShifter499 joined #git
03:08 NeverDie_ joined #git
03:10 moei joined #git
03:16 Darren_ joined #git
03:19 thebope joined #git
03:20 xall joined #git
03:26 bronson joined #git
03:26 Vortex34 joined #git
03:34 ochorocho__ joined #git
03:35 hexagoxel joined #git
03:37 Emperor_Earth joined #git
03:41 xall joined #git
03:43 cyphase joined #git
03:43 morenoh149 joined #git
03:45 thebope joined #git
03:50 sunri5e joined #git
03:55 xall joined #git
03:57 mizu_no_oto joined #git
03:59 jason237 joined #git
04:03 chachasmooth joined #git
04:05 a_thakur joined #git
04:15 a_thakur joined #git
04:15 Oatmeal joined #git
04:16 fstd_ joined #git
04:16 a_thakur joined #git
04:17 hungry joined #git
04:18 zifnab joined #git
04:19 holdsworth joined #git
04:20 hungry left #git
04:27 bronson joined #git
04:34 mario_ joined #git
04:36 ochorocho__ joined #git
04:38 subhojit777 joined #git
04:38 Darren_ joined #git
04:39 Vgr joined #git
04:42 FederationOfNULL joined #git
04:43 FederationOfNULL joined #git
04:49 dodobrain joined #git
04:51 ac3takwas joined #git
04:53 neutr joined #git
04:54 neutr What's the difference between merging foo in to bar, and merging bar into foo?
04:54 xall joined #git
04:58 kadoban neutr: Mostly which one gets modified. If you merge foo into bar (git checkout bar && git merge foo), foo is unchanged completely. bar is modified, has the changes from foo.
04:58 neutr kadoban: how about merge conflict resolution?
04:58 kadoban How about it?
04:59 duderonomy joined #git
04:59 cyphase joined #git
04:59 neutr kadoban: is there a difference in precedence with respect to which branch's conflicting change is honored?
05:00 lightstalker joined #git
05:00 kadoban Not as far as I know. git doesn't really pick one to be prioritized, if it can't tell for sure, it makes you tell it.
05:00 kadoban (Which is what a conflict is)
05:02 nd_ joined #git
05:08 rchavik joined #git
05:11 looper joined #git
05:12 duderonomy joined #git
05:13 Cabanossi joined #git
05:18 ShapeShifter499 joined #git
05:21 watabou joined #git
05:24 Mowgli joined #git
05:28 bronson joined #git
05:29 ayogi joined #git
05:32 morenoh149 joined #git
05:35 xall joined #git
05:38 ochorocho__ joined #git
05:40 ResidentBiscuit joined #git
05:42 Atrumx joined #git
05:45 aw1 joined #git
05:46 holodoc joined #git
05:55 bocaneri joined #git
05:56 Blendify joined #git
05:57 Blendify How to I write a commit message from an editor from the terminal?
05:57 GT4066 joined #git
05:57 Blendify git commit -m
05:57 Blendify ?
05:58 duderonomy joined #git
06:01 dreiss joined #git
06:05 zefferno joined #git
06:06 bl0m1_ joined #git
06:07 phroa Blendify: you can use -m to specify a message right there, but due to formatting restrictions it's usually not great.  if you want a terminal-based editor, set 'git config --global core.editor <x>' or $GIT_EDITOR
06:10 thethorongil joined #git
06:13 Blendify thanks phroa I got it
06:16 Blendify|zzz left #git
06:21 Moult joined #git
06:23 ogny joined #git
06:24 romerocesar joined #git
06:28 bronson joined #git
06:30 Peuc joined #git
06:37 romerocesar joined #git
06:38 overlord_tm joined #git
06:39 ochorocho__ joined #git
06:46 nydel07 joined #git
06:55 davimore__ joined #git
06:57 cagedwisdom joined #git
06:58 Milos joined #git
06:59 safe joined #git
07:00 freimatz joined #git
07:02 zeroed joined #git
07:05 safe joined #git
07:05 cyan__ joined #git
07:09 ignarps joined #git
07:09 Garen_ joined #git
07:13 lordjancso joined #git
07:16 stick-shift joined #git
07:16 ShapeShifter499 joined #git
07:19 fling joined #git
07:21 morenoh149 joined #git
07:22 howdoi joined #git
07:22 Macaveli joined #git
07:23 davimore_ joined #git
07:24 svm_invictvs joined #git
07:29 bronson joined #git
07:34 howitdo joined #git
07:36 oskarkv joined #git
07:37 tojo joined #git
07:38 a_thakur_ joined #git
07:40 ResidentBiscuit joined #git
07:42 a_thakur joined #git
07:43 [log] joined #git
07:44 a_thakur joined #git
07:44 SJr joined #git
07:46 diogenese joined #git
07:49 [log] joined #git
07:50 skl left #git
07:52 jknetl joined #git
07:59 howdoi what's missing in:
07:59 howdoi git diff --cached --diff-filter=ACMTUXB --name-only -- '*.jsx'
07:59 a_thakur joined #git
08:04 moritz what do you awt to achieve, and why do you think something is missing?
08:04 moritz *want
08:05 howdoi my git status has many changes to jsx files
08:05 howdoi but git diff --cached --diff-filter=ACMTUXB --name-only -- '*.jsx' doesn't list any
08:05 howdoi I am working on a pre-commit git hook linitng
08:05 selckin remove --cached
08:07 fission6_ joined #git
08:07 howdoi selckin: oh! yeah, but how about it diff --diff-filter=ACMTUXB --name-only -- '*.jsx?'
08:07 howdoi as in match both js and jsx
08:08 DieguezZ joined #git
08:10 selckin *js *.jsx
08:15 danslo joined #git
08:15 slappymcfry joined #git
08:17 finalbeta joined #git
08:26 howdoi neat
08:26 howdoi eslint $(git diff --cached --diff-filter=ACMTUXB --name-only -- *.js *.jsx)
08:26 howdoi is good enough for a hook?
08:26 selckin probably need the quotes
08:27 selckin and quotes around $()
08:27 HarryPothead joined #git
08:27 PCatinean joined #git
08:28 howdoi without quotes as well it's working fine
08:28 howdoi need to check if eslint can work on multiline
08:28 selckin try paths with spaces
08:28 selckin or other special chars
08:28 howdoi or it needs a xargs
08:28 selckin touch 'oops; rm -rf .;'
08:28 selckin (dont do that)
08:28 howdoi our code base has not paths with spaces or special chars
08:29 howdoi selckin: lol!
08:29 selckin well if your definition of good enough is it worked in my tests then why are you asking
08:29 selckin *.js will be evaluated by the shell, not git, so it won't go in subdirs, pass the quotes there
08:30 bronson joined #git
08:30 howdoi my concern was wrt to eslint
08:30 howdoi no offense meant here
08:31 selckin i have no clue what eslint is
08:33 Oebele joined #git
08:35 jagob joined #git
08:36 NimeshNeema joined #git
08:38 Ardethian\work joined #git
08:40 ochorocho__ joined #git
08:41 ac3takwas joined #git
08:43 icey joined #git
08:43 icey joined #git
08:44 Panacea joined #git
08:46 Ozymandy joined #git
08:47 Balliad joined #git
08:49 khfeng_ joined #git
08:56 [log] joined #git
09:00 afuentes joined #git
09:04 Milos joined #git
09:08 kurkale6ka joined #git
09:08 cagedwisdom joined #git
09:10 morenoh149 joined #git
09:13 shubhnik joined #git
09:15 ShapeShifter499 joined #git
09:16 marcogmonteiro joined #git
09:23 Gloomy joined #git
09:25 clmsy joined #git
09:30 duderonomy joined #git
09:31 Snugglebash joined #git
09:31 a_thakur joined #git
09:31 bronson joined #git
09:33 Zordey__ joined #git
09:34 jonthn joined #git
09:34 SpecChum joined #git
09:38 Ardethian\work joined #git
09:38 Ardethian\work joined #git
09:40 ochorocho__ joined #git
09:41 ResidentBiscuit joined #git
09:41 rchavik joined #git
09:41 diogenese joined #git
09:42 nettoweb joined #git
09:44 robotroll joined #git
09:44 aidalgol How can I find out which files in a checkout are under version control?
09:45 selckin i think git ls-files
09:45 jonthn left #git
09:45 aidalgol no such command
09:46 selckin !man git-ls-files
09:46 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 !) ?
09:46 gitinfo the git-ls-files manpage is available at http://jk.gs/git-ls-files.html
09:50 xaa joined #git
09:51 aidalgol Which git version added that command?
09:51 ferr1 joined #git
09:51 selckin !release-notes
09:51 aidalgol I'm on 2.1 (because Debian)
09:52 ToBeCloud joined #git
09:52 selckin 2.5 years
09:56 netcarver left #git
09:58 aidalgol oh, I *do* have the command...  I must have mistyped it...
09:58 aidalgol so, uh, thanks. :P
10:05 jnavila joined #git
10:07 GavinMagnus joined #git
10:12 skunkz joined #git
10:12 howitdo joined #git
10:13 Gloomy joined #git
10:15 rnsanchez joined #git
10:20 alexsystemf____ joined #git
10:22 artgoeshere_ joined #git
10:23 dpower_ joined #git
10:23 Outsider___ joined #git
10:23 epic_ joined #git
10:23 worstadmin_ joined #git
10:23 fcrick_ joined #git
10:23 trig-ger_ joined #git
10:24 kutenai_ joined #git
10:24 EmeraldExplorer_ joined #git
10:24 deepa joined #git
10:24 boxrick1_ joined #git
10:25 adambrenecki_ joined #git
10:25 Slush-_ joined #git
10:26 axisys_ joined #git
10:26 souther_ joined #git
10:26 marcogmonteiro joined #git
10:28 Renter added a large file with git add, did not commit yet, can I remove it pre-commit ?
10:29 selckin git status out will tell you how
10:29 Renter ah, git status gave hint for git reset
10:29 Renter thanks
10:29 ojacobson_ joined #git
10:29 neuro_sys joined #git
10:29 acr4 joined #git
10:29 meZee- joined #git
10:30 canton7 joined #git
10:31 demize joined #git
10:31 cyphase joined #git
10:32 hdon joined #git
10:32 bronson joined #git
10:32 drizbit joined #git
10:32 paramourne joined #git
10:33 gnoirzox1 joined #git
10:33 Nothing4You joined #git
10:33 reverse_light joined #git
10:34 biertie joined #git
10:35 jorgesumle joined #git
10:35 ThiefMaster joined #git
10:36 mt joined #git
10:36 netj joined #git
10:36 uva joined #git
10:36 msonntag joined #git
10:36 dminuoso joined #git
10:36 rawtaz joined #git
10:36 nivag joined #git
10:36 grawity joined #git
10:36 j416 joined #git
10:36 Log1x joined #git
10:36 Ram-Z joined #git
10:36 rossome joined #git
10:36 chridal joined #git
10:36 hwoarang_ joined #git
10:36 mutex_ joined #git
10:36 Pie_Napple joined #git
10:36 Corosus joined #git
10:36 infernix joined #git
10:36 troyt joined #git
10:36 de-vri-es joined #git
10:36 VoidFox joined #git
10:36 e joined #git
10:36 leah2 joined #git
10:36 storrgie joined #git
10:36 MuffinMedic joined #git
10:36 blueyed joined #git
10:36 bcc joined #git
10:36 Thorn joined #git
10:36 Ariadeno joined #git
10:36 jephsf joined #git
10:36 adymitruk joined #git
10:36 spb joined #git
10:36 mtso[m] joined #git
10:36 Peetz0r joined #git
10:36 roflin joined #git
10:36 mkoskar joined #git
10:36 TheOrangeOne joined #git
10:36 dersand joined #git
10:36 M-meznak joined #git
10:36 kjsage[m] joined #git
10:36 unilovelight[m] joined #git
10:36 Mher[m] joined #git
10:36 WillianPaiva[m] joined #git
10:36 MacGyver joined #git
10:36 synthmeat joined #git
10:36 ToxicFrog joined #git
10:36 jokester joined #git
10:36 monokrome joined #git
10:36 snits joined #git
10:36 noctux joined #git
10:36 thesquib joined #git
10:36 creppe joined #git
10:36 Arguggi joined #git
10:36 asd5a joined #git
10:36 andschwa joined #git
10:36 rudi_s joined #git
10:36 ColdKeyboard joined #git
10:36 anbz joined #git
10:36 Exagone313 joined #git
10:36 avar joined #git
10:36 cwillu_at_work joined #git
10:36 Cathy joined #git
10:36 jhasse joined #git
10:36 jerrcs joined #git
10:36 milki joined #git
10:36 Korvin joined #git
10:36 sim642 joined #git
10:36 marcaddeo joined #git
10:36 bjoe2k4 joined #git
10:36 iveqy joined #git
10:36 deltab joined #git
10:36 rockfruit joined #git
10:36 hexa- joined #git
10:36 SupaHam joined #git
10:36 robinsmidsrod joined #git
10:36 Neo joined #git
10:36 _ikke_ joined #git
10:36 madknight joined #git
10:36 up_the_irons joined #git
10:36 thejoecarroll_ joined #git
10:36 rcn joined #git
10:36 tgummerer joined #git
10:36 r4z3r joined #git
10:36 quadz joined #git
10:36 pcarrier joined #git
10:36 sparr joined #git
10:36 Chinorro joined #git
10:36 jrahmy- joined #git
10:36 Matsv joined #git
10:36 EvilJStoker joined #git
10:36 mt joined #git
10:37 Karazhan joined #git
10:37 Neo joined #git
10:37 sparr joined #git
10:37 Remram joined #git
10:37 ochorocho__ joined #git
10:38 chrysaor joined #git
10:38 errr joined #git
10:38 jorgesumle Hi, I want to take out a file of a Git repository and use its history to create a new one. This means I just want to preserve the history of that file in the a new repository. Is that possible?
10:39 hexa- joined #git
10:39 mt joined #git
10:40 monokrome joined #git
10:40 dsdeiz joined #git
10:40 dsdeiz joined #git
10:40 ResidentBiscuit joined #git
10:40 _ADN_ joined #git
10:41 selckin yes
10:41 selckin !split
10:41 gitinfo To split an unpushed commit: git rebase -i <id>^; (change the corresponding line from 'pick' to 'edit'; save and quit); git reset --soft HEAD~; (stage and commit changes for first commit; stage and commit changes for second commit); git rebase --continue
10:41 selckin no that
10:42 selckin jorgesumle: !filter_subdir
10:42 gitinfo jorgesumle: [!filter_subdirectory] You can use filter-branch's subdirectory filter to split a directory from an existing repository into a new repository, keeping all history. https://help.github.com/articles/splitting-a-subfolder-out-into-a-new-repository/
10:42 Jackneill joined #git
10:42 selckin !split-repo
10:42 selckin !split_repo
10:42 gitinfo [!split_repository] You can use filter-branch to split an existing repository into smaller new repositories. See http://teach.github.com/articles/lesson-filter-branch/ and !filter_subdirectory
10:44 wwspider_ left #git
10:46 Macaveli joined #git
10:49 pbrewczynski joined #git
10:50 cyphase joined #git
10:50 freimatz joined #git
10:51 PHPanos joined #git
10:51 ghostlight joined #git
10:52 uu joined #git
10:58 morenoh149 joined #git
11:02 jorgesumle But in my case I just need an individual file, not the entire folder. It doesn't work for a single file
11:04 selckin bit more complex then
11:04 selckin trying to google up some examples http://stackoverflow.com/questions/5998987/splitting-a-set-of-files-within-a-git-repo-into-their-own-repository-preserving
11:07 cdown joined #git
11:08 PCatinean_ joined #git
11:10 thiago joined #git
11:14 pasky joined #git
11:14 ShapeShifter499 joined #git
11:14 Mogget joined #git
11:16 Snugglebash joined #git
11:18 archaic joined #git
11:19 zefferno joined #git
11:21 TomyLobo joined #git
11:22 SirLewis joined #git
11:27 ShapeShifter499 joined #git
11:28 rnsanchez joined #git
11:28 GavinMagnus left #git
11:28 vrlx joined #git
11:32 mdw joined #git
11:33 bronson joined #git
11:36 metachr0n joined #git
11:37 jstein_ joined #git
11:39 ixxie joined #git
11:40 leeN joined #git
11:43 YuGiOhJCJ joined #git
11:44 t-mart joined #git
11:44 coasterz joined #git
11:45 mohabaks joined #git
11:46 mohabaks hello folks; any good source such as ebooks for learning git essentials.
11:46 tobiasvl mohabaks: !book
11:46 gitinfo mohabaks: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
11:46 bremner !book
11:46 fahadash joined #git
11:48 FilipNortic joined #git
11:48 mohabaks tobiasvl, thanks.
11:50 ertesx joined #git
12:01 muuse joined #git
12:08 mdw_ joined #git
12:11 bannakaffalatta joined #git
12:18 shinnya joined #git
12:20 nunchuck joined #git
12:21 wizonesolutions joined #git
12:22 dviola joined #git
12:25 m0viefreak joined #git
12:26 Kgao joined #git
12:26 noecc joined #git
12:29 unyi joined #git
12:31 watabou joined #git
12:32 nowhere_man joined #git
12:34 bronson joined #git
12:35 finalbeta joined #git
12:36 m1dnight_ joined #git
12:46 Matsv joined #git
12:47 morenoh149 joined #git
12:47 MrLawrence joined #git
12:48 sdothum joined #git
12:49 buffal0 joined #git
12:50 cdown joined #git
12:50 treehug88 joined #git
12:52 buffffal00 joined #git
12:53 Uufn joined #git
12:53 Panacea joined #git
12:53 pks joined #git
12:56 ojdo joined #git
13:00 narendraj9 joined #git
13:00 Eryn_1983_FL joined #git
13:00 skunkz joined #git
13:02 _Patrick_ joined #git
13:02 jottr joined #git
13:02 mdw joined #git
13:03 mdw joined #git
13:04 ki0 joined #git
13:06 rethus joined #git
13:07 Achylles joined #git
13:07 rethus I'm not familar with windows (since win 98) ^^ so maybe an easy question here....
13:08 rethus how can I setup git to use another public-key-name as id_rsa ?
13:08 rethus on linux it is the .ssh/config file where I can assign keys to connections
13:08 coasterz joined #git
13:08 uva GIT_SSH_COMMAND='ssh -i foo/id_rsa'
13:08 rethus where does they on windows
13:09 rethus uva: what did this command do?
13:11 GavinMagnus joined #git
13:11 rethus ok, found a post on stackoverflow...: I found that windows msygit port store ssh config here <installPath>\Git\etc\ssh\ssh_config
13:11 rethus does windows has a command like linux : which git to see where it is installed?
13:12 uva if you can call cmd.exe a command line..
13:13 rethus yep is open
13:14 mazert joined #git
13:15 rethus uva: i'm waiting...
13:18 Knirch rethus: you read what he said wrong, he didn't ask you to start cmd.exe, he made a note about cmd.exe barley being a command line. "if you could call it that"
13:18 _Patrick_ joined #git
13:18 aw1 joined #git
13:18 mgedmin if you use Git for Windows, you get a bash.exe that makes you feel almost like on Linux
13:18 mgedmin you can vim ~/.ssh/config etc.
13:19 mgedmin (I assume; ~/.bashrc definitely works)
13:19 Schrostfutz joined #git
13:19 rethus ahhh, like haven on earth ^^ or linux on windows ;)
13:19 mgedmin I think ~ maps to c:\users\<yourusername> or something like that
13:19 rethus where can I found this bash.exe?
13:19 rethus inside of git directory?
13:20 rethus yep got it
13:20 mgedmin when you install https://git-for-windows.github.io/ it creates a shortcut on the desktop
13:20 rethus linux-bash is like 3 days holliday at a sunny island :)
13:27 rethus mgedmin: but problem is, using vim to edit ssh_config have no permission to save the changes
13:27 rethus :(
13:29 rethus Is it possible that i have to start bash.exe as admin?
13:29 rethus how does this work on windows.
13:30 jottr joined #git
13:33 jeffreylevesque joined #git
13:35 ok91 joined #git
13:35 dminuoso left #git
13:35 bronson joined #git
13:39 fission6 joined #git
13:40 endiruna joined #git
13:48 GavinMagnus left #git
13:48 wogi joined #git
13:54 Oatmeal joined #git
13:54 Schrostfutz joined #git
13:55 ixxie Is there a way to have git track certain files in the local copy of a repo but not commit them to the global repo?
13:56 tobiasvl ixxie: !xy
13:56 gitinfo ixxie: 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...
13:56 grawity ixxie: no
13:56 ixxie (usecase is configuration files)
13:56 tobiasvl ixxie: !config
13:56 gitinfo ixxie: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
13:58 pks joined #git
13:58 ixxie thanks tobiasvl, ill check it out
13:59 leeN joined #git
14:01 jimi_ joined #git
14:01 jottr joined #git
14:02 danslo joined #git
14:03 porsche944 joined #git
14:04 newbie1 joined #git
14:04 weiyang joined #git
14:08 rnsanchez joined #git
14:10 ixxie joined #git
14:11 plos joined #git
14:13 mazert joined #git
14:13 dunpeal joined #git
14:14 hue joined #git
14:19 pks joined #git
14:19 fission6 joined #git
14:21 HoierM joined #git
14:23 ikelso joined #git
14:24 weiyang joined #git
14:25 SteffanW joined #git
14:29 anonymuse joined #git
14:30 todd_dsm joined #git
14:30 ShekharReddy joined #git
14:36 bronson joined #git
14:36 plos joined #git
14:36 PHPanos joined #git
14:36 morenoh149 joined #git
14:37 shmup joined #git
14:38 shmup so with git interactive staging, it first shows the filename and then the contents of the diff, and then Stage this hunk [y,n,q,a,d,/,K,g,s,e,?]?
14:38 thiago git add --interactive?
14:38 shmup a thing i'd like is to be able to configure git to show the filename right above the Stage this hunk, for the sake of very long hunks and the filename being pushed out of the terminal
14:38 thiago the console adventure text game? :-)
14:38 shmup git add -p specifically :P
14:38 thiago or did you mean git add -p?
14:38 thiago ah
14:39 thiago well, scroll up
14:39 shmup yeah i am haha
14:39 thiago but it's a good feature
14:39 shmup hey i just wanted to mention it! :P
14:41 fuchsi joined #git
14:41 _Patrick_ joined #git
14:43 neilthereildeil joined #git
14:43 neilthereildeil hey guys
14:44 neilthereildeil i just did a git pull from a remote repo
14:44 neilthereildeil before the pu
14:44 neilthereildeil ll
14:45 GeekMan|2 joined #git
14:45 neilthereildeil , master pointed to commit x. after the pull, master still points to commit x, but head points to commit x+3
14:45 neilthereildeil how can i make pull _REALLY_ mirror the remote tree so my local master points to the same commit as remote master?
14:46 osse Have master checked out when you pull
14:47 Es0teric joined #git
14:49 neilthereildeil ahh ok
14:49 neilthereildeil thanks
14:50 urda joined #git
14:53 jknetl joined #git
14:54 shgysk8zer0_ joined #git
14:54 titankiller joined #git
14:55 Rodya_ joined #git
14:56 gtristan joined #git
15:00 neilthereildeil osse: what if remote has a non-master branch checked out that local doesnt have, and local has master checked out and tries to pull?
15:01 dsdeiz joined #git
15:01 dsdeiz joined #git
15:03 cruxeternus joined #git
15:03 SwingShock joined #git
15:06 nicksloan joined #git
15:08 e14 joined #git
15:08 regedit joined #git
15:08 thiago neilthereildeil: did merge stop with cnflicts?
15:08 neilthereildeil yea
15:09 neilthereildeil thats why im asking
15:09 Es0teric joined #git
15:09 thiago then fix the conflict and then commit
15:09 neilthereildeil i never checking stuff to local tree
15:09 thiago yet you have
15:09 neilthereildeil since i pull only, there shouldnrt be any conflicts
15:09 neilthereildeil i have a lot of tags, buts thats it
15:09 thiago well, evidence shows you did something else
15:10 neilthereildeil hmmm
15:10 thiago do you want to discard any local changes, whatever they may be?
15:10 neilthereildeil yea, but i need to keep my tags and gitignore stuff
15:10 thiago tags will remain
15:10 thiago any changes to .gitignore will be removed
15:10 thiago git reset --hard origin/branchname
15:10 meZee joined #git
15:11 neilthereildeil how can i find the culprit?
15:11 thiago I think we already have
15:11 thiago 13:10 < neilthereildeil> yea, but i need to keep my tags and gitignore stuff
15:11 neilthereildeil just look for a different commit id?
15:11 hexa- joined #git
15:11 thiago your gitignore stuff
15:12 chll joined #git
15:13 andrew710 joined #git
15:15 e14 joined #git
15:16 ixxie joined #git
15:17 wogi joined #git
15:17 e14 joined #git
15:24 bronson joined #git
15:24 guest_ joined #git
15:25 morenoh149 joined #git
15:26 guest__ joined #git
15:27 thebope joined #git
15:31 aarobc joined #git
15:33 dsdeiz joined #git
15:35 ki0 joined #git
15:36 Darren_ joined #git
15:44 weiyang_ joined #git
15:45 siddart joined #git
15:45 Tatou joined #git
15:45 Tatou Hello! Having an issue
15:45 Tatou For some reason I'm doing "Git add *" and it's not  tracking anything
15:46 endiruna joined #git
15:47 bronson joined #git
15:47 Tatou Oh for some reason the gitignore was ignoring everything..
15:47 Blendify joined #git
15:48 Blendify Is there a way to quickly go through git blame other then holding down the down arrow for ten minutes?
15:49 ToxicFrog Blendify: pageup/down?
15:49 ToxicFrog Or '/' and then some text and then 'enter' to search
15:49 ToxicFrog ('?' to search backwards)
15:49 uva if you use less(1), then there is vim-style moving allowed
15:49 cdown_ joined #git
15:49 selckin or use a gui
15:49 uva '1000G' for line 1000
15:49 ToxicFrog 'h' for built in help
15:49 axisys joined #git
15:49 uva and you can always switch it out with a pager (or editor) of choice
15:50 Tatou I give up today. Life is not for me.
15:50 selckin send me your saying on paypal
15:50 Blendify thanks
15:50 selckin *savings
15:51 selckin joined #git
15:51 celebre joined #git
15:52 mohabaks joined #git
15:55 endiruna joined #git
16:00 narendraj9 joined #git
16:01 weiyang joined #git
16:02 weiyang Tatou, have solved your problem?
16:02 freimatz joined #git
16:02 cyan__ joined #git
16:07 plos joined #git
16:08 Darcidride joined #git
16:08 ochorocho__ joined #git
16:10 subhojit777 joined #git
16:14 Tatou weiyang: Not quite, but I'll be fine for now :)
16:15 clemf joined #git
16:16 rethus joined #git
16:17 fission6 joined #git
16:17 [ADN] joined #git
16:18 weiyang Tatou, sounds good
16:18 raedah joined #git
16:18 matsaman joined #git
16:22 osse neilthereildeil: What the remote has checked out doesn't matter
16:22 osse Except for the initial clone
16:24 ikelso joined #git
16:25 ikelso joined #git
16:26 d0nn1e joined #git
16:27 sagerdearia joined #git
16:28 ToBeCloud joined #git
16:28 synchronous joined #git
16:29 e14 joined #git
16:32 GavinMagnus joined #git
16:32 tmsmith joined #git
16:34 diogenese joined #git
16:35 GavinMagnus left #git
16:38 zacts joined #git
16:38 matsaman joined #git
16:38 e14 joined #git
16:40 Lyqyd joined #git
16:40 gazm1 joined #git
16:42 e14 joined #git
16:48 bronson joined #git
16:51 rwb joined #git
16:52 jccn joined #git
16:53 vuoto joined #git
16:53 synchronous joined #git
16:55 vuoto_ joined #git
16:56 dave0x6d joined #git
16:57 al-damiri joined #git
16:58 Ender13 joined #git
16:59 Darren_ joined #git
17:00 joki joined #git
17:00 madewokherd joined #git
17:06 cagedwisdom joined #git
17:07 tang^ joined #git
17:08 ki0 joined #git
17:11 howitdo joined #git
17:12 jason237 joined #git
17:13 WayToDoor joined #git
17:14 rossome joined #git
17:16 howitdo joined #git
17:19 re1 joined #git
17:23 fission6 joined #git
17:26 algun joined #git
17:26 PHPanos joined #git
17:27 robotroll joined #git
17:29 denisMone joined #git
17:31 gigq joined #git
17:32 Gloomy joined #git
17:35 imachuchu joined #git
17:41 tobiasvl I guess it can matter for some other things though. like if you try to merge with just the remote's name, then it merges with refs/remotes/$remote/HEAD, doesn't it?
17:41 tobiasvl not that it matters here, just out of curiousity
17:44 nettoweb joined #git
17:44 MrLawrence joined #git
17:47 fuchsi joined #git
17:49 jottr joined #git
17:50 bronson joined #git
17:51 Es0teric joined #git
17:52 svm_invictvs joined #git
17:52 jottr joined #git
17:55 b1tchcakes joined #git
17:58 cagedwisdom joined #git
17:58 hamster joined #git
18:00 srcerer joined #git
18:01 gigq joined #git
18:04 ochorocho__ joined #git
18:04 duderonomy joined #git
18:05 srcerer joined #git
18:06 CheckDavid joined #git
18:07 jccn joined #git
18:08 ignarps joined #git
18:08 albel727 joined #git
18:12 Es0teric joined #git
18:12 aw1 joined #git
18:14 justanotheruser joined #git
18:17 mustmodify joined #git
18:17 fission6 joined #git
18:20 mustmodify Can someone explain rebase to me? The explanations on the web assume a PhD in git.
18:21 NeverDie joined #git
18:22 selckin you have a split in history A-B-X and A-B-Y for example, and you want to go to linear history, A-B-X-Y or A-B-Y-X
18:22 mustmodify how is that different form merge?
18:23 selckin can't fit that one line, merge is joiing the split with an extra commit M , A-B-X-M-Y-B-A (overlap A/B in your mind)
18:25 todd_dsm joined #git
18:25 mustmodify oh.
18:26 mustmodify because the base of the commit is shifting.
18:26 mustmodify rebase.
18:27 selckin !cs
18:27 gitinfo "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup
18:27 selckin maybe that can help
18:27 mustmodify directed acyclic graphs! I really enjoyed CS 230 or ... I think it was 230... the one with all the graphs.
18:28 mustmodify It appealed to the purist in me. Not that I actually use that in real life, but it was fun. :)
18:29 Cavallari joined #git
18:29 [log] joined #git
18:30 zzz_ joined #git
18:30 asgh joined #git
18:31 Random832 selckin, mustmodify, a picture is worth 1000 words: http://imgur.com/2AAtRJQ
18:31 selckin man git-rebase
18:31 gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html
18:31 selckin full of pictures too
18:32 kevleyski joined #git
18:32 joshszep joined #git
18:32 Random832 i don't like manpage diagrams since they go left to right instead of bottom to top for some reason
18:34 jottr joined #git
18:35 zzz_ joined #git
18:36 fragMental joined #git
18:36 zzz joined #git
18:36 nivag joined #git
18:37 loxs joined #git
18:38 loxs does `clone` do something special to my local repository? How does it differ from a repo that I originally developed locally and then pushed somewhere?
18:38 idlemind joined #git
18:39 selckin clone is how create a local repo based on a remote one
18:40 azerus joined #git
18:40 loxs I know that. What I don't know is whether it does something special with the `remotes` configuration of the local repo
18:40 selckin no
18:40 selckin its just git init; git remote add origin url; git fetch origin; checkout branch
18:41 nettoweb joined #git
18:41 loxs the reason I'm asking is because when I see all branches using gitk (including remotes), my origin/master never updates after I push or pull
18:41 loxs it stays on the first revision
18:41 selckin !non-bare
18:41 gitinfo [!bare] A bare repository is used to push/fetch (useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/
18:42 selckin !deploy
18:42 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
18:42 selckin !xy
18:42 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...
18:42 loxs selckin, my remote is bare
18:43 tobiasvl loxs: how do you push and pull when you don't see origin/master update?
18:43 loxs git pull and git push
18:44 loxs (with no arguments)
18:44 regedit joined #git
18:47 t0by joined #git
18:49 bronson joined #git
18:50 boombatower joined #git
18:51 GunArm joined #git
18:52 davimore__ joined #git
18:52 GunArm is it possible to see a history of which branches you had checked out in the past?
18:54 GunArm trying to google about it but the results are flooded out with stuff about "git log" which afaik is more about commit histories on a branch than checkout history
18:56 asgh joined #git
18:58 tobiasvl GunArm: yeah, "git log" is wrong. you want "git reflog"
18:58 tobiasvl it will show you what HEAD has been
18:58 GunArm awesome! thanks
18:58 tobiasvl !reflog
18:58 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
18:59 ikelso joined #git
19:00 tobiasvl GunArm: so it doesn't go back forever, and although it says 2+ weeks, the default is 30 days I think
19:00 tobiasvl or is 30 days just when gc collects dangling commits perhaps...
19:02 GunArm right, I could see that being reasonable
19:02 GunArm but this is what I needed
19:02 jeffreylevesque joined #git
19:03 rwb joined #git
19:14 cyan__ joined #git
19:14 publio joined #git
19:15 duderonomy joined #git
19:15 ki0 joined #git
19:16 ok91 joined #git
19:17 Balliad joined #git
19:18 donught joined #git
19:18 donught joined #git
19:20 mustmodify left #git
19:21 hahuang61 joined #git
19:22 f3r70rr35f joined #git
19:28 shgysk8zer0_ joined #git
19:29 ok92 joined #git
19:29 Sasazuka joined #git
19:29 watabou joined #git
19:30 ych joined #git
19:30 ikelso joined #git
19:32 WayToDoor joined #git
19:32 zzz joined #git
19:33 satifant joined #git
19:34 ok92 joined #git
19:34 ignarps joined #git
19:35 [log] joined #git
19:35 Lyqyd joined #git
19:35 morenoh149 joined #git
19:36 Atm0spher1c joined #git
19:37 tyreld joined #git
19:39 DocMAX joined #git
19:39 DocMAX "please comit or stash you changes before you merge" <--- how can i get rid of this message? (git commands please)
19:40 fahadash joined #git
19:40 joki- joined #git
19:42 tobiasvl DocMAX: either "git commmit" or "git stash"
19:42 tobiasvl commit*
19:43 tobiasvl possibly "git add" the relevant files before "git commit"
19:45 DocMAX i didnt change any files
19:45 DocMAX google says git reset --hard does help
19:45 DocMAX but it doesnt
19:45 tobiasvl DocMAX: "git status" will tell you what files you changed
19:46 cdg joined #git
19:46 b1tchcakes joined #git
19:46 DocMAX oh yes 1 file
19:46 DocMAX thx!!
19:46 dsantiago joined #git
19:47 tobiasvl you can run "git reset --hard HEAD" (you probably didn't have the "HEAD" part, ie. the rev you wanted to reset to), but it's dangerous and will erase the changes you made to that file forever. better to just run "git stash", that way the changes are removed but stored somewhere else for backup
19:47 WayToDoor joined #git
19:47 DocMAX i deleted that 1 file
19:47 cdown joined #git
19:47 DocMAX still have that message
19:48 tobiasvl yeah, deleting a file is also a change... so you just replaced your local change with another
19:48 tobiasvl now you should run "git reset --hard HEAD" or "git checkout HEAD -- filename" or something
19:48 DocMAX how can i RESET everything?
19:48 tobiasvl git reset --hard HEAD
19:49 tobiasvl like I said that's a dangerous operation, so you should know what it does: it resets everything to HEAD, which is the commit you have currently checked out, and --hard means it should ignore the fact that you have local changes when resetting
19:49 tobiasvl DocMAX: may I also suggest you read a git !book or something to gain some understanding of the basics
19:49 gitinfo DocMAX: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
19:50 bronson joined #git
19:56 kadoban joined #git
19:59 Salander27_ joined #git
20:02 duderonomy joined #git
20:02 ochorocho__ joined #git
20:03 thiago_ joined #git
20:04 RobertPlummer joined #git
20:05 RobertPlummer How does one `git log -pretty` but include the diff of what was committed?
20:05 RobertPlummer I consulted the documentation, and could not find a param for that specific use case.
20:05 moritz RobertPlummer: -p
20:07 RobertPlummer Is there a way to have it as part of the pretty? like: `git log --pretty='"%B","%-p"\n'`
20:07 RobertPlummer ty moritz!
20:07 Schrostfutz joined #git
20:08 Cassiopaya joined #git
20:08 moritz RobertPlummer: sounds like you really want an alias
20:09 RobertPlummer I want to output all the message and diff as a csv.
20:09 RobertPlummer nothing more, nothing less.
20:09 RobertPlummer Does that qualify as an alias?
20:10 moritz dunno
20:10 moritz aliases are for saving you typing
20:10 moritz if it's part of an automation, that's typically not an issue
20:11 moritz if not, I'd be interested to learn why you need CSV -)
20:11 IlNominePatre joined #git
20:11 RobertPlummer I cannot fully say, but... https://github.com/harthur-org/brain.js
20:11 * RobertPlummer wiggles eyebrows
20:12 moritz so you want to teach a neuronal network how to write commits for you, automating yourself out of business? :-)
20:13 RobertPlummer lol
20:14 RobertPlummer That, interesting as it may sound, is not what my goal is.
20:16 denisMone joined #git
20:16 shams joined #git
20:16 RobertPlummer I just figured I was missing something, not a big problem, I can find a way.  ty ty moritz!
20:18 Salander27 joined #git
20:21 yibo joined #git
20:21 Salander27Temp left #git
20:23 Oatmeal joined #git
20:23 cdg_ joined #git
20:25 gtristan joined #git
20:25 APNG left #git
20:25 NeverDie_ joined #git
20:25 APNG joined #git
20:25 APNG when should .git/exclude be used over .gitignore?
20:26 APNG Arch User Repository?
20:27 moritz APNG: .git/exclude if the excludes are specific to your setup; .gitgnore if everybody working with the repo needs them
20:29 rvsjoen joined #git
20:29 rvsjoen joined #git
20:29 guest_ joined #git
20:30 ixxie speaking of .gitignore, is there a nice way to locally track certain files but not commit them to origin?
20:30 olvas joined #git
20:30 guest__ joined #git
20:33 tyreld joined #git
20:36 kyan joined #git
20:37 olvas left #git
20:42 _ikke_ ixxie: .git/info/exlcude
20:42 _ikke_ exclude
20:42 _ikke_ Euhm, sorry
20:42 _ikke_ ixxie: No, what you want is not possible
20:43 hanthings joined #git
20:44 holodoc joined #git
20:45 cdg joined #git
20:45 xaa joined #git
20:45 Hello71 git doesn't work that way
20:45 jnavila joined #git
20:45 Hello71 VCSs don't work that way
20:46 kadoban ixxie: !config is probably info that might help, but no that's not possible.
20:46 gitinfo ixxie: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
20:48 ok91 joined #git
20:48 siddart joined #git
20:50 ixxie I guess its not that important to track one or two files used by one person
20:51 bronson joined #git
20:51 cdg joined #git
20:52 dsdeiz joined #git
20:58 robotroll joined #git
21:01 ochorocho__ joined #git
21:01 jstimm joined #git
21:02 aax joined #git
21:06 aidalgol joined #git
21:06 Achylles joined #git
21:06 cagedwisdom joined #git
21:08 trenorholx83 joined #git
21:10 Ender13 joined #git
21:12 howitdo joined #git
21:12 askb joined #git
21:13 shgysk8zer0_ left #git
21:14 eblake joined #git
21:14 eblake How do I go about debugging "error: unpack failed: unpack-objects abnormal exit" during a 'git push' attempt?
21:18 cdg joined #git
21:18 ThunderChicken joined #git
21:19 imachuchu eblake: no idea, but kneejerk is to run git fsck on both ends to make sure there isn't something really bad going on
21:19 eblake nothing wrong with 'git fsck' locally (just the usual dangling items); I don't have shell access on the remote machine
21:20 eblake remote machine is git.sv.gnu.org, I was able to push the same commit to repo.or.cz, so it may be a difference in server versions
21:20 eblake trying to repeat the steps on an absolutely clean clone, to prove it is not something local (and that I can indeed reproduce the problem)
21:21 cdg_ joined #git
21:22 Es0teric joined #git
21:22 duderonomy joined #git
21:23 isysd joined #git
21:23 trenorholx83 Hey, I have some references to submodules when I run 'ls-files --stage | grep 160000' but they don't exist anymore. How can I remove that reference? Thanks
21:24 matsaman joined #git
21:25 sbeller git update-index --force-remove submodule &&
21:25 sbeller git config -f .gitmodules --unset submodule.submodule.path &&
21:25 sbeller git config -f .gitmodules --unset submodule.submodule.url &&
21:25 sbeller git add .gitmodules &&
21:25 sbeller git commit -m "submodule deleted" &&
21:25 sbeller trenorholx83: ^
21:25 trenorholx83 sbeller: thank you :-)
21:27 mentazoom joined #git
21:28 nowhere_man joined #git
21:28 jagob joined #git
21:34 shgysk8zer0_ joined #git
21:38 eblake imachuchu: aha - figured it out: invalid push URL configuration on my end (error message is horrible) - I thought I had cloned correctly, but missed the push URL configuration
21:38 thebope joined #git
21:44 msonntag_ joined #git
21:46 tmsmith joined #git
21:49 eblake still, it would be interesting if there were a way to configure the server to give a nicer error message, as I can at least pass that config hint on to the server admins
21:51 Yaazkal joined #git
21:51 PaulePanter hi. How do I amend a subproject change?
21:51 PaulePanter http://paste.debian.net/905437/
21:51 bronson joined #git
21:52 newbie1 joined #git
21:52 hahuang61 joined #git
21:52 Yaazkal Hi, I have a "push" work in progress in a bash window and it will take a long time since is uploading about 2GBb of info using LFS. Can I start editing and commiting in another window or that is going to make any conflict?
21:53 neilthereildeil thiago_: u there?
21:55 watabou joined #git
21:57 neilthereildeil guys, im having a problem pulling from remote. since i last pulled, the remote created a new branch and i have created a few local tags and modified stuff that is gitignor'ed. for some reason im getting pull conflicts even though my latest local commit hash exists in the remote
21:58 bcc joined #git
21:58 bcc joined #git
21:58 llamapixel Yaazkal: From what I understand commiting is making another local commit until you push somewhere so it should be ok
21:58 Yaazkal llamapixel: that's what I tought, but i'm just nervous :)
21:58 Yaazkal llamapixel: thanks
21:58 llamapixel I understand ;)
21:59 diogenese joined #git
21:59 llamapixel Yaazkal: scroll down to the diagram http://blog.osteele.com/posts/2008/05/my-git-workflow/
22:00 Yaazkal llamapixel: oh thank you so much
22:00 llamapixel no worries
22:01 imachuchu eblake: glad to hear it wasn't something terrible
22:02 Tobbi joined #git
22:03 thebope joined #git
22:05 thiago_ neilthereildeil: yes
22:06 neilthereildeil thiago_: i just explained my problem from a few yours ago more clearly ^
22:06 ok91 joined #git
22:06 neilthereildeil i think you might have understood that i changed gitignore
22:06 thiago_ neilthereildeil: considering I don't remember what happened a few hours ago, sure
22:06 neilthereildeil lol
22:07 thiago_ neilthereildeil: anyway, did you modify tracked files? what does git status say (before pull)?
22:08 neilthereildeil i didnt modify anything thats tracked
22:08 neilthereildeil i have untracked files though
22:08 thiago_ neilthereildeil: ok, pastebin what git merge told you
22:08 Tobbi joined #git
22:09 Tobbi Is "git pull" and "git fetch <remote> && git rebase ..." the same?
22:09 Tobbi Oh my, there's a guy called rem_ote in here? :D
22:10 preaction don't worry about it. they picked the name, they can deal with the highlights :p
22:10 preaction there's someone named "as" on the network, for example
22:10 Tobbi :D
22:10 preaction and yes, provided you've set up auto-rebase. otherwise it's "git fetch <remote> && git merge <remote> <remote-branch>"
22:11 Tobbi Ah, okay, how do I check whether that's the case?
22:11 jeffreylevesque joined #git
22:12 thiago_ Tobbi: no. git pull --rebase is equivlent to taht
22:12 Tobbi thiago: Uhm, so what's the difference between git pull and git pull --rebase, then?
22:12 preaction git config branch.<branch-name>.rebase <- if that says "true", then rebase is the default
22:12 Tobbi I'll check.
22:13 Tobbi I guess I shouldn't worry about this.
22:13 jimi_ joined #git
22:14 Tobbi I use the fetch and rebase strategy most of the time
22:14 Tobbi This is how I learned it.
22:14 cdg joined #git
22:14 preaction i use the configured default of rebase because i'm super lazy
22:14 Tobbi Ah, so that's the default?
22:15 preaction no, that's what the configuration i showed does
22:15 Tobbi Ah, okay.
22:15 preaction you can add that configuration yourself
22:15 WayToDoor joined #git
22:15 preaction you can also make that the default for all new branches by doing autosetuprebase
22:15 Tobbi hmm, for some reason, it doesn't show anything when I enter git config branch.master.rebase
22:15 jagob joined #git
22:16 YuGiOhJCJ joined #git
22:16 preaction right, so it's false, which means it's not true
22:16 Tobbi :D
22:16 preaction if you want to make it true, you can do: git config branch.master.rebase true
22:16 Tobbi I just thought it'd pretty-print something like "false"
22:17 Tobbi Yeah, I might...
22:17 preaction nah. "" is just as false
22:17 Tobbi Thanks :)
22:17 preaction also, to make that the default for newly-created branches: git config -g branch.autosetuprebase always
22:17 Es0teric joined #git
22:17 preaction that makes that config (branch.<branchname>.rebase) always get set to true when creating new branches
22:19 imachuchu joined #git
22:20 neilthereildeil thiago: hmm im not having that error anymore
22:20 neilthereildeil thiago: since remote crated a new branch, i plan to do "git fetch origin other-branch"
22:21 neilthereildeil thiago: then ill do "git merge origin/other-branch"
22:23 neilthereildeil ok i ran get fetch an it looks like it suceeded
22:23 neilthereildeil but when i try to merge, it says its not something we can merge
22:24 neilthereildeil the fetch said * branch FETCH_HEAD
22:25 jagob joined #git
22:25 cdown joined #git
22:26 HoierM_ joined #git
22:27 thiago pastebin the terminal
22:28 snowkidind joined #git
22:31 neilthereildeil thiago: http://pastebin.com/SCfZbDey
22:31 neilthereildeil thiago: FYI git branch -a on my local repo only shows master
22:31 neilthereildeil also, i dont think any remotes are defined on my local repo
22:32 tyreld joined #git
22:32 thiago neilthereildeil: ok, you did a !pull4
22:32 gitinfo neilthereildeil: [!fetchfour] [pre 1.8.4 only] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).
22:32 thiago neilthereildeil: actually, no
22:33 thiago neilthereildeil: you fetched a branch from a URL. You never specified where to store it.
22:33 thiago neilthereildeil: that means origin/newBranch never got created. That's why you can't merge it. Git is right.
22:33 thiago what you downloaded is stored temporarily in FETCH_HEAD
22:34 Synthead joined #git
22:34 neilthereildeil since i never make local changes to my repo, the hashes all match. wouldnt it figure out which is the last common ancestor?
22:34 cdown joined #git
22:34 Es0teric joined #git
22:35 aviraldg joined #git
22:35 aviraldg joined #git
22:36 neilthereildeil thiago: also, how can i specify where to store it?
22:38 celebre joined #git
22:39 thiago neilthereildeil: git remote add -f remotename URL
22:39 thiago the remotename can be "origin"
22:39 thiago then use the remote name, not the URL
22:39 neilthereildeil what would the URL be in my case with ssh?
22:39 thiago the URL you want
22:40 moei joined #git
22:40 thiago your paste shows one, so you have one you want
22:40 neilthereildeil oaste shows ssh
22:40 dsdeiz joined #git
22:40 Tobbi joined #git
22:40 neilthereildeil so would URL be /home/user/dev/src/project or ssh://user@remoteMachine:23/home/user/dev/src/project?
22:42 thiago yes
22:42 cdg joined #git
22:42 neilthereildeil thiago: lol yes to which one? i gave 2 alternatives
22:42 anonymuse joined #git
22:43 LiMp^ joined #git
22:43 thiago whichever one works
22:44 thiago obviously the former is a local file path
22:44 thiago the latter is a remote URL via SSH
22:44 thiago since they're not at all the same, it's not an alternative
22:45 cdown joined #git
22:47 thebope joined #git
22:47 neilthereildeil thiago: nice, that worked. thanks
22:48 cdg joined #git
22:49 cdown joined #git
22:49 cagedwisdom joined #git
22:50 neilthereildeil thiago: if i had remote setup earlier, i could have just done git fetch?
22:50 thiago yes
22:51 overlord_tm joined #git
22:51 Vortex35 joined #git
22:51 cdown joined #git
22:52 neilthereildeil thiago: next time i wanna get new commits from remote (in all branches), how would i do it?
22:52 bronson joined #git
22:52 thiago git fetch
22:53 thiago it'll fetch the remote that the current branch tracks. In your case, that's "origin".
22:53 neilthereildeil how can i make it fetch into ALL local branches since my local tree is just mirroe remtoe commits?
22:53 neilthereildeil mirroring*
22:54 osse You can't
22:55 thiago write a script
22:55 osse https://github.com/Osse/git-scripts/blob/master/git-fflocals
22:56 osse I use this which works quite well. But I try to limit my local branch to the ones I need. There is no point in making one local branch per remote branch unless you plan to do something with it
22:57 neilthereildeil also, why does thiago recommend using git fetch rather than pull?
22:57 kexmex joined #git
22:58 matsaman less is more, probably
22:59 matsaman some people's workflows are complex enough it will matter more, and some people's are simple enough it might not ever matter
23:00 thiago pull = fetch + merge
23:01 fmeerkoetter joined #git
23:01 neilthereildeil thiago: also, if i do "git fetch origin/master && git pull origin/master", will remote/master and local/master both be updated?
23:02 thiago no
23:02 matsaman I will say, when combining things, I tend to favor my own shell wrapper, rather than use some built-in combination which might contain additional magic you don't want
23:02 thiago both commands will fail
23:02 thiago nothing will get updated
23:03 thiago git fetch origin ==> updates origin/*
23:03 neilthereildeil how can i make sure both refs are updated?
23:03 thiago git pull origin master ==> updates origin/* then merges origin/master into the current branch (which may or may not be the local master)
23:04 imachuchu joined #git
23:04 neilthereildeil so whichever local branch i wanna update, i have to switch to?
23:07 pasky joined #git
23:09 thiago yes
23:09 thiago unless it's a fast-forward
23:09 thiago in which case, you can run: git push . origin/branchname:branchname
23:10 robotroll joined #git
23:13 Sasazuka joined #git
23:13 thebope joined #git
23:16 rwb joined #git
23:16 jagob joined #git
23:18 Fhe joined #git
23:21 dsantiago joined #git
23:22 jagob joined #git
23:24 celebre joined #git
23:27 jagob joined #git
23:29 Vortex34 joined #git
23:30 khagler joined #git
23:33 celebre joined #git
23:36 ikelso joined #git
23:37 ikelso_ joined #git
23:38 kulelu88 joined #git
23:39 ikelso joined #git
23:40 Hathadar joined #git
23:41 Hathadar I am a little confused about when to use a ssh key for use with github.  Should having one setup on my linux box enable me to push to my repo on github without needing a username/password?
23:41 preaction yes
23:41 preaction well, unless your ssh key requires a local passphrase, but that's on you not github
23:42 anonymuse joined #git
23:43 Hathadar How would I configure git to enable me to push and use my key?
23:43 preaction you've already got your public key in your github profile?
23:43 Hathadar yes
23:43 neilthereildeil left #git
23:44 preaction then you have to tell git to use "ssh" as the "remote": git remote origin set-url ssh://git@github.com/<user>/<repo>
23:44 Hathadar ok, thanks
23:50 jeffreylevesque joined #git
23:51 masuberu joined #git
23:51 canton7 (btw, in that example, <user> will be a path relative to the root of the filesystem. It's more normal to use scp-style ssh urls - e.g. 'git@github.com:user/repo', which will look in the right place. If you *need* to use a non-scp style url, e.g. if you need to specify the port, you'll normally need something like ssh://git@example.com:port/~/user/repo.git)
23:52 canton7 (see "git urls" in man git clone for more details)
23:52 gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html
23:53 bronson joined #git
23:54 cagedwisdom joined #git
23:55 buffal0 joined #git
23:59 Schrostfutz joined #git

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