IRCloggy #git 2014-05-30

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-05-30

← jcvfen left00:01
← ckyle left00:01
→ maslowbeer joined00:02
→ b332v joined00:02
← hwrdprkns left00:03
→ ilmgb joined00:03
← b332v left00:03
← avtobiff left00:04
→ noyb joined00:04
← ShooterMG left00:05
happytux hi00:05
So when git merging something to something, this will first change the workspace, right? One has to commit the merged result, right?00:05
→ bbloom_ joined00:06
← bbloom left00:07
→ reaverb joined00:08
← JDHawke2 left00:08
→ bipolar joined00:08
← endiruna left00:08
← ilmgb left00:08
← robarelli left00:09
reaverb How do you "partially" apply a patch? I'm rebasing and git won't apply a patch becuase one hunk, which I was going to change anyway by amending, won't apply.00:09
← mmitchell left00:09
→ robarelli joined00:09
← imachuchu left00:09
→ JDHawke joined00:11
← xSmurf left00:11
→ avtobiff joined00:12
← Sample left00:12
→ mellernoia joined00:12
← robarelli left00:13
→ Dougie187 joined00:15
← homework1 left00:15
← hochmeister left00:15
← starkhalo left00:16
→ Cristi joined00:17
Cristi → Guest2008700:17
← Guest20087 left00:17
← str left00:18
← mizu_no_oto left00:19
← Neozonz|Disc2 left00:20
→ aspiers_ joined00:21
← jay_ left00:21
← nnyk_ left00:22
→ rchavik joined00:22
← bbloom_ left00:23
← aspiers left00:23
→ wakd joined00:23
← dkpi left00:23
→ lithiumjake joined00:23
← wakd_ left00:24
→ Dougie2187 joined00:26
→ fatalhalt joined00:26
→ mdub joined00:26
← SHyx0rmZ left00:27
← woollyams left00:28
→ gordian joined00:28
← blackmes1 left00:28
→ affa09 joined00:29
→ tinti joined00:29
→ hochmeister joined00:30
→ Neozonz joined00:32
← Neozonz left00:32
→ Neozonz joined00:32
→ aberrant joined00:33
→ ilmgb joined00:34
← kenneth left00:36
← looper left00:36
← Neozonz left00:36
← EminenceHC left00:37
← ilmgb left00:39
→ maglnet_ joined00:40
← wakd left00:40
→ kenneth joined00:40
→ hkon_ joined00:40
→ bob14 joined00:41
→ Kayra joined00:41
→ dik_dak joined00:42
← affa09 left00:43
← SkyFlyer left00:43
← maglnet left00:44
← FreezingCold left00:44
← hkon_ left00:45
← MarionDaly left00:45
→ TCubed joined00:45
← Kayra left00:46
← kenneth left00:47
→ kenneth joined00:48
→ Neozonz joined00:48
← Neozonz left00:48
→ Neozonz joined00:48
→ MarionDaly joined00:48
→ ariscop joined00:48
← luc__ left00:49
← maestrojed left00:49
→ luc_ joined00:50
→ frogonwheels joined00:50
→ MistuhKurtz joined00:51
← ColKurtz left00:51
→ _Vi joined00:51
← aberrant left00:51
→ wakd joined00:52
← Neozonz left00:53
← kenneth left00:54
→ kenneth__ joined00:54
→ megawac joined00:57
← noyb left00:57
← kenneth__ left00:58
→ endiruna joined00:58
→ kenneth joined00:59
← pweaver_ left01:01
← endiruna left01:03
→ Neozonz joined01:04
← Neozonz left01:04
→ Neozonz joined01:04
← lethjakman left01:04
→ kenneth__ joined01:05
← bob14 left01:05
← adkins1 left01:06
→ bob14 joined01:07
← kenneth left01:08
← maslowbeer left01:09
← Neozonz left01:09
→ aberrant joined01:10
← thiago left01:10
→ robarelli joined01:10
← hahuang65 left01:12
→ k_sze[work] joined01:13
← gelardi_ left01:14
← robarelli left01:14
→ EminenceHC joined01:15
← Vampire0 left01:17
← justinsd left01:19
← EminenceHC left01:19
→ maslowbeer joined01:20
← Noldorin left01:20
→ Neozonz joined01:20
← Neozonz left01:20
→ Neozonz joined01:20
← robustus left01:21
→ NotANick_ joined01:21
← NotANick_ left01:21
→ NotANick_ joined01:21
SamB !smart01:21
gitinfo [!smartgit] SmartGit is a (commercial) UI for git that is very user-friendly and feature-complete. http://syntevo.com/smartgithg01:21
SamB !http01:21
gitinfo [!web_repos] Sharing git repositories over http/https (gitweb or `git clone`) is easy with http://sethrobertson.github.com/HowToPutGitOnTheWeb Auth includes none, authfile, pam, ldap, and ssl client certs.01:21
← NotANick left01:22
NotANick_ → NotANick01:23
← xobb left01:23
← fr33domlover left01:23
→ robustus joined01:23
SamB hmm, that address gave me a rude, incorrect message about my browser being broken01:24
→ alexlindenlevy joined01:24
SamB my browser is perfectly within its (and my) rights to require user confirmation of "Refresh"-style redirects01:24
← Neozonz left01:25
→ hgl joined01:26
← bob14 left01:26
← MistuhKurtz left01:27
→ akushner joined01:28
→ jftf joined01:29
→ Goplat joined01:29
→ Vampire0 joined01:30
← jovy88 left01:30
→ FutureTense joined01:30
← Deseaus left01:30
← mellernoia left01:31
→ jovy88 joined01:31
→ alexlind_ joined01:32
← SegFaultAX left01:33
← jftf left01:34
← WaReZ left01:34
→ SegFaultAX joined01:35
← alexlindenlevy left01:35
→ ColKurtz joined01:36
→ Neozonz joined01:36
← alexlind_ left01:36
← maslowbeer left01:39
→ weiyang joined01:39
→ revyd joined01:40
← Anders_J left01:40
← kriks left01:40
← Neozonz left01:41
→ ojacobson joined01:41
← dik_dak left01:41
← Polymorp_ left01:41
→ Neozonz joined01:41
← Neozonz left01:41
→ Neozonz joined01:41
→ Kayra joined01:41
← Celm left01:42
← Neozonz left01:42
→ Neozonz joined01:43
← Neozonz left01:43
→ Neozonz joined01:43
→ watabou joined01:45
← Kayra left01:46
← watabou left01:46
← ErKa left01:47
→ tmcmahon joined01:49
← Neozonz left01:50
→ akim_ joined01:51
← luc_ left01:52
← akim left01:52
→ watabou joined01:52
← twittard left01:53
→ twittard joined01:54
← yhager left01:57
→ yhager joined01:59
← ColKurtz left01:59
← Foldager left02:01
← akushner left02:01
→ ColKurtz joined02:01
← knownasilya left02:02
← tmcmahon left02:03
← tpollard left02:03
← LucasTT left02:04
→ tpollard joined02:06
→ akim joined02:08
→ devinhe joined02:09
→ thiago joined02:10
→ luc_ joined02:10
→ robarelli joined02:11
← akim_ left02:11
← kyb3r_ left02:11
← doitjay left02:12
→ kyb3r_ joined02:14
→ pweaver_ joined02:14
← Ysgard left02:14
→ jftf joined02:14
← robarelli left02:15
← bipolar left02:15
← jcarouth left02:17
→ hahuang65 joined02:17
← bitkiller left02:17
← alvaro_o left02:17
→ EminenceHC joined02:18
→ johnkevi_ joined02:18
← jftf left02:19
← Sleepy63 left02:19
→ zzing joined02:19
← mribeirodantas left02:20
← ColKurtz left02:21
← freestyl3r left02:21
→ codeurge joined02:21
← debajit left02:21
← johnkevinmbasco left02:22
← EminenceHC left02:23
→ bipolar joined02:24
Eugene .trigger_edit web_repos Sharing git repositories over http/https (gitweb or `git clone`) is easy with http://goo.gl/4EUTCX Auth includes none, authfile, pam, ldap, and ssl client certs.02:27
gitinfo Eugene: Okay.02:27
Eugene Better?02:27
→ quazimodo joined02:28
→ hkon_ joined02:29
→ tranzfuse joined02:30
← tranzfuse left02:30
← madewokherd left02:31
→ raven-au joined02:31
← bipolar left02:31
→ Sleepy63 joined02:33
← hkon_ left02:33
→ daito joined02:34
← NaStYdoG left02:35
→ NaStYdoG joined02:35
NaStYdoG → Guest846602:36
→ ilmgb joined02:36
← bakflash left02:37
← pbrobst left02:37
← kenneth__ left02:38
→ Vivekananda joined02:38
← johnkevi_ left02:38
← hyperair left02:40
← JDHawke left02:40
← ilmgb left02:40
← yhager left02:41
→ Kayra joined02:41
← bgerber left02:42
→ johnkevinmbasco joined02:42
→ CoderBug joined02:44
← Kayra left02:46
← CoderBug left02:47
→ kushal3 joined02:49
← quazimodo left02:49
kushal3 All jokes are Copyright by Eugene E. Kashpureff Jr, except the ones that aren't. lolwut?02:49
← tinti left02:49
Eugene man git-blame ;-)02:49
gitinfo the git-blame manpage is available at http://jk.gs/git-blame.html02:49
← pweaver_ left02:50
→ maslowbeer joined02:50
reaverb → reaverpf02:50
reaverpf → reaverb02:50
→ JDHawke joined02:51
→ bgerber joined02:51
← johnkevinmbasco left02:54
← maslowbeer left02:56
→ quangdvh joined02:57
← quangdvh left02:57
→ quangdvh joined02:58
→ ferreum768 joined03:00
→ theRealGentleman joined03:00
→ poindontcare joined03:00
→ _pr0t0type_ joined03:01
→ starkhalo joined03:01
← ferreum158 left03:01
poindontcare how does one ignore files #foo# i am trying [#]*[#] but doesnt seem to be workign03:01
← aretecode left03:01
← bartman`` left03:01
← gordian left03:01
offby1 poindontcare: I think you need a \ before the #03:01
maybe only the first one03:01
otherwise git thinks the # is a comment in your .gitignore file.03:02
← twittard left03:02
offby1 That's my conjecture, anyway :-|03:02
→ akushner joined03:02
→ hyperair joined03:02
poindontcare hmm idk i tried \#*# too :(03:03
← quangdvh left03:03
poindontcare oh wait it worked03:03
thanks03:03
→ johnkevinmbasco joined03:03
→ quangdvh joined03:03
← quangdvh left03:04
← lithiumjake left03:05
← wakd left03:05
← akushner left03:06
→ ilmgb joined03:07
← Bombe left03:07
→ kenneth joined03:07
← nkouevda left03:08
→ nkouevda joined03:09
→ debajit joined03:09
→ luc__ joined03:10
← luc_ left03:10
← ilmgb left03:11
→ robarelli joined03:11
→ pweaver_ joined03:12
milki lol03:12
← m0viefreak left03:14
→ jftf joined03:15
→ Bombe joined03:16
← robarelli left03:16
← dreiss left03:17
← pweaver_ left03:18
→ JerryT joined03:18
← JerryT left03:18
→ NotANick_ joined03:19
← NotANick_ left03:19
→ NotANick_ joined03:19
→ JerryT joined03:19
← jftf left03:20
← kenneth left03:21
→ EminenceHC joined03:22
← NotANick left03:22
← Segfault_ left03:25
← dobalina left03:25
← St_Marx left03:25
← skorgon left03:25
← asakura0 left03:25
← causasui left03:25
← Exio4 left03:25
→ danecando joined03:26
← EminenceHC left03:27
→ kerrick_ joined03:27
← Mitchbones left03:29
→ mennea joined03:29
← devinhe left03:29
← kerrick left03:30
→ St_Marx joined03:34
← Dougie187 left03:34
← Dougie2187 left03:34
→ dobalina joined03:34
jaimef if you merge a pull request, is there an easy way to revert it? without reverting each individual commit in that merge?03:35
← JDHawke left03:36
→ Exio4 joined03:36
milki jaimef: !undo might help03:37
gitinfo jaimef: [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!03:37
→ causasui joined03:37
← debajit left03:37
milki jaimef: revert also has a -m option03:37
→ JDHawke joined03:37
milki jaimef: man git revert03:37
gitinfo jaimef: the git-revert manpage is available at http://jk.gs/git-revert.html03:37
→ ilmgb joined03:38
→ skorgon joined03:38
→ ferreum joined03:39
jaimef thanks03:39
→ Lyqyd joined03:40
NotANick_ → NotANick03:41
→ Kayra joined03:41
→ asakura0 joined03:42
← ferreum768 left03:42
← ilmgb left03:42
→ kenneth joined03:43
→ treaki__ joined03:44
→ CoderBug joined03:46
← Kayra left03:47
→ Segfault_ joined03:47
→ kalypso joined03:47
← FutureTense left03:48
← treaki_ left03:48
→ Lemony joined03:48
→ SLY1986 joined03:49
→ zivester joined03:50
← doge_wow left03:50
← theRealGentleman left03:50
← SLY1986 left03:52
→ soya joined03:52
→ SLY1986 joined03:52
→ doge_wow joined03:53
← codeurge left03:55
yates it seems that i have a bunch of untracked files that don't show up in "git status" as untracked03:59
→ maestrojed joined03:59
yates they don't show up at all03:59
← ojacobson left03:59
yates oh, ok.04:00
git only shows the top level path of untracked files?04:00
→ noyb joined04:01
→ fairuz joined04:03
← zivester left04:04
martisj how can i save local changes in a new branch04:05
← mdub left04:06
← CKyle_ left04:07
→ irqq joined04:08
→ ilmgb joined04:09
→ robarelli joined04:12
→ ErKa joined04:13
← ilmgb left04:13
← robarelli left04:14
→ robarelli joined04:14
← deanclkclk left04:14
mark_t martisj, probably the worst way to do it is to "git stash" the changes, create the branch, then "git stash apply".04:15
→ bipolar joined04:16
→ jftf joined04:16
→ hkon_ joined04:17
← robarelli left04:19
← akim left04:20
→ cads2 joined04:20
← jftf left04:21
← hkon_ left04:22
→ EminenceHC joined04:25
← JDHawke left04:26
← megawac left04:26
→ OffTheRails joined04:27
→ maslowbeer joined04:28
→ beautifulmind joined04:29
← freeman42 left04:30
← EminenceHC left04:30
← beautifulmind left04:30
→ beautifulmind joined04:32
→ JDHawke joined04:33
→ kushal2 joined04:35
← kushal3 left04:37
← lu_zero left04:37
→ lu_zero joined04:37
← lu_zero left04:37
→ lu_zero joined04:37
← daito left04:39
← irqq left04:39
→ woollyams joined04:40
← TCubed left04:40
→ ilmgb joined04:40
← toobluesc left04:40
→ Kayra joined04:41
→ hwrdprkns joined04:42
→ dreiss joined04:43
→ zoso joined04:43
← fatalhalt left04:44
← bunbury left04:45
← ilmgb left04:45
→ codeurge joined04:46
← woollyams left04:46
← Kayra left04:46
← cads2 left04:46
martisj mark_t: pretty much what i did 👎04:47
← hahuang65 left04:48
→ woollyams joined04:49
← codeurge left04:50
mark_t martisj, glad to hear it. Quick-and-dirty is the way to go. :D04:51
→ yacks joined04:51
→ codeurge joined04:52
← FL1SK left04:52
→ amigojapan joined04:52
→ FL1SK joined04:52
→ pablo_ joined04:54
→ debajit joined04:56
gitinfo set mode: +v04:57
pablo_ hello. Newbie question: If I push changes to a remote branch on my local machine, then I ssh into another server, how do a I pull my changes onto the server I'm ssh'd into?04:58
mark_t pablo_, if you boil your question down to its essence, it is "how do access my local machine from a remote server?" The anwer is: "provide access from the remote server to your local server"05:00
← dreiss left05:01
mark_t Although I am likely going down the road of "there are many better ways to do it", I'd say opening a port on your local firewall and system for ssh access is the best way.05:01
→ pweaver_ joined05:03
→ drjeats joined05:04
→ Mystica joined05:05
← Mystica left05:05
← kalypso left05:07
Vivekananda hey everyone I did a git rm --chached file1 file2 and now on git status I see both files as 'deleted'05:08
is this correct ?05:08
I just wanted to delete the staged changes05:09
← kadoban left05:10
→ ilmgb joined05:11
martisj Vivekananda: did you stage the files?05:12
Vivekananda martisj: if you are asking if I did a git add then no05:12
but I did make changes to the files05:12
→ hahuang65 joined05:12
martisj and you want to “revert” the changes?05:12
Vivekananda: I would suggest looking at git reset then05:12
instead of rm05:13
pablo_ mark_t - thanks I figured it out, I had created a new branch on the remote machine instead of checking out the remote branch. needed to delete the local dupe branch and then check it out... if that makes sense05:13
er delete the remote dupe branch05:13
→ Kicer86 joined05:13
→ robarelli joined05:15
← ilmgb left05:16
← pablo_ left05:16
→ bbloom joined05:19
← pweaver_ left05:19
martisj How do i use git fsck to recover a deleted branch?05:19
← robarelli left05:19
mark_t martisj, you don't.05:20
← ericp4 left05:21
← kukks left05:21
→ ericp4 joined05:21
→ vyadhaka2 joined05:25
Vivekananda martisj: how do I undo the rm --cached ?05:25
← polyzen left05:25
mark_t Vivekananda, git add again05:26
→ Kayra joined05:26
← the8thbit left05:26
← jovy88 left05:26
→ kcj joined05:26
grawity martisj: look over all commits that `git fsck` reports as dangling05:26
Vivekananda mark_t: it currently shows : git status deleted: file1 deleted:file205:26
do I git add now ?05:27
martisj mark_t: aha yeah :)hahah found out that I have to create the branch from the sha of the deleted branch05:27
grawity martisj: if you find the head of the deleted branch, just create a new branch starting from that commit05:27
Vivekananda also isnt there a git undo command ?05:27
grawity Vivekananda: what would `git undo` do, precisely?05:27
mark_t Vivekananda, git reset05:27
Vivekananda to undo whatever I executed the last05:27
grawity no, there isn't05:27
→ jovy88 joined05:27
Vivekananda grawity: so git reset then ? or git add ? I dont want to loose those files05:27
← drjeats left05:28
→ D9 joined05:28
→ EminenceHC joined05:28
→ gittish joined05:29
→ drjeats joined05:29
← _pr0t0type_ left05:31
→ Deseaus joined05:31
vyadhaka2 I added a global .gitignore file somewhere and referencee it like but it's not working, is this right > git config --global core.excludesfile ~/.../.gitignore_global05:31
← EminenceHC left05:32
← noyb left05:33
→ EminenceHC joined05:33
← Deseaus left05:35
→ User458764 joined05:36
← __main__ left05:36
→ __main__ joined05:37
← kushal2 left05:38
osse yes05:39
→ daito joined05:39
← __main__ left05:39
→ __main__ joined05:40
→ wrouesnel1 joined05:40
← luc__ left05:40
→ luc__ joined05:41
← daito left05:41
→ daito joined05:41
← luc__ left05:41
→ luc__ joined05:42
→ ilmgb joined05:42
vyadhaka2 osse: thank you, the only line I have in there is for *.swp and they still get picked up, is there something else I am missing05:43
→ luc___ joined05:43
osse vyadhaka2: picked up how?05:43
vyadhaka2 they come up as untracked files05:44
→ ThomasLocke joined05:44
osse vyadhaka2: run 'git config --global core.excludesfile' what does it say?05:44
← EminenceHC left05:44
vyadhaka2 /home/username/.gitignore05:45
I changed the filename05:45
Vivekananda vyadhaka2: interesting name !05:46
osse vyadhaka2: and that path is correct?05:46
← luc__ left05:47
osse you said they show up as untracked files. make sure it's not modified files.05:47
← ilmgb left05:47
vyadhaka2 yes. and moved it to the home directory assuming it would make a difference05:47
so the excluded files come up as untracked but not as modified?05:47
← dobalina left05:47
← Gamecubic left05:47
osse no, Iæm05:47
I'm asking you05:47
→ bhldev joined05:48
→ str joined05:48
→ bdav|irccloud joined05:48
→ leeN joined05:49
vyadhaka2 I am new to git, but I havent added them to the repo, why will they come up as modified, my understanding of the excluded files is that they dont get tracked.05:49
→ Wiz_KeeD joined05:50
osse your understanding is correct. I just wanted you to double check that git status actually says untracked and not modified05:50
vyadhaka2 yes they are only showing up as untracked05:50
I just want them not to come up as untracked05:51
osse vyadhaka2: check if you have trailing whitespace in the gitignore file05:51
← johnkevinmbasco left05:51
→ johnkevinmbasco joined05:51
← str left05:52
← codeurge left05:52
User458764 → User458764_NotHe05:54
→ zzing_ joined05:54
→ Gamecubic joined05:54
vyadhaka2 no whitespaces, I also tried placing the file in the repo working dir, not working05:54
starkhalo how can I search if a file has ever existed at any point in the repo?05:55
← tpollard left05:55
← zzing left05:55
vyadhaka2 let me first confim, .gitignore file can be placed anywhere and reference it with the git config core.excludesfile, right? and the name of the file be different?05:55
← hgl left05:57
mark_t starkhalo, git log path/to/file --try-harder-darnit!05:57
← karpoff left05:57
→ dreiss joined05:57
starkhalo but I don't have a path? say I want to know if there has ever been a *.pc file?05:58
← User458764_NotHe left05:58
→ karpoff joined05:58
→ MattMake_ joined05:58
← diegoviola left05:59
→ Silmarilion joined05:59
starkhalo I guess I could iterate all refs through ls-files but is there a shorter way?05:59
vyadhaka2 fixed it, there was a trailing space after the rule. *.swp05:59
← MattMaker left06:00
← MattMake_ left06:00
→ MattMaker joined06:00
→ CodePulsar joined06:02
→ Sicp joined06:02
grawity starkhalo: no, there is no global index on filenames06:03
→ johnkevi_ joined06:03
starkhalo grawity: kk thanks, I'll iterate then06:03
grawity starkhalo: the _only_ way to know if a file was in any commit is to look through all commits06:03
← beautifulmind left06:03
grawity starkhalo: though, if you're making a script, then you can speed it up by checking individual trees, not whole commits06:04
← FunkyAss left06:04
← Lemony left06:04
grawity because often the same (sub-)tree is used by dozens of commits06:04
← johnkevinmbasco left06:04
grawity starkhalo: for example, https://github.com/grawity/code/blob/master/devel/git-find-blob06:05
starkhalo: that script searches by hash, would be easy to change it to search by name though06:05
← JDHawke left06:05
→ hkon_ joined06:05
starkhalo awesome, let me read about it 'cause I'm not familiar with that06:05
thanks a bunch!06:06
grawity the way it works, a commit doesn't have a flat list of files, it has a nested list of 'tree' objects06:06
each subdirectory corresponding to a tree object06:06
→ Sijdesign joined06:06
grawity well, "nested list" isn't the right term06:06
→ johnkevinmbasco joined06:07
← johnkevi_ left06:07
starkhalo oh my, I'm sure that's more efficient and probably faster but I think I'll go with a simple ls-files and leave git-find-blob for git homework06:08
← Sijdesign left06:08
→ JDHawke joined06:08
→ ciampix joined06:10
→ happytux_ joined06:10
← hkon_ left06:11
→ lite_ joined06:11
→ Sicp_ joined06:11
← kcj left06:12
← Sicp left06:13
→ ilmgb joined06:13
← happytux left06:13
← sarkis left06:15
→ Sijdesign joined06:15
→ robarelli joined06:15
→ FvG_u joined06:15
→ FunkyAss joined06:16
→ sinkensabe joined06:16
← johnkevinmbasco left06:16
← Sijdesign left06:16
→ lirikon joined06:17
→ Raging_Hog joined06:17
← lirikon left06:17
← ilmgb left06:17
→ jftf joined06:18
→ mishunika joined06:19
← robarelli left06:20
← starkhalo left06:21
← leeN left06:21
osse vyadhaka2: so there *was* trailing whitespace after all? :)06:22
→ ilmgb joined06:22
← jftf left06:23
→ johnkevinmbasco joined06:24
→ doitjay joined06:25
→ freeman42 joined06:25
→ longbeach joined06:25
→ beautifulmind joined06:26
← kyb3r_ left06:26
← Arkaniad|Laptop left06:27
← digitalextremist left06:28
→ Vile joined06:29
→ EminenceHC joined06:30
→ alxgnon joined06:31
→ digitalextremist joined06:31
→ kyb3r_ joined06:32
→ mishunik1 joined06:32
→ bob14 joined06:32
← digitalextremist left06:32
→ marthinal joined06:33
← Vile left06:34
← freeman42 left06:34
← EminenceHC left06:35
← mishunika left06:35
← luxgeek left06:36
← Lyqyd left06:36
→ jagob joined06:37
← marthinal left06:37
→ cbreak-work joined06:37
← CoderBug left06:38
→ Deseaus joined06:39
→ jargon joined06:41
→ pweaver_ joined06:42
→ h0bbit joined06:43
→ hkon_ joined06:43
← maestrojed left06:43
→ jnavila joined06:43
← dreiss left06:43
← mishunik1 left06:44
← viciousbunny left06:45
← Kayra left06:46
→ mlechner joined06:46
← kyb3r_ left06:47
→ andr3a joined06:47
→ jeffreylevesque joined06:48
← zzing_ left06:48
→ zzing joined06:49
← Sicp_ left06:50
→ Sicp joined06:50
← northfurr left06:51
→ viciousbunny joined06:51
→ noyb joined06:51
← asakura0 left06:51
→ luxgeek joined06:52
← oojacoboo left06:52
→ asakura0 joined06:52
→ digitalextremist joined06:52
→ mishok13 joined06:54
→ SittingShiva joined06:55
← Dottimolly left06:55
← ilmgb left06:55
← jeffreylevesque left06:55
← noyb left06:56
→ Polymorp_ joined06:57
→ tvw joined06:58
← weiyang left06:59
← SittingShiva left06:59
→ nabblet joined07:00
→ harish joined07:01
← Sonderblade left07:01
→ shidi joined07:02
← debajit left07:02
→ hebz0rl joined07:04
→ Gavrisimo joined07:06
← pweaver_ left07:07
→ akushner joined07:07
← juril left07:09
adev → adev|afk07:11
← luxgeek left07:11
← FvG_u left07:11
← drjeats left07:12
→ drjeats joined07:13
← akushner left07:14
→ intellix joined07:16
← alxgnon left07:16
→ luxgeek joined07:19
← luxgeek left07:19
→ jftf joined07:19
← Gamecubic left07:20
← amigojapan left07:20
→ irqq joined07:20
← thiago left07:22
← fairuz left07:22
→ norber joined07:23
→ matteo joined07:23
← andr3a left07:23
→ gua_ould joined07:24
→ fairuz joined07:24
← beautifulmind left07:24
→ adambrenecki_ joined07:24
← jftf left07:24
→ debajit joined07:24
← bob14 left07:25
→ irqq_ joined07:26
→ leeN joined07:27
→ adac joined07:27
← armyriad left07:27
→ armyriad joined07:28
← irqq left07:29
→ thevishy joined07:29
← danecando left07:31
→ EminenceHC joined07:32
→ nnyk_ joined07:32
→ andr3a joined07:32
← doitjay left07:32
→ the8thbit joined07:33
← hebz0rl left07:34
→ hebz0rl joined07:34
← nkouevda left07:34
→ rishabh_ joined07:35
→ hoschi joined07:35
→ juril joined07:36
← EminenceHC left07:36
→ sq-one joined07:37
→ Elek101 joined07:38
← Elek101 left07:38
← hebz0rl left07:38
→ abak joined07:39
← zzing left07:39
→ Elek101 joined07:39
→ wakd joined07:39
→ akushner joined07:40
← ErKa left07:40
→ konadr joined07:40
← konadr left07:40
→ strk joined07:40
strk error: Not tracking: ambiguous information for ref refs/remotes/origin/1.11 # how to debut/fix ?07:40
→ konadr joined07:41
→ hebz0rl joined07:41
← daito left07:41
→ gertptr joined07:41
strk git branch -r | grep -w 1.11$ # origin/1.1107:41
git tag -v | grep 1.11 # none07:42
osse strk: what command produced that error?07:42
→ saurabh joined07:42
→ Balliad joined07:43
← gua_ould left07:43
strk git branch 1.11 origin/1.1107:43
← hebz0rl left07:43
→ hebz0rl joined07:44
← hebz0rl left07:44
tobiasvl strk: what do you want to do?07:44
→ hebz0rl joined07:44
← akushner left07:44
← MattMaker left07:45
← yacks left07:45
→ _soya_ joined07:45
tobiasvl strk: is origin/1.11 already tracked by another branch?07:45
← _soya_ left07:45
tobiasvl did you mean to use -t ?07:45
← soya left07:46
strk I want a "1.11" branch tracking origin/1.11, how can I see if another branch is already tracking it ?07:47
grep 1.11 .git/config # no hits07:48
osse strk: my guess is you accidentally created a local branch called origin/1.1.107:49
what does git branch -a say07:49
→ gua_ould joined07:49
← OffTheRails left07:50
→ Xethron joined07:50
← Xethron left07:50
→ Xethron joined07:50
← debajit left07:50
→ cllamas joined07:51
→ MattMaker joined07:51
→ ilogger2 joined08:04
cbreak-work abak: git mv root/A root/T && mkdir root/A && git mv root/T root/A/newname08:06
or something like that08:06
→ bgerber joined08:06
cbreak-work abak: you might also have to adjust .gitmodules and the settings in .git/config08:06
→ lov joined08:07
abak so I have to use a temp folder08:07
damccull If I want to ignore a pattern with .gitignore, but still track a specific file that fits that pattern, can I just git add it manually before/after putting it in the gitignore and git will love it like it loves every other file?08:08
tobiasvl damccull: yes08:08
damccull sweet thanks08:08
→ athan joined08:11
→ Bigus joined08:11
→ dobalina joined08:12
→ daito joined08:14
→ endiruna joined08:15
→ ncd|leeN joined08:15
cbreak-work abak: no, just a temporary name08:16
→ samsamm777 joined08:17
→ wrouesnel2 joined08:18
→ Macaveli joined08:18
jast damccull: you can put inverted rules in .gitignore files, too08:18
e.g. '*.txt' and '!superimportant.txt'08:19
→ jpierre03 joined08:19
→ jftf joined08:20
→ Shusshu joined08:20
damccull Wow! Inverted rules? neato08:21
Vampire0 What would be the benefit of the explicit invertion for just one file jast? I see the advantage for another pattern, but for a single file?08:21
→ kini joined08:21
d-snp Vampire0: for js projects its common to have your compilation result in the git repo08:21
→ teran joined08:21
d-snp so I have gitignore: dist/*, !dist/myproject.min.js08:22
so all my build artifacts are ignored except for the final result08:22
→ amcsi_work joined08:22
Vampire0 d-snp, but what is the benefit of putting it as inverse rule to .gitignore over just adding it explicitly. As soon as you explicitly add a file, the .gitignore rules are non-effective08:23
d-snp well that's true, but I don't think that's very pretty08:23
jast documentation, basically08:23
it's an explicit record of the fact that it's correct for that file to be tracked08:23
→ Neon1024 joined08:23
Vampire0 ok08:24
:-)08:24
→ marthinal joined08:24
d-snp woop woop, making the learns :)08:24
→ nfk joined08:24
→ jceb joined08:24
→ phanimahesh joined08:24
gitinfo set mode: +v08:24
← jftf left08:25
← teran left08:26
jast that said, I wouldn't track automatically minified versions of my own code with git08:26
→ ArSn joined08:27
→ ilmgb joined08:27
strk osse: git branch -a | grep 1.11 # only gives entries starting with "remote/"08:27
actually, "remotes/origin/"08:27
osse strk: does it give more than one?08:28
damccull What's convention in git for keeping empty directories?08:29
→ ghostlines joined08:29
Vampire0 jast, I would not track ANYTHING that is produced by the build as it can easily be rebuilt from source :-)08:29
→ hkon_ joined08:29
→ matheus23 joined08:30
moritz damccull: adding a .keepme or .gitignore file to it08:30
Vampire0 damccull, put something inside. Git does not track empty directories. You can put an empty .gitignore inside e. g.08:30
→ LeMike joined08:30
damccull so .gitignore is the norm?08:30
just empty?08:30
Vampire0 The norm is to not version empty directories08:31
;-)08:31
damccull Well yeah...but the software I am converting to git doesn't check for a directory that exist that it needs ;)08:31
Vampire0 Yes, an empty file is good enough if you really need it08:31
→ bezet joined08:31
damccull I COULD do that but i don't want to alter it too much yet08:31
← Shusshu left08:31
→ EminenceHC joined08:33
→ W0rmDr1nk joined08:33
→ adkins1 joined08:34
damccull does git automatically ignore hidden files? .something for instance08:34
luto no08:35
← LeMike left08:35
← marthinal left08:35
→ sanjayu joined08:35
damccull oh, i see. it just doesn't list it in git status08:35
abak cbreak-work, I get the following : fatal: source directory is empty, source=T, destination=A/newname08:35
Vampire0 damccull, not every OS handles .file as hidden ;-)08:36
→ m8 joined08:36
Vampire0 damccull, does it not? it shoudl I think08:36
j416 it does.08:36
moritz damccull: my 'git status' shows dotfiles08:36
(untracked, not-ignored dotfiles, that is)08:36
cbreak-work abak: you have to use the correct names of course08:36
Vampire0 damccull, As long as you don't put something in .gitignore or .git/info/excludes, it will not be ignored and also shown in git status08:36
← Macaveli left08:37
← EminenceHC left08:38
abak cbreak-work: obv.08:38
ftr i end up with a folder T/ with my submodule in it08:38
damccull mine just showed "./" when I was in a directory with an untracked .keep_me08:38
→ mennea joined08:39
→ allay joined08:40
abak ok I got it to work, but I had to do the following :08:40
git mv A/ tmp && mkdir A/ && git mv tmp A/newname08:41
→ allay_ joined08:41
abak instead of : git mv A/ tmp/ && mkdir A/ && git mv tmp/ A/newname08:41
→ pantsman joined08:41
abak if anyone can explain me why that happened, it would be cool08:41
→ sarkis joined08:42
cbreak-work abak: you should have done git mv A ... not A/08:42
moritz damccull: well, it shows untracked directories without the files they contain08:42
damccull: which makes sense, because you might have 10k files in a build/ dir or so :-)08:43
cbreak-work abak: the / marks directories.08:43
for sources, git might not recognize it, since submodules are not directories08:43
abak cbreak-work, it did work with A/, just not with tmp/08:43
← endiruna left08:43
cbreak-work and for destinations, it might put it INTO that place08:43
instead of renaming it to that name08:43
moritz does tmp exist?08:43
cbreak-work obviously it must not exist08:43
abak well08:44
cbreak-work as I said ages ago...08:44
abak when i used the command that did not work it ended up existing08:44
cbreak-work no temp dir is needed08:44
→ Celm joined08:44
→ txomon|home joined08:45
→ dangerousdave joined08:46
← sarkis left08:46
→ Deseaus joined08:47
→ pantsman- joined08:48
→ welly joined08:49
← Celm left08:49
damccull moritz: ah thanks08:49
→ ferreum158 joined08:50
← pantsman left08:50
← Deseaus left08:51
→ Sound joined08:51
← m8 left08:52
→ jcvfen joined08:52
→ VictorBjelkholm joined08:52
→ car_tatnte_stw_ joined08:53
← jpierre03 left08:53
→ lite_ joined08:54
→ spacepluk joined08:54
← car_tatnte_stw_ left08:54
→ thevishy joined08:56
→ Xethron joined08:57
← Xethron left08:57
→ Xethron joined08:57
→ m8 joined08:57
→ h0bbit joined08:58
→ skyflash joined09:00
← thevishy left09:01
→ robarelli joined09:01
← bgerber left09:01
→ teran joined09:02
← pantsman- left09:02
→ mikecmpbll joined09:03
→ nabblet joined09:04
→ ferreum768 joined09:04
← ilmgb left09:05
← ferreum158 left09:05
← robarelli left09:05
→ Flowinho joined09:06
→ jpierre03 joined09:06
damccull resolving conflicts: "Mine" is the branch i'm on and "theirs" is the branch I'm merging in right?09:09
osse yes09:09
→ MblKiTA joined09:10
damccull thanks osse09:10
strk osse: only one really called "1.11"09:10
njsg what was the way to keep a branch up with master? git merge master on the branch?09:11
strk the others arelike "1.11.0" or "1.11.0beta1" ..09:11
osse strk: try git branch 1.11 <x> where <x> is the *full* name you see in git branch -a09:11
njsg: either that or rebase09:11
→ ferreum joined09:12
njsg what's the preferred one when having branches for specific features?09:12
osse njsg: depends on who you ask09:12
njsg IIRC rebase is more cleaner and preserves the meaning09:12
but I'm still used to the idea of "merge" from other VCSes, so I may be doing it wrong09:13
← ferreum768 left09:13
→ cvanball joined09:17
Vampire0 njsg, http://sprunge.us/LPfR09:18
→ lolmaus joined09:18
→ jftf joined09:21
→ pretty_function joined09:21
→ ayaz joined09:21
← Neon1024 left09:23
← dangerousdave left09:23
→ dangerou_ joined09:23
→ johnkevi_ joined09:23
njsg Vampire0: wow, thanks09:23
yeah, I think I should have used rebase all this time...09:24
Vampire0 :-)09:24
njsg rebase seems to be what you want if you are just maintaining something along with a "master" branch09:24
Vampire0 Well, I'd say rebase is what you want if you just have local branches and merge for pushed branches, otherwise you !rewrite public history09:25
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/waqum09:25
Vampire0 But it is mainly a matter of how you like your history to look09:25
← jftf left09:26
→ bgerber joined09:27
→ jovy88 joined09:29
→ Neon1024 joined09:30
jast !merge_vs_rebase09:30
gitinfo [!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html09:30
→ gittish joined09:31
→ moritzs joined09:31
← samsamm777 left09:32
→ woollyams joined09:33
→ CussBot joined09:34
ncd|leeN → leeN09:35
→ shruggar joined09:35
→ jatt joined09:36
→ Polymorphism joined09:36
← jatt left09:36
→ jatt joined09:36
→ JDHawke joined09:37
→ EminenceHC joined09:37
→ cornerman joined09:37
→ roymiloh joined09:37
→ Zoddo joined09:41
← EminenceHC left09:42
→ sarkis joined09:42
cornerman hi, i am having an issue checking out a git repository over https. git fails with "gnutls_handshake() failed: The TLS connection was non-properly terminated". i also tried to build git against libcurl-openssl, which also produced an error.09:43
i also tried curl directly to see what is happening and apparently the server does not answer my client hello.09:43
interestingly, it works with curl, when i use the "-3" option to force usage of sslv309:44
any ideas how to force sslv3 usage through git?09:44
→ hgl joined09:44
→ sall joined09:44
→ kikimeter joined09:47
← jatt left09:47
← sarkis left09:47
→ Reskp joined09:48
→ Deseaus joined09:48
← Reskp left09:49
→ kai___ joined09:49
→ Yoda joined09:50
Yoda → Guest3989609:50
→ beautifulmind joined09:50
← Guest39896 left09:50
→ intellix joined09:52
← Deseaus left09:53
→ kcj joined09:54
← moritzs left09:54
← JDHawke left09:56
→ JDHawke joined09:56
→ kevinb joined09:57
→ treehug88 joined10:01
← JDHawke left10:02
← cvanball left10:03
→ JDHawke joined10:03
← kikimeter left10:03
→ endiruna joined10:04
→ maveneag_ joined10:04
Seveas cornerman: a cursory reading of http.c syas it's not possible10:06
sslv3 is also not recommended, better fix your server to support newer TLS versions...10:07
cornerman Seveas: well, the interesting thing is, that this works on debian stable (git 1:1.7.10.4-1 und curl 7.26.0-1)10:08
→ BaBL joined10:09
cornerman currently i use debian testing with git 2.0.0.rc2 and curl 7.37.010:09
← woollyams left10:10
→ GodEater joined10:10
_ikke_ You can use the .curlrc file to instruct curl10:10
← GodEater left10:10
→ GodEater joined10:10
← allay_ left10:10
_ikke_ git uses libcurl to make http connections10:10
← allay left10:10
→ woollyams joined10:10
→ stamina joined10:11
→ frobrob_ joined10:11
← h0bbit left10:12
Kartagis can I find out on what date a specific tag has been created?10:12
moritz Kartagis: for annotated tags, yes10:12
jast if it's an annotated/signed tag, sure10:12
cornerman _ikke_: i just tried setting sslv3 in curlrc, eventhought curl would then use this option, but git still seems to ignore this setting10:12
jast git show <name>10:12
cornerman any ideas how to further check what is actually wrong?10:13
_ikke_ export GIT_TRACE=110:13
Kartagis what does signed tag mean?10:14
moritz an annotated tag with a PGP signature10:14
_ikke_ A tag object that contains a gpg signature10:14
cornerman _ikke_: well it fails when it runs the command: git-remote-https origin ... with the above mentioned error message10:15
→ Sander_ joined10:15
→ User458764 joined10:15
→ Mong0 joined10:17
→ GT4066 joined10:17
_ikke_ It is odd, because .curlrc should also be applied to connections git makes with curl10:18
→ [EddyF] joined10:18
← GodEater left10:18
→ GodEater joined10:18
← GodEater left10:18
→ GodEater joined10:18
← dobalina left10:19
→ SittingShiva joined10:20
← Polymorphism left10:20
→ Eyes joined10:20
→ FabTG joined10:20
→ jftf joined10:22
→ mixandgo joined10:23
← jftf left10:26
← johnkevi_ left10:27
← teran left10:28
cornerman _ikke_: i hoped so, too. but apparently i doesnt :/10:29
← gittish left10:30
→ teran_ joined10:30
← teran_ left10:30
→ teran_ joined10:31
→ rnsanchez_ joined10:32
→ SonikBoom joined10:33
→ cvanball joined10:33
→ sarkis joined10:35
→ alp82 joined10:37
← cvanball left10:38
→ Deseaus joined10:38
→ kriks joined10:39
→ foeniks joined10:39
← nabblet left10:39
→ moritzs joined10:40
← sarkis left10:40
→ _rnsanchez_ joined10:40
→ vyadhaka joined10:40
← treehug88 left10:40
← teran_ left10:40
→ teran joined10:40
← rnsanchez_ left10:41
← Deseaus left10:42
→ rnsanchez_ joined10:43
User458764 → User458764_NotHe10:43
dcpc007 hello10:44
i start git recently, and have 1.7.1 on my new computers. I see that 2.0 released. Is there many important change ?10:44
→ mellernoia joined10:44
← _rnsanchez_ left10:44
dcpc007 i start to learn (and learn to friend) with my config, don't want to loose too much time on obsolet version/methods10:45
→ bakflash joined10:45
← kai___ left10:46
viscera dcpc007: where are you seeing 2.0?10:46
User458764_NotHe → User45876410:46
BinGOs topic for one ^^10:46
viscera BinGOs: i just saw that, but on their site i see 1.9.3 as latest source release10:47
maybe it's UA detecting that i'm on windows and showing me the latest windows source release?10:47
dcpc007 http://www.phoronix.com/scan.php?page=news_item&px=MTcwMzc10:47
viscera or maybe the website maintainers are behind10:47
dcpc007 http://lkml.iu.edu/hypermail/linux/kernel/1405.3/02592.html10:48
← foeniks left10:48
BinGOs if you mean git-scm.com, yes it shows 1.9.3 as the latest for me too.10:48
viscera BinGOs: that's the official site, no?10:48
← dangerou_ left10:48
→ dangerousdave joined10:48
osse windows builds tend to lag with a couple of days/weeks10:48
dcpc007 yep just a delay for public official release10:48
BinGOs not "official" official I gather.10:49
→ foeniks joined10:49
osse in any case, git-scm.com should show 2.0.0, not 1.9.3 :P10:49
dcpc007 next week will if info is true10:49
https://kernel.googlesource.com/pub/scm/git/git here are the sources since 2 days10:50
viscera osse: still 1.9.3 here10:50
osse viscera: that was my point10:50
viscera right10:51
i see10:51
← Flowinho left10:51
→ fevon joined10:52
→ aspiers_ joined10:52
→ m0viefreak joined10:52
→ Macaveli joined10:52
← Macaveli left10:53
← foeniks left10:53
→ xobb joined10:54
→ deuti joined10:54
← Zoddo left10:54
→ maxorator joined10:54
→ ferreum158 joined10:55
→ gua_ould joined10:55
← ferreum left10:55
→ mikey85 joined10:57
mikey85 if anyone has a network let's collaborate. thank you :)10:58
← mikey85 left10:58
→ davividal joined11:00
← davividal left11:01
→ ilmgb joined11:01
← intellix left11:01
→ davividal joined11:01
→ joelm_ joined11:01
joelm_ → joelm11:02
→ robarelli joined11:02
→ JDHawke2 joined11:03
→ Sonderblade joined11:03
← JDHawke left11:04
→ Marina1 joined11:06
← robarelli left11:07
← hgl left11:10
← pretty_function left11:11
→ hgl joined11:13
→ Exio4 joined11:13
→ dkpi joined11:14
→ amigojapan joined11:16
← leeN left11:18
← fevon left11:19
→ foeniks joined11:19
→ bartman`` joined11:21
← woollyams left11:21
→ nnyk_ joined11:21
← jceb left11:21
→ woollyams joined11:23
← mellernoia left11:25
→ LeMike joined11:26
→ vtunka joined11:27
← Marina1 left11:28
→ Marina1 joined11:28
→ workerbeetwo joined11:30
← woollyams left11:30
→ Anders_J joined11:31
workerbeetwo Hi. Id like to force a group of developers to enter a password on push to a network's repository. How would you guys realize this?11:31
→ dobalina joined11:32
→ tgkokk joined11:32
← LeMike left11:33
→ lithiumjake joined11:33
moritz workerbeetwo: not at all11:33
→ jordonbi` joined11:33
← Mong0 left11:33
← Sander_ left11:33
moritz workerbeetwo: entering a password is client side, but you can't control the client11:33
workerbeetwo: so, rather do something sensible, like normal authentication over SSH11:34
→ Plouj- joined11:34
← amigojapan left11:34
→ cvanball joined11:34
→ amigojapan joined11:35
workerbeetwo I could establish some file access rights. currently only root has access making each developer enter the root password, which a bad idea either.11:36
→ sarkis joined11:36
moritz !gitolite exists11:36
gitinfo Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/11:36
→ Mong0 joined11:37
← amigojapan left11:37
← Mong0 left11:38
→ amigojapan joined11:38
→ PeterBooker joined11:39
← cvanball left11:39
← amigojapan left11:40
← sarkis left11:40
→ amigojapan joined11:41
← stamina left11:44
→ danecando joined11:44
Eyes → Eyess11:45
→ freimatz joined11:45
→ Celm joined11:46
User458764 → User458764_NotHe11:47
→ TCubed joined11:48
→ Deseaus joined11:48
→ SprkDev joined11:48
→ GrupoCITEC joined11:49
GrupoCITEC hi11:49
gitinfo GrupoCITEC: 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.11:49
← TCubed left11:49
SprkDev how do I switch to another branch?11:49
osse Is there a reliable way of checking whether a script was invoked from Git itself?11:49
SprkDev: git checkout branch11:49
← sanjayu left11:50
→ King_Hual joined11:50
_ikke_ osse: Instead of?11:50
← bakflash left11:50
_ikke_ invoked by a user11:50
osse yes11:50
→ CheckDavid joined11:50
← Celm left11:50
_ikke_ I guess checking parent processes11:51
SprkDev but won't that overwrite my local disk. I just want to switch without anychanges.11:51
GrupoCITEC I want to revert a previous commit, but I want that revert patch be applied to the working copy, without creating a new commit. Is that possible? how?11:51
_ikke_ SprkDev: what do you want to achieve?11:51
→ sanjayu joined11:51
→ TCubed joined11:52
← Deseaus left11:52
← User458764_NotHe left11:52
osse SprkDev: so you checkout branch2, but keep the files on disk like they are in branch1? In Git terms that doesn't make much sense11:52
GrupoCITEC revert then amend maybe?11:52
osse GrupoCITEC: revert --no-commit11:52
→ Kayra joined11:52
→ nabblet joined11:52
← TCubed left11:52
GrupoCITEC osse, thanks :D perfekt11:52
→ nepochal joined11:53
SprkDev I had switched it to master coz I needed to commit something. But I just want to switch back to my localdisk, and then commit local stuff to repo branch.11:53
osse !loat11:53
_ikke_ GrupoCITEC: That's why asking what you want to achieve much better than asking for an imagined sollution11:53
gitinfo [!float] If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.11:53
→ EminenceHC joined11:53
_ikke_ GrupoCITEC: Sorry, confused user11:54
GrupoCITEC _ikke_, np11:54
osse SprkDev: just switch back. if Git needs to overwrite some files in an unrecoverable way it will abort and let you know11:54
→ intellix joined11:55
osse _ikke_: I made a dummy script that does nothing but 'env'. the only difference was the --exec-path addition to PATH11:56
→ Zoddo joined11:56
← tgkokk left11:58
← amigojapan left11:58
← EminenceHC left11:58
→ amigojapan joined11:59
osse _ikke_: If I invoke the script directly versus invoking it via git difftool there are differences I can use11:59
(I really wanted to check whether difftool was used or not)12:00
← jordonbi` left12:00
→ jordonbi` joined12:00
← kevinb left12:00
→ ckyle joined12:00
← amigojapan left12:01
→ Dynetrekk joined12:01
← Dynetrekk left12:01
→ Dynetrekk joined12:01
← Dynetrekk left12:01
→ Dynetrekk joined12:02
Dynetrekk howdy, how can I get git to stop adding ^M in windows?12:02
→ amigojapan joined12:02
Dynetrekk in general, don't make any whitespace changes - I want to be able to consciously handle it myself12:02
→ lsiv568 joined12:02
→ hide joined12:02
→ kevinb joined12:03
→ robarelli joined12:03
← foeniks left12:03
← amigojapan left12:04
→ tgkokk joined12:04
← tgkokk left12:04
→ cannonball joined12:05
→ tgkokk joined12:05
m0viefreak Dynetrekk: you can set 'git config core.whitespace cr-at-eol'12:05
so the don't show up in diffs12:05
Dynetrekk maybe I should explain a bit more. I'm using cygwin on windows but git-bash since cygwin-git is old/windows-partly-incompatible.12:06
→ looper joined12:06
Dynetrekk so when I "git clone" my config files on a linux box, I get ^M errors, since git-bash puts ^M all over on clone12:06
(and pull, I guess)12:06
← Xethron left12:06
m0viefreak maybe git bash sets up core.autocrlf12:06
→ allay joined12:06
← lithiumjake left12:06
Dynetrekk m0viefreak: could well be12:06
→ allay_ joined12:07
Dynetrekk m0viefreak: ah... I have one .gitconfig in cygwin $HOME, one in git-bash $HOME. way to shoot mself in the foot12:07
→ Xethron joined12:08
← Xethron left12:08
→ Xethron joined12:08
← robarelli left12:08
m0viefreak git builds fine on cygwin by the way, so you can just build a recent copy yourself and you don't need to use git-bash12:08
Dynetrekk m0viefreak: ah... maybe I should do that. I'm changing computers soon, so I'd like to not do it right now though12:09
→ h0bbit joined12:10
← Kayra left12:11
← allay left12:11
← allay_ left12:12
→ JustMozzy joined12:13
← daito left12:13
→ jatt joined12:16
← jatt left12:16
→ jatt joined12:16
← ayaz left12:16
→ jnavila joined12:16
→ squentin joined12:18
← moritzs left12:18
→ sq-one joined12:19
→ bandroidx joined12:20
→ freestyl3r joined12:21
→ carandraug joined12:22
← sall left12:22
→ jluc joined12:24
→ jftf joined12:24
← jatt left12:25
← beautifulmind left12:27
→ thevishy joined12:27
→ woollyams joined12:28
← alp82 left12:29
← jftf left12:29
→ Deseaus joined12:29
← kevinb left12:30
← Dynetrekk left12:31
→ delight joined12:32
→ starkhalo joined12:32
→ cvanball joined12:35
→ g0bl1n joined12:35
→ kevinb joined12:36
→ cvanball_ joined12:36
→ sarkis joined12:37
← lsiv568 left12:37
→ dangerou_ joined12:37
→ lsiv568 joined12:37
← lite_ left12:39
→ RegEchse joined12:39
→ ilmgb_ joined12:39
← dangerousdave left12:40
← cvanball left12:40
→ Error404NotFound joined12:40
→ tmcmahon joined12:40
← sarkis left12:41
← ilmgb left12:42
← woollyams left12:42
← SprkDev left12:42
→ mribeirodantas joined12:42
→ jceb joined12:43
→ Kayra joined12:43
→ mizu_no_oto joined12:47
← bandroidx left12:47
→ gittish joined12:47
→ matteo joined12:48
→ bandroidx joined12:48
← GT4066 left12:48
→ GT4066 joined12:49
→ DarkStompy joined12:50
→ mmitchell joined12:51
← tmcmahon left12:51
← delight left12:52
→ geekbri joined12:53
→ yacks joined12:54
→ paulweb515 joined12:56
→ Noldorin joined12:57
→ acharlieh joined12:57
gitinfo set mode: +v12:58
→ Naab joined12:58
← nabblet left12:59
← jceb left13:01
← paulweb515 left13:02
→ qwyeth joined13:03
→ ciampix joined13:04
→ robarelli joined13:04
← hkon_ left13:04
→ ferreum768 joined13:05
← ferreum158 left13:05
← teran left13:05
→ teran joined13:05
→ moritzs joined13:06
→ teran_ joined13:06
→ mewm joined13:07
→ m0ltar joined13:07
→ ErKa joined13:08
← W0rmDr1nk left13:08
← robarelli left13:08
← Xethron left13:09
← teran left13:10
→ bitkiller joined13:10
→ Dougie187 joined13:10
→ a-l-e joined13:11
← JustMozzy left13:12
← sanjayu left13:13
RegEchse hello everyone. i just lost an hour or so trying to figure out what the heck is wrong with my git repo because i wanted to reproduce the "merge=ours via gitattributes" example at the end of http://git-scm.com/book/en/Customizing-Git-Git-Attributes . I finally came across this ( http://stackoverflow.com/q/5465122#comment6197298_5465122 ) comment "I looked through the git source and I can't see how merge=ours13:13
→ cornerma1 joined13:13
RegEchse ever worked." and now i'm asking: Can anyone point me to any reason at all why this (apparently not working) "solution" is still contained in the documentation on the official git hp!?13:13
← ilmgb_ left13:13
→ Kicer86 joined13:13
→ AaronMT joined13:14
→ Xethron joined13:15
← frobrob_ left13:15
← Xethron left13:15
→ Xethron joined13:15
→ paulweb515 joined13:16
→ zivester joined13:16
→ cjwilburn joined13:16
← cornerman left13:16
→ W0rmDr1nk joined13:17
→ salochinBD joined13:17
→ WormDrink joined13:17
← maveneag_ left13:17
← ghostlines left13:18
→ FunkyAss joined13:19
→ eletuchy_ joined13:22
→ FortySix2 joined13:22
→ Mitchbones joined13:22
→ maveneagle joined13:23
← FortySix2 left13:23
← maveneagle left13:23
→ JerryT joined13:23
→ ilmgb joined13:24
← Xethron left13:24
→ FortySix2 joined13:25
→ Xethron joined13:25
→ howitdo joined13:25
← howitdo left13:25
→ howitdo joined13:25
← JerryT left13:26
← eletuchy_ left13:26
← mizu_no_oto left13:26
← salochinBD left13:26
→ jceb joined13:26
→ JerryT joined13:26
← cjwilburn left13:27
→ dreiss joined13:27
→ whatitdo joined13:27
→ cjwilburn joined13:28
→ ehmatthes joined13:28
→ jcarouth joined13:29
→ cjwilbur_ joined13:30
← GrupoCITEC left13:30
← intellix left13:30
← kevinb left13:31
Dougie187 Here's a weird git-svn question.... Is there a way to do a subtree merge esq thing with something you bring in from git-svn?13:31
→ mjsmith2 joined13:31
Dougie187 basically, I have like 6 svn repos. And I want to try to combine them all into one repo (and directory).13:31
← howitdo left13:32
→ polyzen joined13:32
→ Fang0716 joined13:32
→ kevinb joined13:33
Dougie187 but I need to only combine subdirectories of each of the svn repos.13:33
→ beautifulmind joined13:33
← cjwilburn left13:33
← Sound left13:37
→ luc__ joined13:38
← acharlieh left13:39
← JDHawke2 left13:39
→ lite_ joined13:39
→ CKyle_ joined13:39
→ JDHawke joined13:42
→ esr joined13:42
→ position88 joined13:43
→ leochill joined13:43
← lite_ left13:44
esr Requesting help: I want tp pull a merge request from gitorious but leave it as an unmerged branch rather than immediately crearting a merge commit.13:44
→ ghostlines joined13:44
→ fatalhalt joined13:45
→ jftf joined13:45
HedgeMage esr: IDK, I haven't used gitorious much...but FYI #gitorious exists.13:45
esr HedgeMage: Thanks, I'll go there.13:46
HedgeMage :)13:46
← DarkStompy left13:46
HedgeMage esr: Stay out of trouble...or, failing that, stick to trouble I'll find entertaining. ;)13:46
→ allay joined13:48
→ allay_ joined13:48
esr HedgeMage: Er, when have you ever actually seen me to be in any trouble you *didn't* find entertaining?13:48
← tgkokk left13:48
→ Diemuzi joined13:48
gitinfo set mode: +v13:49
→ tgkokk joined13:49
← dreiss left13:50
HedgeMage fails to come up with a specific instance13:50
← beautifulmind left13:50
HedgeMage We're probably good, then ;)13:50
grawity hmm doesn't Gitorious export all pull requests as refs13:51
seems like it does, so you could fetch refs/merge-requests/113:51
← CheckDavid left13:52
→ DolphinDream joined13:53
grawity as in, `git fetch origin refs/merge-requests/1:merge-1`13:53
← tgkokk left13:53
→ Ankhers joined13:53
grawity often configures Github repos to always fetch refs/pull/*/head as branches13:54
→ Xethron_ joined13:54
← moritzs left13:55
→ gertptr joined13:58
→ intellix joined13:58
← vyadhaka left13:58
← Xethron left13:58
→ mattcen joined13:58
→ Novitsh_ joined13:59
→ nicoulaj joined13:59
→ IrishPrime joined14:01
→ harish joined14:02
← mjsmith2 left14:03
→ EminenceHC joined14:03
→ mjsmith2 joined14:04
← gertptr left14:05
→ robarelli joined14:05
← ilmgb left14:07
→ eliasr joined14:08
← EminenceHC left14:09
← robarelli left14:09
← FortySix2 left14:09
← zivester left14:11
← ckyle left14:11
→ mizu_no_oto joined14:12
← jluc left14:12
← ErKa left14:12
→ GrupoCITEC joined14:12
→ DanGreaves joined14:13
→ FortySix2 joined14:13
← Error404NotFound left14:14
→ kermit joined14:14
← mixandgo left14:15
→ V1TSK joined14:17
→ JDHawke2 joined14:18
← JDHawke left14:19
← squentin left14:19
→ likewhoa joined14:20
→ joki joined14:20
→ squentin_ joined14:20
squentin_ → squentin14:20
→ hkon_ joined14:21
→ lethjakman joined14:22
← GT4066 left14:22
← intellix left14:23
→ ascarter joined14:23
← gittish left14:23
→ milkohol joined14:23
→ noyb joined14:24
→ MarionDaly joined14:25
← hkon_ left14:26
→ _Vi joined14:26
← mennea left14:27
→ leeN joined14:27
← gua_ould left14:27
→ sd1074 joined14:27
← MarionDaly left14:27
→ JDHawke joined14:27
→ eletuchy joined14:27
← leeN left14:27
← JDHawke2 left14:27
→ nodentify joined14:28
→ MarionDaly joined14:28
→ gua_ould joined14:28
← teran_ left14:29
← milkohol left14:29
→ leeN joined14:29
← h0bbit left14:29
→ _pr0t0type_ joined14:29
→ mkjackson joined14:29
→ gathan joined14:30
mkjackson hey good people, I was wondering... if I force add a file into a repo will git start observing changes to it or do I have to continue forcing changes up?14:31
HedgeMage mkjackson: "force add" ??14:31
→ dsabanin joined14:31
Eugene Dougie187 - !import and then !beer14:32
gitinfo Dougie187: Importing lots of revisions from other VCSes(via git-svn in particular) can take a long time. If this will be a one-time switch you should consider "throwing out" all of your old history and making a simple initial commit from a tarball.14:32
Dougie187: Beer! It's what's for dinner!14:32
→ nkouevda joined14:32
HedgeMage hey, Eugene14:32
→ JoeAngel_ joined14:32
← kcj left14:32
Eugene hey, me14:32
→ Elek101 joined14:33
→ ilmgb joined14:33
osse mkjackson: once it's added then you can proceed as usual14:33
HedgeMage: add --force14:33
← phanimahesh left14:33
HedgeMage ahh14:33
→ mennea joined14:34
→ snql joined14:34
HedgeMage did not know such a thing existed, wonders what it's for...overcoming ignores?14:34
osse yup14:34
← FortySix2 left14:34
mkjackson i <3 git14:34
Eugene Yeah. ignore tmp/, then create & force-add tmp/.placeholder so it will be created on-checkout.14:35
mkjackson can't tell you how much I have to defend this beast to the incumbent SVN crowd at my new company14:35
← Mitchbones left14:35
Eugene Or have a policy of ignoring all .png .jpg .gif, then add in the one piece of graphic on your website that never changes, etc.14:35
→ JustMozzy joined14:36
→ abak joined14:36
→ fish_ joined14:37
fish_ hi14:37
gitinfo fish_: 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.14:37
← JerryT left14:38
→ acharlieh joined14:38
→ shaggy_ratte joined14:38
← ascarter left14:38
→ kishanio joined14:39
fish_ can I access the actual pushed changes in a pre-receive hook? I guess not?14:39
osse yes14:39
you can'14:39
fish_ osse: oh cool, so get executed in some tempoary working copy which all changes already included?14:40
osse fish_: no, there is no working copy at all14:41
if you want one you have to create it14:41
git archive does that job fairly well14:41
← abak left14:41
→ sarkis joined14:42
← squentin left14:42
← bandroidx left14:42
gitinfo set mode: +v14:42
gathan My company has gitweb that lists all its repos across all teams. How do I get such a list?14:42
fish_ osse: ah cool, thanks. will try that14:43
← Sonderblade left14:43
→ bandroidx joined14:43
→ mlimaloureiro joined14:44
mkjackson does a bare repo require a HEAD entry?14:44
→ squentin joined14:44
grawity I don't think so14:45
osse gathan: basically what gitweb does is scan (recursively I think) under a certain dir which you tell gitweb contains all of your repos. there's no magic other than that.14:45
grawity though it is used when cloning for that repo, to suggest the initially-checked-out branch14:45
→ treehug88 joined14:45
→ teran joined14:45
mkjackson grawity: good stuffs... thanks!14:46
gathan <osse>Thanks for that. I did go through the gitweb docs and they seem to tell the same thing. I don't think my company admins would provide that because this tool isn't really planned on a a large scale (But, I would want to). So how do I really go about it.14:46
osse gathan: now I'm not sure what you're asking anymore14:47
how do you scan under a dir for valid git-repos ?14:48
gathan Simply get the list of all repos.14:48
offby1 gathan: locate /.git | egrep '\.git$' | sort | uniq14:48
← teran left14:48
milki gitolite info or gitolite list-phys-repos14:48
!14:48
gathan That would require git on the system where I host this, right?14:49
→ tvw joined14:49
← Xethron_ left14:50
osse gathan: "get the list of all repos" you say. From where? Will you be able to run the command/script to generate the list in local shell?14:50
gathan I have access to a machine that has a working copy of about 25 repos.14:51
I am planning to develop a php tool that performs some custom ops on all the 25 repos.14:52
← jordonbi` left14:52
→ freestyler7 joined14:52
→ tranzfuse joined14:52
→ jordonbi` joined14:52
→ sertac joined14:52
→ otter768 joined14:52
← jordonbi` left14:52
← sertac left14:52
→ thedodd joined14:52
osse gathan: search recursively for directories ending in .git or files named HEAD. Wherever you find such things, run git rev-parse --verify HEAD14:52
thegorn gathan: another option is just to scrape gitweb if you don't have local access14:53
gathan Thanks for that.14:53
gitweb would also be fine. So ping that page and parse?14:54
osse oh you already have gitweb running? I thought you wanted an alternative14:54
thegorn yea, there's various libraries for python, perl, etc.. that simplify the scraping process, but to some extent you could practically just do it with curl grep and sed14:54
← freestyl3r left14:55
gathan Thanks. Wonderful people. I will continue from these leads. Thanks again.14:55
← luc__ left14:55
gathan osse: gitweb is running. I was initially trying out commands14:55
osse the project list on gitweb seems to be in a nice HTML table. So it should be relatively easy with some XML parsing stuff14:55
gathan Okay. Thanks. Will consider that as well.14:56
osse find the contents of the cell in each row of the table with id "foo" or something like that14:56
→ pweaver_ joined14:56
osse *first cell14:56
→ Polymorphism joined14:56
← shaggy_ratte left14:57
→ dreiss joined14:58
← VictorBjelkholm left14:58
← SittingShiva left14:59
← mlimaloureiro left15:00
→ aberrant joined15:00
← aberrant left15:01
→ aberrant joined15:02
← noyb left15:02
← Eyess left15:03
→ model joined15:04
→ Eyes joined15:04
← kishanio left15:04
← nodentify left15:05
→ stefy669 joined15:05
← stefy669 left15:05
→ robarelli joined15:06
→ dik_dak joined15:07
→ EminenceHC joined15:08
→ Xethron joined15:09
→ FortySix2 joined15:09
← robarelli left15:09
→ robarelli joined15:09
← gua_ould left15:10
← freimatz left15:10
→ jmpp_ joined15:10
← jmpp_ left15:10
→ jmpp_ joined15:10
← Zoddo left15:12
← EminenceHC left15:13
← treehug88 left15:13
→ manithree joined15:13
→ milkohol joined15:14
← FortySix2 left15:14
→ Zoddo joined15:14
→ beyondcreed joined15:15
← beyondcreed left15:15
→ beyondcreed joined15:15
← joelm left15:16
→ joelm joined15:16
→ FortySix2 joined15:17
→ nnyk joined15:18
← milkohol left15:18
← model left15:18
→ model joined15:19
← Kayra left15:19
→ ngladitz joined15:21
→ Gamecubic joined15:21
← nnyk_ left15:21
→ hyp3rkyd joined15:23
→ ErKa joined15:24
→ sinkensabe joined15:24
hyp3rkyd can someone help me with a foolish issue ?15:25
I can't manage to add a directory no matter what I've tried15:25
grawity is it empty?15:25
→ chipotle joined15:25
← gathan left15:25
hyp3rkyd it's a wordpress website and I am pushing it to bitbucket15:26
then I pull it to my VPS15:26
it's a test environment15:26
everything gets pushed except a theme folder15:26
→ zumba_addict joined15:26
lov 11:25:47 < grawity> is it empty?15:26
hyp3rkyd I checked for hidden files and saw a ".git" folder which I deleted but nothing changed. I tried with git add directory . and git add .15:27
nope15:27
it's full of files15:27
lov ... :(15:27
yeah, that .git folder had all of your metadata.15:27
hyp3rkyd I googled a lot and I found only about empty folders15:27
lov yeah.15:27
ok, so.15:27
hyp3rkyd it was a .git inside this folder15:27
lov was it a submodule or anything?15:27
grawity I think Git considers the directory a submodule in that case15:28
hyp3rkyd the tree is wordpress\wp-content\themes\theme15:28
grawity (being listed in .gitmodules isn't a requirement)15:28
lov shrugs15:28
hyp3rkyd my .git installation is in /wordpress15:28
lov goes back to work15:28
→ MattMaker joined15:28
hyp3rkyd I am not familiar with submodules... I 've never used them15:28
→ Spamoi joined15:28
grawity a Git repo inside a Git repo is a "submodule"15:29
hyp3rkyd the only thing that might help is that on the bitbucket I can see the folder with a double folder icon15:29
→ jj995_ joined15:29
hyp3rkyd and next to it is a "→ 1e505048b9d5 [1e505048b9d5]"15:29
→ TheCommieDuck joined15:29
→ tgkokk joined15:29
← ilmgb left15:29
grawity yes, it's saying "this entry is a link to another Git repository, at commit 1e505"15:29
→ thiago joined15:30
hyp3rkyd grawity: thanks, that makes sense15:30
grawity hmm, you could remove it from the repo (`git rm --cached wp-content/themes/foo`)15:30
hyp3rkyd but is there any chance to save it ?15:30
grawity and then add it again (because you said you already got rid of the .git directory inside)15:30
→ armyriad joined15:30
→ Plouj joined15:30
← Spamoi left15:30
grawity if you hadn't, `git add wp-content/themes/foo/` – with the trailing slash – would still work15:30
then, commit and push.15:30
check `git status` of course15:31
← MattMaker left15:31
hyp3rkyd grawity: thanks, I am trying right now15:31
→ D9 joined15:31
jj995_ is there a way to git squash my commits when I merge with master but somehow keep my detailed commit history (maybe in a branch that I don't push to origin)?15:31
hyp3rkyd I hope it won't alter the base directory15:31
← pweaver_ left15:31
TheCommieDuck Hey; one branch of a repo has uncommitted changes in some project files..and even with git checkout -- and git reset -- hard, they keep reappearing. (I'm using github for windows if that matters)..any idea? D:15:31
→ MattMaker joined15:31
→ mikeputnam joined15:32
← endiruna left15:32
← Plouj- left15:33
← DolphinDream left15:33
← model left15:33
→ irqq joined15:35
← workerbeetwo left15:36
Xethron Meh, giving a talk on git on Thursday, and now you go and release v2.0...15:37
lov sorry bro.15:38
hyp3rkyd grawity: that didn't work15:39
grawity: how can I pull all branches? git pull --all ?15:39
→ King_Hual` joined15:40
→ ascarter joined15:40
← Fang0716 left15:40
→ il_ joined15:41
← jovy88 left15:42
→ kcj joined15:42
→ drjeats joined15:43
→ jovy88 joined15:43
→ gandalfcome joined15:43
← King_Hual left15:43
TheCommieDuck Oh, I think it's a spacing issue. >.>15:43
← tgkokk left15:43
hyp3rkyd grawity: ok the push/pull worked this time but it still displays as a submodule in bitbucket and not as a folder15:43
→ alexlindenlevy joined15:44
→ ilmgb joined15:45
TheCommieDuck Oh, even if I directly replace it with the one from the repo, it still says uncommitted.15:45
← matteo left15:45
← xobb left15:46
→ model joined15:46
osse TheCommieDuck: "uncommited", not "modified"? What does a plain git status say?15:47
→ xobb joined15:47
→ mishunika joined15:47
→ tyrannosaurus_be joined15:47
TheCommieDuck osse: Changes not staged for commit15:48
oh, modified.15:48
osse TheCommieDuck: try 'git add <file>' and run git status again15:48
TheCommieDuck osse: modified in green.15:48
osse hooray15:48
oohh, you want to remove changes, not commit them. haha. my bad15:49
TheCommieDuck: git reset <file> should bring it back to red. git checkout -- <file> should remove it from the list entirely15:49
TheCommieDuck I've tried git reset --hard HEAD and git checkout --, but neither work15:49
osse ok, git diff then15:49
maybe it's a permissions thing15:50
→ vijay13 joined15:50
→ foucist joined15:50
TheCommieDuck it's the entire file, so I wonder if it's windows messing with line endings automatically or something.15:50
→ nnyk_ joined15:50
← Bigus left15:50
foucist is there any editor for editing a file against it's git diff ? perhaps line based? like sometimes in a git diff, i want to keep HALF of the changes and discard the other changes ?15:51
← ascarter left15:51
osse foucist: git checkout -p file15:51
_ikke_ foucist: git add -p15:51
foucist ah15:51
osse TheCommieDuck: that could be15:51
← ciampix left15:51
← drjeats left15:52
→ Royixc joined15:52
→ jackneill joined15:53
gitinfo set mode: +v15:53
→ jaspertheghost joined15:53
mikeputnam is it possible to gitignore log files, but not break my running applications which require the logfile to be present? by gitignoring them, whenever i switch branches, i have to recreate the directory and empty log files :(15:53
jaspertheghost !deploy15:53
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.html15:53
← CKyle_ left15:53
← cvanball_ left15:53
← nnyk left15:53
← Royixc left15:54
← ghostlines left15:54
TheCommieDuck osse: but it seems odd that it will do it automatically, even if I get the .zip from github and drag-drop the files.15:54
→ CKyle joined15:54
→ Royixc joined15:55
→ lsiv568_ joined15:55
osse agreed15:55
← vijay13 left15:55
← Royixc left15:55
mikeputnam ideally i could commit an empty log file as a placeholder, but from that point on ignore all future changes to that file. i'd always bring along my empty file when i switched branches.15:55
→ Royixc joined15:56
→ maestrojed joined15:56
← D9 left15:57
jaspertheghost in my deployment script prolly a good idea to change permissions of all my files before i copy them to there destination that way i dont mess up permissions of files i am exluding from my GIT source code but are in the web root?15:57
→ Junior joined15:57
→ vijay13 joined15:58
← FortySix2 left15:58
← vijay13 left15:58
← snql left15:58
← lsiv568 left15:58
→ Neozonz joined15:58
→ FortySix2 joined15:59
← lsiv568_ left15:59
← model left16:00
← FortySix2 left16:00
← cjwilbur_ left16:01
← JustMozzy left16:01
→ cjwilburn joined16:01
← sinkensabe left16:02
← jnavila left16:02
→ boombatower joined16:03
← mikecmpbll left16:03
→ Asandari joined16:04
← V1TSK left16:05
→ FortySix2 joined16:07
← Elek101 left16:07
→ kishanio joined16:08
← JDHawke left16:09
→ Ineentho joined16:09
→ JerryT joined16:10
→ hkon_ joined16:10
→ donmichelangelo joined16:10
→ JDHawke joined16:10
osse jaspertheghost: only you can answer that.16:10
if you need to change permissions to make things work and make things safe, then do so. Git itself doesn't really care16:11
→ alxgnon joined16:11
← mizu_no_oto left16:12
→ EminenceHC joined16:12
← hyp3rkyd left16:13
→ Ineentho_ joined16:13
← Ineentho_ left16:14
← Ineentho left16:14
→ Ineentho joined16:14
← hkon_ left16:15
→ hebz0rl joined16:15
→ kadoban joined16:15
← nnyk_ left16:16
jaspertheghost if i chown own a directory and its UID is diff between systems wil it mess up16:16
after rsyncing?16:16
← EminenceHC left16:17
osse jaspertheghost: no16:17
→ ojacobson joined16:17
→ imachuchu joined16:17
osse jaspertheghost: git only ever looks at the executable bit for the current user16:17
← thevishy left16:17
osse (or the owner of the file, not sure)16:17
jaspertheghost im not asking about git16:17
im asking about rsync16:17
→ n-st joined16:17
osse oh. no idea.16:17
← Novitsh_ left16:17
osse #rsync16:17
← dreiss left16:18
→ wald0 joined16:18
← foucist left16:18
→ doitjay joined16:20
→ sinkensabe joined16:20
→ lithiumjake joined16:20
→ rath joined16:21
→ akushner joined16:21
← sinkensabe left16:21
← thedodd left16:21
→ sinkensabe joined16:22
→ thedodd joined16:23
jaspertheghost anyways i can chown a while direcotiry and exlcude a few subdirectories16:23
← Ineentho left16:23
← welly left16:24
← sinkensabe left16:26
← W0rmDr1nk left16:26
← kishanio left16:27
→ EminenceHC joined16:27
← hgl left16:27
→ lyakh joined16:27
← tvw left16:28
lyakh has "git request-pull" stopped working only for me?? errors out with "warn: Are you sure you pushed 'HEAD' there?"16:28
→ pweaver_ joined16:28
lyakh 2.0.0 currently16:29
osse well, are you?16:29
lyakh osse: I am16:29
→ User458764 joined16:30
User458764 → User458764_NotHe16:30
User458764_NotHe → User45876416:30
User458764 → User458764_NotHe16:30
User458764_NotHe → User45876416:30
User458764 → User458764_NotHe16:30
lov ... >:(16:30
→ imachuch1 joined16:31
lyakh osse: it only works if I explicitly specify the commit ID of the last commit as "end," which should be optional16:32
← imachuchu left16:34
← carandraug left16:34
← Zoddo left16:35
← Neozonz left16:37
→ Neozonz joined16:37
← Neozonz left16:37
→ Neozonz joined16:37
→ maslowbeer joined16:37
lyakh cool. 1.9.3 works16:37
→ nnyk_ joined16:39
← roymiloh left16:39
← Polymorphism left16:39
← qwyeth left16:40
→ Polymorphism joined16:41
→ Spami joined16:42
→ revyd joined16:43
→ Asiajey joined16:43
→ edux joined16:43
→ BuSerD joined16:44
← boombatower left16:45
→ kishanio joined16:45
← CKyle left16:45
→ noyb joined16:45
← chipotle left16:45
← ilmgb left16:47
→ akim_ joined16:47
← BuSerD left16:48
→ qwyeth joined16:48
→ tonythomas joined16:49
← kishanio left16:50
→ treehug88 joined16:51
← maestrojed left16:51
→ teran joined16:51
→ jnavila joined16:51
→ maestrojed joined16:52
← tyrannosaurus_be left16:52
→ User458764 joined16:53
→ satiricon joined16:53
→ roymiloh joined16:53
→ thumpba joined16:53
→ tyrannosaurus_be joined16:54
← Xethron left16:54
← User458764_NotHe left16:55
← jceb left16:55
← teran left16:56
→ n-st_ joined16:57
→ mikecmpbll joined16:57
← MarionDaly left16:57
← thumpba left16:58
→ MarionDaly joined16:58
→ thumpba joined16:58
→ Sonderblade joined17:00
← kcj left17:00
← FortySix2 left17:00
→ lsiv568 joined17:00
← n-st left17:00
→ n-st__ joined17:01
← [EddyF] left17:01
← roymiloh left17:01
→ FortySix2 joined17:02
→ joaoh82 joined17:02
→ Relsak joined17:02
← alexlindenlevy left17:02
→ alexlindenlevy joined17:03
→ mishok13 joined17:03
→ drjeats joined17:04
→ maveneag_ joined17:04
→ Zoddo joined17:04
← maveneag_ left17:04
← lsiv568 left17:04
← n-st_ left17:04
→ mizu_no_oto joined17:05
→ doev joined17:06
→ dreiss joined17:06
← FortySix2 left17:06
← thiago left17:07
← alexlindenlevy left17:07
← paulweb515 left17:07
→ delight joined17:08
→ cllamas joined17:08
→ nobitanobi joined17:08
nobitanobi Hi guys, I have a symlink called devel in the root folder of my repo. How do I add it to the .gitignore?17:09
→ CKyle joined17:09
ohcibi nobitanobi: just putting "devil" into .gitignore doesnt work?17:10
osse nobitanobi: add a line with 'devel' on it to a file called .gitignore17:10
→ akim__ joined17:10
ohcibi lol17:10
nobitanobi but without the '/' in front?17:10
ohcibi i meant devel17:10
nobitanobi: this would only match it in the repositories root directory17:10
← akim__ left17:10
ohcibi without / it matches everywhere17:11
nobitanobi I want to avoid if there are other devel files or symlinks in other folders to be ignored. I just want the one in the root path17:11
→ Xethron joined17:11
ohcibi /devel17:11
nobitanobi ohcibi: ok thanks17:11
thanks osse17:11
← delight left17:11
osse !ignoretracked17:11
gitinfo [!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.17:11
osse nobitanobi: read the above17:11
ohcibi right17:11
does the bot also has information about filter-branch? 8-))17:12
← akim_ left17:13
← cllamas left17:13
← MarionDaly left17:14
← thumpba left17:15
← DanGreaves left17:16
→ thumpba joined17:16
← danecando left17:17
→ ilmgb joined17:17
→ reaverb joined17:18
→ LucasTT joined17:18
→ MarionDaly joined17:19
← Xethron left17:20
← kermit left17:21
→ Xethron joined17:21
← Xethron left17:21
→ Xethron joined17:21
← eliasr left17:21
← JoeAngel_ left17:22
← jftf left17:22
→ oodavid joined17:22
← gandalfcome left17:23
← cjwilburn left17:23
→ jhulten joined17:24
→ cjwilburn joined17:24
_ikke_ man filter-branch17:25
_ikke_ pokes bot17:25
→ the8thbit joined17:25
ojacobson man git-filter-branch17:25
gitinfo the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html17:25
← ilmgb left17:26
→ ilmgb joined17:26
User458764 → User458764_NotHe17:26
ohcibi i meant something like !filterbranch --> "if you want to change or remove something in all commits of a branch use git-filter-branch"17:26
→ Balliad joined17:27
→ shaggy_ratte joined17:28
_ikke_ No, there is no trigger17:28
→ m7w joined17:30
→ thevishy joined17:30
→ sinkensabe joined17:30
← Xethron left17:31
← User458764_NotHe left17:31
← thumpba left17:31
← allay left17:32
→ roymiloh joined17:32
← rath left17:32
ajf- I have many modified files that have "<<<<<<< Updated upstream", "=======", ">>>>>>> Stashed changes", etc. because I tried to do "git stash", "git pull", "git stash apply", and it had conflicts17:33
→ bambams_ joined17:33
← allay_ left17:33
ajf- I want to abort the whole thing, and just keep modified files as they were17:33
What can I do ?17:33
→ ColKurtz joined17:33
osse ajf-: git reset --hard17:33
_ikke_ What do you want to abort?17:33
ajf- the merge, I want the modified files to remain modified17:33
osse ooops17:34
ajf- without conflicts, just everything the way it was before doing what I did17:34
← doev left17:34
osse ajf-: before the pull?17:34
→ roymiloh_ joined17:34
ajf- yeah17:34
→ Sample joined17:34
osse ajf-: git reset --hard 'HEAD@{1}'17:35
then git stash pop17:35
→ doev joined17:35
← jcvfen left17:35
← CKyle left17:35
osse ajf-: run git show 'HEAD@{1}' to see that the commit is what you expect17:35
← shaggy_ratte left17:35
ajf- worked =) thanks17:36
→ thumpba joined17:36
← joaoh82 left17:36
→ batok joined17:36
← freestyler7 left17:36
→ CKyle joined17:37
→ Sijdesign joined17:37
← roymiloh left17:37
→ jcvfen joined17:38
→ lsiv568 joined17:38
→ paulweb515 joined17:38
← roymiloh_ left17:39
→ Apocalis_ joined17:39
← lsiv568 left17:39
← dangerou_ left17:39
→ lsiv568 joined17:40
→ dangerousdave joined17:40
→ kishanio joined17:41
→ lbigum joined17:41
← doev left17:42
← lbigum left17:43
→ happytux joined17:43
→ moritzs joined17:44
← noyb left17:44
← akushner left17:44
→ napcae_ joined17:44
← napcae_ left17:44
← thumpba left17:44
→ hahuang65 joined17:45
nobitanobi hey guys, if I want to exclude a folder and all its content from my root path, shall I add /folder or /folder/ ?17:45
→ kermit joined17:46
→ Sleepy63 joined17:46
→ thiago joined17:46
← sinkensabe left17:47
→ dangerou_ joined17:47
← ColKurtz left17:47
→ LeMike joined17:49
← treehug88 left17:49
jaspertheghost i have directories under the root of the web directory .. i exlcluded them from git and rsync copying so that when i goto deploy i can just do an rsync —delte and exclude directories that would otherwise be lost17:49
[1:48pm]17:49
→ Celm joined17:49
jaspertheghost problem is i need to set permissions on everything else thats not excluded cuase the excluded directories have special perms to begin with17:49
← dangerousdave left17:49
jaspertheghost im going to havw to rsync to a temp folder on the server17:49
then chmod/chown the files there and then rsync them into there finallocation can anyone thing of a more elegant solution?17:50
← kishanio left17:50
→ pbrobst joined17:50
→ arlev joined17:51
→ twittard joined17:52
← thevishy left17:52
← Celm left17:53
→ treehug88 joined17:53
← mikeputnam left17:53
→ cjwilbur_ joined17:54
← MattMaker left17:54
← Sijdesign left17:54
→ madewokherd joined17:55
→ Sijdesign joined17:55
← cjwilburn left17:55
→ MattMaker joined17:56
← sq-one left17:56
→ lbigum joined17:56
→ akushner joined17:56
← g0bl1n left17:56
→ User458764 joined17:57
← lbigum left17:57
→ Auv joined17:57
gitinfo set mode: +v17:57
← mennea left17:58
→ hkon_ joined17:58
← the8thbit left17:59
→ chipotle joined17:59
→ noecc joined17:59
→ [gmi] joined17:59
→ joaoh82 joined18:00
← Naab left18:01
→ segfalt joined18:01
← dangerou_ left18:02
→ richwestcoast joined18:02
→ dangerousdave joined18:02
→ nodiscc1 joined18:02
segfalt If I have a local repo, and another user has a local repo, both were cloned off a "canonical" repo. The other user has a branch made in the past, with it's own commit history. How can I get an exact replica of that branch in my local repo?18:02
← hkon_ left18:02
← Sijdesign left18:03
thegorn segfalt: one approach, add his repository as a remote18:03
→ noyb joined18:04
thegorn git remote add otheruser /path/to/his/repo/.git18:04
git fetch otheruser18:04
← zumba_addict left18:04
thegorn and then you'll see them as remote branches (git branch -a, etc.)18:04
segfalt thegorn: And then I can branch off that to work on it?18:05
Or?18:05
causasui segfalt: branch your own tree and merge his changes into your branch. make changes, commit them, and send pull request18:06
from the branch18:06
→ thevishy joined18:06
→ FortySix2 joined18:06
← Zoddo left18:06
segfalt causasui: His branch is not up to date, that's the issue. I want to work from his history and resolve the merge conflicts with master.18:06
My master branch is "in the future"18:07
I want to work from his old branch, merge master, and resolve those conflicts.18:07
→ Neozonz|Disc joined18:07
← bezet left18:08
← dangerousdave left18:08
← JDHawke left18:08
→ Neozonz|Disc2 joined18:09
→ FutureTense joined18:09
→ dangerousdave joined18:09
← dangerousdave left18:09
← dreiss left18:09
→ dangerousdave joined18:10
→ dfinly joined18:10
← Neozonz left18:11
→ lbigum joined18:11
← Neozonz|Disc left18:12
← Ankhers left18:13
← FortySix2 left18:13
← Junior left18:14
→ endiruna joined18:14
← lbigum left18:16
→ Ankhers joined18:16
reaverb On git apply (Well git am --reject) is there a way to view which hunks have failed?18:16
→ PyBorg joined18:16
← PyBorg left18:16
← ehmatthes left18:16
→ slacko79321 joined18:17
→ Kayra joined18:17
→ BuSerD joined18:17
→ PyBorg joined18:18
← _pr0t0type_ left18:18
← PyBorg left18:18
← moritzs left18:18
→ Learning2 joined18:18
← jnavila left18:18
← arlev left18:19
← alxgnon left18:20
→ cagedwisdom joined18:20
→ alxgnon joined18:21
→ Xethron joined18:21
← amcsi_work left18:21
← joaoh82 left18:21
→ dreiss joined18:22
→ FortySix_ joined18:23
← kermit left18:23
endiruna suppose that I do some work. I would like to compress the changes from some commit to the present and push those as a single commit, not the whole history. how do i do that?18:24
cool 1111 users are present now18:25
→ tvw joined18:25
→ alvaro_o joined18:26
← akushner left18:26
→ Flowinho joined18:27
→ mennea joined18:28
→ InsanelyADHD joined18:28
→ mozzarella joined18:28
mozzarella shit guys18:28
I fucked up18:28
I staged a folder I shouldn't have staged18:29
← Flowinho left18:29
mozzarella how do I fix tihs18:29
mugwump git reset folder18:29
ryanneufeld git reset folder18:29
mugwump jinx18:29
mozzarella thanks man, I tried git checkout folder18:29
← mennea left18:29
← vtunka left18:29
mugwump good thing you just staged it then, otherwise that command would have overwritten it18:30
→ rotta joined18:30
← tvw left18:30
ryanneufeld yeah18:30
→ kermit joined18:30
mozzarella mugwump: overwritten?18:30
ryanneufeld then you would have really fucked up18:30
mozzarella what do you mean18:30
ryanneufeld are you familiar with svn?18:30
mozzarella from the last commit?18:31
mugwump try 'git gui' for staging commits. It's good, I use it all the time18:31
mozzarella no I'm not18:31
ryanneufeld checkout is like svn revert18:31
mozzarella so it reverts from the latest commit?18:31
ryanneufeld you can do git checkout master -- filename18:31
and it will replace whatever filename18:31
mugwump You don't lose CLI creds for using a Tk UI18:31
ryanneufeld with the latest from the master branch18:31
if you just did git checkout filename18:31
→ JDHawke joined18:32
ryanneufeld it assumes you want the latest commited version from the current branch18:32
← Auv left18:32
→ weevieL joined18:32
→ mennea joined18:32
mozzarella I see18:33
mugwump not last committed, last staged (unless you specify a revision to 'checkout')18:33
mozzarella WHY does checkout revert changes and also switch to whatever branch I want, or those two actions related?18:34
← User458764 left18:34
mozzarella are those*18:34
ryanneufeld mugwump: unless you haven't staged anything18:34
mozzarella sorry18:34
ryanneufeld you're checking out the file/branch18:34
_ikke_ mozzarella: yes, they are related18:34
ryanneufeld if you specify a branch, you're telling git to checkout all the files from that branch18:35
→ roymiloh joined18:35
ryanneufeld it's a bit more complex than that, but the general idea is the same18:35
jaspertheghost !deploy18:35
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.html18:35
ryanneufeld jaspertheghost: relevance?18:36
← starkhalo left18:36
lov mozzarella: !koan18:36
gitinfo mozzarella: [!koans] Looking for some enlightenment? Five koans about Master Git: http://stevelosh.com/blog/2013/04/git-koans/18:36
jaspertheghost needed to look at the rsync script thats there18:36
lov you're not the only one who finds it confusing.18:36
← Eyes left18:36
jaspertheghost having a lil troubel deciding on how my deployment shouild work18:36
→ SuinDraw joined18:36
→ godgodgodgo joined18:37
SuinDraw → Eyes18:37
← Ankhers left18:37
jaspertheghost god damn rule 4 and 218:39
i need both18:39
← roymiloh left18:39
→ Ankhers joined18:39
→ uku joined18:40
← Polymorphism left18:40
→ NotANick_ joined18:40
→ drbean joined18:40
ryanneufeld jaspertheghost: what is it you're trying to do?18:41
← MattMaker left18:41
← mewm left18:41
← MarionDaly left18:41
jaspertheghost well currently i have a post-recieve hook that just copies staging to staging_website.com and i rsync that over to staging/live whatever18:41
→ MarionDaly joined18:42
jaspertheghost rsync has exclude for the folders i dont wanna rsync18:42
← drbean left18:43
jaspertheghost i do a chmod on the directtory before doing the rsync18:43
→ infoshark joined18:43
jaspertheghost so the perms are ok i believe18:43
uku is it possible to get a list the remote directory tree in git without cloning?18:43
→ Polymorphism joined18:43
jaspertheghost everything seems to work ok just feels weird and the chmod takes a min....18:44
i should prolly 644 the files though in my web direcoriy no?18:45
ryanneufeld that really depends on your web server config18:45
jaspertheghost my current server perms are all fucked up lol18:45
there was lots of people before me that didnt know what the fuck they were doing18:45
and i kinda half do18:45
NotANick_ → NotANick18:46
ryanneufeld well, at a minimum you need read perms to the files by whatever process is executing them18:46
jaspertheghost so 644 will cover that18:46
mugwump uku: not really, no18:46
ryanneufeld and write perms on any dir where temp files or uploads are gonna be stored18:46
jaspertheghost yea18:46
→ OffTheRails joined18:46
ryanneufeld jaspertheghost: as long as you don't apply that on directories18:46
jaspertheghost on directories18:47
→ Neozonz joined18:47
← Neozonz left18:47
→ Neozonz joined18:47
jaspertheghost i have 775 currenly18:47
whats something a lil bit stricter i can use?18:47
ryanneufeld if you want them to match 64418:47
you can use 75518:47
→ Annak joined18:47
ryanneufeld basically you need the execute bit set18:47
→ MattMaker joined18:47
→ jason237 joined18:47
gitinfo set mode: +v18:47
uku mugwump: why not?18:47
jaspertheghost thats what the 5 does right?18:47
4read +1 exewcute?18:48
ryanneufeld yes18:48
mozzarella 10118:48
mugwump uku: because the protocol only lets you fetch slices of object graph18:48
you can configure an HTTP repository to have a checkout, though18:49
← Neozonz|Disc2 left18:50
← Diemuzi left18:50
→ tgkokk joined18:51
← nkouevda left18:51
mugwump there are indirect ways of doing it via the protocol, but git's not designed as a fileserver with fileserver operations like that18:51
→ nkouevda joined18:52
← deuti left18:52
Annak → Diemuzi18:53
jaspertheghost thanks ryan18:54
i fell better now :)18:54
uku mugwump: I was thinking of indirect ways, basically I need to check for the presence of a file on repo, but I do not want to clone it just because of that18:55
jaspertheghost feel*18:55
← ErKa left18:55
← FutureTense left18:56
mugwump uku: if the repository has the option enabled, you can use git archive --remote18:56
jaspertheghost how about backups on the webroot for rollback purposes would prolly be good to keep a warm directory that way it wont take to long to do an rsync diff of the warm directory for backup?18:56
and only have 1 rollback18:56
→ the8thbit joined18:56
→ drbean_ joined18:57
← drbean_ left18:57
ryanneufeld jaspertheghost: if you're already using git18:57
jaspertheghost: use tags18:57
that's how we did it18:57
→ drbean_ joined18:57
ryanneufeld we had the repo checked out on every machine it was needed18:57
and through some scripting, we had it effectively do a git fetch, git fetch --tags18:57
git revparse tag18:58
uku mugwump, would archive just print the repo to stdout (tried it today)? I will look more into it...18:58
ryanneufeld git checkout sha-from-revpars18:58
uku wouldn't18:58
← a-l-e left18:58
jaspertheghost thats overmyhead18:58
← drbean_ left18:59
← revyd left18:59
ryanneufeld jaspertheghost: what do yo mean by overhead?19:00
jaspertheghost im not anywhere near good enough in git to even know what those commands do (i can barely get what i have going so bar)19:00
→ drbean joined19:00
→ revyd joined19:01
ryanneufeld okay19:01
keep it simple then19:01
when you have a release ready19:01
git tag v1.019:01
git push && git push --tags19:01
on your local19:01
then on the server19:01
git fetch && git fetch tags19:01
← lyakh left19:01
ryanneufeld git checkout v1.019:01
same thing when v1.1 comes19:01
(v1.0 is arbitrary, you can name it whatever makes sense for you)19:02
if 1.1 is bunk19:02
git checkout v1.019:02
← _Vi left19:02
ryanneufeld rather19:02
git checkout --force v1.019:02
jaspertheghost ahhh19:02
→ yepyep joined19:02
ryanneufeld and you're rolled back19:02
no managing of old versions19:02
→ AndreasLutro joined19:02
ryanneufeld one command19:02
depending on the complexity of your changes19:03
← drbean left19:03
ryanneufeld you might need to do a git reset --hard after changing tags19:03
→ treehug8_ joined19:03
yepyep can i go back to the last commit's changes but save my working tree contents without needing git stash?19:03
ryanneufeld yepyep: yep19:03
yepyep i think you can do that with detached head?19:04
jaspertheghost what does git reset —hard do exactly i have seen it a few times19:04
yepyep i don't recall how, please refresh my memory19:04
jaspertheghost remove history?19:04
ryanneufeld git checkout --soft HEAD~119:04
yepyep: ^^ i think19:04
jaspertheghost: it doesn't remove history19:04
jaspertheghost: it removes any local changes to any files managed by git19:04
but doesn't remove un-tracked files19:05
→ drbean_ joined19:05
← treehug88 left19:05
jaspertheghost so if u botched your local changes to a branch and wanna revert back the remote’s version of the files?19:05
← mizu_no_oto left19:05
ryanneufeld you're 1/2 right19:05
it would revert to the last commit on the current branch you're on19:06
so if your branch is behind origin19:06
you'll only get the last commit you have19:06
now, you can do this: git fetch && git reset --hard origin/master19:07
for example19:07
← lsiv568 left19:07
ryanneufeld which will throw away all your local changes to tracked files19:07
← Ankhers left19:07
ryanneufeld and reset your local master branch to match origin19:07
which saves a merge19:07
it depends on what you're trying to accomplish19:07
jaspertheghost hopefulyl iwill remember all this19:08
i been learnting a real lot lately about everything its been aweesome19:08
ryanneufeld http://help.github.com/import-from-subversion/19:08
http://help.github.com/git-cheat-sheets/19:08
http://gitready.com/19:08
http://andy.delcambre.com/2008/03/04/git-svn-workflow.html19:08
← Polymorphism left19:08
ryanneufeld http://git-scm.com/book/en/Git-Tools-Submodules19:08
http://ndpsoftware.com/git-cheatsheet.html19:08
Those are all the links I used to read19:08
→ Ankhers joined19:08
ryanneufeld still check one or the other when I'm stumped19:08
jaspertheghost and keeping a good portion of it… now say i wanted to rollback to a specfic commit or rollback 2 back19:08
thats what HEAD~2 would do right?19:08
ryanneufeld yes19:08
you can also git checkout 145dedf19:09
jaspertheghost how can i specifiy a sha to rollback to?19:09
ahh ok19:09
ryanneufeld assuming 145dedf is the sha19:09
→ sq-one joined19:09
ryanneufeld that's what's called a detached head state19:09
→ adac joined19:09
jaspertheghost and then i can rename the branch to master and push19:09
→ cllamas joined19:09
ryanneufeld oooh19:09
no19:09
→ Annak joined19:09
gitinfo set mode: +v19:09
ryanneufeld I wouldn't solve that problem in that way19:09
jaspertheghost how would you rollback to specific versionthen?19:10
ryanneufeld you can do git revert commit sha19:10
jaspertheghost version as in SHAhash19:10
← Annak left19:10
ryanneufeld that's what tags are good for19:10
a tag is just a human readable name for a sha19:10
← leeN left19:10
ryanneufeld but it's in detached head when you check it out19:10
it's not like a branch19:10
→ RyPeck joined19:11
ryanneufeld what you're suggesting is changing the history of the branch, rewriting, a force push19:11
→ zzing joined19:11
ryanneufeld for arguments sake19:11
lets say you have a branch called orange19:11
jaspertheghost yep19:11
ryanneufeld the orange branch has 6 commits19:11
← Diemuzi left19:11
ryanneufeld to make it easy we'll say the shas are 1,2,3, 4, 5, 619:12
where 1 is the first and 6 the last19:12
now you realize that commit 6 is bad19:12
and it's in production19:12
← position88 left19:12
ryanneufeld so you have to fix it19:12
jaspertheghost i can def see that happening19:13
ryanneufeld and you know that commit 4 was stable19:13
→ Annak joined19:13
gitinfo set mode: +v19:13
→ Polymorphism joined19:13
ryanneufeld now, the question is: Do you want to delete commits 5 and 6? or just switch to commit 4 while you add commit 7 to fix the problem?19:14
or would deleting commit 6 solve the problem19:14
← cllamas left19:14
Annak → Diemuzi19:14
← noyb left19:14
← armyriad left19:14
ryanneufeld jaspertheghost: this is a choose your own adventure, which path do you take?19:14
jaspertheghost hmm19:14
→ armyriad joined19:14
ryanneufeld there isn't a wrong answer, and it all depends on what you need to do19:15
jaspertheghost delete 5 and 619:15
ryanneufeld okay19:15
do you have any automated pulls from this repo?19:15
→ eliasr joined19:15
jaspertheghost no19:15
seems scary to do so19:15
→ jftf joined19:16
ryanneufeld okay19:16
safest method19:16
which gets' harder as you have more commits19:16
git revert 6 -m "reverting commit due to production error"19:16
git revert 5 -m "reverting commit due to production error"19:17
git push19:17
so that will add commits 7 and 819:17
and you'll see those in your git log as reverted commits19:17
then when you pull on stage, it should go smoothly19:18
← AndreasLutro left19:18
ryanneufeld do you want to hide that you fucked up 5 and 6?19:18
on your local19:18
git checkout orange19:18
git reset --hard 419:18
git push -f19:18
← pbrobst left19:18
→ leeN joined19:18
ryanneufeld or you could do an interactive rebase19:18
jaspertheghost that was my next question when to use a rebase19:19
ryanneufeld many many ways to skin this cat as you can see19:19
that all depends on who you ask19:19
IMHO as seldom as is needed19:19
rebase rewrites your history19:19
I use pull --rebase19:19
→ _pr0t0type_ joined19:19
ryanneufeld a lot on one repo19:19
causasui I have a long hash of a commit. How can I show the diff? git show doesn't recognize it. the string is 'e28ee9e9770007337fe7864a6102e487b4f8231f'19:19
→ AndreasLutro joined19:19
← ArSn left19:19
ryanneufeld git diff sha19:20
causasui ryanneufeld: ambiguous argument 'sha'19:20
→ atomx joined19:20
→ NimeshNeema joined19:20
ryanneufeld facepalms19:20
jaspertheghost sha is the actuall sha19:20
git sha e28ee9e9770007337fe7864a6102e487b4f8231f19:21
← fatalhalt left19:21
ryanneufeld causasui: git whatchanged -p --abbrev-commit --pretty=medium e28ee9e9770007337fe7864a6102e487b4f8231f19:21
you could try that too19:21
← Xethron left19:21
→ oojacoboo joined19:21
ryanneufeld alias gwc="git whatchanged -p --abbrev-commit --pretty=medium"19:21
gwc e28ee9e9770007337fe7864a6102e487b4f8231f19:21
jaspertheghost ryan did you write git or something cause damn … u know everything19:21
ryanneufeld no19:22
← cjwilbur_ left19:22
ryanneufeld I spent a year of fucking up every git repo I touched19:22
← endiruna left19:22
ryanneufeld so I learned a lot along the way19:22
jaspertheghost lol19:22
→ cjwilburn joined19:22
jaspertheghost thats going to be me this year :)19:22
ryanneufeld also I had some help from some people that make me look like a noob19:22
do you know about git reflog?19:23
jaspertheghost no19:23
ryanneufeld so, git keeps a history of every command you run19:23
git reflog19:23
shows that19:23
so, say you fucked up19:23
and deleted a branch19:23
you can use reflog to get it back19:23
sometimes19:23
it autocleans itself after a while19:24
← Marina1 left19:24
ryanneufeld and it's not always a saving grace, but it's been my hail mary pass a few times19:24
create a repo and mess around withit19:24
jaspertheghost btw i still dont think i understnad how the revert commands works exactly…when u revert and push like u did above it adds 2 commits with the changes removed?19:24
← jcvfen left19:24
ryanneufeld yes19:24
← cjwilburn left19:24
ryanneufeld so, when you revert19:24
→ cjwilburn joined19:25
ryanneufeld git logs that as commit19:25
but with the inverse patch19:25
jaspertheghost is there room for a conflict in there?19:25
ryanneufeld there is always room19:25
→ jcvfen joined19:25
ryanneufeld but if it's the most recent commit19:25
it should be fine19:25
← jcvfen left19:25
ryanneufeld as long as you start at the most recent19:26
using the command i gave causasui you could inspect a commit and see how isolated the change was19:26
jaspertheghost so rollback in order19:26
ryanneufeld revert in order19:26
→ jcvfen joined19:26
ryanneufeld (I'm a stickler for semantics)19:26
← geekbri left19:26
ryanneufeld if you wanna play with that stuff19:27
SamB hmm, how do I diff a tarball with a git treeish?19:27
ryanneufeld you'd have to extract the tarball SamB19:27
unless the tarball is in the repo19:27
← dangerousdave left19:27
SamB I realize I would have to extract it, yes19:27
ryanneufeld in which case, you could checkout the version you want to compare to19:27
jaspertheghost btw ryan how do u do your deployments … run a web rsync command or do it by terminal ?19:27
→ knownasilya joined19:27
→ dangerousdave joined19:28
← whatitdo left19:28
← dangerousdave left19:28
jaspertheghost im thinking of just keeping mine as a .sh script in the main repo server19:28
ryanneufeld jaspertheghost: we use a combination of a python script and cf-engine19:28
SamB or, at least, that I'd need to uncompress it19:28
ryanneufeld SamB: you can't do it with git19:28
→ dangerousdave joined19:28
ryanneufeld not entirely19:28
jaspertheghost: that's one way to do it yeah19:28
jaspertheghost: we essentially have teh repo cloned on each server19:29
and when we push a new version19:29
it updates a config file19:29
jaspertheghost how do u tell allthe servers hey its time to update?19:29
ryanneufeld and another script checks that config19:29
that's what cf-engine is for19:29
jaspertheghost ahh19:29
ryanneufeld you can do a cron job19:30
or manual19:30
which we do as well19:30
jaspertheghost ill check it out over the weekend19:30
ryanneufeld cf-engine just ensures that the system state is what we want19:30
jaspertheghost damn i wish i had u on gtalk or something u seem to know alot of stuff i could prolly learn a ton!19:30
ryanneufeld if you're just getting started with configuration management19:30
I'd recommend puppet19:30
jaspertheghost puppet looked tedious19:30
ryanneufeld over cf-engine19:30
it can be19:30
but any config managment system is19:31
RyPeck jaspertheghost: you developer or sysadmin right now?19:31
jaspertheghost both19:31
ryanneufeld ditto19:31
RyPeck what were you before you became both?19:31
ryanneufeld jaspertheghost: I'm always lurking on irc, this is a good place to find me19:31
jaspertheghost always been both19:31
ryanneufeld jaspertheghost: I'm also in #jquery #cf-engine #puppet to name a few19:31
jaspertheghost awesome… im doing an android app with some jquery so i been in jqeury alot19:32
and i def could use some puppet help19:32
→ lbigum joined19:32
→ adkins2 joined19:32
← Eyes left19:33
ryanneufeld I may not always have the answer19:33
→ Eyes joined19:33
ryanneufeld the puppet channel is pretty good19:33
jaspertheghost thats what hours of google is for lol19:33
← lbigum left19:33
ryanneufeld that's pretty much what I do19:33
jaspertheghost i try to learn on my own but talking ot people there is something about it19:33
→ jnavila joined19:33
jaspertheghost i learn and it stays19:33
alot quicker to learn too19:33
ryanneufeld if I had to say what my job was honestly19:33
← dangerousdave left19:34
ryanneufeld it would be asking questions, googling, pulling out my hair, googling, and solving problems19:34
in that order19:34
lol19:34
→ dangerousdave joined19:34
jaspertheghost in about 6 months im going to be looking to move to southern cali or colorado and look for a new DEV job19:34
sounds like u and me have alot in common :)19:34
→ howitdo joined19:34
ryanneufeld it does sound that way19:35
→ dmj` joined19:35
→ roymiloh joined19:35
jaspertheghost developing this android app has been teching me a ot19:36
i switched over to phpstorm and and android studio (which is the same thing basically)19:36
← treehug8_ left19:37
jaspertheghost been loving it … learning alot of CSS/JS and android/java19:37
i do PHP fulltime19:37
finally decided that i needed to learn Git to keep track of everhything19:37
← GrupoCITEC left19:37
← EminenceHC left19:38
Mixologic jaspertheghost: where do you live now?19:38
jaspertheghost South Florida19:38
how about you?19:38
Lanta git commits the world around19:38
← revyd left19:38
→ fenerlitk joined19:38
jaspertheghost lol19:38
← dmj` left19:39
← thedodd left19:39
Mixologic pdx. Just curious. I have a friend who does full time PHP, is just learning git, and is named Jasper thought it might have been worlds colliding.19:39
← roymiloh left19:40
jaspertheghost lol19:40
→ maqr joined19:40
← dreiss left19:41
→ treehug88 joined19:42
jftf My name is Jasper and I'm doing PHP and git19:42
holy smokes19:42
Sam??19:42
hehe jk19:42
jaspertheghost name my anmes matt19:42
→ Segfault_ joined19:42
jaspertheghost wow ok that didnt make snese19:43
My names matt *19:43
jftf i was just being silly don't mind me19:43
jaspertheghost ;p19:43
→ Zoddo joined19:45
ryanneufeld jaspertheghost: i'm in vancouver, I've done a lot of php, i'm in ops now, but I get to do python programming which is nice19:45
we have an office in FLL19:45
jaspertheghost u guys hiriing? lol19:46
← FortySix_ left19:46
ryanneufeld I dunno19:46
jaspertheghost i been wanting to learn python just havent had any projects that warrant it19:46
→ talk2manoj joined19:46
ryanneufeld you can check http://www.cbsinteractive.com/careers/19:46
→ buck1 joined19:47
jaspertheghost Sr Software Engineer new york19:47
seems like every these days i hiiring developers19:47
ryanneufeld yeah, you gotta be pretty good to be called senior19:47
buck1 any idea when this will say 2.0? http://git-scm.com/downloads19:47
ryanneufeld I went from being the lead on metrolyrics.com to being an intermediate on this team19:47
→ Neozonz|Disc joined19:47
← Neozonz|Disc left19:47
→ Neozonz|Disc joined19:47
← jovy88 left19:47
→ SHyx0rmZ joined19:48
jaspertheghost can’t wait till january comes around ill be ready to start looking for better opportunities19:48
i would love to work in a place where people are really msarter than me19:48
and ill learn19:48
i havent had that in such a long time19:48
its been years19:48
→ jovy88 joined19:48
← Polymorphism left19:48
ryanneufeld I know that feeling19:49
it was a tough adjustment for me19:49
buck1 /join #moaning19:49
ryanneufeld coming from the guy who is moaning about git 2.0 not being downloadable? That's rich19:49
jaspertheghost lol19:49
how do u install git 2.019:50
via git?19:50
→ FortySix2 joined19:50
buck1 configure && make && make install19:50
ryanneufeld homebrew for osx has 2.019:50
I'm installing it now19:50
jaspertheghost Latest source Release19:50
1.9.319:50
→ Polymorphism joined19:51
← Asiajey left19:51
jaspertheghost git clone https://github.com/git/git.git && cd git && ./configure && make && make install :)19:51
← Neozonz left19:51
→ thedodd joined19:52
→ lbigum joined19:52
jaspertheghost so ryan u do mostly Larger Scale Linux Admin now?19:52
← FunkyAss left19:53
→ revyd joined19:53
← lbigum left19:53
→ dreiss joined19:54
→ Ragnor joined19:54
→ PR_Deltoid joined19:55
ryanneufeld larger than I did before yeah19:56
← shruggar left19:56
← CKyle left19:56
ryanneufeld I'm actually developing a tool internally to work in concert with our custom inventory system19:56
jaspertheghost if u dont mind me asking hows the pay in that field u pushing 6 figures?19:56
buck1 make: *** No rule to make target `:)'. Stop.19:56
3k/hr19:57
← buck1 left19:57
ryanneufeld jaspertheghost: I'm comfortable ;)19:57
→ lbigum joined19:57
jaspertheghost i hope my next position i can get maybe a 10-15 k shy of that19:58
← lbigum left19:58
ryanneufeld ask for what you want19:58
but make them offer first19:58
jaspertheghost its weird i have seen some companies pay a shit ton for almost no experience19:58
← IrishPrime left19:58
jaspertheghost and others that dont19:58
right now i manage 8 Web related servers (2 KVM/XEN systems that run a few linux / Windows box's19:59
i need to learn Cisco19:59
ryanneufeld get a NOC job20:00
you'll learn it20:00
that's one of those things, that places hire specifically for20:00
or will train you for20:00
as long as you have a concrete understanding of how networks operate20:00
jaspertheghost u know cisco?20:00
ryanneufeld nope20:00
don't need to20:01
← FortySix2 left20:01
jaspertheghost thats the thing i do have a concrete understanding/ i can do lInux IPTABLES all day20:01
ryanneufeld we have people that do know cisco20:01
← drjeats left20:01
jaspertheghost cisco is like fucking rocket science thoug20:01
ryanneufeld nah, it's just memorization20:01
← treehug88 left20:01
jaspertheghost well off to patch a patch panel for some wires we gotta move ill be back20:02
ryanneufeld glhf20:02
→ treehug88 joined20:03
cbreak you want to learn about cisco hardware and software? I heard the NSA knows a lot about that :)20:03
lov zing.20:03
→ weevieL3 joined20:04
← MblKiTA left20:04
→ btree joined20:04
→ sinkensabe joined20:04
→ jokajak` joined20:04
→ debajit joined20:04
jim there are courses for that, and they cost money20:05
← weevieL left20:05
→ FunkyAss joined20:05
ryanneufeld which is why you should apply for a job that will pay for it for you20:05
jim "Yeah, I just graduated from the second grade and I wanna be an NSA spook!"20:06
← weevieL3 left20:07
jim "You're almost overqualified, don't take more school"20:07
cbreak "I hate freedom and I like to peek on ... people... can I join you?"20:07
SJS jim, "When I grow up I want to be a sleeper agent?"20:07
← adkins1 left20:07
→ noyb joined20:07
→ weevieL joined20:08
← sinkensabe left20:08
jim and all this to study net hardware?20:08
→ bezet joined20:08
→ akushner joined20:09
← nnyk_ left20:10
→ causasui joined20:10
jim If you truely hate freedom, perhaps the 1% might be interested20:11
But I digress... we're not still talkin about git?20:11
offby1 jaspertheghost: allow me to plug my employer: http://www.ine.com20:11
→ bvi joined20:11
← btree left20:12
offby1 ♩ ♪ ♫ ♬ ♭ ♮ ♯20:12
← bvi left20:12
offby1 ♩ ♪ ♫ ♬ Pimp that Paycheck ♭ ♮ ♯20:12
jim that one note was flat...20:12
← bezet left20:13
bambams_ O_o20:14
→ lokus\ joined20:14
→ sonicblud joined20:14
← ilmgb left20:14
→ beastd joined20:14
→ ohcibi_ joined20:14
→ Praise- joined20:15
→ Zoddo_ joined20:15
← noyb left20:15
← yacks left20:15
Zoddo → Guest9335020:15
← Guest93350 left20:15
Zoddo_ → Zoddo20:15
← PR_Deltoid left20:15
→ basiclaser joined20:16
→ _ikke__ joined20:16
→ lbigum joined20:17
jim offby1, how do you get the b/#/etc?20:18
→ sheperson joined20:18
→ mizu_no_oto joined20:19
→ roymiloh joined20:20
→ ANR__ joined20:20
→ TwoWhole1orms joined20:20
→ jiriki- joined20:20
→ Lave_ joined20:20
→ dawik_ joined20:20
→ Blaster joined20:21
→ Annak joined20:21
gitinfo set mode: +v20:21
→ sgen joined20:21
→ kcj joined20:21
→ Vampire0 joined20:22
← lbigum left20:22
← lithiumjake left20:22
→ koell joined20:23
← noecc left20:23
← talk2manoj left20:23
→ titusjose_______ joined20:24
→ zumba_addict joined20:24
← Diemuzi left20:24
Annak → Diemuzi20:24
← Sleepy63 left20:24
← Balliad left20:24
→ lbigum joined20:25
← Lave_ left20:25
→ teslan__ joined20:25
→ Lave joined20:25
→ hays joined20:26
← jackneill left20:26
offby1 jim: I just insert them -- my IRC client lets me type Unicode characters (rather laboriously).20:26
→ esc joined20:26
← esc left20:26
→ esc joined20:26
→ EminenceHC joined20:27
jim I see them... so it must be either just the irc client or the whole system20:27
are you using xchat?20:27
→ Annak joined20:27
→ hellome joined20:27
gitinfo set mode: +v20:27
moritz looks like normal UTF-8 to me20:28
← Apocalis_ left20:28
→ kenneth joined20:28
→ FortySix2 joined20:28
← kenneth left20:28
cbreak Unicode 😍...20:28
moritz like U+266C ♬ BEAMED SIXTEENTH NOTES20:28
→ Internet13 joined20:28
→ kenneth joined20:28
jim yeah, I guess I don't see why it wouldn't be... I guess I could copy/paste20:28
← lbigum left20:28
cbreak Or... you could get a mac and just use the character chooser. Totally worth the price... :)20:29
← sheperson left20:29
→ mlimaloureiro joined20:29
→ mz` joined20:30
moritz or on Linux, have a compose key, or gucharmap, or vim + digraphs, or any of the gazillion input methods you can use :-)20:30
← mz` left20:30
→ mz` joined20:30
jim spensive hard/software :)20:30
← Diemuzi left20:30
cbreak moritz: a compose key and an infailable memory of 0x1ffff codepoints20:30
← mlimaloureiro left20:31
jim at one time I had ian infallable memory... I forgot when...20:31
← EminenceHC left20:32
jim if you set up a compose key, it works systemwide?20:32
← cjwilburn left20:32
Sample I have an interesting workflow predicament20:33
jim enters predicament mode20:33
Sample Our designers use git but as a complex tool have inherently less understanding20:33
jim: lol, ty! =P20:33
→ pnkbst joined20:33
jim It'll take about 5 years to load all predicaments tho...20:34
Sample some odd things happen where they have a file open (essentially a cache) and re-save it obliterating changes from pulls20:34
as an example20:34
jim: doh XD20:34
Annak → Diemuzi20:34
Sample so I'm wondering if there are ways to be selective about a merge. To force a merge patch perhaps? I haven't really fleshed it out yet20:34
but in thise case for example, I can be straight forward and merge the design branch, and then reapply my changes from 4 commits ago, and then push again20:35
jim they are holding open remote files?20:35
Sample I'm just wondering if someone here more saavy would have a more elegant approach20:35
→ delight joined20:35
→ lbigum joined20:35
Sample jim: they will open foo.html locally. they will git pull (updating foo). they will then save foo.html (obliterating the pull changes), and commit20:36
as a specific example of this case20:36
other cases include, leaving merge markup in files20:36
I'm just wondering if there is a more elegant approach than merging their branch and re-applying my work and pushing again20:36
I should say merge conflict markup20:37
pnkbst I unstashed a change and it created a merge conflict. I removed the merge markers but did not commit and would like to stash again but git still says I need to merge. how do I get out of this state and stash without losing changes?20:37
jim when you guys n gals use git, do you do decentralized+one central main repo that gets pull requests?20:37
→ hoschi joined20:38
Sample pull requests?20:38
→ facundor joined20:39
jim Sample, it seems to me what you can do is throw time and education at the problem in general20:39
→ lithiumjake joined20:39
Sample jim: what about selective merging20:39
since we can't force selective committing20:39
the developer only has the opportunity to fix/help once it hits the bare origin20:40
central remote server20:40
→ dacechavez joined20:40
jim so all devs can commit to the central repo?20:40
→ akim_ joined20:40
Sample to their respective branches, yes20:40
when dev pushes a change though, design needs to update20:40
and visa versa20:40
← lbigum left20:41
← tyrannosaurus_be left20:42
jim I dunno what to suggest... these issues are harder in that they are communication- and social- based20:42
Sample but yeah. if develop pushes "Fix to ticket #123" and design undoes that... and pushes it to origin/design.. haha20:42
→ tyrannosaurus_be joined20:42
jim the structure you have sounds like an unhosted party20:42
→ lbigum joined20:42
← lbigum left20:43
jim well I guess, that is..... do I have that right or close?20:43
← Ankhers left20:43
Sample Atlassian Stash20:43
internally20:44
→ dangerou_ joined20:44
← dangerousdave left20:44
→ hwrdprkns joined20:44
Sample I guess in this particular instance it was my fault20:45
i updated review and design servers but design had it mounted20:45
jim if you're at their level (equal, not boss of or emp of), you would need to tread kinda carefully20:45
Sample updating the filesystem, but leaving the file open in the editor as a stale cache kinda thing20:45
but yeah there are just perpetual little problems like this20:45
← alvaro_o left20:45
Sample some changes to a template that are bad. since I cant stop the commit I have to merge, undo them, and re-commit20:46
and hope that I catch it all20:46
or leaving merge conflict markup in a file as I mentioned above20:46
jim I'm pretty basic at git, I clone, alter, run diff a LOT, test, commit, push20:47
→ psoo joined20:47
← tyrannosaurus_be left20:47
jim point being, I have no idea if there is a specific solution within git; I would probably think the solution is about talking to people, and mostly asking them questions about how they work20:48
Sample I guess the options are 1) commit on behalf of design, not ideal 2) re-apply all lost or breaking changes after merging design, push, and update design20:48
being able to selectively merge changes (patch) wouldn't be much help I think20:48
jim there may very well be a git solution, I'm not aware of something that specific20:48
Sample yeah. I'm somewhat new to git as well20:49
← kermit left20:49
Sample fairly solid understanding of the basics but far from having neat guru workflows20:49
jim but I do see the challenge20:49
Sample also worth putting these kinds of challenges out there to see how/if someone else has tackled them20:49
some of our team makes everything _extremely_ black and white. i like to look at things more as gray, open to options =P20:50
→ kermit joined20:50
← oojacoboo left20:50
← lethjakman left20:51
→ lethjakman joined20:51
jim I think I tried to collaborate with this one guy, we couldn't get the source control thing going... we went thru cvs, tla, one or two others, and it never worked, and turned out the guy had problems with the use of source control20:52
← dsabanin left20:52
← yepyep left20:52
jim I tried solving the technical issues, but never quite tackled that last thing20:52
→ diegoviola joined20:53
→ ericeatsbrains joined20:53
← tgkokk left20:55
Sample yes, down with version control. good mantra for the resume =P20:56
→ dregad joined20:56
→ TCubed joined20:56
→ pbrobst joined20:57
→ lbigum joined20:57
→ cllamas joined20:58
→ lamont joined20:58
← lbigum left20:59
← dacechavez left21:00
← cllamas left21:03
← MarionDaly left21:03
Sample Unrelated question...21:03
← jhulten left21:03
→ kishanio joined21:03
→ lyzidiamond joined21:03
→ MarionDaly joined21:03
→ pnascimento joined21:04
Sample Is the danger of forcing a rebase simply that work may have been branched off one of the commits which has been turned into a patch and reapplied on top of the branch you rebased onto21:04
a-b-c-d-e turns into a-b-c-f-g-d'-e' yet work may have branched off "d" or "e" ?21:05
← King_Hual` left21:05
Sample who are now in a detached head state and will be garbage collected?21:05
← lithiumjake left21:05
→ PR_Deltoid joined21:06
Sample I mean, HEAD wouldn't be pointing at e anymore, but no branch would either21:06
→ King_Hual joined21:06
← King_Hual left21:06
← kishanio left21:06
→ CKyle joined21:07
← debajit left21:08
jim yeah, rebases and other things can do what's more generally called rewriting history, and that usually requires people to abandon their working dirs and cloning others from their upstream21:09
← JerryT left21:09
jim the simplest and most destructive case is called "erasing the repo and completely starting over", and of course even more damage can be caused after that by "not telling"21:10
→ model joined21:10
→ pantsman- joined21:11
← dobalina left21:11
← Kicer86 left21:11
jim the more you can avoid rewriting history, bhe better, and the less you would have to demonstrate "the central repo sometimes cannot be trusted" which is only partially true, and only (well hopefully_ sometimes21:12
← pnascimento left21:12
→ shingshang joined21:12
← nfk left21:13
→ ErKa joined21:13
← kcj left21:13
Sample interesting take21:13
← Kayra left21:14
Sample philosophical21:14
jim it's a little like a specific accounting practice, which says "always assume the company is going to keep going"21:15
← hwrdprkns left21:15
Sample hah21:15
also interesting21:15
→ nfk joined21:17
jim and hope for less things like Enron21:17
hmm. if Enron had git and a smart git admin, maybe their shredding would have had no effect21:18
→ chris___ joined21:18
→ jhulten joined21:19
← matheus23 left21:20
→ Dottimolly joined21:21
← eliasr left21:21
← batok left21:22
→ astrofog joined21:23
→ foist_ joined21:24
← NimeshNeema left21:24
→ lbigum joined21:25
→ ilmgb joined21:25
← dik_dak left21:26
→ pwnz0r joined21:27
→ kishanio joined21:27
← lbigum left21:28
← ilmgb left21:29
← mmitchell left21:30
← fenerlitk left21:30
→ mmitchell joined21:30
→ sinkensabe joined21:30
← chris___ left21:31
→ jellaby joined21:31
← mmitchell left21:31
← kishanio left21:31
→ mmitchell joined21:31
← Zoddo left21:34
← richwestcoast left21:34
← MattMaker left21:34
→ lbigum joined21:35
→ richwestcoast joined21:35
→ MattMaker joined21:35
→ shruggar joined21:35
← lbigum left21:36
← PR_Deltoid left21:36
→ debajit joined21:36
→ Cristi joined21:36
← hoschi left21:36
← jnavila left21:37
Cristi → Guest6353421:37
← sq-one left21:37
→ shlant joined21:37
shlant anyone know why I would get a permission denied when ls-remote a public git repo?21:37
→ fenerlitk joined21:38
← debajit left21:38
→ ghostlines joined21:38
← tonythomas left21:38
← ghostlines left21:38
← akushner left21:38
→ _Vi joined21:38
→ debajit joined21:38
← OffTheRails left21:38
→ ghostlines joined21:39
osse shlant: I think it's possible to deny your request server side21:39
however, why anyone would want that I don't know21:39
← ghostlines left21:39
→ ghostlines joined21:39
← debajit left21:40
shlant osse: it works on my local machine, just not from an EC2 instance21:40
← sinkensabe left21:40
→ akushner joined21:42
← edux left21:43
← thevishy left21:44
→ Entomo joined21:44
← godgodgodgo left21:44
→ Kayra joined21:45
← jftf left21:45
→ kukks joined21:45
← kukks left21:45
→ kukks joined21:45
→ ojacobson_ joined21:46
← Guest63534 left21:46
← mjsmith2 left21:46
← Kayra left21:46
← CKyle left21:47
→ Kayra joined21:47
← ojacobson left21:47
→ ojbacons joined21:47
← nicoulaj left21:47
← AaronMT left21:47
→ Sleepy63 joined21:48
← ojacobson_ left21:48
→ Stalkr_ joined21:48
← Stalkr_ left21:48
→ Stalkr_ joined21:48
← ojbacons left21:48
→ ojacobson joined21:48
← doitjay left21:49
→ pnascimento joined21:49
← m7w left21:50
← mizu_no_oto left21:50
← rnsanchez_ left21:51
← Kayra left21:51
→ CoderBug joined21:51
→ lbigum joined21:55
← lbigum left21:56
→ trewe joined21:56
osse shlant: does fetching work?21:56
← nodiscc1 left21:56
→ nnyk_ joined21:58
← tranzfuse left21:58
→ doge_wow joined21:58
→ Internetl joined21:59
← Internetl left22:00
→ Internetl joined22:01
→ lbigum joined22:01
← adac left22:01
← Internetl left22:02
→ astaves joined22:02
→ russt joined22:02
← lbigum left22:02
→ GrafikFan4Ever joined22:03
← Dougie187 left22:03
← FortySix2 left22:04
← russt left22:06
→ lbigum joined22:06
→ russt joined22:06
→ axl_ joined22:06
shlant osse: not sure aobut fetch but I can't clone either22:07
osse then it sounds like a generic authentication issue22:08
← mmitchell left22:08
→ frobrob joined22:09
← ojacobson left22:10
→ zilly joined22:10
← treehug88 left22:10
zilly Is there a way to create a commit that's literally the opposite of a commit? So the deletions become additions and vice versa?22:11
osse zilly: git revert22:11
that's exactly what it does22:11
zilly osse, ah! I was under the impression revert went back to a commit. Thanks.22:11
osse maybe you're confusing it with reset22:12
which can be used to do that, but also so much more (be careful)22:12
← qwyeth left22:13
→ jftf joined22:13
← beastd left22:14
← m8 left22:14
← mribeirodantas left22:16
← lyzidiamond left22:17
← lbigum left22:17
← jftf left22:17
pnascimento hello22:18
gitinfo pnascimento: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.22:18
→ Maple__ joined22:18
← irqq left22:19
→ noyb joined22:19
pnascimento I’m trying to apply a patch: git am —signoff < fix001.patch22:21
but this appears: “Patch failed at 0002 …”22:21
→ lbigum joined22:22
← lbigum left22:23
→ shlant1 joined22:24
← akushner left22:24
→ kishanio joined22:25
← ngladitz left22:25
← shlant left22:25
← pwnz0r left22:26
pnascimento anyone knows why this happens?22:26
← jellaby left22:27
← kishanio left22:27
kadoban You'd have to look at the patch failure and see why. Either the format is wrong, or it's a patch from a different starting place or...I dunno.22:28
pnascimento kadoban: this also appeared on terminal as output to “git am"22:29
kadoban: “error: patch failed: setup.cfg:492”22:30
← Diemuzi left22:30
← mennea left22:31
kadoban pnascimento: Yes. A patch is just a list of changes to make, if the changes can't be made (probably because the files aren't in the expected starting state), then you have to either fix that or get a better patch.22:31
pnascimento kadoban: what is “expected starting state” ?22:31
→ CKyle joined22:32
kadoban pnascimento: Whatever starting state the patch was created from.22:32
← dkpi left22:32
→ ckyle_ joined22:32
← pbrobst left22:32
→ t-mart joined22:33
kadoban pnascimento: If you don't have some way to match up the starting state, or to just fix whatever inconsistencies arise on your end, then the workflow you're using isn't very good...22:33
← revyd left22:33
pnascimento kadoban: hm, I think I found with commit is messing this patch, deleting/removing it from the branch/patch it’s adviced?22:34
kadoban: s/with/which/22:35
← bitkiller left22:35
kadoban pnascimento: Sorry I wouldn't really be able to tell if that makes sense, it depends on exactly what you're doing.22:35
→ irqq joined22:36
→ EminenceHC joined22:36
← _pr0t0type_ left22:36
→ oojacoboo joined22:36
pnascimento kadoban: for this patch, I have created a new branch, then, edited every file that I needed, one file was changed by mistake, that file is the one where the “git am” fails, so for that matter:22:37
kadoban: … I have some commits, theres is “special” one, where I make the changes to this file, I would like to remove that commit, should I do htat?22:38
→ revyd joined22:40
← CoderBug left22:40
kadoban pnascimento: I wouldn't really know. I'd need to know way more about what you're doing than I care to learn. If you make a backup and give it a try it sounds like it might be a good idea though.22:40
← russt left22:40
→ kushal3 joined22:41
pnascimento kadoban: hm, starting from the beginning?22:41
← diegoviola left22:41
kushal3 → kus22:41
→ starkhalo joined22:41
kus → kkus22:41
→ linuxmint joined22:42
← EminenceHC left22:42
jim well, to "remove" without rewriting history, you'd have to apply a diff in reverse (well, this is one way) and then commit the result22:42
more generally stated, you would remove the "special" things and then commit22:43
→ Kayra joined22:43
jim given that the presence of your code has been part of the project history, it will remain in some form, just not after the one commit22:44
← pantsman- left22:44
← Kayra left22:45
→ Kayra joined22:45
→ lithiumjake joined22:46
→ cllamas joined22:46
linuxmint Hello, I'm wondering how to pull remote repository data to an existing local git folder which hasn't been used for a while. I understand git clone is for an empty local git folder. I understand git init is for an existing local folder to push up data.22:46
← oojacoboo left22:46
← beyondcreed left22:46
kadoban linuxmint: You're probably looking for 'git fetch' and then either 'git merge' or 'git rebase'. 'git pull' is another possibility, which is 'git fetch' + 'git merge', basically, but doesn't give you a chance to manually decide what to do.22:48
pnascimento kadoban: thanks for your help, mate :)22:48
kadoban pnascimento: 'welcome, hope you got it :)22:49
linuxmint kadoban: thank you, yes, I thought it was git pull, but something went wrong yesterday. I'll try again.22:49
← pnascimento left22:49
kadoban linuxmint: If git pull isn't working right, try 'git fetch' and then 'gitk --all' and you can see kinda visually what the different branches look like, how they're related, that may help.22:49
linuxmint kadoban: sounds helpful, will try.22:50
← Kayra left22:50
→ beyondcreed joined22:50
← sarkis left22:50
→ teran joined22:50
← cllamas left22:50
← maslowbeer left22:51
→ lbigum joined22:52
← lbigum left22:52
← t-mart left22:53
→ doitjay joined22:53
→ Rastus_Vernon joined22:53
BlaDe^ hi all22:54
I've just done a few days work on a branch22:54
I tried to rebase it against devel and there was a HUGE amount of conflicts.. so I was running git checkout --ours <path>22:54
git add <path> git rebase --continue22:54
if that failed I did git rebase --skip as per its recommendation22:54
← mishok13 left22:54
BlaDe^ however.. the result I have after the rebase is pretty far from my branch, what have i messed up / can I avoid losing 3 days of work?22:55
kadoban BlaDe^: You can almost certainly avoid losing work, git makes it pretty hard to actually lose work thankfully. Unfortunately it's hard to say exactly what you've messed up. Would it be good enough to get back your branch as it was in the recent past?22:56
BlaDe^ yeah, I can do that via the reflog right?22:56
← Sample left22:56
kadoban BlaDe^: Yeah, exactly. That'd probably be the easiest way to go, and then try the rebase again and see if you can do better.22:56
BlaDe^ 00a3f3d HEAD@{45}: rebase: checkout devel22:57
5c97e01 HEAD@{46}: checkout: moving from devel to homepageDesign22:57
should I take the 45 or the 46?22:57
kadoban BlaDe^: I'd look for the log of the actual branch, that's what I usually do. I think 'git reflog blahbranch' will show it to you?22:58
← foist_ left22:58
← pnkbst left22:58
BlaDe^ 594b105 homepageDesign@{0}: rebase finished: refs/heads/homepageDesign onto 00a3f3d4cd904c9e1bd592e6fe605e8f06c18a2022:58
5c97e01 homepageDesign@{1}: commit: move videos to repo22:58
kadoban: yeah looks like it should just be @{1} then ?22:58
← fenerlitk left22:58
kadoban BlaDe^: Looks like it to me, yeah.22:58
→ northfurr joined22:59
← GrafikFan4Ever left22:59
← axl_ left22:59
linuxmint Ok, I think I'm understanding the problem of git pull a bit more. I navigated to my local git folder and typed git pull. I received yet another error saying I should use, git pull <remote> <branch>. I typed git branch -a, which said I'm in the branch1. I just need a command to git pull everything down...kind of like a quick and easy git clone.23:01
→ axl_ joined23:01
kadoban linuxmint: Hmm. Well, if your repo doesn't have changes you want to save, easiest way is just to make a new clone and move/delete the old one.23:02
linuxmint Maybe it's easier for me to start fresh on my local computer and delete the local folder and run git clone every time. How do I delete the local git folder though as deleting doesn't seem to work. Maybe because the branch that is open on the local git folder deletes, and not other folders?23:02
BlaDe^ kadoban: yeah that has brought me back23:02
kadoban: can I force it to use my branch in the rebase and not conflict?23:02
kadoban: it's mostly my branch patches conflicting against itself, nothing has changed relating to these files in the devel branch23:02
kadoban BlaDe^: Well...you probably can, but I'm not sure that's a thing that makes sense. Conflicts only happen if the thing you're rebasing on has conflicting changes, so usually you have to manually go in and fix them yourself, however makes sense.23:03
← dangerou_ left23:03
← axl_ left23:04
kadoban BlaDe^: git really can't help you there. The problem is that if you just say "okay, take my changes all the time", then it's unclear exactly why you're rebasing, since that would basically just mean wiping out everything in devel, no? In which case you probably just want a reset --hard or something, but that's also probably not what you want.23:04
→ breiti joined23:04
→ axl_ joined23:04
kadoban (since that would lose all work in devel)23:04
linuxmint kadoban: when you say repo, I understand you mean the remote repository. I don't know if the remote repository has changes or not after a few days...I would like to check by pulling down to my local git folder to check before I start development.23:04
BlaDe^ it's actually my branch that is conflicting against itself23:04
→ FreezingCold joined23:04
BlaDe^ kadoban: when I rebase applying the patches from my current branch against each other conflicts, not really sure why23:04
→ dsdeiz joined23:04
kadoban BlaDe^: Well, the thing is, that doesn't really make sense. As far as I understand, a branch /can't/ conflict against itself. If git can just replay the changes, it never screws up, only if the starting state is different are there conflicts23:05
BlaDe^ isn't there like a --with=ours or similar?23:05
kadoban BlaDe^: I would look a bit more in depth at the conflicts that are happening and see if you can figure it out.23:06
linuxmint kadoban: I found it's not a matter of 'just' making a new clone. When I delete my local git folder, I think only the local git folder with the last branch used is deleted. When I make a new folder with the same folder name and git clone, I receive funny errors.23:06
kadoban BlaDe^: (there probably is something like you're asking for, but honestly I doubt it's what you want...and I don't know the exact flag)23:06
linuxmint: One sec, lemme read over your last few lines)23:06
→ neunon joined23:07
kadoban linuxmint: When I say repo I mean repo in general, I think I was referring to your local one in particular. A repository is just a git directory, whatever you want to call it.23:07
→ fenerlitk joined23:07
kadoban linuxmint: You really shouldn't have to re-clone, it should be possible to just 'git pull' or the other alternatives. Maybe you just need to set up the branch you're on as a tracking branch of a remote one?23:08
← Anders_J left23:08
kadoban linuxmint: Hmm, I'm not sure why you'd be getting errors re your last message. Git is pretty simple with its repositories, if you delete the repository, git no longer knows anything about it.23:09
linuxmint kadoban: yes, maybe that's the problem. I will have to research how to setup every branch as it's made and document it so it's easy to know and use.23:09
kadoban: might be because when I delete the folder 'my git folder' and make a new folder in the same local path 'my git folder', I think something might be cached which confused git commands.23:10
kadoban linuxmint: If you haven't (or just as a refresher) it may save you a bunch of time if you run through a simple git tutorial or two, one that covers like basic workflow stuff, how to clone and manage some tracking branches23:10
linuxmint: git itself doesn't cache anything like that though, although maybe if you're using extra tools on top of git they do?23:10
→ mikey85 joined23:11
linuxmint kadoban: I'm not advanced enough to use extra tools, just trying to get git basics to work first.23:11
mikey85 I just wanted to apologize for early this morning23:11
kadoban Git's repos are designed to be really about as simple as possible. They're just a directory with a .git directory inside that has the git-specific junk23:11
mikey85 my grandpa slipped and fell today. It was pretty bad.23:11
→ jftf joined23:13
mikey85 so, what's this drinking party?23:14
a bot?23:14
or do you release parties? Just wondering.23:14
← nnyk_ left23:14
← mikey85 left23:15
← m0ltar left23:15
→ breiti- joined23:15
← acharlieh left23:17
← irqq left23:17
← breiti- left23:18
← jftf left23:18
← breiti left23:18
→ minterior joined23:19
→ breiti joined23:19
← thedodd left23:20
→ Artpicre joined23:21
← FreezingCold left23:21
← [gmi] left23:21
← psoo left23:22
← Artpicre left23:22
→ Artpicre joined23:22
→ hkon_ joined23:23
→ FreezingCold joined23:23
← SonikBoom left23:23
→ oojacoboo joined23:24
← mishunika left23:26
← ckyle_ left23:26
→ mizu_no_oto joined23:27
→ CoderBug joined23:27
← hkon_ left23:27
→ shlant joined23:30
← davividal left23:31
→ ckyle_ joined23:31
← dsdeiz left23:31
← shlant1 left23:31
← breiti left23:34
→ breiti joined23:35
← sgen left23:37
← shruggar left23:38
→ moritzs joined23:38
→ diegoviola joined23:38
→ jimi_ joined23:39
jimi_ Can someone recommend a method for keeping track of database schema changes? (This might be a bit off topic)23:39
← ckyle_ left23:39
→ EminenceHC joined23:40
→ glebd joined23:41
← FreezingCold left23:42
→ ferreum joined23:42
→ pierre1_ joined23:43
→ wakd joined23:43
← EminenceHC left23:45
← ferreum768 left23:45
→ Kayra joined23:45
← ghostlines left23:46
→ mishunika joined23:47
← richwestcoast left23:47
→ richwestcoast joined23:48
linuxmint kadoban: ok, I tried deleting the local git folder again, and it's caused a mess again. I then typed git clone which pulls the remote repository down to my local empty git folder. I typed git branch -a and here's the mess git shows http://pastebin.com/dWfREwAq23:48
→ akushner joined23:49
mark_t linuxmint, why is that a "mess"?23:49
← CKyle left23:49
← wald0 left23:49
→ CKyle joined23:50
← Kayra left23:50
jimi_ !mysql23:50
→ lbigum joined23:52
→ Sample joined23:52
← akushner left23:53
← jovy88 left23:54
← astrofog left23:54
→ jovy88 joined23:54
← lbigum left23:55
linuxmint mark_t: usually the output shows master or user1_branch. I can then switch branch, but when I try to switch branch now, it doesn't work. I just tried git checkout user1_branch and this worked. I was trying git checkout remotes/origin/user1_branch23:55
→ zivester joined23:56
→ sarkis joined23:56
← roymiloh left23:57
← Neozonz|Disc left23:57
→ FreezingCold joined23:57
→ m0ltar joined23:58
→ lbigum joined23:58
← LeMike left23:58
← lithiumjake left23:59
← lbigum left23:59
→ WaReZ joined23:59

Logs Search ←Prev date Next date→ Channels Documentation