Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-27

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

All times shown according to UTC.

Time Nick Message
00:00 nutron joined #git
00:02 matoro joined #git
00:03 aidalgol joined #git
00:05 pfrench joined #git
00:08 pfrench joined #git
00:10 ryxxed joined #git
00:13 Gustavo6046 joined #git
00:14 pfrench joined #git
00:14 jast .trigger_edit topgit -
00:14 gitinfo jast: Okay.
00:15 nutron joined #git
00:15 jast .trigger_edit Grafts -
00:15 gitinfo jast: Okay.
00:17 jason237 joined #git
00:18 rivarun joined #git
00:18 ozmage joined #git
00:20 pfrench joined #git
00:23 ChadTaljaardt joined #git
00:26 Levex joined #git
00:27 Puffball joined #git
00:27 VoidFox joined #git
00:28 pfrench joined #git
00:29 MattMaker joined #git
00:29 tristanp joined #git
00:31 metalraiden34 joined #git
00:32 clemf joined #git
00:34 pfrench joined #git
00:38 pfrench joined #git
00:40 ryxxed joined #git
00:41 matoro joined #git
00:41 Noldorin joined #git
00:46 GavinMagnus left #git
00:51 pfrench joined #git
00:52 mizu_no_oto joined #git
00:56 pfrench joined #git
00:56 nopf joined #git
00:56 RichiH joined #git
00:58 matoro joined #git
00:59 Gsham joined #git
01:00 nettoweb joined #git
01:04 jason237 joined #git
01:05 testingirc joined #git
01:08 Electrom_ joined #git
01:08 kbs joined #git
01:10 geoid_ joined #git
01:15 pur3eval joined #git
01:17 cqi joined #git
01:18 clemf joined #git
01:20 pypypypypy joined #git
01:21 pfrench joined #git
01:22 ResidentBiscuit joined #git
01:24 acidjnk joined #git
01:24 ToBeCloud joined #git
01:25 pfrench joined #git
01:27 dsdeiz joined #git
01:27 dsdeiz joined #git
01:32 dsdeiz_ joined #git
01:34 pfrench joined #git
01:34 Gsham joined #git
01:38 pfrench joined #git
01:41 acetakwas joined #git
01:42 trip joined #git
01:43 Levex joined #git
01:45 svm_invictvs joined #git
01:48 cagedwisdom joined #git
01:48 akkad joined #git
01:50 pfrench joined #git
01:56 kyan joined #git
01:57 ozmage joined #git
02:02 pfrench joined #git
02:05 pfrench joined #git
02:05 venmx joined #git
02:09 gfixler joined #git
02:10 kyan joined #git
02:13 karstensrage_ left #git
02:14 ReptilianBrain joined #git
02:15 pur3eval joined #git
02:16 EV3RYDAYPR0GRESS joined #git
02:16 pfrench joined #git
02:21 finalbeta joined #git
02:21 pfrench joined #git
02:22 astrofog joined #git
02:27 brent__ joined #git
02:29 pfrench joined #git
02:30 tristanp joined #git
02:32 ezzieyguywuf joined #git
02:32 ezzieyguywuf is it a bad idea to switch to branch A while branch B is compiling?
02:35 Mahpoul22 joined #git
02:35 xaviergmail_2 joined #git
02:35 rchavik joined #git
02:38 pfrench joined #git
02:39 adymitruk yes
02:42 d^sh joined #git
02:46 Emperor_Earth joined #git
02:46 Vampire0 joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | We are aware of the SHA-1 collision. See: http://jk.gs/t/a4 | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:49 pks joined #git
02:52 Limes_ joined #git
02:52 kales joined #git
02:53 ezzieyguywuf k
02:54 pfrench joined #git
02:56 aavrug joined #git
02:58 kales left #git
02:59 PioneerAxon joined #git
02:59 pfrench joined #git
03:03 jameser joined #git
03:05 hexagoxel_ joined #git
03:06 pfrench joined #git
03:06 sbulage joined #git
03:07 gelei007 joined #git
03:08 akkad joined #git
03:10 fstd_ joined #git
03:10 Goplat joined #git
03:11 mizu_no_oto joined #git
03:13 Evidlo left #git
03:13 akkad joined #git
03:16 ISmithers joined #git
03:16 pks joined #git
03:17 Vortex34 joined #git
03:18 boombatower joined #git
03:18 pfrench joined #git
03:18 dreaddymck joined #git
03:25 pfrench joined #git
03:31 pur3eval joined #git
03:31 pfrench joined #git
03:36 chachasmooth joined #git
03:37 pfrench joined #git
03:37 clemf joined #git
03:41 askb joined #git
03:41 pfrench joined #git
03:42 joeyDB joined #git
03:43 explody joined #git
03:45 howdoi joined #git
03:45 MattMaker joined #git
03:46 finalbeta joined #git
03:47 joeyDB hi all, is there a way to do a git merge or rebase with a --depth=1 I need to merge or rebase hundreds of commits, I just don't want to compare the state of the repo over and over again
03:49 pfrench joined #git
03:50 matoro joined #git
03:50 mizu_no_oto joined #git
03:50 Impaloo joined #git
03:50 sunri5e joined #git
03:51 lcj joined #git
03:51 phroa joeyDB: idea: save the current repo state somewhere, then checkout the target commit, put the files back, and commit that as the correct state
03:52 ResidentBiscuit joined #git
03:52 pfrench joined #git
03:53 lcj joined #git
03:53 a_thakur joined #git
03:54 a_thakur joined #git
03:59 nothingnew joined #git
03:59 govg joined #git
04:00 pfrench joined #git
04:02 justanotheruser joined #git
04:05 aruns joined #git
04:08 pfrench joined #git
04:11 rivarun joined #git
04:12 arescorpio joined #git
04:12 joeyDB phroa: not a bad idea. what I've done so far instead... check out new branch REWRITE_HISTORY. git fetch upstream/master --force; gco master; git merge REWRITE_HISTORY --no-ff
04:12 joeyDB hopefully it wont make me do it for every single commit ever
04:12 joeyDB almost done with handling the merge conflicts
04:15 pfrench joined #git
04:16 heroux joined #git
04:20 pfrench joined #git
04:21 nivag joined #git
04:21 akkad joined #git
04:24 ChadTaljaardt joined #git
04:24 pfrench joined #git
04:29 pfrench joined #git
04:30 MattMaker joined #git
04:31 tristanp joined #git
04:33 durham joined #git
04:34 pfrench joined #git
04:35 Random832 joined #git
04:36 kasual joined #git
04:39 pfrench joined #git
04:48 pfrench joined #git
04:50 Cabanoss- joined #git
04:51 darkbit joined #git
04:52 SwiftMatt joined #git
04:54 hahuang65 joined #git
04:57 pfrench joined #git
05:02 pfrench joined #git
05:02 pur3eval joined #git
05:03 venmx joined #git
05:06 pfrench joined #git
05:11 pfrench joined #git
05:12 ayogi joined #git
05:15 pwndave joined #git
05:16 raspado joined #git
05:18 pfrench joined #git
05:21 rodan joined #git
05:22 ayogi joined #git
05:23 re1 joined #git
05:23 svm_invictvs joined #git
05:23 pfrench joined #git
05:26 username_ joined #git
05:28 pfrench joined #git
05:29 spim joined #git
05:32 muhannad_______ joined #git
05:33 jerware joined #git
05:33 jerware moin.
05:33 pfrench joined #git
05:33 jerware what ports does git use to push to a repo on github?  Anything other than 443?
05:34 phy1729 22 9418
05:34 jerware oh ok.  that sucks.  my boss firewalls that.
05:36 phroa get him to unblock it
05:38 pfrench joined #git
05:38 raijin joined #git
05:39 jerware I'll have to set up SOCKS5 proxy at home.  Not supposed to code on the job.
05:39 grawity jerware: if your remote uses SSH, it's port 22; for HTTPS it's port 443
05:39 grawity jerware: the standard ones, basically
05:40 grawity 9418 is for read-only git://
05:40 grawity can't really push over that
05:40 jerware can't I set the git client to use 80 instead of 22? and have the proxy "pivot" from there to 22?
05:41 aw1 joined #git
05:41 jerware did with 443 -> 9418
05:41 grawity I don't quite see the point in that
05:41 grawity if you can use HTTPS, might as well push directly over HTTPS
05:41 jerware those are the only open ports at work
05:41 jerware oh ok
05:42 grawity there's almost no advantage in using SSH, other than its key-based auth
05:42 jerware so if ssh is the git client's default, how to I set it to use https?
05:42 grawity there's no default
05:42 grawity it uses exactly what URL you gave it at time of `git clone`
05:43 grawity see `git remote -v`, and `git remote set-url origin ...`
05:43 _ng joined #git
05:43 pfrench joined #git
05:43 jerware thanks
05:44 grawity (both user@host:path and ssh://user@host/path are SSH over port 22, while https:// is, well, HTTPS over 433)
05:44 grawity github and most other *hubs support both
05:44 lucido-cl joined #git
05:46 * grawity =~ s/over 433/over 443/
05:47 justan0theruser joined #git
05:52 danimal2 joined #git
05:53 danimal2 joined #git
05:53 pfrench joined #git
05:53 netj joined #git
05:58 pfrench joined #git
06:01 thebope joined #git
06:02 peterbecich joined #git
06:03 dec0n joined #git
06:05 aruns joined #git
06:05 pfrench joined #git
06:08 jameser joined #git
06:09 rscata joined #git
06:11 MineCoins joined #git
06:11 rainbyte joined #git
06:13 pfrench joined #git
06:14 dedicated_ joined #git
06:14 math-alpha joined #git
06:17 acetakwas joined #git
06:18 pur3eval joined #git
06:18 Guest82 joined #git
06:20 pfrench joined #git
06:21 YuGiOhJCJ joined #git
06:24 nowhereman joined #git
06:24 rmbeer joined #git
06:25 rmbeer hello
06:25 rmbeer i use 'git diff branch1 branch2 --' say fatal: bad revision 'branch2' , not understand this....
06:25 rmbeer i want view the diff between two branchs
06:26 dorkmafia joined #git
06:28 rmbeer also not work with 'git diff --name-status branch1..branch2', give 'fatal: ambiguous argument 'branch1..branch2': unknown revision or path not in the working tree.'
06:28 pfrench joined #git
06:29 Karunamon joined #git
06:31 sunri5e joined #git
06:31 tristanp joined #git
06:33 zeroed joined #git
06:34 User458764 joined #git
06:35 Loomaanaatii joined #git
06:36 pfrench joined #git
06:36 slax0r_ joined #git
06:37 rmbeer Dx
06:38 serialoverflow joined #git
06:38 slax0r left #git
06:38 rmbeer 'git diff branch2' , 'git diff ..branch2', 'git diff ...branch2', 'git log *stuff-param*', never work!
06:39 dersand joined #git
06:42 pfrench joined #git
06:42 Loomaanaatii joined #git
06:44 rivarun joined #git
06:47 pfrench joined #git
06:47 runlevl4 joined #git
06:49 ThomasLocke joined #git
06:49 ThomasLocke joined #git
06:51 skalpin joined #git
06:51 pfrench joined #git
06:52 osse rmbeer: git rev-parse branch1; git rev-parse branch2
06:52 osse what do those say
06:52 zeroed joined #git
06:52 zeroed joined #git
06:53 Loomaanaatii joined #git
06:54 Raging_Hog joined #git
06:54 pfrench joined #git
06:55 Loomaaanaatii joined #git
06:56 zefferno joined #git
06:56 Loomaanaatii joined #git
06:56 MACscr is there a way to empty my remote master branch at github and start over from scratch?
06:57 rmbeer osse, fixed, one branch only have in origin branch...
06:58 llamapixel MACscr:  Unless it is super corrupted just keep rolling, otherwise you can delete the online repo and make it fresh then push a saved copy from another folder of the work into it becoming commit 1.0 branch master
06:58 rmbeer i make a repository to app.git and get a clone, now in this directory have all in origin :/
07:01 pfrench joined #git
07:02 ckruczek joined #git
07:03 xall joined #git
07:03 matoro joined #git
07:03 Loomaana_ joined #git
07:04 Loomaanaatii joined #git
07:04 MACscr llamapixel the problem is that i cant push or pull anything right now. to many errors about conficts , etc
07:04 llamapixel Do you know how to roll back or is it too far?
07:05 User458764 joined #git
07:05 osse rmbeer: you only get a branch called master when you clone. but you have copies of all the other branches
07:05 MACscr its to far. this repo is only for my own dev use
07:06 osse rmbeer: !remote_tr
07:06 gitinfo rmbeer: [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch>
07:06 MACscr ive completely rewritten it, so not a huge deal anyway
07:06 freimatz joined #git
07:07 hhee joined #git
07:08 ruxu joined #git
07:08 muhannad_______ joined #git
07:08 chele joined #git
07:08 pfrench joined #git
07:09 rivarun joined #git
07:10 JeroenT joined #git
07:13 rmbeer osse, 'git checkout -b origin/branch2' ?
07:14 pfrench joined #git
07:14 osse rmbeer: that part was bad. try either 'git checkout branch2' or 'git checkout -b branch2 origin/branch2'
07:16 qt-x joined #git
07:17 xall joined #git
07:18 sbulage joined #git
07:19 pfrench joined #git
07:20 imack joined #git
07:20 deepy What's the rationale behidn there not being a post-push hook?
07:21 rmbeer also, result that i not need 'git diff'. I need view which is the line with importance changed from branch2 with respect to branch1.
07:22 zeroed joined #git
07:22 xall joined #git
07:25 rmbeer suppose that must use branch1...{number-sha-from-​init-of-branch1}...branch2
07:25 jimsio joined #git
07:27 thebird joined #git
07:29 lordjancso joined #git
07:30 osse rmbeer: try git diff branch1...branch2
07:31 MACscr uh, so i screwed up and just removed local files when i did git rm directory -r. I thought that only removed it from git, not actually the files locally. Anyway for me to reverse that?
07:31 Sample joined #git
07:31 pfrench joined #git
07:32 kadoban MACscr: 'git status' should tell you. Or 'git checkout HEAD -- the_dir'  should just bring it back up keep the change staged.
07:33 MACscr kadoban but i already pushed them
07:33 ixpict joined #git
07:34 kadoban The the same as the last one except not HEAD, whichever commit actually has the version as you want that directory, perhaps HEAD~1
07:35 MACscr sorry, i guess i dont do enough with git to even know version numbers, etc. how do i find this stuff out?
07:35 MACscr ok, i found it
07:35 pfrench joined #git
07:35 MACscr in github
07:36 kadoban man git-revisions descibes how to name commits and such if that's what you mean
07:36 kadoban man gitrevisions
07:36 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
07:36 kadoban That one, I guess.
07:37 govg joined #git
07:40 MACscr i dont get it. if git add doesnt create files, why does git rm remove files?
07:40 pfrench joined #git
07:40 MACscr i would have thought it just removed them from tracking
07:40 venmx joined #git
07:40 osse MACscr: because git doesn't know what it should create, but it can know what it should remove. I guess...
07:40 osse MACscr: use rm --cached to get the behaviour you want
07:41 jameser joined #git
07:42 GT4066 joined #git
07:43 osse git rm is basically a shortcut for 'rm file && git add file'. Equivalent for git mv
07:44 pfrench joined #git
07:45 jagob joined #git
07:48 MACscr ugh, why wont git add work here? http://paste.debian.net/plain/917042
07:48 grawity because that path is a submodule
07:48 grawity and a parent can only track submodules by their commit ID
07:48 pfrench joined #git
07:49 grawity i.e. you can't git-add something that hasn't been committed within the submodule first
07:49 MACscr i dont know what you mean by submodule
07:49 thebope joined #git
07:49 grawity https://git-scm.com/book/e​n/v2/Git-Tools-Submodules https://git-scm.com/docs/git-submodule
07:50 grawity another repo within a repo
07:50 MACscr damn this complicated process. lol.
07:50 grawity so that you can commit while you commit
07:50 jnavila joined #git
07:51 MACscr is there a way to remove that git repo? i guess just have gotten it when i though i was simply downloading a script
07:51 MACscr i still want to retain its files, but none of its git tracking features
07:51 gelei007 joined #git
07:54 leeN joined #git
07:55 elect joined #git
07:55 pfrench joined #git
07:55 MACscr nvm, googled a solution for that
07:56 dreiss joined #git
07:56 dvaske joined #git
07:57 rmbeer thank osse, and goodbye.
08:01 lb1c joined #git
08:01 pfrench joined #git
08:01 elect joined #git
08:01 muhannad_______ joined #git
08:03 ShekharReddy joined #git
08:03 Taikibansei joined #git
08:04 overlord_tm joined #git
08:04 pfrench joined #git
08:06 Loomaanaatii joined #git
08:06 pur3eval joined #git
08:08 User458764 joined #git
08:10 dvaske_ joined #git
08:11 pfrench joined #git
08:11 d0nn1e joined #git
08:12 zeroed joined #git
08:12 zeroed joined #git
08:17 pfrench joined #git
08:17 a_thakur joined #git
08:17 mtr_ joined #git
08:18 venmx joined #git
08:21 King_Hual joined #git
08:24 pfrench joined #git
08:26 biertie joined #git
08:27 ixpict joined #git
08:29 govg joined #git
08:30 pfrench joined #git
08:32 chele joined #git
08:34 jason237 joined #git
08:34 pfrench joined #git
08:34 chele i just pushed a commit to a public master branch and i still see the head pointing to an old commit?
08:35 moritz which head?
08:35 moritz chele: !repro please
08:35 gitinfo chele: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
08:36 armin am i correct that git uses sha1 hashes, which potentially are NOT collision-resistant as shown last week?
08:37 armin i'm pretty sure that SVN suffers from this already, but am unsure about git.
08:39 ejnryu joined #git
08:39 a_thakur joined #git
08:40 moritz armin: !sha1
08:40 gitinfo armin: Git's usage of SHA1 hashes is resistant to most attack vectors. Additional mitigations and an eventual migration to other hash algorithms are planned. https://plus.google.com/+Lin​usTorvalds/posts/7tp2gYWQugL. Constructing an actual SHA1 collision is still very expensive, and accidental encounters are less likely than random wolf attacks. Fear their howl.
08:42 Balliad joined #git
08:43 armin "This attack required over 9,223,372,036,854,775,808 SHA1 computations. This took the equivalent processing power as 6,500 years of single-CPU computations and 110 years of single-GPU computations." -- source: http://stackoverflow.com/questions/28792784/w​hy-does-git-use-a-cryptographic-hash-function (caution, link goes to stackoverflow)
08:44 thebope joined #git
08:44 armin moritz: i wonder if it's safe to say that SVN's use of sha1 is just less safe than the way git uses sha1 hashes, because i just read https://www.bleepingcomputer.com/news/s​ecurity/sha1-collision-attack-makes-its​-first-victim-subversion-repositories/
08:44 yushyin armin: please read the plus.google.com link linked by gitinfo
08:45 moritz armin: git deals much more gracefully with hash collisions
08:45 armin yushyin: ah, thanks in a lot. excuse me, please.
08:45 acetakwas joined #git
08:45 armin thanks to both of you, again.
08:45 kadoban It wouldn't deal with that case particularly well though, but it wouldn't crash and become unusable.
08:46 kadoban You'd just end up with two files that are the same thing, whichever one got added first I think.
08:47 TomyWork joined #git
08:47 dvaske joined #git
08:47 brk_ joined #git
08:48 thebird joined #git
08:49 chele moritz http://paste.debian.net/917046/ this is from git log current state.
08:50 chele moritz the interesting commit is from tester. it appears to be committed after my change
08:51 chele moritz ok i think i am confused with a local timeline display as it shows commit grouped by date.
08:52 pfrench joined #git
08:52 moritz chele: git log orders by topology first, not by date
08:53 zeroed joined #git
08:53 zeroed joined #git
08:53 chele moritz yes. i did not say git log. but i remember seen this commit 2 hours ago before my change. that's why is strange to see it after my change.
08:53 chele s/seen/seeing/g
08:53 mehola joined #git
08:53 moritz chele: did you git pull --rebase or something?
08:56 chele moritz before my change? yes. usual workflow is: git branch feature; <hack hack hack>; git commit; git checkout master; git pull --rebase; git checkout feature; git rebase master; git checkout master; git merge feature; git push origin master
08:57 xaa joined #git
08:58 jozwior joined #git
09:00 pfrench joined #git
09:01 Ardethian joined #git
09:04 darkbit joined #git
09:06 mikecmpbll joined #git
09:07 doener joined #git
09:10 pfrench joined #git
09:12 acidjnk22 joined #git
09:13 skunkz joined #git
09:14 muhannad_______ joined #git
09:14 pfrench joined #git
09:15 notebox joined #git
09:15 bejeb joined #git
09:18 notebox joined #git
09:18 Balliad joined #git
09:19 pfrench joined #git
09:23 pfrench joined #git
09:24 UniFreak joined #git
09:24 UniFreak I have pushed my commit to remote. now can I do a `commit --amend`?
09:27 selckin you can, but its not recommended
09:27 uranellus joined #git
09:27 uranellus joined #git
09:27 noteness joined #git
09:27 alexandre9099 joined #git
09:27 selckin will rewrite history, and you'll have to force push, and everyone else who has pulled from the repo ill have a hard time
09:27 UniFreak selckin: ok, then I won't do it. thankx
09:28 UniFreak thanks
09:31 metalraiden34 joined #git
09:31 jason237 joined #git
09:32 o232k joined #git
09:35 pfrench joined #git
09:36 leeN joined #git
09:38 thebope joined #git
09:39 gtristan joined #git
09:40 gtristan I'm looking at the --no-hardlinks and --local options of `git clone`
09:41 ntonjeta joined #git
09:41 gtristan And, I wonder... if I am not specifying --local, will git use hardlinks if possibly by default ?
09:44 selckin yes
09:45 nettoweb joined #git
09:45 kritzikratzi joined #git
09:46 pfrench joined #git
09:48 gtristan selckin, yes it will ?
09:48 gtristan Ok
09:48 gtristan was trying to sqeeze some extra optimization out of an automated task
09:48 gtristan *squeeze
09:48 * gtristan thinks he will put --local just for good measure anyway
09:49 selckin 2nd paragraph in the manual
09:51 gtristan selckin, you mean the 'git help clone' explanation of --no-hardlinks ?
09:51 selckin man git-clone
09:51 gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html
09:51 selckin " the repository is specified as a local path (e.g., /path/to/repo), this is the default, and --local is essentially a no-op"
09:52 gtristan right, I thought that was ambiguous with the preceding `--local` paragraph (unsure if git will know that it's local or not)
09:52 gtristan that man page is the same as git help clone, or git clone --help (thankfully) :)
09:53 pfrench joined #git
09:53 whywhypaul joined #git
09:55 MineCoins joined #git
09:56 aielima joined #git
09:57 mahakal joined #git
09:57 Snugglebash joined #git
09:58 mahakal joined #git
09:58 elect joined #git
09:59 tvw joined #git
09:59 mahakal joined #git
09:59 c0c0 joined #git
10:01 WhereIsMySpoon joined #git
10:01 WhereIsMySpoon Is there a way to get a simple view of all the commits that only I've made to multiple repos over a date period? Say just returning the commit message, the branch its in and the date
10:02 s1scha_ joined #git
10:02 uranellus joined #git
10:02 uranellus joined #git
10:02 metalraiden34 joined #git
10:02 chll_ joined #git
10:03 mahakal left #git
10:03 blackwind_123 joined #git
10:04 ohcibi joined #git
10:07 _ikke_ WhereIsMySpoon: git log --author="WhereIsMySpoon" --format="%s %d %cd
10:07 _ikke_ "
10:07 _ikke_ something like that
10:07 WhereIsMySpoon _ikke_: is there a way to do that for multiple git repos?
10:07 DrForr joined #git
10:08 grumble joined #git
10:08 _ikke_ Not with one command
10:09 _ikke_ You'd have to create a simple script
10:09 WhereIsMySpoon hm ok, thanks
10:09 manuelschneid3r joined #git
10:10 Levex joined #git
10:10 ismithers joined #git
10:13 ckruczek anybody considered the 'patch-workflow' as a reasonable workflow to work with big teams? I am reading about it and linux is developed like this and I am thinking of applying to our company workflow, but wanna to ask for some experiences
10:13 metachr0n joined #git
10:14 dreadlime joined #git
10:15 Levex joined #git
10:16 iveqy joined #git
10:17 manuelschneid3r joined #git
10:17 Serg_Penguin joined #git
10:17 ferr1 joined #git
10:18 Serg_Penguin hi ! How to make `git commit` return 0 if nothing to commit, but otherwise keep error reporting ?
10:18 WhereIsMySpoon left #git
10:18 b100s joined #git
10:18 Tobbi joined #git
10:18 Serg_Penguin In build script, I try to update dependencies and commit their file, but if not updated - build script fails
10:18 cdesai left #git
10:19 selckin maybe you should check if there are changes first
10:19 Serg_Penguin aha ;)
10:19 _ikke_ git diff -q
10:20 Levex joined #git
10:20 boqplw joined #git
10:22 Ardethian\ joined #git
10:29 gunnaro joined #git
10:30 eroux joined #git
10:30 Serg_Penguin rather `git diff-index HEAD --`, http://stackoverflow.com/a/3879077/1046885
10:31 achadwick joined #git
10:31 styx_ joined #git
10:32 thebope joined #git
10:33 Anoia joined #git
10:34 afuentes joined #git
10:35 Anoia hi all
10:35 Anoia is there a way to get a branch name (even the current branch name) in git show output?
10:35 Sample joined #git
10:35 Anoia %gd just returns blank
10:36 User458764 joined #git
10:37 Sid joined #git
10:37 nettoweb1 joined #git
10:37 WayToDoor joined #git
10:38 DaYwalKer joined #git
10:40 nicolai86 Anoia: %gn should work
10:41 Anoia nicolai86: sadly not..
10:41 Anoia this is for my current HEAD in the same branch
10:41 cr34ton joined #git
10:42 Anoia %d shows it in a different format
10:44 Levex joined #git
10:45 interrobangd joined #git
10:45 ahr3n joined #git
10:45 nicolai86 Anoia: %d should be (branch names), %D without the parathesis
10:46 Anoia nicolai86: yeah, I was hoping for just the (local) branch name, but that'll do for now
10:47 Anoia how about the list of files, as a list rather than diff?
10:47 ankit01ojha joined #git
10:47 Anoia essentiually, I want to format it for copying and pasting elsewhere
10:50 Snugglebash joined #git
10:50 pfrench joined #git
10:53 WayToDoor joined #git
10:53 matumbo` joined #git
10:54 Taikibansei joined #git
10:56 pur3eval joined #git
10:56 dreadlime left #git
10:56 MACscr error: Entry '.gitignore' would be overwritten by merge. Cannot merge.
10:57 MACscr im not sure why it couldnt be overwritten
10:57 Anoia dity local copy?
10:57 Anoia +r
10:57 MACscr of just that file?
10:58 ferr1 joined #git
10:58 Anoia maybe
10:58 Anoia it's a guess
10:58 MACscr how to resolve?
10:59 Anoia make sure it doesn;t have local modifications?
11:00 MACscr i dont care if it does, i want to pull whats from the master and overwrite anything local that exists in the master
11:01 MACscr git fetch --all
11:01 MACscr maybe that instead?
11:02 User458764 joined #git
11:03 MACscr that and git reset --hard origin/master
11:03 MACscr worked
11:04 Anoia or just git checkout
11:05 rnsanchez joined #git
11:06 beckyconning___ left #git
11:07 Masber joined #git
11:10 MACscr Anoia didnt work because it said i was on a branch not yet born
11:11 redeemed joined #git
11:16 bluepixel joined #git
11:20 metalraiden34 joined #git
11:20 aax joined #git
11:21 xaa__ joined #git
11:23 metalraiden34 joined #git
11:23 absinthe joined #git
11:25 cslcm joined #git
11:26 cslcm Hello - I have a repository with a detached worktree (i.e worktree= is set in config pointing to a different location).  When I try to do a "git submodule init", I get the error: "fatal: $program_name cannot be used without a working tree." - any idea what I can do about this?
11:27 Levex joined #git
11:29 RichiH cslcm: submodules are not very happy with detached worktree
11:29 RichiH and there's not a lot you can do to fix that
11:30 cslcm actually I just discovered that I could cd into the detatched worktree and use --git-dir=
11:31 bruce_lee joined #git
11:33 pfrench joined #git
11:37 nd_ joined #git
11:37 brent__ joined #git
11:38 pfrench joined #git
11:41 oskarkv joined #git
11:44 borkr joined #git
11:45 amrits joined #git
11:48 venmx joined #git
11:51 robattila256 joined #git
11:52 kritzikratzi joined #git
11:53 pfrench joined #git
11:54 sz0 joined #git
11:54 flaviodesousa|2 joined #git
11:55 Levex joined #git
11:58 elect joined #git
11:58 Levex joined #git
11:59 dgonzo joined #git
12:00 marcan left #git
12:01 brillenfux joined #git
12:01 Tobbi joined #git
12:01 ixpict_ joined #git
12:02 mizu_no_oto joined #git
12:02 ixpict joined #git
12:03 muhannad_______ joined #git
12:06 dsdeiz joined #git
12:06 dsdeiz joined #git
12:06 aard_ joined #git
12:09 pfrench joined #git
12:11 thebird joined #git
12:12 njx joined #git
12:13 Semtex-h joined #git
12:15 Levex joined #git
12:17 DaYwalKer joined #git
12:18 gelei007 joined #git
12:18 skunkz joined #git
12:22 leeN joined #git
12:22 gelei007 joined #git
12:23 pfrench joined #git
12:25 aw1 joined #git
12:26 oaao joined #git
12:30 pfrench joined #git
12:30 polyrob joined #git
12:30 polyrob joined #git
12:31 xall joined #git
12:32 peacememories joined #git
12:36 Sample joined #git
12:36 pfrench joined #git
12:37 WayToDoor joined #git
12:42 stoopkid joined #git
12:42 _Vi joined #git
12:42 leeN joined #git
12:44 evie_hammond joined #git
12:44 quite joined #git
12:45 pur3eval joined #git
12:45 Khisanth joined #git
12:45 Nilesh_ joined #git
12:47 gtristan joined #git
12:49 Vampire0_ joined #git
12:49 jnor joined #git
12:50 khfeng joined #git
12:51 jnor hi
12:51 jnor Hi. Branch "A" and "B". How can I override file Foo of branch B with file Foo of branch A ?
12:52 jnor seem simple, yet I'm not able to find proper solution
12:53 jnor on branch B I do: git diff A --name-only, and file Foo is listed. I need Foo to be the same on B as on A
12:53 diogenese joined #git
12:53 ResidentBiscuit joined #git
12:55 jnor Ahhhhh
12:55 pfrench joined #git
12:55 jnor I have found out also I'm stupid. Thanks =)
12:55 osse jnor: while you are on B, do  git checkout A -- Foo; git commit -m 'Get Foo from A'
12:58 blackwind_123 joined #git
13:00 rivarun joined #git
13:00 Masber joined #git
13:00 re1 joined #git
13:00 cslcm joined #git
13:01 kfc_ left #git
13:02 re1 joined #git
13:03 Mike11 joined #git
13:03 jameser joined #git
13:06 pbrewczynski joined #git
13:06 jozwior_ joined #git
13:07 BSAlb joined #git
13:08 xall joined #git
13:08 jameser joined #git
13:10 CheckDavid joined #git
13:12 pfrench joined #git
13:13 kristofferR joined #git
13:15 o232k left #git
13:18 cqi joined #git
13:20 cqi joined #git
13:20 dobbser joined #git
13:21 rivarun joined #git
13:22 alexandre9099 joined #git
13:22 jameser joined #git
13:23 skelterjohn joined #git
13:24 blackwind_123 joined #git
13:28 danielitit_ joined #git
13:31 gelei007 joined #git
13:32 rwb joined #git
13:34 jagob joined #git
13:34 wrouesnel1 joined #git
13:35 metalraiden34 joined #git
13:35 jimi_ joined #git
13:37 byte512 joined #git
13:39 jimi_ joined #git
13:40 Cymew joined #git
13:43 Cymew I just initialized a repo in my local file system, cloned it in another location, did some edits which I committed. Now when I push to my local remote it says "remote: error: refusing to update checked out branch: refs/heads/master" is this something new, or have I missed a step somewhere?
13:44 Orphis joined #git
13:44 snfgf joined #git
13:44 snfgf hello
13:45 snfgf why, if i git rm file.txt on branch A, is that same file removed on branch B?
13:45 Cymew I was fairly sure I had some just these procedure before. Is it a new protection for "master" or is there something else going on? There are more in that error message, but I don't understand the jargon.
13:46 snfgf ?
13:46 snfgf ?
13:47 daurnimator joined #git
13:47 jstein_ joined #git
13:47 bvcosta joined #git
13:48 _ikke_ snfgf: no
13:48 _ikke_ if you rm a file, it will only be removed in the next commit
13:48 snfgf hmm
13:48 snfgf _ikke_, so not for all branches?
13:49 osse Cymew: usually you push to a bare repository.
13:49 osse in this case the one you're trying to push to is not bare
13:49 jstein__ joined #git
13:49 snfgf _ikke_, i see now
13:50 skunkz joined #git
13:51 navidr joined #git
13:51 Cymew osse: Have I forgotten what a bare repo is? Can't I clone a repo and then push to it? Must it be bare? Doesn't that mean empty? Wont all repos be non-bare after the first push?
13:52 Nickeeh_ I am trying to find lines that have been removed. I can find the commit that 'removed' the lines with `git log -p -a -m --follow` but not with `git log -p -a --cc --follow`. Where can I find what commit introduced this change?
13:52 selckin !nonbare
13:52 gitinfo [!bare] A bare repository is used to push/fetch (useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/
13:53 brent__ joined #git
13:53 Nickeeh_ Also, when using 'git show' on the commit that removes the line according to `git log -p -a -m`, that merge commit doesn't actually change it (hence it's not shown in --cc I guess), but I just can't find the commit that does change it.
13:54 jeffreylevesque joined #git
13:54 tlaxkit joined #git
13:55 Nickeeh_ I even tried running 'git bisect run rgrep <keyword gone missing>' but that just puts me at some weird commit before good and bad.. I'd say it's outside of the range but.. ugh. No clue what's happening. It's the weirdest thing.
13:55 Cymew Sounds like I have indeed forgotten what a bare repo is. Thanks guys!
13:55 osse Cymew: No doesn't have to be empty, but by default you cannot push to a non-bare
13:55 osse depends on the use case whether it makes sense
13:58 elect joined #git
13:59 alexandre9099_ joined #git
13:59 Gsham joined #git
14:00 tsdev joined #git
14:00 jameser joined #git
14:00 a_thakur joined #git
14:00 jeffreylevesque_ joined #git
14:00 manuelmrtz joined #git
14:01 a_thakur joined #git
14:04 Cymew osse: Thanks. Looking at gitrecipes.de I understand why it failed, now. But I was so sure I had done it before. Maybe using BitBucket have made me misremember the nuts and bolts.
14:04 acetakwas joined #git
14:05 Cymew It looks messy to have a hook to sync the working set on the remote.
14:05 osse Cymew: repos on bitbucket are bare. maybe the last time you pushed to bitbucket from somewhere then cloned from bitbucket somewhere else
14:06 alexandre9099 joined #git
14:06 elisa87 joined #git
14:06 Cymew Yeah, could have been. I've done things in between and I've never internalized the workings of git, or scm, so I guess my route actions failed this time.
14:07 kpease joined #git
14:07 alexandre9099 joined #git
14:08 kpease_ joined #git
14:09 jameser joined #git
14:11 shinnya joined #git
14:13 darkbit joined #git
14:13 dyzke98 joined #git
14:14 livingstn joined #git
14:14 dyzke98 left #git
14:16 dyzke98 joined #git
14:16 heftig[m] joined #git
14:19 ovalseven8 joined #git
14:19 ovalseven8 Hey, if I have a commit that represents release 1.0.0 and it has tag 1.0.0. What's better: Sign the tag with gpg or sign the commit with gpg?
14:19 ovalseven8 And what's the difference?
14:20 dyzke98 left #git
14:21 dyzke98 joined #git
14:21 dyzke98 left #git
14:21 dyzke98 joined #git
14:22 kristofferR joined #git
14:26 Zarthus why not sign both?
14:27 Zarthus when it comes to better, signing more would make sense :P
14:27 ovalseven8 By the way: Is there a roadmap for git when/how to replace SHA-1?
14:28 Zarthus torvalds wasn't too concerned
14:29 dragoonis joined #git
14:29 dragoonis joined #git
14:29 dragoonis cp: cannot create regular file ‘/var/lib/jenkins/workspace/Preview/previe​w-ci-scripts/.git/objects/pack/pack-36c915​e411dc1edb6374cd8d61cf3ab63f3d7ba5.pack’: Permission denied
14:29 dragoonis I can't figure this out .. all permissions are crowned by "jenkins:jenkins" who is the current user
14:29 DarkPsydeLord joined #git
14:29 dragoonis s/crowned/chowned
14:30 GodGinrai joined #git
14:30 peacememories joined #git
14:31 scoobert1on joined #git
14:31 ShekharReddy joined #git
14:31 polyrob joined #git
14:32 metalraiden34 joined #git
14:33 pur3eval joined #git
14:36 brent__ joined #git
14:36 CEnnis91 joined #git
14:37 Sample joined #git
14:37 cslcm joined #git
14:38 elect_ joined #git
14:38 nickabbey joined #git
14:39 kristofferR joined #git
14:39 griffindy joined #git
14:40 bannakaffalatta joined #git
14:42 Orphis joined #git
14:43 nowhereman joined #git
14:44 pfrench joined #git
14:45 Dougie187 joined #git
14:48 rafalcpp joined #git
14:48 nod joined #git
14:48 markzen joined #git
14:49 markzen hi
14:49 markzen some github repo got a pending pull request
14:49 markzen I want to add a few things on that one
14:50 rafalcpp markzen: push to same branch
14:50 markzen so i can just ignore the pending PR?
14:50 UniFreak joined #git
14:51 tamatar joined #git
14:51 tobiasvl the PR will update automatically
14:52 UniFreak joined #git
14:52 jameser joined #git
14:53 DaveTaboola joined #git
14:53 markzen ok, so to rephrase in order to be sure, I can apply the same patch as the current PR into my own fork, fix a few other lines, and the PR will be alright for the original author -- correct?
14:53 tobiasvl oh
14:54 tobiasvl I thought you wanted to add to the PR
14:54 markzen sry, wasn't clear enough
14:54 humboldt joined #git
14:54 tobiasvl not sure what you're asking then – the PR is not to your repo at all? then why would doing anything on your fork affect the PR? it doesn't
14:55 markzen author will see two PR, I just want to make life easy for him
14:55 markzen and to follow best practices, anyway
14:56 markzen thing is, I'd like to apply the pending patch to my own fork, since it's useful
14:56 markzen and i'll use it in the meanwhile
14:56 tobiasvl so you're also going to open a PR
14:56 ntonjeta joined #git
14:56 markzen yes
14:56 markzen on different lines, for other bugs
14:56 stoned I removed the .git from the cloned theme, and added that to my own parent directory's git repo
14:57 stoned now the cloned theme is versioned in my project
14:57 stoned I couldn't commit my changes to that cloned theme, b/c the owner of that repo was some guy and I don't have access.
14:57 stoned So, when you clone a repo, and then you change it, and need to push changes but have no access, how do you turn this into your own repository while keeping all the history?
14:58 stoned Do you just create your own repo and change the remote?
14:58 stoned Does that also make the history go along with it?
14:58 tobiasvl stoned: not sure what you're asking. it already is your own repository when you've cloned. you can change the remote on that clone to push somewhere else, yes
14:58 tobiasvl and yes, the history goes along
14:58 tobiasvl git is distributed, every (non-shallow) clone has all information
14:59 kristofferR joined #git
14:59 GodGinrai joined #git
14:59 stoned I ~/var/www/site.com is my repository which I can push to. Inside, I have  /var/www/site.com/themes/some-theme-I-cloned/. I make changes to this html theme, and when I try to push my changes, it says I am not allowed. I want to make it so what when I commit my reposityr ~/var/www/site.com/ it will also include the /theme/ directory and anything under it To essentially turn that cloned theme repo, into part of
15:00 stoned my own repo
15:00 cdg joined #git
15:00 thebird joined #git
15:00 stoned http://themes.gohugo.io/beautifulhugo/ <- for example, the instructions say to just clone a theme. I do that, but them I can commit my changs, but where do I pus them? Do I change the remote, and setup my own theme repo? or.. do I remove git tracking from this theme altogether, and add it to my parent dir repo?
15:00 Electrometro joined #git
15:00 Es0teric joined #git
15:01 s17 make your own remote and push to that
15:02 notebox joined #git
15:02 tobiasvl why/where do you need to push it?
15:03 Guest16987 joined #git
15:04 hashpuppy joined #git
15:05 AaronMT joined #git
15:06 e14 joined #git
15:09 bannakaf_ joined #git
15:10 Snugglebash joined #git
15:12 Gsham joined #git
15:16 Ryanar joined #git
15:16 Vampire0 joined #git
15:19 nickabbey joined #git
15:19 pfrench joined #git
15:19 e14 joined #git
15:19 humboldt joined #git
15:20 Fallen0223 joined #git
15:21 i7c joined #git
15:23 metalraiden34 joined #git
15:24 k5tux_ left #git
15:24 davidosomething joined #git
15:25 k5tux joined #git
15:27 Vampire0_ joined #git
15:28 enckse for people using pinentry for gpg signing of commits, is there something I'm missing to get git to prompt me for pin (I can only successfully sign if I've already unlocked my gpg agent - when I use 'pass')?
15:29 AJ3X joined #git
15:30 dobbser joined #git
15:31 metalraiden34 joined #git
15:31 nettoweb joined #git
15:32 acetakwas joined #git
15:32 eroux joined #git
15:32 Serif joined #git
15:36 davidosomething i use gpgtools from brew cask
15:37 davidosomething it integrates better with mac os if you're on that platform and you don't have to do the gpg/pinentry-mac setup stuff
15:38 chele joined #git
15:38 rivarun joined #git
15:43 clemf joined #git
15:44 crose joined #git
15:44 theoceaniscool joined #git
15:49 pur3eval joined #git
15:50 Levex joined #git
15:50 acetakwas joined #git
15:50 aielima joined #git
15:52 eduardas_m joined #git
15:53 ResidentBiscuit joined #git
15:54 polyrob joined #git
15:56 thebird joined #git
15:56 thebope joined #git
15:57 dyzke98 joined #git
15:58 Sample joined #git
15:58 netj joined #git
15:59 qqx joined #git
16:01 cdleonard joined #git
16:01 jstein_ joined #git
16:01 doener joined #git
16:02 cdleonard can I make git diff <blob> <blob> work with null blobs?
16:02 grawity as in?
16:03 cdleonard $ git diff 0000000000000000000000000000000000000000 7aafed7a4fdaa49f72a38015a47622b7c0e22a23
16:03 cdleonard fatal: bad object 0000000000000000000000000000000000000000
16:03 cdg joined #git
16:04 grawity dunno if many places recognize that hash
16:04 grawity $(git hash-file -w /dev/null) ought to work
16:05 cdleonard git: 'hash-file' is not a git command. See 'git --help'.
16:05 grawity hash-something-or-other
16:05 grawity ah, git hash-object
16:07 seni joined #git
16:07 metalraiden34 joined #git
16:07 seni how can I get the commit before HEAD
16:08 dgonzo joined #git
16:08 al-damiri joined #git
16:08 cdleonard um, that modifies the repo. I just wanted a quick workaround in the frontend
16:08 grawity HEAD~1 or HEAD^, see `man gitrevisions`
16:08 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
16:08 svm_invictvs joined #git
16:09 SwiftMatt joined #git
16:10 pfrench joined #git
16:11 nettoweb joined #git
16:11 jast cdleonard: if you don't have an empty file committed, I don't think you can do it without modifying the repo
16:11 g105b joined #git
16:12 osse isn't the diff between a blob and a null blob just all of the blob ?
16:12 jast 0000...0000 isn't a valid object ID
16:12 jast sure
16:13 Tobbi joined #git
16:13 jast if you have a shell that supports this construct, you can fake it using: diff -u /dev/null <(git cat-file blob abc123)
16:13 polyrob joined #git
16:16 dyzke98 left #git
16:17 pfrench joined #git
16:18 regedit joined #git
16:18 hhee joined #git
16:21 s1scha_ joined #git
16:21 Sample joined #git
16:21 markzen left #git
16:22 todd_dsm joined #git
16:23 robogoat joined #git
16:24 sarri joined #git
16:24 sarri joined #git
16:24 Fallen0223 joined #git
16:26 metalraiden34 joined #git
16:27 pfrench joined #git
16:27 chachasmooth_ joined #git
16:27 Fallen0223 joined #git
16:28 matoro joined #git
16:29 Electrometro joined #git
16:29 overlord_tm joined #git
16:32 MineCoins joined #git
16:32 Darren_ joined #git
16:32 dreiss joined #git
16:33 jameser joined #git
16:34 synthmeat joined #git
16:35 Levex joined #git
16:36 pfrench joined #git
16:37 jeffreylevesque joined #git
16:38 explody joined #git
16:39 nixjdm joined #git
16:40 thebird joined #git
16:40 brent__ joined #git
16:41 Murii_ joined #git
16:42 sbulage joined #git
16:43 finalbeta joined #git
16:43 Fallen0223 joined #git
16:43 WayToDoor joined #git
16:44 durham joined #git
16:48 absinthe joined #git
16:49 User458764 joined #git
16:50 brent__ joined #git
16:50 ixpict joined #git
16:50 Vampire0 joined #git
16:50 DaYwalKer joined #git
16:51 thebope joined #git
16:51 dorkmafia joined #git
16:52 jstimm joined #git
16:53 m4sk1n joined #git
16:53 whitby Hey folks, does anyone know if there's a way to "shift" this diff one line upwards? https://gist.github.com/whymarrh/​9062422c9fe7cf085904e4663836624a
16:53 whitby Or is that inherent to Git
16:54 whitby I've tried editing the patch manually (i.e. adding the '+' where I want and adjusting the lines numbers) but it didn't take
16:55 chachasmooth joined #git
16:55 qqx whitby: Git doesn't store diffs. If you're using a recent version of git you could try using `git diff --indent-heuristic`.
16:56 qqx There's also the diff.indentHeuristic config setting to have it use that by default.
16:57 whitby That's a bit too new for me unfortunately :(
16:57 whitby I do have --compaction-heuristic but turns out that's not what I want because I don't have newlines
16:58 Jellyg00se joined #git
16:58 whitby Ah well
16:58 whitby This is my life now
16:58 texinwien_ joined #git
16:59 Vampire0_ joined #git
16:59 HardlySeen joined #git
16:59 a_thakur joined #git
17:00 EV3RYDAYPR0GRESS joined #git
17:03 thiago joined #git
17:03 pfrench joined #git
17:04 madewokherd joined #git
17:05 qsx joined #git
17:06 Furai Hey folks, I used to have heavily tailored script for git that was relying on revision numbers for commits. Is there any way in git to reproduce revision numbers in similar way?
17:06 Es0teric joined #git
17:06 whitby You mean for SVN originally?
17:07 kbs joined #git
17:07 tang^ joined #git
17:08 kadoban Furai: What are you using them for? Do they have to be monotonicly increasing, or do they just have to be unique?
17:08 thebird joined #git
17:08 Tobbi joined #git
17:09 Furai HG used to have them monotonically increasing
17:09 Furai whitby, nope, HG mercurial
17:09 Furai I found `git rev-list HEAD --count`
17:10 Furai But that probably won't take anything like branches into account
17:10 Furai And I'm pretty sure HG did.
17:10 Furai I was creating my own changelog in the past by storing HG revisions in database together with commits.
17:10 Ryanar joined #git
17:10 Furai We moved from HG some time ago in favour of git
17:11 Furai and I have never fixed my script for it
17:11 ixpict joined #git
17:11 qqx That won't take non-merged branches into account. But it would be monotonically increasing for a given branch, as long as history isn't rewritten.
17:11 Furai I wanted to salvage as much data as possible...
17:11 multi_io joined #git
17:11 Furai To the best of my knowledge no developers have rewritten history
17:12 Furai Anyway, I'm starting to think that it will be better to maybe store commit hashes
17:12 Furai And then get the commit messages between them, though not sure yet how I'll do it. Probably `git log` will cover this.
17:13 nedbat Furai: hg has sequential revision numbers local to a working tree.  git does not.
17:14 TomyLobo joined #git
17:15 Gustavo6046 joined #git
17:15 Furai I'm kind of aware of that but I'm not really sure what it implies.
17:16 dragoonis joined #git
17:16 publio joined #git
17:17 metalraiden34 joined #git
17:17 nedbat Furai: sorry, you mentioned using the sequential numbers, and seemed to be wondering about a similar ability in git
17:18 Furai I'm sure I'll figure things out, eventually.
17:19 e14 joined #git
17:21 snits` joined #git
17:23 AaronMT joined #git
17:28 govg joined #git
17:29 jungsubk joined #git
17:32 Levex joined #git
17:32 stefan_____ joined #git
17:32 sandalieri joined #git
17:33 dvaske joined #git
17:36 raspado joined #git
17:38 Snugglebash joined #git
17:38 pur3eval joined #git
17:38 LeBlaaanc joined #git
17:39 ToBeCloud joined #git
17:39 matoro joined #git
17:39 ponyofdeath joined #git
17:39 xall joined #git
17:40 ponyofdeath hi, trying to git push my branch and getting failed to push some refs to.. Updates were rejected because a pushed branch tip is behind its remote. even tho i do a git pull origin master and git pull on my branch. any ideas?
17:40 seni with conflicts, is there a way to force it to use a file? I can't make sense of the conflicts (in the file)
17:44 madewokherd seni: 'git checkout branch -- filename' to replace the file with that branch's version
17:45 seni what does the -- do? I used `git checkout --theirs <file>` (rebasing and theirs seems to take new branch)
17:45 thebope joined #git
17:45 madewokherd the -- means anything following that is a filename
17:46 madewokherd I guess it's not necessary in this case, sometimes it can be ambiguous whether you mean a ref or a path
17:46 relipse joined #git
17:46 relipse for some reason every time i do a git pull on my branch it pops up the editor telling me to merge it. Why?
17:47 fatalhalt joined #git
17:48 kyan joined #git
17:49 Noldorin joined #git
17:49 kadoban Because that's what you asked it to do? 'git pull' is fetch + merge
17:50 ryxxed joined #git
17:50 svm_invictvs joined #git
17:51 gusnan joined #git
17:51 gusnan joined #git
17:52 jimi_ joined #git
17:53 pfrench joined #git
17:54 mikecmpbll joined #git
17:55 metalraiden34 joined #git
17:56 Rodya_ joined #git
17:56 XVar joined #git
17:57 akkad joined #git
17:58 ertes joined #git
17:59 SteffanW joined #git
18:01 SpeakerToMeat joined #git
18:04 wizardedit joined #git
18:04 wizardedit joined #git
18:05 jstimm joined #git
18:06 todd_dsm joined #git
18:09 dreiss joined #git
18:13 matoro joined #git
18:13 raijin joined #git
18:16 Orphis joined #git
18:17 absinthe joined #git
18:20 finalbeta joined #git
18:21 chardan joined #git
18:23 pfrench joined #git
18:24 User458764 joined #git
18:24 dedicated joined #git
18:26 Gustavo6046 joined #git
18:27 jagob joined #git
18:27 linuxmodder joined #git
18:27 BlackMaria joined #git
18:28 ronny joined #git
18:32 ejb joined #git
18:33 jason237 joined #git
18:33 robotroll joined #git
18:34 Rodya_ joined #git
18:34 dviola joined #git
18:34 joshszep joined #git
18:35 BlackMaria joined #git
18:35 kristofferR joined #git
18:37 hahuang65 joined #git
18:38 shgysk8zer0_ joined #git
18:39 pur3eval joined #git
18:39 thebope joined #git
18:40 hio joined #git
18:40 hio how is it acceptable for git to rewrite history? that's crazy dangerous for businesses
18:40 oleksiyp joined #git
18:41 mmattice hio: you have to do it intentionally.  It's very easy to disable on your central repos.
18:42 HedgeWork hio: It is.  This is why none of my projects use the typical hosting methods (github, gitlab).  We use gitolite, and remove the "rewrite history" permission globally, only adding it back temporarily for a senior admin when carefully considered and recorded repair operations are needed.
18:43 jmainar joined #git
18:43 metalraiden34 joined #git
18:43 hio you disable it in a gui?
18:44 hio oh its a server
18:45 Es0teric joined #git
18:45 theoceaniscool joined #git
18:45 snowalpaca joined #git
18:45 duderonomy joined #git
18:46 HedgeWork Yes, gitolite is a way to serve up git repositories with very granular access control. :)
18:46 HedgeWork !gitolite
18:46 gitinfo Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/ Quick example: http://gitolite.com/gitolite/​overview.html#basic-use-case
18:48 Naan joined #git
18:48 jimi_ joined #git
18:50 robotroll joined #git
18:50 causasui joined #git
18:50 cr3 joined #git
18:53 Limes_ joined #git
18:53 cr3 is there a way to get somekind of hash of a git directory that changes when files are modified but not committed yet? the reason is that I'd like to detect when I should rebuild a docker images when running tests without having to systematically build the image on each test run (this is for integration tests, not unit tests).
18:54 GodGinrai cr3: `git status` will tell you when files are modified
18:54 hio joined #git
18:55 hasc_ joined #git
18:57 b100s joined #git
18:57 justan0theruser joined #git
18:58 pfrench joined #git
18:59 cr3 GodGinrai: yeah, so I'd have to somehow add the checksum of the modified files and the branch. I was hoping there might be something that already exists.
19:00 GodGinrai cr3: why do you need to add the checksum of the modified files and the branch?  Are you saying you need to determine if the branch changed?
19:02 lucido-cl joined #git
19:02 Panacea joined #git
19:02 c0c0 joined #git
19:03 cr3 GodGinrai: yes but if I changed the branch a minute ago and I change it again now, I'd like to have some way to determine that the change from before is different from the change just now; hence the checksum of the files returned by `git status`
19:04 robotroll joined #git
19:05 GodGinrai I see
19:05 elisa87 can someone guide me as how to proceed to this git rebase? I am new to this concept http://pastebin.com/TtLhkbrh
19:07 bomb-on joined #git
19:09 Sasazuka joined #git
19:11 raynold joined #git
19:12 d10n-work joined #git
19:13 LiftLeft joined #git
19:14 sonOfRa joined #git
19:15 madewokherd joined #git
19:17 peterbecich joined #git
19:17 nurey joined #git
19:21 warthog9 joined #git
19:21 _ikke_ elisa87: You are in a merge conflict
19:22 _ikke_ You first need to fix this, before you can continue
19:22 _ikke_ Run git status to see what's going on
19:26 r00twrh joined #git
19:26 Zwelf left #git
19:28 chrisa joined #git
19:29 chrisa Hello. Does anyone have or know of a simple tool that generates a hash (hashes of the tree entries of a commit
19:30 rwp elisa87, You started a rebase. You hit a merge conflict. Problem is you started a second rebase without completing or aborting the first one.
19:30 chrisa (sorry, hit wrong key) Hello. Does anyone have or know of a simple tool that generates a hash (or hashes) of the tree entries of a commit (so that I can put it into a signed tag)?
19:31 chrisa Basically git ls-tree | sha256sum, but the ls-tree output with sha256 hashes, too.
19:31 kbs chrisa: is this related to concerns over sha1?
19:31 _ikke_ chrisa: Then you would need to hash each blob and usbtree referenced by the tree object with sha256 too
19:31 chrisa Of course :)
19:32 chrisa _ikke_, what I'm saying
19:32 kbs I recently saw a thing that does just this, *looks up notes*
19:32 _ikke_ chrisa: Right, there is nothing built-in
19:32 pfrench joined #git
19:33 thebope joined #git
19:33 boombatower joined #git
19:33 kbs https://github.com/cgwalters/git-evtag
19:34 chrisa (It'll also have to descend into "tree" objects unlike ls-tree)
19:34 * chrisa checks
19:34 dedicated_ joined #git
19:34 tyreld joined #git
19:34 qqx ls-tree will descend into subtrees with the -r option.
19:35 ash_workz joined #git
19:35 kbs It's essentially a parallel implementation of the merkle tree, if you're worried about the sha1 kerfuffle it should (if nothing else) give an additional thing you can sign
19:35 chrisa kbs, thanks, exactly what I was thinking of. Hope it's simple enough to read through the code (gonna see).
19:35 chrisa qqx, ah, didn't know that, thanks
19:36 ahr3n joined #git
19:36 Phylock joined #git
19:39 pur3eval joined #git
19:40 Darcidride joined #git
19:41 jeffreylevesque_ joined #git
19:42 jimi_ joined #git
19:43 paul424 joined #git
19:43 Gustavo6046 joined #git
19:44 The-Compiler joined #git
19:44 kfoonamalik joined #git
19:44 The-Compiler I accidentally committed a submodule update in https://codereview.qt-proj​ect.org/#/c/186891/1//ALL,unified - how do I get rid of it? Simply checking out 675c165d44ac5d39e9b37263e561dc1673f3bfa4 inside src/3rdparty again and git commit -a --amend doesn't seem to cut it.
19:46 plasticboy joined #git
19:46 _ikke_ The-Compiler: Did you stage the change too?
19:47 GodGinrai The-Compiler: how did you check it out?  using submodule update?
19:47 MACscr i have a folder that tracked acording to 'git ls-files filename', but in github, the folder seems to be kind of greyed out and i can open it
19:47 MACscr can't*
19:47 The-Compiler _ikke_: doesn't the -a do that? Or doesn't that apply to submodules?
19:48 The-Compiler GodGinrai: I have no idea how this happened, I don't remember ever touching the submodule
19:48 _ikke_ The-Compiler: What does git status return?
19:49 The-Compiler _ikke_: only some untracked files: http://paste.the-compiler.org/view/008aa36d
19:49 Noldorin joined #git
19:50 crayon joined #git
19:50 The-Compiler ah, but a "git add 3rdparty" and "git commit --amend" seems to help!
19:50 _ikke_ The-Compiler: what does git ls-tree HEAD path/to/submodule return
19:51 The-Compiler _ikke_: 675c165d44ac5d39e9b37263e561dc1673f3bfa4 now, after adding it by hand - seems like that worked :)
19:53 LiftLeft joined #git
19:53 satifant joined #git
19:54 kristofferR joined #git
19:55 kyan joined #git
19:55 orbyt_ joined #git
19:56 metalraiden34 joined #git
19:56 ozmage joined #git
19:57 DarkRose_ joined #git
19:57 smurfendrek123 joined #git
19:58 smurfendrek123 Hello, i have a git repo with a few folders in it, but i only want one folder to be synced to the git repository, do i need to just make a new git repository?
19:59 smurfendrek123 Or should i ignore the folders i don't want in gitignore?
19:59 GodGinrai smurfendrek123: if you don't want any of the folders but one, it sounds like you should have made the repo in that folder
19:59 jeffreylevesque joined #git
20:00 smurfendrek123 Yes but i already shared the repo with other people
20:00 smurfendrek123 I'd just like to move the repo one folder down if you know what i mean
20:01 smurfendrek123 i think i found a solution http://stackoverflow.com/questions​/4660090/how-do-i-move-my-git-repo​-down-level-in-the-directory-tree
20:02 The-Compiler left #git
20:04 dragoonis joined #git
20:04 Es0teric joined #git
20:05 Fallen022317 joined #git
20:09 chardan joined #git
20:09 ToBeCloud joined #git
20:19 Levex joined #git
20:19 puff joined #git
20:20 puff This project has .gitignore under git tracking.  How do I set up a gitignore rule that will not get committed (and not cause git to harass me about committing the modified gitignore?)
20:21 _ikke_ puff: add it to .git/info/exclude
20:21 puff Thanks.
20:21 absinthe joined #git
20:21 puff Hah, .git/info/exclude already has the rule I want, commented out: *~
20:22 puff Guess somebody in the git project uses emacs...
20:23 GodGinrai why wouldn't you want common text editor temp files to be in the .gitignore?
20:24 nedbat puff: if this is about editor temp files, then put it in a global ignore for yourself.
20:25 GodGinrai That works, too, but I sincerely doubt anyone on the project would be angry that he added an editor temp file to the project's .gitignore
20:26 jimi_ joined #git
20:26 perlpilot puff: git help gitignore   # shows you some options
20:26 danielitit_ joined #git
20:26 nedbat GodGinrai: sure, but with a global, it affects all repos
20:27 GodGinrai nedbat: except the one for the next emacs user on the project :P
20:27 thebope joined #git
20:27 bannakaffalatta joined #git
20:27 hashpuppy joined #git
20:28 kpease joined #git
20:28 durham_ joined #git
20:28 dorkmafia osse: did you ever see my updated gist?
20:31 pur3eval joined #git
20:31 Levex joined #git
20:32 Atm0spher1c joined #git
20:41 Ahmed90 joined #git
20:41 _Vi joined #git
20:44 Rodya_ joined #git
20:45 cr34ton joined #git
20:46 askb joined #git
20:50 utrack joined #git
20:54 jeffreylevesque_ joined #git
20:55 durham joined #git
20:56 theoceaniscool joined #git
20:57 raijin joined #git
21:01 NeverDie joined #git
21:02 Groovin joined #git
21:02 Rodya_ joined #git
21:04 netj joined #git
21:05 venmx joined #git
21:05 Loomaanaatii joined #git
21:05 m0viefreak joined #git
21:05 clemf joined #git
21:06 hhee joined #git
21:07 peeps[lappy] joined #git
21:07 _28_ria joined #git
21:08 dragoonis joined #git
21:08 Sasazuka joined #git
21:09 rodan joined #git
21:10 b100s joined #git
21:10 cdg joined #git
21:12 DaYwalKer joined #git
21:14 Ryanar joined #git
21:15 dsdeiz joined #git
21:15 dsdeiz joined #git
21:17 _28_ria joined #git
21:20 nettoweb1 joined #git
21:21 ResidentBiscuit joined #git
21:21 Ryanar joined #git
21:22 Vampire0 joined #git
21:22 _28_ria joined #git
21:24 peterbecich joined #git
21:25 puff nedbat: .git/info/exclude seems to do the job.
21:25 Es0teric joined #git
21:26 qmr joined #git
21:26 nettoweb joined #git
21:26 qmr fatal: read error: Connection reset by peer  <-- any hints for troubleshooting this?
21:26 Tobbi joined #git
21:27 nedbat puff: isn't that the worst of both worlds? Private to you, and only in that repo
21:27 borkr joined #git
21:27 aidalgol joined #git
21:28 _28_ria joined #git
21:28 irqq joined #git
21:28 prg3 joined #git
21:30 llamapixel qmr: You could try git gc but looking at google it appears to be your connection is not steady
21:30 llamapixel https://git-scm.com/docs/git-gc
21:32 joshszep joined #git
21:34 jnavila joined #git
21:34 cr34ton joined #git
21:35 overlord_tm joined #git
21:36 shinnya joined #git
21:37 qmr llamapixel:  tried that
21:37 Gsham joined #git
21:38 Karazhan joined #git
21:38 llamapixel Do you have another network you can try, like your phone to pull the repo qmr ?
21:39 qmr llamapixel:  25KB TX 12KB RX
21:39 qmr it's a private LAN
21:39 LionsMane joined #git
21:39 llamapixel Not sure then, never experienced something like that mate.
21:40 Dougie187 left #git
21:40 llamapixel I have had successful attempts from a different network when something failed in github etc.
21:41 pur3eval joined #git
21:44 joshszep joined #git
21:46 peterbecich joined #git
21:48 rivarun joined #git
21:48 hahuang65 joined #git
21:51 Gustavo6046 joined #git
21:52 DolphinDream joined #git
21:52 DolphinDream howdy gitsterz
21:53 DolphinDream for a server hook when you preocess with pre-receive to the hook (E.g  commenting rules) apply to commits that already reside on the server (albeit they are now part of a newly pushed branch) ?
21:53 DolphinDream or a branch that was merged with another branch which was already pushed before
21:54 moritz DolphinDream: the pre-receive hook is just a program that git invokes you in. In there, you can do whatever you want.
21:55 Anoia left #git
21:55 acetakwas joined #git
21:57 dave0x6d joined #git
21:57 DolphinDream moritz: gotcha. but the pre-receive script receives some input.. what is this input .. here's what my script has (while read oldRev newRev refName do   # do some validation here done < "${1:-/dev/stdin}")
22:01 venmx joined #git
22:01 moritz DolphinDream: man githooks explains that
22:01 gitinfo DolphinDream: the githooks manpage is available at http://jk.gs/githooks.html
22:01 SwiftMatt joined #git
22:03 LionsMane joined #git
22:03 dtrott joined #git
22:03 anuxivm joined #git
22:03 Cyclohexane joined #git
22:03 Squarism_ left #git
22:03 snowalpaca joined #git
22:04 Cyclohexane How do I squash commits via rebase, when one of the commits is a merge? my normal command git rebase -i HEAD~2 for example, doesn't show just 2 commits...
22:04 matoro joined #git
22:04 peterbecich joined #git
22:05 blackwind_123 joined #git
22:05 peterbecich joined #git
22:06 hahuang65 joined #git
22:06 _28_ria joined #git
22:09 Rodya_ joined #git
22:10 dtrott Cyclohexane: I am not sure how to do it with rebase, instead I would use git reset —soft  <hash>; git commit in order to achieve the same result.          (arg should be a double - before soft - my irc client is flipping out)
22:13 Cyclohexane dtrott: ah nice thanks, didnt think of that
22:18 YuGiOhJCJ joined #git
22:19 GodGinrai joined #git
22:21 Guest9 joined #git
22:21 gugah joined #git
22:21 AaronMT joined #git
22:22 [Brain] joined #git
22:22 ISmithers joined #git
22:22 Bizkit joined #git
22:22 rivarun joined #git
22:23 bomb-on joined #git
22:25 dedicated joined #git
22:26 rwb joined #git
22:26 neunon joined #git
22:27 joshszep joined #git
22:30 LionsMane joined #git
22:31 marianina8 joined #git
22:33 Loomaanaatii joined #git
22:33 nowhereman joined #git
22:34 osse dorkmafia: yes. i have no explanation
22:35 osse DolphinDream: git config --global alias.test '!env'. run git test | grep PATH and see if its there
22:35 Rodya_ joined #git
22:35 nicoulaj joined #git
22:36 Es0teric joined #git
22:37 d0nn1e joined #git
22:37 qmr pretty off topic, but anyone know how to access / read atlassian-stash.log ?
22:37 qmr there's no login shell and I can't find anything useful on google
22:40 Rodya_ joined #git
22:41 rivarun joined #git
22:44 gopar joined #git
22:45 jeffreylevesque joined #git
22:45 marenz__ joined #git
22:49 anuxivm joined #git
22:49 rivarun joined #git
22:51 pur3eval joined #git
22:53 NightMonkey joined #git
22:55 MacWinner joined #git
22:55 rodan joined #git
22:57 theoceaniscool joined #git
22:58 nowhere_man joined #git
22:59 peterbecich joined #git
23:00 HurricaneHarry joined #git
23:01 fmeerkoetter joined #git
23:01 neilthereildeil joined #git
23:01 venmx joined #git
23:04 bomb-on joined #git
23:04 __rgn joined #git
23:06 Gsham joined #git
23:08 bannakaffalatta joined #git
23:13 afuentes joined #git
23:15 neilthereildeil left #git
23:16 Cyclohexane left #git
23:21 ahr3n joined #git
23:24 e14 joined #git
23:26 matoro joined #git
23:27 ratdeptrai joined #git
23:28 joshszep joined #git
23:29 bvcosta joined #git
23:31 venmx joined #git
23:33 nowhereman joined #git
23:34 peterbecich joined #git
23:36 benaiah joined #git
23:38 clemf joined #git
23:38 dsdeiz joined #git
23:38 dsdeiz joined #git
23:39 Atm0spher1c joined #git
23:39 benaiah so, I have a feature branch "ewdt". It has 2 commits past master, which I've been rebasing and force-pushing to keep the history clean. I made a bunch of changes which I made temp commits for in another branch, "ewdt-temp", which branched from the HEAD of "ewdt". Now I'd like to do an interactive rebase and cherry-pick some of the temp commits into one of the two commits on the feature branch - but not in the
23:39 benaiah same order they were committed to the temp branch. The temp commits don't overlap, so I'm not worried about merge conflicts, I'd just like to know the proper way to pull in the changes from a specific commit temp while interactively rebasing each of the feature commits.
23:40 rivarun joined #git
23:41 cqi joined #git
23:42 mikecmpbll joined #git
23:43 dsdeiz joined #git
23:43 dsdeiz joined #git
23:45 joshszep joined #git
23:46 peterbecich joined #git
23:46 robattila256 joined #git
23:49 peterbecich joined #git
23:49 MattMaker joined #git
23:52 pur3eval joined #git
23:52 WayToDoor joined #git
23:54 jason237 joined #git
23:55 marianina8 joined #git
23:56 johnnyfive joined #git
23:56 rivarun joined #git
23:57 netj joined #git
23:57 fatalhalt joined #git

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