Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-08

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

All times shown according to UTC.

Time Nick Message
00:00 venmx joined #git
00:01 quetz joined #git
00:04 rubyonrailed joined #git
00:06 kyan joined #git
00:09 texasmynsted so if i git subtree split, does that handle all of the history or only the history for the current branch?
00:09 justanotheruser joined #git
00:09 texasmynsted what if I have many branch and want all of their history?
00:10 howitdo joined #git
00:12 msonntag joined #git
00:13 ejb joined #git
00:14 nkouevda joined #git
00:16 davimore__ joined #git
00:16 texinwien_ joined #git
00:20 NeverTired joined #git
00:27 cagedwisdom joined #git
00:28 jimi_ joined #git
00:33 dodobrain joined #git
00:33 dodobrain joined #git
00:34 dermoth_ joined #git
00:39 m___ joined #git
00:39 emg joined #git
00:39 jimi_sanchez joined #git
00:40 mellernoia joined #git
00:41 rwb joined #git
00:42 texasmynsted oh it seems that is not what subtree split does
00:42 texasmynsted http://stackoverflow.com/questions/20​757601/git-splitting-repository-by-su​bfolder-and-retain-all-old-branches
00:43 holgersson joined #git
00:47 davimore_ joined #git
00:48 tax joined #git
00:56 nickabbey joined #git
00:59 Derderderd joined #git
01:00 madewokherd joined #git
01:00 mizu_no_oto joined #git
01:02 silverfo_ joined #git
01:03 rubyonrailed joined #git
01:04 guest___ joined #git
01:05 jmpp joined #git
01:05 jmpp joined #git
01:08 inflames joined #git
01:13 icey joined #git
01:13 icey joined #git
01:14 Celelibi joined #git
01:17 LayDMonica joined #git
01:20 buffal0 joined #git
01:21 dreaddymck joined #git
01:22 silverfo_ left #git
01:22 screamingSun joined #git
01:23 jccn joined #git
01:26 GavinMagnus joined #git
01:26 screamingSun left #git
01:27 unreal joined #git
01:27 GavinMagnus left #git
01:31 arescorpio joined #git
01:32 dreaddymck joined #git
01:32 jaguarmagenta joined #git
01:33 wcpan joined #git
01:33 thebope joined #git
01:36 wcpan joined #git
01:37 tnecniv joined #git
01:43 mar77i joined #git
01:43 dreaddymck joined #git
01:43 tnecniv joined #git
01:44 mablae joined #git
01:45 rchavik joined #git
01:48 ThnFrnkln joined #git
01:50 anuxivm joined #git
01:51 mizu_no_oto joined #git
01:54 rubyonrailed joined #git
01:54 Nilesh_ joined #git
02:00 alex1a_ joined #git
02:01 venmx joined #git
02:06 sdelic joined #git
02:07 finalbeta joined #git
02:11 fmcgeough joined #git
02:11 venmx joined #git
02:11 f4 joined #git
02:11 svm_invictvs joined #git
02:18 Emperor_Earth joined #git
02:21 Limes_ joined #git
02:21 rubyonrailed joined #git
02:25 Derderderd joined #git
02:26 rubyonrailed joined #git
02:27 jon-mac joined #git
02:27 silicong joined #git
02:28 SpeakerToMeat joined #git
02:34 thebope joined #git
02:34 Derderderd joined #git
02:36 Cerise joined #git
02:36 Cerise joined #git
02:39 dsantiago joined #git
02:39 toogley joined #git
02:41 afuentes joined #git
02:46 dodobrain joined #git
02:46 rubyonrailed joined #git
02:46 Ryanar joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:49 venmx joined #git
02:51 shgysk8zer0 joined #git
02:52 n-st joined #git
02:53 red82 joined #git
02:58 mentazoom joined #git
03:02 durham joined #git
03:02 pks joined #git
03:02 agileadam joined #git
03:03 durham joined #git
03:06 Rodya_ joined #git
03:07 agileadam Simple question: I have committed some code to master that I don’t want in master but I don’t want to lose it. With the code currently in master I can simply checkout a new branch, then switch back to master, then remove the code, right? Does it matter if any of this stuff has been pushed to a remote bare repo?
03:08 agileadam I just tested (without the remotes involved) and everything appeared to work just fine
03:08 aavrug joined #git
03:09 kadoban agileadam: Changing 'master' will be changing history, so the real question is if anyone else is using that history already, or at least has it.
03:09 agileadam kadoban: thanks for pointing this out. The set of files I want to “remove” have been pushed to the bare remote repo but have not been pulled onto the webserver yet.
03:09 venmx joined #git
03:10 kadoban agileadam: Is the bare repo just your own thing, not shared essentially?
03:10 agileadam If someone else has pulled this code (another developer, for example) it will go away when they pull master, but could they then just pull my new branch to get the code back/
03:10 fahadash joined #git
03:10 agileadam kadoban: it’s used to deploy to a server and two other devs use the repo too
03:10 kadoban agileadam: Naw, changing history isn't friendly, it's annoying for other peers. It doesn't automatically fix itself or anything.
03:10 agileadam kadoban: ok
03:10 rewt if by "remove the code" you mean delete and commit (without altering any existing commits), there will be no issues at all
03:11 kadoban You'd have to communicate with them !rewrite will have info on how to recover from that
03:11 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
03:11 srcerer_ joined #git
03:11 agileadam Yeah, I should’ve said… the intention is to make sure I don’t deploy the changes to the live server (by deploying master) but still have the code available to the 2 other developers.
03:12 andres joined #git
03:12 rubyonrailed joined #git
03:12 MeltedLux joined #git
03:12 devster31 joined #git
03:12 niax joined #git
03:12 agileadam I would be deleting and committing that deletion to master. Then, I would re-introduce the code via another branch that the other two devs can merge into whatever they’re working on. Then, when the time is right, I’ll merge that branch back into master for deployment.
03:13 thinkpad joined #git
03:13 agileadam Does that make sense? The other devs are on my team so it’s no biggie for them to deal with my lack fo forethought :)
03:14 kadoban Oh, then yes, if you're not changing history, all is good.
03:14 nsh joined #git
03:14 ensign joined #git
03:14 LiENUS joined #git
03:14 agileadam kadoban: yep, I don’t care if they see the code in the history of the master branch. No biggie there. I just want to be able to deploy master (well, a tag from master) to the server without this particular folder included.
03:15 agileadam Thanks for your time kadoban and rewt :)
03:16 rewt even if you don't make a new branch, you can still come back to the commit that has the code, so no worries there either... (not straight forward, but not too hard either)
03:18 rewt that is if you forget to create the branch before deleting the code... easier to just make the branch beforehand
03:18 Andrew_K joined #git
03:18 Jameser joined #git
03:18 agileadam okay, that makes sense. thank you.
03:20 railssmith joined #git
03:21 rubyonra_ joined #git
03:22 serialoverflow joined #git
03:25 venmx joined #git
03:28 chachasmooth joined #git
03:29 thierryp joined #git
03:30 venmx joined #git
03:33 aw1 joined #git
03:34 dreiss joined #git
03:34 thebope joined #git
03:35 Goplat joined #git
03:35 rubyonrailed joined #git
03:40 cdg joined #git
03:40 jephsf joined #git
03:41 sunri5e joined #git
03:44 dreiss joined #git
03:49 mizu_no_oto joined #git
03:53 jimi_ joined #git
03:53 lektrik joined #git
03:55 Sasazuka joined #git
03:58 Sasazuka joined #git
03:59 iliv joined #git
04:02 dodobrain joined #git
04:02 Rodya_ joined #git
04:02 a_thakur joined #git
04:03 Kaisyu joined #git
04:03 josh joined #git
04:03 hexagoxel joined #git
04:05 star_prone joined #git
04:05 venmx joined #git
04:07 aarobc joined #git
04:10 gfixler joined #git
04:12 mizu_no_oto joined #git
04:13 nadando joined #git
04:13 watabou joined #git
04:14 GT4066 joined #git
04:14 Vortex35 joined #git
04:15 shgysk8zer0 joined #git
04:18 davimore__ joined #git
04:26 fstd_ joined #git
04:34 przemoc joined #git
04:35 Derderderd joined #git
04:37 thebope joined #git
04:39 BUSY joined #git
04:41 lindenle joined #git
04:44 lektrik joined #git
04:45 rmbeer joined #git
04:46 rmbeer hello
04:47 rmbeer with 'git checkout -- *' i can't unchange all the files. always have a untracked, changes and deleted files.
04:47 rmbeer how to undo all in the work directory?
04:48 rmbeer also, i get this error that not understand: error: pathspec 'XXX' did not match any file(s) known to git.
04:48 rubyonrailed joined #git
04:50 mizu_no_oto joined #git
04:51 thesha joined #git
04:52 thesha while sending mail through git command i am getting this error-- Unable to initialize SMTP properly. Check config and use --smtp-debug. VALUES: server=smtp.googlemail.com encryption=tls hello=fedora.localdomain port=587 at /usr/libexec/git-core/git-send-email line 1383
04:52 rmbeer hummm, i view that XXX is a directory, thinking that git discard all directory that not have file. i remove by manual the directory and can't get this problem
04:53 rewt rmbeer, try:  git reset --hard && git clean -fd
04:53 subhojit777 joined #git
04:53 thesha but few days ago it was working fine,i also check the git config
04:53 thesha anybody came across this type of problem?
04:54 macivy joined #git
04:55 Keridos joined #git
05:00 arnsa joined #git
05:01 sbulage joined #git
05:02 donught joined #git
05:02 rmbeer rewt, thank. i try to remember this commands
05:03 macivy have question about missing error, see http://pastebin.com/wkekbvcH
05:03 giraffe joined #git
05:03 giraffe joined #git
05:07 rmbeer left #git
05:10 przemoc joined #git
05:10 przemoc joined #git
05:11 thesha please answer my question
05:11 Puffball_ joined #git
05:15 austin987 joined #git
05:17 lordjancso joined #git
05:19 mizu_no_oto joined #git
05:25 svm_invictvs joined #git
05:26 jimi_ joined #git
05:27 brillenfux joined #git
05:27 Rodya_ joined #git
05:29 BSAlb joined #git
05:30 navidr joined #git
05:30 Derderderd joined #git
05:31 function joined #git
05:32 mentazoom joined #git
05:37 howitdo joined #git
05:38 msonntag joined #git
05:39 _ikke_ thesha: Looks like a gmail authentication problem. They're really strict nowadayss
05:42 drbean joined #git
05:42 zerozero joined #git
05:42 thesha _ikke_:how do i resolve
05:45 jmpp joined #git
05:45 Domhack joined #git
05:46 mseyne joined #git
05:47 sdothum joined #git
05:47 InfoTest joined #git
05:47 bronson joined #git
05:54 blunaxela joined #git
05:54 star_prone joined #git
05:54 Cabanossi joined #git
05:58 xall joined #git
06:03 willlondon joined #git
06:04 jmpp joined #git
06:05 _ikke_ thesha: Do you have two-factor authorization enabled?
06:05 xberg_ joined #git
06:06 Vangelis joined #git
06:06 rubyonrailed joined #git
06:07 rscata joined #git
06:08 OOPMan joined #git
06:11 justan0theruser joined #git
06:13 bronson joined #git
06:16 thesha _ikke_:no,its off
06:18 thiago joined #git
06:20 bronson joined #git
06:21 bluezone joined #git
06:24 Jameser joined #git
06:25 bocaneri joined #git
06:27 cyan__ joined #git
06:28 Macaveli joined #git
06:31 Gloomy joined #git
06:31 _Vi joined #git
06:36 sea-gull_ joined #git
06:36 sarbs joined #git
06:37 howdoi joined #git
06:37 svara1 joined #git
06:38 thebope joined #git
06:39 chigang joined #git
06:39 Junior joined #git
06:43 ThomasLocke joined #git
06:43 ThomasLocke joined #git
06:45 iliv joined #git
06:47 overlord_tm joined #git
06:50 ooooooooo joined #git
06:50 sbulage joined #git
06:52 webdev007 joined #git
06:56 lite_ joined #git
06:56 Raging_Hog joined #git
07:03 Boniche joined #git
07:06 Dragonbird joined #git
07:07 cdown joined #git
07:08 cqi joined #git
07:09 function joined #git
07:09 troulouliou_div2 joined #git
07:10 function joined #git
07:10 cqi joined #git
07:11 constant joined #git
07:12 iliv joined #git
07:14 blahdodo joined #git
07:15 star_prone joined #git
07:16 venmx joined #git
07:16 TikityTik joined #git
07:16 xall joined #git
07:16 TikityTik if I am using git to version control a latex document, do I have to type each sentence on a new line?
07:16 TikityTik I am working with someone else on this document
07:17 raspado joined #git
07:18 ojacobson no
07:18 ojacobson there are some reasons you might want to insert line breaks for version control, but you never _have_ to
07:22 chele joined #git
07:23 elect joined #git
07:23 thesha joined #git
07:24 venmx joined #git
07:27 xberg joined #git
07:27 spriz joined #git
07:28 rads joined #git
07:33 svartoyg-mid joined #git
07:35 bmahe joined #git
07:35 jimi_ joined #git
07:36 _ikke_ thesha: The only way I know then is to either use oauth based authentication (which I have no clue about how to do with git send-mail) or enable allowing insecure authorization in gmail
07:37 svartoyg-mid left #git
07:38 rubyonrailed joined #git
07:38 svartoyg joined #git
07:39 thebope joined #git
07:39 svartoyg saluton. is it intended that "git submodule update" switches to a loose branch instead of staying on master?
07:39 JeroenT joined #git
07:40 freimatz joined #git
07:41 _ikke_ yee
07:41 _ikke_ yes
07:41 _ikke_ git submodules track commits, not branches
07:41 Sceorem joined #git
07:41 _ikke_ That way you know you will always get the same commit everywhere you check out that submodule
07:44 inflames joined #git
07:44 syg_ joined #git
07:47 rads joined #git
07:49 thesha left #git
07:49 thesha joined #git
07:50 zerozero joined #git
07:52 venmx joined #git
07:54 thesha joined #git
07:56 MrMojito joined #git
07:56 Darcidride joined #git
07:57 rubyonrailed joined #git
07:57 TomyWork joined #git
07:59 sunri5e joined #git
08:00 muelli joined #git
08:02 jnavila joined #git
08:06 JeroenT joined #git
08:06 Iota Good morning, world!
08:08 JeroenT_ joined #git
08:14 qt-x joined #git
08:14 mischat joined #git
08:15 svartoyg _ikke_: and can it be achieved that it stays on master?
08:17 elsevero joined #git
08:17 thierryp joined #git
08:17 acetakwas joined #git
08:22 pks joined #git
08:23 Puffball joined #git
08:23 xall joined #git
08:24 Alienpruts joined #git
08:26 roxlu_ joined #git
08:27 Balliad joined #git
08:33 overlord_tm joined #git
08:35 styler2go left #git
08:36 eduardas_m joined #git
08:37 texinwien_ joined #git
08:38 mablae joined #git
08:38 lindenle joined #git
08:39 AndrewMan joined #git
08:39 AndrewMan Hello, does anyone know a channel, where I can ask about GNU license specifics?
08:39 kadoban AndrewMan: #law , maybe ##programming
08:40 kadoban Or is it ##law ? whichever
08:40 AndrewMan Thank you
08:42 afuentes joined #git
08:42 thesha joined #git
08:43 thesha joined #git
08:46 lb1c AndrewMan the fsf does a really good job in explaining the gpl. maybe have a look here: https://www.gnu.org/licenses/gpl-faq.html
08:46 lb1c i meant https://www.fsf.org/licensing/
08:48 selckin tldrlegal.com
08:49 willlondon joined #git
08:50 aidalgol joined #git
08:50 dcpc007 left #git
08:52 wrouesnel1 joined #git
08:53 lb1c nice domain. i'm tempted to look at it
08:53 JeroenT joined #git
08:55 aw1 joined #git
08:59 mikecmpbll joined #git
09:00 TomyWork joined #git
09:01 arnsa joined #git
09:02 xall joined #git
09:03 jknetl joined #git
09:04 ahmedelgabri joined #git
09:05 systemovich joined #git
09:05 thierryp joined #git
09:05 TomyWork joined #git
09:07 garethdaine joined #git
09:09 kurkale6ka joined #git
09:10 TomyWork joined #git
09:11 Sasazuka joined #git
09:14 mar77i joined #git
09:14 finalbeta joined #git
09:14 Gloomy joined #git
09:15 elect_ joined #git
09:16 inflames joined #git
09:17 7GHAAW2ZI joined #git
09:19 rubyonrailed joined #git
09:19 blunaxela joined #git
09:22 rads joined #git
09:25 rominronin joined #git
09:29 jozwior joined #git
09:29 Flowinho joined #git
09:32 byte512 joined #git
09:35 rorro joined #git
09:38 TomyWork joined #git
09:38 indieross joined #git
09:42 chll_ joined #git
09:42 clmsy joined #git
09:46 mahendratech joined #git
09:50 cdown joined #git
09:54 mischat joined #git
09:54 bauruine joined #git
09:54 Gonzo89 joined #git
09:55 TomyWork joined #git
09:56 thierryp joined #git
09:57 pbrewczynski joined #git
09:57 heftig joined #git
09:57 m0viefreak joined #git
10:00 achadwick joined #git
10:00 manuel joined #git
10:03 InfoTest1 joined #git
10:03 heftig joined #git
10:05 Andrew_K|2 joined #git
10:06 rnsanchez joined #git
10:09 muelli joined #git
10:10 bauruine joined #git
10:10 Andrew_K joined #git
10:10 rubyonrailed joined #git
10:11 pR0Ps joined #git
10:12 submitnine joined #git
10:14 zeroed joined #git
10:16 howitdo joined #git
10:16 howitdo joined #git
10:17 delboy1978uk joined #git
10:17 nettoweb joined #git
10:19 rubyonrailed joined #git
10:22 delboy1978uk i am doing a rebase, but when i did rebase --continue after fixing a conflict, i seem to get the exact same conflict to fix again. do i need to commit before calling continue?
10:22 Anja joined #git
10:23 tobiasvl delboy1978uk: just "git add" will suffice
10:23 zeroed joined #git
10:24 delboy1978uk tobiasvl: thanks
10:24 webdev007 joined #git
10:24 re1 joined #git
10:24 tobiasvl telling git that the conflict is resolved
10:25 delboy1978uk hmm, i appear to have the same conflict AGAIN :-(
10:25 irqq joined #git
10:26 zerozero joined #git
10:30 netj joined #git
10:30 flavius joined #git
10:32 TomyWork joined #git
10:37 delboy1978uk left #git
10:41 venmx joined #git
10:48 mar77i joined #git
10:48 xall joined #git
10:50 venmx joined #git
10:50 _Vi joined #git
10:51 YuGiOhJCJ joined #git
10:51 rubyonrailed joined #git
10:53 rominronin joined #git
10:54 cdown joined #git
10:55 jooni joined #git
10:56 mar77i_ joined #git
10:58 mischat joined #git
10:59 JeroenT joined #git
11:00 tsunamie joined #git
11:01 rabbitear joined #git
11:03 Andrew_K|2 joined #git
11:07 DrRobotic joined #git
11:07 thierryp joined #git
11:08 Gloomy joined #git
11:11 Domhack joined #git
11:11 Cavallari joined #git
11:11 Chaser joined #git
11:11 ferr1 joined #git
11:12 Guest44362 joined #git
11:22 thesha joined #git
11:23 Domhack joined #git
11:30 ahmed_elgabri joined #git
11:31 aruns joined #git
11:32 xall joined #git
11:32 King_Hual joined #git
11:33 diogenese joined #git
11:35 JeroenT joined #git
11:36 Learath2 joined #git
11:36 sylario joined #git
11:39 tvw joined #git
11:40 buffal0 joined #git
11:41 aw1 joined #git
11:41 Derderderd joined #git
11:42 thebope joined #git
11:43 buffffal00 joined #git
11:45 thiago_ joined #git
11:45 tmsmith joined #git
11:46 mda1 joined #git
11:46 buffal0_ joined #git
11:47 nettoweb joined #git
11:48 iliv joined #git
11:48 jstein_ joined #git
11:49 sarbs joined #git
11:50 osse that can happen with rebase
11:50 osse I suggest you run 'git rerere' before continuing
11:51 rubyonrailed joined #git
11:55 m___ joined #git
11:56 dminuoso What would you name a commit that changes functions that were deprecated and just renamed?
11:58 moritz superfluous
11:58 moritz if they are deprecated, don't go to the trouble of renaming them; delete them the next time you touch them
11:58 dminuoso No I meant what kind of commit message
11:58 dminuoso moritz: No I mean Im using a library that has deprecated some old functions, emitting warnings if you use them
11:58 dminuoso So instead of do_stuff() they want me to use solve_problem() instead
11:58 dminuoso And my commit just does that.
11:59 dminuoso But I cant come up with a sensible commit message.
11:59 moritz dminuoso: "update $library function names\n\nthis makes it compatible with version $version of $library"
11:59 _Cyclone_ joined #git
12:01 JeroenT joined #git
12:02 systemovich moritz: +1
12:03 moritz maybe add a "The old function names were deprecated" oder so
12:03 diogenese joined #git
12:04 Nikitaw99 joined #git
12:04 dminuoso moritz: Alright. I just did a "Rename before_foo to before_bar\n This ensures compatiblity with library v1.2.3" :)
12:05 Flowinho joined #git
12:05 dminuoso Thank you.
12:05 moritz you're welcome.
12:06 thiago_ joined #git
12:17 synbit joined #git
12:18 g105b joined #git
12:20 aw1 joined #git
12:22 delboy1978uk joined #git
12:23 delboy1978uk urgh. i accidentally did a rebase --skip. can i go back?
12:23 svartoyg left #git
12:23 delboy1978uk i'm on patch 513 of 1031!! :-o
12:24 acetakwas joined #git
12:26 _ikke_ delboy1978uk: You can manually apply the commit if you know the hash
12:27 delboy1978uk before doing rebase continue _ikke_?
12:27 zeroed joined #git
12:27 zeroed joined #git
12:27 _ikke_ yes
12:28 delboy1978uk i have the commit message displaying in the rebadse output, but not the hash. i guess i can git log and grep for it
12:28 _ikke_ right
12:29 _ikke_ git cherry-pick <hash> should work
12:29 delboy1978uk _ikke_: thanks for the help
12:30 delboy1978uk hmm. grep came back with nothing! mind you the commit will be on the other branch!
12:30 delboy1978uk i'll check on tyhe dev server so i can swiytch branches without any issues
12:30 [0xAA] joined #git
12:31 [0xAA] joined #git
12:32 Anja joined #git
12:32 [0xAA] joined #git
12:32 _ikke_ delboy1978uk: use git log --all --grep "message"
12:33 delboy1978uk ah brill, git has a built in grep? :-D
12:33 _ikke_ yes
12:33 ahmed_elgabri joined #git
12:33 delboy1978uk aha! 14c5d65
12:33 delboy1978uk thanks _ikke_
12:35 algun joined #git
12:36 algun is it possible to fetch a list of branches without cloning a repo?
12:36 grawity git ls-remote
12:37 grawity branches are listed under refs/heads/
12:39 delboy1978uk _ikke_: it's saying i need to commit the next patches conflict resolution  before i can cherry-pick. I've already git added, is it safe to commit then rebase --continue?
12:39 delboy1978uk error: Your local changes would be overwritten by cherry-pick.
12:40 _ikke_ ah, you are already in a conflict..
12:40 _ikke_ Hmm
12:40 _ikke_ Makese things more difficult
12:40 _ikke_ You basically need to revert the sequencer, which does not have user-friendly commands
12:40 mentazoom joined #git
12:40 delboy1978uk so i can't just commit?
12:42 _ikke_ Probably more commits have already been applied in the mean time
12:42 _ikke_ Another option if it does not cause problems is to continue with the rebase, and then later put that commit back
12:43 thebope joined #git
12:43 solf1re joined #git
12:44 deadnull joined #git
12:46 Anja joined #git
12:46 delboy1978uk _ikke_: Order of events is 512 patches of 1031 applied, 513th conflict resolved, but accidentally skipped. 514th also had a conflict. resolved, git added, but not committed and i haven't rebase --continue'd yet.
12:47 delboy1978uk so there has only been one commit following it
12:48 mentazoom joined #git
12:49 _ikke_ fix the conflict, reset --mixed back to previous commit, stash, apply missing commit, unstash and commit again
12:50 jaguarmagenta joined #git
12:52 freimatz joined #git
12:53 jaguarmagenta joined #git
12:53 subhojit777 joined #git
12:55 OOPMan joined #git
12:55 JeroenT joined #git
12:55 eduardas_m joined #git
12:57 jaguarmagenta joined #git
12:58 johnmilton joined #git
12:59 mattcen joined #git
13:00 delboy1978uk hooray! rebase continuing! now on patch 519/1031
13:00 Knirch ... :D
13:01 Derderderd joined #git
13:01 dsdeiz joined #git
13:01 dsdeiz joined #git
13:02 g105b left #git
13:04 YuGiOhJCJ joined #git
13:04 freimatz Hi, i habe a hash ee8c033a - how can i show information about this commit?
13:04 _ikke_ git show <hash>
13:04 freimatz thx
13:05 synthroid joined #git
13:06 ismithers joined #git
13:06 venmx joined #git
13:08 algun grawity: thanks mate
13:10 wrouesnel joined #git
13:13 deadnull joined #git
13:14 mischat joined #git
13:15 olbat joined #git
13:16 OOPMan joined #git
13:16 Olipro joined #git
13:17 thesha joined #git
13:20 Rodya_ joined #git
13:20 raspado joined #git
13:22 nettoweb joined #git
13:23 nettoweb1 joined #git
13:24 rubyonrailed joined #git
13:24 kumarsuraj joined #git
13:25 mischat_ joined #git
13:27 tvw joined #git
13:28 guest____ joined #git
13:29 mischat__ joined #git
13:30 juvenal joined #git
13:31 netj joined #git
13:31 shinnya joined #git
13:35 [0xAA] joined #git
13:37 tvl joined #git
13:37 zeroed joined #git
13:37 fmcgeough joined #git
13:38 lordjancso joined #git
13:44 snowkidind joined #git
13:44 delboy1978uk left #git
13:44 Rodya_ joined #git
13:44 _ADN_ joined #git
13:45 jost joined #git
13:45 Rodya__ joined #git
13:45 pks joined #git
13:46 kumarsuraj joined #git
13:47 jeffreylevesque joined #git
13:51 DonRichie joined #git
13:54 ftoulemon hi, is it possible to edit the destination branch of a pull request ? Or is this mechanism not directly related to git (but rather managed soft like github/stash/...)?
13:54 grawity pull requests have many different forms
13:54 daveomcd joined #git
13:54 grawity in github, you can forcepush to the offered branch, but cannot switch to a different one, AFAIK
13:54 dminuoso ftoulemon: https://git-scm.com/docs/git-request-pull
13:55 systemovich joined #git
13:55 grawity likewise in the email kind – once you've sent an email you cannot change what branch it says
13:55 daveomcd I have a lot of local git branches. How can I go about cleaning these up?  Is there a way to tell if all the code is already committed for a branch?
13:55 sdothum joined #git
13:56 grawity git branch --merged master
13:57 Gamecubic joined #git
13:57 daveomcd grawity, does that show me all branches that are fully merged to master branch -- that should be fine for deletion?
13:57 grawity yes
13:57 daveomcd ok cool thanks very much! :)
13:58 thierryp joined #git
13:59 t0by joined #git
13:59 t0by joined #git
13:59 KlausedSource joined #git
13:59 KlausedSource !deploy
13:59 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
14:00 rnsanchez_ joined #git
14:00 willlondon joined #git
14:01 rwb joined #git
14:01 JeroenT_ joined #git
14:02 JeroenT__ joined #git
14:04 kumarsuraj joined #git
14:04 converge joined #git
14:04 jimi_ joined #git
14:07 ahmedelgabri joined #git
14:07 Derderderd joined #git
14:10 kumarsuraj joined #git
14:10 rubyonrailed joined #git
14:11 deadnull joined #git
14:11 ahmed_elgabri joined #git
14:12 thesha joined #git
14:12 gareppa joined #git
14:12 sbulage joined #git
14:13 faux___ joined #git
14:13 guest____ joined #git
14:15 ams__ joined #git
14:15 jaafar joined #git
14:16 faux___ joined #git
14:19 pdgwien joined #git
14:19 ash_workz joined #git
14:20 arnsa joined #git
14:20 HalfEatenPie_ left #git
14:22 arnsa joined #git
14:23 HalfEatenPie joined #git
14:23 jimi_ joined #git
14:24 bruce_lee joined #git
14:24 bruce_lee joined #git
14:24 Gsham joined #git
14:25 jimi_ joined #git
14:25 jimi_ joined #git
14:26 byte512 joined #git
14:26 jaguarmagenta joined #git
14:26 bluezone joined #git
14:29 iliv joined #git
14:32 aruns joined #git
14:36 King_Hual` joined #git
14:36 m___ joined #git
14:36 askhl left #git
14:36 jimi_sanchez joined #git
14:37 rivarun joined #git
14:37 mada joined #git
14:38 ExoUNX joined #git
14:39 navidr joined #git
14:39 jimi joined #git
14:40 bluezone joined #git
14:40 refried_ joined #git
14:41 nickabbey joined #git
14:41 willlondon joined #git
14:41 Es0teric joined #git
14:42 geoid joined #git
14:43 Dougie187 joined #git
14:44 breezy_ joined #git
14:46 modin joined #git
14:47 guest____ joined #git
14:48 texasmynsted I did a subtree split to a new branch called split
14:49 texasmynsted Now I am trying to push that to a new bare repo but I am doing something wrong and the new repo is not working.  What am I doing wrong?
14:49 texasmynsted mkdir sample-common &&cd sample-common &&git init --bare ./.git &&cd ../sampleccl &&git push ../sample-common split:master
14:49 texasmynsted It seems like I am not creating the bare repo correctly
14:50 texasmynsted but I can not determine why/how this is true
14:50 HoierM joined #git
14:51 texasmynsted Ohh.  maybe my expectation is wrong actually
14:51 jaguarmagenta joined #git
14:52 ELFrederich in a project with submodules is there a way I can make sure all the submodules are checked out at the proper commit but be on a local 'master' branch rather then detached?
14:52 ELFrederich This is what I do now... totally hacky, I'm sure there is a better way.  git submodule update && git submodule foreach 'git push -f . HEAD:master; git checkout master'
14:52 jaafar joined #git
14:53 jimi_sanchez joined #git
14:53 rooftopjoe how can i see a diff between my working dir and HEAD?
14:53 boombatower joined #git
14:53 selckin git diff
14:54 rooftopjoe well that was easy :)
14:54 rominronin joined #git
14:55 Boris joined #git
14:57 osse rooftopjoe, selckin:  not exactly. Use 'git diff HEAD'
14:57 rooftopjoe what does git diff show me?
14:57 osse git diff alone just shows unstaged changes. naturally if you have no staged changes then they're the same
14:58 rooftopjoe ah, cool. i didn't have anything staged for commit
14:58 rooftopjoe so i accidentally saw the correct thing
14:58 Derderderd joined #git
14:58 osse tip: don't say accidental. pretend you knew about it all along
14:59 osse :P
14:59 thebope joined #git
14:59 osse But seriously, if I am sure I have no staged changes I just use 'git diff' too.
15:01 Es0teric joined #git
15:01 blackwind_123 joined #git
15:01 red82 joined #git
15:02 nicksloan joined #git
15:02 Random832 I have this diagram on my wall http://images.abizern.org.s3.amazonaw​s.com/365git/Feb11/Git%20Diff%202.png
15:03 osse smart. this is also cool: http://www.ndpsoftware.com/gi​t-cheatsheet.html#loc=index;
15:03 osse if you click on an area it shows useful command related to it
15:06 jimi joined #git
15:07 venmx joined #git
15:09 garethdaine joined #git
15:09 d0nn1e joined #git
15:12 AndrewMan joined #git
15:12 faux___ joined #git
15:12 SaberArthur joined #git
15:14 ResidentBiscuit joined #git
15:18 faux___ joined #git
15:18 faux___ joined #git
15:19 dminuoso Is there some way to do an interactive git commit --fixup to let me find the commit I want to refer to?
15:19 ffm4 joined #git
15:20 dan2k3k4 joined #git
15:20 Dougie187 dminuoso: You should use rebase.
15:20 Rodya_ joined #git
15:20 Dougie187 dminuoso: `man git rebase`
15:20 gitinfo dminuoso: the git-rebase manpage is available at http://jk.gs/git-rebase.html
15:21 inflames joined #git
15:21 dminuoso Dougie187: Heh.
15:21 dminuoso Dougie187: I want to use fixups before I rebase interactive,
15:21 dminuoso Dougie187: Or can I change a commit into a fixup with interactive rebase?
15:21 GodGinrai joined #git
15:22 Dougie187 dminuoso: I'm not really sure you're using the word "fixup" in the same way I'm thinking of it. But interactive rebases will let you manipulate commits.
15:22 qqx dminuoso: Yes you can mark a commit as a fixup during the interactive rebase.
15:22 Dougie187 dminuoso: You can move the order of commits, squash them together, delete them, etc.
15:23 GodGinrai joined #git
15:23 lindenle joined #git
15:23 qqx Marking a commit as a fixup before that will only automatically cause it to be listed as such in the instruction sheet for the interactive rebase.
15:23 qqx And that only if you use the --autosquash option when starting the interactive rebase.
15:23 MeltedLux joined #git
15:23 dminuoso qqx: How do I do that? Just by changing the commit message to start with fixup! ?
15:23 Dougie187 dminuoso: No, you change "pick" to "fixup"
15:23 dminuoso ahh
15:24 Dougie187 dminuoso: Look at this: https://robots.thoughtbot.com/git-interact​ive-rebase-squash-amend-rewriting-history
15:24 Dougie187 Hopefully that helps some.
15:24 Dougie187 Changing it to fixup will squash it into the previous commit, but delete the commit message (for the fixup commit)
15:24 qqx dminuoso: There should also be some instructions at the bottom of the instruction sheet that you edit.
15:24 Dougie187 So, you need to re-order it.
15:24 nettoweb joined #git
15:24 Dougie187 Well, you might need to re-order it.
15:25 jimi_sanchez joined #git
15:25 ffm4 I was up-to-date with master (M0) then I made a feature branche (F0) on local. After some commits (F1) someone in our team pushed a new commit to master (M1). I am still working on the feature branch, but I need the changes from M1. what should I do?
15:26 Dougie187 ffm4: Either (1) Rebase onto master, or (2) merge master into your branch. Depending on what your projects workflow calls for.
15:26 chadhinton joined #git
15:26 ffm4 Dougie187 isnt rebase evil?
15:27 Dougie187 No, I think rebase is one of the best parts of git personaly.
15:27 Dougie187 personally*
15:27 selckin rebase is the number 1 reason to use git
15:27 ResidentBiscuit rebase is great
15:27 osse !merge_vs_rebase > ffm4
15:27 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.html
15:27 GodGinrai selckin: I disagree
15:27 osse even if you're a merge fan, rebase has it's uses with -i
15:28 osse *its
15:28 GodGinrai Yea, it's not like there aren't uses for rebase
15:28 selckin GodGinrai: thats why its hyperbool
15:29 ffm4 Dougie187 should I first commit to F2?
15:29 Learath2 joined #git
15:29 ResidentBiscuit "You should _never_ pull my tree at random points (this was my biggest
15:29 ResidentBiscuit issue with early git users - many developers would just pull my current
15:29 ResidentBiscuit random tree-of-the-day into their development trees). It makes your
15:29 ResidentBiscuit tree just a random mess of random development. Don't do it!"
15:30 ResidentBiscuit A year later, people still do this all the time where i work
15:30 Dougie187 ffm4: If you have uncommitted changes that you want to keep. Alternatively you can use `git rebase --autosquash -i`
15:30 Blkt joined #git
15:30 aleray joined #git
15:30 Dougie187 ResidentBiscuit: that's one of my biggest annoyances too. :P
15:30 selckin ResidentBiscuit: you can make git pull --rebase the default
15:31 Rodya_ joined #git
15:31 arand__ joined #git
15:31 Dougie187 selckin: Just because you can do that doesn't mean people do that.
15:31 selckin you make it company policy then enforce it
15:31 Dougie187 I always tell people to forget about `git pull` just because they don't use it in a useful way.
15:31 GodGinrai selckin: As someone who uses rebase very rarely, if at all, I cannot accept your hyperbole
15:31 osse ResidentBiscuit: they pull *your* stuff? or pull from the de-facto central repo ?
15:31 GodGinrai even if it is an exaggeration
15:31 ResidentBiscuit I just tell people "don't merge code thats clearly in development". They dont listen
15:32 ResidentBiscuit osse: They'll pull from someone's development branch
15:32 Dougie187 selckin: If you can't get the people who would enforce it to care about it, it doesn't matter.
15:32 osse ResidentBiscuit: where is the branch located?
15:32 ResidentBiscuit Our GitHub instance
15:32 e14 joined #git
15:32 selckin you don't want merges just because of the random time of they did a pull with a work in progress local commit, so pull --rebase solves all that, then you have merges when there are actual merges
15:32 Dougie187 osse: I've had people do that with development branches in forks as well.
15:32 selckin Dougie187: resign
15:32 ffm4 Dougie187 ok I committed, now how to rebase?
15:32 Dougie187 ffm4: `git rebase -i <branch_to_rebase_onto>`
15:33 GodGinrai ResidentBiscuit: exactly.  The only thing outside of master you should be merging into your own are branches you own, or branches where the dev in charge has told you it is ok for merging
15:34 ResidentBiscuit Yeah I dont understand why people think its ok
15:34 jimi_sanchez joined #git
15:35 Dragonbird joined #git
15:35 Dougie187 It's because they don't understand git.
15:35 bluezone joined #git
15:35 GodGinrai yup
15:35 flaviodesousa joined #git
15:35 GodGinrai I make it a habit not to push any branch I'm not ready for someone to look at
15:35 GodGinrai it tends to keep people from using my code while it still has problems
15:36 eduardas_m joined #git
15:36 LionsMane joined #git
15:37 Gsham joined #git
15:37 ffm4 Dougie187 `git rebase -i <branch_to_rebase_onto>` <-master or feature in my case?
15:37 osse ResidentBiscuit: my suggestion is to use personal forks to mitigate that. But if your coworkers are as silly as Dougie187's you have issues :p
15:38 Tanfrieze joined #git
15:38 Dougie187 ffm4: You should checkout your feature branch, and rebase it onto master.
15:38 Rodya_ joined #git
15:38 mischat joined #git
15:38 Dougie187 ffm4: So it should be something like: `git checkout <feature>; git rebase -i <master>`
15:38 Dougie187 osse: My ex-coworkers. :P
15:38 ffm4 Dougie187 I am on feature the whole time ;)
15:39 ftoulemon I did a merge, resolved the conflicts, but then a pre-commit hook stopped the merge commit. Now, if I `git commit`, the commit is not recognized as a merge commit, but as a simple commit. How can I fix this ?
15:39 Dougie187 osse: But I agree with you. I think of forks as the same as my local machine. It's annoying when people try to pull from it without me telling them to.
15:39 GodGinrai IMO, the best use of rebase is to recover from other people's fuckups
15:39 Dougie187 ffm4: ok, so you should read that command as "Rebase feature onto master", it will rebase whatever you have checked out currently.
15:39 vrlx joined #git
15:39 osse Dougie187: personal forks that are invisible, except to whitelisted devs \o/
15:39 Dougie187 GodGinrai: I think it's great for cleaning up your own work too
15:39 aarobc joined #git
15:39 GodGinrai Which half the time is *caused* by changing history (with rebase)
15:40 ffm4 Dougie187 thanks!
15:40 Dougie187 ffm4: NP
15:41 GodGinrai Dougie187: I believe in a non-changing history, apart from amending a mistaken commit, if it is realized in time
15:42 Dougie187 GodGinrai: in my work, I tend to make mistakes. And I (personally) find it useful to clean them up in a nice way.
15:42 aleray hi, how can I find the hash of a git notes object?
15:42 crose joined #git
15:42 mischat joined #git
15:43 GodGinrai Dougie187: everyone makes mistakes.  We've got git-revert for dealing with our mistakes (and the mistakes of others)
15:43 Dougie187 GodGinrai: My ex-coworkers on the other hand would have the same issue (they'd make mistakes) and I would see commits in their branches that are like "Implement Feature" followed by "Clean up white space" "Fix weird bug" "Fix indentation"
15:43 mischat_ joined #git
15:44 GodGinrai Dougie187: well, aside from "fix weird bug", those commits seem to describe what is happening.
15:44 Dougie187 GodGinrai: Personally, I don't think the extra commits are useful, so it's nice to squash them together.
15:44 GodGinrai which is what a history should do
15:44 converge joined #git
15:44 converge joined #git
15:45 Dougie187 It's also nice to be able to re-order them. If, for example you implement two new features, in subsequent commits, and then find a bug in the first one that breaks the second one. You could commit the fix, and squash it into the first commit
15:45 GodGinrai Dougie187: if you have a proper commit msg policy, then you could easily strip out those minor commits when viewing a log
15:46 usm4n joined #git
15:46 ResidentBiscuit Meh I prefer to squash those intermediate commits also
15:46 Dougie187 GodGinrai: I had a hard time getting people to follow a proper branching policy. Do you think they care about a proper commit message policy?
15:46 GodGinrai Dougie187: also, any bugfix *is* a useful commit.  It is only not useful when the commit message doesn't properly describe the bug it fixed
15:46 GodGinrai Dougie187: you can enforce a proper commit message policy with git-hooks
15:47 Dougie187 GodGinrai: I think a bugfix commit after the feature has been tested throughly is definitely useful. I think an improper implementation found while you're in the process of implementing it isn't useful though
15:47 ResidentBiscuit ^
15:47 ResidentBiscuit Thats my opinion
15:47 ResidentBiscuit I don't care that you fixed typos while you were working on a new feature
15:47 fission6 joined #git
15:48 Dougie187 I totally agree. It's just clutter. But also as GodGinrai you could get around it with a proper commit message policy, which is a good idea if you can enforce it as well
15:48 fission6 how cani tell how many commits a contributor has made to  a repo
15:48 GodGinrai Dougie187: it doesn't matter when you discovered the bug.  If there is a chance that future modifications to the code could bring it back, it is best people can find it so that they know what fixed it.
15:48 Dougie187 GodGinrai: There isn't a possibility that you could bring it back. It's like you didn't think the feature through while you were implementing it.
15:48 GodGinrai fission6: from the CLI?
15:49 fission6 yea
15:49 fission6 or github whatever
15:49 GodGinrai Dougie187: yes, because bugs *never* resurface in real life
15:49 Dougie187 Anyway, I don't need to argue about rebase vs. merge. I know people who prefer both workflows, and I definitely think both have a place. :P
15:49 Derderderd joined #git
15:49 ResidentBiscuit GodGinrai: If you discover a new bug while developing your feature, then yes I think that should be its own commit. If you're just developing a new feature, you're going to be in many broken states until you get your work finished. I don't think the entire dev process needs documented in commits
15:50 GodGinrai ResidentBiscuit: I agree that broken states (which is not the same as bugs) are not as important for commits.  But at that point, the question is... why did you commit there?
15:50 ejb joined #git
15:50 GodGinrai Unless you needed to push up your code for someone else to help w/ your problem, committing at broken states is just bad practice
15:50 Dougie187 GodGinrai: Could have been the end of a day, and you wanted to make sure your progress was saved.
15:51 ResidentBiscuit GodGinrai: I commit at the end of the day so I know wth I was doing when I come back lol
15:51 ResidentBiscuit But I do see people commit basically whenever they save a file and its a mess
15:51 Es0teric joined #git
15:52 Dougie187 I've seen people do that as well.
15:52 GodGinrai yea
15:52 Dougie187 Branches with 25 commits and 5 lines changed total
15:52 Dougie187 ugh...
15:52 GodGinrai although people who commit whenever they save a file are doing it wrong
15:52 GodGinrai no other way around it <.<
15:52 Dougie187 GodGinrai: Agreed.
15:53 interrobangd joined #git
15:53 fission6 GodGinrai: git shortlog -s -n
15:53 rubyonrailed joined #git
15:53 selckin clearly tells you which code to review with a fine comb tho
15:53 GodGinrai I can understand the save at the end of day idea, but honestly, if I did that, I would probably do a soft reset to remove the bad commit the next morning
15:54 GodGinrai or find a way to store stashes on the server
15:55 ResidentBiscuit I just clean up my history before I get reviewed
15:56 t0by joined #git
15:56 t0by joined #git
15:56 BUSY joined #git
15:56 GodGinrai fission6: glad to see you figured it out.  Btw, from github, you can see the information by clicking "contributors"
15:56 fission6 kk
15:56 vuoto joined #git
15:58 garethdaine joined #git
15:59 ResidentBiscuit fission6: TIL. Thanks for that
15:59 Rodya_ joined #git
16:00 fission6 ResidentBiscuit: TIL?
16:00 GodGinrai fission6: "today I learned"
16:00 ResidentBiscuit ^
16:01 rancyd joined #git
16:03 ayogi joined #git
16:04 jnewt i have a repository that i'd say 90% of the changes are eol or whitespace.  is there a way to clean that up so that diffs aren't just full file removed, full file added because of eol or huge blocks that were tabbed at one point and then spaced in at another point?
16:05 rooftopjoe jnewt: why don't you just keep using the old coding standard?
16:05 rooftopjoe set your editor to add (or not add) the EOLs and go on with your life.
16:05 selckin you can rewrite history so eol is always the same yeah
16:06 rooftopjoe rewriting the history sounds like a pain in the ass. is this worth it?
16:06 Es0teric joined #git
16:06 dreiss joined #git
16:06 rooftopjoe who cares about the EOLs? just be consistent about (not?) using them
16:06 selckin seems to be his question
16:06 rooftopjoe yes, i'm just suggesting that it might be the wrong question to ask :)
16:06 selckin rooftopjoe: that works going forward, but the damage is still done
16:07 al-damiri joined #git
16:07 rooftopjoe selckin: are the changes to from EOL to non-EOL (or vice-versa) all in one commit or are they spread out?
16:08 rooftopjoe because if they are in one commit, you should do a soft reset and then rebase
16:08 selckin wrong person
16:08 jnewt rooftopjoe, they are mixed in with actual changes, which makes it difficult to see what actually changed.
16:08 fission6 ResidentBiscuit: nice!
16:08 selckin you can diff -w and other optiosn to ignore whitespace/eol
16:09 ResidentBiscuit fission6: One of the reasons I lurk here, I'm always learning new tricks
16:09 selckin then you go slap whoever committed and teach them not to change it
16:09 rooftopjoe it doesn't matter whether they are mixed in with stuff
16:09 rooftopjoe it matters when the change happened
16:09 nanga joined #git
16:09 nanga joined #git
16:09 Oatmeal joined #git
16:10 jnewt rooftopjoe, from what i can see, it happened several times, over the past 2 years.
16:10 rooftopjoe this is a good reason to not give people access to repos but instead use pushing and pulling :D
16:10 rads joined #git
16:11 rooftopjoe jnewt: ah, that sucks. then i guess selckin's suggestion is a workaround: ignore the EOLs in the diffs
16:11 d0nkeyBOB joined #git
16:11 jnewt i think this has to do with a mix of windows and linux users, neither of which give a shit about what their actual diff looks like, only that whatever they were supposed to do is done.  now i can't make any sense of what changed and when.
16:12 nopevms joined #git
16:12 mattias__ joined #git
16:12 ojdo joined #git
16:12 ResidentBiscuit Man line endings changes are annoying. Theres a guy on a sister team that is #linuxmasterrace and went and decided to change ALL of our line endings because reasons
16:13 selckin jnewt: any editor that does not preserve the existing line endings is broken, its 2016, they all support it except really shiity ones like notepad.exe heh
16:13 nopevms joined #git
16:13 lattera joined #git
16:14 GodGinrai ResidentBiscuit: but seriously, crlf is horrible
16:14 selckin it doesn't matter one bit
16:14 cyan__ joined #git
16:14 ResidentBiscuit GodGinrai: I really don't care what the line endings are, as long as they're consistent
16:15 ResidentBiscuit We work in a mostly windows environment, so windows line endings makes sense
16:15 GodGinrai ResidentBiscuit: I've had entirely too many bugs caused by crlfs
16:15 GodGinrai *bugs*, not discomfort
16:16 jnewt ResidentBiscuit, i don't see the point of crlf, but i don't really care.  seems like a pointless character that's only reason for existence is "cause windows"
16:16 selckin you can't even see it
16:17 jnewt but i'll settle for everything being set to crlf, would eliminate 90% of the changes in this repo.
16:18 mischat joined #git
16:18 GodGinrai selckin: you can see the carriage return.  It looks like this ^W :P
16:18 GodGinrai or wait
16:18 GodGinrai was that ^M
16:18 GodGinrai one of the two
16:18 qqx ^M
16:18 jnewt yeah, and they're all of the f'ing place in my diffs
16:19 nanga joined #git
16:19 selckin jnewt: git filter-branch --tree-filter 'git ls-files -z | xargs -0 unix2dos' -- -all
16:20 tang^ joined #git
16:20 nanga joined #git
16:21 jnewt i know about autocrlf.  is there an automatic crlf->lf option too?  and if i apply this at the central bare repo can i enforce it in a pre-receive hook?
16:23 cdg joined #git
16:24 evillarreal joined #git
16:24 Electrometro joined #git
16:24 m___ joined #git
16:24 Muzer joined #git
16:24 cdg_ joined #git
16:25 GodGinrai jnewt: IIRC, everyone has to set it locally, but I believe you could reject commits that have crlfs in them
16:27 GodGinrai jnewt: IIRC, everyone has to set it locally, but I believe you could reject commits that have crlfs in themhttps://help.github.com/articl​es/dealing-with-line-endings/
16:28 shgysk8zer0 joined #git
16:28 nioncode joined #git
16:28 GodGinrai there appears to be a setting you can make in the gitattributes fuke
16:28 GodGinrai *file
16:28 fiete joined #git
16:30 faux___ joined #git
16:31 GodGinrai jnewt: also, autocrlf should always be set to input.  If any windows dev complains, tell them to stop using notepad
16:31 Es0teric joined #git
16:31 GodGinrai because that's literally the only text editor I've used on windows that can't see lf as a newline
16:32 dsdeiz joined #git
16:33 jnewt i'm chatting with one of the developers right now, and apparently if you save a code file in mplabx (the ide for our microcontroller work on microchip products), it converts any lf's to crlf on linux.
16:34 shgysk8zer0 joined #git
16:35 breezy_ joined #git
16:37 Gloomy joined #git
16:37 jnewt oh, it will also replace some stuff with crcrlf crcr under certain circumstances.  wonderful.
16:37 overlord_tm joined #git
16:39 function joined #git
16:39 madewokherd joined #git
16:39 Lipp joined #git
16:40 leeN joined #git
16:40 Cavallari1 joined #git
16:42 UncleCJ[m] joined #git
16:47 nd joined #git
16:48 Lipp joined #git
16:49 jimi_sanchez joined #git
16:50 rads joined #git
16:51 rubyonrailed joined #git
16:51 kevwil joined #git
16:52 tmsmith joined #git
16:52 jimi_sanchez joined #git
16:52 tnecniv joined #git
16:53 kevwil joined #git
16:54 matsaman joined #git
16:54 jimi joined #git
16:55 LBV_User joined #git
16:55 jccn joined #git
16:55 Lipp joined #git
16:56 robotroll joined #git
16:57 dispake joined #git
16:57 skirk joined #git
16:57 Lipp joined #git
16:59 cyberz hello
16:59 jimi_sanchez joined #git
16:59 astrofog joined #git
17:00 rominron_ joined #git
17:01 synthroid joined #git
17:02 bruce_lee joined #git
17:02 bruce_lee joined #git
17:02 synthroi_ joined #git
17:05 noctux joined #git
17:07 venmx joined #git
17:08 Electrometro joined #git
17:10 howitdo joined #git
17:10 Derderderd joined #git
17:11 thierryp joined #git
17:12 vdv joined #git
17:14 aard_ joined #git
17:16 durham joined #git
17:17 einnjo joined #git
17:18 zerozero joined #git
17:18 menip joined #git
17:20 davimore joined #git
17:20 Salander27 joined #git
17:21 Lipp_ joined #git
17:26 lattera left #git
17:28 algun joined #git
17:29 polyrob_ joined #git
17:30 Derderderd joined #git
17:30 durham joined #git
17:32 lindenle joined #git
17:33 sea-gull_ joined #git
17:33 unreal_ joined #git
17:35 Balliad joined #git
17:36 romerocesar joined #git
17:36 vrlx joined #git
17:39 subhojit777 joined #git
17:40 deadnull joined #git
17:40 m0viefreak joined #git
17:41 GodGinrai jnewt: dear god I'm glad I'm not using that software
17:42 jnewt i'd rather be using it than having to deal with the mess it is making.
17:42 Onoe joined #git
17:43 Cavallari joined #git
17:44 publio joined #git
17:45 xberg joined #git
17:45 r0bics joined #git
17:48 Gloomy joined #git
17:48 dreiss joined #git
17:48 raspado joined #git
17:49 Lipp joined #git
17:50 troppie joined #git
17:50 robotroll joined #git
17:51 Gloomy joined #git
17:52 Rodya_ joined #git
17:52 guest__ joined #git
17:53 refried_ joined #git
17:56 netj joined #git
17:56 Forgon joined #git
17:59 jnavila joined #git
18:01 nickabbey joined #git
18:03 Forgon left #git
18:06 mischat joined #git
18:06 Forgon joined #git
18:07 Derderderd joined #git
18:07 Forgon So I ran `git clone https://github.com/Warzone2100/warzone2100` and later switched the branch with `git checkout tags/v3.1_beta5`.
18:08 Forgon During compilation, I notice several files are missing in the source directories.
18:08 Forgon Could someone explain that to me?
18:10 texasmynsted So what is the problem with rebasing when using subtree?  Is it the changes in the subtree that should not be rebased, or changes in host project that should be be rebased, or both?
18:11 LionsMane joined #git
18:12 Severin42 joined #git
18:13 ShekharReddy joined #git
18:13 edaught joined #git
18:14 Gloomy joined #git
18:14 texasmynsted anybody know this?
18:14 jost_ joined #git
18:16 jimi joined #git
18:16 JanC_ joined #git
18:16 qqx texasmynsted: I haven't used subtree, but my guess would be both.
18:17 GodGinrai Forgon: maybe those files were missing from the tag?
18:17 Lipp_ joined #git
18:17 qqx I'd recommend following the usual advice of avoiding rebasing (or otherwise rewriting) shared history, with any thing used by the other side of a subtree considered shared.
18:17 jost__ joined #git
18:18 Groscheri joined #git
18:21 Cavallari joined #git
18:22 cagedwisdom joined #git
18:23 kumarsuraj joined #git
18:24 overlord_tm joined #git
18:25 robattila256 joined #git
18:26 kfoonamalik joined #git
18:26 heftig joined #git
18:26 mar77i_ joined #git
18:30 zerozero joined #git
18:30 heftig joined #git
18:30 texasmynsted Basically I am free to use subtree split to split a directory out into a new repo.  Then I can join it back by one of two ways, subtree add, or submodule.  If I use subtree then I can never rebase anything, anywhere.  If I use submodule then I have to separately checkout the submodule to alter the content?
18:31 Balliad joined #git
18:35 muelli joined #git
18:35 davimore_ joined #git
18:35 svm_invictvs joined #git
18:37 afuentes joined #git
18:39 svm_invictvs joined #git
18:39 jimi_sanchez joined #git
18:39 fmcgeough joined #git
18:40 dreiss joined #git
18:40 InfoTest joined #git
18:41 jimi_sanchez joined #git
18:41 jost__ joined #git
18:43 tnecniv joined #git
18:44 cjohnson I want to partially revert a commit
18:44 cjohnson So I ran a git revert, then git reset HEAD~1 to undo the history
18:44 cjohnson then git add -p
18:44 cjohnson and I have staged only the part I want
18:44 cjohnson can I somehow checkout to drop the unstaged changes?
18:44 Es0teric joined #git
18:45 kadoban cjohnson: Sure. You want things to look like the index and drop everything else?
18:45 kadoban That's: git checkout .   (WARNING: nukes unstaged changes!)
18:46 cjohnson but my staged changes will still remain in place? interesting
18:46 kadoban Yep
18:46 cjohnson that's checkout . and not checkout -- .
18:46 cjohnson ?
18:46 GodGinrai cjohnson: why not just commit the changes and then git reset HEAD?
18:46 cjohnson yeah could do that I was mostly just curious
18:46 kadoban Same thing here, though the -- is less ambiguous (though I don't think it can matter here)
18:47 cjohnson got it
18:47 cjohnson it only matters if a branch and filename conflict?
18:47 Dragonbi_ joined #git
18:47 kadoban Yeah, it can only make a difference if there's a ref that could be confused with the path, or the other way around, I'm not even sure which way it resolves the ambiguity.
18:48 kadoban It's good practice in general, I usually throw it in.
18:49 cjohnson cool, good to know
18:49 cjohnson worked out great, thanks for clarification
18:49 tnecniv joined #git
18:50 xberg joined #git
18:51 converge joined #git
18:51 converge joined #git
18:52 kyan joined #git
18:55 Gsham joined #git
18:56 dsantiago joined #git
18:56 Siegfried joined #git
18:56 Derderderd joined #git
18:57 Balliad joined #git
18:58 SteveCharleston joined #git
18:59 Es0teric joined #git
18:59 thillux joined #git
19:00 tmsmith joined #git
19:01 jnavila joined #git
19:02 zivester joined #git
19:04 ash_workz joined #git
19:06 Cabanossi joined #git
19:06 Forgon left #git
19:08 venmx joined #git
19:08 Macaveli joined #git
19:09 macivy joined #git
19:09 Sasazuka joined #git
19:10 jimi_sanchez joined #git
19:11 ejb joined #git
19:11 macivy need help with branch missing problem, http://pastebin.com/8t4dQvtp
19:11 thiago what's the problem?
19:11 Balliad joined #git
19:13 jimi joined #git
19:14 einnjo joined #git
19:15 jimi joined #git
19:16 macivy so you didn't read the pastebin?
19:17 thiago didn't open
19:17 Zarthus that's pretty fundamental :)
19:17 thiago until you explain the problem, I won't click the link (assuming that's just the terminal capture of the problem)
19:17 jimi_sanchez joined #git
19:17 Zarthus thiago: If the problem is a bit lengthy, it makes sense to pastebin it.
19:17 Gsham joined #git
19:18 HoierM joined #git
19:18 guest__ joined #git
19:18 aswen joined #git
19:18 macivy Zarthus, ty
19:18 GodGinrai Zarthus: yet it never makes sense to use pastebin.com
19:18 GodGinrai so we are at an impasse :P
19:19 Zarthus Well, you could throw a !pastebin at him!
19:19 gitinfo [!paste] Please use a pastebin for snippets longer than one line. https://gist.github.com and https://vomitb.in both work well.
19:19 GodGinrai Zarthus: that only works in #archlinux
19:19 jimi joined #git
19:19 GodGinrai Zarthus: the message here would just make him respond "but I *did*!"
19:19 thiago gist is the worst pastebin
19:19 Zarthus All pastebins suck
19:19 GodGinrai thiago: oh how sheltered you are
19:20 thiago not really
19:20 Zarthus i can't find myself a single excellent one.
19:20 macivy thiago, stick to git please
19:20 thiago fair enough, let's stick to git
19:20 GodGinrai Zarthus: ix.io, sprunge.us, and ptpb.pw are all good ones
19:21 jimi_sanchez joined #git
19:21 Zarthus GodGinrai: ptpb.pw generates an invalid cert error, ix.o and sprunge.us are both terminal clients (although I do like sprunge)
19:23 GodGinrai I rarely ever need to paste something that I copied outside of the terminal in a pastebin
19:23 GodGinrai When I do, I just throw it in a mozilla pastebin
19:23 jimi joined #git
19:24 spacelord_ joined #git
19:25 texasmynsted there is no problem with rebasing and using submodules right?  At least I do not recall a problem with this.
19:27 sbeller texasmynsted: it depends. I would not see problems with the rebasing in the superproject.
19:27 thiago texasmynsted: no, not usually
19:28 sbeller rebasing history in the submodule that is already recorded in the superproject however sounds like you may run into problems down the road
19:29 guest__ joined #git
19:29 thiago I don't think rebase updates the submodules' checkout
19:29 texasmynsted if I rebase a repo that has a submodule, it is recoverable right?
19:29 thiago recoverable from what?
19:30 thesha joined #git
19:31 irqq joined #git
19:32 texasmynsted If I rebase a repo that has a subtree joined, can I re-join the subtree?
19:32 thesha i got this error while sending git send-email,also googled it but still unable to send commit messages
19:33 thesha Unable to initialize SMTP properly. Check config and use --smtp-debug. VALUES: server=smtp.googlemail.com encryption=tls hello=fedora.localdomain port=587 at /usr/libexec/git-core/git-send-email line 1383
19:33 thesha i also turn off my secure app for gmail but still the error continues
19:33 BSaboia joined #git
19:34 thiago texasmynsted: sorry, no experience with subtree
19:34 thiago thesha: what did it say when you used --smtp-debug?
19:34 thesha same thing as above
19:35 d0nkeyBOB joined #git
19:35 dan2k3k4 joined #git
19:35 Lipp joined #git
19:36 thesha any idea?
19:36 thiago no
19:36 thiago if this were happening to me, I'd check if it attempted a TCP connection
19:36 thiago use tcpdump or strace
19:36 thesha what you use for sending email from git
19:36 i7c joined #git
19:37 thesha but first time it worked ,few days ago but now its not
19:37 thiago I use git-send-email
19:37 tvw joined #git
19:37 thiago though I wonder if I've ever used it on this laptop... (I've had it for 8 months)
19:38 GodGinrai texasmynsted: I don't see anything anywhere that suggests you can't rebase on a repo once you've made a subtree
19:40 Motoservo joined #git
19:41 kulelu88 joined #git
19:41 NeverDie joined #git
19:42 venmx joined #git
19:42 Gloomy joined #git
19:44 alex1a joined #git
19:46 texasmynsted I keep seeing warnings
19:46 texasmynsted I think that the revision history changes, and then it becomes unclear where the subtree should join the hosting repo.
19:46 brent__ joined #git
19:46 texasmynsted It seems like it would be fixable by re-adding the subtree, but I do not know.
19:47 texasmynsted The last thing I would want to do would be to damage a repository in a way that it can not be fixed.
19:48 joshszep joined #git
19:50 tnecniv joined #git
19:50 zacts joined #git
19:52 jjasinski joined #git
19:53 aidalgol joined #git
19:53 peeps[lappy] joined #git
19:53 synthroid joined #git
19:54 tnecniv joined #git
19:57 Gsham joined #git
20:04 satifant joined #git
20:06 f4 joined #git
20:06 lucazz joined #git
20:06 raspado joined #git
20:11 ExoUNX joined #git
20:12 nwkj86 joined #git
20:13 prg318 Let's say I have release branch 1.x and release branch 2.x .. Then, I created branch "foobar" from release 2.x and merged it back into 2.x .. If I do "git merge foobar" on release 1.x branch, it will merge all of the changes of the 2.x branch, because foobar was branched from 2.x.. how can I take *only* the changes that occured on a branch and not the changes before the branch was started?
20:13 prg318 Basically i want to say "hey git, merge this branch but only commits after <commit-id>
20:14 Jupelius joined #git
20:15 Balliad joined #git
20:15 bernardio joined #git
20:15 Shentino joined #git
20:16 Balliad joined #git
20:17 Disji joined #git
20:17 Es0teric joined #git
20:18 juvenal joined #git
20:18 moritz prg318: a merge can't do that. You need a rebase or a cherry-pick
20:20 przemoc joined #git
20:21 prg318 moritz: oh i see.. so i guess i could rebase foobar against 1.x (in the above example)
20:21 rorro joined #git
20:22 aw1 joined #git
20:22 GodGinrai prg318: you can rebase the branch you want to merge onto your other release branch and then merge it
20:22 przemoc joined #git
20:22 Sonderblade why does setting options cause them to be listed twice?
20:23 prg318 GodGinrai: thank you ! and thank you moritz
20:23 prg318 makes sense now
20:23 Sonderblade im setting autocrlf = input in my .gitconfig, and git config --list lists autocrlf twice with different values
20:23 GodGinrai np
20:24 ExoUNX_ joined #git
20:24 GodGinrai Sonderblade: it's probably set in your global values
20:24 thiago Sonderblade: you probably have it in ~/.gitconfig and in .git/config
20:25 ExoUNX_ joined #git
20:25 Sonderblade no, in ~/.gitconfig i only have autocrlf=true
20:25 Sonderblade i mean autocrlf=input
20:26 crayon joined #git
20:26 jmpp joined #git
20:29 johnmilton joined #git
20:29 Seveas Sonderblade: git config --list --show-origin
20:29 synthroi_ joined #git
20:30 tnecniv joined #git
20:31 Sonderblade Seveas: it shows the options coming from C:\ProgramData/Git/config
20:31 thiago right, that's the system config
20:33 GodGinrai so the global config, like I said :P
20:33 przemoc joined #git
20:35 Sonderblade it's not listed when running git config --system --list
20:36 grantwu joined #git
20:37 grantwu I might be confused, but how do I git grep for the "-- v" string?
20:37 GodGinrai Sonderblade: what about `git config --global --list`?
20:37 grantwu I'm getting that v is an unknown option, even if I wrap the entire thing in single quotes
20:37 grantwu oh, is git grep -- '-- v' what I need...?
20:37 gsingh93 joined #git
20:39 Sonderblade GodGinrai: there it is listed because i added it to .gitconfig
20:39 Ahmed90 joined #git
20:43 przemoc86 joined #git
20:45 b1tchcakes joined #git
20:47 przemoc joined #git
20:50 venmx joined #git
20:51 f4 joined #git
20:52 eb0t joined #git
20:53 ahmed_elgabri joined #git
20:55 M3mphiZ left #git
20:56 tmsmith joined #git
20:59 svm_invictvs joined #git
21:00 shgysk8zer0 joined #git
21:01 tmsmith joined #git
21:02 _ADN_ joined #git
21:03 overlord_tm joined #git
21:07 t0by joined #git
21:07 t0by joined #git
21:07 ToBeFree joined #git
21:08 NeverDie_ joined #git
21:09 zerorax joined #git
21:09 zerorax is there a way to make it so i don't need to enter my username and password every time I push?
21:09 zerorax like, a config file?
21:09 wrouesnel joined #git
21:10 vishal zerorax: ssh keys
21:10 jnavila joined #git
21:11 howitdo joined #git
21:11 zerorax oh
21:11 zerorax I'll just use username and password
21:11 zerorax I don't trust myself not to lose my key
21:11 vishal haha it isn't that hard to set up :)
21:11 eb0t joined #git
21:11 vishal well if you're talking about github, you can easily add/remove keys
21:11 zerorax I just don't trust myself not to accidently delete my key file and lose my backup at the same time
21:11 vishal from the web interface
21:11 zerorax oh
21:12 zerorax then maybe i'll do that
21:12 zerorax i'll look into it later, i have to leave very shortly
21:12 zerorax if I can't figure it out, i'll ask for help, but it's probably easy if you can do it from a web interface
21:13 Lipp joined #git
21:13 zerorax i just started using git a few days ago
21:13 Sasazuka joined #git
21:14 zerorax before i had github I just used mediafire for backing everything up
21:17 tnecniv joined #git
21:17 zerorax i wish someone convinced me to use github years ago
21:17 mikecmpbll joined #git
21:18 guest____ joined #git
21:19 Zarthus to be honest 'years ago' the hip was all about sourceforge
21:19 Zarthus and then you'd be stuck in malware heaven
21:20 zerorax well, I never made my sources public, and over the years i've lost track of and or accidently deleted so many projects that were good enough to land me a job
21:20 dsdeiz joined #git
21:20 dsdeiz joined #git
21:20 zerorax my current project will NOT land me a job, it's too simple and easy, but I'm enjoying it and I think it's cool that my friends can track my progress on github
21:22 cbreak zerorax: you can easily use git without github
21:22 Lipp joined #git
21:22 zerorax cbreak, I am aware of this, but chose to use github
21:23 zerorax there is a private git repository on a network i'm on
21:23 zerorax i just never used it
21:25 adymitruk joined #git
21:26 zerorax and i think you can also use git without a repo, locally. is this correct?
21:27 cbreak not without a repo
21:27 cbreak but doing something like "git init" will create a repo
21:27 zerorax oh ok
21:27 adymitruk joined #git
21:28 cbreak you always have a local git repository, no matter wether  you use github, bitbucket or what ever else
21:28 zerorax yes this is what I meant, i guess i worded it wrong
21:29 refried_ joined #git
21:30 baryon joined #git
21:31 Lipp joined #git
21:31 NeverDie joined #git
21:32 Es0teric joined #git
21:32 le_melomane joined #git
21:33 MarkFletcher joined #git
21:33 evilmquin joined #git
21:34 Severin42 joined #git
21:34 WayToDoor joined #git
21:35 railssmith joined #git
21:37 edaught joined #git
21:37 dviola joined #git
21:40 jstimm joined #git
21:40 adymitruk joined #git
21:41 cdown joined #git
21:42 NeverDie joined #git
21:43 Kopitaja joined #git
21:43 endiruna joined #git
21:44 GodGinrai joined #git
21:47 aarobc joined #git
21:48 jeffreylevesque joined #git
21:48 prg318 so in general.. what does "--" mean in git?
21:50 prg318 does it just mean "stop interpreting flags after this"?
21:51 Gsham joined #git
21:54 qqx prg318: Depends where it's found. That's a common meaning.
21:55 qqx But it's also used to separate a ref (e.g. branch name) from path names in commands that can optionally take either or both of those.
21:55 cjohnson git checkout foo    might mean checkout branch named foo, or file named foo
21:55 cjohnson git checkout -- foo is disambiguous
21:57 invisbl_ joined #git
21:57 prg318 thank you; that makes sense
21:58 rwb joined #git
22:00 dsantiago joined #git
22:04 Darcidride joined #git
22:05 rubyonrailed joined #git
22:12 Lor_ joined #git
22:14 Lipp joined #git
22:14 guest____ joined #git
22:18 menip joined #git
22:19 adymitruk joined #git
22:19 m___ joined #git
22:21 JamesBaxter joined #git
22:21 m___1 joined #git
22:25 zerozero joined #git
22:25 nidr0x joined #git
22:27 msonntag joined #git
22:30 Shentino joined #git
22:30 jstimm joined #git
22:31 tnecniv joined #git
22:31 ayjay_t left #git
22:32 rubyonrailed joined #git
22:32 bernardio joined #git
22:33 Lipp_ joined #git
22:34 bernardio_ joined #git
22:35 bernardio_ joined #git
22:35 novas0x2a|laptop joined #git
22:36 bernardio_ joined #git
22:36 Lipp joined #git
22:39 adymitruk joined #git
22:40 guest____ joined #git
22:43 buffal0 joined #git
22:45 serialoverflow joined #git
22:45 quackgyver joined #git
22:45 jccn joined #git
22:47 Sample joined #git
22:47 Sample joined #git
22:49 derk0pf joined #git
22:51 eb0t joined #git
22:53 ejb joined #git
22:54 venmx joined #git
22:55 boombatower joined #git
22:56 Ulch joined #git
22:57 Derderderd joined #git
22:58 nettoweb1 joined #git
23:01 fmeerkoetter joined #git
23:04 venmx joined #git
23:04 _ADN_ joined #git
23:05 endiruna joined #git
23:06 kyan joined #git
23:08 adymitruk joined #git
23:08 invisbl joined #git
23:08 mischat joined #git
23:09 adymitruk joined #git
23:09 oaao joined #git
23:09 WayToDoor joined #git
23:10 jstimm joined #git
23:11 invisbl joined #git
23:11 abyx joined #git
23:11 invisbl joined #git
23:11 abyx is git update-index --assume-unchanged something that is branch-specific or something?
23:11 guest____ joined #git
23:12 abyx i can't checkout a branch because it says i have local changes to the file i set to --assume-unchanged.... :thinking_face:
23:12 thiago abyx: assume it doesn't work
23:12 thiago abyx: what were you trying to do?
23:13 nicksloan joined #git
23:13 tyreld joined #git
23:14 abyx i have a config file that is tracked in the remote repo, but i need it to be different in my local repo. so i thought updating the index to assume-unchanged would allow me to modify it locally and not conflict with the remote
23:14 osse !assume_
23:14 gitinfo [!assume_unchanged] git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually a promise to Git that the file is identical to the committed version, to reduce unnecessary disk reads. Not only will Git feel free to discard the flag, it will also happily overwrite your changes whenever a checkout/merge/rebase/... updates it.
23:14 thiago no, that's not the case
23:14 thiago forget --assume-unchanged and fix your problem differently
23:14 Lipp joined #git
23:14 thiago !config
23:14 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
23:17 breezy_ joined #git
23:22 dsdeiz joined #git
23:22 dsdeiz joined #git
23:22 m___ joined #git
23:24 Noldorin joined #git
23:24 dreaddymck joined #git
23:25 durham joined #git
23:27 cagedwisdom joined #git
23:30 King_Hual joined #git
23:31 Gsham joined #git
23:31 editshare-ericf joined #git
23:31 nanga joined #git
23:31 nanga joined #git
23:34 ToBeCloud joined #git
23:37 Lipp joined #git
23:37 msonntag joined #git
23:40 Peetz0r joined #git
23:45 King_Hual joined #git
23:54 venmx joined #git
23:55 polyrob_ joined #git
23:57 Derderderd joined #git
23:58 Lipp_ joined #git
23:59 faux___ joined #git
23:59 King_Hual joined #git

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