Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-16

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

All times shown according to UTC.

Time Nick Message
00:00 livingstn joined #git
00:06 t-mart_ joined #git
00:15 rominronin joined #git
00:17 lethosor left #git
00:18 arooni joined #git
00:19 benwbooth joined #git
00:21 CEnnis91 joined #git
00:27 tesuji_ joined #git
00:28 backnforth joined #git
00:29 go1111111 joined #git
00:30 aseidl joined #git
00:30 btcquant joined #git
00:31 arooni joined #git
00:32 stormlrd joined #git
00:33 dmto joined #git
00:34 fscala joined #git
00:35 ahmedelgabri joined #git
00:36 rgrinberg joined #git
00:39 arescorpio joined #git
00:39 fuchstronaut joined #git
00:42 Schwarzbaer_ joined #git
00:44 mkopriva joined #git
00:44 cqi joined #git
00:45 sangy joined #git
00:46 arooni joined #git
00:46 IWishIKnew joined #git
00:47 jeffreylevesque joined #git
00:53 ochorocho__ joined #git
00:53 angelsl joined #git
00:55 eletuchy joined #git
00:56 jstimm joined #git
00:58 zivester joined #git
00:58 cqi_ joined #git
01:01 McNozes joined #git
01:01 arooni joined #git
01:02 Rodya_ joined #git
01:02 bgold joined #git
01:02 maroloccio joined #git
01:03 fahadash joined #git
01:05 bgold joined #git
01:08 fstd_ joined #git
01:08 Rodya_ joined #git
01:08 GandalfTheWizard joined #git
01:09 pks joined #git
01:15 backnforth joined #git
01:16 arooni joined #git
01:16 rominronin joined #git
01:21 dreiss joined #git
01:24 raininja joined #git
01:27 jaguarmagenta joined #git
01:28 anu0 joined #git
01:29 arooni joined #git
01:31 mehola joined #git
01:33 yourmancj joined #git
01:34 yourmancj what is the best way to put a project I am working on onto a remote git server? I cannot push an empty repo correct?
01:35 ahmedelgabri joined #git
01:38 introsp3ctive joined #git
01:38 mkopriva joined #git
01:39 BSaboia joined #git
01:39 arooni joined #git
01:40 SwiftMatt joined #git
01:41 italoacasas joined #git
01:41 eletuchy joined #git
01:41 introsp3ctive joined #git
01:42 Waskeend joined #git
01:46 italoacasas joined #git
01:46 fission6 joined #git
01:46 interne7y joined #git
01:46 eletuchy_ joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and your morning commute | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-hg: Don't you know that's poison?
01:49 eletuch__ joined #git
01:50 Dougie187 joined #git
01:50 eletuchy_ joined #git
01:53 kulelu88 joined #git
01:54 eletuchy joined #git
01:56 arooni joined #git
01:56 eletuch__ joined #git
01:57 drupald joined #git
01:57 Wulf4 joined #git
01:58 kadoban joined #git
01:58 eletuchy_ joined #git
02:00 Sasazuka joined #git
02:00 Sasazuka joined #git
02:01 eletuchy joined #git
02:01 Sasazuka joined #git
02:04 Sasazuka joined #git
02:05 raininja joined #git
02:06 drodger joined #git
02:09 amdi_ joined #git
02:09 17SAAGFTB joined #git
02:09 32NABEXO6 joined #git
02:11 d4rklit3 joined #git
02:11 arooni joined #git
02:12 MattMaker joined #git
02:13 fracting joined #git
02:14 pie_ joined #git
02:15 pie_ hi guys, im in a "detached head state" somehow, i committed some changes an the head is the immediate child of the branch i wanted to commit to
02:15 pie_ how do i get the branch head to be on this commit?
02:15 ojacobson !reattach
02:15 gitinfo Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue
02:16 ojacobson I would create a new branch where you are, so that the commits are at least named
02:16 ojacobson then check out the branch you meant to be on and fast-forward to the new branch
02:18 rominronin joined #git
02:22 shellkr joined #git
02:25 BombStrike joined #git
02:26 Waskeend joined #git
02:27 arooni joined #git
02:28 ncthom91 joined #git
02:28 shellkr I have difficulty using symlinks and Git. I am on Linux so Windows is not an issue. What I want is so that my remote files will become plain text. I have set config to core.symlinks=false. Git does however not recognize changed made to the symlink file so I can not push. It say my branch is up-to-date. I am doing this as the same content of a file is needed in multiple directories. It would be nice if i just had
02:28 shellkr to change the one file instead of copying it to all dirs.
02:31 sdothum joined #git
02:33 droidicus joined #git
02:36 ahmedelgabri joined #git
02:37 justanotheruser joined #git
02:37 jstimm joined #git
02:39 semantipc joined #git
02:39 arooni joined #git
02:40 brcolow How can I set the contents of the buffer inside an autocommand?
02:40 brcolow `au BufRead,BufNewFile *.blah setBufferContents("Hello!")` something like that
02:40 fuchstronaut joined #git
02:42 shellkr I think I solved my issue by using hardlinks instead of softlinks
02:42 cqi_ joined #git
02:42 _xor joined #git
02:43 Dougie187 left #git
02:43 r3c0d3x joined #git
02:44 semantipc joined #git
02:44 watabou joined #git
02:51 rueben joined #git
02:51 hexagoxel joined #git
02:53 eletuchy joined #git
02:54 arooni joined #git
02:54 ome joined #git
02:55 ilk joined #git
02:55 semantipc joined #git
02:57 mns this may be a dumb question.  I have a clone of a git repo to which I do not have push authorisation.  I have made changes to the code to add support for a new platform.  Should I commit my changes locally ?  How will this affect things when I do a pull ?  I plan to give the upstream authors a diff which can be applied upstream.
02:58 xall joined #git
03:00 tcurdt joined #git
03:00 Rakko joined #git
03:03 chachasmooth joined #git
03:04 aavrug joined #git
03:04 thiago joined #git
03:05 barteks2x joined #git
03:05 aavrug joined #git
03:06 Guest55 joined #git
03:07 arooni joined #git
03:12 netj joined #git
03:12 watabou mns: Yes, you commit locally and then generate a diff of the current master versus your local branch. You can have conflicts when you pull where it doesn't know whether you want a change from your branch or from the upstream branch. You will have to resolve it then, which should be generally pretty easy to choose.
03:12 backnforth joined #git
03:15 jc174 joined #git
03:17 uranellus_ left #git
03:18 uranellus joined #git
03:19 DolphinDream_ joined #git
03:19 rominronin joined #git
03:19 semantipc joined #git
03:20 t2mkn joined #git
03:21 k3rn31 joined #git
03:21 arooni joined #git
03:21 jbitdrop joined #git
03:22 d0nkeyBOB joined #git
03:23 jc174 I'm a newbie.  Do I need to do the -u every time when I push a branch, or only the first time I push it?
03:24 harish joined #git
03:25 mattcen jc174: Only the first time. "Try It And See" would also have been an acceptable solution
03:26 jc174 Thx mattcen.
03:26 mkopriva joined #git
03:26 rkazak joined #git
03:28 ShekharReddy joined #git
03:28 BSAlb joined #git
03:28 __xor joined #git
03:28 BSAlb joined #git
03:28 jaguarmagenta joined #git
03:28 mattcen jc174: No worries. In case it's not clear, it just addes the required line(s) to .git/config to list the upstream. Omitting it afterwards doesn't cause those lines to just disappear; you have to explicitly unset the upstream if you want to do that
03:29 BrunoSaboia joined #git
03:29 jc174 Roger that.
03:31 MattMaker joined #git
03:31 mehola joined #git
03:33 arooni joined #git
03:36 ahr3n joined #git
03:37 ahmedelgabri joined #git
03:42 fracting joined #git
03:43 mns watabou: thanks.  I might just do a fork of the upstream project and than work by sending pull requests.  that might probbaly be a better workflow.
03:43 watabou mns: When you clone a project, you've effectively forked it.
03:44 kadoban mns: When you clone a github repo, you usually shouldn't do any of your own work in the 'master' branch. If you just branch off your own stuff and keep it a clear separation, that's a better idea.
03:46 emPi joined #git
03:46 mns watabou: I was going to ask that but you read my mind and answered it already.
03:46 nnyk_ joined #git
03:47 kadoban Well, github has an idea of what a "fork" is. Otherwise there's no real official meaning to the word.
03:47 mns kadoban: not working with a github repo.  This is a repo from savannah.gnu.org
03:48 stormlrd joined #git
03:48 eight58 joined #git
03:49 RustyShackleford joined #git
03:49 RustyShackleford we're migrating to git at work
03:50 RustyShackleford So we have 6 or so branches right now
03:50 arooni joined #git
03:51 RustyShackleford so theres a few things I'm trying to figure out: how do you manage branches for 3 releases being worked on simulataneously
03:51 Rodya_ joined #git
03:52 RustyShackleford and also how to migrate from our old VCS and maintain the link between each of the 3 releases we currently are maintaining
03:53 tmh1999 joined #git
03:58 Eugene What's your old VCS?
04:02 k3rn31 joined #git
04:03 arooni joined #git
04:04 C4ta|Work joined #git
04:04 C4ta|Work joined #git
04:05 rueben joined #git
04:05 hahuang62 joined #git
04:07 RustyShackleford Eugene, Rational Clearcase
04:07 RustyShackleford bleh
04:08 RustyShackleford well I can start with 0.1, then create a new branch and copy and paste the source for that branch
04:08 moei joined #git
04:09 romerocesar joined #git
04:10 Eugene Never heard of it
04:10 Eugene I would try doing a dumb import, yeah
04:11 dreiss joined #git
04:11 orbitphreak joined #git
04:11 bruce_lee joined #git
04:11 Cabanossi joined #git
04:15 RustyShackleford what a mess lol
04:15 steven_a_s joined #git
04:15 RustyShackleford clearcase is even worse than you can imagine
04:16 RustyShackleford so I'm curious, when you're managing this kind of release, how do the branches relate?
04:16 RustyShackleford do you merge up to a common branch?
04:16 arooni joined #git
04:16 RustyShackleford or is 0.2 a branch of 0.1, 0.3 a branch of 0.2 and so on
04:17 sPiN joined #git
04:18 preaction 0.1 is a branch of master. 0.2 is a branch of master. 0.3 is a branch of master. all at different times
04:20 rominronin joined #git
04:20 d4rklit3 joined #git
04:20 Eugene RustyShackleford - !flow
04:20 gitinfo RustyShackleford: [!gitflow] The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow  See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references
04:21 RustyShackleford thanks for the link
04:21 RustyShackleford i'll read it
04:21 Eugene git by itself doesn't enforce any sort of branching model; you can do whatever you want, when you want, where you want.
04:21 Eugene The voodoo to make it happen can be a bit much, but anything is possible at gitcom
04:23 jc174 left #git
04:26 mohabaks joined #git
04:27 foodSurprise joined #git
04:28 foodSurprise When I use git diff, are additions green and deletions red?
04:28 Eugene Yes, that's the normal color scheme
04:29 foodSurprise Are the green changes made from the repistory that would update your local branch or vice versa
04:30 foodSurprise in other words how do I know which side its coming from without checking my local copy
04:30 btcquant joined #git
04:31 arooni joined #git
04:31 dmto joined #git
04:31 foodSurprise I see --- a/ and +++ b/ - what do these signify?
04:32 interne7y joined #git
04:32 thiago a and b
04:32 thiago one version and the other version
04:33 harish_ joined #git
04:33 foodSurprise thiago, how can I tell which one is local and which is remote
04:35 ksinkar joined #git
04:36 ksinkar I read the documentation for git-request-pull(https://git-scm.com/docs/git-request-pull). I am unable to understand how does git-request-pull figure out where is the upstream project? v1.0 is simply a tag in your git repo, right?
04:38 ahmedelgabri joined #git
04:38 jaguarmagenta joined #git
04:39 mns ksinkar: I am guessing it will get the information the same way "git remote -v " does ?
04:40 toogley joined #git
04:40 thiago ksinkar: you tell it
04:41 eletuchy joined #git
04:41 SwiftMatt joined #git
04:46 romerocesar joined #git
04:46 murph joined #git
04:47 Klumben joined #git
04:47 fscala joined #git
04:47 nilg joined #git
04:48 arooni joined #git
04:50 mns ksinkar: PROJECT_ROOT_DIR/.git/config    would have the upstream information.  Or are you looking for somethign else ?
04:50 whomp joined #git
04:54 romerocesar joined #git
04:58 reavengrey joined #git
04:58 reavengrey Hey, can I use vim for my diffs? And this way, when I'm viewing a diff, I can also edit the changes immediately?
05:00 _ng joined #git
05:03 arooni joined #git
05:04 eletuchy joined #git
05:04 Eugene reavengrey - see diff.tool under man git-config and man git-difftool
05:04 gitinfo reavengrey: the git-config manpage is available at http://jk.gs/git-config.html
05:04 gitinfo reavengrey: the git-difftool manpage is available at http://jk.gs/git-difftool.html
05:07 nidr0x joined #git
05:12 reavengrey Thank you
05:14 Mo joined #git
05:14 ksinkar mns: I have cloned a project. .git/config has the information for the origin master. How do I specify, which git repo is my upstream?
05:14 eletuchy_ joined #git
05:15 ksinkar mns: Does git make any assumptions about upstream that I am missing here?  Have you used the git request pull feature? If yes can you show me the .git/config of the repo on which you used that particular feature?
05:16 eletuch__ joined #git
05:18 arooni joined #git
05:18 realz__ joined #git
05:19 mns ksinkar: if you cloned a project, origin should be upstream.  I have not used git request pull,  I have only used the pull request feature on GitHub.
05:19 eletuchy joined #git
05:20 sauvin joined #git
05:21 rominronin joined #git
05:21 rkazak joined #git
05:22 Rish joined #git
05:22 eletuchy_ joined #git
05:23 mns ksinkar: looking at the documentation I would think that upstream is the URL you have in your .git/config
05:24 jceb joined #git
05:24 fahadash Can we do the empty commits?
05:24 mns Its going to be the same URL that you push to.
05:24 milki_ left #git
05:24 mns time to call it a night.
05:24 milki joined #git
05:25 fahadash When I start a new branch I like to see in commit history one of the revisions saying "Start a new branch"
05:25 fahadash Can we add revisions with no changes?
05:25 milki fahadash: yes, --allow-empty
05:26 eletuchy joined #git
05:26 fahadash git commit -m "start branch" --allow-empty
05:26 fahadash Should work?
05:26 fahadash Thanks milki
05:28 eletuch__ joined #git
05:28 stardiviner joined #git
05:29 arooni joined #git
05:29 stardiviner How to undo latest commit, make the commit changes back to work tree?
05:29 milki stardiviner: !undo can help you understand what to do
05:29 gitinfo stardiviner: [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
05:30 stardiviner !fixup_hints
05:30 gitinfo Hints for fixing commits are: (1) NOT PUSHED/PUBLISHED: `git rebase -i $COMMIT^` or perhaps `git commit --amend` (or `git reset HEAD^`). (2) OTHERWISE, `git revert $COMMIT` to make a reverse commit. (3) If you have pushed and MUST remove it, use rebase or filter-branch and type !rewrite in IRC to learn about the implications.
05:30 stardiviner !rewrite
05:30 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
05:31 Mo joined #git
05:31 eletuchy joined #git
05:31 stardiviner !undo
05:31 gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
05:31 fahadash Could we possibly alter the history on remotes so that if I got something removed it would never be recovered?
05:32 fahadash If I revert a precious commit that is on remote. That revert itself will be a new commit hence we can go back on History and get that revision back. But if say we rebase and get rid of some revisions and push to remote. Will remote lose all those revisions forever?
05:32 fahadash previous**
05:33 mehola joined #git
05:33 stardiviner milki: I can't find out which command should I execute to make the last commit back to worktree.
05:33 stardiviner milki: I followed the instructions, but confused on it.
05:34 pwnz0r joined #git
05:34 eletuchy_ joined #git
05:34 t-mart__ joined #git
05:35 ThomasLocke joined #git
05:36 mehola joined #git
05:37 eletuchy joined #git
05:37 fahadash stardiviner: pretty straightforward in the link milki shared
05:37 chandlerbing joined #git
05:37 fahadash git reset HEAD^
05:38 fahadash This will undo last revision and make it local working dir change
05:38 fahadash If you want to go 2 commits back got reset HEAD~2
05:38 stardiviner fahadash: I see, I'm afraid of losting changes, so I ask. Thanks, milki
05:39 ahmedelgabri joined #git
05:39 fahadash Make a copy of whole local repo dir
05:39 fahadash For backup
05:40 stardiviner fahadash: ok
05:40 fahadash Or you can work directly in your copy
05:40 fahadash Experiment in the city
05:40 fahadash Copy**
05:41 reavengrey left #git
05:41 fahadash In my experiences git will not let you make damaging changes without --hard or some other --override
05:41 fahadash Damaging=irreversible
05:41 circ-user-NuHgv joined #git
05:41 zyxep joined #git
05:41 Tratos joined #git
05:42 Tratos joined #git
05:42 milki anything committed can be retrieved again. anything not committed, git cares not
05:42 stardiviner great design.
05:42 arooni joined #git
05:44 rchavik joined #git
05:44 stardiviner damn it, git did removed my working tree after `git reset HEAD^`. I make a backup. what a ...
05:44 aavrug joined #git
05:46 boudicca joined #git
05:46 lordjancso joined #git
05:47 stuh84 joined #git
05:49 milki that would not touch your working tree at all
05:50 stardiviner milki: weird, but my working tree lost..
05:50 lindenle joined #git
05:52 zumba_addict joined #git
05:52 spudowiar joined #git
05:54 rominronin joined #git
05:55 zeroed joined #git
05:55 zeroed joined #git
05:55 arooni joined #git
05:57 ochorocho__ joined #git
05:57 Raging_Hog joined #git
05:57 chandlerbing joined #git
05:58 zyxep joined #git
05:58 Tratos joined #git
05:58 apotry joined #git
05:58 Tratos joined #git
05:58 zyxep joined #git
06:03 deltab joined #git
06:03 rscata joined #git
06:05 shafox joined #git
06:06 shafox I want to count the number of commit till a certain point ? The commit id that I want to count till I have it.
06:06 qt-x joined #git
06:06 Dreamer3 joined #git
06:08 flaguy48 joined #git
06:10 arooni joined #git
06:10 nnyk_ joined #git
06:11 eletuchy_ joined #git
06:12 eletuch__ joined #git
06:13 umbSublime joined #git
06:13 umbSublime joined #git
06:13 vuoto joined #git
06:15 Fijit joined #git
06:15 Rish_ joined #git
06:15 eletuchy joined #git
06:16 babilen joined #git
06:17 eletuchy_ joined #git
06:18 Rish joined #git
06:18 jaafar joined #git
06:19 eletuch__ joined #git
06:21 arooni joined #git
06:21 dreiss joined #git
06:22 phanimahesh joined #git
06:23 PCatinean joined #git
06:24 jaguarmagenta joined #git
06:24 whomp joined #git
06:25 phanimah1sh joined #git
06:27 rchavik joined #git
06:28 rchavik joined #git
06:31 MrMojito joined #git
06:31 MrMojito joined #git
06:32 umbSublime joined #git
06:36 eijk_ joined #git
06:37 arooni joined #git
06:37 fracting joined #git
06:38 Khisanth joined #git
06:39 ahmedelgabri joined #git
06:40 eletuchy joined #git
06:41 phanimahesh joined #git
06:42 fuchstronaut joined #git
06:44 osse shafox: git rev-list --count from..to
06:44 howdoi joined #git
06:44 hhee joined #git
06:46 Goplat joined #git
06:47 Alienpruts joined #git
06:47 subhojit777 joined #git
06:47 backnforth joined #git
06:48 elastix joined #git
06:49 arooni joined #git
06:49 JeroenT joined #git
06:49 Sceorem joined #git
06:49 muthu joined #git
06:50 dsantiago joined #git
06:52 fees joined #git
06:53 mkopriva joined #git
06:53 ahmedelgabri joined #git
06:55 eijk_ joined #git
06:57 cagedwisdom joined #git
06:57 nnyk joined #git
06:57 umbSublime joined #git
06:57 arooni joined #git
06:59 SwiftMatt joined #git
06:59 King_Hual joined #git
07:00 nnyk__ joined #git
07:00 shafox thanks osse that worked :)
07:00 [Brain] joined #git
07:00 mdw joined #git
07:02 whomp joined #git
07:04 _r3ply left #git
07:04 ferr1 joined #git
07:05 aswen joined #git
07:06 phanimahesh joined #git
07:07 encod3 joined #git
07:10 govg joined #git
07:10 JeroenT joined #git
07:12 whomp joined #git
07:14 niobos joined #git
07:14 son joined #git
07:17 RedShift joined #git
07:18 jknetl joined #git
07:18 Hounddog joined #git
07:19 maroloccio joined #git
07:20 Bombe joined #git
07:21 nnyk_ joined #git
07:22 niobos Is there a way to verify if a particular commit (detached HEAD) is available from a particular remote?
07:23 niobos I have a repo with submodules. One of these submodules refers to a commit that is no longer available upstream. But when I try `git submodule update`, it works fine, since the commit is stored in my local .git dir
07:23 niobos If I completely wipe the .git, and re-fetch everything, I get the expected error message
07:23 z8z joined #git
07:23 niobos Is there a less resource
07:23 niobos -intensive way to do that?
07:23 moritz niobos: I wonder if git ls-remote can do it
07:23 romerocesar joined #git
07:24 niobos moritz: that will only show the refs that exist remotely (i.e. the branch tip)
07:24 niobos if the submodule is 1 commit behind, it won't be listed either
07:25 niobos I've tried `git fetch`, but that will only accept a ref-name, not a commit ID
07:25 niobos I'm even looking in to `git fetch-pack`, but that seems to have the same problem (requires a name)
07:26 selckin git status should tell you no?
07:26 hpfmn joined #git
07:26 hpfmn left #git
07:26 moritz niobos: you do a git ls-remote, and check if the commit you're looking for is an ancestor of any of the commits listed there (recursively)
07:26 Balliad joined #git
07:26 selckin ah no since detached
07:27 moritz though that doesn't look like a trivial thing to, needs some scripting
07:28 ki0 joined #git
07:29 niobos moritz: hmm, that indeed sounds like it might do the job
07:29 niobos indeed, scripting needed
07:32 nnyk_ joined #git
07:33 vuoto joined #git
07:33 t-mart_ joined #git
07:34 mariuscc joined #git
07:34 Panacea joined #git
07:36 ahmedelgabri joined #git
07:36 whomp joined #git
07:37 lindenle_ joined #git
07:38 sergio1234 joined #git
07:39 guardian hello, is there a hook that would run after each commit when doing a rebase?
07:41 lb joined #git
07:42 selckin guardian: https://blog.bitbucket.org/2016/06/13/git-2-9/ first item here might help
07:42 holodoc joined #git
07:42 Guest50408 joined #git
07:43 cdown joined #git
07:44 niobos left #git
07:44 multi_io joined #git
07:44 arooni joined #git
07:45 whomp joined #git
07:45 guardian selckin: interesting, I think I can get what I want with --exec
07:45 guardian selckin: this also likely mean post-commit doesn't run after a commit being picked by a rebase
07:46 selckin i don't use hooks, can't help beyond that :)
07:46 garethdaine joined #git
07:46 guardian :)
07:49 c0ded joined #git
07:50 whomp joined #git
07:52 guardian selckin: that's cool, it does what I want
07:52 Brain joined #git
07:52 guardian still I would have preferred to install a hook :)
07:54 eletuchy joined #git
07:54 dsantiago joined #git
07:55 leeN joined #git
07:56 arooni joined #git
07:58 rkj joined #git
07:59 Omen joined #git
08:00 rkj yop, I want to merge a local fast-forward branch WITH a commit message, can someone help me how to do so ?
08:00 rkj i only get Fast-forward (no commit created; -m option ignored)
08:01 selckin -no-ff
08:01 rkj hm
08:01 rkj thx sir <3
08:02 MrWoohoo joined #git
08:03 mikecmpbll joined #git
08:03 aax joined #git
08:04 TomyWork joined #git
08:04 SoRoot joined #git
08:04 pleroma left #git
08:04 kurkale6ka joined #git
08:05 raindev joined #git
08:05 fracting joined #git
08:06 shafox left #git
08:06 phanimahesh joined #git
08:07 _pix joined #git
08:08 arooni joined #git
08:09 MarkusDBX joined #git
08:11 t-mart__ joined #git
08:11 diegoaguilar joined #git
08:11 MarkusDBX If I also want to version my editor-config files, but not have them interfer with my project files, which is the best way to go about it, creating another repository for those files?
08:12 aswen joined #git
08:13 ldleworker If I have 5 commits and I want to move the content of the last commit into, say, the second commit -- how can I do that?
08:14 rossome joined #git
08:14 phanimahesh MarkusDBX: Trying to version them separately will be inconvinient. You can use two repos and scripts to help, but it isn't a very good idea.
08:15 bongjovi joined #git
08:15 phanimahesh ldleworker: git rebase -i HEAD~5, then move the fifth commit to below the second one and change the word pick to squash.
08:16 ldleworker woooooah
08:16 * ldleworker *sploosh*
08:16 phanimahesh ldleworker: See the help displayed below the commits when you do rebase -i
08:16 rchavik joined #git
08:20 MarkusDBX phanimahesh: yeah best would be to have some kind of flag for them, if it was possible, so they wouldn't show up in the "git log --stat" and similar.
08:20 MarkusDBX phanimahesh: is it possible to hide files?
08:21 MarkusDBX like .githide, or similar.
08:21 HyP3r_ joined #git
08:22 marcogmonteiro joined #git
08:22 King_Hual joined #git
08:22 King_Hual joined #git
08:24 fracting joined #git
08:25 ToBeCloud joined #git
08:25 jbitdrop joined #git
08:26 phanimahesh MarkusDBX: you can ignore the files, but if you want to track them you can not hide them.
08:26 MarkusDBX yeah I know that.
08:26 GavinMagnus joined #git
08:27 MarkusDBX phanimahesh: must be a common problem, or do people don't track their project config files?
08:27 phanimahesh MarkusDBX: Why do you want to separate them, anyway? usually editor-config is committed and tracked with code, since it is shared by everyone
08:27 jceb joined #git
08:27 tvw joined #git
08:27 eletuchy joined #git
08:27 phanimahesh The whole point of editor-config is to make it easy for everyone to use same configuration, for consistency in a project.
08:28 MarkusDBX phanimahesh: well if you just want to focus on project updates whilst reviewing logs, it might be nice to "hide" them in that state.
08:28 MarkusDBX maybe the log-viewer could be configured to not show a particular .editor-config directory
08:28 phanimahesh But editor config should not change often. Once set, it rarely changes for a project.
08:28 MarkusDBX phanimahesh: yeah I know, I should add these are some very personal config I keep.
08:29 HyP3r_ Hey all, I have a really weird problem: I created a bare git repository and made it with my apache2 webserver aviable under the direoctry 'git': http://10.0.0.194/git/st-config.git I can browse this folder (with the browser) and can see files like HEAD or config.
08:29 hegemoOn left #git
08:29 MarkusDBX phanimahesh: It's more of a session config in my case really. If I move a window in my IDE it changes..
08:29 phanimahesh MarkusDBX: Then they should not be tracked. Personal stuff shouldn't be committed into the project repo.
08:29 MarkusDBX phanimahesh: so changes often in my case.
08:29 HyP3r_ If I do server side an 'git log' I can see some commits and everthing is fine. But If I do an 'git clone  http://10.0.0.194/git/st-config.git' I clone a 'empty' Repository
08:29 MarkusDBX phanimahesh: but I want them tracked? So another repo?
08:29 phanimahesh Oh, i assumed you were talking of the editor config project, not the configuration of your editor itself.
08:30 phanimahesh Yep. Track them separately and setup symlinks as appropriate into your project.
08:30 MarkusDBX phanimahesh: I could have been more clear.
08:30 MarkusDBX phanimahesh: ok, I'll do that, thanks for your input!
08:30 HyP3r_ What could be a reason for that?
08:30 stormlrd joined #git
08:30 King_Hual joined #git
08:30 King_Hual joined #git
08:30 jast HyP3r_: git supports cloning over 'dumb' HTTP (i.e. not using git's CGI HTTP backend), but with limitations: transfer is not optimized as with the normal protocol, and you need to run 'git update-server-info' on the server from inside the repo each time a branch/ref changes
08:31 phanimahesh HyP3r_: What do you mean empty? Do you receive any commits at all? Is a .git folder created?
08:31 zincrokx joined #git
08:31 jast if you can, use the CGI backend, man git-http-backend for details on how to set it up
08:31 gitinfo the git-http-backend manpage is available at http://jk.gs/git-http-backend.html
08:31 phanimahesh And yep, if you are using the dumb backend, did you set up the server to update-server-info when necessary?
08:32 zincrokx joined #git
08:32 HyP3r_ phanimahesh: its an empty repository with an .git folder but without any commits
08:32 phanimahesh Also, possibly your commits are on one branch and you are looking at a different branch.
08:32 zincrokx joined #git
08:32 HyP3r_ jast: ah thats what I tought. A simple apache 'dumb' HTTP canot server that all
08:33 tinarg joined #git
08:33 HyP3r_ Thats propably the reason why everyone is using gitolite or gitlab
08:33 mase-tech joined #git
08:33 jast gitolite doesn't do the HTTP backend stuff for you, actually
08:33 jast you can use the two together, though
08:33 zincrokx joined #git
08:33 phanimahesh Either that, or an issue with using http dumb backend without properly updating server info.
08:33 heroux joined #git
08:33 jast and yeah, gitlab sets it up for you
08:33 phanimahesh HyP3r_: It is easy to setup the cgi backend with apache/nginx as reverse proxy.
08:34 dopesong joined #git
08:34 HyP3r_ phanimahesh: okay, I'll read this
08:34 phanimahesh Or to set up scripts to run update-server-info on the server when needed.
08:35 HyP3r_ Ok, the simple way with update-server-info was working
08:35 ocbtec joined #git
08:36 SoRoot joined #git
08:36 Panacea joined #git
08:40 clmsy joined #git
08:41 maxorator joined #git
08:43 fuchstronaut joined #git
08:43 choki joined #git
08:46 King_Hual joined #git
08:46 King_Hual joined #git
08:49 netcarver joined #git
08:51 whomp joined #git
08:53 chachasmooth joined #git
08:55 apotry joined #git
08:55 davisonio joined #git
08:57 boudicca joined #git
08:57 raindev joined #git
08:58 Schwarzbaer_ joined #git
08:58 keltvek joined #git
09:01 notebox joined #git
09:02 fracting joined #git
09:05 sbeller joined #git
09:07 weckl joined #git
09:08 hackal joined #git
09:08 phanimahesh joined #git
09:09 boudicca joined #git
09:09 ahmedelgabri joined #git
09:09 jantje Is it possible to do a git log X..Y with gitweb ?
09:10 jantje (ie, a limited range)
09:11 laris joined #git
09:11 laris joined #git
09:11 laris joined #git
09:11 laris joined #git
09:11 laris joined #git
09:11 xpl0iter joined #git
09:12 laris joined #git
09:12 laris joined #git
09:12 boudiccas joined #git
09:12 xpl0iter Hi, I have want to work on a branch "register" which is different from the master branch on a new system. So what do I do?
09:12 xpl0iter Will cloning work?
09:12 zincrokx joined #git
09:12 lb xpl0iter ?! man git checkout
09:12 gitinfo the git-checkout manpage is available at http://jk.gs/git-checkout.html
09:13 zincrokx joined #git
09:13 lb jantje dont know about gitweb, but with gitk it's perfectly possible. gitk takes almost every parameter wich git log would accept
09:14 zincrokx joined #git
09:15 JeroenT joined #git
09:16 Olipro joined #git
09:21 boudiccas joined #git
09:22 jantje lb: found it already in the source, I needed the h= and hp= parameters
09:23 lb jantje nice
09:24 romerocesar joined #git
09:32 eletuchy_ joined #git
09:34 courrier joined #git
09:34 romerocesar joined #git
09:35 digidog joined #git
09:35 eletuchy joined #git
09:35 phanimahesh joined #git
09:36 son joined #git
09:37 eletuch__ joined #git
09:37 hackal Hi, sorry for asking noob question. I am developing a local wordperss theme locally. My workflow is like this. Update code locally, push to github repo, download zip of the code from github and upload the code to server. I am thinking of skipping the download/upload part and just install git to my server and sync the files with my local files. How can I go about this? Should I just initialize remote repository on my server and call git
09:39 bremner hackal: the options are discussed in !deploy
09:39 gitinfo hackal: 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
09:39 lb hackal sounds like !deploy
09:40 Panacea joined #git
09:40 eletuchy joined #git
09:45 dsdeiz joined #git
09:45 dsdeiz joined #git
09:45 eletuchy_ joined #git
09:46 dimi1947 joined #git
09:47 eletuch__ joined #git
09:48 btcquant joined #git
09:50 RoyK^ left #git
09:50 JeroenT joined #git
09:51 eletuchy joined #git
09:52 hackal thanks for the link
09:53 eletuchy_ joined #git
09:54 sol56 joined #git
09:57 isxek joined #git
09:57 eletuchy joined #git
09:58 Schwarzbaer_ left #git
09:58 Schwarzbaer joined #git
09:58 uranellus joined #git
09:58 uranellus joined #git
10:00 eletuchy_ joined #git
10:00 backnforth joined #git
10:01 spaceSub joined #git
10:02 spaceSub left #git
10:04 tvw joined #git
10:07 mdw joined #git
10:07 jagob joined #git
10:10 Schwarzbaer Hi. I messed up my branches commit history with a bad merge. Is there a way to fix it? It's published history already, though.
10:14 romerocesar joined #git
10:18 HyP3r_ Okay I followed the https://jk.gs/git-http-backend.html  tutorial with a lot of pain and git clone http://10.0.0.194/git/st-config.git is now working really well.
10:18 foodSurprise joined #git
10:18 HyP3r_ But I can't push data, I have used AuthUserFile and AuthGroupFile and Require like in the example the group commiters.
10:19 axiom_1 joined #git
10:19 HyP3r_ But how can I specify the user which should be used?
10:19 HyP3r_ While pushing
10:19 iMiiTH joined #git
10:22 liuzhen joined #git
10:23 ilk joined #git
10:24 i7c Schwarzbaer, anybody else basing stuff on your published history? So you cannot rewrite it without them running into trouble?
10:25 Schwarzbaer Hmmm, that's a good question. Gotta check. I think I might have cherry-picked a small bugfix back into develop.
10:25 i7c There are several options: !revert
10:25 gitinfo 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]?
10:25 clmsy joined #git
10:26 i7c You can use git revert to undo merges as well, it will lead to another commit in the history so it's not rewriting. This choice is always safe. If you have the luxury that you can rewrite history, reset would be much simpler.
10:27 i7c But it's a very bad idea if anyone else is working with your branch.
10:29 interne7y joined #git
10:29 allcentury joined #git
10:30 sdothum joined #git
10:32 Panacea joined #git
10:37 stasmakarov joined #git
10:42 JeroenT joined #git
10:43 fuchstronaut joined #git
10:44 rossome joined #git
10:44 DolphinDreamm joined #git
10:45 romerocesar joined #git
10:47 SoRoot joined #git
10:47 jceb joined #git
10:48 johnny56_ joined #git
10:49 nettoweb joined #git
10:50 d0nn1e joined #git
10:50 Bucciarati_ left #git
10:51 raindev joined #git
10:54 CussBot joined #git
10:55 romerocesar joined #git
10:56 whomp joined #git
10:56 mischat joined #git
10:59 mischat joined #git
11:04 GT joined #git
11:04 eletuchy joined #git
11:05 whomp joined #git
11:06 eletuch__ joined #git
11:07 fission6 joined #git
11:08 netj joined #git
11:09 eletuchy joined #git
11:10 thebloggu joined #git
11:11 rnsanchez joined #git
11:12 Panacea joined #git
11:12 eletuchy_ joined #git
11:12 raininja joined #git
11:12 whomp joined #git
11:12 jaguarmagenta joined #git
11:15 eletuchy joined #git
11:16 Sasazuka joined #git
11:17 baraba joined #git
11:17 eletuch__ joined #git
11:18 mkoskar joined #git
11:20 whomp joined #git
11:20 eletuchy joined #git
11:22 nnyk_ joined #git
11:22 eletuchy_ joined #git
11:23 zeroed joined #git
11:23 zeroed joined #git
11:25 romerocesar joined #git
11:25 eletuchy joined #git
11:26 johnmilton joined #git
11:27 eletuch__ joined #git
11:29 tobiasBora joined #git
11:29 sdothum joined #git
11:30 k3rn31 joined #git
11:30 eletuchy joined #git
11:35 eletuchy_ joined #git
11:41 Wind0r joined #git
11:41 rchavik joined #git
11:42 mischat joined #git
11:42 eletuchy joined #git
11:43 johnmilton joined #git
11:44 k3rn31 joined #git
11:44 eletuch__ joined #git
11:44 HyP3r_ Hey all I configured now my apache like this configuration https://jk.gs/git-http-backend.html http://pastebin.com/BkqNK6ru but when I try to push I get this http://pastebin.com/kqaZuqRu
11:44 HyP3r_ Cloining and Pulling is allready working
11:45 HyP3r_ Someone an idea?
11:45 romerocesar joined #git
11:46 rahtgaz joined #git
11:48 fisch123456 joined #git
11:49 lb HyP3r_ checked the permission? remote: error: insufficient permission for adding an object to repository database ./objects
11:49 lb file system permissions
11:49 Wind0r HyP3r_ line 7 insufficient permissions
11:50 Wind0r ups too late :/
11:50 HyP3r_ http://stackoverflow.com/a/6448326
11:50 jojojojo joined #git
11:50 HyP3r_ Yes it was directory acces problems. Sorry lol
11:50 Vinnie_win_t joined #git
11:50 lb HyP3r_ you're welcome :)
11:50 HyP3r_ Now I can push, but the strange thing is: I can push without any authentification
11:51 HyP3r_ You can see in my apache confing the 'Deny from env=AUTHREQUI...'
11:52 kadoban joined #git
11:53 lordjancso joined #git
11:53 maucar joined #git
11:53 _pix joined #git
11:55 phanimahesh joined #git
11:56 nilg` joined #git
11:57 HyP3r_ lb: an idea?
11:58 lb HyP3r_ nope, no apache pro :/
11:59 Wind0r are all those needed modules are  available and activ?
12:00 JeroenT joined #git
12:00 Shakeel_ joined #git
12:01 HyP3r_ Wind0r: yes all are loaded and error.log doesn't cry
12:01 Sceorem joined #git
12:03 clmsy joined #git
12:03 zumba_addict joined #git
12:04 svankmajer joined #git
12:04 svankmajer joined #git
12:04 rgrinberg joined #git
12:05 HyP3r joined #git
12:05 ferr1 joined #git
12:06 Catachan_ joined #git
12:07 raz joined #git
12:08 raz TIL git-lfs is an even bigger trainwreck than git submodules :/
12:08 rgrinberg joined #git
12:08 i7c They are trainwreck with different purposes though.
12:08 i7c trainwrecks*
12:08 raz how do i clone a git-lfs infested repo while disabling *all* lfs related activity (do not attempt to download anything, do not blow everything to crap so i can't even switch branch anymore)
12:10 PSan joined #git
12:10 raz currently it leaves me with a working copy that has hundreds of non-lfs(!) files in deleted state, apparently because lfs blows up before they get checked out.. and i can't reset or switch branch, or do anything really, because lfs always tries to download stuff that doesn't exist
12:10 _ikke_ raz: I don't know too much about LFS, but I believe it relies on .gitattributes to do its magic
12:10 wrouesnel1 joined #git
12:10 raz ahh.. thanks, gonna check those out (had only removed the hooks so far)
12:12 synthroid joined #git
12:14 Ediz joined #git
12:15 dimi1947 joined #git
12:15 allcentury joined #git
12:15 Catachan_ joined #git
12:16 romerocesar joined #git
12:18 rwb joined #git
12:18 joaumg joined #git
12:19 Panacea joined #git
12:19 joaumg joined #git
12:19 raijin joined #git
12:22 ulkesh joined #git
12:28 Papillon joined #git
12:30 interne7y joined #git
12:34 tvw joined #git
12:36 ahmedelgabri joined #git
12:38 eletuchy joined #git
12:39 ktatar joined #git
12:39 nnyk_ joined #git
12:39 lss8_ joined #git
12:40 eletuchy_ joined #git
12:43 Gamecubic joined #git
12:44 eletuchy joined #git
12:44 fuchstronaut joined #git
12:45 espindola joined #git
12:46 eletuchy_ joined #git
12:47 cyan__ joined #git
12:48 guampa joined #git
12:48 eletuch__ joined #git
12:52 eletuchy joined #git
12:53 zivester joined #git
12:53 mdw joined #git
12:54 cyan__ joined #git
12:54 liquidjamm joined #git
12:55 livingstn joined #git
12:56 romerocesar joined #git
12:57 donnib joined #git
12:57 liquidjamm joined #git
12:58 donnib I made a merge and only chose to merge few things, now i want to merge again but since i did a halv merge previously and git registered the merge how can i get the rest of the things in ?
13:00 _ikke_ Only thing I can think of is manually taking a diff and applying that
13:00 rewt you could do it manually with `git difftool otherbranch file`
13:00 donnib ok it seems that maybe it's easier to redo the merge and take everything then
13:01 Guest___ joined #git
13:01 Guest___ left #git
13:02 relix joined #git
13:03 cdown joined #git
13:03 ash_workz joined #git
13:03 liquidjamm joined #git
13:04 CEnnis91 joined #git
13:04 raven-au_ joined #git
13:04 fuchstronaut joined #git
13:09 SoRoot joined #git
13:10 ncthom91 joined #git
13:13 fscala joined #git
13:13 jaguarmagenta joined #git
13:14 iLembus joined #git
13:15 iLembus joined #git
13:17 ajf- joined #git
13:18 Rodya_ joined #git
13:18 italoacasas joined #git
13:20 rnsanchez_ joined #git
13:20 jimi_ joined #git
13:23 a3Dman joined #git
13:26 romerocesar joined #git
13:27 k3rn31 joined #git
13:27 sdothum joined #git
13:31 Dan0maN_Work joined #git
13:33 leeN joined #git
13:33 Dan0maN_Work hi all.  is there a way to disable git from automatically using ssh rsa keys to connect to a server?
13:33 thekingofbandit joined #git
13:34 bremner don't use an ssh url?
13:34 raindev joined #git
13:34 edvbld joined #git
13:34 bremner or you have some other ssh key? in that case, configure ssh via a host alias
13:34 Dan0maN_Work is it manditory that if you use ssh that you must use an ssh key?
13:35 bremner depends. for github and gitolite, yes
13:35 Dan0maN_Work bitbucket
13:35 bremner probably yes
13:35 Dan0maN_Work fun.  okay.  ty
13:36 notebox joined #git
13:36 HedgeMage Dan0maN_Work: That is controlled by your ssh config...create an entry for the host in question, or change the existing one.
13:37 Dan0maN_Work HedgeMage: just using a default config.  and i'm not being prompted when ssh'ing into the other 4000 hosts in the environment
13:38 grawity IdentitiesOnly yes, IdentityFile ~/.ssh/ed25519_for_github
13:38 bruce_lee joined #git
13:39 HedgeMage Dan0maN_Work: can you pastebin your ~/.ssh/config please?  I could check if there's anything in there that would trigger the behavior.  If that is NOT the case, then the host you are accessing may be forcing key-based auth instead of password auth (which is beyond your control).
13:39 HedgeMage That said, password auth is horribly insecure, and on MY git server, I completely disallow it.
13:40 Dan0maN_Work i wouldn't say horribly insecure, but using a password protected key is no doubt a better option.  one could use a passwordless key file and be even less secure than just a password
13:40 JJM joined #git
13:41 nnyk joined #git
13:41 t-mart_ joined #git
13:42 eletuchy_ joined #git
13:42 foodSurprise joined #git
13:42 HedgeMage I'd argue that, without a second factor in place, password-only auth is in practice less secure even than a passwordless key.
13:43 HedgeMage (And I'm not just pulling things out of a hat; I clean up other people's compromises for a living, among other things.)
13:44 HedgeMage The pw-only auth usually gets brute-forced eventually.  Across even a medium-sized population of users, it's beyond likely that a few will have crappy passwords, and getting through those doesn't require first finding and compromising their workstations.
13:44 HedgeMage It's the difference between "lucky script kiddie" and "someone who learned to pivot an attack".
13:46 Dan0maN_Work maybe i'm just paranoid having been working in environments where best practices aren't even heard of and still use shared accounts and unrestricted sudo access
13:46 bremner HedgeMage: fwiw most git hosting services use the "gitolite trick" force command per key to select account without using different OS level accounts.
13:46 PSan joined #git
13:47 bremner and that doesn't work with passwords
13:47 Dan0maN_Work https://gist.github.com/anonymous/60220196670a1e48f18f1c7a42619c2a (sorry, this didn't paste on last line)
13:47 phanimahesh It *can* be made to work with passwords, but it is not a good idea.
13:47 Dan0maN_Work default config for an el7 user
13:48 phanimahesh I agree with HedgeMage's opinion that password based ssh logins are worse than passwordless keys.
13:48 HedgeMage bremner: Most general hosting services, yes.  I've seen a lot of crappy corporate installs that do nasty things with system users instead. :(
13:49 bremner HedgeMage: ack. but we're talking bitbucket here, afaik
13:49 howdoi joined #git
13:49 HedgeMage bremner: Ahh, I missed which host it was.
13:49 yqt joined #git
13:50 SoRoot joined #git
13:52 HedgeMage Dan0maN_Work: That config would not force key-based auth, but as someone else mentioned, bitbucket probably DOES force key-based auth.  ISTR that being the case.
13:52 Dougie187 joined #git
13:53 texasmynsted joined #git
13:53 HedgeMage Anyway, meeting time, bbl (as HedgeWork, as I'll be on the other machine)
13:53 luke_penn joined #git
13:54 cqi_ joined #git
13:54 jamiejackson joined #git
13:55 gajus joined #git
13:55 gajus I have a branch-A, branch-B (that branches from branch-A) and branch-C (that branches from branch-B).
13:55 gajus I have made a change to branch-A
13:56 gajus how do I propagate the changes to branch-B and branch-C
13:56 gajus ?
13:56 jamiejackson hi folks. i made some changes that i have some questions about. first, i had a file, `selenium_tags.cfc`, that i renamed to `SeleniumRC.cfc`, then i created a new `selenium_tags.cfc` that extended the newly-renamed file. (i did this in eGit, BTW). looking at the changes, however....
13:56 moritz gajus: you merge branch-A into both
13:56 moritz gajus: git checkout branch-B; git merge branch-A
13:57 moritz and then same for branch-C
13:57 thiago_ joined #git
13:57 gajus hm. This is going to be  long day
13:57 gajus the reality is more of a 12 branches that stem one from another
13:58 jamiejackson it seems like my intent wasn't realized, because `SeleniumRC.cfc` seems like a new file, and `selenium_tags.cfc` had a ton of changes: https://github.com/teamcfadvance/CFSelenium/pull/27/files
13:58 jamiejackson i'd like to preserve the history as i intended. can you help me understand what went wrong and how to fix it?
13:58 moritz jamiejackson: git doesn't really track renames or copies
13:58 Noldorin joined #git
13:59 sitaram_ bremner: to be fair, I learnt that trick from gitosis, and I am pretty sure gitosis learnt from svn :)
13:59 moritz jamiejackson: tools like "git show" do their own detection
13:59 i7c It just pretends to calm the user.
13:59 bremner sitaram_: hence my quoting "gitolite" ;)
13:59 moritz jamiejackson: git just records a tree a files and some meta data, like the previous commit
14:00 sitaram_ bremner: aah; I missed that
14:00 CJKinni joined #git
14:00 jamiejackson moritz: svn (which i'm far more familiar with) sort of tracks copies, but maybe it does so in the same way that "git show" does
14:01 i7c I think pure renames have been displayed by git status for a long time.
14:01 jamiejackson but anyway, moritz, it sounds like if done as well as i could have on my pull request
14:01 i7c At least in the index.
14:01 i7c But diff and log haven't until recently.
14:01 moritz jamiejackson: yes
14:01 jamiejackson okay, next question...
14:02 moritz why is the sky blue?
14:02 moritz :-)
14:02 i7c Something something wavelength.
14:02 jamiejackson blue light scatters best
14:02 moritz i7c: "Rayleigh scattering"
14:03 i7c Why'd you ask then!
14:03 * i7c is upset.
14:03 bremner go to #mercurial if you want a hug
14:03 moritz i7c: because jamiejackson said "next question", and I couldn't come up with a better next question :-)
14:04 i7c Thank you for not understanding my sarcasm. :P
14:04 eletuchy joined #git
14:04 moritz you're very welcome. Always fun!
14:04 i7c :)
14:04 jamiejackson still trying to find the pull request that i was going to ask my question about
14:05 moritz heh. Next question!
14:05 i7c I can't see a question in there.
14:05 moritz you can't? :-)
14:06 _ikke_ That was your question, you now have 0 credits :P
14:06 i7c :D
14:06 moritz buy ten questions for as low as 0.3 bitcoins now!
14:06 moritz two answers guarantueed!
14:07 crose joined #git
14:07 _ikke_ Not always the answers you expect :P
14:07 moritz well, answers are worthless if they are always what you expect
14:07 mmlb joined #git
14:08 infra-red joined #git
14:10 jamiejackson okay, i give up, so here's my question: where's that screwy pull request i submitted, which i can't find now?
14:10 bremner yes.
14:12 moritz jamiejackson: in the github search bar, enter is:pr user:jamiejackson
14:12 ResidentBiscuit joined #git
14:12 achadwick joined #git
14:12 moritz https://github.com/search?l=&amp;q=is%3Apr++user%3Amoritz&amp;ref=advsearch&amp;type=Issues&amp;utf8=%E2%9C%93 # example search for me
14:13 moritz erm, nope, that shows PRs on my repos :(
14:14 i7c I wonder why git-diff(tool) doesn't use pathspecs but paths in the option with a single <path> argument.
14:14 moritz jamiejackson: ah, author:jamiejackson, not user:
14:14 jamiejackson moritz: i used that url and it turns out i'm very prolific
14:14 jamiejackson i must pr in my sleep
14:15 i7c Because pathspecs would be pretty useful actually.
14:16 i7c err, I meant checkout with -- <path>. git diff does handle pathspecs.
14:17 jamiejackson useful search, moritz, thanks
14:17 moritz jamiejackson: you're welcome
14:20 LiohAu joined #git
14:20 semantipc joined #git
14:21 JeroenT joined #git
14:21 knutstrut joined #git
14:21 LiohAu what happens if I have a local repository "A" with some content, and then I add as remote a repository which also has content (other files) and then I push my local repo on that remote one ?
14:21 van joined #git
14:22 phaleth joined #git
14:22 ajf- I am running a git diff and I see a lot of changes that actually look the same in the  - and in the +
14:22 ajf- what could that be?
14:22 ajf- encoding?
14:22 ajf- any tips to fix/disable ?
14:23 i7c Whitespace?
14:23 _ikke_ line ending usually
14:23 ajf- yeah maybe it's whitespace. Can I ignore these somehow ?
14:23 jlewis_ joined #git
14:23 ajf- I am trying to manually go through a diff and these make it very hard
14:23 PSan how to undo git stash pop
14:23 _ikke_ PSan: git stash pop lists a hash, do you still have that
14:23 bremner LiohAu: your question is a bit puzzling. What matters is what history is stored in the two repos.
14:24 ximvan_ joined #git
14:24 LiohAu bremner: will the history be merged ?
14:24 i7c LiohAu, you don't push files really but commits in branches (or tags).
14:24 PSan _ikke_, I can see the hash when I do git stash list
14:24 bremner LiohAu: all merges happen locally
14:25 ajf- or maybe... what was the command to go through the diff bit by bit interactively?
14:25 LiohAu bremner so let's say the remote has only a master branch, and my local repo has master + featureX, if I push all, git will tell me that it cannot merge my local master with remote master ?
14:25 BombStrike joined #git
14:25 BSaboia joined #git
14:25 i7c file by file with git difftool?
14:25 hashpuppy joined #git
14:25 PSan ok I guess I can just do a reset
14:26 ajf- what I'm doing is trying to check out a complete directory from the stage branch. I think it was git checkout -p stage -- dir
14:26 i7c ajf-, or do you mean interactive staging?
14:27 i7c That's to interactively select bits from the diff, yes.
14:27 bremner LiohAu: unless the remote master is an ancestor of the master you push
14:27 bremner I guess "fast forward" merges happen on the server, technically
14:27 LiohAu bremner: no the thing is that this remote is named with the name I would like to use for my current repo :(
14:27 gajus moritz should I be using merge or rebase, though?
14:28 gajus in this particular case
14:28 gajus where there are many subsequent branches
14:28 bremner LiohAu: and what, you're trying to hijack the remote repo?
14:28 * bremner confused
14:28 tesuji joined #git
14:28 tubbo joined #git
14:29 LiohAu bremner: No I just would like to merge the content of the remote with that other repo that I have locally
14:29 LiohAu without loosing history
14:29 bremner so add it as a remote, fetch, and merge locally
14:29 RustyShackleford joined #git
14:31 LiohAu bremner: the easiest for a non-git user, would be to clone the remote one, copy/paste its content (as there is content only in master) in the other local repo + commit, then delete + re-create the remote repo and push that local repo
14:31 interne7y joined #git
14:31 i7c o_O
14:32 bremner well, you could also just drop git altogether and use rsync. Depends on your goals
14:32 bremner you did say "without losing history"
14:32 LiohAu (when I say copy/paste in the local, I talk about the 2nd local, not the one I just cloned :d)
14:33 LiohAu bremner: yes I just was explaining what I would do If I did not want to keep history
14:33 LiohAu so you can confirm me if your method does what I need with the history kept as bonus :)
14:33 jaafar joined #git
14:34 kvrapo joined #git
14:35 t-mart__ joined #git
14:35 Spacew00t joined #git
14:35 cdg joined #git
14:37 bremner !tias
14:37 gitinfo Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.
14:38 roundabout22 joined #git
14:38 i7c git log (with options of lol) is very confusing with orphan branches. They look just like regular commits in a linear history.
14:40 fmcgeough joined #git
14:41 CJKinni joined #git
14:42 i7c I wonder if it made more sense to use a different symbol (as in not *) if the commit is not a successor of the line below.
14:42 mohabaks joined #git
14:43 tlaxkit joined #git
14:43 drbean_ joined #git
14:44 ntonjeta joined #git
14:44 raz yay, congrats for git 2.9.0!
14:45 jimi_ joined #git
14:46 eletuchy joined #git
14:46 bollullera joined #git
14:46 bollullera left #git
14:46 artemisart joined #git
14:47 ktatar left #git
14:47 jimi_ joined #git
14:48 tubbo hi folks, wondering if i could get some advice on a workflow/branching model i wanted to establish for my team.
14:48 tubbo we mostly use a git-flow-style branching model here, but i find that has a lot of holes in it...like when you make commits to 'production' but not 'master'
14:49 tubbo i'd like to do something closer to github-flow but it would essentially require some discipline on the team, like making everyone squash commits before releasing.
14:49 tubbo do other teams have these "discipline" issues, and if so, how did you guys ensure that all devs follow the workflow?
14:49 Rodya_ joined #git
14:50 Borkr joined #git
14:50 roentgen joined #git
14:51 drbean joined #git
14:52 skalpin tubbo: by scolding people when they do it wrong :)
14:55 kilo_bravo joined #git
14:55 eletuchy joined #git
14:56 ediz_ joined #git
14:56 semantip_ joined #git
14:57 drbean joined #git
14:58 IWishIKnew joined #git
14:58 tubbo haha ok
14:58 tubbo i'm down with that
14:59 drbean_ joined #git
14:59 lindenle joined #git
15:00 mbrzuzy joined #git
15:00 anu0 joined #git
15:02 nnyk_ joined #git
15:02 drbean- joined #git
15:02 whomp joined #git
15:02 sangy joined #git
15:03 ediz_ left #git
15:03 jamiejackson joined #git
15:04 Eugene tubbo - you can enforce the flow you want at push-time with a hook.
15:05 jamiejackson joined #git
15:05 drbean joined #git
15:05 Sasazuka joined #git
15:05 zivester joined #git
15:06 fuchstronaut joined #git
15:07 bango2 joined #git
15:09 MrMojito_Busy joined #git
15:11 GandalfTheWizard joined #git
15:11 drbean joined #git
15:11 dsdeiz_ joined #git
15:12 ProbabilityMoon joined #git
15:12 whomp joined #git
15:12 dmto joined #git
15:13 diegoaguilar joined #git
15:13 cyan__ joined #git
15:14 jaguarmagenta joined #git
15:15 HyP3r Has some experience with git and instable (edge, gsm, …) network connections? What happens if the network connection breaks while downloading updates with 'git pull'?
15:15 HyP3r What happens if you after that restart 'git pull'?
15:15 HyP3r Is there a risk of inconsistence?
15:16 mdw joined #git
15:16 drbean joined #git
15:16 cdown joined #git
15:17 skalpin HyP3r: I don't actually know, but it looks like there shouldn't be any problems with network connections http://stackoverflow.com/questions/3433550/how-safe-is-git-with-an-unreliable-connection
15:18 aard joined #git
15:19 RiPer_ left #git
15:19 ajf- is there an alternative to  git checkout -p source_branch -- directory/name that checks out the new files in source_branch as well ?
15:19 drbean_ joined #git
15:19 _ikke_ HyP3r: No, git will start over fetching the changes it needs
15:19 _ikke_ It will only update things when it has the complete packfile
15:19 ajf- or is there a git merge --squash approach to only one sub-directory
15:20 RiPer joined #git
15:20 semantipc joined #git
15:21 drbean- joined #git
15:21 msonntag joined #git
15:22 ntonjeta joined #git
15:22 whomp joined #git
15:22 madewokherd joined #git
15:22 drbean joined #git
15:24 drbean| joined #git
15:24 harish_ joined #git
15:25 Khisanth joined #git
15:25 aard__ joined #git
15:25 ajf- ?
15:25 introsp3ctive joined #git
15:25 mohabaks joined #git
15:28 whomp joined #git
15:29 nettoweb joined #git
15:29 drbean joined #git
15:30 Gitzilla_ joined #git
15:33 drbean_ joined #git
15:34 nilsi joined #git
15:34 kus joined #git
15:35 drbean- joined #git
15:36 ahmedelgabri joined #git
15:37 tyreld joined #git
15:37 drbean joined #git
15:39 benwbooth joined #git
15:39 drbean_ joined #git
15:39 stavros joined #git
15:39 stavros hello
15:40 stavros i branched off of develop, made a change in file foo.py, then tried to rebase the changes in develop to my branch, and there was a conflict in file bar.py, which i never touched in my new branch. why does git rebase always show conflicts in unrelated files?
15:41 thiago because you're wrong, it's not unrelated
15:41 canton7 "rebase the changes in develop to my branch" sounds like you tried to rebase develop onto your branch, rather than rebase your branch only develop. What command did you actually type?
15:41 madewokherd what patch is rebase trying to apply?
15:41 stavros "git rebase develop" while i was on my branch
15:41 stavros let me check the patch
15:41 thiago there's something happening that you're not telling us. Probably because you didn't notice, which is probably the source of the problem.
15:42 stavros hmm, one of the diffs in the patch looks like it's from a commit in my branch, but i didn't change that file now
15:42 zeroed joined #git
15:42 zeroed joined #git
15:43 canton7 stavros, was your local 'develop' branch up to date?
15:43 thiago git show that patch. Does it show a change to that file?
15:43 stavros canton7, it was when i branched, it has new commits now
15:43 stavros thiago, let me check
15:43 canton7 stavros, the output of !lol would be useful
15:43 gitinfo stavros: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
15:44 canton7 if someone rewrote commits in develop between you branching and rebasing, for instance, that could cause this
15:44 SwiftMatt joined #git
15:44 stavros oh
15:44 stavros here's the head of the log: https://www.pastery.net/zgyryj/
15:45 stavros my branch is feature/scmc-credits
15:45 madewokherd I did a bad rebase to see what this would look like, and it says the failing patch is in .git/rebase-apply/patch
15:45 drbean joined #git
15:45 canton7 ah, you're in the middle of a rebase, so it's not showing helpful stuff :P
15:45 stavros git showing the commit that seems to conflict doesn't show changes to the conflicted file
15:45 stavros oh
15:45 stavros let me abort
15:46 canton7 if you haven't tried to fix the conflict, can you back out of the rebase using 'git rebase --abort', then show the log again?
15:46 stavros https://www.pastery.net/sxmbdn/
15:46 stavros this is after aborting
15:46 canton7 it's still not showing the feature/scm-credits branch
15:46 stavros this doesn't just happen now, it happens every time i try to rebase, i get unrelated conflicts
15:46 stavros "git merge" always works without any problems
15:47 madewokherd .git/rebase-apply/original-commit has the commit id that caused the conflict
15:47 canton7 can you post more of that log? it doesn't show either develop or feature/scmc-credits
15:47 thiago we'll need a !repro
15:47 gitinfo [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
15:48 shinnya joined #git
15:48 stavros sure
15:49 stavros https://www.pastery.net/mmuaqb/
15:49 thiago I think a "git whatchanged develop.." will help
15:49 thiago how long ago did you branch off?
15:50 thiago that paste still doesn t show the branch-off point
15:50 stavros thiago, a few days ago, the graph looks weird to me too
15:50 stavros i wonder why it's like that
15:50 stavros let me try to branch again
15:50 thiago that won't be the same
15:50 drbean_ joined #git
15:51 thiago well, looks like you had a very old develop branch when you branched off.
15:51 stavros sorry, yeah, you're right, i branched off 23 days ago, i forgot it's an old one
15:51 thiago can you pastebin that whatchanged?
15:51 stavros let me try
15:52 synthroid joined #git
15:52 stavros it goes way too far back... so it's because there are so many new commits? why doesn't git rebase auto-resolve them the way git merge would?
15:52 WizJin joined #git
15:53 semantipc joined #git
15:53 stavros hopefully this will work
15:53 stavros https://www.pastery.net/mntjvw/
15:54 bibek left #git
15:54 flopsec joined #git
15:55 LionsMane joined #git
15:55 drbean joined #git
15:57 eletuchy_ joined #git
15:59 concerti joined #git
15:59 drbean_ joined #git
16:00 jstimm joined #git
16:00 dreiss joined #git
16:01 BSaboia joined #git
16:01 kadoban joined #git
16:01 stonerfish joined #git
16:02 canton7 stavros, someone *did* rewrite develop, but the commits which were rewritten were after you branched from it
16:02 stavros ah i see, so that's why?
16:02 eletuchy joined #git
16:02 canton7 I don't think so
16:03 canton7 I'm honestly having trouble finding how things relate :P
16:03 stavros relate to what?
16:03 stavros each other?
16:03 canton7 can you do 'git log --graph --online --decorate develop feature/scmc-changes
16:03 semantipc joined #git
16:03 canton7 can you do 'git log --graph --oneline --decorate develop feature/scmc-changes
16:04 drbean joined #git
16:04 stavros https://www.pastery.net/ysmegm/
16:04 stavros we're using gitlab with merge commits with rebasing, so whenever we branch from develop, we rebase develop into that and then merge when done
16:04 canton7 more history please - I can't see where feature/scsm-changes was created, or even where it finishes :P
16:05 semantipc joined #git
16:05 eletuchy_ joined #git
16:06 thiago stavros: no feature/scmc-changes in that output
16:06 stavros there's no feature/scmc-changes branch
16:06 stavros it's feature/scmc-credits
16:06 stavros https://www.pastery.net/mjzabq/
16:06 canton7 bleh
16:06 stavros i'm not sure how many lines to include in the output
16:06 rueben joined #git
16:06 canton7 git log --graph --oneline --decorate develop feature/scmc-credits, sorry
16:06 stavros that's what i ran, so it's fine :p
16:06 t-mart_ joined #git
16:06 thiago include all of them until the branch point
16:07 thiago anyway, let's try a different angle
16:07 drbean_ joined #git
16:07 thiago "git whatchanged develop..", like I asked 20 minutes ago
16:07 semantip_ joined #git
16:07 stavros https://www.pastery.net/qhcuzh/
16:08 thiago only one commit was printed?
16:08 stavros yes, that's what has changed between develop and this branch, i only added one commit
16:08 diegoviola joined #git
16:08 stavros that's why i'm surprised at all the conflicts
16:09 satbyy joined #git
16:09 Ankhers If I have a submodule in my project, and run "git pull" to get the latest changes. Will I need to use "git submodule update" in order to get the update submodule? If so, can I run a special pull command that would automatically do that for me?
16:09 thiago I asked if that's the only commit that git whatchanged printed
16:09 thiago did it list more?
16:09 stavros no
16:09 stavros i literally gave you the whole output
16:09 thiago ok
16:09 eletuchy joined #git
16:09 stavros 19:07:48 $ git whatchanged develop.. | bakeit
16:09 stavros Paste URL: https://www.pastery.net/qhcuzh/
16:09 thiago so it's not a rewrite
16:09 rominronin joined #git
16:10 thiago stavros: and when you rebase, you see a conflict in a file that is neither of those two?
16:10 stavros yes, exactly
16:10 stavros let me verify
16:10 stavros oh sorry, no
16:10 stavros ah, i'm mistaken
16:11 semantipc joined #git
16:11 stavros the conflict IS in that file, just different lines
16:11 durham joined #git
16:11 fracting joined #git
16:11 Borkr joined #git
16:11 thiago which one? SilentAccountsWeb/phone/models.py ?
16:12 stavros yep
16:12 Ankhers Nevermind, found --recurse-submodules
16:13 eletuchy_ joined #git
16:13 stavros here's an example: https://www.pastery.net/kaccyz/
16:13 stavros the change in THIS branch is me adding the "save" method
16:14 thiago stavros: is it within 3 lines of where the conflict happened?
16:14 stavros and there's a conflict higher up in the file in lines i haven't touched in this branch
16:14 stavros thiago, is the change within 3 lines, you mean?
16:15 thiago conflicts happen whenever the two sides make changes within 3 lines of each other
16:15 stavros ah
16:15 imachuchu joined #git
16:15 stavros it's not
16:15 stavros hmm
16:15 stavros ah
16:16 stavros the save method is within three lines of the renaming of the next method
16:16 thiago ok
16:16 stavros you can see in the conflict, deallocate_number was renamed to unassign_number
16:16 thiago conclusion: it was a real conflict
16:16 stavros hmm
16:16 semantipc joined #git
16:16 * thiago predicted this within 30 seconds of the original question
16:17 narendraj9 joined #git
16:17 stavros there is another section that conflicts that doesn't seem to be within three lines
16:17 semantipc joined #git
16:18 romerocesar joined #git
16:18 thiago check again your assumptions
16:18 thiago if git says there's a conflict, git is probably right
16:18 tomog999_ joined #git
16:18 stavros i will, thanks
16:18 drbean joined #git
16:19 eletuchy joined #git
16:21 mohabaks joined #git
16:21 rkazak joined #git
16:21 jamiejackson joined #git
16:23 eletuchy_ joined #git
16:23 MistahKurtz joined #git
16:23 drbean_ joined #git
16:24 django_ joined #git
16:24 django_ hey all
16:24 gitinfo django_: 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.
16:25 Urbany joined #git
16:25 eletuchy joined #git
16:27 django_ Using git bash on windows, trying to use conda to use Python. conda -V --> conda 4.0.5
16:27 django_ now: activate py3 --> bash: activate: command not found
16:27 django_
16:27 thiago django_: not a Git question, sorry
16:28 django_ aww
16:28 j416 django_: you need to make sure that "activate" exists and is on your path.
16:29 drbean joined #git
16:29 j416 django_: if indeed "activate" is the right thing to run; seems rather general as a name. I'd go talk to the python guys.
16:30 django_ j416, its a command in: </c/Users/JonathanMan/Anaconda3/Scripts> which is in the path
16:30 django_ i checked path with: echo $PATH
16:30 stavros left #git
16:30 stavros joined #git
16:31 algun joined #git
16:31 xall joined #git
16:31 T4nkAbb0t joined #git
16:31 Papillon joined #git
16:32 cdown joined #git
16:32 interne7y joined #git
16:32 T4nkAbb0t If I push a commit to a remote feature branch, then I merge that into a master branch, is there any difference in the commit? Is there a different hash? (I know, just do it... I am confused while looking at it) Does that merge process create a new commit?
16:33 thiago merge creates a merge commit
16:33 thiago but the commit being merged continues to exist as it were, unmodified
16:33 atrus T4nkAbb0t: it's unclear to me what the 2 things you're comparing are when you ask "is there any difference"
16:34 drbean_ joined #git
16:34 manbehindthemadn how does one remove a file and all history of that file's presence?
16:34 T4nkAbb0t ok. So if I create a tag on the commit, it will be followed from the remote feature branch to the master branch, right?
16:34 TomyLobo joined #git
16:34 T4nkAbb0t atrus, That makes two of us. ;)
16:35 T4nkAbb0t thiago, I was told that a commit can only see things that it is allowed to see by the branch. I guess that is what is confusing me.
16:35 irco joined #git
16:35 thiago T4nkAbb0t: me too. That sentence doesn't make sense.
16:36 T4nkAbb0t thiago, I have good words. No, I have the best words
16:36 thiago T4nkAbb0t: if you tag a commit, the tag tags *that* commit and no other.
16:36 thiago T4nkAbb0t: tags don't belong to branches.
16:36 T4nkAbb0t thiago ok
16:37 eight58 joined #git
16:37 drbean joined #git
16:38 LeBlaaanc joined #git
16:40 phanimahesh joined #git
16:40 mmmveggies joined #git
16:41 drbean- joined #git
16:43 kpease joined #git
16:45 blackwind_123 joined #git
16:45 Brain joined #git
16:46 drbean joined #git
16:47 arand joined #git
16:48 jbitdrop joined #git
16:48 romerocesar joined #git
16:50 drbean_ joined #git
16:50 khmarbaise joined #git
16:51 ericvw joined #git
16:51 sol56 joined #git
16:52 alip joined #git
16:53 ochorocho__ joined #git
16:54 drbean joined #git
16:54 cdown joined #git
16:54 papna Is there a good, very high-level changelog somewhere? I'm curious what the difference between 1.8.3 and the latest git release is.
16:54 cqi_ joined #git
16:55 xall joined #git
16:55 kadoban papna: The only ones I've ever seen were quite detailed. You'd want to focus on the changes that came in 2.x I guess, if you haven't already looked there.
16:56 papna kadoban: Thanks.
16:57 papna kadoban: Thanks, I'll read a blog post or two about 2.0. Is there anything you can think of that I'll miss?
16:58 kadoban Not really, even in 2.x there wasn't a ton, relatively. Just that's the biggest bunch of actual changes. Other than that, git is kind of ridiculously stable. Mostly all that changes is bug fixes and small improvements.
16:58 romerocesar joined #git
16:59 kadoban (the biggest change I can recall was the push.default stuff, but basically every blog on 2.x should mention that, it was hard to miss)
16:59 papna kadoban: Yeah, and that is a nice change. The old default was whew.
16:59 dig joined #git
16:59 kadoban Yeah it was a little funny as a default before, heh.
17:00 papna kadoban: I'm upgrading an old 1.6 somewhere and I wanted to know if I should just update everything to the latest or not bother.
17:00 kadoban I would personally just go for it, especially if you don't have a lot of tooling that's depending on intricate git behavior or something. I usually update without much hesitation whenever there's a new version and it hasn't bitten me yet.
17:01 scoobertron joined #git
17:03 axiom_1 joined #git
17:03 mostlybadfly joined #git
17:03 drbean joined #git
17:04 khmarbaise joined #git
17:05 jlewis joined #git
17:07 Limes_ joined #git
17:07 papna kadoban: I don't want to waste my sysadmins' time or break others' scripts or muscle memory unnecessarily.
17:07 Seveas and if your script breaks, it's doing it wrong. scripts should use plumbing commands, of which output doesn't change :)
17:08 fuchstronaut joined #git
17:08 orbitphreak joined #git
17:08 papna Seveas: And yet it's more than a little realistic someone has e.g. a git push in their script.
17:08 kadoban papna: Sure, it's a valid concern. Just git is *the* most stable software I'm familiar with (that's actually maintained). I've literally had nothing break on me ever, even considering stuff like "oh that option changed". (other than push.default)
17:08 sybariten joined #git
17:09 ceaucari joined #git
17:09 Darcidride joined #git
17:09 semantipc joined #git
17:09 jlewis joined #git
17:09 whomp joined #git
17:09 flavius joined #git
17:10 jlewis joined #git
17:10 rominronin joined #git
17:10 sybariten hello, i am using git bash from inside "cmder", on windows. I get this error message when i start up the shell as well as when i do git commands...   "bash: /p/.bash_profile: Permission denied"    anyone know if its coming from bt bash or from the cmder thing itself?
17:11 jlewis joined #git
17:12 eletuchy joined #git
17:12 kadoban I'm unfamiliar with ... most of those proper nouns you mentioned, but it certainly sounds like it'd be coming from bash, when it tries to read .bash_profile.
17:13 artemisart joined #git
17:14 sybariten kadoban: yeah...
17:14 sybariten cmder is just a terminal or something
17:15 jaguarmagenta joined #git
17:15 editshare-ericf joined #git
17:15 steadystatic joined #git
17:16 ntonjeta joined #git
17:19 romerocesar joined #git
17:21 drbean_ joined #git
17:22 sobersabre joined #git
17:22 raijin joined #git
17:22 sobersabre hi. is it possible to run 1 git command and set http.sslVerify = False for it only, without running git config ?
17:22 sobersabre I mean for 1 specific execution
17:23 steadystatic I think you can run without any global this command just for that repo: git config http.sslVerify "false"
17:23 Seveas sobersabre: git -c http.sslVerify=False clone https://please-steal-my-credentials.com/
17:23 sobersabre Seveas: +100! Thanks!
17:23 sobersabre trying this now!
17:24 Seveas sobersabre: also, get that remote fixed.
17:24 Seveas https://git.seveas.net/dealing-with-misconfigured-https-repositories.html
17:24 kadoban sobersabre: Having to do that, even once, is pretty sketchy. Make sure you know what you're doing.
17:24 ahmedelgabri joined #git
17:24 sonOfRa joined #git
17:25 thiago_ joined #git
17:25 skalpin sybariten: try opening a new cmd with admin rights?
17:26 fscala joined #git
17:27 skalpin sybariten: cmder is conemu with some specific stylings and extra hooks for working with git. Did you install it with chocolatey?
17:27 d4rklit3 joined #git
17:28 al-damiri joined #git
17:29 steadystatic I’m moving our Java project’s SVN trunk w/ 30 subdir’s to Git. Wondering for build process reasons (Maven, shell scripts) how to replicate the notion of “trunk” (a master project w/ subprojects)…So far my direction is creating an addittional repo called “build” w/ Git submodules set to each respective repo’s “develop” branch (we’re using a loose git flow/feature branch process). I’m now bumping into Git subtre
17:29 steadystatic (https://makingsoftware.wordpress.com/2013/02/16/using-git-subtrees-for-repository-separation/). Any and all advice, please? :)
17:29 sobersabre kadoban: I understand.
17:29 sobersabre thanks.
17:30 sobersabre is it possible to pass git clone|fetch|ls-remote path to ssh private key ?
17:30 sobersabre (given it's passwordless of course)
17:30 sparr joined #git
17:30 sobersabre also per 1 run only.
17:31 rgrinberg joined #git
17:31 sobersabre I hope not by running an ssh-agent and then bash in it.
17:33 phanimahesh steadystatic: I've used submodules happily for a similar situation. The only possible trouble is that you have to update the build repo with new commits from submodules to create a new build.
17:33 iota_pi joined #git
17:33 phanimahesh I consider it a good thing to have to do that, some consider it an inconvenience.
17:34 phanimahesh sobersabre: Do you mean using an ssh private key for a git command?
17:34 sobersabre phanimahesh: I managed, configured via the ssh client config file
17:35 steadystatic @member:phanimahesh Yeah I wondered about having to clone out that much data all over again for each sub repo. It seems this is another way with remote add and local file path to avoid a full `git clone` when doing git submodule init and update etc. http://stackoverflow.com/a/11134369
17:35 phanimahesh sobersabre: Just use an ssh url and set the key in ~/.ssh/config
17:35 sobersabre phanimahesh: exactly
17:35 Eugene joined #git
17:35 tterrag|alt left #git
17:35 tterrag joined #git
17:38 rahtgaz joined #git
17:39 phanimahesh steadystatic: You can share git repos by setting GIT_DIR env.
17:39 steadystatic Oh that’s interesting, checking that out
17:39 steadystatic Thank you
17:39 drbean joined #git
17:40 fission6 joined #git
17:42 steadystatic left #git
17:42 steadystatic joined #git
17:48 sybariten skalpin: hmmmm..... IIRC i DLed a portable archive
17:48 fission6 joined #git
17:48 benwbooth joined #git
17:49 sybariten yeah, i did
17:53 drbean joined #git
17:53 sybariten skalpin: Hmmm that did it.... hm
17:53 t0mex_ joined #git
17:53 phanimahesh stevenbenner: It essentially shares the .git dir between repos, so you have to be a little careful.
17:54 t0mex__ joined #git
17:54 phanimahesh stevenbenner: There's a way to use the local existing copy only as a reference but not actually share it, don't remember the details off-hand
17:55 durham joined #git
17:55 Eugene man git-clone; I believe it's --local
17:55 gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html
17:55 Eugene Way way better than GIT_DIR hacks
17:56 garethdaine joined #git
17:57 Sasazuka joined #git
18:01 dreiss joined #git
18:01 dmto joined #git
18:01 eletuchy joined #git
18:02 ELFrederich joined #git
18:04 phanimahesh stevenbenner: Eugene: It's git clone --reference <local-repo> --dissociate <url>
18:04 ELFrederich any good visualizations of a Git submodule?  I'm putting together a presentation and can't find any
18:05 phanimahesh The reference tells git to look for objects in that repo, and dissociate tells git to copy them instead of sharing them.
18:05 astrofog joined #git
18:05 phanimahesh ELFrederich: What kind of visualisations?
18:05 phanimahesh to explain the concept?
18:05 zg joined #git
18:05 drbean_ joined #git
18:06 phanimahesh Use a diagram similar to what people use for explaining pointers.
18:06 nwkj86 joined #git
18:06 ELFrederich phanimahesh: yeah... like a picture of some commit tree of the superproject which somehow depicts that the contents of each commit contain a reference to a commit in another repo
18:06 zg Let's say I make a commit and then need it reviewed, someone replies with some feedback, I make appropriate changes, and then want to submit the commit.  In regards to commit messages, what should I put for the message in response to feedback on the code review?  Right now I'm just putting the same contents as the original commit, but I'm curious on what people here have to say about this.
18:07 ELFrederich zg: this is on GitHub?
18:07 zg Yeah
18:07 zg But it's definitely git related.
18:07 ELFrederich zg: then if it is in the context of a merge request the fact that you changed your commit will be noted in the history
18:07 t-mart__ joined #git
18:08 phanimahesh ELFrederich: Sorry, no good ones I remember. I'm assuming you checked the usual doc sources like progit?
18:08 zg ELFrederich: Yes, but what should I put in the commit message?
18:08 drbean- joined #git
18:08 d5sx43 joined #git
18:08 ELFrederich zg: in fact, you may want to rebase your commit so your merge request is still just a single commit, not a series of them
18:08 t-mart__ joined #git
18:08 zg How do I do that?
18:08 ELFrederich phanimahesh: yeah... git submodule section contains only text
18:08 phanimahesh zg: man git commit, option --fixup may be what you want.
18:08 gitinfo zg: the git-commit manpage is available at http://jk.gs/git-commit.html
18:08 timmu joined #git
18:09 idmistir joined #git
18:09 rominronin joined #git
18:09 phanimahesh Use it along with rebase --auto-squash before merging.
18:10 phanimahesh zg: Frequently, or whenever it makes sense, do git rebase <target> from your branch. <target> is the branch this PR will be merged into.
18:10 django_ left #git
18:10 zg lolwut
18:10 ajf- joined #git
18:10 zg "fixup! " prefix?  That looks retarded
18:10 whomp joined #git
18:11 phanimahesh zg: rebase takes the changes in your branch and changes their base.
18:11 semantipc joined #git
18:11 phanimahesh zg: It does till you do rebase --auto-squash.
18:11 phanimahesh That will automatically join all these fixup commits into one.
18:11 eletuchy joined #git
18:11 phanimahesh When the changes are minor and corrections, use fixups.
18:12 phanimahesh If the changes are somewhat major and you want to preserve them as a separate commit, then you can describe that in the commit message
18:13 tinarg joined #git
18:14 zg Alright
18:14 zg Thank you
18:14 zg left #git
18:14 D-Boy joined #git
18:15 EricPoe joined #git
18:19 m0viefreak joined #git
18:21 bluezone joined #git
18:21 shellkr left #git
18:21 drbean joined #git
18:21 jimi_ joined #git
18:22 pungi-man joined #git
18:22 idmistir_ joined #git
18:24 lmatteis joined #git
18:26 ynanm joined #git
18:27 rueben joined #git
18:28 JJM joined #git
18:29 JeremyM_ joined #git
18:31 Hfoi joined #git
18:33 uhmgswa^2 joined #git
18:35 Ccddr joined #git
18:35 svankmajer joined #git
18:37 yqt joined #git
18:37 drbean_ joined #git
18:38 k3rn31 joined #git
18:38 concerti joined #git
18:39 mdw joined #git
18:40 CheckDavid joined #git
18:40 dafb joined #git
18:41 Tryop88 joined #git
18:42 exospecies joined #git
18:42 exospecies hi
18:42 backnforth joined #git
18:43 exospecies git is ignoring a folder which is not in .gitignore, wonder how i can unignore it?
18:43 eletuchy joined #git
18:44 kadoban exospecies: Use 'git check-ignore' to figure out what's causing it. 'git ls-files' might also help
18:45 semantipc joined #git
18:45 Uiiu joined #git
18:46 exospecies kadoban: the folder shows in 'git ls-files', but check-ignore doesn't show me anything
18:46 whomp joined #git
18:47 kadoban exospecies: You know git doesn't track directories themselves, right? It only tracks files. Maybe that's what's going on, at a guess? If not I likely have more questions.
18:48 clemf joined #git
18:49 exospecies kadoban: it's a new file in a new directory that's being ignored, and that new directory is in yet another new directory... so only this new file is ignored then
18:49 kadoban exospecies: What does 'git check-ignore the/path/the_file' output?
18:50 DolphinDream joined #git
18:52 Guest82835 joined #git
18:52 khmarbaise joined #git
18:53 clemf joined #git
18:53 eijk_ joined #git
18:54 exospecies kadoban: actually i was mixing things up, working on two similar files... so there was nothing wrong... sorry about that and thanks for your help
18:54 dmto joined #git
18:56 kadoban No worries, glad you figured it out.
18:56 bumpy_ joined #git
18:57 oakyb joined #git
18:57 go1111111 joined #git
18:57 netj joined #git
18:58 sssilver joined #git
18:59 tso2 joined #git
19:01 bumpy__ joined #git
19:01 bumpy__ left #git
19:01 SwiftMatt joined #git
19:02 eijk joined #git
19:02 cdg joined #git
19:03 eletuchy joined #git
19:04 mmlb joined #git
19:07 cyan__ joined #git
19:08 Raging_Hog joined #git
19:08 fuchstronaut joined #git
19:08 fuchstronaut joined #git
19:09 uhmgawa^3 joined #git
19:10 rominronin joined #git
19:10 GavinMagnus joined #git
19:11 Schwarzbaer joined #git
19:12 t-mart_ joined #git
19:13 mablae joined #git
19:13 clemf_ joined #git
19:14 mablae He git folks
19:14 mablae I am a passionate gitlab user
19:15 mablae Now i need a a simple sulotion to mirror some of the repos remotely..
19:15 Seveas mablae: git clone --mirror
19:15 mablae Is gitolite still "a thing" ?
19:15 jaguarmagenta joined #git
19:16 backnforth joined #git
19:16 HedgeWork mablae: Yes, gitolite is still the best option for its use case.
19:16 vuoto joined #git
19:16 mablae Seveas, I need to push to it, since the local repo is not reachable from outside. That's the main reason for the external mirror to do only deployments from that.
19:17 mablae I used gitolite years ago. It was pretty okay
19:17 mablae Is it actively maintained?
19:17 HedgeWork Yes.
19:17 jeffmjack joined #git
19:18 circ-user-fe4Br joined #git
19:18 diegoviola joined #git
19:19 paul424 joined #git
19:19 troulouliou_div2 joined #git
19:20 romerocesar joined #git
19:20 setuid joined #git
19:20 mablae Just reading the quick install page... The docs definetly got a lot better
19:20 mablae But they could throw some CSS at it :) it ugly :)
19:21 sdothum joined #git
19:23 CJKinni joined #git
19:25 rueben joined #git
19:29 spudowiar https://tmate.io/t/hwLRXgvcFGwKZunJYeL4Q2mvY <--- do WTF you want
19:29 johnmilton joined #git
19:30 cordova joined #git
19:31 phanimahesh spudowiar: lol, why?
19:31 spudowiar someone just killed it :(
19:31 spudowiar lemme do it again!
19:31 Rodya_ joined #git
19:32 phanimahesh why?
19:32 kadoban spudowiar: I'm going to assume that has nothing to do with the channel ... there's gotta be better places for that.
19:33 dsdeiz joined #git
19:34 jstimm joined #git
19:35 mischat joined #git
19:35 reuma joined #git
19:40 b1tchcakes joined #git
19:40 reuma Hi guys, I want to clone a repo that is on my windows machine to a folder on a QNAP. The QNAP has GIT installed and I ran git init in a shared folder. when I try to git remote add the folder on the QNAP I get " Not a git repository (or any of the parent directories): .git"
19:41 btree joined #git
19:41 LeBlaaanc joined #git
19:42 netj joined #git
19:42 mischat_ joined #git
19:48 robotroll joined #git
19:48 reuma ??
19:48 larsrustand joined #git
19:50 m2n left #git
19:50 satifant joined #git
19:53 raindev joined #git
19:54 drbean joined #git
19:54 reuma Can anyone help me please?
19:57 ajf- joined #git
19:58 clemf joined #git
19:59 maziar joined #git
20:00 romerocesar joined #git
20:00 _ikke_ reuma: And you're sure you're in the git repository
20:03 nettoweb joined #git
20:04 joaumg Ok, probably a dumb question... But I have branches A, B ... I was at branch A and did a checkout to branch B, but forgot B's name... "what are my options?"
20:05 reuma _ikke_: Yes I am
20:05 joaumg s/forgot B/forgot A
20:05 madewokherd git reflog
20:05 cdown joined #git
20:05 joaumg madewokherd: thanks
20:06 madewokherd also git branch -a
20:06 eijk joined #git
20:07 joaumg git branch -a throws like 300+ branches, but the reflog save lives.
20:07 mischat joined #git
20:08 fracting joined #git
20:08 DolphinDream joined #git
20:08 _ikke_ reuma: cat .git/HEAD
20:08 dharrigan joined #git
20:09 nonconvergent joined #git
20:09 nonconvergent I have two commits on top that I would like to squash into one commit before I send it to remote
20:10 theskillwithin joined #git
20:10 nonconvergent I know I can use squash on a merge, but how do I say "Just squash this commit and this commit into one"
20:11 rominronin joined #git
20:11 inflames joined #git
20:11 Dan0maN_Work left #git
20:12 _ikke_ git reset --soft HEAD~ && git commit --amend -CHEAD
20:12 kadoban nonconvergent: 'rebase -i' would be the usual tool for that, you can arbitrarily mess with history, that's one of the options
20:12 drbean_ joined #git
20:12 kadoban Or that's probably better ...
20:12 italoacasas joined #git
20:13 nonconvergent kadoban: git rebase -i HEAD~2, then pick one and squash the other (into it)?
20:13 xanadu_ joined #git
20:13 kadoban Yep
20:14 nonconvergent trying it on a fresh branch
20:16 reuma Thanks!
20:17 udm joined #git
20:17 udm_ joined #git
20:17 nnyk_ joined #git
20:18 livingstn joined #git
20:19 _ikke_ reuma: For what? :-)
20:20 semantipc joined #git
20:22 Seveas _ikke_: why the -CHEAD?
20:22 Seveas isn't that implied?
20:24 drbean joined #git
20:26 mischat_ joined #git
20:28 nonconvergent kadoban: Works
20:28 nonconvergent thanks.
20:28 _ikke_ Seveas: Doesn't pop open the editor
20:29 radsy joined #git
20:32 mmlb joined #git
20:32 andlabs joined #git
20:33 andlabs Hi. If I git checkout some-tag -- file, file will be staged on HEAD - how do I avoid this? I just want to get the file for reference, not restore it
20:34 interne7y joined #git
20:34 _ikke_ andlabs: git show some-tag:file
20:34 _ikke_ redirect it to a file if you want it stored
20:35 andlabs ah cool, thanks
20:37 uhmgawa joined #git
20:38 aidalgol joined #git
20:38 Ahmed90 joined #git
20:39 Seveas _ikke_: ah, nifty!
20:40 nerium joined #git
20:40 asnoehu joined #git
20:40 nerium Is there a way to over the desination directory using git clone?
20:40 nerium *to override
20:40 romerocesar joined #git
20:40 Seveas nerium: git clone url-to-repo path-to-destination
20:41 nerium Seveas: ”already exists and is not an empty directory.”
20:41 nerium I was hoping to avoid removing or moving the exiting one
20:41 Seveas is it an actual repo you're cloning into?
20:42 nerium No
20:42 udm joined #git
20:42 nerium Which is why I want to override the existing directory
20:44 udm_ joined #git
20:44 d0nn1e joined #git
20:44 jaime_ joined #git
20:44 jaime_ joined #git
20:45 ramsub08 joined #git
20:45 ramsub08 hello, how do i undo a git reset --soft HEAD~ ?
20:45 selckin git commit
20:46 selckin !reflog
20:46 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
20:49 filcab joined #git
20:52 IWishIKnew joined #git
20:54 diegoaguilar joined #git
20:54 livingstn joined #git
20:54 troulouliou_div2 joined #git
20:54 btree left #git
20:56 rgrinberg joined #git
20:56 orbitphreak joined #git
20:57 ki0_ joined #git
20:57 CussBot_ joined #git
20:57 elastix joined #git
20:59 livingstn joined #git
21:00 neanderslob joined #git
21:00 neanderslob_ joined #git
21:00 helpD joined #git
21:01 neanderslob joined #git
21:03 Grum joined #git
21:04 GavinMagnus joined #git
21:04 helpD_ joined #git
21:05 ramsub07 joined #git
21:05 ahr3n joined #git
21:08 semantipc joined #git
21:09 ramsub08 joined #git
21:09 fuchstronaut joined #git
21:10 cyan__ joined #git
21:10 uhmgawa joined #git
21:10 garethdaine left #git
21:11 romerocesar joined #git
21:12 cdown_ joined #git
21:12 rominronin joined #git
21:13 WaReZ joined #git
21:13 mischat joined #git
21:16 jaguarmagenta joined #git
21:16 LaptopBrain joined #git
21:18 Noldorin joined #git
21:19 diegoviola let's say I made some changes 6 commits back and I regret those changes, should I just create a new commit to revert those or maybe reset the HEAD before that change?
21:19 diegoviola and re-do the newer changes again?
21:19 diegoviola what's best in this case?
21:20 bluj diegoviola, if you haven't pushed the 6 commits upstream yet, you could interactively rebase 6 commits back, and just edit and amend the one problem commit. if you've pushed.. you should do a new commit to make those corrections
21:21 NeverDie joined #git
21:21 ahmedelgabri joined #git
21:21 diegoviola bluj: I've already pushed upstream
21:21 mischat_ joined #git
21:21 jaime_ left #git
21:22 ochorocho__ joined #git
21:22 diegoviola bluj: can't I do the rebase and edit and then push with --force?
21:22 bluj diegoviola, you can. other repo users will be mad.
21:23 diegoviola bluj: I'm the only one at this point
21:23 diegoviola only user
21:23 bluj they will 'git pull' and will learn that it is not a fast forward merge, and they will need to hard reset to the current origin head
21:23 bluj oh, go for it. blast it all away!
21:24 boombatower joined #git
21:24 bluj 'git rebase -i HEAD~6' ... change 'pick' to 'e' on the commit you want to edit.. make the changes, 'git add <files you edited>' 'git commit --amend' and 'git rebase --continue'
21:24 diegoaguilar joined #git
21:24 bluj if you don't want any of the code from that commit, instead of changing the 'pick' to 'e'.. just delete the whole line entirely.
21:25 ToBeCloud joined #git
21:26 diegoviola thanks, deleting the line was enough
21:26 diegoviola at rebase -i HEAD~8
21:26 bluj cool.
21:26 diegoviola I can't believe it was that easy
21:26 diegoviola thanks
21:26 bluj git ftw
21:26 bluj np
21:26 nnyk joined #git
21:28 diegoviola yep, thanks
21:28 rudi_s diegoviola: For the future, rebase -i @~8 is a little less to type.
21:28 rudi_s @ == HEAD
21:29 axiom_1 joined #git
21:30 vjacob joined #git
21:30 eijk joined #git
21:36 Dougie187 left #git
21:37 Darcidride joined #git
21:38 GavinMagnus joined #git
21:38 drbean_ joined #git
21:39 aard__ joined #git
21:39 eijk_ joined #git
21:39 eijk_ joined #git
21:40 filcab joined #git
21:40 fracting joined #git
21:41 jlewis joined #git
21:41 romerocesar joined #git
21:43 mischat joined #git
21:43 raijin joined #git
21:44 garethdaine joined #git
21:45 diegoviola joined #git
21:45 troulouliou_div2 joined #git
21:48 joki joined #git
21:49 andlabs joined #git
21:51 oncall-pokemon joined #git
22:00 aidalgol joined #git
22:01 romerocesar joined #git
22:04 mdw joined #git
22:07 cdown joined #git
22:07 italoacasas joined #git
22:09 italoacasas joined #git
22:09 nettoweb joined #git
22:10 anu1 joined #git
22:13 tyreld joined #git
22:13 rominronin joined #git
22:16 texasmynsted left #git
22:20 rgrinberg joined #git
22:21 apotry joined #git
22:24 squaresurf joined #git
22:25 elsevero joined #git
22:30 texasmynsted joined #git
22:31 texasmynsted iirc there is a config command to shorten the hashes shown for most commands
22:31 texasmynsted Anybody recall this?
22:31 tlaxkit joined #git
22:41 ocbtec joined #git
22:42 ramsub07 joined #git
22:44 cdg joined #git
22:44 GavinMagnus left #git
22:45 ash_workz joined #git
22:45 ojacobson $ git rev-parse --short 4b825dc642cb6eb9a060e54bf8d69288fbee4904
22:45 ojacobson 4b825dc
22:46 uhmgswa^2 joined #git
22:49 shgysk8zer0 joined #git
22:49 texasmynsted I thought there was some way to set something in the config so when I do git log, I see short hashes
22:50 SenpaiSilver_ left #git
22:50 SenpaiSilver_ joined #git
22:50 ramsub08 joined #git
22:51 SenpaiSilver joined #git
22:55 livingstn joined #git
22:56 nonconvergent joined #git
22:59 qsx man git-config
22:59 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
23:04 GGMethos joined #git
23:07 SenpaiSilver joined #git
23:10 fuchstronaut joined #git
23:14 rominronin joined #git
23:17 jdaiii joined #git
23:17 jaguarmagenta joined #git
23:17 jdaiii I installed checkinstall with git. Not working correctly and trying to uninstall. yum remove checkinstall is not working. Ideas?
23:19 jdaiii left #git
23:21 slash77 joined #git
23:22 Atlantic777 joined #git
23:22 Atlantic777 joined #git
23:25 go111111111 joined #git
23:26 Rodya_ joined #git
23:26 interne7y joined #git
23:27 livingstn joined #git
23:30 Rodya_ joined #git
23:32 ajf- joined #git
23:35 minibar joined #git
23:38 Rodya_ joined #git
23:39 texasmynsted left #git
23:40 drbean joined #git
23:42 mablae_ joined #git
23:43 rueben joined #git
23:45 mdw joined #git
23:55 DolphinDream joined #git
23:55 elsevero joined #git
23:56 ajf- joined #git
23:56 rbern joined #git
23:59 fahadash joined #git

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