Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-27

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

All times shown according to UTC.

Time Nick Message
00:00 jaguarmagenta joined #git
00:00 pothepanda yea git remote add etc.. will add a remote.. then i can pull..
00:00 pothepanda aye aye thanks a bunch :D
00:00 quetz joined #git
00:00 hdon pothepanda, IIUC your situation is this: you have local repo "foo" and you "git clone foo" to make another local repo that has checked out master branch from "foo" -- a side effect of "clone" is that the place you cloned from is added as the remote repo called "origin"
00:01 hdon pothepanda, so i thought you wanted to have the remotes be the same in both repos
00:01 hdon pothepanda, btw if you want to work on two different projects at once that are part of the same repo, git has way better ways than making multiple clones of the repo
00:01 hdon pothepanda, do you know how to use branches and stash?
00:03 bronson joined #git
00:03 pothepanda hdon, yes i tried branches when it was the same thing with changes for each project.
00:03 pothepanda hdon: but this, is a base code as a template to use for all projects, so i need to clone and work with a different git repository, then if i can pull any changes from the "base" it would be handy
00:06 pothepanda i think so at least :D
00:07 jaequery joined #git
00:07 pskhadke joined #git
00:07 yaymukund joined #git
00:07 mykespb joined #git
00:08 vassagus joined #git
00:09 pskhadke joined #git
00:11 bronson joined #git
00:12 mellernoia joined #git
00:14 neilthereildeil left #git
00:14 SwiftMatt joined #git
00:16 Salander27 joined #git
00:17 mischat joined #git
00:19 bronson joined #git
00:20 Milijus joined #git
00:22 mozzarella how can I know which diff program git is using?
00:23 Lor_ joined #git
00:24 AlexxNica joined #git
00:26 thiago_ mozzarella: its own
00:26 mozzarella really?
00:27 thiago_ yes
00:27 romerocesar joined #git
00:28 codfection joined #git
00:28 Milijus joined #git
00:28 rgrinberg joined #git
00:29 AciD` left #git
00:31 mizu_no_oto joined #git
00:31 bronson joined #git
00:31 zivester joined #git
00:36 bronson_ joined #git
00:38 Milijus joined #git
00:38 thierryp joined #git
00:39 CEnnis91 joined #git
00:39 bronson joined #git
00:40 ResidentBiscuit joined #git
00:40 nurey joined #git
00:43 Ryanar joined #git
00:43 bronson_ joined #git
00:47 Raed|Mobile joined #git
00:49 citizen-stig joined #git
00:50 Goplat joined #git
00:50 wxg joined #git
00:54 jon-mac joined #git
00:54 prawnzy joined #git
00:54 lolmac joined #git
00:55 Motoko joined #git
00:55 durham_ joined #git
00:55 bronson joined #git
00:56 harry1 joined #git
00:56 Prisoner-2460_1 joined #git
00:57 PioneerAxon joined #git
00:58 snthsnth joined #git
01:00 pilgo_ joined #git
01:01 anuxivm left #git
01:01 pilgo joined #git
01:01 pilgo Hi all.
01:02 pskhadke joined #git
01:02 brokensyntax joined #git
01:02 pilgo I have a git repo with a submodule name ‘plugins’. I somehow corrupted this submodule and would like to get it back
01:02 pilgo How can I do that?
01:02 bronson joined #git
01:02 pilgo When I say I corrupted it, it seems that git thinks it’s part of the main repo and not a submodule
01:02 pilgo ..there’s no .git folder in the submodule dir
01:02 pilgo Any ideas?
01:03 brokensyntax So how's this work anyway? If I want to download something from source to build, is it enough to wget from the src folder, or do I really need to run a git client?
01:04 pilgo brokensyntax: there could be build related things outside src
01:04 nedbat brokensyntax: if your repo host lets you download the latest code as a tarball, then you can do that. you just won't be able to make changes and push them back
01:05 AfroThundr joined #git
01:05 brokensyntax nedbat: I'm trying to install a feature into my asterisk box and the original host is gone. They've ported into Git from the code.google host site (and also upgraded a version.)
01:05 brokensyntax http://code.google.com/p/iksemel
01:05 brokensyntax They used to have a tarball that made it prett yeasy.
01:06 nedbat brokensyntax: you can get a tarball from github
01:06 nedbat brokensyntax: sorry, a zipfile: https://github.com/meduketto​/iksemel/archive/master.zip
01:06 brokensyntax ty
01:07 brokensyntax Git's kinda on my list of code related things to learn about ;)
01:08 nedbat brokensyntax: as well it ought to be
01:09 bronson joined #git
01:10 yaymukund joined #git
01:12 sleepster joined #git
01:12 ncd|leeN joined #git
01:12 sleepster is there a max limit on the number of commits for a single file?
01:13 vassagus joined #git
01:14 bronson_ joined #git
01:14 bremner what do you mean? the number of time one file can be changed? only limit is disk space, basically
01:15 nedbat sleepster: you have something unusual in mind?
01:18 mischat joined #git
01:22 lindenle joined #git
01:22 bronson joined #git
01:23 d^sh joined #git
01:24 sleepster I have a system that generates tons of small files.  The files are updated every 10 minutes or so.  I would like to use git to store these files
01:24 sleepster sort of like an FTP server
01:25 nedbat sleepster: do you really need to keep all the revisions?
01:25 dalias git makes sense for representing the history of content that changes in time
01:25 sleepster nedbat: no :( I already have a publicly accessible git server so I thought I can just use it
01:25 sleepster I don't need the revision history though
01:26 dalias it does not make sense as a file server
01:28 sleepster thanks dalias . yeah I thought so too.  hmm.
01:28 sleepster I'll have to rethink things I guess
01:28 bronson joined #git
01:31 jnavila joined #git
01:31 multi90_ joined #git
01:33 fedepad joined #git
01:33 Cavallari Everytime I run the git fetch --prune AND git rebase origin/master git removes most of my directories in vendor/ (PHP), but vendor directory is in .gitignore
01:33 Cavallari Anyone know why?
01:35 bronson joined #git
01:37 PioneerAxon joined #git
01:38 bejeb joined #git
01:39 jaguarmagenta joined #git
01:40 thierryp joined #git
01:40 aspiers joined #git
01:41 sartan joined #git
01:46 fstd_ joined #git
01:46 foist joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and electronically-induced comas | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-daemon: the evil rises
01:52 dsantiago joined #git
01:54 ruskie joined #git
01:54 pskhadke joined #git
01:55 actinide joined #git
01:56 azerus joined #git
01:59 BlackMaria_netsp joined #git
01:59 evanwang joined #git
02:00 danslo joined #git
02:00 harish joined #git
02:01 Gamecubic joined #git
02:01 arescorpio joined #git
02:09 raijin joined #git
02:10 LeBlaaanc joined #git
02:12 yaymukund joined #git
02:12 Dougie187 joined #git
02:14 dreiss joined #git
02:15 red82 joined #git
02:18 vassagus joined #git
02:19 mischat joined #git
02:19 LeBlaaanc joined #git
02:21 sdothum joined #git
02:21 danslo joined #git
02:25 LeBlaaanc joined #git
02:29 dreiss joined #git
02:31 vishal joined #git
02:31 LeBlaaanc joined #git
02:32 sword joined #git
02:32 kfoonamalik joined #git
02:34 Eryn_1983_FL joined #git
02:36 thenotorious joined #git
02:36 thenotorious left #git
02:37 flavster joined #git
02:37 bocaneri joined #git
02:38 citizen-stig joined #git
02:39 lagothrix joined #git
02:39 bocaneri joined #git
02:40 thierryp joined #git
02:42 pskhadke joined #git
02:42 danslo joined #git
02:45 harry1 joined #git
02:45 chachasmooth joined #git
02:48 mizu_no_oto joined #git
02:48 LeBlaaanc joined #git
02:49 thenotorious joined #git
02:50 re1_ joined #git
02:50 vulture_ joined #git
02:51 thenotorious left #git
02:52 AciD` joined #git
02:52 nilg joined #git
02:52 hexagoxel joined #git
02:53 pskhadke joined #git
02:55 gshrikant joined #git
02:57 LeBlaaanc joined #git
02:57 snthsnth joined #git
02:57 steven_a_s joined #git
02:57 gfixler joined #git
02:58 kfoonamalik joined #git
03:00 aavrug joined #git
03:02 aavrug joined #git
03:07 e14 joined #git
03:08 Rodya_ joined #git
03:09 xshuiniu joined #git
03:11 hahuang62 joined #git
03:13 yaymukund joined #git
03:13 snowkidind joined #git
03:14 EmeraldExplorer joined #git
03:15 morenoh149 joined #git
03:16 bronson joined #git
03:18 bronson_ joined #git
03:18 LeBlaaanc joined #git
03:20 mischat joined #git
03:20 duderonomy joined #git
03:23 LeBlaaanc joined #git
03:23 vassagus joined #git
03:24 danslo joined #git
03:26 dreiss joined #git
03:27 raijin joined #git
03:27 romerocesar joined #git
03:28 ahr3n joined #git
03:28 Pyrogerg joined #git
03:29 romerocesar joined #git
03:31 tmcmahon joined #git
03:31 gshrikant joined #git
03:38 Dougie187 left #git
03:41 thierryp joined #git
03:47 rchavik joined #git
03:47 dsantiago joined #git
03:47 romerocesar_ joined #git
03:48 Andrew_K joined #git
03:49 robotroll joined #git
03:50 Sucks joined #git
03:51 boombatower joined #git
03:51 LeBlaaanc joined #git
03:52 romerocesar joined #git
03:54 romerocesar joined #git
03:55 jaguarmagenta joined #git
03:55 d3r1ck joined #git
03:57 romerocesar joined #git
03:59 shymega joined #git
04:04 __xor joined #git
04:05 danslo joined #git
04:06 e14 joined #git
04:06 Cabanossi joined #git
04:07 a_thakur joined #git
04:07 romerocesar joined #git
04:08 danimal2 joined #git
04:09 e14 joined #git
04:11 LeBlaaanc joined #git
04:13 daey_ joined #git
04:14 yaymukund joined #git
04:14 citizen-stig joined #git
04:16 rscata joined #git
04:16 dreiss joined #git
04:17 joki joined #git
04:19 dsdeiz joined #git
04:20 noyb joined #git
04:21 mischat joined #git
04:24 fedepad joined #git
04:27 danslo joined #git
04:28 vassagus joined #git
04:30 RustyShackleford joined #git
04:30 RustyShackleford which tools do you use with git on os x?
04:30 eshlox joined #git
04:30 RustyShackleford any reason not to use the git that os x ships with? And then i'm curious which diff and mergetools you use
04:31 a_thakur joined #git
04:31 grawity xer0x: right, so that should be `git push github xer0x/branch` or `... xer0x/branch:xer0x/branch`
04:32 a_thakur joined #git
04:33 Motoko The git with OS X is kinda old. 2.8.4 on the latest release.
04:33 * Motoko uses Kaleidoscope, mainly. Beyond Compare a bit.
04:34 clemf joined #git
04:34 russoneto joined #git
04:34 harry1 joined #git
04:34 Motoko KDiff3 isn't too bad for free.
04:36 Motoko There's also FileMerge, which comes with X-Code.
04:38 RustyShackleford I took a training class at work about git
04:38 RustyShackleford I asked the instructor about git gui, he says i'm the only one he knows that uses it hah
04:39 Sucks joined #git
04:39 Motoko gitk?
04:39 RustyShackleford do you use a GUI for the stage/commit workflow? I've also been trying sourcetree a bit
04:39 RustyShackleford gitk lets you visualize history
04:39 Motoko I've been using SourceTree, but have mostly moved to Tower.
04:40 Motoko Also played with GitKraken, which is a decent tool.
04:40 RustyShackleford hmm tower isn't free...
04:40 Sucks_ joined #git
04:40 RustyShackleford sourcetree seems like too much i dunno
04:41 Motoko Yeah, Tower isn't cheap.
04:41 Motoko SourceTree is pretty full-featured.
04:42 Motoko Give GK a try, I guess.
04:43 Limes_ joined #git
04:43 Motoko ST has a ton of UI replicating what the CLI can do. It's useful in many ways.
04:47 danslo joined #git
04:51 actinide joined #git
04:55 ewet joined #git
04:56 Rodya_ joined #git
04:58 annoymouse4210 joined #git
05:00 freimatz joined #git
05:02 subhojit777 joined #git
05:03 dec0n joined #git
05:04 Cabanossi joined #git
05:04 bmahe joined #git
05:08 snthsnth joined #git
05:10 thierryp joined #git
05:11 SwiftMatt joined #git
05:11 laumann joined #git
05:14 ahr3n joined #git
05:14 Motoko joined #git
05:15 WayToDoor joined #git
05:15 yaymukund joined #git
05:15 prawnzy joined #git
05:16 dreiss joined #git
05:17 Jon28 joined #git
05:22 mischat joined #git
05:25 hahuang62 joined #git
05:29 danslo joined #git
05:30 LeBlaaanc joined #git
05:33 vassagus joined #git
05:35 cspack joined #git
05:42 zeroed joined #git
05:46 Nd-47-M joined #git
05:46 stuh84 joined #git
05:49 LeBlaaanc joined #git
05:49 ThomasLocke joined #git
05:49 Akimb joined #git
05:49 Raging_Hog joined #git
05:55 heroux joined #git
05:56 lindenle joined #git
06:00 satya4ever_ joined #git
06:00 cyan__ joined #git
06:01 citizen-stig joined #git
06:03 testild joined #git
06:03 chele joined #git
06:03 WayToDoor joined #git
06:06 fedepad joined #git
06:07 romerocesar joined #git
06:09 fedepad_ joined #git
06:11 watabou joined #git
06:11 danslo joined #git
06:11 lb1c joined #git
06:13 JeroenT joined #git
06:16 a_thakur joined #git
06:17 elect joined #git
06:18 yaymukund joined #git
06:21 Akimbas joined #git
06:22 JeroenT_ joined #git
06:22 neunon joined #git
06:23 mischat joined #git
06:23 harry1 joined #git
06:23 flobin joined #git
06:24 jknetl joined #git
06:25 roelmonnens joined #git
06:25 citizen-stig joined #git
06:27 rominronin joined #git
06:27 cspack joined #git
06:28 _ng joined #git
06:30 shgysk8zer0 joined #git
06:31 lordjancso joined #git
06:32 aswen joined #git
06:33 Repox joined #git
06:35 overlord_tm joined #git
06:35 JeroenT joined #git
06:37 a_thakur_ joined #git
06:38 vassagus joined #git
06:40 LeBlaaanc joined #git
06:40 actinide joined #git
06:42 flobin joined #git
06:42 thierryp joined #git
06:44 circ-user-130ZE joined #git
06:45 lexxis joined #git
06:46 Sceorem joined #git
06:46 laumann joined #git
06:48 brokensyntax joined #git
06:49 quetz joined #git
06:49 Oebele joined #git
06:51 armyriad joined #git
06:54 dimi1947 joined #git
06:54 dreiss joined #git
06:54 bjpenn joined #git
06:55 bjpenn are there anything special about branches that are like release/5.0 vs like release-5.0
06:56 grawity nope
06:57 bjpenn ah ok
06:58 flobin joined #git
06:59 Darcidride joined #git
07:02 submitnine joined #git
07:07 Chloe joined #git
07:14 danslo joined #git
07:15 Andrew_K joined #git
07:16 qt-x joined #git
07:16 rendar joined #git
07:17 TomyWork joined #git
07:18 eduardas_m joined #git
07:19 yaymukund joined #git
07:20 mycyber joined #git
07:22 pijiu2 joined #git
07:23 vulture joined #git
07:23 fuzzmz bjpenn, why some people do the release/5.0 vs release-5.0 is that some GUI clients treat the name/name2 as folder/item-in-folder so it makes grouping easier
07:24 osse fuzzmz: git itself treats it as grouping also
07:24 osse if you have a branch a/b then you cannot have a branch a
07:24 fuzzmz didn't know that. that's awesome
07:24 bjpenn osse: ahh i see
07:24 bjpenn osse: thanks
07:25 bjpenn yeah pretty cool
07:25 osse look inside .git/refs and be enlightened
07:27 sagerdearia joined #git
07:28 Balliad joined #git
07:29 delboy1978uk joined #git
07:29 DevAntoine joined #git
07:29 delboy1978uk i keep forgetting how to delete a branch remotely after having removed it locally
07:30 delboy1978uk isnt it just a git push?
07:30 harish joined #git
07:30 fuzzmz delboy1978uk, git push remote --delete branchname
07:30 fuzzmz or git push remote :branchname
07:31 delboy1978uk thanks fuzzmz
07:31 fuzzmz np
07:31 |prawnzy joined #git
07:32 delboy1978uk left #git
07:33 spriz joined #git
07:34 actinide joined #git
07:35 xaa joined #git
07:36 Alienpruts joined #git
07:37 hahuang62 joined #git
07:38 AlexxNica joined #git
07:38 aax joined #git
07:40 danielitit joined #git
07:42 HappyLoaf joined #git
07:43 vassagus joined #git
07:44 firefly_ joined #git
07:48 danielitit joined #git
07:48 firefly_ left #git
07:48 zeroed joined #git
07:50 danielitit joined #git
07:50 danielitit joined #git
07:58 chll_ joined #git
08:02 mikecmpbll joined #git
08:02 winterchip joined #git
08:06 star_prone joined #git
08:07 mkoskar joined #git
08:08 afuentes joined #git
08:10 ahmedelgabri joined #git
08:11 danslo joined #git
08:12 harry1 joined #git
08:13 Snugglebash joined #git
08:14 Snugglebash joined #git
08:14 citizen-stig joined #git
08:15 b3atr joined #git
08:16 b3atr joined #git
08:16 yaewa joined #git
08:16 b3atr how to get files that's been staged and modified?
08:17 fuzzmz what do you mean by that?
08:17 b3atr i gonna write a git-hook that check if the staged file has the related test
08:17 b3atr so i need path of the staged file
08:18 osse b3atr: git diff --staged
08:18 osse you might want --name-only
08:18 b3atr done
08:19 osse does "done" mean "ok" or does it mean "I've already tried that" ?
08:19 masuberu joined #git
08:19 mooncup osse: yes
08:19 osse ** TRIGGERED **
08:20 fuzzmz :D
08:20 yaymukund joined #git
08:20 sostenuto joined #git
08:22 ferr joined #git
08:22 aidalgol joined #git
08:22 ifra201 joined #git
08:23 troyt joined #git
08:26 b3atr how to check if there's staged change in specific directory?
08:26 t0by joined #git
08:28 deltab you can give a path to git status or git diff --cached
08:29 fees joined #git
08:32 codfection joined #git
08:33 Rodya_ joined #git
08:33 cdown joined #git
08:36 kurkale6ka joined #git
08:36 Serpent7776 joined #git
08:39 z8z joined #git
08:39 niels__ joined #git
08:42 SpecChum joined #git
08:42 7GHAAELQA joined #git
08:42 17SAAD40U joined #git
08:45 mikecmpbll is it possible to do command interpolation in a git alias? i'd like to alias: git log `git describe --tags --abbrev=0`..HEAD --oneline
08:45 mikecmpbll as git release-log
08:45 eduardas_m joined #git
08:45 mikecmpbll i could do it as a bash alias, i guess
08:45 rominronin joined #git
08:46 canton7 you can create shell aliases as git aliases
08:46 canton7 see the second paragraph of 'alias.*' in man git config
08:46 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
08:46 ShekharReddy joined #git
08:47 jaequery joined #git
08:47 osse alias it to  git log --oneline HEAD --not --tags \o/
08:47 PCatinean joined #git
08:47 makinen joined #git
08:48 vassagus joined #git
08:48 mikecmpbll osse : oh :) canny.
08:49 mikecmpbll canton7 : thanks! can't believe i missed that.
08:50 j416 joined #git
08:50 canton7 .. or if you create a shell script called 'git-release-log' and put it in your path, git will find it
08:50 canton7 overkill for a one-liner though
08:51 chele does gitosis just provide fine access control or has it something more than just plain git?
08:51 mikecmpbll git release-log , quite the beut! no more fumbling around on gitlab trying to work out what's changed since last release.
08:51 mikecmpbll ta all.
08:51 dc5ala joined #git
08:52 canton7 chele, !gitosis
08:52 gitinfo chele: gitosis is no longer maintained and supported by the author; we usually recommend gitolite instead which has much better documentation and more features: http://github.com/sitaramc/gitolite -- there's even a migration guide for gitosis users... if you're stuck with gitosis for some reason we'll try to help, but no promises!
08:52 canton7 (and gitolite does provide fine access control)
08:52 ahr3n joined #git
08:53 chele cool, thanks.
08:54 StormLrd joined #git
08:54 troyt joined #git
08:55 TomyWork joined #git
08:57 wrouesnel joined #git
08:58 a_thakur joined #git
08:59 rorro joined #git
08:59 achadwick joined #git
09:00 watersoul joined #git
09:00 tvw joined #git
09:03 BadSnappa joined #git
09:04 j416 joined #git
09:04 Ezzy joined #git
09:05 BSaboia joined #git
09:09 aidalgol joined #git
09:10 j416 joined #git
09:14 jaequery joined #git
09:17 titankiller joined #git
09:19 Biganon joined #git
09:19 flobin joined #git
09:19 Biganon Hi ; I'm afraid I don't understand non-bare repos : if I make a local change to a file and push it to the repo, should it immediately reflect this new state ?
09:19 Biganon because I tried and it doesn't seem so
09:20 osse Biganon: reflect it how?
09:20 osse ah, you're pushing to a non-bare?
09:20 Biganon yes
09:21 Biganon I used git config receive.denyCurrentBranch ignore
09:21 Biganon to be able to do it
09:21 yaymukund joined #git
09:21 selckin so i removed the warning label that said you'd get burned, and now i'm burned, but i don't understand why
09:22 Biganon maybe we can avoid cynicism for once, I'm trying to learn
09:22 selckin !deploy
09:22 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
09:23 Biganon I'll read that, thank you
09:29 jnavila joined #git
09:32 SwiftMatt joined #git
09:32 osse Biganon: I would epect git to not update the file
09:32 osse but i am not sure
09:32 jesk I add some directories to a remote repo, but many subdirectories werent added because they had .git directories themselves. I removed those .git directories, but when readding the directories via "git add" nothing happens
09:32 jesk how can I fix this?
09:38 a3pq51 joined #git
09:39 titankiller joined #git
09:39 hahuang62 joined #git
09:42 citizen-stig joined #git
09:42 danslo joined #git
09:44 fuchstronaut joined #git
09:44 inflames joined #git
09:45 grawity they got added as submodules
09:45 grawity rm --cached them, then re-add
09:46 grawity this time using `git add path/to/dir/` rather than `git add path/to/dir`
09:47 chachasmooth joined #git
09:47 Bowel_ joined #git
09:53 vassagus joined #git
09:55 weylin joined #git
09:56 Bowel_ I created a wrapper around git-clone to automatically set target directory based on the repository url. Is there a better way to do this? https://gist.github.com/op/4aa​916f7d3ce95250ae45d46cf2251e2
09:57 chamunks joined #git
09:58 notebox joined #git
09:58 adante joined #git
09:58 pigeon joined #git
09:58 albel727 joined #git
09:58 bttf joined #git
09:59 Vorisi joined #git
09:59 oldrobot joined #git
09:59 mattcen joined #git
10:00 drupald joined #git
10:00 ldlework joined #git
10:00 ldlework joined #git
10:00 maqr joined #git
10:01 harry1 joined #git
10:01 armenzg_ joined #git
10:01 grumble joined #git
10:02 kjsage[m] joined #git
10:03 encod3 joined #git
10:03 jguillen joined #git
10:04 tcsc joined #git
10:05 Milijus joined #git
10:06 ssitani joined #git
10:08 gfixler joined #git
10:08 Akimbas joined #git
10:09 mischat joined #git
10:11 stamina joined #git
10:11 MissionCritical joined #git
10:13 nilg joined #git
10:14 testild1 joined #git
10:15 moei joined #git
10:15 titankiller joined #git
10:17 cspack joined #git
10:19 nilg joined #git
10:22 a_thakur joined #git
10:22 yaymukund joined #git
10:23 nedbat Bowel_: you run doctests every time you run the tool?
10:25 Milijus joined #git
10:26 jee1mr joined #git
10:26 fuzzmz ahaha, oh god, I love today
10:26 fuzzmz because I'm leaving they put someone else in charge of being the git repo maintainer
10:26 fuzzmz in the 30 minutes I was off to eat lunch he managed to completely break our develop branch by force pushing to it and rewriting all its history
10:27 nedbat fuzzmz: at a job years ago, a junior developer checked in c:\   # though this was cvs, not git, so i guess it's off-topic
10:28 Bowel_ nedbat: hah, yes. makes sure you never forget and also it's such a small time waste compared to the actual network operation ;)
10:28 nedbat Bowel_: ok, interesting :)
10:28 fuzzmz nedbat, oh man, I remember cvs, that was always fun
10:28 vassagus joined #git
10:28 nedbat fuzzmz: well, the point of the story was c:\, but sure :)
10:28 nds_ joined #git
10:29 fuzzmz :D
10:29 Bowel_ nedbat: the real reason is that I couldn't get python -m doctest file to work when it's a main() or something, so i ended up this way. i do like it tho
10:30 nedbat Bowel_: yeah, for something this size, it's no problem, just unusual.
10:30 cloudbud joined #git
10:33 cloudbud what is the functionality of git fetch
10:33 jaguarmagenta joined #git
10:34 tobiasvl cloudbud: man git fetch
10:34 gitinfo cloudbud: the git-fetch manpage is available at http://jk.gs/git-fetch.html
10:34 tobiasvl cloudbud: most often it's used to download branches from a remote and put them in remote-tracking branches
10:35 a_thakur_ joined #git
10:35 tobiasvl !remote_tracking_branch
10:35 gitinfo Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branch>'
10:36 brokensyntax joined #git
10:41 bjpenn joined #git
10:41 danslo joined #git
10:41 tlaxkit joined #git
10:42 Lunatrius` joined #git
10:43 danslo joined #git
10:43 dec0n joined #git
10:44 mischat joined #git
10:44 JeroenT joined #git
10:44 Dong joined #git
10:45 mischat joined #git
10:46 Dong Anybody got understanding of how http protocol does the pack negotiation when fetch/pull?
10:46 Dong The document I read has lots of TODO there
10:49 nedbat Dong: i have no idea, but out of curiosity, what brings you to ask about it?
10:52 Dong I'm writing a C# git library, now onto Fetch (upload-pack)
10:52 JeroenT joined #git
10:52 Dong I have been using tcpdump to see how stock git negotiate with git server, yet it has nothing common to what the document says
10:54 txdv do you have a repo for it?
10:54 a_thakur joined #git
10:55 rorro joined #git
10:56 Dong txdv: question for me? I have it in GitHub private for now.
10:57 txdv what is your goal and how is it different from libgit2sharp?
10:57 a_thakur_ joined #git
10:58 JeroenT joined #git
10:59 wololokatamari[m joined #git
10:59 codfection joined #git
10:59 Dong my lib need to work within UWP which libgit2sharp can't as it needs to load dll
11:00 JeroenT_ joined #git
11:00 aax joined #git
11:01 JeroenT joined #git
11:02 xaa__ joined #git
11:03 bjpenn joined #git
11:03 usm4n joined #git
11:04 Dong and libgit2sharp is just a managed wrapper, it's not real C# library; I suppose Java guys all prefer to use jgit rather than a wrapper right?
11:06 star_prone joined #git
11:06 albel727 joined #git
11:09 brokensyntax joined #git
11:11 cederfjard joined #git
11:12 testild1 joined #git
11:13 cederfjard Let's say I've merge oned branch into another, and fixed all conflicts. Then later, I want to merge the same branch into yet another one, similar but not equal to the first. Is there a way for me to avoid having to redo the overlapping merge fixes manually again?
11:14 cederfjard *Let's say I've merged one
11:14 nedbat cederfjard: not sure, but this might be what rerere is for
11:15 cederfjard nedbat: Thanks, I'll look into it
11:15 ismaris joined #git
11:15 red82 joined #git
11:15 JeroenT joined #git
11:15 nedbat btw, if I use rerere for a rebase, can't I call it rererere ? :)
11:16 nilg joined #git
11:17 leeN joined #git
11:18 cederfjard haha
11:18 rnsanchez joined #git
11:18 cederfjard left #git
11:20 JeroenT joined #git
11:22 BlackMaria joined #git
11:25 laumann joined #git
11:26 mischat_ joined #git
11:27 sin3t joined #git
11:27 JeroenT joined #git
11:27 masuberu joined #git
11:27 flobin joined #git
11:28 zeroed joined #git
11:28 aard joined #git
11:28 ojdo joined #git
11:30 Murii joined #git
11:31 d10n-work joined #git
11:31 nuck joined #git
11:33 niels___ joined #git
11:33 vassagus joined #git
11:34 raspado joined #git
11:34 cdown joined #git
11:37 DieguezZ joined #git
11:37 laumann joined #git
11:37 josuebrunel joined #git
11:37 nettoweb joined #git
11:37 zeorin joined #git
11:38 jbitdrop joined #git
11:38 zeorin !config
11:38 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
11:38 bronson joined #git
11:38 eduardas_m joined #git
11:39 tlaxkit joined #git
11:39 raijin joined #git
11:39 zeorin left #git
11:39 mischat joined #git
11:40 hahuang62 joined #git
11:42 txdv Dong: there is GitSharp
11:42 danslo joined #git
11:42 txdv you might want to look into it instead of sarting from scratch
11:42 txdv although it looks abandoned
11:44 masak left #git
11:45 a_thakur joined #git
11:46 barteks2x joined #git
11:49 mohabaks joined #git
11:49 another_git joined #git
11:49 harry1 joined #git
11:52 wibrt joined #git
11:52 Dong txdv: it is dead code, including ngit which is derived from jgit
11:52 Dong txdv: it does not work with UWP, I tried to make ngit work though, after 2 months I gave up.
11:53 Darcidride_ joined #git
11:53 Dong There is no decent working C# library on git except mine I guess.
11:53 rorro joined #git
11:55 danslo joined #git
11:55 txdv Dong: well currently you are just saying that 'it is there
11:55 canton7 Dong, https://github.com/anhoavu/​LibGit2-UWP-WinRT-Component ?
11:55 am2on[m] joined #git
11:56 am2on[m] left #git
11:56 canton7 and https://github.com/anhoavu/LibGit2-UWP-Static ?
11:56 JeroenT joined #git
11:57 Dong canton7: Commits on Jun 24, 2016, how am I suppose to find it back last November?
11:57 canton7 "find it back last November"?
11:57 Dong the github project you just linked?
11:57 Alienpruts joined #git
11:57 Dong I started my project last nov
11:57 canton7 You said you were writing a project now?
11:58 Dong I'm writing it doesn't mean I just started
11:59 txdv Dong: are you going to make your lib open source?
11:59 canton7 Ok, I'll bite. If you're writing a library, then you find something which does everything you've written and then a lot more, is there any point in continuing?
11:59 NeverDie joined #git
11:59 canton7 It's the Sunk Cost Fallacy: because you've sunk effort into your library, there's a sense that it's more worth your while to continue
11:59 Dong canton7: it doesn't, if you read his Readme
11:59 canton7 I never said it did
11:59 a_thakur_ joined #git
11:59 Dong canton7: then should the jgit guys dump their jgit?
12:00 canton7 I don't know your library, of course. I linked it to you in case it *did* do more than yours
12:00 LBV_User joined #git
12:00 canton7 you don't need to snap at me because of that
12:00 canton7 I was trying to be helpful, damnit
12:00 txdv how dare you!
12:00 Dong canton7: no I'm ok to dump my stuff, but the project you mentioned is not fully working
12:00 cloudbud joined #git
12:01 canton7 I don't know what state yours is in: it might be in a better state than yours for all I know. It's only you that can make that call, and you can't do that unless I give you the link
12:01 Dong I thought about his approach myself, i.e. to get the C++ code working on Win32
12:01 Dong canton7: sure I thank you for that. I didn't mean anything negative
12:02 txdv so LibGit2-UWP-static just makes libgit2 use the winrt api?
12:02 txdv and then you can load that with dllimport no problemo?
12:02 miklcct joined #git
12:02 Dong his work is to replace anything libgit2 calls to something allowed in UWP.
12:03 txdv looks like the smartest approach to me
12:03 Dobo joined #git
12:03 Dong which after some time I decided it's not that easy as it looks as libgit2 calls lots of lib isn't there.
12:03 * canton7 doesn't fancy reimplementing the merge of pack code in anything
12:03 canton7 *or
12:03 geekbri joined #git
12:03 txdv on windows libgit2 is calling only that http lib?
12:04 zeroed joined #git
12:05 qws-user-1229 joined #git
12:05 txdv all the other libs are for unix
12:05 Dong ssh
12:05 Dong UWP doesn't have a libssh
12:05 JoshL_ joined #git
12:05 flaviodesousa joined #git
12:06 txdv on windows?
12:07 txdv hm
12:07 txdv that is a tough one to crack i guess
12:07 wim_ joined #git
12:07 steelnwool left #git
12:09 michaelsharpe joined #git
12:09 cYmen joined #git
12:09 dcpc007 left #git
12:11 Dong thanks to both of you. My intention is to have a pure C# git library just like Java has jgit
12:11 pks joined #git
12:11 ThiefMaster joined #git
12:12 Dong there is too less decent C# libraries around due to the past C# is not open source.
12:13 ash_workz joined #git
12:14 mizu_no_oto joined #git
12:15 wiber joined #git
12:15 wiber howto?: assume i have a parent codebase (eg math course in latex) with two childs (one tailored for X an one tailored for Y), how would you manage this with git? More details: changes to the parent should be present in de childs, but not always; changes in the childs, most of the time only there.
12:15 ssitani joined #git
12:16 johnmilton joined #git
12:16 tobiasvl wiber: submodules?
12:17 dsdeiz joined #git
12:17 albel727 joined #git
12:17 txdv sad
12:17 txdv didn't know that libgit2 doesn't work for uwp
12:17 wiber what would be submodule?
12:18 tobiasvl !submodule
12:18 gitinfo git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/boo​k/en/Git-Tools-Submodules
12:18 ilmari !subtree
12:18 gitinfo The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-To​ols-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.
12:18 ilmari !git-subtree
12:18 gitinfo git-subtree allows a subproject repository to be incorporated into a subdirectory of a main repository, and for the history of a subdirectory to be (re-)exported with reproducible results, making it possible to synchronise a repository with a subdirectory of another repo, see https://github.com/git/git/blob/mas​ter/contrib/subtree/git-subtree.txt for more info.
12:19 wiber the problem that i'm facing: eg parent_1, X_1, X_2 are all different versions of the same, (intended in that way)
12:20 wiber now a change in the file parent_1 most of the time also applies to X_1 and X_2
12:20 wiber so the separation is not on a file level
12:20 synthroid joined #git
12:21 wiber i was looking at branching and merging, but merging seems to mean a 'complete merge'
12:22 mkoskar joined #git
12:22 Raging_Hog joined #git
12:23 txdv Dong: if you ever release that thing please pm me a link to your github repo
12:23 vls-xy joined #git
12:23 mkoskar joined #git
12:23 geekbri left #git
12:23 yaymukund joined #git
12:24 Dong txdv: what are you going to write with it? mind I asking
12:25 txdv nothing
12:25 wiber conceptually i was hoping for a solution, since git has some history with i386, X86, arm 'branches?' for kernel development
12:26 citizen-stig joined #git
12:26 Dong txdv: oh come on.
12:26 bremner wiber: roughly speaking, branches are eventually merged back into one history
12:27 bremner wiber: git doesn't seem that well suited to being a template system, although lots of webdev types seem to try it, so maybe they have some ideas
12:28 bond joined #git
12:28 Dong__ joined #git
12:29 txdv Dong__: ill probably use libgit2sharp
12:29 zotherstupidguy joined #git
12:29 zotherstupidguy whats the maximum blob size in git?
12:29 txdv if i ever come around to doing it at all
12:29 Dong__ txdv: sure, my lib is really made for UWP for the time being
12:29 Wind0r joined #git
12:30 codfection joined #git
12:31 niels___ joined #git
12:32 iveqy_ joined #git
12:32 niels___ joined #git
12:32 jeffreylevesque joined #git
12:34 jaguarmagenta joined #git
12:34 heftig joined #git
12:35 cYmen joined #git
12:37 f3r70rr35f joined #git
12:38 a3pq51_ joined #git
12:38 vassagus joined #git
12:39 sanketdg joined #git
12:40 fuchstronaut joined #git
12:42 ahmed_elgabri joined #git
12:42 Raging_Hog joined #git
12:42 dan2k3k4 joined #git
12:45 zivester joined #git
12:48 rns joined #git
12:48 citizen-stig joined #git
12:50 rgrinberg joined #git
12:51 raspado joined #git
12:51 mojibake joined #git
12:53 Cavallari joined #git
12:54 jimi_ joined #git
12:57 rominronin joined #git
12:58 howitdo joined #git
12:59 arup_r joined #git
13:00 King_Hual joined #git
13:00 andlabs joined #git
13:00 arup_r I am following this http://www.aymerick.com/2014/07/22/jek​yll-github-pages-bower-bootstrap.html for my 1 project to choose the work flow. I am on *Checkout the gh-pages branch in _dist directory* now. I don't understand the command `git clone git@github.com:aymerick/jekyll-example.git -b gh-pages _site` can anyone help me why he did it?
13:02 luke_penn joined #git
13:02 grawity zotherstupidguy: afaik, the only limits are your ULONG_MAX and how much RAM you have
13:03 bjpenn joined #git
13:04 lacrymology joined #git
13:05 GodGinrai joined #git
13:10 idmistir_ joined #git
13:10 marc_v92 joined #git
13:10 cdg joined #git
13:11 JamesBaxter joined #git
13:12 jaafar joined #git
13:12 dan2k3k4 joined #git
13:13 l4v2 joined #git
13:14 ShekharReddy joined #git
13:14 CEnnis91 joined #git
13:15 HalfEatenPie joined #git
13:17 jasondotstar_ left #git
13:17 synthroid joined #git
13:19 ssitani joined #git
13:21 Darren_ joined #git
13:21 f3r70rr35f joined #git
13:21 f3r70rr36f joined #git
13:23 brokensyntax joined #git
13:23 grawity arup_r: afaik, jekyll takes the raw files from the ./_site/ directory and generates HTML stuff in ./
13:23 malesca joined #git
13:24 arup_r grawity: yes you are right. But why is he passing the `_site` directory? How this command works I am trying to understand
13:24 shinnya joined #git
13:24 grawity to tell `git clone` to create the repo there
13:24 grawity `man git clone`
13:24 gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html
13:25 arup_r I did git clone to clone the repo. But neaver passes like `-b gh-pages _site` . So asked. :)
13:25 nurey joined #git
13:26 vassagus joined #git
13:26 JeroenT joined #git
13:26 arup_r got it now.. read the man
13:26 arup_r thank you
13:29 ninetysevena joined #git
13:31 NeverDie joined #git
13:31 jnavila joined #git
13:31 niels__ joined #git
13:32 niels___ joined #git
13:33 Gsham joined #git
13:33 CheckDavid joined #git
13:34 mar77i_ joined #git
13:34 sangy joined #git
13:37 AaronMT joined #git
13:37 sin3t joined #git
13:37 PalTale joined #git
13:38 harry1 joined #git
13:39 kyan joined #git
13:41 hahuang62 joined #git
13:41 ocbtec joined #git
13:43 Cavallari1 joined #git
13:43 ExoUNX joined #git
13:45 anonymuse joined #git
13:45 rnsanchez_ joined #git
13:47 red82 joined #git
13:48 ash_workz joined #git
13:51 cYmen joined #git
13:51 Murii joined #git
13:55 lindenle joined #git
13:55 rominronin joined #git
13:56 niels__ joined #git
13:58 soc42 joined #git
13:59 lindenle joined #git
13:59 Pyrogerg joined #git
14:00 zotherst1 joined #git
14:03 ShekharReddy joined #git
14:05 DeltaHeavy joined #git
14:05 DeltaHeavy My git-for-windows running on msys is getting insanely slow. Would having too many local references perhaps cause that?
14:05 barteks2x joined #git
14:06 7GHAAEOOG joined #git
14:06 64MAA1CKS joined #git
14:07 brokensyntax joined #git
14:08 a3pq51__ joined #git
14:08 tango_ DeltaHeavy: git gc might help
14:08 zotherst1 joined #git
14:10 khfeng joined #git
14:11 michaelsharpe joined #git
14:11 DeltaHeavy tango_ Will that lock everything up making it hard to work right now?
14:11 DeltaHeavy I believe it already does that automatically from time to time no?
14:11 DeltaHeavy By deafult anyway
14:12 e14 joined #git
14:12 ybden joined #git
14:12 lacrymology joined #git
14:12 ResidentBiscuit joined #git
14:13 JoshL_ left #git
14:13 tango_ DeltaHeavy: no idea about the msys version
14:15 le_melomane joined #git
14:19 patarr joined #git
14:21 JoshL joined #git
14:24 DeltaHeavy tango_ It's just git on Windows with git bash
14:24 yaymukund joined #git
14:24 DeltaHeavy git bashs uses msys
14:25 Khisanth joined #git
14:25 vassagus joined #git
14:25 circ-user-HSkrH joined #git
14:26 peepsalot I think I accidentally created a branch when i meant to switch to it, now i'm confused
14:27 peepsalot the branch exists in remote origin, i just want to reset it to that
14:27 phaleth joined #git
14:28 fuzzmz peepsalot, git branch --set-upstream-to=origin/branch-name branch-name
14:28 fuzzmz git fetch origin
14:28 fuzzmz git reset --hard origin/branch-name
14:29 fuzzmz now your branch is the same as the one on the server and is set to track it
14:29 JeroenT joined #git
14:29 michaelsharpe joined #git
14:30 dave0x6d joined #git
14:31 nikivi joined #git
14:31 cdown_ joined #git
14:31 ash_workz joined #git
14:32 HoloPed joined #git
14:33 djh joined #git
14:33 HoloPed Why am I getting "nothing to commit, working directory clean" when I try to commit ?
14:33 HoloPed I did "git add -all"
14:33 laumann joined #git
14:33 HoloPed also, I have several folders that I want all under the same repository, how do I manage folders ?
14:33 harry1 joined #git
14:34 HoloPed the server is bitbucket
14:34 fuzzmz HoloPed, git doesn't track folders, only files
14:34 grawity what? of course it tracks folders
14:34 grawity it just doesn't track empty ones.
14:34 fuzzmz that's what I meant
14:34 HoloPed the folders are not empty
14:34 fuzzmz HoloPed, move those folders inside of your git repo
14:34 matsaman joined #git
14:34 HoloPed they each hold code/ solution, etc
14:34 jaguarmagenta joined #git
14:35 HoloPed fuzzmz, how ?
14:35 HoloPed locally ?
14:35 fuzzmz yes. did you clone the repo from bitbucket on your pc?
14:35 HoloPed the repo is empty
14:35 HoloPed I need to add my local files to the repo
14:35 HoloPed its the first commit
14:35 fuzzmz you clone it, add the files locally and then push them
14:36 HoloPed ah, ok
14:36 djh joined #git
14:38 HoloPed fuzzmz, I cloned and added my files. Now do I run git add -all ?
14:38 chigang joined #git
14:38 fuzzmz yes
14:38 fuzzmz then git commit
14:38 fuzzmz and then git push
14:38 HoloPed cool
14:38 HoloPed thanks
14:38 fuzzmz np
14:39 solars joined #git
14:39 le_melomane joined #git
14:40 solars hi, if I've got a branch dev which is always merged to master - usually fast forward - and is now suddenly out of sync (needs merge commits) can I just rebase master on dev so it works fast forward again?
14:42 lb1c joined #git
14:42 le_melomane joined #git
14:43 _ADN_ joined #git
14:43 zivester joined #git
14:44 Rodya_ joined #git
14:44 fuzzmz are you sharing those branches with anyone?
14:45 fuzzmz if yes, don't rebase. if no, I'd rebase dev on top of master and then merge dev into master (it should ffwd now)
14:46 Dougie187 joined #git
14:46 solars I'm in control with it so it's not a problem - why rebase dev on top of master and merge, and not rebase master on dev?
14:46 lindenle joined #git
14:47 solars ^ fuzzmz
14:49 mohabaks joined #git
14:51 thiago joined #git
14:51 rendar joined #git
14:53 JeroenT joined #git
14:53 rbern joined #git
14:53 nedbat solars: if you rebase master on dev, then the commit sequence in history will be first dev, and then the rest of master.  You (presumably) want: first master, then your dev work
14:53 peepsalot fuzzmz, thanks!  got my branch worked out
14:54 Junior joined #git
14:55 brokensyntax joined #git
14:55 mycyber joined #git
14:56 Brain joined #git
14:56 cbreak joined #git
14:57 mischat joined #git
14:58 fuzzmz solars, what nedbat said. You generally want to rebase the branch that's being merged onto the destination of that merge (in your case, dev on top of master)
14:58 GodGinrai nedbat: why would you rebase master onto anything?
14:59 nedbat GodGinrai: i wouldn't
14:59 harry1 left #git
15:00 GodGinrai nedbat: ah, I misread the previous convo
15:00 stomplee joined #git
15:00 kyan joined #git
15:01 LukeLR joined #git
15:02 solars nedbat: it doesn't matter as they are currently in the same state
15:02 solars fuzzmz: thanks, I'll do it like this anyway then
15:03 fuzzmz no problem
15:03 Cabanossi joined #git
15:03 jknetl joined #git
15:03 daey joined #git
15:04 chachasmooth joined #git
15:04 nedbat solars: same state? Why rebase anything then?
15:04 eivarv joined #git
15:04 fuzzmz I think they're in the same state now after the rebase + merge
15:04 LBV_User joined #git
15:04 nedbat ok, i'll shut up :)
15:05 roelmonn_ joined #git
15:06 tristanp joined #git
15:09 zivester joined #git
15:09 yaymukund joined #git
15:09 cjohnson when you say "rebase master on anything", are you talking about switching to "anything" and running git rebase master?
15:09 cjohnson or the other way around?
15:11 kini joined #git
15:11 nedbat cjohnson: by "rebase master on dev", i meant:  "git checkout master; git rebase dev" (as you put it, the other way around)
15:12 Kitty- joined #git
15:12 evie_hammond joined #git
15:13 khfeng joined #git
15:14 lacrymology joined #git
15:14 brokensyntax joined #git
15:15 cjohnson Oh ok. well I do the opposite of that regularly to refresh long-lived feature branches from master
15:15 cjohnson git checkout feature; git rebase master
15:15 nedbat cjohnson: +1
15:15 cjohnson ok just making sure I wasn't crazy, GodGinrai made me nervous
15:15 cjohnson lol
15:16 rorro joined #git
15:16 clemf joined #git
15:16 InfoTest joined #git
15:16 SwiftMatt joined #git
15:16 Rastafa joined #git
15:18 romerocesar joined #git
15:20 thierryp joined #git
15:20 crose joined #git
15:21 red82 my colleague and I are working on a project that has a main.config file.  his is slightly different than mine.  I want to create an alice.config and a bob.config and if alice checks out the repos alice.config will get copied to main.config and if bob checks out bob.config will get copied to main.config.  is this possible with git hooks? (or am I misunderstanding what they do?)
15:23 tyreld joined #git
15:28 jaequery joined #git
15:29 dreiss joined #git
15:29 ndim joined #git
15:34 Ryanar joined #git
15:35 al-damiri joined #git
15:36 a_thakur joined #git
15:36 nilg joined #git
15:36 gshrikant joined #git
15:37 rgrinberg joined #git
15:41 e14 joined #git
15:41 lindenle joined #git
15:41 hahuang62 joined #git
15:42 e14 joined #git
15:42 cjohnson red82: use symlinks
15:43 cjohnson repo has bob.config and alice.config, part of your initialization process/script is to make symlink main.config -> bob.config or main.config -> alice.config
15:45 red82 cjohnson: thanks
15:45 GandalfTheWizard joined #git
15:45 e14 joined #git
15:45 synthroid joined #git
15:46 durham joined #git
15:46 Gsham joined #git
15:47 cdg joined #git
15:48 e14 joined #git
15:48 brokensyntax joined #git
15:48 laumann joined #git
15:49 nedbat red82: is it important for alice and bob to be checked in at all?
15:50 cjohnson yeah good point. I will generally try to refactor whatever is common (or sane defualts) alice+bob into main.config and then gitignore env.config
15:50 cjohnson and alice writes her own env.config and bob writes his own and I just don't even create env.config because I'm happy with the defaults
15:51 stamina joined #git
15:52 hahuang62 joined #git
15:52 re1 joined #git
15:52 DieguezZ joined #git
15:53 romerocesar joined #git
15:53 hobodave joined #git
15:55 red82 nedbat: just for convenience.  there’s a ton of paths in there and everyone’s are different and its tedious to redo them
15:56 thiago_ joined #git
15:56 romerocesar_ joined #git
15:57 crayon joined #git
15:57 crayon joined #git
15:59 e14 joined #git
16:00 ndim joined #git
16:00 oskarkv joined #git
16:00 joki joined #git
16:01 wogi joined #git
16:05 subhojit777 joined #git
16:06 Vaelatern joined #git
16:07 DieguezZ joined #git
16:08 dinoocch joined #git
16:09 lamont joined #git
16:11 romerocesar joined #git
16:11 fedepad joined #git
16:11 ochorocho__ joined #git
16:15 dunk Is there a clean way to split a file in git, while preserving the history in both of the resultant files?
16:15 dunk I basically want "git cp"
16:16 canton7 dunk, !rename
16:16 gitinfo dunk: git does not support explicitly file renaming - the 'git mv' command is shorthand for 'git rm --cached; mv; git add'. All "rename" statistics are generated at runtime when examining history with git-log. See the -M option in the git-log manpage for more info. Also public-inbox.org/git/Pine.L​NX.4.58.0504150753440.7211@ppc970.osdl.org and `diff.renames = true`  in man git-config
16:16 lexxis joined #git
16:17 maxb joined #git
16:20 wogi_ joined #git
16:22 Repox joined #git
16:23 realz__ joined #git
16:23 ochorocho__ joined #git
16:26 lindenle joined #git
16:26 jwest joined #git
16:27 rbr joined #git
16:29 dwsr joined #git
16:29 prawnzy joined #git
16:30 uebera|| joined #git
16:30 masuberu joined #git
16:31 fuchstronaut joined #git
16:31 dunk canton7: ta
16:33 LeBlaaanc joined #git
16:33 stompleee joined #git
16:34 JSharpeNT joined #git
16:34 Gsham_ joined #git
16:34 Vgr_ joined #git
16:34 Vgr_ joined #git
16:34 russo joined #git
16:34 niels___ joined #git
16:34 pijiu3 joined #git
16:34 Sudden_ joined #git
16:34 SpecChum joined #git
16:34 cdg_ joined #git
16:34 michaels_ joined #git
16:34 bronson_ joined #git
16:34 HoloPed joined #git
16:34 fedepad joined #git
16:34 perlpilot_ joined #git
16:34 jnewt_ joined #git
16:34 vassagus_ joined #git
16:35 ForeignBiscuit joined #git
16:35 t0n1c joined #git
16:35 yaewa joined #git
16:35 circ-user-HSkrH_ joined #git
16:35 jaguarmagenta joined #git
16:35 durham_ joined #git
16:35 ForeignBiscuit joined #git
16:36 realz joined #git
16:36 preilly joined #git
16:36 joki- joined #git
16:36 yaymukun1 joined #git
16:36 qws-user-1228 joined #git
16:36 unbalancedparen joined #git
16:36 angseus joined #git
16:36 Vinnie_win_i joined #git
16:36 lss8_ joined #git
16:36 synthmea1 joined #git
16:37 fstd_ joined #git
16:37 hahuang62 joined #git
16:37 [Brain] joined #git
16:37 astaves_ joined #git
16:37 Atlantic778 joined #git
16:37 tjone270 joined #git
16:37 ItSANgo__ joined #git
16:37 lindenle_ joined #git
16:37 h12o joined #git
16:37 comps_ joined #git
16:37 dharriga1 joined #git
16:37 ndimitrij joined #git
16:37 wogi joined #git
16:37 biax__ joined #git
16:37 JelmerD joined #git
16:37 dwsr_ joined #git
16:37 leeN joined #git
16:37 blueyed joined #git
16:37 unreal joined #git
16:37 Timvde| joined #git
16:37 rzeka joined #git
16:37 jimi_sanchez joined #git
16:37 CIAguy- joined #git
16:37 neunon_ joined #git
16:37 hfp_ joined #git
16:37 dermoth_ joined #git
16:37 techntoke_ joined #git
16:37 spriz joined #git
16:37 Fuco joined #git
16:37 hegge joined #git
16:37 Levex joined #git
16:37 pasky joined #git
16:37 notpratch joined #git
16:37 rbr` joined #git
16:37 Infamous joined #git
16:37 Ragnor joined #git
16:37 habbasi joined #git
16:37 cjohnson joined #git
16:37 unreal joined #git
16:37 mike_ joined #git
16:37 neunon_ joined #git
16:37 AciD- joined #git
16:37 PaulePanter joined #git
16:37 Fuco joined #git
16:37 rzeka joined #git
16:37 Oebele joined #git
16:37 umbSublime_ joined #git
16:37 Mixologic_ joined #git
16:37 ringer1 joined #git
16:37 re1_ joined #git
16:37 polyzen_ joined #git
16:38 constantinexvi_ joined #git
16:38 jwest joined #git
16:38 geko joined #git
16:38 bond joined #git
16:38 u1106_ joined #git
16:38 MTwister joined #git
16:38 tgunr joined #git
16:38 IndigoTiger joined #git
16:38 wagle joined #git
16:38 Khisanth joined #git
16:38 armyriad joined #git
16:38 sfix joined #git
16:38 catsup joined #git
16:38 vmiklos joined #git
16:38 tom][ joined #git
16:38 grawity joined #git
16:38 jgornick joined #git
16:38 AaronMT joined #git
16:38 ribasushi joined #git
16:38 StormLrd joined #git
16:38 evil-t0by joined #git
16:38 hecliunyx joined #git
16:38 LBV_User joined #git
16:38 justinmrkva joined #git
16:38 Lor_ joined #git
16:38 krillr joined #git
16:38 AKPWD joined #git
16:38 wrpn_ joined #git
16:38 jeffreylevesque_ joined #git
16:38 pilgo_ joined #git
16:38 phaleth joined #git
16:38 emptyn1ne joined #git
16:38 kenansulayman joined #git
16:38 filcab joined #git
16:38 64MAA1E8J joined #git
16:38 Guest381` joined #git
16:38 themayor joined #git
16:38 Hogofwar joined #git
16:38 Orion3000 joined #git
16:38 fugiman joined #git
16:38 yoh joined #git
16:38 vdl joined #git
16:38 phaleth joined #git
16:38 filcab joined #git
16:38 me_and joined #git
16:38 Darcidride_ joined #git
16:38 dmarr joined #git
16:38 sparr joined #git
16:38 fling_ joined #git
16:38 ajpiano joined #git
16:38 fhackdroid joined #git
16:38 Alenah joined #git
16:38 bratchley joined #git
16:38 rcn_ joined #git
16:38 nitesh joined #git
16:38 mmattice joined #git
16:38 azerus joined #git
16:38 markmarkmark joined #git
16:38 boshhead joined #git
16:38 WakiMiko joined #git
16:38 jesk joined #git
16:38 Orphis joined #git
16:38 thomas1 joined #git
16:38 mquin joined #git
16:38 hwoarang joined #git
16:38 rossome joined #git
16:38 encod3_ joined #git
16:38 nchambers joined #git
16:38 rxo joined #git
16:38 sleezd_ joined #git
16:38 fspy joined #git
16:38 Shentino2 joined #git
16:39 Kamilion joined #git
16:39 LeBlaaanc joined #git
16:39 oxsyn joined #git
16:39 rudycane joined #git
16:39 sunny256 joined #git
16:39 andlabs joined #git
16:39 tango_ joined #git
16:39 sLite joined #git
16:39 uebera|| joined #git
16:39 uebera|| joined #git
16:39 LeMike joined #git
16:39 Mir4g3 joined #git
16:39 weylin joined #git
16:39 icedp joined #git
16:39 mojibake joined #git
16:39 mozzarella joined #git
16:39 UTAN_dev joined #git
16:39 __name__ joined #git
16:39 Arguggi joined #git
16:39 txdv joined #git
16:39 polyzen joined #git
16:39 _flow_ joined #git
16:39 Fissure joined #git
16:39 croberts joined #git
16:39 roue joined #git
16:39 frobnic joined #git
16:39 DonVitoCorleone joined #git
16:39 Klumben joined #git
16:39 stomplee joined #git
16:39 JanC joined #git
16:39 albel727 joined #git
16:39 dhollinger joined #git
16:39 f3r70rr35f joined #git
16:39 ninetysevena joined #git
16:39 yanome joined #git
16:39 ash_workz joined #git
16:39 mns joined #git
16:39 sagerdearia joined #git
16:39 Ravana joined #git
16:39 brokensyntax joined #git
16:39 SirCmpwn joined #git
16:40 multi_io joined #git
16:40 ansimation joined #git
16:40 Ciblia joined #git
16:40 parasite joined #git
16:40 jason237 joined #git
16:40 Shakeel_ joined #git
16:40 rbern joined #git
16:40 c0ded joined #git
16:40 ocbtec joined #git
16:40 asdofindia joined #git
16:40 hobodave joined #git
16:40 matsaman joined #git
16:40 ghostlight joined #git
16:40 codebam joined #git
16:40 johnmilton joined #git
16:40 seitensei joined #git
16:40 holodoc joined #git
16:40 armenzg_ joined #git
16:40 mutex joined #git
16:40 ayjay_t joined #git
16:40 howitdo joined #git
16:40 midnightmagic joined #git
16:40 Ariadeno joined #git
16:40 CrazyBonz joined #git
16:40 Gianormagantrous joined #git
16:40 Gianormagantrous joined #git
16:40 iveqy_ joined #git
16:41 Anthaas_ joined #git
16:41 snowinferno joined #git
16:41 sigjuice joined #git
16:41 barteks2x joined #git
16:41 watersoul joined #git
16:41 nellicus_ joined #git
16:41 Peng joined #git
16:41 Zoxc joined #git
16:41 nephyrin joined #git
16:41 malesca joined #git
16:41 bejeb joined #git
16:41 raatiniemi joined #git
16:41 lolmac joined #git
16:41 justusranvier joined #git
16:41 barteks2x That's weird, some people have merge conflicts that shouldn't be there.  I merged a branch into master, a few other people have been working on something on master at that time (local only) and they complain they jhave merge conflicts in ClassX while they didn't even touch ClassX
16:41 iamthad joined #git
16:41 forrestv joined #git
16:42 rumble joined #git
16:42 bauruine joined #git
16:42 justusranvier If git is refusing to merge unrelated histories when the two branches do, in fact, have a common ancestor, is that a bug?
16:42 blahdodo joined #git
16:42 mar77i joined #git
16:42 harleypig joined #git
16:42 noodle joined #git
16:42 qlkzy joined #git
16:42 lacrymology joined #git
16:42 joelsmith joined #git
16:42 daishan joined #git
16:42 Samual joined #git
16:42 abh joined #git
16:42 sitaram joined #git
16:42 sitaram joined #git
16:42 preaction joined #git
16:42 Walex joined #git
16:42 a3Dman joined #git
16:42 Samual joined #git
16:43 adante joined #git
16:43 cloudcell_ joined #git
16:44 HoloPed_ joined #git
16:44 yaymukund joined #git
16:44 d3r1ck joined #git
16:44 aax joined #git
16:44 Sleepy63 joined #git
16:44 relrod_ joined #git
16:44 relrod_ joined #git
16:44 lss8 joined #git
16:44 Zenrium joined #git
16:44 mike__ joined #git
16:45 maxb joined #git
16:45 yazdmich joined #git
16:45 LeBlaaan_ joined #git
16:45 vulture_ joined #git
16:45 quenode joined #git
16:45 babilen joined #git
16:45 wogi_ joined #git
16:45 Bombe joined #git
16:45 dharrigan joined #git
16:45 dharrigan joined #git
16:46 bremner justusranvier: what does "git merge-base ref1 ref2" report?
16:46 gr_wity joined #git
16:46 UTAN_dev_ joined #git
16:46 Mixologic joined #git
16:46 Invisible joined #git
16:46 Droolio joined #git
16:46 Atlantic777 joined #git
16:46 Atlantic777 joined #git
16:46 joseph_arnstein_ joined #git
16:46 f3r70rr36f joined #git
16:46 jbitdrop joined #git
16:46 JoshL joined #git
16:47 henriquev joined #git
16:47 khfeng joined #git
16:47 star_prone joined #git
16:47 gsingh93 joined #git
16:47 vishal joined #git
16:47 cagedwisdom joined #git
16:47 ndim joined #git
16:47 jnavila_ joined #git
16:47 VladGh joined #git
16:47 ajpiano_ joined #git
16:47 Klumben joined #git
16:47 wrpn joined #git
16:47 bond_ joined #git
16:47 ochorocho__ joined #git
16:47 fus joined #git
16:47 MillerBo55 joined #git
16:47 jantje joined #git
16:47 sigjuice joined #git
16:47 romerocesar joined #git
16:47 mar77i_ joined #git
16:47 DeltaHeavy Anybody know why git bash (uses msys IIRC) is slow as hell?
16:47 clemf_ joined #git
16:47 emptynine joined #git
16:47 dalias_ joined #git
16:47 Ragnor joined #git
16:47 afuentes joined #git
16:47 nydel07_ joined #git
16:47 txdv joined #git
16:47 sLite joined #git
16:47 DeltaHeavy I'm using the SDK so I've been installing stuff like zsh and tmux via pacman
16:47 josuebrunel joined #git
16:47 DelphicOkami joined #git
16:47 Vorisi joined #git
16:47 Ricaz joined #git
16:47 c0ded joined #git
16:48 fhackdroid joined #git
16:48 nd joined #git
16:48 shymega joined #git
16:48 roue_ joined #git
16:48 geko_ joined #git
16:48 jgornick joined #git
16:48 nilg` joined #git
16:48 cdg joined #git
16:48 traxo-xx joined #git
16:48 sunny256_ joined #git
16:48 rxo joined #git
16:48 iveqy__ joined #git
16:48 neunon joined #git
16:48 Ariadeno_ joined #git
16:48 geko_ joined #git
16:48 fhackdroid joined #git
16:48 Vinnie_win joined #git
16:48 neunon joined #git
16:48 malesca_ joined #git
16:48 skyres joined #git
16:48 oldrobot joined #git
16:48 rivarun_ joined #git
16:48 phaleth joined #git
16:48 [1]ringer1 joined #git
16:48 Peng joined #git
16:48 Mir4g3_ joined #git
16:48 boshhead_ joined #git
16:48 Infamous- joined #git
16:48 phaleth joined #git
16:48 Peng joined #git
16:48 boshhead_ joined #git
16:48 kenansul- joined #git
16:48 vmiklos joined #git
16:48 cydrobolt_ joined #git
16:48 ExeciN joined #git
16:48 Pyrogerg joined #git
16:48 PCatinean joined #git
16:48 qsx joined #git
16:48 parasite__ joined #git
16:48 fstd_ joined #git
16:48 bencevans joined #git
16:48 fstd_ joined #git
16:48 spriz joined #git
16:48 Davey_ joined #git
16:48 jimi joined #git
16:48 and_i joined #git
16:48 filcab joined #git
16:48 tjone270_ joined #git
16:48 Vgr joined #git
16:48 jab416171_ joined #git
16:48 markovh joined #git
16:48 LukeLR joined #git
16:48 RiPer joined #git
16:48 unbalancedparen joined #git
16:48 tom[] joined #git
16:48 HarryHallman joined #git
16:48 nuck joined #git
16:48 holodoc joined #git
16:48 angular_mike_ joined #git
16:48 bratchle1 joined #git
16:48 Vgr joined #git
16:48 maqr joined #git
16:48 mozzarel1 joined #git
16:48 PaulePanter joined #git
16:48 antlarr joined #git
16:48 Orphis joined #git
16:48 unreal joined #git
16:48 garyserj joined #git
16:48 teadrop_ joined #git
16:48 IndigoTiger joined #git
16:48 LiENUS joined #git
16:48 troyt joined #git
16:48 Arguggi joined #git
16:48 j416 joined #git
16:48 Vauff joined #git
16:48 DonVitoCorleone joined #git
16:48 tsunamie joined #git
16:48 croberts joined #git
16:48 Davey_ joined #git
16:48 evil-t0by joined #git
16:48 dan2k3k4 joined #git
16:48 ninetysevena joined #git
16:48 bencevans joined #git
16:48 daynaskully joined #git
16:48 sagerdearia joined #git
16:48 ahf joined #git
16:48 star_pro_ joined #git
16:48 cdesai joined #git
16:48 tokkee joined #git
16:48 whatitdo joined #git
16:48 nchambers joined #git
16:48 iamthad_ joined #git
16:48 daishan joined #git
16:48 polyzen joined #git
16:48 frobnic joined #git
16:48 mojibake joined #git
16:48 _flow_ joined #git
16:49 AaronMT joined #git
16:49 sparr joined #git
16:49 wagle joined #git
16:49 hiroki joined #git
16:49 hiroki joined #git
16:49 markovh joined #git
16:49 mns joined #git
16:49 rbern joined #git
16:49 johnmilton joined #git
16:49 isysd joined #git
16:49 constantinexvi joined #git
16:49 intellix joined #git
16:49 berndj joined #git
16:49 raatiniemi joined #git
16:49 salparadise joined #git
16:49 CrazyBonz joined #git
16:49 mutex joined #git
16:49 dwsr joined #git
16:49 catsup joined #git
16:49 EvilPenguin joined #git
16:49 _W_ joined #git
16:49 nitric joined #git
16:49 sin3t joined #git
16:49 a3Dman joined #git
16:49 pks joined #git
16:49 jwest joined #git
16:49 phroa joined #git
16:49 unforgiven512_ joined #git
16:49 ldlework joined #git
16:49 sleezd joined #git
16:49 ldlework joined #git
16:49 fling joined #git
16:49 SirCmpwn joined #git
16:49 asdofindia joined #git
16:50 vdl joined #git
16:50 rideh joined #git
16:50 CIAguy joined #git
16:50 ayjay_t joined #git
16:50 ToxicFrog joined #git
16:50 lamont joined #git
16:50 ribasushi_ joined #git
16:50 barteks2x joined #git
16:50 dinoocch joined #git
16:50 Shentino joined #git
16:50 lolmac joined #git
16:50 miklcct joined #git
16:50 AKPWD joined #git
16:50 thekingofbandit joined #git
16:50 rorro joined #git
16:50 thiago_ joined #git
16:50 joelsmith joined #git
16:50 BadSnappa joined #git
16:50 bejeb joined #git
16:50 tyreld joined #git
16:50 glebihan_ joined #git
16:50 rnsanchez joined #git
16:50 pigeon joined #git
16:50 TinkerTyper joined #git
16:50 n|nsei joined #git
16:50 blackwind_123 joined #git
16:50 Dougie187 joined #git
16:50 spb joined #git
16:50 bambams joined #git
16:50 bambams joined #git
16:50 SegFaultAX joined #git
16:51 weylin joined #git
16:51 bocaneri joined #git
16:51 citizen-stig joined #git
16:51 sostenuto joined #git
16:51 rgrinberg joined #git
16:51 des_consolado joined #git
16:51 moop joined #git
16:51 drupald joined #git
16:51 codebam joined #git
16:51 iskander joined #git
16:51 zivester joined #git
16:51 crose joined #git
16:51 wgrant joined #git
16:51 evie_hammond joined #git
16:51 ybden joined #git
16:51 kpease joined #git
16:51 oxsyn joined #git
16:51 sfix joined #git
16:51 justusranvier joined #git
16:51 JanC joined #git
16:51 encod3 joined #git
16:51 Guest381` joined #git
16:51 f3r70rr35f joined #git
16:51 markmarkmark joined #git
16:51 gshrikant joined #git
16:51 nkhoit joined #git
16:51 sagerdearia joined #git
16:51 tchan joined #git
16:51 justusranvier left #git
16:51 peepsalot joined #git
16:51 justanotheruser joined #git
16:51 Rikairchy joined #git
16:52 justusranvier joined #git
16:52 monokrome joined #git
16:52 noodle joined #git
16:52 Zoxc joined #git
16:52 watersoul joined #git
16:52 yanome joined #git
16:52 jerrcs joined #git
16:52 tang^ joined #git
16:52 tabakhase joined #git
16:52 tabakhase joined #git
16:52 warthog9 joined #git
16:52 gnarf joined #git
16:52 flaguy48 joined #git
16:52 Marbug joined #git
16:53 jguillen joined #git
16:53 ghostlight joined #git
16:53 rossome joined #git
16:53 bttf joined #git
16:53 icedp joined #git
16:53 rgrimm joined #git
16:53 yoyoyo____ joined #git
16:53 KevinMGranger joined #git
16:53 Muzer joined #git
16:53 nellicus_ joined #git
16:54 brokensyntax joined #git
16:54 Lunatrius joined #git
16:54 rudycane joined #git
16:54 marlun joined #git
16:54 marlun joined #git
16:54 sonOfRa joined #git
16:54 selckin joined #git
16:54 tazle_ joined #git
16:54 chimeracoder joined #git
16:55 HalfEatenPie joined #git
16:55 sagerdearia joined #git
16:55 CrazyBonz joined #git
16:55 nanga joined #git
16:55 babilen joined #git
16:55 armenzg_ left #git
16:56 brandonw joined #git
16:56 RichiH joined #git
16:56 JRHaigh joined #git
16:56 laumann joined #git
16:56 midnightmagic joined #git
16:57 red82 joined #git
16:57 fspy joined #git
16:57 nidr0x joined #git
16:57 Slush- joined #git
16:57 scorphus joined #git
16:57 scorphus joined #git
16:57 Mission-Critical joined #git
16:57 Someguy123 joined #git
16:57 ManiacTwister joined #git
16:57 seitensei joined #git
16:57 giraffe joined #git
16:58 aendrew joined #git
16:58 SteffanW joined #git
16:58 sagerdearia joined #git
16:58 GameGamer43 joined #git
16:58 kini joined #git
16:58 johnny56_ joined #git
16:59 mniip joined #git
16:59 rcn_ joined #git
17:00 sybariten joined #git
17:00 adamm joined #git
17:00 constantinexvi joined #git
17:00 jason237 joined #git
17:00 lagothrix joined #git
17:00 u1106 joined #git
17:00 jaequery joined #git
17:01 EvanDotPro joined #git
17:01 dsdeiz joined #git
17:01 timwis joined #git
17:01 EisNerd joined #git
17:02 plasticboy joined #git
17:02 mmattice joined #git
17:03 e14 joined #git
17:03 andlabs joined #git
17:03 Groscheri joined #git
17:04 mikecmpbll joined #git
17:04 paperziggurat joined #git
17:04 polyzen__ joined #git
17:05 davisonio joined #git
17:05 Kamilion joined #git
17:05 kyan joined #git
17:05 lindenle joined #git
17:05 jleclanche joined #git
17:06 Urbany joined #git
17:06 ec_ joined #git
17:06 d10n-work joined #git
17:06 robotroll joined #git
17:06 parliament joined #git
17:08 Vgr_ joined #git
17:08 Pursuit joined #git
17:08 tjone270__ joined #git
17:08 fstd joined #git
17:08 ringer1 joined #git
17:08 jaequery_ joined #git
17:08 star_prone joined #git
17:08 watt_rabbit joined #git
17:08 contracode joined #git
17:08 EvilPeng1 joined #git
17:08 robotrolll joined #git
17:08 cdg_ joined #git
17:08 mar77i joined #git
17:08 shennyg joined #git
17:08 dling joined #git
17:09 nitric_ joined #git
17:09 polyzen_1 joined #git
17:09 cory___ joined #git
17:09 jimi_ joined #git
17:09 spriz_ joined #git
17:09 rivarun joined #git
17:09 troyt_ joined #git
17:09 Vinnie_win_a joined #git
17:09 phaleth_ joined #git
17:10 ItSANgo joined #git
17:10 spb_ joined #git
17:10 crayon joined #git
17:10 |prawnzy joined #git
17:10 crayon joined #git
17:10 danmackay_ joined #git
17:10 fus_ joined #git
17:11 yanome_ joined #git
17:11 chigang joined #git
17:11 sagerdearia joined #git
17:11 LiENUX joined #git
17:11 stealthii joined #git
17:11 Fuco joined #git
17:11 stealthii joined #git
17:11 stealthii joined #git
17:11 Fuco joined #git
17:11 frobnic joined #git
17:11 boshhead joined #git
17:11 afuentes joined #git
17:11 stealthii joined #git
17:11 ocbtec joined #git
17:11 jnavila_ joined #git
17:11 cydrobol- joined #git
17:11 dave0x6d joined #git
17:11 phroa` joined #git
17:11 Shakeel__ joined #git
17:11 dalias joined #git
17:11 sartan joined #git
17:11 abh_ joined #git
17:11 ManiacTwister joined #git
17:11 j416_ joined #git
17:11 Samual joined #git
17:11 pks_ joined #git
17:11 tsunamie joined #git
17:11 ash_workz joined #git
17:11 evilmquin joined #git
17:11 parasite__ joined #git
17:11 des_consolado joined #git
17:11 Samual joined #git
17:11 __shymega__ joined #git
17:11 Vauff joined #git
17:11 jhe_ joined #git
17:11 holgersson joined #git
17:11 imanc joined #git
17:11 ToeSnacks joined #git
17:12 rxo_ joined #git
17:12 blahdodo_ joined #git
17:12 ninetysevena joined #git
17:12 fhackdro- joined #git
17:12 nitesh` joined #git
17:12 RiPer joined #git
17:12 ajpiano joined #git
17:12 ahf joined #git
17:12 catsup joined #git
17:12 Orion3k joined #git
17:12 KevinMGranger joined #git
17:12 LHL_Jordan joined #git
17:12 Oebele joined #git
17:12 txdv joined #git
17:12 isysd joined #git
17:12 rbern joined #git
17:12 Ciblia joined #git
17:12 sitaram_ joined #git
17:12 sitaram_ joined #git
17:12 Davey_ joined #git
17:12 UTAN_dev joined #git
17:12 jantje_ joined #git
17:12 synthmeat joined #git
17:12 mutex_ joined #git
17:12 ldleworker joined #git
17:12 maqr_ joined #git
17:12 jamick joined #git
17:12 skyres_ joined #git
17:12 Peng___ joined #git
17:12 gshrikant joined #git
17:12 nidr0x joined #git
17:12 PCatinean_ joined #git
17:12 markovh joined #git
17:12 tyreld_ joined #git
17:12 rcz joined #git
17:12 SpeakerToMeat joined #git
17:12 kenansul- joined #git
17:12 bond_ joined #git
17:12 nephyrin` joined #git
17:12 krillr joined #git
17:12 maqr_ joined #git
17:12 Peng___ joined #git
17:12 garyserj joined #git
17:12 filcab joined #git
17:12 sangy joined #git
17:12 Klumben joined #git
17:12 cagedwisdom joined #git
17:12 hidwid joined #git
17:12 barq joined #git
17:12 raatiniemi joined #git
17:12 Ravana joined #git
17:12 iveqy_ joined #git
17:12 Davey_ joined #git
17:12 blackwind_123 joined #git
17:12 pigeon joined #git
17:12 fahadash joined #git
17:12 emilyrose joined #git
17:12 Awesomecase joined #git
17:12 weylin joined #git
17:12 nkhoit joined #git
17:12 rorro joined #git
17:12 kpease joined #git
17:12 icedp joined #git
17:12 selckin joined #git
17:12 qlkzy_ joined #git
17:12 Aaeriele joined #git
17:13 malide joined #git
17:13 croberts joined #git
17:13 HalfEatenPie joined #git
17:13 joelsmith joined #git
17:13 Guest381` joined #git
17:13 prosody joined #git
17:13 markovh joined #git
17:13 a___ joined #git
17:13 thoros joined #git
17:13 Zoxc joined #git
17:13 sagerdearia joined #git
17:13 bencevans joined #git
17:13 bencevans joined #git
17:13 c0ded joined #git
17:13 Peng joined #git
17:13 ninsei joined #git
17:13 t0n1c joined #git
17:13 antlarr joined #git
17:13 dwsr joined #git
17:13 lolmac joined #git
17:13 Slush- joined #git
17:13 JoshL joined #git
17:13 nd joined #git
17:13 traxo-xx joined #git
17:13 danemacmillan joined #git
17:13 brokensyntax joined #git
17:13 rnsanchez joined #git
17:13 pizzaops joined #git
17:14 sparr joined #git
17:14 Kamilion joined #git
17:14 fspy joined #git
17:14 hue joined #git
17:14 pikajude joined #git
17:14 mikecmpbll joined #git
17:14 hexagoxel joined #git
17:14 Mir4g3 joined #git
17:14 __name__ joined #git
17:14 TinkerTyper joined #git
17:14 a3Dman joined #git
17:14 cdown_ joined #git
17:15 asdofindia joined #git
17:15 ToxicFrog joined #git
17:15 oldrobot joined #git
17:15 iamthad joined #git
17:15 unforgiven512 joined #git
17:15 midnightmagic joined #git
17:15 markmarkmark joined #git
17:15 dinoocch joined #git
17:15 lxnch joined #git
17:15 moestevens joined #git
17:15 me_and joined #git
17:15 Lunatrius joined #git
17:16 discopatrick joined #git
17:16 PaulePanter joined #git
17:16 bjpenn joined #git
17:16 Levex joined #git
17:16 roue joined #git
17:16 hexagoxel joined #git
17:16 neunon joined #git
17:16 brokensyntax joined #git
17:16 codebam joined #git
17:16 justusranvier joined #git
17:16 brandonw joined #git
17:16 LeBlaaanc joined #git
17:16 zeller joined #git
17:17 batrick joined #git
17:17 xai joined #git
17:17 warthog9 joined #git
17:17 constantinexvi joined #git
17:17 MLM joined #git
17:17 salparadise joined #git
17:17 comps joined #git
17:17 mns joined #git
17:18 pdgwien joined #git
17:18 BlackMaria joined #git
17:18 cjohnson joined #git
17:18 jbitdrop joined #git
17:18 Ariadeno joined #git
17:19 Dyonisos_ joined #git
17:19 RichiH joined #git
17:19 ndim joined #git
17:19 Shakeel_ joined #git
17:20 LeBlaaan_ joined #git
17:20 vishal_ joined #git
17:20 IndigoTiger_ joined #git
17:21 mutex__ joined #git
17:21 h12o_ joined #git
17:21 bket1 joined #git
17:21 nitesh joined #git
17:21 synthmea1 joined #git
17:21 hue- joined #git
17:21 tsunamie joined #git
17:21 iveqy__ joined #git
17:21 boshhead joined #git
17:21 harleypig joined #git
17:21 ExeciN joined #git
17:21 boshhead joined #git
17:21 harleypig joined #git
17:21 unbalanced joined #git
17:22 bcc joined #git
17:22 AKPWD joined #git
17:22 glebihan__ joined #git
17:22 hegge joined #git
17:22 sebhoss joined #git
17:22 bond_ joined #git
17:22 RickyB98 joined #git
17:22 miklcct_ joined #git
17:22 RickyB98 joined #git
17:22 weylin- joined #git
17:22 ojdo joined #git
17:22 ldlework joined #git
17:22 evilmquin joined #git
17:22 giraffe_ joined #git
17:22 dreiss joined #git
17:22 txdv joined #git
17:22 CIAguy- joined #git
17:22 Infamous joined #git
17:22 SpeakerToMeat joined #git
17:22 ldlework joined #git
17:22 SirCmpwn joined #git
17:22 ninetysevena joined #git
17:22 raatiniemi joined #git
17:22 sunny256 joined #git
17:22 UTAN_dev_ joined #git
17:22 des_consolado joined #git
17:22 atomi_ joined #git
17:22 DelphicOkami_ joined #git
17:22 comps joined #git
17:22 redo joined #git
17:22 guyz joined #git
17:22 dalias joined #git
17:22 krillr joined #git
17:22 Slush- joined #git
17:22 nchambers joined #git
17:23 rxo joined #git
17:23 iskander joined #git
17:23 Maple__ joined #git
17:23 LukeLR joined #git
17:23 Maple__ joined #git
17:23 Maple__ joined #git
17:23 daishan joined #git
17:23 dhollin3 joined #git
17:23 Arguggi_ joined #git
17:23 markovh joined #git
17:23 archaic joined #git
17:23 xai joined #git
17:23 SwiftMatt joined #git
17:23 midnightmagic joined #git
17:23 vcoinminer joined #git
17:23 clemf joined #git
17:23 catsup joined #git
17:23 nkhoit joined #git
17:23 rivarun joined #git
17:23 blackwind_123 joined #git
17:23 tyreld_ joined #git
17:23 Klumben joined #git
17:23 c0ded joined #git
17:23 hidwid joined #git
17:23 hexagoxel joined #git
17:23 berndj joined #git
17:23 bencevans joined #git
17:23 bencevans joined #git
17:24 holgersson joined #git
17:24 a3Dman joined #git
17:24 rgrimm_ joined #git
17:24 fspy joined #git
17:24 JoshL joined #git
17:24 Sc0rpius joined #git
17:24 Sc0rpius joined #git
17:24 ajpiano joined #git
17:24 javaJake joined #git
17:24 TinkerTyper joined #git
17:24 monokrome joined #git
17:24 maqr joined #git
17:24 macivy joined #git
17:25 cagedwisdom joined #git
17:25 HalfEatenPie_ joined #git
17:25 Tee_Pee joined #git
17:25 Davey joined #git
17:25 Davey joined #git
17:25 tango_ joined #git
17:25 duderonomy joined #git
17:26 Peng_ joined #git
17:26 noodle joined #git
17:26 vmiklos joined #git
17:26 kwmiebach__ joined #git
17:26 sdothum- joined #git
17:27 VladGh joined #git
17:27 skyres joined #git
17:27 Derega_ joined #git
17:27 Lowell joined #git
17:27 malesca joined #git
17:27 jason237 joined #git
17:27 pikajude joined #git
17:27 sfix joined #git
17:27 tabakhase__ joined #git
17:27 yoh joined #git
17:27 przemoc joined #git
17:27 hexagoxel joined #git
17:27 WillMoogle joined #git
17:27 Danzeel joined #git
17:27 ueberall joined #git
17:28 emptyn1ne joined #git
17:28 thomas1_ joined #git
17:28 multi_io_ joined #git
17:28 Samual joined #git
17:28 cloudcell_ joined #git
17:28 snowinferno joined #git
17:28 Muzer joined #git
17:30 kline joined #git
17:30 [1]ringer1 joined #git
17:31 mikecmpb_ joined #git
17:31 DelphicOkami joined #git
17:31 janx joined #git
17:31 [diecast] joined #git
17:32 berndj-blackout joined #git
17:32 LukeLR_ joined #git
17:32 Infamous- joined #git
17:32 cyan__ joined #git
17:32 ajpiano joined #git
17:32 JoshL- joined #git
17:33 spychalski joined #git
17:33 ninetysevena joined #git
17:33 miklcct joined #git
17:33 fuchstronaut joined #git
17:33 Fuco joined #git
17:33 Fuco joined #git
17:33 RickyB98 joined #git
17:33 clemf_ joined #git
17:33 CussBot joined #git
17:33 RickyB98 joined #git
17:33 rxo joined #git
17:33 raatiniemi joined #git
17:33 rcn joined #git
17:33 a___ joined #git
17:33 ircuse joined #git
17:33 ggherdov joined #git
17:33 skyres_ joined #git
17:33 dermoth_ joined #git
17:33 isysd joined #git
17:33 hahuang62 joined #git
17:33 Peng_ joined #git
17:33 AciD` joined #git
17:33 jantje joined #git
17:33 UTAN_dev joined #git
17:33 redo joined #git
17:33 shymega joined #git
17:33 Slush-_ joined #git
17:33 rivarun_ joined #git
17:33 nd_ joined #git
17:33 sunny256 joined #git
17:33 krillr joined #git
17:33 bakingbread joined #git
17:34 nchambers joined #git
17:34 CIAguy joined #git
17:34 Arguggi joined #git
17:34 Rikairchy joined #git
17:34 Sasazuka joined #git
17:34 AciD` joined #git
17:34 holgersson joined #git
17:34 Walex joined #git
17:34 txdv joined #git
17:34 JelmerD joined #git
17:34 rbern joined #git
17:34 brokensyntax joined #git
17:34 davisonio joined #git
17:34 pigeon joined #git
17:34 emilyrose joined #git
17:34 Fissure joined #git
17:34 bratchley joined #git
17:34 cdesai joined #git
17:34 boshhead joined #git
17:34 selckin joined #git
17:34 joelsmith joined #git
17:34 warthog9 joined #git
17:34 jason237 joined #git
17:34 aarobc joined #git
17:34 sdothum joined #git
17:34 c0ded joined #git
17:34 _flow_ joined #git
17:34 dhollin3 joined #git
17:34 ocbtec joined #git
17:34 evie_hammond joined #git
17:35 justusranvier joined #git
17:35 wloncom joined #git
17:35 Klumben joined #git
17:35 aarobc I know there is a way to do it, but how do I use a branch in another branch?
17:35 biax joined #git
17:35 evilmquin joined #git
17:35 synthmeat joined #git
17:35 Sc0rpius joined #git
17:35 aarobc like, I thought there was a way to do it without merging
17:35 constantinexvi joined #git
17:35 abh joined #git
17:35 justusranvier left #git
17:35 antlarr joined #git
17:35 monokrome joined #git
17:35 johnmilton joined #git
17:36 HalfEatenPie joined #git
17:36 pikajude joined #git
17:36 duderonomy joined #git
17:36 ForeignBiscuit Do you mean get the changes from another branch?
17:36 ForeignBiscuit The common approach is to rebase
17:37 yanome_ joined #git
17:37 LeBlaaanc joined #git
17:37 aarobc that sounds right
17:37 frobnic joined #git
17:37 codebam joined #git
17:38 AKPWD joined #git
17:38 hexagoxel joined #git
17:39 atomi joined #git
17:39 aarobc does that introduce issues when it's time to merge it into master again?
17:39 kutenai joined #git
17:39 iskander joined #git
17:40 ec_ joined #git
17:40 contracode joined #git
17:40 addshore joined #git
17:40 jhasse joined #git
17:40 cmosguy joined #git
17:40 watt_rabbit joined #git
17:40 elijah joined #git
17:40 rendar joined #git
17:40 da5id joined #git
17:41 roue joined #git
17:41 aarobc maybe I just merge?
17:42 huhlig joined #git
17:42 Kamilion joined #git
17:42 multi_io joined #git
17:42 biax joined #git
17:42 stealthii joined #git
17:42 fuchstronaut joined #git
17:42 fuchstronaut joined #git
17:43 AndreSomers joined #git
17:43 BrianBlaze420 joined #git
17:43 tfnico joined #git
17:43 dsantiago joined #git
17:44 midnightmagic joined #git
17:44 _ADN_ joined #git
17:44 aendrew joined #git
17:44 beckyconning_ joined #git
17:44 biax left #git
17:45 ulkesh joined #git
17:45 JackMc joined #git
17:45 fahadash joined #git
17:45 bcc joined #git
17:45 adambrenecki joined #git
17:45 DannyFritz joined #git
17:45 pizzaops joined #git
17:46 jleclanche joined #git
17:46 unforgiven512 joined #git
17:46 dhollinger joined #git
17:46 cstrahan joined #git
17:46 xai joined #git
17:47 d10n-work joined #git
17:47 unholycrab joined #git
17:47 DuncanT joined #git
17:47 ionelmc joined #git
17:47 daxroc joined #git
17:48 angelsl joined #git
17:48 worstadmin joined #git
17:48 yena joined #git
17:48 yoyoyo____ joined #git
17:48 epic__ joined #git
17:48 Tee_Pee joined #git
17:48 prosody joined #git
17:49 shgysk8zer0 joined #git
17:49 m0viefreak joined #git
17:49 warthog9 joined #git
17:49 JanC joined #git
17:49 mroth joined #git
17:50 altendky joined #git
17:50 GameGamer43 joined #git
17:50 boxrick1 joined #git
17:50 shgysk8zer0 joined #git
17:50 le_melomane joined #git
17:51 imanc joined #git
17:51 barq joined #git
17:51 Anupkumar joined #git
17:51 pfg_ joined #git
17:51 johtso joined #git
17:51 chigang joined #git
17:51 Samual joined #git
17:51 cory___ joined #git
17:51 parliament joined #git
17:52 elmcrest joined #git
17:52 XDS2010 joined #git
17:52 discopatrick joined #git
17:52 techntoke_ joined #git
17:52 paperziggurat joined #git
17:53 spr0tsuki joined #git
17:53 al-damiri joined #git
17:53 angular_mike_ joined #git
17:53 harleypig joined #git
17:53 rfv joined #git
17:53 kireevco_ joined #git
17:53 sebhoss joined #git
17:53 gyre007 joined #git
17:53 kwmiebach__ joined #git
17:53 bket1 joined #git
17:53 mehdi___ joined #git
17:53 JanC joined #git
17:53 Awesomecase joined #git
17:53 ochorocho__ joined #git
17:54 timwis joined #git
17:54 oxsyn joined #git
17:54 MLM joined #git
17:55 vcoinminer joined #git
17:55 zero7 joined #git
17:56 zeller joined #git
17:56 sybariten joined #git
17:57 rahtgaz joined #git
17:57 HappyLoaf_ joined #git
17:57 ToeSnacks joined #git
17:57 nikivi joined #git
17:58 noahsussman joined #git
18:00 wogi joined #git
18:01 ExeciN joined #git
18:01 johnny56_ joined #git
18:02 Iacobus joined #git
18:03 codfection joined #git
18:03 LiENUS joined #git
18:04 multi_io joined #git
18:04 WizJin joined #git
18:05 cspotcode joined #git
18:05 wizonesolutions joined #git
18:05 CEnnis91 joined #git
18:06 e14 joined #git
18:07 e14_ joined #git
18:08 ochorocho__ joined #git
18:08 wogi_ joined #git
18:08 m0viefreak joined #git
18:09 felowe joined #git
18:10 a3Dman joined #git
18:10 a3Dman joined #git
18:10 tabakhase joined #git
18:10 pikajude joined #git
18:10 teadrop_ joined #git
18:10 pikajude joined #git
18:10 Samual joined #git
18:10 _tgunr joined #git
18:10 j416 joined #git
18:10 Fuco joined #git
18:10 Fuco joined #git
18:10 ajpiano joined #git
18:10 DieguezZ joined #git
18:10 CussBot joined #git
18:10 sunny256_ joined #git
18:10 duderonomy joined #git
18:10 Klumben joined #git
18:10 skyres joined #git
18:10 Marbug_ joined #git
18:10 miklcct joined #git
18:11 antlarr_away joined #git
18:11 ninetysevena joined #git
18:11 glebihan__ joined #git
18:11 cyan__ joined #git
18:11 jason237 joined #git
18:11 blackwind_123 joined #git
18:11 WillMoogle joined #git
18:11 AciD- joined #git
18:11 UTAN_dev_ joined #git
18:11 jwest1 joined #git
18:11 nephyrin joined #git
18:11 rcn_ joined #git
18:11 ciss joined #git
18:11 jab416171 joined #git
18:11 redo joined #git
18:11 bond joined #git
18:11 maqr_ joined #git
18:11 bratchle1 joined #git
18:11 rxo joined #git
18:11 Rikairchy joined #git
18:11 johnmilton joined #git
18:11 Aaeriele joined #git
18:11 unbalanced joined #git
18:11 fhackdroid joined #git
18:12 CIAguy joined #git
18:12 sfix joined #git
18:12 _flow_ joined #git
18:12 JelmerD joined #git
18:12 nd joined #git
18:13 ciss left #git
18:13 batrick joined #git
18:13 icedp joined #git
18:13 hexagoxel joined #git
18:14 shymega joined #git
18:14 HappyLoaf_ joined #git
18:15 Timvde joined #git
18:15 frobnic joined #git
18:15 aspiers joined #git
18:15 multi90_ left #git
18:15 daishan joined #git
18:15 rivarun joined #git
18:15 vcoinminer joined #git
18:15 davisonio joined #git
18:16 mroth joined #git
18:16 discopatrick joined #git
18:16 LiENUS joined #git
18:16 forrestv joined #git
18:16 ggherdov joined #git
18:17 xai joined #git
18:18 rivarun joined #git
18:19 elastix joined #git
18:19 fahadash joined #git
18:19 Sasazuka__ joined #git
18:19 epic__ joined #git
18:19 huhlig joined #git
18:19 ionelmc joined #git
18:19 prawnzy joined #git
18:20 ruskie joined #git
18:20 warthog9 joined #git
18:20 ajpiano_ joined #git
18:20 bratchley joined #git
18:20 icedp- joined #git
18:20 lxnch joined #git
18:20 dreiss joined #git
18:20 kwmiebach__ joined #git
18:20 XDS2010 joined #git
18:20 tfnico joined #git
18:20 cloudcell_ joined #git
18:20 beckyconning_ joined #git
18:20 boxrick1 joined #git
18:20 ulkesh joined #git
18:20 moei joined #git
18:20 aendrew joined #git
18:20 kwmiebach__ joined #git
18:20 XDS2010 joined #git
18:20 tfnico joined #git
18:20 cloudcell_ joined #git
18:20 ulkesh joined #git
18:20 beckyconning_ joined #git
18:20 boxrick1 joined #git
18:20 aendrew joined #git
18:21 rgrinberg1 joined #git
18:21 ochorocho__ joined #git
18:21 ojdo joined #git
18:21 constantinexvi joined #git
18:21 RickyB98 joined #git
18:21 Rikairchy joined #git
18:21 RickyB98 joined #git
18:21 JackMc joined #git
18:21 josuebrunel joined #git
18:21 UTAN_dev joined #git
18:21 jantje joined #git
18:21 markovh joined #git
18:21 Davey joined #git
18:21 wloncom joined #git
18:22 boshhead joined #git
18:22 skyres joined #git
18:22 markovh joined #git
18:22 codfection joined #git
18:22 ghostlight joined #git
18:22 unforgiven512 joined #git
18:22 Davey joined #git
18:23 sparr joined #git
18:23 parliament joined #git
18:23 ninetysevena joined #git
18:23 worstadmin joined #git
18:23 ggherdov joined #git
18:23 cory___ joined #git
18:24 cspotcode joined #git
18:24 Arguggi joined #git
18:24 snowinferno joined #git
18:24 rbern joined #git
18:26 sitaram joined #git
18:26 sitaram joined #git
18:28 SegFaultAX joined #git
18:29 XDS2010 joined #git
18:29 Darren_ joined #git
18:29 jantje_ joined #git
18:29 __shymega__ joined #git
18:29 UTAN_dev_ joined #git
18:29 Smirnov joined #git
18:29 Smirnov joined #git
18:30 ToeSnacks joined #git
18:30 andlabs left #git
18:30 johnny56_ joined #git
18:30 yaewa joined #git
18:30 ninetysevena joined #git
18:30 neunon joined #git
18:30 neunon joined #git
18:30 javaJake joined #git
18:30 tcurdt joined #git
18:30 markovh joined #git
18:31 constantinexvi joined #git
18:31 LiENUS joined #git
18:31 zeller joined #git
18:32 mehdi___ joined #git
18:32 Vaelatern joined #git
18:32 mrpackethead joined #git
18:32 MattE joined #git
18:33 lamont joined #git
18:33 offby1 joined #git
18:33 ahmedelgabri joined #git
18:33 offby1 Just saw something puzzling -- https://gist.github.com/offby1/0​683832cf03c0aada1c4fd8d588be7c8 -- why did two fairly similar "git checkout" commands result it slightly different output?
18:34 sybariten joined #git
18:34 offby1 In particular, one said "new-branch set up to track local branch master", but another said the same, but with "by rebasing" at the end.
18:34 arand joined #git
18:34 ochorocho__ joined #git
18:35 Awesomecase joined #git
18:35 Levex joined #git
18:35 wizonesolutions joined #git
18:35 XDS2010 joined #git
18:36 jaguarmagenta joined #git
18:36 elmcrest joined #git
18:37 moei joined #git
18:37 le_melomane joined #git
18:37 XDS2010 joined #git
18:38 anonymus_ joined #git
18:39 HappyLoaf_ joined #git
18:39 johnmilton joined #git
18:39 eihabarabia joined #git
18:39 ochorocho__ joined #git
18:40 maqr joined #git
18:40 cstrahan_ joined #git
18:40 ninetysevena joined #git
18:40 star_prone joined #git
18:40 Darcidride joined #git
18:40 Rodya_ joined #git
18:40 redo joined #git
18:40 joelsmith joined #git
18:40 noahsussman joined #git
18:41 markovh joined #git
18:41 Awesomecase joined #git
18:42 mikecmpbll joined #git
18:42 shinnya joined #git
18:42 MrWoohoo joined #git
18:43 neunon joined #git
18:43 lindenle joined #git
18:43 satifant joined #git
18:44 stamina joined #git
18:44 AndreSomers joined #git
18:45 multi_io joined #git
18:45 emptyn1ne left #git
18:48 ayjay_t joined #git
18:49 aard_ joined #git
18:50 ghostlight joined #git
18:50 HappyLoaf_ joined #git
18:51 eshlox joined #git
18:52 lacrymology joined #git
18:52 thebope joined #git
18:53 codfection joined #git
18:55 nwkj86 joined #git
18:56 aard__ joined #git
18:58 fuchstronaut joined #git
18:59 Davey_ joined #git
19:00 sunny256 joined #git
19:00 Davey_ joined #git
19:00 hfp joined #git
19:00 Limes_ joined #git
19:00 DuncanT joined #git
19:00 markovh joined #git
19:01 ninetysevena joined #git
19:01 markovh joined #git
19:02 jeffreylevesque joined #git
19:03 nikivi joined #git
19:03 LeBlaaanc joined #git
19:04 AciD- left #git
19:06 ochorocho__ joined #git
19:06 githogori joined #git
19:06 madewokherd joined #git
19:07 prawnzy joined #git
19:09 star_pro_ joined #git
19:10 e14 joined #git
19:10 madewokherd` joined #git
19:10 daishan_ joined #git
19:10 osse offby1: Maybe there was some prior configuration
19:11 osse To make that branch use pull --rebase by default
19:11 aendrew_ joined #git
19:11 __shymega__ left #git
19:11 shymega joined #git
19:11 Davey joined #git
19:11 Davey joined #git
19:11 spr0tsuki joined #git
19:11 WayToDoor joined #git
19:12 Andre_work joined #git
19:12 hegge joined #git
19:12 parasite__ joined #git
19:12 Khisanth joined #git
19:12 ozzloy_ joined #git
19:12 jab416171 joined #git
19:12 PaulePan1er joined #git
19:12 bket2 joined #git
19:12 markovh joined #git
19:12 redo_ joined #git
19:12 Lewix joined #git
19:12 LeBlaaanc joined #git
19:13 JoshL- left #git
19:13 hfp_work joined #git
19:13 markovh joined #git
19:13 boshhead joined #git
19:13 ninetysevena joined #git
19:13 _ikke_ yeah, I would think that too
19:13 m0ltar joined #git
19:14 beckyconning_ joined #git
19:14 adambrenecki joined #git
19:16 Marbug joined #git
19:16 huhlig joined #git
19:18 ash_workz joined #git
19:20 ghostlight joined #git
19:20 yaymukund joined #git
19:21 nikivi joined #git
19:21 ojdo joined #git
19:21 patarr joined #git
19:23 nikivi joined #git
19:24 thebope_ joined #git
19:24 nidr0x joined #git
19:24 f3r70rr35f joined #git
19:25 Limes__ joined #git
19:25 VladGh joined #git
19:26 _nwkj86 joined #git
19:26 ozzloy joined #git
19:26 constantinexvi joined #git
19:26 tfnico joined #git
19:26 JelmerD joined #git
19:26 forrestv joined #git
19:26 ozzloy joined #git
19:26 ash_workz joined #git
19:26 forrestv joined #git
19:27 tfnico joined #git
19:27 nchambers joined #git
19:27 tgunr joined #git
19:27 miklcct joined #git
19:27 dreamyspell joined #git
19:27 tcurdt joined #git
19:27 brokensyntax joined #git
19:27 ManiacTwister joined #git
19:27 emilyrose joined #git
19:27 PaulePanter joined #git
19:27 RickyB98 joined #git
19:27 fugi joined #git
19:27 krillr joined #git
19:27 RickyB98 joined #git
19:27 moestevens joined #git
19:27 prawnzy joined #git
19:27 Oebele joined #git
19:27 and_i joined #git
19:27 neunon joined #git
19:28 markovh joined #git
19:28 markovh joined #git
19:28 UTAN_dev joined #git
19:28 TooLmaN joined #git
19:28 kanzure_ joined #git
19:28 Arguggi joined #git
19:28 satifant joined #git
19:28 satifant joined #git
19:28 j416 joined #git
19:28 fhackdroid joined #git
19:28 bronson joined #git
19:28 Marbug joined #git
19:28 cdesai joined #git
19:28 e14 joined #git
19:28 LeBlaaanc joined #git
19:28 holgersson joined #git
19:28 CIAguy joined #git
19:28 ninetysevena joined #git
19:29 Smirnov joined #git
19:29 Smirnov joined #git
19:29 Davey joined #git
19:29 Davey joined #git
19:29 Klumben joined #git
19:29 _flow_ joined #git
19:29 jantje joined #git
19:29 Balliad joined #git
19:29 mehdi___ joined #git
19:29 Maple__ joined #git
19:29 Maple__ joined #git
19:29 Maple__ joined #git
19:29 snowinferno joined #git
19:29 GameGamer43 joined #git
19:29 HappyLoaf_ joined #git
19:29 Ravana joined #git
19:29 parasite__ joined #git
19:29 Vorisi joined #git
19:29 aspiers joined #git
19:30 hexagoxel joined #git
19:30 monokrome joined #git
19:30 f3r70rr36f joined #git
19:30 Guest14330 joined #git
19:31 josuebrunel joined #git
19:31 JoshL joined #git
19:31 LiENUS joined #git
19:32 EisNerd joined #git
19:33 Balliad_ joined #git
19:34 jstimm joined #git
19:34 M-ou-se_ joined #git
19:34 atomi joined #git
19:34 meZee joined #git
19:34 jhasse joined #git
19:35 Cabanossi joined #git
19:35 jwest1 joined #git
19:35 chovy joined #git
19:35 chovy joined #git
19:35 Werring joined #git
19:35 me_and joined #git
19:35 comps_ joined #git
19:35 duderono_ joined #git
19:35 CIAguy joined #git
19:35 ejnahc joined #git
19:35 CIAguy joined #git
19:35 Nugget joined #git
19:35 suy_ joined #git
19:35 hegge joined #git
19:35 PasiFist joined #git
19:35 gravitron joined #git
19:35 Samual joined #git
19:35 Ranhir joined #git
19:36 trondth_ joined #git
19:36 rafalcpp_ joined #git
19:36 nivag_ joined #git
19:36 bambams_ joined #git
19:36 bambams_ joined #git
19:36 nephyrin` joined #git
19:36 pikajude joined #git
19:36 jj- joined #git
19:36 RickyB98 joined #git
19:36 polyzen joined #git
19:36 rxo joined #git
19:36 ninetysevena joined #git
19:36 fugiman joined #git
19:36 RickyB98 joined #git
19:36 abh joined #git
19:36 PalTale joined #git
19:36 Fuco joined #git
19:36 Fuco joined #git
19:36 ilogger2 joined #git
19:36 UTAN_dev_ joined #git
19:36 DANtheBE- joined #git
19:36 relgar- joined #git
19:36 gear4 joined #git
19:36 same_ol_1eez joined #git
19:36 Patrick- joined #git
19:36 jab416171 joined #git
19:36 eqs joined #git
19:36 mischief_ joined #git
19:36 Davey joined #git
19:36 markovh joined #git
19:36 JelmerD joined #git
19:36 jrahmy- joined #git
19:36 mitzip joined #git
19:36 BlaXpirit joined #git
19:36 `mx_ joined #git
19:36 thomas1 joined #git
19:36 Vadtec joined #git
19:36 constantinexvi joined #git
19:36 krillr joined #git
19:36 miklcct joined #git
19:36 nevyn joined #git
19:36 iskander_ joined #git
19:36 nchambers joined #git
19:36 guardian joined #git
19:36 nickthetait joined #git
19:36 Puffball joined #git
19:36 Arguggi joined #git
19:36 laumann joined #git
19:36 JRHaigh joined #git
19:36 larrybolt joined #git
19:36 Korvin joined #git
19:36 Korvin joined #git
19:36 varesa joined #git
19:36 vlt joined #git
19:36 unforgiven512 joined #git
19:36 Aaeriele joined #git
19:36 uranellus joined #git
19:36 uranellus joined #git
19:36 drbean joined #git
19:36 AndrewAlexMac_ joined #git
19:36 SporkWitch_ joined #git
19:36 CussBot joined #git
19:36 LeBlaaanc joined #git
19:36 monte joined #git
19:36 disi joined #git
19:36 fiete joined #git
19:36 Davey joined #git
19:36 rgrimm_ joined #git
19:36 the_cybersphinx joined #git
19:36 Vorisi joined #git
19:36 AKPWD joined #git
19:36 stealthii joined #git
19:37 fhackdroid joined #git
19:37 mrkake joined #git
19:37 Slush- joined #git
19:37 ggherdov joined #git
19:37 holgersson joined #git
19:37 shinnya joined #git
19:37 pmartnhoj joined #git
19:37 bipolar joined #git
19:37 Yuki_ joined #git
19:37 e14 joined #git
19:37 Peng_ joined #git
19:37 emilyrose joined #git
19:37 Gitzilla joined #git
19:37 aspiers joined #git
19:37 maqr joined #git
19:37 bronson joined #git
19:37 Rodya_ joined #git
19:37 Stummi joined #git
19:37 cstrahan_ joined #git
19:37 malide joined #git
19:37 Klumben joined #git
19:37 cdesai_ joined #git
19:37 markovh joined #git
19:37 Ravana joined #git
19:37 Orion3k joined #git
19:37 snowinferno joined #git
19:37 ahmedelgabri joined #git
19:37 rcn_ joined #git
19:37 dreamyspell joined #git
19:37 jaeckel joined #git
19:38 shymega joined #git
19:38 jbondhus joined #git
19:38 themill joined #git
19:38 Lowell joined #git
19:38 parasite joined #git
19:38 TSS_ joined #git
19:38 murr4y joined #git
19:38 quadz joined #git
19:38 artgoeshere joined #git
19:39 SegFaultAX joined #git
19:39 ribasushi joined #git
19:39 hexagoxel joined #git
19:39 Maple__ joined #git
19:39 Maple__ joined #git
19:39 Maple__ joined #git
19:39 cdown_ joined #git
19:39 ochorocho__ joined #git
19:39 ulkesh joined #git
19:39 elastix joined #git
19:39 DeltaHeavy joined #git
19:39 ketas joined #git
19:39 babilen joined #git
19:39 Kobaz joined #git
19:39 forrestv joined #git
19:40 giraffe_ joined #git
19:40 johnmilton joined #git
19:40 c0ded joined #git
19:40 monokrome joined #git
19:40 ash_workz joined #git
19:40 rts-sander joined #git
19:40 Samual joined #git
19:40 angular_mike_ joined #git
19:40 nellicus_ joined #git
19:40 Khisanth joined #git
19:41 jantje joined #git
19:41 kanzure joined #git
19:41 gusnan joined #git
19:41 gusnan joined #git
19:42 snits joined #git
19:42 dodobrain joined #git
19:43 Rodya__ joined #git
19:43 joki joined #git
19:43 fk joined #git
19:43 imanc joined #git
19:43 BlaXpirit_ joined #git
19:43 artgoeshere_ joined #git
19:44 nickthetait1 joined #git
19:44 xai joined #git
19:44 TheMoonMaster joined #git
19:44 suy joined #git
19:44 benbergman joined #git
19:44 vmiklos joined #git
19:44 TSS_ joined #git
19:44 hegge joined #git
19:44 Ravana- joined #git
19:45 mischief joined #git
19:45 CussBot_ joined #git
19:45 elastix1 joined #git
19:45 polyzen_ joined #git
19:45 osse joined #git
19:45 Fuco joined #git
19:45 Fuco joined #git
19:45 trondth joined #git
19:45 JrCs joined #git
19:45 rafalcpp_ joined #git
19:45 zapb_ joined #git
19:45 miklcct_ joined #git
19:45 fiete joined #git
19:45 guardian joined #git
19:45 monte joined #git
19:45 krillr joined #git
19:45 ashnur joined #git
19:45 UTAN_dev joined #git
19:45 rudycane joined #git
19:45 jab416171 joined #git
19:45 rgrimm_ joined #git
19:45 johnmilton joined #git
19:45 jhe_ joined #git
19:45 DANtheBE- joined #git
19:45 larrybolt` joined #git
19:45 jnavila_ joined #git
19:45 Puffball_ joined #git
19:45 mukmuk_ joined #git
19:45 Aaeriele` joined #git
19:45 du__ joined #git
19:45 markovh joined #git
19:45 JelmerD joined #git
19:45 Biganon joined #git
19:46 bluepixel joined #git
19:46 Khisanth joined #git
19:46 jbondhus joined #git
19:46 relgar joined #git
19:46 AKPWD joined #git
19:46 ashnur joined #git
19:46 Impaloo What notation does git use to specify a range of commits?
19:46 Impaloo two or three dots?
19:46 Impaloo A..B or A...B?
19:46 Vadtec joined #git
19:46 axisys joined #git
19:46 fhackdroid joined #git
19:46 TooLmaN joined #git
19:46 pmartnhoj joined #git
19:46 AndrewAlexMac joined #git
19:46 LeBlaaanc joined #git
19:46 bambams joined #git
19:46 bambams joined #git
19:46 disi joined #git
19:46 woodruffw joined #git
19:46 Narwhaal joined #git
19:46 iskander joined #git
19:46 pelegreno___ joined #git
19:46 cdesai joined #git
19:46 PalTale joined #git
19:46 emilyrose joined #git
19:46 Impaloo GitHub uses 3 dots in their URLs, and iirc git-cherry-pick(1) uses 2 dots?
19:46 murr4y joined #git
19:46 gravitron joined #git
19:46 asdofindia joined #git
19:46 holgersson joined #git
19:46 drbean joined #git
19:46 woodruffw joined #git
19:46 markovh joined #git
19:46 e14 joined #git
19:46 SegFaultAX joined #git
19:47 Muzer joined #git
19:47 utrack joined #git
19:47 ninetysevena joined #git
19:47 c0ded joined #git
19:47 Klumben joined #git
19:47 varesa joined #git
19:47 CIAguy joined #git
19:47 pikajude joined #git
19:47 EgS joined #git
19:47 Davey joined #git
19:47 Davey joined #git
19:47 aspiers joined #git
19:47 codebam joined #git
19:47 polyzen joined #git
19:47 Maple__ joined #git
19:47 Maple__ joined #git
19:47 Maple__ joined #git
19:47 sangy joined #git
19:48 hexagoxel joined #git
19:48 jophish joined #git
19:48 parasite joined #git
19:48 ochorocho__ joined #git
19:48 cdown_ joined #git
19:48 clr joined #git
19:48 anth0ny joined #git
19:48 WebDawg joined #git
19:49 tubaman joined #git
19:49 _ikke_ Impaloo: man gitrevisions
19:49 monokrome joined #git
19:49 _ikke_ Impaloo: two or three dots mean diverent things
19:49 nevyn joined #git
19:49 forrestv joined #git
19:49 _ikke_ different*
19:49 timwis joined #git
19:49 * _ikke_ pokes gitinfo
19:49 gitinfo Impaloo: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
19:50 _ikke_ haha :P
19:50 MajorPayne joined #git
19:50 laumann joined #git
19:50 ghostlight joined #git
19:51 Awesomecase joined #git
19:51 ketas joined #git
19:51 giraffe_ joined #git
19:51 uranellus joined #git
19:51 uranellus joined #git
19:51 _ikke_ A..B == ^A B == Everything reachable from B, but exclude everything reachable from A
19:52 cloudcell_ joined #git
19:52 neunon joined #git
19:52 LionsMane joined #git
19:52 fuchstronaut joined #git
19:52 neunon joined #git
19:52 fuchstronaut joined #git
19:52 HalfEatenPie joined #git
19:52 BlessJah joined #git
19:53 harleypig joined #git
19:53 nopf joined #git
19:53 pks joined #git
19:53 eshlox joined #git
19:53 chigang joined #git
19:53 DuncanT joined #git
19:53 ozzloy joined #git
19:54 discopatrick joined #git
19:54 beckyconning_ joined #git
19:54 techntoke_ joined #git
19:54 pizzaops joined #git
19:54 cory___ joined #git
19:55 ec_ joined #git
19:55 addshore joined #git
19:55 _ADN_ joined #git
19:55 CEnnis91 joined #git
19:55 chernjie joined #git
19:56 ToeSnacks joined #git
19:56 tfnico joined #git
19:56 fees joined #git
19:56 cspotcode joined #git
19:56 gyre007 joined #git
19:57 aidalgol joined #git
19:57 dreamyspell joined #git
19:57 mroth joined #git
19:57 Tee_Pee joined #git
19:57 watt_rabbit joined #git
19:57 dreamyspell joined #git
19:58 GameGamer43 joined #git
19:58 johtso joined #git
19:58 joseph_arnstein_ joined #git
19:58 Lowell joined #git
19:58 wizonesolutions joined #git
19:58 elmcrest joined #git
19:58 boxrick1 joined #git
19:58 mrkake joined #git
19:58 marlun joined #git
19:58 spr0tsuki joined #git
19:58 synthroid joined #git
19:58 kireevco_ joined #git
19:58 thebope joined #git
19:59 ulkesh joined #git
19:59 Iacobus joined #git
19:59 cstrahan_ joined #git
19:59 yena joined #git
19:59 unholycrab joined #git
20:00 lxnch joined #git
20:00 angular_mike_ joined #git
20:00 ggherdov joined #git
20:00 davisonio joined #git
20:00 Darren_ joined #git
20:00 Lewix joined #git
20:00 Ender13 joined #git
20:01 nickthetait joined #git
20:01 adambrenecki joined #git
20:02 stealthii joined #git
20:02 zero7 joined #git
20:02 barq joined #git
20:02 yoyoyo____ joined #git
20:02 Kamilion joined #git
20:02 kwmiebach__ joined #git
20:02 rfv joined #git
20:03 teadrop_ joined #git
20:03 al-damiri joined #git
20:03 ShekharReddy joined #git
20:04 mohabaks joined #git
20:04 e14 joined #git
20:05 satifant joined #git
20:05 btamm joined #git
20:05 da5id joined #git
20:05 elijah joined #git
20:06 btamm can someone help? a developer just sent me a zip of changed files that i need to somehow merge into a repo and I have no idea how
20:07 thiago_ joined #git
20:07 prosody joined #git
20:07 Pyrogerg joined #git
20:07 dave0x6d joined #git
20:07 dave0x6d joined #git
20:07 dave0x6d joined #git
20:07 mehdi___ joined #git
20:07 jesk joined #git
20:08 cjohnson btamm: is it a patch? or did they just send you the entire files
20:08 btamm they just sent the files :(
20:08 btamm i’ve never dealt with this before
20:08 btamm usually always get a patch
20:08 cjohnson ok well my first solution would be to tell them to make a commit under their login instead of the crap they're pulling now :P
20:09 cjohnson if that's not applicable, and you're ok putting your name on their changes, just literally check out the dir you want to commit their changes to and then extract the zip in place, overwriting existing files
20:09 cjohnson then check git diff to see their differences
20:09 btamm thats usually what happens but some yahoo is filling in for the dev (PTO)
20:09 jleclanche joined #git
20:09 brokensyntax Are they organized at least?
20:09 prawnzy joined #git
20:09 btamm they are in folders :)
20:09 HappyLoaf_ joined #git
20:09 JackMc joined #git
20:10 cjohnson obviously if those files have changed in the repository since they did their work the git diff will include some additional changes that shouldn't be part of it, so you'll have to manually resolve those cases
20:10 prawnzy joined #git
20:10 joki joined #git
20:10 btamm replace existing files wont do a + file - file? it will show changes to the file?
20:10 freimatz joined #git
20:10 cjohnson + -  are git artifacts
20:11 ochorocho__ joined #git
20:11 cjohnson I'm talking about unzipping the zip in place, using your standard filesystem commands
20:11 Zenstorm joined #git
20:11 red82 joined #git
20:12 cjohnson git doesn't need to watch your filesystem, it detects changes by diffing what's in the repo vs what is in your working copy. so any method of applying those changes to a file is fine
20:12 prawnzy joined #git
20:12 eivarv joined #git
20:12 cjohnson If it were me, I would take their changes, overwrite in place, generate a patch file, and send it back to that dev and tell him to commi it himself (and review the changes to ensure he's not including any additional changes that shouldn't be included)
20:13 brokensyntax Basically a documents management system using check out/check in functions at this point.
20:13 cdg joined #git
20:14 noahsussman joined #git
20:14 nd_ joined #git
20:15 Atm0spher1c joined #git
20:16 mischat joined #git
20:16 f3r70rr35f joined #git
20:17 waveclaw joined #git
20:17 NeverDie joined #git
20:17 f3r70rr36f joined #git
20:18 HappyLoaf_ joined #git
20:18 cspack joined #git
20:19 Gsham joined #git
20:19 Zenrium joined #git
20:20 synthroi_ joined #git
20:20 neilthereildeil joined #git
20:20 thebope_ joined #git
20:20 fling joined #git
20:20 Sasazuka joined #git
20:20 osxi_ joined #git
20:20 mar77i joined #git
20:21 stompleee joined #git
20:21 Shentino joined #git
20:21 m0viefreak joined #git
20:21 neilthereildeil hi. i staged a file modification, and then modified it some more. now i have the file listed in green under staged and red under not staged
20:21 Dobo joined #git
20:21 cdg_ joined #git
20:21 hobodave joined #git
20:21 neilthereildeil how can i throw away the modifications i made to the staged version? i wanna keep what i have staged
20:21 LionsMane joined #git
20:21 Davey_ joined #git
20:21 Davey_ joined #git
20:22 rbern joined #git
20:22 AlgorithmWizard joined #git
20:22 mukmuk joined #git
20:22 jnavila__ joined #git
20:22 PalTale joined #git
20:22 Marbug joined #git
20:22 polyzen__ joined #git
20:22 same_ol_geez joined #git
20:23 eivarv_ joined #git
20:23 mattp_ joined #git
20:23 CEnnis91_ joined #git
20:23 cbreak joined #git
20:23 coasterz joined #git
20:23 ahr3n joined #git
20:23 hegge joined #git
20:23 miklcct joined #git
20:23 iveqy joined #git
20:23 holgersson_ joined #git
20:23 mooncup left #git
20:23 AndrewAlexMac_ joined #git
20:23 Jonuz joined #git
20:23 same_ol_2eez joined #git
20:23 CussBot joined #git
20:23 nchambers joined #git
20:23 sangy_ joined #git
20:23 anth0ny joined #git
20:23 Samual joined #git
20:23 clr joined #git
20:24 snthsnth joined #git
20:24 ninetysevena joined #git
20:24 UTAN_dev_ joined #git
20:24 arand__ joined #git
20:24 axisys_ joined #git
20:24 isysd_ joined #git
20:24 marlun1 joined #git
20:24 grift_ joined #git
20:24 markovh joined #git
20:24 JelmerD joined #git
20:24 grift_ joined #git
20:24 cxreg joined #git
20:24 da5id joined #git
20:24 vmiklos joined #git
20:24 chernjie_ joined #git
20:24 da5id joined #git
20:24 Puffball joined #git
20:24 topi` joined #git
20:24 thierryp joined #git
20:24 nopf joined #git
20:24 e14 joined #git
20:24 jesk joined #git
20:24 ashnur joined #git
20:24 ashnur joined #git
20:24 SegFaultAX joined #git
20:24 tmz_ joined #git
20:24 Stummi joined #git
20:24 cdesai joined #git
20:24 TSS_ joined #git
20:24 Darren_ joined #git
20:24 LeBlaaanc joined #git
20:24 brandonw joined #git
20:24 markovh joined #git
20:24 thierryp joined #git
20:24 fhackdroid joined #git
20:24 elastix joined #git
20:25 btamm joined #git
20:25 uranellus joined #git
20:25 uranellus joined #git
20:25 Soliton joined #git
20:25 NeverDie_ joined #git
20:25 cspack joined #git
20:25 btamm left #git
20:25 _flow_ joined #git
20:25 CIAguy joined #git
20:25 aspiers joined #git
20:25 emilyrose joined #git
20:25 pelegreno___ joined #git
20:25 holodoc joined #git
20:25 EgS joined #git
20:26 gravitron joined #git
20:26 TheMoonMaster joined #git
20:26 Tee_Pee joined #git
20:26 neunon joined #git
20:26 ghostlight joined #git
20:26 monokrome joined #git
20:26 osse joined #git
20:26 Orion3k joined #git
20:26 Klumben joined #git
20:26 Maple__ joined #git
20:26 Maple__ joined #git
20:26 Maple__ joined #git
20:26 Gitzilla joined #git
20:26 relgar joined #git
20:26 drbean joined #git
20:27 ujjain joined #git
20:27 ujjain joined #git
20:27 johnny56_ joined #git
20:28 hexagoxel joined #git
20:28 xai joined #git
20:28 Kamilion joined #git
20:28 rgrinberg1 joined #git
20:28 tubaman joined #git
20:28 RiPer joined #git
20:28 Kuukunen joined #git
20:29 forrestv joined #git
20:30 Dev0n joined #git
20:30 joki joined #git
20:30 UTAN_dev joined #git
20:32 PasiFist joined #git
20:32 NeverDie joined #git
20:32 varesa joined #git
20:32 BlessJah joined #git
20:32 hahuang61 joined #git
20:32 CussBot joined #git
20:32 Muzer joined #git
20:32 axisys joined #git
20:32 tcurdt joined #git
20:33 DANtheBEASTman joined #git
20:33 ahr3n_ joined #git
20:33 timmu_ joined #git
20:33 brett_ joined #git
20:33 vmiklos_ joined #git
20:33 same_ol_1eez joined #git
20:33 snthsnth_ joined #git
20:33 jab416171 joined #git
20:33 miklcct joined #git
20:33 ghostlight_ joined #git
20:33 hegge joined #git
20:33 same_ol_geez joined #git
20:33 neunon joined #git
20:33 fees joined #git
20:33 guardian` joined #git
20:33 chernjie joined #git
20:33 FabTG_ joined #git
20:33 PalTale joined #git
20:33 SegFaultAX joined #git
20:33 timothy joined #git
20:33 Ratler joined #git
20:33 rgrimm_ joined #git
20:33 brandonw joined #git
20:33 tmz joined #git
20:33 LeBlaaanc joined #git
20:33 quadz joined #git
20:33 e14 joined #git
20:33 rgrinberg1 joined #git
20:33 qpdb joined #git
20:33 fhackdroid joined #git
20:33 Jonuz joined #git
20:33 du joined #git
20:33 krillr joined #git
20:33 nchambers joined #git
20:33 jesk joined #git
20:33 johnmilton joined #git
20:33 marlun1 joined #git
20:33 isysd_ joined #git
20:33 Samual joined #git
20:33 sybariten joined #git
20:34 zapb_ joined #git
20:34 JelmerD joined #git
20:34 usm4n joined #git
20:34 msm joined #git
20:34 WaReZ joined #git
20:34 CIAguy joined #git
20:34 ninetysevena joined #git
20:34 jbondhus joined #git
20:34 emilyrose joined #git
20:34 cdesai joined #git
20:34 waveclaw joined #git
20:34 drbean joined #git
20:34 sangy_ joined #git
20:34 malide joined #git
20:34 xai joined #git
20:34 WebDawg joined #git
20:34 c0ded joined #git
20:34 holgersson joined #git
20:34 Klumben joined #git
20:34 _flow_ joined #git
20:35 snits joined #git
20:35 grift joined #git
20:35 uranellus joined #git
20:35 uranellus joined #git
20:35 hexagoxel joined #git
20:35 Maple__ joined #git
20:35 Maple__ joined #git
20:35 Maple__ joined #git
20:35 nuck joined #git
20:36 Slush- joined #git
20:36 Peng_ joined #git
20:36 DeltaHeavy joined #git
20:36 aspiers joined #git
20:36 timwis joined #git
20:36 HalfEatenPie_ joined #git
20:36 cstrahan_ joined #git
20:37 Khisanth joined #git
20:37 snowinferno joined #git
20:37 nopf joined #git
20:37 rudycane joined #git
20:38 ndim joined #git
20:38 SporkWitch joined #git
20:38 TheMoonMaster joined #git
20:38 cmosguy joined #git
20:39 Guest61699 joined #git
20:39 DuncanT joined #git
20:39 star_prone joined #git
20:39 tfnico joined #git
20:39 codebam joined #git
20:39 adambrenecki joined #git
20:40 cory___ joined #git
20:40 yena joined #git
20:41 discopatrick joined #git
20:42 johtso joined #git
20:42 davisonio joined #git
20:42 Tee_Pee joined #git
20:42 ggherdov joined #git
20:42 elastix joined #git
20:42 stealthii joined #git
20:43 Lowell joined #git
20:43 Lewix joined #git
20:43 felowe joined #git
20:43 mehdi___ joined #git
20:43 GameGamer43 joined #git
20:43 pizzaops joined #git
20:43 ketas joined #git
20:43 fstd joined #git
20:43 HappyLoaf_ joined #git
20:45 jast joined #git
20:45 techntoke_ joined #git
20:45 heroux joined #git
20:45 joseph_arnstein_ joined #git
20:45 elmcrest joined #git
20:45 harleypig joined #git
20:45 PasiFist joined #git
20:45 ahr3n joined #git
20:45 arand_ joined #git
20:45 beckyconning_ joined #git
20:45 zapb__ joined #git
20:45 kugel joined #git
20:45 kugel joined #git
20:45 PalTale joined #git
20:45 cloudcell_ joined #git
20:45 tinanoo joined #git
20:45 Vadtec_ joined #git
20:45 cxreg2 joined #git
20:45 qpdb joined #git
20:45 ozzloy_ joined #git
20:45 dilfridge joined #git
20:45 bket2 joined #git
20:45 marlun1 joined #git
20:45 guardian joined #git
20:45 iveqy_ joined #git
20:45 mischief joined #git
20:46 benbergm1n joined #git
20:46 lmat joined #git
20:46 snowinferno joined #git
20:46 gkatsev joined #git
20:46 cspack_ joined #git
20:46 e14 joined #git
20:46 BlessJah joined #git
20:46 JelmerD joined #git
20:46 hegge joined #git
20:46 Slush- joined #git
20:46 ninetysevena joined #git
20:46 timmu joined #git
20:46 krillr joined #git
20:46 ToeSnacks joined #git
20:46 unholycrab joined #git
20:46 ThunderYeti joined #git
20:46 boxrick1 joined #git
20:46 chigang joined #git
20:46 addshore joined #git
20:46 _Patrick_ joined #git
20:46 `mx joined #git
20:46 same_ol_1eez joined #git
20:46 larrybolt joined #git
20:46 addshore joined #git
20:46 unholycrab joined #git
20:46 brett_ joined #git
20:46 larrybolt joined #git
20:46 Lunatrius` joined #git
20:46 CussBot joined #git
20:46 c0ded joined #git
20:46 LeBlaaanc joined #git
20:46 miklcct joined #git
20:46 BlessJah joined #git
20:46 rts-sander joined #git
20:46 fees joined #git
20:46 addshore joined #git
20:46 boxrick1 joined #git
20:46 unholycrab joined #git
20:46 ToeSnacks joined #git
20:46 chigang joined #git
20:46 addshore joined #git
20:46 Khisanth joined #git
20:46 nchambers joined #git
20:46 quadz joined #git
20:46 nivag_ joined #git
20:47 markovh joined #git
20:47 Klumben joined #git
20:47 waveclaw joined #git
20:47 Gitzilla joined #git
20:47 angular_mike_ joined #git
20:47 dreiss joined #git
20:47 jhe_ joined #git
20:47 cdesai joined #git
20:47 grift joined #git
20:47 NuckingFuts joined #git
20:47 jab416171 joined #git
20:47 rgrimm joined #git
20:47 nellicus_ joined #git
20:47 vmiklos joined #git
20:47 emilyrose joined #git
20:47 Fissure joined #git
20:47 Samual joined #git
20:47 BrianBlaze420 joined #git
20:47 SJr joined #git
20:47 cdown joined #git
20:47 jrahmy joined #git
20:47 teadrop_ joined #git
20:47 jbondhus joined #git
20:48 CIAguy joined #git
20:48 sangy_ joined #git
20:48 suy joined #git
20:48 WebDawg joined #git
20:48 Kobaz joined #git
20:48 mohabaks joined #git
20:48 _flow_ joined #git
20:48 hexagoxel joined #git
20:48 holgersson joined #git
20:48 MrC joined #git
20:48 TheMoonMaster joined #git
20:48 ulkesh joined #git
20:49 _ADN_ joined #git
20:49 Maple__ joined #git
20:49 Maple__ joined #git
20:49 Maple__ joined #git
20:49 neunon joined #git
20:49 SegFaultAX joined #git
20:49 codebam joined #git
20:49 Stummi joined #git
20:50 fhackdroid joined #git
20:50 dzho joined #git
20:50 shymega joined #git
20:50 joki joined #git
20:50 Vaelatern joined #git
20:50 mrpackethead joined #git
20:50 MattE joined #git
20:50 prosody joined #git
20:50 giraffe_ joined #git
20:50 xai joined #git
20:50 refried_ joined #git
20:51 thomas joined #git
20:51 heroux joined #git
20:51 ManiacTwister joined #git
20:51 Kamilion joined #git
20:51 vmiklos joined #git
20:52 garyserj joined #git
20:52 Peng_ joined #git
20:52 trondth joined #git
20:52 Muzer joined #git
20:52 gyre007 joined #git
20:52 barq joined #git
20:52 asdofindia joined #git
20:53 thomas joined #git
20:53 al-damiri joined #git
20:53 fuchstronaut joined #git
20:53 Ineentho[m] joined #git
20:54 rgrinberg joined #git
20:54 timwis joined #git
20:54 kireevco_ joined #git
20:54 tfnico joined #git
20:54 cmosguy joined #git
20:54 JackMc joined #git
20:54 cory___ joined #git
20:55 zero7 joined #git
20:55 WaReZ joined #git
20:55 adambrenecki joined #git
20:55 Darren_ joined #git
20:56 wizonesolutions joined #git
20:56 Ender13 joined #git
20:56 huhlig joined #git
20:56 Awesomecase joined #git
20:56 [diecast] joined #git
20:56 cspotcode joined #git
20:56 Anupkumar joined #git
20:56 flobin joined #git
20:57 theskillwithin joined #git
20:57 ionelmc joined #git
20:57 DuncanT joined #git
20:58 sebhoss joined #git
20:58 eshlox joined #git
20:58 jleclanche joined #git
20:58 cstrahan_ joined #git
20:59 Iacobus joined #git
20:59 dave0x6d joined #git
20:59 kwmiebach__ joined #git
21:00 joki joined #git
21:01 CEnnis91 joined #git
21:01 da5id joined #git
21:01 brokensyntax joined #git
21:01 elijah joined #git
21:02 lxnch joined #git
21:02 _sjs joined #git
21:02 WillMoogle joined #git
21:03 kikijiki[m] joined #git
21:04 MLM joined #git
21:06 jimi_ joined #git
21:08 _ikke_ neilthereildeil: You are contracting
21:08 _ikke_ What do you want to keep and what can go away?
21:08 axisys joined #git
21:08 _ikke_ s/contracting/contradicting*
21:10 lebster in a git log i see a merge commit then right before i see the commit inside the merge.. if i want to do a revert do i revert the merge commit or the change commit?
21:10 jast neilthereildeil: I think you just want "git checkout <file>" which restores the staged version
21:11 neilthereildeil ahh ok thanks
21:12 jast lebster: generally it's easier to revert the merge commit because that will revert any conflict resolutions, too. word of caution: when you revert a merge and you ever want to re-merge it, you have to do it by reverting the revert :)
21:12 lebster awesomeeee thx man
21:12 cdown joined #git
21:13 ndim joined #git
21:13 jast reverting merge commits is special, by the way, it will ask you about a parent number
21:13 hahuang61 joined #git
21:13 jast I think !revert_merge has details
21:13 gitinfo [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Docu​mentation/howto/revert-a-faulty-merge.txt
21:14 lebster sooo lets say there were multiple commits inside the merge and i wanted to keep some of them... att hat point would i revert the commit inside the merge or still revert the whole merge?
21:14 jast probably better to revert the individual commits, then
21:15 offby1 joined #git
21:15 Dydzio_ joined #git
21:17 red82 joined #git
21:19 Derega_ joined #git
21:19 aviraldg joined #git
21:20 hobodave joined #git
21:20 raspado joined #git
21:20 dsdeiz joined #git
21:26 HappyLoaf_ joined #git
21:28 ruby_ joined #git
21:29 thierryp joined #git
21:30 dsdeiz_ joined #git
21:31 mischat joined #git
21:31 neilthereildeil left #git
21:33 nwkj86 joined #git
21:35 mellernoia joined #git
21:38 LeBlaaanc joined #git
21:40 aviraldg joined #git
21:40 aviraldg joined #git
21:42 fuzzmz joined #git
21:43 mkoskar joined #git
21:43 M-meznak joined #git
21:44 stomplee joined #git
21:46 ghostlight joined #git
21:46 snthsnth joined #git
21:46 Guest39784 joined #git
21:48 hahuang62 joined #git
21:49 Remram[m] joined #git
21:50 jeffreylevesque joined #git
21:52 HappyLoaf_ joined #git
21:53 justan0theruser joined #git
21:54 fuchstronaut joined #git
21:54 rumen1980 joined #git
21:56 Dougie187 left #git
21:56 Guest27249 left #git
22:00 rumenp1980 joined #git
22:01 olalonde joined #git
22:02 cagedwisdom joined #git
22:02 thierryp joined #git
22:04 einnjo joined #git
22:06 cdown_ joined #git
22:07 MadHatter42 joined #git
22:08 snthsnth joined #git
22:11 Noldorin joined #git
22:12 meloc joined #git
22:12 meloc joined #git
22:15 HappyLoaf_ joined #git
22:15 e14 joined #git
22:19 astrofog joined #git
22:20 mischat joined #git
22:20 cdown joined #git
22:21 hallogallo[m] joined #git
22:21 wololokatamari[m joined #git
22:21 dodobrain joined #git
22:22 hahuang61 joined #git
22:22 yaymukund joined #git
22:27 star_prone joined #git
22:28 flobin joined #git
22:28 rgrinberg joined #git
22:32 fedepad joined #git
22:34 rgrinberg joined #git
22:35 wizardedit joined #git
22:35 coasterz joined #git
22:38 HappyLoaf_ joined #git
22:38 sangy_ joined #git
22:40 njbair joined #git
22:40 jaequery joined #git
22:41 whitby joined #git
22:41 biotim joined #git
22:42 frobnic joined #git
22:43 Davey joined #git
22:43 Davey joined #git
22:43 boombatower joined #git
22:47 astrofog joined #git
22:48 red82 joined #git
22:48 xshuiniu joined #git
22:49 einnjo joined #git
22:49 M-mistake1 joined #git
22:51 astrofog joined #git
22:51 madewokherd joined #git
22:52 LeBlaaanc joined #git
22:52 mischat joined #git
22:52 same_ol_geez joined #git
22:55 ninetysevena left #git
22:55 fk joined #git
22:56 altendky joined #git
22:56 Cabanossi joined #git
22:57 navidr_ joined #git
22:57 anonymuse joined #git
22:58 prawnzy joined #git
22:59 HappyLoaf_ joined #git
23:00 Infamous joined #git
23:02 a___ joined #git
23:02 navidr joined #git
23:04 navidr joined #git
23:04 mizu_no_oto joined #git
23:06 Boniche joined #git
23:06 HappyLoaf_ joined #git
23:07 QwertyDragon joined #git
23:08 vassagus joined #git
23:09 zivester joined #git
23:10 vassagus joined #git
23:14 thierryp joined #git
23:19 kyan_ joined #git
23:20 joki joined #git
23:21 codfection joined #git
23:22 clemf joined #git
23:22 HappyLoaf_ joined #git
23:23 Gsham joined #git
23:25 romerocesar joined #git
23:25 Davey_ joined #git
23:25 Davey_ joined #git
23:26 snthsnth joined #git
23:27 ahr3n joined #git
23:29 Milijus joined #git
23:31 Davey_ joined #git
23:31 Davey_ joined #git
23:31 Hobbyboy joined #git
23:31 sanscheese joined #git
23:31 lep2 left #git
23:32 leprechau joined #git
23:34 dsdeiz joined #git
23:36 perrier-jouet joined #git
23:39 shafun joined #git
23:39 LeBlaaanc joined #git
23:40 Mobutils joined #git
23:42 codfection joined #git
23:43 LeBlaaanc joined #git
23:46 pjs joined #git
23:46 codfection joined #git
23:47 pjs left #git
23:47 pjs joined #git
23:48 pjs Hey all.. silly question but, "error: src refspec release/3.5.2016 matches more than one." when I try to push to a new branch on origin server. However, there is no remote branch or tag with the name release/3.5.2016 and no other conflicts locally that I can see. Any ideas?
23:51 CtrlC joined #git
23:51 ShekharReddy joined #git
23:52 rbern joined #git
23:52 pjs left #git
23:52 ojacobson pjs: can you pastebin `git show-ref` in the offending local repository?
23:52 hahuang62 joined #git
23:53 mischat joined #git
23:54 HoloPed__ joined #git
23:55 fuchstronaut joined #git
23:56 AfroThundr joined #git

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