Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-05

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

All times shown according to UTC.

Time Nick Message
00:00 drodger joined #git
00:00 Teny joined #git
00:02 svm_invictvs joined #git
00:12 tanuki joined #git
00:15 dsdeiz joined #git
00:15 dsdeiz joined #git
00:15 albel727 joined #git
00:16 Shazer[2] joined #git
00:16 Shazer[2] Hi guys. I have three branches - RMC-921, RMC-928, and RMC-940
00:17 Shazer[2] If RMC-940 is blocked by RMC-921 and RMC-928 what is the best way to handle it?
00:17 dirtyroshi joined #git
00:17 pbrewczynski joined #git
00:17 ojacobson Define "blocked"
00:18 Shazer[2] Should I checkout master, merge 921 and 928 into master, then branch RMC-940 off?
00:18 Shazer[2] As in code required to complete RMC-940 is in 921 and 928
00:18 re1 joined #git
00:18 hagridaaron joined #git
00:19 Rodya_ joined #git
00:20 roelmonnens joined #git
00:20 _28_ria joined #git
00:22 Stutters left #git
00:25 shinnya joined #git
00:26 gopar joined #git
00:26 thebope joined #git
00:27 CaptainHeavy joined #git
00:29 RWAG joined #git
00:29 Gsham joined #git
00:30 tanuki joined #git
00:31 Shazer[2] ojacobson ^^
00:32 ojacobson I don't think there's a single "should" answer
00:32 ojacobson just a lot of "could" answers
00:33 Shazer[2] ok :)
00:34 chachasmooth joined #git
00:34 Shazer[2] could I checkout master, merge 921/928 into master, then branch 940 off master?
00:36 hahuang65 joined #git
00:36 Cabanossi joined #git
00:36 tanuki joined #git
00:38 qpdb joined #git
00:38 matoro joined #git
00:39 overlord_tm joined #git
00:40 pks joined #git
00:42 drodger joined #git
00:44 aidalgol joined #git
00:48 Noodlewitt joined #git
00:48 ahrs joined #git
00:49 shgysk8zer0 joined #git
00:50 metachr0n joined #git
00:50 raspado joined #git
00:54 chachasmooth joined #git
00:56 hitman1 joined #git
00:56 hitman1 How to recover a file after I deleted it ?
00:58 gopar joined #git
01:00 ojacobson hitman1: was it previously committed?
01:00 hitman1 don't know
01:00 hitman1 ls
01:02 hitman1 I recovered it by now there is another file missing from that directory?
01:02 dave_uy joined #git
01:02 slobber left #git
01:02 hitman1 which was there before restoring the file.
01:02 dsdeiz joined #git
01:02 dsdeiz joined #git
01:04 P4nther joined #git
01:04 mda1 joined #git
01:05 Rodya_ joined #git
01:07 drodger joined #git
01:07 hitman1 *but
01:10 a3Dman joined #git
01:12 sunri5e joined #git
01:18 netj joined #git
01:18 fstd_ joined #git
01:19 cam27 joined #git
01:20 thebope joined #git
01:22 TbobbyZ joined #git
01:23 menip joined #git
01:25 finalbeta joined #git
01:31 durham_ joined #git
01:31 dsantiago joined #git
01:32 peterbecich joined #git
01:33 lavalamp joined #git
01:34 pks joined #git
01:36 fstd_ joined #git
01:36 Cabanossi joined #git
01:41 netj joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:54 duderonomy joined #git
01:54 d^sh joined #git
01:55 lavalamp joined #git
01:57 robattila256 joined #git
02:00 dermoth joined #git
02:01 eikhorst joined #git
02:02 peterbecich joined #git
02:02 jameser joined #git
02:03 dsdeiz joined #git
02:04 salamanderrake joined #git
02:04 AtomicSpark left #git
02:07 robattila256 joined #git
02:09 roelmonnens joined #git
02:09 dsdeiz joined #git
02:09 dsdeiz joined #git
02:11 eperez joined #git
02:11 RWAG joined #git
02:12 fstd_ joined #git
02:15 thebope joined #git
02:15 peterbecich joined #git
02:16 nickel_dime_look joined #git
02:16 lagothri1 joined #git
02:16 fstd_ joined #git
02:19 hexagoxel joined #git
02:20 doppo joined #git
02:22 gopar joined #git
02:23 matoro joined #git
02:24 Introoter joined #git
02:24 bruce_lee joined #git
02:27 TbobbyZ joined #git
02:29 chigang joined #git
02:30 durham joined #git
02:31 Sushi joined #git
02:31 zivester joined #git
02:31 durham joined #git
02:32 MatthewAllan93 joined #git
02:36 perrier-jouet joined #git
02:36 unreal_ joined #git
02:37 hahuang65 joined #git
02:38 cqi joined #git
02:38 peepsalot joined #git
02:40 peterbecich joined #git
02:40 a3Dman joined #git
02:41 prg3 joined #git
02:42 chachasmooth joined #git
02:44 skypuke joined #git
02:44 ddavidd joined #git
02:45 hahuang65 joined #git
02:50 oskarkv joined #git
02:54 chardan joined #git
02:56 Vortex34 joined #git
02:59 rchavik joined #git
02:59 thebope joined #git
03:00 elsevero joined #git
03:01 aavrug joined #git
03:03 riot_grrrl joined #git
03:03 a3Dman joined #git
03:03 riot_grrrl left #git
03:06 toothe joined #git
03:06 raspado joined #git
03:07 ojdo joined #git
03:07 wagle joined #git
03:07 toothe I accidently committed a few very large files to my repository. I want to remove them from the history. I am the only person using this repo as of now. How do I do that?
03:09 thiago joined #git
03:11 toothe I think I found it.
03:12 SantaClauze joined #git
03:12 toothe no...the size of the repository did not change.
03:12 toothe that's odd.
03:13 safe joined #git
03:14 theiostream joined #git
03:14 hitman1 How to refresh the file at github and file at my pc
03:14 hitman1 so both are sync
03:15 hitman1 and both at the same level
03:18 rewt toothe, run git gc, or wait 2 weeks
03:18 toothe wait two weeks?
03:19 rewt git keeps stuff around for a couple of weeks in case you made a mistake and want to get them back
03:21 hitman1 I want to restore a file
03:21 hitman1 and I commited the change
03:21 hitman1 I deleted that file yesterday.
03:21 hitman1 How to restore the file once deleted?
03:23 learning joined #git
03:24 Goplat joined #git
03:24 rewt just go back to the old commit
03:31 davimore joined #git
03:33 om_henners joined #git
03:33 matoro joined #git
03:34 Andrew_K joined #git
03:36 inflames joined #git
03:36 Cabanossi joined #git
03:36 matoro joined #git
03:40 hvxgr joined #git
03:45 justan0theruser joined #git
03:46 plexigras joined #git
03:47 peterbecich joined #git
03:48 dnukem|2 joined #git
03:50 Cabanossi joined #git
03:59 mehola joined #git
03:59 prg3 joined #git
03:59 mehola joined #git
04:01 SwiftMatt joined #git
04:01 xall joined #git
04:10 z8z joined #git
04:10 rscata joined #git
04:10 a_thakur joined #git
04:13 Noodlewitt joined #git
04:14 durham joined #git
04:14 prg3 joined #git
04:15 a3Dman joined #git
04:21 nickel_dime_look joined #git
04:24 thebope joined #git
04:32 pks joined #git
04:33 MuffinMedic joined #git
04:35 Cabanossi joined #git
04:36 a3Dman joined #git
04:36 MuffinMedic joined #git
04:39 jesst joined #git
04:42 fakenerd joined #git
04:45 dstw joined #git
04:46 netj joined #git
04:46 jab416171 joined #git
04:47 overlord_tm joined #git
04:51 venmx joined #git
04:52 Nilesh_ joined #git
04:52 Levex joined #git
04:52 austin987 joined #git
04:53 Arkaniad joined #git
04:54 Arkaniad joined #git
04:56 Arkaniad joined #git
04:57 MarioBranco joined #git
04:59 holodoc joined #git
04:59 Arkaniad joined #git
05:00 a3Dman joined #git
05:00 a3Dman joined #git
05:00 freimatz joined #git
05:01 sunri5e joined #git
05:04 hahuang65 joined #git
05:04 eperez joined #git
05:04 Arkaniad joined #git
05:05 dec0n joined #git
05:06 peterbecich joined #git
05:07 Murii joined #git
05:09 a_thakur joined #git
05:10 pbrewczynski joined #git
05:15 ozmage joined #git
05:18 thebope joined #git
05:21 Eragon joined #git
05:23 Brski joined #git
05:23 dersand joined #git
05:24 drodger joined #git
05:24 Rodya_ joined #git
05:24 prg3 joined #git
05:25 sbulage joined #git
05:27 Vaelatern joined #git
05:30 Khisanth joined #git
05:33 chachasmooth joined #git
05:34 Raging_Hog joined #git
05:34 ozmage joined #git
05:35 acetakwas joined #git
05:35 Cabanossi joined #git
05:36 fakenerd joined #git
05:37 ozmage joined #git
05:38 moei joined #git
05:38 xall joined #git
05:39 Eugene !stats
05:39 gitinfo [!irclog] Public logs of #git are kept at: http://colabti.org/irclogger/irclogger_log/git or look at stats for the last 30 days: http://itvends.com/irc/git.html or since Jan 1, 2012: http://itvends.com/irc/git-all.html
05:40 thierryp_ joined #git
05:42 Levex joined #git
05:47 HurricaneHarry joined #git
05:49 chris3492 joined #git
05:49 safe joined #git
05:49 lordjancso joined #git
05:51 cqi joined #git
05:52 mpeter joined #git
05:53 Bock joined #git
05:54 chachasmooth joined #git
05:55 ozmage joined #git
05:55 ThomasLocke joined #git
05:55 ThomasLocke joined #git
05:56 peterbecich joined #git
05:57 MuffinMedic joined #git
06:01 blunaxela joined #git
06:03 diogenese joined #git
06:04 qt-x joined #git
06:06 Silmarilion joined #git
06:08 jnavila joined #git
06:08 a3Dman joined #git
06:08 a3Dman joined #git
06:10 lb1c joined #git
06:11 diogenese joined #git
06:12 thebope joined #git
06:12 freimatz joined #git
06:14 chele joined #git
06:15 roelmonnens joined #git
06:15 _28_ria joined #git
06:15 dhollinger joined #git
06:16 roelmonnens joined #git
06:20 imack joined #git
06:20 JeroenT joined #git
06:20 sarri joined #git
06:20 sarri joined #git
06:20 JeroenT joined #git
06:22 visual morning peeps
06:23 peepsalot mornin visual :P
06:23 visual haha
06:23 sbulage joined #git
06:24 senaps joined #git
06:24 oskarkv joined #git
06:26 Rodya_ joined #git
06:27 elect__ joined #git
06:29 Eugene Mmmm midnight beer
06:31 inflames joined #git
06:31 rominronin joined #git
06:33 xkr47 joined #git
06:34 TbobbyZ joined #git
06:35 Cabanossi joined #git
06:36 dvaske_ joined #git
06:40 chachasmooth joined #git
06:40 MineCoins joined #git
06:40 chardan joined #git
06:41 Gloomy joined #git
06:41 finalbeta joined #git
06:41 govg joined #git
06:43 rokups joined #git
06:44 ayogi joined #git
06:44 oskarkv joined #git
06:45 dstw joined #git
06:45 durre joined #git
06:46 chardan o/
06:48 fxg joined #git
06:50 thierryp joined #git
06:51 fxg left #git
06:52 djb-irc joined #git
06:55 flaviodesousa joined #git
06:59 Tobbi joined #git
07:01 Vaelatern joined #git
07:04 mda1 joined #git
07:05 hahuang65 joined #git
07:05 Cabanossi joined #git
07:06 eperez joined #git
07:06 zefferno joined #git
07:07 _ng joined #git
07:08 King_Hual joined #git
07:13 donnib joined #git
07:13 donnib Hi
07:13 ZyX-I joined #git
07:14 donnib I need to push all remote branches to a new remote without creating local branches, i've done it before but i forgot how, could somebody let me know the syntax ?
07:15 a_thakur joined #git
07:16 govg joined #git
07:18 jor joined #git
07:18 adac joined #git
07:19 tobiasvl donnib: but creating local remote-tracking branches is ok?
07:19 _ikke_ donnib: git push <remote> refs/remotes/<source-remote>/*:refs/heads/*
07:19 a_thakur joined #git
07:19 navidr joined #git
07:20 donnib _ikke_: thank you, that was what i was looking for
07:21 TomyWork joined #git
07:23 Grievar joined #git
07:23 jimi_ joined #git
07:24 IRQ` joined #git
07:25 sea-gull joined #git
07:26 jokajak joined #git
07:26 elect joined #git
07:27 schleppel joined #git
07:28 Rodya_ joined #git
07:28 elect_ joined #git
07:29 theoceaniscool joined #git
07:33 cqi joined #git
07:33 donnib so i shrunk a git repository but on the remote after i pushed there are still few packs left which should have dissapeared, how in ..... cna i get git to remove those
07:34 kegster joined #git
07:34 kegster joined #git
07:34 donnib i tried pretty much everything i think git reflog --expire
07:34 donnib git prune
07:34 donnib git gc --aggressive
07:34 donnib git repack
07:34 ronskisika joined #git
07:34 _ikke_ If the packs are there, git thinks the objects in there are still referenced
07:35 donnib i know the repo should be smaller because i pushed to another remote and it was smaller
07:35 chachasmooth joined #git
07:35 ronskisika joined #git
07:35 donnib _ikke_: hmm
07:35 jokajak joined #git
07:35 Cabanossi joined #git
07:36 zeroed joined #git
07:38 donnib git fsck says there is a dangling commit
07:38 donnib i then redid the git reflog expire --expire=now --all
07:38 donnib and git gc --prune=now
07:39 donnib then git fsck again and still it says there is this dangling commit
07:40 fbwnd joined #git
07:40 a_thakur joined #git
07:40 Tobbi joined #git
07:40 ethali joined #git
07:41 nkuttler can somebody recommend a way to merge po files? i see various tools around, preferably no ruby/nodejs
07:42 overlord_tm joined #git
07:45 MarioJC joined #git
07:45 tocka joined #git
07:45 tocka hi guys, I just did a git pull, but I want to see what were the changes for a certain file that I pulled
07:45 tocka How can I do that? :o
07:46 kadoban git log --patch ^thebranch@{1}  I think might work
07:46 kadoban Oh I forgot the file part
07:46 kadoban git log --patch ^thebranch@{1} -- somefile
07:46 kurkale6ka joined #git
07:47 tocka wow :D
07:47 tocka that looks complicated :D
07:56 kadoban A tad, heh
07:56 kadoban There's probably an easier way I don't know
07:57 chachasmooth joined #git
07:57 peterbecich joined #git
07:58 db` joined #git
07:58 kjsaihs joined #git
08:00 lmatteis joined #git
08:00 osse the easy way: git log {copy that foo..bar thing from the git pull output here} -- file
08:00 venmx joined #git
08:00 thebope joined #git
08:03 Eragon joined #git
08:03 t0by joined #git
08:03 t0by joined #git
08:03 Snugglebash joined #git
08:05 zulutango joined #git
08:06 a_thakur joined #git
08:06 MatthewAllan93 joined #git
08:06 afuentes joined #git
08:06 elsevero joined #git
08:08 a_thakur joined #git
08:09 sunri5e joined #git
08:09 mischat joined #git
08:14 a3Dman joined #git
08:14 TheWild joined #git
08:14 TheWild hello
08:14 elsevero joined #git
08:15 TheWild how to `git rev-list` all the heads (all the commits without parents)?
08:15 Murii joined #git
08:15 Dookie12 joined #git
08:15 _ikke_ You mean the root commits?
08:16 TheWild not the roots. The latest commits.
08:16 aax joined #git
08:17 _ikke_ Than the "without parents" does not really make sense :-)
08:17 umbSublime joined #git
08:17 umbSublime joined #git
08:17 babilen_ joined #git
08:18 TheWild I did a commit, but since I didn't want a merge, I did `git reset --hard` to some older commit, then `git pull`.
08:18 mmattice joined #git
08:18 TheWild then realized my commits might be usable and those are somewhere... I think...
08:19 TheWild just can't find the commit I want to reset to.
08:19 _ikke_ TheWild: Then you want the reflog
08:19 _ikke_ man git reflog
08:19 gitinfo the git-reflog manpage is available at http://jk.gs/git-reflog.html
08:22 TheWild great, found it!
08:22 TheWild thank you _ikke_
08:24 TheWild "e979906 HEAD@{4}: commit: #112 fix", unfortunately `git reset --hard e979906` doesn't work.
08:25 _ikke_ What does "doesn't work" mean here?
08:25 TheWild fatal: ambiguous argument 'e979906': unknown revision or path not in the working tree.
08:26 a3Dman joined #git
08:26 acetakwas joined #git
08:28 pdgwien joined #git
08:28 TheWild omg, stupid me.
08:28 notebox joined #git
08:29 TheWild I typed it in another console window which was pointed to another directory.
08:29 _ikke_ :-)
08:30 sotoz joined #git
08:33 drodger joined #git
08:33 kbeflo joined #git
08:35 sbulage joined #git
08:37 redeemed joined #git
08:37 guardian hello, what's the simplest way to script a git fetch -p and tells whether current branch has been updated upstream?
08:40 danimal2 joined #git
08:41 Endarked joined #git
08:42 clmsy joined #git
08:42 db` joined #git
08:43 jimi_ joined #git
08:44 dminca joined #git
08:44 cbreak guardian: you can count: git rev-list --count HEAD..@{u}
08:47 paemlm joined #git
08:50 Cabanossi joined #git
08:52 seni joined #git
08:52 aard_ joined #git
08:53 tom_blue joined #git
08:56 onmeac joined #git
08:56 mknod joined #git
08:57 zeroed joined #git
08:57 zeroed joined #git
08:58 tkore joined #git
08:59 peterbecich joined #git
09:00 hahuang65 joined #git
09:00 thebope joined #git
09:01 Tobbi joined #git
09:03 hs366 joined #git
09:05 ronskisika joined #git
09:06 guardian gonna try that
09:07 eperez joined #git
09:08 Silenced joined #git
09:09 guardian thanks
09:11 a3Dman joined #git
09:11 codebam joined #git
09:11 nutron joined #git
09:12 ronskisika joined #git
09:12 digidog joined #git
09:13 Tobbi joined #git
09:13 digidog joined #git
09:17 Renter If I want to reverse a specific commit and I know nothing has been done to the specific files after the commit was made, is there a reverse-merge or something that does the trick without having to edit manually ?
09:18 i7c git revert?
09:18 i7c man git-revert
09:18 gitinfo the git-revert manpage is available at http://jk.gs/git-revert.html
09:20 Renter i7c: thanku to be my frned
09:26 holodoc joined #git
09:27 user__ joined #git
09:27 nutron joined #git
09:29 Rodya_ joined #git
09:30 ispn joined #git
09:30 user__ joined #git
09:31 irqq joined #git
09:34 stamina joined #git
09:34 rorro joined #git
09:38 TbobbyZ joined #git
09:42 Dookie12 joined #git
09:44 max12345 joined #git
09:44 max12345 can I create a fork and give it a new name?
09:45 max12345 or is it always "original name " - fork
09:46 max12345 stackoverflow says yes ;)
09:46 max12345 ty
09:46 grawity uh, that's specific to the app/website/webapp that you're creating these forks in
09:46 max12345 anyway
09:46 grawity it's not a Git thing
09:46 max12345 ...
09:46 max12345 ok so git doesn't care and just points to a URI?
09:46 jjasinski joined #git
09:48 Acerific joined #git
09:48 Acerific joined #git
09:48 _ikke_ yes
09:48 canton7 git doesn't know about "forks" - they're not really a git concept
09:49 _ikke_ To git, they are just clones of the original project
09:49 canton7 websites which host git repos use "fork" to mean "clone the repo under my account, and link it somehow back to the original repo in the user interface"
09:49 mischat_ joined #git
09:49 Acerific joined #git
09:50 max12345 ok that works just as well then ;)
09:50 max12345 it's conceptually simpler too
09:50 Cabanossi joined #git
09:54 Introoter joined #git
09:57 Ice_Strike joined #git
09:58 tymczenko joined #git
09:58 chris3492 joined #git
09:59 user__ joined #git
09:59 marcogmonteiro joined #git
09:59 bejeb joined #git
10:00 sysintcn joined #git
10:01 peterbecich joined #git
10:02 ejnahc joined #git
10:03 borkr joined #git
10:05 ZyX-I joined #git
10:12 ayogi joined #git
10:13 jost joined #git
10:13 ToBeFree joined #git
10:16 scoobertron joined #git
10:20 TheWild joined #git
10:20 masuberu joined #git
10:25 b100s joined #git
10:31 tvw joined #git
10:34 ixian joined #git
10:36 bejeb joined #git
10:38 IRQ` joined #git
10:41 drodger joined #git
10:41 Ice_Strike How to open editor when when doing git commit?
10:41 JeroenT_ joined #git
10:42 JeroenT_ joined #git
10:43 Tobbi joined #git
10:43 ethali joined #git
10:44 tobiasvl Ice_Strike: http://stackoverflow.com/a/2596835/176464
10:44 leeN joined #git
10:44 JeroenT_ joined #git
10:45 Ice_Strike tobiasvl so after doing that. Just type git commit?
10:45 tobiasvl Ice_Strike: yes
10:47 finalbeta joined #git
10:47 Ice_Strike when I type
10:47 Ice_Strike $ git commit
10:47 Ice_Strike editor did not popup
10:48 ssarah joined #git
10:50 dendazen joined #git
10:50 dminca Ice_Strike `man git`
10:50 gitinfo the git manpage is available at http://jk.gs/git.html
10:50 dminca and search for EDITOR
10:50 dminca env var
10:50 dminca how to set it
10:50 dminca you'll find out that you have a global gitconfig file
10:51 dminca where you can add w/e option you like
10:52 Ice_Strike already done that
10:53 dminca and still not working?
10:53 dminca what did you do exactly
10:53 Ice_Strike Oh working now
10:53 dminca good
10:53 Ice_Strike do I write at the top or bottom?
10:54 Ice_Strike # Please enter the commit message for your changes. Lines starting
10:54 dminca yeah
10:54 Murii joined #git
10:54 thebope joined #git
10:54 Ice_Strike So I am assuming write after #
10:57 basiclaser joined #git
10:58 Levex joined #git
11:01 osse Ice_Strike: start writing on the first line.
11:01 osse hmm, I think either works
11:01 max12345 left #git
11:02 roelmonn_ joined #git
11:02 hahuang65 joined #git
11:02 dminca the # is commented out and will not show up in the commit log...
11:03 peterbecich joined #git
11:03 dminca those are comments
11:03 dminca doesn't matter where you write
11:03 dminca idea is to leave one carriage-return between the title and the body of the message
11:05 Vampire0 Well, more a new-line than a carriage-return and actually two of them. :-D
11:06 roelmonn_ joined #git
11:06 durre joined #git
11:07 jimi_ joined #git
11:07 bannakaffalatta joined #git
11:08 zeroed joined #git
11:08 kexmex joined #git
11:09 raspado joined #git
11:11 Ice_Strike gitkraken seem nice
11:11 hitman1 left #git
11:12 ljc joined #git
11:13 al-damiri joined #git
11:14 dminca oh, the GUI for newbs
11:15 adac joined #git
11:18 YuGiOhJCJ joined #git
11:19 mischat joined #git
11:21 navidr joined #git
11:21 gk_1wm_su joined #git
11:22 fakenerd joined #git
11:24 gk_1wm_su left #git
11:24 durre joined #git
11:27 ExoUNX joined #git
11:28 Bennux joined #git
11:28 jagob joined #git
11:29 marcogmonteiro joined #git
11:29 ethali joined #git
11:29 darkbit joined #git
11:30 acetakwas joined #git
11:30 Rodya_ joined #git
11:31 dsdeiz joined #git
11:31 dsdeiz joined #git
11:31 Noodlewitt joined #git
11:31 kbeflo_ joined #git
11:32 s17 GUI tends to slow me down
11:32 s17 I find it easier just to learn the CLI
11:36 noecc joined #git
11:40 TbobbyZ joined #git
11:41 TheWild joined #git
11:47 alexandre9099 joined #git
11:48 thebope joined #git
11:49 finalbeta joined #git
11:50 Tobbi joined #git
11:53 notebox joined #git
11:55 nd_ joined #git
11:55 Darcidride joined #git
11:56 dsdeiz joined #git
11:59 fmcgeough joined #git
12:00 dec0n joined #git
12:03 Levex joined #git
12:03 HoierM joined #git
12:04 synthroid joined #git
12:04 peterbecich joined #git
12:06 NeverDie joined #git
12:07 alexandre9099 joined #git
12:08 vuoto joined #git
12:08 scottjl joined #git
12:09 MarioJC joined #git
12:11 boombatower joined #git
12:15 mpeter joined #git
12:15 finalbeta joined #git
12:18 kegster joined #git
12:18 YuGiOhJCJ joined #git
12:20 dvaske joined #git
12:22 nemesit|znc joined #git
12:23 fmcgeough joined #git
12:23 b100s joined #git
12:24 JeroenT joined #git
12:26 Eragon joined #git
12:27 kpease joined #git
12:28 manuelschneid3r joined #git
12:29 dglambert joined #git
12:29 dglambert yo
12:29 JeroenT joined #git
12:31 finalbeta joined #git
12:31 Rodya_ joined #git
12:31 fakenerd joined #git
12:33 mda1 joined #git
12:35 Cabanossi joined #git
12:36 Erati joined #git
12:37 canoon joined #git
12:38 JeroenT joined #git
12:38 gugah joined #git
12:42 buffal0 joined #git
12:42 thebope joined #git
12:43 hahuang65 joined #git
12:45 phinxy joined #git
12:46 mischat joined #git
12:50 Tobbi joined #git
12:50 rorro joined #git
12:50 Ryanar joined #git
12:51 acetakwas joined #git
12:51 mischat_ joined #git
12:54 acetakwas joined #git
12:55 fuzzybear3965 left #git
12:56 xall joined #git
12:57 makinen joined #git
12:59 finalbeta joined #git
13:03 theoceaniscool joined #git
13:05 Cabanossi joined #git
13:05 peterbecich joined #git
13:06 synthroi_ joined #git
13:07 thierryp joined #git
13:08 JeroenT joined #git
13:08 smccully joined #git
13:08 Sound joined #git
13:08 Jackneilll joined #git
13:09 shinnya joined #git
13:09 jozwior joined #git
13:10 jeffreylevesque joined #git
13:12 fuchstronaut joined #git
13:13 acetakwas joined #git
13:16 jackhum joined #git
13:19 jackhum can anyone suggest me which book to pickup for beginning in git vcs
13:19 Guest98451 left #git
13:19 jackhum >
13:19 jackhum ?
13:20 jackhum my messages are reaching channel ?
13:20 frobnic yes :)
13:20 jackhum ah ,lol, my irc client theme sucks
13:20 jackhum messages looks dull , so i am confused if they are passing through
13:20 qqx jackhum: !book
13:20 gitinfo jackhum: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
13:21 Tobbi joined #git
13:21 jackhum !bottomup
13:21 gitinfo 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)
13:21 jackhum wow , thanks gitinfo
13:21 gitinfo jackhum: you're welcome, but please note that I'm a bot. I'm not programmed to care.
13:21 qqx jackhum: You can also msg the bot to get the info
13:22 jackhum gitinfo , how smart are you?
13:22 jackhum qqx , is gitinfo smart bot?
13:22 jackhum gitinfo , any good book on git?
13:23 qqx I don't think it's all that smart, but I don't really know much about it.
13:23 jackhum qqx , okay
13:24 thierryp joined #git
13:26 publio joined #git
13:28 mischat joined #git
13:29 jeffreylevesque joined #git
13:31 jozwior joined #git
13:32 Rodya_ joined #git
13:32 blr joined #git
13:34 acetakwas joined #git
13:35 Cabanossi joined #git
13:36 noecc left #git
13:36 thebope joined #git
13:36 YuGiOhJCJ joined #git
13:39 star_prone joined #git
13:39 King_Hual joined #git
13:42 Endarked joined #git
13:42 Tobbi joined #git
13:42 cwnqsg joined #git
13:42 acetakwas joined #git
13:43 MarioBranco joined #git
13:43 Dougie187 joined #git
13:44 hahuang65 joined #git
13:45 DarkPsydeLord joined #git
13:45 TbobbyZ joined #git
13:47 TikityTik joined #git
13:48 oleo joined #git
13:49 DaveTaboola joined #git
13:51 r2k joined #git
13:53 Darcidride joined #git
13:54 stevehope joined #git
13:55 jdl joined #git
14:01 dviola joined #git
14:02 crose joined #git
14:02 AaronMT joined #git
14:02 bannakaffalatta joined #git
14:04 acetakwas joined #git
14:05 Cabanossi joined #git
14:06 plasticle joined #git
14:06 tcorneli joined #git
14:06 iffraff joined #git
14:06 fahadash joined #git
14:07 peterbecich joined #git
14:08 russruss joined #git
14:09 plasticle joined #git
14:10 bannakaf_ joined #git
14:15 LeBlaaanc joined #git
14:18 lohfu joined #git
14:22 rwb joined #git
14:23 zivester joined #git
14:23 cdg joined #git
14:24 UrsoBranco joined #git
14:25 roelmonnens joined #git
14:25 zivester joined #git
14:25 notebox joined #git
14:26 pbrewczynski joined #git
14:27 strk joined #git
14:27 strk is it expected for push --mirror to fail upon pushing HEAD ?
14:27 strk ! [remote rejected] refs/pull/1/head -> refs/pull/1/head (deny updating a hidden ref)
14:27 strk error: failed to push some refs to 'git@github.com:libgeos/libgeos.git'
14:28 ash_workz I forgot to checkout a new branch and committed to master; I haven't pushed it yet; I switched to a new branch and then tried to push that `git push origin newbranch` but it failed "src refspec <newbranch> does not match any."
14:28 Es0teric joined #git
14:29 ash_workz what went wrong?
14:29 ash_workz oh... weird, same command now works
14:30 thebope joined #git
14:30 drodger joined #git
14:33 Raging_Hog joined #git
14:34 rorro joined #git
14:35 earnestly joined #git
14:36 Guest37211 joined #git
14:37 thiago joined #git
14:38 _ng joined #git
14:39 b100s joined #git
14:40 al-damiri joined #git
14:40 LionsMane joined #git
14:42 Ryanar joined #git
14:43 rory left #git
14:45 s1scha joined #git
14:47 thiago joined #git
14:47 levex_ joined #git
14:49 PioneerAxon joined #git
14:49 groundnuty joined #git
14:50 groundnuty hey, why does a command:  git commit --author 'me me <me>' -m 'foo' , still asks for "*** Please tell me who you are." in the gitconfig?
14:50 Cabanossi joined #git
14:51 groundnuty (I hope it's a right place to ask such questions)
14:51 roelmonnens joined #git
14:51 raspado joined #git
14:52 qqx groundnuty: Likely for the committer info, which is tracked separately from the author info.
14:52 ojacobson groundnuty: --author doesn't set committer info
14:52 ojacobson you still need to set that, either through env vars or through git config
14:53 Cavallari joined #git
14:53 groundnuty ojacobson: is ther env variable that I can use for that?
14:53 groundnuty ojacobson: just for commiter info
14:54 groundnuty qqx: thank you for helpfull answer
14:54 ojacobson git help git
14:54 ojacobson man git
14:54 gitinfo the git manpage is available at http://jk.gs/git.html
14:54 groundnuty ojacobson: ok, thanks :)
14:54 ojacobson scroll down, the env vars are near the bottom
14:54 ojacobson there's also the -c option for setting config values on a command-by-command basis
14:59 Raging_Hog joined #git
14:59 nckpz joined #git
15:00 star_prone joined #git
15:00 ahrs joined #git
15:00 star_prone joined #git
15:02 mischat_ joined #git
15:03 overlord_tm joined #git
15:04 groundnuty ojacobson: variables like GIT_COMMITTER_NAME are also interesting
15:04 groundnuty ojacobson: thx for help :)
15:05 TbobbyZ joined #git
15:05 D092M joined #git
15:06 lavalamp joined #git
15:06 DarkPsydeLord joined #git
15:06 russruss joined #git
15:06 guampa joined #git
15:06 m00n joined #git
15:06 ddavidd joined #git
15:06 ddavidd joined #git
15:07 DarkPsydeLord joined #git
15:08 Tobbi joined #git
15:09 peterbecich joined #git
15:11 macivy joined #git
15:12 Rodya_ joined #git
15:14 Endarked joined #git
15:15 raspado joined #git
15:15 LionsMane joined #git
15:16 fakenerd joined #git
15:16 theoceaniscool joined #git
15:16 fakenerd joined #git
15:18 Snugglebash joined #git
15:20 sr___ joined #git
15:23 DarkPsydeLord joined #git
15:24 thebope joined #git
15:27 Gsham joined #git
15:28 theoceaniscool joined #git
15:30 pks joined #git
15:30 rominronin joined #git
15:30 linuxmodder joined #git
15:30 kegster joined #git
15:33 tang^ joined #git
15:34 pskhadke joined #git
15:34 rominron_ joined #git
15:34 tymczenko joined #git
15:35 TomyLobo joined #git
15:35 pskhadke joined #git
15:36 Yau joined #git
15:36 strk how do I get the list of refs ?
15:36 pskhadke left #git
15:37 pskhadke joined #git
15:37 tocka joined #git
15:38 qqx strk: git for-each-ref
15:38 DarkPsydeLord joined #git
15:39 WeiJunLi joined #git
15:39 choki joined #git
15:40 _Vi joined #git
15:41 Gustavo6046 joined #git
15:42 D092M joined #git
15:42 Oatmeal joined #git
15:44 ssarah joined #git
15:45 hahuang65 joined #git
15:47 plexigras joined #git
15:48 jagob joined #git
15:50 tyreld joined #git
15:51 hagridaaron joined #git
15:52 davimore_ joined #git
15:56 mda1 joined #git
15:58 prg3 joined #git
15:59 MacWinner joined #git
16:00 maks_ joined #git
16:00 guardian curious: why is --ignore-date incompatible with --interactive when rebasing?
16:00 russruss joined #git
16:00 thiago_ joined #git
16:01 nivag joined #git
16:02 dpower joined #git
16:03 davimore joined #git
16:05 madewokherd joined #git
16:06 m00n so im following this (https://www.keybits.net/post/automatically-use-correct-ssh-key-for-remote-git-repo/) guide more or less, and my git remote is set to the correct hostname (matches what is in my sshconfig), doing a git config --local -l shows the correct username, but when i try to git push it pushes as my other github account
16:07 m00n how can i make this local repository i need to push push with an ssh key?
16:07 selckin whats the git url, and whats in your ssh/config
16:08 selckin it should work if you did it correctly
16:08 m00n host github-m00n  Hostname github.com  User m00n-sl473r  IdentityFile ~/.ssh/github-m00nkey
16:08 jnavila joined #git
16:08 m00n thats the relevant segment of my sshconf
16:08 m00n ~/devel/gitrepos/dotfiles-public *>git remote -v                                          git:(master*) [12:04]
16:08 m00n origingit@github-m00n:m00n-sl473r/dotfiles.git (fetch)
16:08 m00n origingit@github-m00n:m00n-sl473r/dotfiles.git (push)
16:09 m00n thats the relevant gitremote
16:09 selckin try removing user from .ssh/config
16:09 kexmex joined #git
16:10 strk qqx: that worked, thanks
16:10 m00n nah
16:10 peterbecich joined #git
16:10 m00n its still picking up on my main account (this is an alt)
16:11 selckin you have differend ssh keys for the accounts right
16:11 kbs joined #git
16:11 m00n yes
16:11 m00n i just generated and added one
16:11 selckin i only see user as possible issue, there since, it should be using the "git" user
16:11 m00n oh right yeah
16:12 selckin try ssh -vv git@github-m00n and see what says about the keys
16:12 m00n but the fact that it explicitly states it should override user config (which should override the installs default config)
16:13 m00n still connects with my main
16:13 selckin yeah but it'll go like, tried key x
16:13 m00n yeah it doesnt find it
16:13 m00n thanks its a name issue
16:13 * m00n facepalms
16:14 vrach joined #git
16:18 m00n no it wasnt
16:18 m00n i forgot to add to ssh agent
16:18 Tobbi joined #git
16:18 * m00n facepalms again
16:18 nedbat I think i've asked here before if there is a way to get the current branch name, and was told it was hard.  "git rev-parse --abbrev-ref HEAD" seems to do it.  What edge cases am I overlooking?
16:18 thebope joined #git
16:19 drodger joined #git
16:19 hagridaaron joined #git
16:22 IRQ` left #git
16:22 nitric joined #git
16:24 svm_invictvs joined #git
16:24 kbs does that do what you expect on detached heads?
16:29 nedbat kbs: i don't use detached heads, so i'd be fine with whatever.
16:29 Stath joined #git
16:31 kbs someone else might be aware of other edge-cases, only one I think of when HEAD isn't present might be an empty repo
16:31 ojacobson head is present even then
16:31 ojacobson questionably valid (it points to a nonexistant branch) ut present
16:31 kbs ah - ^^
16:33 TikityTik joined #git
16:35 pskhadke joined #git
16:36 mmlb joined #git
16:39 strk I get an error like "[remote rejected] refs/pull/100/head -> refs/pull/100/head (deny updating a hidden ref)" when push --mirror'ing
16:39 digidog joined #git
16:39 strk how do I disable pushing refs/pull while mirroring ?
16:39 orbyt_ joined #git
16:39 strk I replaced `fetch = +refs/*:refs/*` with explicit lines in the [origin] section, but maybe I have to do it in the *target* remote section too ?
16:40 tvw joined #git
16:41 manuelschneid3r joined #git
16:42 amazon4BTC joined #git
16:42 fakenerd joined #git
16:44 strk I suspect I have a local refs/pull/100 which I should drop
16:44 iLembus joined #git
16:44 strk yep, indeed. How do I get rid of it ?
16:47 strk figured: git update-ref -d <ref>
16:47 pskhadke joined #git
16:48 Stath joined #git
16:49 pskhadke left #git
16:49 Rodya_ joined #git
16:51 Es0teric joined #git
16:54 Levex joined #git
16:54 GT joined #git
16:54 hagridaaron joined #git
16:55 vsakharov joined #git
16:58 freimatz joined #git
17:00 xaa__ joined #git
17:01 Ryanar joined #git
17:02 choki joined #git
17:03 gopar joined #git
17:08 Lea2 joined #git
17:08 a_thakur joined #git
17:08 tymczenko joined #git
17:09 CheckDavid joined #git
17:11 choki joined #git
17:11 hahuang65 joined #git
17:11 berndj ok, i have another "Everything up-to-date" except that it isn't - my local branch is ahead by 1 commit
17:11 Learath2 joined #git
17:11 strk left #git
17:12 peterbecich joined #git
17:12 ojacobson !transcript
17:12 gitinfo Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
17:13 thebope joined #git
17:13 hagridaaron joined #git
17:15 LionsMane joined #git
17:16 Murii joined #git
17:18 theiostream joined #git
17:18 tyreld joined #git
17:21 prg3 joined #git
17:22 hagridaaron joined #git
17:24 the_f0ster joined #git
17:25 reactormonk[m] I want to edit history, and switch out one commit for another.
17:25 reactormonk[m] ... presumably some rebase?
17:26 m00n um
17:26 m00n huh
17:26 whitby reactormonk[m]: yes, rebase
17:27 whitby You and add arbitrary lines to a rebase file
17:27 reactormonk[m] ah, cool
17:28 a_thakur joined #git
17:32 peterbecich joined #git
17:34 theskillwithin joined #git
17:35 Puffball joined #git
17:35 plasticle joined #git
17:35 gopar joined #git
17:36 mda1 joined #git
17:39 jaggz joined #git
17:39 jaggz regarding bisect: so I checked out a version and then started a bisect, and ran bisect good on it
17:40 jaggz what's the proper way to look at the future commits now?  (the log terminates at the version I checked out)
17:41 venmx joined #git
17:46 Tobbi joined #git
17:47 theiostream joined #git
17:48 venmx joined #git
17:49 irqq joined #git
17:49 berndj ok, i have another "Everything up-to-date" except that it isn't - my local branch is ahead by 1 commit; this time with shell session output: https://pastebin.com/v2zQuMAc this started happening out of the blue, usually 'git push' would just work as expected
17:49 duderonomy joined #git
17:50 nixjdm joined #git
17:50 Cabanossi joined #git
17:50 ojacobson berndj: what git version, and what (if anything) does `git config push.default` print?
17:50 ojacobson and, also, git branch -vv
17:50 jccn joined #git
17:51 Rodya_ joined #git
17:51 prg3 joined #git
17:52 berndj ojacobson: 2.1.4, push.default = simple, but i haven't changed that since years ago. * v6.5.1                   d511497 [origin/v6.5.1: ahead 1] Business card placement rule refinements.
17:53 ojacobson possible expn: `git fetch origin`
17:54 berndj yesterday i did some jiggery after seeing the same confusion, reset my local branch to a few commits back, re-pulled the remote repo and merged (avoiding a few intermediate merge commits i had locally), and then somehow that poked the push to happen. but now it's confused again
17:54 LionsMane joined #git
17:54 berndj i'd like to get to the root of this + explanation if possible, rather than "just make it work"
17:54 ojacobson yes
17:55 ojacobson If that works then I will explain the theory
17:55 berndj so i didn't do any more jiggery pokery today
17:55 ojacobson if it doesn't, then no harm in running it - all it'll do is refresh refs/remotes/origin/*
17:55 whitby jaggz: I haven't used bisect in a while but you can pass a branch name/hash to log to start from there even if that's not where you're at
17:55 Pie_Napple joined #git
17:55 whitby If that helps
17:57 berndj ok there's something weird here. ojacobson i did the fetch, and it got some 6 new commits my cow orkers made during the day, but weirdly git log --graph shows two ultimate parents. half-expected or shall i pastebin that?
17:57 ojacobson can you gist/pastebin the commands and output?
17:57 ojacobson I'll load my mental model into your brain in a sec, I promise
17:58 jaggz whitby, thanks.. :)
17:58 MattMaker joined #git
18:00 tymczenko joined #git
18:02 xall joined #git
18:02 berndj holy shit what have they done, it's like we don't have common history at all anymore
18:03 ojacobson oh ho ho
18:03 ojacobson good times
18:03 ojacobson so, here's the mental model I had: `git status` and `git branch` use refs/remotes/* to figure out ahead/behind
18:03 grawity do a `git diff` of the oldest commit from both histories
18:03 grawity curious what they rewrote :D
18:04 ojacobson these are a local cache, and are only updated by `git fetch` (and wrapping ops, like git pull) and `git push`
18:04 Sasazuka joined #git
18:04 ojacobson `git push`, on the other hand, checks the remote ref directly
18:04 berndj quick for ref: how do i get the most recent common ancestor?
18:04 ojacobson and gives up if the value you're trying to push is equal to the value stored remotely
18:04 ojacobson git merge-base will print the common ancestors
18:05 ojacobson !lol may be helpful
18:05 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
18:05 berndj holy shit^2 common ancestor goes back to november
18:05 ojacobson someone pushed a reeeebaaaaase
18:05 ojacobson (just a hypothesis)
18:05 berndj you're probably right
18:06 berndj could a force push also have done it?
18:06 ojacobson lots of things could
18:06 ojacobson that's one
18:06 rwp Just pushing isn't enough. If they rewrote history it would have needed a forced push.
18:06 berndj i just think force push is more likely than rebase, knowing these guys
18:06 grawity a force push isn't how you screw up history
18:06 grawity it's just how you *put* the screwed-up history there
18:06 Dookie12 joined #git
18:07 thebope joined #git
18:07 berndj well here's the paste just for reference. https://pastebin.com/wxkJb596
18:08 berndj i find it highly likely that your hypothesis is correct, ojacobson
18:10 ojacobson So, what's interesting there is that v6.5.1 _wasn't_ in the list of updated refs
18:10 ojacobson that does somewhat poke a hole in my theory that your local refs were stale and were misleading you
18:11 russruss joined #git
18:11 hhee joined #git
18:11 berndj oh wait that --graph log is from master, not v6.5.1
18:12 ertesx joined #git
18:13 rwp Seeing v6.5.1 feels like a tag to me rather than a branch with future development. That doesn't seem like something one would push to.
18:13 maks_ joined #git
18:13 berndj and git ls-remote shows refs/heads/v6.5.1 with a commit id that's HEAD~1 to me
18:14 berndj rwp, just take it at face value, it's a branch. git discipline isn't very good in this company
18:14 rwp okay
18:15 peepsalot joined #git
18:15 berndj the marketing type people seem to have usurped control over version naming too, so for the last few years, *everything* has been "6.5.1"
18:15 ojacobson berndj: oh shit, rwp might be onto something
18:15 ojacobson _do_ you have a tag named `v6.5.1`?
18:15 GT joined #git
18:16 berndj git tag -l shows nothing matching 6.5
18:16 t0by joined #git
18:16 berndj (releases haven't been tagged since i left permanent employ there)
18:16 ojacobson unqualified names will be resolved as refs/NAME, refs/tags/NAME, refs/heads/NAME, then some other stuff, in that order
18:16 ojacobson hence the q
18:16 ojacobson just for grins, does `git push origin refs/heads/v6.5.1` (making the source and target of the push explicit) do what you wanted `git push` to do? Either answer will help narrow down what happened
18:17 ojacobson as would `git show-ref` and `git ls-remote origin` output
18:17 berndj refs/heads/v6.5.1 is literally the only thing in ls-remote output that contains the substring "6.5.1"
18:18 maks_ joined #git
18:18 berndj `git push origin refs/heads/v6.5.1` pushed something!
18:19 ojacobson great, there's some ref ambiguity somewhere
18:19 ojacobson that's super helpful :)
18:19 berndj although now it's changed the state of things
18:19 ojacobson `git push` isn't pushing what you think it's pushing. Now, why?
18:19 maks_ joined #git
18:19 ojacobson Yeah, that'll happen
18:19 ojacobson I suppose I should have suggested --dry-run
18:19 berndj i mean we've touched the heissenbug
18:20 jaggz git bisect suspect foo.cpp  # <-- would be neat for biasing the bisections a bit :)
18:20 berndj i have root on the remote server and can check things there if it'd help?
18:21 Darren_ joined #git
18:21 irqq_ joined #git
18:22 Dookie12 joined #git
18:22 Dookie14 joined #git
18:22 Bass10 joined #git
18:24 Tobbi joined #git
18:25 ethali joined #git
18:25 Sasazuka joined #git
18:26 notebox joined #git
18:26 maks_ joined #git
18:27 berndj ojacobson, here's my .git/config btw: https://pastebin.com/QbkD0f2r i remember now i added remote.origin.push about 2 weeks ago. aah, did i thereby give git amnesia about non-namespaced branches?
18:28 berndj i added that because i wanted to push my feature branch berndj/foo to the remote repo
18:28 ojacobson Beyond my ken but you likely don't need that push spec to accomplish that specific goal
18:28 berndj but i guess with that setting git no longer knows how to push v6.5.1 anymore?
18:28 ojacobson an alias equivalent to `git push origin 'berndj/*'` would probably be easier to reason about
18:29 trondth joined #git
18:30 gunner_ joined #git
18:32 theoceaniscool joined #git
18:33 raczek joined #git
18:33 qqx berndj: Right, git needs a refspec to be able to push to the normal branches.
18:33 raczek left #git
18:33 qqx You can have multiple refspecs for push, by repeating "push =".
18:33 russruss_ joined #git
18:34 berndj qqx, should i then just be able to delete the 'berndj' leg of that refspec on both sides of the ':'?
18:35 berndj i think i added it when i wanted to push my local feature branch, git wouldn't let me, then i changed things thinking i knew what i was doing
18:36 berndj now i can't remember if the setting was previously push = refs/heads/*:refs/heads/* or just missing
18:36 ojacobson generally just missing
18:36 maks_ left #git
18:36 gunner_ Hello, I am setting up git for a WordPress website. I will have a local machine git repo and push changes to a remote repo and use webhooks to achieve auto-deployment on a development server. However, of course WordPress itself can modify plugin installs/updates on the server itself (say plugin update). How can I go about ensuring WordPress can update files and still make successful pulls?
18:36 ojacobson `git remote add` sets url and fetch, and that's it
18:37 qqx berndj: By default remotes don't specify a push refspect in the config and so pick up an internal default.
18:37 gunner_ Last week I tried to pull some changes to the server that had updated plugins (that had not been pushed yet) and it caused a huge headache.
18:38 maks_ joined #git
18:39 ziombelas joined #git
18:39 berndj thanks for the help folks, i'll see next time i have a change to push whether my footgun removal helped
18:40 Acerific joined #git
18:40 Zialus joined #git
18:41 davimore joined #git
18:41 moritz gunner_: the only reliable way is to not let the production wordpress do any updates
18:41 moritz gunner_: instead, do it in a dev or testing environment, and commit all changes your git repo
18:41 m0viefreak joined #git
18:42 moritz which has the additional advantage of your wordpress not potentially hosing production through an update gone wrong
18:42 moritz because you can, like, test it before, in a different environment
18:43 berndj or potentially getting your site trashed when someone finds a vulnerable plugin
18:43 ziombelas joined #git
18:43 russruss joined #git
18:44 raynold joined #git
18:44 sunri5e joined #git
18:45 finalbeta joined #git
18:46 courrier joined #git
18:47 gunner_ Ok, so there is not really anyway to have files treated as if they were in .gitignore but still be tracked? I agree, and that is def the preferred method. Reason I was kind of looking for an alternative is right now we only have a few test/dev servers and often times a designer will be working on the front end and add or update a plugin for use. I would like to avoid having a bunch of conflicts if an update happens and work is done
18:47 gunner_ before someone can go in and commit the changes
18:48 Forlorn joined #git
18:49 grawity tracked and ignored is a contradiction in terms
18:50 Cabanossi joined #git
18:51 TbobbyZ_ joined #git
18:52 gunner_ Well ok, I mean to say is track changes to File A but also ignore any differences between it and the version on remote. So I could push File A to remote but never pull.
18:52 russruss joined #git
18:55 moritz gunner_: have the designers work in dethe dev environment, not in prod
18:55 moritz *the
18:55 gunner_ I am talking about dev
18:56 moritz ok
18:56 moritz well, the conflicts must be resolved some way
18:56 Gsham joined #git
18:56 ResidentBiscuit joined #git
18:57 Es0teric joined #git
18:57 Levex joined #git
19:00 nedbat joined #git
19:00 nitric +gunner: you could have a config.example file in git, and have each designer copy it to "config" (without the .example) in each working copy. that puts the burden on the local working copy to resolve updates to the "true" config file
19:01 thebope joined #git
19:01 russruss joined #git
19:03 levex_ joined #git
19:05 gunner_ Maybe I am missing something. Yesterday, as a test I created a branch and did some work. Meanwhile, I updated a plugin. The resulting commit created a huge list of conflicts (from the plugin update). Is there a way to accept a version on a directory basis?
19:05 rcn joined #git
19:07 Ryanar joined #git
19:09 rcn joined #git
19:09 planigan joined #git
19:12 rcn joined #git
19:13 sequence_ joined #git
19:14 durre joined #git
19:17 hahuang61 joined #git
19:23 Levex joined #git
19:23 crunchers joined #git
19:28 Forlorn joined #git
19:29 cfoch-always joined #git
19:29 cfoch-always hi
19:29 gitinfo cfoch-always: 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.
19:31 BSaboia joined #git
19:31 phantombeta joined #git
19:32 jesst joined #git
19:32 phantombeta left #git
19:34 Endarked joined #git
19:35 davimore_ joined #git
19:36 Cabanossi joined #git
19:36 cfoch-always I want to do "git diff commit1..commit2 path_to_file" where path_to_file is a deleted file in "commit1"... how can I show the last diff=
19:36 cfoch-always ??
19:37 star_prone joined #git
19:37 levex_ joined #git
19:38 cfoch-always I get this error
19:38 cfoch-always fatal: ambiguous argument 'ext/nas/nassink.h': unknown revision or path not in the working tree.
19:38 theiostream joined #git
19:38 plasticle joined #git
19:39 guardian is there a way to list commits containing a blob?
19:40 ResidentBiscuit joined #git
19:40 cfoch-always hi... ?
19:41 Seveas guardian: only if the blob always is the same file
19:41 guardian I see
19:43 Levex joined #git
19:44 TbobbyZ joined #git
19:47 guardian thanks
19:48 theiostream joined #git
19:48 tymczenko joined #git
19:48 planigan joined #git
19:51 luke_nukem joined #git
19:51 tinanoo1 joined #git
19:54 Tobbi joined #git
19:55 thebope joined #git
19:55 Forlorn joined #git
19:56 jstimm joined #git
20:00 thebope joined #git
20:01 russruss joined #git
20:01 Arokh joined #git
20:04 Taikibansei joined #git
20:06 venmx joined #git
20:07 thallada joined #git
20:10 cdg joined #git
20:11 durham joined #git
20:12 ZyX-I joined #git
20:15 rosiu joined #git
20:16 sotoz joined #git
20:17 nowhere_man joined #git
20:20 jesst_ joined #git
20:20 jesst_ joined #git
20:22 planigan joined #git
20:23 Ryanar joined #git
20:23 thallada joined #git
20:27 ethali joined #git
20:29 Es0teric joined #git
20:29 cfoch-always is it possible to "git checkout" interactively
20:29 cfoch-always ?
20:29 cfoch-always like "git add -p" ?
20:29 _ikke_ try git checkout -p :-)
20:30 cfoch-always xD
20:30 cfoch-always yes, I've just noted that
20:31 hashtagstrashtag joined #git
20:32 choki joined #git
20:33 planigan joined #git
20:34 aidalgol joined #git
20:35 toothe anyone added that bash add-on to git?
20:35 b100s joined #git
20:35 toothe man, git is really cool
20:36 durham joined #git
20:40 irqq joined #git
20:41 bannakaffalatta joined #git
20:41 orbyt_ joined #git
20:43 Endarked joined #git
20:43 JJtG joined #git
20:46 marianina8 joined #git
20:47 _Vi joined #git
20:48 _ikke_ what bash add-on
20:49 akkad joined #git
20:52 Es0teric joined #git
20:53 Rodya_ joined #git
20:53 rorro joined #git
20:54 _28_ria joined #git
20:54 kadoban joined #git
20:54 thebope joined #git
20:55 eflynt joined #git
20:57 eflynt joined #git
20:59 eightg joined #git
21:00 cjohnson I agree toothe the manpage is really cool
21:00 cjohnson :P
21:00 onmeac joined #git
21:00 jesst_ joined #git
21:00 peterbecich joined #git
21:04 russruss joined #git
21:05 Sasazuka__ joined #git
21:07 [Brain]2 joined #git
21:08 rwb joined #git
21:11 onmeac joined #git
21:13 kadoban_ joined #git
21:14 nowhere_man joined #git
21:16 jost_ joined #git
21:16 Rodya_ joined #git
21:18 lmatteis joined #git
21:20 livingstn joined #git
21:21 nowhere_man joined #git
21:24 a3Dman joined #git
21:24 a3Dman joined #git
21:24 marianina8 joined #git
21:26 nowhere_man joined #git
21:28 marianina8 joined #git
21:28 eflynt joined #git
21:29 star_prone joined #git
21:31 kexmex joined #git
21:32 nowhereman joined #git
21:32 p4trix joined #git
21:33 anuxivm joined #git
21:33 LionsMane joined #git
21:35 cagomez joined #git
21:37 jonez joined #git
21:37 jonez greetings
21:37 ljc joined #git
21:38 nckpz joined #git
21:41 aw1 joined #git
21:41 dsdeiz joined #git
21:41 dsdeiz joined #git
21:41 peterbecich joined #git
21:42 bronson joined #git
21:43 govg joined #git
21:44 bannakaffalatta joined #git
21:48 a3Dman joined #git
21:48 a3Dman joined #git
21:48 thebope joined #git
21:49 VladGh joined #git
21:52 manuelschneid3r joined #git
21:54 ssarah joined #git
21:56 exotime joined #git
21:57 dave0x6d joined #git
21:57 Xenophon1 joined #git
22:00 peterbecich joined #git
22:01 tmg joined #git
22:02 Gsham joined #git
22:05 Dougie187 left #git
22:11 kristofferR joined #git
22:14 wouter0100 joined #git
22:14 Sasazuka joined #git
22:16 orbyt_ joined #git
22:25 r0siu joined #git
22:27 dirtyroshi joined #git
22:35 livingstn joined #git
22:37 madewokherd joined #git
22:37 telephone joined #git
22:37 telephone joined #git
22:38 TikityTik joined #git
22:40 hahuang65 joined #git
22:42 thebope joined #git
22:45 a3Dman joined #git
22:47 scoobertron joined #git
22:50 NwS joined #git
22:52 zezba9000 joined #git
22:53 zezba9000 is it possible to check the status of a local remote branch "origin/master" with the servers copy?
22:54 zezba9000 ...before fetching files
22:54 zezba9000 in short see if it is behind or ahead of the servers copy
22:55 preaction zezba9000: ls-remote origin
22:55 dendazen joined #git
22:56 Es0teric joined #git
22:56 a3Dman joined #git
22:56 a3Dman joined #git
22:57 zezba9000 preaction: ok tnx, so I can compare with "git rev-parse HEAD"
22:58 preaction probably "origin/master", not HEAD
22:58 zezba9000 ya was just going to say that
22:58 preaction and it might need to be "refs/heads/origin/master", but whatevz
22:59 zezba9000 so I can use "git ls-remote origin master" and compare with "git rev-parse origin/master" !!!
22:59 zezba9000 awesome tnx
23:00 preaction if you want to know if it's behind or ahead, you can see if the commit on the remote is reachable from your local origin/master
23:00 aw1 joined #git
23:00 preaction if it is reachable, then you're ahead. if it's not reachable, you're behind
23:00 NwS joined #git
23:00 zezba9000 good to know. For this I only need to know if they don't equal one another
23:01 nemesit|znc joined #git
23:03 aw1 joined #git
23:08 sunri5e joined #git
23:09 Tobbi joined #git
23:14 zivester joined #git
23:17 XenophonF joined #git
23:19 star_prone joined #git
23:19 askb joined #git
23:20 drodger joined #git
23:21 Ryanar joined #git
23:21 tocka joined #git
23:22 hahuang65 joined #git
23:29 ski7777 joined #git
23:33 Yuuray joined #git
23:34 hahuang61 joined #git
23:34 zezba9000 preaction: so git ls-remote doesn't accually check the server?
23:35 svm_invictvs joined #git
23:35 zezba9000 I did a commit to my code but git ls-remote shows the same change set as git rev-parse origin/master?
23:37 thebope joined #git
23:37 zezba9000 there must be a way to pull the last changeset ID from the server without fetching?
23:40 TbobbyZ_ joined #git
23:41 Gsham joined #git
23:42 a_thakur joined #git
23:47 russruss joined #git
23:47 Noodlewitt joined #git
23:49 venmx joined #git
23:49 peterbecich joined #git
23:50 irqq joined #git
23:50 Cabanossi joined #git
23:52 polyrob joined #git
23:54 RWAG joined #git
23:54 zezba9000 guess I have to do "git fetch origin master --dry-run" Is this the only option?
23:56 a3Dman joined #git
23:56 thiago joined #git
23:56 Tobbi_ joined #git

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