IRCloggy #git 2014-09-25

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2014-09-25

← fstd left00:00
→ ropav joined00:00
→ fstd joined00:00
→ loz-- joined00:00
→ jay_ joined00:00
← jay_ left00:01
← ropav left00:01
← Sample left00:01
→ gccostab_ joined00:01
← m8 left00:01
→ devoldmx3 joined00:02
← zanchoPansa left00:02
← imachuchu left00:02
→ m0ltar joined00:02
← toothrot left00:03
← jottr left00:03
→ aidalgol joined00:03
← aidalgol left00:03
← gccostabr left00:03
→ jontmorehouse joined00:04
→ aidalgol joined00:05
← devoldmx left00:05
← jonmorehouse left00:06
→ ropav joined00:06
→ _Atom_ joined00:07
← ropav left00:07
← mscook left00:08
← lyang0 left00:09
→ sohail joined00:11
→ jonmorehouse joined00:11
← cgar left00:11
← GluonQuark left00:12
← jontmorehouse left00:13
→ bAnt_ joined00:14
← ALiXyrus left00:15
→ jontmorehouse joined00:16
→ kopparam joined00:16
→ ojacobson joined00:17
→ neonixcoder joined00:17
← jonmorehouse left00:18
→ tokik joined00:18
← chiromante left00:19
→ common-lisper joined00:20
← ecky--ptang-zoob left00:20
← kopparam left00:21
→ ecky--ptang-zoob joined00:21
← jontmorehouse left00:22
→ SjB joined00:22
→ mscook joined00:22
→ jontmorehouse joined00:22
← ianbrandt left00:22
→ lyang0 joined00:23
← havanamint left00:23
← ncd|leeN left00:23
→ leen^| joined00:24
← mscook left00:25
→ mscook joined00:25
← nettoweb left00:26
← jonr22 left00:28
→ Warrior-kk joined00:28
→ nettoweb joined00:28
→ toothrot joined00:29
← Warrior-kk left00:29
← oskarkv left00:29
→ mattstra_ joined00:29
← sgen_ left00:30
→ Mobutils joined00:30
→ Warrior-kk joined00:30
← harish_ left00:30
← jenni_naiaretti left00:31
→ sgen_ joined00:31
← mattstratton left00:31
← sgen_ left00:31
→ mattstratton joined00:31
→ pandeiro joined00:32
← common-lisper left00:32
← JosephFerano left00:33
← daedeloth left00:33
← mattstra_ left00:34
← Mobutils left00:34
← ErKa left00:34
← Quevin left00:34
→ Sample joined00:35
← Sample left00:35
→ mikewintermute joined00:36
← leen^| left00:36
→ leen^| joined00:36
→ sgen_ joined00:37
← maestrojed left00:37
→ jonmorehouse joined00:38
← blackmesa left00:38
← orinday left00:38
← jontmorehouse left00:38
→ yosito joined00:39
← felixjet left00:39
m0ltar I'm on 2.1.0. Doing: "git diff --exit-code $filename; echo $!" -- I am getting visual diff output (there are differences) but the exit code is always 0 (zero).00:39
← EminenceHC left00:39
← hmsimha_ left00:39
→ Lacris joined00:41
→ jason237 joined00:41
→ ivan\_ joined00:42
← aidalgol left00:42
← yosito left00:43
→ helgikrs3 joined00:43
→ _joelsmith joined00:44
← nettoweb left00:44
← hyperair left00:45
← anaran left00:46
→ common-lisper joined00:46
→ jontmorehouse joined00:47
→ danemacmillan joined00:47
→ robzilla joined00:47
← ojacobson left00:47
← jonmorehouse left00:48
→ ojacobson joined00:48
→ raffe joined00:49
← paul424 left00:49
← yacks left00:50
← jyuan` left00:50
→ aidalgol joined00:51
→ jyuan joined00:51
← ivan\ left00:51
← joelsmith left00:51
← tapout left00:51
ivan\_ → ivan\00:51
→ iateadonut joined00:52
← mscook left00:52
→ devoldmx joined00:52
← robzilla left00:53
→ yacks joined00:53
iateadonut i've got a bunch of 'deleted' files in my working directory. they are all in the directory /vendors - i'm wondering how do i delete just those files that appear 'deleted' ?00:53
→ leeN joined00:53
→ ppinto joined00:53
← leen^| left00:54
→ Mobutils joined00:54
← devoldmx3 left00:54
→ Malsasa joined00:54
→ jonmorehouse joined00:54
→ zivester joined00:56
← jontmorehouse left00:56
ruediger_ → ruediger00:57
→ nettoweb joined00:57
← nettoweb left00:57
→ rchavik joined00:57
→ awkwardusername joined00:57
→ nettoweb joined00:57
Guest69740 → magic00:58
magic → Guest2098100:58
Guest20981 → magic00:59
← magic left00:59
→ magic joined00:59
← m0viefreak left00:59
← jyuan left00:59
← roflin left01:00
← LBV_User left01:00
← _Atom_ left01:00
→ roflin joined01:00
← nettoweb left01:00
← eto left01:01
← blahdodo left01:01
← Steve_Jobs left01:02
→ eto joined01:02
→ Steve_Jobs joined01:03
← Lacris left01:03
← bmcorser left01:03
→ ferreum_ joined01:04
rudi_s m0ltar: use echo $? - $! is not the exit code01:04
m0ltar feels stupid. thanks rudi_s01:04
rudi_s np01:04
→ pwnz0r joined01:05
← seanmerron left01:06
← Sasazuka left01:06
← ferreum left01:07
← bitkiller left01:07
← kballou left01:07
← Neozonz|Disc3 left01:07
← mattstratton left01:08
→ yosito joined01:08
→ mattstratton joined01:09
← mattstratton left01:09
→ jdrumheller_ joined01:09
iateadonut when i do 'git status', i see in my working directory a bunch of files that say 'deleted' - how can i stage those for a commit all at once, and just the files that appear when i do 'git status'?01:09
← jdrumheller_ left01:09
→ mattstratton joined01:09
← brandonshowers left01:10
→ aartist joined01:10
→ berndj-blackout joined01:11
← awkwardusername left01:11
→ jonr22 joined01:11
→ thedodd_ joined01:12
berndj-blackout i'm cloning a big repo but i don't want to do it all in one go (midnight data is cheaper than daytime); is there a way to resume a clone at a later time? ^C would just wipe everything i have downloaded so far, so i guess i should copy .git to a safe place first - will that even help me?01:13
→ weiyang joined01:13
← thedodd_ left01:13
jrnieder berndj-blackout: my best advice is to rsync a bundle instead01:14
→ thedodd joined01:14
← jonmorehouse left01:14
← stellarhopper left01:14
jhass → jhass|off01:14
→ Toaster` joined01:14
jrnieder berndj-blackout: if you don't control the server, you can use https://bundler.caurea.org/01:14
berndj-blackout indeed i don't. it's flightgears fgdata fwiw01:15
← leeN left01:15
jrnieder berndj-blackout: oh, hm, that seems to be down. source at https://github.com/wereHamster/git-bundler-service01:15
→ Mso150 joined01:15
← ncthom91 left01:15
jrnieder random web search finds http://flightgear.mxchange.org/pub/fgfs/fgdata.bundle01:16
berndj-blackout heh, the fg page even suggests downloading it with bittorrent01:16
→ jonmorehouse joined01:16
jrnieder yeah, that's the way to go I'd say01:16
berndj-blackout and because git's history is self-checking, i can trust that mxchange bundle, right?01:16
→ mscook joined01:16
jrnieder if the sha1s match, then sure01:16
→ tapout joined01:16
← Sebtoast left01:17
← daynaskully left01:17
→ kopparam joined01:17
pekster All you need to know is that your latest sha1 commit matches the server's history and you know the rest of the history before that is good01:17
Assuming you trust however you visited the server to get _that_ sha1 ;)01:17
jhass|off → jhass01:17
→ digifiv5e joined01:18
← digifiv5e left01:18
→ digifiv5e joined01:18
→ acharlieh joined01:18
← desposo left01:18
jrnieder oh, good point. by 'the sha1s' I mean 'the sha1s for the refs you care about'01:18
berndj-blackout hmm, the data in .git/objects might not be worth saving anyway, it's a giant tmp_pack_U3Po5c01:18
← aartist left01:18
digifiv5e → daynaskully01:18
jrnieder I'd start over and use bittorrent, yes01:19
jhass → jhass|off01:19
→ bezet joined01:20
← mikewintermute left01:21
← mscook left01:21
→ moritzschaefer joined01:21
→ mikewintermute joined01:21
← kopparam left01:21
→ hmsimha_ joined01:22
→ mscook joined01:23
← bezet left01:24
→ Goplat joined01:24
← CheckDavid left01:24
← moritzs left01:24
→ c2h6o joined01:25
→ k_sze[work] joined01:25
→ RiVale joined01:26
← rdbell left01:26
→ rdbell joined01:27
→ jontmorehouse joined01:28
← jonmorehouse left01:28
← Malsasa left01:28
→ Malsasa joined01:29
→ nettoweb joined01:30
← nettoweb left01:30
→ nettoweb joined01:30
→ scottschecter joined01:31
→ Vampire0_ joined01:31
← Siicp left01:32
← scottschecter left01:32
← mscook left01:32
← toothrot left01:33
→ jonmorehouse joined01:33
→ scottschecter joined01:34
← jontmorehouse left01:34
← Vampire0 left01:35
← Mobutils left01:35
→ zhangxaochen joined01:36
→ EminenceHC joined01:37
← rdbell left01:37
zhangxaochen my git went wrong after my creating a new branch and switching between them01:37
→ mscook joined01:37
→ watabou joined01:37
→ neilk_ joined01:38
neilk_ In a large repo that I don't control, someone checked in a dos file. My local checkout (mac os x, core.autocrlf=input keeps reporting it as changed). How can i get it to shut up?01:39
I've tried manually rewriting the file to unix, as well as various settings to autocrlf. I don't think it would make sense for me to modify .gitattributes for someone else's repo.01:39
← epifanio left01:40
neilk_ I'm not even really sure why git status thinks it's changed. What is it comparing it to? Does it do line ending conversions before deciding on status?01:40
← neonixcoder left01:40
← thedodd left01:40
zhangxaochen http://codepad.org/5jS3mue1 , does anyone have some ideas?01:41
← EminenceHC left01:41
zhangxaochen both 'git checkout -- .' and 'git stash' could not remove the untracked file01:41
→ toothrot joined01:42
← mnavratil left01:42
← hmsimha_ left01:42
neilk_ zhangxaochen: what does git status say?01:43
← maslowbeer left01:44
zhangxaochen neilk_, http://codepad.org/HyIaP2Sm01:44
one of my files modified is not staged01:45
→ listochkin joined01:45
zhangxaochen while actually I've changed nothing, but git thinks the line endings are changed from LF to CRLF01:45
← jonmorehouse left01:46
neilk_ zhangxaochen: I think you have an unrelated issue.01:46
zhangxaochen unrelated?01:46
← pwnz0r left01:46
neilk_ zhangxaochen: I have the same problem today, a line-ending issue. Git thinks it's changed but it's not really.01:46
zhangxaochen: if you do a fresh checkout, does the same file appear to be changed?01:47
→ arthurb_ joined01:47
→ daito joined01:47
neilk_ zhangxaochen: like, in a separate directory01:47
zhangxaochen neilk_, you mean clone again from the remote repo?01:48
neilk_ zhangxaochen: yes01:48
→ fatalhalt joined01:49
→ smccarthy joined01:49
neilk_ zhangxaochen: no guarantees on this, I'm puzzled by the same issue today.01:49
→ robarelli joined01:49
zhangxaochen neilk_, probably no01:49
neilk_ zhangxaochen: this might help https://help.github.com/articles/dealing-with-line-endings01:50
zhangxaochen neilk_, are you saying it's just something is happening *today*?01:50
← listochkin left01:50
neilk_ zhangxaochen: no, by coincidence we have the same problem.01:50
← LucasTT_ left01:51
zhangxaochen neilk_, much worse01:52
→ jackh joined01:52
← darkbasic left01:52
zhangxaochen I cloned the remote repo again to another folder, and now it's "[master +0 ~18 -0]"01:52
f*****k01:52
← m0ltar left01:53
→ darkbasic joined01:53
→ zzzrodd joined01:53
← scottschecter left01:53
← Mso150 left01:54
Vampire0_ → Vampire001:54
→ hyperair joined01:55
← robarelli left01:55
gitinfo set mode: +v01:55
← RiVale left01:56
zzzrodd Hi, git is ignoring a specific folder in my project. no matter what I do I can't add it to the project, it's never there when i do a git status. Browsing the project on bitbucket I see this: vlf_assets → 794a98ae72f8 [794a98ae72f8] - Any ideas on what's going on?01:56
belak zzzrodd: that's not a folder, that's a submodule...01:56
zzzrodd idk how that became a submodule if that's a folder in my project01:56
and there are no .git under that folder01:57
← Ankhers left01:57
→ harish_ joined01:57
← devoldmx left01:58
→ nettoweb_ joined01:58
← looper left01:58
← danemacmillan left01:58
← jonr22 left01:58
← nettoweb_ left01:58
← Motoko left01:59
← common-lisper left01:59
→ nettoweb_ joined01:59
→ offby1 joined01:59
← bAnt_ left01:59
← offby1 left02:00
→ offby1 joined02:00
belak Have you initialized your submodules since cloning?02:01
← nettoweb left02:01
→ devoldmx joined02:01
→ looper joined02:01
← mmitche__ left02:01
→ neonixcoder joined02:02
damccull_ → damccull02:02
← mikewintermute left02:02
← jon_r left02:02
← johntramp_ left02:02
← teran left02:02
→ mikewintermute joined02:03
lng Hi! There is sinle directory in repo1 where there are the other 3 sub-directories. When I add repo1 as remote to repo2, and do `git fetch repo1 && git branch repo1 remotes/repo1/branch1 && git checkout branch1`, for some reason I see these 3 subdirectories insted on one. Why?02:04
s/on/of/02:04
→ eletuchy joined02:05
zzzrodd nevermind, figured out02:05
did git rm --cached /path/02:05
← weiyang left02:06
→ Ankhers joined02:06
→ zumba_addict joined02:06
← zzzrodd left02:07
→ ncthom91 joined02:07
← msonntag left02:07
→ jpf_ joined02:08
→ brandonshowers joined02:08
→ Mobutils joined02:09
→ msonntag joined02:09
← looper left02:09
→ muhaha03__ joined02:09
← damccull left02:11
← neilk_ left02:11
← ncthom91 left02:12
← Consuela left02:12
← jpf_ left02:13
← jpf left02:13
→ havanamint joined02:13
← simesy left02:13
→ damccull joined02:13
lng I can also see some differences in the structure after fetch/checkout - there is one redundant dir appears02:14
← alvaro_o left02:14
lng the source branch was `git filter-branch`02:15
← iateadonut left02:15
→ thedodd joined02:16
← Toaster` left02:18
→ kopparam joined02:18
← ppinto left02:18
← aidalgol left02:19
lng seams like this dir is taken from repo202:19
← zumba_addict left02:20
→ aidalgol joined02:20
→ zumba_addict joined02:20
→ Dougie187 joined02:21
← baweaver left02:22
→ simesy joined02:22
← kopparam left02:22
← zumba_addict left02:23
← fatalhalt left02:24
→ zumba_addict joined02:24
→ common-lisper joined02:25
← thedodd left02:28
← benbergman left02:28
← JanC left02:29
→ benbergman joined02:29
← dreiss left02:29
→ oskarkv joined02:31
→ jon_r joined02:33
→ otter768 joined02:35
← Bruno_ left02:36
→ aartist joined02:36
← mueslo left02:37
→ epifanio joined02:37
→ BSaboia joined02:38
← mellernoia left02:39
→ EminenceHC joined02:39
← zumba_addict left02:41
→ felixjet joined02:42
→ zumba_addict joined02:42
→ jpf joined02:43
→ JanC joined02:43
← EminenceHC left02:43
→ HanClinto joined02:44
← amikiri left02:44
→ glosoli joined02:44
← mikewintermute left02:45
← toothrot left02:45
← zumba_addict left02:46
→ zumba_addict joined02:47
→ operhiem1 joined02:49
← harish_ left02:50
→ awkwardusername joined02:51
← kaendfinger left02:51
← BSaboia left02:51
→ robarelli joined02:51
→ weiyang joined02:52
→ harish_ joined02:52
← nettoweb_ left02:53
← weiyang left02:57
← robarelli left02:57
→ wrouesnel joined02:57
← common-lisper left02:59
→ pwnz0r joined02:59
← txdv left02:59
→ txdv joined03:00
← yosito left03:01
← aidalgol left03:01
→ yosito joined03:01
← neonixcoder left03:02
→ thedodd joined03:03
← yacks left03:03
→ teran joined03:03
→ bvi joined03:04
← Vinnie_win_w left03:04
→ jiku joined03:05
← otter768 left03:05
← yosito left03:06
← operhiem1 left03:06
→ operhiem1 joined03:08
← teran left03:08
→ dreiss joined03:09
← thedodd left03:09
→ tmcmahon joined03:09
→ thedodd joined03:09
→ yacks joined03:09
← zhangxaochen left03:09
→ nnyk joined03:10
→ jdrumheller_ joined03:10
← tanath left03:10
← jdrumheller_ left03:10
← thedodd left03:10
→ aidalgol joined03:11
→ tanath joined03:11
→ jenni_naiaretti joined03:12
→ rdbell joined03:12
← jenni_naiaretti left03:12
→ TomCat2 joined03:13
atomx i was banned a few months ago from git, but now, thanks to the pity of the time elapsed, I could connect again ;)03:13
← Mitchbones left03:14
→ dvdchr joined03:14
← shinnya left03:14
atomx do you know if it's possible to make a read-only account on bitbucket, such that to provide the password to somebody who can read some/all repositories, but cannot modify them ?03:15
← zivester left03:15
belak atomx: what are you actually using this for?03:16
← Noldorin left03:16
→ zivester joined03:16
atomx for my personal work03:17
I want to show it to somebody else with ro permisions03:17
possible?03:17
belak You can add them to a repo with read permissions03:17
atomx possible on bitbucket.org?03:17
→ daviid joined03:17
belak Yes03:17
atomx: https://confluence.atlassian.com/display/BITBUCKET/Repository+privacy,+permissions,+and+more03:18
atomx: There are also deployment keys which give that ssh key the ability to clone a repo over ssh but no more than that03:18
atomx No, I want to show already existing repositories, but with another password than mine -- because with my pasword of my account they could remove03:18
Eugene You.... what?03:18
!xy03:18
gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...03:18
→ kopparam joined03:18
atomx OK. So it03:19
s03:19
possible03:19
→ zumba_ad_ joined03:19
→ Fissure joined03:19
atomx belak: I am reading that now03:20
belak atomx: yes, in the repository admin, under access permissions, you can give users admin, write or read03:20
→ bezet joined03:20
atomx The idea is to write in my CV the read only account, such that to be able to convey somehow in CV the core written by me03:21
the code03:21
Is there some more direct way than a read-only git repo ?03:21
→ JosephFerano joined03:21
← zumba_addict left03:22
ojacobson ZIPs work03:22
→ steveoh joined03:22
→ neonixcoder joined03:22
steveoh hello, i need some help with git clone throwing a SSL certificate problem: unable to get local issuer certificate03:23
ojacobson though, honestly, you're putting way the hell too much thought into technical barriers03:23
TomCat2 git is for version control. unless you are intending to use it as such, it's not a replacement for a plain old file drop03:23
steveoh i'm on a windows machine03:23
and not quite sure what's up03:23
← kopparam left03:23
atomx you cannot drop the file in CV, keeping it protected03:23
→ arup_r joined03:23
ojacobson protected from what?03:23
data can be copied, edited, distributed03:23
that's the nature of bits03:23
steveoh trying to install some atom.io packages and they are failing with that error message03:23
atomx from public place03:24
steveoh git clone https://github.com/Benvie/harmony-collections.git to be specific03:24
TomCat2 google drive?03:24
ojacobson how ev er, because of how brutally unfair intellectual property legislation is in north america, nobody's going to distribute your code secretly03:24
→ weiyang joined03:24
← arup_r left03:24
ojacobson there's no payoff and the risk you'll sue is way too high03:24
→ trustedsage joined03:24
atomx My code is already on bitbucket03:24
→ iron_houzi joined03:24
ojacobson similarly, nobody's going to keep your code - a hiring manager will probably glance at it, but that's about it03:24
← bezet left03:24
atomx It is more direct to do it so, if bitbucket allow read only accounts03:25
ok. Thanks.03:25
I will study the provided article03:25
belak atomx: it's not that the account is read only, just that you can give an account read only access to certain repos03:25
← bvi left03:25
← ajustrun left03:25
steveoh can anyone help?03:25
i know ssh and all that is not super fun but this is frustrating and a few steps shoudl probably fix it03:26
TomCat2 probably as a hiring manager, I would appreciate someone more who made my life easier and just allowed me to somehow get a zip file than someone who required I navigate their git repo03:26
having 'Git' on the CV would be enough to convince me that you knew how to use it... I wouldn't need to go beyond that03:26
lower the barriers03:27
I have a somewhat complex scenario that I'm trying to work out what the best strategy is going to be going forward...03:28
← jon_r left03:28
atomx belak: I have an account X there with repositories A, B C.03:28
TomCat2 We have a vendor product that contains sources that we are allowed to modify and customize... unfortunately it's not a customization framework... it's basically just their app code and they say 'here it is, go for it'03:28
→ jenni_naiaretti joined03:28
atomx You mean, I have to make an account Y connected to the same repo?03:28
or to make another password for X ?03:29
← jenni_naiaretti left03:29
atomx and on this 2nd password to provide ro access ?03:29
TomCat2 so lets call it VendorV5... vendor is now on V6. Our legacy app is still running on their V5. We are starting a new project to work against their V6, but also want our V5 changes to take effect wherever possible03:29
the legacy team has been working completely in CVS with everything, and vendor updates have been a very time consuming task for them. We have an opportunity to move them to Git for the start of this project, so I would like to solve this manually updating files from the vendor issue.....03:30
← yacks left03:31
TomCat2 here's the complication though... legacy team will continue to provide updates against their V5 based version for the next 6 months while we work on the V6 version... we need to keep their updates flowing through as well03:31
so if anyone followed that, any kind of input would be great :D03:31
→ yacks joined03:31
belak atomx: Ask the person who you want to give access to to make an account and give you the username. You can add that username to those repos with read access. They will only be able to see the code and not modify it.03:31
→ jenni_naiaretti joined03:33
← Sleepy63 left03:33
atomx or i can make an account and ask myself to provide ro acces, after that i put the 2nd account name and password in cv . correct so ?03:33
TomCat2 atomx: Honestly, what I would do is just get some cheap hosting somewhere and put up a CV website. Create a user list for a protected area where you want to present some source code and distribute the usernames/passwords on the CVs you send out03:33
← jenni_naiaretti left03:34
TomCat2 you could even put a different username/password on each CV and then you would know who was looking at your code03:34
← Mobutils left03:34
← glosoli left03:35
atomx correct. i think any site that supports javascript also has protected connections.03:35
like heroku03:35
TomCat2 atomx: note that in my suggestion, you don't want to go too overboard on the website design... if it looks like you spent a lot of time on it, then that in itself could be a red flag to employers03:35
atomx: anyone who's really good at what they do, but preferring to work as an employee... they don't normally have time to build a robust personal marketing site03:36
atomx: if you are looking for contract work, however, go all out03:36
so no suggestions for me guys... am I basically screwed to leverage Git for this?03:37
→ jon_r joined03:37
atomx thanks !03:37
that in itself could be a red flag to employers --- can you explain why ? heroku it's easy to use03:38
← Ankhers left03:38
atomx heroku is javascript combined with git03:38
just write the js code, and push it there, and all works !03:39
ojacobson TomCat2: tracking vendor releases in git is actually pretty trivial, because of git's snapshot-based nature03:39
atomx heroku does all the job alone. you just put a file node.js, and it will link the site starting from this file03:39
← zacg left03:40
ojacobson you might, perhaps, be explaining houses to carpenters here.03:40
→ EminenceHC joined03:42
TomCat2 ojacobson: I'll be back in a sec... going to reproduce and document the steps that don't seem to be working as well as I had hoped... maybe I did something wrong with it03:42
ojacobson... basically, I started with a base in Git as the vendor's V5 product... committed... created a new branch from it and overlayed the legacy team's changes... committed that03:42
then went back to V5 branch and made a new branch out of it for V6... replaced everything with what was provided in V6 and committed03:43
made a branch from V6 for our new version... then merged from our v5 version to our v6 version... some things merged OK... had some expected conflicts to resolve03:44
← supernaut left03:44
← jon_r left03:44
→ listochkin joined03:44
TomCat2 further changes to the legacy app that I tried to merge into our new version seemed to get stuck on some of the same conflicts03:44
i.e. imagine a JSP file where someone just added a <script src=....></script> to the second to last line... but the vendor ended up completely changing the file. We had to resolve the merge conflict by taking all of their new code and just re-adding that script line to the right place03:46
← EminenceHC left03:46
TomCat2 then someone replaced <script src...> with <script> some code </script>03:46
(in legacy)03:46
← Dougie187 left03:47
← Droolio left03:47
→ Sleepy63 joined03:47
→ supernaut joined03:47
steveoh reinstalling mysysgit fixed my problem03:48
thanks folks03:48
TomCat2 should expect that once a file is in conflict between legacy and new, that merging future updates from legacy is just going to keep resulting in merge conflicts, or am I probably doing something wrong?03:48
← jiku left03:49
← listochkin left03:49
→ lacrymology joined03:50
→ lukeholder joined03:50
lacrymology is there a way to just update all tracking branches?03:50
← aidalgol left03:51
→ robarelli joined03:53
→ aidalgol joined03:53
→ revyd joined03:53
← gfixler left03:53
→ ropav joined03:55
→ zacg joined03:56
← zacg left03:56
→ zacg joined03:56
← ome left03:57
← neonixcoder left03:57
← evildmp left03:59
← sgen_ left03:59
← robarelli left03:59
→ bvi joined04:00
← aidalgol left04:00
← raffe left04:01
→ jerius joined04:01
← brandonshowers left04:02
→ zz_LoRdToLsToI joined04:02
→ mwoodson joined04:02
→ GT4066 joined04:02
→ marscher joined04:04
→ teran joined04:04
← bvi left04:04
→ diegoviola joined04:05
← aartist left04:05
← marchelzo_ left04:06
← kerrick left04:06
← kukks left04:06
← steveoh left04:06
← ropav left04:06
← ojacobson left04:07
→ ropav joined04:08
← teran left04:09
→ TititaTitutu joined04:13
→ User458764 joined04:14
← marscher left04:14
→ bvi joined04:17
→ ErKa joined04:17
← moritzschaefer left04:17
← epifanio left04:17
→ glosoli joined04:18
← ropav left04:19
← Bourbonic[OU] left04:20
→ marscher joined04:20
← madewokherd left04:21
→ gimpygoo joined04:23
← daito left04:23
← revyd left04:23
→ daito joined04:24
→ revyd joined04:24
→ mennea joined04:25
→ irqq joined04:26
→ aidalgol joined04:26
← Kabaka left04:27
← daito left04:28
← Pyrogerg_ left04:29
→ Kabaka joined04:30
← tmcmahon left04:30
← lukeholder left04:31
← Floatingman left04:31
→ jstimm joined04:32
← jstimm left04:32
← kermit left04:34
→ kermit joined04:35
→ Floatingman joined04:35
→ punchagan joined04:36
→ JustJohn joined04:36
← JustJohn left04:37
→ neonixcoder joined04:38
← acharlieh left04:39
← kpreid left04:45
→ kpreid joined04:45
← glosoli left04:45
← neonixcoder left04:45
← irqq left04:45
← BuenGenio left04:46
→ irqq joined04:46
→ SLY1986 joined04:48
← HanClinto left04:48
→ neonixcoder joined04:49
← pwnz0r left04:51
milki lacrymology: git remote update maybe04:51
← lindenle left04:52
← iamjarvo left04:53
← mennea left04:55
← irqq left04:55
→ mennea joined04:55
→ kcj joined04:55
← SjB left04:55
→ robarelli joined04:56
→ TT314 joined04:56
← mscook left04:56
← nnyk left04:57
← zacg left04:58
← TT314 left04:58
← Floatingman left04:58
→ Mobutils joined04:59
→ kiran joined05:00
→ jon_r joined05:00
← smccarthy left05:00
← robarelli left05:01
→ Floatingman joined05:03
← unglid left05:04
→ daito joined05:04
← UmbraMalison left05:04
→ lukeholder joined05:04
→ UmbraMalison_ joined05:05
→ teran joined05:05
→ subhojit777 joined05:06
← dreiss left05:08
← teran left05:09
→ unglid joined05:09
→ beautifulmind joined05:09
→ jdrumheller_ joined05:11
← Lyqyd left05:11
← jdrumheller_ left05:11
← daito left05:11
← eliasr left05:12
← beautifulmind left05:12
← ecky--ptang-zoob left05:12
→ ecky--ptang-zoob joined05:13
→ johnny2600 joined05:13
← lukeholder left05:15
→ beautifulmind joined05:15
→ zoso joined05:16
← rdbell left05:17
← ErKa left05:17
→ rdbell joined05:17
→ kopparam joined05:18
→ _Atom_ joined05:18
→ mscook joined05:19
← _Atom_ left05:20
→ bezet joined05:20
→ daito joined05:21
← rdbell left05:21
→ mscook_ joined05:22
→ MutLalpha joined05:22
→ ncthom91 joined05:22
← kopparam left05:23
→ lindenle joined05:23
→ h0bbit joined05:23
→ CraigyDavi joined05:23
← mscook left05:23
← CraigyDavi` left05:24
← mennea left05:25
→ arup_r joined05:25
← bezet left05:25
→ mennea joined05:25
← kcj left05:26
← marscher left05:27
← Console left05:27
← aidalgol left05:27
← lindenle left05:27
← stickyboy left05:28
← GT4066 left05:30
→ Console joined05:31
→ statis joined05:31
→ gfixler joined05:31
→ Junior joined05:31
→ kopparam joined05:32
→ BuenGenio joined05:32
← devoldmx left05:33
→ devoldmx joined05:34
→ lukeholder joined05:34
← Tuna-Fish left05:36
← h0bbit left05:36
← bvi left05:37
← ncthom91 left05:37
→ kyb3r_ joined05:38
→ khmarbaise joined05:40
← neonixcoder left05:41
→ Tuna-Fish joined05:41
→ dreiss joined05:42
→ ThomasLocke joined05:43
→ h0bbit joined05:43
→ akagr joined05:43
→ tfirg joined05:44
→ neonixcoder joined05:45
← TomCat2 left05:46
→ TomCat2 joined05:46
→ damccull_ joined05:46
← Goplat left05:46
← LLaurent left05:47
← tfirg left05:47
← leprechau left05:47
→ EminenceHC joined05:47
→ leprechau joined05:48
→ LLaurent joined05:48
← bedouin left05:48
← damccull left05:49
→ bedouin_ joined05:50
← Tuna-Fish left05:51
→ Kicer86 joined05:51
← khmarbaise left05:51
← hcc23_ left05:51
← EminenceHC left05:52
→ hcc23_ joined05:52
→ Tuna-Fish joined05:53
→ rdbell joined05:54
← mennea left05:55
→ mennea joined05:55
← starkhalo left05:55
→ jimmyy joined05:56
← jpf left05:57
→ robarelli joined05:58
← gimpygoo left05:58
← Fissure left05:58
← tanath left06:01
→ King_Hual joined06:01
← daviid left06:01
→ tanath joined06:01
← sgen left06:02
← robarelli left06:03
→ Silmarilion joined06:04
← a_le left06:04
→ a_le joined06:04
← zumba_ad_ left06:06
← User458764 left06:06
← neonixcoder left06:06
← jerius left06:06
→ Fissure joined06:07
← jnewt left06:07
→ papegaaij joined06:07
→ zumba_addict joined06:08
→ jnewt joined06:08
→ Marcus_ joined06:09
← naturally left06:09
→ jerius joined06:09
→ User458764 joined06:11
→ _Atom_ joined06:14
← h0bbit left06:14
→ sgen joined06:14
→ ciampix joined06:14
← BuenGenio left06:16
→ jagob joined06:17
← a_le left06:17
← _Atom_ left06:18
→ irqq joined06:18
→ roelmonnens joined06:19
→ gimpygoo joined06:20
← dvdchr left06:22
→ Wiz_KeeD joined06:23
→ a_le joined06:24
→ nnyk joined06:24
← mennea left06:25
→ BuenGenio joined06:25
→ mennea joined06:25
→ acolson joined06:25
← User458764 left06:26
→ boombatower joined06:28
← rdbell left06:28
← a_le left06:29
→ rath joined06:29
← ciampix left06:29
→ jceb joined06:29
→ FilipNortic joined06:29
→ User458764 joined06:30
← thibaultcha left06:30
← Gamecubic left06:31
← LLaurent left06:31
→ hmsimha_ joined06:33
← devoldmx left06:33
→ h0bbit joined06:33
← lacrymology left06:34
→ skynxnex joined06:34
→ FunkyAss joined06:35
→ teran joined06:36
→ Streward joined06:36
→ lacrymology joined06:36
→ roelmonn_ joined06:36
→ nilg joined06:37
← johnny2600 left06:37
← Streward left06:38
→ roelmon__ joined06:38
← weiyang left06:39
← hahuang65 left06:39
← roelmonnens left06:39
← acolson left06:39
→ devoldmx joined06:39
→ freimatz joined06:40
← teran left06:40
← rchavik left06:41
← roelmonn_ left06:41
→ gauke joined06:43
← arup_r left06:44
→ jargon joined06:44
→ Gizburdt joined06:45
← darkbasic left06:46
→ darkbasic_ joined06:46
→ arup_r joined06:47
← jon_r left06:48
→ jon_r joined06:48
→ bigblackbook joined06:49
→ maestrojed joined06:50
→ jonmorehouse joined06:50
→ acolson joined06:52
← jon_r left06:52
→ Streward joined06:52
→ rob_w joined06:53
← devoldmx left06:53
→ EminenceHC joined06:54
→ DrSkyLizard joined06:55
← mennea left06:55
→ mennea joined06:55
→ ciampix joined06:56
→ jon_r joined06:57
← EminenceHC left06:58
→ sdrfnord1 joined06:58
→ cbr_ joined06:59
← robbyoconnor left06:59
→ saurabh joined06:59
→ devoldmx joined06:59
saurabh → Guest4438806:59
→ silverfix joined06:59
→ robarelli joined07:00
→ ehmatthes joined07:01
← mscook_ left07:01
→ joo-_ joined07:01
→ thevishy joined07:02
→ jnavila joined07:02
→ thevishy_home joined07:02
← BuenGenio left07:03
→ hebz0rl joined07:03
← joo-_ left07:03
← Kicer86 left07:04
→ mindlessdemon joined07:04
← bigblackbook left07:04
← mindlessdemon left07:04
← kopparam left07:04
→ evildmp joined07:04
← Guest44388 left07:04
→ robbyoconnor joined07:04
→ mindlessdemon joined07:04
→ kopparam joined07:05
← mindlessdemon left07:05
→ Kicer86 joined07:05
← robarelli left07:05
→ mindlessdemon joined07:05
← mindlessdemon left07:05
→ dvdchr joined07:06
→ mindlessdemon joined07:06
→ aswen joined07:06
← mindlessdemon left07:06
→ mindlessdemon joined07:07
← kopparam left07:07
← mindlessdemon left07:07
→ kopparam joined07:07
→ mindlessdemon joined07:08
← mindlessdemon left07:08
→ mindlessdemon joined07:08
← mindlessdemon left07:09
→ mindlessdemon joined07:09
← revyd left07:09
→ vgarg joined07:10
← mindlessdemon left07:10
→ LeMike joined07:11
← hebz0rl left07:12
→ jdrumheller_ joined07:12
← jdrumheller_ left07:12
→ raboof joined07:12
raboof how do i do something like 'git branch -d remotes/origin/foo'?07:13
← sohail left07:14
osse raboof: git push --delete origin foo07:14
→ BuenGenio joined07:14
→ seschwar joined07:14
← devoldmx left07:14
→ joo-_ joined07:15
→ hebz0rl joined07:16
→ aidalgol joined07:19
← BuenGenio left07:20
← kopparam left07:20
→ bezet joined07:21
← jast left07:21
← mennea left07:23
← hebz0rl left07:24
→ hebz0rl joined07:25
← DrSkyLizard left07:25
→ devoldmx joined07:25
← bezet left07:25
← lukeholder left07:26
→ BuenGenio joined07:26
← joo-_ left07:27
→ mustafavelioglu joined07:28
→ gua_ould joined07:28
→ lukeholder joined07:28
→ ghostlin_ joined07:29
→ Warrior-kkk joined07:29
→ Trudko joined07:29
→ W0rmDr1nk joined07:30
← FunkyAss left07:30
← nnyk left07:31
← Warrior-kk left07:31
→ jast joined07:32
→ palcu_ joined07:32
← mustafavelioglu left07:33
→ tranzfuse joined07:33
→ FunkyAss joined07:33
← blubberbop left07:34
→ EminenceHC joined07:35
→ mustafavelioglu joined07:36
← jonmorehouse left07:36
→ balki1 joined07:37
← balki1 left07:37
→ petersr joined07:38
→ Shusshu joined07:38
← Shusshu left07:39
← EminenceHC left07:39
→ kerrick joined07:39
← dreiss left07:39
→ jonmorehouse joined07:40
← maestrojed left07:42
← BuenGenio left07:42
→ Mso150 joined07:43
→ BuenGenio joined07:44
← beautifulmind left07:44
→ mkaesz joined07:45
→ ki0 joined07:45
→ NBhosting joined07:46
→ kriks joined07:46
→ kopparam joined07:46
→ avvs joined07:46
→ AnujSharma joined07:47
→ Muinasjutuvestja joined07:49
→ jenni_naiaretti joined07:50
← jenni_naiaretti left07:51
→ Sonderblade joined07:51
← Sonderblade left07:52
→ Sonderblade joined07:52
← simesy left07:53
→ kcj joined07:53
← palcu_ left07:54
→ palcu joined07:54
→ Raging_Hog joined07:54
→ sgen__ joined07:56
→ palcu_ joined07:57
← thevishy_home left07:57
← thevishy left07:57
→ alorence joined07:57
→ roelmonnens joined07:58
← palcu left07:59
← Malsasa left07:59
→ roelmonn_ joined08:00
← roelmon__ left08:01
← acolson left08:01
→ robarelli joined08:02
← Gizburdt left08:02
→ mikecmpbll joined08:02
→ p4trix joined08:03
← arup_r left08:03
→ rjc joined08:03
← roelmonnens left08:04
→ simesy joined08:04
→ mennea joined08:04
→ khmarbaise joined08:05
→ noxd joined08:05
→ ome joined08:06
← robarelli left08:06
← eagles0513875 left08:06
→ eagles0513875 joined08:06
← eagles0513875 left08:06
→ eagles0513875 joined08:06
p4trix Hi. I want to ignore a bunch of files in my repo. Since its pretty big, its easier to do it the other way around. Ignore everything but the files I want. I have found something using the "!" operator in the .gitignore file.. But its not working. Its ignoring the files i want to not ignore...08:08
Any idea?08:08
tobiasvl p4trix: !repro08:08
gitinfo p4trix: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.08:08
→ msankhala joined08:08
← ki0 left08:09
tobiasvl p4trix: we need to see your .gitignore to help08:09
→ eliasr joined08:09
p4trix Thx, one sec :)08:09
→ jenni_naiaretti joined08:10
→ nikita joined08:10
_ikke_ !ignore_whitefile08:10
gitinfo [!gitignore_whitefile] A global/directory .gitignore blacklist with specific file whitelist is trivial to specify in git, since files tracked by git are ignored by .gitignore. So simply make a .gitignore of "*" and then `git add -f filename` Those specific files will be tracked by git and show up in git status and friends.08:10
tobiasvl aaah, nice trigger08:11
_ikke_ there is also ignore_whitedir08:11
← devoldmx left08:13
← zumba_addict left08:13
← TititaTitutu left08:13
p4trix https://gist.github.com/patrick-hertling/2f934a15cf466b9ed75108:14
Ok :D08:14
→ acolson joined08:14
← bbloom left08:14
→ astrofog joined08:15
← irqq left08:15
→ irqq joined08:15
→ zumba_addict joined08:15
→ bbloom joined08:16
→ Jazza76 joined08:16
→ nnyk joined08:16
← nnyk left08:16
→ nnyk joined08:16
← irqq left08:16
→ irqq joined08:17
← thiago left08:17
← Jazza76 left08:17
→ nour joined08:19
→ ki0 joined08:19
← jenni_naiaretti left08:20
← ehmatthes left08:20
→ jenni_naiaretti joined08:21
→ intellix joined08:21
→ teran joined08:21
← jenni_naiaretti left08:22
→ jenni_naiaretti joined08:24
→ joo-_ joined08:24
→ Gizburdt joined08:25
→ TititaTitutu joined08:25
← Gizburdt left08:25
→ Gizburdt joined08:26
→ xolubi joined08:26
← khmarbaise left08:26
→ daedeloth joined08:26
← h0bbit left08:27
→ h0bbit joined08:27
← jenni_naiaretti left08:27
→ jenni_naiaretti joined08:28
← oskarkv left08:28
→ mindlessdemon joined08:28
← jenni_naiaretti left08:28
← watabou left08:29
→ mnml joined08:32
→ bezet joined08:33
p4trix _ikke_, thx for the advice... Worked perfectly :)08:33
→ Vivekananda joined08:33
→ jenni_naiaretti joined08:34
← mennea left08:34
→ mennea joined08:34
→ seanmerron joined08:34
→ devoldmx joined08:35
← boombatower left08:35
← petersr left08:35
→ francisfish joined08:36
→ khmarbaise joined08:36
← daedeloth left08:37
→ daedeloth joined08:37
→ encod3 joined08:39
← msankhala left08:40
→ msankhala joined08:42
→ hexagoxel joined08:42
← babilen left08:43
→ arnatal joined08:44
→ shinnya joined08:45
← teran left08:46
→ mlechner joined08:46
← joki left08:47
← Mso150 left08:48
→ kristofferR joined08:48
→ blackmesa joined08:51
→ ghostli__ joined08:52
← ghostlin_ left08:52
→ plitzenberger joined08:52
← BuenGenio left08:53
→ arup_r joined08:53
→ joki joined08:53
→ jenni_naiaretti_ joined08:54
← devoldmx left08:54
→ nettoweb joined08:54
→ BuenGenio joined08:54
← nettoweb left08:54
→ nettoweb joined08:55
← jceb left08:56
← palcu_ left08:56
← nettoweb left08:56
→ palcu joined08:56
← Gizburdt left08:56
← St_Marx left08:57
→ evildmp_ joined08:57
→ thevishy_home joined08:57
← jenni_naiaretti_ left08:57
← evildmp left08:57
→ teran joined08:58
→ St_Marx joined08:58
← hexagoxel left08:59
← darkbasic_ left08:59
→ devoldmx joined08:59
→ darkbasic joined09:00
→ thevishy joined09:00
← palcu left09:01
→ Gizburdt joined09:01
→ hauron joined09:02
→ Nazrhom joined09:02
→ robarelli joined09:02
→ EminenceHC joined09:02
← sdrfnord1 left09:02
← kopparam left09:03
← BuenGenio left09:04
← msankhala left09:07
← jagob left09:07
esc if I have a file with a utf 8 char in the name, git status shows a weird represetation09:07
\303\274 instead of ü09:07
→ jceb joined09:07
→ stamina joined09:07
← EminenceHC left09:08
← robarelli left09:08
← jon_r left09:08
→ kopparam joined09:08
→ g4r37h joined09:09
hauron hi, two branches - develop and topic, topic was derived from develop, develop went forward number of commits, topic went forward number of commits, in the mean time - develop changes were merged onto the topic branch (not pretty)09:10
anyway, the topic maintainer would like to make a final merge to the topic from develop, and then:09:10
tobiasvl what kind of merge? not fast forward?09:11
hauron what's the easiest or cleanliest solution to squelch all the topic commits into a patch that may be aftewards pushed onto the develop?09:11
tobiasvl, unfortunately not09:11
tobiasvl and not rebase either then09:11
hauron yes09:12
although rebasing onto initial commit in the topic branch09:12
rebase --interactive and squelch them all?09:12
← Marcus_ left09:12
hauron that would be all the changes on the topic branch, then checkout the develop branch "from that initial deriving date", apply the topic's patch - this is a single commit09:13
← tranzfuse left09:13
cbreak esc: lesscharset? locale?09:13
hauron then rebase it onto the new develop?09:13
_ikke_ hauron: Why do you want to squash them?09:13
← Gizburdt left09:14
hauron _ikke_, the topic branch was a bit experimental and I suppose it would help with comparing the "sum of topic's changes" vs new develop?09:15
← ghostli__ left09:15
→ BuenGenio joined09:15
hauron does the latter point make sense?09:15
_ikke_ Do you think the commits individual don't have any value?09:15
→ Gizburdt joined09:15
linduxed what would the three dots be for in the following command?09:15
→ ghostlin_ joined09:15
linduxed git diff --shortstat origin/master...09:15
_ikke_ linduxed: Full it will be origin/master...HEAD09:16
← ghostlin_ left09:16
hauron _ikke_, well, you're right that they do, if that's what you're implying, and I'd lose all that history09:16
← jackh left09:16
← mustafavelioglu left09:16
_ikke_ linduxed: It means show any commits that are in origin/master, HEAD but not in both09:16
linduxed _ikke_: oh so it's just a shorthand?09:16
← Tuna-Fish left09:16
→ mustafavelioglu joined09:16
← avvs left09:17
_ikke_ see man gitrevisions for the explenation09:17
gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html09:17
→ msankhala joined09:17
esc cbreak: utf-809:17
piping ls to less displays fine09:18
→ zapb_ joined09:19
→ hexagoxel joined09:20
→ saurabh joined09:20
saurabh → Guest8176709:20
→ johnkevinmbasco joined09:21
← mustafavelioglu left09:21
← sgen__ left09:23
← BuenGenio left09:25
→ Tuna-Fish joined09:27
← tokik left09:29
← teran left09:29
→ lb1a joined09:29
← plitzenberger left09:29
→ nettoweb joined09:29
→ avvs joined09:30
← nikita left09:30
→ BuenGenio joined09:31
← astrofog left09:32
← lb1a left09:32
→ nikita joined09:33
← dharrigan left09:33
→ babilen joined09:33
→ dharrigan joined09:34
← mennea left09:34
→ sdrfnord1 joined09:34
→ glub0t joined09:34
← kristofferR left09:34
→ mennea joined09:34
gitinfo set mode: +v09:35
glub0t hi09:35
gitinfo glub0t: 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.09:35
← devoldmx left09:35
← Nikoli left09:36
→ ockham joined09:36
← CosmicLogick left09:36
← FunkyAss left09:36
glub0t I cant't connect to git on my server. I can ssh to the server. I can connect to github.com. I don't have idea how to debug this problem. Any idea?09:36
→ FunkyAss joined09:37
glub0t I only can't connect from specific machine. Mostly I can connect from other machine.09:38
→ CosmicLogick joined09:38
→ mscook joined09:38
→ jnavila_ joined09:39
← jnavila left09:40
← mindlessdemon left09:40
← harish_ left09:41
_ikke_ !doesnt09:41
gitinfo [!doesntwork] Sorry to hear it doesn't work, but how about some details? At this point we don't even know whether it did nothing, spit out an error message, or abducted your pet unicorn in a flying saucer. That makes it hard to troubleshoot – unicorn abduction requires a completely different solution than an error message, for instance. So, please be specific...09:41
_ikke_ :)09:41
glub0t It just hang up09:42
I wish there is error message or something09:42
>09:42
← AnujSharma left09:42
_ikke_ When does that happen?09:43
glub0t right now09:43
_ikke_ I mean, what command are you executing?09:43
glub0t hey, thanks for replying :D09:43
I try git clone09:43
← khmarbaise left09:43
_ikke_ as what user?09:44
glub0t I can clone from other machine09:44
system user, ssh09:44
authentication, password, is ok.09:44
_ikke_ Do you get any output at all?09:44
glub0t nope, that's is the problem09:44
even with -v09:45
cbreak esc: hmm...09:45
→ dangerousdave joined09:45
esc cbreak: yeah...09:45
→ devoldmx joined09:45
esc it's not super important, I was just curious09:45
cbreak esc: does it work with git --no-pager log?09:45
esc no09:46
→ palcu joined09:46
→ plitzenberger joined09:46
cbreak esc: then maybe the locale is not a utf8 locale, or the content of the history is actually not utf809:47
glub0t yes, it works09:47
→ tranzfuse joined09:48
glub0t *confused, not familiar with irc09:48
→ mnavratil joined09:49
_ikke_ glub0t: cbreak is talking to the user esc09:50
← dangerousdave left09:50
glub0t _ikke_: i see09:51
→ mindlessdemon joined09:51
← noneo left09:51
← mindlessdemon left09:52
→ dangerousdave joined09:52
← tirengarfio left09:52
glub0t _ikke_: fyi, I use centos box from vagrant. I'm not familiar with vagrant, maybe it have some faulty ssh configuration09:52
→ mindlessdemon joined09:53
← mindlessdemon left09:53
→ mindlessdemon joined09:54
← mindlessdemon left09:54
→ tirengarfio joined09:54
→ mindlessdemon joined09:54
← mindlessdemon left09:55
→ mindlessdemon joined09:55
← tranzfuse left09:55
← mindlessdemon left09:55
→ ghostlin_ joined09:56
→ kongthap joined09:56
← Tuna-Fish left09:56
→ anaran joined09:57
← anaran left09:58
→ hazrpg joined09:58
kongthap i've made some changes after my last commit (still not commit), i just realized i should had include some files into the HEAD~2 commit, how should i fix this?09:58
← jonmorehouse left09:59
→ anaran joined09:59
→ darnir joined10:00
glub0t @kongthap to save changes before commit, you can use git stash10:00
kongthap glub0t, after saving that changes, how can i step back to include some files into the second last commit?10:01
glub0t @kongthap your condition is rather diffucult, because you want to change git history10:02
→ oskarkv joined10:02
→ nfk joined10:02
← johnkevinmbasco left10:03
← Warrior-kkk left10:03
kongthap glub0t, yes, but this is my private i don't have to share the history with anyone, i also learning using git, that's why i'm trying to go it instead of let it go :P10:03
glub0t @kongthap if you haven't push the last two commit, you can try reset --hard HEAD~2.10:04
← trustedsage left10:04
← mennea left10:04
glub0t @kongthap no guarantee, you have to research the command yourselft :P10:04
kongthap glub0t, i will try that thanks :)10:04
→ robarelli joined10:04
→ mennea joined10:04
kongthap glub0t, use it with my own risk right? :P10:04
glub0t kongthap yeah :D10:05
kongthap thanks anyway for the idea10:05
glub0t kongthap sure10:06
→ Fingolfin joined10:06
→ Tuna-Fish joined10:07
→ EminenceHC joined10:07
← israelpattison left10:08
← blackmesa left10:08
← ifdm_ left10:08
→ israelpattison joined10:08
→ genomespam joined10:08
← robarelli left10:10
← dropdrive left10:10
→ Advocation joined10:10
← joo-_ left10:10
← silverfix left10:10
→ netcarver joined10:11
→ jagob joined10:11
← h0bbit left10:11
← EminenceHC left10:12
→ Sebtoast joined10:12
→ dropdrive joined10:12
← Fingolfin left10:13
← devoldmx left10:13
→ Fingolfin joined10:16
→ beautifulmind joined10:18
→ japro joined10:18
gitinfo set mode: +v10:19
← beautifulmind left10:20
japro so i'm rebasing some stuff and some of the commits have trivial conflicts.... but fixing those changes the author to me. can i avoid that?10:20
→ mueslo joined10:20
← Gizburdt left10:20
← mkaesz left10:20
← MattMaker left10:20
← glub0t left10:21
→ joo-_ joined10:21
→ MattMaker joined10:21
→ D4v33 joined10:21
→ ifdm_ joined10:21
→ listochkin joined10:21
→ mustafavelioglu joined10:23
← zumba_addict left10:25
→ zumba_ad_ joined10:25
→ jonmorehouse joined10:25
← TititaTitutu left10:26
tobiasvl author or committer?10:26
← Advocation left10:27
→ sysvalve joined10:27
→ paul424 joined10:28
japro if i tyle log it gives my name as the "Author" (also the timeline of the commits doesn't make sense)10:28
← simesy left10:30
→ PEMapModder_ joined10:30
← PEMapModder_ left10:30
← kcj left10:30
→ PEMapModder joined10:31
→ leeN joined10:31
← noxd left10:31
PEMapModder Testing10:31
← PEMapModder left10:31
→ beautifulmind joined10:32
← kriks left10:33
← mennea left10:34
→ johnkevinmbasco joined10:34
→ mennea joined10:34
darnir In a project we had a file which was autogenerated and being ignored by git. Now, we wish to use that /quit10:35
← darnir left10:35
← ifdm_ left10:35
→ kriks joined10:35
← BuenGenio left10:35
→ tqkrfa joined10:35
bremner !next10:36
gitinfo Another satisfied customer. NEXT!10:36
→ devoldmx joined10:36
← sysvalve left10:43
← kopparam left10:44
→ kopparam joined10:44
→ jottr joined10:45
← aidalgol left10:45
← plitzenberger left10:45
← jottr left10:46
→ Gizburdt joined10:46
→ ribasushi joined10:46
→ mkaesz joined10:47
→ Advocation joined10:47
→ m0ltar joined10:48
← intellix left10:48
→ ifdm_ joined10:48
← polyzen left10:49
→ sadly_anon joined10:50
← sadly_anon left10:50
→ teran joined10:50
→ teran_ joined10:51
← amcsi_work left10:53
← mustafavelioglu left10:53
→ carandraug joined10:53
→ mustafavelioglu joined10:54
← devoldmx left10:54
→ vtunka joined10:54
← mustafavelioglu left10:54
← teran left10:55
→ mustafavelioglu joined10:55
← jaeckel left10:55
← arup_r left10:55
→ devoldmx joined10:56
← ome left10:57
← palcu left10:57
→ palcu_ joined10:59
→ tranzfuse joined11:01
← SLY1986 left11:01
→ jottr joined11:03
← mustafavelioglu left11:04
→ mustafavelioglu joined11:05
→ BuenGenio joined11:05
→ robarelli joined11:06
→ nonmadden joined11:06
← mustafavelioglu left11:07
← worc left11:07
→ mustafavelioglu joined11:07
→ amcsi_work joined11:07
→ kpease joined11:10
← kpease left11:10
→ amikiri joined11:10
→ noxd joined11:11
→ unreal joined11:11
← robarelli left11:12
→ Marcus___ joined11:12
→ EminenceHC joined11:12
← tqkrfa left11:13
jhass|off → jhass11:13
← devoldmx left11:14
← mkaesz left11:15
→ vpnncn joined11:15
← ItSAN____ left11:15
← yacks left11:15
→ plitzenberger joined11:17
← EminenceHC left11:17
← leeN left11:17
→ leeN joined11:18
→ lucha joined11:19
← mueslo left11:20
← diegoviola left11:21
← dangerousdave left11:21
← xolubi left11:22
→ mueslo joined11:22
→ xolubi joined11:22
→ martinklepsch joined11:22
← dvdchr left11:22
← jonmorehouse left11:22
→ a_le joined11:23
→ moritzschaefer joined11:23
→ dangerousdave joined11:23
→ devoldmx joined11:23
← mscook left11:24
→ durre joined11:24
durre hey! I accidentaly added a large binary > 100mb a few commits ago. tried to push it to github now but it wont let me since they have a 100mb limit. can I remove this one file from history without messing up the commit it was in?11:26
→ tvw joined11:27
→ marscher joined11:27
← xolubi left11:28
→ Mitchbones joined11:28
→ BSaboia joined11:28
→ Droolio joined11:28
→ lindenle joined11:28
← BSaboia left11:28
osse !sensitive11:29
gitinfo [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. http://help.github.com/remove-sensitive-data/11:29
← lukeholder left11:29
osse durre: pretend itæs sensitive and follow those isntructions11:29
→ BSaboia joined11:29
→ intellix joined11:29
← nnyk left11:30
→ glosoli joined11:30
← mueslo left11:31
durre thanks, I'll give it a go!11:31
→ mueslo joined11:32
← ciampix left11:32
← lindenle left11:32
← mueslo left11:33
← devoldmx left11:33
← mennea left11:34
→ mueslo joined11:34
→ mennea joined11:34
← Advocation left11:35
← BSaboia left11:36
→ otter768 joined11:36
← nonmadden left11:37
← martinklepsch left11:37
→ xolubi joined11:38
→ CheckDavid joined11:38
← mennea left11:38
← mueslo left11:39
→ jon_r joined11:39
← BBBThunda left11:39
→ nnyk joined11:40
← FunkyAss left11:40
← beautifulmind left11:40
← japro left11:41
← kyb3r_ left11:41
← avvs left11:45
→ devoldmx joined11:46
→ Gavrisimo joined11:47
→ iamjarvo joined11:47
← listochkin left11:47
← encod3 left11:48
← otter768 left11:48
→ listochkin joined11:48
→ bAnt joined11:48
← tanath left11:48
← cagedwisdom left11:48
→ otter768 joined11:48
→ arup_r joined11:48
← paul424 left11:49
← mustafavelioglu left11:49
→ tanath joined11:49
→ cannonball joined11:50
← dangerousdave left11:50
→ mustafavelioglu joined11:50
← mustafavelioglu left11:51
→ mustafavelioglu joined11:51
← mustafavelioglu left11:51
← akagr left11:51
→ akagr joined11:52
→ mustafavelioglu joined11:52
→ yacks joined11:52
← listochkin left11:52
← otter768 left11:53
→ Xethron joined11:53
← Xethron left11:53
→ Xethron joined11:53
← nnyk left11:54
→ BBBThunda joined11:55
← paulweb515 left11:55
← xolubi left11:56
← mustafavelioglu left11:56
← mattstratton left11:56
← daito left11:58
→ daito joined11:59
← fstd left12:00
→ nonmadden joined12:00
→ fstd joined12:00
← Guest81767 left12:00
→ encod3 joined12:00
→ BuenGenio_ joined12:00
← BuenGenio left12:01
← joo-_ left12:01
→ nnyk joined12:01
→ mustafavelioglu joined12:01
→ regreg joined12:01
→ sebhoss joined12:01
→ FunkyAss joined12:03
← FunkyAss left12:03
← mustafavelioglu left12:03
→ FunkyAss joined12:03
FunkyAss → Guest2205812:04
← daito left12:04
→ mustafavelioglu joined12:04
← Gizburdt left12:04
→ drmeiste_ joined12:04
← BuenGenio_ left12:05
← LeMike left12:06
drmeiste_ I have a git repo called "clasp" There is a directory "clasp/src/mps" that used to be another git repo. I deleted the .git* files "clasp/src/mps/.git*" Now I'm trying to "git add clasp/src/mps" and for some reason the "clasp/src/mps/*" contents refuse to add. Would anyone know why this is?12:06
→ xolubi joined12:06
drmeiste_ I don't have "mps/" in any higher .gitignore file12:06
jast possibly !submodule_rm12:07
gitinfo [!submodules_rm] You want to delete submodules? Excellent choice! All commands are in the superproject. Edit/delete .gitmodules to remove the submodule. Then `rm -rf submodulepath; git rm -f --cached submodulepath; git commit -am "Removed submodules!"` Inspect .git/config for "submodule" entries to remove. Inspect .git/modules for caches to remove "!gitslave" or "!subtree" (type them!) might be alternatives12:07
→ Advocation joined12:07
← mustafavelioglu left12:08
→ robarelli joined12:08
→ Toaster` joined12:08
← Peuc left12:09
drmeiste_ Checking submodules - I experimented with git submodules when I was new to git. It was an unfortunate time.12:09
← noxd left12:10
→ diegoviola joined12:10
drmeiste_ Yes, it was listed in .gitmodules - thank you!12:10
← jon_r left12:10
→ mscook joined12:11
→ Peuc joined12:11
← Toaster` left12:11
→ BuenGenio joined12:12
← Sebtoast left12:12
← robarelli left12:14
→ lsiv568 joined12:15
← plitzenberger left12:16
← Peuc left12:16
→ knobo joined12:16
→ dangerousdave joined12:16
knobo When I do "git pull origin master", then I pull it in to the branch I am currently on, right?12:16
osse yes12:17
→ Peuc joined12:17
→ beautifulmind joined12:17
drmeiste_ The part "Inspect .git/config" for "submodule" entries to remove... I'm puzzled. Do I remove [submodule "src/mps"]...url = from the .git/config file?12:18
→ paul424 joined12:18
_ikke_ yes12:18
← Tuna-Fish left12:18
← kriks left12:19
drmeiste_ And then I go into .git/modules/src and rm -rf mps ? Gah - this is git surgery.12:19
→ jitendravyas joined12:19
← punchagan left12:20
← a_le left12:20
drmeiste_ Done12:20
→ a_le joined12:21
→ samtuke joined12:21
jitendravyas do u know any useful git tips12:21
Seveas no12:22
git isn't useful12:22
jitendravyas it's useful for me12:22
tobiasvl lol. any useful git tips12:23
any at all12:23
Seveas tobiasvl: 12 tips for the price of 10!12:23
→ mennea joined12:23
→ Anticom joined12:24
samtuke going quietly insane here. Every time certain team members remotely commit and push changes, other commits are reverted to days prior, adding their latest commit on top. History looks like mon, tues, weds, .....sunday (+1 new commit) and thurs and fri commits are lost in the history. Then I reset --hard and push -f, and then the next time they commit it happens again. ideas why? some kind of broken merging from them?12:24
→ Gizburdt joined12:24
← vgarg left12:24
osse samtuke: every time you push -f you potentially just make it worse12:24
→ ulkesh joined12:25
osse !rewrite12:25
Seveas samtuke: they probably push -f as well. git config recieve.denyfastforwards true12:25
← Gizburdt left12:25
Anticom Hi all. I#m getting "your branch is ahead of 'origin/[...]' by 12 commits" when running `git status`. Is there any way to identify those commits?12:25
→ Gizburdt joined12:25
← jast left12:25
samtuke Seveas, why would I want to deny fast forwards?12:25
Seveas Anticom: !lol for a visual one. Or git log origin/branchname..branchname12:25
samtuke: because non-fast-forwards make you lose data12:25
samtuke osse, thats the best way I know to undo their damaging commits :(12:25
Seveas hmm, is gitinfo dead?12:26
gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum12:26
Anticom: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all12:26
osse samtuke: yes, but you need to inform them that you've done so, and they need to take precautions12:26
Seveas samtuke: set nonfastforward and they can't break it12:26
Anticom Seveas: what do you mean by '!lol' ?12:26
like litteraly?12:26
osse samtuke: if they pull then they merge the new history with the old12:26
→ jast joined12:26
→ donmichelangelo joined12:26
Seveas Anticom: it's a trigger for the gitinfo bot. But it's a bit slow12:26
→ punchagan joined12:26
Seveas A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all12:26
← nonmadden left12:27
→ nonmadden joined12:27
← johnkevinmbasco left12:28
← Guest22058 left12:28
← govg left12:28
osse Seveas: and if you push -f again, they pull and merge the new history with the old )which already contained an even older one)12:29
oops12:29
that was for samtuke12:29
→ lindenle joined12:29
Seveas is there a trigger for 'recovering from upstream rebase'?12:29
!bot12:29
gitinfo [!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans. Please see http://jk.gs/git/bot for more information about how to use me.12:29
→ Tuna-Fish joined12:29
← michelangelo left12:29
samtuke Seveas, so I can set recieve.denyfastforwards remote and export the config change to a remote copy of the repo? I don't have ssh access to another copy we are using as central staging server12:30
can I export the config option to other machines?12:30
→ plitzenberger joined12:30
osse denyNONfastforwards12:30
samtuke osse, right that makes more sense :)12:30
Seveas samtuke: the config (and make sure you use what osse said) only needs to be on the central git host12:31
→ HanClinto joined12:31
Seveas !push-f12:31
gitinfo [!force_push] If you need to overwrite the history of a remote git repository (very bad idea, see !rewrite), you can do so with `git push -f`. Note the remote server may reject this. See man git-config and search for receive.denyNonFastForwards. Best practice is for upstream servers to denyNonFastForwards.12:31
← muhaha03__ left12:31
osse there is no trigger for t he "recover" thing it seems12:31
Seveas no, but I did find push-f while looking for it :)12:32
← bezet left12:32
← nonmadden left12:32
← jitendravyas left12:33
← lindenle left12:33
← Tuna-Fish left12:33
← hmsimha_ left12:34
→ Quevin joined12:35
← devoldmx left12:35
samtuke Seveas, still confused about how to set that on remote central git host. In my case it's BitBucket, they say they support the config option (users have the permission). Is there a way to export this config option to their server, or does this depend on their own config tools?12:35
osse use the web interface12:35
→ paulweb515 joined12:36
→ KeiKun joined12:36
→ mattstratton joined12:36
← nikita left12:36
Seveas samtuke: sorry, I don't use bitbucket, so have no idea how to do that. It's likely somewhere in their webinterface as osse says.12:37
KeiKun hi! is it possible to git format-patch a rev but disregard all changes in it when the files aren't modified12:37
← paul424 left12:37
← curiousmansi left12:37
samtuke osse, Seveas, thanks, looking :)12:37
Seveas KeiKun: that doesn't parse. If the files aren't modified, there are no changes...12:37
KeiKun i mean12:38
→ kpease joined12:38
KeiKun in some revisions files are like added or removed or modified12:38
→ TheDoctor joined12:38
Seveas yes, most revisions will have such changes :)12:38
← BuenGenio left12:38
→ danemacmillan joined12:38
KeiKun but i want to exclude in the same revision diffs about added files12:38
or removed files12:38
→ nikita joined12:39
Seveas why? they're part of that change...12:39
← amikiri left12:39
← beautifulmind left12:39
← Quevin left12:39
KeiKun for some times before, i tried to patch another repo with same patch but gives error due to /dev/null issue12:40
Seveas looking at the manpage, it's not possible. Possibly because it makes no sense :)12:40
KeiKun /dev/null goes with ADDED Files12:40
Seveas ehm, what?12:40
osse GIT_EDITOR='() { :;}; echo vulnerable' git rebase origin/master12:40
Seveas KeiKun: !repro the actual problem you have12:41
gitinfo KeiKun: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.12:41
← TheDoctor left12:41
→ TheDoctor joined12:41
← c2h6o left12:41
→ DocPew joined12:41
← kopparam left12:42
→ devoldmx joined12:42
→ kopparam joined12:43
→ FunkybAss joined12:43
← Gavrisimo left12:43
→ DrSkyLizard joined12:44
→ Tuna-Fish joined12:45
← kopparam left12:47
← plitzenberger left12:48
← thevishy_home left12:49
← thevishy left12:50
→ WakiMiko joined12:51
→ joo-_ joined12:51
← Advocation left12:51
← nikita left12:51
→ nonmadden joined12:52
← dangerousdave left12:53
→ dangerousdave joined12:54
→ nikita joined12:54
← KeiKun left12:55
← devoldmx left12:55
→ livingstn joined12:55
← palcu_ left12:55
← k_sze[work] left12:55
→ palcu joined12:56
← arup_r left12:57
← zumba_ad_ left12:57
← Sonderblade left12:57
← JanC left12:58
← jenni_naiaretti left12:58
→ noxd joined12:58
← tranzfuse left12:58
→ beaky joined12:58
beaky hello12:58
how do i share my git repository with my friends12:59
do i simply mail a .tar.gz of it to them or should i do somethigne sle12:59
canton7 beaky, the easiest way is to put it up somewhere like github12:59
beaky my friends arent very familiar with git or github but they love learnin13:00
← palcu left13:00
→ kriks joined13:01
→ thevishy_home joined13:02
← DocPew left13:02
→ dsdeiz_ joined13:02
← jceb left13:02
→ Sebtoast joined13:03
← zapb_ left13:03
kongthap i'm not clear yet using rebase -i, http://pastie.org/9593545, after edit this text file and :wq!, the rebase will stop at (1)before commit 1.1 or (2) after commit 1.1?13:03
canton7 just after commit 1.1, before 1.213:03
→ palcu joined13:03
canton7 the message it gives when it stops will tell you that13:03
the idea is that you edit, commit --amend13:03
→ glub0t joined13:03
→ devoldmx joined13:03
→ SumDude joined13:04
→ Advocation joined13:04
← dsdeiz left13:04
kongthap canton7, i did at the first attemp, then i use normal command such as git add filename.txt to be part of that commit then i call git rebase --continue, correct?13:05
→ StarManta joined13:05
→ Warrior-kk joined13:05
canton7 kongthap, no. like the message rebase gives you says, you need to make your changes, add them, *then commit --amend to edit the commit*, then rebase --continue13:05
← dangerousdave left13:06
kongthap canton7, so what i missed i didn't re-commit it13:06
← punchagan left13:06
canton7 you staged your changes, but you didn't actually edit the commit to include them13:06
kongthap canton7, and i must use "commit" with "--amend" to recommit my 1.1 right?13:06
→ thevishy joined13:06
canton7 yes13:06
→ dangerousdave joined13:07
kongthap canton7, just to make sure again, in this case i should use "commit --amend" 2 times in total, first to un-commit, second the re-commit, correct?13:07
canton7 no13:07
only once13:07
kongthap :(13:07
canton7 git rebase -i, change 'pick', to 'edit', save and close. rebase drops you just after 1.1, and tells you what to do next13:08
kongthap yeb13:08
canton7 following rebase's instructions, you make your changes, 'git add them', then 'git commit --amend' to edit commit 1.113:08
then 'git rebase --continue'13:08
kongthap i see13:08
i thought i must use commit --amend before the making changes first13:09
canton7 no13:09
it wouldn't do any harm, but it wouldn't do anything at all, either :P13:09
kongthap canton7, i think i get it now13:09
canton7 read up on what git commit --amend does ;)13:09
← Gizburdt left13:10
kongthap canton7, that's was the first attemp's result, i quite understand about commit --amend alone but i got really confuse using git rebase :P13:10
canton7, thanks, you are really helpful13:10
canton7 no worries13:10
→ punchagan joined13:10
→ robarelli joined13:11
→ harish_ joined13:11
→ jenni_naiaretti joined13:11
→ bezet joined13:12
→ JanC joined13:12
← Plenoge_ left13:12
← lsiv568 left13:13
→ listochkin joined13:13
← devoldmx left13:13
daynaskully if I want to overwrite my master branch with develop; is rebase into master what i want to do?13:15
_ikke_ no13:15
→ zapb_ joined13:16
→ martinklepsch joined13:16
← robarelli left13:16
_ikke_ git checkout -B master develop13:17
← xolubi left13:17
→ plitzenberger joined13:18
→ jitendravyas joined13:20
anaran _ikke_: a good soul at mozilla took care of my windows-1252 ä in my git patch yesterday13:20
← jitendravyas left13:20
→ jceb joined13:20
→ choffstein joined13:20
kongthap if i have many unstaged files, can i stash only some specified files?13:20
→ ErKa joined13:21
→ EminenceHC joined13:22
anaran kongthap: how about git stash save -p13:22
→ yosito joined13:22
→ Ankhers joined13:23
anaran kongthap: actually on hunk level, not file level13:23
← mennea left13:23
← vtunka left13:23
kongthap anaran, i'm reading the manual but not understand "git stash save -p filename" ?13:23
← iamjarvo left13:23
→ mennea joined13:23
← mscook left13:24
anaran kongthap: I don't see filename in my manual13:24
→ JeanCarloMachado joined13:24
← JeanCarloMachado left13:25
kongthap anaran, according to your answer, i think i cannot stash only some files :)13:25
→ devoldmx joined13:26
→ xolubi joined13:26
anaran kongthap: you might want to only stash a few changes to a file, your your just save yes to all13:26
← choffstein left13:26
← bdavenport left13:26
→ mscook joined13:26
anaran kongthap: create a playgroud git repo then you can try this stuff at ease13:26
kongthap anaran, i just get it, using -p just like interactive, i can use y/n :)13:26
→ trip joined13:26
anaran kongthap: you got it13:27
← EminenceHC left13:27
kongthap thanks :)13:27
anaran kongthap: ? is also a good one :-)13:27
→ flugo joined13:27
→ zacg joined13:27
→ Gizburdt joined13:27
kongthap whatif i answer "?"13:28
what is the result?13:28
→ Nikoli joined13:28
← MattMaker left13:29
→ zumba_addict joined13:30
anaran kongthap: you get a legend for what all characters mean13:30
→ kpease_ joined13:30
← kpease left13:30
→ bdavenport joined13:30
→ sohail joined13:31
anaran kongthap: It behaves badly for my in cygwin for a big displayed hunk, I have to scroll back to see the legend13:31
kongthap i only know y, n, q :(13:32
anyway try search on google13:32
→ ItSANgo joined13:32
→ Sonderblade joined13:33
← Sonderblade left13:33
← evildmp_ left13:33
→ avvs joined13:33
→ Sonderblade joined13:33
kpease_ → kpease13:33
← devoldmx left13:34
← miceiken left13:34
← jottr left13:34
← dangerousdave left13:34
→ dangerousdave joined13:35
← Nikoli left13:35
← darkbasic left13:35
← kongthap left13:35
→ darkbasic joined13:35
← plitzenberger left13:35
→ Warrior-kkk joined13:36
← Warrior-kk left13:38
← jerius left13:38
← Gizburdt left13:39
→ Dougie187 joined13:41
← dsdeiz_ left13:44
← jargon left13:44
→ jargon joined13:45
← joo-_ left13:45
→ jheg_ joined13:46
← jheg_ left13:46
← yosito left13:46
drmeiste_ → drmeister_13:46
→ Nikoli joined13:46
→ msmith_ joined13:47
→ wrouesnel2 joined13:48
→ tranzfuse joined13:48
← Fingolfin left13:48
moarrr → DanMAbraham13:49
→ aucecil joined13:49
→ iamjarvo joined13:50
→ naturally joined13:50
← naturally left13:50
→ naturally joined13:50
→ sburgess joined13:51
→ topolinux joined13:51
→ ehmatthes joined13:51
→ Gizburdt joined13:51
← mennea left13:53
→ evildmp joined13:53
→ mennea joined13:53
→ devoldmx joined13:53
← evildmp left13:54
→ Malsasa joined13:54
← oskarkv left13:55
→ evildmp joined13:55
← bezet left13:55
← evildmp left13:56
→ bezet joined13:56
→ evildmp joined13:57
→ starkhalo joined13:57
← dangerousdave left13:58
→ pandeiro` joined13:58
← pandeiro left13:58
← pandeiro` left13:58
→ blackmesa joined13:58
→ Neozonz joined13:59
← Neozonz left13:59
→ Neozonz joined13:59
← aucecil left13:59
→ BuenGenio joined13:59
→ pandeiro joined13:59
← lacrymology left14:00
← SumDude left14:00
→ jottr joined14:00
← xolubi left14:00
→ SumDude joined14:01
→ aucecil joined14:01
→ dangerousdave joined14:01
→ vtunka joined14:01
← rob_w left14:02
→ AaronMT joined14:03
kpease → kpease_14:03
→ Skapadapaduu joined14:03
→ rikko joined14:04
→ gregsmith joined14:05
→ hahuang65 joined14:07
← g4r37h left14:07
← Gizburdt left14:07
→ Gizburdt joined14:08
← Nikoli left14:09
→ bitkiller joined14:09
→ kristofferR joined14:09
→ petersr joined14:09
→ n-st joined14:09
edwardly → D14:10
D → edwardly14:11
→ iateadonut joined14:11
← eletuchy left14:11
← daedeloth left14:11
→ gluten_hell joined14:11
← rypeck left14:11
→ eletuchy joined14:12
→ Nikoli joined14:12
→ robarelli joined14:13
→ fission6 joined14:14
fission6 i just did a git pull and updated my code with what looks like 2 commits from contributors, the web app seems now have bad performance, how can i checkut out the exact code base at a certain commit, test performance, then get back to my current state which is all the way forward14:15
→ lindenle joined14:15
osse fission6: git checkout <certain commit>; test performance; git checkout master14:15
→ mike_af joined14:15
fission6 thanks let me try14:15
→ jerius joined14:16
← jottr left14:16
← akagr left14:16
← zivester left14:16
→ oriba joined14:17
← glosoli left14:19
→ treehug88 joined14:19
← robarelli left14:19
← jagob left14:19
→ tang^ joined14:19
→ dsdeiz joined14:20
→ k_sze[work] joined14:22
→ cebor joined14:22
← gargola left14:22
← mscook left14:22
← drmeister_ left14:22
← papegaaij left14:22
← mennea left14:23
→ mennea joined14:23
← BuenGenio left14:24
→ EminenceHC joined14:24
← evildmp left14:25
← mlechner left14:25
→ roberto_ joined14:26
← k_sze[work] left14:26
← awkwardusername left14:26
← msankhala left14:26
→ awkwardusername joined14:27
← Trudko left14:27
→ cuppscakes joined14:27
← thevishy_home left14:27
→ ppinto joined14:27
← thevishy left14:27
→ mscook joined14:28
← roberto_ left14:28
→ evildmp joined14:29
→ robertodecurnex joined14:29
← EminenceHC left14:29
← Junior left14:29
→ juril_laptop joined14:30
← Warrior-kkk left14:30
robertodecurnex Morning. Quick weird question.14:30
`git status`under Git 2.x14:30
how can I get a "not currently on any branch" message ?14:30
_ikke_ robertodecurnex: Do you want that message, or do you wonder why you get it?14:30
canton7 !detached14:30
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 !reattach14:30
Hello71 !detached14:30
canton7 wins14:31
robertodecurnex exactly, just wondering14:31
how can i get over the detached if14:31
iateadonut i'd like to stage for commit anything in the working directory that has been 'deleted' - the file list is very very long, so i'd rather not do git rm file for each file.14:31
robertodecurnex https://github.com/git/git/blob/ce1d3a93a6405b8a0313491df3099919ed3d150f/wt-status.c#L132714:31
Hello71 canton7: mine was first, but my host is slightly oversold: %Cpu(s): 0.1 us, 0.1 sy, 0.8 ni, 47.1 id, 9.2 wa, 0.0 hi, 0.0 si, 42.8 st14:31
← punchagan left14:32
← runeg left14:32
robertodecurnex (I really don't need that, just trying to reproduce that `else` scenario)14:32
→ jagob joined14:32
_ikke_ 48% steal?14:32
canton7 robbyoconnor, like the trigger said, if you've checked out something that isn't a normal, local branch, HEAD will point directly to the commit14:32
← Advocation left14:32
→ BUSY joined14:33
← mscook left14:33
canton7 robbyoconnor, or maybe if HEAD points to an unborn branch?14:33
← Marcus___ left14:33
BUSY is there a way to clone into a non-empty directory? there will be no conflicts14:33
_ikke_ BUSY: git clone url . I believe14:34
→ EminenceHC joined14:34
← ecky--ptang-zoob left14:34
→ nekyian_ joined14:34
→ milkohol joined14:34
BUSY already exists and is not an empty directory14:34
→ ecky--ptang-zoob joined14:35
→ runeg joined14:35
BUSY no worries i'll just move stuff around it14:35
→ Quevin joined14:35
← DANtheBEASTman left14:36
_ikke_ robertodecurnex: It has to do with the reflog14:36
← SumDude left14:38
→ acharlieh joined14:38
→ Peuc2 joined14:38
← dangerousdave left14:38
→ Advocation joined14:38
→ DANtheBEASTman joined14:39
← kriks left14:39
→ atomx_ joined14:39
robertodecurnex _ikke_: interesting, will play with it ;) ty14:39
← wrouesnel2 left14:39
→ thevishy joined14:39
→ thevishy_home joined14:40
← atomx left14:40
← Quevin left14:40
→ punchagan joined14:40
→ ohcibi joined14:40
→ SumDude joined14:41
← BUSY left14:41
→ skylite joined14:41
← Peuc left14:41
Peuc2 → Peuc14:41
→ dreiss joined14:41
← skylite left14:42
→ jab416171 joined14:43
→ jottr joined14:43
→ Arcticfox48__ joined14:43
→ jdmf joined14:43
← MutLalpha left14:45
→ mkaesz joined14:45
← TheDoctor left14:45
→ whoami joined14:45
← punchagan left14:46
← ecky--ptang-zoob left14:46
← glub0t left14:46
→ ecky--ptang-zoob joined14:46
← FunkybAss left14:47
→ TheDoctor joined14:47
→ dangerousdave joined14:49
→ Manny joined14:49
← jottr left14:49
← nilg left14:50
← TheDoctor left14:51
→ ojacobson joined14:51
→ TheDoctor joined14:51
→ mscook joined14:53
→ dmarkham joined14:55
← FilipNortic left14:57
← St_Marx left14:57
→ St_Marx joined14:58
→ pcypher joined14:58
→ FunkyAss joined14:58
→ jmichaelward joined14:59
← tranzfuse left14:59
← mscook left14:59
→ tranzfuse joined15:00
← zumba_addict left15:00
← rath left15:01
→ daviid joined15:01
← sdrfnord1 left15:01
← Silmarilion left15:02
Sonderblade what would be the best way to move the latest commit on the current branch to a new branch based on master?15:02
_ikke_ move or copy15:02
← roelmonn_ left15:02
_ikke_ ?15:02
Sonderblade move15:02
← acolson left15:02
Sonderblade without disturbing all my unstaged changes15:03
→ PsciCOdeliXHAt joined15:03
← Gizburdt left15:03
_ikke_ git stash; git branch <new_branch>: git reset --hard HEAD^; git stash pop15:03
← mennea left15:04
Sonderblade but then the new branch wont be based on master15:04
_ikke_ it will15:05
→ mennea joined15:05
← pcypher left15:05
wrouesnel is there a way to rebase a whole stack of branches which share a common ancestor (i.e. upstream/master) semi-automatically?15:05
_ikke_ not really15:05
← PsciCOdeliXHAt left15:05
→ PsciCOdeliXHAt joined15:05
_ikke_ You can basically create a loop which calls rebase15:05
PsciCOdeliXHAt hello guys...I had a branch which was better than the master, so i rename the master to master-old and rename the better-branch to master, and push it with --force...but know when i clone it from remote repo, it's not the same thing as my work local dir...some hint ? how do I fix that15:06
← dsdeiz left15:06
PsciCOdeliXHAt anyone may help with that15:08
→ MutLalpha joined15:08
→ jitendravyas joined15:08
→ liamkeily joined15:08
→ g4r37h joined15:09
→ evildmp_ joined15:09
← evildmp_ left15:10
moritz PsciCOdeliXHAt: do you have uncommitted changes? what does 'git status' say in you "local work dir" and in the new clone?15:10
← jjasinski left15:11
→ spareproject joined15:11
→ evildmp_ joined15:11
← dangerousdave left15:11
→ nilg joined15:11
Sonderblade _ikke_: i tried it and the new branch definitely becomes based on the current branch, not master15:11
→ ingu_cloud joined15:11
→ dsdeiz joined15:11
← evildmp left15:12
→ zumba_addict joined15:13
← gauke left15:13
→ common-lisper joined15:13
PsciCOdeliXHAt moritz: it's says nothing to commit15:14
→ lsiv568 joined15:14
moritz PsciCOdeliXHAt: please copy&paste the whole output from both to a pastebin15:14
PsciCOdeliXHAt ok15:14
← andrewrk left15:14
→ jjasinski joined15:15
→ jottr joined15:15
← palcu left15:15
← M-ou-se left15:15
→ M-ou-se joined15:15
→ robarelli joined15:15
← seschwar left15:15
→ palcu joined15:16
← mattstratton left15:16
→ mattstratton joined15:16
← ingu_cloud left15:16
← Arcticfox48__ left15:17
← sebhoss left15:18
hexagoxel Sonderblade: you can rebase the new branch (before popping stash). i.e. "git rebase --onto master temp^ temp" where "temp" is the <new_branch>15:18
← lsiv568 left15:18
← avvs left15:18
→ Jarboe joined15:18
→ Grum joined15:19
Sonderblade hexagoxel: i did it afterwards, worked too15:19
→ canci joined15:20
← _Vi left15:20
hexagoxel yeah it depends on how clean your workingdir is, i suppose15:20
→ pcypher joined15:20
← robarelli left15:20
← Sonderblade left15:21
← tranzfuse left15:21
canci hm... I would like to run textconv for git-diff to transform unintellegible text-files to something readable. The problem is that these files don't have an extension15:22
← liamkeily left15:22
canci Is there a way to bind a textconv method to a file rather than using its extension?15:22
→ jdrumheller joined15:22
← FunkyAss left15:22
← ThomasLocke left15:23
canton7 canci, should be, sure15:23
man gitattributes15:23
gitinfo the gitattributes manpage is available at http://jk.gs/gitattributes.html15:23
→ rnsanchez joined15:23
← sqrrl left15:23
→ risu joined15:23
canci canton7: I haven't found it in there yet15:25
[diff "ps"] \n textconv = ps2ascii \n binary = true15:25
← evildmp_ left15:25
canton7 so that defines the diff driver15:25
canci that is what I find in there - however that binds to *.ps, doesn't it?15:25
← rikko left15:25
canton7 no15:25
it creates a diff driver named "ps"15:25
canci ah, so I would put diff=ps into gitattributes?15:26
canton7 and see *just* above that, 'String'15:26
← dsdeiz left15:26
canton7 almost.15:26
← havanamint left15:26
canton7 it's filename_or_pattern <whitespace> diff=diff_driver15:26
canci yea right15:26
canton7 so my_funky_filename diff=ps15:27
← Advocation left15:27
canci okay, but I must say that is not really aparrent from the manpage :/15:27
canton7 yeah it's not stuffed full of example15:27
→ tranzfuse joined15:28
canton7 but if you scroll down a few lines, you can that tex diff example15:28
which is pretty close15:28
← Jarboe left15:28
canton7 and that syntax is used again and again15:28
← MutLalpha left15:28
canci yea, the trouble is that it says 'you cannot use -diff and diff=foo' and at that point it doesn't define at all what diff=foo does15:28
the tex example is better, indeed15:29
however you don't find that by searching for textconv15:29
← oriba left15:29
← pcypher left15:29
← jitendravyas left15:29
→ SjB joined15:29
→ Gavrisimo joined15:29
canci canton7: thanks for your help ;)15:29
canton7 :)15:29
← skynxnex left15:29
→ Plenoge joined15:30
← JanC left15:30
→ sebhoss joined15:31
→ dccc joined15:33
→ lsiv568 joined15:33
← common-lisper left15:33
← P4_Denis left15:33
→ Jarboe joined15:33
→ common-lisper joined15:34
→ P4_Denis joined15:34
← gua_ould left15:34
← zlinn_ left15:35
← devoldmx left15:35
← tranzfuse left15:36
→ worc joined15:36
→ devoldmx joined15:37
→ hguux joined15:37
← p4trix left15:37
← paulweb515 left15:38
← Raging_Hog left15:38
← P4_Denis left15:38
→ pheaver joined15:38
→ rikko joined15:39
← ehmatthes left15:40
← noxd left15:40
← JosephFerano left15:40
← vtunka left15:41
← marlun left15:41
kpease_ → kpease15:41
→ Pyrogerg joined15:42
← Xethron left15:42
→ thiago joined15:42
→ olspookishmagus joined15:42
→ marlun joined15:42
olspookishmagus → Guest1202215:42
→ dilfridge joined15:43
→ zarubin joined15:43
→ evildmp joined15:43
← alorence left15:44
← jargon left15:44
→ Gamecubic joined15:45
← flugo left15:46
→ JanC joined15:47
→ _lrh_ joined15:47
← thevishy_home left15:47
← thevishy left15:47
→ iiiinzg joined15:48
← ghostlin_ left15:48
→ BuenGenio joined15:49
← tvw left15:49
← Akagi201 left15:50
← Ankhers left15:50
← tanath left15:50
→ _Vi joined15:50
← zoso left15:50
→ tanath joined15:50
kpease → kpease_15:50
← jmichaelward left15:50
→ Akagi201 joined15:51
→ smccarthy joined15:51
→ jmichaelward joined15:51
→ Ankhers joined15:51
← iinzg left15:52
← Websoftwarez left15:52
← batrick left15:53
→ tmcmahon joined15:53
→ looper joined15:55
← aswen left15:55
← himikof left15:55
← jmichaelward left15:55
→ batrick joined15:56
← tmcmahon left15:56
← jottr left15:56
→ g3orge joined15:56
← daviid left15:56
→ himikof joined15:57
← sebhoss left15:57
→ misu joined15:57
← lsiv568 left15:58
← hebz0rl left15:59
→ jmichaelward joined15:59
→ jokke joined15:59
← g3orge left16:00
jokke hi16:00
← hyperair left16:00
→ tranzfuse joined16:00
jokke i want to show the names of all changed files between the current commit and last tag. I tried git diff --name-only `git describe --tags`16:01
but it shows nothing16:01
→ g3orge joined16:01
jokke the changes come from another branch. might this be an issue?16:01
→ umpire777 joined16:01
← g3orge left16:01
→ dangerousdave joined16:02
→ Quevin joined16:02
← nekyian_ left16:02
← jnavila_ left16:03
← misu left16:03
← SumDude left16:04
→ paulweb515 joined16:04
→ desposo joined16:05
→ joo-_ joined16:05
gitinfo set mode: +v16:05
→ polyzen joined16:05
→ MutSbeta joined16:05
umpire777 anyone with a suggestion on updating bash in the windows GIT install?16:05
← Sleepy63 left16:05
← jjasinski left16:06
← tranzfuse left16:06
← Manny left16:06
→ tranzfuse joined16:06
← regreg left16:07
→ Novitsh_ joined16:07
→ jjasinski joined16:08
← jceb left16:08
← spareproject left16:09
→ LucasTT joined16:09
← MutSbeta left16:10
→ Sasazuka joined16:10
→ JohnBat26 joined16:10
→ MutSbeta joined16:10
← MutSbeta left16:11
← gdrc left16:11
umpire777 quit16:11
← umpire777 left16:11
→ MutSbeta joined16:12
← m0ltar left16:13
← awkwardusername left16:13
→ jottr joined16:14
→ akushner__ joined16:14
← lucha left16:14
← nour left16:14
← nikita left16:15
← juril_laptop left16:15
← batrick left16:15
← mennea left16:15
→ Sleepy63 joined16:16
→ mennea joined16:16
→ robarelli joined16:16
→ Xethron joined16:17
← Xethron left16:17
→ Xethron joined16:17
→ imachuchu joined16:18
→ batrick joined16:18
← dangerousdave left16:18
→ nikita joined16:19
← evildmp left16:19
→ Mso150 joined16:19
← beaky left16:19
→ plitzenberger joined16:19
← gluten_hell left16:20
→ karstensrage joined16:21
← W0rmDr1nk left16:21
→ rishabh_kwt joined16:21
← robarelli left16:22
← tranzfuse left16:22
karstensrage i keep getting into these situation where i pull from master and am ahead of master by X number of commits even though i havent changed anything or committed anything16:22
what happens if i push that?16:22
← jenni_naiaretti left16:22
→ evildmp joined16:22
← nnyk left16:23
tang^ umpire777: helps if you wait more than five minutes for your answer16:23
→ jenni_naiaretti joined16:23
tang^ states helplessly into the void16:23
anaran karstensrage: do you have multiple remotes? git remote -v16:23
→ orinday joined16:24
→ pcypher joined16:24
karstensrage anaran, no the same remote listed twice for fetch and push16:24
← Xiti left16:24
→ m0ltar joined16:24
← evildmp left16:24
anaran karstensrage: git remote show NAME_OF_REMOTE # looks ok?16:25
← Mso150 left16:26
← Xethron left16:26
→ Mso150_u joined16:26
anaran karstensrage: git reflog # should give you an idea what sent on in your repo16:27
→ G_SabinoMullane joined16:27
← hexagoxel left16:27
← paktai1 left16:27
→ Xiti joined16:28
→ hyperair joined16:28
→ paktai joined16:28
← samtuke left16:29
← mkaesz left16:29
← mikecmpbll left16:30
← batrick left16:30
→ m0viefreak joined16:30
karstensrage git remote show looks fine its github16:30
← listochkin left16:30
karstensrage git reflog shows a bunch of checkout:moving from master to master16:30
pull origin master: FF16:31
only one commet at {5}16:31
commit16:31
→ listochkin joined16:31
→ batrick joined16:31
anaran karstensrage: and it says you are ahead by how many?16:32
batrick → Guest2953316:32
← Anticom left16:32
karstensrage 20 commits16:32
← Xiti left16:32
→ nnyk joined16:32
→ JosephFerano joined16:32
Vampire0 karstensrage, you are probably using an old version of Git and are facing !fetch416:32
gitinfo karstensrage: [!fetchfour] [pre 1.8.4 only] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).16:32
G_SabinoMullane Is there a way to make git diff do depth-first? I'm aware of the -O option. Need to git diff two tags and have foo/bar come before zeta16:32
karstensrage 1.8.216:33
← thiago left16:33
← jenni_naiaretti left16:33
← Guest29533 left16:33
karstensrage so should i update git then clone again?16:34
→ sdrfnord1 joined16:34
karstensrage im nervous about pushing this, i dont know what it will do16:34
→ batrick_ joined16:34
← TheDoctor left16:34
→ Xiti joined16:35
anaran karstensrage: git log origin/master..master # explains the 20 commits?16:35
← listochkin left16:35
anaran ^assuming you are on master16:36
karstensrage Segmentation fault16:36
oh crap16:36
anaran Vampire0: would git fsck be advisible in such a case?16:37
→ mixandgo joined16:37
Vampire0 why anaran? what karstensrage sees is absolutely expected behaviour16:38
TomCat2 is it possible someone rebased master and recreated it on your remote? I'm not sure what that looks like when that happens since I normally avoid such things16:38
Vampire0 karstensrage, you can either update Git, or follow the advice in !fetch416:38
gitinfo karstensrage: [!fetchfour] [pre 1.8.4 only] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).16:38
anaran Vampire0: segmentation fault? karstensrage of git itself?16:38
Vampire0 ah, didn't see the segfault16:39
karstensrage yes16:39
Glaisher is it possible to submit a patch file without cloning the repository locally?16:39
karstensrage now it says Illegal instruction16:39
Vampire0 This doesn't sound to me like a corrupt repository16:39
More like a broken system or Git executable or RAM16:40
→ thumpba joined16:41
→ lsiv568 joined16:41
anaran Glaisher: where is the source? ON github you can edit online and send a pull request16:41
← marscher left16:41
Glaisher nope, gerrit16:41
jokke is it somehow possible to find out the previous head in a post-merge hook?16:41
← blackmesa left16:42
← dmarkham left16:42
Vampire0 jokke, this should be the first parent of the merge commit, shouldn't it?16:42
anaran Glaisher: typo patch or real code, in which case you should be able to test it first16:42
Glaisher anaran: sort of a typo patch16:43
jokke Vampire0: as in HEAD~~16:43
?16:43
← dreiss left16:43
→ baweaver joined16:43
← nnyk left16:43
→ nnyk joined16:44
anaran Glaisher: I guess you would have to ask the project owners anyway, practices vary widely16:44
Remram How do I get Git to output debugging information?16:45
internal commands like http-fetch or send-pack have -v flags but they don't get carried over from higher-level commands16:45
This shows debugging output: http://git-scm.com/book/en/Git-Internals-Transfer-Protocols16:45
but there is no indication as to what was set to get it16:46
karstensrage ok i built 1.9.4 and its working16:46
→ cads joined16:46
← Sleepy63 left16:47
karstensrage git log origin/master..master shows a bunch of changes that are already in master on the remote16:47
→ gargola joined16:47
→ Gizburdt joined16:48
← EdGruberman left16:49
← lsiv568 left16:49
→ maestrojed joined16:50
← Baluse left16:51
Vampire0 jokke, that is the grandparent (same as HEAD^^ or HEAD~2), I think the first parent, HEAD~, is what you are after16:52
→ LBV_User joined16:52
← wrouesnel left16:52
Vampire0 karstensrage, you now of course have to do the pull or fetch again as you did !fetch4 before. Did you at all read the hint?16:53
gitinfo karstensrage: [!fetchfour] [pre 1.8.4 only] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).16:53
← _Vi left16:53
→ Baluse joined16:53
karstensrage Vampire0, ok16:53
← moritzschaefer left16:54
← nath_schwarz left16:54
→ listochkin joined16:54
← baweaver left16:54
→ revyd joined16:54
→ baweaver joined16:54
→ mscook joined16:55
← thumpba left16:55
→ EdGruberman joined16:56
→ blackmesa joined16:56
← ki0 left16:56
→ nath_schwarz joined16:57
→ Advocation joined16:57
← listochkin left16:57
→ lsiv568 joined16:57
→ Xethron joined16:57
← Xethron left16:57
→ Xethron joined16:57
jokke Vampire0: yup16:58
thanks16:58
← joo-_ left16:59
← mscook left16:59
→ oriba joined17:00
→ joo-_ joined17:00
← sdrfnord1 left17:00
← intellix left17:00
→ Sleepy63 joined17:00
← Quevin left17:01
→ listochkin joined17:01
← common-lisper left17:01
gitinfo jokke: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person, but please do it via private message to avoid mass highlighting people.17:01
→ mizu_no_oto joined17:02
→ xcyclist joined17:02
→ maslowbeer joined17:02
← kapowaz_ left17:04
Remram Oooooh, that's cool.17:04
→ kapowaz joined17:04
Remram I had tried rolling out something like that for mailing-lists a while back17:04
→ Quevin joined17:06
→ sdrfnord1 joined17:06
jokke Vampire0: thanks :)17:07
← irqq left17:07
jokke .karma Vampire017:07
gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 18 (1 in past 30 days) (2 given out)17:07
jokke ;)17:08
→ it0a joined17:08
← cbr_ left17:08
→ hebz0rl joined17:08
← imachuchu left17:08
Vampire0 yw jokajak17:10
yw jokke17:10
← stamina left17:10
kpease_ → kpease17:10
→ _Vi joined17:10
→ thiago joined17:11
→ Imdsm joined17:11
← lsiv568 left17:12
← Ankhers left17:14
← devoldmx left17:14
→ Ankhers joined17:16
← cuppscakes left17:16
← himikof left17:17
→ imachuchu joined17:17
→ devoldmx joined17:17
→ mmitchel_ joined17:18
→ himikof joined17:18
→ robarelli joined17:18
→ cuppscakes joined17:18
← bezet left17:19
← bAnt left17:20
→ ki0 joined17:21
→ m8 joined17:22
← piccata left17:22
→ cherwin joined17:23
← encod3 left17:23
← g4r37h left17:23
← jmichaelward left17:24
magic → Guest2617817:25
← Guest26178 left17:25
← robarelli left17:25
→ jmichaelward joined17:25
→ thumpba joined17:26
← cherwin left17:27
← ki0 left17:27
Steve_Jobs does anyone know if bash issues from yesterday affect gitolite?17:27
← rikko left17:28
→ dreiss joined17:29
→ souther joined17:29
← jmichaelward left17:29
gratimax → gratimax|away17:30
← JohnBat26 left17:30
← fission6 left17:31
← pcypher left17:31
← ecky--ptang-zoob left17:31
→ piccata joined17:31
← Xethron left17:32
→ ecky--ptang-zoob joined17:32
← MutSbeta left17:32
→ thumpba_ joined17:32
→ lsiv568 joined17:32
← arnatal left17:32
← mennea left17:32
→ upene joined17:32
→ thevishy_home joined17:32
→ mennea joined17:33
← thumpba left17:33
← Nazrhom left17:33
← mattstratton left17:33
← _lrh_ left17:33
→ Nazrhom joined17:34
→ thevishy joined17:34
→ dangerousdave joined17:34
← Nazrhom left17:35
← cuppscakes left17:35
→ Nazrhom joined17:35
← BuenGenio left17:35
← Nazrhom left17:36
→ Nazrhom joined17:36
← iamjarvo left17:37
← Quevin left17:37
→ ncthom91 joined17:37
→ ajustrun joined17:37
→ ianbrandt joined17:37
→ soulwaves joined17:40
← soulwaves left17:40
→ Xethron joined17:40
← Xethron left17:40
→ Xethron joined17:40
→ pcypher joined17:40
← revyd left17:40
← Nazrhom left17:41
→ InvidFlower joined17:41
← bitkiller left17:41
Remram Hmm, I'm looking for a script that would allow Git and Dropbox to work together17:41
→ Quevin joined17:41
Remram like, that would automatically commit when my dumb-ass dropbox-using collaborators make a change in document in dropbox17:42
← mixandgo left17:42
Remram so that I don't have to put up with that crap17:42
→ imkmf joined17:42
→ BuenGenio joined17:42
← Gizburdt left17:43
Remram Obviously, my googling attempts only returned heretic blog posts about hosting your git repositories on dropbox17:43
← Grum left17:43
→ soulwaves joined17:43
→ jargon joined17:44
← Advocation left17:44
→ Gizburdt joined17:45
→ cuppscakes joined17:46
← dangerousdave left17:47
→ Grum joined17:47
→ _lrh_ joined17:47
← lsiv568 left17:48
kpease → kpease_17:48
← freimatz left17:49
kpease_ → kpease17:49
→ ropav joined17:49
← palcu left17:49
← BuenGenio left17:50
→ mikehaas763 joined17:51
→ beneggett joined17:51
→ cherwin joined17:51
mikehaas763 Out of curiousity, is it possible to set up a working git repo as a remote and to push to it? (as opposed to a bare repo)17:51
→ revyd joined17:51
← n-st left17:52
Seveas mikehaas763: yes17:52
though to say that it's not recommended would be an understatement...17:52
mikehaas763 I know it's not recommended, was just curious so that I can provide an answer when the team members I'm training on Git ask me about it.17:53
Seveas in fact, if you do such a thing, it's highly unlikely people in here will want to help you when (not if, when) it breaks :)17:53
← blackmesa left17:53
← iateadonut left17:53
mikehaas763 Seveas, although, now I'm wondering... what is the technical reasons as to why it's not recommended?17:54
Seveas you can't update a work tree by pushing, you can't update the currently checked out branch when pushing.17:54
subhojit777 i am having some problem. https://github.com/subhojit777/drupal-vim/tree/master/bundle there are some icons in gray color (cannot be clicked) and others in blue (can be clicked). why this difference. the gray ones are installing correctly, not the blue ones.17:54
← _Vi left17:54
Seveas and though in theory that can be made possible, git is not a !deploy tool, so it won't be implemented :)17:55
gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html17:55
← joo-_ left17:55
← cherwin left17:56
→ joo-_ joined17:56
kpease → kpease_17:57
→ BlakeRG joined17:57
← skorgon left17:57
→ kotopies joined17:58
← Grum left17:58
Seveas subhojit777: the gray ones are submodules, but the repo is borked and is missing the actual submodule config17:58
← xSmurf left17:58
→ BuenGenio joined17:58
→ FleaFlicker joined17:59
← kiran left17:59
← ropav left18:00
→ Grum joined18:00
subhojit777 Seveas, borked?18:01
Seveas subhojit777: broken.18:01
→ ropav joined18:01
← jason237 left18:02
← gumble left18:02
← mennea left18:02
→ jpf joined18:03
→ mennea joined18:03
→ nour joined18:03
← upene left18:03
← genomespam left18:03
← topolinux left18:04
← m0ltar left18:04
subhojit777 Seveas, so the blue ones, there repos are "borked"?18:04
their* repos are borked18:04
→ skorgon joined18:04
Seveas no, *your* repo is borked18:04
→ irqq joined18:05
→ mikecmpbll joined18:05
← ropav left18:06
→ zburns joined18:06
← nilg left18:06
→ fission6 joined18:07
← FleaFlicker left18:07
→ etpuis joined18:07
← Novitsh_ left18:08
subhojit777 Seveas, any idea how to fix it?18:09
← jottr left18:09
Seveas yes, stop ignoring git's advice to commit the submodule config.18:09
→ m0ltar joined18:10
Seveas actually, it's not just advice that git does, it even stages the file for you. For some unknown reason you keep unstaging it18:10
→ glosoli joined18:10
← plitzenberger left18:10
→ kballou joined18:10
→ ropav joined18:11
← looper left18:11
subhojit777 Seveas, so I will add bundle/* in .gitignore18:11
← akushner__ left18:11
Seveas that's not at all what I said.18:11
→ lsiv568 joined18:11
→ akushner_ joined18:11
→ rath joined18:11
← thumpba_ left18:11
→ thumpba joined18:12
← joo-_ left18:12
→ jas4711 joined18:12
← mnml left18:13
← revyd left18:13
→ blackmesa joined18:13
← devoldmx left18:14
→ martinkl_ joined18:14
← martinkl_ left18:14
→ skylite joined18:14
→ SimonNa joined18:14
→ bAnt joined18:14
← martinklepsch left18:15
→ martinkl_ joined18:15
← jargon left18:15
→ liamkeily joined18:15
← martinkl_ left18:15
→ jargon joined18:16
→ martinklepsch joined18:16
→ tincan joined18:17
← Sasazuka left18:17
→ thibaultcha joined18:17
← pcypher left18:18
→ FunkyAss joined18:18
→ axl_ joined18:18
→ dgpalmer joined18:20
→ pcypher joined18:21
dgpalmer hey there, i have 2 repos, 1 for my web application, and 1 for a plugin….how can I clone the plugin repo into my web applications repo and have them “synced” so to speak? i have tried using git remote add <remote repo> but that did not work for me…I’d just like to be able to push changes to my plugins repo and have them reflected in the web applications repo18:21
thanks folks :)18:21
→ robarelli joined18:21
→ Sasazuka joined18:22
← lsiv568 left18:22
tobiasvl dgpalmer: sounds like you maybe want a !submodule18:22
gitinfo dgpalmer: git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules18:22
tobiasvl or !subtree18:22
gitinfo The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/Git-Tools-Subtree-Merging for more info, see also !git-subtree and !git-stich-repo.18:22
← Gavrisimo left18:22
→ lsiv568 joined18:22
tobiasvl (I always forget which one of those refers to the other)18:22
→ jmichaelward joined18:23
dgpalmer tobiasvl: thanks, i had actually tried that but it didnt do what i expected. i had followed the steps here http://git-scm.com/book/en/Git-Tools-Subtree-Merging18:23
← dkn64738_afk left18:24
← CheckDavid left18:24
dgpalmer tobiasvl: i think that submodule is what i need, giving that a shot.18:24
tobiasvl good luck. submodules don't always do what you expect either :) but holler if you stumble upon some of the gotchas18:25
dgpalmer tobiasvl: thanks much sir, i am a long time subversion user, still trying to get the hang of git18:25
tobiasvl good for you!18:26
Vampire0 dgpalmer, there are also other options18:26
← luto left18:26
Vampire0 dgpalmer, if you develop both repos yourself and together maybe !gitslave is also interesting18:26
gitinfo dgpalmer: gitslave (http://gitslave.sf.net) is useful to add subsidiary git repositories to a git superproject when you control and develop on the subprojects at more or less the same time as the superproject, and furthermore when you typically want to tag, branch, push, pull, etc. all repositories at the same time.18:26
Vampire0 dgpalmer, also look at the other options at !subr18:26
gitinfo dgpalmer: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.18:26
← robarelli left18:26
→ Nazrhom joined18:27
← lsiv568 left18:27
→ lsiv568 joined18:28
→ devoldmx joined18:28
← BuenGenio left18:28
→ Noldorin joined18:29
→ rikko joined18:29
→ decompiled joined18:29
← jas4711 left18:30
→ dkn64738_afk joined18:31
→ kotopies_ joined18:32
→ jas4711 joined18:32
← pandeiro left18:32
→ dmarkham joined18:32
→ Chaze joined18:32
← decompiled left18:33
→ decompiled joined18:33
← decompiled left18:33
Chaze Hey, general question: I have a virtual drive that is duplicated on multiple systems, and occaisionally synced (newer timestamps override old files, but deletion does not propagate). I have a couple of git repositories in this drive. Will they become broken through this sync process?18:34
→ jakob- joined18:35
← koell left18:35
Chaze the issue certainly is that when something in the repository gets deleted, the 'syncing' essentially restores that file.18:35
→ decompiled joined18:35
← decompiled left18:35
Chaze (not talking about the files in the working copy here, but the repo itself)18:35
← kotopies left18:36
→ decompiled joined18:36
→ dv__ joined18:36
← dv_ left18:36
← Gizburdt left18:36
← lazarus477 left18:37
← tubaman_ left18:37
→ tubaman joined18:38
← pcypher left18:38
→ oriba_ joined18:38
BtbN Chaze, that sounds like an extremely broken "sync"18:38
→ gauke joined18:38
BtbN Why even sync git repositorys? Just push and pull between them18:38
→ Gizburdt joined18:38
← paktai left18:39
← dkn64738_afk left18:39
→ lazarus477 joined18:39
dgpalmer tobiasvl: for the subtree, there is this command: $ git read-tree --prefix=rack/ -u rack_branch18:39
tobiasvl: what should that prefix value be? the path to where i want the external repo to reside?18:39
→ jottr joined18:40
← Gizburdt left18:40
← beneggett left18:41
→ Gizburdt joined18:41
← oriba left18:41
→ hhhhhhhh joined18:42
hhhhhhhh hi how do i reattach head18:42
← gauke left18:42
canton7 !reattach18:43
gitinfo Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue18:43
← canton7 left18:43
→ canton7 joined18:43
→ blubberbop joined18:43
canton7 letters refer to: !detach18:43
gitinfo [!detached] 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 !reattach18:43
→ kriks joined18:43
Chaze BtbN: the sync isn't for the git repositiories per-se. I sync my complete user data between multiple systems - among which, there may also be git repos18:43
← mennea left18:44
Chaze (local ones)18:44
tobiasvl dgpalmer: yeah probably. man git-read-tree or http://git-scm.com/book/en/Git-Internals-Git-Objects18:44
gitinfo dgpalmer: the git-read-tree manpage is available at http://jk.gs/git-read-tree.html18:44
→ mennea joined18:44
→ JohnBat26 joined18:44
tobiasvl dgpalmer: I haven't used subtree that much so better direct your questions to the channel at large than at me directly :)18:44
→ aidalgol joined18:44
→ hexagoxel joined18:45
dgpalmer tobiasvl: hahaha no worries, i just have a front end developer chomping at the bits to theme this plugin….im just determined to do this the proper git way18:45
→ koell joined18:45
hhhhhhhh how do i make master point to my current commit18:46
→ aard_ joined18:46
← orinday left18:46
canton7 you don't care about what master is currently pointing to?18:46
note that this might be !rewriting18:46
gitinfo [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum18:46
→ orinday joined18:46
hhhhhhhh canton7: i dont18:46
→ govg joined18:46
canton7 'git checkout master; git reset --hard <commit you did have checked out>' is one way18:47
'git checkout -B master HEAD' is another18:47
← orinday left18:47
← InvidFlower left18:47
hhhhhhhh that looks like it did it18:48
thanks18:48
← aard_ left18:48
← baweaver left18:49
→ Hello71_ joined18:49
→ gauke joined18:49
→ orinday` joined18:49
← Hello71 left18:49
← orinday` left18:49
→ orinday` joined18:49
← nnyk left18:49
→ aard_ joined18:49
← Asenar left18:50
← m0ltar left18:50
← Mobutils left18:50
← orinday` left18:50
→ orinday`` joined18:50
→ Asenar joined18:51
← Xethron left18:51
→ MutSbeta joined18:53
← ajustrun left18:53
subhojit777 Seveas, now I understand what I was doing wrong. http://vimcasts.org/episodes/synchronizing-plugins-with-git-submodules-and-pathogen/ this shows how to manage plugins as git submodule - thanks :)18:53
→ musicmatze joined18:53
subhojit777 Seveas++18:53
← ingy left18:54
→ irqq_ joined18:55
← orinday`` left18:55
← kermit left18:55
← robustus left18:56
→ CheckDavid joined18:56
← hahuang65 left18:56
← tincan left18:56
→ irqq__ joined18:56
→ tincan joined18:56
← irqq left18:56
← asakura left18:57
→ havanamint joined18:58
→ cvanball joined18:58
← paulweb515 left18:59
→ asakura joined18:59
← irqq_ left19:00
→ robustus|Off joined19:00
← EminenceHC left19:00
robustus|Off → robustus19:01
← govg left19:01
→ revyd joined19:02
← mizu_no_oto left19:02
→ spareproject joined19:02
→ kermit joined19:03
← Mso150_u left19:04
→ matt____ joined19:04
→ Mso150_u joined19:04
← matt____ left19:05
← cvanball left19:05
→ marchelzo_ joined19:05
← diegoviola left19:06
← etpuis left19:07
→ frobware_ joined19:07
← Artpicre left19:07
← kermit left19:08
→ Xiti` joined19:09
→ Artpicre joined19:09
← treehug88 left19:10
→ samtuke joined19:10
← mennea left19:10
← Artpicre left19:10
→ Artpicre joined19:10
→ iamjarvo joined19:11
← bAnt left19:11
← rath left19:11
← JohnBat26 left19:12
← darkbasic left19:12
← Xiti left19:12
→ darkbasic joined19:12
← blackmesa left19:12
→ skynxnex joined19:13
→ hahuang65 joined19:13
← skylite left19:15
← iamjarvo left19:15
→ kayloos joined19:15
← Xiti` left19:15
← revyd left19:16
→ Xiti joined19:16
→ jason237 joined19:16
→ Enekk joined19:17
← Enekk left19:18
→ Enekk joined19:19
← darkbasic left19:19
← Gizburdt left19:19
← vpnncn left19:19
→ darkbasic joined19:19
→ johtso joined19:19
→ paulweb515 joined19:20
→ ki0 joined19:20
← Enekk left19:20
→ jitendravyas joined19:20
→ mennea joined19:20
← mennea left19:20
→ Enekk joined19:20
← samtuke left19:21
← Enekk left19:21
← shinnya left19:21
oriba_ → oriba19:21
→ Enekk joined19:22
→ robarelli joined19:23
← jmichaelward left19:23
→ das_beard joined19:23
→ jmichaelward joined19:23
← listochkin left19:24
→ listochkin joined19:24
trip → Guest8606319:24
→ treehug88 joined19:25
← hebz0rl left19:25
→ mennea joined19:25
→ revyd joined19:26
→ AlexWH88 joined19:27
← teran_ left19:28
← frobware_ left19:29
→ govg joined19:29
← listochkin left19:29
← robarelli left19:30
→ gdrc joined19:30
→ beneggett joined19:31
← lsiv568 left19:32
→ jonmorehouse joined19:33
← Chaze left19:34
← acharlieh left19:34
→ thedodd joined19:34
→ Gizburdt joined19:34
← binaryhat left19:35
← NBhosting left19:35
← milkohol left19:35
→ lsiv568 joined19:35
← amcsi_work left19:36
→ blackmesa joined19:37
→ looper joined19:38
← jonmorehouse left19:38
← danemacmillan left19:38
→ EminenceHC joined19:38
→ danemacmillan joined19:39
→ acharlieh joined19:40
→ pombreda joined19:41
← jitendravyas left19:42
→ cagedwisdom joined19:43
← EminenceHC left19:43
→ baweaver joined19:44
← baweaver left19:44
Hello71_ → Hello7119:44
→ baweaver joined19:44
→ jonmorehouse joined19:44
← thibaultcha left19:46
← subhojit777 left19:46
← jargon left19:48
← carandraug left19:48
← treehug88 left19:49
← durre left19:50
→ Plenoge_ joined19:50
← deizl left19:50
→ thibaultcha joined19:52
→ dangerousdave joined19:52
→ Mobutils joined19:53
← Plenoge left19:53
→ upene joined19:53
→ frobware_ joined19:53
← nath_schwarz left19:54
→ treehug88 joined19:55
→ d00ber joined19:55
← DanMAbraham left19:55
→ bakers joined19:55
← maestrojed left19:55
→ zerofun joined19:55
→ EminenceHC joined19:56
bakers I was on brach A. I did "git stash" switched to branch B, and no I have a ton of merge conflicts. I don't care about branch A I want to go back to B with the code I had stashed19:56
← Gizburdt left19:56
bakers is that possible, or do I lose all that code when I do "git stash pop"19:56
canton7 you don't get conflicts by switching branches19:56
did you stash pop after switching?19:56
→ nath_schwarz joined19:56
canton7 you were on A, went to B, now you don't care about A and want to go back to B? wut?19:57
→ paul424 joined19:57
← cuppscakes left19:57
canton7 and no, if 'git stash pop' conflicts, then the stash isn't actually popped19:57
→ joo-_ joined19:57
bakers canton7: Sorry yes, I neglected that I did git stash pop19:57
← thiago left19:57
→ cuppscakes joined19:58
→ iamjarvo joined19:58
bakers I did "stash pop" and it didn't merge cleanly. I just want to go back to A with the code from my stash19:58
← Ankhers left19:58
← zerofun left19:58
tobiasvl just a tip: "git stash apply" will apply the stash without removing the stash19:58
bakers when I try and switch back I get a bunch of "needs merge"19:58
← moparisthebest left19:58
bakers tobiasvl: I'll have to do that next time19:58
← unreal left19:59
→ moparisthebest joined19:59
pombreda Howdy: I have a top git repo with a deep nesting of submodules. I want to get back to the exact code tree that existed for a tag on the top repo,to deploy that somewhere internally. Is this the right sequence to get this? https://gist.github.com/pombredanne/6a1260da304ecc51625d19:59
→ nimdAsyS joined19:59
← gauke left19:59
bakers canton7: so if I git reset head all those changes so there is no merge conflict, then switch back repos, and git stash pop will my code still be in the stash?19:59
canton7 "back repos"20:00
and yes20:00
bakers canton7: I meant branches, sorry20:00
← Guest86063 left20:01
← sLite left20:01
→ encod3 joined20:01
→ MattMaker joined20:01
← pheaver left20:02
→ tesaf joined20:02
→ sysvalve joined20:02
← petersr left20:02
← D-Boy left20:02
bakers canton7: Phew that worked... thanks20:03
Eugene bakers - if you've still got the SHA of the stash in your terminal history you can `git cherry-pick $SHA`, which is basically what `git stash apply` does internally20:03
bakers canton7: For future reference... if I "stash pop" but it does NOT merge cleanly it does not remove that ref to the stash?20:03
canton7 and no, if 'git stash pop' conflicts, then the stash isn't actually popped20:03
→ W0rmDr1nk joined20:04
← mennea left20:06
→ sLite joined20:06
← skynxnex left20:06
→ mennea joined20:07
→ skynxnex joined20:07
← WormDr1nk left20:07
← joo-_ left20:07
→ thiago_ joined20:09
← nimdAsyS left20:09
→ pcypher joined20:10
→ milkohol joined20:10
→ kermit joined20:10
→ rath joined20:11
← hahuang65 left20:11
← das_beard left20:11
← skynxnex left20:12
→ denisMone joined20:12
← Imdsm left20:12
← ropav left20:12
→ chiromante joined20:13
← martinklepsch left20:13
← yacks left20:14
← irqq__ left20:14
← d00ber left20:14
← lsiv568 left20:15
→ martinklepsch joined20:15
← imkmf left20:16
← revyd left20:16
← User458764 left20:16
← baweaver left20:16
→ pheaver joined20:17
← Quevin left20:18
← francisfish left20:19
→ D-Boy joined20:19
← rikko left20:19
← SjB left20:20
→ alvaro_o joined20:21
→ gfixler_ joined20:21
→ luto joined20:22
← ki0 left20:22
→ jheg joined20:22
→ nnyk joined20:22
← jonmorehouse left20:23
→ KrofDrakula joined20:24
→ jonmorehouse joined20:24
gitinfo set mode: +v20:25
KrofDrakula hello20:25
gitinfo KrofDrakula: 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.20:25
← cads left20:25
← Mso150_u left20:25
KrofDrakula i've got git 1.7.2.5 installed as the version that comes as default on debian 620:25
← chiromante left20:26
KrofDrakula does anyone know if this git version respects the merge attribute in the .gitattributes file?20:26
→ chiromante joined20:26
KrofDrakula i'm trying to set up merge drivers for specific paths, but it doesn't seem to be taking hold20:26
← hhhhhhhh left20:26
→ baweaver joined20:27
→ teran joined20:28
→ j`ey joined20:29
← G_SabinoMullane left20:30
→ veebers joined20:30
← kotopies_ left20:30
→ tranzfuse joined20:30
← rishabh_kwt left20:30
KrofDrakula here are the configurations and scripts i'm using to achieve this: https://gist.github.com/KrofDrakula/9e4a880cf58bf6fb444420:31
am i missing something?20:31
→ Robarelli joined20:32
← kpease_ left20:33
→ kpease joined20:33
← tincan left20:33
→ rikko joined20:34
← oriba left20:34
Seveas KrofDrakula: yes, that version inculdes support for the merge attribute20:35
→ jenni_naiaretti joined20:35
← jason237 left20:35
← jds left20:35
← sLite left20:36
KrofDrakula Seveas: k, so that's one troubleshooting item less to deal with; any ideas on what i'm missing in the gist to make that work, then?20:36
← ppinto left20:36
Seveas no idea, I don't use attributes20:36
I just looked up the commit that added the merge attribute (f3ef6b6bbe9bfd3d09130f7e26b87dbe11b93c5b) and ran git tag --contains on it :)20:36
← tyreld left20:36
→ mueslo joined20:37
← mennea left20:37
→ tyreld joined20:37
KrofDrakula ah, ok :) will lurk here some more in case anyone can shed any light on the merge attribute, then20:37
→ mennea_ joined20:37
KrofDrakula thanks20:37
← SimonNa left20:37
← denisMone left20:37
← thibaultcha left20:38
→ listochkin joined20:39
← JDHawke left20:41
→ sLite joined20:41
→ lun_ joined20:42
← thiago_ left20:42
← thumpba left20:43
← Plenoge_ left20:43
← listochkin left20:43
← glebihan left20:43
← pheaver left20:44
→ imkmf joined20:45
← dangerousdave left20:45
→ glebihan joined20:45
← mikecmpbll left20:46
→ dangerousdave joined20:46
→ thumpba joined20:46
→ Apocalis_ joined20:46
← thumpba left20:47
← tranzfuse left20:47
→ nimdAsyS joined20:49
← LucasTT left20:50
→ mikecmpbll joined20:51
→ LucasTT joined20:53
→ LucasTT_ joined20:53
← dangerousdave left20:53
→ ropav joined20:53
← thedodd left20:54
← nimdAsyS left20:54
← sohail left20:54
→ thedodd joined20:54
→ dangerousdave joined20:54
← ojacobson left20:55
← thedodd left20:55
→ thedodd joined20:56
← thedodd left20:56
→ mscook joined20:56
→ thedodd joined20:56
→ pheaver joined20:56
→ thumpba joined20:57
→ tpollard joined20:58
← zburns left20:58
← sburgess left20:59
← tesaf left20:59
→ revyd joined20:59
← thedodd left21:00
→ thedodd joined21:00
← darkbasic left21:00
← mscook left21:00
← thedodd left21:01
← chiromante left21:01
→ aerocarbine joined21:01
← robertodecurnex left21:02
← rikko left21:02
← mikehaas763 left21:02
→ darkbasic joined21:02
← jonmorehouse left21:02
→ Sonderblade joined21:03
→ killtheliterate joined21:04
← cannonball left21:04
→ sinkensabe joined21:04
→ ajustrun joined21:04
← Robarelli left21:04
→ dsdeiz joined21:05
← styx_ left21:05
→ thedodd joined21:06
← liamkeily left21:07
→ SjB joined21:07
← pcypher left21:08
← iamjarvo left21:08
→ pcypher joined21:08
← it0a left21:08
→ Mobutils_ joined21:08
← revyd left21:09
← nour left21:09
← rnsanchez left21:09
← looper left21:09
→ maestrojed joined21:09
← Mobutils left21:10
Mobutils_ → Mobutils21:10
← zapb_ left21:10
← bremner left21:10
← FunkyAss left21:10
→ bremner joined21:10
← bremner left21:10
→ bremner joined21:10
← aerocarbine left21:10
← glosoli left21:11
← pcypher left21:11
→ ciampix joined21:12
← livingstn left21:12
← PsciCOdeliXHAt left21:13
← gregsmith left21:13
← GGMethos left21:14
→ liamkeily joined21:14
→ rikko joined21:14
→ acl_ joined21:14
← jenni_naiaretti left21:15
→ jenni_naiaretti joined21:16
← aard_ left21:17
→ GGMethos joined21:17
← milkohol left21:17
→ _Vi joined21:17
← dangerousdave left21:18
← rikko left21:18
← mnavratil left21:18
← Pyrogerg left21:19
← frobware_ left21:20
→ jon_r joined21:21
→ pcypher joined21:23
← danemacmillan left21:23
← liamkeily left21:23
→ ki0 joined21:23
→ listochkin joined21:23
← netcarver left21:23
→ parcs joined21:23
← parcs left21:23
→ thibaultcha joined21:24
→ thiago_ joined21:24
← zumba_addict left21:24
→ aswen joined21:24
→ tristanp joined21:24
← ajustrun left21:26
→ robarelli joined21:26
← akushner_ left21:27
→ akushner_ joined21:27
← ki0 left21:27
← dsdeiz left21:28
→ jason237 joined21:28
→ cads joined21:29
→ averell joined21:30
← beneggett left21:30
→ liamkeily joined21:30
← jerius left21:30
→ PinkSpecs joined21:31
← robarelli left21:31
← upene left21:32
← Vivekananda_y510 left21:32
← sinkensabe left21:32
→ ajustrun joined21:32
→ SumDude joined21:33
← ropav left21:33
pombreda guesses that nones has an idea for sub modules question above ? :|21:33
pombreda s/for sub/for my sub21:33
j`ey hates submodules21:34
← baweaver left21:35
← kayloos left21:35
← LucasTT_ left21:36
→ kristoff_ joined21:37
→ milkohol joined21:37
← mennea_ left21:37
→ nimdAsyS joined21:37
→ mennea joined21:37
← kristoff_ left21:37
→ kristoff_ joined21:38
→ skynxnex joined21:38
→ baweaver joined21:38
→ zumba_addict joined21:39
→ ropav joined21:39
← kristofferR left21:40
← encod3 left21:41
← Kicer86 left21:41
← skynxnex left21:42
→ ojacobson joined21:42
→ shinnya joined21:43
pombreda j`ey: ;)21:44
← ajustrun left21:45
j`ey pombreda: i just switched to them at work.. but it seems like the best of a bad bunch21:45
pombreda I have to do with the hand I was dealt with ;)21:45
← FreezingCold left21:46
← kermit left21:46
→ kermit joined21:47
← zumba_addict left21:47
→ ajustrun joined21:49
← ockham left21:49
← rath left21:49
thiago_ → thiago21:50
← ItSANgo left21:51
→ beneggett joined21:52
← beneggett left21:52
→ dsdeiz joined21:54
→ mscook joined21:55
← Sonderblade left21:55
→ LLaurent joined21:55
← Skapadapaduu left21:56
← jenni_naiaretti left21:56
← tristanp left21:56
← King_Hual left21:56
← liamkeily left21:56
← Neozonz left21:57
← AlexWH88 left21:57
← sLite left21:58
→ sLite joined21:58
→ cherwin joined21:59
← mscook left21:59
→ Pyrogerg joined21:59
← cuppscakes left22:01
← eletuchy left22:02
← kriks left22:03
→ liamkeily joined22:04
← nath_schwarz left22:04
→ sinkensabe joined22:04
← ciampix left22:05
→ northfurr joined22:06
osse pombreda: not if you bluff22:06
← mennea left22:07
← StarManta left22:07
→ nath_schwarz joined22:07
→ mennea joined22:07
← ropav left22:08
← dsdeiz left22:08
← Muinasjutuvestja left22:10
← Sebtoast left22:11
→ toothrot joined22:11
← paul424 left22:11
← nath_schwarz left22:12
→ unreal joined22:12
← Dougie187 left22:12
→ ropav joined22:12
→ nath_schwarz joined22:13
→ jenni_naiaretti joined22:14
→ MattMake_ joined22:14
→ iamjarvo joined22:14
← martinklepsch left22:14
← ojacobson left22:14
→ Quevin joined22:14
← PinkSpecs left22:16
← maestrojed left22:16
← liamkeily left22:16
→ ki0 joined22:16
← ropav left22:17
← treehug88 left22:17
← MattMaker left22:17
← iamjarvo left22:19
← Quevin left22:19
risu → squirrel22:19
→ ropav joined22:19
→ maestrojed joined22:19
← aswen left22:20
← acharlieh left22:20
← leeN left22:20
← ropav left22:21
← m8 left22:21
→ jonmorehouse joined22:21
→ ropav joined22:21
← nfk left22:21
← thevishy left22:23
← thevishy_home left22:23
→ zumba_addict joined22:24
→ zahlman joined22:24
← msmith_ left22:25
← axl_ left22:25
→ msmith_ joined22:25
← zumba_addict left22:26
→ zumba_addict joined22:26
gitinfo set mode: +v22:26
→ sohail joined22:27
← zumba_addict left22:28
→ endiruna joined22:28
→ zumba_addict joined22:28
→ robarelli joined22:28
zahlman I've made a mistake. I used someone else's repository as an example for setting up my directory structure and build tools; but rather than simply getting a download, replacing the content and init'ing a new repository, I cloned it and started committing.22:29
Now I have a branch of something else that should be a separate, new project; and I can't `git remote add origin` on github. How do I best fix this?22:29
→ rikko joined22:29
← rikko left22:29
← msmith_ left22:30
← thedodd left22:30
→ blackmes1 joined22:30
pombreda zahlman: do you care for your history or not?22:30
zahlman: you could quite simply create another remote call for instance upstream or anything else22:31
or start from scratch clean without any history22:31
→ ColKurtz joined22:31
← loz-- left22:32
← jheg left22:32
→ dsdeiz joined22:32
→ axl_ joined22:32
← axl_ left22:32
→ ppinto joined22:32
zahlman I have about 20 commits, which I'd like to preserve. the original project has not much more than that.22:33
pombreda answereing my own question above "I have a top git repo with a deep nesting of submodules. I want to get back to the exact code tree that existed for a tag on the top repo,to deploy that somewhere internally. Is this the right sequence to get this? https://gist.github.com/pombredanne/6a1260da304ecc51625d"22:33
pombreda: after some extensive check this works indeed22:33
:D22:33
← blackmesa left22:33
pombreda zahlman: create a new remote, just do not call it "origin"22:34
hexagoxel zahlman: but you can add remote locally22:34
→ groolot joined22:34
← groolot left22:34
pombreda remote defs are by definition local :P I can grok that could be confusing22:35
← robarelli left22:35
← jonmorehouse left22:35
← spareproject left22:35
zahlman so when I subsequently push to github, I'd do `git push <other name> master`? there's nothing magic about the name 'origin'?22:36
hexagoxel but your remote could have a remote, couldn't it?22:36
→ thevishy_home joined22:36
→ TheOnlyMerlin joined22:36
→ loz-- joined22:36
← blackmes1 left22:36
← LBV_User left22:37
→ thevishy joined22:37
pekster zahlman: Besides the fact that it's the default name for a remote, it's not special at all. I frequently rename 'origin' because I have multiple origins with the way I do my workflow22:37
I'd rather see a name that tells me where I'm pushing/pulling from/to22:37
→ rdbell joined22:37
→ skynxnex joined22:39
zahlman ... but 'master' is magic in that it refers to the main branch, yes?22:39
← Pyrogerg left22:39
→ Pyrogerg_ joined22:39
hexagoxel i don't think there is much magic for master, either22:40
→ jonmorehouse joined22:40
← TheOnlyMerlin left22:40
hexagoxel default branch name22:40
→ ItSANgo joined22:40
→ blackmes1 joined22:41
pombreda correct22:41
zahlman ok, but suppose I wanted to preserve my history, but get rid of that from the old project. Can I do better than (ugh) writing a script to re-create a new repository, one commit at a time, copying across from the old one?22:42
pombreda pekster: same here, I like to have eventually multiple clearly named remotes... usually upstream something for others ... and I tend to keep origin for remotes that under my direct control22:42
hexagoxel zahlman: keep the repository, add a new remote, do a rebase -i and squash some stuff22:43
(there might be better solutions still)22:43
zahlman someone in another channel mentioned filter-branch22:43
← wakd left22:43
← skynxnex left22:43
hexagoxel unless there are files from the "old project" that you don't want in your history, filter-branch should not be necessary22:44
← killtheliterate left22:44
← Pyrogerg_ left22:44
→ Pyrogerg joined22:45
→ danemacmillan joined22:45
← sinkensabe left22:45
zahlman if I rebase -i from the first old-project commit to the first my-project commit, that'd be moot, yeah?22:45
← j`ey left22:45
→ bodie_ joined22:46
← jagob left22:46
zahlman because the first commit would effectively just show the files I had in my first version?22:46
← jnewt left22:46
bodie_ I want to diff a file between two branches, but `git diff branch1:path/to/file branch2:path/to/file` doesn't show the changes which I know are there.22:46
what can / should I do?22:47
it simply doesn't show any changes at all.22:47
→ liamkeily joined22:48
← mennea left22:48
← jonmorehouse left22:48
soerenb shouldn't it be git diff branch1 branch2 -- file22:48
← mike_af left22:48
← soulwaves left22:48
→ mennea joined22:49
→ mike_af joined22:49
← jmichaelward left22:49
→ am0khuman joined22:50
← mennea left22:50
hexagoxel zahlman: uhm, i don't get your question22:50
← SjB left22:51
zahlman hexagoxel: I mean, I don't understand what "files from the old project" would still appear in the commit history, if I rebase the way I think I need to.22:51
→ jonr22 joined22:51
← TheFuzzball left22:51
zahlman which would be something like `git rebase --onto <initial commit> <my first commit> <my last commit>22:52
hexagoxel zahlman: if you don't omit any commits, just edit/squash/fixup, then the set of files (and the end result) will remain unchanged22:52
that's not --interactive22:53
zahlman oh, the interactive mode does something different than just letting you browse for the commits you want?22:53
→ TheFuzzball joined22:53
hexagoxel yes22:53
you could, for example, rewrite a single commit message22:53
← mike_af left22:54
→ sgen_ joined22:54
hexagoxel or take two commits and "merge" them into one22:54
read the manpage22:54
bodie_ soerenb, same, no results from the diff22:55
← Mobutils left22:55
→ dsdeiz_ joined22:55
zahlman yeah, the description of interactive mode is way at the end of the manpage, past the other options, didn't expect that.22:56
hexagoxel in your case, you'd want to merge the "old project" commits, and maybe additionally edit the commit (if you want take over authorship :D)22:56
← milkohol left22:56
zahlman okay, this looks like I can figure it out22:56
hexagoxel and always backup (i.e. keep the old branch around) :)22:56
zahlman I think I'm going to physically copy the .git folder somewhere else for this :)22:57
← dsdeiz left22:57
bodie_ ah, there we go, just a dumb mistake22:57
soerenb, I do like that syntax better though :)22:57
← bodie_ left22:57
← ropav left22:58
zahlman is just editing the commit from my perspective enough to change the owner, or do I need to do anything explicitly?22:58
→ pwnz0r joined22:58
← Pyrogerg left22:59
hexagoxel zahlman: --reset-author, maybe23:01
zahlman: also, i just noticed that rebase -i somehow can not touch initial commit23:01
so you might need to check that out, edit it, then rebase your complete history onto that, then rebase -i to squash23:02
← kpease left23:02
hexagoxel (and channel, please say if anyone has a better solution to this)23:03
→ ropav joined23:03
← zumba_addict left23:04
→ madewokherd joined23:05
← EminenceHC left23:06
→ EminenceHC joined23:06
← toothrot left23:07
← thevishy_home left23:07
← thevishy left23:07
← ki0 left23:07
← nettoweb left23:08
KrofDrakula don't have much to add to what was already said, but i do have a problem i'm stuck on myself :)23:09
← fission6 left23:09
KrofDrakula for some reason, merging a file with the merge attribute in .gitattributes doesn't trigger my custom merge driver: https://gist.github.com/KrofDrakula/9e4a880cf58bf6fb444423:10
is the merge driver triggered only when there are changes both in HEAD and the merged branch?23:11
← EminenceHC left23:11
KrofDrakula is it triggered when there are only incoming changes from the merged branch, but nothing changed in HEAD?23:11
← sdrfnord1 left23:13
← pcypher left23:13
← howitdo left23:13
← nimdAsyS left23:14
→ kukks joined23:15
← kukks left23:15
→ kukks joined23:15
← unreal left23:15
← tang^ left23:16
→ sdrfnord1 joined23:17
→ mscook joined23:17
← Wiz_KeeD left23:17
← zacg left23:17
← bakers left23:18
→ boombatower joined23:18
← damccull_ left23:18
→ hmsimha_ joined23:18
→ pcypher joined23:19
← ncthom91 left23:22
← hexagoxel left23:23
← anaran left23:23
← sysvalve left23:25
← smccarthy left23:25
← nnyk left23:26
← przemoc left23:26
← baweaver left23:27
→ msmith_ joined23:28
→ przemoc joined23:28
→ unreal joined23:28
← ropav left23:30
→ ropav joined23:31
→ robarelli joined23:31
← TheFuzzball left23:31
← blackmes1 left23:32
→ howitdo joined23:32
← helgikrs3 left23:32
→ hahuang65 joined23:34
← Nazrhom left23:34
→ Nazrhom joined23:34
← liamkeily left23:34
← SumDude left23:34
→ Quevin joined23:35
← dmarkham left23:35
→ noonian joined23:35
→ P4_Denis joined23:35
← ropav left23:36
← robarelli left23:36
← cherwin left23:37
← msmith_ left23:38
← Nazrhom left23:39
→ skynxnex joined23:39
→ zumba_addict joined23:39
← AaronMT left23:40
← P4_Denis left23:40
← jon_r left23:41
→ jon_r joined23:41
→ ropav joined23:42
→ tinti joined23:42
→ Lyqyd joined23:43
→ amalloy joined23:43
← ajustrun left23:44
← skynxnex left23:44
← akushner_ left23:45
→ akushner_ joined23:45
← howitdo left23:45
← pheaver left23:46
← ropav left23:46
← cads left23:46
zahlman I found this which seems useful to me: http://stackoverflow.com/questions/2246208/change-first-commit-of-project-with-git23:46
← sLite left23:47
← St_Marx left23:47
→ ropav joined23:47
→ St_Marx joined23:48
← pcypher left23:48
→ martinklepsch joined23:48
← lahwran left23:48
sitaram Steve_Jobs: yes they do; look on groups.google.com for the mailing list and one of the recent threads discusses it briefly23:49
← martinklepsch left23:49
← ppinto left23:49
← mikecmpbll left23:49
→ skylite joined23:49
← ropav left23:49
→ martinklepsch joined23:49
← HedgeMage left23:50
→ lahwran joined23:50
→ DolpheenDream joined23:50
→ baweaver joined23:50
→ Consuela joined23:51
← skylite left23:52
← martinklepsch left23:52
→ sLite joined23:52
← sLite left23:53
← listochkin left23:53
→ mikecmpbll joined23:55
→ sLite joined23:56
→ devoldmx3 joined23:56
→ martinklepsch joined23:57
← martinklepsch left23:57
→ Dougie187 joined23:58
→ martinklepsch joined23:58
← devoldmx left23:58
← mmitchel_ left23:59
→ howitdo joined23:59
← mikecmpbll left23:59
→ tmcmahon joined23:59

Logs Search ←Prev date Next date→ Channels Documentation