Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-11

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

All times shown according to UTC.

Time Nick Message
00:00 rbern joined #git
00:01 mwhooker joined #git
00:03 ajf- joined #git
00:04 ShekharReddy joined #git
00:05 titanium17 joined #git
00:06 Kaisyu joined #git
00:09 chris7 joined #git
00:09 Gitzilla joined #git
00:09 ac3takwas joined #git
00:18 fstd_ joined #git
00:23 livingstn joined #git
00:27 mehola joined #git
00:29 oich joined #git
00:30 BlackMaria_netsp joined #git
00:33 ochorocho__ joined #git
00:42 HoierM joined #git
00:43 xall joined #git
00:47 qpdb joined #git
00:50 eka joined #git
00:51 _xor joined #git
00:53 plasticle joined #git
00:54 Shapeshifter joined #git
00:54 sleepee joined #git
00:55 manosnore joined #git
00:55 oich joined #git
00:56 plasticle joined #git
00:56 tristanp joined #git
00:59 tristanp joined #git
01:00 sleepee joined #git
01:02 miesco My 'branch.master.merge = refs/heads/master'.  Shouldn't it be refs/remotes/heads/master?
01:02 catag87 joined #git
01:04 miesco branch.master.merge defines the "upstream" branch for the local master.
01:06 miesco Why is the upstream branch a local branch?  "upstream" by definition is a remote branch and NOT a local: "it is 'the branch' (if any) on 'said remote', which is tracking the 'current branch' on your 'local repository'."
01:07 annoymouse joined #git
01:08 armyriad joined #git
01:09 NeXTSUN joined #git
01:10 durham joined #git
01:12 oich joined #git
01:13 Vgr joined #git
01:13 Vgr joined #git
01:16 netj joined #git
01:18 fuchstronaut joined #git
01:18 pks joined #git
01:19 Shapeshifter joined #git
01:20 wiky joined #git
01:20 ahmedelgabri joined #git
01:21 romerocesar joined #git
01:21 zacts joined #git
01:22 inflames joined #git
01:22 MrWoohoo joined #git
01:23 rbern joined #git
01:23 Literphor joined #git
01:23 titanium17 joined #git
01:26 livingstn joined #git
01:26 texinwien joined #git
01:30 osse miesco: the value of that config setting is relative to the remote rempo
01:30 osse repo
01:31 Dougie187 joined #git
01:31 miesco osse: Thanks.  I just figured that out from search on google. (Barely; one site that out of the hundreds that describe this said it was relative to the remote).
01:31 romerocesar joined #git
01:34 osse miesco: otherwise there probably wouldn't be a separate config setting for the remote itself
01:36 miesco osse: So basically, if on master and type `git pull`, it will `git pull <branch.master.remote> <branch.master.merge>`, which fetches origin's master branch (if `branch.master.merge = refs/heads/master`) and merges origin's master (as set by `branch.master.merge` into current local branch (master).
01:37 miesco osse: So basically, if on master and type `git pull`, it will `git pull <branch.master.remote> <branch.master.merge>`, which fetches origin's master branch (if `branch.master.merge = refs/heads/master`) and merges origin's master (as set by `branch.master.merge`) into current local branch (master).
01:37 miesco Forgot right ')'
01:37 osse yes
01:39 miesco osse: So branch.master.merge determines two things: (1) the default branch to fetch from on master, and (2) the default branch to merge into master?
01:39 stantonk joined #git
01:41 liuzhen joined #git
01:46 osse yes
01:46 miesco osse: Basically, if on master, `git fetch; git pull` does `git fetch <branch.master.remote> <branch.master.merge>; git merge <branch.master.remote>/<branch.master.merge>`?
01:46 miesco sorry, `git pull` does*
01:49 kbs joined #git
01:50 shaggycat joined #git
01:51 Literphor joined #git
01:51 stonerfish joined #git
01:59 jorj joined #git
02:01 ekinmur joined #git
02:02 mrkmg joined #git
02:02 romerocesar joined #git
02:02 fracting joined #git
02:03 osse also yes
02:06 miesco osse: `git fetch` fetches all branches on branch.master.remote?
02:08 pi_0 joined #git
02:08 mrkmg I asked earlier and did not get any response. I have made a plugin to replace git-flow for a single master branch flow. I just started working on it, so I am open to features I should re-create from git flow. https://github.com/mrkmg/git-stream
02:09 mrkmg Looking for comments on it
02:09 mrkmg and maybe direction
02:15 harish joined #git
02:17 fission6 joined #git
02:17 catag87 joined #git
02:18 catag87 joined #git
02:19 catag87 joined #git
02:19 catag87 joined #git
02:20 catag87 joined #git
02:20 titanium17 joined #git
02:21 catag87 joined #git
02:22 catag87 joined #git
02:22 catag87 joined #git
02:23 catag87 joined #git
02:24 fracting joined #git
02:24 hexagoxel joined #git
02:24 catag87 joined #git
02:25 catag87 joined #git
02:25 catag87 joined #git
02:26 miesco Okay thanks for help
02:26 catag87 joined #git
02:27 eijk joined #git
02:27 catag87 joined #git
02:28 catag87 joined #git
02:28 catag87 joined #git
02:29 tristanp joined #git
02:29 catag87 joined #git
02:30 catag87 joined #git
02:31 catag87 joined #git
02:31 aidalgol joined #git
02:32 romerocesar joined #git
02:34 ochorocho__ joined #git
02:36 Literphor joined #git
02:38 Dougie187 left #git
02:40 xall joined #git
02:41 chachasmooth joined #git
02:43 armyriad joined #git
02:48 stantonk joined #git
02:51 nitin joined #git
02:52 mycyber joined #git
02:56 zivester joined #git
03:07 NeverDie joined #git
03:08 marc__ joined #git
03:10 Limes left #git
03:12 a_thakur joined #git
03:17 BSAlb joined #git
03:19 fuchstronaut joined #git
03:19 treaki__ joined #git
03:23 romerocesar joined #git
03:25 david007 joined #git
03:25 jon28_ joined #git
03:29 xlegoman joined #git
03:29 NeverDie joined #git
03:31 stantonk joined #git
03:31 catag87 joined #git
03:33 NeverDie joined #git
03:33 Korvin joined #git
03:33 Korvin joined #git
03:33 axiom_1 joined #git
03:37 romerocesar joined #git
03:39 Codfection joined #git
03:40 stantonk joined #git
03:42 a_thakur_ joined #git
03:42 a_thaku__ joined #git
03:44 Ratigan joined #git
03:45 zacts joined #git
03:56 romerocesar_ joined #git
03:59 wiky joined #git
04:02 titanium17 joined #git
04:04 akushner joined #git
04:09 fracting joined #git
04:11 rainbyte joined #git
04:14 dreiss joined #git
04:19 zacts joined #git
04:20 Xethron joined #git
04:25 vavovi joined #git
04:25 toogley joined #git
04:28 Limes_ joined #git
04:28 orbitphreak joined #git
04:35 ochorocho__ joined #git
04:39 t2mkn joined #git
04:42 lindenle joined #git
04:44 ascarter joined #git
04:45 Cabanossi joined #git
04:45 phanimahesh joined #git
04:46 fracting joined #git
04:51 MacWinne_ joined #git
04:51 MattMaker joined #git
04:55 freimatz joined #git
04:56 shgysk8zer0 joined #git
04:57 subhojit777 joined #git
05:03 ajf- joined #git
05:04 romerocesar joined #git
05:05 texinwien joined #git
05:07 OnBrokenWings joined #git
05:09 romerocesar_ joined #git
05:09 xall joined #git
05:10 d4rklit3 joined #git
05:10 shgysk8zer0 joined #git
05:12 hk238 joined #git
05:15 stuh84 joined #git
05:16 mehola joined #git
05:19 GT4066 joined #git
05:19 fuchstronaut joined #git
05:20 pi_o joined #git
05:23 Phreya joined #git
05:24 nilg joined #git
05:24 romerocesar joined #git
05:25 ahmedelgabri joined #git
05:33 ximvan joined #git
05:35 sostenuto joined #git
05:38 eijk joined #git
05:38 texinwien joined #git
05:39 vuoto joined #git
05:41 larrybolt joined #git
05:42 FuzzySockets joined #git
05:42 johnny56 joined #git
05:43 shgysk8zer0 joined #git
05:44 stantonk joined #git
05:44 akiva joined #git
05:47 shgysk8zer0 joined #git
05:48 devbug joined #git
05:50 xelxebar joined #git
05:50 Repox joined #git
05:50 ThomasLocke joined #git
05:54 zeroed joined #git
05:55 rscata joined #git
05:58 souther joined #git
05:58 izabera how do i turn an existing lightweight tag into an annotated tag=
05:59 izabera s/=/?/
06:00 Macaveli joined #git
06:00 xlegoman joined #git
06:04 izabera found it, made a temp tag and then deleted the old one and created a new annotated one with the old name and then deleted the temp one
06:04 MattMaker joined #git
06:04 guidocalvano joined #git
06:05 titanium17 joined #git
06:05 netj joined #git
06:09 Twirl joined #git
06:09 oich joined #git
06:09 mycyber joined #git
06:10 apathor joined #git
06:10 Twirl does git -am work with deleted files?
06:11 Twirl as in, restore them in my other branch?
06:11 texinwien joined #git
06:12 Twirl I have 10 base files, and 10 in a different one, if i delete 3 of them then checkout then checkout back again, do the files get restored if I use git commit -am ?
06:12 fracting joined #git
06:12 mariuscc joined #git
06:13 Twirl also, can I commit then delete a bunch of files then restore them just from checking out?
06:16 dminca joined #git
06:17 MrMojito joined #git
06:17 MrMojito joined #git
06:17 catag87 joined #git
06:17 MrMojito joined #git
06:17 MrMojito joined #git
06:17 bayman joined #git
06:17 akushner joined #git
06:18 MattMaker joined #git
06:20 romerocesar_ joined #git
06:20 settermjd joined #git
06:21 oich joined #git
06:23 romerocesar joined #git
06:25 acetakwas joined #git
06:28 shgysk8zer0 joined #git
06:30 shgysk8zer0 joined #git
06:30 vavovi joined #git
06:30 SwiftMatt joined #git
06:32 romerocesar joined #git
06:32 Sucks joined #git
06:34 settermjd joined #git
06:35 JeroenT joined #git
06:36 freimatz joined #git
06:37 ochorocho__ joined #git
06:37 Alienpruts joined #git
06:37 Repox joined #git
06:41 NeverDie joined #git
06:41 MattMaker joined #git
06:43 neanderslob joined #git
06:43 circ-user-JW25t joined #git
06:44 guidocalvano joined #git
06:44 lindenle joined #git
06:44 Rish joined #git
06:45 freimatz_ joined #git
06:47 guidocalvano joined #git
06:50 Guest52 joined #git
06:50 aidalgol joined #git
06:51 Hounddog joined #git
06:51 freimatz joined #git
06:51 Guest52 left #git
06:53 erguven joined #git
06:54 mcfrisk joined #git
06:55 JeroenT joined #git
06:55 mcfrisk Hi, is there a git way to handle corrupt files in .git? Workspace is cleaned with reset --hard but after some server crashes and long io wait times I have some zero size files in .git..
06:56 TomyWork joined #git
06:56 thiago fix the corrupt files first
06:56 thiago git fsck can identify them for you
06:57 eijk joined #git
06:59 mcfrisk I'd like some git foo automation to be executed on build server farm if they have corrupt files in .git after crashes. Manually fixing is an option but I'd rather not do that.
07:00 thiago git fsck after an unclean reboot. If anything is amiss, restore from backup.
07:00 cqi joined #git
07:00 mcfrisk ok, so git fsck could fix "error: object file ./objects/01/29cf39c418225​f8b73a4650c82c11f229e2bf5 is empty" type of problems
07:01 romerocesar joined #git
07:01 thiago no, it can't fix that error
07:01 thiago you fix that problem, then git will work
07:02 JeroenT_ joined #git
07:02 zeroed_ joined #git
07:03 guidocalvano joined #git
07:03 zeemzz joined #git
07:04 mwhooker joined #git
07:08 tinajohnson___ joined #git
07:09 Oebele joined #git
07:09 eijk_ joined #git
07:09 MrMojito joined #git
07:09 MrMojito joined #git
07:11 MattMaker joined #git
07:12 encod3 joined #git
07:12 stan_man_can joined #git
07:15 zumba_ad_ joined #git
07:16 zeroed joined #git
07:16 zeroed joined #git
07:20 eijk_ joined #git
07:20 MrMojito joined #git
07:20 fuchstronaut joined #git
07:21 stan_man_can left #git
07:22 romerocesar joined #git
07:24 hk238 joined #git
07:24 tvw joined #git
07:25 Meow-J joined #git
07:25 Balliad joined #git
07:26 dopesong joined #git
07:27 ahmedelgabri joined #git
07:29 DevAntoine joined #git
07:29 guidocalvano joined #git
07:33 guidocalvano joined #git
07:34 kedare joined #git
07:34 guidocalvano joined #git
07:39 stratos joined #git
07:42 romerocesar joined #git
07:44 seventy joined #git
07:45 circ-user-JW25t joined #git
07:46 OtakuSenpai joined #git
07:46 armyriad joined #git
07:46 settermjd joined #git
07:47 OtakuSenpai is there an android app tht does git operations on my smartphone??
07:48 johnny56 joined #git
07:48 MattMaker joined #git
07:49 multi_io joined #git
07:51 guidocalvano joined #git
07:53 clmsy joined #git
07:53 pneuma joined #git
07:54 nodz joined #git
07:56 a3Dman joined #git
07:56 LiohAu joined #git
07:58 Lingo joined #git
07:58 nodz left #git
07:58 fees joined #git
07:58 nodz joined #git
08:00 basiclaser joined #git
08:02 cdown joined #git
08:04 mwhooker joined #git
08:05 astrofog joined #git
08:06 cdown joined #git
08:07 grawity there is, but
08:08 Lingo joined #git
08:08 kurkale6ka joined #git
08:09 artemisart joined #git
08:10 guidocalvano joined #git
08:12 zeroed joined #git
08:13 zumba_ad_ joined #git
08:14 sanketdg joined #git
08:14 Arban joined #git
08:16 bongjovi joined #git
08:17 a_thakur joined #git
08:17 guidocalvano left #git
08:18 ximvan_ joined #git
08:19 GavinMagnus joined #git
08:19 MattMaker joined #git
08:21 satya4ever joined #git
08:23 fracting joined #git
08:23 ochorocho__ joined #git
08:24 nnyk_ joined #git
08:25 stantonk joined #git
08:28 JeroenT joined #git
08:30 hoangtranwork joined #git
08:30 totte joined #git
08:32 rahul1 joined #git
08:32 ximvan_ joined #git
08:33 romerocesar joined #git
08:34 PCatinean joined #git
08:35 rahul1 joined #git
08:36 Lingo left #git
08:36 rahul1 joined #git
08:37 lugzer joined #git
08:37 tristanp joined #git
08:40 notebox joined #git
08:41 Guest46271 left #git
08:42 notebox joined #git
08:42 Bizkit joined #git
08:42 JeroenT joined #git
08:42 Beams joined #git
08:43 nmz787_i joined #git
08:45 Sonderblade joined #git
08:46 lindenle joined #git
08:46 przemoc hi!  is there any quick trick to make  `git diff --no-index ...` read pipe's content?  I'm talking about  `git diff --no-index --color-words <(...) <(...)`  use case for instance.
08:46 totte joined #git
08:49 stefanha left #git
08:49 tonyj_ joined #git
08:49 cq1 joined #git
08:50 settermjd joined #git
08:50 cyan__ joined #git
08:56 MattMaker joined #git
08:57 encod3 joined #git
09:00 Qes joined #git
09:02 ToBeCloud joined #git
09:05 settermjd joined #git
09:08 acetakwas joined #git
09:10 muelli joined #git
09:13 romerocesar joined #git
09:14 rahul1 left #git
09:15 rahul147 joined #git
09:15 qpdb joined #git
09:15 fuchstronaut joined #git
09:15 phanimahesh przemoc: what do you want the content to be? git diff doesn't read stdin afaik.
09:17 przemoc I'm talking about named pipes, though, as shown by <(...) notation in example
09:17 jikz joined #git
09:17 gumbee joined #git
09:19 dwmw2_gone joined #git
09:19 JeroenT joined #git
09:19 artemisart joined #git
09:20 Gonzo89 joined #git
09:23 circ-user-JW25t joined #git
09:23 stonerfish joined #git
09:25 King_Hual joined #git
09:26 Darcidride joined #git
09:27 MattMaker joined #git
09:27 is_null joined #git
09:27 King_Hual joined #git
09:27 King_Hual joined #git
09:27 is_null hi all, is there a command to just get the contents of a file with a given path on a given ref without taking any action on the file system ?
09:28 ahmedelgabri joined #git
09:28 is_null note that i'm trying to do this from python, it doesn't matter if i have to call a command though
09:32 Softeisbieger joined #git
09:33 nnyk_ joined #git
09:34 Zamerick joined #git
09:36 przemoc is_null: is  `git show REF:PATH`  what you're looking for?
09:38 matleh joined #git
09:39 bruce_lee joined #git
09:39 chll_ joined #git
09:40 nnyk_ joined #git
09:42 texinwien joined #git
09:44 romerocesar joined #git
09:45 holodoc joined #git
09:45 cyan__ joined #git
09:46 liuzhen_ joined #git
09:52 jast for use in scripts, I believe 'git cat-file blob committish:path' is the preferred option
09:52 phanimahesh przemoc: isn't it the same? If a command can accept stdin, it can be made to work on a named pipe somehow.
09:53 ArchNoob joined #git
09:53 phanimahesh Yep. prefer plumbing in scripts.
09:54 lordjancso joined #git
09:56 przemoc phanimahesh: git diff works fine with | if you use - as arg
09:56 aurelien__ joined #git
09:56 * phanimahesh reads man git-diff
09:59 phanimahesh Interesting, there's no mention in manual
09:59 phanimahesh Or I can't grep. :P
10:00 phanimahesh przemoc: what are valid inputs to git diff - when piping?
10:00 phanimahesh I can't get it to work. :/
10:00 freimatz3 joined #git
10:01 phanimahesh echo stuff | git diff -- - does nothing for any stuff
10:02 przemoc no, diff requires two parameters in such case, so you compare stdin with given PATH
10:02 przemoc echo stuff | git diff --no-index PATH
10:02 przemoc echo stuff | git diff --no-index - PATH
10:02 JeroenT joined #git
10:02 przemoc echo stuff | git diff --no-index -- - PATH
10:03 przemoc now it's correct ;)
10:03 przemoc I forgot about --, because when you do PATH -, then it's not needed
10:04 MattMaker joined #git
10:06 przemoc I can obviously write short script stating given paths and catting them to tmpfiles, so git diff wouldn't show useless pipe:[...] in its output, but thought that maybe there is some smart switch changing git-diff's behavior
10:06 przemoc s/tmpfiles/& if needed/
10:09 JeroenT joined #git
10:10 bumpy joined #git
10:10 nnyk_ joined #git
10:14 romerocesar joined #git
10:17 bumpy joined #git
10:18 catag87 joined #git
10:19 harish_ joined #git
10:19 MattMaker joined #git
10:21 jimi_ joined #git
10:23 molt joined #git
10:23 e89c8c95a050 joined #git
10:24 ochorocho__ joined #git
10:26 _ikke_ also process substitution <(..)
10:27 stantonk joined #git
10:28 vmiklos joined #git
10:28 ahmedelgabri joined #git
10:29 fuchstronaut joined #git
10:29 bumpy joined #git
10:29 przemoc _ikke_: you mean?  the whole point is that process substitution is unusable with git's diff.
10:29 vmiklos joined #git
10:30 allcentury joined #git
10:30 Guest52 joined #git
10:31 _ikke_ przemoc: Ah sorry, missed that piece
10:32 przemoc process substitution works by creating named pipes
10:33 bumpy joined #git
10:33 vmiklos joined #git
10:33 a_thakur joined #git
10:34 przemoc and git diff doesn't look into them but treat them as special files, thus their "content" for git is: pipe:[number]
10:34 JeroenT joined #git
10:34 _ikke_ Yeah just tested it
10:34 MattMaker joined #git
10:35 sdothum joined #git
10:35 erguven joined #git
10:37 piattino joined #git
10:37 vuoto joined #git
10:38 piattino can i merge b1 into b2 whilst being in b1 rather than b2?
10:38 sanketdg joined #git
10:38 piattino without checking out b2 first
10:38 tristanp joined #git
10:38 _ikke_ no
10:39 _ikke_ You always merge into the currently checked out branch
10:39 _ikke_ With some trickery, it might be possible though
10:40 _ikke_ But that requires fiddling with git's internals
10:40 grawity you can fast-forward easily with `git push`
10:40 grawity kinda wish there was an easy way to at least do conflict-less merges though
10:40 vlvx joined #git
10:40 vlvx hi guys
10:40 gitinfo vlvx: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
10:40 vlvx i just did a "git checkout -b [branchname]" in folder which created my branch
10:41 vlvx i'm having trouble checking it out though
10:41 grawity you already checked it out
10:41 vlvx no no
10:41 vlvx in a different folder
10:41 vlvx error: pathspec '2.1.0.2-maint' did not match any file(s) known to git.
10:41 vlvx i get that
10:41 grawity maybe that 'different folder' is in a different repo entirely
10:41 vlvx hm
10:41 grawity compare `git rev-parse --show-toplevel`, `git rev-parse --git-dir`
10:42 grawity and of course `git branch`
10:42 moritz vlvx: if you haven't pushed the branch, it only exists in the copy of the repository where you created it
10:43 vlvx so its only local to the server its on atm?
10:43 moritz yes
10:43 vlvx so i need to git push after doing git checkout -b [branch]
10:43 mehola joined #git
10:43 vlvx just call git push?
10:44 vlvx moritz: ?
10:44 moritz vlvx: git push -u origin <branchname>
10:44 moritz vlvx: just "git push" might or might not work, depending on your configuration
10:44 vlvx origin being the repo i branched it from?
10:45 Impaloo joined #git
10:45 romerocesar joined #git
10:45 moritz origin being the remote that "git remote" shows
10:46 vlvx i see
10:47 jatin30 joined #git
10:47 jatin30 why did I get this https://bpaste.net/show/30b06d4f7f02 ?
10:48 jatin30 how can a commit be empty?
10:48 MattMaker joined #git
10:48 moritz jatin30: it means that the changes that your cherry-pick tries to bring in are already there
10:48 jatin30 I did git reset anyways and cherry-picked another feature and it worked well
10:49 jatin30 thanks +moritz
10:49 jatin30 one more doubt tho
10:49 johnmilton joined #git
10:50 jatin30 I am trying to cherry-pick some text editor features for which I did a general search in CM/android_frameworks_base with query= "text editor" and I got 212 results
10:50 deltab joined #git
10:51 jatin30 now do I have to look up at each one of them as to which feature I want to cherry pick?
10:51 sobersabre hi. when I do an interactive rebase, does a change to the comment snippet reflect in the rebased comment top line ?
10:51 jatin30 Is there a better/effective way to do what I am trying to do?
10:51 sobersabre IF I have picked a commit a1b2c3d4 change abc and changed to: a1b2c3d4 [infra] change abc
10:52 sobersabre will this be added to the commit message of the rebase result ?
10:53 moritz sobersabre: no
10:53 nnyk_ joined #git
10:53 sobersabre ok, thought so. so I nede to do some amends here :)
10:53 moritz sobersabre: you need to change 'pick' to 'reword'
10:53 sobersabre oh! cool!!!!!
10:53 moritz ... and then git rebase will open the editor for you
10:53 sobersabre amazing!!!
10:54 JeroenT joined #git
10:55 cdown joined #git
10:58 mischat joined #git
10:59 nnyk_ joined #git
11:00 fuchstronaut joined #git
11:00 fracting joined #git
11:00 ahmedelgabri joined #git
11:02 a_thakur joined #git
11:04 settermjd joined #git
11:05 sbulage joined #git
11:06 sbulage left #git
11:07 tvw joined #git
11:10 raijin joined #git
11:11 MattMaker joined #git
11:12 freimatz joined #git
11:14 netcarver joined #git
11:15 romerocesar joined #git
11:15 digiou joined #git
11:15 ojdo joined #git
11:17 liuzhen joined #git
11:17 Ezzy joined #git
11:19 nilg` joined #git
11:19 nnyk_ joined #git
11:21 HoierM joined #git
11:28 JeroenT joined #git
11:30 clmsy joined #git
11:32 ToApolytoXaos joined #git
11:33 fission6 joined #git
11:33 jagob joined #git
11:34 ToApolytoXaos greetings everyone. my question is rather naive, but please be gentle with me: why can't I push a local repository straight to remote repository without having to create it first on github?
11:34 Internet13 joined #git
11:35 moritz ToApolytoXaos: you'd have to ask the github developers, but possibly "explcit is better than implicit"
11:36 HoierM joined #git
11:36 HoierM_ joined #git
11:36 ToApolytoXaos that is taken from "the Zen of Python" :) cool
11:36 moritz ToApolytoXaos: but https://github.com/ingydotnet/git-hub has a "repo-new" command which you can use on the command line
11:37 phanimahesh ToApolytoXaos: There's nothing preventing anyone from creating a server that creates repos on first push. Git doesn't require any specific behaviour regarding remote repo creation.
11:37 ToApolytoXaos I see
11:37 moritz also possibly to catch typos
11:38 phanimahesh Git assumes the remote repo exists. Most likely early implementers decided to have a web interface for creating, and it suck.
11:38 phanimahesh For reasons like ^^(typos).
11:38 phanimahesh s/suck/stuck/
11:39 moritz it often also sucks :-)
11:39 phanimahesh :D Aye.
11:39 Lunatrius joined #git
11:40 tristanp joined #git
11:40 a_thakur joined #git
11:42 MattMaker joined #git
11:43 fuchstronaut joined #git
11:43 ahmed_elgabri joined #git
11:44 mehola joined #git
11:49 fracting joined #git
11:49 _ikke_ Can create a lot of confusion when you push to a different repo through a typo, and github would just accept it
11:52 ramsub07 joined #git
11:55 fahadash joined #git
11:55 ArchNoob joined #git
11:56 MattMaker joined #git
11:57 settermjd joined #git
11:58 griffindy joined #git
11:59 notebox joined #git
11:59 a_thakur joined #git
11:59 synthroid joined #git
12:00 rnsanchez joined #git
12:01 allcentury joined #git
12:03 tomog999_ joined #git
12:03 piattino joined #git
12:03 Darcidride_ joined #git
12:05 Darcidride_ joined #git
12:07 Darcidride_ joined #git
12:07 Ezzy Hi, is there are a way to get <revision + path> for all three sides of a file conflict?
12:07 Ezzy For a merge conflict, HEAD/MERGE_HEAD can be used as local/server revisions and `git merge-base` to find a base revision. But how to get original file paths (if file was renamed in one of the branches)?
12:07 Ezzy And what can be done in case of rebase? There are nothing similar to REBASE_HEAD in `.git/rebase-apply` folder.
12:07 Ezzy AFAIU `git ls-tree --unmerged` outputs blobs, that cannot be converted to revision (at least, not without possible ambiguity).
12:07 Ezzy The point is to get "git blame" for local/server/base versions. `git blame :1:./file/name` doesn't seem to work. `git blame /file/with/>>>>/in/it` works, but I'd like to get output for original files.
12:08 Ezzy *git ls-files
12:09 rnsanchez_ joined #git
12:09 stoopkid joined #git
12:14 harish_ joined #git
12:15 liuzhen joined #git
12:16 fracting joined #git
12:19 Ezzy upd: `.git/rebase-apply/original-commit` looks like what I need. Renamings are still the question.
12:20 MattMaker joined #git
12:22 espindola joined #git
12:24 rwb joined #git
12:24 JeroenT joined #git
12:24 ochorocho__ joined #git
12:25 Codfection joined #git
12:28 zumba_addict joined #git
12:29 stantonk joined #git
12:29 jknetl joined #git
12:32 Lunatrius joined #git
12:35 mrkmg joined #git
12:35 MattMaker joined #git
12:35 ximvan joined #git
12:35 jeffreylevesque_ joined #git
12:36 zack_s_1 joined #git
12:36 romerocesar joined #git
12:38 TooLmaN joined #git
12:38 Shock- joined #git
12:38 zack_s_1 left #git
12:38 nodz joined #git
12:39 zack_s_ joined #git
12:39 zack_s_ can I rename and adjust the content of a file in one commit?
12:41 lb what's the current tool for subprojects ak best supported by git and this channel :D ? last time i cared about this there were several competing tools?
12:41 cdown joined #git
12:41 tristanp joined #git
12:44 ToApolytoXaos left #git
12:45 phanimahesh zack_s_: Sure. just rename and edit the file.
12:45 artemisart joined #git
12:46 phanimahesh lb: subprojects? As in one repo, but with multiple repos embedded?
12:46 yqt joined #git
12:46 phanimahesh There's submodules, which many strongly dislike, subdir is the new kid on the block.
12:46 JeroenT joined #git
12:47 aguimaraes1986 joined #git
12:48 mahendra_ joined #git
12:48 ilmari I thought !git-subtree was the new shiny
12:48 gitinfo git-subtree allows a subproject repository to be incorporated into a subdirectory of a main repository, and for the history of a subdirectory to be (re-)exported with reproducible results, making it possible to synchronise a repository with a subdirectory of another repo, see https://github.com/git/git/blob/mas​ter/contrib/subtree/git-subtree.txt for more info.
12:48 a_thakur joined #git
12:49 howdoi joined #git
12:49 lb tracking shared code (html templates) accross several projects (repos)
12:50 phanimahesh oops, I meant subtree.
12:50 lb ok so nothing has changed :D submodules/subtree/subdir
12:50 fuchstronaut joined #git
12:50 lb oh ok so only subtree
12:50 fracting joined #git
12:51 phanimahesh subdir is a merge strategy iirc. it was older than submodules.
12:51 MattMaker joined #git
12:51 mjuszczak joined #git
12:51 notebox joined #git
12:52 Mo joined #git
12:53 Mo Hi, I'm syncing via 'git p4 sync' from a P4 repo. Now a user on P4 had a typo in its mail-adress, we fixed that on P4 but the git clone still has the error. Does git cache the users somewhere?
12:55 dopesong_ joined #git
12:55 m0nkmaster joined #git
12:56 fuchstronaut joined #git
12:57 mar77i_ joined #git
13:00 phanimahesh git caches the imported data afaik.
13:01 cd-rum joined #git
13:01 phanimahesh but if it'smodified on p4 the commit ids should have changed there, right? (not sure how p4 works, in git metadata is part of commit, so id changes when it changes)
13:01 phanimahesh and if commit id changes next import/pull should have updated local copies.
13:01 Beams joined #git
13:03 FunkyAss joined #git
13:03 ekinmur joined #git
13:03 Mo phanimahesh: Should, but the sync does not update the mail adress in the log, eventhough the remote P4 repo has updated the user account.
13:04 phanimahesh No idea then.
13:05 Mo I can't clone from scratch as then all IDs are different :)
13:07 chid joined #git
13:07 chid_ joined #git
13:08 erguven joined #git
13:08 qsx Mo: you could try to obliterate all commits with the wrong address and then git p4 rebase, but of course that will change all those git commits
13:09 rgrinberg joined #git
13:09 cuebix-wk joined #git
13:10 dsdeiz joined #git
13:12 Mo qsx: Ok, I try, with a backup snapshot.
13:12 concerti joined #git
13:13 livingstn joined #git
13:15 lolmac joined #git
13:15 Hogofwar joined #git
13:16 JeroenT joined #git
13:17 crose joined #git
13:20 Hogofwar joined #git
13:20 Mo How does git manage its users, doesn't a central repo know all users?
13:20 Mo Like perforce has a user map.
13:22 pks joined #git
13:22 kanzure authentication and authoriation are not handled by git
13:22 kanzure ... authorization
13:23 qsx Mo: a user’s identity is recorded in the commit (try git cat-file -p HEAD)
13:24 Mo Who does it? Everyone can clone and submit?
13:24 Darcidride joined #git
13:24 qsx Mo: authentication and authorization is done by ssh, https, …
13:24 todd_dsm joined #git
13:24 JeroenT joined #git
13:24 Mo So every sync from P4 should get the new user on P4. But it does not.
13:25 wiky joined #git
13:26 phanimahesh Mo: In git the author and committer information is part of the commit message.
13:26 pioiytr joined #git
13:26 phanimahesh as far as git internals are concerned, it's just a simple string.
13:26 rnsanchez_ joined #git
13:26 phanimahesh you can put pretty much anything there.
13:26 a_thakur_ joined #git
13:26 romerocesar joined #git
13:26 Mo Weird that git p4 sync does get the wrong old version of the user.
13:27 phanimahesh When talking to a remote server, the server handles the authentication or authorisation.
13:27 a_thaku__ joined #git
13:27 phanimahesh and git just transfers everything it has.
13:28 phanimahesh So it's possible for me to commit in your name and push to a repo.
13:28 Mo Ok, I look in P4 if there is the cause....
13:28 Hogofwar joined #git
13:28 MattMaker joined #git
13:28 phanimahesh To guarantee authenticity, tools like GPG are used.
13:28 ejb joined #git
13:29 grawity it's possible for servers to have a receive hook that forbids pushing commits by the 'wrong' author
13:29 Cassiopaya joined #git
13:29 grawity although that would make merges really annoying, IMO
13:30 Hogofwar joined #git
13:30 phanimahesh Yep. Technically possible but not widespread.
13:32 IlNominePatre joined #git
13:35 a_thakur joined #git
13:35 NeXTSUN joined #git
13:35 ekinmur joined #git
13:35 a_thakur joined #git
13:37 cyan__ joined #git
13:37 Hogofwar joined #git
13:37 nmz787_i joined #git
13:38 fracting joined #git
13:38 McNozes joined #git
13:38 Hogofwar joined #git
13:43 Dougie187 joined #git
13:45 stantonk joined #git
13:45 cdg joined #git
13:48 drodger joined #git
13:50 erguven joined #git
13:51 Beams joined #git
13:51 shaggycat joined #git
13:52 allcentury joined #git
13:53 sharpy joined #git
13:53 Wind0r joined #git
13:54 NeXTSUN joined #git
13:54 dopesong joined #git
13:54 robotroll joined #git
13:55 tristanp joined #git
13:57 azbarcea joined #git
13:59 MattMaker joined #git
13:59 phaleth joined #git
14:01 AaronMT joined #git
14:01 catag87 joined #git
14:01 tristanp joined #git
14:02 AaronMT joined #git
14:04 shaggycat joined #git
14:05 alex007 joined #git
14:06 alex007 left #git
14:07 dopesong joined #git
14:07 danslo joined #git
14:07 BombStrike joined #git
14:08 jimi_ joined #git
14:09 danslo how would you guys recommend I version files in the root of my repository? I have things like Vagrantfile, local.yml, etc. that I want to share across multiple projects, but I rather not make copies. would the best solution be to use git submodules and symlink those files?
14:12 zivester joined #git
14:12 dopesong joined #git
14:12 al-damiri joined #git
14:15 ashnur hi, can someone help me with submodules for a second? I have an existing git repo cloned ( https://github.com/joequant/hyperledger ) which has several submodules which I want to remove (with one exception), and to add a new one.
14:15 ashnur removing was almost easy, but then I saw it did not remove from .git/config
14:15 ashnur and I just can't add a new one
14:16 rnsanchez_ joined #git
14:16 GodGinrai joined #git
14:16 ashnur I suspect because I am trying to add a relative one, it complains https://gist.githubusercontent.com/ashnur/64b​c4b72200529103b434ef4f4d500c2/raw/d5bfd2cba83​7feb544fb90f4460275730df61c90/gistfile1.txt
14:18 Rynomster joined #git
14:18 Rynomster joined #git
14:18 toogley joined #git
14:19 stantonk joined #git
14:21 drodger joined #git
14:21 vivekp joined #git
14:21 vivekp joined #git
14:21 f3r70rr35f joined #git
14:23 jagob joined #git
14:23 stantonk joined #git
14:24 codeman joined #git
14:25 ochorocho__ joined #git
14:26 drodger joined #git
14:26 diegoviola joined #git
14:29 D-Boy joined #git
14:29 dopesong joined #git
14:30 catag87 joined #git
14:30 jackrandom joined #git
14:32 LionsMane joined #git
14:33 ResidentBiscuit joined #git
14:33 ResidentBiscuit joined #git
14:34 yqt joined #git
14:36 MattMaker joined #git
14:37 circ-user-JW25t joined #git
14:37 romerocesar joined #git
14:39 nnyk_ joined #git
14:39 cdown joined #git
14:39 bket joined #git
14:39 Mowgli joined #git
14:40 Gitzilla joined #git
14:43 refried_ joined #git
14:44 hamster joined #git
14:44 a_thakur joined #git
14:44 BSaboia joined #git
14:44 BSAlb joined #git
14:47 tristanp joined #git
14:48 fmcgeough joined #git
14:49 ams__ joined #git
14:49 nonconvergent joined #git
14:50 nonconvergent I commited and pushed to the wrong branch.
14:50 tristanp_ joined #git
14:50 ramsub07 joined #git
14:51 WayToDoor joined #git
14:51 nonconvergent revert and cherry pick?
14:54 Dougie187 I'd say if possible, cherry-pick and reset.
14:54 tristanp joined #git
14:55 Dougie187 If the reset isn't possible, then do a revert instead.
14:55 felipesabino joined #git
14:57 dopesong joined #git
14:58 chilversc left #git
14:59 stantonk joined #git
14:59 ejb joined #git
15:00 rnsanchez_ joined #git
15:00 nonconvergent Can I revert then cherry-pick a merge commit?
15:00 nonconvergent ...I already revert -m 1 that merge commit
15:01 Dougie187 no, you can't cherry pick a merge commit as far as I know.
15:01 mjuszczak joined #git
15:01 Dougie187 A merge commit depends on the two parents, so cherry-picking it to a different commit doesn't really make much sense.
15:02 mjuszczak joined #git
15:03 mjuszczak joined #git
15:04 clemf joined #git
15:06 drodger joined #git
15:06 ExoUNX joined #git
15:07 MattMaker joined #git
15:07 subhojit777 joined #git
15:07 _ikke_ cherry-picking a merge requires you to specify which side it should follow
15:07 _ikke_ so you would only get one side of the changes
15:07 romerocesar joined #git
15:09 HoierM_ joined #git
15:09 HoierM joined #git
15:11 tyreld joined #git
15:15 dopesong joined #git
15:15 shinnya joined #git
15:15 nilg joined #git
15:16 fuchstronaut joined #git
15:16 bongjovi joined #git
15:20 NeverDie joined #git
15:20 zivester joined #git
15:21 BSaboia joined #git
15:21 BSAlb joined #git
15:22 lindenle joined #git
15:23 jimi_ joined #git
15:23 sangy joined #git
15:24 turnstileJumper joined #git
15:24 eijk_ joined #git
15:25 erguven joined #git
15:27 AaronMT_ joined #git
15:28 sharpy joined #git
15:28 sharpy joined #git
15:29 bket joined #git
15:29 felipesabino joined #git
15:29 stantonk joined #git
15:30 zacts joined #git
15:30 ejb joined #git
15:31 felipesabino joined #git
15:31 nnyk_ joined #git
15:32 dmto joined #git
15:32 felipesabino joined #git
15:33 samson joined #git
15:34 dopesong joined #git
15:37 tristanp joined #git
15:37 User458764 joined #git
15:37 Balliad joined #git
15:37 kpease joined #git
15:38 thiago joined #git
15:38 romerocesar joined #git
15:38 zacts joined #git
15:39 eijk joined #git
15:39 zack_s_ left #git
15:40 synthroid joined #git
15:41 mjuszczak joined #git
15:41 cwillu_at_work joined #git
15:41 BlackMaria joined #git
15:41 Zamerick joined #git
15:42 stantonk joined #git
15:42 marc_v92 joined #git
15:42 Alienpruts joined #git
15:43 oich joined #git
15:43 eivarv joined #git
15:44 Electrometro joined #git
15:47 ash_workz joined #git
15:47 kulelu88 joined #git
15:47 kulelu88 joined #git
15:47 annoymouse joined #git
15:49 refried_ joined #git
15:50 todd_dsm_wk joined #git
15:51 fuchstronaut joined #git
15:52 dreiss joined #git
15:53 nitrix joined #git
15:55 BSAlb joined #git
15:55 BrunoSaboia joined #git
15:58 NeverDie joined #git
15:59 stantonk joined #git
15:59 drodger joined #git
16:00 jraccoon joined #git
16:01 TomyLobo joined #git
16:02 Arban joined #git
16:02 ArchNoob joined #git
16:03 madewokherd joined #git
16:03 jraccoon_ joined #git
16:04 le_melomane joined #git
16:05 MattMaker joined #git
16:05 jraccoon joined #git
16:05 digidog joined #git
16:07 stantonk joined #git
16:07 freimatz3 joined #git
16:08 ash_workz I don't suppose there's a way to wrap lines in a gist is there? (maybe not the channel for that anyway)
16:08 romerocesar joined #git
16:08 foist joined #git
16:09 InfoTest joined #git
16:09 diogenese joined #git
16:09 jack_rip_vim left #git
16:09 jraccoon_ joined #git
16:11 saedelaere joined #git
16:12 FuzzySockets joined #git
16:13 jraccoon joined #git
16:13 javajoe joined #git
16:13 phanimahesh joined #git
16:13 spudowiar joined #git
16:15 dopesong joined #git
16:16 MattMaker joined #git
16:16 BSaboia joined #git
16:16 BSAlb joined #git
16:19 stantonk joined #git
16:19 nnyk_ joined #git
16:23 tristanp joined #git
16:26 ochorocho__ joined #git
16:26 BrunoSaboia joined #git
16:27 stantonk joined #git
16:29 MattMaker joined #git
16:29 jknetl joined #git
16:30 cortexman joined #git
16:30 BSaboia joined #git
16:32 diegoviola joined #git
16:34 cortexman when I use git-bisect with a known good and known bad commit, it gives me commits to test that are outside of that range
16:34 devbug joined #git
16:34 BSAlb joined #git
16:34 akushner joined #git
16:35 thiago cortexman: how do you know they are outside?
16:36 thiago and are you sure the same commits don't happen if you just start your bisecting, then provide the known and known bad in later commands?
16:37 l4v2 joined #git
16:38 BSaboia joined #git
16:38 dsdeiz joined #git
16:38 l4v2 So I deleted a branch, and then found out I needed it, so I deleted my project and then cloned it from the repo, where all work was pushed via master branch, so I lost all of my branches. anyone got any good advice?
16:38 thiago l4v2: restore your backups
16:39 thiago l4v2: if that is not an option, then check if your branches exist as part of (or exactly as) remote branches on the repository you've just cloned
16:39 thiago use git branch -a
16:40 D[4]ni joined #git
16:40 l4v2 I was thinking about doing a backup restore, but it was a month  ago. I mean my project is still ok, but I am using this as a learning experience.
16:41 durham joined #git
16:42 SteffanW joined #git
16:43 l4v2 ok, so I had two branhes, one was spelled wrong, so I re created it, but it turned out I did some work on it. and merged it. Now if I wanted to see what was merged, would I run git log?
16:44 nettoweb joined #git
16:44 Macaveli joined #git
16:44 l4v2 or how can I see what work is done on a branch?
16:45 l4v2 I only use the CLI
16:45 stantonk joined #git
16:49 zacts joined #git
16:50 Cease joined #git
16:50 MattMaker joined #git
16:51 thiago l4v2: git log branchname
16:51 encod3 joined #git
16:52 junhao joined #git
16:52 le_melomane left #git
16:53 l4v2 ok, so you know when you merge your branch back into master how it shows all of the + and -’s is there a way to see that when on a branch? like compare the branch to the master?
16:53 thiago git diff branchname master
16:54 crankharder joined #git
16:54 thiago though you may want to run git diff master...branchname
16:55 l4v2 oh cool, thanks
16:55 noodle joined #git
16:56 GavinMagnus joined #git
16:57 stantonk joined #git
16:58 stonerfish joined #git
16:58 MattMaker joined #git
17:02 stantonk joined #git
17:02 rath joined #git
17:02 tristanp joined #git
17:03 orbitphreak joined #git
17:04 durham joined #git
17:06 eivarv joined #git
17:07 mjuszczak joined #git
17:08 BlackMaria_netsp joined #git
17:08 mjuszczak joined #git
17:09 eivarv joined #git
17:09 xall joined #git
17:09 mjuszczak joined #git
17:10 BlackMaria_netsp joined #git
17:11 mjuszcza_ joined #git
17:12 mjuszczak joined #git
17:13 cq1 joined #git
17:13 mjuszcza_ joined #git
17:13 stantonk joined #git
17:16 d4rklit3 joined #git
17:18 blackwind_123 joined #git
17:19 romerocesar joined #git
17:19 GodGinrai joined #git
17:20 impermanence joined #git
17:21 impermanence Hey! Am I unable to pass the -f switch to a git clone command?  My fantasy was to call git clone from some other directory and then pass my .gitconfig file.  What am I doing wrong?
17:22 Shock- joined #git
17:22 ojacobson I don't know, what _are_ you doing wrong? !transcript
17:22 gitinfo 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
17:22 ramsub07 joined #git
17:23 impermanence np, lol.  wun sec.
17:23 bongjovi joined #git
17:25 nmz787_i1 joined #git
17:25 inflames joined #git
17:25 devbug joined #git
17:25 MattMaker joined #git
17:25 dopesong_ joined #git
17:26 impermanence https://gist.github.com/jonassteinbe​rg1/31970f4b1601a09a89df3452329c309a
17:26 impermanence ojacobson: ^
17:26 catag87 joined #git
17:26 flaguy48 left #git
17:26 stantonk joined #git
17:27 EvilPeng1 joined #git
17:27 ochorocho__ joined #git
17:27 ojacobson I don't see any indication of a -f option in either man git or man git-clone
17:27 gitinfo the git manpage is available at http://jk.gs/git.html
17:27 gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html
17:27 GodGinrai impermanence: -f isn't even a flag for git-clone
17:27 GodGinrai oh, I was beaten to the punch
17:28 impermanence ojacobson: I see.
17:28 impermanence GodGinrai: I see.
17:28 impermanence oaky, cool.
17:28 impermanence thx,
17:28 impermanence I'm sure I can figure this out.
17:28 ekinmur joined #git
17:28 ojacobson man git-config may have some helpful pointers *rolls dice*
17:28 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
17:29 ojacobson In this specific case, you should be able to set HOME
17:29 jaggz I have some local changes.. how do I change those to the source repository's files, ignoring my changes?
17:29 ojacobson eg. HOME=/home/me git clone …
17:29 kutsuya joined #git
17:29 BlackMaria joined #git
17:29 jaggz I have some which say they're modified, but I didn't do it.. kinda weird
17:29 jaggz how do I revert those to the repo's head (or whatever you call it)
17:29 GavinMagnus left #git
17:30 f3r70rr35f joined #git
17:30 felipesabino joined #git
17:31 GodGinrai jaggz: `git checkout -- file`, I believe
17:32 rgrinberg joined #git
17:33 infra-red joined #git
17:33 jaggz I removed some.. hrm
17:33 jaggz error: pathspec 'user_config.h' did not match any file(s) known to git.
17:34 Electrometro joined #git
17:34 jaggz got it..
17:35 Electrometro joined #git
17:35 jaggz git fetch --all; git reset --hard origin/master; git pull
17:36 GodGinrai jaggz: oh, I thought you wanted to discard the changes in specific files
17:36 MaximusColourum joined #git
17:38 deadnull joined #git
17:38 impermanence Yep.  resolved.
17:38 stantonk joined #git
17:38 impermanence I didn't own the directories I was working out of so there you go.  In my head I was thinking it was because I needed to move an ssh key somewhere or a .gitconfig file somewhere or something.  But it's all good now.
17:39 deadnull joined #git
17:39 jaggz GodGinrai, :)
17:40 Sucks joined #git
17:40 vuoto joined #git
17:43 sharpy joined #git
17:47 thiago joined #git
17:49 fuchstronaut joined #git
17:49 romerocesar joined #git
17:51 stantonk joined #git
17:52 xall joined #git
17:53 flaguy48 joined #git
17:54 dopesong joined #git
17:54 tristanp joined #git
17:57 durham joined #git
17:57 Limes_ joined #git
18:00 MattMaker joined #git
18:04 durham joined #git
18:04 Repox joined #git
18:07 dsantiago joined #git
18:09 fuchstronaut joined #git
18:11 rahtgaz joined #git
18:11 sumoruman joined #git
18:12 Topic for #git is now Welcome to #git, the place for git help and impeccable room service | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | You can checkout any time you like, but you can never diff.
18:13 dmto joined #git
18:13 btree joined #git
18:13 btree left #git
18:15 MattMaker joined #git
18:16 stantonk joined #git
18:17 davisonio joined #git
18:18 drodger joined #git
18:19 romerocesar joined #git
18:19 spudowiar joined #git
18:21 stantonk joined #git
18:21 jaggz joined #git
18:21 tvw joined #git
18:22 jost__ joined #git
18:24 f3r70rr35f joined #git
18:25 catag87 joined #git
18:26 cdg joined #git
18:27 mischat joined #git
18:28 Sasazuka joined #git
18:28 vuoto joined #git
18:28 dsantiago joined #git
18:30 vuoto joined #git
18:31 MattMaker joined #git
18:31 stantonk joined #git
18:32 Balliad joined #git
18:32 durham joined #git
18:33 vuoto joined #git
18:33 crayon joined #git
18:35 shirty joined #git
18:35 shirty Have a bad connection and have to push alot of data up to a server
18:35 shirty is it ok to work with git while pushing?
18:36 hahuang61 joined #git
18:37 J_128 joined #git
18:38 catag87 joined #git
18:38 J_128 Hello. I have a question:  how do I push commits to a new branch?
18:38 eijk joined #git
18:38 GodGinrai shirty: that doesn't sound safe
18:39 GodGinrai but I don't know
18:39 rgrinberg joined #git
18:39 GodGinrai J_128: are you trying to push a local branch to a remote?
18:39 shirty yea didnt' to me either
18:39 shirty to a remote
18:39 vuoto_ joined #git
18:40 J_128 Sorry, I'm new to git, but I think a remote.
18:40 ojacobson shirty: if you do anything that causes garbage collection (eg. git-commit), then it might block while git-push is running if and when gc does more than nothing
18:40 vuoto joined #git
18:40 ojacobson and obviously if you fuck up the repo (rm -rf, whatever) mid-push, you're going to have a bad time
18:40 GodGinrai J_128: ok, confirm these for me: 1) Are you working in a branch that is not master? 2) You want that branch on the server that you pull from?
18:41 f3r70rr35f joined #git
18:41 stantonk joined #git
18:42 rpd shirty: you can work on git while pushing, but you might expect the things you can do safely to be limited
18:43 durham_ joined #git
18:44 rpd but all local operations really shouldn't have any effect while you are pushing. You probably could run rm -rf while pushing as long as you don't get rid of .git/
18:45 Fenikkusu joined #git
18:45 l4v2 joined #git
18:46 Masterphi joined #git
18:47 Fenikkusu I'm having an issue where whenever one of my co-workers does a merge, his system competely overwrites changed files to the state they are in his repo, often times files he hasn't touched. Any thoughts on why this might happen?
18:47 Masterphi Fenikkusu: Merge strategy?
18:48 Fenikkusu Masterphi, I presume what ever the default is. He hasn't changed his settings to my knowledge and it is a fairly new install of git (Last 6 Months or So).
18:49 GodGinrai Fenikkusu: what OS, for both of you?
18:49 Fenikkusu GodGinrai, WIndows 7 On both.
18:49 Masterphi CLI or some sort of GUI?
18:50 GodGinrai and if CLI, which CLI? msysgit or cygwin git?
18:50 Fenikkusu Masterphi, GUI (PHPStorm).
18:50 GodGinrai Ok, so you guys installed git using the git-scm.com windows installer?
18:50 Fenikkusu GodGinrai, Correct
18:51 nitin joined #git
18:52 GodGinrai Fenikkusu: that installer lets you choose some important defaults during the install process.  Some of which are defaulted to some pretty stupid values... (like the one defaulting line endings to be converted to crlf when checked out)
18:52 tristanp joined #git
18:52 GodGinrai I'd compare your git config values
18:52 NeverDie joined #git
18:53 Fenikkusu Okay, I will look into that. Thank You
18:55 supsup joined #git
18:55 supsup is there a way to see how a user rebased into your git repo?
18:55 King_Hual joined #git
18:56 nwkj86 joined #git
18:56 andrey_utkin joined #git
18:58 andrey_utkin Hi! I've got ~20 git-fsck warnings like "warning in tag 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c: missingTaggerEntry: invalid format - expected 'tagger' line". How could I fix that without re-fetching entire Linux git repo?
18:58 artemisart joined #git
18:59 djb-irc joined #git
19:00 supsup is there a way to prove someone did a git reset back in time then committed it?
19:01 _ikke_ supsup: Only if you have the original history
19:01 D[4]ni supsup: git reflog, if you didn't git gc since then
19:01 _ikke_ D[4]ni: the reflog keeps entries for 90 days
19:01 _ikke_ But you need his repository
19:01 D[4]ni And that
19:01 D[4]ni I think a GC destroys it too
19:02 _ikke_ Nope
19:02 _ikke_ That defeats the purpose of the reflog
19:02 stantonk joined #git
19:02 D[4]ni Oh, I mistook it
19:02 D[4]ni There's git reflog expire
19:02 Rynomster joined #git
19:02 Rynomster joined #git
19:04 andrey_utkin related to my above question... is there a command to remove particular objects so that I could fetch them again from remotes?
19:05 andrey_utkin i'd hate refetching linux repo which is currently 14G
19:05 l4v2 left #git
19:05 ejb joined #git
19:06 J_128 left #git
19:06 _ikke_ andrey_utkin: The git protocol does not refetch arbitrary objects
19:06 l4v2 joined #git
19:06 sumoruman_ joined #git
19:07 _ikke_ It compares refs and fetches objects based on the difference
19:07 cyan__ joined #git
19:07 GodGinrai supsup: http://stackoverflow.com/questions/10​319110/how-to-detect-a-forced-update <-- this might be useful
19:08 _ikke_ That requires a hook to be installed
19:09 vuoto joined #git
19:09 nodz joined #git
19:09 supsup how is it that the history of my git got rewritten?
19:09 supsup guy did an update one hour ago and all the updates before it for 3 days are gone
19:10 GodGinrai _ikke_: indeed it does.  So he could do this to prevent such instances in the future.
19:10 dsdeiz joined #git
19:10 dsdeiz joined #git
19:10 supsup i'm assuming he did a reset locally and commit it something?
19:10 ascarter joined #git
19:10 GodGinrai supsup: that could just mean he force pushed an old branch
19:10 ojacobson gone as in no longer in `git log origin/master`, or gone as in the changes have been reversed?
19:12 blackwind_123 joined #git
19:13 supsup is there a way to undo a forced push?
19:13 ojacobson push the original commits again
19:13 supsup they don't show up in history anymore
19:13 ojacobson (which will likely - i want to say necessarily - require --force again)
19:13 ojacobson someone has them, either in their reflog or in their local branches
19:13 supsup or log
19:13 ojacobson find that someone, have them re-push, then lock down force push on important branches
19:13 dsantiago joined #git
19:14 supsup thanks for info Ojac
19:14 supsup but there is no way to tell he did a forcepush and not a reset push?
19:15 ojacobson any non-forward push requires --force
19:15 ojacobson it doesn't matter whether it's backwards (reset back, push that) or sideways (rebase and push that) or both
19:15 andrey_utkin supsup, what is "reset push"?
19:16 kutsuya joined #git
19:16 supsup like do reset HEAD~20 then clean -df add some new content and comment?
19:16 supsup or would there be a history of that
19:17 GodGinrai resets don't leave commits
19:17 GodGinrai otherwise they would be reverts, essentially
19:17 supsup even if they clean and edit a file and do a commit?
19:17 supsup i guess that would just be a new commit tho
19:18 supsup and be in history
19:18 MaximusColourum joined #git
19:18 supsup in the force push idea, why does the commit the guy did not show all the files he deleted?
19:19 GodGinrai supsup: There's no way to tell if it was a reset or if they just started committing on an old branch
19:19 annoymouse I'm making a very large PR on GH right now and I just noticed that way back when I accidentally committed a bunch of lines that I shouldn't have (my editor automatically changed some of the whitespace). How can I fix this?
19:20 annoymouse Is there a better way then manually changing each line I messed up?
19:20 D[4]ni annoymouse: maybe git rebase -i, choose to edit that commit, git reset --soft, git commit --patch
19:21 andrey_utkin ok i guess these "missingTaggerEntry: invalid format - expected 'tagger' line" warnings are fine for these objects, which are tags for v2.6.11 - v2.6.13-rc3. v2.6.14 is fine and it features "Tagger:" line, which those indeed lack.
19:21 GodGinrai annoymouse: unless that was its own commit with no other changes, I'd say manually changing the lines would be the easiest.
19:21 annoymouse oh man
19:21 annoymouse this will be fun
19:21 afuentes joined #git
19:21 andrey_utkin err i meant v2.6.11-tree - v2.6.13-rc3-tree
19:22 yqt joined #git
19:22 supsup so GodGinrai the senario is someone has their own branch then they force commit it into the shard branch causing all the differences to just be dropped/
19:24 GodGinrai supsup: or they could've just never done a recent pull on master, made some changes, tried to push, got a push error (because their master diverged) and then force pushed because yolo
19:24 tristanp joined #git
19:24 andrey_utkin left #git
19:25 nettoweb joined #git
19:25 supsup and that destroys the stuff in between?
19:25 Fenikkusu joined #git
19:25 supsup or makes dangling commits out of all of them?
19:25 fuchstronaut joined #git
19:26 SwiftMatt joined #git
19:26 _ikke_ Only gc will remove any objects, and that after they have been expired from the reflog
19:26 tvon joined #git
19:26 dsdeiz_ joined #git
19:26 supsup so when i talk to this guy i can get him to undo it how ?  I tried to revert his commit locally but it does not help at all
19:27 supsup i guess it does revert what he did but i don't get my dangling commits back
19:27 _ikke_ supsup: Did you had those changes locally that he 'removed'?
19:27 supsup yeah
19:27 supsup i can rebase them right
19:27 _ikke_ Then you can check your own reflog
19:27 supsup but that's annoying
19:27 supsup that's the only solution tho?
19:28 supsup i can do that i guess just gonna kill a dev.  it's not just me either it's like 4 other people
19:28 _ikke_ someone needs to undo the history rewriting
19:28 supsup will my reflog contain all the missing content that used to be committed ?
19:28 eivarv joined #git
19:28 supsup or just the stuff i did
19:28 _ikke_ Everything you had locally
19:29 _ikke_ It tracks what commits you had checked out and also all branches
19:29 supsup alright im still going to kill this dev
19:30 jimi_ joined #git
19:30 _ikke_ Teach him how to prevent it in the future, and you might have an asset ;-)
19:30 tvon joined #git
19:31 GodGinrai supsup: yea, `git revert` can't undo resets.  Remember, there is no record of a reset, so `git revert` doesn't know what it needs to "undo"
19:32 _ikke_ git revert is not an undo operation
19:32 _ikke_ It creates a new commit that does the opposite
19:32 _ikke_ of the commit being reverted
19:32 _ikke_ So it operates on commits, not on history
19:32 GodGinrai _ikke_: that's why I put undo in double quotes
19:33 * GodGinrai makes air quotes with his fingers
19:33 _ikke_ GodGinrai: Was not a remark to you, just wanted to explain it further
19:33 GodGinrai ah, ok
19:35 sq-one joined #git
19:36 refried_ joined #git
19:39 stantonk joined #git
19:40 durham joined #git
19:40 dsantiago joined #git
19:41 acetakwas joined #git
19:45 jstimm joined #git
19:45 sagerdearia joined #git
19:47 Macaveli joined #git
19:48 rromans joined #git
19:49 ifsp joined #git
19:50 mehola joined #git
19:50 ejb joined #git
19:51 catag87 joined #git
19:51 supsup is this a possible solution?   reset --hard to right before this happened
19:51 supsup then force mine ?
19:51 supsup make them redo their stuff?
19:52 cookie16 joined #git
19:52 _ikke_ sure
19:52 supsup locally I have done that and it looks OK...
19:52 _ikke_ He does not have to redo it
19:53 supsup they destroyed 768 commits by doing this
19:53 supsup and gave me 6 commits
19:53 Masterphi joined #git
19:53 _ikke_ Not a fair trade
19:53 _ikke_ Unless
19:53 supsup they may have rebased i guess
19:53 supsup but i don't like it
19:53 Dyonisos joined #git
19:53 _ikke_ They often say, you are not finished when you have nothing to add, but when you have nothing to remove :P
19:53 _ikke_ But that are quite a many commits
19:54 cdg joined #git
19:55 Masterphi joined #git
20:00 GodGinrai supsup: you can force yours, and then have him merge master into his
20:00 EvilPenguin joined #git
20:00 GodGinrai then he doesn't need to redo
20:00 _ikke_ Then you get a weird history
20:01 GodGinrai _ikke_: just have him checkout -b his master as a new branch, then merge the updated master into it.  Then it looks like a feature branch that was merged in once he FF-merges it into master
20:02 tristanp joined #git
20:04 nnyk_ joined #git
20:04 stantonk joined #git
20:04 stantonk joined #git
20:06 hahuang61 joined #git
20:06 phanimahesh joined #git
20:07 dsantiago joined #git
20:08 ObvLofWwGXXe joined #git
20:09 EricPoe joined #git
20:09 supsup heh a little nervous i've never done git push origin stage --force before
20:09 _ikke_ --force-with-lease is a little safer
20:10 supsup hurm will google
20:10 GodGinrai supsup: or just read the manpage
20:12 supsup it's all backed up so....bonzai
20:12 GodGinrai lol
20:12 ExKSkqriclUq joined #git
20:16 ynanm joined #git
20:17 supsup seems to have worked well but i feel dirty
20:17 GodGinrai lol
20:17 supsup i don't like how people can do that
20:17 _ikke_ You can prevent force pushes
20:17 GodGinrai supsup: You can prevent this by detecting force pushes with hooks
20:17 GodGinrai and preventing them
20:18 GodGinrai or at least logging them
20:18 ploop joined #git
20:18 supsup oh i am
20:18 supsup an't nobody going to force my repo again
20:19 rpd supsup: don't let people push to master imo
20:19 rpd like all these things are fine terrible things to do in any other branch then master
20:19 supsup it was a branch
20:19 rpd I see
20:19 m0viefreak joined #git
20:19 Pulp joined #git
20:20 go1111111 joined #git
20:21 GodGinrai supsup: this is one place where having the developers work in forks rather than the main repo is beneficial
20:21 GodGinrai supsup: if they don't have write access to your branch, they can't break it
20:21 spudowiar joined #git
20:22 apotry joined #git
20:23 muelli joined #git
20:24 ekinmur joined #git
20:26 nmz787_i joined #git
20:27 phanimahesh joined #git
20:28 felipesa_ joined #git
20:28 satifant joined #git
20:28 Masterphi joined #git
20:29 zivester joined #git
20:29 nmz787_i1 joined #git
20:30 erguven joined #git
20:33 nnyk_ joined #git
20:35 FabTG joined #git
20:37 pur3eval joined #git
20:38 stantonk joined #git
20:38 f3r70rr35f joined #git
20:41 jon28_ joined #git
20:41 Slush- joined #git
20:42 dbolser joined #git
20:43 dsantiago joined #git
20:43 stantonk joined #git
20:46 phanimahesh joined #git
20:48 elastix joined #git
20:49 underpantz joined #git
20:50 xpk joined #git
20:50 dsantiago joined #git
20:52 supsup yeah i'm still a newb at git i think i'm improving tho
20:52 cr3 joined #git
20:53 dsantiago joined #git
20:53 f3r70rr35f joined #git
20:53 aidalgol joined #git
20:57 fradd joined #git
20:57 Darren_ joined #git
20:59 EvilPeng1 joined #git
21:00 tristanp joined #git
21:00 Darren_ Hey, I plan on doing dev work with a few devs on WordPress. How can I use Git so we don't step on each others' toes?
21:02 supsup make local branches, do all your work in the local branch, then when your ready to push, rebase all the commits into one in the local branch, then cherry pick that commit to your master
21:02 supsup imo
21:02 supsup but i'm prob wrong
21:02 supsup technically git is not for content authoring
21:02 Darren_ well it wouldn't be content, it would be the dev work for the php files
21:03 supsup ah sorry i don't use word-press i thought it was just basic html files
21:03 i7c !workflow
21:03 gitinfo Finding the right workflow for you is critical for the success of any SCM project.  Git is very flexible with respect to workflow.  See http://sethrobertson.github.c​om/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.
21:03 i7c ^
21:05 stantonk joined #git
21:07 supsup left #git
21:07 ahr3n joined #git
21:07 GodGinrai joined #git
21:08 GodGinrai joined #git
21:10 Fomina joined #git
21:10 muelli joined #git
21:11 romerocesar joined #git
21:15 Darcidride joined #git
21:16 fuchstronaut joined #git
21:17 CussBot joined #git
21:17 phanimahesh joined #git
21:21 ploop joined #git
21:21 liuzhen joined #git
21:22 tvon joined #git
21:22 BSaboia joined #git
21:23 SirFunk joined #git
21:23 justanotheruser joined #git
21:24 justanotheruser joined #git
21:25 IWishIKnew joined #git
21:25 tematibr joined #git
21:27 HoierM_ joined #git
21:31 romerocesar joined #git
21:34 GavinMagnus joined #git
21:35 felipesa_ left #git
21:36 mehola joined #git
21:36 pioiytr_ joined #git
21:37 phanimahesh joined #git
21:38 GavinMagnus left #git
21:38 lmatteis joined #git
21:42 acetakwas joined #git
21:52 spudowiar joined #git
21:52 stantonk joined #git
21:57 jaafar joined #git
21:59 thiras joined #git
22:00 xlegoman joined #git
22:00 thiras hello
22:00 gitinfo thiras: 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.
22:00 acetakwas joined #git
22:01 thiras i'm trying to backup my vim environment
22:01 durham_ joined #git
22:02 thiras i couldn't belive how problematic is this
22:02 thiras got few plugin under (as clonned git repos)
22:02 joki joined #git
22:03 thiras is there any single command to catch them all? or should i build submodules for each plugin one by one?
22:03 Dougie187 left #git
22:05 blackwind_123 joined #git
22:07 phanimahesh joined #git
22:08 eijk_ joined #git
22:09 nexxy joined #git
22:10 ascarter joined #git
22:12 romerocesar joined #git
22:12 lindelabs joined #git
22:19 eijk joined #git
22:20 GT4066 joined #git
22:21 lindelabs left #git
22:24 stonerfish joined #git
22:24 drodger joined #git
22:24 pneuma joined #git
22:26 Slush- joined #git
22:26 phanimahesh joined #git
22:28 jstimm joined #git
22:29 mischat_ joined #git
22:29 zacts joined #git
22:31 romerocesar joined #git
22:32 i7c This is probably not the right place to discuss this, but why don't you use one of the plugin managers?
22:32 i7c There's vundle and neobundle and dein.vim and pathogen and …
22:33 i7c Some (?) of those simply clone/pull repos as install/update actions and you just maintain a config file.
22:33 izabera if a plugin manager is a plugin, how do you install a plugin manager without a plugin manager?    :mindblown:
22:33 EvilPenguin joined #git
22:34 i7c By adding a snippet of vimscript to your vim config which luckily is a turing complete language.
22:34 bremner just barely ;)
22:34 i7c And it installs all the shit on first start if it isn't present.
22:34 i7c bremner ;)
22:35 jeffreylevesque joined #git
22:35 mwhooker joined #git
22:35 i7c I guess the plugin installation is even possible without turing completeness. :P
22:36 catag87 joined #git
22:37 izabera that's kind of a moot point, since if X is doable with a turing machine, X is doable without a turing machine
22:38 shinnya joined #git
22:40 i7c And that means?
22:40 thiras i7c, i'm already using vundle
22:41 thiras when i try to add already cloned plugins (including vundle) under .vim/bundle/ as submodules it throws "'.vim/bundle/Vundle.vim' already exists in the index"
22:42 i7c I don't understand why you need to add them as submodules or anything like that.
22:42 cdown_ joined #git
22:42 WaReZ joined #git
22:42 thiras because simple "add" doesnt work
22:42 i7c If your plugin manager is configured properly it should be able to recreate the exact vim environment.
22:42 i7c You should have to track git repos with git.
22:42 i7c should not*
22:43 i7c As in "check if all is installed, otherwise install everything that's missing".
22:43 thiras ok any idea to move that environment to 10x machine as fast as git clone?
22:43 NeXTSUN joined #git
22:44 Shentino joined #git
22:44 i7c Well I'm using neobundle (which is currently a bit messed up sadly but still) all I need is the vimrc on the new machine.
22:44 i7c It clones everything from github repos where the plugins are hosted.
22:45 thiras so i have change my all config which set for vundle
22:45 thiras https://github.com/thiras/vim-python-ide i7c
22:45 i7c uhm, I thought vundle should be able too.
22:46 thiras check this i just add .vim .vimrc to my git repo and push to the here
22:46 thiras check the bundles
22:47 i7c OK I guess. I mean if you want to manage your plugins that way, submodules might be the way to go, yes.
22:48 thiras and i cannot add submodules it throws "'.vim/bundle/Vundle.vim' already exists in the index"
22:49 pneuma joined #git
22:49 thiras ok i guess i will go with your way. a bash script probably will solve the problem if i can get vundle and my vimrc
22:50 i7c thiras: https://paste.xinu.at/fClJvq/ That's my vimrc, but I warn you, it's fucked up because I'm so damned lazy.
22:50 i7c I stole most of this stuff from other people. :)
22:51 mjuszczak joined #git
22:51 pneuma_ joined #git
22:53 mischat joined #git
22:54 nexxy joined #git
22:56 thiras yeah mine is stolen too :)
22:56 i7c Ain't nobodoy got time to learn vimscript. ;)
22:57 phanimahesh joined #git
23:00 madewokherd joined #git
23:01 Marbug joined #git
23:02 romerocesar joined #git
23:03 hahuang61 joined #git
23:03 EvilPenguin joined #git
23:05 johnmilton joined #git
23:05 User458764 joined #git
23:06 durham joined #git
23:07 hahuang65 joined #git
23:09 Garen joined #git
23:10 rxc joined #git
23:10 rxc joined #git
23:10 mischat_ joined #git
23:11 AndroidLoverInSF joined #git
23:13 DarkoEyes joined #git
23:13 pneuma joined #git
23:16 espindola joined #git
23:16 Jahh joined #git
23:16 fuchstronaut joined #git
23:16 pneuma_ joined #git
23:17 phanimahesh joined #git
23:20 Literphor joined #git
23:20 pneuma_ joined #git
23:20 Marbug joined #git
23:21 johnmilton joined #git
23:22 pneuma__ joined #git
23:23 Sazhen86 joined #git
23:23 pneuma joined #git
23:25 ArchNoob joined #git
23:32 thiago joined #git
23:32 Sasazuka joined #git
23:32 ekinmur joined #git
23:32 romerocesar joined #git
23:37 mehola joined #git
23:37 Thorn joined #git
23:38 pioiytr joined #git
23:39 shgysk8zer0 joined #git
23:41 Achylles joined #git
23:42 thiago joined #git
23:43 topi` joined #git
23:44 davisonio joined #git
23:44 cqi joined #git
23:46 nidr0x joined #git
23:46 cdown joined #git
23:49 fracting joined #git
23:50 settermjd_ joined #git
23:50 Literphor joined #git
23:52 cdown joined #git
23:52 phanimahesh joined #git
23:53 iomari joined #git
23:54 dsantiago joined #git
23:57 ethereality82 joined #git
23:58 espindola joined #git

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