Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-05-09

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

All times shown according to UTC.

Time Nick Message
00:00 raspado joined #git
00:00 jnewt_ joined #git
00:00 Vampire0 malmalmal, no
00:01 Vampire0 malide, pull = fetch + merge or fetch + rebase, depending on the config and parameters
00:01 Vampire0 fetch just updates the remote tracking branches in your local repository, it does not touch your local branches
00:01 psprint_ joined #git
00:02 cagomez joined #git
00:02 Whiskey joined #git
00:02 malide malmalmal: ^^
00:03 alexandre9099 joined #git
00:03 rishi```` joined #git
00:03 ahf joined #git
00:03 richardlitt joined #git
00:03 druonysus joined #git
00:03 malmalmal Vampire0: ok, so fetch does not merge
00:04 malmalmal pull merges
00:04 f1nch_ joined #git
00:04 malide correct
00:04 binary106 joined #git
00:04 malmalmal so how to fetch + merge all branches again ?
00:04 unreal joined #git
00:04 malmalmal and...actually how to merge previously fetched files
00:05 pix9 joined #git
00:05 dzho git merge
00:05 Vampire0 malmalmal, merge merges
00:05 malmalmal hah!
00:05 ahrs joined #git
00:05 Vampire0 malmalmal, rebase rebasesmerge merges
00:05 Vampire0 malmalmal, rebase rebases
00:05 Vampire0 malmalmal, fetch fetches
00:05 Vampire0 malmalmal, pull does either fetch+merge or fetch+rebase
00:05 malmalmal depending on config
00:05 qlkzy joined #git
00:06 Vampire0 malmalmal, depending on config and parameters, yes
00:06 Vampire0 malmalmal, by default it is fetch+merge
00:06 malmalmal so how to fetch + merge all branches again ?
00:06 Vampire0 malmalmal, you don't
00:06 malmalmal I don't...
00:06 Vampire0 nope
00:07 malmalmal : (
00:07 malmalmal bad practice ?
00:07 Vampire0 Not without writing a script
00:07 malide you can make a script to do so, but generally don't
00:07 malide yeah that ^^
00:07 Vampire0 well, a merge has always potential for conflicts
00:07 Vampire0 conflicts need to be resolved manually
00:07 Vampire0 this speaks against an automated way to do it
00:07 Vampire0 I guess this is the reason there is not standard command for it
00:08 henriquev joined #git
00:08 Takumo joined #git
00:08 Takumo joined #git
00:08 malmalmal OK, so in my scenario we work on a website, me and another dev. There is a remote repo on the server of this website. As I am understanding, it would be good practice to create a dev branch, and to pull this branch to local.
00:08 malide if you make a script, probably add '--ff-only' to the merge to avoid conflicts and then output which branches were updated
00:08 malmalmal then I do my work in this local branch, when finished and tested, add commit and push
00:09 malmalmal and if there are conflicts, I will get them at this point, as I understand
00:10 malide add your commit, pull, fix conflicts, and then push
00:10 malmalmal oh
00:10 Vampire0 malmalmal, !deploy
00:10 gitinfo malmalmal: 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
00:11 Vampire0 malmalmal, and !workflow
00:11 gitinfo malmalmal: Finding the right workflow for you is critical for the success of any SCM project.  Git is very flexible with respect to workflow.  See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.
00:11 malmalmal Ok, people, I think I need to actually dive in longer in the manuals, as there are many things I still don't understand properly it seems
00:11 malmalmal thank you very much for your help
00:12 Vampire0 malmalmal, maybe also interesting !bottom and !book
00:12 gitinfo malmalmal: [!bottomup] 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)
00:12 gitinfo malmalmal: 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
00:13 malmalmal Thanks again Vampire0
00:13 Vampire0 yw
00:13 ExeciN joined #git
00:15 Cabanossi joined #git
00:18 TbobbyZ_ joined #git
00:18 fstd_ joined #git
00:18 malmalmal seems the link to git from the bottom up has changed
00:18 demize joined #git
00:19 madewokherd joined #git
00:19 Vampire0 malmalmal, the second one works
00:20 jasom left #git
00:20 malmalmal ok
00:20 dviola joined #git
00:20 Vampire0 !bottom
00:20 gitinfo [!bottomup] 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ikke.info/git.from.bottom.up.pdf
00:21 malmalmal :))
00:22 MrLawrence joined #git
00:26 nevodka joined #git
00:28 MrLawrence joined #git
00:28 northfurr joined #git
00:30 Bhootrk_ joined #git
00:30 druonysus left #git
00:30 zturner joined #git
00:30 druonysus joined #git
00:30 cfoch-always _ikke_: git rev-parse --abbrev-ref @{-1}
00:30 mischat joined #git
00:30 cfoch-always do you remember that? what if I want to get the last checked out branch?
00:31 cfoch-always even if I did git commit before
00:31 dirtyroshi joined #git
00:33 Vampire0 [00:33:43] <Vampire0> _ikke_, cfoch-always,  well I guess to get this reliably working one would have to code a loop that loops through @{-1}, @{-2}, ... using rev-parse and checking the result against show-ref --heads to find the last branch that was checked out. Or git reflog and then reading the entries
00:34 thiago cfoch-always: what are you trying to do?
00:34 rchavik joined #git
00:36 Vampire0 thiago, he was hit by a !zombie, committed, now wants to know on which branch he was at last
00:36 gitinfo thiago: Brainzz! More brainzzzz!  For information about detached heads, see !detached
00:36 thiago but not check it out?
00:37 MattMaker joined #git
00:37 MattMaker joined #git
00:38 mattcen joined #git
00:39 cfoch-always thiago: I just want to use "git bisect", but there is a script that runs "git checkout" in all the branches
00:39 jab416171 joined #git
00:39 cfoch-always it selects but default the branch listed and marked with '*' when you do "git branch"
00:39 thiago how is knowing the branch you were previously on going to help you?
00:40 cfoch-always in the case of "git bisect" the problem is it shows "* (no branch...)"
00:40 thiago yes, because you're not in any branch. You're in a detached HEAD so you can test that commit.
00:41 thiago but if you're in the middle of a commit, Vampire0's command won't work.
00:41 safe joined #git
00:41 gugah joined #git
00:41 Vampire0 thiago, what do you mean?
00:41 thiago that only works if you're only one commit outside of the branch. Git bisect will check out more than one.
00:41 mizu_no_oto joined #git
00:41 cfoch-always yes
00:41 Husky_Apocalypse joined #git
00:42 Vampire0 thiago, it works no matter how far you away, the hops are the problem. And what I described **would** work fine if someone would do it
00:42 thiago so, what are you trying to do during a git bisect?
00:42 matt|home hi.. quick question, im using an automated build program within my git repo, and each time i do a new build multiple files get modified, but only those modified files have the commit message attached to them
00:42 Vampire0 thiago, I didn't give a command but a procedure
00:42 MattMake_ joined #git
00:42 matt|home is there a way to do an en-masse commit message for all files within a specific branch in a repo, or not really
00:42 cfoch-always i have to loop until some data is output ?
00:42 Vampire0 thiago, besides using git reflog and manually looking which also would work fine for doing it manually
00:42 thiago matt|home: modified files don't have commit message associated
00:42 thiago matt|home: commits have commit message
00:43 thiago matt|home: if your script is changing tracked files, then maybe you should fix the script
00:43 matt|home okay yeah im using the wrong words, basically the "edited" files that i then add/commit get the messages
00:43 cfoch-always if I loop @{-1} @{-2} ...
00:43 matt|home it's not my script it's a pre-made program
00:43 thiago cfoch-always: loop over what? Why do you need to loop?
00:43 matt|home anyway it's just a minor issue, no worries..
00:43 thiago matt|home: git add won't get you messages
00:44 thiago matt|home: explain what you're trying to do
00:44 matt|home okay.. let me test it again right now to make sure im not making a mistake
00:44 cfoch-always If I do the following command "git rev-parse @{-x}" where x goes from 1 to N
00:44 thiago cfoch-always: you're trying to git bisect. When git bisect stops, you're supposed to test.
00:44 thiago cfoch-always: do I understand that you're going to run a script at this time?
00:45 Vampire0 cfoch-always, you need to loop @{-1} @{-2} ..., use the current one to `git rev-parse --abbrev-ref  @{-1}`, then use the result in `git show-ref --heads <here>`
00:45 Vampire0 cfoch-always, if that returns find, you found the last checked out branch
00:45 rkazak joined #git
00:45 cfoch-always does it make sense to say "what branch does this commit belongs to"?
00:46 cfoch-always because I start to think it doesn't
00:46 thiago a commit can belong to zero or more branches
00:46 cfoch-always ye
00:46 cfoch-always yes
00:46 thiago but why would you want to know that?
00:47 cfoch-always because when I run that script, it parses the current branch
00:47 thiago why does the script need to know that?
00:47 Vampire0 cfoch-always, a commit does not belong to any branch. In can be in the history of another commit to which a branch pointer currently points
00:47 Vampire0 cfoch-always, but a commit does not really belong to any branch
00:47 cfoch-always It's for flatpak, it autogenerate a flatpak manifest (json file)
00:47 Vampire0 cfoch-always, the branch pointers can be peeled off and stuck to any other commit at any time
00:47 thiago that doesn't answer the question
00:47 cfoch-always indicating current branch
00:47 thiago why does it need the branch's name?
00:48 cfoch-always because it creates a special configuration based on the indicated branch
00:48 MattMaker joined #git
00:48 thiago so if you rename the breanch to alsojdu49hodhfu, what happens?
00:49 TheSimonator joined #git
00:49 cfoch-always it will create a myprogram.template.json file
00:49 cfoch-always sorry
00:49 thiago will the flatpak generation fail because there's no configuration associated with that branch name?
00:49 cfoch-always alsojdu49hodhfu.template.json
00:49 thiago why does that file need the branch name?
00:51 thiago why can't you use a name without the branch name?
00:51 thiago like yourprogramname.template.json?
00:51 cfoch-always sorry, it creates a file myprogram.alsojdu49hodhfu.json
00:51 cfoch-always because that file contains information about dependencies, versions and other stuff
00:51 cfoch-always to run the program without problems
00:52 thiago you're replying about the file's content, not the file's name
00:52 cfoch-always for that branch
00:52 thiago why does the *name* need to have the branch name inside?
00:53 cfoch-always because you may waant to depend on certain branch
00:53 thiago that's circular reasoning
00:53 Vampire0 cfoch-always, simply said in my opinion any build script or program that depends on being on some branch or in any other way needs a VCS available is bullshit and not worth existing
00:53 thiago you're saying that it has the branch name because you want to depend on the branch name
00:53 matt|home Okay.
00:53 thiago why can't you abolish that?
00:53 Vampire0 cfoch-always, what if you ship your sources as a source package
00:54 Vampire0 cfoch-always, how would one build it?
00:54 matt|home So here are the commands i ran: 'git status' to make sure everything was clean, after which I edited a config file, then ran a build program. the build program edited a few more files. I then ran 'git status' again, and it showed "changes not staged for commit" all marked in red as being the previously edited files.
00:55 Vampire0 thiago, I don't think he means it circular, but another package could depend on his package branch X
00:55 Vampire0 not really makes it better, but at least non-circular :-D
00:55 matt|home after running git add *, then git commit -m "insert message here" -only the files that were listed previously had the commit message assigned to them-
00:55 matt|home does that make sense ?
00:55 thiago cfoch-always: if you meant that it's an identifier that other packages can depend on, I recommend you keep it in a file you control, not the Git branch name.
00:55 Vampire0 matt|home, nope
00:55 thiago so other people can also depend on it and will generate the same identifier
00:55 matt|home what i -wanted- was for the commit message to affect ALL FILES in the current branch in the current repo okay, Vampire0 what does not make sense
00:56 thiago if you branch off to do some quick work, the identifier won't change
00:56 thiago matt|home: commit messages affect all files. Always.
00:56 Vampire0 matt|home, files do not have commit messages. commits do have commit messages and file-changes are part of a commit
00:56 matt|home then github is showing me something entirely different
00:56 thiago matt|home: explain the problem
00:56 malide matt|home: github shows you the last commit that touched that file's message
00:56 Vampire0 matt|home, or more correct a commit contains the state of all files at commit time, so basically the message is for all files, because the message is for the commit
00:56 malide that is the expected behaviour
00:57 routingsparks joined #git
00:57 matt|home okay.. it's not a big deal honestly, i just wanted to figure out the behavior
00:57 thiago matt|home: what behaviour?
00:57 thiago explain the issue
00:57 matt|home i guess it's a github issue so don't worry about it, forget i said anything. thanks
00:58 malide thiago: looking at a repo like this, the message listed on GH is the last commit message that touched that file or directory https://github.com/github/hubot
00:58 Vampire0 matt|home, as malide said, the GitHub UI shows similarly to blame the last commit that changed the contents of a file
00:58 northfurr joined #git
00:58 Vampire0 matt|home, that is just a display detail
00:59 Vampire0 matt|home, if you want the same message displayed in GitHub for all files and directories, just modify **every** file in **every** commit
00:59 malide should've put the link after "like this", but you get the gist
00:59 Vampire0 matt|home, but to be honest, that would be ridiculous
01:00 matt|home it's no big deal
01:01 qpdb joined #git
01:01 d^sh_ joined #git
01:02 miha_S7_ joined #git
01:05 SpeakerToMeat joined #git
01:05 Vampire0 matt|home, well, it is a convenience feature of GitHub that displays and links the commit that last touched that file :-)
01:06 matt|home yeah. my thought process though was "if this is a new build, even if it's editing only a few files, I might as well make this a major commit and update all file changes"
01:06 matt|home no big deal
01:06 matt|home thanks Vampire0
01:09 holodoc joined #git
01:12 dsdeiz joined #git
01:12 dsdeiz joined #git
01:15 cyphase joined #git
01:16 holodoc joined #git
01:20 fmcgeough joined #git
01:20 Doginal joined #git
01:20 MistahKurtz joined #git
01:22 cfoch-always I found a workaround
01:22 mikecmpbll joined #git
01:22 cfoch-always will always  "git rev-parse HEAD" return current commit?
01:23 TbobbyZ joined #git
01:24 adymitruk joined #git
01:24 TbobbyZ joined #git
01:24 singlerider cfoch-always: looks to me like it returns the HEAD
01:24 singlerider So, the most recent commit, regardless of the checked out branch
01:25 adymitruk joined #git
01:27 zturner joined #git
01:27 ZyX-I joined #git
01:27 TbobbyZ_ joined #git
01:28 watabou joined #git
01:34 malide s/most recent commit/currently checked out commit
01:34 TbobbyZ joined #git
01:34 Paraxial joined #git
01:37 sunri5e joined #git
01:37 robattila256 joined #git
01:38 prg3 joined #git
01:43 firef1y joined #git
01:47 Cabanossi joined #git
01:47 bronson joined #git
01:47 acetakwas joined #git
01:50 hendry joined #git
01:51 davidstrauss joined #git
01:51 hendry hi there, so I have branched from a earlier commit and I want to individually apply patches from the original branch. Intuitively `git apply ea7c699` doesn't work.
01:52 Vampire0 singlerider, cfoch-always not the most recent, but the current
01:52 Lyqyd joined #git
01:53 Vampire0 cfoch-always, if you want the current branch or nothing if detached, use `git symbolic-ref HEAD 2>/dev/null`
01:53 Vampire0 hendry, man git cherry-pick
01:53 gitinfo hendry: the git-cherry-pick manpage is available at https://gitirc.eu/git-cherry-pick.html
01:54 Vampire0 hendry, man git apply applies patch files
01:54 gitinfo hendry: the git-apply manpage is available at https://gitirc.eu/git-apply.html
01:54 Vampire0 simple patch files that is
01:55 hendry Vampire0: oh right
01:55 durham_ joined #git
01:55 hendry if a cherry-pick fails, how do I back out ?
01:56 NeXTSUN joined #git
01:59 d^sh joined #git
01:59 amikiri joined #git
01:59 malide hendry: Are you looking for 'git cherry-pick --quit'?
02:00 dermoth joined #git
02:01 roelmonnens joined #git
02:01 _rht joined #git
02:06 Nugget joined #git
02:08 jameser joined #git
02:08 zivester joined #git
02:12 scoobert1on joined #git
02:13 lagothrix joined #git
02:15 Cabanossi joined #git
02:15 Vampire0 hendry, git cherry-pick --abort
02:16 raspado joined #git
02:16 MattMaker joined #git
02:17 prg3 joined #git
02:18 ayogi joined #git
02:18 northfurr joined #git
02:23 h12o joined #git
02:23 dsdeiz joined #git
02:25 bbhoss joined #git
02:25 Husky_Apocalypse joined #git
02:27 acetakwas joined #git
02:30 gopar joined #git
02:32 hendry Vampire0: thanks btw
02:33 iamasamosa joined #git
02:33 miha_S7_ joined #git
02:35 mel00010 joined #git
02:35 caper joined #git
02:37 hexagoxel joined #git
02:39 cagomez joined #git
02:39 Vortex35 joined #git
02:42 sunri5e joined #git
02:44 cstrahan joined #git
02:45 Cabanossi joined #git
02:47 prg3 joined #git
02:51 mischat joined #git
02:52 jaziz joined #git
02:52 a_thakur joined #git
02:52 cqi joined #git
02:53 aidalgol joined #git
02:54 masuberu joined #git
02:55 Masber_080 joined #git
02:59 sword joined #git
02:59 davedub joined #git
03:00 aavrug joined #git
03:02 chachasmooth joined #git
03:10 perrier-jouet joined #git
03:12 joshszep joined #git
03:13 joshszep joined #git
03:13 joshszep joined #git
03:14 Cabanossi joined #git
03:14 TikityTik joined #git
03:14 joshszep joined #git
03:15 transhuman joined #git
03:15 joshszep joined #git
03:15 malmalmal joined #git
03:16 joshszep joined #git
03:17 joshszep joined #git
03:17 joshszep joined #git
03:19 a_thakur joined #git
03:19 nd_ joined #git
03:22 duderonomy joined #git
03:24 TheSimonator joined #git
03:40 imack joined #git
03:41 steeze how do i generate and commit a file in a pre-commit hook? does it not just run the script infinitely at that point?
03:43 thiago steeze: if you modify the index, won't that work?
03:44 moei joined #git
03:45 thiago put it differently, can't you just git add the file you've created?
03:45 steeze if i add then do another commit though wont that just run the precommit script again?
03:45 steeze also, does anyone know why a script ran from git vs through calling manually includes the '\n' when i echo?
03:46 thiago pre-commit is run by git commit, on every commit
03:46 thiago what do you mean by "\n when I echo"
03:47 bronson joined #git
03:47 steeze in my script i create a file and echo some contents into it. when i run it manually when testing, an echo "### Features \n" puts that line in the file as i expect
03:47 steeze ### Features and then a new line. but when the script is ran after i actually commit, it literally puts "### Features \n" in the file
03:48 thiago how did you run the script manually?
03:48 steeze sh pre-commit
03:48 thiago and what is the shebang line?
03:48 steeze #!/usr/bin/env bash
03:48 thiago there you go
03:48 thiago you've found the difference
03:49 steeze i dont follow what that changes, can you elaborate?
03:49 thiago sh is not bash
03:49 steeze oof
03:49 zturner joined #git
03:49 roelmonnens joined #git
03:49 steeze does bash not recognize the escaped new line?
03:49 thiago don't use bash
03:49 thiago I mean, I don't use bash
03:50 steeze what do you use
03:50 thiago zsh
03:50 steeze well technically i do too, but i cant guarantee people on my team run it
03:51 cev joined #git
03:51 thiago anyway, you've figure out what the difference is
03:51 thiago it's a matter of writing a correct script now
03:51 rwp steeze, Using echo with either options or escape sequences is not portable. You should use printf instead.
03:52 mischat joined #git
03:52 thiago or if you want an extra blank line, just use echo again
03:52 steeze rwp thank you for that actual nugget
03:53 a_thakur joined #git
03:53 steeze thiago changing my shebang line to sh did fix the issue, but ill look into printf for portability
03:53 durham joined #git
03:54 mel00010 joined #git
03:55 steeze also looks like commiting a file in a commit hook is a bit tricky
03:55 thiago don't commit. Just git add it
03:56 fatalhalt joined #git
03:58 steeze ah okay that worked ha
04:01 __main__ joined #git
04:02 miha_S7_ joined #git
04:03 SlashLife joined #git
04:05 davidomanfredo joined #git
04:05 sim590 joined #git
04:07 kaldoran joined #git
04:10 a_thakur joined #git
04:12 Atm0spher1c joined #git
04:13 perrier-jouet joined #git
04:13 fatalhalt joined #git
04:17 prg3 joined #git
04:18 hjw000 joined #git
04:20 davidomanfredo joined #git
04:20 steeze joined #git
04:21 _xor joined #git
04:25 _xor joined #git
04:26 ski7777 joined #git
04:26 rfv joined #git
04:29 Wulf joined #git
04:30 njbair joined #git
04:30 zturner joined #git
04:31 davidomanfredo_ joined #git
04:33 prg3 joined #git
04:33 h12o joined #git
04:39 ayogi joined #git
04:39 a_thakur_ joined #git
04:43 Puffball joined #git
04:44 Cabanossi joined #git
04:45 Puffball joined #git
04:51 MrWoohoo joined #git
04:53 mischat joined #git
04:54 lindenle joined #git
04:55 dmc joined #git
04:56 treaki_ joined #git
04:59 ma5ter joined #git
05:00 sbulage joined #git
05:03 cagomez joined #git
05:06 roar joined #git
05:06 Puffball joined #git
05:06 scorpion joined #git
05:07 roar joined #git
05:07 guardianJ joined #git
05:07 dec0n joined #git
05:09 MattMaker joined #git
05:13 guardianJ joined #git
05:15 Mutter joined #git
05:15 pks joined #git
05:18 rscata joined #git
05:19 davidomanfredo_ joined #git
05:19 User458764 joined #git
05:20 imack joined #git
05:23 ivo_ joined #git
05:23 guardianJ left #git
05:25 m9xDRv8TeTry joined #git
05:26 unholycrab joined #git
05:27 northfurr joined #git
05:28 davidomanfredo_ joined #git
05:29 Cabanossi joined #git
05:30 overlord_tm joined #git
05:32 davidomanfredo joined #git
05:32 miha_S7_ joined #git
05:35 Brski joined #git
05:37 roelmonnens joined #git
05:40 porterodoran joined #git
05:40 shgysk8zer0 joined #git
05:40 marianina8 joined #git
05:40 porterodoran joined #git
05:41 dersand joined #git
05:41 GT4066 joined #git
05:42 Mutter joined #git
05:44 TomyLobo joined #git
05:46 daurnimator joined #git
05:47 porterodoran joined #git
05:47 Lowell joined #git
05:48 bronson joined #git
05:48 ThomasLocke joined #git
05:48 ThomasLocke joined #git
05:49 jaziz joined #git
05:52 Raging_Hog joined #git
05:52 m0ltar joined #git
05:54 mischat joined #git
05:54 tunekey joined #git
05:55 a_thakur joined #git
05:56 f0rks joined #git
05:57 npgm joined #git
05:59 npgm intellij has a feature to only reformat VCS changed lines. I'm wondering if git has some sort of facility for letting me do something similar, ideally I'd like to run a sed command on the lines modified in a particular commit.
06:02 ogny joined #git
06:02 kadoban Not really that I can think of. I'm sure you could build one, but it's not built-in and I can't think of any particularly helpful commands.
06:04 Silmarilion joined #git
06:06 zefferno joined #git
06:10 eshlox joined #git
06:11 XVar joined #git
06:12 rkazak joined #git
06:13 JeroenT joined #git
06:16 jozwior joined #git
06:17 chele joined #git
06:18 sea-gull joined #git
06:18 tango_ well the reformat itself would not be done by git, but you could get the changed lines from the diff
06:19 roelmonnens joined #git
06:20 roelmonnens joined #git
06:21 King_Hual joined #git
06:21 jamick joined #git
06:22 h12o joined #git
06:23 JeroenT joined #git
06:27 Whisket joined #git
06:27 ogny joined #git
06:29 Cabanossi joined #git
06:29 qt-x joined #git
06:30 jagob joined #git
06:30 zeroed joined #git
06:31 bdesemb joined #git
06:36 freimatz joined #git
06:43 tharuin joined #git
06:44 ppang joined #git
06:46 dreiss joined #git
06:48 digidog joined #git
06:48 bronson joined #git
06:51 pfg joined #git
06:52 navidr joined #git
06:53 ertes-w joined #git
06:55 iamashishkebab2 joined #git
06:55 mischat joined #git
06:55 zturner joined #git
07:00 s1scha joined #git
07:01 tanuki_ joined #git
07:02 miha_S7_ joined #git
07:03 DuckHuntDog joined #git
07:04 Introoter joined #git
07:05 LyndsySimon joined #git
07:05 Kaisyu joined #git
07:09 ronskisika joined #git
07:10 dstw joined #git
07:10 dstw joined #git
07:10 tarkus joined #git
07:11 ppang joined #git
07:11 Jer0meB51 joined #git
07:12 dstw joined #git
07:12 a_thakur_ joined #git
07:13 TomyWork joined #git
07:13 Jer0meB51 left #git
07:13 cads joined #git
07:13 dstw joined #git
07:13 LOMAS joined #git
07:14 murii_ joined #git
07:14 Cabanossi joined #git
07:14 dstw joined #git
07:14 circ-user-zNiD2 joined #git
07:15 LOMAS is it true that blob sha-1 changes if the file is modified ?
07:15 ronskisika joined #git
07:15 Masber_080 joined #git
07:15 selckin probably, but the questionn is very ambigious
07:16 dstw joined #git
07:16 roar joined #git
07:17 LOMAS Lets say that I just added a file and committed. A new blob gets created with SHA-1.In the next commit I changed the same file. Now the SHA-1 of blob remains same as that of previous commit ?
07:18 barq joined #git
07:18 selckin which "blob"
07:18 flaviodesousa joined #git
07:18 circ-user-zNiD2_ joined #git
07:19 djb-irc joined #git
07:19 cagomez joined #git
07:19 _ikke_ LOMAS: The hash of the contents changes, so a new blob will be created when you git add those changes
07:22 miha_S7_ joined #git
07:23 DuckHuntDog left #git
07:23 pbandark joined #git
07:26 LOMAS Thank you. In actual my target is to get stats. like "files changed", "lines added" etc. by a user between two or more commits. I am starting with python but APIs like gitPython, libgit2 etc. are hard to understand for beginner like me. Any text you like to suggest?
07:26 _ikke_ !book
07:26 gitinfo 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:27 _ikke_ pro git has some chapters about the internals
07:28 Xatenev joined #git
07:34 basiclaser joined #git
07:35 armyriad joined #git
07:35 Random832 joined #git
07:39 kfunk joined #git
07:40 armyriad joined #git
07:40 xall_ joined #git
07:40 Xenophon1 joined #git
07:41 aw1 joined #git
07:47 PCatinean joined #git
07:47 PCatinean hello all
07:47 MTecknology left #git
07:47 PCatinean I have a git repository and I have no idea what a directory inside it represents
07:47 thiago which one?
07:47 aendrew joined #git
07:47 PCatinean If I look at it in bitbucket it shows a two-folder icon, locally it's empty and when I try to update submodule it says there is no submodule
07:47 PCatinean yet when I delete the empty directory it shows deleted content that's supposed to be inside it
07:48 PCatinean I'm confused :))
07:48 _ikke_ PCatinean: It might be just a gitmodule
07:48 thiago git ls-tree -r HEAD: | grep thatpath
07:48 _ikke_ which happens when you add a directory with a git repository in it
07:48 thiago what does it say?
07:48 _ikke_ thiago: no need for grep
07:49 _ikke_ git ls-tree path/to/module
07:49 _ikke_ git ls-tree HEAD path/to/module
07:49 PCatinean _ikke_, could very well be, how can I use it? :))
07:49 thiago indeed, no need for grep
07:49 thiago PCatinean: what does it say?
07:49 _ikke_ PCatinean: It's not very usefull on it's own
07:49 PCatinean 160000 commit c120552344e77d55324beab1e590449449908eddphp-product-configurator
07:49 _ikke_ right
07:49 PCatinean _ikke_, should I delete and add as submodule instead?
07:49 thiago it's a submodule
07:50 _ikke_ gitmodule*
07:50 thiago do you want to manage it with git submodule?
07:51 schleppel joined #git
07:52 mikecmpbll joined #git
07:53 PCatinean thiago, not neccesairly, though it does have the perk of getting the latest version when cloning recursively
07:53 trondth left #git
07:53 thiago well, it's up to you
07:53 kurkale6ka joined #git
07:54 _ikke_ by default it doesn't
07:54 _ikke_ git submodules are meant to track a specific commit
07:54 narendraj9 joined #git
07:55 wandering_vagran joined #git
07:56 telephone joined #git
07:56 telephone joined #git
07:57 marcogmonteiro joined #git
07:57 netroxen joined #git
07:59 rangergord joined #git
07:59 rangergord hi
08:00 PCatinean _ikke_, oh I see, and there's no way to have it update automatically on each pull?
08:01 bongjovi joined #git
08:02 cqi joined #git
08:02 rangergord I'm pushing a ~500KB binary file to bitbucket a few times a day. Since it's encrypted data the file is 99% different every time. I really only need to keep the last month or so alive. What commands can I run to delete all repo history older than 30 days, so that bitbucket isn't holding on to large, old and useless data? I know I could use the --depth option when cloning, but let's say I wanted to
08:02 rangergord clean up the repo itself.
08:02 scoobertron joined #git
08:02 _ADN_ joined #git
08:03 _ikke_ A combination of man git replace and man git filter-branch
08:03 gitinfo the git-replace manpage is available at https://gitirc.eu/git-replace.html
08:03 gitinfo the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html
08:03 _ikke_ No automated way (because it's not really where git was built for)
08:04 _ikke_ with git replace --graft, you can change a commit to be a root commit (no parents), and with filter-branch, you can make this change permanent
08:04 rangergord allright, reading up. thanks
08:04 _ikke_ note that this means you will be rewriting the history every time you do this
08:05 rangergord that's OK. So replace locally, force-push, and all is well...
08:05 _ikke_ right
08:07 djh joined #git
08:09 DaGoaty joined #git
08:11 zturner joined #git
08:12 elect joined #git
08:13 Glooomy joined #git
08:14 Cabanossi joined #git
08:14 narendraj9 joined #git
08:15 kurkale6ka joined #git
08:15 zulutango joined #git
08:15 JeroenT_ joined #git
08:16 iamasamosa joined #git
08:18 kurkale61 joined #git
08:18 raspado joined #git
08:18 bdesemb joined #git
08:18 aw1 joined #git
08:20 cagomez joined #git
08:20 kurkale6ka joined #git
08:21 a_thakur joined #git
08:22 JeroenT joined #git
08:22 davidomanfredo joined #git
08:22 circ-user-zNiD2 joined #git
08:23 kwmiebach___ joined #git
08:23 JeroenT_ joined #git
08:24 tarkus How to tweak the "upstream" branch to be fetch-only (in order to avoid accidentally pushing to it)
08:25 rominronin joined #git
08:25 aard joined #git
08:26 Xatenev tarkus, http://stackoverflow.com/questions/1662205/how-to-make-a-git-repository-read-only
08:27 tarkus Xatenev, when I run "git remote -v" there are two URLs in the "upstream" repo - fetch and pull, i was wondring, maybe there is a way to remove the second one..
08:28 tarkus * (fetch) and (push)
08:29 manveru joined #git
08:29 miha_S7_ joined #git
08:31 ploop joined #git
08:32 gregwork joined #git
08:33 tourdownunder joined #git
08:34 marcogmonteiro joined #git
08:37 clmsy joined #git
08:38 notebox joined #git
08:39 flaviodesousa joined #git
08:40 causasui joined #git
08:40 rvgate joined #git
08:42 lebster joined #git
08:43 Rhonda joined #git
08:44 Rhonda joined #git
08:45 miha_S7_ joined #git
08:46 acetakwas joined #git
08:46 iamashishkebab2 joined #git
08:47 iamashishkebab2 joined #git
08:48 iamasamosa joined #git
08:48 MatthewAllan93 joined #git
08:48 ndim joined #git
08:48 Levex joined #git
08:48 manuelschneid3r joined #git
08:49 arecaceae joined #git
08:49 aw1 joined #git
08:50 bronson joined #git
08:50 seni joined #git
08:51 cagomez joined #git
08:54 LOMAS what this signifies : "@@ -1,252 +0,0 @@"
08:57 nineg joined #git
08:58 Ozymandy joined #git
08:58 rafalcpp joined #git
08:58 cstratak joined #git
08:59 tvw joined #git
09:00 milkshoes joined #git
09:00 tourdownunder joined #git
09:00 marcogmonteiro joined #git
09:00 davidomanfredo joined #git
09:03 mikecmpbll joined #git
09:05 pizzaops joined #git
09:06 Archrover joined #git
09:07 MindfulMonk joined #git
09:07 JeroenT joined #git
09:08 JeroenT joined #git
09:09 Vampire0 LOMAS, before the patch the hunk starts at line 1 and is 252 lines long, after the patch the hunk starts at line 0 and is 0 lines long.
09:09 dre_ joined #git
09:10 zturner joined #git
09:10 tourdownunder joined #git
09:11 LOMAS Vampire0, :)
09:19 OnTheTrumpPatrol joined #git
09:20 OnTheTrumpPatrol left #git
09:20 a_thakur_ joined #git
09:23 cagomez joined #git
09:24 ams__ joined #git
09:29 Cabanossi joined #git
09:32 borkr joined #git
09:33 bilal_ joined #git
09:35 lordjancso joined #git
09:35 zulutango joined #git
09:37 seni1 joined #git
09:37 sarri joined #git
09:37 sarri joined #git
09:41 timewalker joined #git
09:44 Snugglebash joined #git
09:47 leeN joined #git
09:49 mikecmpbll joined #git
09:50 tourdownunder joined #git
09:52 earnestly joined #git
09:53 tourdownunder joined #git
09:55 PioneerAxon joined #git
09:57 YuGiOhJCJ joined #git
09:58 lohfu joined #git
10:00 Travis-42 joined #git
10:00 davidomanfredoo joined #git
10:00 h12o joined #git
10:01 jackrandom joined #git
10:01 EliteBook2560p joined #git
10:02 aielima joined #git
10:03 EliteBook2560p left #git
10:03 JeroenT joined #git
10:11 ferr joined #git
10:12 njbair joined #git
10:14 nowhereman joined #git
10:14 h12o joined #git
10:16 Maple__ joined #git
10:16 Maple__ joined #git
10:16 Maple__ joined #git
10:18 circ-user-zNiD2_ joined #git
10:18 fragMental joined #git
10:21 sbasso joined #git
10:22 zefferno joined #git
10:23 tourdownunder joined #git
10:26 re1 joined #git
10:27 tourdownunder joined #git
10:27 dendazen joined #git
10:29 Cabanossi joined #git
10:30 amikiri joined #git
10:31 zefferno joined #git
10:31 Snugglebash joined #git
10:31 tourdownunder joined #git
10:33 mischat joined #git
10:33 cebula joined #git
10:34 Karazhan joined #git
10:34 Maple__ joined #git
10:34 Maple__ joined #git
10:34 Maple__ joined #git
10:35 Karazhan joined #git
10:36 murii_ joined #git
10:36 tourdownunder joined #git
10:36 Karazhan joined #git
10:38 govg joined #git
10:38 JeroenT joined #git
10:39 BSAlb joined #git
10:39 Karazhan joined #git
10:40 Karazhan joined #git
10:41 BSAlb joined #git
10:41 JimDungo joined #git
10:42 Darcidride joined #git
10:42 tourdownunder joined #git
10:43 Karazhan joined #git
10:44 circ-user-zNiD2 joined #git
10:46 sbulage joined #git
10:47 ronskisika joined #git
10:48 tourdownunder joined #git
10:49 denisMone joined #git
10:50 bdesemb joined #git
10:51 bronson joined #git
10:51 tourdownunder joined #git
10:52 cebula joined #git
10:53 zefferno joined #git
10:55 plos joined #git
10:58 D4R5C0D3 joined #git
11:00 ronskisika joined #git
11:01 perrier-jouet joined #git
11:03 mbrevda joined #git
11:04 mbrevda is there a way to do the reverse of `git rev-list master --first-parent --count`? I.e. take a count and point it back at a revision?
11:05 grawity that's master~<count>
11:05 grawity which always follows the first parent
11:06 mbrevda `git rev-list master~339`?
11:06 _ikke_ rev-parse
11:07 grawity the opposite of *that* might be name-rev
11:07 grawity so you can try `git name-rev <commit>` and it should return "master~100"
11:07 mbrevda git rev-parse master~339? " fatal: ambiguous argument"
11:09 Vampire0 mbrevda, do you maybe have a tag named "master"? While for me this just warns that the refname is ambiguous, but still returns the SHA
11:09 Vampire0 mbrevda, what Git version are you using?
11:09 HoierM joined #git
11:09 Cavallari joined #git
11:09 mbrevda no, master is a branch
11:09 mbrevda 2.11.1
11:10 JeroenT joined #git
11:10 sturner joined #git
11:11 JeroenT joined #git
11:11 MineCoins joined #git
11:11 tourdownunder joined #git
11:11 Vampire0 mbrevda, what does `git for-each-ref | grep master` say?
11:12 Vampire0 mbrevda, and was " fatal: ambiguous argument" the full error message, or was there more shown?
11:12 mbrevda ...85aee7 commitrefs/heads/master
11:12 mbrevda ....85aee7 commitrefs/remotes/origin/master
11:12 mbrevda https://www.irccloud.com/pastebin/uEHCYzJp/
11:13 kexmex joined #git
11:13 i7c the commit does not exist?
11:14 i7c Maybe you don’t have 339 commits on this branch?
11:14 Cabanossi joined #git
11:14 i7c Or 340 for that matter.
11:14 Glooomy joined #git
11:14 _ng joined #git
11:14 askb joined #git
11:14 romank joined #git
11:15 blackwell joined #git
11:15 mbrevda but this gives me 339? git rev-list master --first-parent --count
11:15 i7c Yes.
11:15 mbrevda ah, so -1
11:15 i7c If you have 339 commits, can you have 339 parents of a commit?
11:15 i7c Exactly.
11:16 mbrevda ok. Now, shouldnt that be the second to last commit?
11:16 MattMaker joined #git
11:16 i7c Second to last commit is master~1.
11:17 Vampire0 or short master~
11:17 Vampire0 or if master is checked out even @~
11:17 MattMaker joined #git
11:17 i7c And also master^
11:17 mbrevda thanks!
11:17 i7c :D
11:18 MattMaker joined #git
11:18 wrouesnel1 joined #git
11:18 gitinfo mbrevda: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person but don't expect immediate increase. Ten thanks make up one karma point.
11:19 MattMaker joined #git
11:19 MattMaker joined #git
11:20 DARSCODE joined #git
11:20 MattMaker joined #git
11:21 MattMaker joined #git
11:26 sbasso joined #git
11:27 macrover joined #git
11:27 bdesemb joined #git
11:29 canton7 heh, someone's out after karma :P
11:30 kristofferR joined #git
11:31 alexandre9099 joined #git
11:31 NvpkD1y7Ez joined #git
11:31 Tobbi joined #git
11:32 Xatenev karma .canton7
11:32 Xatenev .karma canton7
11:33 gitinfo the Genuine Real Life Karma™ REST API results are back! c‍anton7: 112 (0 in past 30 days) (3 given out)
11:33 Xatenev .karma xatenev
11:33 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
11:33 Xatenev .karma Xatenev
11:33 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
11:33 Xatenev Somebody stole my karma
11:33 * Xatenev calls git police
11:34 bremner the dogma ate it
11:35 canton7 it's something like 10 "thanks" per karma
11:36 _ikke_ correct
11:36 DerpTruck left #git
11:36 canton7 yeah: https://github.com/jast/gitinfo/blob/b3dd9d99ea5493486cde39540a0cef549e5d6180/plugins/thanks.pm#L40
11:36 VampiricPadraig joined #git
11:36 gitinfo canton7: you're welcome, but please note that I'm a bot. I'm not programmed to care.
11:36 canton7 hah!
11:36 bremner dogma++
11:36 _ikke_ lol
11:37 canton7 .topkarma
11:37 gitinfo top karmic beings of past 30 days ('all' arg to see totals): v‍ampire0: 4,  o‍sse: 3,  _‍ikke_: 3,  k‍adoban: 1,  j‍ast: 1
11:37 canton7 .topkarma all
11:37 gitinfo top karmic beings of all time: o‍sse: 275,  _‍ikke_: 240,  c‍break: 145,  s‍eveas: 116,  g‍rawity: 113
11:37 canton7 aww, I've been bumped from the list
11:37 _ikke_ Vampire0 is making a run
11:39 cagomez joined #git
11:40 hwoarang joined #git
11:42 visual canton7: hey can you invite me to c# pls
11:42 visual why'd you put invite only on the channel anyway?
11:42 caper joined #git
11:43 canton7 the channel's ##csharp
11:43 visual :!O
11:43 visual oh right
11:43 visual canton7: can i /pm/ you?
11:43 canton7 no
11:43 visual canton7: pls
11:43 canton7 no
11:43 visual rats!
11:44 Cabanossi joined #git
11:44 visual are you still mad at me for saying javascript is scripts written in java
11:45 Silox| joined #git
11:45 zefferno joined #git
11:47 kurkale61 joined #git
11:47 mkalfon_ joined #git
11:48 dsdeiz joined #git
11:53 njbair joined #git
11:55 davidomanfredo joined #git
11:55 zxd joined #git
11:56 zturner joined #git
11:56 romank joined #git
11:57 Xenophon1 joined #git
11:58 netj joined #git
11:59 Glooomy joined #git
11:59 kyan joined #git
12:05 HardlySeen joined #git
12:07 Vampire0 yay, cool, probably the first time in at place 1 in the topkarma list :-D
12:07 Vampire0 probably because of the Git newbie I helped some hours ago, I probably got 1 karma point just from him yesterday. *g*
12:08 hwoarang joined #git
12:08 Altiare joined #git
12:09 sbasso joined #git
12:09 zefferno joined #git
12:11 romank joined #git
12:11 ppang joined #git
12:11 dka joined #git
12:11 dka what coverage result is the most relevant to display on my README.md on github ? (1) statements, (2) branch, (3) funcs, (4) lines
12:11 Archrover left #git
12:11 mentazoom joined #git
12:12 NeXTSUN joined #git
12:14 visual coverage?
12:14 visual usually the README is for installation instructions if you dont have a /wiki/
12:15 davidomanfredo joined #git
12:17 kurkale6ka joined #git
12:17 visual hey can i cherry pick which changes to /stash/?
12:18 linuxmodder joined #git
12:18 circ-user-zNiD2_ joined #git
12:19 tobiasvl visual: git stash save -p ?
12:20 dka visual, people start to display code coverage on the readme
12:21 visual tobiasvl: :O! worked like a sex
12:21 visual thanks tobiasvl
12:21 tobiasvl np
12:23 visual tobiasvl: wait, stash lets me select only chunks, do you know of a way to cherrypick files?
12:25 NeXTSUN joined #git
12:25 solution_ joined #git
12:25 tobiasvl visual: files, no, not really
12:26 caper joined #git
12:27 ssarah joined #git
12:27 visual how do i see a shash? and why isnt git stash show {nr} working?
12:27 visual http://prntscr.com/f5swrc
12:27 JeroenT joined #git
12:27 osse visual: press 'a' instead of 'y'
12:27 visual what did you mean by this?
12:28 tobiasvl visual: git stash show stash@{2}
12:28 visual right, thanks tobiasvl )
12:28 visual any way to make it more verbose than just showing the file?
12:28 dsdeiz joined #git
12:29 tobiasvl for example git stash show -p stash@{2}
12:30 zxd joined #git
12:30 tobiasvl it supports any format known to "git diff" according to man git stash
12:30 gitinfo the git-stash manpage is available at https://gitirc.eu/git-stash.html
12:30 visual right, thanks tobiasvl :J
12:31 kurkale6ka joined #git
12:31 seni1 joined #git
12:32 hwoarang joined #git
12:34 synthroid joined #git
12:34 tourdownunder joined #git
12:34 hwoarang joined #git
12:37 synthroi_ joined #git
12:37 ojdo joined #git
12:40 fmcgeough joined #git
12:41 visual git stash drop = remove?
12:41 visual it says stash drop =  i.e., do the inverse operation of git stash save . , but that would be shash pop, right?
12:41 visual what is the remove command?
12:42 tobiasvl visual: it is drop, yes
12:42 visual tobiasvl: thx
12:42 tobiasvl pop = apply + drop (if apply was clean)
12:45 BackEndCoder joined #git
12:46 zaratustra joined #git
12:46 livingstn joined #git
12:47 dka joined #git
12:48 valkyr2e joined #git
12:49 hwoarang_ joined #git
12:50 ableto joined #git
12:50 Gurkenglas joined #git
12:50 gugah joined #git
12:51 Snugglebash joined #git
12:52 bronson joined #git
12:52 miha_S7_ joined #git
12:52 Chuguniy joined #git
12:54 TheSimonator joined #git
12:55 jeffreylevesque joined #git
12:56 ShapeShifter499 joined #git
12:58 UTAN_dev joined #git
12:58 tourdownunder joined #git
12:58 iaj joined #git
13:00 iaj hi folks!  having a little question here... When I got the .gitignore with a line .vim/plugged/     but git status gives me modified:   .vim/plugged/tcomment_vim (new commits)    << how can I remove that from being staged?
13:00 IRQ` joined #git
13:00 tobiasvl iaj: just don't stage it. git status mentions it because it is already tracked, and !ignore_tracked applies
13:00 gitinfo iaj: Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
13:02 Snugglebash joined #git
13:02 blackwind_123 joined #git
13:03 ExoUNX joined #git
13:03 marcogmonteiro joined #git
13:04 macrover joined #git
13:04 JeroenT joined #git
13:05 Marquisk2 joined #git
13:07 FilipNortic joined #git
13:07 roby10 joined #git
13:09 gaucheph joined #git
13:09 davidomanfredo joined #git
13:09 cdg joined #git
13:09 dka joined #git
13:13 ij joined #git
13:13 Nilesh___ joined #git
13:13 Silenced joined #git
13:14 Cabanossi joined #git
13:17 ij Hello dear gits. I am pulling from a local non-bare remote into a bare remote. My bare repo gets copied onto another machine and `git show` doesn't work any more, because it has coped some absolute paths into the bare one. http://sprunge.us/OAKM
13:18 guest___ joined #git
13:18 grawity hmm, how exactly did you "pull" from that repo?
13:18 grawity `git clone` should take care of everything properly
13:18 cdown joined #git
13:20 JeroenT joined #git
13:20 Gsham joined #git
13:22 shinnya joined #git
13:22 plos joined #git
13:22 MattMaker joined #git
13:22 Sound joined #git
13:22 Sound joined #git
13:23 PioneerAxon joined #git
13:23 aard joined #git
13:25 guest___ joined #git
13:26 northfurr joined #git
13:26 fission6 joined #git
13:27 h12o joined #git
13:27 zturner joined #git
13:31 JeroenT joined #git
13:31 justin2 joined #git
13:32 ij I initially cloned, yes.
13:32 grawity hmm
13:33 grawity well, go back to the original machine, run `git repack -da`, and remove that alternates file
13:34 guardianJ joined #git
13:34 grawity and next time, when dealing with such remotes, clone with --dissociate
13:34 zmo joined #git
13:34 zmo hi ????
13:34 ij grawity, Sounds like you might be on to something.
13:34 zmo is there a label that refers to the last branch?
13:34 grawity (or maybe --no-local, should work as well)
13:34 AaronMT joined #git
13:34 zmo so I can do like: `git checkout LAST`
13:35 ij Did you read about it just now? Why did you initially think just git-clone would work?
13:35 grawity zmo: @{-1} or in some commands -
13:35 zmo grawity - cool, I knew there was something ♥
13:35 grawity ij: because the defaults weren't what I expected them to be
13:35 ij So you assumed --disassociate the default?
13:35 grawity yes
13:35 ij +'s
13:35 Levin^ joined #git
13:35 Levin^ hello there
13:35 a_thakur joined #git
13:36 altendky joined #git
13:36 Levin^ I need a free file comparison tool for mac...
13:36 zmo and another related question: is there a similar label for current branch? so I can do `git push origin CURRENT`?
13:36 zmo (without setting it to tracking)
13:36 Levin^ I've used the trial version of Kaleidoscope, but... it... expired
13:36 ij grawity, You're the man!
13:36 _ikke_ HEAD
13:36 grawity HEAD might do, but it won't be accepted by `git push` (you'd need at least `git push origin HEAD:master`)
13:36 _ikke_ grawity: iirc, it works
13:37 grawity hmm
13:37 grawity might depend on that option which chooses the upstream branch
13:37 zmo grawity - oh, so there's no short way to express that :/
13:37 livingstn joined #git
13:38 zmo basically my current branch is foobar, and I want a shorter way to write `git push origin foobar` without doing a git push -u origin foobar
13:38 grawity zmo: well, just `git push origin` or `git push` might work
13:38 grawity zmo: depending on the push.default config
13:38 zmo (basically, same behaviour, but explicit rather than implicit)
13:39 zmo exactly, push.default is set to another remote
13:39 Timvde What's the best way to cherry-pick a commit as a fixup for another commit?
13:39 Timvde (I want to amend a commit that is not in my branch to an existing commit)
13:40 Timvde I can of course cherry-pick, rebase -i and manually reorder and fixup, but I was just curious if there's a quicker way to do it
13:40 grawity not really
13:40 dave0x6d joined #git
13:41 Timvde Okay, thanks, then I'll do it like this :) If anyone does think of another way, let me know :)
13:41 cfoch-always when I do "git branch" when bisecting, I get the following output
13:41 cfoch-always * (no branch, bisect started on branch_name)
13:41 cfoch-always is there way to get that information more structured?
13:41 Timvde (Mostly curious, it took me like 15 seconds or so, so I already lost more time just asking :P)
13:42 grawity .git/bisect-*
13:42 gypsydave5 joined #git
13:42 grawity that's what git-prompt (contrib/completion/) digs information out of
13:42 grawity not really nice tbh, but it's there
13:43 cfoch-always "cat .git/BISECT_START" do what I want, however is there something more direct?
13:43 cfoch-always like a git command shortcut?
13:44 gbt joined #git
13:45 Snugglebash joined #git
13:45 notebox joined #git
13:45 guest___ joined #git
13:45 chrisM_1 joined #git
13:47 lindenle joined #git
13:47 visual is there a clever way to find out which was the "origin" branch of a branch?
13:48 visual like when you did "git branch new_branch", which branch it inherited? :/
13:48 visual does the question make sensE?
13:48 JeroenT joined #git
13:49 _ikke_ This information is not really tracked
13:49 _ikke_ So there is no easy way to get that information
13:49 visual blows, but i guess it had some limitations
13:49 visual thx
13:49 apax joined #git
13:50 Xatenev visual, You can go over different ways and grep for the commit history On that branch, and find the nearest commit on different branches
13:50 Xatenev visual, as described in the 2nd answer here: http://stackoverflow.com/a/17843908/3223157
13:50 Xatenev Something like that worked for me months ago
13:50 cfoch-always isn't there a way for example to know if I am bisecting (Just get True or False)?
13:51 cfoch-always 1 or 0 (for example)
13:51 visual Xatenev: Спасибо!
13:51 borkr joined #git
13:51 Xatenev visual, :)
13:56 malmalmal joined #git
13:59 ij How do I list object directories/
13:59 visual ls?
13:59 visual what object?
14:02 Vampire0 cfoch-always, `git status` e. g. tells you that you are bisecting and from which branch you started
14:03 Vampire0 cfoch-always, and I think the existence of the .git/BISECT_* files are the sign that you are currently bisecting
14:03 cfoch-always Vampire0: and how do I parse that? it may be bisecting/detached (IDK what else and IDK if the message will always be the same)?
14:03 Kronuz joined #git
14:04 Vampire0 cfoch-always, how do you parse what and what exactly do you want to know?
14:04 Vampire0 cfoch-always, just check for existence of .git/BISECT_START to know whether you are bisecting
14:04 chll_ joined #git
14:07 Hunter1_ joined #git
14:12 RxMcDonald joined #git
14:13 RxMcDonald Hello, I'm trying to merge, I resolved the conflicts manually and removed the >>>>HEAD etc annotations in the files, then git merge again and it says that I have unmerged files... ?
14:13 Hello71 !give cfoch-always xy
14:14 Hello71 !xy
14:14 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
14:14 Hello71 RxMcDonald: git status
14:14 Cabanossi joined #git
14:14 tristanp_ joined #git
14:14 RxMcDonald oh yea
14:15 Gsham joined #git
14:16 oskarkv joined #git
14:18 redoverture joined #git
14:18 circ-user-zNiD2 joined #git
14:19 ResidentBiscuit joined #git
14:20 raspado joined #git
14:21 Emperor_Earth joined #git
14:21 rasto joined #git
14:21 synthroid joined #git
14:22 dglambert joined #git
14:23 dglambert yo
14:23 Vampire0 oy
14:23 ij Can refs be of format "SHA1 path" What is the path there for?
14:24 Vampire0 ij, what and where exactly do you mean?
14:24 visual what does this mean? "warning: deleting branch '05.05_feedback' that has been merged to 'refs/remotes/origin/05.05_feedback', but not yet merged to HEAD."
14:24 menip joined #git
14:24 Vampire0 ij, a ref is some name pointing to something, e. g. a SHA
14:24 ij Vampire0, Ref is a file inside a .git, right?
14:24 raffo joined #git
14:25 ij Like .git/HEAD or .git/refs/heads/master.
14:25 Vampire0 visual, you are trying to delete a branch that was merged into the mentioned branch, but not into the history you currently have checked out
14:25 Vampire0 ij, a ref can be stored in such a file, yes. It can also be stored inside a pack file though
14:25 visual Vampire0: thx
14:26 zturner joined #git
14:26 Vampire0 ij, and where do you see a path and what do you intend to do?
14:26 Vampire0 visual, yw
14:26 ij In the FETCH_HEAD. I intend to find out what purpose does it serve.
14:29 mizu_no_oto joined #git
14:32 ForeignBiscuit joined #git
14:32 ForeignBiscuit joined #git
14:32 Vampire0 ij, if you fetch, the fetched commit is stored in FETCH_HEAD. FETCH_HEAD can even have multiple lines if you fetched several things. If you resolve FETCH_HEAD, just the first 40 characters are taken as SHA. The information behind the SHA tells you what you fetched. If you e. g. do `git fetch origin refs/heads/master`, then the fetched  commit is not stored anywhere like in the remote tracking branch, but y
14:32 Vampire0 ou can access the fetched commit using FETCH_HEAD
14:32 caper joined #git
14:33 mikecmpbll joined #git
14:35 Kronuz joined #git
14:37 armyriad joined #git
14:37 marcogmonteiro joined #git
14:38 visual bash-4.3$ git merge --no-ff repair
14:38 visual error: merge is not possible because you have unmerged files.
14:38 visual >merge is not possible because you have unmerged files
14:38 visual >you cant solve this problem because this problem isnt solved
14:39 _ikke_ visual: You still have a merge conflict
14:39 visual yeah im trying to resolve it
14:39 _ikke_ you cannot do a new merge before you solve the conflict
14:39 meadmoon joined #git
14:39 _ikke_ well, you do not solve it by trying to merge again
14:39 _ikke_ !conflict
14:39 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
14:39 visual so how do i see the confclit? :I
14:40 _ikke_ git status shows you the unmerged files
14:40 _ikke_ Check that video linked to get a basic gist
14:40 visual jesus christ something went wrong as fuck
14:40 kinlo left #git
14:40 plos joined #git
14:40 visual http://i.imgur.com/nZrWujN.png
14:40 _ikke_ You can use git merge --abort to undo the merge
14:41 todd_dsm joined #git
14:41 visual bam! aborted like an unwanted baby!
14:41 visual thanks _ikke_ !
14:43 fenikso joined #git
14:44 visual http://i.imgur.com/p0GU3ml.png
14:44 kiwieater joined #git
14:44 visual right.. what's the next step of this master plan?
14:45 crose joined #git
14:46 _ikke_ So somehow the repair branch conflicts with the branch you are trying to merge into
14:46 redoverture_ joined #git
14:46 visual yeah, so i have to resolve them in-file now, right?
14:46 visual between the <<<<<< and >>>>>
14:47 macrover joined #git
14:47 duderonomy joined #git
14:48 TbobbyZ joined #git
14:48 tarkus joined #git
14:49 D4R5C0D3 joined #git
14:49 ij If I detect that there are multiple packfiles I do git gc. Can I do both checking and repacking with git-repack somehow?
14:50 theoceaniscool joined #git
14:50 kristofferR joined #git
14:50 _ikke_ visual: correct. There also exist tools to aid this process
14:51 zivester joined #git
14:51 visual right, thanks _ikke_
14:52 synthroi_ joined #git
14:52 TbobbyZ_ joined #git
14:53 bronson joined #git
14:53 Gsham joined #git
14:53 theoceaniscool joined #git
14:56 redoverture joined #git
14:57 varo joined #git
14:57 varo hello all
14:58 varo how can I tell git merge to ignore previous resolutions?
14:59 _ikke_ varo: you mean rerere?
14:59 Cabanossi joined #git
14:59 PHPanos joined #git
14:59 varo no idea, when I do merge git tells me 'Resolved 'path/to/file' using previous resolution.'
14:59 _ikke_ right
15:00 _ikke_ git rerere forget path/to/file
15:00 varo _ikke_: is there a way to forget all previous resolutions (i.e. more than one file)?
15:00 varo or should I just use find
15:01 justin2 joined #git
15:01 _ikke_ You can completely disable rerere (it has to be enabled to work)
15:02 varo that works, thanks
15:03 guampa joined #git
15:06 synthroid joined #git
15:07 timewalker joined #git
15:07 Kronuz joined #git
15:08 roelmonn_ joined #git
15:09 Snugglebash joined #git
15:13 prsn joined #git
15:14 MattMaker joined #git
15:14 prsn hi, what does "warning: no common commits" in git pull's output really mean?
15:14 prsn google results make it sound scary, but it's been happening to me with no discernible negative effects
15:14 prsn history is still how i expect, etc
15:15 osse prsn: one of the branches you fetched didn't stem from one of the branches you alreadu have
15:15 mikecmpbll joined #git
15:16 King_Hual joined #git
15:16 raspado joined #git
15:16 PHPanos joined #git
15:16 prsn osse: does that mean it's expected every time there's "* [new tag]"?
15:17 osse no
15:17 FilipNortic_ joined #git
15:17 linuxmodder_ joined #git
15:18 prsn the listed branches pulled were master, which is the one i inspected for problems, and a [new tag] which i don't really care about
15:18 dka joined #git
15:18 prsn so it seems like it has to be one of those?
15:19 MDA2 joined #git
15:19 osse probably master
15:19 King_Hual` joined #git
15:20 prsn ok, so what does that mean?
15:20 prsn one other person is working on this repo, and made changes to one file
15:20 osse prsn: do 'git merge-base foo bar' where foo is one of your branches and bar is the pulled master (e.g. origin/master)
15:20 prsn i got those changes, everything seems fine
15:21 prsn what will that do, and how did i get into a state where it needs doing?
15:21 steeze joined #git
15:21 masuberu joined #git
15:22 osse I don't know how else to formulate it: the branch you pulled has no commits you have, and you have no commits that one has
15:22 osse it won't "do" much. it will just tell you the merge base (ie. latest common commit). I expect it to print nothing
15:22 osse or maybe the current commit
15:23 osse also it doesn't need doing. it's something i'm asking you to run to investigate
15:23 prsn it printed the third most recent commit
15:23 osse because I am not in front of your computer
15:23 prsn gotcha, it sounded like a possibly destructive thing, but i get it now
15:23 linuxmodder- joined #git
15:23 osse ok, how about git rev-list --max-parents=0 --all
15:24 prsn that prints the very first hash in git log
15:24 prsn ie, the one at the bottom
15:24 osse just one?
15:24 prsn yep
15:25 osse then I don't understand how that warning appeared in the first place
15:25 osse it seems to be wrong
15:25 prsn and like, the hypothesis that it's really master that has no common commits seems obviously wrong to me
15:25 prsn yeah
15:25 prsn we've been successfully pulling each other's commits just fine for quite some time while this warning has appeared
15:26 publio joined #git
15:26 prsn it seems like it has to have to do with the * [new tag] entry? but i don't really understand tags, so maybe that's obviously wrong
15:27 osse a tag is sort of like a branch that you can never update
15:29 dreiss joined #git
15:29 prsn i'm searching my terminal history, and it looks like it only happens when new tags are present, but doesn't always happen when they are
15:30 prsn but always doesn't when they aren't
15:31 prsn hm, maybe not. i found one with a new tag that resulted in an "error: Your local changes..." but no "no common commits". Not sure if the error happens first and aborts before the warning is emitted..
15:34 cstratak joined #git
15:34 heftig how can I find all leaves of the history?
15:34 Snugglebash joined #git
15:35 brent__ joined #git
15:35 heftig er, the commit graph
15:36 j08nY joined #git
15:36 _ADN_ joined #git
15:37 brent__ joined #git
15:38 fahadash joined #git
15:38 _ikke_ heftig: normally there is always a ref pointing to a leaf, but there can also be refs pointing to non-leafs
15:39 _ikke_ I think the only way is to count how many commits are pointing to a certain commit
15:40 jth41 joined #git
15:40 TbobbyZ joined #git
15:40 kexmex joined #git
15:42 madewokherd joined #git
15:43 TomyLobo joined #git
15:43 ronskisika joined #git
15:43 RxMcDonald left #git
15:44 plagasul joined #git
15:44 plos joined #git
15:44 NeverDie joined #git
15:45 overlord_tm joined #git
15:47 malmalmal Hello, I am having problems cloning a remote repo. The problem is with the path. Thing is usually I see the path used when cloning ends with /nameOfRepo.git but I created my repo using git init, without a name (as far as I understand) this confuses me.
15:48 achadwick joined #git
15:49 cstratak_ joined #git
15:50 malmalmal "git clone ssh://user@server/path/.git" does not work. although I am unsure that the unnamed repo is responsible for that, I would appreciate if someone explain, please.
15:50 ij Should I «git gc» or «git repack …»?
15:51 Murii joined #git
15:52 _ikke_ ij: normally you do no have to do those things yourself..
15:52 zturner joined #git
15:52 hobodave joined #git
15:53 D4R5C0D3 joined #git
15:53 orbyt_ joined #git
15:54 _ikke_ ij: What do you want to achieve?
15:54 gaucheph joined #git
15:54 TbobbyZ joined #git
15:55 SlashLife joined #git
15:55 ij I want to use a bare git repo to compress and deployment archive creation.
15:55 cagomez joined #git
15:55 masuberu joined #git
15:56 hobodave_ joined #git
15:57 TheSimonator joined #git
15:59 kiwieater joined #git
15:59 snowkidind joined #git
16:00 lafleurdubien joined #git
16:03 rkazak joined #git
16:04 Nilesh___ joined #git
16:05 a_thakur joined #git
16:06 orbyt_ joined #git
16:09 TheCycoONE joined #git
16:11 Dougie187 joined #git
16:11 TheCycoONE using git for windows, when trying to look through older entries in git log I get swamped with lines like "Syntax Error (189898): Illegal chracter <6f> in hex string" - any pointers on how that happens or at least how I can silence them?
16:11 TheCycoONE they make it impossible to read the log
16:12 async-await joined #git
16:12 malmalmal Hello, when attempting to clone a remote repo hosted on bluehost, I am getting a strange error related to git upload-pack, that mentions possible corruption on remote side. I tried re-initing the repo with no luck. This is the error: https://paste.ofcode.org/HZZRMa8iBKEcP9cgJgjqa7
16:13 async-await hey! Is anyone who is involved in open source projects willing to answer three questions? It’s for a college assignment, it won’t take more than five minutes :-P.
16:13 dave0x6d joined #git
16:15 prsn left #git
16:15 CheckDavid joined #git
16:15 synthroid joined #git
16:16 TheCycoONE --no-textconv seems to silence the errors
16:16 ZexaronS joined #git
16:17 kfoonamalik joined #git
16:17 Levin^ I need a free file comparison tool for mac...
16:17 Levin^ I've used the trial version of Kaleidoscope, but... it... expired
16:17 synthroi_ joined #git
16:18 Levin^ do you guys use anything in that matter?
16:18 circ-user-zNiD2_ joined #git
16:20 Random832 i just use vimdiff
16:20 perlpilot Levin^: I sometimes use meld for that purpose
16:20 User458764 joined #git
16:20 jagob joined #git
16:20 perlpilot though, neither meld nor vimdiff are like Kaleidoscope
16:20 guampa joined #git
16:20 preyalone joined #git
16:20 Levin^ hm
16:21 Random832 i wouldn't say they're "not like" it. maybe "not as good"
16:21 nitric joined #git
16:21 perlpilot fair enough
16:21 Eugene I like the diff thingy included with !smartgit
16:21 gitinfo SmartGit is a (commercial) UI for git that is very user-friendly and feature-complete. http://syntevo.com/smartgithg
16:21 Random832 honestly even meld is probably better than vimdiff at what it does, i use it because i am skilled in vim
16:22 theoceaniscool joined #git
16:22 plos joined #git
16:23 ZexaronS-2 joined #git
16:23 Dougie187 left #git
16:24 Levin^ I see
16:24 ahrs joined #git
16:24 alexandre9099 joined #git
16:25 Levin^ well thanks guys
16:26 malmalmal I was getting the following error when attempting to clone a remote repo: https://paste.ofcode.org/HZZRMa8iBKEcP9cgJgjqa7 , and I fixed it by using the following global config flags on remote , http://stackoverflow.com/a/28811605/5721273 , although no idea why this is... no explanation on the answer there. Any explanation would be greatly appreciated.
16:26 Oatmeal joined #git
16:26 Random832 Levin^, you might also try kdiff3
16:27 Random832 i haven't personally used it but i've heard it is good
16:27 Levin^ oh!
16:27 ahrs joined #git
16:27 svm_invictvs joined #git
16:31 Introoter joined #git
16:33 Snugglebash joined #git
16:33 Gustavo6046 joined #git
16:33 async-await joined #git
16:34 King_Hual_ joined #git
16:38 mizu_no_oto joined #git
16:39 SteffanW joined #git
16:40 robertparkerx joined #git
16:40 durham joined #git
16:41 bipolar joined #git
16:41 TheSimonator joined #git
16:43 tango_ joined #git
16:43 rkazak joined #git
16:43 PioneerAxon joined #git
16:45 a_thakur joined #git
16:45 grazfather left #git
16:46 firef1y joined #git
16:46 northfurr joined #git
16:53 svm_invictvs joined #git
16:53 jaziz joined #git
16:54 bronson joined #git
16:57 jth41 joined #git
16:58 sarri joined #git
16:58 sarri joined #git
16:58 jth41 Can anyone help me with the post-checkout git hook? I'm having trouble with this simple scenario: https://gist.github.com/sindresorhus/7996717
16:58 imack joined #git
16:59 phinxy joined #git
16:59 jth41 I put it into place in the githooks folder and it seems to correctly run npm install
16:59 jth41 however it is still running npm install even if the file has not changed
17:02 al-damiri joined #git
17:02 miha_S7_ joined #git
17:04 TbobbyZ_ joined #git
17:05 TbobbyZ_ joined #git
17:07 Persikka joined #git
17:07 regedit joined #git
17:09 diogenese joined #git
17:11 PioneerAxon joined #git
17:11 cebula joined #git
17:12 theoceaniscool joined #git
17:15 boombatower joined #git
17:15 vals_ joined #git
17:17 matsaman joined #git
17:17 matsaman morning =)
17:18 matsaman is there a way to make a new branch based off master that only checks out particular files, not all files?
17:18 matsaman I want a future git merge master to see the remaining files as new
17:19 vals_ matsaman: no. the best you can do is git subtree
17:19 npgm joined #git
17:21 tyreld joined #git
17:21 notebox joined #git
17:22 hobodave joined #git
17:23 livingstn joined #git
17:24 matsaman how tedious =P
17:24 matsaman thanks =)
17:24 Gurkenglas joined #git
17:24 robowarrior joined #git
17:25 robowarrior hello, how can I ignore mode changes when using git apply?
17:25 robowarrior I've tried `git -c core.fileMode=false apply -R --3way $file`
17:25 aviraldg joined #git
17:25 aviraldg joined #git
17:26 thiago robowarrior: undo them after the apply
17:26 robowarrior thiago: this is the command i'm trying: `git -c core.fileMode=false apply -R --3way $file`
17:26 robowarrior how to undo after apply?
17:27 thiago probably with a script that iterates over git ls-files -m
17:27 thiago can't you ask that your contributor re-do the patch without the unnecessary modes?
17:28 robowarrior that'd be easier or is there a config option somewhere?
17:29 robowarrior like; going over the staged files, and removing ones that are "only" mode changes
17:30 cagomez joined #git
17:30 caper joined #git
17:31 cagomez joined #git
17:31 thiago it would be easier for your contributor to send you a proper patch
17:31 TikityTik joined #git
17:32 robowarrior okay, thanks :)
17:32 cagomez_ joined #git
17:33 ZexaronS joined #git
17:33 mostlybadfly joined #git
17:33 northfurr joined #git
17:33 Hunter1_ joined #git
17:35 duderonomy joined #git
17:38 Raed|Mobile joined #git
17:39 jth41 Anyone have any thoughts? http://stackoverflow.com/questions/43876375/optional-githook-behaving-as-non-optional
17:40 cdown joined #git
17:41 LionsMane joined #git
17:41 paul424 joined #git
17:42 mohabaks joined #git
17:43 imack joined #git
17:43 redoverture joined #git
17:44 redoverture Hey, does anyone know the command to revert a commit?
17:44 kadoban redoverture: !revert
17:44 gitinfo redoverture: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
17:44 guampa joined #git
17:45 Wulf joined #git
17:45 redoverture kadoban: Thanks!
17:45 kadoban Anytime
17:45 kadoban jth41: Have you checked the output of the individual commands?
17:47 brent__ joined #git
17:49 mizu_no_oto joined #git
17:49 romank joined #git
17:49 cagomez joined #git
17:50 redoverture_ joined #git
17:50 redoverture joined #git
17:51 dyek joined #git
17:52 _ikke_ weird, if I do git rev-parse ORIG_HEAD in the hook, it returns something, but in that command it says it's a bad object
17:52 valhala_22 joined #git
17:52 jth41 kadoban I am not super familiar with how to do that in shell scripts. could you point me to a simple way to throw in logging?
17:52 dreiss joined #git
17:52 druonysus joined #git
17:52 _ikke_ jth41: You can just echo things in the hook
17:53 Levin^ joined #git
17:53 _ikke_ jth41: try HEAD@{1} instead of ORIG_HEAD
17:54 alfonso_ joined #git
17:55 _ikke_ jth41: add echo $files to the hook to see what files it sees as changed
17:57 dyek Hi! What did I do wrongly with "git stash"? I started modifying a bunch of files and not ready to commit yet. In 1 modified file, I realized I wanted to move a round 1 block of text. To avoid messing up the diff when a block of text is moved in a large file, I would like to commit the move separately. So, I "git stash save ..." and committed the move of text. Then, I "git stash pop" and get conflicts after conflicts, resolved after resolved, still
17:57 dyek the stash didn't pop off, just reintroduced the changes that I already resolved and committed (prematurely, being forced by the conflict.) How do I avoid this messy "git stash" issue?
18:00 MineCoins joined #git
18:01 Sasazuka joined #git
18:01 Goplat joined #git
18:02 circ-user-zNiD2_ left #git
18:02 andschwa joined #git
18:04 felixsanz joined #git
18:05 binary10101 joined #git
18:06 demize joined #git
18:06 orbyt_ joined #git
18:06 immae joined #git
18:07 canton7 joined #git
18:07 HurricaneHarry joined #git
18:08 AndreasLutro joined #git
18:08 dcpc007 joined #git
18:08 Hunter1_ joined #git
18:09 rishi joined #git
18:10 northfurr joined #git
18:10 jth41 _ikke_ that worked! can you help me understand the difference between HEAD@{1} and ORIG_HEAD ?
18:10 dyek Could it be that I should have used "git stash apply", rather than "git stash pop"? (Missed the part about using "git stash apply" in the man pages earlier.)
18:11 imack joined #git
18:11 sbasso joined #git
18:12 apax joined #git
18:12 acetakwas joined #git
18:12 joshszep joined #git
18:12 bpna joined #git
18:13 joshszep joined #git
18:13 _ikke_ jth41: ORIG_HEAD existed before the reflog was added
18:14 sz0 joined #git
18:15 mel00010 joined #git
18:15 joshszep joined #git
18:15 orbyt_ joined #git
18:15 Raedism joined #git
18:16 joshszep joined #git
18:16 d10n-work joined #git
18:18 jth41 gotcha. thanks again _ikke_!
18:18 ozcanesen joined #git
18:18 _ikke_ ORIG_HEAD is set by some operations
18:19 _ikke_ many more update the reflog
18:19 cdown joined #git
18:19 dreiss joined #git
18:19 Vampire0 dyek, that is not messy but a security feature to not loose your changes. If `git stash pop` applies cleanly without conflicts, the entry is removed from the list of stashes. If there are conflicts, you are left with conflicted state to resolve the conflicts manually. After resolving the conflicts and being happy with the result you have to manually `git stash drop` the stash entry to remove it from the li
18:19 Vampire0 st of stashes. `git stash apply` always only applies the changes and does not remove the stash entry.
18:20 _ADN_ joined #git
18:22 dyek Vampire0: Thanks! Yup, just read more of the man pages and read part of what you mentioned. Still need to read more and try out to really be confident of the "git stash" usage...
18:23 weakdan joined #git
18:25 guampa joined #git
18:26 ij _ikke_, Did my unhighlighting reply get past you or you had nothing to add?
18:26 kfoonamalik joined #git
18:27 Levin^ left #git
18:27 dyek Vampire0: By the way, I kinda rely on "git stash pop" to restore the changes (even if there is any conflict to be resolved) and pop off what that were already restored. If both "git stash pop" doesn't pop off (remove from list of stashes), it doesn't give me a sense if it only restored part of the changes, but not all -- i.e., abort mid-way due to conflicts.
18:28 jackrandom joined #git
18:29 ryez joined #git
18:29 User458764 joined #git
18:30 misosoup joined #git
18:31 dyek Also, what counts as resolving conflicts in the case of "git stash pop" on a different commit? Do I simply resolve the "<<< === >>>" conflicts and that was it? And followed by "git stash drop" and done? Or do I need to do "git add" (and commit?) those files before conflicts are considered resolved?
18:32 MineCoins joined #git
18:32 cagomez joined #git
18:33 ToBeCloud joined #git
18:34 govg joined #git
18:34 jackrandom joined #git
18:34 MrLawrence joined #git
18:35 satifant joined #git
18:36 guampa joined #git
18:36 brandonw joined #git
18:38 jzeus joined #git
18:38 ahrs joined #git
18:39 mda1 joined #git
18:40 dreiss joined #git
18:41 PioneerAxon joined #git
18:41 transhuman_ joined #git
18:42 Raed|Mobile joined #git
18:44 macrover joined #git
18:44 transhuman_ hi! I am in need of a few questions answered. I am attempting to to train a neural net on the linux kernel history. I would like to integrate sentiment analysis as stage one on the different sections of code and its evolution over time and the bugs associates and comments and postings made relative to each section of code. Question is there any plugins for git that might help me produce a text list of this kind of
18:44 transhuman_ information by utilizing the data found in bugzilla? thanks in advance
18:45 phinxy joined #git
18:46 njs126 joined #git
18:46 valhala_22 what is difference between git remote and git  pull  new to git
18:47 grawity `git remote`
18:47 grawity er
18:47 grawity `git remote` basically manages URL bookmarks which to pull from (and push to)
18:47 northfurr joined #git
18:48 valhala_22 ty grawity but recently i got confused by word origin master  and origin/master  even read on stackoverflow
18:48 d^sh joined #git
18:49 mugwump joined #git
18:49 mugwump Hey I'm having problems getting filter-branch to make any changes at all to my tree, on Git 2.12.2 on MacOS
18:49 Peuc joined #git
18:51 D630 joined #git
18:53 nowhereman joined #git
18:54 finalbeta joined #git
18:55 cstratak joined #git
18:56 borkr joined #git
18:57 romank joined #git
19:00 raffo joined #git
19:00 howardwlo joined #git
19:00 Mutter joined #git
19:02 Acerific joined #git
19:02 Acerific joined #git
19:02 Vampire0 dyek, well, stash pop *does* apply all changes and does not abort due to conflict. It ends with some files in conflict maybe. And in that case the stash is not removed, so that you can start from the beginning if you didn't do the conflict resolution correctly, or so that you can look at the original changes in the stash while doing the conflict resolution.
19:03 Vampire0 dyek, resolving the conflict is either by looking at the conflict markers or by using `git mergetool`, yes
19:04 Vampire0 dyek, a file in conflicted state always needs to be marked as resolved, either by `git add` or by `git reset`, depending on whether you want the result in the index or only in the worktree
19:04 howardwlo_ joined #git
19:05 Vampire0 dyek, but other then that, yes. stash pop with conflicts -> resolve conflicts -> mark as resolved (git mergetool will do this for you) -> git stash drop
19:05 howardwlo_ joined #git
19:06 dyek Vampire0: Thanks much! That clarified a lot.
19:06 howardwlo_ hello!
19:06 gitinfo howardwlo_: 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.
19:06 dsdeiz joined #git
19:06 dsdeiz joined #git
19:06 Vampire0 dyek, yw
19:07 howardwlo_ i cloned my github repo on the github deskttop app, and i can push pull just fine. i tried to do the same in terminal, and i get repo not found.
19:07 Vampire0 valhala_22, "origin" is the name of a remote, "master" is the name of a branch, "origin/master" is the name of a branch in the remote origin
19:07 livingstn joined #git
19:07 Atm0spher1c joined #git
19:07 Vampire0 mugwump, !repro
19:07 gitinfo mugwump: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
19:07 Vampire0 howardwlo_, !repro
19:07 gitinfo howardwlo_: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
19:08 pbandark joined #git
19:08 zeroed joined #git
19:09 howardwlo_ apologies, https://gist.github.com/Howardwlo/bd282aec39f9c1181ab945c05d294dd1
19:10 howardwlo_ but i face no issue on my github desktop app
19:11 Vampire0 howardwlo_, I guess this is a private repo?
19:11 howardwlo_ Vampire0 yes it is
19:11 Vampire0 howardwlo_, then I'd say you are not authenticated and thus GitHub says "hey, nothing here"
19:12 howardwlo_ how do i authenticate via terminal?
19:13 jzeus joined #git
19:13 Vampire0 howardwlo_, either use SSH urls and SSH keys for authentication, or maybe you can try changing the remotes URL to https://howardlo@github.com/bloodhound/bloodhound.git
19:13 Vampire0 howardwlo_, I'm not sure though, never used private repos on GitHub
19:13 Vampire0 howardwlo_, and I never use https URLs for stuff I have to authenticate against, but always SSH, so I don't need manual credentials
19:14 howardwlo_ Vampire0 is it ok to use http through the github desktop app?
19:17 howardwlo_ gah im so confused. before when i used bittbucket, i can just `git pull` and it would ask for password.
19:17 howardwlo_ and that was a private repo as well
19:18 yqt joined #git
19:19 aielima joined #git
19:20 btree joined #git
19:20 Hunter1_ joined #git
19:20 livingst_ joined #git
19:21 gopar joined #git
19:25 malmalmal joined #git
19:25 hobodave joined #git
19:28 tarkus joined #git
19:28 btree left #git
19:29 Cabanossi joined #git
19:31 blackwind_123 joined #git
19:31 raspado joined #git
19:31 Gsham joined #git
19:36 ribasushi joined #git
19:38 catch22 joined #git
19:39 livingstn joined #git
19:39 Cavallari joined #git
19:39 Doginal joined #git
19:41 m0viefreak joined #git
19:43 anjen joined #git
19:44 guampa joined #git
19:46 raspado joined #git
19:50 cads joined #git
19:53 mizu_no_oto joined #git
19:54 guampa joined #git
19:57 valhala_22 joined #git
19:58 SJr If I want to update a file with the commit, branch or tag name of where head is. Can I just use the post-checkout hook, or do I need to hook into several things (like post-merge, post-commit as well).
20:00 preaction why do you want to do this? this sounds problematic. is this file under version control itself?
20:01 Tobbi joined #git
20:01 nixjdm joined #git
20:02 SJr Nope
20:02 preaction i asked two questions
20:03 SJr A couple reasons, the simplest one is that we display the branch/tag and commit in the app in some places and right now we are doing that by invoking git. That means we need to have a full .git folder lying around which our ops team has complained about.
20:03 Gsham joined #git
20:03 preaction so you're going to copy this file around, but not using version control?
20:03 SJr The second reason is that we have switched processes on our development side, where we use IntelliJ to remotely deploy files instead of developing in the VM. This means that the git information is never right on the VMs which is annoying.
20:03 romank joined #git
20:04 SJr Right, when the app wants to display the version, it will just read some json file that has the information needed.
20:04 gopar joined #git
20:04 SJr We can have hooks, and deployment steps that populate it.
20:05 preaction as long as it's not in version control, then you probably want, yes, those few hooks: post-checkout, post-merge, and i hope you're not committing on the box you're deploying on, but if you are...
20:05 preaction but if you've got a deployment process already, it might be easier to just add `git describe > GIT_VERSION` to that
20:06 SJr Yeah we do have a deployment process, but we also want to fix our dev side process which is deployment free.
20:06 SJr Thanks.
20:06 finalbeta joined #git
20:07 northfurr joined #git
20:08 brent__ joined #git
20:09 jth41 Can anyone give me ideas about what I might be doing wrong here? http://stackoverflow.com/questions/43878982/git-hook-fails-silently
20:10 mentazoom joined #git
20:10 jth41 @_ikke_ can you save me again? http://stackoverflow.com/questions/43878982/git-hook-fails-silently
20:11 paws__ joined #git
20:11 mugwump Vampire0: thanks for asking.  Turns out my answer was that I had to cumulatively fix up all the files I already fixed up in previous commits.  Because filter branch is not rebase
20:12 cdg joined #git
20:14 paws__ joined #git
20:14 cagedwisdom joined #git
20:15 paws__ joined #git
20:17 dreiss joined #git
20:21 Domhack joined #git
20:23 miha_S7_ joined #git
20:24 synthroid joined #git
20:25 evie_hammond joined #git
20:26 manuelschneid3r joined #git
20:29 Cabanossi joined #git
20:32 Achylles joined #git
20:32 Gsham joined #git
20:34 askb joined #git
20:37 mikecmpbll joined #git
20:38 mattcen joined #git
20:39 johnny56 joined #git
20:45 hhee joined #git
20:46 orbyt_ joined #git
20:48 misosoup joined #git
20:49 salamanderrake_ left #git
20:51 salamanderrake joined #git
20:52 aidalgol joined #git
20:53 cdown_ joined #git
20:54 orbyt_ joined #git
20:55 nevodka joined #git
20:55 johnny56 joined #git
20:56 bronson joined #git
20:56 jzeus joined #git
20:57 Random832 joined #git
20:59 Cabanossi joined #git
20:59 jeffreylevesque joined #git
21:05 mel00010 joined #git
21:06 caper joined #git
21:09 dsdeiz joined #git
21:09 dsdeiz joined #git
21:10 zeroed joined #git
21:10 zeroed joined #git
21:10 zeroed joined #git
21:13 gopar joined #git
21:16 kyan joined #git
21:17 pl left #git
21:18 dreiss joined #git
21:18 kexmex joined #git
21:18 nixjdm joined #git
21:23 shgysk8zer0 joined #git
21:25 valhala_22 joined #git
21:25 raffo joined #git
21:25 rasto joined #git
21:28 Gsham joined #git
21:30 BSaboia joined #git
21:30 northfurr joined #git
21:31 _lvb__ joined #git
21:35 malmalmal Hello , I am having, what I guess are basic problems setting up a remote repo, and linking it to a local repo. If I use git init on the remote server, then git clone on the local machine, I can't 'git push', because it tells me it is a non-bare repo. If I create the remote repo with 'git init --bare baregit.git' , then locally I use 'git remote add origin ssh://user@server.net/path/to/baregit.git' it seems to work, but when pushing I get a 'fatal,
21:35 malmalmal Could not read from remote repository' May it be because it is an ssh path? is the only answer my path is wrong? Thanks
21:36 Dougie187 joined #git
21:39 Adylas joined #git
21:40 NeXTSUN joined #git
21:40 Adylas Hello git, using 2.7.4 (Ubuntu 16.04). Doing clone with an https repo with Kerberos auth. Work fine !! However, when doing submodule update, it fail. Ideas ?
21:42 cust joined #git
21:42 Karazhan joined #git
21:46 masuberu joined #git
21:47 justin2 joined #git
21:49 Vampire0 malmalmal, I would have said it looks fine, but looks either like an error in the path, or you are not authenticating correctly, or your user does not have permission to read the repository
21:49 Vampire0 malmalmal, can you do "ssh user@server.net" and then ls /path/to/baregit.git?
21:49 Vampire0 malmalmal, btw. you can also write it as user@server.net:/path/to/baregit.git
21:50 transhuman_ joined #git
21:50 malmalmal Vampire0: hello :) , yes I can login with ssh://user@server.net then cd exactly to the path I am providing to git add origin
21:51 netj joined #git
21:51 YuGiOhJCJ joined #git
21:52 Nugget Using 1.8.3.1 I've got commit.gpgsign=true set in my ~/.gitconfig but `git commit` doesn't honor it.  It works if I explicitly `git commit -S` -- any theories?
21:52 malmalmal Vampire0: I am quite confused.
21:52 NeXTSUN joined #git
21:53 Nugget oh, nevermind.
21:53 malmalmal Vampire0: I will do it all over again with the other syntax, let's see
21:53 gopar joined #git
21:54 Sasazuka joined #git
21:54 alexandre9099 joined #git
21:54 malmalmal Vampire0: I login through ssh on the remote server, then I do mkdir dir, cd dir, git init --bare this.git
21:55 malmalmal Vampire0: now on local I mkdir dir, cd dir, git init
21:55 brschaefer joined #git
21:55 Vampire0 malmalmal, why don't you simply clone your repo on the server?
21:56 Vampire0 s/on/from/
21:56 malmalmal Vampire0: because then I does NOT allow me to push , because it tells me it is not bare. Let me paste the full message I receive.
21:57 Vampire0 Adylas, maybe you have no right to clone the submodule? Just that you have the right to clone the parent does not automatically mean you have the right to clone the submodule
21:57 Vampire0 malmalmal, no
21:57 malmalmal https://paste.ofcode.org/9TY5PLWPcjNWLcxm5ckRAZ
21:57 malmalmal oops
21:57 Vampire0 malmalmal, you create a non-bare on the server
21:57 Vampire0 malmalmal, of course then it tells you it is non-bare
21:58 Vampire0 malmalmal, if you clone a bare one this is quite usual and pushing will work fine
21:58 malmalmal Vampire0: ok you mean create a bare on remote server, then clone on local
21:58 Adylas Vampire0, Hello ! No worries about that. Its full open ;-) after some GIT_CURL_VERBOSE=1, I see that clone and submodule don't behave the same.
21:58 Vampire0 malmalmal, yes
21:58 malmalmal Vampire0: I will try that again, although It did not work before.
21:59 gopar joined #git
21:59 Vampire0 malmalmal, even pushing to non-bare remote would work if you don't push to the checked out branch or explicitly allow to push to the checked out branch, but usually it is a bad idea to push to non-bare repos
21:59 Dougie187 left #git
21:59 Vampire0 Adylas, you could also try GIT_TRACE=1, maybe it helps
22:00 LTRand joined #git
22:00 malmalmal Vampire0: My case-scenario is very simple. I am going to work on my website, and want to use git, also to learn. So I want to have my repo on the server, then pull locally, change things, add commit push, no need for branches yet. Am I not doing it right ?
22:00 Adylas Vampire0, Yeah, looking at the debug with GIT_CURL_VERBOSE but my C is quite rusty and I'm unable to locate how submodule download its stuff VS clone
22:01 Vampire0 malmalmal, do you mean you want to use Git to deploy your website to the production server?
22:01 Vampire0 Adylas, that's why I said use GIT_TRACE=1
22:01 malmalmal Vampire0: yes, I think that is what I want to do
22:01 chatter29 joined #git
22:01 Vampire0 malmalmal, !deploy
22:01 gitinfo malmalmal: 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
22:02 orbyt_ joined #git
22:02 malmalmal haha
22:02 Aljone joined #git
22:02 malmalmal And one of the first things they hear when they ask about it on #git is "git is not a deployment tool, so don't do that" ;-)
22:02 Adylas Vampire0, Ok, I ll compare both !! Thanks for your help !!!
22:03 malmalmal Vampire0: learning git is starting to become a convoluted path
22:03 chatter29 is using a GUI for git a good idea?
22:04 malmalmal Vampire0: what do we mean exactly by deploying here ?
22:04 chatter29 or should I learn how to use the command line version?
22:04 Vampire0 malmalmal, bringing the files you commit to your production server to be served to the public
22:05 Vampire0 chatter29, up to you, but in my opinion almost all GUIs are mostly useless and you trade some clicky-colory for power and flexibility
22:05 Vampire0 chatter29, also !gui
22:05 gitinfo chatter29: Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
22:05 malmalmal Vampire0: ok, but is there any difference between deploying them, as you describe it, and having the files in the production server WITHOUT them being deployed? does that make sense ?
22:05 Vampire0 chatter29, but !guis
22:05 gitinfo chatter29: Popular GUIs for Git are listed on the website: http://git-scm.com/downloads/guis
22:06 Vampire0 chatter29, but I'd really recommend learning the command line client, even if then later use a GUI after you understood how to work with the commandline client
22:06 Vampire0 chatter29, but at that point you might not want to use a GUI after all :-D
22:06 chatter29 oh thanks
22:06 Vampire0 malmalmal, getting the files to the production server is what is called deploying in this context
22:07 Vampire0 malmalmal, if you have a bare repository, there is no worktree, so you have the repo on the server, but not a worktree with the files
22:07 Vampire0 malmalmal, in that case it is not deploying, but hosting a Git repo that you do with your server
22:07 gopar joined #git
22:07 Vampire0 chatter29, yw
22:08 gitinfo chatter29: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person but don't expect immediate increase. Ten thanks make up one karma point.
22:08 blackwind_123 joined #git
22:08 chatter29 gitinfo, thanks
22:08 gitinfo chatter29: you're welcome, but please note that I'm a bot. I'm not programmed to care.
22:10 malmalmal Vampire0: thanks, you are very helpful. May I ask, what would be a reccomended way to use git in my case-scenario please? Single dev working on his own website, wanting to keep a remote and a local copy of it (repo?) and being able to deploy from time to time. The remote copy/repo will also be the producton server where the site will be deployed.
22:10 cyphase joined #git
22:10 malmalmal I meant, the server where the remote copy or repo is store, will also be the production server where the site will be deployed.
22:11 cbreak have multiple remotes
22:12 transhuman_ joined #git
22:12 perrier-jouet joined #git
22:12 malmalmal cbreak, could you please ellaborate ?
22:12 cbreak a proper remote, and some for deployment on some servers
22:12 malmalmal .karma Vampire0
22:12 gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 37 (5 in past 30 days) (4 given out)
22:13 malmalmal .topkarma
22:13 gitinfo top karmic beings of past 30 days ('all' arg to see totals): v‍ampire0: 5,  _‍ikke_: 3,  o‍sse: 3,  k‍adoban: 2,  j‍ast: 1
22:13 cbreak as !deploy says
22:13 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
22:13 miha_S7_ joined #git
22:13 cbreak git isn't made for deployment
22:13 cbreak but if you want  you can use hooks for it
22:13 cbreak those hooks would be in a deployment repo
22:14 cbreak I'd recommend having a proper repo somewhere else too
22:14 chatter29 left #git
22:14 gopar joined #git
22:14 malmalmal when you say a proper repo, what do you mean by proper cbreak ?
22:15 cbreak something not on some public facing web server
22:15 Vampire0 malmalmal, did you look at !deploy as I said before?
22:15 gitinfo malmalmal: 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
22:16 malmalmal Vampire0: yes, I am looking at it, but the sole notion of deploying is new to me, plus it shows me my initial misunderstanding about git. Now I am not even sure if I should be using git or not.
22:17 Karazhan joined #git
22:17 _lvb__ joined #git
22:17 cbreak sure you should
22:17 cbreak git is very nice for all kind of development
22:19 gopar joined #git
22:19 klbruenn joined #git
22:22 Vampire0 malmalmal, if you want to do any version control of your files, Git **is** definitely the right choice, everything else is either deprecated or crap :-)
22:23 ZyX-I joined #git
22:24 diogenese joined #git
22:26 elsevero joined #git
22:27 serialoverflow joined #git
22:27 foreal joined #git
22:27 kexmex joined #git
22:28 Hunter1_ joined #git
22:28 northfurr joined #git
22:37 perrier-jouet joined #git
22:45 bilal joined #git
22:46 HoierM joined #git
22:50 yanope joined #git
22:50 Hunter1_ joined #git
22:50 dviola joined #git
22:50 mostlybadfly joined #git
22:51 elisa87 joined #git
22:51 elisa87 do you know why git is not still recognized in my machine? https://pastebin.com/TsPkBEpX I need to use the git command in command prompt
22:52 transhuman_ joined #git
22:53 justanotheruser joined #git
22:54 fatalhalt joined #git
22:54 ertes joined #git
22:56 Vampire0 elisa87, well, most probably your package manager did not add the path to git.exe to your PATH variable. Change this
22:57 bronson joined #git
22:58 Levex joined #git
22:58 raspado joined #git
22:59 TomyLobo joined #git
22:59 Cabanossi joined #git
22:59 infotek joined #git
23:00 Xenophon1 joined #git
23:03 fatalhalt joined #git
23:10 LTRand joined #git
23:10 mel00010 joined #git
23:11 ryez joined #git
23:11 thiago joined #git
23:12 saau joined #git
23:12 perrier-jouet joined #git
23:12 pks_ joined #git
23:13 hazelux joined #git
23:14 JanC_ joined #git
23:15 fatalhalt joined #git
23:17 menip joined #git
23:21 thiago_ joined #git
23:22 malmalmal Vampire0: I've read the why git is not a deploy tool now. As I understand it now, I should not have my remote repo on a public_html folder, but somewhere else on the shared server. Still I am having the problem where I can't seem to be able to (understand how to properly) create a remote repo and clone it locally, or add it as origin to a local repo. So I can develop locally and push to remote , deployment aside. Would you maybe be so kind as to guide
23:22 malmalmal me on this steps? I tried everything I could find on docs, still not working. Not sure why
23:24 NeXTSUN joined #git
23:26 fatalhalt joined #git
23:29 a3Dman joined #git
23:29 a3Dman joined #git
23:29 Cabanossi joined #git
23:30 Vampire0 malmalmal, this is simple as initing a bare repo on the server and cloning it to local as I said before. There is really nothing more to it
23:31 Vampire0 malmalmal, what does not work no, the cloning?
23:31 Vampire0 malmalmal, then please set GIT_TRACE=1 on the client and try again, then show me the output
23:32 Vampire0 malmalmal, and be quick, I'm almost in bed ;-)
23:32 Vampire0 malmalmal, you're lucky I had a last look at the screen
23:32 malmalmal Vampire0: jaja, Ok don't worry, please. I'll do some more tests and come back tomorrow
23:33 malmalmal Vampire0: thanks again
23:34 justin2 joined #git
23:38 alexandre9099_ joined #git
23:38 Vampire0 malmalmal, just show me the output, maybe I spot the error
23:39 malmalmal Vampire0: I think this time it worked, yes. I can push. But as I think you mentioned, there is no filetree on the remote server, which I understand it is expected.
23:40 miha_S7_ joined #git
23:40 Vampire0 malmalmal, that is **the** difference between a bare and a non-bare repository. A bare has no worktree. !bare_vs
23:41 Vampire0 malmalmal, !bare
23:41 gitinfo malmalmal: 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/
23:41 malmalmal Vampire0: and why was it again that I had to use bare ?
23:41 scorpion left #git
23:42 malmalmal Vampire0: and can I deploy FROM remote bare to remote live ? say with git-deploy or some hook
23:42 telephone joined #git
23:42 giraffe joined #git
23:42 telephone joined #git
23:44 mentazoom joined #git
23:45 malmalmal Vampire0: my first question is answered in this text you linked. Maybe my second one too... reading
23:45 Vampire0 malmalmal, read !bare and !deploy. The first answers the first question, the second the second
23:45 gitinfo malmalmal: 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/
23:45 gitinfo malmalmal: 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
23:46 malmalmal Ok yes, thank you.
23:48 Vampire0 malmalmal, yw
23:48 gitinfo malmalmal: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person but don't expect immediate increase. Ten thanks make up one karma point.
23:48 Vampire0 I'm off to bed now, cu
23:49 malmalmal bye bye, sleep well
23:49 ploop joined #git
23:49 Cabanossi joined #git
23:49 Ltooo joined #git
23:50 mellernoia joined #git
23:56 h12o joined #git
23:56 madewokherd joined #git
23:58 cdown_ joined #git
23:59 ZyX-I joined #git

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