Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-30

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

All times shown according to UTC.

Time Nick Message
00:06 adambrenecki GyrosGeier: Wouldn't merging in the old history using -s ours have a similar effect?
00:06 lvns joined #git
00:06 adambrenecki that way the 'bad' history looks like it's already merged
00:07 GyrosGeier no
00:07 GyrosGeier the merge commit would still reference the old data
00:08 romerocesar joined #git
00:08 GyrosGeier the goal isn't just to get the files out of the working tree, but retroactively remove them from history, so the objects can be removed
00:14 UserOO7 joined #git
00:15 SwiftMatt joined #git
00:21 VagabondAzulien joined #git
00:21 dsantiago joined #git
00:22 aarcane joined #git
00:23 jokajak joined #git
00:24 sangy joined #git
00:25 ljc joined #git
00:27 rbern joined #git
00:27 NeverDie_ joined #git
00:30 SwiftMatt joined #git
00:30 arancio joined #git
00:30 arancio left #git
00:31 bluepixel joined #git
00:32 drinfernoo joined #git
00:32 drinfernoo hello all \o
00:32 gitinfo drinfernoo: 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.
00:33 daynaskully joined #git
00:33 drinfernoo quick question, i hope lol
00:33 drinfernoo i have two modules in my project, using Android studio, and I'm hoping to push them to separate remote repos. is that doable?
00:35 Synthead joined #git
00:35 daishan joined #git
00:36 d^sh joined #git
00:37 deltab drinfernoo: yes. are they submodules, with their own .git directories?
00:37 drinfernoo let me double check
00:38 Kaisyu joined #git
00:38 drawkula joined #git
00:38 drinfernoo deltab, no
00:39 drinfernoo they're just both in the same project, i guess? lol
00:39 ljc joined #git
00:40 deltab okay
00:40 drinfernoo in my project root folder, i have a .git folder, and also the two folders for my modules
00:40 drinfernoo among other things like.gradle, etc
00:40 deltab (if they were separate, you could cd into each and set their own remotes, push, etc.)
00:41 deltab you can separate out the histories of the modules using git subtree
00:42 ljc joined #git
00:42 deltab that'll create a branch for a subdirectory with the relevant commits rewritten to only contain the contents of that subdir
00:42 drinfernoo if it helps, i haven't made any commits containing the new module
00:43 rkazak joined #git
00:43 deltab you can then push the branch for each module to the appropriate remote
00:44 daynaskully joined #git
00:44 deltab ah okay, you can choose to do it either way
00:45 drinfernoo are you familiar with the process in android studio? or intellij, since it's based on that?
00:45 deltab no
00:46 uidzer0 joined #git
00:46 drinfernoo what about in the GitHub client?
00:46 drinfernoo I'm just not very familiar with command line git
00:47 uidzer0 joined #git
00:47 deltab no, sorry
00:47 boombatower joined #git
00:47 drinfernoo so how would i go about it via command line?
00:48 mda1 joined #git
00:48 d0nn1e joined #git
00:49 raijin joined #git
00:49 deltab git submodule for the former, git subtree for the latter
00:49 mizu_no_oto joined #git
00:50 jaguarmagenta joined #git
00:50 drinfernoo what would be the difference?
00:51 drinfernoo ah, should i push my previous changes first, or should that not matter?
00:52 deltab with submodules you have a nested repo for each module, and they work independently, but the parent repo has to have special configuration, and you have to commit changes to the modules and the parent separately
00:55 deltab with subtrees you have only one repo, with special branches for the modules
00:55 drinfernoo but can i push those to different remote repos?
00:55 deltab yes
00:56 drinfernoo so something like:
00:56 deltab when you push you can name specific branches to push
00:56 drinfernoo git subtree split --p /othermodule
00:57 drinfernoo oh and also
00:57 drinfernoo -b to make a new branch
00:59 nettoweb joined #git
00:59 chaos-zhang joined #git
01:00 mkopriva joined #git
01:00 fahadash joined #git
01:05 arescorpio joined #git
01:05 crayon joined #git
01:07 cdg joined #git
01:22 Lyqyd joined #git
01:23 Gsham joined #git
01:28 mattcen joined #git
01:28 snowkidind joined #git
01:29 BenderRodriguez joined #git
01:33 snowkidind joined #git
01:33 ollien_ left #git
01:34 nettoweb joined #git
01:35 kai__ joined #git
01:35 lightstalker joined #git
01:42 Orion3k joined #git
01:46 pks joined #git
01:47 evanwang joined #git
01:49 fakenerd joined #git
01:51 MattMaker joined #git
01:52 zivester joined #git
01:54 mkopriva joined #git
01:54 d^sh joined #git
01:55 iateadonut joined #git
01:55 Vampire0_ joined #git
01:57 harish joined #git
01:57 ochorocho__ joined #git
01:57 A5101 joined #git
02:01 jrahmy_ joined #git
02:03 hahuang65 joined #git
02:04 spudowiar joined #git
02:04 optraz joined #git
02:06 clarens0000 joined #git
02:06 pijiu joined #git
02:07 Gsham joined #git
02:07 pijiu joined #git
02:08 durham_ joined #git
02:09 Aces_Charles joined #git
02:09 pijiu3 joined #git
02:11 pijiu3 joined #git
02:12 ResidentBiscuit joined #git
02:13 Goplat joined #git
02:14 danslo joined #git
02:20 Gsham joined #git
02:20 HoierM joined #git
02:21 ljc joined #git
02:21 unbalancedparen joined #git
02:22 lvns joined #git
02:22 harish joined #git
02:25 varx joined #git
02:25 hexagoxel joined #git
02:32 Dougie187 joined #git
02:33 star_prone joined #git
02:38 fstd_ joined #git
02:38 chachasmooth joined #git
02:45 mizu_no_oto joined #git
02:45 rafalcpp joined #git
02:46 sssilver joined #git
02:46 pijiu3 joined #git
02:46 zacts joined #git
02:46 Prisoner-2460_1 joined #git
02:47 lagothri1 joined #git
02:49 mkopriva joined #git
02:49 ytl joined #git
02:51 ahr3n joined #git
02:56 pijiu2 joined #git
03:00 sandstrom joined #git
03:04 darkbit joined #git
03:04 mingrammer joined #git
03:11 Atrumx joined #git
03:15 danslo joined #git
03:15 clemf joined #git
03:17 EY joined #git
03:18 rafalcpp joined #git
03:19 vassagus joined #git
03:20 raijin joined #git
03:21 justan0theruser joined #git
03:25 sssilver joined #git
03:27 durham joined #git
03:27 durham joined #git
03:30 harish joined #git
03:31 Darren_ joined #git
03:34 Dougie187 left #git
03:38 duderonomy joined #git
03:39 daftbun joined #git
03:39 a_thakur joined #git
03:39 daftbun hi
03:39 daftbun i have a git prob
03:40 daftbun i branched B off A
03:40 daftbun made custom changes to B
03:40 daftbun and now A has been changed
03:41 sssilver joined #git
03:41 daftbun so i'm in branch B
03:41 daftbun and i want to do git merge A
03:41 daftbun will this work?
03:41 daftbun when i do it goes to the commit screen
03:41 daftbun and says you want to merge A with B
03:44 d4rklit3 joined #git
03:45 daftbun nvm
03:50 kadoban daftbun: Sounds like you already figured it out, but sure that's a possibility.
03:51 daftbun i just didn't realize merging makes you auto commit
03:51 daftbun :o
03:51 daftbun what if there was a conflict!
03:52 kadoban daftbun: Then it tells you you have to fix it first.
03:52 daftbun ok
03:52 kadoban daftbun: You can use --no-commit if you don't like it commiting automatically, but it's not usually a problem at all.
03:52 daftbun so another naive question
03:52 daftbun i have my code on a server
03:52 daftbun which is on branch A
03:52 jrahmy_ joined #git
03:52 daftbun and i'ma bout to checkout branch B
03:53 daftbun i'm safe to checkout branch A
03:53 daftbun if anything goes wrong
03:53 daftbun A is update to date on the server
03:53 daftbun is this correct?
03:53 daftbun do i need to register anything for historical reference just in case
03:54 daftbun kadoban?
03:54 daftbun :(
03:55 Silenced_v2 joined #git
03:55 phroa if you want to see a history of commits you've checked out, it's always available in the `man git-reflog`.  besides, the server isn't update until you tell it you've done something :)
03:55 gitinfo the git-reflog manpage is available at http://jk.gs/git-reflog.html
03:56 d4rklit3 joined #git
03:56 Silenced_v2 joined #git
03:57 daftbun o cool thanks
03:58 kadoban daftbun: I don't really understand the question, sorry.
03:58 daftbun ok
03:58 ochorocho__ joined #git
03:58 daftbun sooo...
03:58 phroa kadoban: checking out B won't remove A from the server
03:58 daftbun cool
03:58 daftbun so i'm safe
03:58 daftbun to just checkout it out
03:58 daftbun and test it
03:58 phroa very
03:58 daftbun and then checkout A if it goes wrong
03:58 daftbun YAY
03:58 daftbun :D
03:58 daftbun I LOVE GIT
03:59 ljc joined #git
03:59 marcm joined #git
03:59 mingrammer joined #git
04:00 phroa zzz
04:01 a10c joined #git
04:01 hahuang65 joined #git
04:01 thecomedian joined #git
04:02 a10c joined #git
04:02 Motoko joined #git
04:03 dreiss joined #git
04:03 daftbun hi
04:03 daftbun is it possible
04:03 daftbun to checkout everything from branch A except for file [FILEA]
04:04 daftbun i'm getting this
04:04 daftbun error: You have local changes to 'FILEA'; cannot switch branches.
04:04 daftbun FILEA is a jar..
04:05 daey_ joined #git
04:05 EY joined #git
04:06 jeffreylevesque joined #git
04:08 bugzbunny joined #git
04:09 Anupkumar joined #git
04:10 mehola joined #git
04:12 daftbun hello?
04:14 dreiss joined #git
04:15 Raging_Hog joined #git
04:16 danslo joined #git
04:17 ycon_ joined #git
04:17 ycon_ Hi all, I want to start a project from scratch (as I messed up my first commit as there was a random .git file there).
04:17 ycon_ How do I remove all traces of git to start again? I've done rm -rf *.git at the root dir, but it still is there I think
04:18 ycon_ Ah, "rm -rf .git" will do it?
04:19 vassagus joined #git
04:22 nchambers joined #git
04:26 dreamyspell joined #git
04:31 a10c joined #git
04:31 LeBlaaanc joined #git
04:32 satya4ever joined #git
04:33 ericsupreme joined #git
04:33 settermjd joined #git
04:40 EY joined #git
04:41 milki o.O
04:43 jmd joined #git
04:43 bugzbunny left #git
04:44 jmd I need to GPG-sign a whole bunch of commits.  How can I do this?
04:45 romerocesar joined #git
04:45 drbean joined #git
04:45 kadoban jmd: Sign a tag pointing to the most-recent one, if they're all reachable from that.
04:45 kadoban (it's the same security guarantee)
04:46 afuentes joined #git
04:46 jmd kadoban: I dunno if the server will accept that, but I will try.
04:46 nidr0x joined #git
04:48 nidr0x joined #git
04:50 LUMIA930 joined #git
04:52 jmd kadoban: Nahh. I must sign every commit.
04:53 kadoban jmd: Is this to satisfy some hook, or what?
04:53 jmd Yes.
04:53 _ikke_ yay...
04:55 a10c_ joined #git
04:58 bocaneri joined #git
04:58 KrasPvP joined #git
04:59 KrasPvP Hello all :)
04:59 gitinfo KrasPvP: 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.
04:59 _ng joined #git
05:01 _ng joined #git
05:03 Gurkenglas joined #git
05:09 subhojit777 joined #git
05:09 aavrug joined #git
05:10 phanimahesh joined #git
05:11 A5101 joined #git
05:11 aavrug joined #git
05:13 rubyonrailed joined #git
05:18 danimal2 joined #git
05:25 stuh84 joined #git
05:28 tjone270 joined #git
05:30 rkazak joined #git
05:32 Grievar left #git
05:32 freimatz joined #git
05:36 hahuang65 joined #git
05:39 Kulrak joined #git
05:39 Kulrak joined #git
05:39 Elronnd joined #git
05:40 Elronnd Is there a way to, in a .gitignore, say "Ignore all files in this directory except for this one"?
05:40 armyriad joined #git
05:41 mkoskar joined #git
05:41 Elronnd nvm, found it
05:41 Elronnd left #git
05:42 dreiss joined #git
05:43 cyan__ joined #git
05:47 mingrammer joined #git
05:48 MatthewAllan93 joined #git
05:51 axsuul joined #git
05:51 settermjd joined #git
05:51 axsuul When I'm running `git commit -a`, it complains that it cannot read this weird file in ~/.stCommitMsg, google shows nothing. Any ideas?
05:53 tvw joined #git
05:54 thiago what is the exact error message?
05:55 rchavik joined #git
05:55 axsuul fatal: could not read '/Users/axsuul/.stCommitMsg': No such file or directory
05:55 axsuul thiago: ^
05:56 thiago my guess is that that file is your commit template
05:56 thiago git config -l | grep stCommitMsg
05:56 thiago anything?
05:57 kozie joined #git
05:57 axsuul thiago: yep! commit.template=/Users/axsuul/.stCommitMsg
05:57 axsuul what does this mean?
05:57 thiago there you go
05:57 thiago that means git will use that file as the template for commit messages
05:57 rscata joined #git
05:57 axsuul I see, how do I reset it?
05:58 thiago git config --unset commit.template
05:58 kozie Hi there, i'm having a minor issue with git on mac. I had git for some time now on my Mac. It was the built in (?) git. i'm also using zsh (oh-my-zsh). I could type 'git checkout somebranch<tab>' and it would autocomplete, case insensitive
05:58 ImNotQ009 joined #git
05:59 axsuul thiago: odd, it's still there after running that
05:59 kozie now i installed a newer git with brew, all nice.. but now the auto complete for branches is case sensitive
05:59 ochorocho__ joined #git
05:59 axsuul thiago: nm, i added --global
05:59 axsuul thiago: thank you :)
05:59 kozie i tried various settings in my zshrc, zsh completions, git completions but nothing helped so far
05:59 ImNotQ009 Hello. I have quite a problem which I hope you could help me with. My local branch is ahead of origin/mater by 2 commits? How do I fix that? I did git pull --rebase but that didn't help
06:00 kozie @ImNotQ009 if it's ahead, you need to push it right.. otherwise if you want to roll back to original state (from remote) you have to do git checkout --hard HEAD, right ?
06:00 kozie @ImNotQ009 let me check that first
06:00 ImNotQ009 I made quite a mess trying to undo a bunch of things, in the end failing misrea miserably
06:01 kozie @ImNotQ009 i mean git reset --hard HEAD if you want to go to origin state.. you will lose changes you made tho ;)
06:01 thiago kozie: branch names are case sensitive
06:02 ImNotQ009 kozie: I don't want to push, I want to abandon the changes It says --hard is not avalid option for checkout
06:02 kozie @ImNotQ009 sorry, i meant reset, not checkout ;)
06:02 thiago ImNotQ009: you made commits. Do you want to remove them?
06:02 iskander_work joined #git
06:02 ImNotQ009 kozie: yeah, I did hard reset earlier
06:03 ImNotQ009 thiago: correct
06:03 ImNotQ009 I just want to reset to the state it was before I made this mess
06:03 thiago ImNotQ009: git reset --hard @{u}
06:03 kozie @thiago tnx, but how did it work before i installed the newer git? i know they are case sensitive but i just want my branch, for example 'MyBrach-v1' to be auto completed when i type 'git checkout myb<tab>' just like it did before
06:03 ImNotQ009 thiago: There, thank you
06:05 thiago kozie: bug
06:09 achlys joined #git
06:09 kozie well that sounds like the easiest assumption. Sound more like a feature to me ;)
06:10 ericsupreme joined #git
06:11 thiago the fact that you're doing this on macos, which has case insensitive FS by default, sounds like a bug to me
06:11 timvishe` joined #git
06:11 thiago it probably listed the refs/heads/ files that matched your prefix and did find something, due to the case-insensitive FS
06:11 l4v2 joined #git
06:12 thiago but the name in the packed-refs file continues to be case sensitive
06:13 armyriad joined #git
06:14 aarcane joined #git
06:14 kozie @thiago saying it like that makes it sound more logical. The built in Git was from apple, thus probably case insensitive. The one installed now is probably just the original ^_^
06:14 rubyonrailed joined #git
06:15 thiago or just plain older
06:16 ljc joined #git
06:16 danslo joined #git
06:20 JeroenT joined #git
06:22 cqi joined #git
06:22 frobnic joined #git
06:22 ericsupreme joined #git
06:26 biotim joined #git
06:26 achlys joined #git
06:31 settermjd joined #git
06:32 harish joined #git
06:33 Sceorem joined #git
06:37 sandstrom joined #git
06:39 elect joined #git
06:40 phanimahesh joined #git
06:41 LUMIA930` joined #git
06:41 mingrammer joined #git
06:41 navidr joined #git
06:43 yuhlw_ joined #git
06:44 mariuscc joined #git
06:45 Rish joined #git
06:46 mehola joined #git
06:49 pelegreno joined #git
06:49 a10c joined #git
06:50 a10c joined #git
06:51 a10c joined #git
06:52 a10c joined #git
06:52 cqi joined #git
06:53 Macaveli joined #git
06:53 submitnine joined #git
06:55 Xizor joined #git
06:56 a10c_ joined #git
06:56 [cust] joined #git
06:56 IanV0rn2341 joined #git
07:00 ochorocho__ joined #git
07:00 mkopriva joined #git
07:01 Emperor_Earth joined #git
07:04 jnewt_ joined #git
07:04 LUMIA930 joined #git
07:05 jknetl joined #git
07:06 JeroenT joined #git
07:08 atomi joined #git
07:09 Darcidride joined #git
07:10 sandstrom joined #git
07:12 mkoskar joined #git
07:12 TomyWork joined #git
07:13 settermjd joined #git
07:15 King_Hual joined #git
07:16 A5101 joined #git
07:16 King_Hual joined #git
07:17 achlys joined #git
07:17 mehola joined #git
07:17 King_Hual joined #git
07:17 King_Hual joined #git
07:17 [cust] joined #git
07:17 danslo joined #git
07:19 ShekharReddy joined #git
07:20 Raed|Laptop joined #git
07:20 govg joined #git
07:22 vassagus joined #git
07:24 gelei007 joined #git
07:26 Balliad joined #git
07:29 PCatinean joined #git
07:29 a10c joined #git
07:29 mkoskar joined #git
07:29 Arguggi joined #git
07:31 Olipro joined #git
07:33 nabblet joined #git
07:33 meditans joined #git
07:33 dreiss joined #git
07:35 dsdeiz joined #git
07:35 dsdeiz joined #git
07:35 nabblet hi, i once added a submodule in a branch but then delted that branch soon after. Now I wanted to add the submodule in an other branch and got "A git directory for 'foo' is found locally with remotes blah blah blah" I used the --force agrument and it did what I wanted but I wonder: Does git keep track of submodules even if the commits that were used to add them were voided?
07:36 xaa joined #git
07:36 mingrammer joined #git
07:36 jceb joined #git
07:36 ResidentBiscuit joined #git
07:38 MafiaInc joined #git
07:38 mkoskar joined #git
07:39 hahuang65 joined #git
07:39 des_consolado joined #git
07:39 darkbit joined #git
07:39 des_consolado hey in man git-branch it says you can --sort by <key> but it doesn't give any information on what the possible <key>'s are D:
07:39 gitinfo the git-branch manpage is available at http://jk.gs/git-branch.html
07:39 JeroenT joined #git
07:40 selckin des_consolado: it does
07:43 rubyonrailed joined #git
07:45 LeBlaaan_ joined #git
07:47 JeroenT joined #git
07:47 SwiftMatt joined #git
07:49 ljc joined #git
07:51 a10c_ joined #git
07:52 a10c_ joined #git
07:53 achlys joined #git
07:53 AndrewAlexMac joined #git
07:53 a10c joined #git
07:54 roxtrongo joined #git
07:59 kurkale6ka joined #git
07:59 Junior joined #git
07:59 garethdaine joined #git
08:03 Silenced joined #git
08:04 Silenced joined #git
08:05 ahmedelgabri joined #git
08:05 a10c_ joined #git
08:05 m0viefreak joined #git
08:06 bongjovi joined #git
08:06 JeroenT joined #git
08:08 dsdeiz_ joined #git
08:09 marcogmonteiro joined #git
08:10 JeroenT joined #git
08:11 maxorator joined #git
08:11 GavinMagnus joined #git
08:12 workcat joined #git
08:12 workcat left #git
08:13 aliencat joined #git
08:13 aliencat hello
08:14 aliencat how can I push to remote master from another branch?
08:14 aliencat Updates were rejected because a pushed branch tip is behind its remote
08:14 t0by joined #git
08:14 tobiasvl aliencat: git push origin BRANCHNAME:master
08:14 aliencat when trying I get that message
08:15 tobiasvl aliencat: well in that case you can't push directly, you either need to rebase first, or force push
08:15 aliencat hmm rebase?
08:16 j416 aliencat: pushing would delete history at the remote, because it changed
08:16 tobiasvl aliencat: !rebase
08:16 gitinfo aliencat: 'git rebase' takes away your local commits, updates your branch with new stuff from <upstream> (argument), then re-applies your local commits on top. This makes it look like your commits were created "after" the new stuff, and it can look cleaner than doing a !merge. Beware of !rewriting_public_history, though. Not to be confused with !interactive_rebase.
08:16 aliencat wow my head explodes already
08:16 j416 aliencat: so you need to either base your changes on top of those changes (rebase), or explicitly say you want to throw them away (force push)
08:17 ljc joined #git
08:18 vrishab joined #git
08:18 mozzarella joined #git
08:19 biotim left #git
08:20 shruggar joined #git
08:22 chll_ joined #git
08:23 vassagus joined #git
08:23 aliencat okay fixed it thanks
08:25 Torrone joined #git
08:26 ljc joined #git
08:26 a_thakur joined #git
08:30 Torrone hello #git, I messed all up again. I've made changes and committed them while on the wrong branch and now I can't get them on the right one because it says "Already up-to-date" when I try to push or merge. I'm very likely to delete all my files accidentally so please help :> thanks
08:30 tobiasvl Torrone: !repro
08:30 gitinfo Torrone: [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
08:30 selckin cherry pick the commit on the right branch, delete commit from wrong branch?
08:30 tobiasvl did you push the wrong branch, or just commit to it? how do you try to get them on the right one?
08:31 Torrone I've not pushed, I'm trying to run git merge while on the wrong one, specifiying th right one
08:31 Gonzo89 joined #git
08:32 tobiasvl Torrone: OK, make a gist or something with what you try to do and what happens maybe
08:32 Torrone (on branch master) git merge bv-deploy :Already up-to-date.
08:32 tobiasvl and you are trying to merge bv-deploy into master?
08:33 selckin merging sounds wrong
08:34 tobiasvl yeah, I would perhaps cherry-pick or rebase
08:35 tobiasvl but it still shouldn't say "up-to-date" unless Torrone actually wants to merge master into bv-deploy
08:35 Torrone tobiasvl, https://gist.github.com/anonymous/6b989dbc4217d5f145b9687a96450a2a
08:36 aliencat left #git
08:36 Torrone the changes I've made are on Master, but they should be on bv-deploy
08:36 tobiasvl Torrone: then "git checkout master; git merge bv-deploy" is the opposite of what you want. it merges bv-deploy into master
08:36 tobiasvl Torrone: but don't merge
08:36 tobiasvl or well, if it's a fast forward, merging is fine I guess
08:37 ljc joined #git
08:37 Torrone so I need to checkout bv-deploy and merge master?
08:37 tobiasvl yes, if merging is what you want
08:37 Torrone I haven't pushed anything yey
08:37 Torrone yet
08:38 Torrone I need bv-deploy to be exactly like my local copy of master
08:38 tobiasvl if it's just one commit I would do "git checkout bv-deploy; git cherry-pick master"
08:38 DieguezZ joined #git
08:38 Vampire0 Torrone, git branch -f bv-deploy master
08:39 tobiasvl yeah if it needs to be exactly like master, do what Vampire0 said
08:39 Vampire0 Torrone, that completely discards bv-deploy and makes bv-deploy point to what master is now
08:39 tobiasvl and remember to do "git checkout master; git reset --hard HEAD^" or something afterwards
08:40 Torrone ok looks good
08:40 Vampire0 Or    git branch -f master master~   should work also in this case I think :-)
08:40 tobiasvl yeah
08:40 Torrone thanks guys, one day I'm gonna erease my hard disk with git
08:40 tobiasvl nah you're good
08:41 Torrone I'm pretty sure its possible if you're careless enough
08:41 tobiasvl Torrone: it's actually very hard to permanently lose stuff with git (unless it was never staged)
08:42 Torrone tobiasvl, agreed but if you do something wrong it gets hard to take everything back
08:42 selckin !backup
08:42 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
08:42 selckin !reflog
08:42 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
08:44 Torrone I can't push on branch bv-deploy :>
08:44 tobiasvl Torrone: because?
08:44 Torrone On branch bv-deploy
08:44 Torrone nothing to commit, working directory clean
08:44 Torrone *I can't commit
08:44 tobiasvl what would you need to commit?
08:45 Torrone I don't know :>
08:45 SwiftMatt joined #git
08:45 Torrone I just needed to push
08:45 tobiasvl then push :)
08:45 Torrone ok
08:46 eijk joined #git
08:51 ashutosh joined #git
09:00 ThomasLocke joined #git
09:00 ochorocho__ joined #git
09:02 Ezzy joined #git
09:03 encod3 joined #git
09:03 cdown__ joined #git
09:03 courrier joined #git
09:05 Munt joined #git
09:05 qpdb joined #git
09:07 alansaul joined #git
09:08 achlys joined #git
09:08 ljc joined #git
09:13 Sleepy63 joined #git
09:14 aax joined #git
09:15 notebox joined #git
09:15 mattias__ joined #git
09:15 xaa__ joined #git
09:18 cdown_ joined #git
09:18 danslo_ joined #git
09:20 smexy joined #git
09:20 BlessJah joined #git
09:21 quackgyver joined #git
09:23 vassagus joined #git
09:24 mingrammer joined #git
09:24 a_thakur_ joined #git
09:24 ljc joined #git
09:24 leeN joined #git
09:27 sanketdg joined #git
09:28 infernix joined #git
09:31 elect joined #git
09:33 mariuscc joined #git
09:35 davisonio joined #git
09:39 hahuang65 joined #git
09:44 lss8 joined #git
09:45 rbr joined #git
09:45 raven-au joined #git
09:48 MrWoohoo joined #git
09:50 jceb joined #git
09:54 aavrug joined #git
09:59 rominronin joined #git
10:00 notebox joined #git
10:00 ljc joined #git
10:02 alansaul joined #git
10:03 Sceorem joined #git
10:05 a_thakur joined #git
10:09 Kulrak joined #git
10:09 Kulrak joined #git
10:11 tvw joined #git
10:12 tvw joined #git
10:13 pijiu joined #git
10:14 pijiu joined #git
10:15 pijiu joined #git
10:18 jceb joined #git
10:19 rominronin joined #git
10:22 solf1re joined #git
10:23 cqi joined #git
10:24 vassagus joined #git
10:24 cqi joined #git
10:28 cdown joined #git
10:32 sevenfourk joined #git
10:33 nettoweb joined #git
10:35 fahadash joined #git
10:39 vrishab Hi.
10:41 wget joined #git
10:42 achlys joined #git
10:43 sandstrom joined #git
10:45 King_Hual joined #git
10:46 ferr joined #git
10:47 MadHatter42 joined #git
10:52 rahtgaz joined #git
10:52 ufk joined #git
10:52 ufk hi
10:52 _ikke_ hu
10:52 kline joined #git
10:54 kline joined #git
10:54 i7c hy
10:59 inflames joined #git
11:02 a_thakur_ joined #git
11:02 badLuckJoe joined #git
11:03 j`ey joined #git
11:03 j`ey argh, I literally always forget how to do this. if I do git log from..to
11:03 j`ey why does it show tons of stuff after foo?
11:04 jast which one is foo?
11:04 j`ey sorry, 'to'
11:04 j`ey not foo
11:04 jast hmm, that shouldn't happen
11:05 j`ey git log from..to and the 'to' hash is in the middle
11:05 jast what is more likely to happen is that you get old stuff you didn't expect, if it came in through a merge between from and to
11:05 j`ey merges make everything so much harder D:
11:06 jast nah, just different :}
11:06 ToBeFree joined #git
11:06 j`ey I'm just trying to get a list of revisions I can test against (basically a manual bisect)
11:07 jast why not an automatic one?
11:08 osse j`ey: try git log --first-parent from..to
11:08 j`ey jast: it won't work in this case
11:08 jast dang
11:08 j`ey osse: oh yeah, that thing
11:09 jast fwiw --first-parent skips merged in commits
11:09 j`ey that still shows me stuff after the 'to' commit
11:09 star_prone joined #git
11:10 jast do you have anything else on your command line?
11:10 j`ey a branch name
11:10 j`ey i guess that doesn't help
11:10 osse nuke it from orbit
11:11 jast that will make it include everything from that branch, too
11:11 mozzarella joined #git
11:11 sdothum joined #git
11:11 Repox joined #git
11:11 j`ey lame
11:12 jast so, just leave it out?
11:12 jast :)
11:13 j`ey I already piped it to a file and deleted everything after 'to' anyway
11:13 j`ey but next time..
11:14 osse :S
11:17 CheckDavid joined #git
11:19 mozzarella joined #git
11:19 mingrammer joined #git
11:19 star_prone joined #git
11:19 ojdo joined #git
11:19 JeroenT joined #git
11:19 danslo_ joined #git
11:20 ufk can I add some basic authentication to git-daemon ?
11:21 ericsupreme joined #git
11:22 ljc joined #git
11:22 xaa__ left #git
11:23 sandstrom left #git
11:23 xaa joined #git
11:23 star_prone joined #git
11:25 vassagus joined #git
11:25 bremner ufk: there's no built-in or common (afaik) way to do that.
11:25 Qria joined #git
11:26 ufk git-daemon works on a specific git project? I can't give it a directory with tons of git projects in it ?
11:26 bremner you can.
11:26 bremner most people would say "repository" rather than "project"
11:26 ufk ok sorry :)
11:27 jast look at the --base-path option
11:28 joeBadLuck joined #git
11:29 HoierM joined #git
11:29 amikiri joined #git
11:30 ufk i have base-path set, and also export-all. but when i try to close a repository I see on /var/log/messages that it doesn't appear to be a git repository
11:30 ufk close=clone
11:30 jast maybe some of them are non-bare repositories
11:30 jast i.e. there's a checkout of the working files in them
11:30 kossy_ joined #git
11:30 jast if so, you need to add a /.git to the end of the URL
11:31 ufk all of them are bare repositories. no .git in them. trying to find out if it's permissions related issues
11:31 CussBot joined #git
11:31 jast that would be the next likely reason
11:31 ufk nope not that. all directories have read and execute for others
11:31 jast the contents, too?
11:31 ufk i'll just create a new repository and try to clone that
11:32 kashyap joined #git
11:32 cyphase joined #git
11:32 badLuckJoe joined #git
11:32 troyt joined #git
11:34 ufk i created ufk-test.git directory, did 'git --bare init .'. chmod 777 -R to directory, and the results are the same. if i provide an invalid directory it returns the exact same error
11:34 kashyap Hi folks, so I use Postfix locally, and been using it to send patches to public lists for a while.  (And I have TLS configured properly).
11:34 kashyap However, suddenly, `git-send-email` starts failing with:
11:34 kashyap CA path "'/etc/postfix'" does not exist at /usr/libexec/git-core/git-send-email line 1220.
11:34 netj joined #git
11:35 kashyap Here's the complete config (what I have in my ~/.gitconfig; and some TLS details from Postfix) -- http://paste.openstack.org/show/564813/
11:35 kashyap Can anyone shed some light here?
11:35 joeBadLuck joined #git
11:36 a10c joined #git
11:37 achlys joined #git
11:37 achlys joined #git
11:38 rnsanchez joined #git
11:39 codebam joined #git
11:39 eijk_ joined #git
11:40 hahuang65 joined #git
11:40 badLuckJoe joined #git
11:41 kanyeezy joined #git
11:41 moritz smtpsslcertpath = '/etc/postfix' looks unusual
11:41 moritz for one, it seems to include the single quotes
11:41 moritz so try removing those
11:41 moritz and then... is /etc/postfix really a path to the CA store?
11:42 moritz (that was both for kashyap)
11:43 kashyap moritz: I bet I tried that, but let me retry.  I had this config for a while.  And was able to send patches just fine
11:44 kashyap moritz: If I remove the quotes, I get this:
11:44 kashyap STARTTLS failed! SSL connect attempt failed error:14090086:SSL routines:ssl3_get_server_certificate:certificate verify failed at /usr/libexec/git-core/git-send-email line 1369.
11:44 j`ey left #git
11:44 * kashyap finds it embarassing that he's not able to solve a TLS issue, in the distant past, he was a test engineer doing PKI stuff
11:45 moritz kashyap: that looks like progress to me
11:45 moritz kashyap: are there actually certificate files directly under /etc/postfix, and if yes, can your user account read them?
11:46 kashyap moritz: Sure, the CA cert is under that directory, and I could even do: openssl x509 -in /etc/postfix/newca.crt -noout -text | grep Validity -A2
11:46 kashyap I even double-checked the 'Issuer' and 'Sender' names, and confirmed internally, with a colleague, that the CA cert is correct
11:47 moritz kashyap: try using /etc/postfix/newca.crt for smtpsslcertpath directly?
11:47 kashyap I did try that too, IIRC.  Let me retry
11:47 moritz (without quotes :-)
11:47 kashyap Yeah, yea :-)
11:48 Haliucinas joined #git
11:48 kashyap moritz: That did it!
11:48 kashyap Is this a requirement from the new versions of Git?  In the past it picked up the CA cert
11:49 moritz kashyap: no idea
11:49 kashyap But probably because there could be multiple CA certs
11:49 kashyap moritz++
11:50 moritz yay, karma!
11:50 kashyap No Karma bot, duh :-)
11:50 jast false
11:50 gitinfo What am I, decoration?
11:51 bremner you wish, uglybot
11:51 gitinfo :'(
11:51 Jellyg00se joined #git
11:51 star_prone joined #git
11:52 gitinfo bremner is being mean to me and nobody is defending me, I hate you all
11:52 * bremner rolls actuators
11:52 amikiri joined #git
11:52 rgrinberg joined #git
11:52 moritz .karma
12:04 ilbot3 joined #git
12:04 Topic for #git is now Welcome to #git, the place for git help and doorbells | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Knock knock. Who's there? Git. Git-who? Sorry, 'who' is not a git command - did you mean 'show'?
12:08 cdown joined #git
12:10 aavrug joined #git
12:12 darkbit joined #git
12:13 davidosomething joined #git
12:13 lmatteis joined #git
12:13 eijk_ joined #git
12:13 mingrammer joined #git
12:14 ImNotQ009 joined #git
12:14 lmatteis guys, say i make a branch from master to implement a feature. other ppl continue commiting on master. what is the best practice in this case? should i be merging stuff from master into my feature branch?
12:15 ImNotQ009 I always kep ruining things. I tried to reset (git reset HEAD) and now it shows more unstaged changes. Changes in files I've never touched. Why?
12:15 jaguarmagenta joined #git
12:15 mizu_no_oto joined #git
12:16 moritz lmatteis: it really depends. Did you publish the branch? Did others pull it? If not, rebasing might be easier
12:16 moritz lmatteis: or you might get away with not merging master into your branch at all, and only merge the branch into master when it's done
12:16 moritz (and avoid long-lived feature branches)
12:16 lmatteis moritz: right
12:17 lmatteis i was thinking of not rebasing
12:17 lmatteis and just worrying about it at merge time
12:18 Noldorin joined #git
12:19 eduardas_m joined #git
12:19 jtri when i do "git log -p" and find a change I'm interested in, how can i find the commit number of that change?
12:19 jast it shows the commit ID in the output
12:19 jast "commit abc123"
12:19 jast right above the diff
12:20 jtri here's the result of git log -p : http://dpaste.com/3RZBB60
12:20 kashyap left #git
12:21 ImNotQ009 Gaaah, I'm just gonna clone again
12:21 choki joined #git
12:21 Hounddog joined #git
12:21 eduardas_m hello...is there a git tool that one can integrate into Ubuntu 14.04 nautilus like rabbitVCS? rabbitVCS is working, but is not being actively developed and lacks some features I like in TortoiseGit on Windows
12:22 eduardas_m like creating a bare git repository not from the command line
12:22 LBV_User joined #git
12:23 ahmed_elgabri joined #git
12:23 moritz see also http://askubuntu.com/questions/4788/nautilus-git-integration
12:24 eduardas_m moritz, I am already using rabbitVCS, but is there a better actively developed alternative?
12:25 rgrinberg1 joined #git
12:25 govg joined #git
12:25 luke_penn joined #git
12:25 moritz not that I'm aware of
12:26 daniel_rose joined #git
12:27 _ikke_ ImNotQ009: !rmrf
12:27 gitinfo ImNotQ009: [!startover] There’s usually no need to start over / rm -rf everything and reclone or so.  Most situations can be fixed by other means.
12:27 eduardas_m I am an amateur at this, but I still lack rabbitVCS extremely lacking in features
12:27 jtri ok, i see the commit number further up
12:27 ImNotQ009 _ikke_: oh, I'm sure of that
12:27 ImNotQ009 If you know how :P
12:27 _ikke_ If you haven't removed everything yet
12:28 texasmynsted joined #git
12:28 ImNotQ009 I backed the old repo up
12:28 ImNotQ009 It's still there
12:28 ImNotQ009 But now it seems I can't cherry-pick my commits
12:28 _ikke_ ImNotQ009: These problems usually indicate line ending normalization problems
12:28 ImNotQ009 From the remote
12:28 choki joined #git
12:28 _ikke_ What OS are you on?
12:28 ImNotQ009 Ubuntu 14.04
12:28 _ikke_ ok
12:29 ImNotQ009 But really, I think starting over is a good idea in general
12:29 _ikke_ Is there a .gitattributes file present somewhere in the repo
12:29 ImNotQ009 Because my local repo is a TOTAL mess
12:29 _ikke_ ImNotQ009: You'll learn nothing from that
12:29 _ikke_ Next time you run into this problem, you'd have to remove everyting again
12:29 ImNotQ009 _ikke_: of course, but you have to understand that I spent about 14 hours just trying to get it all working
12:29 ImNotQ009 I can't spend all my time like this
12:29 ImNotQ009 I need to actually do something more productive
12:30 _ikke_ sure
12:30 magicturtle joined #git
12:30 ImNotQ009 You see, I'm a git dummy :)
12:31 _ikke_ But this problem might reoccure next time you clone
12:32 ImNotQ009 _ikke_: it all started because I tried to alter my old commits in a wrong way, I basically fell into quicksand
12:32 ImNotQ009 Trying more and more different commands I didn't fully understand, causing more mess
12:34 jeffreylevesque joined #git
12:35 miklcct joined #git
12:35 kanyeezy joined #git
12:35 kanyeezy joined #git
12:36 Gamecubic joined #git
12:36 synthroid joined #git
12:37 andlabs joined #git
12:38 cdown_ joined #git
12:42 MapMan joined #git
12:42 dsdeiz joined #git
12:43 MapMan Hi! I have trouble pushing/pulling on Windows. Everything worked fine until today. I type git pull (or push) and it simply hangs. What should I do?
12:43 Erati joined #git
12:43 simon MapMan, have you tried making a new clone?
12:44 MapMan No. Should I?
12:44 _ikke_ MapMan: try GIT_TRACE=1 git pull (if you're using git bash that is)
12:44 simon MapMan, this happened to me yesterday because my git-svn bridge changed server; simply updating the .git/config didn't work, but making a new clone did.
12:44 simon MapMan, you probably should not have to, but it was a workaround that worked for me.
12:44 davidosomething joined #git
12:45 mohabaks joined #git
12:45 simon MapMan, or do what _ikke_ says. I failed at debugging it. :)
12:46 amikiri joined #git
12:46 daniel_rose joined #git
12:47 masak joined #git
12:47 MapMan _ikke_: I set GIT_TRACE to 1 and tried pushing/pulling but it made no difference.
12:47 masak how do you ask `git` whether two branches share the same initial commit?
12:48 Hello71 masak: what if it has multiple roots
12:48 Hello71 s/it has/one or both have/
12:48 star_prone joined #git
12:50 bremner you may find git merge-base helpful, although it doesn't exactly answer your question.
12:50 Hello71 also, !xy
12:50 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
12:50 EduardoMartins joined #git
12:52 hosttor joined #git
12:53 njbair joined #git
12:54 masak my overall objective: producing a branch listing that says "(x commits ahead, y commits behind)" relative to master.
12:55 chris2 git branch -vv is one half of that?
12:55 masak but I happen to have a gh-pages branch where this information makes little sense, because it's an orphaned branch and has no commits in common with master.
12:55 masak it currently shows me "(24 ahead, 891 behind)", and those numbers aren't useful, they're just the commits on the respective branch
12:55 jast basically you use 'git rev-list' with the range operators
12:56 jast 'git rev-list a..b' will output nothing if the two have no commits in common
12:56 nydel07 joined #git
12:56 jast no wait
12:56 masak that does not seem to be the case
12:56 Dro joined #git
12:56 jast a moment of stupid
12:56 masak also not in line with my understanding of ranges
12:56 masak it's all about whether they share an initial commit
12:56 jast I'm sure I was thinking about something different
12:57 jast I believe 'git merge-base a b' will not output anything if there is no common history
12:57 masak I'm fine with handling the case of multiple initial commits, althought I don't need it for this repository
12:57 MapMan _ikke_, simon: looks like its something with the repo host, visualstudio.com.
12:57 masak jast: yes, this seems to be true. that helped, thank you!
12:58 ash_workz joined #git
12:58 miklcct joined #git
12:59 masak cool, and that (correctly) identified another orphaned branch
12:59 GavinMagnus joined #git
13:01 irco joined #git
13:01 sanketdg joined #git
13:01 shaggycat joined #git
13:01 pijiu2 joined #git
13:02 sanketdg joined #git
13:02 ochorocho__ joined #git
13:04 kadoban joined #git
13:04 GodGinrai joined #git
13:06 davisonio joined #git
13:06 ShekharReddy joined #git
13:06 fahadash joined #git
13:07 sanketdg joined #git
13:07 ExoUNX joined #git
13:08 daniel_rose joined #git
13:10 jimi_ joined #git
13:10 [cust] joined #git
13:11 Caelum joined #git
13:13 GavinMagnus left #git
13:13 kyan joined #git
13:14 Remram[m] joined #git
13:15 ekinmur joined #git
13:15 dermoth joined #git
13:16 M-mistake joined #git
13:16 Ineentho[m] joined #git
13:16 M-shine joined #git
13:16 M-meznak joined #git
13:19 Gsham joined #git
13:19 docnvk joined #git
13:19 JeroenT joined #git
13:21 danslo_ joined #git
13:23 cjohnson So I did an rsync from my local machine up to a production server, using --exclude '*git*', and it copied a few directories up that aren't tracked by git (I think they used to be in git and we removed them but my local copy hadn't cleaned them up)
13:23 cjohnson Anyway I want to remove the untracked files, but for some reason when I actually go onto the prod machine and git status, it shows that my WC is clean
13:23 cjohnson I'm positive they aren't tracked in git and I'm 99% sure it's not excluded via .gitignore
13:24 cjohnson what else am I missing?
13:25 cjohnson nevermind I'm dumb it is gitignore. I used git check-ignore -v path
13:25 Remram[m] joined #git
13:25 Remram[m] joined #git
13:26 cjohnson So let me start over. I have 2 gitignore rules,    *.com  and !*.com/
13:27 cjohnson I want to block files ending in .com but allow directories. for some reason this is blocking my directory. any clues why?
13:27 Remram[m] What about !.com/*
13:27 cjohnson that's not in my list, is that how it should be?
13:28 Remram[m] !*.com/**
13:28 Remram[m] It might be a better exclusion pattern
13:28 Remram[m] as you know, Git doesn't actually track directories at all, only files
13:28 cjohnson I swear I had this working before. maybe it's a git version difference
13:28 cjohnson tried that, no dice, the files are still being ignored
13:29 JanC_ joined #git
13:29 cjohnson oh wow server is 1.9.1
13:30 daniel_rose joined #git
13:31 cyan__ joined #git
13:31 davisonio joined #git
13:32 chigang_ joined #git
13:32 HelloShitty left #git
13:33 HelloAtMega joined #git
13:33 t4nkd joined #git
13:33 cjohnson Ok well assuming that's why the ignore rule is being parsed differently, I commented out those rules, and ran a git check-ignore -v Sites/foo.com
13:33 cjohnson I get no matching rules. but still, the file isn't showing as untracked
13:33 cjohnson git status shows that it's all clean
13:34 cjohnson I'm up to date on master branch, positive that Sites/foo.com isn't checked in at all, gitignore definitely isn't matching the path
13:36 pothepanda joined #git
13:36 brandonw joined #git
13:36 cjohnson git status -u --ignored shows a whole bunch of correctly ignored files, but doesn't list this dir or any of its files
13:37 rnsanchez_ joined #git
13:39 mingrammer joined #git
13:39 rubyonrailed joined #git
13:40 cjohnson deleted .git/index and git reset to be sure I didn't sync a corrupt index over. tried git update-index --really-refresh
13:40 griffindy joined #git
13:41 hahuang65 joined #git
13:41 jaafar joined #git
13:44 cdg joined #git
13:44 mithenks joined #git
13:44 Faylite joined #git
13:46 esbena joined #git
13:46 Qria left #git
13:48 Jellyg00se joined #git
13:48 dviola joined #git
13:49 str joined #git
13:50 crelix joined #git
13:52 star_prone joined #git
13:52 AaronMT joined #git
13:52 LUMIA930` joined #git
13:52 pro_metedor joined #git
13:54 raijin joined #git
13:54 realz joined #git
13:56 javajoe joined #git
13:57 thiago joined #git
13:58 esbena I have a problem: when I run `git pull --rebase` it drops my local commits! If I do a `git fetch; git rebase`, then everything is fine. Is there some workaround/cause?
13:59 oxsyn joined #git
14:00 anonymuse joined #git
14:00 arooni joined #git
14:00 hobodave joined #git
14:01 sangy joined #git
14:02 zivester joined #git
14:02 davisonio joined #git
14:03 t4nkd joined #git
14:05 maret joined #git
14:06 maret hi everyone. I have list of several commits and I need to split those commits into separate branches. My approach would be to checkout to first commit and then create all of feature branches, checkout them one by one and cherry pick commits from master.
14:08 dave0x6d joined #git
14:08 jast maret: makes sense. maybe it's worth mentioning that you can simultaneously create and switch to a branch: git checkout -b mynewbranch
14:09 jast with the base commit as an optional extra argument
14:11 ResidentBiscuit joined #git
14:13 LeRieur joined #git
14:14 Silenced_v2 joined #git
14:14 Silenced_v2 joined #git
14:16 LeRieur joined #git
14:19 Emperor_Earth_ joined #git
14:21 Limes joined #git
14:23 harish joined #git
14:23 LeRieur joined #git
14:24 Wind0r joined #git
14:24 maret yeah just noticed that i need add base commit because if I do git checkout someCommitHash and then do git checkout -b my_feature_branch, base commit will be still the last one from master
14:24 iota_pi joined #git
14:24 dmto joined #git
14:25 LeRieur left #git
14:26 grawity works fine here http://sprunge.us/WYaf
14:26 LeRieur joined #git
14:28 ToxicFrog maret: git checkout -b <name> with no named commit bases the branch on whatever you currently have checked out.
14:29 sssilver joined #git
14:31 shinnya joined #git
14:33 LionsMane joined #git
14:33 cdown joined #git
14:33 clemf joined #git
14:34 silus1 joined #git
14:34 flaguy48 left #git
14:34 Silenced joined #git
14:34 Silenced joined #git
14:35 Lynxium joined #git
14:35 Felishia joined #git
14:35 Felishia joined #git
14:35 Felishia help
14:36 Felishia git exploded
14:36 Phlogistique Felishia: yes?Q
14:36 heftig quick, implode it
14:36 Felishia :<
14:36 JeroenT joined #git
14:36 crose joined #git
14:36 Felishia I was just merging to git repos
14:36 Felishia and I forgot to remove .git folder
14:36 clemf joined #git
14:37 Felishia two*
14:37 Felishia so the folder with the git repository didn't get commited
14:37 Felishia I removed the git folder and then did git add
14:37 Felishia it doesn't work... it's completely ignoring it
14:38 moritz Felishia: !repro please
14:38 gitinfo Felishia: [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
14:38 thiago Felishia: and when you say "merging", do you mean git merge?
14:38 shaggycat joined #git
14:38 Felishia no
14:38 Felishia I had two git repos... app and views
14:39 Felishia app contained a folder named src/ which contained controllers
14:39 Felishia views was a standalone repo
14:39 Felishia I copied the content of views into src/views
14:39 Felishia including (by mistake) the .git folder
14:39 Felishia I then tried to push
14:40 thiago Felishia: the !repro, please
14:40 gitinfo Felishia: [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
14:40 j416 Felishia: did you just skip a step there
14:40 Felishia it said ok and bitbucket says something about Subproject commit 04b10d271ae53cba3978e11f618539769ef3399e
14:40 j416 Felishia: read above
14:40 Felishia do you really want me to create two github repos to attempt to create a reproduction D:
14:41 morenoh149 joined #git
14:41 hashpuppy joined #git
14:41 j416 Felishia: remove the commit and force push, then remove that faulty .git and commit again
14:41 thiago no, we want you to copy your terminal that you actually used
14:42 Felishia there were 678 files changed... you want to see the entire diff... wat...
14:43 ProbabilityMoon joined #git
14:43 thiago we don't want the diff. We want your terminal.
14:44 thiago anyway, I think I know what the problem is.
14:44 Felishia what is it :o
14:44 thiago reset back to prior to the bad commit, then add the subdir with the sources and commit again
14:44 Felishia but I also modified a lot of files
14:44 Felishia I don't want to lose those changes... :<
14:46 moritz !backup
14:46 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
14:46 Felishia oh great and now someone commited 3 times more on that branch -.-
14:46 d10n-work joined #git
14:47 thiago Felishia: ok, so don't reset
14:47 thiago Felishia: git rm --cached src/views
14:47 jast git rm --cached path/to/broken/dir; git add path/to/broken/dir
14:47 jast then commit and push
14:47 celino joined #git
14:48 celino hi all
14:48 gitinfo celino: 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.
14:48 Felishia yyyes :D
14:48 celino I've got a weird problem with the jgit flow maven plugin, dunno if I'm at the right place
14:49 jast your chances aren't too great here, probably, but feel free to ask anyway
14:49 celino the problem is, when I do a release-finish, it merges release-0.0.2 into master, and the resulting merge sometimes has version 0.0.1 and sometimes has version 0.0.2
14:50 madewokherd joined #git
14:50 celino but I would like it to always have version 0.0.2, the version from the release-0.0.2 branch
14:50 marcelofr joined #git
14:50 celino what's the default merge strategy ?
14:50 star_prone joined #git
14:50 _ikke_ recursive
14:52 l4v2 joined #git
14:55 celino and why does it take the master commit (which is older) instead of the release-0.0.2 commit ?
14:55 AnarchyAo joined #git
15:00 cdg joined #git
15:02 davidosomething joined #git
15:02 anonymuse joined #git
15:03 ochorocho__ joined #git
15:04 koqz joined #git
15:05 robotroll joined #git
15:05 davidosomething joined #git
15:09 davisonio joined #git
15:09 bauruine_ joined #git
15:10 ahmed_elgabri joined #git
15:10 tvw joined #git
15:13 romerocesar joined #git
15:14 bsanford joined #git
15:14 Darcidride_ joined #git
15:14 skapunker joined #git
15:16 dreiss joined #git
15:19 davidosomething joined #git
15:20 pro_metedor joined #git
15:20 howdoi joined #git
15:22 danslo_ joined #git
15:24 oafi joined #git
15:27 mingrammer joined #git
15:27 zacts joined #git
15:27 snowkidind joined #git
15:28 vassagus joined #git
15:30 CheckDavid joined #git
15:31 ochorocho__ joined #git
15:34 clemf joined #git
15:35 cjbrambo joined #git
15:36 EvilPenguin joined #git
15:36 davisonio joined #git
15:40 Khisanth joined #git
15:41 hahuang65 joined #git
15:45 govg joined #git
15:46 diogenese joined #git
15:47 subhojit777 joined #git
15:50 narcberry joined #git
15:51 shaggycat joined #git
15:51 narcberry joined #git
15:53 tyreld joined #git
15:54 chrisshattuck joined #git
15:54 madewokherd joined #git
15:54 faux___ joined #git
15:55 rominronin joined #git
15:55 timmu joined #git
15:55 ahmedelgabri joined #git
15:56 hahuang65 joined #git
15:59 terminal_echo joined #git
16:02 maxorator joined #git
16:03 eijk_ joined #git
16:03 Electrometro joined #git
16:03 cdg joined #git
16:03 refried_ joined #git
16:08 altendky joined #git
16:08 synthroid joined #git
16:08 pR0Ps joined #git
16:09 phaleth joined #git
16:11 nabblet joined #git
16:11 nurey joined #git
16:11 diogenese joined #git
16:12 nabblet if i create a feature branch from master, and later master is bug fixed, what's the correct way to incorporate that bugfix into my feature branch so that there won't any issues when I merge back the feature branch to master?
16:12 altendky i have a file that git doesn't seem to be detecting permissions for correctly.  this was merely annoying until it blocked me from rebasing.  http://pastebin.com/d86Fwyvz  in this case it is in windows and i am using the bash shell provided with the git installer.  reset, checkout, chmod, no luck.
16:13 osse nabblet: merge or rebase, your choice
16:13 osse nabblet: or if you specifically want that fix and nothing else you can cherry-pick the related commit
16:13 nabblet osse: ok. Just one more question, for completeness: if I cherry-pick, will that result in a merge conflict later?
16:13 osse no
16:13 nabblet osse: great, thanks!
16:15 ahmedelgabri joined #git
16:15 Faylite joined #git
16:15 jast it *can* result in a merge conflict
16:15 jast but usually it won't
16:16 osse say what now
16:17 nabblet jast: how so?
16:17 jast altendky: what does 'git config core.filemode' say?
16:18 altendky true
16:19 jast altendky: okay, normally git auto-detects when file modes are not reliable (as is the case on windows). you may have tricked it somehow. ;) do 'git config core.filemode false' to stop git from checking the executable bit.
16:19 jast in fact you can probably do it globally: git config --global core.filemode false
16:19 romerocesar joined #git
16:20 faux___ left #git
16:20 _ikke_ setting filemode false meanse git doesn't look at the executable bit at all (non-default behaviour)
16:20 altendky jast: thanks for the, well, workaround i suppose.
16:20 jast normally it's set automatically when you init/clone on a platform that doesn't handle that bit correctly, e.g. windows
16:20 _ikke_ ah, mingw
16:20 _ikke_ yeah
16:21 blackwind_123 joined #git
16:21 moop joined #git
16:21 _ikke_ jast: I don't think setting it globally will help mutch
16:21 SwiftMatt joined #git
16:21 altendky branch by branch i'm making the project linux compatible, but sometimes i have to work in windows...
16:21 mingrammer joined #git
16:21 nopevms joined #git
16:22 iota_pi joined #git
16:22 _ikke_ jast: git always sets it explicitly per repo
16:22 jast nabblet: hmm, I had this case in my mind that would cause a conflict, just thought it through again and actually I don't see any possibility for a conflict now...
16:23 danslo_ joined #git
16:23 jast _ikke_: oh, yeah, right. the docs implied otherwise.
16:24 nabblet jast: ok. Thanks for your consideration though! :)
16:25 macivy joined #git
16:25 nettoweb joined #git
16:28 roxtrongo joined #git
16:28 ytl joined #git
16:31 mohabaks joined #git
16:32 durham joined #git
16:32 kpease joined #git
16:34 terminal_echo joined #git
16:36 SwiftMatt joined #git
16:36 LUMIA930 joined #git
16:36 IanV0rn2341 joined #git
16:36 elementalest joined #git
16:36 elementalest joined #git
16:37 miklcct joined #git
16:45 kfunk joined #git
16:46 paws_ joined #git
16:46 bgnick007 joined #git
16:46 davisonio joined #git
16:47 hahuang65 joined #git
16:48 bgnick007 hi, i need to undo a couple of git pushes. so for that, i just need to do 'git revert SHA' from latest bad commit to oldest bad commit, which will undo the remote repo code and also my local code?
16:48 _ikke_ No
16:48 _ikke_ well, yes
16:48 Flaghacker joined #git
16:48 bttf it will do only local
16:48 _ikke_ The changes in the work-tree are undone, but the commits are still there
16:49 bttf still have to push
16:49 Flaghacker Is it possible to temporarily restore my local repository to a previous commit while keeping the current stuff "backed up" somewhere?
16:49 d0nn1e joined #git
16:50 rivarun joined #git
16:50 _ikke_ Depending how temporary, but git checkout <commit> would work
16:52 Flaghacker And how can I restore it?
16:52 _ikke_ git checkout -
16:53 _ikke_ will return to the previous branch
16:53 fiddlerwoaroof joined #git
16:53 _ikke_ (or git checkout <branch>
16:53 daynaskully joined #git
16:53 Flaghacker So do I have to make a branch to do this?
16:54 _ikke_ Flaghacker: Depends if you want to commit or not
16:54 bgnick007 bttf so git push after that, and done?
16:55 davisonio use `git checkout -b branch_name` to create and checkout a branch
16:55 bttf yeah bgnick007 should be
16:55 Flaghacker Well my full problem is this: I changed some stuff and now the program doesn't work anymore. I would like to see what the last working commit is to then compare that with what I have right now
16:56 javajoe joined #git
16:56 rominronin joined #git
16:57 gravitron joined #git
16:58 Flaghacker So I guess I don't want to commit, how can I restore what I have?
16:58 Flaghacker *had
16:58 cjohnson check out git bisect Flaghacker
16:59 cjohnson otherwise if that doesn't help you would just git checkout $commit
16:59 cjohnson and just go through one commit at a time like that
17:00 Flaghacker And when I start bisect will my current changes be lost?
17:00 Catachan_ joined #git
17:01 Duder9999 joined #git
17:01 Flaghacker Nvm, I found it, git bisect reset does that.
17:02 atrus you can always create a branch from what you've got as a backup. it's basically free.
17:03 7YUABYB5X joined #git
17:04 vbgunz joined #git
17:04 HoierM joined #git
17:04 dreiss joined #git
17:05 InfoTest joined #git
17:06 refried_ joined #git
17:08 vbgunz hello fellas, I'd just like to confirm, git rm mans page is really short so I just want to confirm this. git rm -f file will remove files from disk AND index **if** the files on disk match exactly what is in the current index? I'm trying to understand it and am finding it kind of weird.
17:08 romankl joined #git
17:09 thiago no
17:09 thiago without -f, that's how you described
17:09 thiago with -f, it will remove in any state that the file may be in
17:09 vbgunz if I touch afile ... then git rm afile, I get a "did not match", if I use -f, I get the same response. only if I stage afile with add, I can then use rm -f to remove it from the index AND disk.
17:09 romankl joined #git
17:10 thiago you can only remove files Git knows about
17:10 vbgunz the man page I think is trying to say this, I'm trying to confirm it
17:11 vbgunz yeah, I'm trying to get it through my head, rm alone is easy enough, I'm trying to figure out git rm, it seems simple, just trying to get it right
17:11 thiago it is simple enough
17:11 thiago it will remove the file from git tracking
17:11 j416 vbgunz: git rm foo, is short for adding a deletion and then rm'ing the file. Cannot add a deletion of a file that does not exist in the repo.
17:12 vbgunz yeah, that's easy, I just want to know for sure when it will go ahead and remove it from disk
17:12 thiago but if the file contents don't match the index and the commit, you need -f
17:13 thiago "The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index"
17:13 MacWinne_ i'm current on dev branch, and I want to switch to master branch.. However master has moved forward.  What the best way to checkout master at the latest commit?  rather than doing "git checkout master && git pull"  Is there a way to go straight to the latest master commit?
17:13 vbgunz thiago, yeah, I think I'm playing with it but haven't actually committed and tried it again, alright, I think I'm understanding, thanks!
17:14 thiago MacWinne_: you need two commands anyway
17:14 thiago MacWinne_: why is the solution you have not good enough?
17:14 MacWinne_ thiago, i don't want the intermediate files to be there
17:15 thiago MacWinne_: what intermediate files?
17:15 MacWinne_ i know it's a split second.. but more for my education as well
17:15 MacWinne_ thiago, the old master files that were changed by the pull
17:15 thiago I know, but why is that a problem?
17:16 MacWinne_ thiago, in case a node process restarts and reads the old version...  it's not a real problem at all..  just wondering if it can be done
17:16 MacWinne_ to understand git better
17:16 thiago it can be
17:16 thiago git fetch && git push . master@{u}:master && git checkout master
17:17 MacWinne_ ooh.. what's that second command magic?
17:17 MacWinne_ semantically doing i mean
17:18 thiago note that checkout is not atomic. If any process reads during the checkout, they may see a partial update
17:18 vbgunz thiago: yeah, it looks like after I made a commit, git rm starts to make more sense
17:18 thiago it's pushing master@{u} to "master" on the remote "."
17:19 rivarun joined #git
17:19 MacWinne_ thanks
17:22 alansaul joined #git
17:23 bgnick007 bttf hi, what if i wanted my repo to look exactly as it was right after a certain git commit?
17:23 bttf you'd have to do a force push
17:23 bttf which is a little bit more dangerous
17:23 thiago bttf: that depends. Is !rewriting history acceptable?
17:23 gitinfo bttf: [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
17:23 Sasazuka joined #git
17:24 bttf yeah, that's basically the gist of it
17:24 bttf if you're working by yourself bgnick007 it would be harmless but if there are others working on the same repo i'd think twice
17:24 bgnick007 bttf i see. and no other way? i think my issue started after my second to last commit, i did a 'git pull' which brought about bad changes
17:25 bttf doing a revert is fine
17:25 bgnick007 bttf its a feature branch that only i'm working on. others are just pulling it sometimes
17:25 thiago except it doesn't un-merge
17:25 bttf it muddles up your commit history but that's not iimportant
17:25 bttf thiago you can't revert to pre-merge commit?
17:26 thiago you can apply the reverse of the changes
17:26 thiago but you can't undo the merge
17:26 thiago it's still merged and can't be merged again
17:26 bttf hmm
17:29 vassagus joined #git
17:31 nurey joined #git
17:31 osse joined #git
17:34 bgnick007 bttf ty. i will try this out
17:35 miklcct joined #git
17:35 mutex joined #git
17:36 bgnick007 bttf last question lol. i made a few code edits. but i wanna discard those changes. haven't done git add, commit, or push. these are called unstaged changes, i believe
17:36 bttf git checkout -- ./
17:36 roxtrongo joined #git
17:37 BrianBlaze420 joined #git
17:37 ResidentBiscuit joined #git
17:39 clemf joined #git
17:39 thiago bgnick007: git status will tell you what to do
17:41 McNozes joined #git
17:41 bgnick007 bttf, why the slash at the end
17:43 bttf it's inconsequential - that's just how I describe my pwd
17:46 Kicer86 joined #git
17:47 nitric joined #git
17:50 kfunk joined #git
17:50 Groscheri joined #git
17:52 quinten joined #git
17:52 aswen joined #git
17:52 achlys joined #git
17:53 quinten hi! trying to get started using git branches on Windows. i'm confused about a basic issue. after making a branch, can i use an editor like notepad++ to edit just that one branch without touching the master branch in my working directory?
17:54 quinten or do i need to make a clone, or what?
17:54 bremner quinten: git checkout otherbranch
17:54 bremner possibly git stash first, if you have fear of commitment
17:54 multi_io joined #git
17:54 _ikke_ quinten: when you check out a branch, the files in your working tree represent that branch
17:55 quinten what i was seeing is that after i switch back to master, the directory contents show changes from my branch
17:55 _ikke_ quinten: Uncomitted changes don't belong to a branch
17:55 rominronin joined #git
17:57 quinten my workflow: i did git init, and git add . to a working directory. a script others are already using. i'd like to make changes and keep them contained in a branch
17:57 quinten i ran git branch -d "branchname"
17:57 quinten then i want to open a file in notepad++ to edit a file in the branch
17:58 cjohnson to edit a branch, you have to switch to that branch (git checkout <branch>)
17:58 quinten do i then type git stash after each change, to keep changes out of the working directory, so users don't accidentally run the version that's not done yet?
17:58 cjohnson that switches the entire working copy to that branch
17:58 cjohnson then you edit in notepad, save, stage (via git add), and commit
17:58 quinten right, sorry. i did run git checkout "branchname"
17:58 cjohnson cool, so yeah now you edit and save, add, commit
17:58 cjohnson and your changes will only be part of branchname
17:58 quinten the thing i was confused about is that if another user goes to that working directory, they see my changed version
17:58 cjohnson another user on your computer?
17:59 quinten no, this is saved on a network path
17:59 cjohnson well if that user is pointing to your working copy and you cahnge your working copy then of course they will see the changes you made in your working copy
17:59 _ikke_ Don't work with multiple people on one repository
18:00 quinten what's the best workflow for that "production" version of the code then?
18:00 cjohnson quinten: git branching doesn't magically bypass the filesystem (network or otherwise). changes you make in your editor to a file will be made to that file
18:00 cjohnson git just tracks the differences after you save the file
18:00 quinten okay, yeah, i learned version control on CVS many years ago. used to branches living in their own directory
18:01 nwkj86 joined #git
18:01 cjohnson ah yeah, in git it's all one working copy. the best way to handle that setup is to have each person check out their own copy of the repo
18:01 quinten should i make the production version a clone? sounds like my initial setup of git isn't quite right
18:01 thoros joined #git
18:01 quinten should i move it to a new dev directory, and then clone it for production? or what is best practice?
18:02 cjohnson yeah that's how I do it. github is the authoritative repo. each dev clones github on their machine, and production clones github as well
18:02 cjohnson whenever I make changes on local, I commit. Then I push my changes up to github. Then I have a deploy script that will run a git pull on the production machine
18:02 cjohnson ideally git shouldn't be your deploy process but...
18:02 quinten not ready to put it in a public github directory just yet, since we don't pay for the private repository
18:02 cjohnson well github is just my choice. you can just choose a server you own to host the authoritative one
18:03 quinten okay. is it OK to make the server hosting the master repository a Windows file server, without ssh?
18:03 bgnick007 bttf ty for the help
18:03 bttf np
18:04 LionsMane joined #git
18:04 cjohnson quinten: there are other options beside ssh for pushing to repos. there's an http server... I think gitosis?
18:04 jost joined #git
18:04 mischief- joined #git
18:04 qsx !gitolite
18:04 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/
18:04 mischief- is there a way to delete a file from the tree but not delete it from disk?
18:04 osse mischief-: rm --cached
18:05 quinten thanks for the help, this gives me some good direction
18:05 Gsham joined #git
18:05 mischief- osse: neato! :D
18:05 Sasazuka joined #git
18:05 achlys joined #git
18:07 cjohnson qsx: so is gitosis something different? or you just like gitolite more?
18:07 _ikke_ gitosis is not maintained anymore
18:08 cjohnson gotchya
18:09 shinnya joined #git
18:09 mingrammer joined #git
18:09 Faylite joined #git
18:11 foist joined #git
18:12 dsantiago joined #git
18:13 shams joined #git
18:13 [cust] joined #git
18:18 achlys joined #git
18:20 govg joined #git
18:20 miklcct joined #git
18:21 e14 joined #git
18:22 katherine joined #git
18:22 jnewt joined #git
18:24 chachasmooth joined #git
18:24 danslo_ joined #git
18:26 romerocesar joined #git
18:27 exarch joined #git
18:29 str joined #git
18:30 morenoh149 joined #git
18:30 vassagus joined #git
18:31 liefer joined #git
18:31 A5101 joined #git
18:31 jnewt how do i get rid of refs/original after git filter-branch?  tried rm -rf .git/refs/original, tried gc.
18:31 skyfaller joined #git
18:31 skyfaller joined #git
18:32 _ikke_ git for-each-ref refs/original --format="delete %(refname)" | git update-ref --stdin
18:33 vuoto joined #git
18:33 star_prone joined #git
18:36 irco joined #git
18:36 [cust] joined #git
18:36 thiago jnewt: rm -rf .git/refs/original
18:37 bsanford joined #git
18:37 l4v2 joined #git
18:37 _ikke_ thiago: that's exactly what he tried..
18:38 thiago then it worked
18:38 jnewt _ikke_, yours worked. the rm -rf did not
18:38 afuentes joined #git
18:39 cyan__ joined #git
18:39 _ikke_ jnewt: why didn't the rm -rf work?
18:40 _ikke_ The only reason mine would work and rm -rf not is packed refs
18:42 kab joined #git
18:44 jnewt i have no idea, i ran it, then ran log and they were all still there.  ran yours, and then log and they were all gone.
18:44 _ikke_ ok
18:46 slayerjain joined #git
18:46 rivarun joined #git
18:48 shymega joined #git
18:48 blackwind_123 joined #git
18:48 boushi_ joined #git
18:49 PaulCape_ joined #git
18:49 jeffreylevesque_ joined #git
18:50 brutul joined #git
18:50 raven-au_ joined #git
18:51 diogenese joined #git
18:51 nephyrin` joined #git
18:52 kenansulayman joined #git
18:52 Surfer2010_ joined #git
18:52 e14 joined #git
18:52 masak joined #git
18:52 jubalh joined #git
18:52 chernjie joined #git
18:52 comps joined #git
18:53 FabTG joined #git
18:53 Lowell joined #git
18:53 BooK joined #git
18:53 curvv joined #git
18:53 avar joined #git
18:53 avar joined #git
18:54 Zoxc joined #git
18:54 stealthii joined #git
18:54 jasondev joined #git
18:55 nbro joined #git
18:55 nbro left #git
18:56 netcarver joined #git
18:56 DANtheBEASTman joined #git
18:56 Urbany joined #git
18:56 netj joined #git
18:56 Grum joined #git
18:56 Arguggi joined #git
18:56 MikeChernev joined #git
18:56 ahf joined #git
18:56 pR0Ps joined #git
18:56 Hogofwar joined #git
18:56 rominronin joined #git
18:56 zapb_ joined #git
18:56 ozymandias_ joined #git
18:57 refried_ joined #git
18:57 mattcen joined #git
18:57 Gsham joined #git
18:57 inodb joined #git
18:58 hecliunyx joined #git
18:59 mariuscc joined #git
18:59 nopf joined #git
18:59 Dougie187 joined #git
18:59 crelix joined #git
19:00 kline joined #git
19:00 meZee joined #git
19:00 Peng joined #git
19:00 Juri_Agarin joined #git
19:01 Catachan_ joined #git
19:01 akkad joined #git
19:02 blackwell joined #git
19:02 TheMoonMaster joined #git
19:02 M-meznak joined #git
19:03 clemf joined #git
19:03 ExeciN joined #git
19:03 vuoto_ joined #git
19:03 APic joined #git
19:04 cyan__ joined #git
19:04 Ranhir joined #git
19:04 Kehet joined #git
19:04 mingrammer joined #git
19:04 m1dnight_ joined #git
19:04 jaeckel joined #git
19:05 Gianormagantrous joined #git
19:05 courrier joined #git
19:05 d5sx43 joined #git
19:05 daumie joined #git
19:06 m1dnight_ joined #git
19:06 Rikairchy joined #git
19:07 garethdaine joined #git
19:08 anonymuse joined #git
19:09 grumble joined #git
19:10 Cabanossi joined #git
19:10 johnny56_ joined #git
19:11 timewalker joined #git
19:11 IanV0rn2341 joined #git
19:12 circ-user-oX0fs joined #git
19:12 cagedwisdom joined #git
19:14 sybariten joined #git
19:14 ahmedelgabri joined #git
19:14 ojdo joined #git
19:15 d5sx43 joined #git
19:16 sanguisdex joined #git
19:16 sanguisdex how can i purge all hitory of a submodule
19:16 sanguisdex ?
19:16 vuoto joined #git
19:17 kyan joined #git
19:17 Flaghacker sanguisdex, Have some patience, this is not live support.
19:17 cagedwisdom left #git
19:17 bremner brainz!
19:18 catbeard think he just forgot the ? and immediately remembered
19:18 cjohnson sanguisdex: easiest way to "lose history" of things is to delete and recreate
19:18 cjohnson imo
19:18 cjohnson now it won't actually delete the history but it will separate it from the current state of the thing
19:19 vuoto_ joined #git
19:19 sanguisdex I have a vim plugin that I want to switch maintainers (repos), but when ever I clone my .dot files repo where I keep the sub, and then init the submodules it gets the old source. despite haveing the .git modules files updated
19:19 Flaghacker catbeard, You're right, I mistook the seconds as minutes, and I thought he bumped after 3 minutes. My apologies...
19:20 alaing joined #git
19:20 sanguisdex Flaghacker: and I thought your response was that of a bot :P
19:21 kyan joined #git
19:21 Flaghacker sanguisdex, ssst, it's a secret!
19:22 JanC_ joined #git
19:22 Caelum joined #git
19:22 cjohnson sanguisdex: git submodule sync && git submodule update --recursive --init
19:22 cjohnson that's how I do that
19:22 sssilver joined #git
19:22 cjohnson if that doesn't do it, remove the folder from .git/modules
19:22 cjohnson and run it again
19:23 cjohnson well, the actual folder and the one in .git/modules
19:25 danslo_ joined #git
19:25 sanguisdex cjohnson: hah it worked! thanks
19:25 cjohnson but really, submodules are evil and you should never use them
19:25 cjohnson :P
19:25 sanguisdex they are the good kind of evil
19:25 cjohnson no, just the bad pure evil
19:25 cjohnson composer/npm are better
19:26 sanguisdex cjohnson: its a .vim dir
19:26 cjohnson but anyway, sync will sync your .gitmodules to the proper .git files
19:26 boombatower joined #git
19:26 cjohnson sanguisdex: vundle
19:27 alaing joined #git
19:27 sanguisdex pathogen
19:27 cjohnson yeah vundle generally works as a drop-in replacement for pathogen
19:27 LionsMane joined #git
19:27 cjohnson but gives you dep management without using submodules. which are evil
19:27 sanguisdex I will look into it someday :)
19:27 cjohnson haha just pulling your leg. I use them too even though they're a major pain
19:28 _ng joined #git
19:28 cagomez joined #git
19:29 nurey joined #git
19:30 parsnip joined #git
19:31 vassagus joined #git
19:31 nwkj86 joined #git
19:31 satbyy joined #git
19:33 daivyk joined #git
19:35 roxtrongo joined #git
19:35 Corneliu joined #git
19:36 PioneerAxon joined #git
19:38 daivyk joined #git
19:39 daivyk joined #git
19:41 crelix joined #git
19:43 jrahmy_ joined #git
19:44 Jon28 joined #git
19:47 jason237 joined #git
19:48 satifant joined #git
19:49 daniel_rose joined #git
19:49 EckyEcky joined #git
19:50 star_prone joined #git
19:51 aard_ joined #git
19:51 grumble joined #git
19:54 fullbit joined #git
19:56 e14 joined #git
19:57 fullbit Hello all, so I have a bit of a dilemma, and I was wondering what would be the best approach. I'm working on my project, and there are two major versions. I am going along the lines of gitflow, having master, develop, release and feature branches. Master is still on version 1.0 but develop is long into 2.0. Due to requirements, I've made a new branch, interim-develop, which is a branch off of master (1.0). How can I put this on top of
19:57 fullbit develop (which is 2.0 based), while still retaining history? Thank you in advance!
19:57 rominronin joined #git
19:58 fullbit Do I just delete everything... commit... and then add everything?
19:58 Mobutils joined #git
19:58 i7c So you have commits based on 1.0 that you want to have on 2.0 as well?
19:58 osse fullbit: what was the reason you didn't create it off 2.0 ?
19:58 cdg joined #git
20:02 fullbit osse: 2.0 is being frozen for the time being
20:02 fullbit i7c: to the best of my knowledge, anything done on 1.0 will eventually be tossed away
20:02 fullbit i7c: so no, nothing on 1.0 will be required for 2.0
20:03 settermjd joined #git
20:03 osse fullbit: if you create a branch off of 2.0 nothing bad happens to 2.0 itself
20:03 osse sounds like bureaucracy got in the way of progress!  \o/
20:04 fullbit osse: lol yes :P buuuuut gotta do what you gotta do. so 2.0 is the develop branch in the gitflow model
20:04 i7c "How can I put this on top of develop (which is 2.0 based), while still retaining history?" Put what?
20:04 fullbit Put a branch off of master (1.0) with new changes on it, that will not be retained for 2.0, onto develop
20:04 Darcidride joined #git
20:04 osse fullbit: if you make a new branch then you can make it anywhere. none of the other branches change at all
20:05 fullbit osse: our infraustructure right now requires code to be on develop, release and master
20:05 i7c Ah. Yeah then osse already said everything I suppose. :)
20:05 osse fullbit: that's unfortunate. you said your branch was called interim-develop
20:06 mischief- well. crap.
20:06 mischief- my git tree is corrupted
20:06 fullbit osse: Yes, the branch is interim-develop
20:06 bjoe2k4 joined #git
20:06 fullbit I also could revert alllll the way back to where the fork happened but idk
20:06 preyalone joined #git
20:06 osse fullbit: but then you break your infrastructure
20:06 rnsanchez joined #git
20:07 matsaman joined #git
20:07 fullbit osse: by reverting?
20:07 nettoweb joined #git
20:07 shaggycat joined #git
20:07 osse fullbit: i'm not good with red tape
20:07 fahadash joined #git
20:08 osse fullbit: you made it sound like only specific branch names were "allowed" or something
20:08 cjohnson fullbit: you can tag 1.0 branch as "last pure 1.0" or something, then start hacking on it with your new changes. then when you're done on 2.0, merge 1.0 into it, if it's still mergeable (depends on your changes in 2.0x)
20:08 fullbit osse: What are your thoughts on me just reverting the delta between 1.0 and 2.0? commit the new changes to 1.0 on top of that
20:08 fullbit and calling it a day
20:08 osse i have no clue
20:08 osse not really sure what you're trying to accomplish
20:08 fullbit reset develop to 1.0, add changes on top of that
20:08 fullbit long story short
20:09 fullbit buuuut keep the changes that I added since, i.e. version 2.0, to come back to that later
20:09 cjohnson fullbit: just go to the relevant commit where ou want to diverge, and make a branch off that commit
20:09 osse :S
20:09 cjohnson no need to reset anything
20:10 i7c It’s possible in one step. :P
20:10 i7c git branch <newbranch> <here>
20:10 osse fullbit: so you want a branch based on 1.0 but with everything from 2.0 in it?
20:10 i7c Or git checkout -b <newbranch><there> (or -B in case you want to "reset")
20:11 kyan joined #git
20:11 daniel_rose joined #git
20:12 fullbit i7c: osse: Here's what I'm gonna do. git checkout -b develop to-be-continued-develop; git revert <to-commit-before-2.0-fork>;
20:12 fullbit :)
20:12 fullbit thanks everyhone
20:12 fullbit everyone
20:13 osse that revert doesn't do what you think it does
20:15 i7c Can see it from your ref description. :D
20:15 osse exactly. I am a genius.
20:16 i7c Was there a reset ≠ revert kinda command for the bot?
20:17 moritz !revert
20:17 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]?
20:18 i7c Guess that’ll do.
20:19 i7c Assuming fullbit still reading here.
20:20 i7c Now assuming after the highlight he'll at least read here.
20:21 _ikke_ qsx: https://www.youtube.com/watch?v=2bim74DR9rI&amp;feature=youtu.be
20:22 qsx need i fear?
20:22 qsx oh, that :D
20:22 thoros left #git
20:22 thoros joined #git
20:23 _ikke_ :-)
20:23 nilg joined #git
20:25 i7c Rhabarberbabarbarenarabarbierbierbar.
20:25 xaa joined #git
20:25 antipsychiatry__ joined #git
20:27 romerocesar joined #git
20:28 danslo joined #git
20:29 thekliar joined #git
20:29 naw joined #git
20:32 vassagus joined #git
20:36 hahuang65 joined #git
20:36 blr_ left #git
20:37 rgrinberg joined #git
20:40 pullphinger joined #git
20:43 quackgyver joined #git
20:44 Sasazuka joined #git
20:46 satbyy joined #git
20:46 satbyy joined #git
20:49 fullbit i7c: I mean revert a range of commits, starting from HEAD to the one before the goal commit to get back to
20:49 MaddHatter Is there some way to tell checkout-index to continue on error? It's correctly failing when it can't create a directory, but I want it to just ignore the uncreated directory and keep going with the rest of the checkout. Instead it gives fatal error and dies.
20:50 Limes left #git
20:50 Limes joined #git
20:51 i7c fullbit, git revert <that-commit>..HEAD
20:51 blackwind_123 joined #git
20:52 fullbit i7c: thank you :)
20:52 i7c You’re welcome. :]
20:52 mingrammer joined #git
20:52 shaggycat joined #git
20:53 i7c fullbit, oh, you probably wanna pick one commit *after* the one you want to go back to.
20:53 i7c Because revert really takes as arguments which commits to undo.
20:54 fullbit i7c: mmhm :)
20:54 jrahmy_ joined #git
20:55 chrisshattuck joined #git
20:56 nwkj86 joined #git
20:57 m0viefreak joined #git
20:58 osse i7c: the range foo..bar does not contain foo itself
20:58 rominronin joined #git
20:58 i7c Oh
20:58 i7c ah right, it’s "not reachable from foo".
20:59 * i7c was wrong. Again.
20:59 * i7c apologises.
21:00 e14 joined #git
21:01 e14 joined #git
21:08 archaic joined #git
21:13 Faylite_ joined #git
21:15 flavius joined #git
21:15 al-damiri joined #git
21:18 inflames joined #git
21:21 ericsupreme joined #git
21:22 achlys joined #git
21:26 dsdeiz_ joined #git
21:27 spacelord joined #git
21:28 danslo joined #git
21:28 hahuang65 joined #git
21:30 achlys joined #git
21:32 HoierM joined #git
21:33 gargola joined #git
21:36 anuxivm joined #git
21:40 e14 joined #git
21:41 jimi_ joined #git
21:41 bauruine joined #git
21:42 clemf joined #git
21:43 Cabanossi joined #git
21:45 andlabs joined #git
21:46 ahr3n joined #git
21:47 mingrammer joined #git
21:48 Dougie187 left #git
21:51 raijin joined #git
21:58 justanotheruser joined #git
21:59 rominronin joined #git
22:00 justanotheruser joined #git
22:00 cagmz joined #git
22:01 spudowiar joined #git
22:07 dsdeiz joined #git
22:11 JamesBaxter joined #git
22:16 davis left #git
22:16 Darcidride joined #git
22:20 lvns joined #git
22:20 e14 joined #git
22:23 landaire_ joined #git
22:25 blackwell joined #git
22:25 e14 joined #git
22:26 fullbit joined #git
22:27 amdi_ joined #git
22:28 BSaboia joined #git
22:28 cosmologic joined #git
22:29 Raed|Mobile joined #git
22:29 danslo joined #git
22:30 amdi_ joined #git
22:31 romerocesar joined #git
22:33 vassagus joined #git
22:33 MattMaker joined #git
22:35 chrisshattuck joined #git
22:38 fullbit joined #git
22:45 romerocesar joined #git
22:46 unreal joined #git
22:51 Caelum joined #git
22:52 d1b joined #git
22:52 raijin joined #git
22:54 zivester joined #git
22:55 umpoohg joined #git
22:55 pijiu joined #git
22:56 fullbit joined #git
23:02 rgrinberg joined #git
23:04 pioiytr joined #git
23:05 refried_ joined #git
23:06 fish3485 joined #git
23:07 Ahmed90 joined #git
23:08 chrisshattuck joined #git
23:09 Gsham joined #git
23:12 flaguy48 joined #git
23:12 anonymuse joined #git
23:16 clemf joined #git
23:18 madewokherd joined #git
23:22 kyan joined #git
23:22 arescorpio joined #git
23:23 tomog999 joined #git
23:25 ResidentBiscuit joined #git
23:25 e14 joined #git
23:28 drawkula joined #git
23:30 danslo joined #git
23:30 rgrinberg joined #git
23:34 DolpheenDream joined #git
23:34 vassagus joined #git
23:35 mingrammer joined #git
23:37 ayjay joined #git
23:38 ansimation joined #git
23:38 benbergman joined #git
23:40 dsdeiz joined #git
23:40 dsdeiz joined #git
23:42 DolpheenDream joined #git
23:43 Kaisyu joined #git
23:45 cmrabet joined #git
23:45 cmrabet Hi all
23:45 gitinfo cmrabet: 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.
23:47 cmrabet I have an existing repository A where in a subfolder I want to clone a specific folder from another repository B, is this possible? Basically repository A is my app, and repository B is the source in markdown for my documentation, which is parsed into HTML static files in a subdirectory (the one I want to add into repository A). Thanks.
23:47 ansimation joined #git
23:49 kyan joined #git
23:50 waruqi joined #git
23:51 skylite joined #git
23:51 bobdobbs joined #git
23:53 v0n joined #git
23:56 dodobrain joined #git
23:57 l4v2 joined #git
23:57 Lyqyd joined #git
23:58 SwiftMatt joined #git

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