Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-28

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

All times shown according to UTC.

Time Nick Message
00:02 mquin_ joined #git
00:03 noahsussman joined #git
00:04 yanome joined #git
00:04 johtso joined #git
00:04 [diecast] joined #git
00:05 jgrasser joined #git
00:05 Bigcheese joined #git
00:05 PeterReid joined #git
00:05 davidstrauss joined #git
00:05 pfg joined #git
00:05 sfan786_ joined #git
00:05 howitdo joined #git
00:05 howitdo joined #git
00:06 ToBeCloud joined #git
00:06 LeBlaaanc joined #git
00:06 da5id joined #git
00:06 Lowell joined #git
00:07 ahrs joined #git
00:07 bl0m1 joined #git
00:07 jor joined #git
00:07 Phanes joined #git
00:07 Phanes joined #git
00:07 devhost joined #git
00:07 uidzer0 joined #git
00:08 Cerise joined #git
00:08 Cerise joined #git
00:08 Nevik joined #git
00:08 duderonomy joined #git
00:09 Blendify joined #git
00:09 Hedgework joined #git
00:09 marcoslater joined #git
00:10 thebope joined #git
00:10 Blendify so I had my editor to do white space cleanup but after looking at my local changes I relieved that I had that turned on. Is there a way to revert white space changes?
00:10 johnnyfive joined #git
00:10 nsh joined #git
00:11 m1dnight_ joined #git
00:11 Gunni joined #git
00:11 M-ou-se joined #git
00:11 fragMental joined #git
00:11 asd5a joined #git
00:11 rcn joined #git
00:12 daopu[m] joined #git
00:12 jokester joined #git
00:12 UncleCJ joined #git
00:12 sparr joined #git
00:12 meZee joined #git
00:13 McKraken_zzzzz joined #git
00:13 idmistir joined #git
00:13 idmistir joined #git
00:13 fuzzmz joined #git
00:14 ensign_ joined #git
00:14 girk joined #git
00:14 errr joined #git
00:15 hexa- joined #git
00:15 MatthewAllan93 joined #git
00:16 jstimm joined #git
00:17 dedicated joined #git
00:17 MatthewAllan93 joined #git
00:17 hagabaka joined #git
00:17 raijin joined #git
00:18 cores joined #git
00:18 Fissure joined #git
00:18 madduck joined #git
00:20 dedicated_ joined #git
00:22 dorkmafia thanks osse
00:22 e14 joined #git
00:23 nevodka joined #git
00:23 zifnab joined #git
00:23 KG4PEQ_ joined #git
00:24 Darren_ joined #git
00:25 madewokherd joined #git
00:26 trelane joined #git
00:26 trelane joined #git
00:29 bufferoverflow joined #git
00:29 MattMaker joined #git
00:29 rodan joined #git
00:31 hlam joined #git
00:31 Virox joined #git
00:32 MattMaker joined #git
00:32 durham joined #git
00:33 trip joined #git
00:34 nickabbey joined #git
00:34 matoro joined #git
00:34 Ryanar joined #git
00:35 dtrott joined #git
00:37 thebope_ joined #git
00:38 buckowski joined #git
00:40 thebope joined #git
00:40 dsdeiz joined #git
00:40 dsdeiz joined #git
00:40 MattMaker joined #git
00:42 puff joined #git
00:42 puff Good evening.
00:44 safe joined #git
00:45 thebope joined #git
00:48 diogenese joined #git
00:51 Droolio joined #git
00:52 hugh joined #git
00:53 nedbat puff: hey there
00:58 marianina8 joined #git
00:59 nowhere_man joined #git
01:00 Gsham joined #git
01:02 kbs left #git
01:04 Droolio joined #git
01:06 brendyn joined #git
01:12 Droolio joined #git
01:12 Guma joined #git
01:14 matoro joined #git
01:14 raspado_ joined #git
01:15 yaewa joined #git
01:17 raijin joined #git
01:18 thebope joined #git
01:19 dviola joined #git
01:20 moei joined #git
01:21 polyrob joined #git
01:22 peterbec` joined #git
01:22 Guma joined #git
01:23 acidjnk joined #git
01:25 humboldt joined #git
01:25 clemf joined #git
01:26 Electrom_ joined #git
01:28 checkItOut joined #git
01:30 dsdeiz joined #git
01:30 dsdeiz joined #git
01:35 nowhereman joined #git
01:40 brent___ joined #git
01:41 pur3eval joined #git
01:41 thiago joined #git
01:42 gtristan joined #git
01:42 humboldt joined #git
01:50 fuzzmz joined #git
01:55 dtrott joined #git
01:58 UniFreak joined #git
01:58 menip joined #git
02:00 ResidentBiscuit joined #git
02:01 raspado joined #git
02:01 angular_mike_ joined #git
02:01 rivarun joined #git
02:01 wizonesolutions joined #git
02:03 rchavik joined #git
02:04 lkraider joined #git
02:05 nb_bez___ joined #git
02:07 Gsham joined #git
02:10 nickabbey joined #git
02:11 Ryanar joined #git
02:11 ResidentBiscuit joined #git
02:12 Vampire0_ joined #git
02:12 joshszep joined #git
02:14 rivarun joined #git
02:14 raspado joined #git
02:15 rodan joined #git
02:16 lkraider joined #git
02:17 fuzzmz joined #git
02:18 auzty joined #git
02:25 Limes_ joined #git
02:25 dtrott joined #git
02:26 NightMonkey joined #git
02:26 finalbeta joined #git
02:27 WayToDoor joined #git
02:28 dreiss joined #git
02:30 Random832 joined #git
02:31 rivarun joined #git
02:32 rodan joined #git
02:34 finalbeta joined #git
02:36 jameser joined #git
02:39 d^sh joined #git
02:40 kasual joined #git
02:41 e14 joined #git
02:47 ResidentBiscuit joined #git
02:47 xall joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | We are aware of the SHA-1 collision. See: http://jk.gs/t/a4 | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:50 matoro joined #git
02:52 aavrug joined #git
02:53 dsdeiz joined #git
02:53 dsdeiz joined #git
02:56 pur3eval joined #git
03:02 Gsham joined #git
03:03 ejb joined #git
03:03 ojdo joined #git
03:06 pur3eval joined #git
03:08 fstd_ joined #git
03:09 hexagoxel joined #git
03:09 xall joined #git
03:10 gopar joined #git
03:11 kyan joined #git
03:12 Sample joined #git
03:17 NightMonkey joined #git
03:17 Vortex34 joined #git
03:19 gelei007 joined #git
03:20 finalbeta joined #git
03:21 alexandre9099 joined #git
03:23 stoopkid joined #git
03:24 gelei007 joined #git
03:32 sparr joined #git
03:33 durham_ joined #git
03:35 sbulage joined #git
03:38 _UniFreak joined #git
03:39 clemf joined #git
03:41 brent__ joined #git
03:42 rivarun joined #git
03:42 jstimm joined #git
03:44 cqi joined #git
03:44 NightMonkey joined #git
03:44 govg joined #git
03:45 chachasmooth joined #git
03:45 sunri5e joined #git
03:46 ResidentBiscuit joined #git
03:48 raijin joined #git
03:52 venmx joined #git
03:55 dhollinger joined #git
03:55 durham joined #git
03:56 redhedded1 joined #git
03:58 offtopik joined #git
04:00 Emperor_Earth joined #git
04:03 jimsio joined #git
04:04 durham joined #git
04:04 MattMaker joined #git
04:05 durham joined #git
04:08 NightMonkey joined #git
04:09 MattMaker joined #git
04:10 xall joined #git
04:11 Darren_ joined #git
04:12 MattMaker joined #git
04:13 Ranhir joined #git
04:14 cdown joined #git
04:15 pur3eval joined #git
04:15 a_thakur joined #git
04:17 a_thakur_ joined #git
04:18 WayToDoor joined #git
04:19 ruxu joined #git
04:22 dreiss joined #git
04:23 duderonomy joined #git
04:25 raspado joined #git
04:26 Ranhir joined #git
04:27 nowhereman joined #git
04:31 ffilozov joined #git
04:33 InfoTest joined #git
04:35 xall joined #git
04:36 joshszep joined #git
04:36 LiftLeft joined #git
04:37 strugee joined #git
04:41 pur3eval joined #git
04:42 Afforess joined #git
04:42 sargentmki joined #git
04:45 dave0x6d joined #git
04:47 Atm0spher1c joined #git
04:49 Cabanoss- joined #git
04:49 SteffanW joined #git
04:53 BlueMatt joined #git
04:54 brent__ joined #git
04:54 Darren_ joined #git
05:00 peterbec` joined #git
05:03 ankit01ojha joined #git
05:06 watabou joined #git
05:06 ayogi joined #git
05:09 bufferoverflow joined #git
05:13 jungsubk joined #git
05:13 Darren_ joined #git
05:13 durham joined #git
05:14 thebird joined #git
05:18 drodger joined #git
05:18 clemf joined #git
05:18 Noodlewitt joined #git
05:21 Noodlewitt joined #git
05:23 MattMaker joined #git
05:28 MACscr joined #git
05:31 kenansulayman joined #git
05:34 sargentmki joined #git
05:36 lucido-cl joined #git
05:37 muhannad_______ joined #git
05:40 humboldt joined #git
05:44 cdown joined #git
05:48 netj joined #git
05:50 sbulage joined #git
05:52 dvaske_ joined #git
05:54 rscata joined #git
05:57 WayToDoor joined #git
05:58 danielitit_ joined #git
05:59 cdown_ joined #git
06:02 cdown joined #git
06:02 MineCoins joined #git
06:05 pur3eval joined #git
06:07 orbyt_ joined #git
06:13 chachasmooth joined #git
06:13 dec0n joined #git
06:14 thebope joined #git
06:15 osse dorkmafia: that !env alias was for you btw
06:18 nowhereman joined #git
06:19 re1 joined #git
06:23 pifon joined #git
06:23 dedicated joined #git
06:24 gk-1wm-su joined #git
06:24 gk-1wm-su left #git
06:26 raspado joined #git
06:26 laroi joined #git
06:28 sargentmki joined #git
06:28 acetakwas joined #git
06:28 User458764 joined #git
06:30 navidr joined #git
06:30 jason237 joined #git
06:31 peterbec` joined #git
06:34 kisonecat joined #git
06:41 pur3eval joined #git
06:44 dersand joined #git
06:45 venmx joined #git
06:46 bannakaffalatta joined #git
06:47 ThomasLocke joined #git
06:47 ThomasLocke joined #git
06:47 zeroed joined #git
06:48 darkbit joined #git
06:51 kisonecat joined #git
06:51 __rgn joined #git
06:52 jstimm joined #git
06:52 ruxu joined #git
06:54 chigang joined #git
06:55 dtrott joined #git
06:56 ToBeCloud joined #git
06:57 lordjancso joined #git
06:57 muhannad_______ joined #git
06:58 diogenese joined #git
07:00 bocaneri joined #git
07:00 Raging_Hog joined #git
07:01 qt-x joined #git
07:01 __rgn joined #git
07:02 marianina8 joined #git
07:03 kisonecat joined #git
07:07 theoceaniscool joined #git
07:11 JeroenT joined #git
07:12 ruxu joined #git
07:14 matoro joined #git
07:15 jason237 joined #git
07:15 Fissure joined #git
07:18 cdown joined #git
07:18 joshszep joined #git
07:18 bocaneri joined #git
07:18 cyphase joined #git
07:19 joshszep joined #git
07:20 JeroenT joined #git
07:22 thebope joined #git
07:25 imack joined #git
07:27 cdown joined #git
07:28 bschindler joined #git
07:30 ABR joined #git
07:30 ABR left #git
07:32 bket joined #git
07:32 bschindler Hi - when I set in gitattributes * text=auto, does git perform CRLF conversion on checkout, or is this not specified?
07:32 bschindler I tried it on a windows machine and crlf was performed. Yet, I'm unsure whether its due to autocrlf or whether its due to text=auto
07:33 vuoto joined #git
07:34 chele joined #git
07:35 tvw joined #git
07:35 _ikke_ bschindler: the conversion happens between the index and the working tree
07:35 _ikke_ so yes
07:36 bschindler _ikke_, so it happens in both directions
07:37 _ikke_ bschindler: read the "end-of-line normalization" section in man gitattributes
07:37 gitinfo bschindler: the gitattributes manpage is available at http://jk.gs/gitattributes.html
07:37 bschindler _ikke_, I did which is why I came here.
07:38 _ikke_ alright
07:38 mehola joined #git
07:38 bschindler _ikke_, what the manpage says is this: "When a text file is normalized, its line endings are converted to LF in the repository"
07:38 bschindler which is good
07:39 bschindler what I am asking is - lets say I do a git clone of a repository on windows. Does text=auto give me a crlf file when it produces the working copy
07:39 bschindler and the man page doesn't say unfortunately
07:40 _ikke_ "Setting this variable to "true" is the same as setting the text attribute to "auto" on all files and core.eol to "crlf". Set to true if you want to have CRLF line endings in your working directory and the repository has LF line endings."
07:40 _ikke_ This is what config autocrlf says
07:41 bschindler yes, the issue with autocrlf is that it is a config variable which means it has to be set on every machine. But I'd like to control the behavior on a repository level which is why I turned to attributes
07:41 DaYwalKer joined #git
07:42 _ikke_ sure, I'm not suggesting you should set it, it just gives a little bit more context
07:44 xall joined #git
07:44 doener joined #git
07:44 a_thakur joined #git
07:47 ferr1 joined #git
07:47 freimatz joined #git
07:48 ToxicFrog joined #git
07:49 y_sekino joined #git
07:50 EV3RYDAYPR0GRESS joined #git
07:54 Cymew joined #git
07:56 dtrott joined #git
07:56 bruce_lee joined #git
08:00 gk-1wm-su joined #git
08:01 tlaxkit joined #git
08:02 King_Hual joined #git
08:02 karstensrage joined #git
08:06 Naan joined #git
08:08 Rh0nda left #git
08:08 Rhonda joined #git
08:08 filcab joined #git
08:09 rvgate joined #git
08:10 gusnan joined #git
08:10 gusnan joined #git
08:10 rvgate joined #git
08:12 TomyWork joined #git
08:12 gusnan_ joined #git
08:13 chachasmooth joined #git
08:14 glnz joined #git
08:14 absinthe joined #git
08:14 pur3eval joined #git
08:17 xall joined #git
08:18 jagob joined #git
08:19 _28_ria joined #git
08:20 Parham73 joined #git
08:20 nkuttler i have a line in a commit that has been moved around a few files, is there a shortcut to track down the initial commit?
08:21 elect_ joined #git
08:22 Parham73 left #git
08:22 svm_invictvs joined #git
08:23 Taikibansei joined #git
08:26 raspado joined #git
08:27 osse nkuttler: try git log -L lineno,lineno:filename
08:27 _UniFreak joined #git
08:27 osse maybe add --follow. I'm not sure
08:29 moritz you could also use tig, with tig blame -M thefile
08:29 moritz and then use , (I think) to jump to the previous commit touching the line
08:31 dvaske joined #git
08:31 nutron joined #git
08:32 _ng joined #git
08:34 lgfelicio joined #git
08:34 a_thakur joined #git
08:35 theoceaniscool joined #git
08:37 ruxu joined #git
08:39 xaa__ joined #git
08:39 a_thakur joined #git
08:39 acetakwas joined #git
08:40 thebope joined #git
08:41 LuizGustavo1515 joined #git
08:41 Balliad joined #git
08:44 trudko joined #git
08:45 trudko Hi everyone, how to make diff changes caused by change of formatting easier? now I have whole blocked marked as changed when formattings change(lets say tab length from 2 to 4) and it hard to see other changes in same code
08:49 osse trudko: git diff -b or -w
08:49 trudko thank you will check it
08:53 Takumo joined #git
08:53 Takumo joined #git
08:56 ozmage joined #git
08:57 ozmage joined #git
08:57 dtrott joined #git
08:59 flaviodesousa|2 joined #git
09:01 windy-black joined #git
09:01 mikecmpbll joined #git
09:02 testus_ joined #git
09:03 C0r3 joined #git
09:03 C0r3 I had staged my changes and then I modified again. How do I get back to what I staged
09:03 marianina8 joined #git
09:04 jast 'git status' tells you, basically 'git checkout -- <files>'
09:05 jast git checkout -p to undo each hunk individually
09:05 moritz or to unstage, git reset HEAD <file>
09:06 thebope_ joined #git
09:06 overlord_tm joined #git
09:06 C0r3 jast: Thanks. Worked.
09:07 ResidentBiscuit joined #git
09:08 windy-black joined #git
09:08 windy-black how to clone a local svn repo with a git svn clone? the repo is in /tmp/test-svn. Executing git svn clone file:///tmp/test-svn trunk2 doesn't work. And SVN.pm at line 148 complaints about being unable to open repository.
09:09 Whiskey joined #git
09:09 moritz does svn even work without a server?
09:09 GodGinrai joined #git
09:09 chachasmooth joined #git
09:12 xall joined #git
09:13 thebope joined #git
09:13 bernardio joined #git
09:18 blackwind_123 joined #git
09:23 JanC_ joined #git
09:24 acetakwas joined #git
09:24 xall joined #git
09:25 ahr3n joined #git
09:26 kurkale6ka joined #git
09:26 ismithers joined #git
09:26 YuGiOhJCJ joined #git
09:27 PaulCapestany joined #git
09:28 notebox joined #git
09:30 bomb-on joined #git
09:31 Levex joined #git
09:34 b100s joined #git
09:35 Tobbi joined #git
09:37 Snugglebash joined #git
09:38 lgff joined #git
09:40 bernardio joined #git
09:40 dragoonis joined #git
09:45 nettoweb joined #git
09:46 aaa_ joined #git
09:46 seni joined #git
09:46 git_student joined #git
09:46 zeroed joined #git
09:47 s1scha_ joined #git
09:47 redeemed joined #git
09:48 git_student Hello! Please tell, how to force git-log --graph to show at least one commit for every branch I see?
09:48 i7c --all
09:50 _ikke_ --branches would only show branches (--all also shows tags and remote tracking branches)
09:50 moritz also, add --decorate to the mix
09:52 mehola joined #git
09:52 bipolar joined #git
09:53 kisonecat joined #git
09:54 _ikke_ moritz: right
09:56 bgerber joined #git
09:56 git_student how to force git-log --graph to show info for every branch we see https://paste.debian.net/917213/ ??
09:56 MattMaker joined #git
09:57 g105b joined #git
09:57 _ikke_ git_student: We just gave some suggestions
09:57 _ikke_ git_student: add --decorate
09:57 _ikke_ git_student: What kind of info are you looking for?
09:58 git_student @_ikke_  I need to see last commit in branch. --decorate does not have this effect(
09:59 chll_ joined #git
10:00 git_student not only pipes, but last (one before current) commit info
10:01 git_student may be we need to change output order to topological so something like this...?
10:01 _ikke_ git_student: perhaps --simplify-by-decoration?
10:02 _ikke_ But that might hide too much?
10:02 _ikke_ git_student: by adding -3, you will see no more than 3 commits
10:02 _ikke_ so that's not going to work
10:03 pur3eval joined #git
10:04 marianina8 joined #git
10:05 git_student :_ikke_  --simplify-by-decoration does exactly this))) Thank you so much!!!
10:05 ShapeShifter499 joined #git
10:05 koneko joined #git
10:06 manuelschneid3r joined #git
10:07 PtxDK joined #git
10:08 git_student _ikke_: ohh  --simplify-by-decoration does exactly shows "Commits that are referred by some branch or tag are selected. " but not the previous...
10:13 PaulCapestany joined #git
10:15 Phobos531 joined #git
10:15 Tobbi joined #git
10:16 powkref joined #git
10:16 achadwick joined #git
10:16 powkref joined #git
10:16 Phobos531 I have two instances of source code, each reaching around 800 MB size. What would be the most appropriate (if any) way to get this on github? I'm asking because of Github's 1GB limit. Context: I'll be uploading Lolipop and Marshmallow kernel source code to help make custom ROMs for my device
10:17 hussam joined #git
10:18 powkref joined #git
10:18 timthowtdi joined #git
10:18 powkref joined #git
10:19 markelite joined #git
10:20 powkref joined #git
10:21 hhee joined #git
10:21 cyphase joined #git
10:22 aard_ joined #git
10:22 afuentes joined #git
10:23 CussBot joined #git
10:23 POQDavid joined #git
10:24 kritzikratzi joined #git
10:24 hardik_ joined #git
10:24 MineCoins joined #git
10:26 thebird joined #git
10:26 tobiasvl !crosspost
10:26 gitinfo Note: The above question was posted in both #git and #github
10:27 Sheogorath[m] joined #git
10:27 rancyd joined #git
10:27 raspado joined #git
10:30 jstein_ joined #git
10:33 thebope joined #git
10:36 irqq joined #git
10:46 Sonderblade joined #git
10:46 dedicated_ joined #git
10:47 cyphase joined #git
10:50 cdleonard joined #git
10:50 User458764 joined #git
10:52 borkr joined #git
10:56 n1ce joined #git
10:57 MattMaker joined #git
10:57 johnlage joined #git
10:58 nettoweb joined #git
10:59 thebope_ joined #git
10:59 __rgn joined #git
11:04 elisa87 joined #git
11:04 pur3eval joined #git
11:05 Anja joined #git
11:05 Phobos531 joined #git
11:07 theoceaniscool joined #git
11:08 ResidentBiscuit joined #git
11:10 venmx joined #git
11:10 kritzikratzi joined #git
11:14 theoceaniscool joined #git
11:15 Snugglebash joined #git
11:18 MineCoins joined #git
11:18 cyphase joined #git
11:20 _cyril_ joined #git
11:20 hardik_ joined #git
11:23 rivarun joined #git
11:24 Learath2 joined #git
11:25 Tobbi joined #git
11:30 mcortinas joined #git
11:32 lordjancso joined #git
11:33 mcortinas hello! i want remove a submodule but i need request to all my team delete manually files once the submodule has deleted in the origin master branch
11:33 mcortinas some body know some workaround in order to don't request this to all my team members????
11:34 tobiasvl mcortinas: why do you need request? I don't understand the question
11:39 thebird joined #git
11:39 masuberu joined #git
11:40 mehs joined #git
11:42 shinnya joined #git
11:47 am2on joined #git
11:47 dyce[m] joined #git
11:47 unclechu joined #git
11:47 KevinMGranger[M] joined #git
11:47 Jarrah[m] joined #git
11:47 dikiaap joined #git
11:47 Elliott[m]1 joined #git
11:47 elwan7[m] joined #git
11:47 heftig[m] joined #git
11:47 srkrishna[m] joined #git
11:47 M-meznak joined #git
11:47 Remramm joined #git
11:47 aviraldg joined #git
11:47 musicmatze[m] joined #git
11:47 SpEcHiDe joined #git
11:47 monomon[m] joined #git
11:47 patrickr[m] joined #git
11:47 daopu[m] joined #git
11:47 hiq[m] joined #git
11:47 UncleCJ joined #git
11:47 Salander27 joined #git
11:47 evanc joined #git
11:47 flo[m] joined #git
11:47 saintaquinas[m] joined #git
11:47 hallogallo[m] joined #git
11:50 sz0 joined #git
11:54 jor joined #git
11:55 pifon joined #git
11:55 hallogallo[m] joined #git
11:57 mezod joined #git
11:57 hhee joined #git
11:58 mezod why do they keep changing the syntax for add all
11:58 mezod every half a year we have to change the scripts -.-
11:58 llamapixel what was it last time mezod ?
11:58 llamapixel Ive only known add .
11:58 mezod lately I was using git add -A .
11:58 mezod and before I don't even remember
11:59 mezod but it was changed less than a year ago
11:59 tobiasvl it was?
11:59 mezod apparently I have to use "git add --all :/"
11:59 mezod now
12:00 dtrott joined #git
12:00 kpease joined #git
12:00 mezod llamapixel: add . doesn't work?
12:00 thebope joined #git
12:00 llamapixel That is all I have used since my first days of git
12:01 mezod that's only for the current folder?
12:01 JeroenT_ joined #git
12:01 llamapixel http://explainshell.com/explain?cmd=git+add+.
12:01 tobiasvl http://stackoverflow.com/a/33559567/176464
12:01 monomon[m] joined #git
12:02 s1scha_ joined #git
12:02 mezod so yeah, it changed again :D
12:02 llamapixel ty tobiasvl
12:02 swapnil joined #git
12:03 bvcosta joined #git
12:03 JeroenT_ joined #git
12:04 koneko joined #git
12:04 bremner 2.0 was more like 3 years ago for most people.
12:04 jameser joined #git
12:05 mezod yeah that's what i don't understand
12:05 mezod my scripts worked last year, then ahd to change them to the add -A and now broke again there :f
12:06 ankit01ojha joined #git
12:07 xkr47 joined #git
12:07 b100s hi2all
12:07 b100s can i do git br --contains for all branches remote and local which already fetched ?
12:08 blackwind_123 joined #git
12:09 seni joined #git
12:10 _ikke_ git branch -a --contains
12:10 amrits joined #git
12:11 venmx joined #git
12:11 Ferris____ joined #git
12:11 lgff joined #git
12:12 thebird joined #git
12:13 thinkpad joined #git
12:14 markelite joined #git
12:14 flo[m] joined #git
12:14 thebope_ joined #git
12:15 Naan joined #git
12:16 User458764 joined #git
12:16 cslcm joined #git
12:18 wrouesnel joined #git
12:18 Remramm joined #git
12:19 dragoonis joined #git
12:20 _Vi joined #git
12:25 dragoonis_ joined #git
12:26 magey- left #git
12:27 imack joined #git
12:28 peacememories joined #git
12:28 raspado joined #git
12:30 cyphase joined #git
12:31 Remramm joined #git
12:33 musicmatze[m] joined #git
12:33 Karazhan joined #git
12:33 UncleCJ joined #git
12:34 windy-black joined #git
12:36 thebird joined #git
12:37 dikiaap joined #git
12:38 xaa__ joined #git
12:40 elwan7[m] joined #git
12:40 djb-irc joined #git
12:42 chigang joined #git
12:43 marianina8 joined #git
12:43 SpEcHiDe joined #git
12:44 Nothing4You joined #git
12:45 a_thakur joined #git
12:47 heftig[m] joined #git
12:47 JeroenT joined #git
12:48 explody joined #git
12:49 __rgn joined #git
12:50 Elliott[m]1 joined #git
12:50 Eugene joined #git
12:50 SpEcHiDe joined #git
12:53 pur3eval joined #git
12:53 Seveas joined #git
12:53 _ikke_ joined #git
12:54 synthroid joined #git
12:54 jimsio joined #git
12:55 SpEcHiDe joined #git
12:55 synthroi_ joined #git
12:59 MattMaker joined #git
13:00 dtrott joined #git
13:00 JeroenT joined #git
13:01 evanc joined #git
13:01 chigang joined #git
13:01 ShapeShifter499 joined #git
13:01 amosbird hello
13:01 amosbird what does the src folder ewah mean inside git repo?
13:02 canton7 "ewah"?
13:02 SpEcHiDe joined #git
13:02 _ikke_ It's a lib, forgot what it was used for
13:02 canton7 compressed bitmaps, apparently
13:02 _ikke_ "compressed bitmap implementation"
13:03 rivarun joined #git
13:03 osse https://github.com/vmg/libewok
13:03 thebird joined #git
13:03 canton7 amosbird, that's nothing to do with git. It's a bit like asking HP what git is, because git runs on your HP computer :P
13:04 osse but how could he know it's nothing to do with git? :O
13:05 canton7 becase I just told him?
13:05 canton7 *because
13:06 osse oh. seemed like you objected to asking it in the first place
13:08 ShapeShifter499 joined #git
13:08 ruxu joined #git
13:08 newbie1 joined #git
13:09 ntonjeta joined #git
13:10 JeroenT joined #git
13:11 venmx joined #git
13:12 seni1 joined #git
13:12 jameser joined #git
13:13 Ozymandy joined #git
13:13 oskarkv joined #git
13:13 JeroenT joined #git
13:13 amosbird osse: thanks :)
13:13 MattMaker joined #git
13:14 Ozymandy I had branch A with some commits with files in path /pathA, then I need merge it to master, but in master these files relocated to /pathB, so I checkout branch A and commits relocation to pathB. And now I have unresolvable merge conflict
13:15 _ikke_ canton7: note that git itself uses ewah
13:15 _ikke_ canton7: so it has to do with git
13:15 _ikke_ https://github.com/git/git/tree/master/ewah
13:15 canton7 ah, fair enough. He meant inside the src of git itself, not inside a git repository. That wasn't clear to me.
13:15 dorkmafia joined #git
13:15 Ozymandy when i do merge A it says me "Deleted merge conflict for "
13:16 Ozymandy How can I resolve it?
13:18 koneko joined #git
13:18 HardlySeen joined #git
13:19 laroi left #git
13:21 goTAN joined #git
13:21 Gustavo6046 joined #git
13:21 Gloomy joined #git
13:21 Elliott[m]1 joined #git
13:21 osse Ozymandy: what does git status say ?
13:22 musicmatze[m] joined #git
13:25 thebope joined #git
13:25 Ozymandy osse: on merging?
13:25 osse yes, I guess.
13:25 osse I mean what does it say now after you ran git merge and it failed
13:26 patrickr[m] joined #git
13:27 MatthewAllan93 joined #git
13:28 d0nn1e joined #git
13:30 elwan7[m] joined #git
13:31 dsdeiz joined #git
13:32 Levex joined #git
13:33 muhannad_______ joined #git
13:35 jameser joined #git
13:37 Levex joined #git
13:37 Sheogorath[m] joined #git
13:37 daopu[m] joined #git
13:38 cdown joined #git
13:38 mazert_ joined #git
13:38 Khisanth joined #git
13:39 windy-black joined #git
13:39 thebope_ joined #git
13:39 raspado joined #git
13:42 dfas joined #git
13:44 MattMaker joined #git
13:45 raijin joined #git
13:45 rubdos joined #git
13:46 _ikke_ joined #git
13:46 hugh joined #git
13:49 JeroenT joined #git
13:50 saintaquinas[m] joined #git
13:51 notebox joined #git
13:51 DolphinDream server hook question: does this reliably checks if a certain rev exists on the server ? : if [[ `git branch -a --contains $newRev 2> /dev/null` ]]; then
13:53 _ikke_ DolphinDream: man git rev-parse
13:53 gitinfo DolphinDream: the git-rev-parse manpage is available at http://jk.gs/git-rev-parse.html
13:53 _ikke_ git rev-parse --verify --quiet
13:53 osse DolphinDream: no, it might be referenced by tags
13:53 DolphinDream ah ..
13:53 Cymew joined #git
13:53 osse _ikke_: does that check for reachability?
13:54 _ikke_ No, it checks if it exists only
13:54 _ikke_ Which is what DolphinDream asked about
13:54 osse DolphinDream: what is the higher level goal ?
13:54 jeffreylevesque joined #git
13:55 DolphinDream i have a comment formatting hook that was supposed to ignore previously accepted commits to the server.. and recentely i made some changes to the rules and pushing new branches with merged old commits fail to pass .. I suspect it has something to do with not properly identifying the commits alrready on the server.
13:56 kexmex joined #git
13:57 scoobertron joined #git
13:57 osse DolphinDream: do you correctly use the range given to the hook?
13:58 JeroenT joined #git
13:58 DolphinDream osse: this is my pre-receive script : http://pastebin.com/DaLbH7YC
14:00 jmd joined #git
14:00 osse ah
14:02 raijin joined #git
14:02 osse DolphinDream: what's the point of the if in line 101 ?
14:03 DolphinDream osse: if you push a new ref (branch) .. it will not have a previous rev (the rev is 0x0)
14:03 osse ah
14:03 DolphinDream in that case i only want to check the newRev (the commit just pushed on that new branch)
14:04 osse DolphinDream: why not all before it ?
14:04 DolphinDream all before all the way to the root ?
14:04 osse yes
14:05 osse in case the new branch has more than one commit
14:05 osse ohhhh, never mind
14:09 DolphinDream osse: why nevermind ?
14:10 osse because I realized the problem with checking all the way back to the root
14:10 osse a brain fart lead me to believe a new ref meant an orphan branch, in which case checking back to the root would make sense
14:10 DolphinDream a new branch with multiple commits that is pushed for the first time should have n old-rev = 0x0 and newRev = SHA of the last commit on the new branch since it was branched off of some other branch.
14:12 venmx joined #git
14:12 DolphinDream say i have   A->B-C <- master .. and  B->S1->S2->S3 <-newBranch  .. ABC are on the server already. when i push newBranch the prereceive should check only S1,S2,S3 but i think the input it gets is oldRev=0x0 and newRev = S3.. correct?
14:13 DolphinDream in which case I do want to check S3 all the way down to S1
14:13 timini joined #git
14:13 timini Hey can anyone tell me how git cherry works?
14:13 eroux joined #git
14:13 timini how does it tell which commits are not applied no another branch ?
14:13 ejb joined #git
14:14 _ikke_ timini: man git patch-id
14:14 gitinfo timini: the git-patch-id manpage is available at http://jk.gs/git-patch-id.html
14:14 timini i believe its not a simple a looking at the sha of the commit
14:14 _ikke_ ^^
14:14 CheckDavid joined #git
14:14 Vampire0 joined #git
14:15 osse DolphinDream: correct
14:15 gunnaro joined #git
14:15 timini ok so is the patch ID different to the commit sha?
14:15 _ikke_ yes, it's based purely on the diff, not the rest of the commit meta data
14:16 _ikke_ (and the diff is normalized somewhat)
14:16 osse DolphinDream: I think you have to do the "already exists" check on all commits in the ranges
14:16 Gsham joined #git
14:17 bsanford joined #git
14:18 DolphinDream osse: i'll have to do some tests. the oldRev..newRev code works when the branches already exit on the server, the only problems are the new refs wich have oldRev=0x0
14:18 timini how can  i view the diff for a commit?
14:19 osse timini: git show {commit}
14:20 DolphinDream the new branch could have also multiple merges of local (never pushed) branches.. so finding all the commits in the history of th enew branch that are NOT on the server is a bit .. non-trivial i say. unless there is a magic git command
14:20 osse hence doing the check on all the commits in the range(s)
14:21 kbs joined #git
14:21 scottjl joined #git
14:21 cyphase joined #git
14:21 timini thanks
14:22 hugh joined #git
14:22 DolphinDream osse: sure, but when you have a new ref .. the pre-receive likely gets oldRev=0x0 .. newRev=latestCommitOnTheNewBranch newRef=newBranch .. so how do you get the ranges from the latestCommitOnTheNewBranch alone ?
14:22 SpEcHiDe joined #git
14:22 aruns joined #git
14:22 DolphinDream you'll probably have to traverse the DAG starting from the latestCommitOnTheNewBranch commit down to any commit that is already on the server.
14:23 hugh__ joined #git
14:23 osse DolphinDream: git rev-list $newRef and keep collecting the hashes until you encounter one that exists
14:23 aielima joined #git
14:23 osse and basically do the same thign when oldrev exists also, except you can do git rev-list oldrev..newrev
14:25 osse (AFAIK)
14:26 cdg joined #git
14:28 timewalker joined #git
14:28 b100s _ikke_, thanks, i tried 'git branch --contains --all' and that doesnt work
14:30 dyzke98 joined #git
14:30 timini anyone know how to get the patch-id from a commit?
14:31 DolphinDream osse: yeah.. that's what i do when oldRev exits :  while rev ... validate(rev) .. done < <(if ((newRef)); then echo $newRev; else git rev-list $oldRev..$newRev ; fi)
14:31 osse DolphinDream: while read ref oldrev newrev; do while read hash; do if git rev-parse --quiet --verify $hash || checkthese+=($hash); done < <(if [[ $oldrev = $ZEROSHA ]]; then git rev-list $newrev; else git rev-list $oldrev..$newrev); done;
14:31 _ikke_ b100s: How doesn't it work?
14:32 osse DolphinDream: but that too might re-check existing commits
14:32 b100s error: malformed object name --all
14:32 b100s _ikke_, ^^
14:32 b100s _ikke_, but yours variant is ok, thanks
14:32 ShekharReddy joined #git
14:32 DolphinDream osse: "that too" what? your example ?
14:33 osse DolphinDream: your existing code might re-check existing commits
14:33 _ikke_ b100s: --contains expects a rev
14:33 DolphinDream yeah.. mine does
14:33 DolphinDream hence my inqueries :)
14:33 osse mine doesn't.
14:33 osse but it's not exactly optimal in the newref case.
14:34 masuberu joined #git
14:34 DolphinDream sweet. i'll check that ;) you know what they say: never trust any osse you don't know ;)
14:34 kbs joined #git
14:34 _ikke_ :D
14:35 DolphinDream yeah.. for long history it will check all the refs down to the root :]
14:35 timini arrrg!
14:35 timini ok so i have 2 commits they seem to have exactly the same diff
14:36 timini but git parch-id gives them different ids
14:36 DolphinDream unless i do a rev-list rev ^excludeRef (where excludeRef are all the refs that do exist on the server)
14:36 bannakaffalatta joined #git
14:36 timini which is very annoing because this is a commit I have cherry-picked from one branch to another
14:36 timini but it is still listed by git cherry
14:37 GodGinrai joined #git
14:37 timini Im trying to figure out why its still listed in git cherry (why the patch-id is different)
14:37 timini any suggestions?
14:38 jnavila joined #git
14:40 SpEcHiDe joined #git
14:40 chitopunk joined #git
14:42 jameser joined #git
14:42 pur3eval joined #git
14:43 Peetz0r joined #git
14:43 Gustavo6046 joined #git
14:44 Guma joined #git
14:44 _ikke_ timini: can you try git patch-id --stable??
14:44 marianina8 joined #git
14:44 MattMaker joined #git
14:45 timini Yeah stable produces the same Patch ID
14:46 robotroll joined #git
14:46 timini so i guess i want get cherry to do the same - and use stable
14:46 kritzikratzi joined #git
14:46 griffindy joined #git
14:47 a_thakur joined #git
14:47 _ikke_ right, but I don't think git cherry uses git patch-id direct
14:47 _ikke_ directly
14:47 nickabbey joined #git
14:47 _ikke_ It doesn't support --stable
14:48 ayogi joined #git
14:49 timini oh, how does git cherry figure out which commits are missing from a branch then?
14:51 _ikke_ timini: The man page describes the same mechanism as patch-id uses
14:51 Munt joined #git
14:51 _ikke_ So I'm not sure where it faisl
14:51 _ikke_ fails
14:51 ChadTaljaardt joined #git
14:53 heftig[m] joined #git
14:54 kachink joined #git
14:54 bannakaf_ joined #git
14:58 MattMaker joined #git
14:58 nettoweb joined #git
14:59 deltab joined #git
15:00 aviraldg joined #git
15:00 aviraldg joined #git
15:00 AaronMT joined #git
15:00 a_thakur joined #git
15:02 nickabbey joined #git
15:02 dtrott joined #git
15:03 hallogallo[m] joined #git
15:04 User458764 joined #git
15:05 rory left #git
15:05 cdg joined #git
15:06 robotrolll joined #git
15:09 Es0teric joined #git
15:09 LeBlaaanc joined #git
15:12 alexandre9099 joined #git
15:13 venmx joined #git
15:13 MattMaker joined #git
15:15 ResidentBiscuit joined #git
15:15 al-damiri joined #git
15:16 tang^ joined #git
15:18 dendazen joined #git
15:18 Murii_ joined #git
15:20 crose joined #git
15:20 smurfendrek123 joined #git
15:21 cdg_ joined #git
15:21 GodGinrai joined #git
15:25 mikecmpbll joined #git
15:26 srkrishna[m] joined #git
15:31 publio joined #git
15:32 humboldt joined #git
15:32 mikecmpb_ joined #git
15:33 seni joined #git
15:33 nickabbey joined #git
15:33 Learath2 joined #git
15:33 stoopkid joined #git
15:33 dreiss joined #git
15:35 elwan7[m] joined #git
15:35 acetakwas joined #git
15:36 kachink joined #git
15:36 jstimm joined #git
15:37 mmlb joined #git
15:38 nettoweb joined #git
15:38 kachink_ joined #git
15:40 Sound joined #git
15:40 Snugglebash joined #git
15:41 raynold joined #git
15:41 rivarun joined #git
15:41 raspado joined #git
15:41 e14 joined #git
15:43 pur3eval joined #git
15:43 kexmex joined #git
15:43 AngryNorseMan joined #git
15:43 kristofferR joined #git
15:44 kegster OK so I have a huge problem. We have a master, testing, and release branch. My master is FINE. We take master and push to testing, then release. Right now when I checkout testing or release, it tells me I'm in a detached head state. I've checked all over online and can't figure out how to easily fix this lol
15:44 jimi_ joined #git
15:45 blahdodo joined #git
15:47 b100s joined #git
15:48 Nilesh_ joined #git
15:49 nedbat kegster: are you sure testing and release are branches?
15:49 kegster yes
15:49 nedbat they aren't tags?
15:49 chitopunk joined #git
15:51 nettoweb joined #git
15:51 DaYwalKer joined #git
15:53 TheMontyChrist joined #git
15:54 TheMontyChrist 1. clone a repo 2. created a branch and want to push
15:54 TheMontyChrist it's complaining.
15:54 TheMontyChrist the "repo" is on my thumb drive
15:54 _ikke_ TheMontyChrist: What is the file system of the thumb drive?
15:54 TheMontyChrist fat
15:54 TheMontyChrist err ntfs
15:55 _ikke_ TheMontyChrist: Ok, what error does it give?
15:55 monomon[m] joined #git
15:56 TheMontyChrist I can't recall now but it suggest that I "--set-upstream"
15:56 TheMontyChrist "git push --set-upstream branchname"
15:56 TheMontyChrist why is it asking me to do this?
15:57 bsanford joined #git
15:57 TheMontyChrist let me just ask a noob question
15:57 TheMontyChrist shouldn't I be able to create a branch then just push?
15:57 TheMontyChrist and the new branch is now on the bare repo?
15:58 TheMontyChrist actually
15:58 pur3eval joined #git
15:58 TheMontyChrist wouldn't it be "git push --set-upstream remote/newbranch"?
15:58 ThatBob9001 joined #git
15:58 TheMontyChrist I'm coming from mercurial so this stuff is a little strange to me.
15:59 TheMontyChrist to me, I'd just "hg push /path/to/repo" and I'd be done
15:59 TheMontyChrist so is it <machine>/branch nomenclature used in git?
15:59 _ikke_ TheMontyChrist: if you don't specify upstream information, git wants you to specify *what* you want to push
16:00 _ikke_ git push <remote> <branch>
16:00 nckpz joined #git
16:00 dtrott joined #git
16:00 TheMontyChrist no slash?
16:00 TheMontyChrist <remote>/<branch>?
16:00 _ikke_ TheMontyChrist: No, that's only to refer to 'remote tracking branches'
16:00 TheMontyChrist you're very patient
16:01 jast push and fetch are just about the only places it's not name-of-remote/name-of-branch
16:01 TheMontyChrist so please, can you explain "if you don't specify upstream information, git wants you to specify *what* you want to push"
16:01 TheMontyChrist and what you just said
16:01 jast !rtb
16:01 gitinfo [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote
16:02 jast Git doesn't assume you'll want to have your local 'foo' branch correspond to 'someremote/foo' just because the names happen to be the same, so you have to create an actual assocation once
16:02 TheMontyChrist "if you don't specify upstream information, git wants you to specify *what* you want to push"
16:02 peacememories joined #git
16:02 jast if you don't create that assocation, Git doesn't know where you want to push your branch
16:03 TheMontyChrist okay, I think I see
16:03 Darren_ joined #git
16:03 TheMontyChrist so in my repo I create branch B
16:03 kegster nedbat, they are branches
16:03 jast after you do it once (git push -u someremote somebranch) Git knows that your local somebranch should be associated to somebranch on someremote
16:03 kegster nedbat, sorry had ZNC issues
16:03 raspado joined #git
16:03 kegster nedbat, i have the 2 branches setup to each deploy to a separate environment
16:03 TheMontyChrist when I'm in B and I push, I can't assume that it'll push to remote/B
16:03 clemf joined #git
16:03 TheMontyChrist or that's the error I'm encountering
16:04 TheMontyChrist git push --set-upstream remote B" would be the command?
16:05 jast TheMontyChrist: yeah, that's like a single push with manually telling Git what to push where and, at the same time, ask it to remember (--set-upstream/-u)
16:05 SpEcHiDe joined #git
16:05 Munt joined #git
16:05 jast you can tell Git what your upstream is without pushing, too, but this combination tends to be convenient
16:05 TheMontyChrist crap, I think I did "git push --set-upstream remote/B"
16:05 kachink_ joined #git
16:06 jast that shouldn't actually result in a valid push, so just do it again and do it right this time :)
16:06 TheMontyChrist would that be like adding an entry to the .git/config file?
16:06 _ikke_ TheMontyChrist: yes, it adds two entries
16:06 jast look at .git/config before and after a 'git push' with -u, it's pretty straightforward
16:06 clemf joined #git
16:07 aviraldg joined #git
16:09 marianina8 joined #git
16:09 yottabyte joined #git
16:09 nydel07 joined #git
16:09 yottabyte what's the difference between a git pull and a git fetch? I do git fetch to update all my remote branches like origin
16:10 jast pull = fetch + merge (or fetch + rebase depending on your config)
16:10 raijin joined #git
16:10 yottabyte so if you just fetch, what do you have to do with those files waiting to be merged?
16:10 yottabyte how do you know what's coming in?
16:11 Glooomy joined #git
16:11 clemf joined #git
16:11 jast you can compare commits and do diffs and stuff like that
16:11 TheMontyChrist as a hg user, I'm used to looking back a revision or two do diffs.  it seems a lot of git tools don't encourage this, it's as if you can only diff between tags and branches.
16:11 TheMontyChrist I'm not saying you can't do specific revisions.
16:11 jast for instance, git log [-p] foo..origin/foo ("new commits I just fetched, and [optionally] the diff for each one")
16:11 TheMontyChrist but I've not seen a tool that i'll let me jump to revision 90 and diff it with 75, etc
16:12 red82 joined #git
16:12 jast TheMontyChrist: sure you can, it's very easy
16:12 jast you can use commit IDs (shortened ones, too) in place of branch/tag names almost everywhere
16:12 kritzikratzi joined #git
16:12 jast and you can also do stuff like HEAD~5 (5 commits back from current topmost)
16:12 TheMontyChrist where can I get a list of commit id's?
16:12 TheMontyChrist woot!
16:12 jast 'git log', for instance
16:13 jast those long hexadecimal thingies are commit IDs :)
16:13 shgysk8zer0_ joined #git
16:13 GGMethos joined #git
16:13 timini joined #git
16:13 jast typically the first 6-7 characters are enough to identify the commit
16:13 jast less for smaller projects
16:13 TheMontyChrist can you recommend a gui tool?
16:14 TheMontyChrist git cola isn't doing it for me.
16:14 red82 If a commit C was made in the history of branch A and I’m on A’  (branch off of A) and revert on C, that revert is only in effect on branch A’ correct ?
16:14 jast for what, looking at history or actually tracking/committing your changes?
16:14 YuGiOhJCJ joined #git
16:14 venmx joined #git
16:14 MattMaker joined #git
16:14 TheMontyChrist I'll be honest, I'm looking for something similar to tortoise mercurial
16:14 jast red82: if you mean 'git revert', it only works on the checked out branch
16:14 TheMontyChrist I can see a dag
16:14 red82 jast: ty
16:14 TheMontyChrist along side a list of commits
16:15 jast for just viewing, git ships with gitk. it's a bit ugly but has everything
16:15 TheMontyChrist how about manipulating?
16:15 yottabyte jast: thanks for the info
16:15 Vinnie_win joined #git
16:15 jast then there's stuff like !gitext for windows to get shell integration
16:15 gitinfo Git Extensions is a GUI for git on Windows. It includes Explorer integration and a Visual Studio plugin. http://gitextensions.github.io/
16:15 TheMontyChrist okay thanks
16:15 jast well, git has two separate tools, gitk and git-gui
16:16 jast some of their commands hand stuff off to each other
16:16 synthroid joined #git
16:17 TheMontyChrist suppose I'm local, I make changes in branch A, and branch B.  if I push does it update A/B on the remote?
16:17 rivarun joined #git
16:17 jast by default, since Git 2.0, 'git push' only pushes the branch that is checked out
16:17 TheMontyChrist or... if I'm in branch A, git push, only pushes A changes.  I have to checkout B and then push B changes.
16:17 TheMontyChrist ah
16:17 TheMontyChrist how do I push it all at once?
16:17 jast there's also git push --all if you're feeling trigger-happy :)
16:17 TheMontyChrist I'm my case just lazy :P
16:18 jast --all doesn't use the tracking/upstream info so this only works if the branch names are identical on the remote
16:18 rubyonrailed joined #git
16:18 TheMontyChrist whoa
16:18 TheMontyChrist if I can have local/A push to remote/B?
16:18 TheMontyChrist the names don't have to match up?
16:18 nettoweb joined #git
16:19 jast it's possible, but you'll probably want to avoid it because it can get confusing
16:19 jast the default config protects against setting it up that way, in fact
16:19 jast rather, you can set it up like that but the push will error out to be safe
16:20 jast for users who prefer doing messy magical things, it's easy to turn off, though :)
16:20 TheMontyChrist in mercurial, I'd do the following for a deep refactor.  start a branch (0), go until I don't like it (10), start at a point where I do like it (5) and branch, keep going until I don't like it (20), etc, repeat.
16:20 _ikke_ if you set push.default to matching, that it would be default push all branches that have upstream information set
16:20 TheMontyChrist the number is the commmit
16:20 TheMontyChrist when I'm done I'd "close" all the branches that I didn't like
16:20 TheMontyChrist is there something similar in git?
16:20 clemf joined #git
16:20 jast actually 'matching' ignores upstream/tracking info
16:20 eb0t joined #git
16:20 _ikke_ TheMontyChrist: You don't need to close branches in git
16:21 jast all it checks is that a branch with the same name exists on the remote
16:21 humboldt joined #git
16:21 TheMontyChrist how do I keep it from cluttering "git branch" list?
16:21 _ikke_ TheMontyChrist: You can remove branches
16:21 jast delete the branches
16:21 _ikke_ (branches in git are just pointers)
16:21 ThatBob9001 joined #git
16:21 jast git branch -d mybranch, also git push --delete origin mybranch
16:21 _ikke_ like bookmarks in hg
16:21 perlpilot TheMontyChrist: and you *will* want to delete unused branches.  They can become a nuisance when there are too many branches.
16:21 jast the history will still be there because of the merge, only the label will go away
16:22 TheMontyChrist ahh, I was under the impression that a delete local would delete remote when pushed.
16:22 jast nah, that would be nasty
16:22 TheMontyChrist so I have to delete in two repos?
16:22 jast if you want it gone locally and remotely, yes
16:22 _ikke_ TheMontyChrist: git does not record that you removed a local branch in a way that you can push
16:22 _ikke_ And that you deleted a local branch does not necessarily imply that you want it removed remotely
16:23 jast nor vice versa
16:24 b100s joined #git
16:24 TheMontyChrist actually, that's slick
16:24 mostlybadfly joined #git
16:24 TheMontyChrist it's better than mercurial
16:24 TheMontyChrist all my changes would get pushed to the repo - even if they're deleted
16:24 TheMontyChrist in git, I can keep them all local
16:24 jast there's a reason we're all here ;)
16:24 _Vi joined #git
16:24 TheMontyChrist so I can gunk up my repo all I want
16:24 eb0t joined #git
16:25 _ikke_ yes
16:25 TheMontyChrist and cherry pick what branches get pushed
16:25 TheMontyChrist so I don't clutter the main repo
16:25 SporkWitch always nice; worst case just nuke and clone fresh :P
16:25 _ikke_ exactly
16:25 dorkmafia joined #git
16:25 TheMontyChrist mercurial can't do that
16:25 jast I'll assume you can do it in hg, too, but I've never really seriously used hg
16:25 TheMontyChrist a little more work
16:25 nedbat in hg, the branch is an attribute of the commit
16:26 madewokherd joined #git
16:26 TheMontyChrist so that's probably why "git push -all" is required.  Prevent you from sending unwanted garbage.
16:26 jast yep. in fact I never use --all
16:27 TheMontyChrist that's why, I never get wanted behavior coming from hg using git.
16:27 TheMontyChrist I'd "push"
16:27 TheMontyChrist but when I pull it's not there.
16:27 LeBlaaanc joined #git
16:27 TheMontyChrist I just didn't know the push/pull mechanism
16:27 TheMontyChrist it's *not* the same as hg
16:27 TheMontyChrist nor is the notion of head
16:27 musicmatze[m] joined #git
16:28 TheMontyChrist it's almost like learning hg has set me back - I have to unlearn it.
16:28 TheMontyChrist probably easier if I never used a dcvs :P
16:28 TheMontyChrist same command names, kinda/sorta similar behavior
16:29 jast you'll get used to it :P it's the same as learning a new language that is related to your own
16:29 _ikke_ TheMontyChrist: Same with SVN :-)
16:29 _ikke_ jast: Like me learning German?
16:29 TheMontyChrist I hated those .svn sub dirs.
16:29 jast _ikke_: I guess
16:29 chitopunk1 joined #git
16:29 _ikke_ Ich finde das nicht so schlim :P
16:30 jast spelling mistake detected :P
16:30 _ikke_ Unavoidable
16:30 jast speak for yourself
16:30 _ikke_ I do
16:30 nickabbey joined #git
16:31 Es0teric joined #git
16:31 thebope joined #git
16:32 Oatmeal joined #git
16:32 Learath2 joined #git
16:32 TheMontyChrist suppose a branch ends at revision 100
16:32 TheMontyChrist I delete it
16:33 TheMontyChrist can I reopen it by creating a commit 101
16:33 TheMontyChrist that's how we reopen things in mercurial
16:33 chitopunk joined #git
16:33 nedbat TheMontyChrist: branches are just references to commits
16:33 _ikke_ (Note that in git, revisions are not numbered sequentially like in hg)
16:34 TheMontyChrist so if the last commit in branch A has id: cafebabedeadbeef; I git branch -d A;  git checkout cafebabedeadbeef; touch blah.txt; git add -a; it'll reopen "A"?
16:35 _ikke_ TheMontyChrist: No
16:35 patrickr[m] joined #git
16:35 _ikke_ You don't 'open' a branch by comitting on it
16:35 _ikke_ You can create a new branch pointing to that commit
16:35 _ikke_ git branch A abcde123
16:35 TheMontyChrist ahh
16:36 TheMontyChrist git branch cafebabedeadbeef in my case
16:36 dorkmafia joined #git
16:36 TheMontyChrist and all of a sudden it'll appear in git branch
16:36 _ikke_ TheMontyChrist: 2 params, first the branchname, 2nd, the commit it should point at
16:36 TheMontyChrist okay, as you said, truly, branches are pointers.
16:36 _ikke_ after you deleted the branch, git has no idea that there used to exist a branch called A pointing to that commit
16:36 jast here are pictures to look at if you like :) !gcs
16:36 gitinfo [!concepts] "Git Concepts Simplified" presents all the important structures in Git, step by step, including selected internal details so it becomes much easier to understand what's going on whenever something's going on. http://gitolite.com/gcs.html
16:37 _ikke_ TheMontyChrist: The other thing you need to be aware of is that git relies on reachability
16:37 jast you can probably skip over a fair bit of that at this point
16:37 _ikke_ TheMontyChrist: So git does not have anonymous heads like HG
16:38 egajwv joined #git
16:39 TheMontyChrist I'm curious.  suppose I go back to a commit "cafebabedeadbeef" can I commit?  In mercurial I'd have a fork
16:39 _ikke_ TheMontyChrist: If a commit is not being referenced anymore at all (from at least one ref), the commit will be eligible to garbage collection
16:39 _ikke_ TheMontyChrist: You create a branch from there, then you commit
16:39 TheMontyChrist so git will complain if I trying making a commit it sounds.
16:40 _ikke_ TheMontyChrist: git will warn you when you check out anything not being a branch
16:40 perlpilot TheMontyChrist: git will complain that you're on a detached head, but you can commit.
16:40 _ikke_ (a tag, a remote tracking branch, a commit)
16:40 jast it will let you, but it will issue a warning when you checkout something that isn't a branch label
16:40 jast !detached :)
16:40 gitinfo A detached HEAD (aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
16:40 eblip joined #git
16:40 hallogallo[m] joined #git
16:41 blueyed joined #git
16:41 TomyLobo joined #git
16:42 markelite joined #git
16:42 mikecmpbll joined #git
16:43 daopu[m] joined #git
16:43 thebope joined #git
16:44 Cymew joined #git
16:44 TheMontyChrist what's a head?
16:44 TheMontyChrist current revision?
16:45 TheMontyChrist or it's what's currently checked out
16:45 cdg joined #git
16:45 TheMontyChrist head in mecurial if the tip of each branch
16:45 _ikke_ TheMontyChrist: a different name for a branch (unlike HEAD)
16:45 _ikke_ HEAD points to the currently checked out branch or commit
16:46 _ikke_ TheMontyChrist: the full name of a branch is refs/heads/<branchname>
16:46 _ikke_ but git lets you just use <branchname>
16:46 brent___ joined #git
16:46 _ikke_ and all heads are named, no anonymous once
16:47 _ikke_ ones*
16:47 dragoonis joined #git
16:47 seni joined #git
16:48 TheMontyChrist so detached "HEAD" means that the current revision doesn't terminate on a branch?
16:48 TheMontyChrist ..if that made any sense.
16:48 TheMontyChrist it just means that it points to a revision, but we don't know where the successor terminates.
16:49 _ikke_ detached HEAD means that HEAD does not point to a branch
16:49 jeffreylevesque_ joined #git
16:49 jagob joined #git
16:49 jast technically HEAD is a symbolic ref: it can point directly to a commit, or to another ref (branch, normally)
16:49 _ikke_ it does not say anything about the current revision
16:49 _ikke_ (another branch can still point to that commit
16:49 _ikke_ )
16:49 nickabbey joined #git
16:49 jast if you commit while HEAD points to a branch, the branch is updated. if you commit while HEAD points to a commit, only HEAD is updated.
16:49 sbeller joined #git
16:49 TheMontyChrist I'm sorry, "current revision->current checkout"
16:49 TheMontyChrist is what I meant.
16:50 TheMontyChrist thanks
16:50 jast you can see the difference in .git/HEAD while on a branch vs. detached
16:50 _ikke_ (or git symbolic-ref HEAD)
16:50 chitopunk joined #git
16:51 mar77i hmm, is there an easy way I can create a new branch with some commits missing from between current HEAD and a certain commit in the past (the one used for the last deployment)
16:52 hiq[m] joined #git
16:52 TheMontyChrist what does it mean to have a HEAD in a bare repo?
16:52 jast it has a different meaning there
16:52 _ikke_ TheMontyChrist: It's used to specify the branch being checked out when you clone from that repo
16:52 jast we have a summary for that, too: !HEAD
16:52 gitinfo HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is *not* something that exists separately for every branch. It also is *not* necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)
16:52 _ikke_ So basically the default branch
16:53 netj joined #git
16:53 srkrishna[m] joined #git
16:53 b100s joined #git
16:54 matoro joined #git
16:54 navidr joined #git
16:54 DarkPsydeLord joined #git
16:55 username1 joined #git
16:56 texinwien_ joined #git
16:58 DarkPsydeLord joined #git
16:58 m4sk1n joined #git
16:58 M-meznak joined #git
16:59 nickabbey joined #git
16:59 brent__ joined #git
17:00 gtristan joined #git
17:00 brent____ joined #git
17:01 chitopunk joined #git
17:01 madewokherd joined #git
17:01 Naan joined #git
17:01 thebird joined #git
17:04 chitopunk1 joined #git
17:04 King_Hual` joined #git
17:08 clemf joined #git
17:08 thiago joined #git
17:09 timini hey I want to make my own git-cherry that uses patch-id --stable
17:10 timini can anyone tell me where to start?
17:10 timini basically i want to be able to list all patchIds for a branch
17:10 _ikke_ timini: use git rev-list to generate a list if commits
17:11 _ikke_ You need to create 2 ranges
17:11 multi_io joined #git
17:12 raspado joined #git
17:14 pur3eval joined #git
17:15 venmx joined #git
17:15 markelite joined #git
17:16 cwre joined #git
17:17 brent___ joined #git
17:19 User458764 joined #git
17:20 chitopunk joined #git
17:20 clemf joined #git
17:21 finalbeta joined #git
17:22 jstimm joined #git
17:23 streetwitch joined #git
17:23 streetwitch How can I grab the latst code from github into my working directory without using git clone?
17:24 hurricanehrndz joined #git
17:24 qqx timini: Have you considered enhancing the existing git-cherry to support that option?
17:24 hurricanehrndz would would cause git on commit to create doc/tags folder?
17:25 chitopunk1 joined #git
17:25 thebope joined #git
17:26 timini qqx, i wouldnt know were to get wtarted with that unfortunatly
17:29 _ikke_ streetwitch: curl https://github.com/name/project/archive/<branch>.tar.gz | tar xf -
17:30 streetwitch What is that ikke?
17:30 Vampire0_ joined #git
17:30 _ikke_ A command that downloads and extracts a tarbal from github from a certain branch
17:30 chitopunk joined #git
17:31 nedbat streetwitch: just curious, why don't you want to clone it?
17:31 _ikke_ streetwitch: curl https://github.com/name/project/archive/<branch>.tar.gz | tar xzf -
17:31 streetwitch nedbat, because after I clone it, it becomes very hard to update the git with new changes
17:32 streetwitch right?
17:32 thebird joined #git
17:32 _ikke_ streetwitch: No
17:32 DolphinDream osse: about that pre-receive hook..  i get the if git rev-parse --quiet --verify $rev > /dev/null; then echo "Rev $rev already on the server"; else # do some validation ; fi  and this tells me that even newly pushed revs are on the server. am i doning something wrong ? or is it that rev-parse does find the new revs on the server (objects with that already created for the new revs)
17:32 nedbat streetwitch: how would you update with changes if you don't clone it?
17:33 nedbat streetwitch: are we talking about cloning, or github forking?
17:33 overlord_tm joined #git
17:34 rafalcpp joined #git
17:34 streetwitch Well when I do get pull I get: Already-up-to-date
17:35 streetwitch git clone works, I tried it in another directory
17:35 chitopunk joined #git
17:35 _ikke_ just 'git pull' is not always the best command to update your repository
17:36 leeN joined #git
17:36 streetwitch _ikke_: OK
17:37 streetwitch Well I think I fixed my problem with git pull now
17:38 durham joined #git
17:39 User458764 joined #git
17:40 chitopunk joined #git
17:41 Sheogorath[m] joined #git
17:41 wwalker_ joined #git
17:44 rwb joined #git
17:46 gugah joined #git
17:46 DolphinDream for the server hook's pre-receive .. the oldRev / newRev inputs to the script.. to check if the newRev exists on the server it appears that git rev-parse $newRev will say the newRev is alredy on the server. even though this has not yet been an accepted push. Is there a way to check fi the new commit (To be accepted during a push) has been pushed already ?
17:47 svm_invictvs joined #git
17:48 chitopunk joined #git
17:48 nettoweb joined #git
17:49 sbulage joined #git
17:49 Richard_Cavell joined #git
17:50 dorkmafia joined #git
17:51 peeps[lappy] joined #git
17:51 chitopunk1 joined #git
17:51 nickabbey joined #git
17:51 robotroll joined #git
17:54 ertesx joined #git
17:54 Vampire0 joined #git
17:55 _Patrick_ joined #git
17:56 wilbert joined #git
17:58 kadoban joined #git
18:00 EisNerd joined #git
18:01 _ikke_ Hmm, pre-receive should mean that the object are not yet in the db (and hence, the push still can be aborted)
18:03 DolphinDream _ikke_: but the pre-receive gets the newRev and oldRev as input for the pushed ref .. so the newRef should exits on the server albeint not yet integrated into the DAG?
18:04 _ikke_ No, it should not
18:04 _ikke_ Hmm,
18:05 _ikke_ Sorry, I'm mistaken
18:05 _Patrick_ joined #git
18:05 _ikke_ "Just before starting to update refs on the remote repository, the pre-receive hook is invoked."
18:05 orbyt_ joined #git
18:05 _ikke_ So the objects are there, but the refs are not updated yet
18:06 raijin joined #git
18:06 MacWinner joined #git
18:07 _ikke_ DolphinDream: git branch --contains $3 $2
18:08 jason237 joined #git
18:08 dreiss joined #git
18:10 DolphinDream _ikke_: yep.. that's what i had before and it failed to check if some revs were already on the server.. e.g. for the newly created/pushed branches that happened to have been merged with some other branches already pushed. The merged comits on this new branch should have commits alredy on the server and should be skipped (for my comment validation)
18:10 livingstn joined #git
18:10 jnavila joined #git
18:11 Puppet_ joined #git
18:11 kritzikratzi joined #git
18:11 DolphinDream osse: tried to led me into temptation with this rev-parse ;)
18:12 _ikke_ DolphinDream: I think the update hook is more suited then
18:13 _ikke_ DolphinDream: I think the only way to find out is to check if the commit is not reachable by any other branch
18:14 apotry joined #git
18:14 DolphinDream yeah :) easy job
18:15 raijin joined #git
18:15 pur3eval joined #git
18:15 MattMaker joined #git
18:15 venmx joined #git
18:15 _ikke_ git does not provide a list of objects that were pushed or something like that
18:20 DolphinDream _ikke_: yes, but it transfers the objects created to the server and provides the newRev and oldRev to the pre-receive. and all revs reachable from newRev and not from oldRev are the new commits needed to be checked.
18:20 g_zen joined #git
18:20 cyphase joined #git
18:24 raynold joined #git
18:25 rubyonrailed joined #git
18:25 DolphinDream what does git branch --contains $3 $2 do ?
18:26 DolphinDream does this check fi a commit is reachable from another commit ?
18:26 Levex joined #git
18:27 peterbecich joined #git
18:28 synthmeat joined #git
18:33 brent__ joined #git
18:35 Cymew joined #git
18:36 nowhereman joined #git
18:37 s1scha joined #git
18:38 cdg joined #git
18:38 timini is there any way to list all commits under a certain path
18:38 timini ?
18:39 preaction timini: git log path
18:39 preaction though, git doesn't care about directories, so that might not work
18:41 Es0teric joined #git
18:43 smurfendrek123 joined #git
18:43 b100s joined #git
18:44 username_ joined #git
18:44 grawity sure it does, it just deliberately ignores empty ones
18:44 nevodka joined #git
18:45 jdelreal joined #git
18:47 matoro joined #git
18:50 thebope joined #git
18:51 EisNerd_ joined #git
18:52 ejb joined #git
18:54 timini_ joined #git
18:54 jrm joined #git
18:56 EisNerd joined #git
18:57 hasc_ joined #git
18:57 dsteplight__ joined #git
18:58 dviola joined #git
18:58 sunrunner20 We have some large repositories over a slow connection.
18:58 sunrunner20 Push and pull just does the latest changes, correct?
18:59 Balliad joined #git
18:59 jottr joined #git
18:59 grawity they do the difference between you and remote, roughly
19:00 lucido-cl joined #git
19:01 boombatower joined #git
19:01 sunrunner20 Is there a lot of traffic to determine the differences?
19:02 grawity not unless you have hundreds of branches/tags
19:02 grawity it's roughly, "give me a list of branch commit IDs" + "I want commit X, I have Y+Z+T"
19:03 gopar joined #git
19:03 grawity try `GIT_TRACE_PACKET=1 git pull`
19:03 nettoweb joined #git
19:04 grawity usually it's rather efficient
19:05 Limes_ joined #git
19:05 grawity you can sometimes reduce fetch traffic by limiting it e.g. to master only, or just a few specific branches, if the project otherwise has tons of them
19:05 grawity if the connection is high-latency, http(s) will probably work better than ssh
19:06 cagomez joined #git
19:07 steven joined #git
19:08 irqq joined #git
19:08 flavius joined #git
19:08 synthroid joined #git
19:09 heftig[m] joined #git
19:09 Elliott[m]1 joined #git
19:09 KevinMGranger[M] joined #git
19:09 saintaquinas[m] joined #git
19:09 am2on joined #git
19:09 uhmgawa joined #git
19:09 M-meznak joined #git
19:09 unclechu joined #git
19:09 dyce[m] joined #git
19:09 elwan7[m] joined #git
19:09 Jarrah[m] joined #git
19:09 dikiaap joined #git
19:09 srkrishna[m] joined #git
19:09 aviraldg joined #git
19:09 Remramm joined #git
19:09 SpEcHiDe joined #git
19:09 musicmatze[m] joined #git
19:09 monomon[m] joined #git
19:09 Salander27 joined #git
19:09 hiq[m] joined #git
19:09 patrickr[m] joined #git
19:09 UncleCJ joined #git
19:09 flo[m] joined #git
19:09 hallogallo[m] joined #git
19:09 daopu[m] joined #git
19:10 andrewhl joined #git
19:10 smurfendrek123 joined #git
19:11 Sasazuka joined #git
19:11 Sample joined #git
19:11 joshszep joined #git
19:12 finalbeta joined #git
19:13 srkrishna[m] left #git
19:13 uhmgawa joined #git
19:14 smurfendrek123_ joined #git
19:14 ahr3n joined #git
19:14 raijin joined #git
19:15 sunrunner20 Thanks grawity
19:16 venmx joined #git
19:16 MattMaker joined #git
19:16 jimi_ joined #git
19:17 nettoweb1 joined #git
19:17 kevwil joined #git
19:18 matoro joined #git
19:18 Fallen0223 joined #git
19:19 steven joined #git
19:19 dvaske joined #git
19:20 Noldorin joined #git
19:23 Rodya_ joined #git
19:23 smurfendrek123_ joined #git
19:24 crose joined #git
19:24 xissburg_ joined #git
19:25 dvaske_ joined #git
19:27 jedahan joined #git
19:27 xaa__ joined #git
19:28 TheMontyChrist joined #git
19:28 TheMontyChrist I really like git
19:28 TheMontyChrist wrong channel.
19:29 GodGinrai joined #git
19:30 xall joined #git
19:30 kadoban Sounds like the right channel :)
19:30 bremner nono, this is where people tell us how much they hate git, and then ask for help
19:30 Dewin joined #git
19:31 nettoweb joined #git
19:31 TheMontyChrist yeah, there are something that I need to get used to so git can be annoying at times wrt to mercurial
19:31 TheMontyChrist I'm sure the same can be said the other way around.
19:32 TheMontyChrist but it's annoying at times for a reason
19:33 rubyonrailed joined #git
19:33 Atm0spher1c joined #git
19:34 satifant joined #git
19:36 jstimm joined #git
19:38 TheMontyChrist I'm curious, what happens when a git project contains another git repo
19:39 perlpilot TheMontyChrist: nothing?
19:39 TheMontyChrist okay
19:39 perlpilot TheMontyChrist: unless you *want* something to happen, but then you're using submodules or something
19:39 TheMontyChrist suppose I add a project that's also a git project and then I do a commit w/ my parent project
19:39 TheMontyChrist git add another_git_repo
19:40 _ikke_ Then git records that directory as a git module
19:40 _ikke_ (which is not yet a submodule)
19:40 TheMontyChrist I guess I need to learn about modules then
19:40 _ikke_ Which means that git status does not report individually for files within the repository
19:41 _ikke_ When you clone that repo, you just get an empty directory
19:41 Sample joined #git
19:41 e14 joined #git
19:43 jedahan_ joined #git
19:46 pur3eval joined #git
19:50 peacememories joined #git
19:50 muhannad_______ joined #git
19:52 kbs joined #git
19:53 timini_ joined #git
19:53 chachasmooth joined #git
19:53 nickabbey joined #git
19:53 LiftLeft joined #git
19:54 AciD- left #git
19:55 joshszep joined #git
19:56 AciD` joined #git
20:00 clemf_ joined #git
20:01 cahoots joined #git
20:01 cahoots hi, i'm working with a pr with a ton of deleted files, so the git diff is huge and it practically breaks my chrome browser. how can i set up a pr without having to see the diff?
20:02 selckin !github
20:02 gitinfo Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
20:04 _Vi joined #git
20:05 Learath2 joined #git
20:07 thebope joined #git
20:07 sathed joined #git
20:07 grawity cahoots: click "new pull request", that doesn't show a diff
20:08 Dougie187 joined #git
20:09 hvxgr joined #git
20:11 lacour joined #git
20:11 dermoth joined #git
20:14 Bizkit joined #git
20:15 ChadTaljaardt joined #git
20:16 hvxgr joined #git
20:17 venmx joined #git
20:17 MattMaker joined #git
20:17 hvxgr joined #git
20:18 tekniq joined #git
20:19 SwiftMatt joined #git
20:21 cahoots joined #git
20:22 joeco joined #git
20:24 enkrypt joined #git
20:25 chachasmooth joined #git
20:25 mikecmpbll joined #git
20:26 zuv joined #git
20:26 synthroid joined #git
20:28 nickabbey joined #git
20:30 askb joined #git
20:32 pur3eval joined #git
20:34 cr34ton joined #git
20:34 filcab joined #git
20:34 Es0teric joined #git
20:37 jeffreylevesque joined #git
20:38 aviraldg joined #git
20:38 aviraldg joined #git
20:38 clemf joined #git
20:39 wgrant joined #git
20:39 cdown joined #git
20:40 _Vi joined #git
20:42 ok91 joined #git
20:43 randoName joined #git
20:43 armyriad joined #git
20:44 snowalpaca joined #git
20:46 Retropikzel[m] joined #git
20:50 Zamyatin joined #git
20:51 e14 joined #git
20:52 oskarkv joined #git
20:53 randoName left #git
20:55 metalraiden34 joined #git
20:55 username_ joined #git
20:56 Vinnie_win joined #git
20:56 ChadTaljaardt joined #git
20:57 joshszep joined #git
20:59 joshszep joined #git
21:00 joshszep joined #git
21:00 bannakaffalatta joined #git
21:01 nickabbey joined #git
21:01 marianina8 joined #git
21:02 marianina8 joined #git
21:02 ResidentBiscuit joined #git
21:05 grumble joined #git
21:07 madewokherd` joined #git
21:08 le_melomane joined #git
21:09 snowalpaca joined #git
21:09 sbasso joined #git
21:12 aax joined #git
21:12 Vinnie_win_c joined #git
21:13 nettoweb1 joined #git
21:15 dsdeiz joined #git
21:15 dsdeiz joined #git
21:15 gopar joined #git
21:17 Es0teric joined #git
21:17 Levex joined #git
21:18 venmx joined #git
21:18 dreiss joined #git
21:18 durham_ joined #git
21:18 MattMaker joined #git
21:19 Sound joined #git
21:19 cdg joined #git
21:20 nettoweb joined #git
21:22 matoro joined #git
21:22 cdg joined #git
21:23 elisa87 joined #git
21:24 jason237 joined #git
21:24 Tobbi joined #git
21:25 zumba_addict joined #git
21:26 ryouma joined #git
21:26 ryouma i'm confused (as usual).  i do "git log 054b1ef90b3a5e83d6e0755c2e0e0e016da5c428" and it shows every commit.  why doesn't it show just one commit?
21:27 _ikke_ ryouma: That's default behaviour of git log
21:27 _ikke_ ryouma: git log -1 <commit> will only show one
21:27 _ikke_ (or git show <commit>)
21:28 raijin joined #git
21:29 masuberu joined #git
21:30 Fallen0223 joined #git
21:31 matoro joined #git
21:31 ryouma _ikke_: thanks.  i had thought, if i specify something, it will show that something.  what is wrong with my assumption in this case?
21:31 raijin joined #git
21:31 ryouma does it mean "starting with that commit"?
21:31 einnjo joined #git
21:32 _ikke_ correct
21:32 ryouma ok
21:32 _ikke_ it defaults to HEAD
21:32 _ikke_ (see also --(no-)walk in man git log
21:32 gitinfo the git-log manpage is available at http://jk.gs/git-log.html
21:32 ryouma are git log -1p 054b1ef90b3a5e83d6e0755c2e0e0e016da5c428 and git show equivalent
21:33 _ikke_ As in, they show the same output, yes
21:33 _ikke_ but git show can show more then just commits
21:33 ResidentBiscuit joined #git
21:34 om_henners joined #git
21:35 Xethron joined #git
21:36 ryouma ok, walking seems to complicated for my philosophy of healthy-fear-of-git at this time.  i presume it is analogous to file tree walking and it tries to get at every dag (multi-dag?) commit or (past my understanding here) reflog.
21:36 beastd joined #git
21:36 ryouma oh, git show can do a whole tree or something.  great.
21:38 MattMaker joined #git
21:38 wilbert joined #git
21:38 _ikke_ ryouma: it 'walks' the parent of each commit
21:38 _ikke_ parent(s)
21:40 svm_invictvs joined #git
21:44 fatalhalt joined #git
21:44 ryouma so it's like recursive?
21:44 pur3eval joined #git
21:44 cagomez joined #git
21:45 m0viefreak joined #git
21:46 explody joined #git
21:47 overlord_tm joined #git
21:49 cdg joined #git
21:50 thebope joined #git
21:50 cdg_ joined #git
21:50 NeverDie joined #git
21:51 Jackneill joined #git
21:52 ejb joined #git
21:53 metalraiden34 joined #git
21:55 cany0n joined #git
21:56 beastd left #git
22:00 Fallen0223 joined #git
22:00 venmx joined #git
22:02 _ikke_ yes, that's how git works, each commit points to it's parent(s), when git shows the log, it recursively follows those links until it find the root commmit(s)
22:03 MattMaker joined #git
22:03 Atm0spher1c joined #git
22:03 YuGiOhJCJ joined #git
22:03 cahoots_ joined #git
22:05 grumble joined #git
22:06 blackwind_123 joined #git
22:07 marenz_ joined #git
22:08 n-st joined #git
22:09 Atm0spher1c joined #git
22:11 cahoots joined #git
22:11 rwb joined #git
22:13 oich joined #git
22:14 Vinnie_win joined #git
22:14 LaptopBrain joined #git
22:14 weyanus joined #git
22:21 Gsham joined #git
22:22 _rgn joined #git
22:23 Sasazuka__ joined #git
22:23 xissburg joined #git
22:23 xissburg joined #git
22:25 stoopkid joined #git
22:25 chachasmooth joined #git
22:26 jeffreylevesque joined #git
22:27 anjen joined #git
22:28 zumba_addict joined #git
22:29 arooni joined #git
22:29 cagedwisdom joined #git
22:29 arooni is there a way i can checkout a project; but restrict it to tagged releases ? and then when i update it, have it only update if there is a tagged release?
22:30 arooni if so, how would i go about doing that?
22:32 arooni it looks from 2 minutes of googling my options are; git checkout tags/<tag_name> ; and git checkout tags/<tag_name> -b <branch name>
22:32 arooni any reason why one is better than others?
22:32 ChadTaljaardt joined #git
22:33 anuxivm joined #git
22:34 kadoban arooni: ... it sounds a lot like you're trying to use git for just getting a copy of some project to run it. Usually a mistake unless there is literally no other way to get it.
22:35 arooni kadoban: well i'm trying to get at a project; but then keep it up to date as it progresses when there are other tagged releases; i dont plan on contributing to this particular project
22:35 joshszep joined #git
22:35 arooni git would seem ideal for this purpose (the keeping it up to date part)
22:36 zumba_addict hey folks. need your expert ideas about the way we deploy our app and how we can implement hotfix to production. We're using Jenkins to build our javascript app. When it gets build, the default deployment is in our DEV environment. The deployed assets are simple html, css, jpg, js files that is ready to be served by Nginx+S3. We have another Jenkins job that we start to upload those same files into our STAGE so our QA can test. That same Jenkins j
22:36 zumba_addict ob can be used to upload the same files to our PROD environment. There were issues last week that were found in production. I figured out a way to test a fix-branch. The problem right now is how will I push the fix-branch to stage without going thru stage? It's because our stage normally contains other features that we will not want in production
22:36 kadoban arooni: Then find any other way to get it. You're going to get frustrated, git is *way* over-powered and over-complicated for that use.
22:36 eb0t joined #git
22:37 arooni kadoban: i'm sure it is; but i see it as an opportunity to learn more about git; which i'd like to do anwyay for myself
22:38 EV3RYDAYPR0GRESS joined #git
22:38 eblip joined #git
22:40 g105b joined #git
22:40 venmx joined #git
22:42 ryouma i am conservative with git, and not an expert, but i use git all the time for getting projects.  i use maint branch if it exists and just pull.
22:43 ryouma however, i find this to be insecure in some cases (git protocol does not guarantee no mitm, or so), so i don't do it for those cases.
22:44 kadoban ryouma: Access via HTTPS is MITM-resistant, as-is SSH if done correctly (check the fingerprints for new domains, etc.)
22:44 kadoban The actual git:// protocol I rarely see used.
22:45 ryouma kadoban: some servers only do git i think
22:45 kadoban Git does work fine for "just get me a copy of this thing", if you already know git. But I see a lot of users told to use it, and then they come here lost and annoyed, because ... git is shitty if you don't want to learn anything about it.
22:45 kadoban ryouma: Yes, but it's fairly rare. I don't know if I've ever actually used one like that.
22:46 ryouma i learned the hard way that git will prove to me that i know nothing about it the second i think i do
22:47 ryouma so i use it for bare minimum and have scripts for stuff
22:48 kadoban It can be confusing. The interface leaves a lot to be desired. If you learn kind of what I'd consider the underlying concepts, and then just try to find the command that does the modification/query of the underlying concepts it seems to go well enough.
22:48 Blkt joined #git
22:50 XenophonF joined #git
22:51 Noodlewitt joined #git
22:51 pur3eval joined #git
22:52 dave0x6d joined #git
22:57 BSaboia joined #git
23:01 fmeerkoetter joined #git
23:01 cdg joined #git
23:01 Milos_ joined #git
23:03 MattMaker joined #git
23:04 nickabbey joined #git
23:04 bannakaffalatta joined #git
23:04 raijin joined #git
23:07 Gsham joined #git
23:07 jason237 joined #git
23:11 dsdeiz joined #git
23:15 MattMaker joined #git
23:17 bket joined #git
23:18 wgrant joined #git
23:19 Vivekananda joined #git
23:20 OnkelTem joined #git
23:20 idlemind joined #git
23:20 mikecmpbll joined #git
23:21 OnkelTem Hi all. Noble sirs, please tell me, what's the magic of .gitignore so that my mortal mind can't handle it?
23:30 absinthe joined #git
23:30 robattila256 joined #git
23:31 gugah joined #git
23:32 metachr0n joined #git
23:33 Noodlewitt joined #git
23:34 OnkelTem joined #git
23:34 OnkelTem ping
23:34 OnkelTem Was disconnected
23:34 sbasso joined #git
23:34 peterbec` joined #git
23:34 OnkelTem right after the question. And I'm not even sure what part of my question get passed
23:36 einnjo joined #git
23:36 OnkelTem 'sites/*/files/*' - why doesn't this ignores /www/sites/default/files/.... ?
23:36 OnkelTem What's wrong? How to ignore the file?
23:37 nowhereman joined #git
23:37 venmx joined #git
23:41 phy1729 Are the files already tracked?
23:42 dtrott joined #git
23:42 ixian joined #git
23:44 om_henners joined #git
23:44 hahuang65 joined #git
23:48 davidosomething joined #git
23:48 ozmage joined #git
23:49 ozmage joined #git
23:50 dreiss joined #git
23:51 rossome joined #git
23:51 chipotle joined #git
23:51 Dougie187 left #git
23:52 pur3eval joined #git
23:53 GT4066 joined #git
23:53 gclaugus joined #git
23:55 wizardedit joined #git
23:57 rivarun joined #git

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