Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-17

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

All times shown according to UTC.

Time Nick Message
00:00 hagridaaron joined #git
00:00 matoro joined #git
00:01 NeXTSUN joined #git
00:02 venmx joined #git
00:02 nettoweb joined #git
00:03 mostlybadfly joined #git
00:04 thiago joined #git
00:05 yrseo joined #git
00:06 MattMaker joined #git
00:11 Abbott joined #git
00:12 mischat joined #git
00:13 Abbott so "git stash" will copy all the tracked files to a temporary location ane set me to the latest local commit, right? Then I would pull, which would update me cleanly to HEAD, then I would copy files out of the stash directory and push, if I wanted to use my stashed files instead?
00:13 mischat joined #git
00:13 Abbott I just don't really understand what stash would be used for
00:16 madewokherd joined #git
00:18 mehola joined #git
00:18 pur3eval joined #git
00:22 howitdo joined #git
00:22 howitdo joined #git
00:26 snowalpaca joined #git
00:26 nedbat Abbott: you've made some change to some files.  You don't want to commit them yet. Instead, you want to get changes from the repo, or you want to switch branches because you were starting from the wrong place.  You stash your changes to get a clean tree.  You pull, or switch branches.  Then you can pop your stash to have your changes applied on top of that new starting point.
00:26 dwmw2_gone joined #git
00:26 SoulOfTheInterne joined #git
00:27 Oatmeal joined #git
00:29 Vampire0_ joined #git
00:41 DolpheenDream joined #git
00:42 ResidentBiscuit joined #git
00:44 PettanShoutaKun joined #git
00:44 PettanShoutaKun is there an easy way to look and see who deleted a file from a branch in git?
00:44 rewt find the commit that did it, and see who committed that commit
00:45 PettanShoutaKun but there's no easy way? I have to dig through every commit by hand?
00:46 dwmw2_gone joined #git
00:46 rewt try:   git log -- file
00:47 anuxivm1 joined #git
00:52 Lyqyd joined #git
00:52 PettanShoutaKun thank you sir!
00:56 duderonomy joined #git
00:57 Darren_ joined #git
00:57 cdg joined #git
01:01 ratdeptrai joined #git
01:02 dwmw2_gone joined #git
01:02 zzz joined #git
01:02 Somelauw left #git
01:03 PettanShoutaKun if I do a git merge and then do a reset before I resolve conflicts can I undelete something?
01:03 PettanShoutaKun how does that work?
01:03 d^sh joined #git
01:03 nettoweb joined #git
01:03 kadoban PettanShoutaKun: Unclear what you're asking. Did you do something and are trying to recover? Are you trying to accomplish a specific thing? Other?
01:04 Vampire0 joined #git
01:04 PettanShoutaKun Someone deleted a file from master, but I'm working on a new branch and I have to merge that master in... so on my branch the file is there, but on master it isn't (it should be)
01:05 PettanShoutaKun so when I merge master in, and it deletes my file, because that's what the log shows D on this file... can I git reset, re add the file, and then commit my merge
01:05 kadoban PettanShoutaKun: You can, but it sounds like not a great idea to me. You should probably merge and then revert that change you don't want.
01:05 kadoban Merges that add changes are ... not terribly friendly in general.
01:06 j7k6 joined #git
01:06 PettanShoutaKun I see. I'm also worried next time someone merges master back in it will redelete the file
01:06 PettanShoutaKun I really don't want that
01:07 kadoban Why do you want it in your branch then? Sounds weird.
01:07 PettanShoutaKun it's supposed to be on master
01:07 PettanShoutaKun some guy deleted it by accident fixing other stuff
01:07 Gsham joined #git
01:07 stoopkid joined #git
01:08 PettanShoutaKun I really don't want to rebase
01:08 kadoban Oh I misread. If you just revert the deletion of it on your branch, I don't see why merging your branch back into master would re-delete it. The original change wouldn't be applied again anyway.
01:08 PettanShoutaKun and ruin thhe repo for everyone who has it checked out
01:08 PettanShoutaKun when I merge this back into master it's probably just going to A "stuff that got deleted" right?
01:09 kadoban Why not have someone fix that problem on master first anyway, if it was wrong? Not that it really matters.
01:09 PettanShoutaKun or are you saying just put the files back on my branch
01:09 kadoban I didn't understand the end of 'when I merge this back into master it's probably just going to A "stuff that got deleted" right?'
01:10 kadoban brb
01:10 PettanShoutaKun D is a deletion. A is an addition. I can take my merge and add the files back in, so that the deletion is gone form my merge commit.
01:10 jccn joined #git
01:10 e01 joined #git
01:10 e01 joined #git
01:10 kadoban *shrug* whatever you want to do. Just my opinion, you usually won't end up with fun when you start adding real changes to merge commits.
01:11 menip joined #git
01:11 PettanShoutaKun yeah... I don't want to make this anymore difficult than it has to be
01:11 PettanShoutaKun I was just trying to be clever I guess but it sounds like a bad idea
01:11 ozmage joined #git
01:12 kadoban It tends to just be confusing. It's usually an assumption that merges *only* merge.
01:13 kadoban Whereas this is just straight-up changing something. So merging and then reverting seems much clearer, and it's easier as well.
01:21 nickabbey joined #git
01:27 wiesel joined #git
01:27 matoro joined #git
01:27 Darren_ joined #git
01:34 cagomez joined #git
01:34 ncthom91 joined #git
01:34 ncthom91 joined #git
01:35 morenoh149 joined #git
01:36 ncthom91 joined #git
01:37 ncthom91 joined #git
01:38 Abbott nedbat: so how is that different from a merge?
01:39 chipotle joined #git
01:39 nedbat Abbott: a merge commits the work. the stash is a way to set work aside before you are ready to commit it
01:40 Abbott nedbat: right, but to stash your work, update, then make changes and push, wouldn't that just be the same as merging, which would download the files, then ask you to add the changes from the local files?
01:40 cagomez joined #git
01:40 nedbat Abbott: you might need the different starting point in order to even make a coherent commit
01:41 Abbott okay that makes sense
01:41 Peetz0r joined #git
01:41 jameser joined #git
01:42 Abbott my other question was: how do people typically manage a todo list of sorts? committing a TODO file? or is there a git-y way to manage a list of things that are needed to be done
01:43 kadoban A TODO file seems like not a bad idea really.
01:43 llamapixel TODO is sometimes managed as a list of elements in your editor.
01:44 llamapixel You can even make a #TODO remark list and manage it in say the main script.
01:44 llamapixel As things grow I also make a #ANCHOR to the places I have to revisit in order to find those TODO’s quickly again
01:45 llamapixel UID_find points
01:46 NaN joined #git
01:46 NaN hi there
01:46 llamapixel A todo in your readme on your git if you please.
01:46 Abbott okay cool I see which of those my group likes
01:47 Abbott thank you very much
01:47 NaN I did a commit and I was on master but didn't want to commit to master so I did $git reset HEAD~1 and now my changes are gone; do I still have a chance?
01:47 pur3eval joined #git
01:49 ecuanaso joined #git
01:50 netj joined #git
01:51 eroussel joined #git
01:52 durham_ joined #git
01:53 nedbat NaN: take a look at:   git reflog
01:54 duderonomy joined #git
01:55 NaN nedbat: the commit is still there, how can I get it back?
01:56 loopsmark joined #git
01:57 nedbat NaN: make a note of the hash that you want.  Then make a branch (git checkout -b branchname), and reset it to that hash (git reset --hard THAT_HASH)
01:57 nedbat NaN: i'm assuming you want that commit on a branch?
01:58 NaN nedbat: you are right :D
01:59 NaN wow it worked!
01:59 NaN nedbat: you are great, thanks!
01:59 NaN so it was like "bring that commit from garbage and put it right here"
01:59 NaN nice
02:00 nedbat NaN: glad to help
02:03 venmx joined #git
02:05 Sasazuka joined #git
02:08 mischat joined #git
02:09 finalbeta joined #git
02:11 e01 joined #git
02:11 e01 joined #git
02:22 menip joined #git
02:33 jameser_ joined #git
02:33 suttonwilliamd__ joined #git
02:37 gelei007 joined #git
02:41 dwmw2_gone joined #git
02:46 oscarpica joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and a bag of wheeee | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | Are you even reading this? Prove it by submitting to https://madeitwor.se/git-jokes
02:51 d^sh joined #git
02:52 Ryanar joined #git
02:55 xall_ joined #git
02:55 Vampire0_ joined #git
02:59 cqi joined #git
03:00 dermoth joined #git
03:02 alexandre9099 joined #git
03:03 ojdo joined #git
03:04 tonyj joined #git
03:06 dwmw2_gone joined #git
03:07 j7k6 joined #git
03:08 mizu_no_oto joined #git
03:09 Rodya_ joined #git
03:11 chachasmooth joined #git
03:12 bruce_lee joined #git
03:12 e01 joined #git
03:13 duderonomy joined #git
03:15 j416 joined #git
03:16 nictrasavios joined #git
03:17 Vortex34 joined #git
03:18 gelei007 joined #git
03:18 fstd_ joined #git
03:18 Rodya_ joined #git
03:19 nictrasavios I have an all mighty merge coming up - involving taking branched that diverged on "commit 10". Master is on "commit 28", the branch is on "commit 24". There is a bit of an issue. Does anyone know a really good, well explained reference on things like "deleting files during a merge", or a tool that will let us get through this with a minimum of headache?
03:20 chuckie joined #git
03:21 hexagoxel joined #git
03:21 nictrasavios What happened was, durring a rails project the backend team moved the entire backend of the code, and the front end team moved the entire view. There is some overlap in the middle with the controllers - and they even used different model names in their code. It's now my job to clean it all up.
03:22 cdown joined #git
03:24 morenoh149 joined #git
03:24 rwp nictrasavios, My sympathies go out to you.
03:24 rwp They violated from the paradigm that one should never go that long and diverge that far from the target branch.
03:25 jameser joined #git
03:26 Zarthus You can't fix this as one person
03:26 Zarthus you need both of the teams to fish out the good and the bad.
03:26 xall joined #git
03:26 nictrasavios Zarthus, Well - that really isn't my call to make. I've been told "this is your job".
03:27 Zarthus It's not your call, but you can certainly give the advice
03:27 j416 joined #git
03:27 deepbook5broo joined #git
03:27 Zarthus send the warning before rather than apologize afterwards.
03:28 jimklo_ joined #git
03:29 nictrasavios Zarthus, Already did that before I had my mourning coffee - all that's left now is to get it done. No point in whining after I made my point clear.
03:29 Zarthus haha. mourning coffee.
03:29 Zarthus I don't know if that's intentional but it sure is apt.
03:29 Zarthus I also hope they wrote tests.
03:30 nictrasavios Zarthus, Full RSpec from the backend, full "Rails test" from the front end. They wrote tests.... in two different test-writing paradigms.
03:31 nickabbey joined #git
03:32 nictrasavios Zarthus, Which - granted rails is not my speciality  - I believe are totally incompatible with each other.
03:32 Zarthus That hurts.
03:33 nictrasavios Yeah, inexperience project manager dropped the ball. My turn!
03:33 nictrasavios inexperienced*
03:33 nictrasavios Oh, on the same note - I need to figure out how to push a local master to a remote branch for the merge....
03:34 nictrasavios Because front end decided to - instead of pulling from out repo - init a new repo, copy the files over, and go from their.
03:34 nictrasavios And not copy the .git folder.
03:34 nictrasavios there*. (It has been a long day, sorry for the lack-luster typing.)
03:36 * nictrasavios looks around for a git-master and savour.
03:36 * nictrasavios saviour* >.<
03:42 snowalpaca joined #git
03:47 Lyqyd joined #git
03:50 j_r joined #git
03:51 matoro joined #git
03:52 tinanoo joined #git
03:52 arescorpio joined #git
03:52 ResidentBiscuit joined #git
03:54 a_thakur joined #git
03:54 ygeLN joined #git
03:56 rkazak joined #git
03:58 deepbook5broo left #git
04:00 sunri5e joined #git
04:01 netj joined #git
04:01 Goplat joined #git
04:04 Derperperd joined #git
04:04 venmx joined #git
04:04 Vampire0 joined #git
04:06 acetakwas joined #git
04:11 inflames joined #git
04:11 syg_ joined #git
04:13 e01 joined #git
04:13 e01 joined #git
04:13 pur3eval joined #git
04:15 cdg joined #git
04:16 dreiss joined #git
04:19 Rodya_ joined #git
04:19 mehola joined #git
04:23 dsdeiz_ joined #git
04:26 howdoi joined #git
04:26 souther joined #git
04:27 salamanderrake joined #git
04:28 lowecase joined #git
04:28 raijin joined #git
04:29 robotroll joined #git
04:29 Cabanoss- joined #git
04:30 lowecase joined #git
04:34 cagomez joined #git
04:37 shgysk8zer0_ joined #git
04:39 dsdeiz joined #git
04:39 dsdeiz joined #git
04:40 endiruna4 joined #git
04:43 xall joined #git
04:46 hexagoxel joined #git
04:47 itsgokul joined #git
04:47 Ranhir joined #git
04:47 itsgokul how to create multiple repo for one project
04:48 phroa what do you mean
04:48 gelei007 joined #git
04:48 itsgokul repository
04:49 tusharmalik joined #git
04:50 itsgokul for eg if bitbucket fails then
04:50 phroa well you can add multiple remotes, see `man git-remote`, and just try to remember to keep them in sync.
04:50 gitinfo the git-remote manpage is available at http://jk.gs/git-remote.html
04:51 phroa there is no automatic mirroring built in to git, but bitbucket is probably safe
04:52 phroa if you wanted to host your own, you can run !gitolite with as many redundant mirror servers as you like (ish)
04:52 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
04:52 shgysk8zer0_ joined #git
04:52 preaction if bitbucket fails, you have a local copy
04:52 preaction and to make another backup: git clone <x>
04:54 bgerber joined #git
05:03 JanC_ joined #git
05:05 sbulage joined #git
05:08 j7k6 joined #git
05:09 dsdeiz joined #git
05:09 dsdeiz joined #git
05:13 morenoh149 joined #git
05:14 e01 joined #git
05:14 pur3eval joined #git
05:15 durham joined #git
05:16 MineCoins joined #git
05:16 justanotheruser joined #git
05:16 Tech joined #git
05:17 durham joined #git
05:20 Tech joined #git
05:26 sbulage joined #git
05:26 pur3eval joined #git
05:27 neeri joined #git
05:28 mehola joined #git
05:32 nickabbey joined #git
05:32 matoro joined #git
05:46 sbulage joined #git
05:49 rivarun joined #git
05:56 matoro joined #git
05:57 KnightsOfNi_ joined #git
06:02 dec0n joined #git
06:02 overlord_tm joined #git
06:04 MineCoins joined #git
06:05 venmx joined #git
06:08 DBag joined #git
06:08 dreiss joined #git
06:09 ratdeptrai joined #git
06:10 wcpan joined #git
06:13 rscata joined #git
06:14 e01 joined #git
06:14 e01 joined #git
06:18 grahamperrin joined #git
06:19 rivarun joined #git
06:19 Vampire0_ joined #git
06:20 ozmage_ joined #git
06:21 grahamperrin https://gitter.im/gitterHQ/develo​pers?at=58a5fce19eb1bd81481d1237 "… Please, commit your changes before merging. …" I can't tell what those changes are, or were. Were the changes truly made by me? If 'git diff' will not tell me, then what will?
06:21 Rodya_ joined #git
06:22 bocaneri joined #git
06:24 masuberu joined #git
06:24 preaction grahamperrin: git status
06:25 itsgokul ok
06:25 AcuBcn joined #git
06:25 dimi1947 joined #git
06:28 basdb joined #git
06:29 basdb joined #git
06:31 basdb joined #git
06:32 PioneerAxon joined #git
06:34 qt-x joined #git
06:34 pks joined #git
06:40 zeroed joined #git
06:40 zeroed joined #git
06:43 sbulage joined #git
06:43 Raging_Hog joined #git
06:45 ertesx joined #git
06:47 eroux joined #git
06:48 brent__ joined #git
06:50 snowalpaca joined #git
07:01 venmx joined #git
07:02 morenoh149 joined #git
07:03 pks joined #git
07:04 sostenuto joined #git
07:04 SwiftMatt joined #git
07:08 j7k6 joined #git
07:10 sbulage joined #git
07:10 Darren_ joined #git
07:10 DieguezZ joined #git
07:11 shgysk8zer0_ joined #git
07:11 DieguezZ joined #git
07:13 pks joined #git
07:14 pks joined #git
07:15 e01 joined #git
07:15 askb joined #git
07:16 Tobbi joined #git
07:21 sbulage joined #git
07:22 lordjancso joined #git
07:23 Rodya_ joined #git
07:23 HalfEatenPie joined #git
07:24 ihradek joined #git
07:24 chele joined #git
07:25 tusharmalik joined #git
07:25 chele joined #git
07:26 theoceaniscool joined #git
07:29 jagob joined #git
07:30 j7k6 joined #git
07:33 sbulage joined #git
07:33 chele joined #git
07:36 jnavila joined #git
07:39 Taikibansei joined #git
07:39 JeroenT joined #git
07:40 tolland joined #git
07:44 gusnan joined #git
07:47 Murr joined #git
07:48 freimatz joined #git
07:48 noteness joined #git
07:49 sarri joined #git
07:49 sarri joined #git
07:51 Wulf joined #git
07:53 sbulage joined #git
07:53 bernardio joined #git
07:57 DDBag joined #git
08:01 jimklo joined #git
08:04 absinthe joined #git
08:08 nd_ joined #git
08:10 mkoskar joined #git
08:11 JanC_ joined #git
08:11 toydestroyer_ left #git
08:12 Tobbi joined #git
08:12 Junior joined #git
08:13 jagob joined #git
08:13 Guest79539 joined #git
08:15 Tobbi joined #git
08:18 a_thakur joined #git
08:18 Balliad joined #git
08:18 Darcidride joined #git
08:19 Derperperd joined #git
08:21 navidr joined #git
08:21 elect joined #git
08:22 zulutango joined #git
08:24 aidalgol joined #git
08:26 spm_draget joined #git
08:29 Alienpruts joined #git
08:30 grahamperrin joined #git
08:37 telephone joined #git
08:37 telephone joined #git
08:38 acetakwas joined #git
08:38 mikecmpbll joined #git
08:39 SwiftMatt joined #git
08:39 afuentes joined #git
08:39 pks joined #git
08:48 oskarkv joined #git
08:50 jimklo joined #git
08:50 morenoh149 joined #git
08:51 toydestroyer joined #git
08:51 b100s joined #git
08:51 rchavik joined #git
08:51 mikecmpbll joined #git
08:51 xbob joined #git
08:54 hanshenrik joined #git
08:57 troulouliou_div2 joined #git
08:59 joshszep joined #git
09:02 venmx joined #git
09:06 sagerdearia joined #git
09:06 viny joined #git
09:07 GodGinrai joined #git
09:10 pur3eval joined #git
09:11 King_Hual joined #git
09:11 viny joined #git
09:12 [ADN] joined #git
09:12 prg3 joined #git
09:13 overlord_tm joined #git
09:13 viny_ joined #git
09:14 peepsalot joined #git
09:14 a3Dman joined #git
09:15 viny_ I have a travis build failing because libgit errors out during a describe-operation on a repo with a detached head; libgit complains "object not found - no match for id ...". I never asked for the OID in question, which is a stray commit somewhere in the tree. Any idea what could be going on here?
09:15 dhollinger joined #git
09:15 diogenese joined #git
09:18 bongjovi joined #git
09:20 ifra201 joined #git
09:21 marcogmonteiro joined #git
09:22 Vampire0 joined #git
09:24 atomi joined #git
09:24 RxMcDonald joined #git
09:24 RxMcDonald how do you find the first commit of a fork?
09:24 t0by joined #git
09:25 osse the last commit in  git log forkbranch --not {all other branches here}
09:25 leeN joined #git
09:28 moei joined #git
09:29 Ordentlig joined #git
09:30 dersand joined #git
09:30 Forlorn joined #git
09:31 Forlorn joined #git
09:32 SirOlive_ joined #git
09:33 nickabbey joined #git
09:34 dsdeiz_ joined #git
09:35 seni1 joined #git
09:37 Darcidride joined #git
09:37 clmsy joined #git
09:37 Tobbi joined #git
09:39 denisMone joined #git
09:40 chele joined #git
09:41 mischat joined #git
09:42 redeemed joined #git
09:44 Gloomy joined #git
09:44 nettoweb joined #git
09:46 dsdeiz joined #git
09:46 dsdeiz joined #git
09:48 hahuang61 joined #git
09:49 neeri joined #git
09:51 ruxu joined #git
09:51 ChiLL_SurF joined #git
09:52 aw1 joined #git
09:52 a_thakur joined #git
09:57 acetakwas joined #git
10:01 mda1 joined #git
10:03 venmx joined #git
10:06 rnsanchez joined #git
10:09 achadwick joined #git
10:10 TomyWork joined #git
10:10 Forlorn joined #git
10:11 Rico joined #git
10:11 theoceaniscool joined #git
10:11 Rico hi
10:11 dcpc007 left #git
10:12 Rico how can I debug the reason why a bundle does not work ?
10:12 tvw joined #git
10:12 Rico (does not work = does not make changes it's supposed to)
10:12 treia joined #git
10:14 tvw joined #git
10:14 jfr joined #git
10:15 hanshenrik_ joined #git
10:15 Forlorn joined #git
10:15 tvw joined #git
10:18 ac3takwas joined #git
10:18 tvw joined #git
10:19 Vampire0_ joined #git
10:20 tvw joined #git
10:20 Derperperd joined #git
10:21 xbob joined #git
10:21 manuelschneid3r joined #git
10:22 bernardio joined #git
10:22 Atrumx joined #git
10:23 pbrewczynski joined #git
10:24 Forlorn joined #git
10:24 muthu joined #git
10:25 jast Rico: what operation specifically is not having the effect you expected? a bundle doesn't do anything without a command being run after all. :)
10:25 Rico hi jascott1
10:25 Rico oops
10:25 Rodya_ joined #git
10:25 Rico hi jast
10:26 Rico I'm expecting to see something in the git log, a new commit for example
10:26 jast from doing what?
10:27 BSAlb joined #git
10:27 Rico jast:  http://fpaste.scsys.co.uk/553213
10:28 Rico is that the right way to unbundle ?
10:28 jast as the manpage says, 'unbundle' is really a low-level operation and normally you shouldn't need to use it
10:29 jast it only adds objects to the .git database, it doesn't actually update any branches
10:29 MACscr joined #git
10:29 Rico do I have to use fetch instead ?
10:30 jast fetch doesn't update branches, either, though at least it makes the first ref from the bundle available temporarily as FETCH_HEAD
10:31 jast so, given a bundle with only one branch in it, you could use: git fetch <path to bundle> <branch>, followed by 'git merge FETCH_HEAD' (or git rebase)
10:31 jast if you want to save a step, I suppose you can use 'git pull <path to bundle> <branch>'
10:32 jast alternatively, after unbundling, you can merge by commit ID (the one you got in the output of 'git bundle verify'
10:32 Rico yeah ! this one works fine, thanks
10:34 freddymungo_ joined #git
10:34 Forlorn joined #git
10:35 irqq joined #git
10:39 freddymungo_ joined #git
10:39 morenoh149 joined #git
10:46 scoobertron joined #git
10:46 patarr joined #git
10:46 ac3takwas joined #git
10:49 Forlorn_ joined #git
10:52 MonsterKiller joined #git
10:52 j7k6 joined #git
10:53 ResidentBiscuit joined #git
10:55 psantana joined #git
11:01 xall_ joined #git
11:01 de-vri-es joined #git
11:01 DarkRose_ joined #git
11:04 venmx joined #git
11:05 Zeno` joined #git
11:06 Zeno` hi all. Given that I've merged a PR from github (using github) into my master branch, how do I update local master while keeping history "flat"?
11:07 Zeno` git rebase origin/master seems to add an extra commit
11:07 GodGinrai joined #git
11:08 Tobbi joined #git
11:09 Zeno` rebase and then squash HEAD~1?
11:09 Zeno` doesn't seem great but it might work
11:10 tobiasvl Zeno`: so you want to rewrite history?
11:10 Zeno` tobiasvl, not really
11:11 Zeno` but I can't seem to get my local master in sync with github master
11:11 tobiasvl oh. can't you just do "git merge"? shouldn't it be a fast-forward?
11:11 Zeno` not sure... testing
11:12 tobiasvl I thought you meant that you wanted to flatten the remote master locally, but you choose between flat and non-flat history when merging in github, not afterwards (without rewriting history)
11:12 Zeno` no no. I just want the PR that I merged using github to be included in local master
11:13 tobiasvl should just be "git pull" really
11:13 Zeno` without making an extra commit and/or making the history not flat
11:13 tobiasvl if you haven't done anything locally on the master?
11:13 Zeno` nope, local master is unchanged
11:14 Zeno` hmm well I have some stashed stuff
11:15 tobiasvl that shouldn't matter
11:16 ferr1 joined #git
11:16 theoceaniscool joined #git
11:17 Zeno` git pull makes history not flat and so does fetch/rebase
11:18 Zeno` this is weird
11:18 Zeno` I might just sqaush
11:19 emaz joined #git
11:19 Zeno` or just not worry :)
11:21 emaz Hi, can I ask a question releated to git bash here? :P
11:21 garethdaine joined #git
11:21 selckin sure
11:22 patarr joined #git
11:22 emaz I have a npm task that is invoked with parameters like so: npm run x -- --path=/x/y
11:23 selckin no
11:23 emaz in git bash that path at the end gets resolved to C:\program files\git\x\y :P
11:23 emaz but not in any other shell :P
11:24 osse emaz: hmm, that doesn't happen in my git bash now. But I know I've seen that effect before. try --path=//x/y
11:25 aw1 joined #git
11:26 Rodya_ joined #git
11:27 emaz yeah, it does not get resolved any then, but I still have the extra leading / ther, but I can remove that in the script if found I guess :P thanks..
11:29 AcuBcn joined #git
11:31 mostlybadfly joined #git
11:32 Tobbi joined #git
11:34 nickabbey joined #git
11:36 _ADN_ joined #git
11:38 CalimeroTeknik joined #git
11:42 ratdeptrai joined #git
11:43 PresidentTrump joined #git
11:43 PresidentTrump hi
11:43 Zeno` hello, Sir
11:43 PresidentTrump if I revert git back to a previous commit
11:44 PresidentTrump what happens to the files I haven't commited?
11:44 _ikke_ PresidentTrump: What command are you using?
11:44 PresidentTrump _ikke_, which one do you recommend?
11:44 PresidentTrump I need to go back 2 commits on a server
11:44 PresidentTrump but I need to keep all work in progress changes
11:45 osse !revert
11:45 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
11:45 PresidentTrump the work in progress changes are not on the files in the past two commits
11:46 PresidentTrump I going to need to do a hard one
11:46 _ikke_ no
11:46 osse PresidentTrump: do you want to pretend the two commits never happened?
11:46 _ikke_ git reset --merge
11:46 hahuang61 joined #git
11:46 _ikke_ git reset --merge HEAD~2
11:46 PresidentTrump yes I do want to pretend
11:46 _ikke_ (--hard would loose your uncomitted changes)
11:48 Zeno` left #git
11:48 mgedmin left #git
11:48 b100s joined #git
11:49 PresidentTrump error: Entry 'index.html' not uptodate. Cannot merge.
11:50 _ikke_ Then you did edit a file which was affected
11:50 _ikke_ which was edited in those commits
11:50 PresidentTrump index.html wasn't one of them
11:51 a_thakur joined #git
11:51 _ikke_ git diff --name-only HEAD~2 HEAD
11:51 PresidentTrump actually it was o__0 I removed a space
11:51 bruce_lee joined #git
11:51 bruce_lee joined #git
11:52 LordRyan joined #git
11:52 a_thakur_ joined #git
11:54 courrier joined #git
11:55 jameser joined #git
11:56 SirOliver joined #git
11:57 PresidentTrump fixed it
11:57 Guest9 joined #git
11:57 PresidentTrump thanks osse _ikke_
11:57 _ikke_ yw
11:59 ronskisika joined #git
12:03 Taikibansei joined #git
12:04 nettoweb1 joined #git
12:04 xall_ joined #git
12:04 ngladitz joined #git
12:04 ngladitz joined #git
12:04 invisbl joined #git
12:09 a_thakur joined #git
12:10 SirOlive_ joined #git
12:11 ephimetheus joined #git
12:12 canuk joined #git
12:15 a_thakur joined #git
12:16 SirOliver joined #git
12:16 a_thakur joined #git
12:18 Forlorn joined #git
12:20 joki joined #git
12:20 a_thakur joined #git
12:21 Derperperd joined #git
12:21 ismithers joined #git
12:23 kulelu88 joined #git
12:23 a_thakur joined #git
12:23 kulelu88 left #git
12:23 xall_ joined #git
12:24 bernardio joined #git
12:25 dviola joined #git
12:27 Rodya_ joined #git
12:28 SirOliver joined #git
12:28 Zialus joined #git
12:28 morenoh149 joined #git
12:29 webdev007 joined #git
12:29 vuoto joined #git
12:30 re1 joined #git
12:30 borkr joined #git
12:32 CussBot joined #git
12:32 Anticom joined #git
12:37 Tobbi joined #git
12:40 DolpheenDream joined #git
12:45 a_thakur joined #git
12:48 chipotle joined #git
12:48 SirOliver joined #git
12:49 clmsy joined #git
12:51 RxMcDonald joined #git
12:51 RxMcDonald joined #git
12:51 finalbeta joined #git
12:53 staafl joined #git
12:55 finalbeta joined #git
12:57 tvw joined #git
13:01 theoceaniscool joined #git
13:03 jozwior joined #git
13:04 suttonwilliamd joined #git
13:04 Derperperd joined #git
13:05 venmx joined #git
13:06 Tobbi joined #git
13:07 staafl joined #git
13:08 GodGinrai joined #git
13:09 fieldmapper joined #git
13:10 absinthe joined #git
13:13 jsho joined #git
13:15 tusharmalik joined #git
13:17 absinthe joined #git
13:17 SirOliver joined #git
13:17 newbie1 joined #git
13:19 birthnight joined #git
13:19 marcogmonteiro joined #git
13:19 seni1 joined #git
13:19 birthnight Hi guys, can someone tell me how to "refresh a repository" ?
13:19 ^7heo git pull
13:19 tobiasvl birthnight: what does that mean?
13:19 ecuanaso joined #git
13:19 tobiasvl yeah maybe git pull
13:19 ^7heo tobiasvl: you need a noob-to-tech translator ;)
13:20 tobiasvl I can hire you!
13:20 ^7heo tobiasvl: or, 1+ years of experience in customer support ;)
13:20 ^7heo tobiasvl: I'm not for hire, sorry.
13:20 birthnight I would like to convert all files to LF line endings, so I found a post on SO that says to do make an adjustment in the .gitattributes file, and then "refresh the repository"
13:21 jeffreylevesque_ joined #git
13:21 ^7heo ah ok it wasn't noob speak but SO-speak.
13:21 ^7heo different dialect.
13:21 birthnight haha
13:21 ^7heo (SO speak is noob speak with major arrogance)
13:22 ^7heo s/major/& notes of/
13:22 ^7heo birthnight: link?
13:22 ^7heo birthnight: so we can downvote that answer, and also understand what you're asking ;)
13:23 birthnight Can I just post a link here? yes, i'm a noob...but i'm trying...
13:23 _ikke_ git pull is not always the best option to refresh a repository
13:23 _ikke_ it creates lots of merge commits
13:23 ^7heo right.
13:24 ^7heo _ikke_: but without context...
13:24 birthnight goo.gl/tYIL2I
13:24 ^7heo birthnight: yes you can.
13:24 birthnight ok thx
13:24 birthnight there's the link ^
13:24 ^7heo http://stackoverflow.com/questions/27625299/
13:24 ^7heo that's the real link for those interested.
13:26 ^7heo birthnight: from the doc: "Git can handle this by auto-converting CRLF line endings into LF when you add a file to the index"
13:27 ^7heo That is the effect of the `git config --global core.autocrlf` flag.
13:27 ^7heo if they ALREADY are in the index, it's different I guess.
13:27 birthnight yeah i have set that to true for my windows machine and "input" for my linux machine
13:27 chandu20 joined #git
13:27 birthnight but phpstorm is still seeing the line ending differences and changes...
13:27 birthnight oh yeah
13:28 birthnight line ending differences AS* changes
13:28 birthnight sorry
13:28 ^7heo birthnight: have you tried setting `git config --global core.autocrlf input`?
13:28 Rodya_ joined #git
13:28 birthnight yeah i did that on my linux machine because the git documentation says "true" for windows and "input" on linux
13:28 birthnight to preserve LF endings on the server
13:28 ^7heo birthnight: also, did you actually `git add` your changes?
13:28 re1_ joined #git
13:29 ^7heo if phpstorm sees them as changes, maybe they're not added to the index yet.
13:29 birthnight yeah they're not flagged as modified files in phpstorm, but when i go to sync with the server, phpstorm is saying that the files are different "only in line endings"...
13:29 birthnight but
13:30 birthnight i guess i will try removing and re-adding all the files. maybe that's what was meant my "refresh your repository"
13:30 ^7heo if I could have access to your git repo, I'd fix that for you
13:30 ^7heo is it on github?
13:30 ^7heo but out of the blue, with random tools that you're using, I wouldn't know how to do that.
13:31 Tobbi joined #git
13:33 plos joined #git
13:33 birthnight ^7heo: Thanks for the help. I will try removing and re-adding. I guess I was just really wondering what "refreshing your repository" was supposed to mean
13:33 ^7heo I have no clue.
13:33 birthnight :) okay, that actually makes me feel better
13:33 ^7heo yeah, the answer is shit.
13:33 birthnight haha
13:33 ^7heo stackoverflow has a fair share of those.
13:33 ^7heo I wish I would know how to answer that
13:34 ^7heo but I never worked with windows
13:34 ^7heo so I never had the problem.
13:35 birthnight Yeah, after all of this, I considered just developing on linux only, but it will bother me that I don't know how to deal with this if i ever need to work with someone who uses a windows machine
13:35 nickabbey joined #git
13:35 birthnight so I'm just not going to be satisfied until i figure this out
13:35 birthnight thanks again for your help :)
13:35 ^7heo birthnight: try with git ONLY on the command line
13:35 ^7heo do not rely on other tools.
13:35 ^7heo that might be a good start.
13:36 cagomez joined #git
13:36 birthnight yeah i'm using git bash
13:36 ^7heo not for the diffs, you're using phpstorm for those ;)
13:36 birthnight yeah
13:36 birthnight what a mess
13:36 ^7heo exactly.
13:36 ^7heo use git only for git stuff.
13:36 CalimeroTeknik joined #git
13:36 birthnight oh i see what you mean
13:36 ^7heo I use vim and vim-fugitive for seeing git diff
13:37 ^7heo but that's using git under the hood
13:37 ^7heo and it's only for faster editing (so I don't have to search for the diffs, they are tagged)
13:37 ^7heo if I add stuff to the index, I use git add -p
13:37 birthnight oh nice
13:37 ^7heo and I pretty much use git for all the rest too.
13:37 ^7heo just git.
13:38 ^7heo not gitk, not anything else.
13:38 ^7heo `git log --decorate --all --graph` works good, too.
13:38 ^7heo (to replace gitk's visualization)
13:39 birthnight oh cool :) i'll look into that. haven't' used that yet
13:39 ^7heo you might want to have a few aliases
13:40 ^7heo like `amend = commit --amend`
13:40 ^7heo so you can type `git amend`
13:40 ^7heo I have another one `duff = "!f() { echo 'DRINK DUFF!!!'; }; f"`
13:40 birthnight lol
13:40 ^7heo 'cause when you end up tying `git duff`, you probably need one.
13:41 birthnight :D
13:41 ^7heo and `tree = log --all --graph --decorate`
13:41 ^7heo (also existing with `t = ...`
13:41 birthnight yeah i could definitely use a drink right now
13:41 ^7heo )
13:41 ^7heo see?
13:41 ^7heo :P
13:41 birthnight haha
13:41 ^7heo Same here, going to fetch a coffee.
13:41 ^7heo brb.
13:42 birthnight good timing, my girlfriend just started a pot, and not even kidding, i just started smelling it in the air.
13:42 jeffreylevesque_ joined #git
13:43 _ikke_ Do I hear coffee?
13:43 ^7heo remember not to smoke pot when you use git
13:43 birthnight do you smell it?
13:43 birthnight haha
13:43 ^7heo it's not compatible,
13:43 ^7heo that's how you wreck repos
13:43 jeffreylevesque joined #git
13:44 newbie1 joined #git
13:46 Tobbi joined #git
13:46 newbie1 joined #git
13:46 GodGinrai joined #git
13:47 hahuang61 joined #git
13:47 newbie12 joined #git
13:49 brent__ joined #git
13:51 dsdeiz joined #git
13:51 dsdeiz joined #git
13:51 Masber joined #git
13:52 bongjovi joined #git
13:52 chipotle joined #git
13:53 synthroid joined #git
13:53 ResidentBiscuit joined #git
13:57 dwmw2_gone joined #git
13:59 Gsham joined #git
14:00 nickabbey joined #git
14:01 Gloomy joined #git
14:02 c0ded joined #git
14:02 JeroenT_ joined #git
14:03 Tobbi joined #git
14:03 denimsoft joined #git
14:04 tsdev joined #git
14:06 axisys joined #git
14:06 venmx joined #git
14:07 newbie1 joined #git
14:08 jimi_ joined #git
14:08 griffindy joined #git
14:08 yqt joined #git
14:10 Gustavo6046 joined #git
14:11 revoltingPeasant joined #git
14:13 nowhereman joined #git
14:17 morenoh149 joined #git
14:19 netj joined #git
14:20 Rodya_ joined #git
14:20 ash_workz joined #git
14:21 manuelschneid3r joined #git
14:22 DarkRose_ joined #git
14:24 nowhereman joined #git
14:25 yqt joined #git
14:27 DarkRose_ joined #git
14:27 helmet33 joined #git
14:28 Taikibansei joined #git
14:30 Tobbi joined #git
14:32 boombatower joined #git
14:32 Tobbi joined #git
14:32 dendazen joined #git
14:33 yqt joined #git
14:35 yqt joined #git
14:35 jsho joined #git
14:35 yqt joined #git
14:36 raijin joined #git
14:36 yqt joined #git
14:37 yqt joined #git
14:38 pbrewczynski joined #git
14:40 jen_ joined #git
14:41 jen_ My current flow is local—> github —> production server via webhooks.  The problem with this - if there is failed pushes to server, we cannot get notification. Can I do push from local to github and if that passes then push to production - in one line?
14:42 dwmw2_gone joined #git
14:43 gnuart101 joined #git
14:43 gnuart101 left #git
14:44 osse jen_: define "passes"
14:44 texinwien_ joined #git
14:44 _Cyclone_ joined #git
14:45 jen_ pushes
14:45 wiesel joined #git
14:45 jen_ push to github && push to production
14:46 jen_ if github push failed, stop.
14:46 osse so github's webhook runs even when the push failed? o_O
14:47 Tobbi joined #git
14:47 thejoecarroll joined #git
14:48 jen_ osse: no, when the push from local to github is done, sometimes the push from github to production fails.
14:48 dwmw2_gone joined #git
14:48 jen_ I won’t see that failure until I go into gh and look at the webhook logs.
14:49 jen_ I’d like to see failure at the time when pushes are made the act accordingly.
14:49 jen_ basically, i need to do push to multiple remotes.
14:49 osse Hmm, that is more of a #github question.
14:49 osse But you can push directly to production if you want
14:49 jen_ can I do that in one line of code?
14:50 Es0teric joined #git
14:50 osse Either define a new remote, or I think you can assign two push urls to the same remote
14:50 jen_ push to gh then push to production
14:50 osse ''git push github && git push production'' is one line
14:50 osse if that's what you mean
14:51 jen_ ok, so I would need to define remotes?
14:53 UTAN_dev_ joined #git
14:53 dwmw2_gone joined #git
14:54 heroux joined #git
14:54 cdown joined #git
14:54 mischat_ joined #git
14:55 osse that's what I'd do I think
14:55 jen_ thanks
14:55 osse my alternative approach I don't think will work with the condition
14:55 osse you can try
14:55 Es0teric joined #git
14:56 z1haze_work joined #git
14:56 shinnya joined #git
14:56 z1haze_work If i have like 30 commits to a repository by different users, and for some reason, I am told hey please delete this commit likes like right in the middle.. whats the best way to go about doing that?
14:56 mischat_ joined #git
14:57 jen_ I will try this: http://stackoverflow.com/a/849960
14:57 miczac joined #git
14:58 crose joined #git
14:58 moritz z1haze_work: can't you just revert the commit?
14:59 z1haze_work oh im asking what to do. im not a experienced git user.. its new to us
14:59 ecuanaso joined #git
14:59 z1haze_work we're moving from tfs
14:59 kadoban joined #git
15:00 moritz if you actually deleted a commit in the middle, you'd have to rewrite all the newer history
15:00 moritz if you just don't want the effect of the commit anymore, doing a revert is preferable
15:00 z1haze_work so i just do a revert of a specific commit, then make a new commit of that?
15:00 moritz that creates a new commit with reversed diff of the reverted commit
15:01 z1haze_work nice
15:01 z1haze_work i will try it thank you
15:01 moritz by default, git revert $commit creates the commit for you
15:01 moritz you're welcome
15:01 Zbnl joined #git
15:01 pwndave joined #git
15:02 Tobbi joined #git
15:03 Dougie187 joined #git
15:03 yqt joined #git
15:04 bannakaffalatta joined #git
15:05 kpease joined #git
15:06 rumble joined #git
15:08 Es0teric joined #git
15:08 inflames joined #git
15:09 LeBlaaanc joined #git
15:12 venmx joined #git
15:13 AaronMT joined #git
15:14 newbie1 joined #git
15:14 heroux joined #git
15:15 nictrasavios joined #git
15:19 ych joined #git
15:19 bannakaffalatta joined #git
15:20 dwmw2_gone joined #git
15:22 Gsham joined #git
15:23 dimi1979 joined #git
15:25 nettoweb joined #git
15:25 pks joined #git
15:27 Nilesh_ joined #git
15:28 ihradek joined #git
15:29 morenoh149 joined #git
15:29 robotroll joined #git
15:29 TomyLobo joined #git
15:30 jagob joined #git
15:30 tsdev_ joined #git
15:30 glspi joined #git
15:30 oncall-pokemon joined #git
15:32 absinthe joined #git
15:35 Guest9 joined #git
15:38 jimi_ joined #git
15:39 mischat joined #git
15:40 Walex joined #git
15:40 rvgate joined #git
15:41 Peng joined #git
15:41 lobinios joined #git
15:41 rvgate joined #git
15:42 Tobbi joined #git
15:42 jeffreylevesque joined #git
15:42 lobinios left #git
15:44 Derperperd joined #git
15:45 Emperor_Earth joined #git
15:45 throstur left #git
15:47 ExoUNX joined #git
15:48 patarr joined #git
15:49 snowalpaca joined #git
15:49 hahuang61 joined #git
15:51 seni13 joined #git
15:52 Murii joined #git
15:53 seni joined #git
15:53 luc4 joined #git
15:55 Es0teric joined #git
15:55 snowalpaca joined #git
15:57 luc4 Hello! It frequently happens to me that I would like to commit a portion of a task which is not yet completed. In this case I work in a branch, and then once completed entirely, I merge into the "main" one. This is great. But is there any way to make the merge appear as a single commit? I mean, isn't it possible to "commit" and "push" to a safe place a portion of a task without having this "partial commit"  appear in the final history?
15:58 z1haze_work left #git
15:58 MineCoins joined #git
15:58 mindfart joined #git
15:59 Rodya_ joined #git
16:00 absinthe joined #git
16:00 osse luc4: merge --squash
16:01 morenoh149 joined #git
16:01 luc4 osse: exactly what I needed, thanks!
16:01 lowercaseman joined #git
16:02 Gsham joined #git
16:02 austin987 joined #git
16:02 morenoh149 where is `git checkout -` documented?
16:02 morenoh149 don't see it in the man page
16:02 osse luc4: but, make sure your commits aren't HUUUG either. it's fine to have two, three or eight commits as long as each of them makes sense.
16:03 osse commit --amend and commit --fixup are awesome tools to learn
16:03 Dougie187 left #git
16:03 Tobbi joined #git
16:03 JoshL- left #git
16:04 JoshL joined #git
16:05 texasmynsted left #git
16:05 seni1 joined #git
16:06 Derperperd joined #git
16:07 seni13 joined #git
16:07 hamdjan joined #git
16:07 Ranhir joined #git
16:09 Es0teric how do i go back a commit but keep the files?
16:09 Es0teric undo a commit
16:09 _ikke_ git reset HEAD~1
16:09 ych joined #git
16:11 seni joined #git
16:13 venmx joined #git
16:14 flavius joined #git
16:14 cdg joined #git
16:17 madewokherd joined #git
16:18 bremner !revert
16:18 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
16:18 hamdjan hi, how can i see if any commits of this pull request were accepted? https://github.com/revsys/django-fack/pull/9
16:19 hamdjan ah they weren't accepted yet as i see in the commit history
16:21 m0viefreak joined #git
16:21 Vampire0 joined #git
16:22 Taikibansei_ joined #git
16:22 mohabaks joined #git
16:23 miczac joined #git
16:23 himmAllRight17 joined #git
16:23 cdg_ joined #git
16:24 xbob joined #git
16:25 thiago joined #git
16:25 thiago joined #git
16:27 _ikke_ hamdjan: Note that only the entire PR can be accepted, not individual commits
16:27 _ikke_ (They can of course cherry-pick the commits, but that is highly unusual)
16:28 morenoh149 how do you enable branch tab completion?
16:29 hamdjan _ikke_, the repo owner didnt accept the PR, but i need the PR, can i somehow checkout the PR for myself locally?
16:29 durham joined #git
16:29 _ikke_ sure
16:30 _ikke_ either fetch the branch from the repo where the PR was made from, or github exposes the pr as a separate ref you can fetch
16:31 hamdjan ah i do the first which seems the easiest. thanks!
16:31 clemf joined #git
16:33 raspado joined #git
16:36 brent__ joined #git
16:38 eric_engestrom joined #git
16:39 mohabaks joined #git
16:41 mischat joined #git
16:42 synthroid joined #git
16:43 dviola joined #git
16:43 dreiss joined #git
16:43 mischat_ joined #git
16:43 svm_invictvs joined #git
16:45 cyrus_mc joined #git
16:45 armyriad joined #git
16:45 eric_engestrom hey guys, quick question: I have a readonly filesystem with a bare git repo; I want to check out its contents but git seems to absolutely want to create a lock for it:
16:45 eric_engestrom git --git-dir="$gitdir" --work-tree="$tmpdir" checkout --quiet --force master
16:45 eric_engestrom fatal: Unable to create '....git/index.lock': Read-only file system
16:46 eric_engestrom I could do a shallow clone, but that would still copy some unnecessary bits across
16:46 cyrus_mc Is there a way to specify --recursive when cloning as a global configuration. I know I can create an alias, but getting all my developers to remember to use something like git rclone vs just git clone is going to be hard
16:47 ismaris-tmp joined #git
16:48 tusharmalik joined #git
16:48 dviola joined #git
16:48 jdl joined #git
16:50 eric_engestrom well, I just tried and "--depth is ignored in local clones", so I'd really like if there was a way to checkout without locking?
16:51 osse cyrus_mc: but how will they know how to add that to their configurations ?
16:52 xbob joined #git
16:52 jdl Eric, Git doesn't checkout with locks.
16:52 overlord_tm joined #git
16:53 _ikke_ jdl: git is writing things to the index, I would say it would lock at that moment
16:53 jdl It maintains integrity with locks internally, but your files are not checked out locked.
16:53 cyrus_mc osse: well we have a one time setup guide they have to follow. So easier for them to follow that once then remember to run a specific command every time
16:53 _ikke_ jdl: It's not the files that are locked, but the index *is* locked
16:54 osse cyrus_mc: do they clone that often?
16:54 eric_engestrom the issue here is that the git repo is readonly, so creating the index lock fails
16:54 jdl The phrase
16:54 osse I see clone as a one-time thing too
16:54 cyrus_mc osse: for instance they have to run git config --global core.hooksPath as part of the initial setup so that we can disribute hooks in each repo
16:55 jdl Blah.  The phrase "checkout with locks" traditionally applies to file. (Think CVS, or RCS, for example.)
16:55 _ikke_ jdl: Note what eric_engestrom showed as error messaeg
16:55 dviola joined #git
16:55 _ikke_ "eric_engestrom │ fatal: Unable to create '....git/index.lock': Read-only file system"
16:55 jdl I might have missed the context then.  Sorry.
16:55 cyrus_mc osse: true, probably not. Just that we have a lot of developers come and go. So they may check out a repo just after following the initial setup. Then a couple weeks later have to work on a different project and forget they have to use git rclone vs git clone
16:56 jdl Ah.  I see.
16:56 cyrus_mc osse: just trying to make it a little less error prone if possible. Was hoping the recursive option could be specific in the global config some how
16:57 osse cyrus_mc: sounds like the kind of place where you regularly work with several repos.  I don't know. Specify --recursive in the "how to build the Foo project" guide. Otherwise put "Remember to use --recursive" in big friendly letters, somewhere
16:57 mischat joined #git
16:57 cyrus_mc osse: ok. Appreciate the input
16:58 Guest85 joined #git
16:58 dviola joined #git
16:59 saml joined #git
16:59 miczac joined #git
16:59 saml hey, is it okay to tag on a feature branch?  or is it saner to merge features to master and tag only on master?
17:00 oncall-pokemon Hi is there a way in git to redefine what a stale branch is? Right now it's 3 months but I'd like to make it 12.
17:00 _ikke_ oncall-pokemon: You mean how long the reflog keeps it's entries?
17:02 oncall-pokemon _ikke_: well you can do git remote prune origin. to remove all stale branches
17:02 osse oncall-pokemon: that's something else. there is no time limit there.
17:03 bruce_lee joined #git
17:03 bruce_lee joined #git
17:03 Rodya_ joined #git
17:03 oncall-pokemon well stale branches are 3 months right?
17:03 oncall-pokemon if I got git remote show it will tell me which are stale
17:03 oncall-pokemon then use the prune command to delete them
17:04 bannakaffalatta joined #git
17:04 m0viefreak thats not what pune does
17:04 _ikke_ oncall-pokemon: git does not call branches stale
17:04 osse oncall-pokemon: no, I just said there is no time limit for the thing you're talking about
17:05 m0viefreak _ikke_: it actually does
17:05 oncall-pokemon it certainly does
17:05 m0viefreak but it doesnt mean they havent been touch anytime lately, but that they dont exist on the real remote anymore
17:05 oncall-pokemon I was asking if there was a way to redefine it
17:05 fckfreenode joined #git
17:06 m0viefreak oncall-pokemon: what you mean is GitHub's definition of stale
17:06 m0viefreak this has nothing to do with the word "stale" found in man git-remote under "prune"
17:06 gitinfo the git-remote manpage is available at http://jk.gs/git-remote.html
17:06 _ikke_ oncall-pokemon: the 3 months / 90 days refers to the reflog
17:07 Darren_ joined #git
17:07 ertes joined #git
17:07 alexandre9099 joined #git
17:08 tang^ joined #git
17:09 MineCoins joined #git
17:13 modin joined #git
17:13 oncall-pokemon m0viefreak: if you run `git remote show origin` then it shows the old brances as stale. Then on some it suggests running `git remote prune` to get rid of it
17:13 m0viefreak yes
17:13 _ikke_ oncall-pokemon: Right, but git never does that automatically
17:14 venmx joined #git
17:14 skyfaller joined #git
17:14 m0viefreak "stale" here means: the branch foo does not exist on the actual remote anymore, but there is still a .git/refs/remotes/foo in your *local* clone
17:14 m0viefreak this has nothing to do with how old these branches are
17:14 oncall-pokemon oh I see
17:15 * osse feels ignored
17:15 oncall-pokemon I understand now osse
17:15 osse :3
17:21 lowercaseman joined #git
17:22 noteness joined #git
17:22 jccn joined #git
17:26 cyrus_mc joined #git
17:27 dreiss joined #git
17:29 f0rks joined #git
17:30 cdown_ joined #git
17:31 solarfly joined #git
17:31 Nugget_ left #git
17:32 tang^ joined #git
17:32 Nugget joined #git
17:36 wachpwnski-mobi joined #git
17:36 wachpwnski-mobi left #git
17:38 hahuang61 joined #git
17:38 thiago joined #git
17:42 jost__ joined #git
17:42 ecuanaso joined #git
17:42 eroux joined #git
17:43 raynold joined #git
17:43 peterbecich joined #git
17:44 auioa joined #git
17:44 finalbeta joined #git
17:44 jccn joined #git
17:44 auioa left #git
17:45 fatalhalt joined #git
17:46 CDanU joined #git
17:46 squirrel joined #git
17:47 peterbecich joined #git
17:47 Celelibi Here it is. I knew I'd do it at least once.
17:48 Celelibi I pushed my config commit.
17:48 tang^ !oops
17:48 gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
17:48 Celelibi I fixed it, it's not the problem.
17:48 squirrel is there something like got clone's --depth=1, but for git pull? i want to update the existing repository but do not need history
17:48 Celelibi But I should definitely work on that hook script that check that I don't push my config.
17:49 CDanU So here is my situation: I have a gotten a huge commit that needs to be split up into several smaller ones. I decided that I will add hunks interactively for every change that goes into a single commit. That is a tedious process. Is there somehow a way to use more than one staging area?
17:49 Celelibi squirrel: git pull is git fetch + git merge.
17:50 Celelibi I see git fetch has some --depth option.
17:50 osse CDanU: it is technically possible, but I think it will be a hassle.
17:50 osse CDanU: you can set GIT_INDEX in the environment to change which index file Git uses
17:51 Celelibi squirrel: git pull also has a --depth option. Have you tried it?
17:51 Celelibi CDanU: I might suggest to do all your commits in a side branch.
17:52 Celelibi You can checkout a single file and apply only some hunks.
17:52 squirrel oh, i don't know why i thought there wasn't the same option on git pull and fetch
17:52 squirrel thanks
17:52 revoltingPeasant joined #git
17:52 tang^ pull is fetch+merge
17:53 ckb left #git
17:53 tang^ as Celelibi stated
17:54 osse CDanU: in case you didn't know, you can mix usages of 'add' and 'add -p'. Add some files whole, add the rest by hunk. you can even run add -p multiple times
17:55 diego3 joined #git
17:56 diego4 joined #git
17:56 CDanU osse: I did not know aoubt the -p option, I' will look into it. So the git_index is basically a file that stores the information about the staging area right?
17:56 mikecmpbll joined #git
17:56 osse CDanU: yes.
17:57 osse CDanU: if you did not know about add -p what did you mean by add hunks interactively ?
17:57 CDanU oww, I knew about it at some point, than i added a alias for it
17:58 Starky joined #git
17:59 nuck joined #git
18:00 CDanU osse: Theoretically it should be possible to create a script/program that behaves somewhat like the -p option but additionally with the possibility to add stuff into different git_index files.
18:00 osse it is definitely possible
18:00 Starky joined #git
18:00 skyfaller left #git
18:01 Kronuz joined #git
18:01 squirrel left #git
18:02 CDanU Ok than that's all I needed to know, there has got to be someone who had the same idea and mad already a script for that.
18:02 osse export GIT_INDEX_FILE=somewhere; git reset; git add -p; ...; GIT_INDEX_FILE=second; git reset; git add -p
18:03 osse then point GIT_INDEX_FILE to what you want to commit before running commit
18:07 CDanU Thx that will be a starting point If I don't find anything more comfortable, I should be able to decide while choosing on whether I want to add the hunk to the stage ... something like y0 .. y9 instead of plain y
18:08 robattila256 joined #git
18:09 moL-Ou joined #git
18:09 rath joined #git
18:09 cluelessperson joined #git
18:11 snowalpaca joined #git
18:12 githogori joined #git
18:15 venmx joined #git
18:16 svm_invictvs joined #git
18:16 dimi1979 I use the git rebase --interactive master command to get into rebase mode but when the rebase console window open in the top I see the message noop...what that means?
18:16 Rodya_ joined #git
18:17 ramsub07 joined #git
18:17 ramsub07 Hi, I have 2 unpushed commits. I don't want to push the latest and I want to make the first unpushed commit + the recent change. How do I go about ?
18:18 osse dimi1979: it means that there is nothing to rebase
18:19 dimi1979 osse:and when that happens...at what condition
18:19 osse dimi1979: 'git rebase master' (with out without --rebase) will let you rebase all commits that are in the current branch but not in master
18:19 osse I mean with or without --interactive
18:20 diego4 joined #git
18:20 dimi1979 with what command I will rebase master's commit?
18:20 osse git checkout master; git rebase --interactive master~1
18:21 dimi1979 osse;I have to checkout master first?
18:21 publio joined #git
18:21 osse if it's master you want to rebase, yes
18:21 duderonomy joined #git
18:21 c0c0 joined #git
18:22 dimi1979 osse:remind me what checkout does?
18:22 osse switches between branches
18:22 _ikke_ ramsub07: create a new branch on the first commit, commit the changes, and push that
18:22 ramsub07 _ikke_: can't do from the same branch itself?
18:22 dimi1979 osse:I am currently at master...so I do not think checkout is needed
18:23 osse dimi1979: correct
18:23 osse dimi1979: but then git rebase master doesn't do anything
18:23 dimi1979 osse:and what does?this:git rebase --interactive master~1
18:24 osse it rebases the current branch onto master~1
18:24 osse aka. the commit one earlier then current master
18:25 dimi1979 osse:I assume if I want to shoe the last 5 commits I will use thiss git rebase --interactive master~5
18:25 morenoh149 joined #git
18:25 mohabaks joined #git
18:25 osse yes
18:27 dimi1979 osse:the only problem with the rebase window presentation is that the most recent commit is shown at the bottom...can the order be reversed?
18:27 osse not afaik
18:28 _ikke_ ramsub07: you want to commit the recent change ontop of the first commit, not on top of the last commit
18:28 matoro joined #git
18:28 _ikke_ you can also commit those changes on the same branch, and use interactive rebase to reorder the commits
18:28 dimi1979 osse:I assume for combining 2 commits I must use squash
18:29 osse yes
18:29 osse that for fixup
18:29 Ownix joined #git
18:29 osse *or
18:29 osse mark the second commit as squash, the first you leave as pick
18:35 joshszep joined #git
18:36 Es0teric joined #git
18:37 YuGiOhJCJ joined #git
18:39 dfas joined #git
18:40 bannakaffalatta joined #git
18:41 hanshenrik_ joined #git
18:43 ResidentBiscuit joined #git
18:44 venmx joined #git
18:45 ghoti joined #git
18:46 Forlorn joined #git
18:48 nidr0x joined #git
18:51 roygbiv joined #git
18:51 nowhereman joined #git
18:52 diego4 joined #git
18:52 zzz joined #git
18:52 shgysk8zer0_ joined #git
18:55 jnavila joined #git
18:55 matoro joined #git
18:56 bannakaffalatta joined #git
18:57 nunchuck joined #git
18:58 grayjoc joined #git
19:03 atomi joined #git
19:04 cdown joined #git
19:05 ruxu joined #git
19:05 qqx joined #git
19:12 satifant joined #git
19:13 irqq joined #git
19:14 cliluw joined #git
19:15 grayjoc joined #git
19:16 d10n-work joined #git
19:16 Sasazuka joined #git
19:17 Fissure joined #git
19:17 jccn joined #git
19:18 Atemu joined #git
19:20 jnavila_ joined #git
19:21 glspi joined #git
19:22 roygbiv joined #git
19:22 blackwind_123 joined #git
19:25 Es0teric joined #git
19:28 jimi_ joined #git
19:30 dsdeiz joined #git
19:31 JanC_ joined #git
19:32 Doow joined #git
19:35 _ADN_ joined #git
19:37 cahoots joined #git
19:37 cahoots hi, how can i have `git diff` do `git diff --color-words`?
19:39 perlpilot cahoots: either a shell alias or a git alias
19:39 perlpilot cahoots: there may be some config setting too, I dunno
19:39 whitby cahoots: https://git-scm.com/book/en​/v2/Git-Basics-Git-Aliases
19:39 chardan joined #git
19:40 ecuanaso joined #git
19:43 rivarun joined #git
19:44 mar77i joined #git
19:44 mischat joined #git
19:46 miczac joined #git
19:46 wilbert joined #git
19:47 jccn joined #git
19:47 fragMental joined #git
19:47 peterbecich joined #git
19:48 tyreld joined #git
19:48 todd_dsm joined #git
19:49 borkr joined #git
19:51 bvtton joined #git
19:54 a3Dman joined #git
19:54 xanadu joined #git
19:55 manuelschneid3r joined #git
19:57 Nerbrun joined #git
20:00 dave0x6d joined #git
20:01 Learath2 joined #git
20:01 bannakaffalatta joined #git
20:02 NeXTSUN joined #git
20:02 xanadu joined #git
20:03 wachpwnski-mobi joined #git
20:04 sabrina_feiticei joined #git
20:04 wachpwnski-mobi How do you clone a git annex repository?
20:05 wachpwnski-mobi Git clone on the repo doesn't clone the annex and db portions of it.
20:06 todd_dsm joined #git
20:06 _ikke_ wachpwnski-mobi: I think you need to use git annex for that
20:07 _ikke_ [git annex get][https://git-annex.branchable.com/git-annex/]
20:07 miczac joined #git
20:07 bremner wachpwnski-mobi: it _does_ clone the metadata. Just not the annexed files.
20:07 bremner the metadata is just git branches
20:08 wachpwnski-mobi I need to do a git annex sync —content then?
20:08 _ikke_ wachpwnski-mobi: git annex get should get all the content
20:09 bremner sync --content should also work, although you might have to run sync without --content the first time
20:10 cahoots whitby, is it legit to do "[alias]\ndiff = diff --color-words"?
20:10 bremner no
20:11 bremner can't alias built in commands
20:11 whitby Huh, I would've guess you could
20:11 whitby Well then there's no way to have `git diff` do `git diff --color-words`, cahoots
20:11 _ikke_ You would have a recursive loop
20:12 whitby You'll need to settle for a different command
20:13 Lyqyd joined #git
20:17 valize joined #git
20:17 b3kN joined #git
20:17 b3kN joined #git
20:18 kpease joined #git
20:19 xanadu joined #git
20:22 cahoots ok thanks :)
20:23 grayjoc joined #git
20:24 absinthe joined #git
20:27 Zolotovoloska joined #git
20:28 morenoh149 joined #git
20:29 iamtakingiteasy joined #git
20:33 rperez_ joined #git
20:34 iamtakingiteasy joined #git
20:35 valize !ops sabrina_feiticei http://i.imgur.com/AXrZeP8.png
20:39 iamtakingiteasy joined #git
20:41 Pulp joined #git
20:44 jimi_ joined #git
20:47 matoro joined #git
20:48 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
20:51 felixjet joined #git
20:53 minibar left #git
20:54 peterbecich joined #git
20:56 iamtakingiteasy joined #git
20:56 hvxgr joined #git
20:59 kent\n joined #git
21:01 iamtakingiteasy joined #git
21:04 denisMone joined #git
21:04 Tobbi joined #git
21:05 cahoots_ joined #git
21:06 raspado joined #git
21:09 snowalpaca joined #git
21:09 MarioBranco joined #git
21:09 Es0teric joined #git
21:13 wilornel Does anyone know any solutions for letting inexperienced users contribute to a git repository? Where could I learn more about this? I was wondering if there are some nice tools to help them. I would rather stick with git (because I am used to it), and let the inexperienced contributors (who have trouble with git) use some other tool that interfaces with git
21:14 Timvde wilornel: There are some GUIs. You have gitk, git-cola and SmartGit, for example. I haven't used any of them, or even really looked into them, so I can't really recommend one
21:15 wilornel In my last project I had a developer who said he knew about git and told me he DID read guides on how to use it, but this was a lie and he would put a few branches in a bad state most of the time (copying changes over using text editors instead of merging, for example). Now, I am working with a non-technical user and I gave him some steps on how to make a change on bitbucket
21:15 perlpilot wilornel: or ... they could learn to use git too  :)
21:15 Timvde They still need to know the basic concepts of commits and branches, of course
21:15 wilornel perlpilot: When they tell you they learn about it but they lie, it's not helpful
21:15 diogenese joined #git
21:15 moritz wilornel: you can always use something like github where you can force people to make pull requests, and where users can use a web GUI to edit files and creates PRs
21:16 wilornel Timvde: Alright, I'll look into git-cola and SmartGit. I think gitk does not let you easily checkout, merge, push and pull (only visualize) from the GUI, right?
21:16 Timvde wilornel: Why would anyone lie about what they learned? That can only be counter-productive...
21:16 sathed joined #git
21:16 wilornel Yes
21:16 Timvde wilornel: I also haven't used gitk, just CLI for me
21:16 Timvde So maybe, I don't know.
21:16 wilornel Alright, thanks all the same
21:17 wilornel moritz: Yes, we are using something similar on bitbucket right now with the non-technical contributor
21:17 wilornel Alright, thank you Timvde  and moritz !
21:23 CDanU Is there an option that auto splits big hunks into smaller ones (option 's') when I use `add -p`?
21:24 jccn joined #git
21:24 mischat joined #git
21:26 perlpilot CDanU: you can edit them yourself
21:26 UTAN_dev joined #git
21:29 webdev007 joined #git
21:30 CDanU perlpilot: well yes, as I mentioned I am aware of the 's' choice but I'd rather let the system to this every time, see here: http://www.spinics.net/lists/git/msg162091.html as far as I understand there is as script but it needed some work. Was that integrated?
21:30 vuoto joined #git
21:32 iamtakingiteasy joined #git
21:35 Sample joined #git
21:35 CDanU I found the source file and it does not seem so
21:35 Sample joined #git
21:37 iamtakingiteasy joined #git
21:38 kadoban joined #git
21:38 tvw joined #git
21:38 concerti joined #git
21:38 Es0teric joined #git
21:39 [Brain] joined #git
21:43 Sample joined #git
21:43 Sample joined #git
21:43 jeffreylevesque joined #git
21:44 kfoonamalik joined #git
21:45 absinthe joined #git
21:47 iamtakingiteasy joined #git
21:49 Dzoster joined #git
21:49 Dzoster left #git
21:50 joki joined #git
21:50 Puffball joined #git
21:51 ratdeptrai joined #git
21:52 iamtakingiteasy joined #git
21:57 James_Epp joined #git
21:57 James_Epp left #git
21:58 durham_ joined #git
21:59 mischat joined #git
21:59 ecuanaso joined #git
22:01 Lyqyd joined #git
22:02 Raed joined #git
22:02 morenoh149 joined #git
22:04 skyfaller joined #git
22:04 miczac joined #git
22:07 iamtakingiteasy joined #git
22:08 crose joined #git
22:09 githogori joined #git
22:10 todd_dsm joined #git
22:10 snowalpaca joined #git
22:11 buck1 joined #git
22:11 buck1 is there anyway to modify the default for git diff --find-renames/-M ?
22:12 iamtakingiteasy joined #git
22:12 kaldoran joined #git
22:13 sim590 joined #git
22:13 manuelschneid3r joined #git
22:17 iamtakingiteasy joined #git
22:21 NeXTSUN joined #git
22:22 YuGiOhJCJ joined #git
22:22 buck1 looks like no https://github.com/git/git/search?q=rename_score
22:24 ihradek joined #git
22:25 nowhereman joined #git
22:27 iamtakingiteasy joined #git
22:29 PettanShoutaKun joined #git
22:32 iamtakingiteasy joined #git
22:33 joeco joined #git
22:34 zulutango joined #git
22:35 Emperor_Earth joined #git
22:37 rgrinberg joined #git
22:37 iamtakingiteasy joined #git
22:40 ismaris-tmp joined #git
22:42 prg3 joined #git
22:45 Tobbi joined #git
22:47 iamtakingiteasy joined #git
22:52 iamtakingiteasy joined #git
22:52 b3kNik joined #git
22:54 chipotle joined #git
22:57 iamtakingiteasy joined #git
23:01 Derperperd joined #git
23:01 fmeerkoetter joined #git
23:02 jnavila_ joined #git
23:02 iamtakingiteasy joined #git
23:05 dmin7b5 joined #git
23:06 MrWoohoo joined #git
23:07 mikecmpbll joined #git
23:10 snowalpaca joined #git
23:11 Noldorin joined #git
23:12 sat-aton joined #git
23:13 iamtakingiteasy joined #git
23:16 githogori joined #git
23:18 iamtakingiteasy joined #git
23:18 krillr joined #git
23:22 Vampire0_ joined #git
23:23 polyrob_ joined #git
23:23 iamtakingiteasy joined #git
23:26 dna113p joined #git
23:26 DolpheenDream joined #git
23:26 cwillu_at_work joined #git
23:28 iamtakingiteasy joined #git
23:30 nidr0x joined #git
23:31 ispn joined #git
23:32 ozmage joined #git
23:33 Gustavo6046_ joined #git
23:34 [Brain]2 joined #git
23:36 wgrant joined #git
23:36 variable joined #git
23:36 venmx joined #git
23:37 basdb joined #git
23:39 nettoweb joined #git
23:39 iamtakingiteasy joined #git
23:44 iamtakingiteasy joined #git
23:49 iamtakingiteasy joined #git
23:53 mischat joined #git
23:54 iamtakingiteasy joined #git
23:56 nowhereman joined #git
23:57 BSaboia joined #git
23:58 beny joined #git
23:59 iamtakingiteasy joined #git

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