Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-08

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

All times shown according to UTC.

Time Nick Message
00:04 stoned Anyone?
00:05 alhariel joined #git
00:06 kadoban stoned: Not really possible to answer with the information you've given, especially since git isn't a deployment tool and has little to do with what's on your website usually.
00:06 askb joined #git
00:07 nettoweb joined #git
00:07 stoned Sure.
00:07 stoned here's my process
00:08 stoned I edit on my local machine. I push up the changes to gitlab. I pull the changes down on my server. Done.
00:08 stoned there are some thigns which are live on my site, which no longer exist on my local or remote repository. I'm trying to figure out this mystery.
00:09 stoned It has nothing to do w/ the site other than the fact, that my this one particular file which vanished into the oblivion, is currently rendered live there
00:09 stoned If the concept of the servr in here confuses you, forgetI mentioned it.
00:10 stoned There is a file that  mysteriously vanished from my local and remote repositories.I have checked the last few commits, it's not there. But it's obviously live on my site (bottom of article, most_recent.html template). It's there. It was in my git repo at some point, and now it's gone locally and remotely.
00:10 kadoban stoned: What is 'git status' on the server? What is it locally? What commit are you on locally? What on the server?
00:10 stoned Your branch is up-to-date with 'origin/master'.
00:10 stoned nothing to commit, working directory clean
00:10 Dougie187 joined #git
00:11 mohan_ joined #git
00:11 kadoban stoned: Check .gitignore and see what actual commit you're on. 'git rev-parse --verify HEAD' or some other way
00:13 NeverDie joined #git
00:13 stoned I'm not ignoring anything
00:13 stoned I don't have an ignore file
00:15 stoned kadoban: I'm on the latest commit
00:15 vucks96 joined #git
00:16 mischat joined #git
00:17 kadoban Check again, I guess. You're 99% likely to be missing something. The other options aren't very likely. Gotta run errands, back in a while.
00:17 stoned This is a mystery. I made a commit. I pulled it down on the server. The changes are live. Now I look in my repository and it's gone!
00:19 stoned Oh ffs, even that girls poem is gone from the repo. All my latest changes I made are live on the server, but somehow they are goen from the repositories locally and remotely
00:19 stoned What the hell happened?
00:20 anonymuse joined #git
00:20 anonymuse joined #git
00:20 jccn joined #git
00:21 thiago joined #git
00:23 mkoskar joined #git
00:24 stoned *sigh*
00:24 fk joined #git
00:25 hecliunyx joined #git
00:26 Darren_ joined #git
00:27 danslo joined #git
00:28 romerocesar joined #git
00:30 stoned I added the poem like 10 commits ago. Even that poem file is gone from all the commits on local and remote
00:30 chris123456 joined #git
00:30 stoned Dude... what the heck
00:30 kadoban stoned: Did you bother checking the commit hash in both places?
00:30 stoned yes, I told you they are on the same latest one
00:31 kadoban stoned: And the file is in the repo on the server, but not on your local one? And they have the same sha-id ?
00:31 stoned The file is missing from remote and local repo. The file no longer exists on my local machien, gitlab repo, or my remote webserver
00:32 stoned it's competely gone from everywhere. This file should be there starting 15 commits back. but it's gone from all those commits too
00:32 stoned I am browsing each commit one by one on gitlab, going through and not finding any of the missing files.
00:32 kadoban stoned: Why should it be there 15 commits back? What leads you to believe that?
00:32 stoned The commit messages are there in gitlab, but the file are gone
00:33 stoned kadoban: because I added the file 15 commits ago.
00:33 kadoban stoned: Well, what's in the changes for that commit? Anything?
00:33 stoned after I added the file, I made 15 more commits. I never removed the file. It should be there.
00:36 vmiklos joined #git
00:43 QwertyDragon joined #git
00:45 liuzhen joined #git
00:48 matoro joined #git
00:48 Kaisyu joined #git
00:53 jephsf joined #git
00:54 HedgeMage Okay, guys, I did a stupid last night.  Through a very exhausted typo, I accidentally made a tag called HEAD that pointed to HEAD and I can't seem to delete it in any way that propogates when I push to the repo. Help!
00:54 HedgeMage It's causing confusion and errors
00:54 HedgeMage :(
00:54 ojacobson git push --delete refs/tags/HEAD
00:54 ojacobson use the fully-qualified name :)
00:54 HedgeMage aha
00:54 ojacobson uh, git push --delete <remote> refs/tags/HEAD
00:57 HedgeMage ahh, I was about to paste an error, thanks
00:58 * HedgeMage showers ojacobson with chocolates and tea
00:58 HedgeMage <3 <3 <3
00:58 ojacobson ugh please no
00:58 ojacobson I just ate, I am so full
00:58 HedgeMage rofl
00:58 * HedgeMage provides a raincheck instead
00:58 ojacobson Meg made a beef/chocolate/coffee/stout stew and it was delish but now i ded
00:58 HedgeMage yum!
00:59 Random832 i didn't know about delete
00:59 Random832 i always just do git push <remote> :refname
01:00 HedgeMage delete is very important after you fatfinger commands at 4:45am while sleep deprived
01:01 Gianormagantrous joined #git
01:02 gigq joined #git
01:03 Gianormagantrous joined #git
01:05 Gsham joined #git
01:06 rmbeer stoned, you use the gitg for check the file?
01:07 rmbeer seem the same problem that i have
01:07 renlo joined #git
01:07 cqi joined #git
01:07 rmbeer but little different
01:08 Bass10 joined #git
01:08 rmbeer stoned, https://github.com/git/git-scm.com/issues/883#issuecomment-258362129
01:09 afusion joined #git
01:10 QwertyDragon joined #git
01:10 rmbeer is hard for recreate. Only have the problem in my real project, like a problem with the first file exist in timeline.
01:10 converge joined #git
01:11 gigq joined #git
01:12 qws-user-1228 joined #git
01:13 vmiklos joined #git
01:13 dsantiago joined #git
01:14 synthmeat joined #git
01:15 dsantiag_ joined #git
01:15 renlo joined #git
01:16 rmbeer ojacobson, :L
01:16 ojacobson what
01:16 mischat joined #git
01:17 grumblebee joined #git
01:17 rmbeer ojacobson, you say of food... now have a hungry... ¬¬
01:18 liuzhen joined #git
01:18 ojacobson Oh, ha! I'm sorry
01:19 nidr0x joined #git
01:19 zumba_ad_ joined #git
01:19 netj joined #git
01:19 TheOrangeOne joined #git
01:20 fstd_ joined #git
01:27 renlo joined #git
01:27 bannakaffalatta joined #git
01:28 Rickmasta joined #git
01:29 SwiftMatt joined #git
01:31 nicksloan joined #git
01:34 steelsw0rd joined #git
01:39 stoned Date:   Fri Nov 4 13:53:05 2016 -0600 "15 most recent"
01:39 stoned rmbeer: thank you
01:39 stoned i am figuring out how to use gitg and also looking at issue
01:40 thiago joined #git
01:40 stoned the most_recent.html file's commit is there. the file is live on the website, but it's not on any repository
01:40 thiago joined #git
01:41 kadoban stoned: "... commit is there" what does 'git show thecommit' show?
01:42 kadoban stoned: Also ... I thought your live website was a git repo you said. Is the file there or not? Before you seemed to be saying it was gone from everywhere now.
01:43 t-mart_ joined #git
01:44 stoned it's not there
01:44 stoned it's live on the website as a generated html file
01:45 stoned most_recent.html was part of a template in static site generator. I created the tempalte file and it's gnerated and rendered on the live site, but the file is now gone from gitlab, my computer and the webserver webroot
01:46 arescorpio joined #git
01:46 rmbeer stoned, no figure in the gitg? also can use gitk for kde.
01:47 stoned ok
01:53 Rickmasta joined #git
01:54 morenoh149 joined #git
01:57 ochorocho__ joined #git
02:04 barteks2x what could cause merge conflict in line that is exactly the same in both versions?
02:05 venmx joined #git
02:06 sangy joined #git
02:06 thiago barteks2x: a line that is not exactly the same in both versions
02:07 thiago note that the merge algorithm also looks at the lines around the one that got modified (context lines)
02:07 barteks2x but... they are the same
02:07 thiago the 3 lines before and the 3 lines after
02:07 thiago don't argue. There's something different.
02:07 barteks2x this is what I see: http://pastebin.com/qtNhAbW5
02:07 thiago your job is to find out what and then fix it.
02:07 thiago maybe the difference is whitespace
02:08 stoned rmbeer: no, it's all messed up.
02:08 dodobrain joined #git
02:08 andrew710 joined #git
02:08 barteks2x wtf intellij idea? I tried to see if there is whitespace at the end, and it looked like there isn't. But pastebin shows there is
02:08 dsdeiz joined #git
02:09 micdo_ joined #git
02:09 barteks2x nevermind, there isn't
02:09 barteks2x I was selecting text wrong
02:10 barteks2x I don't see how there could be a difference in whitespace...
02:13 xall_ joined #git
02:13 barteks2x git diff branch1 branch2 doesn't show any difference in that place
02:14 barteks2x wait, nevermind, it was a me-problem
02:14 rmbeer stoned, messed or missed?
02:16 mehola joined #git
02:17 stoned I found the files in a really old commit, the authors on myste been restored manually
02:17 stoned now I'm looking for the template file
02:17 stoned everything else seems ok
02:17 ilCyx86_64 joined #git
02:17 mischat joined #git
02:17 stoned then im going to manually back this up
02:18 maroloccio joined #git
02:19 maroloccio hi. i am looking at changes introduced by a sequence of commits (i.e. git log -p). the merge commits with conflicts show as "no change" but if i git show commit-id i can see there were changes.. does git log -p not print those?
02:19 rmbeer stoned, then found the file correctly in the gitg?
02:19 stoned yes
02:19 stoned but the template file is not anywhere anymore :(
02:19 rmbeer good.
02:19 stoned I don't know why this happens
02:20 stoned git is always losing my files randomly
02:20 stoned im going to stop using it.
02:20 rmbeer stoned, always use 'git status' for  verify that not loss nothing step?
02:21 ilCyx86_64 Having issues with git on Windows accepting SSH keys. When I do `ssh git@gitserver.com`, I get "authentication successful", but any git operation to the same server results in "Key access denied" from the Gogs git server. All of my GNU/Linux machines work fine. What could be the issue?
02:21 Sasazuka joined #git
02:22 JamesBaxter joined #git
02:23 maroloccio oh, that's just -m as a git log option. duh
02:24 finalbeta joined #git
02:27 fahadash joined #git
02:29 rmbeer i found a two problem with git, the 'commit -a' not work with properly, '-a' omit somethig work of 'add', i must use 'add' and later 'commit'. And like report in #883, i can view all in gitg, but 'checkout' not load the correct older commit and create a wrong workspace, but where go to last commit have a correct workspace.
02:29 rmbeer something*
02:31 SocialBlunder joined #git
02:32 jstimm joined #git
02:32 Goplat joined #git
02:33 nettoweb joined #git
02:33 ilCyx86_64 NVM, for some reason I just had to regenerate the key pair...
02:33 hahuang61 joined #git
02:38 d^sh_ joined #git
02:38 barteks2x is there some single command way to do equivalent of git reset file && git checkout file?
02:41 barteks2x it's a bit annoying to type these 2 commands for several files
02:41 railssmith joined #git
02:46 rmbeer barteks2x, can use the bash
02:46 barteks2x right... always forget about that. And always forget the syntax for functions
02:46 liuzhen joined #git
02:46 SocialBlunder left #git
02:46 einnjo joined #git
02:51 JamesBaxter joined #git
02:52 robogoat joined #git
02:55 Gsham joined #git
02:56 madebymarkca joined #git
02:58 fakenerd joined #git
03:00 svm_invictvs joined #git
03:02 aavrug joined #git
03:03 Lyqyd joined #git
03:03 aavrug joined #git
03:05 mmlb joined #git
03:06 nd- joined #git
03:06 Darren_ joined #git
03:06 sgtbigman joined #git
03:12 renlo joined #git
03:18 mischat joined #git
03:20 infernix joined #git
03:21 Darren_ joined #git
03:24 thebope joined #git
03:24 thebope joined #git
03:33 didik joined #git
13:07 ilbot3 joined #git
13:07 Topic for #git is now Welcome to #git, the place for git help and public-access television programming | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.2 | Getting "cannot send to channel"? /msg gitinfo .voice | git-bisect: No, not like that. Grow up.
13:08 annoymouse256 joined #git
13:08 re1 joined #git
13:08 synthroid joined #git
13:11 mycyber joined #git
13:15 govg joined #git
13:16 liamonade joined #git
13:18 qpdb joined #git
13:19 Gsham joined #git
13:20 ramsub08 joined #git
13:21 Rickmasta joined #git
13:23 lmatteis joined #git
13:23 hahuang61 joined #git
13:30 Starky joined #git
13:30 Starky joined #git
13:32 annoymouse256 joined #git
13:32 micdo_1 joined #git
13:32 wrouesnel2 joined #git
13:33 micdo_1 joined #git
13:34 micdo_1 joined #git
13:35 danslo joined #git
13:35 micdo_1 joined #git
13:36 micdo_1 joined #git
13:37 micdo_1 joined #git
13:38 micdo_1 joined #git
13:40 gabi__ joined #git
13:40 micdo_1 joined #git
13:41 ArchNoob joined #git
13:41 dreiss joined #git
13:43 thinkpad joined #git
13:44 anonymuse joined #git
13:45 revoltingPeasant joined #git
13:45 usm4n joined #git
13:45 chris2 can i force creating a reflog when cloning with --mirror? -c core.logAllRefUpdates=true doesnt seem to work
13:46 annoymouse256 joined #git
13:48 JeroenT joined #git
13:49 annoymouse25642 joined #git
13:51 qpdb joined #git
13:51 skyres joined #git
13:53 vlt troulouliou_div2: Maybe you could rebase B1_1 onto B2.
13:54 d0nn1e joined #git
13:54 porsche944 joined #git
13:54 govg joined #git
13:55 ccapndave How can I get a --name-status diff of all changes since the beginning of the repository up to a particular commit?
13:55 moritz ccapndave: sounds like a git ls-files at that point in time might be enough?
13:56 ccapndave moritz: Hmmm - you are quite right
13:56 moritz why doesn't git ls-files take a commit?
13:56 moritz that would be so handy
13:56 ccapndave moritz: The only thing is that sometimes I also want to get the change between an actual commit and HEAD
13:56 rnsanchez_ joined #git
13:56 ccapndave moritz: git diff --name-status <some_commit>..HEAD
13:57 ccapndave So if possible I would like to use the same format so I don't have to implement a whole different set of logic
13:57 skyres joined #git
13:57 liamonade joined #git
13:57 ccapndave But you are right that ls-files does it just right when there is no <some_commit>
13:57 moritz ccapndave: problem is, there can be more than one root commit
13:58 moritz so you can't just plug in "the" root commit as <some_commit>
13:58 ccapndave Oh, I see
13:58 ccapndave In my repository there definitely won't be
13:59 ccapndave Does that mean there is a trick we could use?
13:59 kpease joined #git
13:59 ccapndave You know what, ls-files works wonderfully.  I think I'll just put in two different logic paths rather than hack around
13:59 kpease_ joined #git
14:00 nedbat joined #git
14:02 skyres joined #git
14:03 jimi_ joined #git
14:04 Starky joined #git
14:04 synthroi_ joined #git
14:06 CEnnis91 joined #git
14:08 skyres joined #git
14:09 meth joined #git
14:09 JamesBaxter joined #git
14:10 Ryanar joined #git
14:10 _rnsanchez_ joined #git
14:10 WayToDoor joined #git
14:10 Snugglebash joined #git
14:14 skyres joined #git
14:14 cdg joined #git
14:14 thiago joined #git
14:16 kyan joined #git
14:16 mischat__ joined #git
14:16 vucks96 joined #git
14:17 hs366 joined #git
14:18 Snugglebash joined #git
14:18 mischat_ joined #git
14:18 Snugglebash joined #git
14:18 troulouliou_div2 vlt, even if i have multiple merge on B1_1 ?
14:18 Snugglebash joined #git
14:19 skyres joined #git
14:19 Snugglebash joined #git
14:19 snowkidind joined #git
14:20 mindfart joined #git
14:20 rgrinberg joined #git
14:20 sangy joined #git
14:22 _rnsanchez_ joined #git
14:22 zumba_addict joined #git
14:23 tlaxkit joined #git
14:25 skyres joined #git
14:26 sdlnv joined #git
14:29 AaronMT joined #git
14:29 sdlnv_ joined #git
14:31 skyres joined #git
14:33 kensan joined #git
14:33 _cyril_ joined #git
14:34 eduardas_m joined #git
14:35 venmx joined #git
14:36 skyres joined #git
14:37 morenoh149 joined #git
14:37 troulouliou_div2 is it possible to pull all remote branches ?
14:40 durham joined #git
14:41 eroussel joined #git
14:42 sshine joined #git
14:42 skyres joined #git
14:42 e14 joined #git
14:42 osse no, but you can fetch them
14:42 nicksloan joined #git
14:42 sshine https://gist.github.com/sshine/6368982b53c281879a99c29a6a5c90b8 -- am I running out of memory when rebasing?
14:42 danslo joined #git
14:42 selckin joined #git
14:43 anddam left #git
14:45 Gsham joined #git
14:45 netj joined #git
14:47 _ikke_ sshine: Looks like a ulimit applying
14:47 _ikke_ sshine: it's the fork call that fails
14:47 skyres joined #git
14:48 _ikke_ Though, it'
14:48 Darren_ joined #git
14:48 _ikke_ it's windows, so I don't know
14:50 achlys joined #git
14:50 russoneto joined #git
14:51 Es0teric joined #git
14:52 anonymuse joined #git
14:53 russoneto Sometimes git prevents me from pushing.. I need to pull and then push. Considering that I'm solo developer and I have only commits from my machine.. how to explain this?
14:54 flaviodesousa joined #git
14:55 _ikke_ russoneto: It happens 1. when you push from another location 2. when you rewrite history (pull would be wrong then)
14:55 ShekharReddy joined #git
14:55 russoneto _ikke_ none of the above..
14:55 e14 joined #git
14:55 sshine russoneto, what is git's output when failing to push?
14:56 russoneto whats the default git message?
14:56 russoneto Look this log: http://i.imgur.com/w3SZdiB.png
14:56 russoneto there are 2 equal commit
14:57 luke_penn joined #git
14:57 russoneto 765 is the latest, but somehow, 5d3 got "split"
14:57 kpease joined #git
14:57 mischat joined #git
14:58 sshine do you pull --rebase?
14:58 russoneto _ikke_ also, these 2 commits have the same timestamp..
14:58 russoneto no rebase involved
14:59 russoneto with timestamps: http://i.imgur.com/7jWBde8.png
14:59 sshine and you only have a single local clone of your repo
14:59 russoneto yes
14:59 nilg joined #git
14:59 phaleth joined #git
15:00 ShekharReddy joined #git
15:00 selckin do you use --amend?
15:00 romerocesar joined #git
15:00 revoltingPeasant joined #git
15:01 sshine (e.g.: push, amend, push again)
15:01 Dougie187 left #git
15:01 selckin you are editing commits somehow and rewriting history after you push
15:01 synthroid joined #git
15:01 boombatower joined #git
15:01 b100s joined #git
15:02 b100s hi2all
15:02 b100s why i got conflict on cherry-pick?
15:02 b100s i just want to apply that commit
15:02 selckin because it conflicts
15:03 kgirthofer joined #git
15:03 b100s selckin, how does git detect it ?
15:04 selckin by trying to apply the diff
15:04 kgirthofer hello all - I'm trying to figure out how to tag appropriately - when I tag it goes to my last commit
15:04 osse b100s: stuff git expects to find isn't there
15:04 kgirthofer so last commit is 61d5729 but when I do a tag it goes to teh previous commit (1431a67)
15:05 b100s osse, what stuff ?
15:05 dede_ joined #git
15:05 osse b100s: the stuff you see when you do 'git show <commit>'
15:05 b100s selckin, apply any diff is not a problem, there is no arguments to suppose any conflict
15:05 mmlb joined #git
15:05 osse in particular the white stuff and the red stuff
15:06 b100s osse, whaat ? ))
15:06 milestone_ joined #git
15:06 alhariel joined #git
15:06 thebope joined #git
15:06 tcorneli joined #git
15:07 osse b100s: let's say your commit changes A into B. Specifically the A that is next to K. If Git cannot fand A or K then the cherry-pick won't work.
15:07 Dougie187 joined #git
15:07 xall_ joined #git
15:07 osse *find
15:07 sarbs joined #git
15:07 resurtm joined #git
15:08 b100s osse, git can find parent commit for sure because it is exists
15:09 b100s osse, there is another logic, i suppose
15:10 russoneto selckin I do use, but not THIS time
15:10 osse b100s: the commits don't mean anything in this case
15:10 treehug88 joined #git
15:11 b100s osse, then it should be applied as is without any merge
15:11 b100s isnt it?
15:11 osse it cannot be applied
15:12 ResidentBiscuit joined #git
15:12 b100s osse, obvious, as git said me, but i have another opinion and try to find out why
15:12 selckin b100s: there is a patch from parent to current, and from parent to diff/patch, both paths changed the same line, so it deosn't know which one is good
15:12 selckin s/patch/path/
15:12 andrew710 joined #git
15:13 selckin so many typos
15:13 b100s selckin, says i have commit X and want to apply it by cherry-pick to my HEAD. what git will check first ?
15:13 wolfpld joined #git
15:13 b100s how it will detect is conflict or not?
15:13 selckin i don't know how to awnser that beyond what was already said
15:14 osse b100s: it will simply try to apply the patch. like the 'patch' program would do
15:14 b100s then, lets ask osse , what do you think?
15:14 osse history doesn't matter
15:14 b100s osse, but how conflict appears ?
15:14 sshine hmm, 'git svn rebase' just deleted two files "because their commits didn't add or changed anything". how do I find them again in git's infinite wisdom?
15:15 osse b100s: the way i explained
15:15 selckin sshine: !reflog
15:15 gitinfo sshine: 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`
15:16 b100s osse, but how git cant find A and K if A is my HEAD and K is parent of A ?
15:16 b100s i have commit X which should change A to B
15:17 shinnya joined #git
15:17 b100s as you said git wont work if it cant find A or K, but HOW? it there, it exists
15:18 ski7777 joined #git
15:18 Gsham joined #git
15:19 jeffreylevesque joined #git
15:20 dogmatic69 joined #git
15:21 dogmatic69 hi all, I have been using credential.helper and its been fine, but now ssh'ing to the machine I was on it does not work.
15:21 dogmatic69 is there something I can do to make this work over ssh?
15:21 exarch joined #git
15:21 osse b100s: parents have nothing to do with it at all
15:21 dogmatic69 eg: its configured on Host B, I am now on Host A sshed to Host B and it does not work
15:21 osse b100s: my letters where for example lines in a file
15:22 skyres joined #git
15:22 Rickmasta joined #git
15:23 JeroenT joined #git
15:24 sharpy joined #git
15:27 roelmonnens joined #git
15:27 wolfpld hi
15:27 gitinfo wolfpld: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
15:27 aax joined #git
15:27 roelmonn_ joined #git
15:27 wolfpld i'm writing a small tool using libgit.a as a git interface
15:28 skyres joined #git
15:28 roelmonn_ joined #git
15:28 wolfpld I do traverse_commit_list, then check object type in callback, and perform read_sha1_file to get file size (I don't care about file contents, unless it's the magic size I'm looking for)
15:28 roelmonn_ joined #git
15:29 wolfpld I wonder if that's the fastest way to achieve this, or would it be better to use for_each_{loose,packed}_object, like in builtin/cat-file.c?
15:29 _ng joined #git
15:29 sarbs joined #git
15:29 Es0teric joined #git
15:30 InfoTest joined #git
15:30 _cyril_ joined #git
15:31 _ng joined #git
15:31 WayToDoor joined #git
15:31 andrew710 joined #git
15:32 durham joined #git
15:33 skyres joined #git
15:34 davidfetter_ge joined #git
15:35 madewokherd joined #git
15:35 mikecmpb_ joined #git
15:35 PtxDK joined #git
15:36 PtxDK can someone recommend a method of either removing a file from a commit. of completely removing the commit?
15:37 _ikke_ has this commit been pushed?
15:37 red82 joined #git
15:38 durham joined #git
15:38 elementalest joined #git
15:38 elementalest joined #git
15:38 uxaqua joined #git
15:38 PtxDK yes
15:38 pks joined #git
15:39 PtxDK didn't notice the extra file..
15:39 gareppa joined #git
15:39 skyres joined #git
15:39 PtxDK some auto-generated stuff got pushed
15:40 rnsanchez_ joined #git
15:40 _ikke_ Do you expect anyone has fetched the commits?
15:40 PtxDK no
15:41 PtxDK only 2 people on the project, i'm the only coder
15:41 PtxDK kinda, the other guy doesn't code on it currently
15:42 micdo_ joined #git
15:42 _ikke_ ok
15:43 _ikke_ And this file is a new file that was added to this specific commit? (And is it the last commit)?
15:43 micdo_ joined #git
15:44 PtxDK it is the last commit
15:44 PtxDK the file already existed
15:44 _ikke_ ok
15:44 PtxDK so only need to delete the changes
15:44 _ikke_ And you want to undo the change to these files in the last commit?
15:44 _ikke_ ok
15:44 skyres joined #git
15:44 _ikke_ git checkout HEAD~ -- path/to/file
15:44 _ikke_ git commit --amend -CHEAD
15:44 PtxDK so pretty specific
15:45 mischat_ joined #git
15:46 PtxDK this is interesting
15:46 GavinMagnus joined #git
15:47 PtxDK _ikke_: thanks alot
15:47 _ikke_ One last step:
15:47 revoltingPeasant joined #git
15:47 _ikke_ git push --force-with-lease origin <branchname>
15:47 tang^ joined #git
15:48 PtxDK gotta put this in my notes, it's awesome
15:49 dan2k3k4 joined #git
15:50 skyres joined #git
15:51 resurtm joined #git
15:52 matsaman joined #git
15:53 romerocesar joined #git
15:55 nilg` joined #git
15:55 nettoweb joined #git
15:55 skyres joined #git
15:56 tcorneli joined #git
15:56 venmx joined #git
15:56 dmpeters63 joined #git
15:58 subhojit777 joined #git
15:58 Noldorin joined #git
15:59 subhojit777 joined #git
15:59 subhojit777 joined #git
16:00 rafalcpp joined #git
16:00 subhojit777 joined #git
16:01 anonymus_ joined #git
16:01 crose joined #git
16:02 skyres joined #git
16:03 mischat joined #git
16:03 Rickmasta joined #git
16:03 seeknull joined #git
16:03 kgron joined #git
16:03 dtrott joined #git
16:04 roelmonnens joined #git
16:04 navidr joined #git
16:05 mischat__ joined #git
16:05 Starky joined #git
16:07 jaafar joined #git
16:08 skyres joined #git
16:08 renlo joined #git
16:10 Filiphe joined #git
16:10 ojdo joined #git
16:11 GavinMagnus joined #git
16:12 dreiss joined #git
16:14 geko joined #git
16:14 skyres joined #git
16:14 zeroed joined #git
16:14 zeroed joined #git
16:14 LionsMane joined #git
16:16 r3c0d3x joined #git
16:16 andrew710 joined #git
16:16 dtrott_ joined #git
16:17 jnewt joined #git
16:18 kensan left #git
16:20 rafalcpp_ joined #git
16:20 ramsub07 joined #git
16:20 berndl joined #git
16:20 joki- joined #git
16:20 jaafar joined #git
16:20 skyres joined #git
16:21 Mir4g3 joined #git
16:21 vucks96 joined #git
16:22 SwiftMatt joined #git
16:23 hhee joined #git
16:25 hahuang61 joined #git
16:26 morenoh149 joined #git
16:26 skyres joined #git
16:27 doener joined #git
16:33 skyres joined #git
16:33 JanC joined #git
16:34 [cust] joined #git
16:35 achlys joined #git
16:35 svm_invictvs joined #git
16:37 Ryanar joined #git
16:37 jason237 joined #git
16:38 JanC joined #git
16:38 ilCyx86_64 joined #git
16:39 robotroll joined #git
16:39 skyres joined #git
16:41 e14 joined #git
16:43 tlaxkit joined #git
16:44 eblip joined #git
16:45 skyres joined #git
16:46 thebope joined #git
16:47 Ryanar joined #git
16:49 Ramen joined #git
16:51 skyres joined #git
16:52 mehola joined #git
16:52 tyreld joined #git
16:52 _cyril_ joined #git
16:52 lordjancso joined #git
16:53 ArchNoob joined #git
16:55 lindenle joined #git
16:56 einnjo joined #git
16:56 synthroid joined #git
16:57 micdo_ joined #git
16:57 skyres joined #git
16:58 synthroi_ joined #git
16:58 micdo_1 joined #git
16:58 guampa joined #git
16:59 nawwmz joined #git
17:00 GavinMagnus left #git
17:03 Darcidride joined #git
17:04 skyres joined #git
17:04 govg joined #git
17:04 ochorocho__ joined #git
17:06 Es0teric joined #git
17:07 truckcrash joined #git
17:08 Balthasar|HPWork joined #git
17:09 acetakwas joined #git
17:10 skyres joined #git
17:10 rafalcpp joined #git
17:10 thebope joined #git
17:14 ash_workz_ joined #git
17:14 eivarv joined #git
17:14 synthroid joined #git
17:15 thebope_ joined #git
17:15 elsevero joined #git
17:16 akushner joined #git
17:16 skyres joined #git
17:18 WillianPaiva[m] joined #git
17:18 nicksloan joined #git
17:20 thebope joined #git
17:21 MarceColl joined #git
17:22 thebope joined #git
17:22 svm_invictvs joined #git
17:22 skyres joined #git
17:23 gareppa joined #git
17:25 gigq joined #git
17:26 netj joined #git
17:26 qguv joined #git
17:26 meauses joined #git
17:27 e14 joined #git
17:28 skyres joined #git
17:31 hashpuppy joined #git
17:32 renlo joined #git
17:32 durham joined #git
17:32 jccn joined #git
17:32 FilipNortic joined #git
17:34 ash_workz_ left #git
17:34 skyres joined #git
17:35 ash_workz joined #git
17:37 Mobutils joined #git
17:37 e14 joined #git
17:38 gareppa joined #git
17:40 sea-gull_ joined #git
17:40 trobotham joined #git
17:41 dendazen joined #git
17:41 skyres joined #git
17:41 nilg` joined #git
17:42 crayon joined #git
17:46 BrianBlaze420 joined #git
17:47 _cyril_ joined #git
17:47 skyres joined #git
17:49 atlas159 joined #git
17:49 rivarun joined #git
17:50 mrpackethead joined #git
17:52 oskarkv joined #git
17:52 ochorocho__ joined #git
17:53 skyres joined #git
17:54 morenoh149 joined #git
17:55 ochorocho__ joined #git
17:55 dan2k3k4 joined #git
17:56 hahuang61 joined #git
17:59 skyres joined #git
17:59 Doginal joined #git
18:01 daniel_r_ joined #git
18:05 Learath2 joined #git
18:05 eroussel joined #git
18:05 skyres joined #git
18:10 _rnsanchez_ joined #git
18:10 clemf joined #git
18:12 skyres joined #git
18:13 khfeng_ joined #git
18:13 dsantiago joined #git
18:13 harushimo joined #git
18:14 BSaboia joined #git
18:17 acetakwas joined #git
18:17 nixdork joined #git
18:17 m0ltar Hi! I'm trying to resolve some conflicts during merge. And one file was touched by someone else a lot. I don't really have the expertise there. Is there a way to delegate just that one file to be merged by someone else in the middle of rebase?
18:17 m0ltar What would the workflow be?
18:18 skyres joined #git
18:18 dreiss joined #git
18:18 _cyril_ joined #git
18:19 nixdork If I switch my mailstore from mbox to maildir would it make sense to back it up w/ git so I can get it (read only) onto multiple coputers?
18:19 selckin ask them to rebase on top of current head
18:20 thebope_ joined #git
18:21 thebope joined #git
18:24 skyres joined #git
18:25 bmahe joined #git
18:25 ddou joined #git
18:26 Es0teric joined #git
18:27 cdg joined #git
18:27 protn joined #git
18:28 BlaXpirit m0ltar, give them access through remote desktop xD
18:28 protn To https://github.com/g/m ! [rejected]        master -> master (non-fast-forward) error: failed to push some refs to 'https://github.com/g/m'
18:28 protn hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g.
18:28 protn hint: 'git pull ...') before pushing again.
18:28 protn its a brand new repository
18:28 protn wtf lol
18:28 protn i did commit and now I want to push
18:29 Darcidride_ joined #git
18:29 protn do  I need to copy all files to .git?
18:29 protn BlaXpirit:
18:29 akushner_ joined #git
18:29 BlaXpirit protn,
18:30 protn i commited mofos
18:30 protn they arent pushing
18:30 protn :D
18:30 skyres joined #git
18:30 protn ....
18:32 ivac joined #git
18:33 protn BlaXpirit: lol mate any quick hack
18:33 protn git add --all
18:33 cdown joined #git
18:34 Doginal joined #git
18:35 johnmilton joined #git
18:35 protn managed
18:35 protn left #git
18:36 revoltingPeasant I used `git checkout -f HEAD@{6}` to revert my local repo to an earlier stage. I've made some edits since and done `git push origin master` which reports "Everyting is up to date" but the online repo does not reflect the changes. what am I doing wrong?
18:36 skyres joined #git
18:37 Random832 revoltingPeasant: a checkout doesn't change your local repo's references, you need to reset.
18:38 Random832 also it's not clear what you mean by 'made some edits since'. did you commit on top of a detached HEAD?
18:40 dsantiag_ joined #git
18:40 renlo joined #git
18:40 acetakwas joined #git
18:40 railssmith joined #git
18:42 InfoTest joined #git
18:42 skyres joined #git
18:44 e14 joined #git
18:46 revoltingPeasant Random832: Probably, although I'm not exactly sure what a detatched head is. I did a `checkout -f` to discard the last few commits, then I wrote some code and did `commit -a` and `git push origin master`.
18:46 King_Hual` joined #git
18:47 jost joined #git
18:48 Random832 ok your situation is complicated
18:48 Random832 do a git log --oneline --decorate --all --graph
18:49 skyres joined #git
18:49 Doen joined #git
18:50 madebymarkca joined #git
18:50 achlys joined #git
18:51 m___ joined #git
18:51 blackwind_123 joined #git
18:51 shubhnik joined #git
18:53 khfeng_ joined #git
18:53 daniel_rose joined #git
18:53 b1tchcakes joined #git
18:55 f3r70rr35f joined #git
18:55 skyres joined #git
18:56 chris123456 joined #git
18:56 finalbeta1 joined #git
18:56 nhennenfent joined #git
18:56 renlo joined #git
18:57 akushner joined #git
18:57 revoltingPeasant Random832: here is the first 50 lines https://ptpb.pw/ovwE. I wanted to discard everything between ( but not including ) 14199d8 and b9eb43e. I had just done `git reset --hard <commit-id>` befor I ran the command.
18:58 Sasazuka joined #git
18:58 thebope joined #git
18:59 revoltingPeasant I thought that would fix it but it's still reporting "Everything up to date" without uploadign any files
18:59 Chocobo joined #git
19:00 thebope_ joined #git
19:00 micdo_ joined #git
19:01 Chocobo Hi all.  I am trying to to do "git checkout --patch origin/master -- server.py" and I get the error "fatal: corrupt patch at line 40" which turns out to be "# ---"  Is there something I am suppose to do with that line?  I have tried uncommenting it without much luck
19:01 skyres joined #git
19:01 Random832 ...wait, which commit had you reset to
19:02 Random832 you didn't mention a reset command before, and do you mean before the checkout or before the commit
19:02 thebope joined #git
19:03 Random832 anyway, you don't have anything you haven't committed, right? b9eb43e has everything you need
19:03 _cyril_ joined #git
19:03 revoltingPeasant Random832: yeah sorry I did that before you you responded the second time
19:04 thebope_ joined #git
19:04 Random832 revoltingPeasant: if so, do git checkout master; git reset --hard b9eb43e; git push --force origin master;
19:04 Random832 and then you need to decide what to do with the changes you discarded - do you not need them at all, or are you going to want them later on top of your new code?
19:05 revoltingPeasant no I don't need them, thanks I'll try that
19:05 finalbeta joined #git
19:06 Random832 you'll probably want to drop the stash then.
19:06 Anja joined #git
19:06 Random832 and just be aware that if anyone else pulled from the repository while those changes are in there, when they pull again it's going to merge and reintroduce them.
19:07 skyres joined #git
19:08 cdown joined #git
19:09 dikiaap joined #git
19:12 thebope joined #git
19:12 Orion3k joined #git
19:12 yehowyada joined #git
19:13 jstimm joined #git
19:13 cdown_ joined #git
19:13 laumann joined #git
19:13 skyres joined #git
19:13 Snugglebash joined #git
19:14 yehowyada joined #git
19:15 Limes joined #git
19:15 rahtgaz joined #git
19:17 revoltingPeasant Random832: thanks for the info man
19:17 revoltingPeasant it's working now
19:18 yehowyad_ joined #git
19:18 JanC joined #git
19:19 daniel_rose joined #git
19:19 skyres joined #git
19:22 Es0teric joined #git
19:26 skyres joined #git
19:26 nicksloan joined #git
19:26 ArchNoob joined #git
19:29 ahmed_elgabri joined #git
19:30 jmpp joined #git
19:30 jmpp joined #git
19:31 mikecmpbll joined #git
19:31 e14 joined #git
19:31 davidfetter_ge hi
19:32 skyres joined #git
19:32 davidfetter_ge i forgot to put something in a commit a couple of commits back. when i rebase with -i, can i preserve the comments? i get that all the shas from there on will change.
19:34 thebope_ joined #git
19:36 ochorocho__1 joined #git
19:36 cagedwisdom joined #git
19:37 kgron left #git
19:38 skyres joined #git
19:39 daniel_rose joined #git
19:39 paulygo joined #git
19:40 durham joined #git
19:41 troulouliou_div2 joined #git
19:44 thiago joined #git
19:45 skyres joined #git
19:45 Random832 you mean the commit messages?
19:45 Random832 yes they will be preserved unless you change them
19:46 Random832 if you select squash it will prompt you to edit the commit message, with the default being the original ones concatenated together. If you select fixup the commit message from the fixup commit will be discarded.
19:48 scientes joined #git
19:48 scientes is there a way to just check connectivity?
19:48 scientes I'm trying to bench git's sha1 performance
19:48 anonymuse joined #git
19:50 thiago scientes: there s no tool to do a simple connectivity check
19:51 Seveas scientes: connectivity and sha1 performance are not the same thing. To measure sha1 performance, you'll need to actually patch git itself.
19:51 thiago and that has nothing to do with sha1 hashing performance
19:51 skyres joined #git
19:51 scientes I'm just guessing that with intel sha extensions the openssl is faster than built in
19:51 thiago that may be, but you don't have a processor with the SHA extensions
19:51 grawity doesn't `git fsck` more or less "check connectivity"
19:52 thiago grawity: more
19:52 scientes ^^ bingo that was what i was remembering
19:52 Seveas grawity: it does, but that does require very little in the form of sha1
19:52 Seveas it requires unpacking objects, not calculating checksums
19:53 Seveas hash-object comes closer to something useful to measure sha1 performance, but it also does a lot of compression.
19:54 scientes_ joined #git
19:54 nidr0x joined #git
19:54 sarbs joined #git
19:56 daniel_rose joined #git
19:56 * thiago updates his Intel manual and notices that the SHA extensions moved from the "extensions" manual (future processors) to the regular manual (current or near-future processors)
19:56 scientes_ thiago: this is a 6 year old laptop and it has them
19:57 scientes_ or rather 6 year old cpu
19:57 skyres joined #git
19:57 scientes_ wait im confusing with aes which is seperate
19:57 scientes_ year its quite new
19:57 jimi_ joined #git
19:58 thiago AES is much older
19:58 scientes_ https://github.com/openssl/openssl/blob/ace05265d2d599e350cf84ed60955b7f2b173bc9/crypto/sha/asm/sha1-x86_64.pl
19:58 thiago it showed up on Westmere, in 2010
19:59 scientes_ # Goldmont 8.13 6.42/+27% 1.70/+380%(**)
19:59 * thiago loves OpenSSL's perlsembly
19:59 thiago way to combine the two least readbale programming languages
20:00 scientes_ at least it is self confined
20:00 daniel_rose joined #git
20:00 thiago that's probably just implementing this paper: https://software.intel.com/en-us/articles/improving-the-performance-of-the-secure-hash-algorithm-1
20:00 bittyx joined #git
20:00 thiago according to wikipedia, Kabylake doesn't have SHA extensions, so I'd expect it on the next processor
20:01 _ADNWO_ joined #git
20:02 daniel_r_ joined #git
20:03 bejeb_ Why would git status show a file as modified even after a git reset --hard? It isn't modified which makes me think this has to be something to do with whitespace
20:03 bejeb_ e/whitespace/line endings
20:03 scientes_ thiago: that page doesn't even use the instructions--the instructions use the AVX registers
20:03 skyres joined #git
20:04 scientes_ https://software.intel.com/en-us/articles/intel-sha-extensions
20:05 nedbat bejeb_: git diff should be able to show you
20:05 Aboba joined #git
20:07 WhiskerBiscuit joined #git
20:10 bejeb_ nedbat: git diff --color --word-diff-regex=. shows me what I thought - line endings on every line, like `/controllers.js" />[-^M-]` where `[-^M-]` is in red
20:10 skyres joined #git
20:10 [Brain] joined #git
20:10 bejeb_ but why won't git reset --hard just reset the file to what it is in the repo?
20:10 athaller joined #git
20:11 ochorocho__ joined #git
20:11 thiago scientes_: that's my point, but I notice your link does use the sha instructions further down. I hadn't read it all.
20:11 LucaTM_ joined #git
20:13 nedbat bejeb_: maybe something about your gitconfig that adjusts line endings? Not sure.
20:14 bejeb_ nedbat: thanks. I'm going to try poking around some more I guess
20:15 WhiskerBiscuit joined #git
20:16 skyres joined #git
20:17 bmahe joined #git
20:17 athaller joined #git
20:19 aidalgol joined #git
20:20 adac joined #git
20:21 matoro joined #git
20:22 skyres joined #git
20:25 elsevero joined #git
20:25 Es0teric joined #git
20:26 satifant joined #git
20:28 thebope joined #git
20:28 renlo joined #git
20:28 skyres joined #git
20:35 skyres joined #git
20:35 xaa__ joined #git
20:36 tyreld joined #git
20:37 emg joined #git
20:37 sunri5e joined #git
20:37 b100s joined #git
20:41 skyres joined #git
20:42 btree joined #git
20:44 jason237 joined #git
20:46 ramsub07 joined #git
20:47 skyres joined #git
20:51 JamesBaxter joined #git
20:51 kpease joined #git
20:52 _cyril_ joined #git
20:53 nwkj86 joined #git
20:54 skyres joined #git
20:54 voidDotClass joined #git
20:54 m1dnight2 joined #git
20:54 harushimo joined #git
20:54 Sna4x8 joined #git
20:55 jstein_ joined #git
20:55 aard_ joined #git
20:56 cdg joined #git
20:56 mycelium joined #git
21:00 WayToDoor joined #git
21:00 skyres joined #git
21:02 anonymuse joined #git
21:03 thebope joined #git
21:05 dsdeiz joined #git
21:05 dsdeiz joined #git
21:05 voidDotClass When viewing git diff, it shows the old line followed by the new line. Is there a way to find out the hash in which the old line was added? Something similar to git blame except for the old line in git diffs? Details: http://stackoverflow.com/questions/40496380/how-to-get-the-hash-of-the-commit-in-which-a-deleted-line-was-added
21:06 MarceColl joined #git
21:06 ochorocho__ joined #git
21:06 skyres joined #git
21:10 anuxivm joined #git
21:10 MrWoohoo joined #git
21:11 askb joined #git
21:11 ramsub08 joined #git
21:13 skyres joined #git
21:14 robattila256 joined #git
21:16 tyreld joined #git
21:16 dreiss joined #git
21:19 skyres joined #git
21:21 charlie__ joined #git
21:21 nettoweb joined #git
21:25 skyres joined #git
21:26 makar joined #git
21:26 paulygo joined #git
21:26 emg joined #git
21:27 paulygo left #git
21:28 jaafar joined #git
21:29 jaafar joined #git
21:30 sophiag joined #git
21:30 e14 joined #git
21:30 Synthead joined #git
21:30 thebope joined #git
21:32 jaafar joined #git
21:32 skyres joined #git
21:33 sophiag hi. really hoping this is a quick question...i have a bunch of legacy projections where i very foolishly inited git too deep in the directory. have several times followed some bad SO advice and moved the .git folder resulting in about a half day of hell each time. last time i came on here and was told to just leave it where it is and add the files
21:33 sophiag after i move them, but since they're moved *up* git add returns fatal "outside repository." how would i handle this case? i assume moving the .git dir is still not the right answer?
21:35 clemf joined #git
21:36 DieguezZ joined #git
21:37 sophiag is "git add ." the answer?
21:38 skyres joined #git
21:39 jaafar joined #git
21:42 jaafar joined #git
21:44 skyres joined #git
21:44 acetakwas joined #git
21:45 zumba_addict joined #git
21:45 kyan joined #git
21:46 hopHola joined #git
21:46 clemf joined #git
21:46 hopHola left #git
21:47 Faylite_ joined #git
21:47 Atrumx joined #git
21:50 Alienpruts joined #git
21:50 m0viefreak joined #git
21:50 Random832 sophiag: you need to create a new git repository
21:51 Random832 you might be able to keep your history by having the old git repository as a submodule
21:51 skyres joined #git
21:51 ShapeShifter499 joined #git
21:53 sophiag i saw something say to create a branch and then merge them?
21:53 adac joined #git
21:53 Random832 do you have just one repository in the wrong spot or multiple subdirectories
21:53 zumba_addict joined #git
21:54 Random832 if you just have one you can move all the files inside it to where they should be in the new hierarchy, then move all the other files from outside it into it.
21:54 CrazyBonz joined #git
21:54 jstimm joined #git
21:55 clemf joined #git
21:55 Random832 if you have multiple ones then i guess you could do that with all of them and then make a new repository, add them as remotes, fetch from all of them, and do a merge
21:56 sophiag i'm not moving files around
21:56 sophiag i'm not talking about multiple repos either
21:57 netj joined #git
21:57 djb-irc joined #git
21:57 sophiag this is the question i asked above...
21:57 sophiag not some other question
21:57 skyres joined #git
21:59 dendazen joined #git
22:03 skyres joined #git
22:04 nettoweb joined #git
22:05 wizardedit joined #git
22:06 eroussel joined #git
22:07 Darcidride_ joined #git
22:07 point joined #git
22:08 heroux joined #git
22:08 djb-irc joined #git
22:09 skyres joined #git
22:09 p4trix joined #git
22:15 lacour joined #git
22:15 nwkj86 joined #git
22:16 skyres joined #git
22:22 skyres joined #git
22:22 ailaG joined #git
22:23 ailaG Hi, if my app requires per-installation data, e.g. database info, where do I put that?
22:24 mutex_ left #git
22:24 ailaG Like, what is the proper way. I could make a config file and put it in gitignore and tell my users to create one but that’s bleh.
22:26 ochorocho__ joined #git
22:27 nilg joined #git
22:28 j416 ailaG: create a config example file with demo config, tell users to copy that to the right config and edit it to suit their needs
22:28 j416 ailaG: and/or, use environment variables
22:28 matsaman joined #git
22:28 ailaG j416 OS env vars? npm env vars?
22:28 j416 OS
22:28 ailaG and ty :)
22:28 j416 I don't know about npm
22:28 skyres joined #git
22:29 dreiss joined #git
22:29 ailaG I’ll ask over at #npm too, maybe there’s an install procedure
22:29 ailaG Since i’m using this in this specific project… thanks!
22:29 j416 is this a package?
22:29 janx joined #git
22:29 voidDotClass joined #git
22:29 ailaG It’s a web app. I want to see how complex I want to make it
22:29 j416 what does npm have to do with it
22:30 j416 do you install the web app via npm?
22:30 btree left #git
22:30 ayjay_t joined #git
22:32 viccuad joined #git
22:32 viccuad Hi folks. Question, is it possible to commit just a filename change of a file that has changes inside also?
22:33 j416 viccuad: yes. Easiest is probably to do it manually, copy the file someplace, then reset its content, rename, commit that
22:33 viccuad j416: but that's cheating :D
22:33 j416 haha
22:33 ailaG j416: I install modules with it, so the user runs npm install
22:34 j416 ailaG: so your config is not related to npm at all
22:34 skyres joined #git
22:35 j416 viccuad: git mv foo bar
22:35 j416 viccuad: where foo is the current name and bar is the new name
22:35 j416 viccuad: will work without adding the changes
22:35 ailaG j416: Yeah but it’s a  process I may be able to run on npm install (since the user already does that) so I figured there may be some solution for that already
22:35 viccuad j416: ok, that's a solution, but what about if I already changed the filename?
22:36 j416 ailaG: I'm no fan of npm :) I guess #npm may be able to help.
22:36 ailaG Yeah I asked there. Why don’t you like it?
22:37 j416 ailaG: node_modules is insanely huge because of how packages depend on each other
22:38 ailaG j416: Yeah :/
22:38 Learath2 joined #git
22:41 skyres joined #git
22:41 j416 viccuad: hmm, then you have already deleted the original file by renaming it, so I'm not sure there's a way apart from "cheating"
22:41 viccuad j416: fair enough
22:41 viccuad j416: many thanks! :)
22:41 j416 not that I can think of, anyway. :)
22:41 j416 welcome o/
22:42 Guest66 joined #git
22:42 j416 viccuad: you can of course always modify the index manually
22:42 j416 viccuad: but that's likely more hassle than cheating
22:42 viccuad yet more correct :>
22:42 viccuad !
22:42 j416 heh
22:42 j416 maybe.
22:42 j416 I forget how to do it
22:43 [cust] joined #git
22:43 viccuad nah, just nitpicking, this kind of situations is where I try to learn and do some yak shaving
22:43 boombatower joined #git
22:44 j416 heh, I understand. I'm the same
22:44 morenoh149 joined #git
22:47 skyres joined #git
22:49 viccuad I have a `git pa` git alias with `slikts pa = push --all --follow-tags origin`
22:49 viccuad sigh, `pa = push --all --follow-tags origin`, and I would like it to push all branches, but not any of them matching patch-queue/*
22:50 zumba_ad_ joined #git
22:50 viccuad and I'm wondering how to do that
22:50 pokalyis joined #git
22:51 `slikts viccuad: sup
22:52 viccuad `slikts: that was unfortunate, sorry
22:52 `slikts you get 3 wishes
22:53 skyres joined #git
22:55 * viccuad asks for more money, being on the beach in summer and a public-access television programming schedule
22:56 `slikts all granted, but it's delayed effect, may take years
22:57 nettoweb joined #git
22:57 leeN joined #git
22:57 BenderRodriguez joined #git
22:57 acetakwas joined #git
22:58 danslo_ joined #git
22:59 hahuang61 joined #git
22:59 skyres joined #git
23:00 Dougie187 left #git
23:00 ToBeCloud joined #git
23:02 GavinMagnus joined #git
23:04 Dougie187 joined #git
23:04 sangy joined #git
23:06 skyres joined #git
23:06 jimi_ joined #git
23:08 ramsub07 joined #git
23:09 aarobc joined #git
23:09 harushimo joined #git
23:09 jimi_sanchez joined #git
23:12 skyres joined #git
23:12 jimi_ joined #git
23:13 stitch left #git
23:13 dreiss joined #git
23:13 peeps[lappy] joined #git
23:14 runlevl4 joined #git
23:15 jimi_sanchez joined #git
23:17 jimi joined #git
23:18 skyres joined #git
23:24 skyres joined #git
23:26 thebope joined #git
23:28 pirate21994 joined #git
23:29 Sasazuka joined #git
23:29 arescorpio joined #git
23:30 Noldorin_ joined #git
23:30 skyres joined #git
23:31 harushimo joined #git
23:32 BenderRodriguez joined #git
23:34 dsdeiz joined #git
23:34 dsdeiz joined #git
23:36 skyres joined #git
23:38 Marbug_ joined #git
23:39 kbs joined #git
23:42 skyres joined #git
23:43 D-Boy joined #git
23:44 ansyeblya1 joined #git
23:44 mellernoia joined #git
23:45 anonymuse joined #git
23:48 GavinMagnus joined #git
23:48 skyres joined #git
23:49 harushimo joined #git
23:51 dsdeiz joined #git
23:52 crayon joined #git
23:55 skyres joined #git
23:55 blahdodo joined #git
23:57 robattila256 joined #git
23:59 venmx joined #git

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