Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-03

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

All times shown according to UTC.

Time Nick Message
00:00 Dpl joined #git
00:01 cdg joined #git
00:02 venmx joined #git
00:05 matoro joined #git
00:06 hakzsam joined #git
00:07 mozzarella joined #git
00:07 hakzsam hi, anyone aware of this issue https://hastebin.com/evamakuned.sql ? git 2.12.0 (archlinux)
00:08 thiago joined #git
00:09 btree joined #git
00:10 raedah joined #git
00:10 btree left #git
00:11 sunrunner20 Can I make a sub module fully part of the master repo? Basically nested git repos
00:13 l2y joined #git
00:15 sunrunner20 Trying to figure out the difference between subtrees and sub modules it seems
00:15 Derperperd joined #git
00:15 sunrunner20 Looks like sub modules are for when you have an entirely separate repo you'd like to reference
00:16 sunrunner20 Say, nose.js
00:16 sunrunner20 *node
00:16 kadoban nose.js sounds much more interesting
00:16 sunrunner20 Lol
00:17 sunrunner20 Makes clown noises when you click your mouse on people's noses
00:17 suttonwilliamd_ joined #git
00:17 SwiftMatt joined #git
00:20 Vampire0 sunrunner20, !subr
00:20 gitinfo sunrunner20: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
00:21 sunrunner20 !subtree
00:21 gitinfo The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-To​ols-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.
00:22 adambrenecki joined #git
00:23 netj joined #git
00:23 Anja joined #git
00:23 gelei007 joined #git
00:23 dendazen joined #git
00:24 rivarun joined #git
00:27 kini joined #git
00:30 thebope joined #git
00:31 jeffreylevesque joined #git
00:33 Derperperd joined #git
00:33 qassim joined #git
00:34 rchavik joined #git
00:35 years joined #git
00:38 ExeciN joined #git
00:39 Derperperd joined #git
00:40 gelei007 joined #git
00:47 jimi_ joined #git
00:47 ozmage joined #git
00:51 Lyqyd joined #git
00:53 Anja joined #git
00:54 justanotheruser joined #git
00:59 cqi joined #git
01:00 kexmex joined #git
01:03 dsdeiz joined #git
01:06 bvcosta joined #git
01:06 mu left #git
01:06 xissburg joined #git
01:07 matoro joined #git
01:07 daopu[m] joined #git
01:07 joshszep joined #git
01:07 Retropikzel[m] joined #git
01:10 Sheogorath[m] joined #git
01:11 Salander27 joined #git
01:11 hallogallo[m] joined #git
01:11 hiq[m] joined #git
01:11 dikiaap joined #git
01:11 elwan7[m] joined #git
01:11 Remramm joined #git
01:12 rivarun joined #git
01:12 matoro joined #git
01:13 overlord_tm joined #git
01:13 amosbird joined #git
01:14 UncleCJ joined #git
01:15 saintaquinas[m] joined #git
01:16 Elliott[m]1 joined #git
01:16 dyce[m] joined #git
01:16 monomon[m] joined #git
01:16 patrickr[m] joined #git
01:16 M-meznak joined #git
01:16 Jarrah[m] joined #git
01:16 musicmatze[m] joined #git
01:16 flo[m] joined #git
01:16 aviraldg joined #git
01:16 KevinMGranger[M] joined #git
01:16 SpEcHiDe joined #git
01:17 cdg joined #git
01:17 rkazak joined #git
01:17 unclechu joined #git
01:17 am2on joined #git
01:18 wgrant joined #git
01:20 kexmex joined #git
01:22 schneider joined #git
01:23 arescorpio joined #git
01:29 ResidentBiscuit joined #git
01:29 ResidentBiscuit joined #git
01:32 Rodya_ joined #git
01:32 jmckind joined #git
01:33 pur3eval joined #git
01:34 gugah joined #git
01:43 XenophonF joined #git
01:44 kexmex joined #git
01:45 jstimm joined #git
01:47 Bizkit joined #git
01:48 Bizkit joined #git
01:48 hvxgr joined #git
01:49 Bizkit joined #git
01:49 brent__ joined #git
01:53 Sasazuka joined #git
01:53 ResidentBiscuit joined #git
01:56 raedah how can I 'merge' all the changes from another branch into my current branch, but as a single commit
01:57 MattMaker joined #git
02:00 plugwash I *think* you can merge with --no-commit then delete .git/MERGE_HEAD then commit
02:00 plugwash but I haven't actually tried this
02:01 aruns joined #git
02:01 joki joined #git
02:02 nickabbey joined #git
02:06 jameser joined #git
02:06 wgrant joined #git
02:07 Sasazuka joined #git
02:07 dirtyroshi joined #git
02:07 rwp raedah, You can use 'git rebase -i' on your branch to squash all of the commits you want into a single commit.  Then merge the result.
02:08 raedah plugwash: MERGE_HEAD doesnt seem to exist
02:09 kbs joined #git
02:13 hexagoxel joined #git
02:13 tctara joined #git
02:13 Vampire0 raedah, man git merge and search for squash
02:13 gitinfo raedah: the git-merge manpage is available at http://jk.gs/git-merge.html
02:14 eblip joined #git
02:14 finalbeta joined #git
02:16 DaYwalKer joined #git
02:17 deSt0n3d joined #git
02:19 dsantiago joined #git
02:19 deSt0n3d left #git
02:19 deStone joined #git
02:20 mizu_no_oto joined #git
02:20 deStone I have a 110mb+ file - I committed it like 10 billion commits ago.   I am trying to push and I cant because I have a huge file.   I'm an idiot -- what should I do?   thus far:   git rm hugefile.zip,
02:20 deStone .gitignore too, tried that...
02:20 hvxgr joined #git
02:26 raedah plugwash, rwp: it was actually just as simple as  git merge --squash
02:26 NeXTSUN joined #git
02:27 DolpheenDream joined #git
02:27 raijin joined #git
02:27 Darren_ joined #git
02:28 durham_ joined #git
02:30 rwp raedah, Ah!  Yes.  I had forgotten about that option.  Lately I use 'git rebase -i' as the magic tool for everything.
02:32 skirk joined #git
02:34 Rodya_ joined #git
02:36 d^sh joined #git
02:37 hvxgr joined #git
02:37 cdg_ joined #git
02:39 Bizkit joined #git
02:41 pks joined #git
02:46 MrWoohoo joined #git
02:46 nowhere_man joined #git
02:46 hexagoxel joined #git
02:46 Gsham joined #git
02:47 letian joined #git
02:47 cdg joined #git
02:48 finalbeta joined #git
02:50 hvxgr joined #git
02:51 Vampire0 deStone, !bfg
02:51 gitinfo deStone: A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
02:52 Bizkit joined #git
02:53 robattila256 joined #git
02:53 Bizkit joined #git
02:57 safe joined #git
02:59 Gsham joined #git
03:02 dreiss joined #git
03:02 fstd_ joined #git
03:03 ojdo joined #git
03:05 aavrug joined #git
03:06 aavrug joined #git
03:08 aavrug joined #git
03:12 thebope joined #git
03:12 deStone Vampire0: thanks broseph
03:14 darkkal joined #git
03:15 UniFreak joined #git
03:15 UniFreak can I remove all stashes at once? instead do git drop repleately
03:16 raijin joined #git
03:16 years joined #git
03:17 Vortex34 joined #git
03:19 explody joined #git
03:20 mehola joined #git
03:22 UniFreak oh, stash clear
03:22 UniFreak got it
03:22 diogenese joined #git
03:23 dzho heh
03:29 durham joined #git
03:30 venmx joined #git
03:30 livingstn joined #git
03:34 Derperperd joined #git
03:36 chachasmooth joined #git
03:36 hexagoxel joined #git
03:38 ISmithers joined #git
03:38 wgrant joined #git
03:42 Gsham joined #git
03:43 sunri5e joined #git
03:43 benjaminran joined #git
03:45 mizu_no_oto joined #git
03:46 phy1729 joined #git
03:48 marianina8 joined #git
03:56 joelsmith joined #git
03:57 pur3eval joined #git
04:00 ocelotsloth joined #git
04:06 thebope joined #git
04:07 hexagoxel joined #git
04:07 mozzarella joined #git
04:08 cqi joined #git
04:12 xall joined #git
04:13 fahadash joined #git
04:13 thiago joined #git
04:13 Limes_ joined #git
04:14 mand0 joined #git
04:14 blackwind_123 joined #git
04:17 Andrew_K joined #git
04:18 Sample joined #git
04:24 mehola joined #git
04:25 aruns joined #git
04:26 Gsham joined #git
04:33 Random832 joined #git
04:36 UniFreak joined #git
04:37 Goplat joined #git
04:38 mkoskar joined #git
04:40 lucido-cl joined #git
04:43 gtristan joined #git
04:45 akkad joined #git
04:45 BANNED_IRL_BRO joined #git
04:45 ertes joined #git
04:46 a_thakur joined #git
04:47 navidr joined #git
04:49 dmc joined #git
04:50 Sample joined #git
04:52 laroi joined #git
04:56 jason237 joined #git
04:58 Cabanoss- joined #git
04:58 pur3eval joined #git
05:04 username_ joined #git
05:05 justanotheruser joined #git
05:10 explody joined #git
05:10 indistylo joined #git
05:12 ayogi joined #git
05:13 rivarun joined #git
05:18 bket joined #git
05:18 petersaints joined #git
05:18 gynter joined #git
05:18 gynter Hello! Is it possible to clone another repo's branch to an existing repo as bare branch?
05:22 nickabbey joined #git
05:27 mda1 joined #git
05:28 duderonomy joined #git
05:28 eroux joined #git
05:30 brent__ joined #git
05:30 venmx joined #git
05:31 math-alpha joined #git
05:32 pur3eval joined #git
05:36 ianmethyst joined #git
05:38 aidalgol joined #git
05:50 dtto86 joined #git
05:50 Eugene gynter - sure, just add it as a remote and fetch from it.
05:51 HurricaneHarry joined #git
05:51 dtto86 joined #git
05:52 dtto86 joined #git
05:54 thebope joined #git
05:55 explody joined #git
05:56 dtto86 joined #git
05:57 akkad joined #git
05:58 sbulage joined #git
06:03 dtto86 joined #git
06:03 brent__ joined #git
06:05 dec0n joined #git
06:06 MineCoins joined #git
06:12 dtto86 joined #git
06:13 rscata joined #git
06:13 acetakwas joined #git
06:15 psb joined #git
06:16 humboldt joined #git
06:17 xissburg joined #git
06:23 psb hello, question for which I was not able to find a definitive answer on SO or elsewhere:
06:23 psb An application was writing to old.file.name and pushing to git.  A change was made and the application started writing to new.file.name instead.  This was only discovered after the application owner found that their revision history was broken.  Is there a way to merge the history of old.file.name to new.file.name while at the same time removing old.file.name from the repo?
06:23 nickabbey joined #git
06:25 psb on a test branch I tried: git merge-file new old new but it did not result in a file change I could commit.
06:25 psb I am now looking at possibly rebasing but figured I should exhaust community resources before I play with fire
06:28 lucido-cl joined #git
06:29 grawity psb: Git doesn't keep history per-file in the first place, only whole-repo snapshots
06:29 grawity things like `git log` rely on similarity-based detection
06:29 grawity psb: so your best option would be to have a commit which renames the file without any changes
06:30 grawity though, if it all has already been committed and such, then the only thing you can do is history rewriting
06:31 grawity and as for git merge-file, that's ... not even close to what it does
06:32 psb yeah that was more of a hail mary
06:32 kyan joined #git
06:32 acetakwas joined #git
06:32 GGMethos joined #git
06:33 ozmage joined #git
06:33 RM982 joined #git
06:34 stoopkid joined #git
06:34 psb found some docs I haven't read yet with "git history rewrite" thanks grawity
06:34 RM982 hi, how can I edit title/description for a commit which is not the last one
06:34 grawity use `git rebase -i ...`
06:35 grawity if people already have clones of that repo, with the commits you're about to rewrite, make sure !rewriting is worth causing the troubles
06:35 gitinfo [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
06:35 singalaut joined #git
06:36 psb ok wait, you're saying that mv-ing the file and committing at the present time is a recommended step?
06:37 grawity only if the new file hasn't been committed at all yet
06:37 psb it has, several times, that's my issue
06:37 grawity well see above answer about history rewriting
06:38 psb sigh it just got more complicated tho
06:39 psb the work mentioned vs losing that commit window
06:39 psb they'll want to make that decision
06:39 psb thanks for the info tho, really appreciate it grawity
06:39 grawity probably not much work – assuming they have no local commits it's `git fetch && git reset --hard origin/master`, or in other cases maybe `git pull --rebase`?? shrug.
06:39 grawity but it's still work
06:41 RM982 grawity: thanks, I do 'git rebase -i HEAD~2' that popped the editor with the last 2 commits titles, what about the descriptions?
06:41 grawity the titles are irrelevant
06:41 grawity if you want to actually edit them you have to pick the 'reword' command
06:41 grawity the todo list itself only has them for convenience of picking the correct commit to edit
06:42 cqi joined #git
06:43 grawity psb: same tool in your case ^ – find the commit which added the new file, use `git rebase -i` to split it in two
06:43 RM982 damn, i'm too dumb for this, where do you enter that command?
06:43 grawity one which just renames the old file to the new one
06:44 grawity and another which actually brings in the new data
06:44 qt-x joined #git
06:44 grawity RM982: in the todo list that pops up when rebasing?
06:44 grawity RM982: it usually has instructions at the bottom
06:45 RM982 so I type reword at the bottom and save/quit?
06:45 grawity you type reword instead of pick next to the commit you want to edit
06:47 lordjancso joined #git
06:47 ThomasLocke joined #git
06:48 RM982 got it, now it's stuck at Rebasing (1/2)
06:48 grawity did it pop up a text editor?
06:49 grawity with 'reword' it runs the same editor as you get when committing
06:49 RM982 no, just that message
06:49 RM982 let me ctrl-c and try again
06:53 RM982 error: the following untracked working tree files would be overwritten by merge: ....
06:53 RM982 so this action mess with files, I though it was just the commits texts
06:53 n1ce_ left #git
06:54 ResidentBiscuit joined #git
06:56 bashcoder joined #git
06:56 bashcoder joined #git
06:56 RM982 I wish it was simpler, I'll be more careful with commit description next time
06:56 acetakwas joined #git
06:59 Oatmeal joined #git
07:00 Raging_Hog joined #git
07:01 xbob joined #git
07:02 hexagoxel joined #git
07:02 finalbeta joined #git
07:04 kasual joined #git
07:05 sarri joined #git
07:05 sarri joined #git
07:06 algun_ joined #git
07:06 kristofferR joined #git
07:07 Kulrak joined #git
07:07 Kulrak joined #git
07:08 RM982 omfg that deleted my last commit
07:08 chele joined #git
07:08 RM982 how do I get it back?
07:08 freimatz joined #git
07:09 algun__ joined #git
07:09 RM982 grawity:
07:10 mrcrjs joined #git
07:15 rivarun joined #git
07:16 acetakwas joined #git
07:18 zeroed joined #git
07:20 gynter Eugene: thanks!
07:20 gynter left #git
07:22 jnavila joined #git
07:22 psb left #git
07:22 RM982 got it back, fuck this
07:23 svm_invictvs joined #git
07:23 diego_ joined #git
07:24 MTecknology Any time I'm playing with a feature I'm not familiar with on something I care about losing, I'll cp -R the entire repo before finding out if it works or not.
07:24 JeroenT joined #git
07:29 JeroenT joined #git
07:31 venmx joined #git
07:33 diego_ left #git
07:38 ankit01ojha joined #git
07:39 elect joined #git
07:40 bruce_lee joined #git
07:43 thebope joined #git
07:44 Balliad joined #git
07:45 math-alpha joined #git
07:45 rediska joined #git
07:47 cdown joined #git
07:48 XenophonF joined #git
07:50 jason237 joined #git
07:52 Derperperd joined #git
07:53 apotry joined #git
07:54 matoro joined #git
07:57 Random832 joined #git
07:58 acetakwas joined #git
07:59 hexagoxel joined #git
08:02 dersand joined #git
08:06 acetakwas joined #git
08:12 Dumblez0r joined #git
08:13 TomyWork joined #git
08:13 indistylo joined #git
08:14 doug16k joined #git
08:16 emin joined #git
08:17 aruns__ joined #git
08:17 xall joined #git
08:19 laroi joined #git
08:20 Sheogorath[m] joined #git
08:20 iamtakingiteasy joined #git
08:25 nickabbey joined #git
08:26 cdown joined #git
08:28 indistylo joined #git
08:32 ozmage joined #git
08:32 acetakwas joined #git
08:37 anddam joined #git
08:38 anddam hello
08:38 anddam I cloned from a github repo, then renamed origin to upstream and create a new remote "origin" using my github fork ssh URL
08:38 anddam while doing 'remote show upstream' I see
08:38 anddam Local branch configured for 'git pull':
08:38 anddam master merges with remote master
08:39 anddam and I figure that's because the remote now called upstream was originally created as origin, since I cloned from that
08:39 synthmeat joined #git
08:39 anddam how can I "reassign" the local branch reference frmo upstream/master to origin/master ?
08:41 marenz_ joined #git
08:41 cerkauskas joined #git
08:42 Random832 joined #git
08:43 smurfendrek123 joined #git
08:44 akkad joined #git
08:44 Balliad joined #git
08:44 ozmage joined #git
08:45 rediska left #git
08:45 acetakwas joined #git
08:45 indistylo joined #git
08:46 afuentes joined #git
08:47 osse anddam: git branch -u origin/master
08:51 flaviodesousa joined #git
08:55 ResidentBiscuit joined #git
08:56 imack joined #git
08:57 Snugglebash joined #git
08:59 kurkale6ka joined #git
08:59 joshszep joined #git
09:00 manuelschneid3r joined #git
09:00 troulouliou_div2 joined #git
09:01 anddam thanks, I had just used explicit --set-upstream while pushing, git suggested me for a new branch
09:01 akkad joined #git
09:01 anddam why are there both   --set-upstream <branch>   and --set-upstream-to=<branch>   syntaxes?
09:02 bongjovi joined #git
09:03 osse anddam: one is automatic, the other is manual
09:03 osse and the automatic one is used by default
09:04 MrcRjs joined #git
09:05 mikecmpbll joined #git
09:07 DaYwalKer joined #git
09:08 King_Hual joined #git
09:10 YuGiOhJCJ joined #git
09:12 indistylo joined #git
09:12 jimsio joined #git
09:12 hussam joined #git
09:15 marcogmonteiro joined #git
09:17 ntonjeta joined #git
09:20 netj joined #git
09:21 LucaS05 joined #git
09:21 OtakuSenpai joined #git
09:22 LucaS05 hi. Is it possible to change the branch from where I've checked out?
09:22 OtakuSenpai hey guys
09:22 OtakuSenpai so i created a project in github and in my local box,i did a git init in a folder which had my 3 months old works
09:23 OtakuSenpai but when i tried doing git pull(first) then git push(second) it said it couldnt work
09:24 OtakuSenpai Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
09:24 canton7 OtakuSenpai, and you committed, I assume?
09:24 OtakuSenpai yes i did
09:24 OtakuSenpai git add
09:24 OtakuSenpai git commit -m
09:24 canton7 OtakuSenpai, did you ask github to commit some default files for you (such as .gitignore)? I think it offers these days
09:24 canton7 if so, there will be a commit in the github repo which you don't have, which is why it's refusing to push
09:24 OtakuSenpai yes a readme and a License
09:24 OtakuSenpai ok
09:24 canton7 take a look at !lol anyway - that will show you exactly what's going on
09:24 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
09:25 OtakuSenpai i think its an X-Y problem
09:25 GodGinrai joined #git
09:25 OtakuSenpai i had one before too
09:25 OtakuSenpai like one branch is ahead of another
09:25 OtakuSenpai but i forgot what to do in this case
09:25 canton7 heh, that's not what an XY problem is
09:25 LucaS05 joined #git
09:26 OtakuSenpai well A-B and then C
09:26 nickabbey joined #git
09:26 OtakuSenpai i read in the github,i forgot totally
09:26 canton7 the easiest thing to do is just to throw away the commit which github made for you, by force-pushing (which will overwrite whatever is in the github repo)
09:26 canton7 alternatively you could rebase onto that commit which github made, using 'git rebase origin/master'
09:26 indistylo joined #git
09:26 OtakuSenpai ok
09:26 canton7 but, being able to see what's going on graphically is the first step
09:26 OtakuSenpai what are origin and master?>
09:26 canton7 and for that, use gitk, or !lol, or any other graphical history viewer
09:26 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
09:26 muldover joined #git
09:27 canton7 OtakuSenpai, you might want to read a good beginners' book - this stuff is pretty fundamental
09:27 canton7 !book
09:27 gitinfo 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
09:27 notebox joined #git
09:27 OtakuSenpai ill read up a book,but can you tell me what to do so tht i can upload it?
09:27 canton7 I've told you two options
09:27 OtakuSenpai yes
09:28 OtakuSenpai ok ill try force-pushing then
09:30 clmsy joined #git
09:30 LucaS05 hi. Is it possible to change the branch from where I've checked out?
09:31 venmx joined #git
09:31 ljc joined #git
09:31 LucaS05 Suppose you were on a branch called test and then you checkout to a new one. Do some changes and commit, but instead you wanted to check out from master. Is it possible to change that?
09:33 anddam osse: meaning the first form is to create a new branch that automatically sets its upstream?
09:33 osse anddam: yes
09:33 canton7 LucaS05, when you say "checkout from a branch", do you actually mean "create a new branch from another branch"?
09:33 LucaS05 canton7: yes exactky, eric
09:33 canton7 "eric"?
09:34 Snugglebash joined #git
09:34 ^7heo you mean git branch -u foo/bar?
09:34 LucaS05 canton7: is your nickname a reference to "eric cantona"?
09:34 canton7 I think he's doing 'git checkout -b newbranch oldbranch', from the way he was using 'checkout'
09:34 canton7 LucaS05, no, it isn't
09:35 LucaS05 ok, sorry :/
09:35 canton7 that's OK, George
09:35 ^7heo ahaha
09:35 LucaS05 hahah
09:35 ^7heo nice one Cantona
09:35 canton7 it's nothing to do with the dance, the place, or the beer :P
09:35 anddam osse: thanks
09:35 xall joined #git
09:35 canton7 anyway, you use rebase to change what branch another branch is based on
09:36 mda1 joined #git
09:36 ^7heo canton7: canton is a beer? where?
09:36 canton7 no idea, someone on IRC said it was
09:36 canton7 (therefore it must be true)
09:37 LucaS05 anyway I was on a branch and then I've done checkout -b newbranch. I've done some changes and commited them. But later I realized that I checked out when I was on the wrong branch. So I was on branch B, checkout to branch C. Now I want to change the brach from where I've checked out (B) to something else (like, as you were guessing A)
09:38 canton7 so you actually were on branch B, and you did 'git checkout -b C'?
09:38 LucaS05 canton7: yes
09:38 canton7 git rebase --onto A B
09:39 OtakuSenpai left #git
09:41 danielitit_ joined #git
09:41 canton7 (see the lovely diagrams in man git rebase to see why that works)
09:41 gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html
09:43 muldover01 joined #git
09:44 aard_ joined #git
09:46 M-meznak joined #git
09:46 Elliott[m]1 joined #git
09:46 am2on joined #git
09:46 KevinMGranger[M] joined #git
09:46 saintaquinas[m] joined #git
09:46 dyce[m] joined #git
09:46 elwan7[m] joined #git
09:46 unclechu joined #git
09:46 Jarrah[m] joined #git
09:46 dikiaap joined #git
09:46 aviraldg joined #git
09:46 Remramm joined #git
09:46 SpEcHiDe joined #git
09:46 musicmatze[m] joined #git
09:46 UncleCJ joined #git
09:46 Salander27 joined #git
09:46 monomon[m] joined #git
09:46 patrickr[m] joined #git
09:46 hiq[m] joined #git
09:46 hallogallo[m] joined #git
09:46 Retropikzel[m] joined #git
09:46 flo[m] joined #git
09:46 notebox joined #git
09:46 daopu[m] joined #git
09:47 LucaS05 canton7: yeah, i was just seeing these: https://git-scm.com/docs/git-rebase
09:47 LucaS05 thanks!
09:47 ToBeCloud joined #git
09:49 EV3RYDAYPR0GRESS joined #git
09:50 hroi joined #git
09:50 hrob hi
09:51 hrob I've been using git rebase for a while
09:51 hrob even on branches that are simply a fast forward
09:51 cousteau joined #git
09:51 hrob I'm a little daunted by how verbal and careful rebase is
09:52 hrob I don't understand why rebase asks me, do you want to edit that file, just like you did originally
09:52 hrob off course I want that
09:52 bgerber joined #git
09:52 hrob I want the same commit on that file as I did before
09:52 j7k6 joined #git
09:52 hrob there is a git rebase --skip
09:53 selckin what exactly do you run, and what do you mean with it asks
09:53 hrob I think I need another option
09:53 selckin should only stop on conflicts
09:53 selckin !rerere
09:53 demin joined #git
09:53 hexagoxel joined #git
09:53 selckin man git-rerere
09:53 gitinfo the git-rerere manpage is available at http://jk.gs/git-rerere.html
09:53 Derperperd joined #git
09:53 hrob selckin, right, how can there be a conflict in a rebase of a branch that has no conflict with master
09:54 hrob the branch was a fast forward... in fact it only had "new files"
09:54 selckin what command do you run
09:54 hrob git checkout master
09:54 hrob git pull
09:54 hrob git checkout my-doc-branch
09:54 hrob git rebase master
09:55 anddam left #git
09:55 hrob ok - I think I know what is going on
09:56 hrob it is basically replaying my branch history, but on top of current master
09:56 j7k6_ joined #git
09:56 hrob so, if in one of my commits i had conflict with another commit on origin
09:56 hrob then yeah, its going to replay that conflict, right?
09:57 j7k6_ joined #git
09:57 hrob thing is, I resolved that in my history --- I guess I want to replay my resolution exactly as I did before
09:57 xall joined #git
09:57 selckin man git-rerere
09:57 gitinfo the git-rerere manpage is available at http://jk.gs/git-rerere.html
09:57 ahr3n joined #git
09:58 muhannad_______ joined #git
09:58 hrob Reuse recorded resolution
09:58 hrob hmm,
09:59 hrob that seems to address my issue specifically, right?
10:00 hrob but isn't it a little strange that rebase doesn't have an option that say for example  git rebase --continue --keep-theirs
10:00 hrob or... git rebase --continue --resolve-as-before
10:01 Snugglebash joined #git
10:01 selckin search for strategy in the manual
10:01 hrob my use case (and I guess most people ) use rebase when they want to replay history exactly as it has happened,
10:02 hrob selckin, ok :)  thanks for the tips
10:02 thebope joined #git
10:02 aruns__ joined #git
10:02 Raging_Hog joined #git
10:04 ChadTaljaardt joined #git
10:05 j7k6_ joined #git
10:05 indistylo joined #git
10:06 j7k6_ joined #git
10:07 Tobbi joined #git
10:07 JeroenT_ joined #git
10:08 gelei007 joined #git
10:09 JeroenT__ joined #git
10:10 cousteau left #git
10:10 cousteau joined #git
10:11 LucaS05 and is there a way to see which is the branch where i was on when i did the checkout?
10:11 chll_ joined #git
10:11 cousteau does git have an option for "do not track this file, but include it for push/pull/clone purposes"?
10:12 selckin !reflog
10:12 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
10:12 selckin LucaS05: ^
10:12 selckin cousteau: !config
10:12 gitinfo cousteau: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
10:16 odinsbane joined #git
10:16 overlord_tm joined #git
10:16 odinsbane Alright, I have two branches that I do not want to fully merge. Eg. one is a subset of another one. Is there a good way to pull in partial changes?
10:17 selckin cherry-pick
10:17 Snugglebash joined #git
10:17 pR0Ps joined #git
10:17 odinsbane Great. check it out.
10:17 seni joined #git
10:17 odinsbane ... er Ill check it out.
10:19 j7k6_ joined #git
10:20 ferr1 joined #git
10:20 cousteau selckin, I didn't quite understand that link, sorry...  This is actually a generated .pdf and not a config file; maybe it doesn't apply
10:21 cousteau basically I want to have a git repository of my .tex and image source files, and also have the result of the last build available for download to see how it looks
10:22 LucaS05 selckin: there are "moving" informations, but are they saying that i'm creating a new branch or just that i'm moving from one to the other?
10:22 selckin cousteau: !deploy
10:22 gitinfo cousteau: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
10:23 LucaS05 selckin: just found one of them "Reflog message: checkout:" thanks!
10:24 cousteau >:(  ok, there goes my plan of storing my thesis on bitbucket and easily upload/download the result for seeing it remotely.  I guess I'll have to install pdflatex on the other computers or connect remotely to see the result then.  Thanks for the help!  ^_^
10:25 selckin or you know just do it
10:26 cousteau there's a thing called git-lfs though; maybe it's what I should use if I really really want to automate this
10:26 j7k6_ joined #git
10:27 j7k6_ joined #git
10:27 j7k6_ joined #git
10:28 SteffanW joined #git
10:28 aruns__ joined #git
10:28 Raging_Hog joined #git
10:29 andschwa joined #git
10:30 sbasso joined #git
10:31 j7k6_ joined #git
10:33 DaYwalKer joined #git
10:43 stduolc joined #git
10:44 stduolc hi all, I try to run 'git diff SHA1 SHA2 --name-status' to find the modify files. but there is only add files, how can i find the modify files.
10:44 tlaxkit joined #git
10:46 ftlava joined #git
10:46 stduolc I only need the modify files name.
10:47 corentin stduolc: git status ?
10:47 j7k6_ joined #git
10:47 mikecmpb_ joined #git
10:47 cyphase joined #git
10:48 stduolc corentin: git status can show the diff between two commits or tags?
10:49 Vampire0 stduolc, if you want only the names use --name-only. If you want only modified files, not added, deleted, ... use --diff-filter=M
10:49 Vampire0 stduolc, in your case if only added files are shown, then there ARE only added files, no modified ones
10:50 stduolc Vampire0: thx, I don't no the diff-filter flag before
10:50 j7k6_ joined #git
10:50 odinsbane Okay, I do git log and find a commit I *might* want to cherry pick. What is a good way to see the files/what was added or removed?
10:52 Vampire0 odinsbane, `git diff <commit-ish>^!` or if you only want the filenames add `--name-only`
10:54 mikecmpbll joined #git
10:54 odinsbane Thanks that works great.
10:54 SwiftMatt joined #git
10:54 stduolc Vampire0: no, there is no modify files list. I change a file and there is no output show the file name.
10:55 stduolc Vampire0: sorry, I didn't commit the change...
10:57 stduolc Vampire0: I use the GitPython, I try to add the file with the untracked_files, so the modify files didn't add to the index and didn't commit.
10:58 stduolc did anyone use GitPython?
11:01 _28_ria joined #git
11:02 sbasso joined #git
11:02 hvxgr joined #git
11:03 achadwick joined #git
11:03 j416 joined #git
11:04 Vampire0 stduolc, not me. Actually most people in here are probably using the normal commandline client
11:05 staafl joined #git
11:06 stduolc Vampire0: I try to auto control the repo commit and rollback, then deploy the code to the production server.
11:06 stduolc sorry for my english...
11:07 Snugglebash joined #git
11:07 stduolc Vampire0: I try to auto control the repo, so it can commit and rollback, then deploy the code to the production server.
11:09 rapidshot64 joined #git
11:09 hvxgr joined #git
11:10 rapidshot64 how can I diff commit between two repo in specific folder
11:10 rapidshot64 I have two kernel git, and I want to cherry pick some patches in old kernel
11:11 rapidshot64 in new kernel to old kernel
11:11 osse rapidshot64: the easiest is to add one repo as a remote in the other
11:11 rapidshot64 and next?
11:11 osse fetch, then use cherry-pick the usual way
11:12 rapidshot64 thx I will try
11:14 aruns__ joined #git
11:17 overlord_tm joined #git
11:18 _28_ria joined #git
11:19 cdown joined #git
11:20 indistylo joined #git
11:21 inflames joined #git
11:22 StuartMI joined #git
11:23 Vampire0 stduolc, maybe !deploy can help you
11:23 gitinfo stduolc: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
11:25 astrozyk joined #git
11:25 GodGinrai joined #git
11:27 nickabbey joined #git
11:27 aruns__ joined #git
11:29 lesshaste joined #git
11:29 lesshaste really newbie question.. I just cloned a repo and have edited a file. Do I just need to go "git commit" "git push"?
11:29 lesshaste or do I need "git add" to?
11:29 lesshaste I edited an existing file
11:30 _ikke_ lesshaste: You need to use git add to stage the change before you commit
11:30 lesshaste _ikke_, ok so I need to do that every time I want to edit a file? I ask because in svn and hg I think it's just commit and push
11:30 astrozyk joined #git
11:31 _ikke_ lesshaste: Correct, git adds extra flexibility in what you want to commit
11:31 lesshaste thanks
11:31 peacememories joined #git
11:32 venmx joined #git
11:33 math-alpha joined #git
11:33 uhmgawa joined #git
11:34 marcogmonteiro joined #git
11:37 whaley joined #git
11:37 nevodka joined #git
11:42 hvxgr joined #git
11:42 cdown joined #git
11:44 bvcosta joined #git
11:46 rnsanchez joined #git
11:47 lesshaste git push is asking for a password for the wrong github repo
11:47 lesshaste how do I specify where it should go?
11:48 lesshaste Username for 'https://github.com':
11:48 lesshaste is what it says
11:48 bremner git remove -v
11:48 _ikke_ git remote -v shows the remotes, git remote set-url <name> <url> to change it
11:48 bremner that. I often typo remote/remove for some reason
11:49 lesshaste git remote -v
11:49 lesshaste originhttps://github.com/alexneville/bosons.git (fetch)
11:49 lesshaste originhttps://github.com/alexneville/bosons.git (push)
11:49 lesshaste so that looks right
11:49 canton7 fingers have a life of their own. Tell me about it
11:49 _ikke_ canton7: bremner totally agree
11:49 lesshaste but git push doesn't offer me thta
11:49 canton7 lesshaste, right, so what makes you think it's asking for a password for the wrong github repo?
11:49 _ikke_ lesshaste: So what's the problem?
11:49 JeroenT joined #git
11:49 lesshaste oh I see
11:49 lesshaste I didn't understand what Username for 'https://github.com':  meant
11:49 lesshaste thanks
11:50 thebope joined #git
11:51 marcogmonteiro joined #git
11:54 Snugglebash joined #git
11:54 Derperperd joined #git
11:59 Vampire0 lesshaste, regarding your git add question, you can live without git add if you want. Git is very flexible as _ikke_ already said. If you do `git commit -a`, Git automatically adds all changes to tracked files, meaning edited and deleted files. Just if you add new files, you have to add them manually
12:00 lesshaste aha! So -a is the secret thank you
12:00 Vampire0 lesshaste, the sense to using the index with git add manually instead of -a to commit is, that you can add only a subset of your changes to the commit and not all edited files
12:00 Vampire0 lesshaste, if you don't want this, you are fine with using -a to commit
12:00 lesshaste thanks
12:01 gitinfo lesshaste: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
12:03 JeroenT joined #git
12:04 JeroenT_ joined #git
12:06 pbrewczynski joined #git
12:08 hexagoxel joined #git
12:12 ISmithers joined #git
12:13 masuberu joined #git
12:17 suttonwilliamd joined #git
12:19 MrcRjs joined #git
12:21 al-damiri joined #git
12:22 troulouliou_div2 joined #git
12:22 muhannad_______ joined #git
12:23 JeroenT joined #git
12:23 metachr0n joined #git
12:24 manuelschneid3r joined #git
12:25 askb joined #git
12:25 JeroenT joined #git
12:26 JeroenT_ joined #git
12:29 JeroenT joined #git
12:30 cdown joined #git
12:31 venmx joined #git
12:35 lesshaste Vampire0, thanks
12:35 lesshaste .topkarma
12:35 gitinfo top karmic beings of past 30 days ('all' arg to see totals): _‍ikke_: 5,  o‍sse: 3,  j‍ast: 2,  v‍ampire0: 2,  q‍qx: 1
12:35 lesshaste thanks bremner
12:36 lesshaste thanks _ikke_
12:38 laroi left #git
12:39 Starky joined #git
12:39 MineCoins joined #git
12:43 tcorneli joined #git
12:44 DolpheenDream joined #git
12:44 scottjl joined #git
12:45 DaYwalKer joined #git
12:47 kpease joined #git
12:47 qqx joined #git
12:48 kpease_ joined #git
12:49 math-alpha joined #git
12:50 dendazen joined #git
12:52 cdown joined #git
12:52 UniFreak joined #git
12:55 ResidentBiscuit joined #git
12:55 marianina8 joined #git
12:56 nowhere_man joined #git
12:58 ferr1 joined #git
12:59 nobitanobi joined #git
13:01 manuelschneid3r joined #git
13:04 livingstn joined #git
13:04 jameser joined #git
13:04 sbasso joined #git
13:04 peacememories joined #git
13:06 Darcidride joined #git
13:07 muhannad_______ joined #git
13:09 kpease joined #git
13:12 d0nn1e joined #git
13:16 shinnya joined #git
13:16 BSaboia joined #git
13:17 jameser joined #git
13:17 nd joined #git
13:18 NeXTSUN joined #git
13:18 theoceaniscool joined #git
13:19 Snugglebash joined #git
13:20 MrcRjs joined #git
13:21 brent__ joined #git
13:22 seni joined #git
13:22 whaley joined #git
13:25 Sound joined #git
13:26 GodGinrai joined #git
13:27 Derperperd joined #git
13:27 notebox joined #git
13:28 ankit01ojha joined #git
13:28 nickabbey joined #git
13:31 bgerber joined #git
13:32 kexmex joined #git
13:34 pks joined #git
13:35 nowhere_man joined #git
13:35 vinumq joined #git
13:38 SuperDuperKali joined #git
13:39 SuperDuperKali lool 1248 users in here
13:39 Snugglebash joined #git
13:39 dsdeiz joined #git
13:39 SuperDuperKali anyway, can I create a repo from the command line rather than doing it on git.com?
13:40 _ikke_ sure
13:40 _ikke_ git init <dirname>
13:41 _ikke_ (git.com is not owned by the git project, you might mean github.com)
13:41 wrouesnel1 joined #git
13:42 overlord_tm joined #git
13:44 jameser joined #git
13:44 HardlySeen joined #git
13:46 thiago joined #git
13:47 cdg joined #git
13:47 livingstn joined #git
13:48 jimi_ joined #git
13:50 minibar joined #git
13:53 kent\n joined #git
13:54 marcogmonteiro joined #git
13:54 ResidentBiscuit joined #git
13:55 Darren_ joined #git
13:56 jeffreylevesque joined #git
13:57 Snugglebash joined #git
14:03 ToxicFrog (which is also not owned by the git project, it's just a git hosting provider)
14:03 Derperperd joined #git
14:05 Gsham joined #git
14:05 whaley joined #git
14:05 leeN joined #git
14:07 hasc joined #git
14:09 nanga joined #git
14:09 minibar hi, anyone knows how to solve this? https://github.com/divmain/GitSavvy​/issues/596#issuecomment-283909266
14:10 nanga joined #git
14:11 Vampire0 SuperDuperKali, did you mean to ask whether you can create a repo *on* GitHub from the command line or did you mean creating a local repo? For local repo _ikke_ told you already. If not, then yes, if you use a tool that can speak to the GitHub API like git-spindle which I can really recommend
14:12 DarkPsydeLord joined #git
14:12 SuperDuperKali Vampire0, yeah sounds like git-spindle is what I want
14:12 SuperDuperKali I meant to create a repo *on* Github from the command line.
14:13 SuperDuperKali git init is for local yes
14:13 Vampire0 Then yes, I'd recommend git-spindle. It can talk to github, gitlab, bitbucket and also local installation of github or gitlab and you can do pretty much anything you might want to from the commandline
14:14 SuperDuperKali uuuh, nice!
14:18 stemid joined #git
14:19 gugah joined #git
14:19 kbs joined #git
14:20 ToxicFrog Oh sweet
14:20 fission6 joined #git
14:21 fission6 how do i show just changes in a diff
14:21 stemid left #git
14:21 MrcRjs joined #git
14:21 ToxicFrog What do you mean by "just changes"? No context lines?
14:22 tvw joined #git
14:22 fission6 yes
14:23 osse fission6: git diff -U0
14:23 fission6 thanks!
14:24 phroa joined #git
14:24 jeffreylevesque_ joined #git
14:24 mohan joined #git
14:25 Gloomy joined #git
14:28 Dougie187 joined #git
14:29 e14 joined #git
14:30 nickabbey joined #git
14:31 boombatower joined #git
14:32 thebope joined #git
14:32 Munt joined #git
14:34 publio joined #git
14:34 matt_m joined #git
14:35 borkr joined #git
14:36 robotroll joined #git
14:37 WayToDoor joined #git
14:42 creppe joined #git
14:42 nowhere_man joined #git
14:43 rwb joined #git
14:43 RxMcDonald joined #git
14:43 RxMcDonald joined #git
14:43 bannakaffalatta joined #git
14:44 LionsMane joined #git
14:45 bvcosta joined #git
14:47 RxMcDonald So I made some changes to my fork and want to discard the changes or merge favouring the origin (not my fork) but it says I need to resolve the conflicts?
14:48 _ikke_ So you are already in a conflict?
14:48 Vampire0 RxMcDonald, so you just want to reset your master branch back to upstream master branch?
14:48 RxMcDonald well I could do that I guess
14:48 ThomasLocke joined #git
14:48 RxMcDonald just reset hard to a previous commit and git pull?
14:48 RxMcDonald then push force to my fork?
14:49 Vampire0 RxMcDonald, what do *you* want to achieve? If that is what you want, then basically yes
14:49 _ikke_ git merge --abort
14:49 Vampire0 RxMcDonald, just do `git checkout master && git reset --hard upstream/master && git push -f`
14:49 Vampire0 After aborting the merge of course as _ikke_ said
14:50 Darren_ joined #git
14:50 e14 joined #git
14:50 Es0teric joined #git
14:51 thiago joined #git
14:52 avar failo: /w 6
14:52 Derperperd joined #git
14:54 nowhere_man joined #git
14:58 kulelu88 joined #git
14:58 livingstn joined #git
14:59 iamthad joined #git
14:59 dvaske joined #git
15:01 NeXTSUN joined #git
15:02 RxMcDonald left #git
15:02 crose joined #git
15:03 Murii_ joined #git
15:05 moule joined #git
15:05 mehola joined #git
15:06 jeffreylevesque joined #git
15:06 Forlorn joined #git
15:08 eqxakv joined #git
15:10 ansimation joined #git
15:10 moule hey, i'm trying to get the perfect .gitattributes to have .cs files only checked in and out as crlf, i've tried "*.cs -text eof=crlf" but a simple "echo >> File.cs" then commit and checkout still shows lf line endings
15:12 kulelu88 left #git
15:12 AaronMT joined #git
15:13 moule pretty much all the documentation i find says that i should have lf endings on the repository and use line ending normalization on checkout, but that's not what i want, is there a way to force crlf new lines on checkin ?
15:13 LeBlaaanc joined #git
15:14 aspiers joined #git
15:15 rcn joined #git
15:18 thiago joined #git
15:20 corentin moule: are you working on a mac computer?
15:20 moule no, windows
15:20 corentin moule: I'm asking because echo will either issue a CR or LF depending if you're on Linux or Mac
15:20 MrcRjs joined #git
15:21 moule the team is windows-only and the code style explicitly states files should be crlf
15:22 diogenese joined #git
15:22 corentin moule: Actually I think your test is not good. Please try this: echo > blah and then check the content of blah in hexdump
15:23 GT4066 joined #git
15:24 einnjo joined #git
15:25 Bizkit joined #git
15:25 moule corentin: "echo > blah" will obviously insert a \n, so unless i check in and out first, it will be \n
15:26 dcpc007 left #git
15:26 Snugglebash joined #git
15:26 moule (and even if i check in and out, it still is \n, which is what bothers me)
15:27 GodGinrai joined #git
15:28 tang^ joined #git
15:30 corentin moule: on a windows 7 vm it appears echo > blah outouts this:
15:30 corentin 00000000  45 43 48 4f 20 69 73 20  6f 6e 2e 0d 0a           |ECHO is on...|
15:30 corentin 0000000d
15:31 corentin I can't figure out why it adds ECHO is on, but the end of line is CR LF
15:31 osse moule: files should be CRLF is not a problem to achieve.  But the stuff you check in stop being files and just becoem some binary crap only Git knows how to deal with. Thus the code style doesn't cover that. Solution: use   *.cs text eol=crlf   \o/
15:31 jstimm joined #git
15:33 osse setting eol probably enables the text attribute, so i suspect what you're trying to do is just '*.cs -text'
15:33 azerus joined #git
15:35 moule osse: "*.cs text eol=crlf" will mark all my files as Modified, because it will requires all my files to be commited as LF
15:35 osse yup
15:35 hasc joined #git
15:35 _Vi joined #git
15:35 moule currently, files are all CRLF in the repository and I'd like to keep that as is
15:36 osse then the best you're gonna get is '*.cs -text'
15:36 moule corentin: i guess it depends on the shell (i was using bash on windows)
15:36 corentin moule: oh, ok, have tried with cmd.exe
15:36 moule osse: no way to automatically convert \r to \r\n on check in?
15:36 sbulage joined #git
15:36 osse moule: you mean \n to \r\n ?
15:36 moule yes, sorry
15:37 osse AFAIK no.
15:37 brent__ joined #git
15:37 osse but how does one accidentally create a .cs file with \n ? :O
15:37 corentin moule: if you have vim you can easily convert to crlf using :set ff=dos
15:37 corentin but it's manual of course
15:37 moule i can't rely on a manual process or on the developer having a correct setup
15:37 dreiss joined #git
15:38 corentin and you could have hooks to check if the files you commit or the files you retrive have the correct line ending
15:38 moule i guess there's a hook solution
15:38 osse moule: if you can't do that then the best course of action is to swallow the "all files are modified" pill
15:38 moule thinking about it :)
15:38 osse a hook solution violates the "having correct setup" constrain
15:38 osse t
15:38 moule a hook on the server
15:39 moule since we're using gerrit, i guess it's possible
15:39 oskarkv joined #git
15:39 m4sk1n joined #git
15:39 osse yes, the hook would have to do a checkout. but yes
15:41 osse what i object to most is that the code style somehow covers the stuff inside .git :P
15:43 jeffd joined #git
15:43 Snugglebash joined #git
15:44 moule osse: agreed, it would be easier to just accept the best practice of have LF in the repo
15:44 moule thank you corentin and osse for your help
15:45 osse hopefully i have you a way of lawyering your way out of it
15:45 corentin you're welcome
15:45 Es0teric joined #git
15:46 nowhere_man joined #git
15:46 doug16k_ joined #git
15:47 odinsbane left #git
15:48 rapidshot64 joined #git
15:49 matt_m joined #git
15:52 jstimm joined #git
15:53 noteness_ joined #git
15:53 bannakaf_ joined #git
15:55 Khisanth joined #git
15:57 magruder85 joined #git
15:57 ExoUNX joined #git
15:57 ayogi joined #git
15:59 peacememories joined #git
16:02 pur3eval joined #git
16:05 tolland joined #git
16:05 ansimation joined #git
16:07 tolland I have a project that is split over a bunch of repos (module per repo design) so often I have to make 7-10 branches, and then do merges before committing. typically the branch is called the same thing in the repos. Are there any tools for dealing with this (other than bash...) etc?
16:08 Phylock joined #git
16:10 overlord_tm joined #git
16:12 jstimm joined #git
16:12 dviola joined #git
16:17 nowhere_man joined #git
16:17 blackwind_123 joined #git
16:20 thiago joined #git
16:20 thebope joined #git
16:20 davidosomething joined #git
16:21 zzz joined #git
16:21 MrcRjs joined #git
16:25 Vampire0 tolland, !subpr
16:25 gitinfo tolland: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
16:26 Vampire0 tolland, I think !gitslave might be what you are after
16:26 gitinfo tolland: gitslave ( http://gitslave.sf.net ) is useful to add subsidiary git repositories to a git superproject when you control and develop on the subprojects at more or less the same time as the superproject, and furthermore when you typically want to tag, branch, push, pull, etc. all repositories at the same time.
16:26 Vampire0 tolland, or maybe "repo" which was developed by Google for Android
16:28 ljc joined #git
16:32 robnester joined #git
16:33 jstimm joined #git
16:39 UniFreak joined #git
16:41 rivarun joined #git
16:41 brent__ joined #git
16:42 ansimation joined #git
16:43 kjsaihs joined #git
16:46 kjsaihs left #git
16:48 username1 joined #git
16:48 chardan joined #git
16:49 xbob joined #git
16:49 TbobbyZ joined #git
16:52 Derperperd joined #git
16:54 nowhere_man joined #git
16:54 jottr joined #git
16:56 orbyt_ joined #git
16:57 hashpuppy joined #git
16:57 durham joined #git
16:57 madewokherd joined #git
16:58 finalbeta joined #git
16:58 Noldorin joined #git
17:01 re1 joined #git
17:07 mehola joined #git
17:09 _rgn joined #git
17:09 _rgn joined #git
17:11 Raging_Hog joined #git
17:12 multi_io joined #git
17:15 tyreld joined #git
17:16 marenz_ joined #git
17:16 archheretic joined #git
17:17 archheretic Does git update-index --assume-unchanged only affect the local repo, or will it affect the whole repo after a push?
17:17 archheretic update-index --assume-unchanged <file>
17:18 osse archheretic: Only the local repo, and it might suddenly disappear
17:19 osse !assume
17:19 gitinfo [!assume_unchanged] git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually a promise to Git that the file is identical to the committed version, to reduce unnecessary disk reads. Not only will Git feel free to discard the flag, it will also happily overwrite your changes whenever a checkout/merge/rebase/... updates it.
17:19 dreiss joined #git
17:20 tolland Vampire0: gitslave looks just the thing. thnx
17:20 TomyLobo joined #git
17:23 pur3eval joined #git
17:28 _rgn joined #git
17:28 GodGinrai joined #git
17:29 kjsaihs joined #git
17:31 jstimm joined #git
17:35 nowhere_man joined #git
17:35 foreal joined #git
17:35 svm_invictvs joined #git
17:35 jfr__ joined #git
17:35 Garen_ joined #git
17:35 nextloop joined #git
17:36 DaYwalKer joined #git
17:36 ssarah joined #git
17:36 worstadmin_ joined #git
17:36 ssarah hei guys is there a way to join git repositories, maintaining the history, they dont' have files in common
17:36 iron_houzi_ joined #git
17:37 tharuin_ joined #git
17:37 troulouliou_div2 joined #git
17:37 altendky_ joined #git
17:38 MLM__ joined #git
17:38 kireevco_ joined #git
17:38 kaosine_ joined #git
17:38 ionelmc_ joined #git
17:38 daxroc_ joined #git
17:38 Ekho- joined #git
17:38 addshore_ joined #git
17:38 OMGOMG joined #git
17:38 ReenignE- joined #git
17:38 ReenignE- joined #git
17:38 da5id_ joined #git
17:38 phtes_ joined #git
17:38 shennyg_ joined #git
17:38 Peng__ joined #git
17:38 vishal joined #git
17:38 xkr47_ joined #git
17:39 BlessJah_ joined #git
17:39 nikomo_ joined #git
17:39 wcpan_ joined #git
17:39 boshhead_ joined #git
17:39 armin_ joined #git
17:39 hakzsam_ joined #git
17:39 bjarki joined #git
17:39 Shakeel__ joined #git
17:39 kaosine_ left #git
17:39 sts_ joined #git
17:40 Kestrel-029 joined #git
17:40 tanuki_ joined #git
17:40 Kuukunen joined #git
17:40 atomi_ joined #git
17:40 Gsham joined #git
17:40 tjbp_ joined #git
17:40 maxb_ joined #git
17:40 harv_ joined #git
17:40 PaulePan1er joined #git
17:40 Doc-Sain1ly joined #git
17:40 milki_ joined #git
17:40 msm_ joined #git
17:40 ^7heo_ joined #git
17:40 thib_ joined #git
17:40 souther_ joined #git
17:40 osse ssarah: Add one as a remote in the other. Fetch from it and merge.
17:40 styx__ joined #git
17:40 FilipNor1ic joined #git
17:40 pickfire_ joined #git
17:41 moritz_ joined #git
17:41 comps_ joined #git
17:41 hegge_ joined #git
17:41 Tatou_ joined #git
17:41 frobnic_ joined #git
17:41 osse ssarah: If there is nothing in common I think git will merge it just fine even if there is no common ancestor
17:41 brandonw_ joined #git
17:41 peeps[lappy] joined #git
17:41 osse ssarah: But if it won't then you can create a merge commit by hand
17:41 resetpacket joined #git
17:41 alip_ joined #git
17:42 Lunatrius` joined #git
17:42 spriz_ joined #git
17:42 CtrlC- joined #git
17:42 gnoirzox2 joined #git
17:42 MeltedLux_ joined #git
17:42 UncleCJ1 joined #git
17:42 ThiefMasterrr joined #git
17:42 janx_ joined #git
17:42 kaosine joined #git
17:42 kaosine man this is really stupid that if I'm not nicked, I'm banned here and can't change my name to my non underscored name
17:42 SirFunk_ joined #git
17:42 benaiah` joined #git
17:42 nedbat_ joined #git
17:42 kyledeal joined #git
17:42 daurn joined #git
17:42 batrick_ joined #git
17:42 r3c0d3x_ joined #git
17:42 Grum_ joined #git
17:42 meZee- joined #git
17:42 nod___ joined #git
17:43 g0d355__ joined #git
17:43 SirCmpwn_ joined #git
17:43 nixjdm_ joined #git
17:43 Salander271 joined #git
17:43 MatthewAllan93_ joined #git
17:43 bjarki joined #git
17:43 jor_ joined #git
17:43 BlueMatt_ joined #git
17:43 Olipro_ joined #git
17:43 nitesh` joined #git
17:43 hagebake joined #git
17:43 c0d3d joined #git
17:43 JeremyD joined #git
17:43 Spinkzeit` joined #git
17:43 bremner kaosine: you could register with nickserv
17:43 plasticl1 joined #git
17:43 Cerise joined #git
17:43 Cerise joined #git
17:43 sawk joined #git
17:43 McKraken_zzzzz joined #git
17:43 Mindii joined #git
17:43 RickyB98 joined #git
17:43 RickyB98 joined #git
17:43 BrAsS_mOnKeY joined #git
17:43 salparadise joined #git
17:43 tribly joined #git
17:44 CalimeroTeknik joined #git
17:44 benaiah` left #git
17:44 tabakhase joined #git
17:44 lukky513 joined #git
17:44 pwndave joined #git
17:44 bcc joined #git
17:44 bcc joined #git
17:44 gmh joined #git
17:44 Fissure joined #git
17:44 kaosine bremner: I am registered, but if this name is still somehow connected and I ghost it, this channel, c++  and java all give a "435 kaosine channel Cannot change nickname while banned on channel"
17:45 Salz joined #git
17:45 Salz joined #git
17:45 bathtub_shark joined #git
17:45 ulkesh joined #git
17:45 barq joined #git
17:46 TooLmaN joined #git
17:46 SebastianFlyte joined #git
17:46 SilverBe joined #git
17:47 zifnab joined #git
17:47 ahrs joined #git
17:48 nsh joined #git
17:48 ensign- joined #git
17:48 ome joined #git
17:49 theoceaniscool joined #git
17:49 lolmac joined #git
17:49 timwis joined #git
17:50 gajus joined #git
17:50 moritz joined #git
17:50 OverCoder joined #git
17:51 pifon joined #git
17:51 pizzaops joined #git
17:53 ayogi joined #git
17:54 murph joined #git
17:55 nextloop joined #git
17:56 SuperDuperKali joined #git
17:56 matt_m joined #git
17:56 karstensrage_ joined #git
17:57 jstimm joined #git
17:58 ntonjeta joined #git
17:58 Derperperd joined #git
17:59 jason237 joined #git
18:01 tomek kaosine you're not banned, #git has mode that disallows nick changes
18:01 tomek just part, change nick, join back
18:02 kaosine yeah but that's annoying to have to leave and rejoin 3 different channels because of that
18:02 jeffreylevesque is http://scikit-learn.org/stable/modu​les/generated/sklearn.svm.SVC.html hosted on github pages?
18:02 MineCoins joined #git
18:02 bremner kaosine: I guess it's a freenode irc server limitation.
18:02 zeroed joined #git
18:03 Peng It's not a limitation, it's a choice.
18:05 Sound joined #git
18:07 anbz joined #git
18:08 mehola joined #git
18:08 thebope joined #git
18:09 Gustavo6046 joined #git
18:13 King_Hual` joined #git
18:15 Vinnie_win joined #git
18:15 zivester joined #git
18:15 smurfendrek123 joined #git
18:15 j7k6 joined #git
18:16 jstimm joined #git
18:17 Limes joined #git
18:19 srcerer joined #git
18:21 jeffreylevesque joined #git
18:21 karstensrage_ left #git
18:21 alexandre9099 joined #git
18:22 CountryNerd joined #git
18:23 Limes_ joined #git
18:23 karstensrage joined #git
18:23 pur3eval joined #git
18:23 xbob joined #git
18:24 MrcRjs joined #git
18:24 grawity just log in before doing any ghosting
18:24 dsteplight__ joined #git
18:24 kexmex joined #git
18:25 MrcRjs joined #git
18:25 whaley joined #git
18:26 einnjo joined #git
18:30 MrcRjs joined #git
18:31 puff Good afternoon.
18:34 Nugget_ left #git
18:34 Klumben joined #git
18:34 Tsutsukakushi joined #git
18:34 JelmerD joined #git
18:34 _flow__ joined #git
18:35 Nugget joined #git
18:35 JelmerD joined #git
18:35 Limes joined #git
18:35 albel727 joined #git
18:36 King_Hual_ joined #git
18:36 jeffreylevesque_ joined #git
18:36 _flow__ joined #git
18:36 fatalhalt joined #git
18:37 Tsutsukakushi joined #git
18:37 jnavila joined #git
18:38 BlueMatt_ left #git
18:38 BlueMatt joined #git
18:40 hhee joined #git
18:43 matoro joined #git
18:43 ahr3n joined #git
18:45 Sample joined #git
18:45 swords joined #git
18:45 dreiss joined #git
18:45 bgerber joined #git
18:47 jstimm joined #git
18:49 Es0teric joined #git
18:52 joshszep joined #git
18:53 inflames joined #git
18:58 done joined #git
18:59 rnsanchez joined #git
19:03 _rgn joined #git
19:05 dreiss joined #git
19:06 Hink joined #git
19:07 lucasem hello!
19:08 a3Dman joined #git
19:14 nellicus_ joined #git
19:16 jstimm joined #git
19:17 livingstn joined #git
19:22 Levin^ joined #git
19:22 Levin^ hello there
19:22 gitinfo Levin^: 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.
19:23 Levin^ !backup
19:23 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.c​om/GitBestPractices/#backups
19:23 Derperperd joined #git
19:24 pur3eval joined #git
19:25 Levin^ what is the command to send my local files to my bitbucket repository?
19:26 grawity sending stuff only works with commits, not files
19:26 grawity use `git push` to transfer those
19:26 Sample joined #git
19:27 nikomo_ left #git
19:27 Levin^ I used git push and it did nothing
19:28 SteffanW joined #git
19:28 jottr_ joined #git
19:29 GodGinrai joined #git
19:31 Iacobus joined #git
19:31 raspado joined #git
19:32 Sample joined #git
19:32 Sample the goggles
19:32 thiago joined #git
19:35 Darren_ joined #git
19:35 duderonomy joined #git
19:35 Awesomecase joined #git
19:37 jimi_ joined #git
19:37 Es0teric joined #git
19:38 marcogmonteiro joined #git
19:38 jimi_ joined #git
19:39 jimi_ joined #git
19:39 nedbat_ Levin^: tell us more about what you did.  You edited some files.  Then what?
19:40 MrcRjs joined #git
19:40 Levin^ now I want to send what I did to my bitbucket repo
19:40 JanC_ joined #git
19:41 Mir4g3 joined #git
19:41 nedbat_ Levin^: you need to add the changes, then make a commit, then push the commit.
19:41 Levin^ I used the git push command, it said Everything up-to-date
19:41 Levin^ ok, I will do it again, a sec
19:42 Levin^ git status, git add ., git commit -am, git push
19:42 MattMaker joined #git
19:43 uhmgswa^2 joined #git
19:43 Levin^ are these commands correct?
19:44 _Vi joined #git
19:44 jnavila joined #git
19:45 nedbat_ Levin^: yes, though the -a on commit is redundant with the "add".
19:45 Levin^ oh
19:46 govg joined #git
19:48 shgysk8zer0_ joined #git
19:50 Levin^ when I entered the commit command, it returned this:
19:50 Levin^ On branch master, Changes not staged for commit: modified: vendor/leandrogoncalves/vcgen (modified content), no changes added to commit
19:50 ntonjeta joined #git
19:51 Levin^ "no changes added to commit" is what's making it refrain to send it to my online repo?
19:53 uhmgawa joined #git
19:53 nedbat Levin^: yes, add those files with "git add".  Is that a new file?
19:54 Levin^ well, atually I modified at least 20 different files, and what one is not modified from me, probably some system file? I don't know
19:54 Derperperd joined #git
19:55 Levin^ I know my local repo is updated because I used git pull origin felipe and git push origin felipe
19:55 Levin^ now i want to send my current state to the online repo, but it doesnt go
19:55 MineCoins joined #git
19:56 livingstn joined #git
19:56 Gustavo6046 joined #git
19:57 thebope joined #git
19:59 Levin^ now I know what happened
20:00 Levin^ I was able to send git push to the master branch
20:00 Levin^ now, I need to know how to commit to another branch
20:01 Levin^ I have two branches: master and felipe. I need to send it to the branch felipe. how to commit to that branch?
20:02 Endarked joined #git
20:04 gopar joined #git
20:05 chachasmooth joined #git
20:07 wilbert joined #git
20:09 mehola joined #git
20:11 Pursuit joined #git
20:12 Pursuit joined #git
20:14 thiago joined #git
20:14 pur3eval joined #git
20:16 j7k6 joined #git
20:19 DaYwalKer joined #git
20:21 lucido-cl joined #git
20:23 Shatnerz0 joined #git
20:25 Shatnerz0 Hey, I'm new to githooks but want something that basically checks if a directory (schema/) was modified at all on a push to master and sends out a msg via email or slack. Would I want to use the post-receive hook here?
20:26 jstimm joined #git
20:28 peterbecich joined #git
20:29 ojacobson post-receive or update
20:29 ojacobson post-receive runs once per push, update runs once per branch
20:29 ojacobson er, post-update
20:29 Shatnerz0 nice thanks, update is applied per branch
20:29 Shatnerz0 nvm thanks
20:30 Maxdamantus joined #git
20:30 Shatnerz0 and that would be in the bare repo, is there any git/bash magic that check if the new push changed a specific directory?
20:30 MattMaker joined #git
20:31 ojacobson you have to inspect the commit being pushed
20:31 SwiftMatt joined #git
20:32 ojacobson the hook receives both the old revision (or allballs for newly-created branches) and the new revision (or allballs for a deleted branch) and you can use git tools like `git diff` to compare them
20:32 ojacobson the objects exist on disk at that point
20:33 Shatnerz0 cool, thanks again
20:33 ojacobson as a starting point, if is_commit $OLD && is_commit $NEW && git diff --quiet $OLD $NEW -- path/to/dir; then send_mail; fi
20:33 anuxivm joined #git
20:33 ojacobson where is_commit and send_mail are placeholders you'd have to write
20:34 ojacobson is_commit is a simple string compare: if it's forty 0 characters in a row, it's not a commit
20:35 sq-one joined #git
20:39 Bizkit joined #git
20:39 _rgn joined #git
20:39 _rgn joined #git
20:40 griffindy joined #git
20:41 gregakinman joined #git
20:41 raatiniemi joined #git
20:41 lacour joined #git
20:41 ljc joined #git
20:42 gregakinman hey there- got a question about the .gitignore behavior if anyone is an expert
20:42 alexandre9099 joined #git
20:42 Derperperd joined #git
20:43 qqx So if nobody is an expert you don't have a question?
20:43 gregakinman lol. rephrased for programmers: i have a question about .gitignore behavior and am wondering if anyone here would like to try to answer
20:44 qqx !anyone
20:44 gitinfo Usually, it does not help to ask for someone specific to help you. Without knowing your specific problem, nobody knows if they can be of assistance. Please ask your questions and wait until somebody speaks up.
20:45 Jjdga joined #git
20:45 gregakinman why is it that a .gitignore line such as "foo" ignores files such as "bar/baz/foo"?
20:45 gregakinman according to the documentation each .gitignore line is treated as a shell glob and passed to fnmatch(3)
20:46 gregakinman according to fnmatch(3), "foo" does not match "bar/baz/foo"
20:46 gregakinman therefore, according to the documentation, "bar/baz/foo" should NOT be ignored when the line "foo" is in the .gitignore
20:46 gregakinman however, in practice, i see that it is ignored
20:46 gregakinman what gives?
20:47 Hink joined #git
20:47 ojacobson I can't recall off the top of my head where it's spelled out in the man page (but it is)
20:48 ojacobson but 'foo' matches a file in any directory, '/foo' matches a file in the same directory as the .gitignore file, '/bar/foo' matches a file named foo in a directory named bar in the directory where the .gitignore file is, etc
20:48 qqx Patterns read from a .gitignore file in the same directory as the path, or in any parent directory,
20:48 nedbat gregakinman: the common case is ignoring something like *.o  .  It's usaful for that to apply to files anywhere in the tree.
20:48 Es0teric joined #git
20:49 gregakinman yes, but IMO you should have to specify explicitly that you want any file in the tree to be ignored, i.e., with **/foo
20:49 gregakinman and ojacobson, yes, that is the behavior i have observed experimentally
20:49 ojacobson great
20:49 gregakinman but that behavior does not agree with the online documentation!
20:49 gregakinman "Otherwise, Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag"
20:50 _ikke_ If the pattern does not contain a slash /, Git treats it as a shell glob pattern and checks for a match against the pathname relative to the location of
20:50 _ikke_ the .gitignore file (relative to the toplevel of the work tree if not from a .gitignore file).
20:50 _ikke_ foo matches bar/baz/foo
20:50 gregakinman if you pass "foo" and "bar/baz/foo" to fnmatch(3) with that flag, it tells you they don't match!
20:51 gregakinman foo objectively does NOT match bar/baz/foo according to fnmatch(3)
20:51 _ikke_ gregakinman: the next step says "otherwise"
20:51 _ikke_ so if it does not contain a /, fnmatch does not come into play
20:51 HardlySeen left #git
20:51 Gloomy joined #git
20:52 gregakinman so the "otherwise" only applies to paths that contain a slash but do not end with a slash?
20:52 ojacobson the otherwise only applies to paths that contain a slash somewhere other than at their end
20:52 ojacobson patterns 'foo' and 'foo/' will be treated as shell globs on 'foo'
20:53 gregakinman what does that mean exactly "be treated as shell globs"?
20:53 ojacobson patterns 'foo/bar' and 'foo/bar/' will be treated as fnmatch patterhsn on 'foo/bar' IIRC
20:53 Levin^ left #git
20:53 _ikke_ if it ends with a '/', it will only match directories
20:53 Dougie187 left #git
20:54 vtols joined #git
20:54 _ikke_ so 3 sitations: ends with a /, not containing a /, or containing a /
20:54 _ikke_ situations*
20:55 gregakinman right
20:55 gregakinman so the "not containing a /" situation is the one of concern here
20:55 gregakinman the docs say "Git treats it as a shell glob pattern"
20:55 gregakinman what does that mean exactly?
20:57 gregakinman nobody knows, apparently
20:57 nedbat gregakinman: are you trying to 1) understand the behavior, 2) trying to change the behavior, 3) trying to improve the docs?
20:57 gregakinman 1) for sure, and 3) if necessary
20:58 gregakinman definitely not 2)
20:58 vtols Hi. Want to apply to GSoC with git. Where can I write my questions. Can I start with "git tag --contains <id>" microproject?
20:58 _ikke_ gregakinman: That piece is already in the documentation since 2007
20:58 username1 joined #git
20:58 _ikke_ vtols: the !mailing_list is the best place
20:58 gitinfo vtols: The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git
20:58 gregakinman _ikke_: what piece?
20:59 _ikke_ gregakinman: "treats as a shell glob pattern
20:59 gregakinman _ikke_: yes, but what does that actually mean
20:59 gregakinman is there a definition of a shell glob pattern as Git knows it anywhere
21:00 _ikke_ gregakinman: I'm trying to find iut
21:00 radoslavcap joined #git
21:00 Hello71 man glob
21:00 Hello71 uh, man 7 glob
21:01 einnjo joined #git
21:02 blr joined #git
21:02 gregakinman i understand globs in the context of wildcards
21:03 gregakinman but for strings that don't contain *, ?, or [, i'm not sure what they do other than match exact strings
21:04 _ikke_ gregakinman: man 7 glob says "Globbing is applied on each of the components of a pathname separately."
21:04 _ikke_ "
21:05 gregakinman i just found that phrase, yeah
21:05 gregakinman i think that is the key phrase
21:05 gregakinman thanks for pointing it out
21:05 gregakinman i'm using find as a reference here as well
21:05 gregakinman and if you have baz/foo and foo in a directory
21:06 gregakinman find . -name 'foo' returns both of those
21:06 Hink joined #git
21:06 gregakinman which i guess i didn't know until now
21:07 peeps[lappy] joined #git
21:09 gregakinman alright but one interesting case is this
21:09 dreiss joined #git
21:09 gregakinman it doesn't always follow the behavior of find(1)
21:09 gregakinman for example
21:09 _ikke_ Hello71: thanks for that pointer btw
21:10 gregakinman find . -name "**/foo" does not return anything when run in a directory with foo and baz/foo
21:10 Hello71 ** isn't in glob(7)
21:10 Hello71 or, more precisely, it matches zero or more characters then zero or more characters
21:11 _ikke_ That's where fnmatch comes into play
21:12 nilg joined #git
21:12 cdg joined #git
21:13 diego2 joined #git
21:14 diego3 joined #git
21:15 gregakinman _ikke_ so i just tested **/foo matching baz/foo with fnmatch(3) and it doesn't match
21:15 ojacobson with FNM_PATHNAME set?
21:15 gregakinman _ikke_: so it looks like there's something else at play here
21:15 gregakinman yes
21:16 gregakinman #include <stdio.h> #include <fnmatch.h>  int main(void) {         const char *pattern, *string;          pattern = "**/foo";         string = "baz/foo";          if (fnmatch(pattern, string, FNM_PATHNAME)) {                 printf("%s matches %s.\n", pattern, string);         } else {                 printf("%s does not match %s.\n", pattern, string);         } }
21:16 ojacobson (The gitignore page spells out ** behaviour explicitly, separately from fnmatch)
21:16 _ikke_ right
21:16 _ikke_ my bad
21:16 gregakinman ah
21:16 _ikke_ ** is not in fnmatch either
21:16 Hink joined #git
21:16 ojacobson The man page is, I think, one step removed from reading the code
21:16 ojacobson and could be massively improved if someone wanted to take the time
21:17 gregakinman ok
21:17 ojacobson (Issue 37 in my ongoing series titled "git is user-hostile")
21:17 gregakinman i think as far as ** goes the man page is fine
21:17 gregakinman but i think the shell glob part for lines that do not contain slashes could be improved
21:18 ojacobson I think that misses the point a bit… the man page should spell out the syntaxes without reference to the implementation details
21:18 ojacobson the syntaxes _aren't that complicated_
21:18 _ikke_ I don't know how it worked for me, but it was quite for me already in the beginning that foo matches anything called foo
21:18 _ikke_ quite clear*
21:18 ojacobson Unprefixed foo matches any suffix of a path, /foo matches an exact path, trailing slash matches a directory, leading ! inverts a match, # is a comment
21:19 _ikke_ even without looking at man fnmatch or man 7 glob
21:19 ojacobson there are some ordering rules, and then you're done
21:19 ojacobson (and an entire section on wildcards and globs)
21:19 ojacobson People reading the docs should get a clear picture of what git's going to do, not a clear picture of how git accomplishes it
21:19 ojacobson if you want the how, read the source
21:20 ojacobson or run strace
21:20 _ikke_ A lot of that documentation apparently is already there from the very beginning
21:20 _ikke_ ojacobson: At least to me, it's quite clear what happens if I read that part
21:20 ojacobson I'm entirely sympathetic to gregakinman's initial "I am surprised by this" complaint :)
21:21 _ikke_ what complicates it is that there are 3 mechanisms at play
21:21 _ikke_ glob, fnmatch, and git matching **
21:21 ojacobson I'm not clear on why that necessarily complicates the documentation
21:22 ojacobson anyways I should take this line of reasoning to the !list I bet :)
21:22 gitinfo [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git
21:22 byte512 joined #git
21:22 _ikke_ ojacobson: Looked to me that gregakinman focused on one part of those 3, which did not describe the entire behaviour
21:22 Hink joined #git
21:23 _ikke_ But not mentioning them would improve that, agreed
21:23 _ikke_ On the other hand, it does prevent that you need to copy existing documentation
21:23 ojacobson I'm not sure I follow - can you elaborate?
21:24 _ikke_ ojacobson: gregakinman was looking at fnmatch only
21:24 nilg` joined #git
21:25 gregakinman and i was looking at that case only because the documentation wasn't clear
21:25 gregakinman i think the docs should lay out all the cases sort of like a switch statement
21:25 gregakinman programmers are reading these docs - they should be laid out as a programmer would read them
21:25 _ikke_ gregakinman: Not everyone who reads this is a programmer
21:25 gregakinman they're close - but i think this section could be improved
21:26 gregakinman right, but even so, i think it should be laid out like code anyway as that is the most logical way to describe it
21:26 _ikke_ It's basic an if/else statement right now
21:26 _ikke_ if a, elsif b, else
21:27 AngryNorsMan joined #git
21:27 gregakinman except there's caveats afterwards for **
21:27 gregakinman so it's not as clear
21:27 gregakinman i perhaps may put together a reword for this and submit it as a patch
21:27 _ikke_ gregakinman: Nice
21:28 ojacobson that'd be awesome
21:28 gregakinman _ikke_: and ojacobson: thank you for your help!
21:28 ojacobson that's a way better outcome than I expected from this conversation
21:28 ojacobson most "the docs suck" threads end with zero resolution
21:28 ojacobson pre-emptive kudos
21:28 gregakinman :)
21:29 GodGinrai joined #git
21:30 mikecmpbll joined #git
21:32 _ikke_ I think what did it for me is that I noticed how git behaved, and that made it easier for me to interpret the documentation
21:35 bttf joined #git
21:36 SCHAAP137 joined #git
21:37 pur3eval joined #git
21:37 jeffreylevesque joined #git
21:39 MattMaker joined #git
21:40 matt_m joined #git
21:42 TbobbyZ_ joined #git
21:43 bgerber joined #git
21:44 hasc joined #git
21:46 dreiss joined #git
21:47 masuberu joined #git
21:50 bgerber joined #git
21:51 hasc joined #git
21:52 davimore joined #git
21:53 durham_ joined #git
21:54 todd_dsm joined #git
21:55 m0viefreak joined #git
21:55 Atm0spher1c joined #git
21:55 jeffreylevesque_ joined #git
21:56 joshszep joined #git
21:57 joshszep joined #git
21:57 TbobbyZ joined #git
22:01 nowhere_man joined #git
22:02 jimi_ joined #git
22:02 MattMaker joined #git
22:03 jagob joined #git
22:03 AngryNorsMan left #git
22:03 durham joined #git
22:08 blackwind_123 joined #git
22:10 mikeputnam joined #git
22:12 Shatnerz0 joined #git
22:14 bgerber joined #git
22:17 j7k6 joined #git
22:20 netj joined #git
22:23 enckse joined #git
22:24 Karazhan joined #git
22:24 storrgie joined #git
22:28 ash_workz joined #git
22:29 Karazhan joined #git
22:34 Karazhan joined #git
22:35 whaley joined #git
22:36 MrcRjs joined #git
22:37 pur3eval joined #git
22:40 Karazhan joined #git
22:40 clemf joined #git
22:40 rwb joined #git
22:42 Karazhan joined #git
22:43 jimi_ joined #git
22:44 venmx joined #git
22:44 thebope joined #git
22:49 Karazhan joined #git
22:52 jottr_ joined #git
22:53 YuGiOhJCJ joined #git
22:53 ssarah osse, it will keep the history like that (about the merging two git repositories)
22:55 jottr joined #git
22:55 pks joined #git
22:58 jstimm joined #git
22:59 marenz_ joined #git
23:01 nickabbey joined #git
23:01 raspado joined #git
23:01 CussBot joined #git
23:02 chardan joined #git
23:06 manuelschneid3r joined #git
23:07 c-c joined #git
23:08 c-c I saw somewhere a oneliner for using git to generate hashes (sha). I forget what was the syntax & input. Is there a cool way to generate N long hashes from arbitrary input string?
23:08 durham joined #git
23:09 APic Will Git switch to SHA256 some Day?
23:10 jimi_ joined #git
23:17 Karazhan joined #git
23:17 muhannad joined #git
23:17 phy1729 APic: https://plus.google.com/+Lin​usTorvalds/posts/7tp2gYWQugL
23:18 APic Thanks.
23:18 dave0x6d joined #git
23:19 joshszep joined #git
23:24 beatdown joined #git
23:24 MatthewAllan93_ left #git
23:24 durham joined #git
23:24 MatthewAllan93 joined #git
23:24 masuberu joined #git
23:26 MattMaker joined #git
23:27 barajasfab joined #git
23:28 nowhere_man joined #git
23:30 GodGinrai joined #git
23:30 jstimm joined #git
23:31 Darren_ joined #git
23:35 akkad joined #git
23:37 humboldt joined #git
23:38 cbreak APic: why switch to SHA2 when SHA3 already exists? :)
23:38 APic Because.
23:38 pur3eval joined #git
23:39 osse makes sense
23:40 DolpheenDream joined #git
23:43 DieguezZ joined #git
23:43 c-c ok, to answer my question, I guess one could use $ git hash-object /path/file.txt
23:43 c-c left #git
23:43 cagomez joined #git
23:43 CmndrSp0ck joined #git
23:44 eroux joined #git
23:44 joshszep joined #git
23:47 CmndrSp0ck joined #git
23:48 CmndrSp0ck joined #git
23:50 bannakaffalatta joined #git
23:50 sathed joined #git
23:50 MattMaker joined #git
23:52 madewokherd joined #git
23:52 DryBreadAddict joined #git
23:52 peacememories joined #git
23:53 sathed joined #git
23:53 thiago_ joined #git
23:54 chardan joined #git
23:54 MattMaker joined #git
23:55 nothingnew joined #git
23:57 chardan joined #git

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