Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-20

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

All times shown according to UTC.

Time Nick Message
00:01 soerenb joined #git
00:03 mingrammer joined #git
00:04 ailaG One more question. If I committed some work to the wrong branch, can I copy / move that work to the relevant branch?
00:09 HoierM joined #git
00:10 cyphase joined #git
00:13 lugzer joined #git
00:16 nevyn yeah
00:16 nevyn cherry-pick
00:19 johnnyfive joined #git
00:19 _unreal_ left #git
00:19 drbean_ joined #git
00:20 l4v2 joined #git
00:20 mjuszczak joined #git
00:22 tjone270 joined #git
00:23 Nadav joined #git
00:23 Digitteknohippie joined #git
00:25 Nadav Hello everyone. I'm trying to make sense of how binary diffs are represented in git diffs. Has anyone worked on this by any chance?
00:27 jcadduono left #git
00:31 drbean joined #git
00:38 watabou joined #git
00:44 madewokherd joined #git
00:45 drbean_ joined #git
00:48 mehola joined #git
00:49 drewo joined #git
00:52 justanot1eruser joined #git
00:52 xall joined #git
00:53 cqi joined #git
00:57 sag47 joined #git
00:57 sag47 left #git
00:57 Noldorin joined #git
00:58 mingrammer joined #git
00:59 tgunr joined #git
01:02 efdetonator joined #git
01:05 pks joined #git
01:07 matzie joined #git
01:08 SwiftMatt joined #git
01:08 lugzer joined #git
01:08 matzie trying to write a valid credential to a credential helper programmatically in a script, ie not letting it be triggered by a clone or similar but ‘pre-filling’ creds into the helper.  anyone know how? Can’t crack the syntax
01:19 SwiftMatt joined #git
01:20 matzie For the logs: soln was - make a file containing four lines, protocol=, host=, username=, password= … then cat that piped into ‘git-credential approve’
01:21 LeBlaaanc joined #git
01:22 anuxivm left #git
01:22 juanpablorochaam joined #git
01:23 efdetonator joined #git
01:27 jaguarmagenta joined #git
01:28 Gsham joined #git
01:29 danimal2 joined #git
01:31 dsantiago joined #git
01:31 cdg joined #git
01:33 texinwien_ joined #git
01:34 Sucks joined #git
01:34 durham_ joined #git
01:34 jost__ joined #git
01:37 sangy joined #git
01:38 clemf joined #git
01:39 PioneerAxon joined #git
01:39 f3r70rr35f joined #git
01:39 HoierM joined #git
01:40 watabou joined #git
01:40 legumbre joined #git
01:41 matzie left #git
01:42 dreamseeker joined #git
01:46 cd-rum_ joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and support groups | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.1 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | CVS Survivors Meetings are Tuesdays at 9
01:49 mwhooker joined #git
01:49 Motoko joined #git
01:51 kus joined #git
01:52 st0opkid joined #git
01:53 naf i love version control, but something about git that gits me is how it's possible to irreversibly flick up a repository in a single command by accident
01:54 kadoban It's pretty hard, unless that command is something like rm -rf
01:55 ochorocho__ joined #git
01:55 bremner /usr/bin/haltandcatchfire
02:02 Darren_ joined #git
02:03 lugzer joined #git
02:03 harish_ joined #git
02:04 thiago joined #git
02:05 LvcasX1 joined #git
02:05 ahr3n joined #git
02:05 jeffreylevesque joined #git
02:06 Bennux joined #git
02:09 mingrammer joined #git
02:10 bayman joined #git
02:10 bayman i'm getting Permission denied (publickey). tryng to git clone a private bitbucket repo
02:12 scottbot84 joined #git
02:13 thiago bayman: your public key was not accepted
02:13 f3r70rr36f joined #git
02:14 hexagoxel joined #git
02:15 sto0pkid joined #git
02:16 f3r70rr35f joined #git
02:21 st0opkid joined #git
02:21 Dougie187 joined #git
02:23 lindenle joined #git
02:25 stantonk joined #git
02:32 cqi joined #git
02:35 skylite joined #git
02:40 chachasmooth joined #git
02:42 kevin joined #git
02:42 watabou joined #git
02:43 ajf- joined #git
02:45 Ravana joined #git
02:48 mehola joined #git
02:54 Gsham joined #git
02:57 lamont joined #git
02:57 dreiss joined #git
02:57 lugzer joined #git
02:59 durham joined #git
03:03 gfixler joined #git
03:06 durham joined #git
03:08 samsonizzle joined #git
03:08 fahadash joined #git
03:09 unforgiven512 joined #git
03:09 caffeinatedcode joined #git
03:09 caffeinatedcode joined #git
03:11 maqr joined #git
03:11 cdg joined #git
03:12 nobso joined #git
03:13 fullstack joined #git
03:16 Darren_ joined #git
03:17 systmkor joined #git
03:18 fullstack joined #git
03:18 Dougie187 left #git
03:19 emilyrose joined #git
03:20 Jon28_ joined #git
03:20 k3rn31 joined #git
03:21 stonerfish joined #git
03:27 boombatower joined #git
03:27 piling joined #git
03:28 cqi joined #git
03:28 Andrew_K joined #git
03:30 danimal2 joined #git
03:31 mehola joined #git
03:32 chrisshattuck joined #git
03:38 blahdodo joined #git
03:39 azbarcea joined #git
03:40 rchavik joined #git
03:48 Limes_ joined #git
03:48 a_thakur joined #git
03:49 Goplat joined #git
03:50 danslo joined #git
03:50 robotroll joined #git
03:52 lugzer joined #git
03:56 steve joined #git
03:57 ochorocho__ joined #git
03:59 nilg joined #git
04:04 dsdeiz joined #git
04:04 drbean joined #git
04:06 sangy joined #git
04:09 mycyber joined #git
04:09 akushner joined #git
04:11 Lyqyd joined #git
04:12 bayman- joined #git
04:12 f3r70rr35f joined #git
04:13 zacts joined #git
04:17 blahdodo joined #git
04:20 ag4ve_ joined #git
04:20 drbean joined #git
04:20 sto0pkid joined #git
04:21 phanimahesh joined #git
04:21 ljc joined #git
04:24 stantonk joined #git
04:24 stantonk joined #git
04:25 LiENUS joined #git
04:26 stantonk joined #git
04:31 t-mart_ joined #git
04:32 dunpeal joined #git
04:32 k3rn31 joined #git
04:33 drbean_ joined #git
04:34 zivester joined #git
04:36 drbean joined #git
04:43 emPi joined #git
04:46 ShapeShifter499 joined #git
04:47 lugzer joined #git
04:49 drbean_ joined #git
04:51 freimatz joined #git
04:57 Cabanossi joined #git
04:59 mycyber joined #git
05:03 lugzer joined #git
05:04 MattMaker joined #git
05:04 drbean joined #git
05:05 MattMaker joined #git
05:11 subhojit777 joined #git
05:11 rscata joined #git
05:12 cqi joined #git
05:13 akushner joined #git
05:19 babilen joined #git
05:19 drbean_ joined #git
05:21 akushner joined #git
05:21 a_thakur joined #git
05:21 SwiftMatt joined #git
05:22 ochorocho__ joined #git
05:22 f3r70rr35f joined #git
05:23 _xor If I have a working tree with some changes that I don't need, and I do a git checkout -f some_other_branch, should I do git reset --hard HEAD before that or is it redundant?
05:23 _xor Correct me if I'm wrong, but the reset completely restores the tree IIRC, while the checkout -f will just overwrite files as necessary but leave unconflicting changed files.
05:27 stantonk joined #git
05:30 sangy joined #git
05:36 qt-x joined #git
05:37 ThomasLocke joined #git
05:40 st0opkid joined #git
05:40 davidbz joined #git
05:42 grawity no, -f always overwrites local changes
05:43 Sucks joined #git
05:44 tvw joined #git
05:50 crazyhorse18 joined #git
05:51 zeroed joined #git
05:51 zeroed joined #git
05:51 Alienpruts joined #git
05:51 danslo joined #git
05:51 drbean joined #git
05:51 Novitsh_ joined #git
05:51 crazyhorse18 hey.. ok so everytime i commit, objects in .git/objects end up being group owned by me.. so others can't commit
05:51 crazyhorse18 how can i fix this
05:52 thiago crazyhorse18: look into the core.sharedRepository option in man git-config
05:52 gitinfo crazyhorse18: the git-config manpage is available at http://jk.gs/git-config.html
05:53 lamont joined #git
05:54 lordjancso joined #git
05:55 crazyhorse18 thanks thiago.. i'll test it now
05:55 muthu joined #git
05:55 Repox joined #git
05:56 sto0pkid joined #git
06:00 jeffreylevesque joined #git
06:00 jceb joined #git
06:01 dopesong joined #git
06:02 JeroenT joined #git
06:04 dopesong_ joined #git
06:05 Macaveli joined #git
06:06 cyan__ joined #git
06:07 drbean_ joined #git
06:11 usm4n joined #git
06:14 zeroed joined #git
06:17 nilg joined #git
06:19 apotry joined #git
06:21 a_thakur joined #git
06:23 cyphase joined #git
06:26 ochorocho__ joined #git
06:27 st0opkid joined #git
06:27 lindenle joined #git
06:28 watabou joined #git
06:29 stantonk joined #git
06:32 LeMike joined #git
06:33 cdown joined #git
06:33 ajf- joined #git
06:36 a_thakur joined #git
06:37 sto0pkid joined #git
06:38 j4hr0m joined #git
06:39 j4hr0m hi room!
06:39 gitinfo j4hr0m: 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.
06:39 Alienpruts joined #git
06:41 st0opkid joined #git
06:41 OnBrokenWings joined #git
06:42 JeroenT joined #git
06:45 leeN joined #git
06:48 xai joined #git
06:49 j4hr0m I am asking for advice regarding following situation:
06:49 j4hr0m We have a TEST-system that is used only for developing purposes. We are developing features 1-5
06:49 j4hr0m When we think, our TEST are complete, we deploy all 5 features on a PREPROD system, where the customer can view our newly developed features.
06:49 j4hr0m Now the customer can decide, whether he/she wants a feature or not, that is already on the PREPROD system, se he wants feature 1,3,5 but not 2 and 4.
06:49 j4hr0m We have each system on a seperate branch, running jenkins that builds install packages.
06:49 j4hr0m What is the best way (git workflow) to manage our system? Thanks in advance for the hints
06:51 j4hr0m i forgot to mention: our PRODUCTION system is also on a seperate branch
06:54 lugzer joined #git
06:54 adac joined #git
06:54 selckin why are you not happy with how you do it now
06:57 watabou joined #git
06:57 MrMojito joined #git
06:57 MrMojito joined #git
06:57 Darcidride joined #git
06:59 dopesong joined #git
07:00 Hedgework joined #git
07:01 settermjd joined #git
07:02 tjone270_ joined #git
07:02 danslo joined #git
07:02 j4hr0m we are not sure, if it is good the way, we are doing it now.
07:04 a_thakur joined #git
07:04 j4hr0m the problem is, that we might have many commits in a linear order on the preprod branch, but then we want to install only a few of them
07:04 drbean joined #git
07:04 MrMojito joined #git
07:05 j4hr0m what is the best way organizing them?
07:07 TheVoid joined #git
07:07 netcarver joined #git
07:07 rbr joined #git
07:08 wethu joined #git
07:10 Hounddog joined #git
07:11 intellix joined #git
07:12 TomyWork joined #git
07:16 encod3 joined #git
07:20 drbean_ joined #git
07:21 Faylite joined #git
07:23 watabou_ joined #git
07:24 texinwien_ joined #git
07:25 howdoi joined #git
07:27 akiva joined #git
07:28 p4trix joined #git
07:28 jaguarmagenta joined #git
07:29 chicpsj1130 joined #git
07:29 chicpsj1130 left #git
07:30 obiwahn joined #git
07:30 obiwahn hi git
07:31 obiwahn i am reading https://git-scm.com/docs/githooks
07:31 obiwahn i wonder what variables are availalbe in the script
07:34 LiohAu joined #git
07:35 GavinMagnus joined #git
07:35 drbean joined #git
07:36 ramsub07 joined #git
07:37 MrMojito joined #git
07:37 MrMojito joined #git
07:38 DevAntoine joined #git
07:40 settermjd joined #git
07:42 ahmedelgabri joined #git
07:44 Balliad joined #git
07:45 kab joined #git
07:46 kab joined #git
07:47 armyriad joined #git
07:47 kab joined #git
07:49 cbreak obiwahn: man git has a list of git env vars...
07:49 gitinfo obiwahn: the git manpage is available at http://jk.gs/git.html
07:49 cbreak they are probably also active in a hook
07:51 Darcidride joined #git
07:51 multi_io joined #git
07:51 settermjd joined #git
07:52 rossome joined #git
07:54 mingrammer joined #git
07:57 King_Hual joined #git
07:59 nuc joined #git
08:01 aswen joined #git
08:01 mikecmpbll joined #git
08:02 dopesong joined #git
08:05 JeroenT joined #git
08:05 bongjovi joined #git
08:07 drbean_ joined #git
08:10 a_thakur joined #git
08:11 tesuji joined #git
08:11 kurkale6ka joined #git
08:11 t0by joined #git
08:12 a_thakur joined #git
08:14 PioneerAxon joined #git
08:15 FunkyAss joined #git
08:16 chll_ joined #git
08:17 PCatinean joined #git
08:18 settermjd joined #git
08:20 mischat joined #git
08:25 govg joined #git
08:27 cyphase joined #git
08:27 ochorocho__ joined #git
08:30 JeroenT joined #git
08:30 lindenle joined #git
08:32 sanketdg joined #git
08:32 a_thakur joined #git
08:34 crazyhorse18 joined #git
08:35 Silenced joined #git
08:36 rscata joined #git
08:36 Silenced joined #git
08:37 Sasazuka joined #git
08:37 wethu joined #git
08:37 rscata joined #git
08:43 zeroed joined #git
08:45 filcab joined #git
08:46 cbreak so... it seems bitbucket enabled git lfs beta
08:46 cbreak seems to work
08:47 cbreak and seems to be easier than git annex
08:47 Zarthus bitbucket is really stepping up as of late, yeah
08:47 Zarthus lots of cool features
08:47 eizua joined #git
08:47 phanimahesh joined #git
08:49 DevAntoine joined #git
08:49 drbean joined #git
08:49 clmsy joined #git
08:53 troulouliou_div2 joined #git
08:55 notebox joined #git
08:55 lordjancso joined #git
08:56 Balliad joined #git
08:56 aidalgol joined #git
08:58 dhruv2204 joined #git
08:59 testild joined #git
09:00 filcab joined #git
09:04 sveinse joined #git
09:04 M-shine joined #git
09:04 kedare joined #git
09:05 tvw joined #git
09:06 drbean_ joined #git
09:07 ljc joined #git
09:08 GavinMagnus left #git
09:11 ryez joined #git
09:15 jikz joined #git
09:18 GavinMagnus joined #git
09:19 GavinMagnus left #git
09:20 mutsy joined #git
09:20 mutsy okay guys, help me please
09:20 mutsy I had uncommited changes
09:20 mutsy and I did a reset --hard to the last commit...
09:21 mutsy so I lost all my changes now
09:21 mutsy how can I revert this back?
09:21 nnyk joined #git
09:22 cbreak mutsy: nope
09:22 usm4n joined #git
09:22 cbreak mutsy: if it's not committed, then git has no history of it
09:22 cbreak mutsy: did you git add the files?
09:22 mutsy yeah true..
09:22 mutsy and no
09:22 mutsy so I lost them
09:23 GavinMagnus joined #git
09:23 cbreak if you would have added them, you might be able to find them with git fsck --lost-found
09:23 cbreak but since you didn't, git never had any record of your changes :(
09:27 M-mistake joined #git
09:27 M-meznak joined #git
09:29 ochorocho__ joined #git
09:30 GavinMagnus left #git
09:31 stantonk joined #git
09:31 jaguarmagenta joined #git
09:34 netj joined #git
09:38 nilg joined #git
09:40 ahmedelgabri joined #git
09:42 phanimahesh joined #git
09:43 notebox joined #git
09:43 Silox| joined #git
09:46 mrkat joined #git
09:51 Darcidride_ joined #git
09:53 TheDcoder joined #git
09:54 TheDcoder How do I only clone the latest revision of code?
09:54 TheDcoder I don't want all the history
09:54 TheDcoder I just want the latest files
09:56 mahendra_ joined #git
09:56 playfullyExist joined #git
09:58 JeroenT joined #git
09:58 jstein_ joined #git
10:02 dsdeiz joined #git
10:04 gma joined #git
10:04 ryez TheDcoder: git clone --depth 1
10:05 TheDcoder oh
10:05 wodim joined #git
10:05 TheDcoder Thanks ryez
10:06 e89c8c95a050 joined #git
10:10 mehola joined #git
10:10 DieguezZ joined #git
10:15 piling_ joined #git
10:15 Softeisbieger joined #git
10:15 Darcidride_ joined #git
10:17 j4hr0m is it possible to merge selected commit only with git?
10:17 selckin !cherry-pick
10:18 mycyber joined #git
10:18 mingrammer joined #git
10:19 DevAntoine joined #git
10:19 j4hr0m thanks selckin
10:20 TheDcoder left #git
10:22 Macaveli joined #git
10:23 drbean joined #git
10:25 _ikke_ (which is not a merge)
10:27 Corneliu joined #git
10:27 achadwick joined #git
10:29 mdw joined #git
10:30 mdw joined #git
10:31 ome joined #git
10:32 lindenle joined #git
10:34 circ-user-03wEf joined #git
10:35 acetakwas joined #git
10:36 drbean_ joined #git
10:37 intellix joined #git
10:38 drbean joined #git
10:38 freimatz joined #git
10:38 iota_pi joined #git
10:39 Jellyg00se joined #git
10:43 JeroenT joined #git
10:43 DomeMaster left #git
10:44 settermjd joined #git
10:50 sdothum joined #git
10:52 drbean_ joined #git
10:58 fahadash joined #git
10:59 a_thakur joined #git
10:59 JeroenT joined #git
10:59 rchavik joined #git
11:04 playfullyExist joined #git
11:05 fuchstronaut joined #git
11:05 Diabolik joined #git
11:06 JeroenT joined #git
11:07 Diabolik joined #git
11:07 Diabolik joined #git
11:08 HoierM joined #git
11:09 drbean joined #git
11:13 mingrammer joined #git
11:13 johnmilton joined #git
11:16 m0nkmaster joined #git
11:16 stuivi joined #git
11:16 ojdo joined #git
11:18 _xor joined #git
11:19 Viewtiful joined #git
11:20 rnsanchez joined #git
11:21 cdown joined #git
11:24 nilg joined #git
11:25 LeMike joined #git
11:25 cdown_ joined #git
11:26 phanimahesh joined #git
11:28 CheckDavid joined #git
11:28 settermjd joined #git
11:30 ochorocho__ joined #git
11:31 eatsfoobars joined #git
11:32 jaguarmagenta joined #git
11:32 cyphase joined #git
11:34 stonerfish joined #git
11:34 cyan__ joined #git
11:34 Gonzo89 joined #git
11:40 eatsfoobars joined #git
11:40 Ocnod joined #git
11:40 Ocnod left #git
11:42 eatsfoobars joined #git
11:44 crazyhorse18 joined #git
11:46 m0nkmaster joined #git
11:49 rchavik_ joined #git
11:51 sonOfRa joined #git
11:51 leeN joined #git
11:53 Anticom joined #git
11:53 drbean_ joined #git
11:55 Lunatrius joined #git
11:56 Rooxo joined #git
11:56 drbean joined #git
11:58 espindola joined #git
12:00 dopesong joined #git
12:03 tomog999 joined #git
12:05 synthroid joined #git
12:05 m0nkmaster joined #git
12:06 GavinMagnus joined #git
12:07 dopesong joined #git
12:07 drbean_ joined #git
12:09 dopesong joined #git
12:09 livingBEEF joined #git
12:09 drbean- joined #git
12:11 mehola joined #git
12:13 JeroenT joined #git
12:13 livingBEEF So I have a cache directory with .gitkeep in it.. but locally I want to have cache in tmp, so I use simlink. Now git is complainig that I have unstaged changes (deleted .gitkeep - even though .gitkeep is there, only behind simlink). Is there any way around this?
12:14 osse livingBEEF: no. git will track the symlink itself, not what it points to
12:14 baako joined #git
12:15 rwb joined #git
12:18 chachasmooth joined #git
12:18 stantonk joined #git
12:18 solf1re joined #git
12:21 tvw joined #git
12:21 griffindy joined #git
12:21 drbean joined #git
12:22 rgrinberg joined #git
12:23 drbean_ joined #git
12:25 inflames joined #git
12:26 rgrinberg joined #git
12:30 usm4n joined #git
12:31 notebox joined #git
12:31 mingrammer joined #git
12:31 yuhlw_ joined #git
12:32 talin_ joined #git
12:32 talin_ hello. i have meld as tool when doing git diff. how can i use meld also for git show?
12:33 jeffreylevesque joined #git
12:34 lindenle joined #git
12:35 livingBEEF too bad... thanks for info though
12:35 selckin livingBEEF: can symlink in the other direction maybe
12:35 selckin livingBEEF: or hard links
12:36 livingBEEF It's a simlink on ramdisk... so hardling isn't an option
12:36 subhojit777 joined #git
12:36 zacts joined #git
12:36 livingBEEF bind mount is the only way to make it work, probably
12:38 livingBEEF It's not a big issue though, I can always delete checkout the cache folder whenever I need to rebase and replace it with simlink again after it's done.
12:39 livingBEEF It's just a bit annoying.
12:39 baako joined #git
12:40 harish_ joined #git
12:40 GavinMagnus left #git
12:42 bahamas joined #git
12:42 bahamas hi. I have a bunch of commits in a branch. is there a way to turn all of them into separate branches?
12:43 creppe joined #git
12:44 Eryn_1983_FL joined #git
12:45 chachasmooth joined #git
12:45 selckin just do it (tm) ?
12:46 selckin branch, cherry-pick, repeat or script
12:46 ahmedelgabri joined #git
12:47 victorbjelkholm joined #git
12:47 zivester joined #git
12:48 victorbjelkholm hello! I'm wondering if I can set the name of the default remote when cloning projects, instead of origin I would like it to default into upstream instead. Did some searching but found nothing meaningful so thought I would ask here before giving up at least
12:48 bahamas selckin: I'll look at cherry-pick. thanks!
12:49 perlpilot victorbjelkholm: you can always do  "git clone ...; git remote rename origin upstream"
12:50 perlpilot victorbjelkholm: you can also make an alias for that
12:50 victorbjelkholm perlpilot, yeah, that's what I'm doing currently, would be nicer if it was automatic though :)
12:50 victorbjelkholm hm, yeah, an alias for cloning would be an option, thanks for the idea perlpilot
12:50 selckin victorbjelkholm: git clone == git init; git remote add upstream; git fetch
12:51 jantje start push -> server writes objects -> runs pre-receive hooks -> locks repo + updates it with new commit + unlock -> run post-receive -> end   , I have the problem that if a client drops out (Cltrl-C) when it's at the very end of the pre-receive hook (but it keeps on running due to ignoring sigpipe etc) then the server accepts the commit, but it never starts running the post-receive hook
12:51 victorbjelkholm selckin, what you mean with git clone === git init ?
12:52 perlpilot victorbjelkholm: git clone -o upstream ...  # from the docs :)
12:52 Cata|Work joined #git
12:52 victorbjelkholm `--origin <name>, -o <name>` ah, good catch perlpilot
12:53 victorbjelkholm then it most surely be possible to set this in my ~/.gitconfig, no?
12:53 m0nkmaster joined #git
12:53 Eryn_1983_FL joined #git
12:54 chachasmooth joined #git
12:54 perlpilot victorbjelkholm: if not, that's a good suggestion for the devs to add it to the stuff settable via .gitconfig
12:55 osse livingBEEF: make easier to make the cache available to your app/website/thingy/whatever through an env var or somethung like that. then you don't have to do anything in git
12:56 osse livingBEEF: or make it as part of a build script or something; whatever fits what you're doing
12:56 osse s/make easier/maybe easier/
12:56 l4v2 joined #git
12:56 GavinMagnus joined #git
12:58 livingBEEF That's not a bad idea. Thers's a local config file with database password and such other local stuff.. might be possible to put it there.
12:59 osse !config btw :P
12:59 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
12:59 livingBEEF yea, that one isn't tracked
13:00 osse \o/
13:01 obiwahn Is there a way to get a "diff" between 2 commits showing only lines committed by a certain "author". It does not make much sense if some changes are based on other peoples pulled in work - but i would like to neglect that for now.
13:02 mbrzuzy joined #git
13:02 selckin all changes are made by the author of the 2nd commit you're diffing?
13:02 andlabs joined #git
13:02 selckin erm, nevermind
13:03 tunage joined #git
13:05 zincrokx joined #git
13:05 cdown joined #git
13:06 tunage where is the n00b guide to starting a project? How to start your versioning numbering system correctly, how to make code snippets private?  etc...
13:06 mbreedlove joined #git
13:06 rom1504 git has no code snippets
13:06 rom1504 git has no versioning numbering system
13:06 zincrokx joined #git
13:06 rom1504 git has no project
13:07 selckin obiwahn: can probably script something crazy with blame, just curious why do you want this?
13:07 zincrokx joined #git
13:08 zincrokx joined #git
13:08 m0nkmaster joined #git
13:09 mbreedlove joined #git
13:10 a_thakur_ joined #git
13:11 boombatower joined #git
13:11 SourTrout joined #git
13:15 daniel_rose joined #git
13:16 playfullyExist joined #git
13:16 ExoUNX joined #git
13:17 mozzarella joined #git
13:17 bsanford joined #git
13:20 kbs joined #git
13:22 fuchstronaut joined #git
13:23 sostenuto joined #git
13:25 cdg joined #git
13:26 ncx joined #git
13:26 SourTrout joined #git
13:28 SourTrou_ joined #git
13:28 phroa tunage: in order, man git-init , you can approximate with `git rev-list | wc -l` but there is no actual version numbering, and... just don't share code with people you don't want to have it?
13:28 gitinfo tunage: the git-init manpage is available at http://jk.gs/git-init.html
13:28 phroa here are several "guides" (more or less)
13:28 phroa !books
13:28 gitinfo [!book] There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
13:29 rnsanchez_ joined #git
13:29 Xethron joined #git
13:30 ochorocho__ joined #git
13:32 nnyk joined #git
13:33 jaguarmagenta joined #git
13:33 SourTrout joined #git
13:34 livingBEEF left #git
13:35 TooLmaN joined #git
13:36 moei joined #git
13:36 Gsham joined #git
13:38 fuchstronaut joined #git
13:38 fuchstronaut joined #git
13:40 a_thakur joined #git
13:43 AaronMT joined #git
13:43 moei joined #git
13:45 Dougie187 joined #git
13:45 dranve joined #git
13:46 caffeinatedcode joined #git
13:46 caffeinatedcode joined #git
13:46 usm4n joined #git
13:47 mikecmpb_ joined #git
13:47 mdw joined #git
13:48 mdw joined #git
13:51 FuzzySockets joined #git
13:51 mbreedlove joined #git
13:51 smithbone joined #git
13:53 AaronMT joined #git
13:55 drbean joined #git
13:57 mingrammer joined #git
13:58 hubertus_quack joined #git
13:58 hubertus_quack left #git
13:59 mikecmpbll joined #git
13:59 nehaljwani joined #git
13:59 nehaljwani left #git
14:00 new_student joined #git
14:01 new_student Hi! Is there a particular reason why git ls-remote --tags doesn't have a -l option? In a huge repo, it throws all the tags.. whereas I want only certain, matching a pattern,without cloning the repo
14:02 citizen-stig joined #git
14:02 synthroid joined #git
14:03 bsanford joined #git
14:04 fuchstronaut joined #git
14:05 pxqxvk joined #git
14:06 kbs I thought a ref pattern can be specified? e.g. git ls-remote -t https://github.com/git/git v2.9\*
14:07 catag87 joined #git
14:07 marcogmonteiro joined #git
14:07 catag87 joined #git
14:08 new_student thanks kbs I somehow missed that from the man page
14:08 MZAWeb_ joined #git
14:08 adac joined #git
14:08 devxom joined #git
14:09 l4v2 joined #git
14:10 cy6erlion joined #git
14:12 mehola joined #git
14:12 adac joined #git
14:13 daniel_rose joined #git
14:15 encod3 joined #git
14:16 cdg joined #git
14:18 Electrom_ joined #git
14:18 cuebix-wk joined #git
14:19 madewokherd joined #git
14:21 ribasushi joined #git
14:22 tabrez joined #git
14:23 unbalancedparen joined #git
14:24 mangolisk joined #git
14:24 armyriad joined #git
14:25 phaleth joined #git
14:25 D-Boy joined #git
14:26 mbreedlove joined #git
14:26 jceb joined #git
14:27 crose joined #git
14:27 shaggycat joined #git
14:28 mbreedlove joined #git
14:28 ShekharReddy joined #git
14:29 cy6erlion left #git
14:30 phanimahesh Anywhere you expect a pattern to work, try it. It usually works, or there's a strong reason why it doesn't.
14:30 geoid joined #git
14:31 phanimahesh That's the beauty of well designed applications.
14:32 kadoban joined #git
14:32 JeroenT joined #git
14:34 rnsanchez joined #git
14:34 devster31 joined #git
14:35 mustmodify joined #git
14:35 mustmodify Hey can I `cat` a file for a different version, without having to checkout, etc?
14:35 mustmodify I know I can, I just can't remember how right now. I'll ask Google.
14:36 lindenle joined #git
14:36 jast git show commit:path/to/file
14:36 ahmedelgabri joined #git
14:36 D[4]ni joined #git
14:36 jast for low level, man git-cat-file
14:36 gitinfo the git-cat-file manpage is available at http://jk.gs/git-cat-file.html
14:36 kadoban jast > google
14:36 jast I'm faster
14:36 mustmodify Yeah, if that were git cat it would be that much easier to remember. :)
14:37 jast but they're still not offering me enough money, so I remain google's foremost competitor. :}
14:37 kadoban git hates cats
14:37 stantonk joined #git
14:37 kadoban jast: Haha
14:38 tvw joined #git
14:39 drbean_ joined #git
14:40 thiago joined #git
14:40 daniel_rose joined #git
14:41 mustmodify jast: You're the one thing standing in the way of their global domination. Keep sticking it to them!
14:42 King_Hual joined #git
14:42 King_Hual joined #git
14:42 sangy joined #git
14:42 d0nkeyBOB joined #git
14:44 zivester joined #git
14:44 ResidentBiscuit joined #git
14:45 phanimahesh joined #git
14:45 naitsirhc joined #git
14:46 tinanoo joined #git
14:48 grift joined #git
14:49 mikecmpbll ahhh, what a mess. let's say i create branch B from master, do 5 commits, and then cherry pick the latest commit from branch B in to master
14:50 mikecmpbll does the merge-base between master and branch B then become the head of branch B, so git merge B from master won't do anything?
14:50 mikecmpbll that appears to be the case to me? if so, how can i merge the other commits, or find out what they are so i can cherry-pick them too? :/
14:51 subhojit777 joined #git
14:52 mingrammer joined #git
14:52 mustmodify left #git
14:54 chachasmooth joined #git
14:55 espindola joined #git
14:56 daniel_rose joined #git
14:56 kanyeezy joined #git
14:57 qpdb joined #git
14:59 mycyber joined #git
14:59 clemf joined #git
15:00 GavinMagnus joined #git
15:01 encod3 joined #git
15:03 espindol_ joined #git
15:05 robotroll joined #git
15:07 daniel_rose joined #git
15:07 jast mikecmpbll: cherry-pick doesn't affect the merge base
15:07 ResidentBiscuit joined #git
15:08 jast generally, to find out what you can pick, you can use 'git cherry master' (going from your example)
15:08 mikecmpbll jast: no? hmm. so when i merge branch B does it try and merge commits before the cherry-picked one? not sure what's gone on with mine then.
15:08 jast it should merge everything starting from the old merge base, and potentially run into conflicts if it can't figure out that the cherry-picked commit is a copy of one of the commits after the merger base
15:09 madewokherd joined #git
15:09 netcarver joined #git
15:10 editshare-ericf joined #git
15:13 RajRajRaj joined #git
15:13 ash_workz joined #git
15:13 fuchstronaut joined #git
15:13 encod3 joined #git
15:13 kaldoran joined #git
15:14 daniel_rose joined #git
15:15 chrisshattuck joined #git
15:15 Darren_ joined #git
15:16 RajRajRaj hi, i want to see my changes since a certain date. how do i do it?
15:17 _ikke_ RajRajRaj: git log --all --since "<date>"
15:17 RajRajRaj _ikke_:  only my commits
15:17 _ikke_ RajRajRaj: git log --all --since "<date>" --author="rajrajraj"
15:17 spb 'man git-log' is helpful here
15:17 gitinfo the git-log manpage is available at http://jk.gs/git-log.html
15:17 RajRajRaj _ikke_:  thanks :))
15:18 clemf joined #git
15:18 eka joined #git
15:18 clemf joined #git
15:19 romerocesar joined #git
15:20 BrianBlaze420 joined #git
15:20 NeXTSUN joined #git
15:20 jimi_ joined #git
15:21 netcarver joined #git
15:21 IWishIKnew joined #git
15:23 drbean joined #git
15:24 clemf joined #git
15:24 khelkun joined #git
15:24 synthroid joined #git
15:24 RajRajRaj _ikke_:  git log --all --since "30 days ago" --date=relative --author="rajrajraj" {doesnt work}
15:25 RajRajRaj it shows me the commit only of lat 30th day
15:25 RajRajRaj last*
15:25 clemf joined #git
15:26 clemf joined #git
15:26 Rooxo left #git
15:26 netcarver joined #git
15:27 dreiss joined #git
15:28 mostlybadfly joined #git
15:29 _ikke_ Does work for me
15:29 clemf joined #git
15:29 RajRajRaj ok
15:30 bremner RajRajRaj: what you write isn't clear to me. What commits are missing that you are expecting to be there?
15:30 dmto joined #git
15:30 clemf joined #git
15:31 tobiasBora joined #git
15:31 RajRajRaj bremner:  i want to see all changes that i have done in past 30 days, but it shows me commit of only "today - 29"th day
15:31 ochorocho__ joined #git
15:31 bremner so, one days changes missing? then bump 30 to 31
15:32 ericho joined #git
15:32 fstd joined #git
15:32 clemf joined #git
15:33 RajRajRaj bremner:  -_-
15:33 RajRajRaj bremner:  all 29 days of result is missing
15:34 bremner oh. then something is really wrong, compared to my results
15:34 bremner RajRajRaj: is the repo public?
15:34 govg joined #git
15:34 RajRajRaj bremner:  no
15:34 dadada joined #git
15:34 dadada hi
15:34 dadada I want to merge changes from a different branch, and I don't expect conflicts
15:35 dadada but I don't want to merge all the changes automatically
15:35 dadada I want to check each hunk/line one-by-one
15:35 dadada is there any tool for that?
15:35 kadoban dadada: Do a merge with --no-commit and then use diff to check what's going to be commited?
15:36 dadada kadoban: ty
15:36 clemf joined #git
15:40 Jellyg00se joined #git
15:40 cyphase joined #git
15:41 bremner RajRajRaj: I don't know what to suggest then, except to consider that git log will be looking at commit-dates, not author dates. But commit-dates are usually later, so I don't really know how that could make things disappear.
15:42 dadada kadoban: damn, didn't work
15:42 dadada kadoban: I tried git merge --no-commit branch_name
15:42 RajRajRaj bremner:  its ok thanks
15:42 dadada kadoban: and it generates a new commit nevertheless
15:42 kadoban dadada: What went wrong?
15:42 _ikke_ !transcript
15:42 _ikke_ oh noes
15:42 dadada kadoban: fun fact, the remote branch also renamed the file, could that cause it?
15:42 _ikke_ no
15:42 dadada kadoban: so in the commit a rename => is performed
15:43 mbreedlove joined #git
15:43 kadoban dadada: Uhm, that doesn't make any sense, it absolutely won't perform a commit when given --no-commit, so I must be missing something.
15:43 _ikke_ Did it do a fast-forward?
15:44 _ikke_ jast: Could you check up on gitinfo?
15:44 dadada _ikke_: yes
15:44 _ikke_ dadada: So it did not create a commit, it just moved branches
15:44 kadoban Oh, huh, I didn't consider ff
15:44 MZAWeb_ joined #git
15:45 xall joined #git
15:45 aseidl joined #git
15:45 gitinfo joined #git
15:46 _ikke_ jast: Fixed again
15:48 Darcidride joined #git
15:48 armyriad joined #git
15:49 lugzer joined #git
15:52 fmcgeough joined #git
15:53 zeroed joined #git
15:53 lindenle joined #git
15:56 lucasem joined #git
15:56 baxx joined #git
15:57 InfoTest joined #git
15:59 EvilPeng1 joined #git
16:00 rgrinberg joined #git
16:01 thiago_ joined #git
16:03 le_melomane joined #git
16:03 fuchstronaut joined #git
16:04 montchr joined #git
16:06 snowkidind joined #git
16:08 diegoviola joined #git
16:09 diegoviola I've removed a branch with branch -d and before that I actually rewrote some of the history in that branch
16:09 diegoviola how do I pull that branch from origin again?
16:09 diegoviola with the original history
16:09 thiago restore from backups or from a repository that still has it
16:10 thiago git branch -d deletes the reflog for it too
16:10 cyan__ joined #git
16:10 diegoviola my repo has a remote
16:10 diegoviola and that remote still has the branch
16:10 thiago there you go
16:10 diegoviola I did git fetch
16:11 diegoviola and then a checkout but the history is still behind since I rewrote it
16:11 nnyk joined #git
16:12 thiago restore from a more recent backup
16:12 diegoviola I don't want to have to reclone the repo
16:12 thiago git reflog for HEAD (not a branch) may have a more recent commit, if you've recently checked that branch out
16:13 mehola joined #git
16:13 diegoviola oh suddenly my changes are there
16:13 diegoviola thanks thiago ;)
16:14 minix joined #git
16:14 sbeller joined #git
16:17 r00twrh joined #git
16:18 NeXTSUN joined #git
16:21 mdw joined #git
16:22 freimatz joined #git
16:23 ToBeFree joined #git
16:23 mutex joined #git
16:23 le_melomane joined #git
16:23 ToBeCloud joined #git
16:23 ToBeCloud joined #git
16:26 geoid_ joined #git
16:30 durham joined #git
16:30 mdw joined #git
16:32 ochorocho__ joined #git
16:32 madewokherd joined #git
16:33 encod3 joined #git
16:33 zincrokx joined #git
16:34 romerocesar joined #git
16:34 fuchstronaut joined #git
16:35 zacts joined #git
16:36 silverdust joined #git
16:37 akushner joined #git
16:39 herr_barium joined #git
16:40 mingrammer joined #git
16:42 jaguarmagenta joined #git
16:43 HoierM joined #git
16:44 lugzer joined #git
16:45 zincrokx joined #git
16:49 blackwind_123 joined #git
16:54 mdw joined #git
16:54 drbean_ joined #git
16:56 mdw_ joined #git
16:57 Aqae joined #git
16:57 ribasushi joined #git
16:58 mikecmpbll joined #git
16:58 rnsanchez joined #git
16:58 fmcgeough joined #git
16:59 jaguarmagenta joined #git
16:59 fairuz joined #git
17:01 zincrokx joined #git
17:02 fairuz Hi guys. I have a project with a generated dist folder for deployment. This dist folder container a file index.html and a folder assets. I tried to push the contents of this folder dist as subtree with git subtree push —prefix dist origin release. The branch is release is created but only contains assets folder and index.html is missing. Any hint on how to fix this? Thanks
17:03 moritz fairuz: git add index.html
17:03 moritz fairuz: but it's a bad idea to commit generated files
17:04 moritz that's what a package repository or an artifact repository is for
17:04 zincrokx joined #git
17:04 m0viefreak joined #git
17:04 fairuz moritz: thanks. git add index.html in release branch?
17:04 zincrokx joined #git
17:05 moritz fairuz: in the branch you want to push from
17:05 fairuz moritz: True but I find it easy to just do a git pull on the server to deploy new versions
17:05 moritz but again, it's a bad idea
17:06 moritz it obscures the history of the source code, and increases the size of the repo substantially
17:06 moritz and yes, it's intially easier than building a properl build pipeline
17:06 moritz but I'm biased, i'm writing a book about that :-)
17:07 nitin_ joined #git
17:08 fairuz :)
17:08 fairuz Do you have recommendation for a lightweight package repository ?
17:08 fairuz my software is mostly web applications
17:08 sterns joined #git
17:08 SteffanW joined #git
17:09 joaumg joined #git
17:10 shinnya joined #git
17:10 sterns git v2.8.1 `git status` shows modified CHANGELOG.md, but `git ls-files --modified` does not list anything?
17:10 joaumg Hello, how does git "store" the password between executions ? ( I mean, internally ? )
17:11 zincrokx joined #git
17:12 fairuz joaumg: which password?
17:12 joaumg git-credential-cache
17:13 zincrokx joined #git
17:13 _ikke_ It's using some kind of daemon
17:13 joaumg Oh, nevermind, there is a daemon at ~/.git-credential-cache/socket
17:13 joaumg _ikke_: yep, thanks.
17:14 edaught joined #git
17:15 zincrokx joined #git
17:15 baxx joined #git
17:15 fairuz thanks moritz
17:15 _ikke_ From a quick lookup, it's storing it plain-text in memory
17:16 LiohAu_ joined #git
17:17 jungsubk joined #git
17:18 a_thakur joined #git
17:18 paul424 joined #git
17:21 stantonk joined #git
17:21 daniel_rose joined #git
17:22 _eddy joined #git
17:22 Sadeukko joined #git
17:22 jaguarmagenta joined #git
17:25 stantonk_ joined #git
17:25 Captain_Ramius joined #git
17:25 fairuz left #git
17:25 Captain_Ramius I need all the king's horses and all the king's men, on the double!
17:26 Captain_Ramius (Yes, I'm here because I broke my git repo)
17:27 Captain_Ramius Anyone around?
17:27 kadoban Captain_Ramius: People usually don't respond until the real questions come out :)
17:27 Captain_Ramius Duly noted.
17:28 Captain_Ramius I'm trying to deploy my php app to my public server
17:28 Captain_Ramius From the server using SSH, I just cloned the origin from Bitbucket.
17:28 govg joined #git
17:28 Captain_Ramius No app files showed up though.
17:29 krstf joined #git
17:29 rgrinberg joined #git
17:29 kadoban Captain_Ramius: Well, using git for deployment isn't really the best idea ever, though !deploy has some stuff.
17:29 gitinfo Captain_Ramius: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
17:30 kadoban Captain_Ramius: I'm not sure what you're seeing though exactly. What command did you run? Are you not seeing any of the files in the repository?
17:30 rgrinberg joined #git
17:30 Captain_Ramius I'm new to web dev, so I'm new to git and everything else. I just want to put the files on my shared hosting server, so I can show it to a friend (who's a pro developer)
17:31 * Captain_Ramius goes to Google "php deployment best practices"
17:31 kadoban Captain_Ramius: Usually for deployment I just use rsync, honestly. It's simple and works nicely.
17:31 Captain_Ramius The trouble is that I tried to get up my public repo as a mirror.
17:32 Captain_Ramius So, I get an "error: --mirror can't be combined with refspecs"
17:32 Captain_Ramius After looking up what refspecs are, it makes even less sense than when I started.
17:32 kadoban Yeah I forget what --mirror does, but I don't think it's anything like what you want.
17:33 Captain_Ramius https://help.github.com/artic​les/duplicating-a-repository/
17:33 kadoban Captain_Ramius: I'd just copy the files you want to the webserver in the right place, using whatever tools you're comfortable with. If you have no idea, rsync is a decent default.
17:33 zacts joined #git
17:33 kadoban Using git for that is just ... not all that appropriate.
17:33 Captain_Ramius I'm comfortable with CyberDuck. It just struck me as a crude method of deployment
17:33 intellix joined #git
17:34 wrkrcoop joined #git
17:34 Captain_Ramius Not appropriate: got it.
17:34 wrkrcoop umm somehow my branch got merged to master …
17:34 wrkrcoop on github
17:34 Captain_Ramius Should I just remove the public repo on my webserver then?
17:34 _ikke_ Captain_Ramius: I would do that :-)
17:34 wrkrcoop anyone know how to delete that merge to master
17:34 dopesong joined #git
17:34 Captain_Ramius Thanks, guys. I'm not too proud to back away from a bad situation. ;-D
17:34 _ikke_ wrkrcoop: Is that the only extra commit github has that you don't have?
17:35 mingrammer joined #git
17:35 wrkrcoop _ikke_: yes
17:35 wrkrcoop -ikke_: master is supposed to be empty
17:35 _ikke_ You can force push your local master to github then
17:35 wrkrcoop ok
17:35 wrkrcoop cool
17:35 wrkrcoop thank you
17:36 hahuang65 joined #git
17:37 dsantiago joined #git
17:37 emPi joined #git
17:38 despoil joined #git
17:38 lugzer joined #git
17:39 texinwien_ joined #git
17:40 GavinMagnus joined #git
17:40 danslo_ joined #git
17:40 bsanford joined #git
17:42 durham joined #git
17:42 espindola joined #git
17:42 mwhooker joined #git
17:43 wrkrcoop joined #git
17:43 dreiss joined #git
17:43 dopesong joined #git
17:44 jimi_ joined #git
17:44 mdw joined #git
17:45 nnyk joined #git
17:47 crashbdx joined #git
17:47 kbs joined #git
17:48 xall joined #git
17:48 dopesong joined #git
17:48 stantonk_ joined #git
17:48 eight58 joined #git
17:48 Sasazuka joined #git
17:50 jimi_ joined #git
17:52 stantonk_ joined #git
17:52 dopesong joined #git
17:55 Gsham joined #git
17:55 thiago joined #git
17:58 EduardoMartins joined #git
17:59 durham_ joined #git
17:59 Sucks joined #git
18:00 nilg joined #git
18:00 D-Boy joined #git
18:01 zincrokx_ joined #git
18:01 cuebix-wk joined #git
18:02 jaguarmagenta joined #git
18:04 davisonio joined #git
18:06 geoid_ joined #git
18:07 dopesong joined #git
18:07 Dyonisos joined #git
18:08 NeonSynth joined #git
18:09 pur3eval joined #git
18:10 lugzer joined #git
18:12 pepper_chico joined #git
18:12 rnsanchez joined #git
18:12 pepper_chico Hi
18:13 pepper_chico anyone got a nice git log command for this? http://stackoverflow.com/questions/​38486266/how-to-list-merge-commits-​from-one-specific-branch-to-another
18:13 dopesong joined #git
18:13 ramsub07 joined #git
18:14 mehola joined #git
18:14 jast _ikke_: the bot auto-reconnects when it gets dropped off, it's just not extremely smart about it (and many of the addresses the round robin resolves to seem to not actually work) so it can sometimes take a few minutes
18:15 _ikke_ alright
18:15 settermjd joined #git
18:16 jast pepper_chico: I don't think there's anything really straightforward. generally speaking, it's much, much easier to have bugfixes go to the most stable branch first, and then merge them "forward" to less stable branches
18:16 RedShift joined #git
18:16 jast maybe I should say sta(b)le :}
18:16 dopesong joined #git
18:17 pepper_chico if it's stable, why should it get a commit first?
18:17 SwiftMatt joined #git
18:17 jast well, if the fix isn't perfectly trivial you'd do it on a topic branch first
18:18 happy-dude joined #git
18:18 jast but by merging to the oldest release branch first, you can then merge from there to all the other branches without having to worry about which things to include and which to skip, because the old releases don't have anything over the newer ones (and master) other than the fixes
18:18 dopesong joined #git
18:18 pepper_chico topic branches don't go on test on the field. I'm doing release branches b/c it's device code
18:19 pepper_chico otherwise I'd just adopt githubflow
18:20 piling joined #git
18:20 jast well, then we're back to why it's difficult to list merges between one branch and another: more advanced history lookups typically involve ranges. those use set difference: take history reachable from B, subtract history reachable from A (written as A..B). but when you merge B to A, the merge, and anything before it, is reachable from A, too, so "historical" merges will never be returned by a range like that
18:22 vdv joined #git
18:22 jast if you go with the default merge commit messages you might be able to cheat:
18:24 jast git log --grep "Merge branch 'master'" --merges release
18:24 daurnimator joined #git
18:24 pepper_chico hehe, I imagined that too, but didn't like this
18:25 drbean joined #git
18:25 jast then you'll probably have to write a script. you'd need an intersection operator for two refs and git doesn't currently have that...
18:25 pepper_chico so I thought whether there was way without string matching
18:25 zacts joined #git
18:25 kab joined #git
18:25 jast let's see if I can hack something up
18:26 pepper_chico yeay... sad. IMO, this is useful and basic
18:26 jast it's not that basic, really
18:26 jast you're the first person coming here in the ~8 years I've been here to ask for this
18:26 pepper_chico merge commits from A to B... looks a trivial request for me
18:27 pepper_chico I imagine :-)
18:27 jast the thing is, git doesn't really record source and target branch
18:27 Felishia joined #git
18:27 jast all it does record is a graph of commits
18:27 pepper_chico ok
18:27 jast you might be able to guess at what happened, but it won't be perfectly reliable
18:28 durham joined #git
18:28 d4rklit3 joined #git
18:28 jast for instance, in your example, you could walk the chain of first parents starting from 'release' and output any commit that has a commit from 'master' as its second parent
18:28 Felishia joined #git
18:28 Felishia help
18:29 jast but that doesn't necessarily exclude things that were merged to master and then, later, merged to release from there
18:29 Felishia git is acting strange
18:29 jast Felishia: what's going on?
18:29 dopesong_ joined #git
18:29 mingrammer joined #git
18:30 jast (to make things more complicated, merges can be fast-forward merges, in which case the commits are simply copied from branch A to branch B and there is no record at all of any merge having happened)
18:30 pepper_chico I'd be glad if you answer your script on stackoverflow. I think it's a good question to have some reference online, even though git not storing source/target branches, at a high level of usage it seems useful. There are other question on SO about logging merge commits alone to master for example, which is related, but doesn't help in this case.
18:31 pepper_chico jast: indeed, but I'm assuming there's a merge commit always
18:31 jast well, that's something at least
18:31 pepper_chico I guess then grep seems the only way
18:32 jast but you see there are a lot of assumptions you can make that are not generally true, so the feature you're asking for isn't nearly as general as it might seem at first glance
18:32 jast in many projects there's a mix of fast-forwards and proper merges
18:32 dopesong joined #git
18:32 pepper_chico yeah I know, the issue is, a high level wish that's just not compatible with inner workings
18:33 ochorocho__ joined #git
18:33 GavinMagnus joined #git
18:33 jast yeah, unfortunately
18:34 Repox joined #git
18:35 dopesong joined #git
18:35 jast the main issue that remains, given your assumptions, is that git doesn't record the point at which a branch was started. so, if you want all merges from master to release, you'll also get all merges made to master before release was created
18:36 jstein_ joined #git
18:37 durham joined #git
18:37 FuzzySockets joined #git
18:37 pepper_chico jast: that's just what happens, everything goes to master, it's the develop branch. release branches are stable in the sense the solely get stuff from master alone
18:38 jast sure, but presumably new release branches are created from master
18:38 pepper_chico there're just merge commits from master to release on release branches, no other kind of commits or merges
18:38 nd joined #git
18:38 pepper_chico yes, at some remote time
18:38 davisonio joined #git
18:39 jast exactly. and after the fact, git can't tell at which precise point the branch was created
18:39 krstf joined #git
18:39 jast so, as far as git is concerned, there is no structural difference between the merge to release that happened five days after release was created, and the merge to master that happened five days before release was created
18:40 pepper_chico I see
18:41 zacts joined #git
18:41 dopesong joined #git
18:42 f3r70rr35f joined #git
18:42 pepper_chico structurally the merge to a new release branch that's just at the same hash as master is just like a merge that happened on master
18:43 danslo_ joined #git
18:43 dopesong joined #git
18:43 pepper_chico if it happened on master
18:43 mwhooker joined #git
18:44 jast anyway, what may be a little better than 'git log --merges' is 'git log --first-parent --merges'
18:44 jast that shows only direct merges, not merges brought in by other merges
18:45 dopesong joined #git
18:45 cdg joined #git
18:46 pepper_chico will check what I get here
18:47 gbs joined #git
18:47 Manis joined #git
18:47 andres_ joined #git
18:48 durham joined #git
18:48 RajRajRaj left #git
18:51 edaught joined #git
18:53 Manis Hi. I have a bare git repo on a server. I was having multiple "working copies" of that repo on the same server , but now when I try to "git fetch", I get "fatal: mmap failed: Cannot allocate memory".
18:54 Manis If I clone the repo to my local machine using ssh, it works. Also fetching other repos on the same server in the same way works fine. Is there anything I can do?
18:54 pepper_chico ah... nevermind, dumb me. I was replicating the workflow myself now and forgot that everything that gets backported to release branches go through a pull request from a feature branch that almost just grabs de commits from master. But it's not straight from master to the release branch.
18:55 GavinMagnus left #git
18:55 SimonNa joined #git
18:56 pepper_chico I guess my request on SO just doesn't make sense at all and it's understandable that git doesn't have this.
18:56 dopesong_ joined #git
18:59 TooLmaN joined #git
19:00 mdw joined #git
19:00 efdetonator joined #git
19:00 jaguarmagenta joined #git
19:00 Sasazuka joined #git
19:01 dopesong joined #git
19:01 stantonk joined #git
19:02 stantonk joined #git
19:02 dsdeiz joined #git
19:02 dsdeiz joined #git
19:02 geoid_ joined #git
19:02 satifant joined #git
19:03 dopesong joined #git
19:04 dopesong joined #git
19:05 SwiftMatt joined #git
19:05 tyreld joined #git
19:06 lugzer joined #git
19:06 geoid__ joined #git
19:11 geoid__ joined #git
19:11 cdown joined #git
19:14 ajf- when I have a with two origins
19:14 ajf- how do I make sure all git push go to both ?
19:14 ajf- set-upstream only allows one no?
19:15 johnmilton joined #git
19:15 ajf- * a branch
19:16 EvilJStoker joined #git
19:17 daniel_rose joined #git
19:17 emPi joined #git
19:18 D[4]ni joined #git
19:18 Gsham joined #git
19:18 kadoban ajf-: Well, you can create a remote with multiple push URLs, so when you push to it it'll push to both, maybe that's what you want?
19:18 basiclaser joined #git
19:19 efdetonator joined #git
19:19 ajf- basically I have two repos, one tracks development things, and the other is directly connected to the server with automatic deployment
19:19 ajf- and the "dev" branch has both remotes
19:19 romerocesar joined #git
19:19 ajf- but I have to selectively push, like: git push -u origin dev, and git push -u otherorigin dev
19:20 ajf- and git push alone sends to "otherorigin" only
19:20 dopesong joined #git
19:20 kadoban Using git for deployment is kind of goofy, but sure you can do essentially that with what I said above.
19:20 johnmilton joined #git
19:22 Darren_ joined #git
19:23 mingrammer joined #git
19:23 kadoban ajf-: Look into 'git remote set-url --add', You'll have to refactor how you're setting things up a bit though.
19:23 dopesong joined #git
19:24 ajf- thanks will look into it
19:24 atrus !deploy
19:24 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
19:25 thejoecarroll joined #git
19:26 synthroi_ joined #git
19:26 rgrinberg joined #git
19:27 dopesong_ joined #git
19:27 nivag joined #git
19:29 ahmedelgabri joined #git
19:30 dopesong joined #git
19:31 bjoe2k4 joined #git
19:32 ajf- argh I am not using it to deploy!
19:32 ajf- it's a git hook
19:32 ajf- configured on "otherorigin"
19:33 dopesong joined #git
19:35 mwhooker joined #git
19:36 dopesong joined #git
19:38 lindenle joined #git
19:39 MZAWeb_ joined #git
19:40 hubertus_quack joined #git
19:42 Gsham joined #git
19:43 danslo_ joined #git
19:43 MattMaker joined #git
19:45 seventy_ joined #git
19:45 xpk joined #git
19:47 efdetonator joined #git
19:47 davisonio joined #git
19:48 robotroll joined #git
19:48 McNozes joined #git
19:48 troulouliou_div2 joined #git
19:49 kugel joined #git
19:50 dopesong joined #git
19:50 paul424 joined #git
19:52 wrkrcoop joined #git
19:54 nivag joined #git
19:54 akiva joined #git
19:57 GenZai joined #git
19:57 Limes_ joined #git
19:58 ecraven joined #git
19:58 ecraven hello :)
19:59 ecraven after running git pull, I have a merge conflict. I'd like to resolve it by using "theirs" for all conflicting files. how do I do this?
19:59 vktec joined #git
19:59 nwkj86 joined #git
20:00 vktec Can I un-commit? I don't want to `git commit --amend` or `git revert` I want to get back to how it was just before I committed (ie. with changes in the staging area)
20:00 lugzer joined #git
20:01 bremner ,reset
20:01 bremner !reset
20:01 gitinfo reset does two things! (1) without file/path argument: 'git reset [flags] [<commit>]' = make the current branch point to <commit> (default: HEAD). --soft = don't do anything else. --mixed (default) = overwrite the index to match. --hard = overwrite the working files to match. (2) 'git reset [<commit>] -- <path>' = overwrite the index entries for <path> with the content from <commit> (default: HEAD)
20:01 _ikke_ git reset --soft HEAD~1
20:02 dopesong joined #git
20:02 rahtgaz joined #git
20:03 vktec Thanks!
20:03 eroussel joined #git
20:03 MattMaker joined #git
20:03 vuoto joined #git
20:04 WaReZ joined #git
20:04 vktec Does that remove the commit as well or do I have to do something to get it to do that?
20:05 catag87 joined #git
20:06 daniel_rose joined #git
20:06 seventy_ left #git
20:07 Gsham joined #git
20:08 pur3eval joined #git
20:10 eicordob_ joined #git
20:10 vktec It seems to have removed it
20:10 jaguarmagenta joined #git
20:11 dopesong joined #git
20:12 ochorocho__ joined #git
20:14 ericho joined #git
20:14 cdown joined #git
20:14 HanClinto joined #git
20:15 mehola joined #git
20:15 stantonk joined #git
20:16 snowkidind joined #git
20:16 Orion3k joined #git
20:16 Sucks joined #git
20:17 eicordob_ joined #git
20:17 LeMike joined #git
20:18 usm4n joined #git
20:25 dopesong joined #git
20:25 foo joined #git
20:25 foo I did git add . ... and not when I do git diff, I don't see several files that were modified. I get the impression git add . re-added all files in the dir, and thus doesn't allow me to see what was modified. Is there a way to reverse this?
20:26 ajf- joined #git
20:26 jaguarmagenta joined #git
20:26 Hoffman joined #git
20:26 kadoban foo: Are you looking for 'git diff --cached'? It's a very useful command, you should probably have an alias for it. I use 'git dc', personally.
20:26 Hoffman heya
20:26 Faylite joined #git
20:26 ynanm joined #git
20:27 Hoffman I deleted a commit from a git repo hosted on gitlab, but the commit still shows up on gitlab, and is not on any branch
20:27 Hoffman How do I force gitlab to run a git gc --prune=all
20:29 ailaG joined #git
20:30 usm4n_ joined #git
20:30 foo kadoban: ah, yeah, this is what I'm looking for. I'd normally see this with git cache
20:31 MattMaker joined #git
20:33 hubertus_quack joined #git
20:35 aidalgol joined #git
20:35 usm4n joined #git
20:36 rwb1 joined #git
20:40 NeverDie joined #git
20:41 dopesong joined #git
20:41 netcarver joined #git
20:41 jnewt1 joined #git
20:43 mbreedlove joined #git
20:44 dopesong joined #git
20:44 danslo_ joined #git
20:45 jnewt1 i'm trying to view a file from another commit without checking it out and overwriting the working file.  i tried $git show <SHA> -- file.c > file.c_other, and i get the file, but it's full of +'s and -'s in front of every line.  can i get it without those somehow? (i got this far from git-scm.com/docs/git-show, but now i don't seem to be able find what I need.
20:45 jnewt1 it's almost like the -c or -cc option shows on that webpage
20:46 kadoban jnewt1: git show <sha>:file.c ?
20:46 steevo joined #git
20:46 editshare-ericf joined #git
20:48 dopesong joined #git
20:48 Silenced joined #git
20:48 Silenced joined #git
20:49 GavinMagnus joined #git
20:49 IWishIKnew joined #git
20:50 jaguarmagenta joined #git
20:52 kbs git cat-file -p <SHA> is globally handy :)
20:52 le_melomane joined #git
20:52 Corosus joined #git
20:52 mustmodify joined #git
20:53 kbs oh, silly me - <SHA> is the commit_id, nm
20:53 mustmodify left #git
20:54 dopesong joined #git
20:54 jimi_ joined #git
20:55 nnyk joined #git
20:56 ericho joined #git
20:56 lugzer joined #git
20:58 playfullyExist joined #git
21:00 stantonk joined #git
21:00 stantonk joined #git
21:02 mbreedlo_ joined #git
21:03 dsantiago joined #git
21:03 dopesong joined #git
21:04 Marbug_ joined #git
21:04 dunpeal Is there a good/easy way to create short aliases for branches?
21:05 mbreedlove joined #git
21:05 apotry joined #git
21:06 Seveas make short/easy branchnames...
21:06 dunpeal Seveas: that's not entirely in my control, unfortunately.
21:07 choesh joined #git
21:07 dunpeal the rest of the team wants long, descriptive branch names since we have so many of them.
21:08 MattMaker joined #git
21:10 dunpeal I guess I can use symbolic-ref
21:11 NeonSynth_ joined #git
21:11 mingrammer joined #git
21:11 boombatower joined #git
21:12 geoid__ joined #git
21:12 wrkrcoop joined #git
21:12 dopesong joined #git
21:12 m0viefreak joined #git
21:13 svankmajer joined #git
21:13 pepper_chico joined #git
21:14 pepper_chico howdy ho! again
21:14 pepper_chico I have another question...
21:14 shachaf left #git
21:14 pepper_chico I wish to do what git log --no-walk --tags --decorate=short does, but I also want to check for tags in a given range solely, not just all the tags.
21:14 NeverDie Is there a way to merge my branch into another whilst staying in my branch?
21:14 pepper_chico http://stackoverflow.com/questions/3849076​7/git-log-of-tags-solely-in-a-given-range
21:14 NeverDie Like if I'm on branch <css> and I want to merge into develop for example.
21:14 NeverDie Without actually doing git checkout develop and git merge css.
21:16 akegalj joined #git
21:17 fahadash joined #git
21:17 akegalj hey, I have messed up with merging branch X locally so I have decided to remove this branch locally which I did. Now I would like to pull branch is from origin. How to do this ?
21:18 NeverDie akegalj: $ git pull origin <branch>
21:18 snowkidind joined #git
21:18 pepper_chico NeverDie: http://stackoverflow.com/questions/6777629/​merge-branches-without-checking-out-branch
21:18 pepper_chico found that
21:18 dminca joined #git
21:18 NeverDie pepper_chico: Thank you very much, I'll read into it.
21:18 akegalj NeverDie: doesn't work :/
21:20 pepper_chico akegalj: you removed it locally right, ok. Now you do git checkout origin/branch-name
21:20 pepper_chico you will be in detached head
21:20 pepper_chico to put it in its own branch you just do it
21:20 pepper_chico git checkout -b branch-name
21:21 akegalj paperziggurat: that didn't work either. This works http://stackoverflow.com/a/10313379
21:22 dopesong joined #git
21:22 acetakwas joined #git
21:22 akegalj thanks all <3
21:22 pepper_chico that's what I've said in one command
21:23 pepper_chico instead of two
21:23 akegalj paperziggurat: it didn't work with two commands, I tried fetching pulling and other variants
21:23 pepper_chico ok
21:23 akegalj paperziggurat: maybe my order was wrong thou
21:23 HoierM joined #git
21:23 dopesong joined #git
21:24 pepper_chico poor paperziggurat :-)
21:25 spudowiar joined #git
21:25 Dougie187 left #git
21:26 elastix joined #git
21:26 svankmajer joined #git
21:26 svankmajer joined #git
21:27 dopesong joined #git
21:27 mikecmpbll joined #git
21:27 ahr3n joined #git
21:28 pepper_chico git log --no-walk --tags --decorate=short on a given range anyone?
21:30 stonerfish joined #git
21:31 akegalj pepper_chico: oh, sorry. I was misspeling you
21:31 pepper_chico akegalj: noproblem
21:32 fuchstronaut joined #git
21:32 fuchstronaut joined #git
21:33 MattMaker joined #git
21:36 GavinMagnus left #git
21:38 dopesong joined #git
21:42 neanderslob joined #git
21:43 drbean_ joined #git
21:44 dopesong joined #git
21:45 danslo joined #git
21:47 MattMaker joined #git
21:49 danimal2 joined #git
21:50 dopesong joined #git
21:50 Arban joined #git
21:50 kanyeezy joined #git
21:50 kanyeezy joined #git
21:51 MattMaker joined #git
21:52 LaptopBrain joined #git
21:53 lugzer joined #git
21:53 cd-rum joined #git
21:54 elsevero joined #git
21:54 cdown joined #git
21:55 wethu joined #git
21:56 cd-rum joined #git
22:00 rafalcpp joined #git
22:00 Gsham joined #git
22:01 pur3eval joined #git
22:03 dopesong_ joined #git
22:06 cd-rum joined #git
22:06 mingrammer joined #git
22:07 joki joined #git
22:07 dopesong joined #git
22:08 wethu joined #git
22:08 theskillwithin joined #git
22:09 prosody joined #git
22:10 MattMaker joined #git
22:11 dopesong joined #git
22:11 citizen-stig joined #git
22:13 wrkrcoop joined #git
22:13 rnsanchez_ joined #git
22:13 eroussel joined #git
22:15 gbs hi, is there a way to intercept `git commit-tree ` when called from `git svn`? i'm trying to generate a different commit layout when importing
22:15 gbs basically `git filter-branch` + `git svn clone`
22:15 mehola joined #git
22:16 CheckDavid joined #git
22:18 braderhart joined #git
22:18 stantonk joined #git
22:19 fuchstronaut joined #git
22:20 jaguarmagenta joined #git
22:20 _rnsanchez_ joined #git
22:22 snowkidind joined #git
22:23 FroMaster joined #git
22:23 andlabs joined #git
22:26 baxx joined #git
22:27 dunpeal joined #git
22:28 shgysk8zer0 joined #git
22:31 pur3eval joined #git
22:33 dopesong joined #git
22:34 jaguarmagenta joined #git
22:34 apotry joined #git
22:36 dopesong joined #git
22:36 Dreamer3 joined #git
22:38 mycyber joined #git
22:38 ache1 joined #git
22:38 ramsub07 joined #git
22:41 MattMaker joined #git
22:45 danslo joined #git
22:46 neanderslob joined #git
22:47 lugzer joined #git
22:48 Goplat joined #git
22:50 MattMaker joined #git
22:50 apricity joined #git
22:51 apricity I ran git add . before adding my .gitignore. How do i remove all added files so i can re-add only the files not in my .gitignore
22:53 anuxivm joined #git
22:54 dreiss joined #git
22:54 gfixler joined #git
22:57 preaction apricity: git status should say what to do, which is git reset
22:58 apricity thanks :) just tried that and git diff --cached shows no results
22:58 Xorg_Xalargsky joined #git
23:02 edaught_ joined #git
23:02 pur3eval joined #git
23:05 jimi_ joined #git
23:09 neanderslob joined #git
23:10 baxx joined #git
23:13 MattMaker joined #git
23:15 anuxivm left #git
23:26 fuchstronaut joined #git
23:26 ochorocho__ joined #git
23:36 dreiss joined #git
23:38 rgrinberg joined #git
23:39 rgrinberg joined #git
23:40 MrWoohoo joined #git
23:41 lugzer joined #git
23:45 mwhooker joined #git
23:45 israelzuniga joined #git
23:45 madewokherd joined #git
23:46 danslo joined #git
23:47 devxom joined #git
23:48 thiago joined #git
23:52 azbarcea joined #git
23:54 mingrammer joined #git
23:56 xall joined #git
23:56 SwiftMatt joined #git
23:58 DevAntoine joined #git
23:59 wethu joined #git
23:59 jeffreylevesque joined #git

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