Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-05-23

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

All times shown according to UTC.

Time Nick Message
00:15 aidalgol joined #git
00:15 nnyk joined #git
00:19 fuchstronaut joined #git
00:21 lucasem joined #git
00:22 dreiss joined #git
00:25 variable joined #git
00:29 diego2 joined #git
00:31 tomog999 joined #git
00:32 PityDaFool joined #git
00:34 aghalarp joined #git
00:34 SwiftMatt joined #git
00:35 dopesong joined #git
00:36 mda1 joined #git
00:37 interne7y joined #git
00:38 ntshetty joined #git
00:42 mmlb joined #git
00:42 bronson joined #git
00:43 eletuchy joined #git
00:45 MattMaker joined #git
00:47 ril joined #git
00:52 Kaisyu joined #git
00:53 SwiftMatt joined #git
00:57 csd_ joined #git
01:01 Puffball_ joined #git
01:01 gaen joined #git
01:10 ril joined #git
01:12 hanshenrik joined #git
01:13 catsup joined #git
01:13 mizu_no_oto joined #git
01:15 csd_ joined #git
01:16 cdg joined #git
01:16 nnyk joined #git
01:19 Limes_ joined #git
01:20 elementalest joined #git
01:21 fuchstronaut joined #git
01:21 ensyde joined #git
01:26 elementalest joined #git
01:26 elementalest joined #git
01:26 ceaucari joined #git
01:27 tristanp joined #git
01:28 Vaelatern joined #git
01:32 rawtaz joined #git
01:33 scarabx joined #git
01:42 wxg joined #git
01:46 joako joined #git
01:50 fracting joined #git
01:51 tacocat left #git
01:53 nnyk joined #git
01:57 Puffball joined #git
01:57 pks joined #git
01:57 dreiss joined #git
01:58 AbsurdTech joined #git
02:00 drbean_ joined #git
02:01 Puffball joined #git
02:02 rchavik joined #git
02:04 Puffball_ joined #git
02:06 baba_ joined #git
02:07 fracting joined #git
02:07 baba_ joined #git
02:09 tristanp joined #git
02:09 joki joined #git
02:10 Brando753 joined #git
02:16 nnyk joined #git
02:19 zivester_ joined #git
02:19 zivester_ joined #git
02:21 dsantiago joined #git
02:22 fuchstronaut joined #git
02:24 CROOKED^HILLARY^ joined #git
02:26 chachasmooth joined #git
02:35 Puffball joined #git
02:38 hexagoxel joined #git
02:39 mehola joined #git
02:39 Puffball joined #git
02:53 baba_ joined #git
02:53 eletuchy joined #git
02:54 Puffball joined #git
02:57 arescorpio joined #git
02:58 larslarsson joined #git
02:59 a_thakur joined #git
02:59 Puffball joined #git
03:02 chachasmooth joined #git
03:02 Puffball joined #git
03:06 zivester joined #git
03:08 aavrug joined #git
03:08 Goplat joined #git
03:10 Mobutils joined #git
03:10 Dougie187 left #git
03:11 eletuchy joined #git
03:12 rkazak joined #git
03:13 dsantiago joined #git
03:13 Puffball joined #git
03:16 Puffball joined #git
03:16 baba__ joined #git
03:18 baba__ joined #git
03:19 jstimm joined #git
03:19 nettoweb joined #git
03:20 hahuang61 joined #git
03:20 aavrug joined #git
03:20 k3rn31 joined #git
03:22 fuchstronaut joined #git
03:25 MattMaker joined #git
03:25 bjpenn joined #git
03:31 roknir joined #git
03:33 __xor joined #git
03:34 _xor joined #git
03:38 sanketdg joined #git
03:38 interne7y joined #git
03:39 akushner joined #git
03:50 Gsham joined #git
03:55 mehola joined #git
03:57 SimonNa joined #git
03:59 pwnz0r joined #git
04:00 k3rn31 joined #git
04:01 jagob joined #git
04:07 bjpenn joined #git
04:08 baba_ joined #git
04:08 a_thakur joined #git
04:08 eletuchy joined #git
04:12 MattMaker joined #git
04:14 baba_ joined #git
04:14 gaurav_ joined #git
04:14 rscata joined #git
04:16 aghalarp joined #git
04:17 baba_ joined #git
04:20 CROOKED^HILLARY^ joined #git
04:21 khmarbaise joined #git
04:22 hahuang61 joined #git
04:23 fuchstronaut joined #git
04:26 gaurav_ joined #git
04:29 bjpenn joined #git
04:30 roknir joined #git
04:30 roknir joined #git
04:32 skylite joined #git
04:35 a_thakur joined #git
04:35 netj joined #git
04:35 hahuang61 joined #git
04:37 david007 joined #git
04:39 dopesong joined #git
04:40 IWishIKnew joined #git
04:41 aidalgol joined #git
04:41 Cabanossi joined #git
04:42 eletuchy joined #git
04:44 jonesinator joined #git
04:49 baba_ joined #git
04:50 tristanp joined #git
04:51 a_thakur joined #git
04:56 baba_ joined #git
04:59 muthu joined #git
05:04 aavrug joined #git
05:09 subhojit777 joined #git
05:16 unreal joined #git
05:17 fracting joined #git
05:18 muthu joined #git
05:19 fracting1 joined #git
05:24 fuchstronaut joined #git
05:25 SwiftMatt joined #git
05:29 d4rklit3 joined #git
05:32 Puffball_ joined #git
05:35 tristanp joined #git
05:37 dopesong joined #git
05:39 Puffball joined #git
05:39 interne7y joined #git
05:41 mehola joined #git
05:42 baba_ joined #git
05:45 Puffball joined #git
05:45 tristanp_ joined #git
05:45 yournick joined #git
05:45 mariuscc joined #git
05:46 dopesong joined #git
05:47 aghalarp joined #git
05:47 Puffball_ joined #git
05:51 clemf joined #git
05:52 Puffball joined #git
05:53 karstensrage if i wanted to fix something in a github repo, and do a pull request, is the standard way to do that to create a fork, fix it in my fork and do the pull request from my fork?
05:53 Raging_Hog joined #git
05:53 kadoban karstensrage: Yes
05:53 ThomasLocke joined #git
05:54 qt-x joined #git
05:54 NateAGeek joined #git
05:54 karstensrage kadoban, and then i can delete the fork? i dont like having forks in my account
05:54 nardev joined #git
05:54 kadoban After it gets merged, yeah. I dunno if you can before that, it might delete the PR if you do (no idea)
05:54 romankl joined #git
05:55 karstensrage yeah after merge
05:55 karstensrage ok thanks
05:55 nnyk joined #git
05:56 jceb joined #git
05:57 baba_ joined #git
05:57 emPi joined #git
05:58 aavrug joined #git
06:00 Puffball joined #git
06:02 netj joined #git
06:04 mase-tech joined #git
06:04 Puffball joined #git
06:04 zeroed joined #git
06:08 shinnya joined #git
06:09 maxis joined #git
06:09 eletuchy joined #git
06:11 fwdit joined #git
06:13 _weyer joined #git
06:13 Junior joined #git
06:14 Puffball joined #git
06:14 lamppid joined #git
06:15 david007 joined #git
06:18 CROOKED^HILLARY^ joined #git
06:21 Puffball joined #git
06:22 eletuchy joined #git
06:24 dsdeiz joined #git
06:24 dsdeiz joined #git
06:25 fuchstronaut joined #git
06:25 baba_ joined #git
06:26 ToBeCloud joined #git
06:32 rkd joined #git
06:34 bakhtik joined #git
06:34 Lvjasha joined #git
06:35 baba_ joined #git
06:37 rominronin joined #git
06:38 nnyk joined #git
06:38 raijin joined #git
06:40 eijk joined #git
06:41 Alienpruts joined #git
06:42 baba_ joined #git
06:44 dreiss joined #git
06:45 baba_ joined #git
06:47 officialgupta joined #git
06:48 Sceorem joined #git
06:48 baba__ joined #git
06:48 subhojit777 joined #git
06:49 Puffball joined #git
06:51 JeroenT joined #git
06:53 officialgupta left #git
06:55 Puffball joined #git
06:55 apotry joined #git
06:57 eijk_ joined #git
06:58 moei joined #git
06:58 zeroed joined #git
07:01 Puffball joined #git
07:02 yuhlw_ joined #git
07:03 Macaveli joined #git
07:03 blackwind_123 joined #git
07:04 Junior joined #git
07:05 Psychiatrist joined #git
07:05 cdown joined #git
07:05 tristanp joined #git
07:06 Junior yello ;)
07:08 wooy joined #git
07:08 cdown_ joined #git
07:08 cgundersson joined #git
07:08 elastix joined #git
07:09 cgunders2on joined #git
07:09 cgunders1on joined #git
07:09 eletuchy joined #git
07:10 nnyk_ joined #git
07:14 GavinMagnus joined #git
07:15 anu1 joined #git
07:15 chigang_ joined #git
07:17 lindenle joined #git
07:17 Kulrak joined #git
07:17 Kulrak joined #git
07:17 fees joined #git
07:18 CROOKED^HILLARY^ joined #git
07:18 yournick joined #git
07:20 moritz oh hai
07:21 GavinMagnus joined #git
07:25 Balliad joined #git
07:26 fuchstronaut joined #git
07:26 GavinMagnus joined #git
07:28 eijk joined #git
07:28 ahmedelgabri joined #git
07:29 LucaTM joined #git
07:30 monoxane joined #git
07:31 monoxane joined #git
07:32 monoxane joined #git
07:33 monoxane joined #git
07:34 Gonzo89 joined #git
07:34 haway joined #git
07:35 prsn joined #git
07:35 jagob joined #git
07:35 khmarbaise joined #git
07:37 mariuscc joined #git
07:38 bjpenn joined #git
07:38 MeltedLux joined #git
07:40 talin hello. i have a repo called meep.git
07:40 interne7y joined #git
07:40 radsy joined #git
07:40 talin now when i hceckout any branch, it says "not a meep.git repo", all of a sudden
07:40 talin whether it's master or any other branch
07:41 josuebrunel joined #git
07:42 milki thats a strange thing to say
07:42 milki doesnt look like a standard git error message
07:43 eijk_ joined #git
07:44 aidalgol joined #git
07:45 ojdo joined #git
07:46 mischat joined #git
07:46 moritz talin: are there any active hooks in that repository?
07:48 dcpc007 hi, i got a bug with aliases like git st "fatal git-st permission denied. i found on google that git seems to check execution permission on each folder in the PATH before trying to use an alias ? (i'm still with old version because Centos 6.7 at work, not tested on my home laptop)
07:49 dcpc007 is it excpected or more like a bug (and i hope fixed in more recent versions than our current)
07:49 eijk joined #git
07:49 bronson joined #git
07:49 selckin git() { PATH=/usr/sdfsjd git "${@}" }
07:50 harish_ joined #git
07:50 cgundersson joined #git
07:50 cgunders2on joined #git
07:50 cgunders1on joined #git
07:53 a_thakur joined #git
07:53 Lauven joined #git
07:54 leeN joined #git
07:54 cdown joined #git
07:56 dsdeiz joined #git
07:56 dsdeiz joined #git
07:57 GavinMagnus joined #git
07:57 eijk_ joined #git
07:57 GavinMagnus joined #git
07:57 br0kenman joined #git
07:58 Fijit joined #git
08:03 JeroenT joined #git
08:03 subhojit777 joined #git
08:04 hahuang61 joined #git
08:07 _ikke_ dcpc007: I think that's because it first checks if git-<cmd> exists before checking aliases
08:08 kurkale6ka joined #git
08:11 bongjovi joined #git
08:11 cdown_ joined #git
08:12 mflow joined #git
08:12 GavinMagnus joined #git
08:13 robotroll joined #git
08:13 os_ joined #git
08:13 os_ hi
08:13 gitinfo os_: 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.
08:14 os_ how do i clone a specific folder in a repository ?
08:15 _ikke_ git does not support that
08:17 GavinMagnus joined #git
08:17 Guest57 joined #git
08:18 _pix joined #git
08:18 cdown_ joined #git
08:19 a_thakur joined #git
08:20 ocbtec joined #git
08:21 Marny joined #git
08:22 a_thakur_ joined #git
08:22 Off2k18 left #git
08:24 Jellyg00se joined #git
08:26 os_ ok
08:26 os_ thanks
08:26 fuchstronaut joined #git
08:26 marcogmonteiro joined #git
08:29 prsn joined #git
08:29 dcpc007 _ikke_: yes possible with the message shown. Is there a workaround ? We have environment common for different computer type, and sometimes possibles that a PATH contain one invalid path sometimes
08:30 dcpc007 more for testers like me :) always testing/tweaking configs and profiles ...
08:31 tristanp joined #git
08:34 _ikke_ I don't think without breaking some fundametal expectation
08:35 CalimeroTeknik how can I display all tags before a given commit hash? (that'll be HEAD in my case)
08:38 TomyWork joined #git
08:39 toogley joined #git
08:39 osse CalimeroTeknik: git tag --merged
08:40 _ikke_ Ah, that exists
08:40 _ikke_ hmm,
08:40 _ikke_ my man doesn't list it
08:40 _ikke_ ah, n/m
08:42 CalimeroTeknik oops, that needs a fairly recent version of git ^^
08:42 CalimeroTeknik thanks (I'll use sshfs)
08:44 osse CalimeroTeknik: 2.7.0
08:44 Macaveli joined #git
08:45 CalimeroTeknik I had 2.4.10 on that server; the purpose of the command itself was to update said server, so I ran git tag --merged from sshfs and all was good!
08:45 baba_ joined #git
08:46 GavinMagnus joined #git
08:49 rivarun joined #git
08:50 monoxane i have a silly idea, would it work to use git to sync my folder of school stuff between computers (all on linux)?
08:50 selckin sure
08:50 monoxane cool
08:51 acetakwas joined #git
08:51 moritz though if one of your school project involves video editing, I wouldn't use git for that :-)
08:52 monoxane joined #git
08:54 Shashikant86 joined #git
08:54 CalimeroTeknik monoxane, bitsync, syncthing etc can also be useful
08:54 monoxane nah, just a pile of lass notes
08:54 monoxane *class
08:54 CalimeroTeknik oh then git is perfect
08:54 monoxane yea, thats what i thought
08:55 * moritz tends to use git for basically all text documents these days
08:55 CalimeroTeknik all the more if said notes are in plain text or markdown
08:55 moritz notes, manuscripts, invoices, ...
08:55 JeroenT joined #git
08:56 baba_ joined #git
08:59 sans_s3r1f joined #git
09:01 razieliyo joined #git
09:01 razieliyo joined #git
09:02 circ-user-gDxqH joined #git
09:02 cdown joined #git
09:05 hahuang61 joined #git
09:07 fracting1 joined #git
09:07 EY joined #git
09:09 tristanp joined #git
09:14 JeroenT_ joined #git
09:14 Shashikant86 joined #git
09:18 baba_ joined #git
09:18 cdown joined #git
09:21 MadHatter42 joined #git
09:22 dimi1947 joined #git
09:23 eletuchy joined #git
09:24 ferr joined #git
09:24 ams__ joined #git
09:24 Ch4rAss joined #git
09:25 PCatinean joined #git
09:26 khelkun joined #git
09:26 a_thakur joined #git
09:27 infernix joined #git
09:27 fuchstronaut joined #git
09:30 jaguarmagenta joined #git
09:32 a_thakur_ joined #git
09:32 baba_ joined #git
09:32 gaen joined #git
09:33 fuchstronaut joined #git
09:38 aavrug_ joined #git
09:38 baba_ joined #git
09:41 basiclaser joined #git
09:41 interne7y joined #git
09:42 gaen joined #git
09:44 fuchstronaut joined #git
09:46 JeroenT joined #git
09:47 JeroenT joined #git
09:48 baba_ joined #git
10:02 wcpan joined #git
10:03 rawtaz left #git
10:04 dimi1979 joined #git
10:04 JeroenT_ joined #git
10:04 dimi1979 If I want to rename a commit...what I must do..use rebase?
10:04 netj joined #git
10:04 _rgn simply git commit --amend if it's the last one
10:04 _rgn rebase -i if not
10:05 JeroenT joined #git
10:05 afuentes joined #git
10:06 b00^wk left #git
10:06 hahuang61 joined #git
10:09 wcpan joined #git
10:11 fscala joined #git
10:14 tristanp_ joined #git
10:14 gechr joined #git
10:15 tvw joined #git
10:15 tristanp_ joined #git
10:16 dimi__ joined #git
10:16 gechr joined #git
10:17 dimi__ -rgn: Ok I ammended it the commit but how am I going to "commit" that change...?
10:17 nettoweb joined #git
10:18 osse if you did commit --amend then you are done
10:18 mahendra_ joined #git
10:18 mahendra_ left #git
10:19 gechr joined #git
10:20 dimi__ I am still in the COMMIT_EDITMSG window...how to return to the normal commands window of VIM?
10:20 bibble Press ESC i think
10:20 lindenle joined #git
10:20 bibble Then, :wq
10:23 griffindy joined #git
10:25 nowhere_man joined #git
10:29 jbitdrop joined #git
10:29 digidog joined #git
10:30 subhojit777 joined #git
10:31 Grievre left #git
10:32 dsdeiz joined #git
10:33 griffindy joined #git
10:34 tristanp joined #git
10:34 Macaveli joined #git
10:39 mdw joined #git
10:39 mikecmpbll joined #git
10:39 aavrug_ joined #git
10:40 jhasse joined #git
10:42 interne7y joined #git
10:42 JeroenT joined #git
10:43 mdw_ joined #git
10:43 jhasse Is it possible to tell git stash not to stash staged changes? (git stash -k still adds them to the stash)
10:44 circ-user-gDxqH joined #git
10:44 sdothum joined #git
10:44 kp_ joined #git
10:44 fuchstronaut joined #git
10:45 osse jhasse: no. workaround: git commit -m bleh && git stash && git reset --soft HEAD~1
10:45 jhasse osse, thx
10:45 exospecies joined #git
10:45 exospecies hi
10:47 zeroed joined #git
10:48 yournick joined #git
10:49 cgunders1on joined #git
10:49 cgundersson joined #git
10:49 cgunders2on joined #git
10:51 wooy jhasse, osse: intellij idea has "keep index" checkbox which keeps changes upon stashing, but I guess it runs something like osse suggested
10:51 csd_ joined #git
10:52 osse wooy: git stash has the exact same thing. problem is that it keeps the staging area AND stores it in the stash at the same time
10:52 mohabaks joined #git
10:52 WayToDoor joined #git
10:52 fuchstronaut joined #git
10:54 jhasse it's sooo annoying
10:54 osse agreed
10:54 jhasse and not intuitive
10:54 osse imho it should work like what i wrote
10:54 osse not sure was intellij does; maybe it has "fixed" it
10:55 jhasse yeah. I even think that it should be the default for `git stash`. I remember having all my hard work via `git add -p` being thrown away when I didn't know enough about git stash.
10:57 baba_ joined #git
10:59 tlaxkit joined #git
11:01 a_thakur joined #git
11:01 tristanp_ joined #git
11:02 robotrolll joined #git
11:02 mdw joined #git
11:04 ahmedelgabri joined #git
11:09 JeroenT joined #git
11:09 tristanp joined #git
11:10 noidea joined #git
11:10 noidea joined #git
11:11 acetakwas joined #git
11:12 mrkat joined #git
11:12 dimi__ bibble:no that did not do it
11:13 ocbtec joined #git
11:14 Rish joined #git
11:14 aavrug_ joined #git
11:14 dimi__ bibble:it worked after all...I had done something wrong
11:16 subhojit777 joined #git
11:16 tristanp joined #git
11:18 johnmilton joined #git
11:20 Ashley-ny joined #git
11:21 baba_ joined #git
11:21 fracting1 joined #git
11:22 johnmilton joined #git
11:23 Rish joined #git
11:26 sybariten joined #git
11:26 mbreedlove joined #git
11:26 sybariten g'day
11:27 sybariten if i do a git status, that's only relative to my own repo ofcourse? Is there a "git status" thing that compares with a remote server that my repo is also on?
11:27 selckin fetch i guess
11:27 osse sybariten: there is not. but what would it show?
11:28 quizzi joined #git
11:28 mbreedlove joined #git
11:30 apprentice joined #git
11:31 sybariten osse: i do not know that. It's quite possible that i'm trying to compare, uh, apples and MC Hammer here
11:31 jaguarmagenta joined #git
11:32 osse sounds a bit like that to me
11:32 baba_ joined #git
11:34 dangerousdave joined #git
11:35 scoz joined #git
11:37 mizu_no_oto joined #git
11:38 CheckDavid joined #git
11:41 dsdeiz_ joined #git
11:43 interne7y joined #git
11:43 dsdeiz_ joined #git
11:43 velho joined #git
11:44 dsdeiz joined #git
11:44 velho Does re-tagging imply any problems if done on remote repository that are used as central repository with gerrit?
11:45 johnmilton joined #git
11:46 cdown joined #git
11:47 dsdeiz joined #git
11:47 liamonade joined #git
11:47 dsdeiz joined #git
11:47 rnsanchez joined #git
11:49 bibble dimi__: Great! :)
11:50 tobiasvl velho: re-tagging how? surely it will rewrite history anyway
11:50 tobiasvl with all the potential problems that entails
11:50 velho tobiasvl, removing the old tag and use a newer commit from that branch?
11:51 tobiasvl velho: !rewrite
11:51 gitinfo velho: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
11:52 obadz joined #git
11:52 obadz looking inside a /.git folder, I'm trying to figure out what's the commit ID that's currently checked out
11:52 obadz (I can't invoke git)
11:53 obadz the HEAD file often contains something like: refs/heads/master or refs/heads/branch-name
11:53 gechr joined #git
11:53 obadz but the refs/head folder often does NOT contain the mentionned file
11:53 m8 joined #git
11:53 obadz is there an easy way to do this?
11:53 tobiasvl obadz: huh? it should contain the file, I would think
11:53 _ikke_ tobiasvl: not if you have packed refs
11:54 obadz _ikke_: ah, yes! I did a git gc yesterday
11:54 tobiasvl aaah. ofc
11:54 peroht joined #git
11:54 Sceorem joined #git
11:54 obadz so hmmm… any solutions?
11:55 ojdo joined #git
11:55 obadz I guess I've got to grep the packed-refs file?
11:56 _ikke_ you can try
11:56 obadz _ikke_: any scenario where this would not work?
11:57 obadz (what are these commit ids in packed refs that start with a ^?)
11:59 fstd joined #git
12:00 fracting1 joined #git
12:00 m8_ joined #git
12:01 tristanp joined #git
12:01 mischat_ joined #git
12:02 dimi__ there is one more thing, I have made a commit in master and I want the changes made to that script be  transferred to another branch...I think cherry-pick can help here,I do not know how to use it though IF od course can help in this occasion
12:02 |2701 joined #git
12:03 rgrinberg joined #git
12:04 johnmilton joined #git
12:04 jeffreylevesque joined #git
12:04 a_thakur_ joined #git
12:04 baba_ joined #git
12:05 mehola joined #git
12:07 elastix joined #git
12:07 rgrinberg joined #git
12:09 johnny56 joined #git
12:09 ferr1 joined #git
12:10 synthroid joined #git
12:10 unbalancedparen joined #git
12:11 flaguy48 left #git
12:11 bittin joined #git
12:12 akiTendo joined #git
12:12 tobiasvl yes it can help, man git cherry-pick
12:12 gitinfo the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html
12:13 tobiasvl or of course you can rebase
12:13 tobiasvl do you only want that commit over?
12:13 akiTendo Question regarding patches.
12:13 fuchstronaut joined #git
12:13 nilsi joined #git
12:13 akiTendo I have a production server running code not in any repository
12:14 akiTendo The current way my company has been deploying is they keep the code in repo on a local server, and each dev clones that repository to their mac. Apparently no one here has figured out git is decentralized.
12:14 akiTendo (to be fair, I’m just getting the hang of using it that way)
12:15 selckin !deploy
12:15 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
12:15 akiTendo I’m trying to replace our current deploy process which uses an rsync of that local repo to the production server while ignoring the directories in the .gitignore
12:16 akiTendo :selckin I know that. I’m working with Ansible and developing a new deployment approach.
12:16 akiTendo I’m just giving background so my question will make sense.
12:17 akiTendo This is what I’m trying.
12:17 selckin people can read everytime you press enter, this isn't email
12:18 akiTendo :selckin Nor are page long paragraphs encouraged on any chatroom I’ve ever visited.
12:18 Jellyg00se joined #git
12:19 aua joined #git
12:19 akiTendo Anyway, On a production mirror I’ve init’ed a git repository since it is avaialable.  I’d like to package deployments into patches and move them over. However, the patch won’t apply - it gives this error “error: patch failed: readme.html:1” The patch is a simple create one new file, one line edit in a file, and delete a file. The hang is occuring on the deletion.
12:19 durham joined #git
12:20 akiTendo Is this due to the fact the two repositories don’t know each other, having been init’ed seperately despite being on the same code base?
12:20 liamonade joined #git
12:20 akiTendo And if that is so is there a work around?
12:20 jeeger joined #git
12:20 selckin apply with patch not with git
12:20 selckin why would you package deployments as patches that sounds insane
12:21 lindenle joined #git
12:21 sybariten osse: i'm just confused... i do git status, and it says "Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean" . But does that really tell me if my file collection is in the latest state? Considering there's a server version too
12:22 jeeger Greetings! In my git repo, someone split out a branch (A), and then deleted all files in that branch from the main branch (master). Now, I'd like to merge A back into master, but all files are getting deleted. How can I get around this?
12:22 johnmilton joined #git
12:22 kinlo left #git
12:23 johnmilton joined #git
12:24 tristanp joined #git
12:25 deadnull_ joined #git
12:25 johnmilton joined #git
12:25 johnmilton joined #git
12:25 zeroed joined #git
12:26 troulouliou_div2 joined #git
12:26 jbitdrop joined #git
12:27 johnmilton joined #git
12:29 jason237 joined #git
12:29 Gamecubic joined #git
12:32 tristanp joined #git
12:32 rwb joined #git
12:32 niels__ joined #git
12:33 osse sybariten: git fetch origin and do status again
12:34 liquidjamm joined #git
12:35 narendraj9 joined #git
12:37 tinajohnson___ joined #git
12:37 jeeger Sorry, other way round. Merging master into A applies the delete commit to all the changed files in branch A.
12:37 liquidjamm joined #git
12:38 obadz left #git
12:38 j416 jeeger: what did you expect?
12:38 j416 jeeger: if you don't want to get the changes from a branch, why do you merge it?
12:38 jeeger j416: That was what I expected, but I'd like to retain the changes in A.
12:39 jeeger (or rather, skip the commit that deleted the changes)
12:39 osse jeeger: git merge --no-commit; tweak the result (git checkout etc); git commit
12:39 j416 jeeger: you removed files in master, and changed them in branch A?
12:39 j416 osse: ew
12:40 jeeger j416: Not me, someone else. Someone wanted to move changes from the main branch into a seperate feature branch.
12:40 j416 jeeger: person doesn't matter. is that what happened?
12:40 jeeger yeah
12:40 guardian hello how can I troubleshoot the fact that $ git checkout foo doesn't switch to the foo branch, which I just pushed to origin from another computer
12:40 j416 jeeger: then you will get a merge conflict when you try to merge
12:40 guardian (of course I fetched)
12:40 osse guardian: start by reading the error message
12:40 j416 jeeger: you can revert that commit on master first, if you prefer. this is cleaner.
12:40 guardian osse: there is none
12:41 jeeger j416: No, the files were deleted, without conflicts. That's what I was wondering about.
12:41 aua left #git
12:41 j416 jeeger: then you did not change them on your branch
12:41 osse guardian: no output whatsoever?
12:42 guardian osse: nope, nada
12:42 osse guardian: git status?
12:42 guardian git branch -a shows remotes/origin/foo
12:42 guardian git status says up to date with origin/master
12:42 LBV_User joined #git
12:42 jeeger j416: That makes sense, yeah. $person told me he had made changes though, so I assumed that was true^^
12:42 osse guardian:which branch does it say you're on?
12:42 j416 jeeger: check the log
12:42 j416 jeeger: if deletions are not wanted, just undo them?
12:42 guardian it says I'm on the master branch
12:42 j416 jeeger: if they are wanted, keep them...
12:43 osse guardian: does git branch -a show more than one foo ?
12:43 guardian I didn't try that yet, I bet it's going to work: git checkout -b foo && git reset --hard origin/foo
12:43 guardian nope, a single one
12:43 guardian but that's kindof my question: what's the full syntax when 2 remotes have same branch names?
12:44 j416 guardian: "origin" is the name of your remote.
12:44 interne7y joined #git
12:44 j416 guardian: switch that out for whatever you named your other remote
12:44 j416 guardian: origin/master, someotherremote/master
12:44 cdown_ joined #git
12:45 j416 guardian: nothing special with "origin" except it's a common default
12:45 guardian yeah I know what remotes are
12:45 jeeger j416: Yeah, I'll just make changes to the files, so no problem there. I assumed there *were* changes, and wondered why they were deleted without conflict.
12:45 j416 jeeger: o/
12:45 guardian if I do git checkout origin/foo, I end up in detached head
12:46 j416 indeed.
12:46 guardian from there I could git checkout -b foo --set-upstream
12:46 guardian and that works
12:46 guardian but if I delete the local foo branch
12:46 guardian then I'm back to the situation where I can't git checkout foo
12:46 guardian first time I'm experiencing this
12:46 j416 you're not on a very old git version are you?
12:47 guardian 2.7.1.windows.1
12:47 j416 ok, recent enough
12:47 guardian ok
12:47 guardian in fact
12:47 Rish_ joined #git
12:47 guardian "foo" is not the real branch name
12:47 guardian and I have a folder that has the same name as the branch
12:47 jeeger j416: Thanks for your help!
12:47 j416 jeeger: welcome
12:47 osse guardian: then  git checkout foo --
12:47 osse with the --
12:47 jeeger left #git
12:47 j416 osse: TIL, thanks
12:47 guardian I thought I tried that
12:48 guardian at least git could emit a message :)
12:48 j416 osse: didn't know -- worked the other way round like that
12:48 guardian well not really
12:48 guardian it does what I'm asking :/
12:48 guardian it just I thought I tried with --
12:49 osse does it work with the -- ?
12:49 guardian it does
12:49 osse praise gaben
12:49 guardian thanks for the help
12:50 sdothum joined #git
12:51 fmcgeough joined #git
12:51 ximvan joined #git
12:52 mekhami left #git
12:55 settermjd joined #git
12:55 boudiccas joined #git
12:55 Matrixiumn joined #git
12:56 baba_ joined #git
12:56 Jellyg00se joined #git
12:57 zivester joined #git
13:02 Sonderblade joined #git
13:02 cdg joined #git
13:03 bitkiller joined #git
13:03 italoacasas joined #git
13:04 cdg joined #git
13:05 wxg joined #git
13:07 Raging_Hog joined #git
13:07 AbsurdTech joined #git
13:08 flaguy48 joined #git
13:08 hahuang61 joined #git
13:09 a_thakur joined #git
13:14 zalatovo joined #git
13:15 JeroenT joined #git
13:15 Orbitrix joined #git
13:17 rnsanchez_ joined #git
13:17 ximvan joined #git
13:18 jceb joined #git
13:19 mischat joined #git
13:19 eletuchy joined #git
13:20 jaafar joined #git
13:21 mbreedlove joined #git
13:21 apotry joined #git
13:21 sybariten osse: is that a routine i should keep as "good practice" to do all the time?
13:23 Darcidride joined #git
13:23 dangerousdave joined #git
13:23 mbreedlove joined #git
13:26 csd_ joined #git
13:27 mehola joined #git
13:28 NeverDie joined #git
13:28 boudiccas joined #git
13:28 diegoaguilar joined #git
13:31 guzzlefry joined #git
13:32 jaguarmagenta joined #git
13:32 osse sybariten: it doesn't hurt
13:32 osse but it's better to understand what's going on
13:33 guzzlefry Quick question I think. I need to undo a commit I accidentally made on my development branch instead of feature branch. After the accidental commit I created the appropriate feature branch off of the developement branch. Now do I simply `git checkout development && git reset --hard HEAD~1` to undo the accidental commit?
13:33 ocbtec joined #git
13:34 Marny joined #git
13:34 sybariten osse: okaydokay
13:34 ash_workz joined #git
13:34 m8_ joined #git
13:34 jast guzzlefry: if you haven't pushed, there's definitely no problem with that. make sure you don't have any uncommitted changes you care about, of course.
13:34 osse sybariten: if it still says up to date after fetch then you are really really up to date
13:35 jimi_ joined #git
13:35 osse unless someone pushed between you running fetch and status
13:35 sybariten right
13:36 tristanp joined #git
13:37 AbsurdTech joined #git
13:38 leeN joined #git
13:40 Gsham joined #git
13:40 Orbitrix joined #git
13:40 josuebrunel joined #git
13:40 nfk joined #git
13:42 mdw joined #git
13:45 interne7y joined #git
13:46 mmlb joined #git
13:46 jceb joined #git
13:46 prsn joined #git
13:48 ntshetty joined #git
13:49 CJKinni joined #git
13:52 marcogmonteiro joined #git
13:52 liamonade joined #git
13:53 Dougie187 joined #git
13:53 todd_dsm joined #git
13:54 maucar joined #git
13:55 maucar joined #git
13:55 raven-au_ joined #git
13:56 phaleth joined #git
13:56 btyne79 joined #git
13:56 bronson joined #git
14:00 ntshetty joined #git
14:01 mdw joined #git
14:03 tristanp joined #git
14:03 a_thakur joined #git
14:04 WayToDoor joined #git
14:05 mekhami joined #git
14:07 dhsanket joined #git
14:07 sdeshpande_ joined #git
14:08 dhsanket joined #git
14:08 LionsMane joined #git
14:09 hahuang61 joined #git
14:09 a_thakur_ joined #git
14:10 LionsMane I have a question about using svn retrieved branches in git.  I am using the git svn fetch command to pull down update from an svn server and into my local git repo.
14:12 gmurop joined #git
14:13 davisonio joined #git
14:14 lucido-cwl joined #git
14:14 Blkt joined #git
14:14 eletuchy joined #git
14:15 lucido-cwl Hi, I forgot to pull the branch (master) from the remote (origin) before I started doing work on it. Now Ik cant push it to origin. How can I resolve this issue?#
14:16 lucido-cwl some kind of merge is required I think, but since these are not separate branches (or are they?) I'm not sure how to merge
14:16 Gitzilla joined #git
14:17 f3r70rr35f joined #git
14:19 sbogg joined #git
14:20 ilmari lucido-cwl: 'git pull --rebase' rebases your commits onto the other commits in master
14:20 ilmari as if you'd done a pull first
14:21 bremner LionsMane: was there an actual question in there?
14:21 sangy joined #git
14:21 lucido-cwl ilmari, how will the possible conflicts be solved?
14:21 VikingHoarder joined #git
14:21 texasmynsted joined #git
14:22 ilmari lucido-cwl: rebase will stop if there are conflicts, then you fix them and do 'git rebase --continue'
14:22 texasmynsted before I cherry pick a commit from a different branch I would like to see the difference that it will apply
14:22 leonarth joined #git
14:22 _ikke_ git show commit
14:22 _ikke_ git show <commit>
14:23 texasmynsted If I diff HEAD..cherrypickhash, I see many many differences beyond the foreign change
14:23 _ikke_ correct, you see all the changes from all the commits
14:23 texasmynsted If I change to the branch with the commit, I can git  show the commit and see what it did to THAT branch
14:23 _ikke_ You don't even need to checkout that branch
14:23 moritz you odn't need to change the branch for that
14:23 texasmynsted but what I want to see is what it will do to the current branch
14:23 ilmari it will do the same thing to the branch you cherry-pick it to
14:24 ilmari unless there are conflicts, in which case you have to resolve them yourself
14:24 texasmynsted so git show from my current branch?
14:24 _ikke_ It applies the diff of the commit with it's parent to the new branch
14:24 moritz texasmynsted: git show cherrypickhash
14:24 _ikke_ texasmynsted: git show does not depend on what branch you are on
14:24 _ikke_ (except when relying on HEAD)
14:24 Gsham joined #git
14:24 texasmynsted mmkay
14:25 k3rn31 joined #git
14:25 texasmynsted when I cherry-pick it will create a new hash in my current branch right?
14:25 texasmynsted hmm.  That makes sense I think
14:26 moritz yes
14:26 texasmynsted What happens if later that other branch is merged into this one, will the cherry-picked commit get re-added?
14:26 axl_ joined #git
14:26 kenansulayman joined #git
14:26 moritz yes, you'll have two commits doing essentially the same thing
14:27 texasmynsted How do I prevent that?
14:27 moritz don't cherry-pick, or don't merge
14:27 moritz or squash-merge
14:27 osse texasmynsted: the duplicates are harmles
14:27 osse s
14:27 texasmynsted ok
14:28 gajus joined #git
14:28 gajus I have had two PRs
14:28 gajus which I have merged in a wrong order
14:28 gajus which resulted in corrupt state
14:29 gajus now I am trying to revert changes of the last PR
14:29 gajus and I am getting error "Sorry, this pull request couldn’t be reverted automatically. It may have already been reverted, or the content may have changed since it was merged."
14:29 gajus There have been no commits/ PRs since
14:32 gajus Never mind.
14:32 gajus Thats not the real issue.
14:32 scoz joined #git
14:32 texasmynsted So if git show, shows what the commit did.  Is there a way that I can see what the commit, will do, when I cherry-pick it, before I cherry-pick it?
14:33 moritz texasmynsted: I'm not aware of a way
14:33 moritz texasmynsted: but you can simply do it, and discard it if you don't like it
14:33 osse it will do the same thing
14:33 texasmynsted I guess one answer would be cherry pick, show, then if it is bad, undo it
14:34 moritz just make sure your working directory and index are clean
14:34 texasmynsted ok thank you
14:34 scoz joined #git
14:34 moritz there's also git cherry-pick --no-commit
14:34 * texasmynsted checking
14:35 texasmynsted oh nice
14:35 texasmynsted so everything but the commit.
14:36 tristanp joined #git
14:37 LionsMane bremner: Yeah, sorry, I didn't hit enter on the second part.  So yeah, when I pull down trunk, I do want to publish that to the central git repo on GitHub.  But, because the SVN server lives inside the corp network, GitHub won't be able to see the repo, only the remote git client repos will.
14:37 roentgen joined #git
14:37 tolland joined #git
14:38 isxek joined #git
14:39 subhojit777 joined #git
14:39 dangerousdave joined #git
14:39 tlaxkit joined #git
14:39 frem_ joined #git
14:40 jaafar joined #git
14:41 bremner LionsMane: ok. that doesn't seem like a problem to me, the push is from your git client to github. There are other problems though; for example any local git-svn commits will cause history to be rewritten, making sharing tricky
14:43 mbreedlo_ joined #git
14:43 Terens joined #git
14:43 scoobertron joined #git
14:44 LionsMane I saw that commits need to happen to the svn repo BEFORE getting push to remote repo.  That is what I understood
14:44 LionsMane bremner: Does that cover what you were talking about being "tricky" with sharing commits?
14:45 bremner LionsMane: yeah, that would work. It's just writing into svn from git that tends involve rebasing
14:45 mbreedlove joined #git
14:45 interne7y joined #git
14:46 LionsMane bremner: I don't expect to be contributing much (possible as little as nothing) to the svn repo.  And we might do stuff like submit diffs to them directly and then get the code changes in the git svn diff.  Next thing that was "odd" to me was the way the svn branches showed up
14:47 mbreedlove joined #git
14:47 LionsMane bremner: In particular, they showed up as remotes/origin/trunk.  The origin threw me because I expected origin to be the path for the remote git repo on GitHub.
14:48 Gsham joined #git
14:48 tristanp joined #git
14:48 bremner git-svn doesn't know anything about github, obviously
14:49 mbreedlove joined #git
14:50 gumnos joined #git
14:50 LionsMane bremner: It is the naming… wouldn't the git repo branches and the svn branches overlap in the same namespace?
14:51 ELFrederich joined #git
14:51 mbreedlove joined #git
14:52 ELFrederich can I change a config per command?  For example, I want to run "git rebase -i ffff0123" but with a different editor for this one particular case
14:52 osse ELFrederich: GIT_EDITOR=lol git rebase -i
14:52 osse git -c core.editor=rofl rebase -i
14:52 ELFrederich osse: cool... thanks
14:53 bremner LionsMane: dunno, I guess it has to do with the git-svn branches needed special handling, not really being mergeable, etc...
14:53 ELFrederich osse: hmmm, doesn't like sublime
14:53 osse rekt
14:54 ELFrederich Unable to save ~/src/foo/.git/rebase-merge/git-rebase-todo
14:54 ceaucari joined #git
14:54 mbreedlove joined #git
14:54 fission6 joined #git
14:54 gajus Ok. I think I got myself into problem. I had two PRs. Lets call them. 39 and 40. I was supposed to merge them in that order: 39, 40. I merged them 40, 39. I then used GitHub interface to create a PR which reverts 40 and then reverts 39.
14:54 gajus How do I now again merge 39 and 40?
14:54 raven-au joined #git
14:54 gajus when I try to raise a PR, git says there is no difference between master branch and say 39 branch
14:54 fission6 i just checkedout a branch and then tried to merge master into it, i hit a bunch of conflicts, i actually want to undo or rever the merge and not address any conflicts how do i "undo" git merge master
14:54 fission6 (its mid merge |MERGE)
14:55 moritz fission6: git merge --abort
14:56 fission6 thanks moritz
14:56 mbreedlove joined #git
14:57 Terens1 joined #git
14:58 clemf joined #git
14:59 Marny joined #git
14:59 ELFrederich I want to take https://github.com/pypa/sampleproject  and use it as a starting point for my project.  I'm trying to squash all commits so that I have a single commit representing latest as my starting point.  Using "git rebase -i" I can only seem to get it down to 2 commits, not 1
14:59 kilo_bravo joined #git
14:59 LionsMane bremner: Ah ok.
15:00 moritz ELFrederich: you could always rm -rf .git; git init; git add .; git commit -m 'Initial project from https://github.com/pypa/sampleproject'
15:00 osse ELFrederich: isn't there a wrapper called subl or something
15:00 ojacobson ELFrederich: git checkout --orphan starting-over
15:00 mekhami left #git
15:00 LionsMane bremner: Ok, I am even MORE confused.  My GitHub branches show up as origin/<branch>
15:00 acetakwas joined #git
15:00 dreiss joined #git
15:00 ELFrederich moritz: yeah... I just did that.  More of a curiosity question.  I've been there before and wind up doing weird things with ammend and other stuff
15:00 LionsMane bremner: When does the remote(s)/origin show up?
15:00 Eryn_1983_FL joined #git
15:00 baraba joined #git
15:01 zivester joined #git
15:01 moritz ELFrederich: manipulating the root commit seems to be troublesome in some situations, but I'm afraid I don't know the details
15:01 jimmybuffet joined #git
15:01 docnvk joined #git
15:02 ojacobson ELFrederich: if you wanted to do it with rebase for some reason, git rebase -i --root and change all commits other than the first to 'squash', but rebase will do Interesting Things with all the merges in the history
15:02 ojacobson it's easier to create a new orphan branch from the tip, if all you want is to start a fresh history with the current state
15:02 tristanp joined #git
15:02 ojacobson skip all the history-editing and go directly to goal
15:04 rasto joined #git
15:06 artemisart joined #git
15:06 mischat_ joined #git
15:07 madewokherd joined #git
15:07 guzzlefry left #git
15:08 guardian I'm truncating some history by rebasing onto a new root commit. How come when doing git rebase --preserve-merges --onto XXX YYY I'm getting merge conflicts to resolve in the middle of the rebase?
15:08 JohnBat26 joined #git
15:08 efco joined #git
15:09 eka joined #git
15:09 mdw joined #git
15:10 rkazak joined #git
15:11 guardian I'm basically doing this https://git-scm.com/blog/2010/03/17/replace.html
15:11 freimatz joined #git
15:12 guardian it worked many times already, but on this one repository, I'm getting merge conflicts to solve
15:12 plujon joined #git
15:13 Noldorin joined #git
15:14 dmto joined #git
15:14 Tim-SEM joined #git
15:15 a_thakur joined #git
15:15 plujon How do I avoid "... lines add whitespace errors." warnings when working with windows-readme.txt?
15:15 diegoaguilar joined #git
15:15 puff Good morning.
15:15 anu0 joined #git
15:16 Tim-SEM joined #git
15:17 tristanp_ joined #git
15:18 fracting1 joined #git
15:19 gajus can I use rebase to revert master to a specific commit?
15:19 faux___ joined #git
15:20 faux___ joined #git
15:20 tristanp joined #git
15:21 plujon To answer my own question: echo 'windows-readme.txt eol=clrf' >> .gitattributes
15:23 tsherman joined #git
15:23 gajus http://paste.linux.chat/view/a6d4037c
15:23 gajus would really appreciate some help here
15:24 gajus need to somehow re-apply #40 and #39 changes
15:24 athan joined #git
15:24 sd512 joined #git
15:25 preaction did you push? if not, reset. if so, revert the reverts
15:27 elastix joined #git
15:29 garyserj what is the difference between a fetch and a merge?
15:29 _ikke_ fetch just downloads histroy
15:29 _ikke_ history
15:29 _ikke_ merge merges that history
15:29 garyserj ok so a fetch does a merge.
15:29 garyserj a ff merge
15:30 garyserj or a recursive merge?
15:30 garyserj or neither?
15:30 garyserj i'd guess it'd do a ff merge
15:30 _ikke_ No merge at all
15:30 preaction no. fetch doesn't merge
15:30 garyserj but doesn't it put that history onto the origin/master branch?
15:31 garyserj how is putting commits on a branch, not a merge?
15:31 garyserj putting commits from another branch, onto that branch
15:31 _ikke_ No, it just downloads history, and points the remote tracking branch to same commit as remote
15:31 preaction origin/master isn't a branch you can commit to, it's just a ref to what origin/master looks like last you fetched
15:32 abc123 joined #git
15:32 Eryn_1983_FL joined #git
15:32 garyserj is origin/master a branch at all?
15:33 c0ded joined #git
15:33 jaguarmagenta joined #git
15:33 baraba it is a branch
15:34 baraba fetch will not touch your working dir
15:34 davisonio joined #git
15:34 baraba merge will merge the changes to your working copy
15:35 preaction fetch will also not touch any of your local branches
15:35 tristanp_ joined #git
15:36 charlesr joined #git
15:36 gajus preaction Something is really messed up. Reverting pickups completely different changes.
15:36 nabax joined #git
15:37 nabax hi there
15:37 gitinfo nabax: 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.
15:37 nabax I've a local commit that's not showing up in remote
15:37 gajus I would like to create a commit that reverts git to a state before either of these PRs have been merged.
15:37 gajus Then merge the branches of those PRs into the reverted state.
15:37 nabax git push origin master says there's nothing to commmit, however git log shows an additional commit that's not in the remote branch
15:38 j416 gajus: !revertmerge
15:38 j416 hmm what was that
15:38 j416 gajus: !revertrevert
15:38 j416 bah
15:39 j416 ah.
15:39 j416 gajus: !revert_merge
15:39 gitinfo gajus: [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt
15:39 j416 might be useful.
15:39 lindenle joined #git
15:40 j416 although I disagree with the not having a good time.
15:40 j416 :)
15:40 baraba what is the log command that you are running nabax
15:40 peepsalot joined #git
15:40 peepsalot i edited a single line of a .patch file and when i do git diff it shows thousands of lines edited.  is there something special i need to do so git will read a diff of .patch properly?
15:40 j416 nabax: remove --all
15:40 Gsham joined #git
15:40 nabax baraba, just "git log"
15:41 j416 hum.
15:41 baraba which branch are you on?
15:41 eijk_ joined #git
15:41 j416 peepsalot: what exactly are you doing? git does not read patch files unless you apply them.
15:41 j416 peepsalot: sounds like you are diffing the patch file itself
15:41 nabax master, only got one branch in this repo
15:41 leehambley joined #git
15:42 nabax what's even funnier is git log origin/master shows that commit
15:42 peepsalot j416 the patch file is in the repo as its own file, i don't want git to apply any patches, just edit this like any other source file
15:42 nabax but it's not there in GitHub
15:42 nabax and if I clone the repo, that commit is not there either
15:42 j416 peepsalot: you probably changed the line endings then
15:42 baraba nabax, try: git log origin/master..HEAD
15:42 nabax baraba, it prints nothing
15:43 peepsalot hrm, i edited it in nano, not sure if it changed them
15:44 circ-user-taqdN joined #git
15:44 baraba did you do a pull, nabax
15:44 j416 peepsalot: git diff --check
15:44 j416 peepsalot: probably says something about trailing whitespace on all lines
15:44 nabax baraba, yep, I did pull before attempting to push the latest commit
15:45 BlaXpirit github did that thing again where branches in the web interface don't update but I clone from github and see my branches just fine
15:45 BlaXpirit is it just me or..?
15:45 n-st github's issue database has developed a splitbrain. absolutely hysterical.
15:45 j416 peepsalot: if it prints nothing, perhaps you changed crlf to lf
15:45 n-st *refresh* oh, my ticket's gone! *refresh* oh, it's back, but all the comments are missing!
15:46 j416 peepsalot: "git diff -w" should show you only your modified line, if it's the line endings that are the issue.
15:46 BlaXpirit why do i even ask,  github > 18:31 EEST We are still working to resolve minor service issues. You may see delays in updates across the site.
15:46 interne7y joined #git
15:46 thiago joined #git
15:47 nabax BlaXpirit, baraba, that may be my case as well then...
15:47 guardian if I have 2 remotes with same tags but tags point to different commits, how can I disambiguate the two locally, e.g. when doing a git log?
15:47 baraba lol
15:47 nabax but when pulling I can't retrieve my latest changes either
15:47 synthroid joined #git
15:48 BlaXpirit nabax, well that could also be the wrong remote that you're pulling from
15:48 mostlybadfly joined #git
15:48 Arsonide joined #git
15:48 eijk joined #git
15:48 afuentes joined #git
15:49 EY joined #git
15:49 nabax BlaXpirit, oh well, that's funny, if I clone the repo it DOES include the latest commit
15:50 nabax so I guess it's GitHub horsing around with their web interface after all
15:50 tristanp joined #git
15:52 nabax HA! and if I just visit https://github.com/[blahblah]/commit/[commit-hash] the commit is there
15:52 nabax so it's definitely a stupid frontend issue
15:52 bittin joined #git
15:52 nabax thanks BlaXpirit, baraba
15:56 jetisr joined #git
15:56 snits joined #git
15:58 syosoft1 joined #git
15:58 bronson joined #git
15:59 jetisr joined #git
16:00 syosoft1 hey guys, I created a repository in github.com, but i didn't check "initialize repository with readme" - Now the system isn't letting me push to it, and when i try to create a new repository, it says that name is already in use... How do I "initialize it after create" so i can actually use it?
16:01 selckin github is having issues atm, maybe related
16:01 SwiftMatt joined #git
16:01 selckin try push -f too
16:01 digidog joined #git
16:01 syosoft1 So, I don't have to manually "initialize" it? I'm not seeing the repo in my account... so guess I'll give it some time.
16:02 jast the repo should be showing up in your account even if it's completely empty
16:02 syosoft1 i see it after i log in on the home page, but then i click on the repo and i get the 404 page.
16:02 jast so there's something going wrong on github's end and maybe it will magically fix itself
16:02 eletuchy joined #git
16:02 syosoft1 yea, thanks for the heads up
16:02 syosoft1 i'll wait a bit.
16:02 tristanp_ joined #git
16:03 pwnz0r joined #git
16:03 Gsham joined #git
16:03 ahmed_elgabri joined #git
16:04 tvw joined #git
16:05 texasmynsted left #git
16:06 athan left #git
16:06 peepsalot j416, thanks, it looks like nano removed trailing whitespace without my knowledge
16:07 peepsalot this is really annoying
16:07 imachuchu joined #git
16:09 maestrojed joined #git
16:11 btyne79 joined #git
16:11 elisa87 joined #git
16:11 ItSANgo joined #git
16:11 elisa87 hey you know why the update doesn't show on github page even though the push was successful? http://pastebin.com/vcmBT16U
16:11 Gsham joined #git
16:11 BlaXpirit elisa87, yes
16:11 elisa87 BlaXpirit: ok why?
16:11 BlaXpirit elisa87, https://status.github.com/
16:12 kpease joined #git
16:12 Trieste joined #git
16:13 chitopunk joined #git
16:13 acetakwas joined #git
16:13 wizardedit joined #git
16:13 elisa87 ok BlaXpirit thanks
16:14 elisa87 do you work for github? that was a quick answer :)
16:14 Trieste joined #git
16:14 wizardedit is there a git-config option to have --show-signature be the default for git show? I don't see one in manpage
16:15 tsherman joined #git
16:15 sebhoss joined #git
16:16 EY joined #git
16:16 acetakwas joined #git
16:17 Vinnie_win_l joined #git
16:18 kpease joined #git
16:18 sangy is there a two-column format for git diff? (similar to how diff works?)
16:19 jamieshepherd joined #git
16:19 nichi_ joined #git
16:21 NeverDie When I do git add origin for an existing project, do I have to remove the old remote origin?
16:21 NeverDie Or does doing it again override the previous one?
16:21 gumnos joined #git
16:22 jamieshepherd NeverDie: Adding overrides the previous one
16:22 jamieshepherd Assuming it has the same name (e.g. origin)
16:22 NeverDie Weird, I just tried and it says "remote origin already exists".
16:22 NeverDie Should I remove the previous git stuff and start it new or what should I do?
16:23 jamieshepherd What command are you running?
16:23 jamieshepherd git remote add origin git@...
16:23 NeverDie Yeah that one.
16:23 baba_ joined #git
16:23 NeverDie git remote add origin addressToRepo
16:23 jamieshepherd You can do git remote rm origin
16:24 Tim-SEM joined #git
16:24 ojacobson NeverDie: you can't add a remote when the name already exists. If it's the same repo in a new location, git remote set-url will update the URL; if it's a new remote, remove the original (which will clean up a bunch of related bits) and add the new one
16:24 NeverDie jamieshepherd: That seems to have worked.
16:24 jamieshepherd Or if you just wanat to change the url use set-url
16:24 PryMar56 joined #git
16:24 jamieshepherd Like ojacobson said ^
16:24 NeverDie Got it.
16:24 jamieshepherd Generally in new git adding a remote over the new one just overrides it though
16:24 ixian joined #git
16:24 jamieshepherd Maybe old versions don't have that feature
16:25 knutstrut joined #git
16:25 blackwind_123 joined #git
16:26 rkazak joined #git
16:26 baba_ joined #git
16:26 syosoft1 left #git
16:26 mischat joined #git
16:26 NeverDie Yeesh, I just realized it pushed all the old branches as well.
16:26 NeverDie It feels so messy this way rather than just starting a new git.
16:26 ojacobson https://gist.github.com/ojacobson/9d105c075da76c56db4b2bcbe8d2492c /shrug/
16:27 NeverDie Got a 404.
16:27 ojacobson oh, right, github's having the shits
16:27 leonarth joined #git
16:27 ojacobson anyways, as of at least 2.7.4, git-remote will refuse to add a duplicate remote
16:27 ojacobson that's all :)
16:28 Gsham joined #git
16:28 ruskie joined #git
16:30 Terens joined #git
16:30 akushner joined #git
16:31 mdw joined #git
16:32 ixian joined #git
16:33 bjpenn joined #git
16:35 faux___ joined #git
16:36 SteffanW2 joined #git
16:38 BlaXpirit github just updated a thing for me
16:39 LeBlaaanc joined #git
16:40 baba_ joined #git
16:40 raijin joined #git
16:40 hahuang61 joined #git
16:40 mikecmpbll joined #git
16:42 baba_ joined #git
16:44 fracting joined #git
16:44 tvw joined #git
16:46 elastix joined #git
16:47 interne7y joined #git
16:48 tristanp joined #git
16:48 Ch4rAss joined #git
16:50 khmarbaise joined #git
16:50 nnyk joined #git
16:52 nilsi joined #git
16:54 jimi_ joined #git
16:54 Gore|home joined #git
16:55 Gore|home hi, i´m a bit confused, my push shows up to date, but does not appear on github, 2 hours back everything worked fine, what have I done? :o
16:56 grawity maybe you're pushing to a different branch
16:56 ojacobson maybe github is still having issues status.github.com
16:56 unbalancedparen Gore|home: in some strange cases github takes some time to reflect the commit
16:56 Gore|home nope, is master, tried it on another repo too
16:56 eletuchy joined #git
16:56 tatran joined #git
16:56 Gore|home oh
16:56 unbalancedparen Gore|home: it hapened to me a few times
16:57 Gore|home "18:53 W. Europe Standard Time Some users may experience a delay in pushes or other changes appearing on the site. "
16:57 Gore|home dooo
16:57 Gore|home thx
16:59 faux___ joined #git
17:00 italoacasas joined #git
17:00 aguimaraes1986 joined #git
17:03 fracting joined #git
17:03 italoacasas joined #git
17:03 ajf- joined #git
17:04 peepsalot can "git clean" remove untracked paths, (empty directories)
17:04 faux___ joined #git
17:05 DARSCODE joined #git
17:05 peepsalot oh, duh, -d got it
17:05 chrisshattuck joined #git
17:05 toothe joined #git
17:06 toothe I did a pull request on github, got a comment back. Made another change. How do I make the pull request for the new commit?
17:06 _ikke_ You can update the existing pull request..
17:06 toothe I'm asking how.
17:07 _ikke_ Did you create a new commit?
17:07 toothe yes, and pushed it to my own repo on github.
17:07 tatran so what is the full answer?
17:07 toothe I'm asking...
17:07 toothe right now, my pull request is pointed to the old commit
17:08 toothe I want it to be directed to the new commit.
17:08 tatran @peepsalot: what is the anwser?
17:08 peepsalot tatran, git clean -d
17:08 tatran ta ;-)
17:08 dan2k3k4 joined #git
17:09 italoacasas joined #git
17:09 artemisart joined #git
17:10 italoacasas joined #git
17:12 italoacasas joined #git
17:12 k3rn31 joined #git
17:12 Ch4rAss joined #git
17:13 dimi1947 joined #git
17:13 italoacasas joined #git
17:13 BSaboia if I have a local branch and then I amend the commits, is there some information about those amends left when I finally push it? (if you amend and then push --force you still get this information, right?)
17:15 tristanp joined #git
17:15 jbitdrop joined #git
17:15 toothe gah! why won't this push to git!!!
17:15 toothe github*
17:16 netj joined #git
17:17 TomyLobo joined #git
17:17 dreiss joined #git
17:18 acetakwas joined #git
17:18 Gore|home unbalancedparen happened now, everything works :)
17:18 tristanp joined #git
17:19 tristanp joined #git
17:19 BlaXpirit I have a bunch of sequential commits with commit times that make no sense. I would like to change all their commit times to the current time. How can I do that?  rebase --ignore-date / --committer-date-is-author-date  don't seem to work
17:20 italoacasas joined #git
17:21 unbalancedparen Gore|home: awesome :D
17:21 Gore|home ;)
17:22 kyledr joined #git
17:22 kyledr i just did a git clone in a directory that already had a clone of that repo
17:23 kyledr i meant to do it in a new directory to try a fresh build. i had some commits that weren't pushed to remote. did i just wipe them all out?
17:23 mikecmpbll joined #git
17:24 EvilPeng1 joined #git
17:24 bronson joined #git
17:25 diegoviola joined #git
17:25 BlaXpirit sigh, self-answer.  git rebase -i ,   then   `EDITOR=true git commit --amend --reset-author && git rebase --continue`    a bunch of times
17:26 EvilPenguin joined #git
17:26 toothe okay so I did a git push, but want to revert back to a previous commit WITHOUT adding in another 'reversion' commit. How do I do that?
17:26 toothe this is pushed onto github.
17:26 garethdaine joined #git
17:26 sbeller_ BlaXpirit: you could put `EDITOR=true` in front of the` rebase -i` and pass  --exec "git commit --amend --reset-author"
17:27 BlaXpirit oh ok, thanks
17:29 m0rph84 joined #git
17:29 italoacasas joined #git
17:29 Trieste joined #git
17:30 toothe i screwed this up badly...
17:30 mehola joined #git
17:30 liquidjamm joined #git
17:32 LionsMane joined #git
17:32 italoacasas joined #git
17:32 Trieste joined #git
17:33 italoacasas joined #git
17:33 jaguarmagenta joined #git
17:33 circ-user-taqdN joined #git
17:34 garethdaine joined #git
17:34 Dro joined #git
17:35 Marny joined #git
17:37 shudon joined #git
17:37 shudon hi all :) does a stash know what revision it is based in?
17:37 Trieste joined #git
17:37 theodoric joined #git
17:38 skunkz joined #git
17:39 grawity yes
17:39 grawity that's kinda how it stores the changes in the first place
17:39 grawity i.e. it's a slightly magical commit
17:40 Sasazuka joined #git
17:40 kadoban joined #git
17:40 * toothe wonders what kinda graphical git tools there are to see the nice pretty tree.
17:41 hahuang61 joined #git
17:41 grawity tig is good; there's also gitk and !lol
17:41 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
17:41 grawity well perhaps without the --all
17:41 GavinMagnus left #git
17:41 Trieste joined #git
17:42 arooni joined #git
17:42 boudiccas joined #git
17:43 BlaXpirit grawity, why without --all ?
17:43 BlaXpirit so the difference is  without all it only shows commits below current branch?
17:44 LeMike joined #git
17:44 grawity well the other tools default to current branch only
17:44 grawity so just "git log --oneline --graph --decorate" would fit the list better
17:44 grawity all of them support --all though.
17:44 whitby joined #git
17:47 Trieste joined #git
17:47 User458764 joined #git
17:49 bjpenn joined #git
17:50 tristanp joined #git
17:50 hahuang61 joined #git
17:51 boudicca joined #git
17:52 chrisshattuck joined #git
17:52 davisonio joined #git
17:52 JustinHitla left #git
17:53 mdw joined #git
17:57 mohabaks joined #git
17:57 raininja joined #git
17:58 IWishIKnew joined #git
18:01 sarbs joined #git
18:03 thiago joined #git
18:03 Kakamoko joined #git
18:04 mdw joined #git
18:04 IWishIKnew joined #git
18:05 jimmyeatworld joined #git
18:06 Dro joined #git
18:08 rahtgaz joined #git
18:09 satifant joined #git
18:09 ril joined #git
18:09 Gsham joined #git
18:09 david-lyle joined #git
18:10 cdown joined #git
18:12 Kakamoko left #git
18:12 cdown_ joined #git
18:15 ig0r_ joined #git
18:15 mjuszczak joined #git
18:16 mjuszczak joined #git
18:16 tristanp_ joined #git
18:16 LeBlaaanc joined #git
18:17 mjuszczak joined #git
18:18 josuebrunel joined #git
18:18 mjuszczak joined #git
18:19 tristanp joined #git
18:19 madewokherd joined #git
18:19 glebihan joined #git
18:19 mjuszczak joined #git
18:19 baloney_ left #git
18:21 mjuszczak joined #git
18:21 subpath joined #git
18:21 ajf- joined #git
18:21 mikecmpbll joined #git
18:21 Terens joined #git
18:22 mjuszczak joined #git
18:22 dsdeiz joined #git
18:22 dsdeiz joined #git
18:23 bjpenn joined #git
18:25 ToBeCloud joined #git
18:26 bronson joined #git
18:27 djakovlev joined #git
18:27 Balliad joined #git
18:28 compema- joined #git
18:28 Vaelatern joined #git
18:28 EduardoMartins joined #git
18:29 knutstrut joined #git
18:30 nnyk joined #git
18:31 mwhooker joined #git
18:32 multi_io joined #git
18:35 ForgottenPlayer joined #git
18:39 Dyonisos joined #git
18:39 rubyonrailed joined #git
18:39 Rish joined #git
18:40 nitin joined #git
18:41 dan2k3k4 joined #git
18:42 _ikke_ yeah, I define my 'lol' without --all
18:42 _ikke_ can always add it later
18:43 Eugene I also add "-10" to my lol, since that's normally all I care about
18:45 skylite joined #git
18:45 txdv lol
18:45 _ikke_ Can you negate a -N?
18:45 mischat joined #git
18:47 tristanp joined #git
18:47 darkbit joined #git
18:49 tristanp joined #git
18:49 interne7y joined #git
18:49 tristanp joined #git
18:53 mdw joined #git
18:53 kyledr joined #git
18:53 compema- left #git
18:54 compeman joined #git
18:54 davisonio joined #git
18:56 mikecmpbll joined #git
18:56 akiva joined #git
18:56 italoacasas joined #git
18:57 guardian when in the middle of a merge conflict, is there a command that would list me files "both added" or "both modified" that I could pipe through xargs?
18:58 _ikke_ git ls-files -u?
18:58 themill joined #git
18:59 jost joined #git
18:59 dsdeiz joined #git
18:59 dsdeiz joined #git
18:59 guardian thanks, git ls-files -u | cut -f2 | sort -u then
19:00 amdi_ joined #git
19:02 boudicca joined #git
19:02 haasn joined #git
19:02 WaReZ joined #git
19:05 sarbs joined #git
19:08 Trieste joined #git
19:15 tristanp joined #git
19:15 Trieste joined #git
19:17 GavinMagnus joined #git
19:18 tvw joined #git
19:18 c0ded joined #git
19:19 osse why sort -u?
19:21 Trieste joined #git
19:22 guardian because files both added appear twice
19:23 boudiccas joined #git
19:23 guardian I'm doing a git rebase --preserve-merges onto XXX YYY
19:23 guardian git stops failing at redoing merge commits
19:24 m0viefreak joined #git
19:24 guardian so I just do git ls-files -u | cut -f2 | sort -u | sed -r 's/^(.*)$/git reset -q HEAD \1 >\/dev\/null \&\& git show <merge_commit_sha1_given_when_rebase_bails_out>:\1 > \1/' |sh
19:24 italoacasas joined #git
19:24 ej joined #git
19:25 ej anyone online? I'm wondering if it's possible to force git clone from an https url to user the global config username and password, so it doesnt prompt the user
19:26 Trieste joined #git
19:26 madewokherd joined #git
19:26 BaD_CrC joined #git
19:27 nitin joined #git
19:27 robotroll joined #git
19:28 EvilPenguin joined #git
19:29 berndj joined #git
19:30 _ikke_ man gitcredentials
19:30 gitinfo the gitcredentials manpage is available at http://jk.gs/gitcredentials.html
19:31 mehola joined #git
19:31 _ikke_ The credential helpers can be used to provide credentials when needed
19:31 darkbit joined #git
19:31 Guest57 joined #git
19:31 boudicca joined #git
19:33 tristanp joined #git
19:33 mjuszczak joined #git
19:34 gargola_ joined #git
19:35 Orbitrix joined #git
19:38 Sasazuka joined #git
19:41 efco joined #git
19:43 rxc joined #git
19:43 rxc joined #git
19:44 Balliad joined #git
19:44 rainbyte joined #git
19:46 boudiccas joined #git
19:46 durham joined #git
19:47 kfpratt joined #git
19:47 nnyk joined #git
19:47 durham joined #git
19:48 tristanp joined #git
19:49 boudicca joined #git
19:51 guardian would a fetch +refs/*:refs/* nullify benefits of a repack? or would it just bring recent loose objects?
19:52 guardian say the first fetch +refs/*:refs/* happens few days before the repack, then the latest fetch +refs/*:refs/* happens right after the repack
19:52 Trieste joined #git
19:56 rpad joined #git
19:56 rpad Is there a better way to clone a large repo instead of git clone? Preferably a method that can resume if connectivity breaks
19:59 kadoban Not really. You could use rsync to copy the files maybe, if the repo is not being pushed to.
19:59 faux___ joined #git
19:59 Trieste joined #git
20:00 s00pcan_ joined #git
20:00 Gsham joined #git
20:00 rkazak joined #git
20:01 _ikke_ create a bundle if you are in a position to do that
20:02 nwkj86 joined #git
20:02 Orbitrix joined #git
20:03 BaD_CrC joined #git
20:04 hashpuppy joined #git
20:04 Trieste joined #git
20:06 mjuszczak joined #git
20:06 guardian anyone for my repack q? please
20:06 josuebrunel joined #git
20:07 Xorg joined #git
20:07 Xorg will "git add *"
20:07 Xorg add untracked files ?
20:08 kadoban Yes. It's not really the best form of the command though, you usually want to do 'git add .' instead
20:09 Xorg that wont add untracked ?
20:09 kadoban . stands for the current directory, and git add is recursive, so it does mostly the same thing, but better.
20:09 bjpenn joined #git
20:09 kadoban Xorg: If you want to avoid adding untracked files, add them to your .gitignore file
20:09 Xorg I'm aware that . stands for current
20:09 Xorg they are allready there
20:10 Xorg lets say, i've allready untracked pyc files
20:10 _ikke_ Xorg: your shell will expand * to every file and dir in the current dir
20:10 Xorg will "git add ."
20:10 Xorg add pyc ?
20:10 mwhooker joined #git
20:11 pandeiro joined #git
20:11 _ikke_ If they're not ignored, it will
20:11 Xorg ok
20:11 Xorg but will git add *, add ignored ?
20:12 Trieste joined #git
20:13 Seveas no, that'll take a git add -f *
20:14 Xorg kk
20:14 Xorg ty guys
20:14 Xorg :)
20:14 |2701 joined #git
20:14 Xorg enjoy the rest of te day
20:14 Xorg holla
20:16 tristanp_ joined #git
20:18 Adagh joined #git
20:18 tristanp joined #git
20:22 dangerousdave joined #git
20:22 fracting joined #git
20:22 maestrojed joined #git
20:22 tristanp_ joined #git
20:23 tristanp_ joined #git
20:23 faux___ joined #git
20:24 dan2k3k4 joined #git
20:24 srcerer_ joined #git
20:24 durham joined #git
20:26 nettoweb joined #git
20:26 leonarth joined #git
20:27 MasterBob joined #git
20:27 MasterBob Hi. My google fu is failing me. How do I cherry-pick all commits which have a specific commit message? or
20:28 MasterBob or filter them to it's own branch
20:31 SimonNa joined #git
20:31 Guest57 joined #git
20:33 nnyk joined #git
20:33 Seveas git cherry-pick $(git log --format=%h --grep commit-message-string)
20:34 Seveas actually, make that git cherry-pick $(git rev-list --grep commit-message-string HEAD)
20:34 MasterBob Seveas: thank you so very much.
20:34 mwhooker joined #git
20:36 Xorg left #git
20:39 rahtgaz joined #git
20:39 basiclaser joined #git
20:39 ej I've noticed that when I run "git clone" on an https url, the "Username for https://xxx" prompt isn't on the stdout or stderr. does anyone know how to get that username/password prompt onto the stdout?
20:39 radsy joined #git
20:40 Gsham joined #git
20:41 Eugene !xy
20:41 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
20:42 Seveas ej: the very short answer is: you don't. The slightly longer answer is what gitinfo just said.
20:43 tristanp joined #git
20:44 ej alright. I'm building an app with a web UI that ends up calling a bunch of bash scripts in the background. I'd like to detect when the git clone script prompts for username/password, so I can bubble that up to the UI so the user can enter it, then send it back down into the stdin
20:45 ej ideally they can use the UI to git clone a repo, even if they've never set any git config yet on their box
20:45 tristanp_ joined #git
20:46 Seveas yeah, definitely an XY problem.
20:46 cdown_ joined #git
20:47 Seveas git does all its credentials prompting via credential helpers, so you'll have to write one that works with your app and let git use it
20:47 EvilPenguin joined #git
20:49 tristanp joined #git
20:49 ej alright, thanks
20:51 interne7y joined #git
20:51 hahuang61 joined #git
20:51 eletuchy joined #git
20:52 madewokherd joined #git
20:52 troulouliou_div2 joined #git
20:53 rkd joined #git
20:58 soerenb_ joined #git
20:58 ahmed_elgabri joined #git
21:01 Guest58770 joined #git
21:01 boudiccas joined #git
21:04 mjuszczak joined #git
21:07 cebor joined #git
21:13 cdg joined #git
21:14 faux___ joined #git
21:14 hahuang61 joined #git
21:14 BrianBlaze420 joined #git
21:14 beardfish left #git
21:18 bamb joined #git
21:19 bamb left #git
21:19 neilthereildeil joined #git
21:19 neilthereildeil hey guys
21:20 tristanp_ joined #git
21:20 LeBlaaanc joined #git
21:21 neilthereildeil i deleted some files that were tracked in GIT. how can i "commit" those deletions?
21:22 damccull joined #git
21:22 Gsham joined #git
21:22 tristanp_ joined #git
21:23 preaction neilthereildeil: git status should say, but "git rm <file>; git commit"
21:26 mwhooker_ joined #git
21:27 BaD_CrC joined #git
21:28 neilthereildeil preaction: that will delete the file from GIT?
21:28 preaction neilthereildeil: it will add a commit that deletes the file from the working tree. what do you want?
21:28 neilthereildeil ye aok
21:28 preaction the file is still in the history
21:29 babilen joined #git
21:29 Laaw joined #git
21:29 Laaw hey what's the flag to get git to generate a build tag
21:29 preaction build tag?
21:29 Laaw not build tag... I forget the exact vocab word
21:30 preaction git describe?
21:30 Laaw like the "how many commits after last tag" thing
21:30 Laaw yes
21:30 Laaw ty
21:30 NeverDie joined #git
21:31 aidalgol joined #git
21:31 mehola joined #git
21:32 tvw joined #git
21:35 liquidjamm joined #git
21:35 f3r70rr35f joined #git
21:35 jaguarmagenta joined #git
21:36 GavinMagnus joined #git
21:36 faux___ joined #git
21:36 artemisart joined #git
21:37 nitrospectide joined #git
21:37 shinnya joined #git
21:37 darkbit joined #git
21:38 mwhooker joined #git
21:39 nitrospectide I am using Git to version control a website on a remote server. Today, I was working on pulling in commits from a hosted repo, and ran into some odd things I've never seen before.
21:39 nitrospectide On my first pull, I got "error: unable to unlink old 'sites/default/settings.php' (Permission denied)"
21:39 nitrospectide I tried again, without changing anything, and was told that "error: Your local changes to the following files would be overwritten by merge:"
21:40 preaction sounds like some other user is sharing the same working tree, which is a bad idea
21:40 boxrick1__ left #git
21:40 preaction and then it sounds like you've got some uncommitted changes, which you need to either commit, stash, or remove. which the error message told you
21:41 garethdaine joined #git
21:41 nitrospectide I tried just deleting the files via FTP, since I wanted them overwritten anyway. I kept getting the same messages.
21:41 boxrick1 joined #git
21:42 nitrospectide preaction: Then I removed the settings.php from the repo (it was a mistake that it was in there and trying to overwrite the one on the server)
21:42 preaction nitrospectide: you're changing the git repo, continually. if you're going to use git, you should use git. see !deploy
21:42 gitinfo nitrospectide: 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
21:43 nitrospectide preaction: I'm using it rather simply, and have had success for years.
21:43 preaction yes, accidentally, i suspect
21:44 tristanp joined #git
21:44 preaction if you're using a working tree as your deployment, and you edit that working tree without committing, you're going to end up with exactly the problems you're having now
21:44 NeverDie joined #git
21:44 nitrospectide The thing that completely threw me was this error, which I got after killing all the files on the server and trying to pull again: "insufficient permission for adding an object to repository database .git/objects"
21:45 preaction because the .git/objects directory has some bad permissions. so fix them
21:46 darkbit joined #git
21:47 nitrospectide preaction: I understand that if I change things on the server, I need to commit them back into the server repo, and push that back to merge into the hosted repo. I get that. The settings.php file complained about overwriting because it was not supposed to be committed into the repo at the dev end, but accidentally had been, and wasn't noticed until the pull. Removing it at the dev side and committing that seemed the right solution.
21:47 tristanp_ joined #git
21:47 mischat joined #git
21:48 nitrospectide I have no idea why the other files were seen as being changed, but it is what it is, and deleting them should have been a simple solution, so the new ones from the hosted repo could come in and replace them.
21:49 preaction deleting files is changing the working tree. it works like any other change to the working tree
21:50 Sasazuka joined #git
21:50 tristanp joined #git
21:50 therooxo joined #git
21:51 nitrospectide preaction: What is the recommended solution in that specific case? The files should not have been changed, and causing a conflict, but somehow they were. Wasn't deleting them to allow the incoming ones from the pull to replace them the right move? Isn;t that what you said originally? "and then it sounds like you've got some uncommitted changes, which you need to either commit, stash, or remove. which the error message told you"
21:51 preaction remove the _changes_, not the _files_
21:52 preaction you remove changes using "git checkout <file>"
21:52 nitrospectide ok
21:52 preaction if you just want to remove all the changes in the working tree, you can do "git checkout ." in the repository root
21:53 nitrospectide well, that situation seems to no longer be my issue. I am stuck with this permission thing. I have never had that error, and have no idea why anything would have changed.
21:54 jstimm joined #git
21:54 preaction did you try to use the git repo when you were root, or another user other than the user that owns the repo?
21:54 elastix joined #git
21:54 nitrospectide preaction: no
21:54 preaction the short solution is to "chown -R <user>: /path/to/repo" as root
21:55 preaction i find that literally impossible to believe
21:55 mdw joined #git
21:56 nitrospectide I haven't. The other option is that some other user did… which would mean I have been hacked, since I am the only user.
21:56 Dougie187 left #git
22:00 tristanp_ joined #git
22:02 mdw_ joined #git
22:02 dan2k3k4 joined #git
22:06 blackwind_123 joined #git
22:08 Gsham joined #git
22:09 tristanp joined #git
22:15 ril joined #git
22:16 darkbit joined #git
22:16 toothe left #git
22:17 nitrospectide preaction: I went into the .git/objects folder, and do see 3 folders from 4 years ago that have "root" as the owner. This would have been done by the person I inherited this from. But it was 4 years ago. Why would this come up _now_? Could my removal of that file from the repo be touching a 4yr old object and causing this perm issue?
22:19 mwhooker joined #git
22:20 tristanp joined #git
22:21 Post-it joined #git
22:21 faux___ joined #git
22:21 neanderslob joined #git
22:22 LeBlaaanc joined #git
22:24 dopesong joined #git
22:28 bronson joined #git
22:28 cdown joined #git
22:28 italoacasas joined #git
22:29 jimi_ joined #git
22:30 italoacasas joined #git
22:31 mischat joined #git
22:31 italoacasas joined #git
22:31 mischat joined #git
22:32 tgunr joined #git
22:32 mischat joined #git
22:33 mischat joined #git
22:34 mischat joined #git
22:34 dopesong joined #git
22:34 mischat joined #git
22:35 mischat joined #git
22:36 mischat joined #git
22:36 jstimm joined #git
22:37 mischat joined #git
22:37 tristanp joined #git
22:37 mischat joined #git
22:38 darkbit joined #git
22:38 mischat joined #git
22:39 mischat joined #git
22:40 mischat joined #git
22:40 mischat joined #git
22:41 tristanp_ joined #git
22:41 mischat joined #git
22:42 akiTendo How would I get a diff between head and working copy?
22:42 mischat joined #git
22:43 mischat joined #git
22:43 dtrott joined #git
22:44 mischat joined #git
22:44 kadoban_ joined #git
22:44 perlpilot_ joined #git
22:44 mischat joined #git
22:45 mozzarel1 joined #git
22:45 mischat joined #git
22:45 faux___ joined #git
22:46 mischat joined #git
22:46 cust_ joined #git
22:47 mischat joined #git
22:47 frogonwheels__ joined #git
22:47 wcpan_ joined #git
22:47 Andre_work joined #git
22:47 neanderslob_ joined #git
22:47 mischat joined #git
22:48 nb-ben_ joined #git
22:48 fscala joined #git
22:48 Michaela joined #git
22:48 vals_ joined #git
22:48 colona_ joined #git
22:48 ZenWalke1 joined #git
22:48 mischat joined #git
22:48 howdoi joined #git
22:48 MaddHatt1r joined #git
22:48 hendry_ joined #git
22:48 ffledgli1g joined #git
22:48 tonyj_ joined #git
22:48 scoobert1on joined #git
22:48 tvl joined #git
22:48 doppo_ joined #git
22:48 EvanDotP1o joined #git
22:48 BaD_CrC joined #git
22:48 souther_ joined #git
22:48 des_cons1lado joined #git
22:48 Ariadeno joined #git
22:49 kappy_ joined #git
22:49 shachaf_ joined #git
22:49 przemoc86 joined #git
22:49 scarcry_ joined #git
22:49 zrr_ joined #git
22:49 kontoo_ joined #git
22:49 joevandy1 joined #git
22:49 HeresJoh1y joined #git
22:49 mischat joined #git
22:49 r3c0d3x_ joined #git
22:50 mischat joined #git
22:50 tristanp joined #git
22:50 dtrott Is there a way to suppress commented out lines (Java and Javadoc) from the output of git diff  ?
22:50 akiTendo I don’t think so.
22:50 mischat joined #git
22:51 M-sbts joined #git
22:51 M-meznak1 joined #git
22:51 akiTendo Any good diff viewing programs someone could recommend (OSX)
22:51 mischat joined #git
22:51 ORiON--- joined #git
22:51 mattcen_ joined #git
22:51 TSS3000RO joined #git
22:51 diegoaguilar joined #git
22:51 zifnab06 joined #git
22:51 resetpacket joined #git
22:51 Bilge- joined #git
22:51 watabou_ joined #git
22:51 rxo_ joined #git
22:51 gravitron_ joined #git
22:52 meZee- joined #git
22:52 lep2 joined #git
22:52 systmkor joined #git
22:52 joako_ joined #git
22:52 martinklepsch|BN joined #git
22:52 MatthewAllan93_ joined #git
22:52 darkbit joined #git
22:52 mrkake joined #git
22:52 naitsirhc_ joined #git
22:52 timthowtdi_ joined #git
22:52 ygeLN_ joined #git
22:52 dave0x4d joined #git
22:52 blackwell_ joined #git
22:52 tmz_ joined #git
22:52 mischat joined #git
22:52 HarryHallman_oth joined #git
22:52 jgornick_ joined #git
22:52 cschneid- joined #git
22:52 troulouliou_div2 joined #git
22:52 romrador joined #git
22:52 j416_ joined #git
22:52 Celelibi_ joined #git
22:52 Linkandzelda_ joined #git
22:52 martinbjeldbak joined #git
22:52 sweatsuit_ joined #git
22:52 abh_ joined #git
22:53 mischat joined #git
22:53 mark- joined #git
22:53 dtrott akiTendo: I like p4merge (its free - you don’t need any of the rest of perforce) - but I like it primarly for the three way merge.
22:53 cdesai_ joined #git
22:53 nedbat_ joined #git
22:53 karstensrage_ joined #git
22:53 ashka` joined #git
22:53 mischat joined #git
22:53 hiroki joined #git
22:53 robogoat joined #git
22:54 Samual joined #git
22:54 unforgiven512 joined #git
22:54 Roconda joined #git
22:54 akiTendo drodger: I’m not wanting to do any merging though - I just have a diff file that I’d like to view more cleanly than looking at it in sublime text.
22:54 lamont joined #git
22:54 tokkee joined #git
22:54 McKraken_zzzzz joined #git
22:54 superteece joined #git
22:54 mischat joined #git
22:55 sadmac joined #git
22:55 Reda joined #git
22:55 mischat joined #git
22:55 MikeChernev joined #git
22:55 rivarun joined #git
22:55 devhoag joined #git
22:55 Jeroen joined #git
22:56 mischat joined #git
22:56 rbr joined #git
22:56 maestrojed joined #git
22:56 Sasazuka joined #git
22:56 mischat joined #git
22:57 mischat joined #git
22:57 rancyd joined #git
22:58 Mission-Critical joined #git
22:58 SleePy joined #git
22:58 mischat joined #git
22:59 mischat joined #git
22:59 tmz_ left #git
22:59 mischat joined #git
23:00 mischat joined #git
23:00 tmz_ joined #git
23:01 Tee_Pee joined #git
23:01 mischat joined #git
23:02 mischat joined #git
23:02 karstensrage_ left #git
23:02 mischat joined #git
23:03 mischat joined #git
23:03 karstensrage joined #git
23:03 murph joined #git
23:04 mischat joined #git
23:04 akiTendo left #git
23:05 mischat joined #git
23:05 mischat joined #git
23:05 darkbit joined #git
23:06 ThunderX joined #git
23:06 mischat joined #git
23:07 mischat joined #git
23:08 mischat joined #git
23:08 ruskie joined #git
23:08 mischat joined #git
23:08 Klumben joined #git
23:09 mischat joined #git
23:10 mischat joined #git
23:10 mischat joined #git
23:11 EvilPenguin joined #git
23:11 mischat joined #git
23:11 d4rklit3 joined #git
23:12 mischat joined #git
23:13 mischat joined #git
23:13 mischat joined #git
23:14 mischat joined #git
23:15 anu1 joined #git
23:15 mischat joined #git
23:16 mischat joined #git
23:17 mischat joined #git
23:17 mischat joined #git
23:18 mischat joined #git
23:19 mischat joined #git
23:19 jonesinator joined #git
23:20 mischat joined #git
23:20 neilthereildeil left #git
23:20 mischat joined #git
23:21 mischat joined #git
23:22 mischat joined #git
23:22 MaddHatter left #git
23:22 jeffreylevesque joined #git
23:23 mischat joined #git
23:23 mischat joined #git
23:24 mischat joined #git
23:25 mischat joined #git
23:26 mischat joined #git
23:26 mischat joined #git
23:27 mischat joined #git
23:27 zivester joined #git
23:28 mischat joined #git
23:28 ThunderX joined #git
23:29 cagedwisdom joined #git
23:29 mischat joined #git
23:29 darkbit joined #git
23:29 mischat joined #git
23:30 sleezd joined #git
23:30 Learath2 joined #git
23:30 foul_owl joined #git
23:30 deepy joined #git
23:30 mischat joined #git
23:30 Bucciarati joined #git
23:31 ujjain joined #git
23:31 ujjain joined #git
23:31 mischat joined #git
23:32 mischat joined #git
23:32 avar joined #git
23:32 mehola joined #git
23:32 phy1729 joined #git
23:32 mischat joined #git
23:33 mischat joined #git
23:34 mischat joined #git
23:34 mkoskar joined #git
23:35 mischat joined #git
23:35 srcerer joined #git
23:35 mischat joined #git
23:36 jaguarmagenta joined #git
23:36 ZenWalke1 left #git
23:36 baraba joined #git
23:36 mablae__ joined #git
23:36 mischat joined #git
23:36 ZenWalker joined #git
23:36 ZenWalker left #git
23:37 mischat joined #git
23:38 mischat joined #git
23:38 quentusrex joined #git
23:38 quentusrex joined #git
23:38 kpease joined #git
23:38 kfpratt joined #git
23:38 yude joined #git
23:38 drawkula joined #git
23:38 mischat joined #git
23:39 dunk joined #git
23:39 theresajayne joined #git
23:39 mischat joined #git
23:39 tgunr joined #git
23:40 elmcrest joined #git
23:40 wizonesolutions joined #git
23:40 mischat joined #git
23:40 MLM joined #git
23:41 mischat joined #git
23:41 yena joined #git
23:41 mischat joined #git
23:42 ToeSnacks joined #git
23:42 huhlig joined #git
23:42 csd_ joined #git
23:42 mischat joined #git
23:43 realz joined #git
23:43 Internet13 joined #git
23:43 mischat joined #git
23:43 Guest31413 joined #git
23:44 mischat joined #git
23:44 mischat joined #git
23:45 musca joined #git
23:45 mischat joined #git
23:45 [cust] joined #git
23:46 zivester_ joined #git
23:46 likewhoa joined #git
23:46 mischat joined #git
23:47 mischat joined #git
23:47 Soliton joined #git
23:47 mischat joined #git
23:48 rkazak joined #git
23:48 mischat joined #git
23:48 inflames joined #git
23:49 mischat joined #git
23:50 mischat joined #git
23:50 mwhooker joined #git
23:50 mischat joined #git
23:50 jamesshijie joined #git
23:51 jamesshijie left #git
23:51 mischat joined #git
23:52 mischat joined #git
23:52 ash_workz joined #git
23:52 leonarth joined #git
23:53 mischat joined #git
23:53 dmto joined #git
23:53 mischat joined #git
23:54 mbreedlove joined #git
23:54 mischat joined #git
23:55 mattfoo joined #git
23:55 mischat joined #git
23:56 mischat joined #git
23:56 cagedwisdom joined #git
23:56 mischat joined #git
23:56 [cust] joined #git
23:57 mischat joined #git
23:57 gaen joined #git
23:57 IWishIKnew joined #git
23:57 Sonderblade joined #git
23:58 mischat joined #git
23:58 rubyonrailed joined #git
23:59 mischat joined #git
23:59 fstd joined #git
23:59 mischat joined #git

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