Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-17

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

All times shown according to UTC.

Time Nick Message
00:00 thebope joined #git
00:01 yupvr joined #git
00:02 nettoweb joined #git
00:02 cdown joined #git
00:04 Gsham joined #git
00:06 Noldorin joined #git
00:06 nicksloan joined #git
00:08 radsy joined #git
00:08 radsy joined #git
00:08 byte512 joined #git
00:11 venmx joined #git
00:12 jnewt joined #git
00:13 jccn joined #git
00:15 robotroll joined #git
00:20 mozzarella joined #git
00:21 cdown joined #git
00:22 thiago joined #git
00:24 thiago joined #git
00:28 txdv joined #git
00:30 UserOO7 joined #git
00:36 mikecmpbll joined #git
00:36 thiago joined #git
00:38 abextra joined #git
00:39 User458764 joined #git
00:42 umpc joined #git
00:42 cdown joined #git
00:42 aucotsi joined #git
00:43 NeverDie joined #git
00:45 phox joined #git
00:45 phox is there a way to make git-diff give me filename and line number for every line such that I can get the equivalent of a grep -n but on the diff?
00:46 BenderRodriguez joined #git
00:47 durham joined #git
00:47 Gsham joined #git
00:47 cbreak joined #git
00:49 durham joined #git
00:52 _cyril_ phox: I don't know off the top of my head ; I'll check `git help diff` when I get a chance, but there are loads of options in there, so you might find what you're looking for?
00:54 durham joined #git
00:55 johnkevinmbasco joined #git
00:55 DolpheenDream joined #git
00:56 cbreak joined #git
00:57 rominronin joined #git
00:58 ayjay_t joined #git
00:58 Gsham joined #git
00:59 phox _cyril_: as far as I can tell all it's willing to do is normal contextual diff...  and it doesn't appear to support extended diff options like --new-line-format so the hacky way isn't on the table either :P
00:59 snowkidind joined #git
00:59 phox oh well, I'll live... would make tracking (new-only) TODO comments smoother though ;)
00:59 * phox pets git anyways
00:59 sarbs joined #git
01:00 austin987 joined #git
01:01 watersoul joined #git
01:01 sssilver_ joined #git
01:02 thebope joined #git
01:02 Gabemo joined #git
01:02 fstd_ joined #git
01:02 Lyqyd joined #git
01:04 Infinite_182 joined #git
01:05 cao_ joined #git
01:06 Nilesh_ joined #git
01:06 storrgie joined #git
01:07 anuxivm left #git
01:07 Celmor joined #git
01:09 Celmor how can I configure that 'add'ed but modified files and therefore 'not staged for commit' will always be staged for commit and only untracked files (files that haven't been 'add'ed yet) won't be commited upon a commit and would have to be first added?
01:10 jpX joined #git
01:11 Jameser joined #git
01:16 johnkevi_ joined #git
01:16 _cyril_ Celmor: not sure I completely understand what you want, but you might be looking for `git add -u`? Have a look at what that does in the manual
01:19 done joined #git
01:20 Celmor for example, I have a log file to keep track of exact changes (what commands has been executed on the files) in that folder, I have of-course added it once the first time that file has been created but now every time I modify that file I have to runn 'git add $file' on it again before committing
01:20 vishal Celmor: you probably want to always commit with -a
01:20 Guest55 joined #git
01:22 bremner yikes
01:22 Celmor thanks
01:23 Celmor can only unstaged changes be diff'ed?
01:23 _cyril_ Celmor: git diff --staged
01:23 fling joined #git
01:23 _cyril_ Celmor: will show you the diff for what has been staged
01:24 vishal isn't diff by default only for unstaged
01:24 _cyril_ vishal: yes, it is
01:24 Jameser joined #git
01:24 Celmor tbh I don't find not much use in the distinction of staged and unstaged...
01:24 safe joined #git
01:24 Celmor all my errors root into that distinction
01:24 vishal Celmor: I use that distinction regularly :)
01:25 _cyril_ Celmor: That distinction actually very useful once you learn how to work with it!
01:25 Celmor for example?
01:26 DolpheenDream joined #git
01:27 _cyril_ Say you've made a bunch of changes, but you want to not commit everything in one go. You want to make several commits for several logically distinct changes.
01:27 Celmor in my case I have many 'micro' changes and often just commit if I want to keep a version of a file, no major or minor versioning, so I don't have use in keeping track of files I already added for commit since last commit or not
01:28 _cyril_ Sure, so in that case, git commit -a should do the trick. But your use case is a very specific one. Generally speaking, when you're working on code, that's not what you want to do. Well if you want a clean and logical history that is.
01:30 Celmor well, all changes I do are mostly independant from each other and rather tweaks, if I would commit after every independant change I would grow the git database 100-fold
01:31 Celmor thanks for the tips, I'm probably just gonna alias that one
01:32 _cyril_ No problem. Sure, do that if it suits your workflow!
01:32 CubiK joined #git
01:32 fatalhalt joined #git
01:44 cqi joined #git
01:47 pks joined #git
01:48 boombatower_ joined #git
01:51 oaaao joined #git
01:57 hahuang65 joined #git
02:00 pijiu joined #git
02:02 Charliechin joined #git
02:02 thebope joined #git
02:04 zivester joined #git
02:04 morenoh149 joined #git
02:07 Doginal joined #git
02:09 hendry joined #git
02:09 hendry i seem unable to rebase the very first commit, which has the wrong (personal) email address set
02:10 kadoban hendry: --root
02:11 hendry kadoban: thank you
02:11 kadoban Anytime
02:12 los joined #git
02:12 byte512 joined #git
02:13 c1pher joined #git
02:20 finalbeta joined #git
02:28 rominronin joined #git
02:28 jaguarmagenta joined #git
02:31 Celmor joined #git
02:33 thiago joined #git
02:33 d^sh joined #git
02:35 JamesBaxter joined #git
02:40 icedwater selckin: I agreed with you from the get-go, but I was trying to solve aranea's situation as it was presented :p
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and contextual clues | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.2 | Getting "cannot send to channel"? /msg gitinfo .voice | QOTD: <tilpner> (Ignore this)
02:49 cao_ joined #git
02:56 JuliusN joined #git
03:00 cao_ joined #git
03:01 Gsham joined #git
03:03 thebope joined #git
03:05 aavrug joined #git
03:08 nokr joined #git
03:09 midgetspy joined #git
03:10 cao_ joined #git
03:14 sunri5e joined #git
03:19 ashokrajar joined #git
03:19 Jameser joined #git
03:20 cao_ joined #git
03:22 Celmor left #git
03:22 robattila256 joined #git
03:29 Gsham joined #git
03:30 chachasmooth joined #git
03:30 hexagoxel joined #git
03:31 c1pher_ joined #git
03:32 cao_ joined #git
03:33 fatalhalt joined #git
03:35 khfeng_ joined #git
03:36 rwb joined #git
03:39 Goplat joined #git
03:39 Andrew_K joined #git
03:40 UserOO7 joined #git
03:41 UserOO7 joined #git
03:43 c1pher__ joined #git
03:43 qws-user-1229 joined #git
03:43 UserOO7 joined #git
03:44 c1pher joined #git
03:44 UserOO7 joined #git
03:48 c1pher_ joined #git
03:49 GT4066 joined #git
03:52 Sasazuka joined #git
03:53 phanimahesh joined #git
03:53 morenoh149 joined #git
03:55 drbean joined #git
03:57 dmc is there a way to ignore all files within directories but not the topdir?
03:58 UserOO7 joined #git
03:59 UserOO7 joined #git
04:00 kadoban dmc: What does that mean?
04:00 dmc all files within subdirectories*
04:00 dmc and not at the base of the repo
04:00 kadoban Possibly you want /*/ ?
04:00 rominronin joined #git
04:02 dmc that helps. thank you
04:02 kadoban Sure
04:02 dmc does the job*
04:03 dsantiago joined #git
04:04 russ_za joined #git
04:07 mmlb joined #git
04:09 done joined #git
04:11 c1pher joined #git
04:11 a_thakur joined #git
04:14 sssilver joined #git
04:14 Vortex35 joined #git
04:14 sdelic joined #git
04:16 railssmith joined #git
04:22 Mobutils joined #git
04:33 Oatmeal joined #git
04:36 dhollinger joined #git
04:37 Kulrak joined #git
04:37 Kulrak joined #git
04:39 danimal2 joined #git
04:40 User458764 joined #git
04:40 arescorpio joined #git
04:41 donmichelangelo joined #git
04:42 SwiftMatt joined #git
04:44 cao_ joined #git
04:44 ayogi joined #git
04:46 jaguarmagenta joined #git
04:47 MrWoohoo joined #git
04:48 subhojit777 joined #git
04:48 davimore_ joined #git
04:50 PaulCapestany joined #git
04:52 wxg joined #git
04:56 ISmithers joined #git
04:58 User458764 joined #git
05:02 c1pher joined #git
05:02 daey_ joined #git
05:07 hahuang65 joined #git
05:08 sssilver joined #git
05:09 snthsnth joined #git
05:09 romerocesar joined #git
05:11 venmx joined #git
05:12 RustyShackleford joined #git
05:15 jokester joined #git
05:16 talkJS I'm on the same branch as a remote server.   the file is tracked and updated locally.  i'm in sync with master.  I git pull on the remote server and a few vendor/* files do not make it
05:16 sdelic_for_me joined #git
05:20 Cabanossi joined #git
05:22 nilsi joined #git
05:22 todder joined #git
05:23 clemf joined #git
05:23 User458764 joined #git
05:27 xall joined #git
05:29 skirk joined #git
05:31 autofly joined #git
05:32 rominronin joined #git
05:34 svm_invictvs joined #git
05:39 ashokrajar joined #git
05:39 User458764 joined #git
05:39 dsdeiz joined #git
05:42 morenoh149 joined #git
05:46 diogenese joined #git
05:48 holodoc joined #git
05:56 thesha joined #git
05:56 inflames joined #git
06:00 daey joined #git
06:03 _ikke_ talkJS: Note that when fetching history from the remote, git never deals just with individual files
06:03 bocaneri joined #git
06:04 talkJS it was the damn .git and .gitignore in a subdirectory thing again
06:04 _ikke_ Ah, submodules
06:04 talkJS i had to redo it .. git rm --cached ...
06:04 _ikke_ right
06:05 thebope joined #git
06:06 sbulage joined #git
06:22 d^sh joined #git
06:23 thesha joined #git
06:30 overlord_tm joined #git
06:33 venmx joined #git
06:34 qt-x joined #git
06:36 xall joined #git
06:37 inflames joined #git
06:41 sssilver joined #git
06:41 pijiu joined #git
06:42 pijiu joined #git
06:42 bitslip_ joined #git
06:43 pijiu joined #git
06:44 los joined #git
06:45 pijiu joined #git
06:46 pijiu joined #git
06:46 nd joined #git
06:47 jaguarmagenta joined #git
06:47 pijiu joined #git
06:47 ThomasLocke joined #git
06:48 pijiu joined #git
06:49 xall joined #git
06:51 tvw joined #git
06:54 LucaTM joined #git
06:59 Space-Duck joined #git
07:01 Raging_Hog joined #git
07:01 jstimm joined #git
07:02 venmx joined #git
07:03 rominronin joined #git
07:04 gfixler joined #git
07:13 zeroed joined #git
07:13 umpc joined #git
07:15 bmahe joined #git
07:15 dreiss joined #git
07:16 rscata joined #git
07:17 lindenle joined #git
07:17 InfoTest joined #git
07:18 qws-user-1228 joined #git
07:20 jstimm joined #git
07:20 freimatz joined #git
07:21 meauses joined #git
07:21 JeroenT joined #git
07:21 thebope joined #git
07:25 nidr0x joined #git
07:25 drbean joined #git
07:29 a_thakur_ joined #git
07:31 zeroed joined #git
07:31 zeroed joined #git
07:31 morenoh149 joined #git
07:32 SwiftMatt joined #git
07:36 John[Lisbeth] joined #git
07:37 John[Lisbeth] I am trying to test my application in a virtual machine and I can't seem to clone my repository
07:37 John[Lisbeth] its says Cloning into 'myrepository' and hangs for a long time
07:38 John[Lisbeth] then returns the error fatal: unable to access my/github/url could not resolve host github.com
07:39 grawity fix your DNS – not a Git problem
07:39 John[Lisbeth] thanks
07:39 Alienpruts joined #git
07:40 rominronin joined #git
07:40 chele joined #git
07:42 elect joined #git
07:42 JeroenT joined #git
07:43 a_thakur joined #git
07:44 bruce_lee joined #git
07:44 bruce_lee joined #git
07:47 Sceorem joined #git
07:48 heroux joined #git
07:49 brillenfux joined #git
07:51 JeroenT joined #git
07:56 elect joined #git
07:58 jstimm joined #git
07:59 tgp_ joined #git
07:59 tgp_ left #git
08:03 venmx joined #git
08:04 ahmedelgabri joined #git
08:04 rasto joined #git
08:04 jnavila joined #git
08:07 brk_ joined #git
08:08 a_thakur joined #git
08:08 derk0pf joined #git
08:08 MrMojito joined #git
08:08 MrMojito joined #git
08:10 User458764 joined #git
08:11 danslo joined #git
08:11 hhee joined #git
08:12 bookies joined #git
08:14 lordjancso joined #git
08:16 PCatinean joined #git
08:17 adac joined #git
08:18 TomyWork joined #git
08:19 jstimm joined #git
08:21 Oatmeal joined #git
08:21 done joined #git
08:21 SwiftMatt joined #git
08:24 cao_ joined #git
08:26 shams joined #git
08:27 Repox joined #git
08:30 mkoskar joined #git
08:35 maret joined #git
08:36 aidalgol joined #git
08:37 mar77i_ joined #git
08:37 LiohAu joined #git
08:38 nettoweb joined #git
08:38 qt-x joined #git
08:39 rorro joined #git
08:41 fees joined #git
08:45 intellix joined #git
08:48 jaguarmagenta joined #git
08:49 dagerik left #git
08:52 virgil joined #git
08:53 UniFreak joined #git
08:53 jfr_ joined #git
08:54 ocbtec joined #git
08:54 UniFreak hi, when I'm trying to merge master into my own branch `myOwn`, there is a conflict, but it shold be solved by another one. so that guy solved it. the problem is
08:55 grift joined #git
08:55 UniFreak I'm now stucked in the `conflict` status, how can I revert to the before status
08:55 apotry joined #git
08:55 PHPanos joined #git
08:55 yupvr joined #git
08:56 garethdaine joined #git
08:57 selckin merge --abort
09:02 hanx joined #git
09:02 re1 joined #git
09:02 UniFreak selckin: thanks
09:03 chele joined #git
09:04 venmx joined #git
09:04 p4trix joined #git
09:04 bongjovi joined #git
09:06 kurkale6ka joined #git
09:06 topi` hello, I just did a "git merge my_topic" on my devel branch, without -no-ff flag but I still got those two commits (that the my_topic was further ahead) on my devel gitlog
09:06 topi` I thought "git merge" would actually merge the differences between branches A and B into a single merge commit?
09:06 ToBeCloud joined #git
09:06 topi` those new commits were cherry picks from yet another branch, maybe that influences?
09:07 mikecmpbll joined #git
09:07 wcpan joined #git
09:08 ToBeCloud joined #git
09:09 cao_ joined #git
09:09 ToBeCloud joined #git
09:10 done joined #git
09:10 ToBeCloud joined #git
09:11 fenris_mid joined #git
09:11 ToBeCloud joined #git
09:11 ayjay_t joined #git
09:12 fenris_mid saluton. is it normal that on "git submodule update" the updated submodules are on a detached head state?
09:14 ferr joined #git
09:14 overlord_tm joined #git
09:15 marcogmonteiro joined #git
09:15 geoffrey joined #git
09:16 systemovich joined #git
09:16 amitprakash joined #git
09:17 amitprakash Hi, I have a git project with 2 other submodules.. however on git submodule status, I am getting a fatal: no submodule mapping found in .gitmodules for path 'src/external'
09:17 WoodLeg joined #git
09:18 amitprakash My .gitmodules is pasted here https://paste.pound-python.org/show/rPPUJG5yePC4G8BnlQ2k/ , and external one other submodule (which I don't see in .gitmodule, but is present at .git/modules/src/external/<name>
09:18 amitprakash How do I go about fixing my repo?
09:18 fenris_mid amitprakash: have you made an init on the submodules?
09:18 fenris_mid "git submodule init"
09:18 amitprakash I had, I am guessing I've screwed this up somehow
09:18 amitprakash git submodule init throws the same issue "fatal: No url found for submodule path 'src/external' in .gitmodules"
09:18 wcpan joined #git
09:19 xall joined #git
09:20 kineticrootkit[m joined #git
09:20 morenoh149 joined #git
09:21 InfoTest joined #git
09:21 Glooomy joined #git
09:22 ayjay_t joined #git
09:22 thebope joined #git
09:23 wxg joined #git
09:26 clmsy joined #git
09:27 VSpike left #git
09:27 meauses joined #git
09:27 kedare joined #git
09:28 a_thakur joined #git
09:29 sangy joined #git
09:30 amitprakash fenris_mid, rm -fR'ed .git and recreated all
09:30 amitprakash seems to work fine, though I've lost my history
09:34 fenris_mid hm, ok
09:34 b3kNik joined #git
09:36 done joined #git
09:39 subhojit777 joined #git
09:42 venmx joined #git
09:42 SwiftMatt joined #git
09:44 chll_ joined #git
09:50 sawk joined #git
09:50 wxg joined #git
09:51 systemovich joined #git
09:52 frank209 joined #git
09:52 GavinMagnus joined #git
09:54 frank209 left #git
09:56 mindriot101 joined #git
09:57 nikivi joined #git
09:57 systemovich joined #git
09:59 mar77i joined #git
09:59 mindriot101 joined #git
10:01 JeroenT joined #git
10:01 Serpent7776 joined #git
10:02 c1pher joined #git
10:02 b3kNi joined #git
10:03 xaa joined #git
10:03 c1pher joined #git
10:04 c1pher joined #git
10:05 c1pher joined #git
10:06 c1pher joined #git
10:10 qasaur joined #git
10:11 garethdaine joined #git
10:12 nikhita joined #git
10:15 BSaboia joined #git
10:16 geoid_ joined #git
10:18 mrkake joined #git
10:23 mablae joined #git
10:26 irco joined #git
10:29 mar77i how can I list all files in a certain commit, even if they weren't changed?
10:30 mar77i in that commit, I mean.
10:30 _ikke_ git ls-tree <commit>
10:31 mar77i ah, cool
10:31 cdown joined #git
10:38 ayjay_t joined #git
10:40 JeroenT joined #git
10:40 xall joined #git
10:41 CheckDavid joined #git
10:42 mattias__ joined #git
10:42 done joined #git
10:43 qswz joined #git
10:43 qswz how I can rebase my branch only the last commit to the master head?
10:43 qswz I could cherry-pick, but.. there must be a better way
10:43 jknetl joined #git
10:43 selckin q doesn't make sense to me
10:44 qswz hmm i'll go down a commit and rebase
10:44 qswz my branch A--B--C--D--E
10:44 qswz master: A--X (<- squashed commit until D)
10:45 BadSnappa_ joined #git
10:45 qswz apparenly people like to merge squash using github
10:45 Gonzo89 joined #git
10:45 rnsanchez joined #git
10:46 selckin if you just rebase it would probably drop the now empty commits and you have A-X-E
10:47 maret joined #git
10:47 qswz ah :( both ways I've ton of conflicts
10:48 jaguarmagenta joined #git
10:50 wrouesnel joined #git
10:51 Guest32435 joined #git
10:51 ahmedelgabri joined #git
10:55 ISmithers joined #git
10:58 Endarked joined #git
10:58 qswz bah ended up cherrypicking
10:59 tvw joined #git
10:59 qswz selckin: I was on my branch, I did git rebase master (the A--X branch)  and it failed, failed also with doing git co HEAD~1 .. git co -b temp.. git rebase master.  And also with git rebase master -s ours
10:59 earational joined #git
10:59 earational hey
11:09 morenoh149 joined #git
11:10 re1_ joined #git
11:11 cao_ joined #git
11:11 King_Hual joined #git
11:12 kulelu88 joined #git
11:12 mar77i_ joined #git
11:19 xall joined #git
11:19 armin joined #git
11:23 garethdaine joined #git
11:24 brillenfux_ joined #git
11:25 osse joe
11:25 rory left #git
11:25 osse where you goin' with that gun in your hadn
11:26 alhariel joined #git
11:33 russ_za joined #git
11:34 cdown joined #git
11:36 Shentino joined #git
11:36 venmx joined #git
11:38 Marbug joined #git
11:39 armin joined #git
11:40 ashokrajar joined #git
11:42 meauses joined #git
11:43 hussam_ joined #git
11:44 p1ngarn joined #git
11:48 JeroenT joined #git
11:49 leehambley joined #git
11:54 a3Dman joined #git
11:56 heinrich5991 joined #git
11:57 jozwior joined #git
11:58 pijiu joined #git
11:59 armin joined #git
12:00 pijiu joined #git
12:00 jeffreylevesque joined #git
12:01 pijiu joined #git
12:02 rorro joined #git
12:02 pijiu joined #git
12:04 pijiu joined #git
12:05 pijiu joined #git
12:05 paladinn joined #git
12:05 JeroenT joined #git
12:06 oskarkv joined #git
12:06 pijiu joined #git
12:06 ahmedelgabri joined #git
12:08 pijiu joined #git
12:09 PHPanos joined #git
12:10 pijiu joined #git
12:10 interrobangd joined #git
12:11 GavinMagnus left #git
12:11 pijiu2 joined #git
12:12 JeroenT joined #git
12:13 pijiu2 joined #git
12:14 cao_ joined #git
12:15 pijiu2 joined #git
12:16 pijiu2 joined #git
12:19 a3Dman joined #git
12:19 b3kNi joined #git
12:19 b3kN joined #git
12:19 b3kN joined #git
12:20 noidea joined #git
12:20 p4trix joined #git
12:26 meauses joined #git
12:29 venmx joined #git
12:29 a3Dman joined #git
12:30 rominronin joined #git
12:31 LiohAu joined #git
12:31 LucaTM_ joined #git
12:33 Darcidride joined #git
12:33 gniourf joined #git
12:35 dsdeiz joined #git
12:35 PHPanos joined #git
12:36 p0wn3d joined #git
12:36 sdothum joined #git
12:36 LucaTM joined #git
12:36 freimatz Hi, i have a problem with a working copy. "git status" SAYS "nothing to commit, working directory clean", but "git checkout master -f" tells me "error: Entry '_dev/src/Ui/Construct/ConstructFrameInput.dfm' not uptodate. Cannot merge." - waht can i do?
12:37 mischat joined #git
12:37 Spec-Chum joined #git
12:39 xall joined #git
12:39 freimatz hm, i renamed this file and all works fine ...
12:39 jknetl joined #git
12:41 Oatmeal joined #git
12:43 cbreak freimatz: maybe someone did something weird, type git update-index --really-refresh
12:44 freimatz someone? it have to be me :-) ok thanks
12:45 JeroenT joined #git
12:45 pijiu3 joined #git
12:49 JeroenT_ joined #git
12:49 qasaur joined #git
12:49 jaguarmagenta joined #git
12:50 Akimb joined #git
12:50 johnmilton joined #git
12:51 Karazhan joined #git
12:52 oaao joined #git
12:52 alwyn joined #git
12:53 oaao joined #git
12:56 ismithers joined #git
12:58 morenoh149 joined #git
13:01 sven7 joined #git
13:01 LBV_User joined #git
13:02 mischat_ joined #git
13:03 encod3 joined #git
13:04 Tevi joined #git
13:08 meauses joined #git
13:08 flcnmv joined #git
13:10 JanC_ joined #git
13:11 cao_ joined #git
13:12 UniFreak joined #git
13:14 JamesBaxter joined #git
13:14 johnmilton joined #git
13:16 cqi joined #git
13:18 hhee joined #git
13:21 a3Dman joined #git
13:22 mindriot_ joined #git
13:24 qws-user-1229 joined #git
13:24 thebope joined #git
13:26 treehug88 joined #git
13:27 mindriot101 joined #git
13:28 synthroid joined #git
13:30 rchavik joined #git
13:30 rominronin joined #git
13:32 tlaxkit joined #git
13:32 jeffreylevesque joined #git
13:33 davimore__ joined #git
13:34 PHPanos joined #git
13:37 anonymuse joined #git
13:38 str joined #git
13:38 UniFreak joined #git
13:40 PHPanos joined #git
13:41 d0nn1e joined #git
13:41 Nilesh_ joined #git
13:43 a3Dman joined #git
13:43 biertie joined #git
13:44 xall joined #git
13:44 tlaxkit joined #git
13:48 BSaboia joined #git
13:49 Xeog joined #git
13:50 Starky joined #git
13:50 Xethron joined #git
13:50 Starky joined #git
13:50 PHPanos joined #git
13:51 hashpuppy joined #git
13:51 manuels joined #git
13:54 fmcgeough joined #git
13:54 ShekharReddy joined #git
13:55 rnsanchez_ joined #git
13:56 Gloomy joined #git
13:56 Xethron joined #git
13:58 mischat joined #git
14:03 cdown_ joined #git
14:03 Snugglebash joined #git
14:05 tjone270 joined #git
14:05 ande joined #git
14:07 Slick joined #git
14:07 mischat joined #git
14:08 meauses joined #git
14:09 kedare joined #git
14:09 thinkfat joined #git
14:10 noecc joined #git
14:11 knittl joined #git
14:11 Sonderblade joined #git
14:15 polyrob joined #git
14:16 rominronin joined #git
14:16 PHPanos joined #git
14:16 sssilver joined #git
14:16 xall joined #git
14:20 lindenle joined #git
14:22 ExoUNX joined #git
14:24 jimi_ joined #git
14:24 Sonderblade joined #git
14:24 thebope joined #git
14:25 Sonderblade joined #git
14:25 BadSnappa joined #git
14:25 f3r70rr35f joined #git
14:27 dviola joined #git
14:27 ToBeCloud joined #git
14:28 Sonderblade joined #git
14:28 Es0teric joined #git
14:28 ToBeCloud joined #git
14:30 ToBeCloud joined #git
14:30 PHPanos joined #git
14:30 todd_dsm joined #git
14:32 holgersson joined #git
14:32 zivester joined #git
14:33 TomyWork joined #git
14:33 mischat_ joined #git
14:34 thinkfat left #git
14:34 WoodLeg joined #git
14:36 AaronMT joined #git
14:38 meauses joined #git
14:40 ieee joined #git
14:41 NeverDie joined #git
14:42 c1pher joined #git
14:43 c1pher joined #git
14:44 c1pher joined #git
14:44 phantombeta joined #git
14:44 phantombeta left #git
14:45 c1pher joined #git
14:45 djb-irc joined #git
14:45 c1pher joined #git
14:46 c1pher joined #git
14:47 morenoh149 joined #git
14:47 Dougie187 joined #git
14:48 venmx joined #git
14:50 jaguarmagenta joined #git
14:51 eivarv joined #git
14:51 hhee joined #git
14:53 rorro joined #git
14:53 mindriot101 joined #git
14:54 cdg joined #git
14:54 intellix joined #git
14:56 nettoweb1 joined #git
14:56 inflames joined #git
14:56 intellix joined #git
14:57 JeroenT joined #git
14:57 blackwind_123 joined #git
14:58 JeroenT joined #git
14:58 Gsham joined #git
14:58 PHPanos joined #git
15:00 mischat joined #git
15:00 rominronin joined #git
15:01 nicksloan joined #git
15:02 djb-irc joined #git
15:02 Ultra_DuckZ joined #git
15:03 sangy joined #git
15:03 Ultra_DuckZ hi, anybody knows of any linux tools to build fancy graphs from a repository's log? like the one from github for example, with number of commits per date
15:03 canton7 Ultra_DuckZ, !lol
15:03 gitinfo Ultra_DuckZ: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
15:04 canton7 also tig
15:05 al-damiri joined #git
15:05 Anupkumar joined #git
15:05 Es0teric joined #git
15:05 sangy also gitk. I never use it, so I don't know the status of it anymore
15:06 garethdaine joined #git
15:06 canton7 gitk's still awesome
15:06 Ultra_DuckZ canton7: I had something like this in mind, rather https://github.com/KingDuckZ/dindexer/graphs/contributors
15:06 Nugget joined #git
15:06 canton7 Ultra_DuckZ, aah, though you meant the 'Network' tab
15:06 Ultra_DuckZ I do use gitk and tig sometimes, but afaict they only give you the history, not the stats
15:07 griffindy joined #git
15:07 canton7 there might be some stuff you can do with man git shortlog?
15:07 gitinfo the git-shortlog manpage is available at http://jk.gs/git-shortlog.html
15:07 sangy maybe with some git shortlog trickery and matplotlib :P
15:08 Ultra_DuckZ hmm if there is some script/project that is already known to work correctly, that would save me a couple sleepless nights :)
15:08 ResidentBiscuit joined #git
15:08 sangy not that I know of, sorry
15:09 Rodya_ joined #git
15:11 venmx joined #git
15:12 intellix joined #git
15:12 Dougie187 Ultra_DuckZ: maybe this helps? https://gist.github.com/eyecatchup/3fb7ef0c0cbdb72412fc
15:13 Dougie187 They are things you should be able to figure out from the man page, but maybe this will get you somewhere quicker?
15:13 mischat joined #git
15:14 rominronin joined #git
15:14 strk joined #git
15:14 strk why would `git describe` not use a known tag ? is it not in the chain to HEAD ?
15:15 ilmari strk: it only uses annotated tags by default, try --tags
15:15 jfr joined #git
15:16 jstimm joined #git
15:19 ash_workz joined #git
15:19 r4nd0m0ne joined #git
15:21 fees joined #git
15:21 thebope joined #git
15:23 r4nd0m0ne joined #git
15:24 Ultra_DuckZ Dougie187: yes, that's very useful
15:25 GT4066 joined #git
15:25 Ultra_DuckZ a coworker is suggesting git summary as well, I think a combination of all these + libreoffice will give what I need
15:27 pzp joined #git
15:27 pzp Hi
15:27 gitinfo pzp: 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.
15:27 pzp I have the diff of some staged changes
15:27 pzp How can I see what the file would look like if I were to commit said changes?
15:28 pzp I guess the "resolution" of the diff?
15:29 rominronin joined #git
15:29 davidosomething joined #git
15:30 Noldorin joined #git
15:31 e14 joined #git
15:31 Junior left #git
15:31 Junior joined #git
15:32 Es0teric joined #git
15:33 osse pzp: git show :0:path/to/file.txt
15:33 osse that gets the file from the index (staging area)
15:34 pzp osse: Thanks
15:34 osse so it includes stages changes but not unstaged changes
15:34 pzp nice
15:34 Ryanar hey guys I tried to pull changes from my remote repository and got a `fatal: loose object <hash> (stored in .git/objects/<id>/<hash>) is corrupt`
15:34 pzp I'm going to need to alias that one
15:34 osse pzp: do you have unstaged changes to the file ?
15:34 pzp yes
15:34 stalk joined #git
15:34 osse ok
15:34 jstimm joined #git
15:34 osse then i guess you know that if you didn't then the "resolution" would just be the file itself :p
15:35 pzp osse: haha yes
15:35 pzp osse: I'm applying patches
15:35 icedwater Nice, thanks osse and pzp for asking the question :)
15:35 pzp I basically forgot to commit for an entire project so I'm doing it now step by step
15:35 stalk hello
15:35 gitinfo stalk: 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.
15:35 phantombeta joined #git
15:35 phantombeta left #git
15:35 icedwater pzp: wait, you're reproducing the changes commit by commit? :p
15:36 pzp icedwater: Indeed
15:36 rnsanchez joined #git
15:36 dviola joined #git
15:36 pzp I want people to be able to follow the process I took
15:36 icedwater Fun times. Where were they tracked, though, does your workflow make patches as well?
15:36 pzp icedwater: They weren't tracked
15:36 pzp that was the problem
15:37 pzp I added a bunch of new files and forgot to add them to git
15:37 icedwater Yeah... so this is reproducing from memory? I thought so, but my question was how would you know?
15:37 a3Dman joined #git
15:37 stalk Quick question: What should I do after a git init in an empty new folder to have the same behaviour as git clone <url>. `pull` would be the logical next step but I think there is some config that is done with a clone?
15:37 icedwater Or is it just one set of files you forgot to commit :p
15:37 bannakaffalatta joined #git
15:37 PHPanos joined #git
15:37 pzp icedwater: Yeah it's all from memory.
15:38 pzp icedwater: It was only about two days of stuff
15:38 icedwater stalk: I think it's a pull, then the remote is set for push and pull?
15:38 pzp so not a big deal
15:38 icedwater pzp: ah, OK, I thought it was from the beginning....
15:38 kpease joined #git
15:40 r4nd0m0ne joined #git
15:40 LionsMane joined #git
15:41 shinnya joined #git
15:41 LionsMane joined #git
15:41 stalk icedwater: I did "git remote add origin <url>" before the pull, and then just "git pull", but that's not enough
15:42 Kature joined #git
15:43 stalk I think I've got the semantic of "git remote add origin <url>" wrong, because my idea would be that then, "git pull" would behave exactly as "git pull <url>"
15:43 Kature left #git
15:44 morenoh149 joined #git
15:44 BadSnappa joined #git
15:45 tjone270_ joined #git
15:45 mischat_ joined #git
15:46 alwyn left #git
15:46 icedwater I don't know exactly either, but it probably has something to do with git push -u origin master in the default init case.
15:47 nikivi joined #git
15:47 icedwater Because clone already defines an upstream (where you clone from), so you may need to set that configuration as well
15:47 strk ilmari: same with --tags, it wasn't reachable from HEAD
15:48 strk btw, (how) can tags be removed on a remote ?
15:48 zivester joined #git
15:48 r4nd0m-0ne joined #git
15:49 User458764 joined #git
15:49 meauses joined #git
15:49 Takumo joined #git
15:49 Takumo joined #git
15:50 icedwater stalk: looks like it's something to the effect of git config branch.<name>.merge <remote branch reference>
15:50 User458764 joined #git
15:50 joki joined #git
15:51 strk stalk: yep, "origin" isn't necessarely special (but could be a default name for some operations)
15:54 stalk mmh, yeah
15:55 crose joined #git
15:55 stalk I've looked at .git/config after a clone, I think that tells you what has been configured
15:55 sssilver joined #git
15:56 xall joined #git
16:01 Seveas stalk: git push -d remotename refs/tags/tagname
16:01 jstimm joined #git
16:02 delboy1978uk joined #git
16:02 delboy1978uk how do I git reset --hard HEAD, ditching all untracked files?
16:03 imMute delboy1978uk: git clean  can help with that
16:03 Seveas you'll need to combine that with git clean -dfx
16:04 delboy1978uk ah ok thanks imMute Seveas :-)
16:07 byte512 joined #git
16:07 JanC_ joined #git
16:07 stalk https://stackoverflow.com/questions/3620633/what-is-the-difference-between-pull-and-clone-in-git
16:08 mdk joined #git
16:08 stalk I should have googled before, sorry guys!
16:09 mindriot101 joined #git
16:09 delboy1978uk thanks again guys, all sorted now!
16:09 delboy1978uk left #git
16:09 mischat joined #git
16:11 ojdo joined #git
16:11 mischat_ joined #git
16:12 clemf joined #git
16:12 mdk Hi, I have a question about --force-with-lease: If one pulled and commited before a rebase + push-with-lease, both will have different histories. Those histories will have both same commits but different sha1s. I find this ugly. I bet a "git pull --rebase" will sort this cleanly instead of a git pull? Is there some nice publications about this? Does someone consider having duplicate commit with different sha1
16:12 mdk "acceptable"? Of does everyone think that the merge should be reseted and a pull --rebase should be done instead?
16:14 morenoh149 is there a way to get git blame to suppress the sha1 and timestamp? I just want the author name or author email on every line
16:14 Takumo joined #git
16:14 Takumo joined #git
16:14 mindriot101 joined #git
16:15 qqx joined #git
16:15 davidfetter_ge joined #git
16:15 raspado joined #git
16:15 selckin mdk: pull --rebase should always be default imo
16:16 mdk selckin: I did not tested (outside of a brain simulation) but pull --rebase solves cleanly the duplicate-commit-different-sha1 of a git pull of a rebased-and-push-force-with-lease branch?
16:17 IrishPrime joined #git
16:17 selckin mdk: well when rewriting history you're in trouble, if the commits match up it should drop them since they become empty
16:18 Electrometro joined #git
16:18 selckin mdk: but randomly git pull'ing creates many silly merges that are just poluting the history
16:18 mdk selckin: Yep I consider using --force-with-lease _only_ to push rebases, not modify history
16:18 selckin mdk: still modifies history
16:18 irco joined #git
16:19 rorro joined #git
16:19 Es0teric joined #git
16:20 mdk yes, but commits are matching, so they'll be cleanly deduplicated by the pull --rebase ?
16:20 paws_ joined #git
16:20 mdk or not-so-cleanly maybe, by a kind of conflict and asking for an explicit git pull --skip?
16:20 mdk `git rebase --skip` sry
16:20 selckin usually it will
16:21 alfism joined #git
16:21 subhojit777 joined #git
16:21 Siegfried joined #git
16:22 mdk cool, so it _may_ be considered a good practice? I consider the early publication of everyone branches so everyone can review, but pushing a branch early may benefit in some rebases in some circonstances, and as I discovered --force-with-lease, I was trying to see if everything work together cleanly
16:22 PHPanos joined #git
16:23 e14 joined #git
16:24 korryd joined #git
16:24 crayon joined #git
16:24 leeN joined #git
16:24 mindriot101 joined #git
16:24 madewokherd joined #git
16:24 crayon joined #git
16:25 zeroed joined #git
16:25 zeroed joined #git
16:25 tyreld joined #git
16:26 venmx joined #git
16:27 Es0teric joined #git
16:27 alex1a_ joined #git
16:31 Gsham joined #git
16:32 cdown joined #git
16:34 Cathy joined #git
16:34 synthroid joined #git
16:34 cebor joined #git
16:36 mischat__ joined #git
16:36 cebor joined #git
16:36 lindenle joined #git
16:36 Salander27 joined #git
16:38 Cathy joined #git
16:41 Oatmeal joined #git
16:43 dreiss joined #git
16:43 nikivi joined #git
16:46 qswz left #git
16:49 Soumu joined #git
16:49 Es0teric joined #git
16:49 intellix joined #git
16:50 Soumu left #git
16:51 intellix joined #git
16:51 jaguarmagenta joined #git
16:51 Es0teric joined #git
16:52 cstratak joined #git
16:52 davimore_ joined #git
16:53 cstratak joined #git
16:57 kbs left #git
16:57 Akimb joined #git
17:02 Gsham joined #git
17:04 sdelic joined #git
17:04 UTAN_dev joined #git
17:05 rominronin joined #git
17:06 stompleee joined #git
17:06 moei joined #git
17:07 stompleee joined #git
17:07 Derperperd joined #git
17:07 leehambley joined #git
17:08 rominron_ joined #git
17:08 Siegfried joined #git
17:08 stomplee joined #git
17:13 cn28h joined #git
17:13 Akimbas joined #git
17:14 cn28h is there a way I can tell git to work on a specific repo without changing my cwd to somewhere inside it? the GIT_WORK_TREE env var seemed like what I wanted, but even after setting it git won't work outside my repo
17:14 Sonderblade joined #git
17:14 durham joined #git
17:15 cn28h and mainly I want to do it because this is scripted, and I rather dislike relying on cwd inside scripts
17:15 venmx joined #git
17:15 mindriot101 joined #git
17:16 edaught joined #git
17:17 durham joined #git
17:18 cn28h aha, I need to also set GIT_DIR and it works (I assumed it would default to $GIT_WORK_TREE/.git)
17:18 armin joined #git
17:19 Sonderblade joined #git
17:20 rominronin joined #git
17:21 serard__ joined #git
17:21 serard__ left #git
17:21 strk left #git
17:21 serard joined #git
17:21 serard hello
17:22 serard how can I globally configure my git to push tags when I git push ?
17:26 InfoTest joined #git
17:27 robotroll joined #git
17:28 matsaman joined #git
17:30 geoid_ joined #git
17:31 lungaro does git keep a pointer to the last time I fetched somehow?
17:31 lungaro sometimes the pull is too big and I miss the previous tag
17:31 lungaro tag=commish
17:32 e14 joined #git
17:32 edaught_ joined #git
17:32 dreiss joined #git
17:33 Akimb joined #git
17:34 e14 joined #git
17:35 polyrob joined #git
17:35 polyrob joined #git
17:38 Derperperd joined #git
17:41 kbs joined #git
17:46 svm_invictvs joined #git
17:47 jccn joined #git
17:48 ruby joined #git
17:50 CubiK joined #git
17:51 leehambley joined #git
17:56 Es0teric joined #git
17:57 flavius joined #git
17:57 sbeller_ joined #git
17:58 cbreak lungaro: git remote -r shows all remote branches from the last time you fetched normally
17:58 cbreak lungaro: git reflog also has some informations
17:58 User458764 joined #git
18:02 azerus joined #git
18:02 griffindy joined #git
18:04 ochorocho__ joined #git
18:07 nikivi joined #git
18:08 Learath2 joined #git
18:09 cstratak_ joined #git
18:11 Gloomy joined #git
18:12 xall joined #git
18:13 mischat joined #git
18:15 nidr0x joined #git
18:15 Rodya_ joined #git
18:18 DolphinDream joined #git
18:19 DolphinDream left #git
18:19 DolphinDream joined #git
18:19 DolphinDream howdy
18:19 Pyrogerg joined #git
18:19 matsaman hi
18:20 DolphinDream if i have a remote branch A on two remotes .. remote/origin/branchA and remote/alt/branchA .. how do i check out the branchA from say origin ?
18:20 DolphinDream when i say git checkout branchA it says the ref does not exist
18:20 rominronin joined #git
18:21 matsaman git fetch alt; git checkout -b foo alt/branchA ? (just a guess)
18:22 kadoban DolphinDream: You have to use the long form, probably something like 'git checkout -b branchA --track remotes/origin/branchA', you'd probably want to check which arguments are implicit in the shortcut command to be sure.
18:22 DolphinDream https://makandracards.com/makandra/14323-git-how-to-check-out-branches-that-exist-on-multiple-remotes
18:22 DolphinDream matsaman: thx
18:22 hendry joined #git
18:22 DolphinDream kadoban: sure
18:24 davimore__ joined #git
18:25 UTAN_dev_ joined #git
18:29 kbs joined #git
18:30 mikecmpbll joined #git
18:33 hariel joined #git
18:33 railssmith joined #git
18:33 r4nd0m-0ne joined #git
18:34 Alienpruts joined #git
18:34 vuoto joined #git
18:35 WayToDoor joined #git
18:35 button joined #git
18:39 r4nd0m-0ne joined #git
18:43 Thorn joined #git
18:43 r4nd0m-0ne joined #git
18:45 r4nd0m-0ne joined #git
18:46 jstein_ joined #git
18:46 cagedwisdom joined #git
18:47 thiago joined #git
18:48 dreiss joined #git
18:49 Mobutils joined #git
18:50 Mobutils joined #git
18:50 eivarv joined #git
18:51 jaguarmagenta joined #git
18:52 EricPoe joined #git
18:56 Infinite_182 joined #git
18:57 King_DuckZ joined #git
18:58 King_DuckZ hello again, I'm using git diff --numstat hash hash~ to get the stats for each commit in my repo, but when I hit the first commit I get an error because hash~ doesn't exist
18:58 King_DuckZ is there a better way to say "git diff of one commit compared to previous *if any*"?
18:59 TomyWork joined #git
19:01 osse King_DuckZ: try git diff hash^!
19:01 Sasazuka joined #git
19:02 King_DuckZ cool, what does ^! mean?
19:02 King_DuckZ osse: ?
19:02 osse King_DuckZ: "The r1^! notation includes commit r1 but excludes all of its parents."
19:03 King_DuckZ ok thanks! :)
19:04 osse hmm, does'nt seem to work properly for the initial commit
19:04 osse it diffs against the working dir instead
19:05 osse also you got it the wrong way: hash~ hash
19:05 matsaman joined #git
19:06 King_DuckZ ah true, now I see it's listing files that weren't there in the first commit
19:06 CheckDavid joined #git
19:07 thiago joined #git
19:09 King_DuckZ found http://stackoverflow.com/questions/14564034/creating-a-git-diff-from-nothing
19:09 King_DuckZ see second answer
19:09 King_DuckZ need the dummy hash
19:09 spm_draget left #git
19:10 osse git show --format= --numstat hash  \o/
19:10 guampa joined #git
19:11 King_DuckZ oh
19:11 King_DuckZ let me see
19:11 Rodya_ joined #git
19:13 King_DuckZ cool it looks correct and it saves me from having to deal with the special case! :)
19:13 jimi_ joined #git
19:14 osse how interesting is a numstat for the initial commit though
19:15 King_DuckZ I'm trying to make a graph that shows the amoount of commits/lines per author over time
19:16 King_DuckZ so if I skip the first commit the first committer doesn't get credited for his lines
19:16 e14 joined #git
19:18 osse that's my point really. should he? Usually initial commits are huge and represent a lot of work, possible by several people
19:18 osse depends on the project I guess
19:18 osse or the initial commit is based on a template. wordpress or something like that
19:18 thiago joined #git
19:19 King_DuckZ in the specific case I need this for it's a genuine commit with a few new files made from scratch
19:19 ToBeCloud joined #git
19:19 King_DuckZ I'm going to publish my script on github, for the sake of generalizing it I can add some --skip-first switch at some point
19:19 King_DuckZ but I'm in a hurry atm
19:19 obiwahn http://paste.debian.net/896449/
19:20 osse sounds good to me
19:20 obiwahn how do i put the 2 upper commits on master?
19:20 obiwahn i have tried rebase a few times not but it is probably not what i want
19:20 osse obiwahn: re-order the commits with git rebase -i, then merge the second commit into master
19:21 ToBeCloud joined #git
19:21 obiwahn would it make sense to cherry pick?
19:21 mutex joined #git
19:22 boombatower joined #git
19:22 osse yes, but then you get duplicates. it makes sense, but only if you rebase the other branch on top of master afterwards
19:22 nettoweb joined #git
19:22 osse but it may be the most straight-forward solution, if you're familiar with cherry-pick but not rebase -i
19:24 tostiheld joined #git
19:24 obiwahn i thought i was :P but i am not able to find the correct command i have tried all combinations of git rebase -i x y
19:24 Rodya_ joined #git
19:24 osse it's supposed to open your editor, then you do stuff in it
19:24 obiwahn i know i had noop when i expected something else
19:25 osse git checkout boost_1.62-arango_bootstrapped; git rebase -i master; re order the commits; save and quit
19:25 obiwahn and if i had the correct window then the boost_1.62-arango_bootstrapped changed but not the master
19:25 tostiheld hi all. encountered a segfault while doing a merge. i'd like to submit a bug report, but the coredump contains sensitive data. the report is pretty much useless without the core dump (i think) and i don't want to post the dump publicly on the mailing list. any advice?
19:25 obiwahn so git rebase -i master boost_1.62-arango_bootstrapped
19:26 osse obiwahn: git rebase x y is equivalent to git checkout y; git rebase x
19:26 obiwahn yes i have read that y is upstream:)
19:26 osse usually x is
19:26 obiwahn you must think i am nuts:P
19:27 obiwahn i have deleted the first commit in vim
19:27 obiwahn as i would like to discard it
19:27 osse sounds good to me
19:28 LionsMane I am using the git svn tools and I am having a problem with the "Unable to determine upstream SVN information from working tree history" problem.  There seems to a LOT of material on the web about it, but I am having a hard time understanding the actual problem.
19:28 obiwahn osse: http://paste.debian.net/896450/
19:28 LionsMane My most recent set of google searches suggest the problem is that a cloned repository doesn't have all the required SVN metadata to be able to use the git svn tools.
19:29 osse obiwahn: fantastic
19:29 obiwahn uhm no:)
19:29 osse why not
19:29 obiwahn ok i can reset hard all the stuff
19:29 LionsMane I am looking for some info on how to move forward with having the original repo that I started using with git svn-remote
19:29 obiwahn but i wanted master to move forward
19:29 osse obiwahn: git checkout master; git merge boost_1.62-arango_bootstrapped
19:29 obiwahn and the boost_1.62-arango_bootstrapped should have stayed the same
19:30 obiwahn yes but discarding the one change
19:30 osse then you should not have rebased it
19:30 mindriot101 joined #git
19:31 obiwahn the easiest way would be a checkout boost... -- CMakeLists.txt on master
19:32 jstimm joined #git
19:32 obiwahn Is there some nice way? The checkout is feasible for one or a few files.
19:32 King_DuckZ I collected all the info I need, now I have to find some way to make a graph like this as quickly and nicely as possible http://bitcoinity.org/markets
19:33 osse obiwahn: yes, the easy way is one of the two ways we discussed initially
19:33 King_DuckZ if anybody knows of a library or tool for linux that's much appreciated
19:33 eivarv joined #git
19:33 obiwahn wasn't the rebase one of them?
19:33 osse obiwahn: yes, but I suggested you reorder the commits, not remove one of them
19:34 obiwahn and then just rest master to be one behind the boost branch
19:34 osse yes, that was my thought
19:34 tostiheld King_DuckZ: do you mean a graph of a git repo's history?
19:35 morenoh149 joined #git
19:36 adac joined #git
19:37 King_DuckZ tostiheld: yeah, I'm not sure, I need to find out something first
19:37 alcohol joined #git
19:37 osse gnuplot is efficient, but not as pretty as this
19:37 hackel joined #git
19:38 Glooomy joined #git
19:38 korryd joined #git
19:38 tostiheld King_DuckZ: gitlab has some pretty sweet graph functionality, you can look up how they do it
19:39 jrnieder joined #git
19:40 dodobrain joined #git
19:43 sector9 joined #git
19:43 sector9 left #git
19:45 King_DuckZ I'm not sure I've seen what I've got in mind anywhere yet - I want to show what my contribution was on a certain project, but either measuring modified lines or number of commits sounds wrong, yet they are a sign of activity
19:46 King_DuckZ so if I overlap the two info as in that graph (click on "WTF?" for an explanation of the graph)
19:47 lacour joined #git
19:47 King_DuckZ hopefully that's more informative as you would see for example that on a given day I did plenty of commits but only modified a few lines, so I was probably fixing the build or experimenting something
19:48 tostiheld in my company we just talk to eachother :p sure, graphs are nice to give an overview, but when my boss asks "what have you done today", i just show and tell him
19:49 King_DuckZ yeah, I wish I was in such a friendy place
19:49 King_DuckZ my job depends partly on how well this graph will speak in my favour...
19:50 tostiheld that sucks
19:52 rominronin joined #git
19:52 tostiheld maybe you should talk to your team (if you have a team) and decide to use scrum with a burndown chart or something. burndown charts usually work well to give the management an idea of how hard you are working
19:53 tostiheld or how well the project is getting on
19:54 Rodya_ joined #git
19:56 WoodLeg joined #git
19:57 fatalhalt joined #git
20:00 King_DuckZ yeah we have that already, but story points are pretty much random... and we have plenty of stories that are worth 0
20:00 King_DuckZ it's being conducted in a very bad way, so my best bet is git commits
20:01 tostiheld then the scrum master should be fired not you lol. but i do get it. project management is hard.
20:02 King_DuckZ I know, he really should - it's unclear to me why he's still there
20:02 garethdaine joined #git
20:03 davimore_ joined #git
20:05 Forkk joined #git
20:05 jephsf joined #git
20:05 polyrob joined #git
20:06 jab416171 joined #git
20:07 nunchuck joined #git
20:08 mischat joined #git
20:08 exospecies joined #git
20:08 finalbeta joined #git
20:10 exospecies hey, wondering about git ftp, i'm getting a problem that says the directory doesn't exist, though it says so instantly without seemingly attempting to connect... doesn't really output anything about connecting when using -vv either
20:11 osse what's "git ftp"? :O
20:13 exospecies it's a git powered ftp client, perhaps someone in here knows how to use it
20:13 osse ah
20:13 Random832 git powered?
20:13 Darren_ joined #git
20:13 kadoban How would git power an FTP client? That sounds very weird.
20:13 exospecies from description: "Git-ftp is a FTP client using Git to determine which local files to upload or which files to delete on the remote host." -- https://github.com/git-ftp/git-ftp/blob/develop/man/git-ftp.1.md
20:13 osse Random832: bunch of gits on exercise bikes pedaling like crazy
20:14 pijiu3 joined #git
20:15 kadoban Sounds like what I'd use rysnc for, but I ignored some details I don't feel like reading about.
20:15 nanonyme Is that seriously not an April fool's day joke?
20:16 exospecies it's for servers which don't offer ssh access
20:17 noidea joined #git
20:17 noidea joined #git
20:18 davimore__ joined #git
20:18 causasui joined #git
20:19 causasui joined #git
20:19 nanonyme I don't seriously get why anyone would prefer giving that out instead of SSH with nologin
20:21 davimore joined #git
20:21 preaction existing machines in weird situations. there are likely also machines that do not have ssh still out there
20:22 romerocesar joined #git
20:22 finalbeta joined #git
20:23 WoodLeg joined #git
20:24 tlaxkit joined #git
20:24 davimore_ joined #git
20:24 e14 joined #git
20:28 ggVGc joined #git
20:30 _leb joined #git
20:30 tvw joined #git
20:30 aidalgol joined #git
20:30 p4trix joined #git
20:31 HoierM joined #git
20:33 Faylite joined #git
20:34 crayon joined #git
20:36 Akimbas joined #git
20:38 dviola joined #git
20:39 davimore joined #git
20:41 matsaman joined #git
20:44 weylin joined #git
20:45 dviola joined #git
20:46 davimore_ joined #git
20:49 Jackneill_ joined #git
20:49 e14 joined #git
20:49 mdiehl joined #git
20:49 mdiehl Hi all.
20:49 gitinfo mdiehl: 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.
20:51 mdiehl Is it possible to comment a change for a single file and have that comment sent up when the commit happens?
20:51 preaction why not just commit it?
20:51 mmlb_ joined #git
20:52 mdiehl Well, I did a lot of work on one issue, but made a few trivial changes to another file that weren't related to the other issue.
20:52 mdiehl Does that make sense?
20:52 mdiehl Or am I being anal?
20:52 jaguarmagenta joined #git
20:53 mdiehl Um ya.  I'm new to git.
20:53 preaction so commit the unrelated changes first using "git add" and then "git commit" (don't use the -a flag), then you can commit the other changes
20:53 preaction the "git add" lets you create and tailor the commit to what you want, then you can just do "git commit"
20:54 preaction i frequently do this. i even use "git add -p" to go through all the changes inside each file and choose which parts to keep in the commit
20:56 jstimm joined #git
20:56 worktoner joined #git
20:57 worktoner Is this a good place to ask a question related to git bash?
20:57 mdiehl Cool.  Thanks.
20:57 mdiehl I've only been using git.... today.
20:57 mdiehl Made 9 commits, though! LOL.
20:58 nwkj86 joined #git
20:59 bambams I'm in kind of a fun situation. We're going a lot of reorganizing paths in the repo. Inevitably, some code was stil in flux while this occurred, and now I'm trying to merge it forward.
20:59 bambams I'm not sure there's a good way to do this. I've essentially restored the MERGE_HEAD files to their new locations. But I can see some new work is lost in the process.
21:01 bambams I'd like to change the index version of files back to HEAD so that I can see the different, and then use git add -p to bring in only the MERGE_HEAD fixes.
21:01 bambams I'm not sure if I can do that without throwing away the index state of being in a merge and the list of initially conflicted files.
21:01 _ikke_ worktoner: As good as a place as any
21:01 bambams If there's a better way I'm all eyes.
21:02 duvnell joined #git
21:03 _ikke_ bambams: Not sure, but perhaps man git work-tree
21:03 gitinfo bambams: the git manpage is available at http://jk.gs/git.html
21:03 _ikke_ man git worktree
21:03 gitinfo the git-worktree manpage is available at http://jk.gs/git-worktree.html
21:03 cjohnson On github in PRs, I've got a PR that has been open for 2 weeks. I did a review of the changes a week ago and since then many more commits have been made. I can see where my review sits in the timeline of commits to know which commits are new
21:04 cjohnson but when I click "view changes" or the "files changed" tab it shows me all changes for the branch. Anybody know how to only check changes since my review?
21:04 kadoban cjohnson: On the CLI or only in their interface?
21:04 cjohnson web interface
21:04 kadoban Hmm, dunno then.
21:04 cjohnson I know I could git diff feature/foo..commitsincereview
21:04 cjohnson just nicer online :)
21:05 cjohnson they are smarter about hiding changes that aren't part of the commits given
21:06 gusnan_ joined #git
21:06 kadoban Hmm? You can certainly see the diff between two commits, which in a line like that will be exactly the changes from the commits in question.
21:06 kadoban I usually like to go commit-by-commit with log --patch as well, but I suspect that's not what you want to do.
21:07 cjohnson Yeah I just want to see the final summary of changes. but you're right I can specify the range manually
21:07 cjohnson I was just hoping the UI was a little nicer
21:07 cjohnson thanks
21:07 kadoban I would hope there is some way in github, I just have no idea how.
21:07 cdg joined #git
21:08 dsdeiz joined #git
21:09 worktoner Does 'legacy data' have a positive connotation as well as a negative one? Similar to a 'dynasty' or a long-lasting brand/product/tool
21:09 noecc left #git
21:09 Pyrogerg joined #git
21:09 _ikke_ worktoner: In software, legacy mostly is negative
21:10 _ikke_ something you inheritted and is hard to maintain
21:10 Lingo joined #git
21:10 kadoban It's pretty much always "that annoying old crap we don't want to have to care about, but are required to"
21:10 garethdaine joined #git
21:10 cjohnson kadoban: yeah you can go to the url /repo/branch/compare/commita...commitb
21:10 worktoner I know it's a terminology that is often used to describe old or aging systems, or systems that are no longer being maintained
21:11 cjohnson and you can use the timeline to get start and stop for those
21:11 worktoner I'm just wondering if it can also mean awesomely long-lived software tools.
21:11 worktoner "Our tool has grown into a legacy!"
21:11 _ikke_ I hardly hear that term used like that
21:11 kadoban I have never seen it used like that.
21:12 cjohnson the positive version of old is "stable"
21:12 vuoto joined #git
21:12 _ikke_ right
21:12 davimore__ joined #git
21:13 shmuli joined #git
21:15 dreiss joined #git
21:15 hackel joined #git
21:15 Es0teric joined #git
21:15 kisonecat joined #git
21:16 adac joined #git
21:16 rorro joined #git
21:21 Rodya_ joined #git
21:21 mdiehl Is there any way for me to configure default login credential so that I don't have to provide a username/password?
21:21 mdiehl When I commit.
21:21 cjohnson git config
21:21 preaction or use ssh keys
21:21 cjohnson best ^
21:22 Seveas commits don't require credentials
21:22 Seveas and for push it depends on the protcol used.
21:22 mdiehl Hmmm... Still learning.
21:23 Seveas aren't we all :)
21:23 rominronin joined #git
21:23 cjohnson not me!
21:23 cjohnson I decided to stop learning
21:23 hahuang65 joined #git
21:24 preaction i choose not to learn that cjohnson has stopped learning
21:24 LionsMane I am having trouble with git svn-remote and the error "Unable to determine upstream SVN information from working tree history"  Can anyone help out with that?
21:25 mdiehl Still learning.... honestly.
21:33 rorro joined #git
21:34 junw joined #git
21:34 WoodLeg joined #git
21:35 mrwat joined #git
21:37 jstimm joined #git
21:37 mdiehl LOL.
21:38 LionsMane Any one have some suggestions about using the git svn-remote tutorial?
21:38 LionsMane I found one, but it very basic.
21:40 mindriot101 joined #git
21:44 shmuli joined #git
21:45 courrier joined #git
21:45 Endarked joined #git
21:48 fmcgeough joined #git
21:50 gigq joined #git
21:51 Pyrogerg joined #git
21:51 shmuli_ joined #git
21:53 e14 joined #git
21:57 dviola joined #git
21:59 anuxivm joined #git
22:00 mischat joined #git
22:01 LaptopBrain joined #git
22:01 paultreny joined #git
22:02 shmuli joined #git
22:03 gargola joined #git
22:05 Starky joined #git
22:06 shmuli_ joined #git
22:08 shmuli joined #git
22:08 _leb joined #git
22:09 apotry joined #git
22:09 dreiss joined #git
22:10 fahadash joined #git
22:12 HM joined #git
22:12 HM left #git
22:12 nanga joined #git
22:14 m0viefreak joined #git
22:14 ISmithers joined #git
22:15 HM joined #git
22:16 t0by joined #git
22:16 t0by joined #git
22:16 HM "git add dir" doesnt seem to work for me inside a submodule
22:16 HM in fact "git status" doesnt show untracked files
22:16 HM what's up with that?
22:16 NeverDie joined #git
22:18 cjohnson a submodule is its own git repository
22:18 _ikke_ is that dir not already tracked?
22:18 _ikke_ HM are you in the parent or in the sub directory?
22:18 cjohnson are you trying to add things from the parent while you're in the submodule dir? that won't work
22:20 dex1983 joined #git
22:20 dex1983 hi
22:20 jimi_ joined #git
22:21 dex1983 how I can add a repo to another repo which is hosted at my own gogs website with another git repo?
22:22 Rodya_ joined #git
22:25 cjohnson wat
22:25 tobiasvl dex1983: I don't understand the question
22:27 dex1983 I have a repo called rep and I want to merge it with a repo called repo :)
22:27 garethdaine joined #git
22:27 cjohnson "merge it" how? do these repos share a commit history?
22:28 dex1983 nope I only want to host the repo online via gogs git service that is all :)
22:28 msonntag joined #git
22:29 tobiasvl dex1983: but what do you want to do with the repos exactly?
22:29 tobiasvl forget gogs at the moment
22:33 jaafar joined #git
22:34 Mobutils joined #git
22:34 GT4066 joined #git
22:36 dex1983 ok :) I only want to add my rep repo to gogs that is all :)
22:37 mischat joined #git
22:39 thebope joined #git
22:40 thebope joined #git
22:41 tobiasvl that's not all, you mentioned "merge"
22:41 OODani joined #git
22:41 dex1983 I created only repo repo on gogs with one md file that was all no more contend
22:42 dex1983 content
22:42 tobiasvl aha. so you do want to merge the "rep" repo, which has unrelated history, into the "repo" repo
22:43 tobiasvl do you need the history to look like anything in particular? you can just do a merge
22:43 tobiasvl add "rep" as a remote to "repo" and pull?
22:43 OODani Is it possible to make the include syntax in git-config include files matching a glob? I have git/config and a directory beside it called tools, with files like git/config/tools/kdiff3 - can I make Git include all files from that subdirectory?
22:43 tobiasvl *fetch and cherry-pick
22:43 kaldoran joined #git
22:44 dex1983 repo has the unrelated history rep has the important history
22:44 dex1983 that I want to merge
22:46 m1dnight_ joined #git
22:47 tobiasvl ok the other way around then
22:47 tobiasvl add "repo" as a remote to "rep", fetch, integrate the history however you wish
22:48 qws-user-1228 joined #git
22:49 mischat joined #git
22:49 dex1983 hmm I am using tortoise git how I could do that
22:49 tobiasvl !gui
22:49 gitinfo Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
22:49 mischat joined #git
22:49 dex1983 oh ok
22:50 mischat joined #git
22:51 mischat joined #git
22:52 mischat joined #git
22:53 mischat joined #git
22:53 jaguarmagenta joined #git
22:53 mischat joined #git
22:54 cao_ joined #git
22:54 mischat joined #git
22:54 matsaman joined #git
22:55 mischat joined #git
22:55 rominronin joined #git
22:56 User458764 joined #git
23:00 Dougie187 left #git
23:00 thebope joined #git
23:01 dsantiago joined #git
23:02 snowkidind joined #git
23:02 jephsf joined #git
23:02 fmcgeough joined #git
23:03 HM joined #git
23:04 HM joined #git
23:04 rossome joined #git
23:06 Anja joined #git
23:07 garethdaine joined #git
23:07 eivarv joined #git
23:08 ramsub08 joined #git
23:09 user2343234 joined #git
23:12 bluezone joined #git
23:12 thierryp joined #git
23:13 venmx joined #git
23:13 WoodLeg joined #git
23:14 ramsub08 Hi, is there a way to see the diff between two branches rather than constantly pressing my "down arrow" key waiting for the terminal to scroll down in its light speed ?
23:14 inflames joined #git
23:14 holodoc joined #git
23:16 osse ramsub08:What do you mean exactly?   git diff branch1 branch2
23:16 ramsub08 git diff branch1..branch2
23:16 ramsub08 i get to see the diff, but it's not in vim or vi editor
23:17 ramsub08 it's on the terminal where I need to keep pressing the key to keep going down
23:17 ramsub08 is there something like a GUI for this?
23:17 dex1983 thanks for help :)
23:17 qqx ramsub: You can pipe the output into a command: git diff branch1 branch2 | vim -
23:17 Peng Your pager is too slow?
23:17 qqx Note the trailing -
23:18 mindriot101 joined #git
23:18 qqx Also, the preffered method of separating branch names in the diff command is with a space, not dots.
23:19 qqx The dot form is to represent a range, but diff only wants two commits.
23:22 mindriot101 joined #git
23:23 jnewt_ joined #git
23:24 mellernoia joined #git
23:24 Rodya_ joined #git
23:25 nidr0x joined #git
23:25 ntnn joined #git
23:26 dex1983 could you give me the console git variant to merge the repos :) tobiasvl?
23:26 osse ramsub08: git difftool branch1 branch2
23:26 osse you can also use page down and up, ya know
23:26 lvns joined #git
23:28 jnewt__ joined #git
23:30 daynaskully joined #git
23:30 romerocesar joined #git
23:33 Topic for #git is now Welcome to #git, the place for git help and The Grand Tour | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.2 | Getting "cannot send to channel"? /msg gitinfo .voice | POWERRRRRR
23:35 jnewt_ joined #git
23:38 dsdeiz joined #git
23:38 dsdeiz joined #git
23:38 jnewt__ joined #git
23:40 noname joined #git
23:43 tjone270_ joined #git
23:47 Zamerick joined #git
23:48 mindriot101 joined #git
23:51 kyan joined #git
23:56 mischat joined #git
23:57 mizu_no_oto joined #git
23:59 SwiftMatt joined #git
23:59 CubiK joined #git

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