Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-02

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

All times shown according to UTC.

Time Nick Message
00:00 Gsham joined #git
00:01 hahuang61 joined #git
00:01 boushi_ joined #git
00:02 quetz joined #git
00:02 e14 joined #git
00:05 danslo joined #git
00:06 SwiftMatt joined #git
00:07 e14 joined #git
00:07 qpdb joined #git
00:08 hahuang65 joined #git
00:11 kus joined #git
00:16 vassagus joined #git
00:16 dmto joined #git
00:17 AaronMT joined #git
00:21 diogenese joined #git
00:26 duderonomy joined #git
00:27 ekinmur joined #git
00:28 tjone270_ joined #git
00:30 Hink joined #git
00:32 cqi joined #git
00:39 e14 joined #git
00:41 mizu_no_oto joined #git
00:41 diogenese joined #git
00:41 geko joined #git
00:45 newbiee i did git add but now i want to keep the changes but don’t want to commit. I want to commit other files though. How to do it?
00:45 vassagus joined #git
00:46 evanwang joined #git
00:46 kadoban newbiee: 'git status' tells you
00:47 newbiee kadban: i alraead did that but i don’t want to commit in the current commit.
00:47 kadoban newbiee: Read what it tells you.
00:48 newbiee http://stackoverflow.com/questions/348​170/how-to-undo-git-add-before-commit
00:48 newbiee i think this is what i need.
00:48 bremner maybe if we copied the output of git status to stackoverflow?
00:49 robattila256 joined #git
00:49 rewt newbiee, the word you're looking for in the `git status` output is "unstage"
00:49 kadoban newbiee: I seriously have no idea how to be any clearer ... type 'git status' and read what it tells you. It tells you exactly how to do what you're asking.
00:50 robattila256 Hey does anyone know where I'm supposed to run "git submodule update --init" to fix this error https://github.com/stepmania/stepmania/issues/1254
00:50 newbiee kadoban: yes i need to unstage some files. So that i can commit other changes but keep the changes for some files.
00:50 Kuukunen kadoban: to be fair, it's not THAT clear
00:50 rewt it is, if you read it
00:51 Kuukunen like, if you're a git newbie, you might have no idea what "unstage" means
00:51 kadoban Kuukunen: It should be when someone points it out. If not, they can certainly ask. "What part?" might be a good followup, or asking for defiinitons, or confirming what command or ...
00:51 bremner newbiee: git reset -p
00:52 Kuukunen not to mention at lest for me it says "git reset HEAD <file>..." which is a bit overly verbose
00:52 jeffreylevesque joined #git
00:52 * kadoban gives up
00:53 rewt true, you can hope git guesses correctly what you want to do
00:53 Kuukunen rewt: the problem is it can't :P
00:54 Kuukunen that's what I'm saying
00:54 newbiee anyway I just did git reset previous_commit_id and then did everything again.
00:54 bremner so, uh, you ignored what I said then.
00:55 flaguy48 left #git
00:56 bremner oh well. One of us learned something, anyway.
00:56 Kuukunen newbiee: as for you, when you ask for advice, don't just ignore what people are saying :P
00:57 newbiee sure will keep that in mind.
00:57 chrisshattuck joined #git
00:57 EvilPenguin joined #git
00:58 newbiee I kind of leave from office and wanted to get rid of this. But anyway how to unstage files after doing git add so that i don’t commit in the current commit but rather commit later.
00:58 Kuukunen newbiee: probably just "git reset" is what you want, as mentioned in the link
00:59 newbiee hmm ok
01:00 dmto joined #git
01:03 nivag joined #git
01:05 Lyqyd joined #git
01:06 Mobutils joined #git
01:07 Noldorin joined #git
01:07 flaguy48 joined #git
01:08 inflames joined #git
01:10 boushi joined #git
01:11 clemf joined #git
01:15 mizu_no_oto joined #git
01:15 mostlybadfly joined #git
01:16 JamesBaxter joined #git
01:16 boushi joined #git
01:16 duderonomy joined #git
01:17 justanotheruser joined #git
01:18 jab416171 joined #git
01:18 AaronMT joined #git
01:19 zumba_addict joined #git
01:20 waht joined #git
01:21 ayjay joined #git
01:22 c0ded joined #git
01:22 SeaK joined #git
01:27 e14 joined #git
01:28 durham joined #git
01:29 boushi_ joined #git
01:33 Dougie187 joined #git
01:35 l4v2 joined #git
01:38 vassagus joined #git
01:39 pks joined #git
01:41 durham joined #git
01:45 dreiss joined #git
01:49 anuxivm left #git
01:49 Goplat joined #git
01:50 vassagus joined #git
01:51 Vampire0_ joined #git
01:51 HoierM joined #git
01:52 d^sh joined #git
01:53 dmto joined #git
01:55 ResidentBiscuit joined #git
01:57 MattMaker joined #git
01:57 CEnnis91 joined #git
01:58 dislore joined #git
01:59 duderonomy joined #git
02:01 boushi__ joined #git
02:01 hahuang65 joined #git
02:02 vassagus joined #git
02:02 anderss__ joined #git
02:03 l4v2 joined #git
02:04 boushi joined #git
02:05 robattila256 left #git
02:05 d0nn1e joined #git
02:05 MattMaker joined #git
02:06 dsantiago joined #git
02:06 chachasmooth joined #git
02:07 lerax joined #git
02:10 cqi joined #git
02:10 Aces_Charles joined #git
02:14 romerocesar joined #git
02:15 vassagus joined #git
02:16 dreiss joined #git
02:19 dmto joined #git
02:19 AaronMT joined #git
02:22 AaronMT_ joined #git
02:22 hexagoxel joined #git
02:26 rgrinberg joined #git
02:27 vassagus joined #git
02:32 fstd_ joined #git
02:35 Puffball joined #git
02:36 lerax left #git
02:38 vassagus joined #git
02:39 boombatower joined #git
02:40 chrisshattuck joined #git
02:43 crayon joined #git
02:43 lagothrix joined #git
02:43 crayon joined #git
02:44 watabou joined #git
02:45 Noldorin joined #git
02:51 vassagus joined #git
02:52 nettoweb joined #git
02:54 MattMaker joined #git
02:55 mingrammer joined #git
02:56 zivester joined #git
02:57 jaguarmagenta joined #git
02:58 cagedwisdom joined #git
03:00 holodoc joined #git
03:00 linuxmint joined #git
03:03 vassagus joined #git
03:04 justan0theruser joined #git
03:04 chachasmooth joined #git
03:06 mingrammer joined #git
03:06 aavrug joined #git
03:07 ahr3n_ joined #git
03:08 aavrug joined #git
03:10 mycyber joined #git
03:13 durham joined #git
03:13 durham joined #git
03:14 Vortex35 joined #git
03:14 vassagus joined #git
03:21 Dougie187 left #git
03:22 AaronMT joined #git
03:28 vassagus joined #git
03:28 A5101 joined #git
03:28 crayon joined #git
03:29 ToBeCloud joined #git
03:29 Andrew_K joined #git
03:30 lorantalas joined #git
03:33 pioiytr joined #git
03:35 rkazak joined #git
03:38 vassagus joined #git
03:39 biotim joined #git
03:42 nettoweb joined #git
03:45 daynaskully joined #git
03:48 radsy joined #git
03:50 sangy joined #git
03:50 evanwang joined #git
03:51 dstw joined #git
03:51 vassagus joined #git
03:52 sssilver joined #git
03:53 a3Dman_ joined #git
03:54 dstw left #git
03:56 sssilver joined #git
03:59 sssilver joined #git
04:01 thecomedian joined #git
04:02 daey_ joined #git
04:02 vassagus joined #git
04:03 hahuang65 joined #git
04:03 mehola joined #git
04:03 sssilver joined #git
04:04 dreiss joined #git
04:06 rscata joined #git
04:07 sssilver joined #git
04:08 daynaskully joined #git
04:09 mehola joined #git
04:11 tomog999_ joined #git
04:12 sssilver joined #git
04:13 Vgr_ joined #git
04:15 vassagus joined #git
04:16 Cabanossi joined #git
04:17 sssilver joined #git
04:17 daynaskully joined #git
04:21 romerocesar joined #git
04:22 sssilver joined #git
04:25 navidr joined #git
04:26 fakenerd joined #git
04:26 blackwell joined #git
04:29 vassagus joined #git
04:31 dmto joined #git
04:32 raijin joined #git
04:36 MattMaker joined #git
04:36 nilsi joined #git
04:38 dsdeiz joined #git
04:38 dsdeiz joined #git
04:42 vassagus joined #git
04:47 mohshami joined #git
04:50 PioneerAxon joined #git
04:51 govg joined #git
04:54 vassagus joined #git
04:55 subhojit777 joined #git
04:58 lorantalas joined #git
04:58 Kicer86 joined #git
04:59 daey_ joined #git
05:00 miklcct joined #git
05:00 govg joined #git
05:05 vuoto joined #git
05:05 vassagus joined #git
05:06 mohshami Hello, is it possible to have a repo inside another repo?
05:07 _ikke_ yes
05:07 _ikke_ !submodule
05:07 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
05:07 Raging_Hog joined #git
05:10 psprint_ joined #git
05:12 lorantalas joined #git
05:16 vassagus joined #git
05:16 biotim see also git subtree https://developer.atlassian.com/blo​g/2015/05/the-power-of-git-subtree/
05:17 miklcct joined #git
05:18 dec0n joined #git
05:19 yuhlw_ joined #git
05:19 leeN joined #git
05:24 AaronMT joined #git
05:25 boushi joined #git
05:27 tvw joined #git
05:28 mingrammer joined #git
05:28 vassagus joined #git
05:30 ratiotile_ joined #git
05:30 boushi_ joined #git
05:31 qws-user-1228 joined #git
05:32 qt-x joined #git
05:36 nidr0x joined #git
05:36 stuh84 joined #git
05:38 MrMojito joined #git
05:38 MrMojito joined #git
05:40 vassagus joined #git
05:41 mohshami Thanks _ikke_
05:42 dmto joined #git
05:42 dodobrain joined #git
05:43 ThomasLocke joined #git
05:43 ThomasLocke joined #git
05:43 harryh joined #git
05:46 mingrammer joined #git
05:46 mingrammer joined #git
05:48 hahuang65 joined #git
05:51 bmahe joined #git
05:51 dmto joined #git
05:54 vassagus joined #git
05:55 jceb joined #git
05:57 a_thakur joined #git
06:02 nwmcsween joined #git
06:03 rkazak joined #git
06:03 dmto joined #git
06:04 dec0n joined #git
06:04 rchavik joined #git
06:04 nwmcsween_ joined #git
06:06 vassagus joined #git
06:07 dec0n joined #git
06:11 thiago joined #git
06:12 pR0Ps joined #git
06:13 cqi joined #git
06:15 clemf joined #git
06:20 mohabaks joined #git
06:20 nilg joined #git
06:20 JeroenT joined #git
06:20 vassagus joined #git
06:22 romerocesar joined #git
06:22 Aboba joined #git
06:22 andlabs joined #git
06:23 dmto joined #git
06:24 nwmcsween__ joined #git
06:26 govg joined #git
06:27 tesuji joined #git
06:28 nwmcsween_ joined #git
06:29 Raging_Hog joined #git
06:29 thomas_25 joined #git
06:32 tesuji joined #git
06:32 vassagus joined #git
06:34 zeroed joined #git
06:36 paulh_ joined #git
06:38 Sceorem joined #git
06:38 star_prone joined #git
06:39 aidalgol joined #git
06:40 grift joined #git
06:40 iskander_work joined #git
06:40 Generic joined #git
06:43 JeroenT joined #git
06:45 jknetl joined #git
06:46 vassagus joined #git
06:47 submitnine joined #git
06:48 jknetl joined #git
06:49 fees joined #git
06:49 hendry joined #git
06:49 hendry how do I quickly resolve a merge in git to say favour my local copy, the one I was using before I did a git pull ?
06:49 danslo joined #git
06:50 grawity -X ours
06:50 grawity or checkout conflicting files with --ours
06:51 pR0Ps joined #git
06:52 cxz joined #git
06:52 crayon joined #git
06:53 eduardas_m joined #git
06:54 DieguezZ joined #git
06:56 hendry grawity: thank you
06:58 jaguarmagenta joined #git
06:58 ribasushi joined #git
06:59 vassagus joined #git
07:00 elect joined #git
07:03 unforgiven512 joined #git
07:05 Darcidride__ joined #git
07:09 crayon joined #git
07:10 cbarbieri joined #git
07:11 vassagus joined #git
07:12 TomyWork joined #git
07:13 satya4ever joined #git
07:13 boushi__ joined #git
07:14 JeroenT joined #git
07:16 Chaser joined #git
07:17 King_Hual joined #git
07:19 afuentes joined #git
07:19 mingrammer joined #git
07:20 Rish joined #git
07:21 dbck joined #git
07:22 Generic left #git
07:23 jhasse Hi! I often need to do `git stash && git pull && git stash pop`. Is there a shortcut for that?
07:23 visualProphet joined #git
07:24 mingrammer joined #git
07:24 vassagus joined #git
07:24 grawity jhasse: some third-party wrappers have one, e.g. I remember `legit sync`
07:24 grawity jhasse: git config --global alias.sync '!git stash && git pull && git stash pop'
07:25 jhasse grawity, thanks! Legit looks very nice :)
07:25 visualProphet So I think I messed up bad
07:25 kurkale6ka joined #git
07:25 visualProphet I accidentally made my whole C: drive a repository
07:26 visualProphet and I have no idea how to undo that
07:26 grawity delete C:\.git, done
07:26 visualProphet ah
07:26 star_prone joined #git
07:27 Balliad joined #git
07:28 quetz joined #git
07:28 lohfu joined #git
07:30 visualProphet I just found out I could have easily fixed my problem if i looked in my ide's settings better ._.
07:30 pioiytr joined #git
07:30 jungsubk joined #git
07:30 Mekkis joined #git
07:31 abyx joined #git
07:32 dec0n joined #git
07:32 choki joined #git
07:33 luke_penn joined #git
07:34 cjohnson If I copy a file manually from one branch to another (it was created in brancha, I want to copy to branchb), assuming I never change the file across branches as it gets mergeda round, this won't cause a conflict will it?
07:34 cjohnson git is smart enough to see that the files match up despite coming from entirely different commits
07:34 cjohnson ?
07:34 cjohnson when I merge brancha into master and then go into branchb and rebase master, for instance
07:34 cjohnson or merging both into master
07:36 osse cjohnson: no problems
07:36 vassagus joined #git
07:37 rominronin joined #git
07:37 cdown joined #git
07:38 elect joined #git
07:39 garethdaine joined #git
07:40 moei joined #git
07:41 cjohnson thx
07:47 encod3 joined #git
07:48 anttim joined #git
07:48 jceb joined #git
07:49 vassagus joined #git
07:49 hahuang65 joined #git
07:52 paws_ joined #git
07:52 greendo joined #git
07:56 Silenced joined #git
07:56 Silenced joined #git
08:00 aidalgol joined #git
08:01 vassagus joined #git
08:02 a_thakur joined #git
08:02 Balliad joined #git
08:02 chll_ joined #git
08:04 erguven joined #git
08:05 thiago joined #git
08:05 a_thakur joined #git
08:06 zonality joined #git
08:11 MattMaker joined #git
08:11 ferr joined #git
08:13 zeroed joined #git
08:14 vassagus joined #git
08:15 Oebele joined #git
08:15 GavinMagnus joined #git
08:16 dede joined #git
08:17 marcogmonteiro joined #git
08:19 bongjovi joined #git
08:20 rchavik joined #git
08:21 boushi_ joined #git
08:23 romerocesar joined #git
08:25 boushi__ joined #git
08:26 crayon joined #git
08:27 vassagus joined #git
08:27 pR0Ps joined #git
08:29 maxorator joined #git
08:30 phanimahesh joined #git
08:31 ehiggs joined #git
08:32 courrier joined #git
08:32 ehiggs Hi all! I have a question about a git workflow. Maybe there’s a better way… I work on my laptop and run some tests locally and want to push to my internal branch. When I get to a good point, I pull the branch on my desktop and run all the tests there.
08:33 netj joined #git
08:33 ehiggs However, sometimes I rebase with upstream and push -f. When I do git pull it gets into a really shirty state and I don’t seem to be able to clean up the branch.
08:34 moritz merge instead of rebase
08:34 ehiggs do i just do git merge —abort and then delete the branch and check it out anew? Or is there something better I could be doing with the workflow?
08:34 moritz or always reset --hard the branch on all machines after doing the rebase
08:34 moritz git fetch; reset --hard origin/develop
08:35 ehiggs if i merge then when I am ready to submit my patch it will be interspersed with the upstream patches.
08:35 ehiggs i thought i wanted my commits to sit on top of the upstream tree
08:36 garethdaine joined #git
08:39 vassagus joined #git
08:40 dec0n joined #git
08:40 vrishab joined #git
08:41 ehiggs ok ill try git reset —hard next time i run into this.
08:41 ehiggs thanks
08:41 JRHaigh joined #git
08:45 harryh left #git
08:46 JeroenT joined #git
08:47 inodb joined #git
08:47 navidr joined #git
08:48 SteffanW joined #git
08:49 radsy joined #git
08:49 ferr joined #git
08:54 aidalgol joined #git
08:55 vassagus joined #git
08:58 MattMaker joined #git
09:00 WhiskerBiscuit joined #git
09:00 hahuang65 joined #git
09:02 gatty joined #git
09:03 marcogmonteiro joined #git
09:04 bagnz0r joined #git
09:05 jceb joined #git
09:05 markelite joined #git
09:06 arand__ joined #git
09:06 vassagus joined #git
09:07 Macaveli joined #git
09:07 paulh_ joined #git
09:09 MattMaker joined #git
09:09 harish joined #git
09:10 cqi joined #git
09:12 a_thakur_ joined #git
09:12 Gurkenglas joined #git
09:13 gatty Hi, with submodules, is it possible to create an empty submodule project within an existing git repository which has existing code inside? I'm wanting to create a submodule "extensions" which doesn't need a clone of the "parent" repository.
09:14 grawity it should be the same as adding an existing one
09:14 star_prone joined #git
09:14 boushi joined #git
09:15 gatty Okay, I'll fiddle around with it a bit more then, cheers
09:16 moriko joined #git
09:17 ochorocho__ joined #git
09:18 vassagus joined #git
09:18 psprint_ joined #git
09:23 zeroed joined #git
09:24 mar77i joined #git
09:24 MegaManSec joined #git
09:25 bathtub_shark joined #git
09:30 jceb joined #git
09:31 rahtgaz joined #git
09:31 vassagus joined #git
09:33 spudowiar joined #git
09:34 mycelium joined #git
09:34 ahmedelgabri joined #git
09:35 ASOLAr joined #git
09:36 iveqy joined #git
09:37 makinen I'm working on a diverged branch and pulled the new commits from the remote repo.
09:37 makinen how can I revert the pull?
09:38 MegaManSec joined #git
09:39 i7c Revert the merge commit or reset to the commit before the merge.
09:39 i7c !revert
09:39 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
09:39 MattMaker joined #git
09:40 i7c If it’s all local, you probably want to reset before merge commit (option e here).
09:40 a_thakur joined #git
09:40 i7c If you published the merge already, you might want revert (needs the -m option for merges).
09:41 makinen reset to the commit before the merge. There is a conflict in one file and I'd like to leave solving it to my coworker :)
09:41 makinen it's a local change still
09:41 i7c Yup then that’s alright to reset --hard <commit before merge>
09:42 i7c Find the right commit from the log
09:42 ASOLAr joined #git
09:43 makinen got it to work thanks
09:44 MegaManSec joined #git
09:45 dislore joined #git
09:45 vassagus joined #git
09:47 ShapeShifter499 joined #git
09:48 groundnuty joined #git
09:48 groundnuty hey, where can I find sources of git-clone I'm very interested how the flag --local is implemented
09:48 groundnuty or rather how git decides that path is local or not
09:49 grawity if it's a *path*, git assumes it's local
09:49 grawity meanwhile URLs are always remote
09:50 groundnuty grawity: any nice definition of *path* and *url*?
09:50 groundnuty regexp wise :)
09:50 sin3t joined #git
09:50 pR0Ps joined #git
09:50 groundnuty url can be localhost/www :)
09:50 grawity no it cannot
09:51 Seveas ://
09:51 grawity you're not dealing with a web browser here, so the defaults are different
09:51 kanyeezy joined #git
09:51 kanyeezy joined #git
09:51 fees joined #git
09:51 groundnuty grawity: ok, sory, you mind pointing me to some resource so I can correct my thinking?
09:52 _ikke_ file:/// is considered 'remote', while just / is considered local (git using hardlinks for example by default)
09:53 Seveas hm
09:54 Seveas git simply checks if the path exists, and if not, then it's considered remote
09:54 grawity at that point it gets weird though
09:54 Seveas hurricane:/tmp$ git init http://example.com
09:54 Seveas Initialized empty Git repository in /tmp/http:/example.com/.git/
09:54 Seveas hurricane:/tmp$ git clone http://example.com example2
09:54 Seveas Cloning into 'example2'...
09:54 Seveas fatal: I don't handle protocol '/tmp/http'
09:54 Seveas fun
09:54 grawity e.g. if $PWD/http:/foobar exists, it can't decide
09:55 Seveas hurricane:/tmp$ git init git@example.com:foo.git
09:55 Seveas Initialized empty Git repository in /tmp/git@example.com:foo.git/.git/
09:55 Seveas hurricane:/tmp$ git clone git@example.com:foo.git
09:55 Seveas Cloning into 'foo'...
09:55 Seveas warning: You appear to have cloned an empty repository.
09:55 Seveas done.
09:55 Seveas grawity: it does decide, but then barfs :)
09:55 grawity I guess that's somewhat unavoidable when you have to support both pathnames with colons, *and* rsh-style host:path
09:57 jungsubk joined #git
09:57 vassagus joined #git
09:58 groundnuty hmm I epxected that to work
09:58 groundnuty git clone  /tmp/http://github.com/groundnuty/​onedata-getting-started.git/ r/
09:58 groundnuty directory /tmp/http://github.com/groundnuty/​onedata-getting-started.git/ exists and has repo inside
10:00 groundnuty I guess it greps for http: because of I move : around it works
10:01 crayon joined #git
10:02 groundnuty anyway, thank you guys for your time
10:02 a_thakur joined #git
10:02 zeroed joined #git
10:06 shmuli joined #git
10:08 liuzhen_ joined #git
10:10 thecomedian_ joined #git
10:10 vassagus joined #git
10:13 bket joined #git
10:15 infernix joined #git
10:15 Mayumi joined #git
10:16 nettoweb joined #git
10:17 cdown joined #git
10:18 PioneerAxon joined #git
10:18 ochorocho__ joined #git
10:19 moriko joined #git
10:20 t0by joined #git
10:21 MegaManSec joined #git
10:22 WhiskerBiscuit joined #git
10:22 pothepanda joined #git
10:22 dreamyspell joined #git
10:23 Gabs joined #git
10:23 romerocesar joined #git
10:24 Matsv joined #git
10:24 vassagus joined #git
10:25 shmuli joined #git
10:28 MegaManSec joined #git
10:29 linuxmodder joined #git
10:29 Puffball joined #git
10:30 exarch joined #git
10:31 star_prone joined #git
10:31 fuchstronaut joined #git
10:31 fuchstronaut joined #git
10:32 Hink joined #git
10:33 star_prone joined #git
10:34 sdothum joined #git
10:36 ahmedelgabri joined #git
10:37 vassagus joined #git
10:41 shmuli joined #git
10:42 encod3 joined #git
10:43 Munt joined #git
10:44 phanimahesh joined #git
10:44 zonality joined #git
10:46 WhiskerBiscuit joined #git
10:46 lorantalas joined #git
10:49 JeroenT joined #git
10:50 linuxmodder joined #git
10:51 vassagus joined #git
10:54 CausaMortis joined #git
10:56 CausaMortis hey guys. I having a bit of trouble understanding the following scenario: I have a PR and want to rebase it ontop of master so running git rebase origin/master. Odd thing is that I get conflicts in the files that I changed in my PR and were not touched by others. This should not happen right? What could I have done wrong?
10:56 jack_thompson joined #git
10:57 osse CausaMortis: They must have been touched in origin/master
10:57 osse What does git status say.
10:57 jokajak joined #git
10:58 Guest32660 joined #git
10:58 jack_thompson git cvsimport can be used to sync a git repository with a CVS repository? development is done using CVS.. git is necessary because of github...
10:59 jack_thompson am i right with that assumption? or does it require me to abandon cvs?
10:59 jack_thompson i want to keep using cvs... but need a way to "upload" to github..
10:59 abhinav joined #git
11:00 abhinav hi
11:00 IndigoTiger_ joined #git
11:00 abhinav how to ignore something without adding it to .gitignore ?
11:00 jaguarmagenta joined #git
11:00 moritz abhinav: add it to .git/info/exclude
11:01 CausaMortis osse: any info you are looking for in particular? I do see some both modified statuses in files that contain the conflicts but should not have been touched on master
11:01 gab__ joined #git
11:01 abhinav moritz: thanks.
11:01 hahuang65 joined #git
11:02 chll__ joined #git
11:03 ToBeCloud joined #git
11:03 alcohol CausaMortis: must not != did not
11:03 CausaMortis osse: ok, just to confirm, my train of thought is not weird or anything, is it? I mean, I want to apply my changes ontop of master (to keep my history clean and concise) so the rebase origin/master is correct
11:03 vassagus joined #git
11:04 alcohol CausaMortis: the files were obviously touched since you branched off from master, otherwise there would be no conflicts.
11:04 CausaMortis alcohol: you are right, I will verify whether changes were made between branching and now
11:04 jack_thompson fuck it... i just upload the release archive into the git at github... lol
11:04 abhinav moritz: wait. this .git is my projects .git no? if i add something here i will have to push this changes to upstream no?
11:04 abhinav moritz: i dont want to psuh this changes.
11:04 moritz abhinav: your .git/info/exclude is a local file
11:04 CausaMortis alcohol: but I made those changes in the PR im trying to rebase. that does not result in conflicts, right?
11:05 alcohol jack_thompson: or, you know, get rid of that ancient dinosaur called cvs.
11:05 CausaMortis does = should*
11:05 moritz abhinav: and won't be synchronized in a push/fetch
11:05 jack_thompson alcohol i found the marketing guy..
11:05 abhinav moritz: oh. great. thanks.
11:06 drizztbsd joined #git
11:06 alcohol jack_thompson: totally. if you use git, you gain internet kudos. if you use svn/cvs, you lose internet kudos.
11:06 CausaMortis alcohol: thank you for making me realise how to check my sanity
11:06 jack_thompson alcohol CVS successfully follows symbolic links something git and svn are not able to do...
11:06 jack_thompson ;D
11:07 Hink_ joined #git
11:07 alcohol jack_thompson: sorry, statement does not compute.
11:07 jack_thompson alcohol so do i use git cvsimport to upload from CVS to github?
11:07 alcohol CausaMortis: sanity checks are always important.
11:07 alcohol cvsimport does not upload anything. i think the name already makes that quite clear.
11:08 Hink_ joined #git
11:08 jack_thompson or do i create an empty git repository and can import the latest changes in the CVS repository into it using git cvsimport.. and then normally commit it to github?
11:09 jack_thompson do do i just import the CVS directories into github too?
11:09 Gitzilla joined #git
11:09 rnsanchez joined #git
11:09 dsdeiz joined #git
11:09 aavrug joined #git
11:09 KnightsOfNi joined #git
11:09 traxo-xx joined #git
11:09 kaldoran joined #git
11:09 tristanp joined #git
11:09 shurnormal joined #git
11:09 AndreSomers joined #git
11:09 snits_ joined #git
11:09 LHL_Jordan joined #git
11:09 deltab joined #git
11:09 chid joined #git
11:09 BeerSerc joined #git
11:09 mrkake joined #git
11:09 siprbaum joined #git
11:09 mwleeds joined #git
11:09 gruetzkopf joined #git
11:09 SebastianFlyte joined #git
11:09 styler2go joined #git
11:09 jesk joined #git
11:09 EgS joined #git
11:09 jast joined #git
11:09 krabat joined #git
11:09 bond joined #git
11:09 gnoirzox joined #git
11:09 Soliton joined #git
11:09 Derega joined #git
11:09 forgot joined #git
11:09 lucz joined #git
11:09 NeverDie joined #git
11:10 lucz joined #git
11:10 jack_thompson so i want to use two different version control systems for the same codebase... CVS and git.. CVS localy.. and git for github...
11:10 alcohol just embrace git.
11:10 tobiasvl jack_thompson: why cvs?
11:10 jack_thompson alcohol just answer my question or don't talk to me
11:11 alcohol probably because he is hitting the retirement age soon and can't be arsed to learn something new :<
11:11 jack_thompson tobiasvl because
11:11 rnsanchez joined #git
11:11 tristanp joined #git
11:11 jack_thompson alcohol exactly
11:11 rscata joined #git
11:11 tobiasvl aight
11:11 CausaMortis lol
11:11 alcohol why don't you try finding a solution on altavista?
11:12 CausaMortis how can you not be willing to learn something new
11:12 CausaMortis why on earth would you work in IT then
11:12 CausaMortis lol
11:12 jack_thompson alcohol altavista is not online anymore
11:12 alcohol really?
11:12 alcohol gosh, what ever will you do now?
11:13 jack_thompson ask how i can use CVS and git simultaneously.. for the same codebase...
11:13 ToBeFree joined #git
11:13 jack_thompson because i think that is the purpose of this channel...
11:13 alcohol painfully, is the answer.
11:13 jack_thompson so what is this git cvsimport about? migration? or what /i/ want?
11:14 CausaMortis jack_thompson: doesnt this pretty much cover your question? https://git-scm.com/docs/git-cvsimport
11:14 alcohol whats about to suggest that, thanks CausaMortis
11:14 CausaMortis "Salvage your data out of another SCM people love to hate"
11:14 CausaMortis lol
11:15 jack_thompson i see... so my best bet to get what i want is to just import the CVS directories too... huh?
11:15 Lunatrius joined #git
11:15 alcohol jack_thompson: if that is what the documentation says
11:15 bremner jack_thompson: see also man git-cvsserver
11:15 gitinfo jack_thompson: the git-cvsserver manpage is available at http://jk.gs/git-cvsserver.html
11:15 vassagus joined #git
11:16 abra0 joined #git
11:16 mehola joined #git
11:16 bremner that lets you use CVS as a UI for data stored in git
11:17 jack_thompson git-cvsserver sounds like a good option.. i am still using CVS because it follows symbolic links.. i find that very convenient... -_-
11:17 jack_thompson alright... thanks!
11:17 mar77i joined #git
11:17 bremner well, don't be surprised if cvsserver breaks your favourite cvs feature
11:17 bremner emulators are like that
11:17 matthiaskrgr joined #git
11:18 jack_thompson bremner i guess i can use the normal cvs client with it... it's the client that follows my symbolic links.. so i should be fine...
11:19 ojdo joined #git
11:20 cdown joined #git
11:21 choki joined #git
11:21 thiago joined #git
11:22 Silenced joined #git
11:22 Silenced joined #git
11:23 jokajak joined #git
11:23 lorantalas joined #git
11:23 rbern joined #git
11:25 toydestroyer joined #git
11:25 7ITAAFWPN joined #git
11:27 vassagus joined #git
11:28 qpdb joined #git
11:31 thiago joined #git
11:32 jack_thompson left #git
11:32 mar77i joined #git
11:32 dsdeiz joined #git
11:33 toydestroyer joined #git
11:33 bejeb git branch -vv shows the remote tracking branches in blue, but my console is blue so I can't read them, how do I change that color setting for the remote branches in the square brackets?
11:35 ProbabilityMoon joined #git
11:35 star_prone joined #git
11:36 _ikke_ bejeb: git config color.branch.upstream <..>
11:36 _ikke_ (add --global)
11:36 bejeb _ikke_: trying it now
11:37 _ikke_ bejeb: Not sure, but this looks the closest
11:37 encod3 joined #git
11:40 joki- joined #git
11:40 roflin joined #git
11:40 vassagus joined #git
11:40 tilpner joined #git
11:41 * bejeb bejeb loves _ikke_
11:41 _ikke_ cool
11:41 _ikke_ What color format did you use?
11:41 bejeb git config --local color.branch.upstream yellow
11:42 tabrez joined #git
11:42 _ikke_ ok, just the name
11:42 dislore joined #git
11:42 _ikke_ --local means just for the current repo
11:42 ash_workz joined #git
11:43 bejeb yup, i was testing it first ;)
11:43 toydestroyer joined #git
11:43 _ikke_ ok
11:43 _ikke_ note that it's the default
11:43 bejeb _ikke_: seriously though, thanks you
11:43 _ikke_ so you can just leave it out
11:44 bejeb noted
11:44 bejeb thank you thank you thank you
11:44 _ikke_ :)
11:44 eduardas_m joined #git
11:46 milki joined #git
11:49 jceb joined #git
11:49 EduardoMartins joined #git
11:49 MattMaker joined #git
11:53 vassagus joined #git
11:53 rbern joined #git
11:54 daivyk joined #git
11:58 boushi joined #git
11:59 luke_penn joined #git
12:02 xaa joined #git
12:04 mohabaks joined #git
12:05 Wysi joined #git
12:06 vassagus joined #git
12:07 raijin joined #git
12:07 zeroed joined #git
12:08 jimi_ joined #git
12:09 radsy joined #git
12:09 bejeb as Homer Simpson would say ... stupid blue terminal windows
12:10 star_prone joined #git
12:14 _ikke_ :D
12:17 roflin joined #git
12:17 andlabs joined #git
12:17 toydestroyer joined #git
12:18 lorantalas joined #git
12:18 vassagus joined #git
12:20 rgrinberg joined #git
12:21 ochorocho__ joined #git
12:22 star_prone joined #git
12:22 jceb joined #git
12:26 toydestroyer_ joined #git
12:28 rgrinberg joined #git
12:28 Lunatrius joined #git
12:30 jeffreylevesque joined #git
12:30 GodGinrai joined #git
12:31 Raging_Hog joined #git
12:32 vassagus joined #git
12:35 irco joined #git
12:35 Silenced joined #git
12:35 Silenced joined #git
12:37 NwS joined #git
12:38 ProbabilityMoon joined #git
12:38 GavinMagnus left #git
12:38 jimi_sanchez joined #git
12:39 RodrigoEduardo__ joined #git
12:41 mohshami joined #git
12:42 dendazen joined #git
12:42 ProbabilityMoon joined #git
12:42 kyan joined #git
12:43 JeroenT joined #git
12:45 ahmedelgabri joined #git
12:46 achadwick joined #git
12:47 MattMaker joined #git
12:48 star_prone joined #git
12:49 danslo joined #git
12:49 zeroed joined #git
12:49 zeroed joined #git
12:51 ruskie joined #git
12:52 Gamecubic joined #git
13:00 guampa joined #git
13:00 kulelu88 joined #git
13:01 jaguarmagenta joined #git
13:01 DrEframSchweiger joined #git
13:02 hahuang65 joined #git
13:02 vassagus joined #git
13:03 viyky8 joined #git
13:04 berndl joined #git
13:04 thomas_25 joined #git
13:05 mokl joined #git
13:06 DrEframSchweiger left #git
13:07 Defcronyke joined #git
13:07 mokl hi, I got a question: if I'm on branch A and commit something, but then do 'git push -u origin B', what happens?
13:08 GodGinrai mokl: you create a branch on origin called B and set the upstream of local branch A to origin/B
13:08 GodGinrai it may give you an error if B already exists
13:09 mokl GodGinrai: thanks for your response. In this case B already existed but I don't seem to have received an error
13:09 DrEframSchweiger joined #git
13:09 _ikke_ That means origin/B was not diverged
13:10 PioneerAxon joined #git
13:10 dimi1947 joined #git
13:10 Defcronyke Hey, I've been noticing lately that when I work on the same file as someone else, sometimes after one of us pushes upstream and the other one pulls, not all the differences end up in conflicts, and still some differences are lost... this never used to happen
13:10 kyan joined #git
13:11 netj joined #git
13:11 _ikke_ Do you have an example?
13:11 Defcronyke I can't reliably reproduce
13:12 Defcronyke it happens sometimes, and we have to pull data from older commits to get the missing stuff back
13:12 lvns joined #git
13:12 mokl _ikke_: this is odd, because I clearly commited some changes, or am I missing something?
13:12 Defcronyke I am also not really a git expert, just a light user for some years now
13:12 ExoUNX joined #git
13:13 osse GodGinrai, _ikke_: If B also existed locally then it would push B to origin/B, right?
13:13 maroloccio joined #git
13:13 JamesBaxter joined #git
13:13 _ikke_ osse: not sure how -u affects what gets pushed
13:14 maroloccio how to: get files changes by last commit? git diff --name-only @~ ?
13:14 mokl I'm using beanstalkapp.com for this project and nothing at all showed (no commits)
13:14 mokl *showed up
13:15 jamick joined #git
13:15 DrEframSchweiger left #git
13:15 GodGinrai osse: not if you were on branch A locally
13:15 cdg joined #git
13:16 jaafar joined #git
13:16 GodGinrai -u just sets the upstream after the push
13:16 GodGinrai for the current branch
13:16 osse GodGinrai: the two things you just said contradict afaik
13:16 Raging_Hog joined #git
13:16 jwest joined #git
13:17 osse GodGinrai: git push origin B pushes B even if you're on A. That part I'm 91% sure of
13:17 vassagus joined #git
13:17 GodGinrai osse: where did I contradict?
13:18 osse hmm, maybe nothing
13:19 osse GodGinrai: depends on what branch you mean gets pushed
13:22 zeroed joined #git
13:23 GodGinrai osse: I meant the branch you are on gets pushed
13:24 osse That's a LIE!
13:25 osse I mean, from ym simple tests it seems to push what you specify. Haven't tried what happens if it doesn't exist
13:25 zorph joined #git
13:25 osse From my other simple test it seems that git sets the -u thingy for the branch you specify. Now let's see what happens if the local doesn't exist
13:26 osse "error: src refspec master does not match any."
13:27 ljc joined #git
13:27 GodGinrai "if the local doesn't exist" meaning?
13:28 osse GodGinrai: git checkout A; git branch -d B; git push origin B
13:28 MattMake_ joined #git
13:29 vassagus joined #git
13:29 zivester joined #git
13:31 GodGinrai and you're saying if B exists and you push from A, that B will get pushed and nothing will happen to A?
13:31 tvw joined #git
13:32 osse Yes, with extreme confidence and showmanship
13:33 crelix joined #git
13:34 osse said showmanship: https://asciinema.org/a/aehizg5huvj2lso03i7kz6txn
13:34 errr joined #git
13:35 phanimahesh joined #git
13:35 ahmedelgabri joined #git
13:37 GodGinrai if that is the case, that seems like a serious design flaw
13:37 notebox joined #git
13:37 berndl Why?
13:38 linuxmodder joined #git
13:39 _ikke_ GodGinrai: Note that you are specifying a refspec, with the full format is <src>:<destination>, where <src> defaults to HEAD
13:39 rnsanchez_ joined #git
13:39 GodGinrai _ikke_: yes, and if src is defaulting to HEAD, it should be the current branch being pushed
13:39 Seveas _ikke_: that's not quite true
13:39 _ikke_ GodGinrai: git push origin HEAD:B
13:40 Seveas it's destination that defaults to src@{upstream}
13:40 al-damiri joined #git
13:41 _ikke_ And what if there is no upstream?
13:41 tabrez joined #git
13:41 Seveas src
13:41 Seveas so git push origin master == git push origin master:[master@{u} if it exists, else master]
13:41 Seveas git push origin :master deletes the master branch remotely :-)
13:42 kpease joined #git
13:42 CausaMortis osse: alcohol: thanks guys. I was afraid I was doing something wrong but I still had my webserver ruining which cached some files that had been removed on master, causing some weird exceptions
13:42 CausaMortis running*
13:43 osse GodGinrai: src default to head, but in ''git push origin B'' git assumes you're overriding the default
13:43 osse it interprets B as the src and with the :dst part missing. Not as the dst with the src: par missing
13:44 griffindy joined #git
13:44 GodGinrai osse: as I said, that's a serious design flaw
13:45 osse at least it's documented!
13:45 Dougie187 joined #git
13:46 deadnull joined #git
13:46 osse I for one find it natural to specify what I want to push instead of specifying where I want to push to. But I think we can all agree I'm weirdo
13:46 Faylite joined #git
13:46 irqq joined #git
13:47 thesquib joined #git
13:48 sangy joined #git
13:49 lvns joined #git
13:50 a_thakur joined #git
13:51 robotroll joined #git
13:52 le_melomane joined #git
13:53 GavinMagnus joined #git
13:53 phaleth joined #git
13:54 GavinMagnus left #git
13:58 navidr joined #git
14:00 vassagus joined #git
14:01 e14 joined #git
14:03 boushi_ joined #git
14:05 vrishab joined #git
14:05 zacts joined #git
14:06 netj joined #git
14:07 up_the_irons2 joined #git
14:07 VagabondAzulien joined #git
14:09 ProbabilityMoon joined #git
14:09 ekinmur joined #git
14:10 hashpuppy joined #git
14:12 Kutgu joined #git
14:13 notebox joined #git
14:14 GavinMagnus joined #git
14:14 mizu_no_oto joined #git
14:14 deadnull_ joined #git
14:17 notebox joined #git
14:18 Munt joined #git
14:18 m_antis joined #git
14:19 mizu_no_oto joined #git
14:20 le_melomane joined #git
14:21 nettoweb joined #git
14:21 ResidentBiscuit joined #git
14:21 bagnz0r_ joined #git
14:22 ochorocho__ joined #git
14:24 shinnya joined #git
14:24 noidea joined #git
14:24 ioar joined #git
14:25 ruby_ joined #git
14:27 ShekharReddy joined #git
14:28 e joined #git
14:29 ochorocho__ joined #git
14:29 KnownSyntax joined #git
14:30 irqq !reflog
14:30 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
14:30 irqq !workflow
14:30 gitinfo Finding the right workflow for you is critical for the success of any SCM project.  Git is very flexible with respect to workflow.  See http://sethrobertson.github.c​om/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.
14:30 vassagus joined #git
14:31 sarbs joined #git
14:31 ash_workz joined #git
14:31 shmuli joined #git
14:32 zonality joined #git
14:33 tabrez joined #git
14:38 ldlework joined #git
14:38 ldlework joined #git
14:39 belak joined #git
14:39 harish joined #git
14:41 timthowtdi joined #git
14:42 infra-red joined #git
14:42 vassagus joined #git
14:42 CussBot joined #git
14:45 zorph2 joined #git
14:46 APic Ok
14:46 APic I messed up my Commit-Message
14:46 thomas joined #git
14:47 * APic typed: git commit -m "Grinsekatze addieren.  Kredite an „Sofia "G
14:47 APic oldkatze".  ☺"
14:47 grawity git commit --amend
14:47 APic Thanks!
14:47 APic *purrr*
14:47 lvns joined #git
14:47 APic That did it.
14:47 APic Great.
14:49 m_antis joined #git
14:49 VagabondAzulien joined #git
14:50 Munt joined #git
14:51 axisys joined #git
14:52 m_antis joined #git
14:54 thebloggu joined #git
14:54 kus joined #git
14:55 thebloggu joined #git
14:55 star_prone joined #git
14:55 thiago joined #git
14:55 vassagus_ joined #git
14:55 star_prone joined #git
14:55 jceb joined #git
14:56 JeroenT joined #git
14:56 m_antis joined #git
14:57 diogenese joined #git
14:58 clemf joined #git
14:58 vassagus joined #git
14:59 GavinMagnus left #git
15:00 morenoh149 joined #git
15:02 jaguarmagenta joined #git
15:03 hahuang65 joined #git
15:04 choki joined #git
15:04 vassagus joined #git
15:05 BackEndCoder joined #git
15:06 dimi1947 joined #git
15:06 emg joined #git
15:06 rkazak joined #git
15:06 snowkidind joined #git
15:07 m_antis joined #git
15:09 vassagus joined #git
15:10 chid joined #git
15:10 boushi_ joined #git
15:10 ash_workz joined #git
15:11 l4v2 joined #git
15:12 SirFunk joined #git
15:12 zorph joined #git
15:13 zonality joined #git
15:14 fugiman joined #git
15:16 dreiss joined #git
15:16 abyx joined #git
15:18 mohabaks joined #git
15:20 jumpman joined #git
15:21 Munt joined #git
15:22 fugiman joined #git
15:22 SirFunk joined #git
15:23 CausaMortis joined #git
15:24 ekinmur joined #git
15:24 vassagus joined #git
15:26 e14_ joined #git
15:26 chrisshattuck joined #git
15:27 zivester joined #git
15:27 bryznsty joined #git
15:28 mikecmpbll joined #git
15:28 leeN joined #git
15:29 bryznsty Hey! I'm trying to figure out how to clone an push stuff to a repo with ssh - but I cant seem to find a straightforward guide can someone point me in the right direction
15:29 crose joined #git
15:29 bryznsty I've already set up my ssh keys
15:29 ratiotile__ joined #git
15:30 dmto joined #git
15:30 cdown_ joined #git
15:30 CausaMortis joined #git
15:31 _ikke_ At what part are you stuck?
15:32 vigilvindex joined #git
15:33 tilpner joined #git
15:33 bryznsty I copy the "Clone with SSH" text but I just get ssh: Could not resolve hostname
15:33 vassagus joined #git
15:34 atomicb0mb joined #git
15:34 thomas_25 joined #git
15:36 CausaMortis joined #git
15:37 ratiotile_ joined #git
15:37 subhojit777 joined #git
15:40 _ikke_ What is the clone url you use?
15:41 nettoweb joined #git
15:41 madewokherd joined #git
15:41 bryznsty git@github.com:bryznasty/bryznasty.github.io.git
15:41 subhojit_ joined #git
15:42 actinide joined #git
15:42 jim joined #git
15:43 jim hi, I think there might be tags on a project I just cloned, but git tag -l has no output... how do I get the tags that are on the upstream origin repo?
15:43 robotroll joined #git
15:44 _ikke_ jim: tags are automatically fetched, so if it does not list them, the project probably does not have tags
15:45 rbr joined #git
15:46 ratiotile__ joined #git
15:47 subhojit_ joined #git
15:47 jim ok... going back one step... this is a java project I downloaded, and I'm getting lots of errors... so I suspect the head branch is ahead of the latest "stable" commit by several commits... I -just- became aware of this project, and I'm aware it has several stable versions going back... so would there be something that might refer to the commit I want (latest stable)?
15:49 sssilver joined #git
15:50 sssilver_ joined #git
15:51 leeN joined #git
15:52 zeroed joined #git
15:52 zeroed joined #git
15:55 rbr joined #git
15:56 tilpner joined #git
15:57 xelxebar joined #git
15:57 GavinMagnus joined #git
15:58 GavinMagnus left #git
15:59 vassagus_ joined #git
15:59 marc_v92 joined #git
16:00 chrisshattuck joined #git
16:00 subhojit_ joined #git
16:02 diogenese joined #git
16:02 d0nn1e joined #git
16:03 subhojit__ joined #git
16:03 Nevik joined #git
16:04 zacts joined #git
16:05 linuxmodder joined #git
16:05 dunpeal joined #git
16:06 dunpeal Hey, gitsters!  What do you do to save typing when you have to frequently jump between different branches?
16:07 notebox joined #git
16:07 Ryanar joined #git
16:08 Ryanar I made a few commits to a detached head, when I checked out my master branch it told me that if I didnt want to lose those commits I should create a new branch for them
16:08 Ryanar how can I put those commits into the new branch?
16:08 vassagus joined #git
16:09 _ikke_ dunpeal: How often?
16:09 _ikke_ (git worktree is a recent thing if you need multiple branches checked out)
16:09 Noldorin joined #git
16:10 pikajude joined #git
16:10 pikajude joined #git
16:10 kadoban joined #git
16:11 nitric joined #git
16:11 FirewalkR joined #git
16:11 dunpeal _ikke_: often enough that ti's annoying to type the full branch name, and retype in case of any error.
16:12 nedbat dunpeal: install tab-completion
16:13 dunpeal yeah, I'm looking for some sort of partial match
16:13 MattMaker joined #git
16:13 bruce_lee joined #git
16:13 bruce_lee joined #git
16:14 romerocesar joined #git
16:14 sssilver joined #git
16:15 dunpeal joined #git
16:15 dunpeal Sorry, disconnected
16:15 dunpeal nedbat: URL for the specific tab-completion you meant?
16:15 CussBot joined #git
16:15 dunpeal I was looking for some sort of partial-match support.
16:16 dunpeal joined #git
16:16 dunpeal Sorry, disconnected again.
16:17 irqq !lol
16:17 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
16:17 rbr joined #git
16:18 Jellyg00se joined #git
16:18 nedbat dunpeal: not sure where I got this from originally, but I haven't modified it: https://github.com/nedbat/dot/​blob/master/.git-completion.sh
16:19 vassagus joined #git
16:21 e14 joined #git
16:23 Awhn4 joined #git
16:23 dunpeal nedbat: thanks. you got it from here: https://github.com/git/git/blob/master/​contrib/completion/git-completion.bash
16:23 nedbat dunpeal: that looks right!
16:24 sssilver_ joined #git
16:24 inflames joined #git
16:25 dunpeal I'd actually rather partial-completion to tab-completion. Maybe I should write my own. Is there a way to just get a list of branches (separated by LF or NULL or whatever)?
16:25 dunpeal Without any whitespace or asterisk.
16:25 nedbat dunpeal: thanks, comparing what is new, I see they have instructions for the main thing I was missing: completions for aliases!
16:26 LionsMane joined #git
16:26 Balliad joined #git
16:27 subhojit__ joined #git
16:28 Noldorin joined #git
16:29 sssilver joined #git
16:31 ratiotile joined #git
16:31 tabrez joined #git
16:31 BSAlb joined #git
16:32 zorph left #git
16:33 subhojit_ joined #git
16:35 tyreld joined #git
16:36 BackEndCoder joined #git
16:37 durham joined #git
16:37 zacts_pi joined #git
16:37 ferr joined #git
16:38 dreiss joined #git
16:39 Munt joined #git
16:41 kyan joined #git
16:43 fahadash joined #git
16:44 tabrez joined #git
16:44 encod3 joined #git
16:45 ferr joined #git
16:48 tabrez left #git
16:49 sanketdg joined #git
16:50 ruby_ joined #git
16:50 subhojit__ joined #git
16:50 ukke joined #git
16:50 MattMaker joined #git
16:51 fakenerd joined #git
16:51 Electrometro joined #git
16:52 danslo joined #git
16:53 ruby_ joined #git
16:56 vassagus joined #git
16:57 subhojit_ joined #git
16:58 ferr joined #git
16:59 slayerjain joined #git
17:01 subhojit__ joined #git
17:01 mira|AO joined #git
17:01 mira|AO what is “tag” in the description of git ls-files -s ?
17:01 mira|AO it’s shown as optional, but never explained
17:01 mira|AO also, not clear when it is present
17:02 mira|AO (trying to write scripts parsing its output…)
17:02 jaguarmagenta joined #git
17:03 davis joined #git
17:03 davis hello
17:03 govg joined #git
17:03 davis i have seen nested git repots before, but when I try to do it. its not working.
17:04 hahuang65 joined #git
17:04 davis is there something which needs to be done special for this to work?
17:05 sangy davis: nested? as in a submodule?
17:05 sangy !man git submodule
17:05 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
17:05 gitinfo the git-submodule manpage is available at http://jk.gs/git-submodule.html
17:06 davis sangy: not really a submodule but maybe since its not a submodule that is my problem.
17:06 davis i was just trying to clone a second repot in a subdir.
17:06 sangy davis: could you show me an example?
17:06 davis yes
17:07 davis i have repot in ~/foo. i have created a dir ~/foo/goo. in goo I tried to do $git clone moo. and it failed.
17:08 davis i was hoping to have ~/foo/goo/moo as the sub git tree.
17:08 sangy davis: why does it fail? what error do you get?
17:08 davis bad key when I clone using ssh
17:09 davis perhaps I need to check my key, but I was certain I had uploaded it to that repot.
17:09 Darcidride joined #git
17:09 nydel07 joined #git
17:09 davis maybe not
17:09 davis i create a top lvl dir to clone it in, and it fails with same msg
17:10 subhojit777 joined #git
17:10 sangy davis: Yeah, that seems like it. Good luck! :)
17:11 davis yes, indeed that is all it is. lol, i guess i never did the add or I deleted it a while back.
17:11 clemf_ joined #git
17:12 clemf_ joined #git
17:14 Sasazuka__ joined #git
17:14 mingrammer joined #git
17:15 marc_v92 joined #git
17:15 Ryanar joined #git
17:16 subhojit777 joined #git
17:16 trimosier joined #git
17:19 e joined #git
17:19 subhojit_ joined #git
17:20 terminal_echo joined #git
17:20 vassagus joined #git
17:20 marvi joined #git
17:21 cagmz joined #git
17:24 Lynxium joined #git
17:24 shgysk8zer0 joined #git
17:24 satbyy joined #git
17:24 satbyy joined #git
17:26 VagabondAzulien joined #git
17:26 BackEndCoder joined #git
17:27 MattMaker joined #git
17:27 ferr joined #git
17:28 subhojit_ joined #git
17:31 abyx joined #git
17:33 clemf joined #git
17:34 dviola joined #git
17:34 McNozes joined #git
17:38 waht joined #git
17:39 ritamcastro joined #git
17:39 clemf joined #git
17:40 Groovie joined #git
17:41 Groovie left #git
17:43 QwertyDragon joined #git
17:45 emg joined #git
17:45 subhojit777 joined #git
17:47 BackEndCoder joined #git
17:47 runlevl4 joined #git
17:48 Douhan joined #git
17:49 yoh joined #git
17:50 yoh git 2.9.3 -- if I have a subdir with another git repo, and then do 'git add .; git commit -m xxx' - git does make a commit marking tht subdir as a submodule, but no record added to .gitmodules, which renders subsequent interactions with git faulty
17:51 yoh detail/demo:  https://github.com/datalad/dat​alad/pull/752/files#r77385729
17:52 yoh I would have expected git to at least add a record without url to .gitmodules, or even with url with a relative path... but it does nothing -- "feature" or a bug?
17:53 danslo joined #git
17:53 chrisshattuck joined #git
17:54 Gurkenglas joined #git
17:54 raijin joined #git
17:54 multi_io joined #git
17:54 Douhan left #git
17:57 AnarchyAo joined #git
17:57 rafalcpp joined #git
17:57 subhojit_ joined #git
17:59 spudowiar joined #git
18:00 mira|AO oh well, I’m just assuming (in https://github.com/mirabilos/git-find for those curious) that this “tag” is never present, and check the input format for this assumption nevertheless
18:01 subhojit__ joined #git
18:01 Gianormagantrous joined #git
18:03 choki joined #git
18:03 dbe joined #git
18:04 MattMaker joined #git
18:06 blackwind_123 joined #git
18:09 Seveas yoh: you'll need to use git submodule add. Feature, not bug. You can have sub-repos without using the submodule machinery.
18:09 tgunr joined #git
18:09 mingrammer joined #git
18:10 stompylee joined #git
18:10 yoh Seveas: well -- git add does add it as a submodule (if I got it right)
18:11 fiddlerwoaroof joined #git
18:11 Seveas mira|AO: ls-files -s doesn't show any 'tag', that's what -t does, and the description (and deprecation notice) is there
18:11 Seveas yoh: not unless you do git submodule add
18:11 yoh git log says that it was added as a subproject
18:11 yoh so could there be a subproject without being a submodule?
18:12 Seveas subproject is the generic name. git-submodule is the usual way of dealing with such subprojects but it's not required
18:12 ToBeCloud joined #git
18:13 yoh So git submodule should not complain if it sees a subproject which is not a submodule?
18:13 Seveas all you did was add a commit to a tree and commit that addition. a 'submodule' is really nothing more than a mapping of a repo to a path, so people who fetch the outer repo know where to find the inner one
18:14 Seveas not sure if git-submodule will complain. I avoid submodules like the plague, as they're nothing but problems.
18:14 subhojit_ joined #git
18:14 yoh I have got that distinction... it does complain as you can see in  https://github.com/datalad/dat​alad/pull/752/files#r77385729
18:14 astrofog joined #git
18:14 Ryanar joined #git
18:15 terminal_echo joined #git
18:15 Seveas oh well, time to add that mapping top .gitmodules then
18:15 duderonomy joined #git
18:15 Seveas s/top/to/
18:16 yoh that is my point -- shouldn't such mapping be added automatically by 'add'?
18:16 Seveas no
18:16 Seveas git submodule add will do it
18:16 Seveas git add doesn't care about how you manage subprojects.
18:17 yoh then 'add' should've not done it... that is my point -- one user-level API command doesn't care about consequnces for another
18:17 yoh are those "subprojects" used for anything else but "submodules" ?
18:17 Seveas what should add not have done?
18:18 Seveas add did what you told it to, add a subproject to the index.
18:18 subhojit__ joined #git
18:18 yoh should have not added a  subproject
18:18 fiddlerwoaroof joined #git
18:18 Seveas then you'll never be able to add it (submodule add does git add, and then manages .gitmodules)
18:19 VagabondAzulien joined #git
18:19 yoh Seveas: ah...   also git grep'ing through git source -- so  subprojects also used for subtrees? (haven't used that feature yet)
18:20 Seveas no, git-subtree is a way to *avoid* having subprojects :)
18:21 yoh I guess then confusion is in semantics since description of subtree uses word 'subproject' as well
18:23 Seveas yeah, that's confusing indeed
18:24 armin joined #git
18:27 spudowiar joined #git
18:29 Noldorin joined #git
18:29 crayon joined #git
18:30 mikecmpbll joined #git
18:30 sssilver joined #git
18:31 yoh I wonder how many ppl use subtree for anything ... tried on my repo and do not see what changed (I do see some new objects created, and lots of ones under .git/subtree-cache, but otherwise everytghing is the same...)
18:32 wwalker is there a way to git "git rebase -i ..." to show the committer in the list of commits?
18:33 cagedwisdom joined #git
18:33 _ikke_ wwalker: I don't thinkg so
18:34 _ikke_ think
18:34 yoh or could pretty much filter history for a subdir into a separate branch... still do not see how subtree helps to maintain collection of repositories as submodule mechanism does :-/
18:34 chrisshattuck joined #git
18:34 subhojit_ joined #git
18:34 clemf_ joined #git
18:35 yoh or probably just 'subtree split' is not sufficient for that "conversion" on its own (although talks about commit msg etc)
18:36 Seveas yoh: 'maintaining a collection of repositories' is not what either submodule or subtree are for. What are you trying to achieve?
18:37 wwalker _ikke_: thanks - turns out there is.  I set rebase.instructionFormat in my .gitconfig to "%an - %s"  I just searched poorly the first time.  stackoverflow :-)
18:37 _ikke_ wwalker: ah, that must be something new :-)
18:38 yoh Seveas: ok -- I think I got subtree mech going...   re collection -- depends on the 'definition' ;)    as for an example see http://datasets.datalad.org/
18:38 clemf joined #git
18:38 Seveas _ikke_: about a year old, 2.6
18:39 erguven joined #git
18:39 hahuang65 joined #git
18:39 yoh indeed subtree mechanism doesn't rely on 'Subprojects', which thus remain solely a mechanism for submodules
18:40 yoh so I really do not see why then 'add' should add a Subproject but leave it to 'submodule' to really "define".
18:40 _ikke_ Seveas: :-/
18:40 yoh not quite a "feature" if you as me ;)
18:40 yoh but ok -- we can workaround indeed
18:44 Guest94942 joined #git
18:44 Guest94942 joined #git
18:44 alex88 joined #git
18:45 peepsalot joined #git
18:45 subhojit__ joined #git
18:46 nettoweb joined #git
18:47 abyx joined #git
18:47 Spinkzeit joined #git
18:48 cdown joined #git
18:48 Ryanar joined #git
18:50 joki- joined #git
18:50 choki joined #git
18:51 cagedwisdom left #git
18:56 alex88 I had a branch, I rebased on another branch, I know that the resolve mine-theirs is reversed between merge and rebase, I did a resolve mine, to solve using the other branch version, but it not only resolved the conflict, it also used the whole file of the other branch, so also removed my non-conflicting changes
18:56 alex88 is my assumption correct? just so next time I'm gonna resolve manually :D
18:57 cdown joined #git
18:58 canton7 yep, that's what checkout --ours / --theirs does
18:58 canton7 checks our our/their version of the time
18:58 canton7 *of the file
18:58 renlo joined #git
18:59 shmuli joined #git
18:59 zacts joined #git
19:00 e14 joined #git
19:01 rbr joined #git
19:01 renlo I want to revert a change that was pushed to a remote master; I checked out a previous commit and have made the necessary changes. Because I made the changes to a previous commit than origin's head, I have a feeling it will still keep the old changes
19:01 danslo joined #git
19:01 renlo how do I make it use the reversions?
19:02 ayjay joined #git
19:03 jaguarmagenta joined #git
19:03 katherine joined #git
19:04 renlo anyone?
19:05 l4v2 joined #git
19:05 _ikke_ What do you want the end result to be?
19:06 subhojit_ joined #git
19:06 alex88 canton7: oh, it's a full checkout of the other/mine file.. gotcha!
19:06 alex88 thanks
19:08 renlo _ikke_: I wanted it to be reversion + a change. I realized I was doing it a weird way and just did git revert for that commit, then a new commit with the additional changes
19:09 VagabondAzulien joined #git
19:10 courrier joined #git
19:11 irqq joined #git
19:11 nydel07 joined #git
19:11 e14 joined #git
19:12 morenoh149 joined #git
19:14 boushi joined #git
19:14 robotroll joined #git
19:15 vassagus joined #git
19:16 mohabaks joined #git
19:17 subhojit__ joined #git
19:20 cyan__ joined #git
19:24 jaguarmagenta joined #git
19:25 shurnormal joined #git
19:25 astrofog joined #git
19:25 mingrammer joined #git
19:26 vassagus joined #git
19:34 sssilver joined #git
19:34 dsdeiz joined #git
19:34 dsdeiz joined #git
19:35 subhojit_ joined #git
19:38 actinide joined #git
19:39 subhojit__ joined #git
19:42 subhojit_ joined #git
19:42 actinide joined #git
19:43 EduardoMartins1 joined #git
19:43 stasmakarov joined #git
19:44 boushi_ joined #git
19:44 m0viefreak joined #git
19:44 nettoweb joined #git
19:45 dendazen joined #git
19:45 subhojit__ joined #git
19:46 shmuli joined #git
19:49 chrisshattuck joined #git
19:51 _ng joined #git
19:51 jeffreylevesque joined #git
19:53 vassagus joined #git
19:53 annoymouse joined #git
19:54 JanC joined #git
19:55 subhojit_ joined #git
19:56 bmbouter joined #git
19:57 bmbouter hello wonderful git folks
19:58 bmbouter branch 3.0-dev was created from branch master a few weeks ago
19:58 JanC joined #git
19:58 bmbouter I merge branch master into 3.0-dev locally and there is 1 modify/delete conflict
19:59 bmbouter I resolve it with a `git rm /path/to/file` because on 3.0-dev it's right to have it deleted
19:59 bmbouter before pushing my chance a co-worker wants to see it (totally makes sense)
19:59 bmbouter s/chance/change/
20:00 bmbouter how can I show him how I resolved the conflict?
20:00 bmbouter I read this:  http://haacked.com/archive/2014​/02/21/reviewing-merge-commits/
20:00 Mobutils joined #git
20:01 bmbouter so I tried `git show dd82610` but it just shows me the merge message
20:01 _ikke_ bmbouter: git diff has a -c and a -cc mode, exactly meant to diff merges
20:01 bmbouter but when I commited it I saw a block that showed me the file where the conflict was
20:01 Seveas bmbouter: push it to a new branch and show him that branch
20:02 Seveas that block about the conflicts was in the comments section, which isn't actually part of the commit
20:02 bmbouter I did push it here as a new branch
20:02 bmbouter https://github.com/pulp/pulp_rpm/pull/975
20:02 subhojit_ joined #git
20:02 bmbouter Seveas: ok that answers my first quesiton then
20:02 boombatower joined #git
20:03 bmbouter my commit is at the bottom of all those other commits, the only thing interesting there (for me) is the very last merge commit
20:03 Noldorin joined #git
20:04 bmbouter the article also references -c and -cc but I think it wants the two branches to diff and I keep wanting to inspect the merge which already has all that info
20:05 asmacdo joined #git
20:05 Seveas git show -c sha1-of-merge
20:06 bmbouter thanks, so that shows me this  https://paste.fedoraprojec​t.org/420069/47284676/raw/
20:06 bmbouter but I still can't see the `git rm` that I used for conflict resolution in there
20:07 bmbouter is this a special case because I resolved a modify/delete conflict?
20:08 qws-user-1229 joined #git
20:08 subhojit_ joined #git
20:08 drizztbsd joined #git
20:09 stickperson joined #git
20:09 bmbouter perhaps if there was another type of conflict which I had to resolve it would show?
20:09 stickperson i tagged and push commit A with tag A. since then i made commits B and C. can i go back to A and give that another tag?
20:10 cdg joined #git
20:10 sssilver joined #git
20:10 bmbouter stickperson: you could add a new tag pointing at commit A yes
20:10 bmbouter you could also delete tag A if you don't want it anymore
20:11 stickperson bmbouter: how can i add an additional tag?
20:11 Seveas stickperson: git tag name-of-tag sha1-of-A
20:11 stickperson thanks :)
20:11 Seveas bmbouter: hm. git diff refs/pull/975/head^2 refs/pull/975/head does show it
20:12 Seveas but I'd expect it to show up in 'git show -c refs/pull/975/head' as well. Puzzled.
20:12 bmbouter me too
20:12 subhojit__ joined #git
20:13 diphtherial joined #git
20:13 bmbouter Seveas: that did show it for me too
20:13 bmbouter bug maybe?
20:13 * bmbouter lives in a world where git doesn't have bugs
20:13 kbs heh
20:13 Seveas not sure. I like my merges clean, so I never do evil merges like this.
20:13 diphtherial hey, any of you happen to know why git for windows' shell freezes up for a few seconds when i attempt to tab-complete, or why tab completion isn't case sensitive?
20:14 diphtherial (if this isn't the right place for support for it, my apologies; i have no idea where else to ask)
20:14 Seveas diphtherial: my guess would be: slow disk, and windows isn't case sensitive, so the tab completion isn't.
20:14 diphtherial Seveas: i'm using an SSD, so that's surprising
20:14 bmbouter Seveas: how could we do this better?
20:14 Seveas diphtherial: there's a git-for-windows thing on gitter where some of the gfw folk hang out. If nobody gives you a better answer in here, maybe try there
20:14 bmbouter I'm always interested in imprvoement
20:15 diphtherial Seveas: ah, thanks, that's helpful
20:15 Seveas bmbouter: 'evil merge' wasn't a qualitative statement, that's just the name given to merges that do more than just merge in a branch (so anything with a conflict by definition is evil)
20:16 Seveas I avoid that by rebasing branches before merging (and often just fast-forwarding after rebase)
20:16 bmbouter so the example would be, rebase 3.0-dev onto master and then merge master into 3.0-dev
20:16 Munt joined #git
20:17 Seveas no
20:18 _ikke_ Seveas: How do you handle conflicts then?
20:18 _ikke_ ah
20:18 Seveas the rebasing thing isn't useful for long lived side branches like yours, kinda forgot that bit
20:18 Seveas it's more for feature branches
20:19 bmbouter yeah that makes sense
20:19 Seveas _ikke_: the rebase will force me to deal with them.
20:19 bmbouter I couldn't do that for the reason that the branch is shared with many other so my rebase won't work
20:19 Seveas exactly
20:19 Seveas I try to avoid such split brain development
20:19 bmbouter yes
20:19 bmbouter alright well I'm satisfied that I'm not completely missing something
20:20 Seveas maybe you're missing a drink because you're on IRC instead :)
20:20 bmbouter rotfl
20:20 bmbouter so true
20:20 bmbouter Seveas you've helped me once before too
20:20 subhojit__ joined #git
20:20 bmbouter Seveas++
20:20 bmbouter thank you
20:23 jimi_ joined #git
20:23 _ikke_ Seveas: Yeah, should've read ahead first :P
20:25 shgysk8zer0 joined #git
20:26 dsantiago joined #git
20:27 Topic for #git is now Welcome to #git, the place for git help and post-reductionist industrial exuberance | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Be careful when rewriting history. It may push you to use the dark side of the --force
20:28 Seveas git push -f Eugene
20:28 Eugene was kicked by Eugene: Overwritten ref
20:28 Eugene joined #git
20:29 Surfer2010_ joined #git
20:29 BSaboia joined #git
20:29 diogenese joined #git
20:29 shmuli joined #git
20:30 MaddHatter I don't suppose there's been any work on git cvsimport? Last I used it (around early 1.* days), it didn't work all that well.
20:30 Eugene man git-fast-import
20:30 gitinfo the git-fast-import manpage is available at http://jk.gs/git-fast-import.html
20:31 Eugene I *believe* (never done it) that you can use that to slurp up a CVS repo
20:31 Eugene But I'm a big fan of skipping the !import
20:31 gitinfo Importing lots of revisions from other VCSes(via git-svn in particular) can take a long time. If this will be a one-time switch you should consider "throwing out" all of your old history and making a simple initial commit from a tarball.
20:32 _ikke_ Seveas: Did you try to apply Dscho's patches?
20:32 vassagus joined #git
20:32 Seveas _ikke_: the ones I reviewed? No. I only looked at them.
20:33 _ikke_ ok
20:33 _ikke_ Trying to apply them, but 3rd series seem to conflict
20:33 _ikke_ 4th I mean
20:33 Seveas could be, I don't see tehm being merged any time soon, he'll need to reroll them post-2.10
20:33 _ikke_ Right
20:34 _ikke_ Just tried to apply them to get more context on the code
20:34 meLon joined #git
20:34 Seveas he does say which commits they're all based on, and you can also simply fetch them
20:38 marcelofr joined #git
20:40 marcelofr Hi!, I'm running a centos 6 cluster (6 nodes, shared storage) and I want to create a virtual network shared among nodes but I failed finding a howto... any hints?
20:41 jaguarmagenta joined #git
20:41 madewokherd I don't know what that means, but it doesn't sound like a git question
20:42 renlo joined #git
20:43 sssilver joined #git
20:43 bsanford joined #git
20:44 nwkj86 joined #git
20:44 nidr0x joined #git
20:45 davis left #git
20:45 marcelofr sorry... wrong chat!!!
20:45 WhiskerBiscuit joined #git
20:48 Eugene marcelofr - #openvpn is a good place to start
20:48 Eugene Or ##networking, I think it is?
20:49 vuoto joined #git
20:49 watabou joined #git
20:50 vassagus joined #git
20:51 dendazen joined #git
20:51 cdg joined #git
20:52 DoITCreative joined #git
20:53 mingrammer joined #git
20:56 WhiskerBiscuit left #git
20:57 clemf_ joined #git
20:57 BackEndCoder joined #git
20:57 bmbouter left #git
20:57 crayon joined #git
20:59 Dougie187 left #git
21:01 up_the_irons joined #git
21:01 renlo joined #git
21:01 vassagus joined #git
21:02 danslo joined #git
21:03 _ikke_ Seveas: Do you know where is_rebase_i is defined? I cannot find it in any of the patch series
21:03 blackwell joined #git
21:06 _ikke_ I think it's missing
21:06 _ikke_ I only see a patch that changes the body (the one that is conflicting)
21:07 LeBlaaanc joined #git
21:08 Seveas the mailed-in series defined it as IS_REBASE_I
21:08 falkenb0t joined #git
21:09 _ikke_ Yeah, but one of the patches already builds on the implementation
21:10 _ikke_ https://public-inbox.org/git/5ffec2e58​8a4edc4902e1ab3a2ec3a73a7c3625b.147263​3606.git.johannes.schindelin@gmx.de/
21:10 terminal_echo joined #git
21:11 vassagus_ joined #git
21:14 clemf joined #git
21:15 maroloccio joined #git
21:17 rnsanchez_ joined #git
21:19 thiago joined #git
21:20 romerocesar joined #git
21:20 dreiss joined #git
21:22 romerocesar joined #git
21:24 sssilver joined #git
21:25 falkenb0t left #git
21:26 falkenb0t joined #git
21:27 Sasazuka__ joined #git
21:29 newbiee joined #git
21:29 SwiftMatt joined #git
21:31 chrisshattuck joined #git
21:32 chrisshattuck joined #git
21:33 falkenb0t left #git
21:34 crayon joined #git
21:35 jaguarmagenta joined #git
21:35 vF3hNGxc47h8 joined #git
21:37 chrisshattuck joined #git
21:39 andlabs joined #git
21:39 thiago joined #git
21:39 Caelum joined #git
21:41 crayon joined #git
21:41 crayon joined #git
21:41 Vivekananda joined #git
21:41 chrisshattuck joined #git
21:42 sssilver joined #git
21:43 sgen joined #git
21:43 chrisshattuck joined #git
21:44 shmuli_ joined #git
21:45 GavinMagnus joined #git
21:47 chrisshattuck joined #git
21:48 mingrammer joined #git
21:49 rbern joined #git
21:51 star_prone joined #git
21:52 chrisshattuck joined #git
21:53 QwertyDragon joined #git
21:54 eycsigfy joined #git
21:55 stickperson joined #git
21:56 madewokherd joined #git
21:57 shmuli joined #git
22:00 stomplee joined #git
22:03 hecliunyx joined #git
22:07 shmuli joined #git
22:10 holodoc joined #git
22:12 shmuli joined #git
22:18 Furio joined #git
22:18 Furio left #git
22:20 sssilver joined #git
22:20 justanotheruser joined #git
22:21 AlgorithmWizard joined #git
22:22 AlgorithmWizard say I want to exclude /root/node_modules, but want to include other node_module folders such as: /root/built/commander/node_modules, /root/built/d3/node_modules
22:22 AlgorithmWizard how would I do so?
22:22 armyriad joined #git
22:24 romerocesar joined #git
22:24 Electrometro joined #git
22:28 Esya joined #git
22:28 AlgorithmWizard got it... just excluded root directory by using /node_modules
22:29 constant joined #git
22:30 Noldorin joined #git
22:30 miklcct joined #git
22:30 actinide joined #git
22:33 safe joined #git
22:38 shaggycat joined #git
22:38 zacts joined #git
22:40 tvw joined #git
22:42 mingrammer joined #git
22:44 kbs left #git
22:46 GavinMagnus left #git
22:57 ASOLAr joined #git
22:59 Esya joined #git
22:59 spudowiar joined #git
23:01 Esya joined #git
23:02 DieguezZ joined #git
23:02 danslo joined #git
23:03 kulelu88 joined #git
23:03 WhiskerBiscuit joined #git
23:03 NeXTSUN joined #git
23:05 Noldorin how can I do `sudo -u foo git ...` but not get it to read SSH config from the wrong place?
23:06 rossome joined #git
23:08 romerocesar joined #git
23:10 paulh_ joined #git
23:12 neilthereildeil joined #git
23:13 neilthereildeil hey guys, i generated a patch with "git diff > myPatch"
23:13 neilthereildeil how can i apply it to the same tree?
23:16 avar !apply
23:16 avar damnit
23:16 avar git help appl
23:16 avar git help apply
23:17 fungal joined #git
23:17 ratiotile_ joined #git
23:18 bremner you know this isn't your shell, right?
23:18 bremner or were you trying for man git-apply
23:18 gitinfo the git-apply manpage is available at http://jk.gs/git-apply.html
23:22 neilthereildeil also,
23:23 neilthereildeil after I git fetch and go to newer commits, why is head detached?
23:23 neilthereildeil i checked out FETCH_HEAD
23:24 neilthereildeil oh crap i just deleted my code review of the last 2 days by doing git checkout...
23:24 neilthereildeil is any of this stuff save in reflogs or something?
23:26 bremner how did you delete something with checkout? did you use checkout -f?
23:26 neilthereildeil yea
23:26 neilthereildeil i did "git diff > patch" and then checkout -f
23:26 neilthereildeil turns out patch was empty
23:27 neilthereildeil any way i can recover my work?
23:29 neilthereildeil or is it totally gone?
23:29 bremner the reflog only knows about commits
23:29 neilthereildeil damn
23:30 neilthereildeil maybe i should start committing all my code reviews to my local tree as branches off the commit that i reviewed
23:30 joki- joined #git
23:30 neilthereildeil so ill have a tree where every so often, ill have a commit that i pulled, with a little branch of length 1 that contains my code review
23:30 neilthereildeil so i can also keep track of the review
23:31 bremner sure, why not.
23:31 neilthereildeil after I git fetch and go to newer commits, why is head detached?
23:33 boushi joined #git
23:34 cdg joined #git
23:39 neilthereildeil how can i make the remote FETCH_HEAD commits part of my tree's lineage?
23:40 ASOLAr joined #git
23:40 star_prone joined #git
23:43 bruce_lee joined #git
23:44 bremner make a local branch?
23:47 neilthereildeil bremner:  I want to make it as if the remote commits happened in my repo
23:47 neilthereildeil because i am not writing the code. i am just reviewing it
23:47 bremner git checkout -b local_branch FETCH_HEAD
23:47 bremner voila, head is not detached.
23:48 skylite_ joined #git
23:49 shmuli joined #git
23:50 MattMaker joined #git
23:50 LeBlaaanc joined #git
23:50 BSAlb joined #git
23:51 boushi_ joined #git
23:56 ASOLAr joined #git

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