Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-07

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

All times shown according to UTC.

Time Nick Message
00:00 eletuchy_ joined #git
00:02 eletuchy joined #git
00:03 anli joined #git
00:04 filter85 joined #git
00:05 eletuchy_ joined #git
00:07 eletuch__ joined #git
00:07 GavinMagnus left #git
00:08 fscala joined #git
00:09 arescorpio joined #git
00:09 Fr4n joined #git
00:10 DolpheenDream joined #git
00:10 eletuchy joined #git
00:12 watabou joined #git
00:12 eletuchy_ joined #git
00:12 checkItOut joined #git
00:14 dopesong joined #git
00:14 eletuch__ joined #git
00:14 Rodya_ joined #git
00:16 eletuchy joined #git
00:18 drodger joined #git
00:19 eletuchy_ joined #git
00:20 MattMaker joined #git
00:20 mikecmpbll joined #git
00:21 holodoc joined #git
00:21 eletuch__ joined #git
00:24 Rodya_ joined #git
00:24 eletuchy joined #git
00:26 eletuchy_ joined #git
00:27 nocbreak joined #git
00:28 jscarano joined #git
00:28 _vyscond joined #git
00:30 eletuchy joined #git
00:31 eletuch__ joined #git
00:33 eletuchy_ joined #git
00:33 Rodya_ joined #git
00:36 EvilPenguin joined #git
00:36 eletuchy joined #git
00:36 Rodya_ joined #git
00:38 ahmedelgabri joined #git
00:39 eletuchy_ joined #git
00:40 mmlb joined #git
00:42 eletuchy joined #git
00:44 eletuch__ joined #git
00:44 drodger joined #git
00:45 ahmedelgabri joined #git
00:47 eletuchy joined #git
00:47 mikecmpbll joined #git
00:49 horusdev joined #git
00:50 eletuchy_ joined #git
00:53 eletuchy joined #git
00:54 mizu_no_oto joined #git
00:55 eletuchy_ joined #git
00:55 jerikl joined #git
00:56 EvilPenguin joined #git
00:57 eletuch__ joined #git
00:58 BombStrike joined #git
00:59 rominronin joined #git
01:00 nettoweb joined #git
01:00 eletuchy joined #git
01:04 interne7y joined #git
01:04 nardev joined #git
01:05 eletuchy_ joined #git
01:08 lindenle joined #git
01:09 eletuchy joined #git
01:10 eletuch__ joined #git
01:14 eletuchy joined #git
01:14 MattMaker joined #git
01:14 fstd joined #git
01:15 nardev joined #git
01:16 heroux joined #git
01:16 checkItO1t joined #git
01:26 pks_ joined #git
01:31 b0nn left #git
01:31 _xor joined #git
01:32 tlolczyk joined #git
01:37 drodger joined #git
01:38 dermoth joined #git
01:41 Tanger joined #git
01:42 Limes_ joined #git
01:47 ecksit joined #git
01:50 ilbot3 joined #git
01:50 Topic for #git is now Welcome to #git, the place for git help and hostage situations | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | I will be executing hostages until there are more https://madeitwor.se/git-jokes
01:55 ceaucari joined #git
01:59 romerocesar joined #git
02:00 rominronin joined #git
02:00 Goplat joined #git
02:01 drbean joined #git
02:05 nkouevda joined #git
02:09 wald joined #git
02:10 twins_peaked joined #git
02:10 dreiss joined #git
02:12 hexagoxel joined #git
02:12 drodger joined #git
02:13 sangy joined #git
02:15 d4rklit3 joined #git
02:16 m_antis joined #git
02:17 drodger joined #git
02:18 NeXTSUN joined #git
02:18 chachasmooth joined #git
02:18 livingstn joined #git
02:20 d4rklit3 joined #git
02:23 ploop joined #git
02:25 david007 joined #git
02:26 linuxmint joined #git
02:26 Sasazuka joined #git
02:28 BubbaJo joined #git
02:31 watabou joined #git
02:32 cdg joined #git
02:32 drodger joined #git
02:32 mizu_no_oto joined #git
02:36 d4rklit3 joined #git
02:42 UbuntuDude quit
02:45 dopesong joined #git
02:46 watabou joined #git
02:46 drodger joined #git
02:48 ToBeCloud joined #git
02:48 Sareuon joined #git
02:50 diogenese joined #git
02:52 MistahKurtz joined #git
02:55 cyan__ joined #git
02:58 plumppuffypig joined #git
02:59 nitin joined #git
03:00 drodger joined #git
03:01 rominronin joined #git
03:01 aavrug joined #git
03:02 mikecmpbll joined #git
03:07 eletuchy joined #git
03:11 faux___ joined #git
03:16 unbalancedparen joined #git
03:16 Rodya_ joined #git
03:16 SpeakerToMeat joined #git
03:20 lindenle joined #git
03:23 drodger joined #git
03:24 qpdb joined #git
03:25 jonmorehouse joined #git
03:28 BenderRodriguez joined #git
03:29 _28_ria joined #git
03:29 netj joined #git
03:30 mizu_no_oto joined #git
03:33 nettoweb joined #git
03:37 nettoweb joined #git
03:38 jonmorehouse joined #git
03:38 inflames joined #git
03:39 eletuchy joined #git
03:42 nettoweb joined #git
03:45 sgen joined #git
03:47 aardvark___ joined #git
03:50 philipp64|work Seveas: the blank line is valid for SASL (DIGEST-MD5) authentication...
04:02 rominronin joined #git
04:03 ncthom91 joined #git
04:03 zincrokx joined #git
04:09 grill joined #git
04:14 sauvin joined #git
04:16 alex1a joined #git
04:16 tgunr joined #git
04:17 grassass joined #git
04:18 k3rn31 joined #git
04:20 fscala joined #git
04:22 Cabanossi joined #git
04:25 nilg joined #git
04:27 pmort joined #git
04:28 nanga joined #git
04:28 fracting joined #git
04:32 drodger joined #git
04:33 guardianJ joined #git
04:34 SuperflyR6 joined #git
04:36 mflow joined #git
04:39 emPi joined #git
04:44 guardianJ joined #git
04:47 romerocesar joined #git
04:48 lolmac joined #git
04:49 milki joined #git
04:49 milki eh
04:49 milki why do i need to make new jokes
04:49 milki uh uh
04:49 milki git and lite in a tree?
04:51 mehola joined #git
04:56 CEnnis91 joined #git
04:57 blur3d joined #git
05:00 dreiss joined #git
05:00 BenderRodriguez joined #git
05:01 hahuang61 joined #git
05:03 rominronin joined #git
05:06 interne7y joined #git
05:07 nidr0x joined #git
05:08 annoymouse joined #git
05:10 tinajohnson___ joined #git
05:10 mariuscc joined #git
05:11 MutantMahesh joined #git
05:12 subhojit777 joined #git
05:16 craq joined #git
05:19 SwiftMatt joined #git
05:20 shgysk8zer0 joined #git
05:22 craq i accidentally pushed changes for one branch into master (such a stupid mistake) and im not sure the best way to fix it.  i did a git push origin beta beta:master and beta is this dumb branch full of ugly merges we use to deploy automatically to a staging on heroku. is there an easy way to undo this push? it adds a lot of ugly old commits so its not like i can just revert the last few commits or something… blah i feel so stupid :(
05:23 muthu joined #git
05:25 qt-x joined #git
05:25 ceaucari joined #git
05:25 fhackdroid joined #git
05:25 guest12345 left #git
05:25 shafox joined #git
05:26 shafox I cant seem to do git fetch --all in my repo dir. When I do git fetch upstream master:master it says fatal: Refusing to fetch into current branch refs/heads/master of non-bare repository
05:26 TomyLobo joined #git
05:27 shafox If I do a --verbose it says everything is up to date with git fetch --all --fetch --verbose
05:29 Mowgli joined #git
05:33 InfoTest joined #git
05:33 grawity craq: push --force the correct commit, and do it before anyone else notices
05:33 craq haha if only it was that easy.
05:34 grawity craq: push --force the correct commit, and email everyone else to `git reset --hard` if they already pulled the garbage
05:34 grawity well, reset to the correct commit that is
05:34 craq grawity: there’s a bunch of really old stupid merges mixed in now at various older dates.
05:34 grawity shafox: git config --get-all remote.upstream.fetch
05:34 grawity craq: yes, what's your point?
05:34 PCatinean joined #git
05:35 shafox grawity: still nothing.
05:36 craq grawity: maybe im just not thinking about this right. git reset will just remove the 1 commit from the tree?
05:36 craq not like roll back to a specific time in the tree taking out other commits ?
05:36 grawity trees don't have commts; repositories have commits, and commits have trees
05:36 cyan__ joined #git
05:36 grawity and no, that's exactly what `git reset` will do – roll back history to that commit
05:38 craq grawity: there’s no way to just rollback a specific push vs commit right?
05:38 grawity um, how would that differ from what I suggested?
05:38 grawity if the server had commit A, and you pushed commit B, and now you force-push commit A, that *is* a rollback.
05:40 stuh84 joined #git
05:40 craq grawity: im still confused. really tired and feeling pretty dumb.
05:42 MrWoohoo joined #git
05:43 grawity well I can't help with that one
05:44 ThomasLocke joined #git
05:44 cyberlard joined #git
05:46 craq grawity: thanks. i needed to just step back from my computer and calm down a little. was really pissed off… i just fixed it now with what you said.
05:49 jaguarmagenta joined #git
05:51 EduardoMartins joined #git
05:52 Keridos joined #git
05:54 jonesinator joined #git
05:55 shafox Still not able to git fetch.
05:58 Oog joined #git
05:58 Rish joined #git
05:58 ciampix joined #git
06:00 hahuang61 joined #git
06:01 elastix joined #git
06:03 jaguarma_ joined #git
06:04 d4rklit3 joined #git
06:04 rominronin joined #git
06:04 grawity Still not able to fetch the `git config --get-all ...` results from shafox.
06:04 khisanth_ joined #git
06:05 shafox grawity: I did the git config as you said and I can see that in my git config -l but when I do git fetch --all i still get every is up to date.
06:05 grawity um
06:05 jstimm joined #git
06:05 grawity what exactly *do* you see there?
06:06 rscata joined #git
06:06 grawity it's --get. it's not supposed to change anything. it's supposed to tell you the current settings, which you're supposed to copy here
06:07 grawity if it's wrong in the way that I *think* it is, you could probably fix it with `git config remote.upstream.fetch "+refs/heads/*:refs/remotes/upstream/*"`, but I don't know if that's the broken part or not
06:07 nitin joined #git
06:07 mikecmpbll joined #git
06:07 alexsystemf__ joined #git
06:07 dpower joined #git
06:08 shafox grawity: https://bpaste.net/show/28cc22fc79b6
06:08 freimatz joined #git
06:08 lmatteis joined #git
06:08 moop joined #git
06:09 settermjd joined #git
06:09 iota_pi joined #git
06:11 rominronin joined #git
06:11 ensyde__ joined #git
06:14 nevyn rshshshafox: fetch does fetch probably doesn't do what you think it does.
06:14 shafox nevyn: how do you mean ?
06:15 grawity but but but I wanted the `git config` output... *cries*
06:16 zeroed joined #git
06:18 nevyn shafox: git fetch.. and git config --get
06:18 nevyn are totally different
06:20 hahuang61 joined #git
06:20 shafox nevyn: yes i know. I have done with git config and then i tried to do git fetch but it showed me the same message.
06:22 lamppid joined #git
06:25 lindenle joined #git
06:25 zeroed joined #git
06:26 bluesilver joined #git
06:26 bluesilver joined #git
06:27 bluesilver joined #git
06:27 bluesilver joined #git
06:29 JZA joined #git
06:30 apotry joined #git
06:32 spoonUltra joined #git
06:32 * spoonUltra is just learning the wonders of git on mobile
06:32 shgysk8zer0 joined #git
06:33 JeroenT joined #git
06:34 Raging_Hog joined #git
06:35 Oog joined #git
06:37 siaw23 joined #git
06:38 siaw23 hello. i forked a repo. i want to push my forked repo but to a different branch and i get this error https://gist.github.com/siaw23/e​4ba6a32196061730453ec434fcf5091
06:38 netj joined #git
06:38 siaw23 any help please?
06:38 JeroenT_ joined #git
06:39 dopesong joined #git
06:39 JeroenT_ joined #git
06:41 ojacobson siaw23: that output did not come from that command.
06:42 Repox joined #git
06:42 siaw23 ojacobson: yeah right. updated https://gist.github.com/siaw23/e​4ba6a32196061730453ec434fcf5091
06:43 ojacobson the branch rails4 in the remote repo 'origin' has commits you don't have locally in 'dev'
06:43 Juzzika joined #git
06:43 ojacobson if you want to lose those commits, you can; git won't do so by default, but git push --force-with-lease will (semi-safely) obliterate them if you're really sure
06:43 paul424 joined #git
06:44 siaw23 ojacobson: so how do i pull all the stuff in the rails4 branch?
06:44 siaw23 i don’t want to force push
06:44 ojacobson check out the branch you want to merge it into
06:44 ojacobson git fetch origin
06:44 ojacobson git merge origin/rails4
06:45 JeroenT joined #git
06:45 siaw23 that means i should create a new branch locally?
06:46 dreiss joined #git
06:46 siaw23 like `git checkout -b rails4`
06:46 siaw23 and then fetch the origin into the rails4 branch i created locally
06:47 siaw23 that’s my understanding of what you just said
06:47 jhgundersen joined #git
06:49 JeroenT_ joined #git
06:50 mase-tech joined #git
06:54 JeroenT joined #git
06:55 pungi-man joined #git
06:55 Sceorem joined #git
06:58 encod3 joined #git
06:59 eletuchy joined #git
07:00 PSan joined #git
07:00 xbob joined #git
07:01 Vgr_ joined #git
07:01 eletuchy_ joined #git
07:02 [Brain] joined #git
07:04 eletuchy joined #git
07:07 interne7y joined #git
07:07 JeroenT joined #git
07:11 JeroenT joined #git
07:11 Oog joined #git
07:12 ncd|leeN joined #git
07:12 jknetl joined #git
07:12 akiva joined #git
07:13 eletuchy joined #git
07:14 dimi1947 joined #git
07:15 eletuchy_ joined #git
07:15 jast kadoban: thanks for the hint, fixed
07:15 Macaveli joined #git
07:19 eletuchy joined #git
07:20 ahmedelgabri joined #git
07:22 eletuchy_ joined #git
07:27 pwnz0r joined #git
07:28 GavinMagnus joined #git
07:29 mdw joined #git
07:29 ciampix joined #git
07:29 jceb joined #git
07:29 k3rn31 joined #git
07:30 mikecmpbll joined #git
07:33 pol123456 joined #git
07:34 nilg joined #git
07:34 kutsuya joined #git
07:34 c-c joined #git
07:34 c-c Simple problem: git commit --amend won't update user.name or .email, even if those fields were re-set.
07:34 Alienpruts joined #git
07:34 c-c I can see the updated values in .git/config
07:34 tobiasvl c-c: re-set how, with --reset-author ?
07:35 selckin won't change committer
07:35 sshine left #git
07:35 selckin git reset HEAD^; git commit, is easiest if only latest commit
07:35 c-c tobiasvl: git config user.name "csmr"
07:36 jast amend doesn't update the commit metadata unless you use --reset-author (which also resets the timestamps)
07:36 hikka joined #git
07:37 c-c Indeed!
07:37 c-c jast: thank you, sir
07:37 c-c tobiasvl and selckin  too
07:40 SimonNa joined #git
07:42 rahtgaz joined #git
07:42 mikecmpbll joined #git
07:42 irco joined #git
07:43 j416 joined #git
07:43 FunkyAss joined #git
07:46 fnky joined #git
07:46 circ-user-WUSoW joined #git
07:47 kurkale6ka joined #git
07:51 jost joined #git
07:51 Fijit joined #git
07:52 interne7y joined #git
07:55 djb-irc joined #git
07:55 h0bbit joined #git
07:57 _nadim joined #git
07:59 mikecmpbll joined #git
08:00 lindenle joined #git
08:01 PSan I use git rebase -i --preserve-merges but it still shows all the commits from the branch that I merged?
08:03 bongjovi joined #git
08:08 ochorocho__ joined #git
08:08 zeroed joined #git
08:08 zeroed joined #git
08:09 iateadonut joined #git
08:09 zincrokx joined #git
08:10 acetakwas joined #git
08:10 iateadonut google says to download it's php api through composer by adding this: "google/apiclient": "1.0.*@beta" , or download from github this way: git clone -b v1-master https://github.com/google/​google-api-php-client.git
08:10 marcogmonteiro joined #git
08:11 acetakwas joined #git
08:11 iateadonut i'm wondering what should the composer string say to download that same branch 'v1-master'
08:11 romerocesar joined #git
08:12 selckin ask whatever composer is
08:12 _pix joined #git
08:13 fracting joined #git
08:13 _pix joined #git
08:14 Juzzika joined #git
08:16 Sasazuka joined #git
08:17 PCatinean joined #git
08:18 zincrokx joined #git
08:19 Juzzika_ joined #git
08:19 zincrokx joined #git
08:19 Shashikant86 joined #git
08:19 zincrokx joined #git
08:21 zincrokx joined #git
08:21 ewet joined #git
08:21 solf1re joined #git
08:22 djb-irc joined #git
08:22 m0nkmaster joined #git
08:27 h0bbit left #git
08:32 nnyk_ joined #git
08:32 mrkat joined #git
08:34 guardian joined #git
08:40 Shashikant86 joined #git
08:43 JeroenT joined #git
08:44 notebox joined #git
08:44 eijk joined #git
08:45 kosc joined #git
08:46 neps joined #git
08:49 ocbtec joined #git
08:50 p4trix joined #git
08:50 zincrokx joined #git
08:53 p4trix Imagine Commits A->B->C->D. Can I fix/ammend only B somehow? I know this rewrites history.
08:53 watabou joined #git
08:54 moritz p4trix: git rebase -i B, then mark B as edit
08:54 selckin -i A i think :/
08:54 moritz and you'll get A->B'->C'->D'
08:54 moritz or that, yes
08:54 moritz I always get that wrong
08:54 p4trix I see. Nice, thank you
08:55 c0ded joined #git
08:55 eijk_ joined #git
08:55 acetakwas joined #git
08:56 eletuchy joined #git
08:57 kosc left #git
08:57 nnyk_ joined #git
08:57 Dro joined #git
08:59 pedro4 joined #git
09:00 GitNewb joined #git
09:01 GitNewb Hi folks - need a little help with a git hook I wrote
09:02 GitNewb I wrote a client side commit-msg hook which works great, but it seems that when I use the hook, it supresses the normal output of git-commit
09:02 GitNewb I can't seem to find how to get that back while using the hook, anyone have any pointers for me?
09:03 mariuscc joined #git
09:04 jhass p4trix: another workflow is git commit --fixup=B and then at some point git rebase -i --autosquash
09:04 p4trix jhass, mmm. Interesting. Thank you
09:04 * p4trix will look into that too
09:04 Lynxium joined #git
09:05 _nadim joined #git
09:06 SimonNa joined #git
09:07 djb-irc joined #git
09:08 ochorocho__ joined #git
09:09 GitNewb it's like using the client-side hook enabled the -q flag somehow
09:09 Olipro joined #git
09:10 EY joined #git
09:11 notebox joined #git
09:13 nitin_ joined #git
09:14 fwdit joined #git
09:16 garethdaine joined #git
09:17 GitNewb disregard everything I said, I'm an idiot.
09:18 msonntag joined #git
09:19 King_Hual joined #git
09:19 King_Hual joined #git
09:19 nuge joined #git
09:20 nuge is there any tricks to excluding a folder from git? I keep getting my SASS cache folder included in my staged file list, but have included the folder in my .gitignore file in the root folder
09:20 duderonomy joined #git
09:21 david007 joined #git
09:22 cdown joined #git
09:23 acetakwas joined #git
09:23 nuge shouldn't /resources/assets/sass/.sass-cache/* exlcude everything below .sass-cache?
09:25 superrorc joined #git
09:27 superrorc hi there! i create new_branch, then pull request to master. but i have a lot of conflicts. after resolving it i am on master branch, but i permission to pulling is denied
09:28 superrorc how can i pull this changes to new_branch, insted of master
09:28 tobiasvl superrorc: did you commit your resolution?
09:28 superrorc yes Your branch is ahead of 'origin/master' by 4 commits.
09:29 superrorc but i can pulling changes to master, only on new_branch
09:30 _noblegas joined #git
09:32 josuebrunel joined #git
09:33 mischat joined #git
09:33 MadHatter42 joined #git
09:38 paul424 Hello, would someone help me squashing three top commits into one ?
09:38 paul424 it's already pushed to the origin development
09:39 fuchstronaut joined #git
09:39 fuchstronaut joined #git
09:39 bnnb joined #git
09:40 joki joined #git
09:40 weckl joined #git
09:42 dimi1947 joined #git
09:42 jceb joined #git
09:43 franl joined #git
09:43 Rish joined #git
09:44 interne7y joined #git
09:45 psprint joined #git
09:45 psprint Hello. Is it possible to detect if staged changes are older than N days?
09:48 neps joined #git
09:49 Macaveli joined #git
09:51 franl joined #git
09:51 Juzzika joined #git
09:52 minibar joined #git
09:53 blackwind_123 joined #git
09:54 JeroenT joined #git
09:59 zincrokx joined #git
10:00 mischat_ joined #git
10:00 zincrokx joined #git
10:00 zincrokx joined #git
10:01 franl left #git
10:01 zincrokx joined #git
10:01 franl joined #git
10:02 lindenle joined #git
10:02 mischat__ joined #git
10:02 watabou joined #git
10:03 i7c I guess you could use the modification date of the object file, but I'm not entirely sure if this is correct in all cases.
10:06 tobiasvl paul424: !rebase_interactive
10:06 tobiasvl seems gitinfo is a little slow today
10:06 tobiasvl paul424: but since you have pushed, !rewrite applies
10:06 gitinfo paul424: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
10:06 tobiasvl paul424: oh hang on. !interactive_rebase
10:06 gitinfo paul424: Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.
10:06 i7c psprint, you can find the object file using git diff-index.
10:06 tobiasvl that bot command always trips me up. the command is rebase --interactive! can someone add an alias
10:08 neps joined #git
10:09 mase-tech joined #git
10:09 zincrokx joined #git
10:09 Sceorem joined #git
10:09 zincrokx joined #git
10:09 phz_ joined #git
10:09 phz_ hey
10:09 gitinfo phz_: 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.
10:09 nitin_ joined #git
10:10 phz_ I’m looking for a git command to show all commits on a branch since it diverged
10:10 zincrokx joined #git
10:10 phz_ i.e. until it reaches a commit that exists on another branch that I give
10:14 osse phz_: git log otherbranch..branch
10:14 phz_ I never understand how that command works
10:14 phz_ (the range stuff)
10:14 osse phz_: https://raw.githubusercontent.co​m/Osse/git-stuff/master/dots.txt
10:15 osse phz_: A..B = reachable from B but not from A.
10:15 osse kinda sorta like "from A to B" in the simple cases
10:15 phz_ hm
10:15 phz_ so
10:16 phz_ A..B gives all the commits from A and B but A
10:16 yqt joined #git
10:16 phz_ with that diagram it’s pretty clear
10:16 phz_ thank you very much :)
10:17 phz_ I need to bookmark that
10:18 osse it's just a simpler, less complete way of describing what's in man gitrevisions
10:18 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
10:18 phz_ it’s impressive how git can be complex :)
10:19 ismithers joined #git
10:19 ismithers Hey all
10:20 phz_ fatal: ambiguous argument 'master..weight_vanishing': unknown revision or path not in the working tree.
10:20 phz_ ah, dammit
10:20 phz_ it doesn’t work with ref?
10:20 osse yes
10:20 phz_ git log master..weight_vanishing
10:20 star_prone joined #git
10:20 osse either master or weight_vanishing doesn't exist, or their names are ambigious
10:21 phz_ because of origin/?
10:21 phz_ git branch makes them appear
10:21 phz_ I don’t get why it would be ambiguous
10:21 franl Maybe because branch weight_vanishing has another branch diverging from it?
10:21 phz_ what do you mean?
10:21 osse phz_: show me the output of git branch
10:22 phz_ there’re several   master
10:22 phz_ print-file-weight
10:22 phz_ * weight-vanishing
10:22 phz_ print-file-weight lags behind
10:22 osse phz_: - and _ are different things
10:22 phz_ i guess I could git branch -d it
10:22 phz_ master
10:22 phz_ * weight-vanishing
10:22 phz_ yep, that’s it
10:22 phz_ (off to lunch, I’ll get back right after)
10:23 MattMaker joined #git
10:23 freimatz joined #git
10:23 sdothum joined #git
10:24 diegoaguilar joined #git
10:24 troulouliou_div2 joined #git
10:24 Gonzo89 joined #git
10:27 josuebrunel joined #git
10:28 qt-x joined #git
10:28 fracting joined #git
10:28 kedare joined #git
10:32 maucar joined #git
10:35 ahmedelgabri joined #git
10:36 dsdeiz joined #git
10:38 fscala joined #git
10:39 sostenuto joined #git
10:41 JeroenT joined #git
10:41 johnmilton joined #git
10:51 Rish joined #git
10:52 hanthings_ joined #git
10:54 Dro joined #git
10:54 Panacea joined #git
10:55 JeroenT joined #git
10:57 SonikBoom joined #git
10:59 johnmilton joined #git
10:59 johnmilton joined #git
11:01 Sendoushi joined #git
11:01 dangerousdave joined #git
11:01 dangerousdave morning all
11:01 dangerousdave ah, afternoon
11:01 JeroenT joined #git
11:02 Infamous dangerousdave, its 4am
11:02 Infamous k
11:02 iateadonut joined #git
11:02 dangerousdave Infamous you should be asleep!
11:02 raijin joined #git
11:03 Infamous dangerousdave, i should but there is a secret you do not know yet
11:03 Infamous i am batman
11:03 watabou joined #git
11:03 dangerousdave i would like to interrogate my git repo to show all contributions (lines of code) made by a user between two dates
11:03 dangerousdave is this possible?
11:04 dangerousdave by night you fight crime and git ignorance?
11:04 j416 dangerousdave: git log --author=<author> --since=<date> --until=<date> -p
11:06 k3rn31 joined #git
11:08 dangerousdave j416 awesome, thanks!
11:09 j416 happy reading. :)
11:09 cbreak throw in an --all
11:09 dangerousdave ok, thanks
11:09 a_thakur joined #git
11:09 cbreak and maybe a --reverse if you want to read them in older-to-newer order
11:10 allcentu1 joined #git
11:11 Shashikant86 joined #git
11:12 j416 nod
11:12 Darcidride joined #git
11:13 dangerousdave one last question, can I remove the context (lines above and below the change) from the diff?
11:13 son_ joined #git
11:13 texinwien joined #git
11:14 settermjd joined #git
11:17 zeroed joined #git
11:19 nandi_ge___ joined #git
11:19 son joined #git
11:20 codeman joined #git
11:20 mflow joined #git
11:21 cbreak sure
11:22 cbreak dangerousdave: man git-diff, look for -U
11:22 gitinfo dangerousdave: the git-diff manpage is available at http://jk.gs/git-diff.html
11:22 EY joined #git
11:22 jhass !ugt
11:22 gitinfo [!bugtracker] the developers of git don't use a bug tracker. If you want to report a bug, send an e-mail to the mailing list at git@vger.kernel.org (no subscription required; everyone uses "reply to all" when responding); you can review past discussions at http://j.mp/gitlist
11:22 jhass :(
11:22 jhass not the one I hoped for
11:23 jhass rather www.total-knowledge.com/~ilya/mips/ugt.html
11:23 dangerousdave cbreak thanks
11:24 sostenuto joined #git
11:24 ShapeShifter499 joined #git
11:24 jast .trigger_edit ugt UGT (Universal Greeting Time): it is always morning when someone joins a channel, and always late night when they leave. http://www.total-knowledge.com/~ilya/mips/ugt.html
11:24 gitinfo jast: Okay.
11:26 romankl joined #git
11:26 jhass <3 thanks
11:29 rnsanchez joined #git
11:29 bollullera joined #git
11:31 mizu_no_oto joined #git
11:31 tlaxkit joined #git
11:32 fees joined #git
11:33 yqt joined #git
11:35 MattMaker joined #git
11:35 cbreak good afternoon
11:37 Gamecubic joined #git
11:38 nilg joined #git
11:38 edude03 joined #git
11:39 noidea joined #git
11:41 acetakwas joined #git
11:41 star_prone joined #git
11:43 Anupkumar joined #git
11:44 mmlb joined #git
11:47 baraba joined #git
11:52 josuebrunel joined #git
11:53 knutstrut joined #git
11:56 Sceorem joined #git
11:57 NwS joined #git
11:59 nitin_ joined #git
12:00 devster31 why here: http://justinhileman.info/arti​cle/git-pretty/git-pretty.png it puts interactive rebases in the danger zone?
12:00 canine joined #git
12:03 notebox joined #git
12:03 jhass because they rewrite history, I assume
12:03 DolpheenDream joined #git
12:03 nadim joined #git
12:03 tvw joined #git
12:03 lindenle joined #git
12:03 lb pretty good reason
12:03 rahtgaz joined #git
12:04 nilsi joined #git
12:04 drodger joined #git
12:06 dsdeiz_ joined #git
12:06 JeroenT_ joined #git
12:07 Orion3k joined #git
12:08 synthroid joined #git
12:08 Mowgli joined #git
12:10 canine joined #git
12:11 Schwarzbaer joined #git
12:11 jceb joined #git
12:12 ncd|leeN joined #git
12:12 Schwarzbaer Hi. Is there a one-liner to resolve one or several merge conflicts by saying "That branch is right", so that I don't have to edit the file involved by hand?
12:13 aswen joined #git
12:13 rgrinberg joined #git
12:14 _pix joined #git
12:14 rwb joined #git
12:15 ElChicoNube joined #git
12:15 Dro joined #git
12:16 nilsi joined #git
12:17 grawity -X ours, -X theirs
12:17 lb damn too slow
12:17 grawity also, `git checkout --ours, --theirs`
12:17 grawity for individual files, that is
12:17 lb ping Schwarzbaer
12:18 Schwarzbaer Thanks.
12:19 case39 joined #git
12:22 cdg joined #git
12:22 Psychiatrist joined #git
12:23 EY joined #git
12:24 JeroenT joined #git
12:24 z8z joined #git
12:24 drodger joined #git
12:28 rchavik joined #git
12:29 fees joined #git
12:30 liquidjamm joined #git
12:32 torbjorn joined #git
12:34 fmcgeough joined #git
12:36 soroot joined #git
12:36 Jubaleth joined #git
12:36 subhojit777 joined #git
12:36 Jubaleth left #git
12:37 son joined #git
12:39 drodger joined #git
12:41 ciampix joined #git
12:41 EY joined #git
12:42 devster31 ours and theirs refer to local and remote?
12:42 grawity when merging, yes
12:42 star_prone joined #git
12:42 grawity well, "this branch I'm on" vs "that branch I tried to pull/merge"
12:43 soroot joined #git
12:43 devster31 thanks
12:43 grawity when rebasing it's the opposite, for some backwards reason
12:44 mischat joined #git
12:44 grawity (it is *technically* correct, but.)
12:44 jhass yeah it's not the first mental model that comes to mind
12:45 devster31 theirs in that case means the branch I'm rebasing and ours is the one I'm rebasing on?
12:45 jhass but then ours and theirs aren't great terms for this in the first place I guess
12:46 jast it's easiest to understand if you think about rebase as re-applying your local commits
12:46 interne7y joined #git
12:46 JeroenT joined #git
12:46 jhass s/your/some/
12:46 grawity which is exactly what rebase is – it cherry-picks your own commits on top of the upstream
12:46 jast in that case, --ours is the stuff that's already been rewritten and --theirs is the commit being re-applied
12:46 a_thakur joined #git
12:46 WayToDoor joined #git
12:47 jast i.e. --ours = content prior to applying the commit, --theirs = content as it was in the original version of the commit rebase is trying to re-apply
12:47 chilversc I've started a merge but git hasn't detected one of the files as renamed, is there a command I can run to change this and then merge the file as normal?
12:47 devster31 git mv?
12:47 jast chilversc: rename detection always happens on the fly, anyway... the data being stored is identical internally
12:47 MattMaker joined #git
12:47 InfoTest joined #git
12:47 chilversc I mean at the moment, the merge conflict shows up as deleted ours, modified theirs
12:48 chilversc is there a command I can run to then allow; git mergetool, to show the conflicts against the renamed file instead
12:48 a_thakur joined #git
12:49 dimi1947 joined #git
12:49 livingstn joined #git
12:49 chilversc something that would play nice with the rest of git such as rerere, something better than marking the merge conflict as resolved with theirs, then mannually 2 way diffing the files
12:50 knutstrut joined #git
12:50 jast okay... I'm out. I don't know anything about that.
12:51 LeMike joined #git
12:52 keltvek joined #git
12:52 chilversc esentually, I've run "git pull" and have a conflict on the file, I want to tell git for this 1 file, re-resolve the merge for that file against "bar.txt" instead of "foo.txt"
12:52 chilversc ie, as if foo was renamed to bar
12:58 devster31 git diff --find-renames?
12:58 chilversc I'm currently in the middle of a merge?
12:59 devster31 oh, sorry, I'm trying everything, from the manuals, but I can't find anything
12:59 son joined #git
12:59 chilversc esentually, I have; "old.txt" and "new.txt", and I want to do a 3-way merge between those 2 files (using old.txt as the common ancestor)
13:00 italoacasas joined #git
13:00 CEnnis91 joined #git
13:00 chilversc well, old.txt as it was in what ever system git uses to find the common ancestor
13:01 dsfreak93 joined #git
13:02 selckin chilversc: only read half and googled but maybe useful http://stackoverflow.com/questions/11113632/why-do​esnt-git-attempt-to-merge-changes-to-renamed-files
13:03 chilversc selckin: I don't really want to start the whole merge again for 1 file
13:03 allcentu1 joined #git
13:03 mischat joined #git
13:03 setuid left #git
13:03 chilversc I also don't want to auto-detect since that could then pick up false positives, I just want to manually tell git for this 1 file, for this merge, it was renamed from a -> b
13:03 selckin git show sha1:filename > orig
13:04 myrl joined #git
13:04 selckin kdiff3  a b orig, whatever
13:04 zivester joined #git
13:04 chilversc and then have git write that back as a merge conflict so all the standard tooling can see the conflict as normal
13:05 chilversc and so that rerere, etc can track it
13:05 fuchstronaut joined #git
13:06 marc_v92 joined #git
13:07 MeltedLux joined #git
13:07 chilversc is there a symbol such as MERGE_BASE that will tell me what commit git chose as the common ancestor for the current merge then?
13:08 nnyk_ joined #git
13:10 jceb joined #git
13:10 ochorocho__ joined #git
13:10 EY joined #git
13:12 josuebrunel joined #git
13:12 isxek joined #git
13:14 cbreak chilversc: when?
13:14 chilversc cbreak: I started a merge, one of the files is listed as deleted local, modified remote, I want to get git to re-evaluate that file against a different file instead (ie renamed)
13:14 selckin he wants to manually do what mergetool does to resolve the conflict, because a file was renamed and not detected
13:14 jimi_ joined #git
13:15 cbreak chilversc: git merge --abort
13:15 cbreak then retry the merge with copy / move detection
13:15 chilversc I don't want to abort, everything is merged but this 1 file
13:15 cbreak so do it manually?
13:15 cbreak just copy the file to where ever you want
13:16 cbreak rename and so on
13:16 hexagoxel_ joined #git
13:16 cbreak and then git add to resolve
13:16 chilversc right, hence I wanted to know what the commands were to get it in that state so that it now shows up as a conflict against the other file
13:16 chilversc and so that I get a 3-way merge (not 2 way)
13:16 cbreak git add will tell git that the conflict is gone
13:17 chilversc where the docs on the whole git show :1:./file ? I'm looking at https://git-scm.com/docs/git-show but I can't see any mention of it
13:18 mykespb joined #git
13:18 cbreak those stages are probably documented in git merge
13:18 rnsanchez_ joined #git
13:18 chilversc ah right
13:18 chilversc yup, thanks
13:19 cbreak you don't really need it though
13:19 cbreak you can checkout from the branches directly
13:19 chilversc its the simplest way to find the ancestor though
13:19 cbreak it's not an ancestor
13:20 cbreak it's the HEAD version
13:20 chilversc I thought those stages contained, our head, their head and common ancestor?
13:20 cbreak hmm...
13:20 chilversc :1: is common ancestor
13:20 cbreak one of them contains HEAD
13:20 cbreak the other the other branch
13:20 cbreak not sure about any others
13:21 star_prone joined #git
13:22 chilversc now, can you manually add a file to those stages, then I could add :1:./a.txt, etc to b.txt, and then run mergetool as normal
13:24 ggherdov Hello. I have a series of commits, say A B C D. In each of them file foo has a change. But file foo should have never been tracked; how do I get it out of these 4 commits?
13:25 italoacasas joined #git
13:25 grawity either rebase --interactive, or filter-branch
13:25 cbreak filter-branch would be simpler I think
13:26 SoRoot joined #git
13:26 ggherdov thanks cbreak grawity
13:27 Fr4n joined #git
13:28 chilversc I have to say, renames seem a lot more difficult to handle than they should be, with the main option being restart the whole merge again with '-X rename-threshold' and just hope it detects it and doesn't get any false positives
13:29 BoBeR182 joined #git
13:29 BoBeR182 Hello, my arch linux build has a git user and git group
13:29 BoBeR182 why is this?
13:29 qsx most likely to run man git-daemon
13:29 gitinfo the git-daemon manpage is available at http://jk.gs/git-daemon.html
13:30 SoRoot joined #git
13:31 mdw joined #git
13:32 mdw joined #git
13:34 exarch joined #git
13:36 notebox joined #git
13:36 jaguarmagenta joined #git
13:38 nitin_ joined #git
13:38 DolpheenDream joined #git
13:39 marchelzo joined #git
13:40 BoBeR182 left #git
13:41 grassass joined #git
13:42 kutsuya joined #git
13:44 TomyWork joined #git
13:44 EY___ joined #git
13:45 jonesinator joined #git
13:46 Macaveli joined #git
13:46 liuzhen joined #git
13:46 dsdeiz_ left #git
13:46 f3r70rr35f joined #git
13:47 madewokherd joined #git
13:47 dsdeiz joined #git
13:48 SwiftMatt joined #git
13:48 DolpheenDream joined #git
13:49 themayor joined #git
13:50 axiom_1 joined #git
13:52 OliverJAsh joined #git
13:52 AaronMT joined #git
13:53 raven-au_ joined #git
13:54 italoacasas joined #git
13:55 grill joined #git
13:55 liuzhen joined #git
13:56 dopesong_ joined #git
13:57 thiago_ joined #git
13:57 raven-au joined #git
13:57 barteks2x joined #git
13:57 JeroenT_ joined #git
13:58 ceaucari joined #git
13:58 phaleth joined #git
13:59 MattMaker joined #git
14:00 cdg joined #git
14:00 crose joined #git
14:00 grill joined #git
14:01 ncthom91 joined #git
14:01 slayerjain joined #git
14:01 nickthetait joined #git
14:02 nickthetait left #git
14:02 nickthetait joined #git
14:03 al-damiri joined #git
14:03 absk007 joined #git
14:03 fuchstronaut joined #git
14:05 frem_ joined #git
14:07 cdown joined #git
14:07 raven-au joined #git
14:07 tsherman joined #git
14:07 watabou joined #git
14:07 allcentu1 joined #git
14:09 diegoviola joined #git
14:09 david007 joined #git
14:13 raven-au_ joined #git
14:13 domgetter joined #git
14:13 Gsham joined #git
14:17 JeroenT joined #git
14:19 droidicus joined #git
14:20 ash_workz joined #git
14:22 jost_ joined #git
14:22 mohabaks joined #git
14:22 SwiftMatt joined #git
14:23 Juzzika joined #git
14:23 drodger joined #git
14:25 flufluflu joined #git
14:25 k3rn31 joined #git
14:26 sostenuto left #git
14:26 sostenuto joined #git
14:27 kfpratt joined #git
14:28 ElChicoNube joined #git
14:28 Chill_Surf joined #git
14:32 drodger joined #git
14:33 Schwarzbaer joined #git
14:35 mflow joined #git
14:37 liuzhen joined #git
14:41 t-mart_ joined #git
14:41 MadHatter42 joined #git
14:43 JeroenT joined #git
14:43 mohabaks joined #git
14:44 pungi-man joined #git
14:44 stonehammer joined #git
14:44 themayor joined #git
14:45 lamppid joined #git
14:46 Jellyg00se joined #git
14:46 lamppid joined #git
14:46 interne7y joined #git
14:47 LionsMane joined #git
14:49 dmto joined #git
14:50 jaguarma_ joined #git
14:51 Gsham joined #git
14:53 zivester joined #git
14:54 chigang_ joined #git
14:55 _nadim joined #git
14:56 shiriru joined #git
14:56 Ahmed90 joined #git
14:58 marc_v92 joined #git
14:59 MadHatter42 joined #git
14:59 mingramm_ joined #git
14:59 johtso joined #git
14:59 aavrug joined #git
15:00 MadHatter42 joined #git
15:00 kevwil joined #git
15:01 aavrug joined #git
15:01 M-sbts joined #git
15:02 kilo_bravo joined #git
15:02 lss8 joined #git
15:03 edude03 joined #git
15:04 yqt joined #git
15:04 MattMaker joined #git
15:05 aavrug joined #git
15:05 tyreld joined #git
15:06 _pix joined #git
15:06 cdown joined #git
15:07 EY___ joined #git
15:08 toogley joined #git
15:10 xlegoman joined #git
15:11 bango2 joined #git
15:13 mmlb joined #git
15:14 drodger joined #git
15:18 nadim joined #git
15:18 nnyk_ joined #git
15:19 liuzhen joined #git
15:21 aavrug joined #git
15:21 barteks2x joined #git
15:22 star_prone joined #git
15:22 aavrug joined #git
15:22 liuzhen joined #git
15:22 _nadim joined #git
15:22 Gsham joined #git
15:23 aavrug joined #git
15:24 sangy joined #git
15:27 rominron_ joined #git
15:27 _nadim joined #git
15:31 zivester joined #git
15:34 mingrammer joined #git
15:37 marc_v92 joined #git
15:37 jimi_sanchez joined #git
15:39 nadim joined #git
15:41 knutstrut joined #git
15:41 _nadim joined #git
15:42 Eabv joined #git
15:43 Gloomy joined #git
15:44 kevwil joined #git
15:46 madewokherd joined #git
15:47 robotroll joined #git
15:49 M-shine joined #git
15:49 M-mistake joined #git
15:49 M-meznak joined #git
15:49 khisanth__ joined #git
15:50 johnmilton joined #git
15:52 irco joined #git
15:53 Gsham joined #git
15:59 marchelzo joined #git
16:00 d10n-work joined #git
16:01 subhojit777 joined #git
16:03 drognan joined #git
16:03 discopatrick joined #git
16:05 drognan left #git
16:06 stonerfish joined #git
16:06 lindenle joined #git
16:07 courrier joined #git
16:08 johnmilton joined #git
16:08 Kicer86 joined #git
16:09 kpease joined #git
16:10 mohabaks joined #git
16:11 AaronMT_ joined #git
16:11 attente joined #git
16:12 IWishIKnew joined #git
16:12 synthroid joined #git
16:13 Orion3k joined #git
16:15 Gsham joined #git
16:15 dsdeiz joined #git
16:15 griffindy joined #git
16:16 zivester joined #git
16:16 josuebrunel joined #git
16:16 MattMaker joined #git
16:17 watabou joined #git
16:18 synthroid joined #git
16:19 dreiss joined #git
16:20 hashpuppy joined #git
16:20 zincrokx joined #git
16:20 Peuc joined #git
16:20 nadim joined #git
16:21 kadoban joined #git
16:21 zincrokx joined #git
16:22 zincrokx joined #git
16:23 zincrokx joined #git
16:24 livingstn joined #git
16:24 pwnawannab[NE] joined #git
16:26 fuchstronaut joined #git
16:26 TomyLobo joined #git
16:28 watabou joined #git
16:28 zincrokx joined #git
16:28 drodger joined #git
16:29 LaT0rtue joined #git
16:29 artemisart joined #git
16:33 imachuchu joined #git
16:34 monoxane joined #git
16:34 espindola joined #git
16:35 EY__ joined #git
16:36 durham joined #git
16:37 thiago joined #git
16:39 diegoaguilar joined #git
16:40 ochorocho__ joined #git
16:40 jimi_sanchez joined #git
16:42 zincrokx joined #git
16:43 jimi_sanchez joined #git
16:43 mbrzuzy joined #git
16:43 zincrokx joined #git
16:43 _nadim joined #git
16:44 zincrokx joined #git
16:44 CalimeroTeknik hi, I'm getting error: bad index file sha1 signature fatal: index file corrupt, is it normal?
16:45 zivester joined #git
16:45 zincrokx joined #git
16:45 zincrokx joined #git
16:46 dreiss joined #git
16:47 CalimeroTeknik well, seems like I can't commit anymore.
16:47 kadoban CalimeroTeknik: No. It usually mean that either something is wrong with the hard drive or computer, or some kind of bug in git occured. It's far from usual.
16:47 interne7y joined #git
16:48 nadim joined #git
16:49 neca joined #git
16:50 CalimeroTeknik ok, solved it via git push; mv .git/config .; rm -rf .git; git clone ssh://… foo; mv foo/.git .; mv config .git; rm -rf foo
16:51 bluezone joined #git
16:51 Gsham joined #git
16:52 _ikke_ CalimeroTeknik: rm .git/index would've been enough if the index was the only thing that was corrupt
16:53 Grimm_ joined #git
16:53 CalimeroTeknik it didn't seem like it was btrfs's fault this time, which sometimes IO errors when it erroneously stores files in mixed inline and non-inline extents
16:55 narendraj9 joined #git
16:56 italoacasas joined #git
16:59 Wysi joined #git
16:59 _nadim joined #git
16:59 rominronin joined #git
17:01 EvilPenguin joined #git
17:02 d4rklit3 joined #git
17:02 marc_v92 joined #git
17:05 blahz joined #git
17:05 blahz left #git
17:06 durham joined #git
17:07 sioseal joined #git
17:10 SwiftMatt joined #git
17:11 texasmynsted joined #git
17:12 EmployeeNumberSe joined #git
17:16 hahuang61 joined #git
17:17 b1tchcakes joined #git
17:17 InfoTest1 joined #git
17:18 sioseal joined #git
17:18 sioseal joined #git
17:19 nadim joined #git
17:19 aavrug joined #git
17:21 jumpman What are my options for resolving conflicts before merging?
17:22 jumpman (ie. I have a branch that I would like to make a merge request for to `develop` but I'm a couple updates behind so I'll very likely have merge conflicts)
17:22 AndroidLoverInSF joined #git
17:23 _nadim joined #git
17:23 kadoban jumpman: The usual ways are to rebase your branch on top of the current 'develop'. The other way to go would be to merge develop into your branch, that should work too. The former is probably far more used for this.
17:23 jumpman cool, thanks
17:24 kadoban 'welcome
17:26 Peuc joined #git
17:26 nadim joined #git
17:26 fuchstronaut joined #git
17:27 mikecmpbll joined #git
17:27 BubbaJo I'm migrating one of our repositories from SVN to Git and am doing a little restructuring in the process.
17:27 BubbaJo I have a branch that I'd like to merge into master as a subdirectory, maintaining full history.
17:27 texinwien joined #git
17:27 BubbaJo I have been able to do this successfully (using read-tree), but have one issue I'd like to resolve.
17:27 philipp64|work hi. I'm trying to use git-send-email (one of the Perl scripts for Git that uses Net::SMTP and Net::SMTP::SSL) and sendmail is abruptly shutting down the connection. as shown here: http://paste.fedoraproject.org/375558/25046414/ ... the client side looks like http://paste.fedoraproject.org/375546/65248863/
17:27 SteffanW joined #git
17:27 shinnya joined #git
17:28 philipp64|work balls. wrong convo. that was meant for #sendmail... ignore
17:28 MattMaker joined #git
17:29 BubbaJo The history of a file, let's say main.c, in the main directory and in subdir/main.c (from the branch) have all of the same history
17:29 BubbaJo So if I look at the git log for either file, I get all of the changes to the file along both development paths (master and the branch)
17:30 BubbaJo If possible, I'd like to treat them as two separate development paths since the branch off master was created
17:30 dreiss joined #git
17:30 acetakwas joined #git
17:31 durham joined #git
17:32 BubbaJo Where "git log main.c" would show the history of the file along the master branch and "git log subdir/main.c" would show the changes made only in the other branch (and of course in master before the branch)
17:32 rahtgaz joined #git
17:33 The_Wood_ joined #git
17:34 martinkl_ joined #git
17:35 BubbaJo As is, using "git log" on both files show the same history, even though the files themselves have not been merged into one
17:36 The_Wood_ left #git
17:36 The_Woodsman joined #git
17:36 The_Woodsman i made some changes to file A, and then made some changes to file B, all on the master branch. I want to make a new branch with only the changes I made from file B. should i git branch newBranch , git reset --hard head, and then cherry pick the commit that fixed up file B? or is there a better way?
17:39 perlpilot The_Woodsman: did you commit those changes already?
17:39 The_Woodsman yeah, the change to file A is on one commit, and the change to file B is on another commit
17:40 perlpilot then I'd make the new branch and cherry-pick.  I don't see why you'd want to reset --hard though
17:41 The_Woodsman perlpilot: wouldn't making the new branch bring over my changes to file A as well
17:42 perlpilot The_Woodsman: depends on where you make the branch.  If you branch from a commit earlier than those changes, then no
17:42 The_Woodsman perlpilot: i made the branch after everything was committed, because i lack foresight
17:42 perlpilot you can alwasy make another
17:43 perlpilot git branch NewBranch <commitish>     # branch from a particular commit.
17:44 The_Woodsman perlpilot: that looks like the way to go. thanks
17:44 zg joined #git
17:44 zg I followed the steps for setting up Git on a server, but I'm wondering, how can I create new repositories if I've restricted the git shell to being git-shell?
17:44 Dyonisos joined #git
17:45 heroux joined #git
17:45 grawity make a git-shell command that creates repositories
17:46 perlpilot zg: you might also want to look at gitolite
17:47 mikecmpbll joined #git
17:47 zg Sorry, no, I'm not going to install another piece of software to manage this for me.
17:47 editshare-ericf joined #git
17:47 romankl joined #git
17:47 fission6 joined #git
17:48 zg grawity: Something like this? http://stackoverflow.com/a/28739802
17:48 fission6 i checked out a commit how do i get back to HEAD
17:48 grawity fission6: HEAD is defined as "the currently checked out commit", so you're already there
17:48 grawity fission6: anyway, you probably want `git checkout -` or `git checkout master`
17:48 espindola joined #git
17:48 fission6 well how do i get to the latest
17:48 grawity zg: yes
17:49 grawity zg: except I'd simplify it to http://sprunge.us/VCaB
17:49 martink__ joined #git
17:50 zg Oh you :-)
17:50 moorejs joined #git
17:51 espindol_ joined #git
17:53 zg thanks grawity
17:53 zg (I also updated the answer on StackOverflow)
17:54 EvilPenguin joined #git
17:54 zg left #git
17:55 Sasazuka joined #git
17:55 moorejs left #git
17:57 piling joined #git
17:57 notebox joined #git
17:57 BubbaJo Does anyone know how to merge one branch into another as a sub-directory, preserving history without co-mingling the histories of the separate files with common ancestry?
17:58 ojacobson fission6: if you want to check out a branch, check out a branch
18:00 AaronMT joined #git
18:00 perlpilot BubbaJo: sounds like a job for subtree merge.  You can probably google that and find out how to do it.
18:00 rominronin joined #git
18:00 boudicca joined #git
18:01 sterichards joined #git
18:02 colmwalsh joined #git
18:02 aard_ joined #git
18:03 BubbaJo perlpilot: Yes, that is what I have done (subtree merge, according to multiple online resources).
18:03 sterichards I’m trying to merge a branch (feature/events) into a test develop branch (develop-events). develop-events is a copy of develop so I can test the merge as it’s quite a big merge but it’s not merging at all and claiming there are no differences in the branch although there clearly are. I’m using source tree to attempt the merge. I created a feature branch (a copy of develop (develop-events)), checked it out and then ran ‘merge
18:03 sterichards feature/events into develop’ but it’s claiming there are no differences but as I say, there cleary is. What is causing this nuisance?
18:04 BubbaJo perlpilot: Most use cases show merging a separate project into another.  I am merging one branch into another, so I think that's the problem - the files share common ancestry
18:04 fracting joined #git
18:05 rahtgaz joined #git
18:05 kevwil joined #git
18:07 colmwalsh left #git
18:07 Sleepy63 joined #git
18:10 LeMike joined #git
18:11 ShekharReddy joined #git
18:11 cbreak BubbaJo: try recursive strategy, with subtree option
18:11 chachasmooth joined #git
18:12 cbreak BubbaJo: but why do you want copies of the same file in the repository?
18:12 artemisart joined #git
18:13 ShekharReddy is there a Github app for ubuntu like there is one for windows through which we can easily push the repositories to github account
18:13 BubbaJo cbreak: I'm trying to clean up some structural issues with an old SVN repository
18:13 BubbaJo cbreak: There are two applications in branches which need to be versioned and released together, so I'm trying to merge them back into a single branch
18:14 BubbaJo cbreak: One was branched from the other originally, so the files have diverged significantly
18:14 cbreak BubbaJo: well, if merge -s recursive -X subtree=X doesn't work, just move everything into the subdirectory in the branch
18:14 cbreak commit that move
18:15 cbreak and merge the branch then
18:15 BubbaJo cbreak: Think of it as submodules, but with some common ancestry - it's a little messy
18:15 BubbaJo cbreak: I haven't even gotten to merging yet, I'm basically doing these steps to set everything up:
18:16 BubbaJo cbreak: *I mean subsequent merging
18:16 BubbaJo git merge -s ours --no-commit projectb/master
18:16 BubbaJo git read-tree --prefix=vendor/projectb/ -u projectb/master
18:16 BubbaJo git commit -m "Merge Project B into vendor/projectb/"
18:16 wald joined #git
18:16 ajf- joined #git
18:17 BubbaJo As I understand it, the first command sets up the merge point, the second actually pulls in the files (with history)
18:17 Gsham joined #git
18:17 diogenese joined #git
18:18 BubbaJo cbreak: Thanks for your suggestions, I will look into that.  Perhaps the read-tree isn't needed since all is in the same repo?
18:18 cbreak the read tree stuff is only for subtree merging
18:18 cbreak you don't need that
18:19 cbreak you would want recursive merging
18:19 jimi_sanchez joined #git
18:20 EvilPenguin joined #git
18:21 allcentu1 joined #git
18:22 ShekharReddy is there something like this   https://desktop.github.com/  the one like this for ubuntu  for ubuntu??
18:23 Raging_Hog joined #git
18:23 osse ShekharReddy: you might want to try your luck in #github if you don't get an answer here
18:24 johnny56 joined #git
18:24 ShekharReddy osse:  that channel seems inactive
18:26 Darcidride joined #git
18:26 mdw joined #git
18:26 ShekharReddy it seems that is available only for win and Mac :  check here https://news.ycombinator.com/item?id=10048100
18:26 Ahmed90 joined #git
18:26 kevwil joined #git
18:27 cbreak sourcetree is somewhat nice
18:27 cbreak and it's not bound to github either, an other advantage
18:27 eka joined #git
18:27 cbreak even has bitbucket integration
18:27 durham joined #git
18:28 BubbaJo cbreak: Hopefully you can point out what I'm doing wrong.  Using "merge -s recursive -X subtree=..." results in merging the branches at the same level, leaving only one copy of the files and tons of conflicts.  Maybe I'm using the subtree option incorrectly?
18:29 edude03 joined #git
18:29 cbreak hmm...
18:29 cbreak I would expect it to work.
18:29 ElChicoNube joined #git
18:30 Repox joined #git
18:30 cbreak BubbaJo: the way I'd do it is to move everything into a subdir in the branch before merging
18:30 cbreak but you can do it during the merge as you tried above with read tree
18:31 drodger joined #git
18:31 BubbaJo cbreak: Moving and merging didn't work either.  The files in the main branch also got moved (ie, deleted) and merged into the subdirectory.
18:31 BubbaJo That was a plain merge, should I be using a specific strategy?
18:33 BubbaJo cbreak: I haven't been able to find any examples or additional documentation on the subtree option to the recursive strategy, just the line that's in the manpage
18:34 cbreak hmm... true
18:34 cbreak because you have ancestry
18:34 BubbaJo cbreak: It seems like the merging options are doing what you'd expect: taking the two files that were branched and leaving one merged copy
18:34 multi_io joined #git
18:35 cbreak so I guess manually creating the index as you tried above is the best way
18:35 AndroidLoverInSF joined #git
18:36 BubbaJo cbreak: Yeah, that keeps two copies of the files in the repo, which is great.  But the combined development history is shown for each file, even though half of the changes shown in the history aren't actually present in said file
18:36 robotroll joined #git
18:36 cbreak BubbaJo: that doesn't matter
18:36 cbreak git history is not stored per file, it's stored for the whole repository
18:37 BubbaJo cbreak: It's very confusing: git log on a file shows commits that are not present in the file
18:37 cbreak BubbaJo: no commits are present in the file
18:37 cbreak you can reduce the rename / copy detection for git log
18:37 cbreak that makes git dumber detecting such stuff
18:38 ericvw joined #git
18:38 ELFrederich joined #git
18:38 BubbaJo cbreak: Ideally, I'd like the individual git log outputs for the two versions of the file in the merged repo to behave exactly as git log on the file in each of the branches immediately before the merge
18:39 cbreak BubbaJo: that's not something you can change by merging differently
18:39 jeffreylevesque joined #git
18:39 BubbaJo cbreak: That sounds promising (dumbing down git log), let me look into that
18:39 Fr4n joined #git
18:39 ELFrederich I was going to submit a patch/bug-fix to Git but then reading the SubmittingPatches I realized that gitk had it's own repo.  Anyone know if it is possible to clone this repo over http?
18:40 flaguy48 joined #git
18:40 MattMaker joined #git
18:40 armenzg joined #git
18:42 livingstn joined #git
18:42 stonerfish joined #git
18:42 SwiftMatt joined #git
18:44 nwkj86 joined #git
18:45 tcsc joined #git
18:45 Psychiatrist joined #git
18:45 ELFrederich anyone?... what is the process for submitting patches to gitk?
18:45 djb-irc joined #git
18:46 edude03 joined #git
18:46 SimonNa joined #git
18:47 kevwil joined #git
18:48 cdg joined #git
18:49 interne7y joined #git
18:50 webrtc2 joined #git
18:50 marc_v92 joined #git
18:50 SteffanW joined #git
18:50 robotroll joined #git
18:51 satifant joined #git
18:52 ynanm joined #git
18:53 jaguarmagenta joined #git
18:54 fuchstronaut joined #git
18:56 nilg joined #git
18:58 k3rn31 joined #git
18:59 Fr4n joined #git
18:59 rominronin joined #git
19:00 Gloomy joined #git
19:01 aavrug_ joined #git
19:02 Gsham joined #git
19:02 kevwil joined #git
19:03 fstd_ joined #git
19:04 mmlb joined #git
19:04 gbv joined #git
19:05 runnyspot joined #git
19:05 runnyspot joined #git
19:05 SirFunk joined #git
19:05 brewmaster joined #git
19:06 BubbaJo cbreak: Still no luck.  I think I forgot to mention earlier that I do have to move the branch to its subfolder before merging, otherwise the history doesn't get pulled over.
19:06 hobodave joined #git
19:07 BubbaJo cbreak: (even with read-tree)
19:07 dopesong joined #git
19:07 BubbaJo cbreak: And I have to follow renames in git log to go past the move to subdir
19:07 MacWinner joined #git
19:08 BubbaJo cbreak: I'm unable to find any git log options which will follow past the rename but only show commits along that one branch.  I think since before the move/rename, the files were the same name and location for all of their history.
19:10 Khisanth joined #git
19:10 skunkz joined #git
19:13 fuchstronaut joined #git
19:14 SJr I recently upgraded from some ungodly version of git to git 2.8.2
19:14 jstimm joined #git
19:15 SJr I recently upgraded from some ungodly version of git 1.7.1 I believe to git 2.8.2, but it seems that all my ansible managed environments are broken. It seems like I can no longer switch to a branch, "git checkout upgrade", "error: pathspec 'upgrade' did not match any file(s) known to git."
19:15 SJr Yet git ls-remote origin | grep upgrade clearly shows it to be there.
19:15 ojacobson I'm not sure what you think ls-remote does, but it has nothing to do with the places git-checkout looks for branches
19:16 SJr Oh that is in reference to the man page for git-checkout "If <branch> is not found but there does exist a tracking branch in exactly one remote (call it <remote>) with a matching name, treat as equivalent to..."
19:16 ojacobson 'git checkout NAME' will check out the existing object named NAME, if it already exists, or create a branch named NAME if the name doesn't exist _and_ NAME is a unique remote branch name as tracked in refs/remotes/REMOTE/*
19:16 ojacobson sure, but it uses the local view of remote repos, not the remote view
19:16 SJr Yeah, and if I do a fetch I should be up to date should I not?
19:16 ojacobson `git fetch` maintains that local view; git-checkout (intentionally) doesn't do network operations
19:17 jimi_ joined #git
19:17 aavrug_ joined #git
19:17 SJr $git fetch && git checkout upgrade error: pathspec 'upgrade' did not match any file(s) known to git.
19:17 wel1 joined #git
19:17 ojacobson I wouldn't rely on the "autocreate tracking branches" behaviour in automated use, anyways - it's more of a human-facing feature
19:17 ojacobson be explicit about what you expect, instead
19:17 cdown joined #git
19:17 b1tchcakes joined #git
19:18 ojacobson eg. `git checkout origin/upgrade -b upgrade` or `git clone -b upgrade URL` or what have you
19:18 SJr git checkout origin/upgrade -b upgrade
19:18 SJr fatal: Cannot update paths and switch to branch 'upgrade' at the same time.
19:18 SJr Did you intend to checkout 'origin/upgrade' which can not be resolved as commit?
19:18 SJr whoops sorry for the multi line
19:18 SJr I'm not doing this manually, ansible is doing this and it is crashing, as is multiple years of git experience. :)
19:19 ojacobson where do you expect `upgrade` to be coming from?
19:19 ojacobson Because it strongly sounds like it's not there :)
19:20 somebody__ joined #git
19:20 SJr Yes and that's why I showed you ls-remote origin :)
19:20 b1tchcakes joined #git
19:21 SJr We have two classes of environments, one that is our 'development server' environments and the other that is our local vm ones. The new version of git has no problem on the vms, But on the dev servers it has a problem.
19:21 SJr If I had to venture a guess, I think it is because on our dev servers we do a shallow git clone
19:21 Laoy joined #git
19:21 ojacobson Be explicit about all the steps, then: `git fetch origin && git checkout -b upgrade origin/upgrade --`
19:22 paul424 joined #git
19:22 Schwarzbaer joined #git
19:22 Wysi joined #git
19:22 somebody__ hey folks.. i was in a branch, and when i did git push -f  it force pushed both the branch and master..  how do i stop that from happening?
19:23 somebody__ it's configured to 'matching'
19:23 SJr git version && git fetch origin && git checkout -b upgrade origin/upgrade -- \n git version 2.8.2\n fatal: invalid reference: origin/upgrade
19:24 somebody__ SJr: is that aimed at me?
19:24 stonerfish joined #git
19:24 SJr Nope that's aimed, at Mr. ojacobson
19:25 SJr somebody__, I think you want to specify a branch when you do push.
19:25 SJr Also probably don't use -f :)
19:26 cdown joined #git
19:26 dsdeiz joined #git
19:26 star_prone joined #git
19:26 ojacobson Where's the fetch output?
19:27 ojacobson somebody__: that's what matching does
19:27 SJr ojacobson there is none, but it is returning 0
19:27 ojacobson if you don't specify at least one push spec, git-push in matching mode will match local branches by name with branches in the remote, and push all of the pairs it finds
19:27 star_prone joined #git
19:27 ojacobson hm. What does `git show-ref` output in that repo?
19:28 somebody__ ojacobson: ok, i didn't realize that, i wanted the "original" default, and it mentioned something about simple being the new thing, and matching being the old thing so i set it to matching
19:28 somebody__ i think i'm more used to current or upstream
19:28 SJr 3e3e127909509c77e6d40d3613508150d377bd6d refs/heads/3.6.0 \n 3e3e127909509c77e6d40d3613508150d377bd6d refs/remotes/origin/3.6.0  \n 3e3e127909509c77e6d40d3613508150d377bd6d refs/remotes/origin/HEAD \n c11d5476806936918ca5f8a7a98d5a4ef56ae9d3 refs/tags/rc1.43.0_m1
19:29 Psychiatrist joined #git
19:29 jumpman When looking at a `git diff`, how can I tell which one is which?
19:30 ataldis joined #git
19:30 ojacobson SJr: ah, you have some unusual fetch specs. `git config --get-all remote.origin.fetch` will probably show it
19:30 Wnalr joined #git
19:30 ojacobson jumpman: the - side of the diff is the state in the first argument, the + side of the diff is the state in the second argument
19:31 jumpman ruh roh
19:31 SJr $git config --get-all remote.origin.fetch \n +refs/heads/3.6.0:refs/remotes/origin/3.6.0
19:32 ojacobson there you go, then
19:32 ojacobson that remote will only ever fetch the branch 3.6.0
19:32 ojacobson step one: figure out what's setting that and why
19:32 ojacobson step two: figure out what to do about it
19:32 somebody__ ojacobson: another dumb q, how do i make git grab the remote branch when i git co -b <branch> the first time ?
19:32 jumpman so it says, "Your branch and 'origin/sidebar-expansion' have diverged, and have 10 and 1 different commit each, respectively."
19:32 jumpman which has the 10 commits and which has the 1 commit?
19:32 markmarkmark joined #git
19:33 netj joined #git
19:34 texinwien joined #git
19:35 ojacobson you have ten new commits
19:35 ojacobson origin/sidebar-expansion has one new commit
19:35 ams__ joined #git
19:36 jmj joined #git
19:37 ataldis I'm getting "0 [main] perl 4784 child_info_fork::abort: address space needed by 'msys-apr-1-0.dll' (0x410000) is already occupied" with standard msys git bash under windows. Any ideas what might fix?
19:38 webrtc2 left #git
19:40 mdw_ joined #git
19:40 Foc joined #git
19:40 emlun joined #git
19:41 Peuc joined #git
19:41 jumpman what does '-n' do? it seems to be an alias for dry-run?
19:42 ash_workz joined #git
19:44 jumpman [-n | --dry-run] that's gotta be it
19:44 Fazh joined #git
19:45 SJr ojacobson, so if I clone the repo to a new folder manually I can switch branches between 3.6.0 and upgrade no problem. If I then do the following and create a new repo (via ssh because I want to use --depth) git clone -b 3.6.0 --depth 1 user@127.0.0.1:/home/user/git2/repo/.git/ that has the same behaviour that we are seeing. If I remove --depth 1 it no longer has that behaviour.
19:45 mischat joined #git
19:45 Psychiatrist joined #git
19:46 T4nkAbb0t joined #git
19:47 T4nkAbb0t If I create a tag on the final commit of branch A, when I merge branch A to Branch Master, will that tag be affected at all?
19:47 ojacobson tags only move if you move them
19:47 T4nkAbb0t I am not certain exactly how to ask this question. Hope ya'll understand what I am looking for
19:47 T4nkAbb0t but
19:47 SJr No, T4nkAbb0t
19:47 T4nkAbb0t tags aren't branch dependent
19:47 T4nkAbb0t they are commit depended
19:47 T4nkAbb0t and the tag exists on remote already
19:48 T4nkAbb0t then I merged the branch A into master.
19:48 lunarmage joined #git
19:48 T4nkAbb0t SJr, So, if someone looks at that tag, they won't know whether it refers to master or branch A, jsut that they can pull that commit and it will be correct based on the tag (aka, a version increase from 1.3.5 to 2.0.0)
19:49 SnoopyDgg joined #git
19:49 SJr yeah, they could determine if master or branch A are still pointing at that commit, they can also figure out whether it is an ancestor of whatever they point to, if they really want.
19:52 mikecmpbll joined #git
19:53 MattMaker joined #git
19:55 raijin joined #git
19:55 allcentu1 joined #git
19:56 toogley joined #git
19:57 Darcidride joined #git
19:58 mdw joined #git
19:58 santa-fire joined #git
19:59 SJr ugh yes, so in the new version of git the fetch gets scoped way down only to the branch, and the old version still wildcarded.
20:00 m0viefreak joined #git
20:00 nitin joined #git
20:00 cdown joined #git
20:00 rominronin joined #git
20:01 star_prone joined #git
20:03 italoacasas joined #git
20:03 mikecmpbll joined #git
20:04 Darcidride joined #git
20:04 durham joined #git
20:05 Silenced joined #git
20:06 ojacobson I wonder if someone along the way changed --shallow to imply --single-branch
20:06 ojacobson I didn't see a changelog to that effect, but it's easy to check manually
20:06 ojacobson in any case, that seems like what you're seeing, so either reset the fetch spec using git-remote or using git-config, or ensure you;re not using single-branch clones
20:06 raijin joined #git
20:07 Silenced joined #git
20:07 dopesong joined #git
20:09 orbyt_ joined #git
20:10 osse my manpage specifically states that --shallow implies --single-branch
20:11 osse wait... you mean --depth right+
20:11 BubbaJo cbreak: FYI, I found a unsatisfactory workaround, but would like to know if you have any other ideas.
20:12 inflames joined #git
20:12 BubbaJo cbreak: Basically, I located the first commit on each branch after the initial split, and I can use --ancestry-path to just get the changes on one of the development paths.  Doesn't work well in GUIs, etc
20:14 codeman joined #git
20:15 Gitzilla joined #git
20:19 radsy joined #git
20:19 Gsham joined #git
20:20 NwS joined #git
20:21 eijk joined #git
20:22 ahr3n joined #git
20:23 diegoaguilar joined #git
20:24 interne7y joined #git
20:26 ELFrederich joined #git
20:26 ELFrederich is there a way to instruct Git that a particular file is already compressed and not to compress it again?
20:26 durham joined #git
20:26 emlun left #git
20:26 fuchstronaut joined #git
20:26 josuebrunel joined #git
20:27 arooni joined #git
20:28 cdown joined #git
20:31 dhollinger joined #git
20:31 yqt joined #git
20:32 nqra joined #git
20:32 GavinMagnus joined #git
20:33 eijk joined #git
20:33 dsdeiz joined #git
20:33 rom1504 no
20:35 kevwil joined #git
20:37 mda1 joined #git
20:39 ojacobson zlib will do something approximately that already
20:39 Edyaa joined #git
20:40 ojdo joined #git
20:43 nwkj86 joined #git
20:46 tomog999 joined #git
20:54 jaguarmagenta joined #git
20:55 italoacasas joined #git
20:56 TheRealZambini joined #git
20:57 grawity the zlib compression for loose objects isn't going to matter most of the time
20:57 _Patrycjerz joined #git
20:57 mase-tech joined #git
20:58 SwiftMatt joined #git
20:59 grawity but if that particular file tends to change over time, I guess the delta compression when packing might have a hard time with it
20:59 radsy joined #git
20:59 grawity for that, there's -delta in `man gitattributes`
20:59 gitinfo the gitattributes manpage is available at http://jk.gs/gitattributes.html
21:01 EvilPenguin joined #git
21:01 rominronin joined #git
21:02 bruce_lee joined #git
21:03 xbob joined #git
21:05 jeffreylevesque joined #git
21:05 fscala joined #git
21:06 eletuchy joined #git
21:09 mmlb joined #git
21:10 eletuchy_ joined #git
21:12 orbyt_ joined #git
21:12 boombatower joined #git
21:12 rnsanchez_ joined #git
21:13 mellernoia joined #git
21:13 eletuchy joined #git
21:14 ElChicoNube joined #git
21:16 eletuchy_ joined #git
21:19 eletuchy joined #git
21:20 durham joined #git
21:20 cdown joined #git
21:21 GT joined #git
21:24 IWishIKnew joined #git
21:29 Guest54 joined #git
21:32 bilb_ono joined #git
21:33 nnyk_ joined #git
21:33 bilb_ono I want to totally reset to the remote version of a branch -develop
21:33 bilb_ono how can I do that? git reset —hard HEAD resets to my local copy
21:33 bilb_ono git pull says its already up to date
21:34 neanderslob joined #git
21:34 neanderslob_ joined #git
21:36 neanderslob joined #git
21:37 _rnsanchez_ joined #git
21:39 Guest54 left #git
21:42 nilsi joined #git
21:42 EduardoMartins joined #git
21:43 holodoc joined #git
21:44 eijk joined #git
21:44 rgrinberg joined #git
21:45 osse bilb_ono: git reset --hard origin/develop
21:45 osse bilb_ono: or whatever the correct name of the remote branch is
21:46 KevinMGranger Also, you're sure resetting is what you want to do?
21:46 KevinMGranger git pull seems to imply your current branch is already public-- if you reset to another branch with different history and push, you'll be overwriting public history
21:49 bollullera joined #git
21:50 diegoviola joined #git
21:51 mdw joined #git
21:52 harish joined #git
21:54 josuebrunel joined #git
21:54 MattMaker joined #git
21:57 fission6 joined #git
21:58 madewokherd joined #git
22:00 CheckDavid joined #git
22:02 bilb_ono ok so I make my changes to feature/my-branch. I do git status, see that I modified file.py. I do git add file.py, git commit file.py
22:02 bilb_ono git checkout develop (to switch)
22:02 bilb_ono git reset —hard origin/develop
22:02 bilb_ono verify that those changes are no longer there
22:02 rominronin joined #git
22:03 bilb_ono THEN git checkout feature/my-branch
22:03 bilb_ono and the changes are gone?
22:03 bilb_ono what did I miss?
22:03 bilb_ono I commited the file
22:05 tremblerz joined #git
22:06 FeersunEndjinn joined #git
22:06 KevinMGranger Then when you first committed, you weren't on feature/my-branch. That's the only explanation
22:06 KevinMGranger or the git checkout develop failed
22:06 KevinMGranger check your reflog
22:06 tremblerz how do I remove an in-between unwanted commit ?
22:06 endiruna joined #git
22:07 preaction tremblerz: !revert
22:07 gitinfo tremblerz: 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]?
22:07 KevinMGranger probably an interactive rebase
22:07 preaction tremblerz: if you want that commit to never have existed entirely, rebase -i
22:09 drodger joined #git
22:09 tremblerz preaction: but after that unwanted commit I made some commits which I want to preserve
22:09 preaction right, you said that
22:09 KevinMGranger rebase -i will do it for ya. It slices, and it dices
22:09 mmlb joined #git
22:10 preaction did you push? can you rewrite history? do you want to rewrite history? do you just want to remove the changes in that commit?
22:10 DolpheenDream joined #git
22:12 tremblerz nano has opened up with only one line ( except comments ) having noop
22:12 tremblerz what is this noop ?
22:13 preaction it's a no-op. because you likely didn't specify which commits to rebase
22:13 preaction and are you sure this is what you want to do?
22:13 tremblerz So I have to use it like HEAD~5 right ?
22:13 preaction if you answer the questions i asked, i could advise you on which you really want
22:14 hahuang61 joined #git
22:14 tremblerz it is the 3rd last commit which I want to remove
22:17 KevinMGranger their other questions still apply
22:17 dopesong joined #git
22:18 rahtgaz joined #git
22:19 tremblerz Ok.....  I didn't push. Yes I can rewrite history. Not sure about this. Yes
22:19 orbyt_ joined #git
22:20 tremblerz preaction: thanks it is done
22:20 preaction then you likely just want revert
22:20 preaction as in git revert <commit>
22:20 tremblerz though I did through git rebase -i
22:21 tremblerz It would be great if you guys can help me in this http://stackoverflow.com/questions/6485508​/git-interactive-rebase-no-commits-to-pick
22:22 tremblerz sorry this http://stackoverflow.com/questions/37685903​/how-to-merge-a-branch-from-git-to-git-svn
22:23 edude03 joined #git
22:24 rnsanchez_ joined #git
22:25 k3rn31 joined #git
22:28 fuchstronaut joined #git
22:28 pwnawannab[NE] joined #git
22:29 YoLoGrimm joined #git
22:32 snfgf joined #git
22:33 tlaxkit joined #git
22:34 tremblerz left #git
22:38 interne7y joined #git
22:40 jstimm joined #git
22:45 Rodya_ joined #git
22:46 Grimm_ joined #git
22:47 spoonUltra joined #git
22:47 spoonUltra joined #git
22:50 smithbone joined #git
22:51 philipp64|work joined #git
22:52 larsrustand_ joined #git
22:52 blur3d joined #git
22:54 eletuchy_ joined #git
22:55 jaguarmagenta joined #git
22:55 mischat joined #git
22:56 philipp64|work joined #git
22:57 jimi_ joined #git
22:57 Noldorin joined #git
22:58 eletuchy joined #git
22:59 WaReZ joined #git
23:00 eletuch__ joined #git
23:00 dopesong joined #git
23:03 eletuchy_ joined #git
23:04 rominronin joined #git
23:04 Mobutils joined #git
23:06 eletuchy joined #git
23:08 GavinMagnus left #git
23:09 whatevsz joined #git
23:10 boz_v1 joined #git
23:11 italoacasas joined #git
23:11 Noldorin joined #git
23:12 eletuchy_ joined #git
23:13 hahuang61 joined #git
23:14 eletuch__ joined #git
23:14 aavrug__ joined #git
23:15 eletuchy joined #git
23:17 keepguessing joined #git
23:18 keepguessing I have a .gitignore file and it has file call ssh.config specified in it. However when I edit this file the git is not ignoring this. Any idea why?
23:19 preaction because it's already in git
23:19 preaction !ignore
23:19 gitinfo [!ignore_dir] Git doesn't track directories, so you can't ignore them. If you want them ignored, ignore the files in the directory. Matching a directory in .gitignore means you ignore all files in that directory
23:19 eletuchy_ joined #git
23:19 preaction !ignore_tracked
23:19 gitinfo Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
23:19 keepguessing its a file.
23:19 Saxon joined #git
23:19 preaction yes, you said. i didn't get the right trigger
23:20 keepguessing Well there are other files that are in git and I was able to ask it to ignore them.
23:21 eletuch__ joined #git
23:21 preaction you can't use gitignore for files that are already tracked
23:21 EvilPenguin joined #git
23:22 keepguessing preaction: I did do git rm --cached on it. it shows git status as deleted ssh.config
23:22 preaction yes, because you deleted it from the repository
23:22 arescorpio joined #git
23:22 preaction that's what "git rm --cached" does. it's gone from the repo, but it's still in your working tree
23:23 preaction what are you trying to achieve here? why do you want to ignore this file?
23:23 keepguessing preaction: I have added custom changes to it.
23:23 keepguessing preaction: I do not want that to prevent me from moving to different branch.
23:24 keepguessing I want git to ignore changes to this file.
23:24 eletuchy joined #git
23:24 preaction so read the link, there are lots of options, one of which should work for you. the best option being "make the app allow another config file"
23:25 keepguessing preaction: thanks. will do.
23:26 Noldorin joined #git
23:27 keepguessing preaction: read it. these do not help me. My file is already committed.
23:27 eletuchy_ joined #git
23:27 keepguessing My situation may be different and I am either unable to express the problem or understand the suggestions.
23:27 preaction and way at the bottom: What about "git update-index --skip-worktree"
23:28 preaction did you actually understand all of it? 2 minutes isn't that long...
23:29 preaction because here, in "If you can't modify your application" under bullet point 4: Not recommended: If all of the previous suggestions won't work for some reason, look at the "assume unchanged" section in man git-update-index. Anyone who's tried this normally ends up hating it.
23:29 gitinfo the git-update-index manpage is available at http://jk.gs/git-update-index.html
23:29 preaction and bullet point 2: Use some gitattributes clean/smudge magic as suggested by SethRobertson, see the other file in this gist.
23:29 preaction but now i'm just copy/pasting the file you already read
23:30 eletuchy joined #git
23:31 keepguessing preaction: I am trying that one specifically.
23:31 preaction and?
23:31 keepguessing preaction: the "assume-unchanged"
23:31 preaction okay, can you stop pinging me? we're the only two people talking
23:31 keepguessing I already ran git rm it says cannot find the file.
23:32 sangy joined #git
23:32 preaction right. you have to put it back now
23:32 keepguessing it still shows up as "modified"
23:32 eletuch__ joined #git
23:32 Sasazuka joined #git
23:33 keepguessing I will look at the manpage of update-index
23:33 preaction even after the assume-unchanged?
23:33 keepguessing yes
23:33 ozette joined #git
23:34 preaction then i don't know, because that's exactly what assume-unchanged does
23:36 eletuchy joined #git
23:36 keepguessing Ok I had to reset the file and then do the assume-unchanged
23:36 Rodya_ joined #git
23:37 mattfoo joined #git
23:37 ToBeCloud joined #git
23:38 eletuchy_ joined #git
23:38 shgysk8zer0 joined #git
23:41 larsrustand joined #git
23:41 eletuchy joined #git
23:42 bittin joined #git
23:44 eletuchy_ joined #git
23:46 eletuch__ joined #git
23:47 Mobutils joined #git
23:48 Lyqyd joined #git
23:48 bollullera left #git
23:49 larsrustand_ joined #git
23:49 Sasazuka joined #git
23:49 eletuchy joined #git
23:53 eletuchy_ joined #git
23:55 ozette left #git
23:56 Ph_ joined #git
23:56 deepa joined #git
23:56 eletuchy joined #git
23:57 Blkt joined #git
23:57 multi_io joined #git
23:59 AlexRussia joined #git
23:59 eletuchy_ joined #git
23:59 b1tchcakes joined #git

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