Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-06

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

All times shown according to UTC.

Time Nick Message
00:02 pcfreak30 joined #git
00:03 HoierM joined #git
00:04 tesuji_ joined #git
00:04 qpdb joined #git
00:06 zg joined #git
00:07 zg Is there a way to see the person who added a line to a file
00:07 mkopriva joined #git
00:07 zg If I look at git blame, it'll show me who changed the line, but it won't show me who actually wrote a specific word on that line
00:08 zg So if a line contains "foo" written by Alice, then Bob changes that to "foobar", it'll blame Bob for changing that line, but Alice was the one who wrote "foo" originally
00:09 preaction zg: perhaps this? http://stackoverflow.com/questions/14142609/git-discover-which-commits-ever-touched-a-range-of-lines
00:09 lindenle joined #git
00:10 Lipp joined #git
00:10 rolha joined #git
00:14 raijin joined #git
00:16 zg preaction: Thank you :-)
00:20 ToBeFree joined #git
00:23 rkazak joined #git
00:23 cdg joined #git
00:23 zg Anyone know how the line number link hashtags are generated in GitHub?
00:24 zg I'm seeing #diff-<md5>L<line number>
00:24 zg But I haven't got a clue what that is an MD5 checksum of
00:24 hahuang61 joined #git
00:27 azerus joined #git
00:28 fstd_ joined #git
00:29 zg left #git
00:32 jstimm joined #git
00:32 romerocesar joined #git
00:33 arescorpio joined #git
00:33 qasaur joined #git
00:34 zg joined #git
00:35 GodGinrai joined #git
00:42 EvilPenguin joined #git
00:43 stantonk joined #git
00:43 lindenle joined #git
00:46 Lipp joined #git
00:47 fii joined #git
00:48 ahr3n joined #git
00:50 allcentury joined #git
00:50 NeverDie joined #git
00:50 mellernoia joined #git
00:51 ohcibi joined #git
00:52 chitopunk joined #git
00:52 chitopunk joined #git
00:53 roflin joined #git
00:53 durham_ joined #git
00:53 MacGyver joined #git
00:53 NeverDie joined #git
00:53 shgysk8zer0 joined #git
00:54 Nothing4You joined #git
00:56 sangy joined #git
01:02 tesuji joined #git
01:02 chigang_ joined #git
01:02 The_Woodsman joined #git
01:04 The_Woodsman when I was working on a branch, I did a git pull --rebase from master. that placed a bunch of commits in my history, and I'd like to get rid of them now. I thought I could use git rebase --onto <branch_name>~<first_commit_hash_to_remove> <branch_name>~<first_commit_hash_to_keep> <branchname> but I'm being told fatal: needed a single revision. invalid upstream (then my branch / commit)
01:04 ekinmur joined #git
01:04 The_Woodsman anyone have any ideas as to how i can get rid of a bunch of commits from a branch quickly?
01:04 pur3eval joined #git
01:04 Gsham joined #git
01:04 NoHoFoo joined #git
01:06 ReginaldFop joined #git
01:07 zacts joined #git
01:07 stantonk joined #git
01:07 pioiytr joined #git
01:08 ochorocho__ joined #git
01:09 tarkus joined #git
01:10 relipse joined #git
01:11 ag4ve joined #git
01:16 cqi joined #git
01:16 ekinmur joined #git
01:17 lindenle joined #git
01:18 mwhooker joined #git
01:19 chitopunk joined #git
01:22 ascarter joined #git
01:23 romerocesar joined #git
01:23 Lipp joined #git
01:25 BombStrike joined #git
01:25 azerus joined #git
01:26 7JTAA93HP joined #git
01:26 7YUABIFAH joined #git
01:28 rominronin joined #git
01:28 Orbitrix joined #git
01:28 Rodya_ joined #git
01:28 pks joined #git
01:32 liquidjamm joined #git
01:40 liuzhen joined #git
01:46 HoierM joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and self-reflection | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Fork by yourself, shame on you. Fork with a friend, now we're getting somewhere.
01:51 lolmac joined #git
01:54 elisa87 joined #git
01:56 stantonk joined #git
01:56 a_thakur joined #git
01:56 elisa87 hey I need to create a branch out of https://github.com/Yashg19/VidyaMap I am using GitHub gui for windows. I am an authorized user for making changes to this repo but I don't know where to start. How can I create a GUI using the Windows GUI? It has the options Add, Create and Clone and none of them accepts a URL.
01:57 Aces_Charles joined #git
01:59 a_thakur joined #git
02:00 xaviergmail joined #git
02:01 drbean joined #git
02:01 orbitphreak joined #git
02:01 elisa87 do you know why I am receiving these errors ? http://pastebin.com/dQpDEtHf
02:02 Lipp joined #git
02:03 shgysk8zer0 joined #git
02:03 romerocesar joined #git
02:04 allcentury joined #git
02:05 elisa87 left #git
02:05 pur3eval joined #git
02:07 Electrometro joined #git
02:08 cyan__ joined #git
02:09 rubyonrailed joined #git
02:09 justanotheruser joined #git
02:10 chachasmooth joined #git
02:13 EgS joined #git
02:14 Goplat joined #git
02:16 mwhooker joined #git
02:20 jchonig_ left #git
02:21 jchonig joined #git
02:21 jchonig left #git
02:21 Literphor joined #git
02:23 dreiss joined #git
02:25 hahuang61 joined #git
02:25 boombatower_ joined #git
02:25 hexagoxel joined #git
02:29 tlolczyk I've made a bunch of changes to a project. Then I realize that I should have made a new branch before I made the changes. Is there a way to fix that? Maybe a web site which shows how to do that?
02:36 preaction tlolczyk: if you haven't commited, just git checkout -b new-branch-name. if you have, git checkout -b new-branch-name; git checkout previous-branch; git reset --hard origin/previous-branch (make a new branch with your current changes, then go back to the previous branch and remove the changes)
02:38 stantonk joined #git
02:39 Lipp joined #git
02:40 boombatower joined #git
02:43 tlolczyk Thanks
02:44 NeverDie joined #git
02:46 ahr3n joined #git
02:47 sarbs joined #git
02:49 mkopriva joined #git
02:55 Gsham joined #git
02:56 ag4ve joined #git
02:58 Sazhen86 joined #git
02:58 zumba_addict joined #git
03:01 texinwien joined #git
03:03 realz__ joined #git
03:03 Reda joined #git
03:03 zacts joined #git
03:08 fracting joined #git
03:08 runtime_error joined #git
03:09 ochorocho__ joined #git
03:11 dopesong joined #git
03:12 Orbitrix joined #git
03:12 Orbitrix joined #git
03:13 dreiss joined #git
03:20 lindenle joined #git
03:23 azerus joined #git
03:27 jaguarmagenta joined #git
03:27 SimonNa joined #git
03:29 rominronin joined #git
03:34 romerocesar joined #git
03:35 dreiss joined #git
03:38 frogonwheels_ joined #git
03:41 monokrome joined #git
03:44 mkopriva joined #git
03:48 Zeta611 joined #git
03:51 SwiftMatt joined #git
03:51 arooni joined #git
03:52 digidog_ joined #git
03:52 Literphor joined #git
03:53 ahr3n joined #git
03:53 nilg joined #git
03:54 phanimahesh joined #git
03:56 dreiss joined #git
03:58 robotroll joined #git
03:58 orbitphreak joined #git
04:01 watabou joined #git
04:02 chrisshattuck joined #git
04:05 muthu joined #git
04:05 pdgwien joined #git
04:06 ag4ve_ joined #git
04:11 jaguarmagenta joined #git
04:11 rscata joined #git
04:14 dreiss joined #git
04:16 durham joined #git
04:18 hk238 joined #git
04:25 arooni joined #git
04:25 hahuang61 joined #git
04:27 zumba_addict joined #git
04:29 leeN joined #git
04:29 Zamerick joined #git
04:30 oich joined #git
04:33 xcesariox joined #git
04:40 snowkidind joined #git
04:40 romerocesar joined #git
04:43 nb-ben joined #git
04:44 arooni joined #git
04:51 freimatz joined #git
04:52 Cabanossi joined #git
04:52 xaviergmail joined #git
04:54 JanC joined #git
04:55 arooni joined #git
04:57 dreiss joined #git
04:59 leeN joined #git
04:59 freimatz joined #git
04:59 quetz joined #git
05:00 Zamerick joined #git
05:02 stantonk joined #git
05:04 arooni joined #git
05:06 romerocesar joined #git
05:06 Literphor joined #git
05:08 jon-mac joined #git
05:08 mmlb joined #git
05:10 codebam hey, so if I want to see commits that I hard revert and force pushed. where would I find them on github?
05:11 ochorocho__ joined #git
05:15 arooni joined #git
05:17 _ikke_ hard revert?
05:17 bket joined #git
05:17 _ikke_ git/github do not track what commits have been rewritten
05:18 codebam oh okay, I thought github held copies of hard resets.
05:19 energizer joined #git
05:19 _ikke_ the objects for the old commits are still in the repository, just not referencable anymore
05:20 codebam oh okay
05:20 jungsubk joined #git
05:23 ahr3n joined #git
05:25 arooni joined #git
05:26 mehola joined #git
05:26 ahr3n joined #git
05:27 fscala joined #git
05:28 dingus joined #git
05:29 circ-user-2lJvp joined #git
05:30 rominronin joined #git
05:30 mehola joined #git
05:31 jfran joined #git
05:31 zacts joined #git
05:35 preaction codebam: !reflog
05:35 gitinfo codebam: 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`
05:35 arooni joined #git
05:35 codebam preaction: it wasnt working when I cloned the repo
05:36 preaction it's not magic, and its not part of a new clone
05:36 preaction only the repo you force-pushed from will likely have it
05:37 ThomasLocke joined #git
05:37 hahuang61 joined #git
05:37 codebam oh okay
05:39 Isla_de_Muerte joined #git
05:39 tehtraveler2321 joined #git
05:43 mariuscc joined #git
05:45 phaleth joined #git
05:45 Lipp joined #git
05:45 arooni joined #git
05:47 Twirl joined #git
05:47 Alger joined #git
05:48 Repox joined #git
05:49 Alienpruts joined #git
05:49 Twirl If I git branch x, then git checkout x, then work on my project, change files delete create etc, how can I take the code back to where I left it in the previous branch?
05:49 Twirl as in, update the files, restore them delete them w/e ?
05:49 preaction Twirl: you want to check out the previous branch? or you want to delete all the work you've done?
05:50 preaction you could just delete the branch
05:50 Twirl No i just want to have two versions of my project I don't want to delete anything
05:50 Twirl one has some features and the other has others
05:50 preaction the git checkout the other branch
05:50 preaction also, two versions of a project is usually a bad idea
05:50 Twirl that updates the files to where I left it in the previous branch?
05:50 preaction try it and see
05:51 Twirl isn't that what all the github projects do?
05:51 Twirl Master, 1.x 3.x w/e ?
05:51 jungsubk joined #git
05:51 preaction why do you want two versions of your project with different features?
05:51 Twirl i can think of too many reasons and answers for that question
05:51 preaction why are _you_ doing it _right now_?
05:52 Twirl I'm doing what everyone else is doing
05:52 preaction then don't branch. if you don't have a reason to branch, don't branch
05:52 Twirl you have a project and 0.x is table, 1.x has different and more features
05:52 Twirl some features have been removed
05:52 Twirl the code has been refactored and so on
05:53 preaction the "1.x", "2.x", "3.x" branches are "release branches". they allow you to bugfix release versions while you work on developing the next version. usually those branches end when you stop supporting the release version
05:53 Twirl and you also have a different branch that fixes an inssue of a particular feature in version 3.x on some systems
05:53 preaction no. you generally don't make branches for every single platform you support
05:53 Twirl idk if those are supposed to be branches but i guess so
05:54 Twirl that's not git related
05:54 Twirl what i do with my software is not relevant
05:54 preaction those are handled by whatever platform-compatibility model your programming language supports
05:54 Twirl also it's what everyone does
05:54 Twirl as in, millions of developers
05:54 preaction do you want to learn best practices or not? because it sounds like you've got some terrible ideas of why people use branches
05:54 preaction see also: cargo culting
05:55 Twirl no I dont want to learn your mental model of software development, I'm asking about git
05:55 arooni joined #git
05:55 preaction i use branches for WIP features, and i've used branches for stable releases. i don't have the time to maintain multiple unending concurrent versions of my projects, so i don't
05:56 preaction and to switch branches in git, you use git checkout <branch>, like you did above with branch "x"
05:56 Twirl does that restore all the code to where I left it before checking out to the other branch?
05:56 preaction !tias
05:56 gitinfo 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.
05:56 acetakwas joined #git
05:57 jikz joined #git
05:57 rominronin joined #git
05:58 Twirl oh yea it works
05:58 Twirl ty
05:59 acetakwas joined #git
05:59 jikz joined #git
05:59 zeroed joined #git
05:59 zeroed joined #git
06:00 jikz joined #git
06:01 jikz joined #git
06:02 energizer Hello! I've been struggling with a problem for a while.
06:02 Macaveli joined #git
06:03 energizer I have .git in /usr/scripts, and in /usr/scripts/builddb/python, there are two directories of interest: build and buildWithSessionField
06:03 energizer they mostly have files of the same name as each other
06:03 energizer all same permissions, everything
06:04 energizer but when i run git add -An, from /usr/scripts, it only says it will add files from buildWithSessionField, not from build
06:08 qt-x joined #git
06:08 romerocesar joined #git
06:11 cyan__ joined #git
06:13 dopesong joined #git
06:14 freimatz joined #git
06:14 EvilPenguin joined #git
06:16 Seveas energizer: so build is either ignored, empty, or already completely added
06:16 akushner joined #git
06:17 subhojit777 joined #git
06:17 zacts joined #git
06:18 energizer git add -An bulddb/python/ http://paste.ubuntu.com/18606910/
06:18 energizer Seveas:
06:18 energizer cat .gitignore
06:19 energizer http://paste.ubuntu.com/18606921/
06:19 energizer git status
06:19 energizer http://paste.ubuntu.com/18606996/
06:19 sarbs joined #git
06:19 energizer ls -lR builddb/python
06:19 energizer http://paste.ubuntu.com/18606923/
06:20 Seveas that's builddb, bot build
06:20 Seveas s/bot/not/
06:20 Seveas you can't add files from builddb/python to the /usr/scripts repo, as it's its own repo.
06:22 PCatinean joined #git
06:22 energizer Seveas: what makes you say builddb/python is its own repo
06:22 Seveas [08:03] <   energizer> | I have .git in /usr/scripts, and in /usr/scripts/builddb/python, there are two directories of interest: build and buildWithSessionField
06:23 Seveas so /usr/scripts is a repo and /usr/scripts/builddb/python is a separate repo
06:23 Seveas and git won't add files from an inner repo to an outer repo
06:24 energizer Seveas: wow, i just ls -lA /usr/scripts/builddb/python/build, and indeed it does have .git in it. tho i actually still don't understand how you knew that
06:25 arooni joined #git
06:25 Seveas energizer: because you said so...
06:26 pur3eval joined #git
06:26 energizer Seveas: oh actually in that quote, the commas suggest i have .git in /usr/scripts and also in each of the two other folders i mentioned, but i actually didn't mean that
06:26 energizer i meant those to be two separate statements
06:27 Seveas punctuation: it matters :)
06:27 energizer but it actually was true - i did have .git there!
06:27 energizer shoulda used a semicolon
06:27 Seveas lucky commas :)
06:27 rubyonrailed joined #git
06:27 energizer thats honestly amazing
06:28 energizer so all i need to do now is trash the inner .gits and it'll work?
06:28 Seveas depends on whether you care about the historical contents of the inner repo
06:28 Seveas trashing the inner .git will for sure make your git add work, but will lose that history
06:29 energizer i don't mind losing that in this case
06:30 energizer is it possible to merge the inner one into the outer one's history?
06:30 Seveas it is, with a subtree merge
06:31 Seveas in short: move the inner repo somewhere else, add it as remote, fetch, merge -S subtree
06:32 clemf joined #git
06:32 energizer Seveas: sweet. reading the subtree docs now
06:32 aidalgol joined #git
06:33 Seveas it's not git subtree that you need
06:33 Seveas you need man git-merge
06:33 gitinfo the git-merge manpage is available at http://jk.gs/git-merge.html
06:34 KnightsOfNi joined #git
06:34 Seveas and it's actually -Xsubtree=builddb/python/build that you need
06:34 arooni joined #git
06:34 UTAN_dev joined #git
06:34 Seveas (I should add that I've never done this myself, so you may need to experiment a bit to find the correct incantation)
06:35 tvw joined #git
06:35 Sceorem joined #git
06:35 energizer Seveas: ok i'll do my homework with it
06:35 energizer thanks for the lifeline
06:37 a_thakur joined #git
06:39 joko joined #git
06:39 Neobenedict_ joined #git
06:39 davidbz joined #git
06:39 Ordentlig joined #git
06:40 dreiss joined #git
06:40 Alienpruts joined #git
06:40 Ordentli2 joined #git
06:43 Impaloo joined #git
06:43 vuoto joined #git
06:43 MrMojito joined #git
06:43 settermjd joined #git
06:44 ramsub07 joined #git
06:44 arooni joined #git
06:45 MrMojito joined #git
06:47 fracting joined #git
06:50 a_thakur_ joined #git
06:51 ahr3n joined #git
06:53 _ng joined #git
06:54 KnightsOfNi joined #git
06:55 arooni joined #git
06:55 albel727 joined #git
06:55 a_thakur joined #git
06:57 englishstudent joined #git
06:57 ramsub08 joined #git
06:58 boombatower joined #git
06:59 Brain joined #git
07:00 martinkl_ joined #git
07:01 TomyWork joined #git
07:01 a_thakur joined #git
07:04 a_thakur_ joined #git
07:04 aidalgol joined #git
07:04 GavinMagnus joined #git
07:04 texinwien joined #git
07:04 mkopriva joined #git
07:05 arooni joined #git
07:05 cdown joined #git
07:06 trudko joined #git
07:07 moriko joined #git
07:07 Lipp joined #git
07:07 trudko Hi, I've run git pull while having one local commit , I've got one file as unmerged, but then I want run git mergetool I get messing no files need merginand when I run git diff I got this http://pastebin.com/FVjn1KVj
07:08 romerocesar joined #git
07:08 trudko why is git showing me one file under Unmerged paths when there is no conflict?
07:08 Hounddog joined #git
07:09 djb-irc joined #git
07:12 lordjancso joined #git
07:12 ochorocho__ joined #git
07:14 Bizkit joined #git
07:14 arooni joined #git
07:15 zg left #git
07:16 tobiasvl trudko: looks like a conflict to me, one line has a space before the { and the other does not
07:16 tobiasvl etc
07:18 GavinMagnus joined #git
07:20 Lvjasha joined #git
07:21 trudko tobiasvl: why does git merge tool says that there are no conflicts?
07:21 tobiasvl !repro
07:21 gitinfo [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
07:21 dreiss joined #git
07:22 mariuscc joined #git
07:24 djb-irc joined #git
07:24 jast canton7: not sure it's really worth it... additionally if I try to keep the state synced, any desync means people can't voice themselves
07:24 arooni joined #git
07:25 canton7 I was imagining a quick check between someone asking to be voiced, and gitinfo voicing them. I guess it would only have been useful once ever though :P
07:27 johnny56 joined #git
07:27 Balliad joined #git
07:27 flobin joined #git
07:29 fracting joined #git
07:30 quenode joined #git
07:31 SimonNa joined #git
07:35 arooni joined #git
07:35 demiro joined #git
07:35 Rish joined #git
07:36 esc joined #git
07:40 nitin_ joined #git
07:42 nnyk_ joined #git
07:43 romerocesar_ joined #git
07:44 demiro joined #git
07:45 arooni joined #git
07:45 rubyonrailed joined #git
07:45 Curly060 joined #git
07:47 steveccc joined #git
07:47 steveccc hi all - i am totally new to git but I have one fundamental question - if two people edit a file at the same time - say a css file - can git merge the two files so that both persons changes are interleaved?
07:48 _ikke_ yes, as long as the changes don't happen on the same line(s)
07:48 flobin depends
07:48 flobin if they edit the same class, for instance, and one of them changes the background color and one removes it entirely
07:49 flobin then there's a conflict
07:49 multi_io joined #git
07:49 _ikke_ yes, editing the same lines
07:49 _ikke_ git merge / diff algorithm is line based
07:49 marcogmonteiro joined #git
07:50 fees joined #git
07:50 steveccc ok thanks - I have never had a need for git working on my own (although i know thats probably a discussion point on its own). However now I am working with another developer, we are sometimes overwriting each others changes so i needed a solution and git came to mind
07:50 kurkale6ka joined #git
07:51 _ikke_ Git will let you know when conflicts happen, so that you can decide how to solve them
07:51 janr joined #git
07:51 steveccc ok thanks - I have a few more questions but they are more fundamental so I will go and have a read up on it first to save annoying you all - thanks for your help
07:52 _ikke_ no problem
07:52 _ikke_ !books for some good articles with different ways of explaining things
07:52 gitinfo [!book] 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
07:52 Curly060 Hi! Lets say I have a branch develop and master. develop=latest development,master=last release. Now I want to make a hotfix, so I create a branch off master, fix the bug and merge it back to master. Now I also need to merge it into develop. Which is the best way to do this? Rebase hotfix branch onto develop and merge the result? git fetch origin develop, merge FETCH_HEAD into hotfix branch and merge the result? Just merge the hotfi
07:52 _ikke_ just merge the hotfix is what I usually do
07:53 Fijit joined #git
07:53 _ikke_ Rebasing is not recommended
07:53 _ikke_ This will create duplicate commits
07:53 steveccc _ikke_: thanks for the book suggestion - should i be worried its 2014 - will much have changed?
07:53 _ikke_ steveccc: No, the basic concepts are still the same
07:54 Curly060 _ikke_: why not? because it actually creates a new commit from my change? ah you just wrote it
07:54 arooni joined #git
07:54 steveccc what editors do you all recommend that can support git and provide good editing environment for web projects - php, html, css, js etc
07:54 Curly060 _ikke_ just merge it back is ok, if there are no conflicts. what if there are conflicts?
07:55 _ikke_ hotfixes tend to be small, I would just fix the conflicts in the merge commit (and if substantial, mention it in the message)
07:56 _ikke_ steveccc: imo, using a separate GUI / CLI for git usually works better
07:56 Curly060 ok, thanks!
07:56 _ikke_ steveccc: git integration can be helpfull for some operations, but I would not rely on it
07:56 flobin steveccc I like atom as an editor, other suggestions are often sublime text, gedit, phpstorm, notepad++
07:57 flobin I know atom and sublime text have git plugins
07:57 flobin but yeah just use the command line really
07:57 steveccc flobin: thanks - yes sublime looks very good - I have coda currently but think sublime would be better
07:57 steveccc flobin: i would use commandline but my colleague is a designer / css dev so I think a smoother gui would be better even though its probably not as good
07:57 Softeisbieger joined #git
07:58 Lipp joined #git
07:58 Softeisbieger I'm trying to use a DictProperty, but it seems like no event is dispatched when assigning a new dict (the dict definitely changed). Is there something I need to know?
07:59 jaguarmagenta joined #git
07:59 steveccc so a git gui would basically (very very over simplifying it) act similar to an ftp client to sync a local copy of the site and then following each change it would sync back to the server?
07:59 _ikke_ Softeisbieger: This is #git
07:59 _ikke_ steveccc: no
07:59 Softeisbieger lol
07:59 _ikke_ steveccc: Don't see git as a file syncing tool
08:00 Softeisbieger meant to post in #kivy, thanks anyways ;)
08:00 _ikke_ Softeisbieger: We see that more often, no biggy
08:00 _ikke_ steveccc: Git is meant to share history (commits with changes), not to sync files
08:00 _ikke_ steveccc: git will make more sense if you see it that way
08:01 romerocesar joined #git
08:01 flobin if you need a gui try the github app, or sourcetree
08:01 _ikke_ github app is very github oriented
08:02 steveccc _ikke_: yes sorry my bad terminology. are any of you guys web guys - wondered if you would run a git repo on your live server or do you keep it just on dev?
08:02 flobin you can have the git repo on the live server, serving the master branch
08:02 _ikke_ steveccc: I'm a web developer
08:02 _ikke_ Although it's possible, we do not recommend it
08:03 steveccc so you would prefer to have a git repo on your dev box and then manually ftp changes upto the live?
08:04 _ikke_ That's one workflow. I like to work with releases
08:04 _ikke_ So each new version is a separate release that I upload to a new directory
08:04 arooni joined #git
08:05 _ikke_ steveccc: depending on the profile of the website, directly uploading from a dev box to the live site might not be a good idea
08:05 steveccc _ikke_: I agree its not perfect but for our small websites, its perfectly fine
08:05 _ikke_ right
08:06 steveccc i just wondered if you would have a git repo on the live server and then just deploy changes to it when you were happy
08:06 Darcidride joined #git
08:06 _ikke_ Lots of people try that, but they often run into issues with it
08:06 _ikke_ That's why we tend to not recommend that workflow
08:07 _ikke_ (for one, you have to realize that you might expose your .git directory to the world)
08:07 ahmedelgabri joined #git
08:08 catbeard not if you use GIT_WORK_TREE=/path/to/sshfs_mount; git checkout -f
08:08 steveccc _ikke_: i am probably asking questions rather than reading so please tell me to go away if I am annoying but.... with git, is the file in the directory the most recent version and .git holds the various changes so you can roll back?
08:09 _ikke_ steveccc: Basically, yes
08:09 _ikke_ steveccc: It contains the version in the currently checked out commit
08:09 steveccc _ikke_: so if i just wanted to make a simple change such as a text colour then i could make the change, commit and then ftp the file in the folder upto the live box like I currently do
08:09 astrofog joined #git
08:10 malesca joined #git
08:10 vuoto_ joined #git
08:10 _ikke_ correcy
08:10 _ikke_ corret
08:11 martinkl_ joined #git
08:11 nnyk_ joined #git
08:12 steveccc ok final question and then i will go away and let you get coffee and headache tablets :) if you are making constant changes to a file and checking the results in a browser and you have the extra step of running the git commands to get the file, commit it etc - doesnt that get tedious if you are making the changes every few mins
08:13 [Brain] joined #git
08:13 steveccc that why I thought an editor would just integrate the git process in its open and save procedure so to a certain extent its transparent
08:14 _ikke_ steveccc: You would only commit changes that you have tested to work
08:14 arooni joined #git
08:14 _ikke_ So usually you have a dev environment where you can test the changes you just made
08:15 hahuang61 joined #git
08:15 GavinMagnus joined #git
08:15 steveccc _ikke_: when you say "test" say it was editing css as part of a wordpress install. I presume to get wordpress to use the file, i would create a git repo in the www folder of the dev box?
08:16 _ikke_ No, you would not use a git repository for this
08:16 _ikke_ This step will not involve git
08:16 _ikke_ would*
08:16 steveccc so do you have a git repo effectively just like a storage area and then copy the files to the dev web box to test?
08:17 _ikke_ steveccc: I usually point the webroot for that project to my working area
08:17 _ikke_ So I do not have to copy anything
08:17 steveccc _ikk_: isnt point the webroot / having the git repo in the standard apache folder for that website the same thing effectively?
08:18 _ikke_ Difference between dev and production
08:18 steveccc im talking purely dev now
08:19 steveccc currently my dev box is a centos box with cpanel and various websites setup /home/site1/www......., home/site2/www..... so i presumed that i would just create a repo in each of those areas?
08:20 texinwien_ joined #git
08:20 _ikke_ Sure, you could do that. I just would not recommend using git to synchronize files for testing
08:21 steveccc when you say syncronise you mean syncing them to live?
08:21 steveccc i agree thats probably a step too far
08:21 _ikke_ Even synchronizig them to dev
08:21 _ikke_ You should not have to commit and push to be able to test changes
08:22 _ikke_ It would create lots of noice and merge conflicts
08:22 a_thakur joined #git
08:23 vuoto joined #git
08:23 steveccc _ikke_: so would you edit in the web environment like I do now but then make the changes to the git repo in a different location after you had tested them?
08:23 hck89 joined #git
08:24 _ikke_ steveccc: I would imagine that in your case, you would edit the files in /home/site1/www, test the changes, and if they're ok, then commit
08:24 arooni joined #git
08:25 ochorocho__ joined #git
08:25 Bengt__ joined #git
08:25 steveccc _ikke_: i can see the logic but that would kinda bypass my requirement as if two of us did that then we would overwrite each others changes in www - i guess the only solution is separate web server dev environments for each person and all submit changes to a core git repo
08:26 _ikke_ steveccc: Yes, that's almost necessary, otherwise, you would constantly have to pull (merge) the changes the other has made, and you will constantly interfere with eachother)
08:27 Beams joined #git
08:27 steveccc _ikke_: so i am dreaming that we could both pull a file, change different parts of it, commit and git just merges the two together into one file easily?
08:28 _ikke_ steveccc: git works commit based, it doesn't just pull changes to a single file
08:28 ramsub07 joined #git
08:29 _ikke_ steveccc: imagine that you make a change, commit and push it, but then the site stops working
08:29 _ikke_ While the other person was just testing their change
08:30 _ikke_ So git is not about synchronzing changes while still developing / testing you changes
08:30 mda1_ joined #git
08:30 steveccc that was my totally innocent thought that we both work of a repo in the www folder, we both make changes like we do now and then on commiting, the system handles most conflicts automatically. Ok - I think i need to go away and setup a repo and a test box and play and I am sure I will soon realise
08:31 GyrosGeier _ikke_, partially
08:31 steveccc _ikke_: ok thanks for your help - I will go away and have a read of that book and then i am sure i will understand it better. do you work in a team?
08:31 GyrosGeier I mean, you can use it that way, but when you rewrite history, everyone needs to get on board with that
08:31 _ikke_ steveccc: I work in a team, yes
08:32 romerocesar joined #git
08:32 _ikke_ steveccc: But each dev has their own directory they work in
08:32 steveccc _ikke_: how do you work smoothly with many people working on the same site - do you all agree to work on your own parts and no two people are doing the same thing at once
08:32 _ikke_ steveccc: Somewhat yes
08:32 _ikke_ each is working on a specific feature
08:33 stantonk joined #git
08:33 _ikke_ And each feature is created in a separate branch
08:33 steveccc yes that makes sense so git is more a protection system from you making a mess and then needing to revert back rather than a merge mechanism
08:33 _ikke_ only merged in the common branch when finished
08:34 _ikke_ It does merge changes, but more on a macroscoping scale, then on a microscopic scale if you understand what I mean
08:34 arooni joined #git
08:34 steveccc _ikke_: think so. Ok thanks for your time and sorry to be a pain
08:35 _ikke_ no problem
08:35 steveccc have you ever tried cloud9 out of interest?
08:35 _ikke_ nope
08:36 steveccc https://c9.io seems to offer a google docs type interface for editing code so multiple people can see each other editing code in one file live - probably not as good as it looks but interesting
08:36 _ikke_ Right, it has similar issues
08:36 _ikke_ Hard to test while another person is changing things
08:36 _ikke_ So it would work in a peer-programming like setting
08:37 ramsub08 joined #git
08:37 _ikke_ where you are actively collaborating
08:37 _ikke_ But not in an asynchronous way
08:39 Bengt__ New to using terminals, used the desktop app for github before, trying the terminal out now. Question, what and why is there diffrent terminals like the normal windows command prompt, git terminal, node terminal, why cant I do the same thing in all of them?
08:39 _ikke_ Bengt__: Why are there different browsers?
08:40 _ikke_ Why are there different OSes?
08:40 Bengt__ I diffrent browsers I can still do most things I can do in the other ones
08:40 Bengt__ What are the difrences in the terminals?
08:41 selckin same deal
08:41 Bengt__ Oh ok, cool, thougt they where diffrent
08:41 _ikke_ You can invoke the same commands, but around that, there are difference
08:42 selckin some are plain, some have tabs, keybinds, url catchers, transparent backgrounds, but in the end, they just show the console
08:42 Bengt__ Ok, thanks
08:42 _ikke_ And they're hosting a shell
08:43 Bengt__ I dont really grasp what a shell is
08:43 _ikke_ The part in a terminal that is reading you commands and exute it
08:43 Lipp joined #git
08:44 Bengt__ Like a compailer?
08:44 arooni joined #git
08:44 _ikke_ more like an interpreter
08:45 mrkat joined #git
08:45 _ikke_ In windows, you by default have use one terminal, but two shells: one is the old dos-style shell, the other one is powershell
08:45 kedare joined #git
08:45 janr joined #git
08:45 Bengt__ Sorry for all the noob questions but why and what is it interpreting?
08:46 keltvek joined #git
08:46 _ikke_ It needs to decide what you want it to do
08:46 _ikke_ if you type in cd foo, it needs to interpret that you want to change directories to foo
08:46 selckin before you had windows to click on, you have a terminal to type into
08:46 _ikke_ if you type in dir, it inteprets that you want a dir listing
08:47 _ikke_ if you type git, it sees it as a command that needs to be executed
08:48 _ikke_ if you type in foo=bar, it sees that you want to set a variable called foo to bar (not sure how dos works with this)
08:49 vuoto joined #git
08:49 Bengt__ During a javaScript fullstack tutorial they said to download babun, think its also a shell, but didnt understand why I needed it and still dont understand why a shell is needed, why cant one just type what you want and need directly in the terminal?
08:50 selckin when you type directly into the terminal, you are already typing into the shell
08:50 _ikke_ Bengt__: The terminal is just a window
08:50 _ikke_ nothing more
08:50 _ikke_ it handles keyboard input, mouse input, and text output
08:51 _ikke_ It relies on another program (the shell), to do something with that
08:51 _ikke_ separation of concerns
08:51 _ikke_ That allows you to change shells
08:51 quenode joined #git
08:51 _ikke_ Just your OS allows you to change browsers for example
08:51 _ikke_ just like
08:51 Bengt__ so then what is the diffrense betwen the shells?
08:52 _ikke_ One big difference is the 'language' they operate on
08:52 selckin do you maybe understand REPL?
08:52 _ikke_ Bengt__: https://babun.github.io/
08:52 _ikke_ see the 10 features list
08:53 SimonNaa joined #git
08:53 jhass well in your case there probably is none, it's just that there's no common denominator on windows that you can rely on, so everything ships the basics themselves
08:54 jhass on unixes you typically have one shell and one terminal emulator (usually your desktop environment default one)
08:54 Bengt__ selckin, I understand REPL
08:54 selckin shell is basicly a repl
08:54 GeekMan joined #git
08:54 arooni joined #git
08:55 ramsub07 joined #git
08:55 Bengt__ Saw something about Microsoft to start having BASH, so thats a Linux speaking shell?
08:55 GeekMan joined #git
08:55 tchan joined #git
08:55 vuoto joined #git
08:56 jhass they made something so you can run linux software on windows, one of which is bash
08:56 selckin bash is the default shell on most linux distros indeed
08:56 jhass bash is fairly portable though, it also natively runs Darwin (OS X) and most BSDs
08:56 Stummi iirc its not really "running linux software on windows", more an environment to allow you to recompile linux software for windows
08:57 vuoto joined #git
08:57 jhass Stummi: I understood it as a reverse wine basically
08:57 jhass shims to provide the right syscalls with the right behavior and a loader for the ELF format
08:57 Bengt__ jhass, whats the problem with reserve wine?
08:57 Stummi jhass, not really. Wine allows you to run .exe files. But cygwin does not allow you to run elf files (if I am not wrong on this)
08:57 jhass I didn't say there's a problem?
08:58 Stummi oh, theres a ELF loader? So I may be wrong
08:58 jhass Stummi: we're not talking about cygwin
08:58 Stummi ah, right, this MS thing. It has a ELF loader?
08:58 jhass cygwin is recompilation indeed
08:58 Bengt__ When I installed the git terminal, it said something about cygwin, whats that?
08:58 jhass well I have no idea how it works otherwise
08:59 jhass Bengt__: a project that ports and recompiles common linux/unix software to windows
08:59 Bengt__ Ok, thanks
09:00 Bengt__ Would there be a good idea to try out a Linux OS?
09:01 vuoto joined #git
09:02 _ikke_ Wouldn't be a bad idea ;-)
09:03 bongjovi joined #git
09:03 cdown_ joined #git
09:03 Bengt__ Whice is the goto one? Ubunto?
09:04 arooni joined #git
09:05 Stummi I am happy with debian testing here on my desktop
09:06 notebox joined #git
09:07 phanimahesh joined #git
09:07 qsx i prefer to paint my bikeshed in hot pink :)
09:07 leehambley joined #git
09:07 _ikke_ :)
09:08 mariuscc joined #git
09:09 marlun If a tag has been removed from origin how do I remove it locally too? fetch --prune did not work?
09:10 Bengt__ what would be a good linux irc channel to turn to for more questions in the subject?
09:11 jhass Bengt__: it doesn't make too much of a difference these days, Ubuntu is fine, Fedora is fine, Antergos is fine, Debian is fine. Have a look at videos screenshots of the desktop environments first (Gnome, KDE, Unity, XFCE) and pick something that has the one you like as a default
09:11 Bengt__ jhass: Thanks
09:13 Bengt__ joined #git
09:15 Stummi Bengt__, after you have choosen a distri, this distris chan is a good starting point
09:16 selckin if you're not english try the smaller #distro-lang channels if they exist, they are usually friendlier then the thousands in the main channel
09:16 Bengt__ Stummi: I dont understand what you mean
09:17 Ordentli1 joined #git
09:19 Ordentli1 Is it possible to make git follow symlinks?
09:19 a_thakur_ joined #git
09:20 a_thakur joined #git
09:20 FunkyAss joined #git
09:20 ahmedelgabri joined #git
09:20 Sazhen86 joined #git
09:21 Ordentli1 I want to do the following: mkdir etcrepo; cd etcrepo; git init; ln -s /etc; ... make changes to /etc and manage the repo inside etcrepo
09:21 Ordentli1 rather than initializing a repo inside /etc
09:21 jim_carry joined #git
09:24 arooni joined #git
09:24 Ordentli1 hmm, I just want it to track /etc, which will reside outside the repository
09:26 ochorocho__ joined #git
09:26 i7c Why don't you simply init the repo in /etc?
09:30 phanimahesh joined #git
09:31 Ordentli1 i7c, I have a repo with all devices, devices/macbookpro, devices/imac, devices/imac/{etc,dotfiles,systemd,..}
09:31 ramsub08 joined #git
09:32 nitin_ joined #git
09:32 Ordentli1 which simply installs, repair and synchronizes dotfiles originally
09:32 EvilPenguin joined #git
09:33 Ordentli1 now I want to attempt to store /etc as well
09:33 i7c You can symlink from etc into your repo. I don't think the other way round will work.
09:33 arooni joined #git
09:33 Lipp joined #git
09:34 i7c You could maybe have your own repo for /etc and manage different machines using branches?
09:35 i7c Or you have to script your magic to restore repair and so on.
09:35 eijk_ joined #git
09:35 phanimahesh joined #git
09:39 Guest46604 joined #git
09:39 vuoto joined #git
09:39 skylite joined #git
09:40 Ordentlig joined #git
09:41 Ordentli1 joined #git
09:41 Ordentli2 joined #git
09:43 mischat joined #git
09:44 arooni joined #git
09:44 mischat joined #git
09:45 digidog joined #git
09:45 Repox joined #git
09:46 jhass you probably also could start an orphan branch and use git worktree
09:47 Ordentlig i7c, that would probably be ideal, I don't really need to backup ALL /etc files.
09:47 elux joined #git
09:48 Ordentlig so perhaps just doing everything from my /devices/<device>/etc and then have somekind of installer that overrides /etc
09:49 retropikzel joined #git
09:50 qasaur joined #git
09:54 arooni joined #git
09:55 narendraj9 joined #git
10:00 jaguarmagenta joined #git
10:00 Neobenedict joined #git
10:01 tvw joined #git
10:03 harish_ joined #git
10:03 arooni joined #git
10:07 bruce_lee joined #git
10:07 ahmedelgabri joined #git
10:08 cdown_ joined #git
10:10 martinkl_ joined #git
10:11 netcarver joined #git
10:11 NwS joined #git
10:15 jhass is there an easy way to cleanup tags that were removed on a remote?
10:17 cdown_ joined #git
10:18 subhojit777 joined #git
10:18 nitin_ joined #git
10:19 jhass ah well, git fetch --prune <remote> '+refs/tags/*:refs/tags/*', not too easy but good enough I guess
10:19 guzzlefry left #git
10:23 makinen joined #git
10:23 makinen http://stackoverflow.com/questions/1628563/move-the-most-recent-commits-to-a-new-branch-with-git
10:24 flobin joined #git
10:25 makinen I moved the three last commits to a new branch according to those answers
10:26 makinen how do I update the remote repo?
10:26 makinen local branches seem to be right now but git push just says Everything up-to-date
10:27 flobin left #git
10:29 wrouesnel1 joined #git
10:29 PioneerAxon joined #git
10:31 King_Hual joined #git
10:31 zacts joined #git
10:33 arooni joined #git
10:34 fracting joined #git
10:35 stantonk joined #git
10:35 makinen anyone?
10:36 Lynxium[] joined #git
10:37 i7c What have you done so far?
10:37 cdown_ joined #git
10:38 i7c Created the new branch? reset master to a previous commit?
10:38 makinen git reset --keep HEAD~3
10:38 makinen git checkout -t -b newbranch
10:38 makinen git cherry-pick ..HEAD@{2}
10:38 mostlybadfly joined #git
10:38 makinen except the name of the new branch is different
10:39 freimatz joined #git
10:40 MattMaker joined #git
10:41 MattMaker joined #git
10:41 i7c Now you want to push master? That's a !rewrite of public history, you should be aware of that.
10:41 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
10:42 irco joined #git
10:42 gudekb joined #git
10:42 i7c If you are, you can push --force-with-lease <remote> master
10:43 arooni joined #git
10:44 tabrez joined #git
10:44 makinen there are only two persons working on the project so it's fine
10:44 makinen but thx
10:45 pur3eval joined #git
10:45 i7c The other branch you can simply git push. You're welcome. :)
10:47 PCatinean joined #git
10:47 ToBeCloud joined #git
10:48 JulienITARD joined #git
10:49 howdoi joined #git
10:51 cdown_ joined #git
10:51 MattMaker joined #git
10:52 makinen I can't still push the new branch containing the commits :/
10:52 makinen Switched to branch 'feature/sylinterikaanto'
10:52 makinen Your branch is ahead of 'develop' by 3 commits. (use "git push" to publish your local commits)
10:52 allcentury joined #git
10:52 makinen $ git push
10:52 phanimahesh joined #git
10:52 makinen Everything up-to-date
10:53 arooni joined #git
10:54 makinen the branch from which the commits were removed is now fine on the remote side too
10:54 javajoe joined #git
10:55 cdown__ joined #git
10:55 a_thakur joined #git
10:58 ramsub07 joined #git
10:58 i7c Can you verify that local version of your feature/sylinterkaanto branch is correct?
10:59 i7c e.g. using git log
10:59 makinen yes it shows the commits
11:00 i7c Well if git says it’s up-to-date you probably already successfully pushed it before?
11:00 troulouliou_div2 joined #git
11:01 makinen I can't see the commits on gitlab
11:02 i7c Are you pushing to the correct remote? Maybe you have several?
11:02 makinen and git checkout suggests to publish new commits by git push
11:02 i7c Do it explicitly
11:02 i7c git push <remote> <branch>
11:03 arooni joined #git
11:03 makinen ah that solved the problem
11:03 makinen great
11:03 makinen thx again
11:04 i7c makinen, you might wanna set the upstream using push -u next time.
11:04 MrMojito joined #git
11:04 i7c git remembers one remote to be the upstream for your branch which is to where git push defaults then.
11:05 malesca joined #git
11:05 javajoe joined #git
11:06 MattMaker joined #git
11:06 ramsub08 joined #git
11:08 makinen ok I'll keep that on my mind
11:08 MrMojito1 joined #git
11:11 ahmedelgabri joined #git
11:14 ojdo joined #git
11:16 MrMojito joined #git
11:17 dlaboratory joined #git
11:17 dlaboratory why git changes the timestamp of all files in the directory after checkout, even files unmodified?
11:18 qasaur joined #git
11:18 dlaboratory then, every file are rebuilt in Visual Studio as it compares the timestamp between source code and object file
11:18 dlaboratory it's a huge project, the complete rebuild is annoying
11:19 johnmilton joined #git
11:19 Mun_ joined #git
11:19 dlaboratory is it a bug?
11:20 dlaboratory (Windows 10 x64 using git 2.9.0)
11:20 pioiytr joined #git
11:21 pioiytr joined #git
11:21 crayon joined #git
11:22 pioiytr joined #git
11:22 sdothum joined #git
11:22 HoierM joined #git
11:23 arooni joined #git
11:24 javajoe joined #git
11:24 Balliad joined #git
11:25 liamonade joined #git
11:25 yqt joined #git
11:26 MattMaker joined #git
11:26 ochorocho__ joined #git
11:27 i7c Uhm, I think the modification date of the files should only change if checking out another branch actually modifies the file.
11:27 i7c And that's what you want in order to not confuse build systems entirely.
11:30 Neobenedict_ joined #git
11:32 ShapeShifter499 joined #git
11:32 rnsanchez joined #git
11:33 arooni joined #git
11:33 settermjd joined #git
11:35 blackwind_123 joined #git
11:37 DX1 joined #git
11:37 Guest75296 joined #git
11:38 Guest75296 left #git
11:38 circ-user-2lJvp joined #git
11:39 sdothum joined #git
11:40 MissionCritical joined #git
11:40 hck89 joined #git
11:43 arooni joined #git
11:44 Drzacek joined #git
11:44 Drzacek Hi, I'm trying to understand Git
11:45 Drzacek "Add remote repository" means that I provide url/path to already existing repository
11:45 Drzacek What if I have my local repository, and I want to create remote repo?
11:45 selckin !bare
11:45 gitinfo 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/
11:46 Drzacek Example: I have project dir on /home/username/Project1/ and I want to put it to /home/username/Network/
11:46 hahuang65 joined #git
11:46 selckin cp
11:46 Drzacek So remote repo is "bare", doesn't contain any .cpp (or other) files that I created?
11:46 selckin usually yes
11:47 selckin any repo can be used as a remote
11:47 tobiasvl a remote doesn't have to be bare, depends what you want to do
11:48 Drzacek Can I put dir on network disk to act as "server", and me and other users will work on that project localy on our PCs, from time to time commiting to server?
11:48 i7c Yes.
11:48 kus joined #git
11:48 i7c A remote can also be somewhere else in your filesystem.
11:49 selckin as in network mount a git repo and use it simultanius?
11:49 selckin thats a nono
11:49 Drzacek why?
11:49 deadnull joined #git
11:49 selckin because its statefull, but if you just push/pull to it should be ok
11:50 Drzacek I don't know how this all works
11:50 selckin what problem are you trying to solve
11:50 Drzacek All I know, is that I want to put my project on network disk, that I mount on my linux machine
11:50 Drzacek So I and few other guys could work on this
11:51 tvw joined #git
11:51 Drzacek Tried git gui, but since it was illogical program for me AND because someone suggested I should work in bash, I'm trying to learn console git now
11:51 espindola joined #git
11:52 tobiasvl smart move
11:52 Drzacek I understand how it all works when I work on local repo, I edit, stage, commit etc
11:53 i7c Well magically create a repo somewhere, obtain it's magical URL and you can do: git remote add <remotename> <url>; git push <remotename> <something>
11:53 selckin cp project/.git /share/project.git; cd /share/project.git; git config --bool core.bare true; Then everyone can just git clone /share/project/git; and work on it
11:53 netj joined #git
11:53 i7c cp won't do anything without -r :)
11:53 arooni joined #git
11:53 Drzacek :D
11:54 selckin if hes too stupid to figure it out from that, its hopeless
11:54 Drzacek core.bare true - don't I want the opposite?
11:54 i7c Not on the remote, probably. Usually you want your remote to be a bare repo.
11:54 Drzacek Why is that?
11:54 selckin because it just act as a database and deosn't need a workdir
11:55 Drzacek ok
11:55 Drzacek But when someone would clone this repo, he would get all the needed files, right?
11:55 i7c + history
11:55 selckin yes
11:56 fracting joined #git
11:56 i7c selckin, btw, your way will lead to possibly many objects on the remote that don't need to be there? Or not?
11:57 selckin can't learn everything at the same time, and doesn't really hurt anything
11:57 i7c Yeah doesn't hurt, sure.
11:57 achadwick joined #git
11:58 selckin my watch has enough diskspace to store it 5 times
11:58 selckin (probably)
11:58 i7c :p
11:58 i7c I guess I never really thought of this way to "create a remote" even tho it's kinda obvious.
11:59 Caelum joined #git
11:59 selckin git init; then locally, git remote add origin bla; then push all the branches, too much to type out :)
12:00 i7c You can always link progit and hide.
12:00 rgrinberg joined #git
12:00 jaguarmagenta joined #git
12:02 MattMaker joined #git
12:02 tomog999_ joined #git
12:03 arooni joined #git
12:03 diego1 joined #git
12:06 ramsub07 joined #git
12:06 mdw joined #git
12:07 Sceorem joined #git
12:07 mdw joined #git
12:07 Guest862` joined #git
12:08 ffledgling Is it safe to rsync a git repo that's undergoing some operations ?
12:08 snowkidind joined #git
12:08 ash_workz joined #git
12:08 selckin probably not
12:08 i7c Sounds like a not-brilliant idea.
12:08 ffledgling It does, which is why I'm running it by people here
12:09 selckin can probably run rsync in a loop till it sees no changes or other fun hacks
12:09 grawity that used to be the main synchronization mechanism of Git, but it was forgotten, and got entirely removed recently
12:09 grawity hmm, safety-wise though
12:09 ffledgling Need to backup a gitserver and don't really want to stop it while the rsync happens
12:09 grawity refs are always updated last, I guess, so as long as objects/ happens to get synced first
12:10 Ordentlig joined #git
12:10 ffledgling I think rsync goes in alphabetical order of directories, so I guess it'd sync refs first and objects later?
12:10 Gonzo89 joined #git
12:11 heftig ffledgling: it's probably readdir order
12:11 sdothum joined #git
12:11 Ordentli1 joined #git
12:11 grawity hmm I thought it did sort them
12:11 selckin my trick probably works for that, or maybe can use like git bundle
12:11 grawity ah well might have been a coincidence
12:11 MattMaker joined #git
12:11 ffledgling selckin: yeah, that trick always works, sort of, it's fragile to figure out when rsync didn't do anything
12:12 ffledgling unless there's a status code I'm missing
12:12 heftig grawity: ah, looks like the transfer list is sorted
12:13 ahmedelgabri joined #git
12:13 grawity yeah, I was sure I'd seen mirror admins talking about relying on rsync downloading packages before db's, or something
12:15 nehaljwani joined #git
12:16 Ordentli2 joined #git
12:19 Oebele joined #git
12:20 ronny hi
12:20 ronny anyone aware of a command to list all local branches that are already merged?
12:21 fracting joined #git
12:22 MattMaker joined #git
12:23 matrixa1 joined #git
12:23 ffledgling git branch --merged origin/master while looping over the list of local branches?
12:23 FuzzySockets joined #git
12:24 ffledgling sorry no looping needed, you can just do git branch --merged origin/master
12:24 romerocesar joined #git
12:24 ffledgling It'll give you the list of all local branches merged into master
12:24 f3r70rr35f joined #git
12:24 ffledgling If you want to figure out which branches are merged into /any/ branch, then you might have to do some looping
12:24 FunkyAss joined #git
12:25 sangy joined #git
12:27 daniel_rose joined #git
12:28 FilipNortic_ joined #git
12:28 troulouliou_div2 joined #git
12:29 cdown joined #git
12:29 f3r70rr35f joined #git
12:29 daniel_rose joined #git
12:31 GodGinrai joined #git
12:32 pioiytr joined #git
12:32 _noblegas joined #git
12:33 arooni joined #git
12:33 pioiytr joined #git
12:33 mrkat joined #git
12:34 pur3eval joined #git
12:34 pioiytr joined #git
12:35 f3r70rr35f joined #git
12:36 pioiytr joined #git
12:36 MattMaker joined #git
12:37 stantonk joined #git
12:37 Neobenedict joined #git
12:39 cqi joined #git
12:41 griffindy joined #git
12:43 arooni joined #git
12:44 nettoweb joined #git
12:48 dingus joined #git
12:48 zivester joined #git
12:49 NeverDie joined #git
12:51 e-dard_afk left #git
12:52 azbarcea joined #git
12:52 spriz joined #git
12:52 nitin_ joined #git
12:53 arooni joined #git
12:54 ramsub08 joined #git
12:54 rolha joined #git
12:55 Brain2 joined #git
12:57 pioiytr joined #git
12:57 cyan__ joined #git
12:58 tabrez joined #git
12:58 MrMojito1 joined #git
12:59 jimi_ joined #git
13:00 pioiytr joined #git
13:00 ekinmur joined #git
13:01 pioiytr joined #git
13:03 arooni joined #git
13:03 pioiytr joined #git
13:03 hck89 joined #git
13:06 phanimahesh Anyone remembers the refs bitbucket uses to track PRs?
13:06 kus joined #git
13:06 _ikke_ phanimahesh: From what I remember, they do not expose them
13:06 grawity just do `git ls-remote`
13:07 MattMaker joined #git
13:07 f3r70rr35f joined #git
13:08 fracting joined #git
13:08 phanimahesh grawity: No refs for pulls. :(
13:08 Sadeukko joined #git
13:08 _ikke_ Right, like I said, they do not expose them
13:08 phanimahesh Do you know of any workarounds?
13:08 _ikke_ Only github has that iirc
13:08 LionsMane joined #git
13:08 _ikke_ phanimahesh: pull the branch from the repo it comes from?
13:09 grawity wonder if git-spindle can automate that
13:09 phanimahesh Ah. That's always an option but it is sometimes easy to lose track. And I don't like opening in browser every now and then.
13:09 fmcgeough joined #git
13:09 phanimahesh Thanks anyway. Looks like I'll have to live with it for now.
13:10 _ikke_ phanimahesh: complaint to atlassian :P
13:11 phanimahesh I'll try that. I don't think they'll do that, though.
13:11 rgrinberg joined #git
13:12 arooni joined #git
13:14 ahmedelgabri joined #git
13:14 CEnnis91 joined #git
13:14 hck89 joined #git
13:15 xpk joined #git
13:16 kapu joined #git
13:18 Ordentlig joined #git
13:18 Ordentli1 joined #git
13:18 Ordentli2 joined #git
13:18 TooLmaN joined #git
13:20 choki joined #git
13:22 arooni joined #git
13:23 Rish joined #git
13:24 yashi joined #git
13:25 rnsanchez_ joined #git
13:27 ochorocho__ joined #git
13:29 Noldorin joined #git
13:30 leehambley joined #git
13:33 arooni joined #git
13:34 toogley joined #git
13:37 MattMaker joined #git
13:37 _ikke_ If enough people do, they might
13:37 ac110 joined #git
13:38 Vgr joined #git
13:38 chitopunk joined #git
13:38 Vgr joined #git
13:38 ekinmur joined #git
13:39 ash_workz joined #git
13:40 Gsham joined #git
13:40 hck89 joined #git
13:40 shinnya joined #git
13:43 arooni joined #git
13:44 gkatsev joined #git
13:45 Lynxium joined #git
13:45 magneticduck joined #git
13:45 AaronMT joined #git
13:46 allcentury joined #git
13:46 AaronMT joined #git
13:47 dingus joined #git
13:48 Lynxium[] joined #git
13:50 gkatsev joined #git
13:51 anushil051 joined #git
13:51 MattMaker joined #git
13:52 allcentury joined #git
13:53 arooni joined #git
13:53 fscala joined #git
13:55 dingus joined #git
13:55 kpease joined #git
13:56 keltvek joined #git
13:57 stantonk joined #git
13:59 MattMaker joined #git
14:01 jim_carry joined #git
14:02 jayjo joined #git
14:02 jayjo Can I create a branch that begins at a specific commit (potentially many commits ago)?
14:02 arooni joined #git
14:02 xcesariox joined #git
14:03 _ikke_ yes
14:03 EvilPenguin joined #git
14:03 _ikke_ git branch <name> <commit>
14:03 _ikke_ A branch is just a pointer, so you can point it to any commit you want
14:03 jayjo _ikke_: where commit is the hash?
14:03 _ikke_ yes
14:03 jayjo OK got it
14:03 jayjo thank you
14:03 Sonderblade joined #git
14:04 todd_dsm_wk joined #git
14:05 stantonk joined #git
14:07 qt-x joined #git
14:09 jim_carry joined #git
14:12 arooni joined #git
14:12 madewokherd joined #git
14:13 GT4066 joined #git
14:14 ahmedelgabri joined #git
14:15 SimonNa joined #git
14:15 jim_carry joined #git
14:18 kevwil joined #git
14:18 cqi joined #git
14:19 orbitphreak joined #git
14:19 D-Boy joined #git
14:19 Ordentlig joined #git
14:19 Ordentli1 joined #git
14:19 Ordentli2 joined #git
14:20 rubyonrailed joined #git
14:21 joko joined #git
14:22 arooni joined #git
14:22 pur3eval joined #git
14:22 diamonds joined #git
14:22 diamonds what the heck am I doing wrong here http://hastebin.com/raw/paxujapune
14:24 diamonds hmm looks like this http://wholemeal.co.nz/blog/2010/06/11/no-changes-did-you-forget-to-use-git-add/
14:24 FeersumEndjinn joined #git
14:24 diamonds git UI appears to have been written by 1000 monkeys on 1000 typewriters....
14:25 FeersumEndjinn left #git
14:26 anushil_ joined #git
14:27 jim_carry joined #git
14:28 Gsham joined #git
14:30 GavinMagnus left #git
14:31 rbpeou joined #git
14:31 GavinMagnus joined #git
14:31 GavinMagnus left #git
14:31 arooni joined #git
14:31 _ikke_ fixing the conflict caused that commit to add nothing new
14:31 _ikke_ which git warns you abuot
14:31 _ikke_ about
14:32 _ikke_ "If there is nothing left to stage, chances are that something else
14:32 _ikke_ already introduced the same changes; you might want to skip this patch."
14:33 _ikke_ You changed something in file x, comitted it. Now you are rebasing, running into a conflict, undo the changes to that file, which makes that commit do nothing anymore
14:34 cdg joined #git
14:34 flaviodesousa joined #git
14:34 fracting joined #git
14:35 xcesariox joined #git
14:37 sweatsuit joined #git
14:37 diegoviola joined #git
14:38 EricPoe joined #git
14:38 hk238 joined #git
14:39 moritz so the proper action is to run git rebase --skip
14:39 daniel_rose joined #git
14:40 _ikke_ sorry, yes
14:41 ejb joined #git
14:42 javaJake diamonds: (good news is, git doesn't give you a huge variety of scenarios. Once you know how to react to a particular cryptic output, you know what to do later.)
14:42 arooni joined #git
14:42 * diamonds nods
14:43 diamonds yeah. been using it for years, not many surprises anymore. Still get a curve ball every now & then :p
14:43 diamonds ty _ikke_ moritz
14:43 javaJake Yep. Sometimes the new "helpful" stuff means I have to unlearn workaround habits, like with some of the new add options.
14:43 moritz also, the git developers do improve the messages
14:43 moritz and where possible, the behavior
14:44 PCatinean joined #git
14:44 azerus joined #git
14:44 diamonds it seems like once git add happens & conflict is resolved, rebase --continue should behave consistently
14:44 diamonds I M O
14:44 kaldoran joined #git
14:44 GavinMagnus joined #git
14:45 moritz but then git can't catch the common error of forgetting git add at all
14:45 moritz git doesn't record whether you ran 'git add', it just knows about the current state of the index
14:45 unbalancedparen joined #git
14:46 javaJake diamonds: ah, I see what you're saying. So maybe it should also say, "If you intend to discard the changes from the rebased patch, use --skip instead"
14:46 ExoUNX joined #git
14:49 diamonds moritz, but it can see if there are "no conflicts", yes?
14:49 diamonds what's the potential issue with saying "no conflicts found, allow --continue to proceed"
14:51 moritz diamonds: that would not be a very good user interface in the common error case mentioned above
14:51 thiago joined #git
14:51 _ikke_ diamonds: the problem is not that there aren't any conflicts, the problem is that the commit you are about to do is 'empty'
14:51 moritz you did an interactive rebase with an "edit" action, made some changes, forgot to git add, and it tells you "no conflicts found"
14:52 moritz that would be quite confusing
14:52 mmlb joined #git
14:52 arooni joined #git
14:54 mostlybadfly joined #git
14:54 ekinmur joined #git
14:57 geoid joined #git
14:59 diamonds hmm ok
14:59 diamonds thx
15:00 sanketdg joined #git
15:01 xpk_ joined #git
15:01 arooni joined #git
15:03 CheckDavid joined #git
15:05 clemf joined #git
15:06 Gsham joined #git
15:07 daniel_rose joined #git
15:08 ramsub07 joined #git
15:08 mdw joined #git
15:08 chrisshattuck joined #git
15:11 miklcct joined #git
15:11 atrus left #git
15:12 arooni joined #git
15:14 atrus joined #git
15:15 ahmedelgabri joined #git
15:16 tannart joined #git
15:18 ekinmur joined #git
15:18 vuoto joined #git
15:19 ochorocho__ joined #git
15:20 Brain joined #git
15:20 harish joined #git
15:20 daniel_rose joined #git
15:21 netcarver joined #git
15:22 arooni joined #git
15:23 6A4AA7DKA joined #git
15:23 leeN joined #git
15:24 Gabemo joined #git
15:25 allcentury joined #git
15:25 jorj joined #git
15:27 Khisanth joined #git
15:29 Mavericks joined #git
15:31 InfoTest joined #git
15:31 Mavericks i've a long running branch. everytime clone's made of it, it's getting hard to do rebase to preserve the history just to avail its benefits instead of doing a git merge
15:31 skylite joined #git
15:31 Mavericks i'm sure there a way to fix it . Does git tag feature help here ?
15:31 arooni joined #git
15:32 jfran joined #git
15:32 lindenle joined #git
15:33 _ikke_ Sorry, what issue do you need to fix, it's unclear to me
15:33 _ikke_ And I don't think tags will help
15:33 Groovie joined #git
15:35 bsanford joined #git
15:36 xcesariox joined #git
15:36 Mavericks _ikke_: with a long running branch rebase takes way too much if there are lots of conflicts to resolve
15:36 quetz joined #git
15:37 watersoul joined #git
15:37 Mavericks _ikke_: merge will not give option of having linear history
15:37 madewokherd joined #git
15:37 anushil051 joined #git
15:38 _ikke_ Is linear history really a requirement?
15:38 Mavericks _ikke_: trying to figure out what's a way to reduce time ?
15:38 _ikke_ (note that git merge will also result into conflicts)
15:38 Mavericks _ikke_: not really but would prefer that
15:38 Mavericks _ikke_: true
15:39 _ikke_ Mavericks: The only thing I can think of is !imerge
15:39 gitinfo Mavericks: https://github.com/mhagger/git-imerge -- a tool to split a large merge with many conflicts into many smaller merges, hopefully each with easier-to-understand small conflicts.
15:39 _ikke_ Quote from today: "14:56:49*       Xandaros │ _ikke_: Thank you so much for showing me imerge. Looks like it actually had less conflicts than normal merge :D"
15:39 netcarver joined #git
15:40 Xandaros Yes. It's amazing.
15:40 eijk_ joined #git
15:41 pioiytr joined #git
15:42 watersoul_ joined #git
15:42 Alienpruts joined #git
15:42 arooni joined #git
15:42 ramsub08 joined #git
15:42 anushil051 joined #git
15:44 dmto joined #git
15:44 EvilPenguin joined #git
15:46 pur3eval joined #git
15:46 romerocesar joined #git
15:47 kevwil joined #git
15:48 sangy joined #git
15:49 oich joined #git
15:49 Macaveli joined #git
15:50 vbsales joined #git
15:51 arooni joined #git
15:53 devbug joined #git
15:53 Rish joined #git
15:54 _ikke_ Still need to use it
15:56 Hounddog joined #git
15:57 ejb joined #git
15:58 rnsanchez joined #git
15:59 Ezzy joined #git
16:01 ramsub07 joined #git
16:02 arooni joined #git
16:02 jaguarmagenta joined #git
16:09 BSaboia joined #git
16:11 tvw joined #git
16:11 arooni joined #git
16:15 quetz joined #git
16:15 azerus joined #git
16:15 alanbennet joined #git
16:16 ahmedelgabri joined #git
16:16 pioiytr joined #git
16:17 alanbennet left #git
16:17 oepjk joined #git
16:18 quetz^^ joined #git
16:18 pioiytr joined #git
16:20 nettoweb joined #git
16:20 geoid joined #git
16:20 JelmerD joined #git
16:20 BrianBlaze420 joined #git
16:21 Anoia joined #git
16:21 Anoia hi all
16:21 arooni joined #git
16:22 Anoia one of our work servers is being replaced and they're migrating all users to another one
16:22 Anoia is there a way I can copy the stashes I have to the new one?
16:23 Anoia git show, and manually recording them seems a bit error prone
16:23 UTAN_dev joined #git
16:24 _ikke_ I don't think it's easy to export stashes
16:24 _ikke_ A stash record more then just the changes you made
16:24 _ikke_ Also the index and the commit where the stash was made on
16:25 styx_ joined #git
16:25 Anoia exactly
16:25 preaction if you copy the .git dir, you'll have the stashes
16:25 Anoia ah yeah, I hadn;t thought of copying the entire folder
16:26 _ikke_ I might have an idea
16:26 romerocesar joined #git
16:26 _ikke_ that's even simpler
16:26 Anoia I'm used to mercurial that has an explicit "patches" folder
16:26 vuoto joined #git
16:26 _ikke_ Create refs for each stash
16:27 _ikke_ push them
16:27 yashi left #git
16:27 _ikke_ and then recreate the stashes from those refs
16:27 clemf joined #git
16:27 Anoia won;t that means they appear ont he central server?
16:27 Anoia that's not going to happen :)
16:27 _ikke_ You can push them anywhere ;-)
16:27 _ikke_ Not necessary the central server
16:27 _ikke_ you can even create a bundle
16:27 Anoia I don't have anywhere else to push to atm
16:28 _ikke_ but just copying the repository is easiest
16:29 Anoia only my desktopare the equivalant to private commits, stored int he index as normal?
16:29 _ikke_ Advantage is that you keep your reflog, config settins, hooks, etc
16:29 _ikke_ Anoia: ?
16:29 Anoia sorry
16:30 Anoia the only other machine I have is my desktop
16:30 Anoia are stashes equivalant to private commits, stored in the index as normal?
16:30 _ikke_ They're not stored in the index
16:30 mmmveggies joined #git
16:30 _ikke_ They reuse the normal commit structure git has to store the index and working tree changes
16:31 uttilo joined #git
16:31 uttilo left #git
16:31 uttilo joined #git
16:31 dreiss joined #git
16:31 uttilo left #git
16:31 _ikke_ If you would look at them, they look like a merge from a one commit branch
16:32 arooni joined #git
16:32 ahmedelgabri joined #git
16:32 Anoia ok
16:32 Anoia they often show in git log whihc confuses the hell out of me until I remember what they are
16:33 Anoia I'm relatively new to git after many many years of hg
16:33 preaction how are they in the log? they're not commits
16:33 _ikke_ they are
16:33 jim_carry joined #git
16:33 _ikke_ they're commits referenced through the reflog
16:33 Anoia .git zipped and copying
16:33 preaction they're not on a branch then. unless you're looking at the log of the stash commit
16:33 _ikke_ a special reflog
16:33 Anoia thanks
16:34 Anoia preaction: mostly when doing a git log --all
16:34 _ikke_ preaction: correct, they're not on a branch
16:34 Anoia to figure out who has fixed (or broken) something on another branch
16:34 pioiytr joined #git
16:35 zeemz joined #git
16:36 pioiytr joined #git
16:37 durham joined #git
16:39 nonconvergent joined #git
16:39 pioiytr joined #git
16:39 nonconvergent I detached my HEAD. How do I reattach it so I can commit?
16:39 _ikke_ !reattach
16:39 gitinfo Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue
16:39 _ikke_ (!detached)
16:39 gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
16:40 pioiytr joined #git
16:40 devbug joined #git
16:42 arooni joined #git
16:42 thiago Anoia: you can probably use git log --remote
16:43 jim_carry joined #git
16:43 SteffanW joined #git
16:44 _ikke_ How would that help?
16:45 rominronin joined #git
16:45 geoid joined #git
16:47 thiago it would list only remote branches, which is where one would expect that other people's commits land
16:47 Rish joined #git
16:48 rpd joined #git
16:49 orbitphreak joined #git
16:51 jim_carry joined #git
16:51 arooni joined #git
16:52 yqt joined #git
16:53 treehug88 joined #git
16:55 hosttor joined #git
16:56 thoraxe joined #git
16:58 GavinMagnus left #git
16:58 qcqqnq joined #git
16:59 nettoweb joined #git
17:00 rpd joined #git
17:01 quetz joined #git
17:01 arooni joined #git
17:02 crose joined #git
17:03 tvw joined #git
17:03 rvsjoen_ joined #git
17:04 romerocesar joined #git
17:05 shgysk8zer0 joined #git
17:05 texinwien_ joined #git
17:07 jim_carry joined #git
17:09 sarbs joined #git
17:09 tobiasvl a log that only lists remote branches?
17:10 arooni_ joined #git
17:10 mischat_ joined #git
17:10 grazfather left #git
17:11 ahmed_elgabri joined #git
17:12 mischat_ joined #git
17:13 nitin joined #git
17:14 jim_carry joined #git
17:14 arooni joined #git
17:14 romerocesar_ joined #git
17:15 Ezzy left #git
17:16 ExoUNX joined #git
17:16 _ikke_ remote tracking branches
17:16 _ikke_ refs/remotes/*
17:17 devbug joined #git
17:18 aep-shoutlet joined #git
17:18 oich is there a reason why git submodule update checks out the submodule branch with detached head, but submodule add -b something checks out the branch without it being detached?
17:19 Shentino joined #git
17:20 e-dard_afk joined #git
17:20 e-dard left #git
17:21 Literphor joined #git
17:22 martin_g joined #git
17:22 sbeller joined #git
17:23 arooni_ joined #git
17:24 Gsham joined #git
17:24 jim_carry joined #git
17:25 arooni joined #git
17:25 cdg joined #git
17:25 MrMojito1 joined #git
17:26 romerocesar joined #git
17:27 xaviergmail joined #git
17:28 _ikke_ oich: with -b you explicitly ask a branch to be checked out
17:28 _ikke_ git submodules by default track commits, not branches
17:29 Darcidride joined #git
17:29 mwhooker joined #git
17:30 segment-fault joined #git
17:31 nellicus_ joined #git
17:32 FuzzySockets joined #git
17:33 tonyyarusso joined #git
17:33 oich _ikke_ my concern is that at some point the submodule will be checked out as what HEAD was at that time rather than that the commit that it was created from. Once I clone the repository the submodule branch is checked out with detached head, so I guess that means it doesn't matter that it is not with a detached head when it is added
17:34 TomyLobo joined #git
17:35 pur3eval joined #git
17:35 thiago joined #git
17:36 LionsMane joined #git
17:36 tgunr joined #git
17:36 bongjovi joined #git
17:37 KeelOfSteel joined #git
17:39 ramsub08 joined #git
17:40 netj joined #git
17:42 zacts joined #git
17:44 arooni joined #git
17:45 jimi_ joined #git
17:45 jrnieder joined #git
17:46 eycsigfy joined #git
17:46 rominronin joined #git
17:47 e-dard joined #git
17:47 jimi_ joined #git
17:49 Literphor joined #git
17:49 ejb joined #git
17:49 * HedgeWork explodes.
17:50 segment-fault ahhhhh
17:50 HedgeWork So...I'm trying to clone a ~1.5GB git repo via a VPN that keeps flaking out on me because $reasons.  Of course, every time git fails to clone, it wipes whatever it's already received.  Is there any way to make it keep this and resume after I re-establish the VPN connection?
17:50 HedgeWork This is getting really old.
17:50 segment-fault oh god
17:50 HedgeWork And I am getting really stabby.
17:51 segment-fault not sure what to say, depends on vpn but i feel your pain
17:51 segment-fault i have had to do that before and its like... JUST FINISH
17:51 jim_carry joined #git
17:51 tyreld joined #git
17:52 ascarter joined #git
17:52 HedgeWork Yeah.  I'm yelling at the head of networking to fix the gorram VPN, but the chances of him doing so in time for me to get this done before my INCREDIBLY KICKASS mountaineering vacation are exceedingly slim.
17:52 _ikke_ HedgeWork: create a bundle, which you can download in a resumable way
17:52 HedgeWork I have a bunch of analysis to do on this repo history by Friday, which is two days from now.
17:52 HedgeWork _ikke_: explain please?
17:53 _ikke_ man git bundle
17:53 gitinfo the git-bundle manpage is available at http://jk.gs/git-bundle.html
17:53 HedgeWork thanks, will read.
17:53 segment-fault nice info gitinfo
17:53 _ikke_ segment-fault: !bot
17:53 gitinfo segment-fault: [!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans.  Please see http://jk.gs/git/bot for more information about how to (ab)use me.
17:53 segment-fault and appropriate name
17:53 segment-fault i can thank any bot i want
17:53 _ikke_ !botsnack
17:53 gitinfo Om nom nom
17:53 segment-fault !thanks
17:53 gitinfo You're very welcome!
17:54 segment-fault see
17:54 arooni joined #git
17:56 eycsigfy joined #git
17:57 jeffreylevesque joined #git
17:57 romerocesar joined #git
17:57 alloro joined #git
17:58 ramsub07 joined #git
17:59 alloro Hi, i want to clone a repository but only a single folder of it. Is this possible? I know git retreives everything.
17:59 Sasazuka joined #git
18:00 cdown joined #git
18:00 SwiftMatt joined #git
18:00 Ph_ joined #git
18:00 tobiasvl alloro: !sparse
18:00 gitinfo alloro: [!sparse_checkout] Sparse checkout can be used to restrict which files/folders are updated with all checkout and status operations.  It cannot change the tree the checkout is rooted from.  See man git-read-tree
18:01 tobiasvl hm, no, not on clone, sorry
18:01 jim_carry joined #git
18:01 tobiasvl alloro: you can do git clone --no-checkout followed by a sparse checkout
18:01 mwhooker joined #git
18:01 alloro Ok thanks i'll try it
18:02 tobiasvl or just init an empty repo, configurate sparse checkout, add remote and then pull
18:03 jaguarmagenta joined #git
18:03 raylu joined #git
18:03 raylu is there a way to get all names for a revision like --decorate? `git name-rev abc123` only gives me the first branch name
18:03 alloro It's a problem with jenkins. I have multiple folders but only one which contains the gradle build file. Either i checkout the folder to / or tell jenkins explicit where the build.gradle is. I guess those are the only options
18:03 fracting joined #git
18:05 alloro Haha... jenkins offers additional behaviours (sparse checkout). Sorry guys i didn't saw this option. Damn Jenkins UI, tricked me
18:05 arooni joined #git
18:05 fscala joined #git
18:12 liquidjamm joined #git
18:12 nitin joined #git
18:14 arooni joined #git
18:14 ramsub07 hello, does $git push origin a:b push from local branch a to remote branch b ?
18:15 dsdeiz joined #git
18:15 vishal ramsub07: yes. see !refspec
18:15 gitinfo ramsub07: [!refspecs] Refspecs are used by fetch/push to *spec*ify which *ref*s to transmit where. They have the form "source:destination". They can be prefixed with a "+" to force the update, possibly displacing existing history. More info: http://jk.gs/git-fetch.html or http://i.qkme.me/3tke7r.jpg
18:16 ynanm joined #git
18:16 dreiss joined #git
18:17 spriz joined #git
18:18 Literphor joined #git
18:18 segment-fault left #git
18:19 ramsub08 joined #git
18:20 javajoe joined #git
18:22 nilg joined #git
18:22 freimatz joined #git
18:24 settermjd joined #git
18:24 arooni joined #git
18:25 kfunk joined #git
18:27 energizer joined #git
18:27 pur3eval joined #git
18:28 ramsub07 joined #git
18:29 diogenese joined #git
18:30 Ph_ joined #git
18:30 freimatz joined #git
18:30 ascarter joined #git
18:31 devbug joined #git
18:33 filcab joined #git
18:34 M-shine joined #git
18:34 arooni joined #git
18:35 Neobenedict_ joined #git
18:35 Neobenedict_ joined #git
18:35 mwhooker joined #git
18:35 moei joined #git
18:36 HedgeWork OMG...I'm at 85%
18:36 HedgeWork everybody cross your fingers and toes
18:38 stantonk joined #git
18:38 m0viefreak joined #git
18:39 xaviergmail joined #git
18:41 ramsub08 joined #git
18:42 stantonk joined #git
18:43 Vinnie_win joined #git
18:44 Gsham joined #git
18:45 rominronin joined #git
18:45 GT4066 joined #git
18:46 nilg joined #git
18:48 vuoto joined #git
18:48 cdown joined #git
18:50 satifant joined #git
18:50 ejb joined #git
18:51 ramsub07 joined #git
18:51 M-mistake joined #git
18:51 M-meznak joined #git
18:52 Ph_ joined #git
18:52 kus joined #git
18:54 NeverDie joined #git
18:54 arooni joined #git
18:55 zacts joined #git
18:57 romerocesar joined #git
18:58 Ph_ joined #git
18:59 HedgeWork Oh thank goodness...it finally synced and I didn't have to try to talk someone on the other end through tarballing up what I need and sending it via another channel.
18:59 HedgeWork whew!
18:59 HedgeWork thanks _ikke_ for the info earlier
19:00 HedgeWork and thanks to those who commiserated :)
19:00 ramsub08 joined #git
19:00 stantonk joined #git
19:00 Discovery joined #git
19:01 Balliad joined #git
19:01 paws_ joined #git
19:02 stantonk joined #git
19:02 Ph_ joined #git
19:03 IlNominePatre joined #git
19:03 franl joined #git
19:04 arooni joined #git
19:04 Balliad joined #git
19:05 irregular joined #git
19:05 Gsham joined #git
19:05 Ph_ joined #git
19:05 daniel_rose joined #git
19:06 arooni joined #git
19:07 ajf- joined #git
19:07 styx_ joined #git
19:08 romerocesar joined #git
19:08 mdw joined #git
19:08 davisonio joined #git
19:11 blackwind_123 joined #git
19:11 GodGinrai joined #git
19:12 _ikke_ no problem
19:13 mwhooker joined #git
19:14 arooni joined #git
19:14 settermjd joined #git
19:15 GodGinrai joined #git
19:17 akushner joined #git
19:17 shinnya joined #git
19:18 alloro left #git
19:18 settermjd joined #git
19:19 Alejandro-25 joined #git
19:21 maroloccio hi. i have branch1 and branch2. branch1 is commit1, commit2, branch2 is branch1 + commit3 on top of it. how do i push branch2 to origin but call it branch1 at the remote's end?
19:21 _ikke_ git push origin branch2:branch1
19:22 maroloccio _ikke_: works. awesome
19:23 EricPoe joined #git
19:23 toogley joined #git
19:24 raylu left #git
19:24 arooni joined #git
19:26 preilly_ joined #git
19:27 Olipro joined #git
19:28 rnsanchez_ joined #git
19:28 ahmed_elgabri joined #git
19:34 arooni joined #git
19:34 robotroll joined #git
19:37 FunkyAss joined #git
19:38 romerocesar joined #git
19:38 pur3eval joined #git
19:40 ascarter joined #git
19:40 LaptopBrain joined #git
19:40 Twirl left #git
19:40 Xandaros joined #git
19:41 orbitphreak joined #git
19:41 WayToDoor joined #git
19:43 WayToDoor joined #git
19:43 psprint_ joined #git
19:44 arooni joined #git
19:46 rominronin joined #git
19:48 daniel_rose joined #git
19:48 Kehet joined #git
19:48 vivekp joined #git
19:50 ekinmur joined #git
19:50 styx_ joined #git
19:51 johnnyfive joined #git
19:53 dhollinger joined #git
19:53 shgysk8zer0 joined #git
19:53 davisonio joined #git
19:53 WayToDoor joined #git
19:54 Darcidride joined #git
19:54 arooni joined #git
19:54 Sazhen86 joined #git
19:54 Smirnov joined #git
19:55 fnodeuser joined #git
19:56 ramsub07 joined #git
19:58 netcarver joined #git
19:59 Spacew00t joined #git
19:59 javajoe joined #git
20:01 fnodeuser left #git
20:02 stantonk joined #git
20:02 choki joined #git
20:02 arooni joined #git
20:03 jaguarmagenta joined #git
20:08 romerocesar joined #git
20:09 vuoto joined #git
20:11 hck89 joined #git
20:11 editshare-ericf joined #git
20:11 arooni joined #git
20:14 Ordentli2 joined #git
20:15 monokrome joined #git
20:15 Yatekii left #git
20:16 irco joined #git
20:18 elastix joined #git
20:22 arooni joined #git
20:25 nettoweb joined #git
20:25 Gsham joined #git
20:28 pur3eval joined #git
20:28 piling joined #git
20:30 styx_ joined #git
20:30 quetz^^ joined #git
20:31 daniel_rose joined #git
20:31 LionsMane joined #git
20:32 _rnsanchez_ joined #git
20:33 spudowiar joined #git
20:33 javajoe joined #git
20:38 romerocesar joined #git
20:41 arooni joined #git
20:42 piling joined #git
20:45 UTAN_dev_ joined #git
20:46 Gamecubic joined #git
20:47 anuxivm joined #git
20:47 rominronin joined #git
20:49 fahadash joined #git
20:50 relipse joined #git
20:51 neanderslob joined #git
20:52 yqt joined #git
20:52 dopesong joined #git
20:53 segment-fault joined #git
20:53 xaviergmail joined #git
20:54 nnyk_ joined #git
20:54 foist joined #git
20:56 YesMan joined #git
20:56 YesMan hello
20:56 gitinfo YesMan: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
20:58 YesMan I'd like to know fo a way to clone a repo with only the minimal history. For instance I want to install a web application. Downloading the application via zip is 80MB, cloning the repo is 350MB. I've seen some people use --depth=1 however it seems to cause some issue or is not recommended.
20:59 daniel_rose joined #git
20:59 _ikke_ YesMan: If the source is not github (or some other site that has it disabled), git archive is what you're looking for
20:59 _ikke_ man git archive
20:59 gitinfo the git-archive manpage is available at http://jk.gs/git-archive.html
21:00 YesMan The issue with git archive is that it doesn't seem to bring the submodules of the repository
21:01 FunkyAss as far as I understand --depth, if you want a single branch, no history and are not interested in cloning the "clone", --depth 1 is totally fine
21:01 YesMan Well the code I'm looking for is actually on github
21:02 FunkyAss (but I'm open to different opinions)
21:02 Lipp joined #git
21:03 ahmed_elgabri joined #git
21:04 _ikke_ If you only want the source, git archive is a better solution. Github does offer downloading archives through http
21:05 Lipp_ joined #git
21:06 YesMan _ikke_: yeah but as i said, in my experience, the git archive doesn't contain submodules, which can be a pain to download separatly
21:07 Lipp joined #git
21:08 eight58 joined #git
21:09 segment-fault left #git
21:10 aseidl joined #git
21:10 johnmilton joined #git
21:10 jrabe joined #git
21:15 zarel joined #git
21:16 jimi_ joined #git
21:17 tvw joined #git
21:19 eijk_ joined #git
21:20 ahmed_elgabri joined #git
21:23 l0rdPE joined #git
21:23 jeffreylevesque joined #git
21:24 cdown joined #git
21:26 johnmilton joined #git
21:29 _xor joined #git
21:29 romerocesar joined #git
21:29 stantonk joined #git
21:30 _ikke_ YesMan: Then just use --depth=1
21:30 YesMan yeah I ended up doing that, works great with --recursive
21:32 artemisart joined #git
21:32 Impaloo joined #git
21:33 jfran joined #git
21:33 jooni joined #git
21:34 bruce_lee joined #git
21:34 nnyk_ joined #git
21:36 nettoweb joined #git
21:37 kevwil joined #git
21:39 allcentury joined #git
21:39 MrWoohoo joined #git
21:40 Gsham joined #git
21:41 f3r70rr35f joined #git
21:42 MattMaker joined #git
21:45 cyan__ joined #git
21:45 xaviergmail joined #git
21:46 rpd joined #git
21:48 johnmilton joined #git
21:49 rominronin joined #git
21:51 Neobenedict joined #git
21:51 Neobenedict joined #git
21:51 HoierM joined #git
21:52 Terens joined #git
21:52 artemisart1 joined #git
21:52 Terens hello
21:55 wintergray joined #git
21:55 Arban joined #git
21:57 MattMaker joined #git
21:57 cd-rum joined #git
21:58 i7c ohai
21:59 ReginaldFop joined #git
21:59 crayon joined #git
22:01 joki joined #git
22:03 ReginaldFop left #git
22:05 fiveplustwo joined #git
22:07 MattMaker joined #git
22:07 rgrinberg joined #git
22:09 aidalgol joined #git
22:11 ascarter joined #git
22:12 liuzhen joined #git
22:14 madewokherd joined #git
22:14 zarel joined #git
22:17 MattMaker joined #git
22:18 fscala joined #git
22:22 xlegoman joined #git
22:26 WaReZ joined #git
22:27 ensyde__ joined #git
22:30 HoierM joined #git
22:30 fiveplustwo left #git
22:31 jrabe joined #git
22:32 MattMaker joined #git
22:33 GavinMagnus joined #git
22:35 mischat joined #git
22:37 lindenle joined #git
22:39 romerocesar joined #git
22:42 lindenle_ joined #git
22:42 EgS joined #git
22:42 MattMaker joined #git
22:46 rubyonrailed joined #git
22:48 nnyk joined #git
22:49 dreiss joined #git
22:49 monokrome joined #git
22:49 marko___ joined #git
22:52 rbern joined #git
22:54 stantonk joined #git
22:56 eycsigfy joined #git
22:58 rominronin joined #git
22:58 skapunker joined #git
23:02 King_Hual joined #git
23:02 King_Hual joined #git
23:02 GavinMagnus left #git
23:09 ochorocho__ joined #git
23:10 romerocesar joined #git
23:11 choki joined #git
23:12 MattMaker joined #git
23:13 rkazak joined #git
23:14 johnny56_ joined #git
23:14 maroloccio joined #git
23:16 mwhooker joined #git
23:18 cdg joined #git
23:22 Lipp joined #git
23:22 MattMaker joined #git
23:22 unreal joined #git
23:23 thiago joined #git
23:23 d4rklit3 joined #git
23:24 cd-rum_ joined #git
23:26 segment-fault joined #git
23:28 qpdb joined #git
23:29 mablae_ joined #git
23:30 romerocesar joined #git
23:31 mkopriva joined #git
23:32 atrigent joined #git
23:32 MattMaker joined #git
23:34 devbug joined #git
23:37 artemisart joined #git
23:37 pioiytr joined #git
23:40 romerocesar joined #git
23:43 bluezone joined #git
23:44 cdg joined #git
23:45 njt joined #git
23:46 nick[0] joined #git
23:48 durham_ joined #git
23:48 cdg joined #git
23:50 nick[0] Hi, I'm trying to prevent a directory from being merged using .gitattributes.  Adding "/directory merge=ours" to the master branch's .gitattributes and then git config --global merge.ours.driver true (or git config merge.ours.driver true) doesn't prevent the merge conflict
23:51 nick[0] local is deleted and remote is modified file
23:51 clemf joined #git
23:51 nick[0] adding "directory merge=ours" to .gitattributes also doesn't work
23:51 Gsham joined #git
23:52 nick[0] what am I doing wrong?
23:58 ojacobson I only have a faintly sarcastic answer, which is "trying to prevent merges"
23:58 ojacobson Assuming it worked, what problem would this be solving for you? Maybe there's a plan B

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