Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-01

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

All times shown according to UTC.

Time Nick Message
00:08 MaggieC joined #git
00:10 shgysk8zer0 joined #git
00:11 qpdb joined #git
00:11 RedNifre_ joined #git
00:12 mmlb joined #git
00:22 mwhooker joined #git
00:26 vbsales joined #git
00:34 romerocesar joined #git
00:37 dreiss joined #git
00:37 fracting joined #git
00:38 fstd_ joined #git
00:49 ochorocho__ joined #git
00:49 raven-au joined #git
00:52 cqi joined #git
00:54 rominronin joined #git
00:55 fuchstronaut joined #git
00:57 Literphor joined #git
01:00 mmlb_ joined #git
01:01 rgrinberg joined #git
01:02 ekinmur joined #git
01:02 mmlb joined #git
01:03 ag4ve joined #git
01:04 ag4ve how do I put all commits associated with files in a directory into a new branch?
01:04 snowkidind joined #git
01:05 romerocesar joined #git
01:05 tesuji joined #git
01:06 ag4ve I'm guessing some filter-branch incantation, but IDK and my googlefu isn't finding anything
01:07 raven-au joined #git
01:10 zaherdirkey am i in wrong way or subtree not my target, http://pastebin.com/LjRrhjQF
01:11 zaherdirkey i want to make local folder UsbKeyboard and work on it, i dont all of the repo
01:11 zaherdirkey *i dont want
01:11 hahuang61 joined #git
01:12 Oun5 joined #git
01:16 mmlb joined #git
01:20 mwhooker joined #git
01:23 fracting joined #git
01:23 rolha joined #git
01:24 githogori joined #git
01:24 rkazak joined #git
01:27 GandalfTheWizard joined #git
01:31 e11n joined #git
01:33 lohfu joined #git
01:34 Guo joined #git
01:36 rahtgaz joined #git
01:37 Sonderblade joined #git
01:37 Ahmed90 joined #git
01:37 kfunk joined #git
01:37 bond joined #git
01:37 snits joined #git
01:37 tazle_ joined #git
01:37 mingrammer_ joined #git
01:37 Electrom_ joined #git
01:37 gnoirzox joined #git
01:37 sorenb_ joined #git
01:37 siprbaum joined #git
01:37 Marbug joined #git
01:37 johnnyfive joined #git
01:37 MajorPayne joined #git
01:37 lamont joined #git
01:37 Linkandzelda joined #git
01:37 Juri_Agarin joined #git
01:37 Soliton joined #git
01:37 preilly_ joined #git
01:37 cmn joined #git
01:37 callumacrae joined #git
01:37 Derega joined #git
01:37 krabat joined #git
01:37 tokkee joined #git
01:37 gruetzkopf joined #git
01:37 hypnosb joined #git
01:37 forgot joined #git
01:38 callumacrae joined #git
01:39 pks joined #git
01:43 johnnyfive joined #git
01:47 d0nn1e joined #git
01:48 HoierM joined #git
01:51 Naros joined #git
01:53 Naros I created a branch (b1) which tracks remote1's branch b0.  After doing some development, i'd like to change the upstream of my branch b1 to be based on my master rather than the remote branch b0.  is that possible and if so, what happens?
01:55 ekinmur joined #git
01:55 jaguarmagenta joined #git
01:55 rominronin joined #git
01:55 fscala joined #git
01:56 xaviergmail joined #git
01:56 aty joined #git
01:58 cd-rum joined #git
02:01 JanC_ joined #git
02:02 Goplat joined #git
02:04 dreiss joined #git
02:06 digidog joined #git
02:12 Iaau joined #git
02:16 watabou joined #git
02:18 User458764 joined #git
02:23 rubyonrailed joined #git
02:23 aaqo joined #git
02:23 githogori joined #git
02:24 CrypticGator joined #git
02:25 kriskropd joined #git
02:25 rolha joined #git
02:26 CrypticGator joined #git
02:26 githogori joined #git
02:27 thiago joined #git
02:28 efdetonator joined #git
02:28 inflames joined #git
02:30 arescorpio joined #git
02:34 chrisshattuck joined #git
02:36 hexagoxel joined #git
02:39 wiky joined #git
02:39 chachasmooth joined #git
02:39 Izid joined #git
02:44 boombatower joined #git
02:45 fuchstronaut joined #git
02:47 earational joined #git
02:47 earational hey
02:48 earational clearall
02:56 rominronin joined #git
02:59 RedNifre joined #git
03:03 aavrug joined #git
03:04 b1tchcakes joined #git
03:05 Rodya_ joined #git
03:06 a_thakur joined #git
03:07 cd-rum joined #git
03:09 chartractegg joined #git
03:10 mehola joined #git
03:12 hahuang61 joined #git
03:19 dcg joined #git
03:20 stantonk joined #git
03:24 rubyonrailed joined #git
03:25 chartractegg joined #git
03:25 shgysk8zer0 joined #git
03:26 stantonk joined #git
03:32 eletuchy joined #git
03:41 eletuchy joined #git
03:44 Codfection joined #git
03:44 nettoweb joined #git
03:45 mmlb_ joined #git
03:50 SwiftMatt joined #git
03:52 wiky joined #git
03:54 jstimm joined #git
03:54 Iuowy joined #git
03:55 jaguarmagenta joined #git
03:57 rominronin joined #git
03:57 vbsales joined #git
04:01 FilipNortic joined #git
04:02 maestrojed joined #git
04:08 Rodya_ joined #git
04:12 cerberii_ left #git
04:12 cerberii joined #git
04:13 jaguarmagenta joined #git
04:13 zumba_ad_ joined #git
04:14 eletuchy joined #git
04:17 phanimahesh joined #git
04:19 oich joined #git
04:21 muthu joined #git
04:25 echosystm joined #git
04:25 rkazak joined #git
04:25 echosystm i've made 5 commits on master and pushed them to origin
04:26 echosystm i now want to revert all those commits
04:26 echosystm how do you do that?
04:26 echosystm basically i want to return master to a point in time
04:26 romerocesar joined #git
04:26 kadoban echosystm: !revert
04:26 gitinfo echosystm: 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]?
04:26 oich joined #git
04:28 alex1a joined #git
04:29 SporkWitch joined #git
04:37 shgysk8zer0 joined #git
04:40 fracting joined #git
04:41 cd-rum joined #git
04:42 hahuang61 joined #git
04:46 fuchstronaut joined #git
04:47 oich joined #git
04:50 GandalfTheWizard joined #git
04:50 floatingpoint joined #git
04:51 quetz joined #git
04:52 Andrew_K joined #git
04:54 freimatz joined #git
04:54 echosystm all good, figured it out
04:54 echosystm thanks
04:57 subhojit777 joined #git
04:58 Cabanossi joined #git
04:58 rominron_ joined #git
04:58 ncd|leeN joined #git
05:02 freimatz joined #git
05:03 cd-rum joined #git
05:03 zumba_ad_ joined #git
05:04 xaviergmail joined #git
05:06 inflames joined #git
05:08 rubyonrailed joined #git
05:09 cd-rum_ joined #git
05:13 Literphor joined #git
05:15 Rodya_ joined #git
05:16 rkazak joined #git
05:17 javster joined #git
05:18 akushner joined #git
05:18 Raging_Hog joined #git
05:19 romerocesar joined #git
05:19 Rodya_ joined #git
05:24 inflames joined #git
05:25 oich joined #git
05:30 Guest86262 joined #git
05:30 nilg joined #git
05:34 stantonk joined #git
05:35 xrfang joined #git
05:36 xrfang hello, how can I get the content of a file from a bare repo without clone? thanks
05:36 milki xrfang: if you hav a blob id, you can git cat-file it
05:36 javster joined #git
05:37 milki xrfang: to get the blob id, you can git ls-tree
05:40 mariuscc joined #git
05:40 sauvin joined #git
05:40 xrfang milki: blob id is the sha1 hash?
05:40 ome joined #git
05:41 jungsubk joined #git
05:43 zumba_ad_ joined #git
05:45 thiago xrfang: in which commit?
05:45 thiago xrfang: you want the contents of the file in which commit?
05:46 ThomasLocke_ joined #git
05:48 bket joined #git
05:49 jsgrant joined #git
05:50 eletuchy joined #git
05:51 Literphor joined #git
05:52 ochorocho__ joined #git
05:57 ShapeShifter499 joined #git
05:58 User458764 joined #git
05:59 User458764 joined #git
05:59 rominronin joined #git
05:59 ScottG489 joined #git
06:03 romerocesar joined #git
06:04 pcfreak30 would it be better to fork a commit to a new branch, then rename branches so that the new one is master (and original is dev) or to fork, and cherry-pick commits, then reset the original to the commit used.
06:04 pcfreak30 result is two branches, one with a older version and another with newer code. (master and dev)
06:05 milki pcfreak30: first one
06:06 qt-x joined #git
06:07 thiago if the result is the same, does it matter how you do it?
06:07 nkravchenko joined #git
06:08 fscala joined #git
06:09 foodtooth joined #git
06:09 freimatz joined #git
06:10 fracting joined #git
06:11 xrfang thiago, I need the file in its latest form, master :)
06:14 dsdeiz joined #git
06:15 fracting joined #git
06:18 MrMojito joined #git
06:19 dminca joined #git
06:19 Repox joined #git
06:20 xall joined #git
06:22 demiro joined #git
06:22 User458764 joined #git
06:24 jceb joined #git
06:27 ryez joined #git
06:31 tchan joined #git
06:33 cagedwisdom joined #git
06:36 tvw joined #git
06:38 Sceorem joined #git
06:38 jagob joined #git
06:43 hahuang61 joined #git
06:43 digidog joined #git
06:45 User458764 joined #git
06:46 yuhlw_ joined #git
06:47 fuchstronaut joined #git
06:47 acetakwas joined #git
06:48 demiro joined #git
06:49 choki joined #git
06:50 _tpavel joined #git
06:51 JeroenT joined #git
06:53 ochorocho__ joined #git
06:56 rubyonrailed joined #git
06:59 eletuchy joined #git
07:00 rominronin joined #git
07:00 cd-rum joined #git
07:00 encod3 joined #git
07:02 rominronin joined #git
07:03 hahuang61 joined #git
07:03 oich joined #git
07:04 dreiss joined #git
07:04 dan2k3k4 joined #git
07:04 lordjancso joined #git
07:05 Oebele joined #git
07:05 nnyk_ joined #git
07:05 harish joined #git
07:06 Lvjasha joined #git
07:07 JeroenT joined #git
07:07 romerocesar joined #git
07:07 b100s joined #git
07:07 Literphor joined #git
07:07 Mikaela joined #git
07:07 j416 xrfang: man git-archive
07:07 gitinfo xrfang: the git-archive manpage is available at http://jk.gs/git-archive.html
07:09 tazle_ joined #git
07:09 zeroed joined #git
07:09 zeroed joined #git
07:10 scarabx joined #git
07:11 alex1a left #git
07:11 scarabx joined #git
07:12 Silenced joined #git
07:12 cd-rum_ joined #git
07:12 Silenced joined #git
07:14 imjacobclark joined #git
07:16 mithenks joined #git
07:18 grift joined #git
07:21 circ-user-1WQiq joined #git
07:21 [cust] joined #git
07:22 Fijit joined #git
07:26 ahmed_elgabri joined #git
07:27 Guest17731 joined #git
07:28 Balliad joined #git
07:30 MrWoohoo joined #git
07:30 Literphor joined #git
07:31 grift joined #git
07:31 solars joined #git
07:33 david joined #git
07:33 LeMike joined #git
07:34 jbitdrop joined #git
07:34 barteks2x joined #git
07:36 demiro joined #git
07:37 stantonk joined #git
07:38 PCatinean joined #git
07:39 jaguarmagenta joined #git
07:40 hjk joined #git
07:42 lindenle joined #git
07:42 diogenese joined #git
07:44 romerocesar joined #git
07:45 wxg joined #git
07:48 multi_io joined #git
07:48 ToBeCloud joined #git
07:49 grift joined #git
07:50 Silenced joined #git
07:50 Silenced joined #git
07:50 dan2k3k4 joined #git
07:50 eletuchy joined #git
07:50 PHPanos joined #git
07:51 jceb joined #git
07:53 pluszak joined #git
07:54 BlackPanx joined #git
07:54 ochorocho__ joined #git
07:55 grift joined #git
07:57 netj joined #git
08:00 demiro joined #git
08:03 JeroenT joined #git
08:08 rkazak joined #git
08:11 mikecmpbll joined #git
08:11 nafg_ joined #git
08:12 ferr1 joined #git
08:16 fracting joined #git
08:17 GavinMagnus joined #git
08:19 clmsy joined #git
08:19 FilipNortic joined #git
08:20 dan2k3k4 joined #git
08:20 marcogmonteiro joined #git
08:21 pluszak joined #git
08:24 kek64 joined #git
08:24 t0by joined #git
08:24 guardianJ joined #git
08:25 Darcidride joined #git
08:26 GavinMagnus left #git
08:27 GavinMagnus joined #git
08:28 kek64 joined #git
08:29 WebDevB joined #git
08:29 kek64 hi
08:29 gitinfo kek64: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
08:29 kek64 is it possible to reduce large changes into just filename when using git diff?
08:30 JeroenT joined #git
08:30 _ikke_ git diff --name-only ?
08:30 kek64 basically when I do "git diff master" there are small changes and huge ones, which tend to obscure the diff
08:30 _ikke_ or git diff --name-status
08:30 kek64 i'd like to view only small changes
08:30 _ikke_ I don't think it's possible to do it selectively
08:30 kek64 the same way a github does
08:30 cdown joined #git
08:30 _ikke_ How does github do it?
08:31 _ikke_ Do you have an example?
08:31 ams__ joined #git
08:31 djb-irc joined #git
08:32 kek64 it figures out that the change is too big and allows the user to view full diff if he wants to
08:32 kek64 name-only/name-status shows 'where' only, not 'what'
08:33 WebDevB Hey guys, I have a project that doesn't have git file - I need to pull in some changes from a repo... what's the best thing to do.
08:34 WebDevB Can anyone help?
08:35 kek64 _ikke_, https://github.com/bitlbee/bitlbee/commit​/5ebff60479fc7a9f7f50ac03b124c91d4e6ebe11
08:35 kek64 here's an example
08:35 kek64 "Sorry, we could not display the changes to this file because there were too many other changes to display."
08:36 Guest94869 joined #git
08:36 cqi joined #git
08:36 WebDevB Is this possible?
08:36 leeN joined #git
08:39 Meteorhead joined #git
08:39 Meteorhead hello, why can't this be a valid branch name bugfix/11842398_[Medium]_integration:FIG:V6:ACF_I​NTEGRATION_V6:TRE:DEV_66031_breaks_V6_and_before
08:39 Meteorhead ?
08:39 kek64 any GUI git browsers that can do that? gitg?
08:39 emPi joined #git
08:40 molt joined #git
08:41 TomyWork joined #git
08:41 j416 Meteorhead: perhaps it is the :
08:43 Meteorhead j416: worked thanks :)
08:43 jceb joined #git
08:44 rubyonrailed joined #git
08:45 cdown_ joined #git
08:45 j416 o/
08:45 circ-user-emArs joined #git
08:46 PaowZ_ joined #git
08:47 fuchstronaut joined #git
08:47 rolha joined #git
08:47 PaowZ_ hi there ! I'm new to Git, I'd like to commit some file, but Git keeps asking me to define user.mail/name which I've done many times.. (I can see it in .git/config)
08:48 PaowZ_ instead, it ends with "fatal: unable to auto-detext email address (got "vince@c2-575.(none)"
08:48 sdothum joined #git
08:48 j416 PaowZ_: user.email, not user.mail
08:49 PaowZ_ j416: damn, you're right..
08:49 PaowZ_ thanks, mate !
08:49 j416 o/
08:51 xaa joined #git
08:52 djb-irc joined #git
08:53 lmatteis joined #git
08:54 lmatteis hi guys
08:55 ochorocho__ joined #git
08:55 JeroenT joined #git
08:55 lmatteis ok so imagine i have a `dev` branch. then about a month ago i created a branch of this called `dev-feature`. now both `dev` and `dev-feature` have changed with commits on same files, etc. etc. and i want to merge `dev-feature` back with `dev`
08:55 lmatteis what is the standard way to do this right now?
08:57 mischat joined #git
08:57 Beams joined #git
08:58 _ikke_ Just a default git merge and fix the conflicts
08:58 lmatteis _ikke_: not a rebase?
08:59 WayToDoor joined #git
09:00 _ikke_ Rebase is possible, but I would not use it if other people are committing on these branches too
09:00 lmatteis ok
09:03 weox joined #git
09:04 notebox joined #git
09:09 mdw joined #git
09:10 SteffanW joined #git
09:10 djb-irc joined #git
09:11 mdw_ joined #git
09:12 mdw_ joined #git
09:13 dangerousdave joined #git
09:14 JeroenT_ joined #git
09:15 romerocesar joined #git
09:16 dangerousdave can someone help with http://stackoverflow.com/questions/38132​521/ignore-case-differences-with-git-log please?
09:16 dangerousdave I suspect it's impossible
09:17 cdown joined #git
09:18 Literphor joined #git
09:19 jceb joined #git
09:19 User458764 joined #git
09:20 cbreak dangerousdave: custom diff driver?
09:20 eijk_ joined #git
09:20 cbreak but it sounds like a braindead problem :(
09:20 cbreak if you don't want changes to matter, don't commit them
09:21 dangerousdave cbreak, if only that were an option
09:21 cbreak dangerousdave: I recommend committing only changes that matter, adding them with git add -p
09:21 dangerousdave cbreak, with VB6 IDE (see links) it makes random code changes, and if they are not preserved, they can corrupt the entire application
09:22 cbreak dangerousdave: what the fuck?
09:22 tvw joined #git
09:22 cbreak and people tell me C++ was complicated... :/
09:23 dangerousdave cbreak VB6 IDE needs to maintain consistency between the code, and the binaries that the tool creates, and these must be stored in version control
09:23 JeroenT joined #git
09:23 dangerousdave http://stackoverflow.com/questions/1064858/​stop-visual-basic-6-from-changing-my-casing
09:25 _ikke_ dangerousdave: from my (long ago) experience, it would only change case as you typed it to make it consistent, but it would not flip around casing
09:26 dangerousdave _ikke_ the IDE changes the case when you save
09:26 dangerousdave The IDE is the issue, and there is no alternative
09:26 eletuchy joined #git
09:27 dangerousdave The good news is we are rewritting the product in C# and C++, but in the interim, we need to support it
09:28 dan2k3k4 joined #git
09:28 eletuchy_ joined #git
09:28 WayToDoor joined #git
09:29 eletuch__ joined #git
09:29 cd-rum joined #git
09:31 boshhead joined #git
09:31 JeroenT joined #git
09:32 xcesariox joined #git
09:32 dan2k3k4 joined #git
09:32 ErKa joined #git
09:34 jimi_ joined #git
09:37 nwkj86 joined #git
09:39 stantonk joined #git
09:39 tinajohnson___ joined #git
09:39 jaguarmagenta joined #git
09:41 rchavik joined #git
09:41 notebox joined #git
09:44 lindenle joined #git
09:45 rubyonrailed joined #git
09:47 stuh84 joined #git
09:47 Doginal joined #git
09:47 dan2k3k4 joined #git
09:48 JeroenT joined #git
09:52 dan2k3k4 joined #git
09:52 cookie2 joined #git
09:52 cdown_ joined #git
09:55 RedShift joined #git
09:55 dadada joined #git
09:55 dadada hi
09:55 dadada I just was on a detached head on a branch
09:55 dadada commited something there
09:55 dadada and switched to another branch
09:56 dadada now I can't switch back apparently and I can't see my commit anywhere
09:56 bremner so, I guess you ignored all the helpful messages? can you scroll back?
09:57 cagedwisdom joined #git
09:57 dadada I guess you're right :-(
09:57 dadada not really
09:58 User458764 joined #git
09:58 bremner how about "git log -g", do you see your commit there?
09:59 dadada yes
09:59 dadada ty, this means I can cherrypick it hopefully
10:00 bremner yes
10:01 bremner for future reference that's the "reflog" in action
10:03 notebox joined #git
10:04 RedNifre_ joined #git
10:08 b00^wk joined #git
10:08 b00^wk hello
10:09 b00^wk can i tell git checkout -f to also wipe out all un-tracked files ?
10:09 mdw joined #git
10:11 User458764 joined #git
10:19 grawity no, but you can use git clean
10:20 b00^wk grawity, ok
10:21 fscala joined #git
10:28 mikecmpbll i have a branch X and branch Y, branch Y has 10 new commits and the merge-base is the HEAD of branch X
10:28 grawity the head* of branch X
10:28 mikecmpbll how can I do an interactive rebase where i can pick commits from branch Y?
10:29 mikecmpbll into branch X
10:29 grawity I dunno if you need a rebase for that
10:29 mikecmpbll or anything, then! :)
10:29 grawity just `git cherry-pick commitX`
10:29 mikecmpbll can i do it interactively? it's a bit awkward doing it for each individual commit, especially as there's a ton
10:29 grawity hmm
10:29 grawity merge all of Y (git merge Y), then git rebase -i @{1}
10:30 mikecmpbll oof, great idea.
10:30 mikecmpbll let me give that spin.
10:30 grawity you can specify current 'head of branch X' explicitly, but @{1} aka "where HEAD was previously" (the pre-merge state) is a shortcut
10:32 mikecmpbll that's glorious, thank you so much grawity :)
10:33 PHPanos joined #git
10:35 Professorpy joined #git
10:35 Professorpy left #git
10:35 PHPanos joined #git
10:37 kek64 _ikke_, hey
10:37 eletuchy joined #git
10:37 kek64 i think i've found it
10:37 kek64 http://blog.andrewray.me/deali​ng-with-compiled-files-in-git/
10:37 kek64 hell yeah
10:41 _ikke_ Might work indeed
10:43 User458764 joined #git
10:43 JeroenT joined #git
10:43 User458764 joined #git
10:46 nnyk_ joined #git
10:47 Bombe joined #git
10:47 docnvk joined #git
10:47 fuchstronaut joined #git
10:51 elsevero joined #git
10:52 mikecmpb_ joined #git
10:53 demiro joined #git
10:53 docnvk joined #git
10:55 keltvek joined #git
10:55 troulouliou_div2 joined #git
10:55 ochorocho__ joined #git
10:56 docnvk joined #git
10:58 eletuchy_ joined #git
11:00 eletuch__ joined #git
11:01 stantonk joined #git
11:02 ag4ve joined #git
11:02 eletuchy joined #git
11:02 unbalancedparen joined #git
11:05 Macaveli joined #git
11:06 eletuchy_ joined #git
11:07 sagerdearia joined #git
11:07 JeroenT joined #git
11:09 eletuchy joined #git
11:15 ojdo joined #git
11:15 m1dnight_ joined #git
11:16 eletuchy_ joined #git
11:18 eletuchy joined #git
11:19 dsdeiz joined #git
11:19 dsdeiz joined #git
11:19 eletuch__ joined #git
11:20 johnmilton joined #git
11:21 settermjd joined #git
11:23 eletuchy joined #git
11:28 rnsanchez joined #git
11:31 HoierM joined #git
11:32 fuchstronaut joined #git
11:38 cbreak git log --pretty=format:"%an" | sort | uniq -c | sort -n
11:38 cbreak I like it
11:39 cdown joined #git
11:40 _ikke_ commits per user
11:40 _ikke_ I think I have done something similar too
11:40 jaguarmagenta joined #git
11:41 _ikke_ git shortlog -ns
11:41 cbreak in case anyone cares, 16564 Junio C Hamano is the undisputed leader in git-core
11:41 cbreak _ikke_: interesting
11:41 _ikke_ who would have thought
11:41 zeroed_ joined #git
11:42 cbreak my method counts 4 commits more than yours for him
11:43 hk238 joined #git
11:45 blur3d joined #git
11:46 lindenle joined #git
11:47 jchonig joined #git
11:52 paakku joined #git
11:52 nettoweb joined #git
11:55 paakku After cloning https://github.com/svn2github/valgrind, how do I fetch only the remaining revisions from svn?  I tried git svn --stdlayout init URL followed by git svn fetch, but it started from r1 even though the git repo already had r15110.
11:56 phanimahesh joined #git
11:58 eatsfoobars joined #git
12:00 eatsfoobars joined #git
12:00 Sceorem joined #git
12:01 ntonjeta joined #git
12:01 kulelu88 joined #git
12:01 kulelu88 joined #git
12:02 jceb joined #git
12:03 tomog999 joined #git
12:07 romerocesar joined #git
12:11 raindev joined #git
12:12 demiro joined #git
12:12 jstein_ joined #git
12:13 t0by joined #git
12:13 User458764 joined #git
12:14 toogley joined #git
12:16 ahmed_elgabri joined #git
12:18 Waskeend joined #git
12:20 emPi left #git
12:21 User458764 joined #git
12:22 cqi joined #git
12:25 m1dnight_ joined #git
12:25 ahmed_elgabri joined #git
12:28 eletuchy joined #git
12:28 fmcgeough joined #git
12:31 jeffreylevesque joined #git
12:32 APic joined #git
12:33 ahmed_elgabri joined #git
12:33 raindev joined #git
12:36 eijk_ joined #git
12:37 djb-irc joined #git
12:39 mikecmpbll joined #git
12:40 JeroenT joined #git
12:43 stantonk joined #git
12:43 SirOliver joined #git
12:44 rgrinberg joined #git
12:45 liquidjamm joined #git
12:46 PHPanos joined #git
12:46 ahmed_elgabri joined #git
12:49 TooLmaN joined #git
12:52 FilipNortic joined #git
12:53 telephone joined #git
12:53 telephone joined #git
12:54 mdw joined #git
12:54 stratos joined #git
12:56 ash_workz joined #git
12:56 ochorocho__ joined #git
12:57 stantonk joined #git
12:59 mdw_ joined #git
13:00 cuebix-wk joined #git
13:03 wiky joined #git
13:03 SirOliver joined #git
13:05 jimi_ joined #git
13:06 aguimaraes1986 joined #git
13:07 harish__ joined #git
13:07 mdw joined #git
13:08 snowkidind joined #git
13:08 Khisanth joined #git
13:09 segment-fault joined #git
13:09 zumba_ad_ joined #git
13:09 t0by joined #git
13:14 a3Dman joined #git
13:14 ekinmur joined #git
13:15 SirOliver joined #git
13:15 NoHoFoo joined #git
13:15 zivester joined #git
13:16 t0by joined #git
13:16 raindev joined #git
13:16 NoHoFoo left #git
13:17 ncthom91 joined #git
13:17 Lunatrius joined #git
13:17 yuhlw_ joined #git
13:18 nwkj86 joined #git
13:19 mehola joined #git
13:20 Heisenberg1276 joined #git
13:21 irqq joined #git
13:22 eletuchy joined #git
13:22 notebox joined #git
13:25 Noldorin joined #git
13:27 cmmagid joined #git
13:28 sangy joined #git
13:31 harish__ joined #git
13:32 SimonNa joined #git
13:32 Phreya joined #git
13:32 mmlb_ joined #git
13:32 harish__ joined #git
13:33 wrouesnel1 joined #git
13:35 linx joined #git
13:35 UTAN_dev joined #git
13:37 Repox joined #git
13:38 cmmagid joined #git
13:39 SirOliver joined #git
13:39 vamsi joined #git
13:39 vbsales joined #git
13:40 a3Dman joined #git
13:41 sveinse joined #git
13:41 jaguarmagenta joined #git
13:41 cmmagid joined #git
13:42 SirOliver joined #git
13:44 User458764 joined #git
13:46 Noldorin joined #git
13:46 basiclaser joined #git
13:47 samson joined #git
13:49 NoHoFoo joined #git
13:50 shinnya joined #git
13:51 fuchstronaut joined #git
13:53 SpeakerToMeat joined #git
13:53 GodGinrai joined #git
13:53 cmmagid joined #git
13:53 TomyLobo joined #git
13:54 JeroenT joined #git
13:57 ochorocho__ joined #git
13:59 NeverDie joined #git
13:59 tvw joined #git
13:59 jaguarmagenta joined #git
14:01 User458764 joined #git
14:01 NeverDie joined #git
14:02 notebox joined #git
14:02 emmajane joined #git
14:03 JeremyM_ joined #git
14:03 xpk joined #git
14:04 ExoUNX joined #git
14:05 acetakwas joined #git
14:06 BSAlb joined #git
14:08 cmosguy so I am trying to undersand somemthing, someone just did PR on my repo, and I have the following command line recommendation to inspect it: git checkout -b langpavel-rsk-update trying-auth0
14:08 tvon joined #git
14:08 romerocesar joined #git
14:09 cmosguy then i do:
14:09 cmosguy pull https://github.com/langpavel/react-redux-auth0.git rsk-update
14:09 mmlb_ joined #git
14:09 cmosguy is the "langpavel-rsk-update" where does this come from?
14:13 demiro joined #git
14:15 xall joined #git
14:15 paakku cmosguy: git checkout creates a branch by that name, and you then pull the changes to it.  You could give it a different name if you wanted.  If there is a (not fast-forward) merge, then the name may appear in the default commit message for the merge commit, so it's best to use something that other people can understand
14:16 eletuchy joined #git
14:16 ExoUNX you know what piece of software I rarely see people complain about? git
14:17 cmosguy paakku: if I understand you correctly, the user langpavel created a new branch called "rsk-update" in his forked repository, if I were to try to create a branch with that same name would there a be a conflict?
14:18 cmosguy paakku: or does it not know anything about it, an by me dong a pull  to his repo it puts it directly in my current branch?
14:19 zumba_addict joined #git
14:20 msonntag joined #git
14:21 mehola joined #git
14:21 RedShift left #git
14:22 phaleth joined #git
14:23 nedbat joined #git
14:23 raijin joined #git
14:23 rubyonrailed joined #git
14:23 EckyEcky joined #git
14:23 tfnico joined #git
14:23 timwis joined #git
14:24 harish joined #git
14:25 paakku cmosguy: I don't see why using the same name would cause a conflict.  If you added langpavel's repository as a remote, then your repository could have both refs/remotes/langpavel/rsk-update (what you fetched from langpavel's repository) and refs/heads/rsk-update (the branch you created), and you'd use "git log langpavel/rsk-update" or "git log rsk-update" according to which one you mean
14:25 phanimahesh joined #git
14:26 runtime_error joined #git
14:26 paakku but if you don't even make it a remote then I don't think the rsk-update name used by langpavel is recorded in your repository
14:27 paakku well I'm not sure, perhaps it goes in a merge commit message, but that won't cause conflicts anyway
14:28 LionsMane joined #git
14:29 nnyk_ joined #git
14:29 hero616_ joined #git
14:30 lexvegas joined #git
14:31 floatingpoint joined #git
14:31 NoHoFoo joined #git
14:31 lexvegas good morning! Can anyone point me towards a library or existing OSS project that I can use/study that will provide a series of linked objects representing the relational map of a git graph?
14:31 lexvegas c# based if it exists
14:31 lexvegas but basically I want something to abstract the reading and parsing of the files in the .git directory for me
14:32 lexvegas extra bonus points if it handles orphaned commits
14:33 paakku lexvegas: the libgit2 web page links to LibGit2Sharp; perhaps that's what you want
14:34 fscala joined #git
14:34 lexvegas paakku, hmm, that might be something to look at. I listened to the goto; Git Deep Dive talk yesterday and the guy mentioned that
14:34 Tim-SEM joined #git
14:36 FunkyAss joined #git
14:36 stuh84 joined #git
14:36 rahtgaz joined #git
14:37 Guest99074 joined #git
14:38 ResidentBiscuit joined #git
14:38 settermjd joined #git
14:40 mniip joined #git
14:41 paakku lexvegas: actually I've been thinking of implementing a .gitattributes parser in C#, but perhaps libgit2sharp already has one... I don't see any promising file names though
14:41 rolha joined #git
14:41 lexvegas I'm looking at potentially doing a git flow graph generator of some sort
14:43 acetakwas joined #git
14:45 netcarver joined #git
14:45 acetakwas joined #git
14:46 ochorocho__ joined #git
14:47 paakku my use case is for a migration tool that would read crlf settings from .gitattributes and generate the stream for git fast-import accordingly
14:47 nnyk_ joined #git
14:48 daniel_rose joined #git
14:48 acetakwas joined #git
14:49 linx joined #git
14:50 acetakwas joined #git
14:50 a3Dman joined #git
14:52 acetakwas joined #git
14:52 sangy joined #git
14:52 gigidell joined #git
14:53 paakku I see their Filter.cs creates a BufferedStream on top of an UnmanagedMemoryStream.  I doubt the buffering improves the speed since the data is already in memory
14:54 paakku oh, I misunderstood; they're different streams. One input and one output.
14:56 infra-red joined #git
14:57 acetakwas joined #git
14:57 shgysk8zer0 joined #git
14:58 zumba_ad_ joined #git
14:59 acetakwas joined #git
15:01 rath joined #git
15:01 phanimahesh joined #git
15:01 Chill_Surf joined #git
15:02 acetakwas joined #git
15:02 tvw joined #git
15:02 sanketdg joined #git
15:04 axl_ joined #git
15:04 chrisshattuck joined #git
15:04 acetakwas joined #git
15:05 kurkale6ka joined #git
15:05 mischat_ joined #git
15:05 xaviergmail joined #git
15:05 kadoban joined #git
15:08 imjacobclark joined #git
15:09 annoymouse joined #git
15:10 GavinMagnus joined #git
15:10 Ediz joined #git
15:10 eletuchy joined #git
15:10 NoHoFoo joined #git
15:11 zivester joined #git
15:13 stuh84 joined #git
15:13 a3Dman joined #git
15:14 eatsfoobars joined #git
15:14 stantonk joined #git
15:15 lss8 joined #git
15:16 abra0 joined #git
15:16 GandalfTheWizard joined #git
15:17 descript joined #git
15:17 flopsec joined #git
15:19 Literphor joined #git
15:19 chrisshattuck joined #git
15:20 ToBeFree joined #git
15:21 thiago joined #git
15:22 a3Dman joined #git
15:22 rolha joined #git
15:24 fuchstronaut joined #git
15:24 rkazak joined #git
15:25 Tim-SEM left #git
15:29 GavinMagnus left #git
15:30 psftlc joined #git
15:33 shinnya joined #git
15:33 oich joined #git
15:36 rkazak joined #git
15:37 ncthom91 joined #git
15:38 darkbit joined #git
15:39 romerocesar joined #git
15:40 acetakwas joined #git
15:41 User458764 joined #git
15:42 aard_ joined #git
15:43 Anticom joined #git
15:45 nettoweb joined #git
15:46 xpl0iter joined #git
15:46 a_thakur joined #git
15:46 lindenle joined #git
15:47 xpl0iter Hi, I created a new branch called segments yesterday. I typed in git checkout foobranch. And then made a lot of edits. Now I have to add this to segments branch I created yesterday. What should I do now without losing all work?
15:47 d4rklit3 joined #git
15:47 xpl0iter I didn't realize I was not in segments branch before making the edits
15:47 btree joined #git
15:48 btree left #git
15:48 iob- joined #git
15:48 acetakwas joined #git
15:49 acetakwas joined #git
15:50 _ikke_ git checkout segments
15:50 _ikke_ !float
15:50 gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
15:51 maestrojed joined #git
15:51 acetakwas joined #git
15:53 t0by joined #git
15:55 githogori joined #git
15:58 daniel_rose joined #git
15:58 subhojit777 joined #git
15:59 subhojit777 joined #git
15:59 madewokherd joined #git
16:00 raindev joined #git
16:01 phanimahesh joined #git
16:03 romerocesar joined #git
16:03 Ahmed90 joined #git
16:05 eletuchy joined #git
16:05 Electrometro joined #git
16:06 romerocesar_ joined #git
16:08 b1tchcakes joined #git
16:09 romerocesar joined #git
16:10 efdetonator joined #git
16:11 quetz joined #git
16:12 linx joined #git
16:12 jaguarmagenta joined #git
16:12 diegoviola joined #git
16:13 brandonw joined #git
16:14 demiro joined #git
16:19 jungsubk joined #git
16:24 User458764 joined #git
16:24 digidog joined #git
16:25 dreiss joined #git
16:25 zumba_ad_ joined #git
16:27 jstimm joined #git
16:28 thiago joined #git
16:30 akushner joined #git
16:32 d4rklit3 joined #git
16:33 zarubin joined #git
16:35 keltvek joined #git
16:35 Ediz left #git
16:36 concerti joined #git
16:36 ahmedelgabri joined #git
16:37 m0viefreak joined #git
16:38 User458764 joined #git
16:42 eletuchy joined #git
16:43 aep-shoutlet joined #git
16:43 eletuchy_ joined #git
16:45 eletuch__ joined #git
16:46 digidog joined #git
16:46 HoierM joined #git
16:47 eletuchy joined #git
16:49 cqi joined #git
16:49 romerocesar joined #git
16:50 tyreld joined #git
16:50 eletuchy_ joined #git
16:51 JanC_ joined #git
16:52 f3r70rr35f joined #git
16:53 retropikzel joined #git
16:56 yqt joined #git
16:56 kpease joined #git
16:57 freimatz joined #git
17:03 ochorocho__ joined #git
17:03 SwiftMatt joined #git
17:03 apprentice joined #git
17:04 GandalfTheWizard joined #git
17:06 freimatz joined #git
17:06 b00^wk left #git
17:08 eijk_ joined #git
17:10 romerocesar_ joined #git
17:11 tango_ joined #git
17:11 robotroll joined #git
17:13 eletuchy joined #git
17:13 rahtgaz hello all. The following is the tip of my repo: http://dpaste.com/2MNZM46 I've noticed that the 'develop' main line is being drawn as a branch. What is going on?
17:13 saml joined #git
17:13 saml git checkout mine;  git merge master;  is there a way to overwrite whatever conflict with what's in master?
17:13 phanimahesh joined #git
17:14 EvilPenguin joined #git
17:15 bb010g joined #git
17:16 rubyonrailed joined #git
17:16 paakku saml: might be git merge -Xtheirs; see the MERGE STRATEGIES section of the git-merge documentation
17:16 saml git reset --hard  master
17:16 saml like a boss
17:18 skogg joined #git
17:19 aseidl joined #git
17:19 osse you have completed git
17:19 osse would you like to play again on a higher difficulty setting?
17:20 paakku osse, would it be faster then?
17:20 floatingpoint joined #git
17:22 tristanp_ joined #git
17:23 mehola joined #git
17:25 LeBlaaanc joined #git
17:25 osse paakku: yes but you also spawn without armor
17:25 fuchstronaut joined #git
17:28 kisonecat joined #git
17:28 jyjon joined #git
17:29 Adaulfo joined #git
17:29 zumba_addict joined #git
17:30 ShapeShifter499 joined #git
17:30 fracting joined #git
17:30 ahmedelgabri joined #git
17:31 MadHatter42 joined #git
17:31 a3Dman joined #git
17:31 nnyk_ joined #git
17:32 clemf joined #git
17:34 skogg joined #git
17:34 lexvegas left #git
17:35 Neobenedict right guys
17:35 dmarr joined #git
17:35 Neobenedict when i get this
17:35 Neobenedict CONFLICT (content): Merge conflict in .gitignore
17:35 Neobenedict Automatic merge failed; fix conflicts and then commit the result.
17:36 Neobenedict and fix the conflict, and git add it
17:36 Neobenedict is everything else fine? or do i need to continue merging somehow
17:36 AndroidLoverInSF joined #git
17:38 ascarter joined #git
17:40 osse Neobenedict: the last part: "commit the result"
17:40 Neobenedict yep
17:40 Neobenedict just did that, looks good
17:40 Neobenedict thanks
17:40 osse Neobenedict: you have to run "git commit" to mark it as complete
17:40 osse after that everything is sunshine and unicorns
17:40 Neobenedict if i'm merging and theres no conflict, will it auto commit?
17:41 osse yes
17:41 osse unless you give --no-commit
17:42 osse (and unless it's a fast-forward)
17:42 cdown joined #git
17:43 stantonk joined #git
17:44 njbair joined #git
17:47 User458764 joined #git
17:49 xaviergmail joined #git
17:49 MrMojito joined #git
17:50 MrMojito joined #git
17:51 watersoul joined #git
17:51 ribasushi joined #git
17:52 dreiss joined #git
17:52 hlysig joined #git
17:55 eletuchy joined #git
17:55 Dreamer3 joined #git
17:56 zumba_a__ joined #git
17:57 cookie2 left #git
17:58 digidog joined #git
18:03 SwiftMatt joined #git
18:03 ochorocho__ joined #git
18:04 FuzzySockets joined #git
18:06 cyan__ joined #git
18:10 AndroidLoverInSF joined #git
18:10 zumba_ad_ joined #git
18:12 irqq joined #git
18:12 shinnya joined #git
18:13 jaguarmagenta joined #git
18:14 jyjon joined #git
18:14 efc joined #git
18:15 demiro joined #git
18:15 AndroidLoverInSF joined #git
18:16 Rish joined #git
18:17 frobnic joined #git
18:20 piling_ joined #git
18:21 jost_ joined #git
18:22 zumba_ad_ joined #git
18:25 leeN joined #git
18:25 catuca joined #git
18:25 kfunk joined #git
18:25 hk238 joined #git
18:25 catuca We have a tag and I need to merge maste into that existing tag. How do I do that?
18:26 vuoto joined #git
18:26 chachasmooth joined #git
18:26 spudowiar joined #git
18:27 dunpeal joined #git
18:28 dunpeal Hi. I have two commits, A and B. How do I find out if one is an ancestor of (as in, reachable from) the other?
18:28 catuca dunpeal: You can't really find that out..
18:28 catuca dunpeal: Git doesn't keep record of that
18:28 toogley joined #git
18:28 vishal catuca: you merge branches, not tags, so to do what you want, create a new branch, checkout to <tag> then merge master into that branch
18:28 dunpeal catuca: of course you can.
18:28 BlessJah of course you can
18:29 dunpeal I just don't remember the syntax.
18:29 catuca BlessJah: and dunpeal How?
18:29 dunpeal Also, this is called from a script, so ideally I'd like the command to return something easily parsable.
18:29 catuca vishal: It will be easier to just delete the tag and then recreate it
18:29 BlessJah dunpeal: do you know which one is which or you have two commits and need to sort things out?
18:30 vishal catuca: I don't see how that's any easier.. but if it works for you :)
18:30 jsgrant joined #git
18:30 dunpeal BlessJah: I have a suspected child, yes.
18:31 BlessJah dunpeal: since git v1.8.0: http://stackoverflow.com/a/13526591
18:32 BlessJah catuca: git keeps exact record of commit ancestry paths, without that it would be impossible for it to work
18:34 nettoweb joined #git
18:34 BlessJah catuca: in git every commit (but first) has pointer to at least one parent commit, to check ancestry you simply need to follow those poitners (either till you find first one or ancestor you're looking for), what it doesn't keep is history of files being renamed (it figures it on the fly later)
18:38 jyjon joined #git
18:38 dunpeal BlessJah: exactly what I needed, thanks!
18:38 BlessJah no problem
18:39 Joel left #git
18:39 mwhooker joined #git
18:40 jbondhus joined #git
18:42 cdown joined #git
18:42 Balliad joined #git
18:47 cyphase joined #git
18:47 treaki joined #git
18:47 fscala joined #git
18:48 Rish_ joined #git
18:49 eletuchy joined #git
18:49 mwhooker joined #git
18:51 Topic for #git is now Welcome to #git, the place for git help and contracts | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Commit early, commit often. A tip for version controlling - not for relationships
18:51 hlysig joined #git
18:52 User458764 joined #git
18:52 Rish joined #git
18:54 nitin joined #git
18:55 Sasazuka joined #git
18:55 hlysig joined #git
19:00 m2n joined #git
19:01 Seveas git divorce
19:01 Seveas git breakup --hard
19:01 m2n joined #git
19:02 m2n Hi, I just want to sign all my previous commits in my commit history with my newly generated gpg keys. I have lost my previous gpg keys and accidently deleted my previous keys from github.
19:02 Seveas m2n: that means rewriting the full history of that repository
19:02 m2n does some git --amend works here ?
19:02 Seveas no.
19:03 keltvek joined #git
19:03 Seveas I wouldn't bother. Just sign new commits with the new key.
19:03 Grum joined #git
19:03 digidog joined #git
19:03 m2n ohh.. Actually my old commits now having un-verified tags because those keys are deleted from github as well
19:03 m2n :(
19:04 cdown joined #git
19:05 keltvek joined #git
19:08 random1 joined #git
19:09 Balliad joined #git
19:11 jstimm joined #git
19:14 zumba_ad_ joined #git
19:15 mda1_ joined #git
19:15 romerocesar joined #git
19:17 paul424 joined #git
19:18 satifant joined #git
19:22 BlaXpirit joined #git
19:24 diogenese joined #git
19:24 Ranhir joined #git
19:26 romerocesar joined #git
19:26 b100s joined #git
19:26 fuchstronaut joined #git
19:27 irco joined #git
19:27 inflames joined #git
19:29 SwiftMatt joined #git
19:29 mwhooker joined #git
19:33 eftov joined #git
19:34 mischat joined #git
19:36 cyan__ joined #git
20:06 ilbot3 joined #git
20:06 Topic for #git is now Welcome to #git, the place for git help and contracts | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Commit early, commit often. A tip for version controlling - not for relationships
20:07 Repox joined #git
20:08 h264 joined #git
20:09 IWishIKnew joined #git
20:11 zeroed joined #git
20:12 stantonk joined #git
20:14 jaguarmagenta joined #git
20:14 jeffreylevesque joined #git
20:15 demiro joined #git
20:15 pampeho joined #git
20:16 angular_mike is understanding git still up to date?
20:18 nilg joined #git
20:20 polyzen wat
20:20 elastix joined #git
20:20 angular_mike polyzen: isdu\udndestanding git stil  upda todate
20:21 polyzen wat
20:21 angular_mike polyzen: isu ndesratnaign sgit stil updtaodate
20:21 polyzen yes
20:21 angular_mike polyzen: but it's been 8 years already
20:22 angular_mike s/understanding git/git internals/
20:22 WayToDoor joined #git
20:22 Nytd joined #git
20:22 polyzen ┐('~`;)┌
20:22 angular_mike is git internals still up to date?
20:22 endiruna joined #git
20:23 nilg joined #git
20:24 hahuang61 joined #git
20:24 chrisshattuck joined #git
20:27 WayToDoor joined #git
20:28 j416 angular_mike: link?
20:28 angular_mike j416: https://github.com/pluralsight/git-internals-pdf
20:30 j416 angular_mike: looks rather outdated.
20:30 angular_mike j416: e.g.?
20:31 Kobaz what's a good way to see the log of newest commits
20:31 Kobaz * 1.9                   68b390e [behind 12]
20:31 j416 angular_mike: if you are looking to get a general understanding, it is probably ok. Part about installation for instance looks a bit old.
20:31 angular_mike Kobaz: git log
20:31 Kobaz yeah but
20:31 j416 angular_mike: !book maybe
20:31 gitinfo angular_mike: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
20:31 Kobaz like a shortcut for only the newest commits
20:31 angular_mike j416: no, I mean about git internals
20:32 angular_mike Kobaz: I believe there can only be one
20:32 angular_mike newest commit
20:32 j416 angular_mike: did not check, but probably has not changed much.
20:32 efdetonator joined #git
20:33 Kobaz yes there is only one 'the newest' commit
20:33 Kobaz but there are multiple "newest" commits
20:33 angular_mike like top 10 newest?
20:33 Kobaz no
20:33 nilg` joined #git
20:33 Kobaz newest since my commit
20:33 Kobaz so, top 12
20:33 Kobaz or top 20, or top 200, however far back you are
20:33 angular_mike you mean "newer than your specific commit"?
20:34 Kobaz yeah
20:34 GavinMagnus joined #git
20:34 angular_mike http://stackoverflow.com/questions/76932​49/commits-since-a-certain-commit-number
20:35 angular_mike git log <hash>..HEAD
20:35 zumba_ad_ joined #git
20:35 Kobaz yeah
20:35 Kobaz that's not what i'm looking for
20:35 Kobaz okay i think i got it
20:35 Kobaz git log @{u}...HEAD
20:36 j416 angular_mike: checked; all looks good @ internals part. There may have been some additions in syntax but the object model has been the same since ancient times.
20:36 angular_mike j416: that's why I'm reading it in the first place
20:36 j416 good
20:36 j416 pro git covers it quite nicely too.
20:37 eletuchy joined #git
20:38 tgunr joined #git
20:41 jamick joined #git
20:45 zumba_ad_ joined #git
20:47 samson joined #git
20:51 yqt joined #git
20:55 mwhooker joined #git
20:56 LaptopBrain joined #git
20:56 zumba_ad_ joined #git
20:57 marcelofr joined #git
20:57 Balliad joined #git
20:58 robotroll joined #git
20:59 ahmedelgabri joined #git
21:00 tgunr joined #git
21:04 CheckDavid joined #git
21:06 shinnya joined #git
21:06 nilg` joined #git
21:09 jetpack_joe joined #git
21:13 mwhooker joined #git
21:14 nilg joined #git
21:15 HoierM joined #git
21:16 dreiss joined #git
21:17 dilfridge joined #git
21:19 LeBlaaanc joined #git
21:19 Guest12722 left #git
21:23 b1tchcakes joined #git
21:24 ToBeCloud joined #git
21:27 fuchstronaut joined #git
21:28 D-Boy joined #git
21:28 rgrinberg joined #git
21:32 SwiftMatt joined #git
21:33 maestrojed joined #git
21:39 jstein__ joined #git
21:46 watersoul_ joined #git
21:47 rahtgaz_1 joined #git
21:48 elastix1 joined #git
21:48 zumba_ad_ joined #git
21:48 Matrixiumn joined #git
21:48 sonOfRa_ joined #git
21:48 chamunks joined #git
21:49 NaN joined #git
21:49 NaN is there a command to do a mv and not lose history from that file?
21:49 boshhead_ joined #git
21:51 QshelTier joined #git
21:51 topi`_ joined #git
21:51 BinGOs_ joined #git
21:51 tvl joined #git
21:51 Neo_ joined #git
21:51 blr_ joined #git
21:51 Bowel_ joined #git
21:51 thiago joined #git
21:53 fracting joined #git
21:53 Blkt joined #git
21:53 ohcibi joined #git
21:53 gigidell joined #git
21:53 ffabi joined #git
21:53 Learath2 joined #git
21:53 filcab joined #git
21:53 rishi joined #git
21:53 themill joined #git
21:53 hahuang61 joined #git
21:53 Orbitrix joined #git
21:54 NeverDie joined #git
21:54 i7c There is no special command as git does not track renames (moves).
21:55 i7c However, git figures it out on the fly that a file has been renamed in a commit and thus you don't really lose the history.
21:55 i7c Check out the --follow option in man git-log for example.
21:55 gitinfo the git-log manpage is available at http://jk.gs/git-log.html
21:55 ochorocho__ joined #git
21:55 jyjon joined #git
21:56 NeverDie joined #git
21:56 nnyk_ joined #git
22:00 nettoweb joined #git
22:00 LeBlaaanc joined #git
22:00 joki joined #git
22:00 ffabi joined #git
22:01 BinGOs_ left #git
22:01 mdw_ joined #git
22:02 BinGOs joined #git
22:02 dunpeal left #git
22:04 cdemc joined #git
22:05 boombatower joined #git
22:06 rishi joined #git
22:08 Literphor joined #git
22:09 jetpack_joe joined #git
22:10 alir joined #git
22:12 Balliad joined #git
22:13 LeBlaaanc joined #git
22:14 watabou joined #git
22:14 kadoban joined #git
22:14 jaguarmagenta joined #git
22:18 xao joined #git
22:19 madewokherd joined #git
22:20 elsevero joined #git
22:20 Shentino joined #git
22:20 GavinMagnus left #git
22:21 Literphor joined #git
22:21 nidr0x joined #git
22:22 oich joined #git
22:23 denimsoft joined #git
22:23 albel727 joined #git
22:24 BSaboia joined #git
22:25 ResidentBiscuit joined #git
22:25 eck joined #git
22:26 ResidentBiscuit joined #git
22:26 eck i work on both personal and work projects on the same computer, and find that i frequently forgot to override my user.email setting which causes my email to have the wrong authorship in projects
22:26 eck does anyone have any clever ideas on how to maintain this automatically?
22:27 _Patrick_ joined #git
22:27 eletuchy joined #git
22:27 i7c eck, you can set user.email project-local.
22:27 canton7 don't set it globally at all?
22:28 i7c There'll also be a new option in the next git version iirc.
22:28 romerocesar joined #git
22:28 fuchstronaut joined #git
22:28 paakku what kind of option?
22:29 eck my work projects all have git urls of the same form (foo@blah.work:so-on) so i was hoping i could set up a regex or somesuch
22:29 cd-rum joined #git
22:29 i7c I think it was a option you can set globally which nags if you didn't set user.email in the repo locally.
22:29 i7c Lemme see if I can find it.
22:30 Seveas eck: if you only create commits on the commandline, a hack like this will work: https://github.com/seveas/dotfi​les/blob/master/.bashrc.d/cd.sh
22:30 eck wow, overriding cd
22:30 eck crazy
22:30 Seveas but works very well :)
22:31 paakku until you use pushd, popd
22:32 cd-rum joined #git
22:32 Seveas hm, true. Time to override those as well
22:32 i7c Ah actually the option was always there.
22:32 i7c user.useConfigOnly in man git-config
22:32 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
22:33 i7c Well probably not "always always" but in 2.9 it was really just a bug fix.
22:33 CrazyBonz joined #git
22:33 i7c Just set this and leave user.email blank in the global config should probably do the trick?
22:33 Seveas I'm too lazy for that
22:34 liuzhen joined #git
22:34 i7c I don't use it myself. I just configure a global email which is almost always correct and occasionally override it locally (i.e. for work related stuff).
22:35 Seveas I have many repos cloned on many machines. can't really be arsed to set user.email all the time :)
22:36 i7c Do you work for booking.com? :P
22:36 Seveas I wonder how you'd guessed that :P
22:36 i7c Well mom always said I'm a smart boy.
22:37 Seveas moms always say that
22:37 i7c That was the point.
22:37 i7c :)
22:37 PabloR joined #git
22:37 i7c And yeah obviously I have my git config in a git repo (along with more dotfiles).
22:37 i7c So I rarely set my mail option.
22:39 Inia joined #git
22:39 PabloR left #git
22:40 Seveas with this cd/pushd/popd hack I never have to set it. Laziness++
22:40 i7c Yeah that's nice, however
22:41 i7c I know it's probably silly but I find the cd redefinition horrible. :D
22:41 cd-rum joined #git
22:41 Seveas oh, it is horrible for sure
22:42 Seveas some people do it in their prompt command
22:42 Seveas but mine does enough already :) https://github.com/seveas/dotfile​s/blob/master/.bashrc.d/prompt.sh
22:42 i7c Even worse :D
22:43 xaviergmail joined #git
22:43 paakku do those hooks preserve the exit codes?
22:43 raijin joined #git
22:44 paakku although perhaps you never do cd directory && some command
22:44 dreiss joined #git
22:44 Seveas hurricane:~$ (exit 67)
22:44 Seveas !(67,EX_NOUSER) hurricane:~$ echo $?
22:44 Seveas 67
22:44 Seveas hurricane:~$
22:44 GyrosGeier joined #git
22:44 GyrosGeier hi
22:45 GyrosGeier I have a project history with a feature branch that has several merges from the main branch
22:45 GyrosGeier I'd like to rebase the feature branch now, getting rid of the merge commits
22:45 Seveas paakku: stop finding bugs in my nasty hacks!
22:46 texasmynsted joined #git
22:46 GyrosGeier I think the correct approach to do that would be to identify the merge commits on the feature branch, and work back from these
22:46 GyrosGeier is there an easy way to query for merge commits reachable from A, but not from B?
22:47 texasmynsted when I do a git log -S "foo" I find a commit with a change I need
22:47 gosti joined #git
22:47 texasmynsted when I git show that commit, it has altered hundreds of files
22:47 [gmi] joined #git
22:47 texasmynsted how do I find the one with the change to "foo" from the first command?
22:48 ffabi joined #git
22:48 Seveas GyrosGeier: just doing git-rebase master on the feature branch should work, no need to find all the merge commits manually
22:50 GyrosGeier nope
22:50 GyrosGeier that gives an unholy mess
22:50 zumba_ad_ joined #git
22:51 GyrosGeier lots of rename/delete conflicts etc.
22:51 texasmynsted So I have found that the "foo" piece that I am looking for has moved to a new file
22:51 texasmynsted How do I track changes beyond file?
22:53 Seveas texasmynsted: git log --follow filename
22:54 raijin joined #git
22:54 cyan__ joined #git
22:55 jimi_ joined #git
22:55 jetpack_joe joined #git
22:56 texasmynsted oh cool
22:56 texasmynsted thank you
22:56 texasmynsted I will try that
22:56 Seveas GyrosGeier: then you'll either need to solve those rename/deleve conflicts or just merge the feature branch
22:56 GyrosGeier okay
22:57 jyjon joined #git
22:57 Seveas you probably already solved those conflicts at least once while merging. If you intend to rebase a feature branch before merging it, you really should do frequent rebases along the way as well to keep the conflicts small
23:00 ahmedelgabri joined #git
23:00 oich why does get branch -r list branches in my repo, but git ls-remote says no remotes have been configured.
23:00 i7c GyrosGeier, do you have a rational reason against the merge commits? :P
23:01 i7c They're not that bad, you know.
23:01 GyrosGeier the commit messages don't follow the project standard
23:01 GyrosGeier git cherry-pick $(git rev-list --reverse new3d/master ^origin --merges | while read line; do echo `git merge-base $line origin`..$line; done)
23:01 GyrosGeier that seems to do the right thing, for the most part
23:01 GyrosGeier hmm
23:02 GyrosGeier needs another ^ so it doesn't try to cherry-pick the merge
23:02 mwhooker joined #git
23:02 GyrosGeier ah wait
23:02 GyrosGeier I need to rebase onto the merge commit afterwards
23:04 GyrosGeier ah wait
23:04 GyrosGeier I need to rebase onto the commit from the mainline that went into the merge
23:06 eletuchy joined #git
23:06 _rgn joined #git
23:10 eletuchy_ joined #git
23:10 ffabi joined #git
23:10 preyalone joined #git
23:11 _rgn joined #git
23:11 _rgn joined #git
23:11 kpease joined #git
23:12 jumpman joined #git
23:12 leeN joined #git
23:13 jyjon joined #git
23:13 GyrosGeier meh
23:13 eletuchy joined #git
23:14 GyrosGeier git cherry-pick --merge wants the number of the parent commit in the list of parents
23:14 GyrosGeier I have the commit ID handy (it's the one that is reachable from the current mainline
23:15 eletuchy_ joined #git
23:17 jyjon joined #git
23:19 eletuchy joined #git
23:19 __rgn joined #git
23:20 eletuch__ joined #git
23:21 _rgn joined #git
23:21 _rgn joined #git
23:23 _rgn joined #git
23:23 mixfix41 joined #git
23:24 eletuchy joined #git
23:24 mixfix41 hey there are these git patches being installed in this aur pkgbuild? https://github.com/hadess/rtl8​723bs/tree/master/patches_4.5, and the aur pkgbuild https://aur.archlinux.org/cgit/aur.gi​t/tree/PKGBUILD?h=rtl8723bs-dkms-git ? sory if this is wrongchannel
23:25 mwhooker joined #git
23:26 eletuchy_ joined #git
23:28 romerocesar joined #git
23:28 Seveas oich: git branch -r lists everything under refs/remotes. If you had remotes once, but removed them with git remote rm or by editing the config, those remote refs are not deleted, so you can end up in a situation like this.
23:29 Seveas mixfix41: try an arch channel.
23:29 osse say what now
23:29 eletuchy joined #git
23:29 osse pretty sure remote rm also cleans the branches
23:29 * osse tests
23:29 WaReZ joined #git
23:29 Seveas osse: hm. I'm pretty sure it doesn't. So one of us is wrong :)
23:29 Seveas (and that's usually me...)
23:30 osse this is no different
23:30 osse huh
23:31 oich Seveas thanks. this is the state of things after git svn clone
23:31 Seveas oich: heh, that's pretty normal then
23:31 _rgn joined #git
23:31 Seveas git-svn stores its refs under refs/remotes, but there's no actual remote involved
23:32 oich ok
23:32 Seveas git-svn predates the remote helper protocol, so it mangles the object db directly instead of pretending that the svn repo is a remote
23:32 eletuchy_ joined #git
23:34 ochorocho__ joined #git
23:34 eletuch__ joined #git
23:35 hahuang61 joined #git
23:36 zumba_addict joined #git
23:36 blur3d joined #git
23:38 _rgn joined #git
23:39 eletuchy joined #git
23:40 BSaboia how can I see all the revisions for a single file?
23:41 eletuchy_ joined #git
23:41 Seveas git log path/to/file
23:43 eletuch__ joined #git
23:45 CognitivePuppy joined #git
23:47 BSaboia Seveas, thanks
23:48 ochorocho__ joined #git
23:48 eletuchy joined #git
23:50 fahadash joined #git
23:50 molt joined #git
23:50 ffabi joined #git
23:51 shgysk8zer0_ joined #git
23:52 eletuchy_ joined #git
23:52 b1tchcakes joined #git
23:54 eletuch__ joined #git
23:56 HoierM joined #git
23:56 chrisshattuck joined #git
23:57 eletuchy joined #git
23:59 eletuchy_ joined #git

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