Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-18

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

All times shown according to UTC.

Time Nick Message
00:01 basdb joined #git
00:02 basdb joined #git
00:03 madewokherd joined #git
00:03 EV3RYDAYPR0GRESS joined #git
00:04 iamtakingiteasy joined #git
00:05 venmx joined #git
00:06 SwiftMatt joined #git
00:06 basdb joined #git
00:09 iamtakingiteasy joined #git
00:12 snowalpaca joined #git
00:15 kegster joined #git
00:18 dreiss joined #git
00:19 Masber joined #git
00:20 iamtakingiteasy joined #git
00:20 ToBeCloud joined #git
00:25 menip joined #git
00:27 DolpheenDream howdy
00:28 DolpheenDream when i do an interactive rebase and I want to not commit a file during one of the rebase step.. how do I unstaged that file ? i can’t see any files staged btw, or in the current directory
00:29 venmx joined #git
00:29 DolpheenDream git reset --soft HEAD^  ?
00:30 iamtakingiteasy joined #git
00:35 iamtakingiteasy joined #git
00:39 peterbecich joined #git
00:40 iamtakingiteasy joined #git
00:41 peterbecich joined #git
00:42 eric_engestrom left #git
00:44 thiago joined #git
00:45 iamtakingiteasy joined #git
00:51 iamtakingiteasy joined #git
00:52 a_thakur joined #git
00:56 iamtakingiteasy joined #git
00:56 tmsmith joined #git
00:58 prg3 joined #git
01:01 iamtakingiteasy joined #git
01:01 Vampire0 joined #git
01:01 nidr0x joined #git
01:04 suttonwilliamd_ joined #git
01:07 iamtakingiteasy joined #git
01:08 watabou joined #git
01:09 armyriad joined #git
01:12 iamtakingiteasy joined #git
01:12 MattMaker joined #git
01:12 xlegoman joined #git
01:17 iamtakingiteasy joined #git
01:19 dna113p left #git
01:22 iamtakingiteasy joined #git
01:25 dysfigured what's the simplest way to tell whether a repo has anything staged?
01:26 dysfigured looking to fix up my bash prompt a bit
01:27 iamtakingiteasy joined #git
01:29 Noldorin joined #git
01:30 raijin joined #git
01:31 nowhereman joined #git
01:32 iamtakingiteasy joined #git
01:37 iamtakingiteasy joined #git
01:37 dysfigured the only thing i can think of is to `staged=$(git diff --cached); [[ -n "$staged" ]]` but that seems.. overkill?
01:39 ngladitz joined #git
01:39 ngladitz joined #git
01:40 dave0x6d joined #git
01:41 kadoban dysfigured: I assume you're familiar with __git_ps1 ?
01:41 dysfigured ..nope
01:41 kadoban You should look it up, it's essentially for what you're asking about, and more.
01:41 kadoban It's fairly configurable, though I have no idea where the docs for the thing are offhand.
01:42 iamtakingiteasy joined #git
01:47 iamtakingiteasy joined #git
01:48 ecuanaso joined #git
01:49 snowalpaca joined #git
01:50 raijin joined #git
01:51 svm_invictvs joined #git
01:51 dysfigured looks like all it does is check return value of git diff --no-ext-diff --cached --quiet
01:52 dysfigured hm, i would've though there'd be something more than that
01:55 jameser joined #git
01:57 wilornel When doing `git checkout -p -- .`, how can I clear the decisions (the no decisions) that have been made?
01:58 skyfaller joined #git
01:58 wilornel The issue I am having is I would like to go back to a hunk I decided no on
01:58 wilornel I would like to go back to that hunk using `/`, the regex search
01:58 arescorpio joined #git
01:59 wilornel Actually, I can't even navigate to it using j,k,J, or K
02:00 dysfigured wilornel: there's probably a better way but i normally quit and start over
02:04 skyfaller_ joined #git
02:06 skyfaller_ joined #git
02:07 iamtakingiteasy joined #git
02:08 nettoweb joined #git
02:08 wilornel dysfigured: I did quit and start over and it seems like my decisions linger on
02:08 wilornel or the consequences of my decisions linger on
02:09 dysfigured `git reset` should unstage all changes
02:09 wilornel Ah you mean this. Alright! I'll try using magit for this part
02:09 wilornel for stagin hunks
02:10 pks joined #git
02:11 austin987 joined #git
02:11 dysfigured tbh i use my editor for staging most of the time
02:11 ecuanaso joined #git
02:12 iamtakingiteasy joined #git
02:14 prg3 joined #git
02:16 shinnya joined #git
02:17 iamtakingiteasy joined #git
02:18 davidosomething joined #git
02:19 jen_ joined #git
02:19 jen_ I need to push local changes to production server. Are these good instructions?https://help.dreamhost.com/hc/en-us/articles/216445197-How-to-push-your-Git-repository-to-an-external-server
02:21 finalbeta joined #git
02:22 iamtakingiteasy joined #git
02:22 thebinary joined #git
02:25 matoro joined #git
02:25 NeXTSUN joined #git
02:27 iamtakingiteasy joined #git
02:28 m0viefreak joined #git
02:32 pur3eval joined #git
02:33 Wulf4 joined #git
02:35 funfunctor joined #git
02:35 funfunctor Hi
02:37 iamtakingiteasy joined #git
02:46 iamtakingiteasy joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:48 medeirosthiiago joined #git
02:49 githogori joined #git
02:49 hahuang61 joined #git
02:49 dreiss joined #git
02:50 medeirosthiiago joined #git
02:50 d^sh joined #git
02:51 Vampire0_ joined #git
02:52 inflames joined #git
02:58 iamtakingiteasy joined #git
03:03 iamtakingiteasy joined #git
03:03 ojdo joined #git
03:05 r3c0d3x joined #git
03:06 bruce_lee joined #git
03:06 bruce_lee joined #git
03:08 iamtakingiteasy joined #git
03:09 Nilesh_ joined #git
03:09 chachasmooth joined #git
03:10 NightMonkey joined #git
03:10 ac3takwas joined #git
03:13 iamtakingiteasy joined #git
03:16 fstd_ joined #git
03:17 Vortex34 joined #git
03:18 ChiLL_SurF joined #git
03:19 iamtakingiteasy joined #git
03:19 hexagoxel joined #git
03:24 iamtakingiteasy joined #git
03:26 roygbiv joined #git
03:29 iamtakingiteasy joined #git
03:31 shgysk8zer0_ joined #git
03:32 clemf joined #git
03:33 sostenuto joined #git
03:34 Guest9 joined #git
03:36 howitdo joined #git
03:37 chipotle joined #git
03:38 medeirosthiiago joined #git
03:39 iamtakingiteasy joined #git
03:42 wiesel joined #git
03:44 iamtakingiteasy joined #git
03:44 peterbecich joined #git
03:44 lb1c joined #git
03:44 patarr joined #git
03:48 snacks joined #git
03:49 iamtakingiteasy joined #git
03:50 snacks hey, I'm trying to set up a git server; what's the standard convention on WHERE you actually put the bare thing.git?
03:51 snacks like, when you git clone --bare thingtocopy $location/thing.git, what location do most people use?
03:53 Goplat joined #git
03:53 snacks I'm putting it onto my raspberry pi server on LAN, if that helps
03:53 duderonomy joined #git
03:54 iamtakingiteasy joined #git
03:55 SwiftMatt joined #git
03:57 sunri5e joined #git
04:02 b1tchcakes joined #git
04:04 DolpheenDream joined #git
04:05 Electrometro joined #git
04:08 raijin joined #git
04:09 hexagoxel joined #git
04:10 iamtakingiteasy joined #git
04:15 iamtakingiteasy joined #git
04:15 pur3eval joined #git
04:17 dreiss joined #git
04:20 snowalpaca joined #git
04:23 r3c0d3x joined #git
04:25 iamtakingiteasy joined #git
04:28 Cabanoss- joined #git
04:30 iamtakingiteasy joined #git
04:31 Emperor_Earth joined #git
04:31 ertes joined #git
04:34 armyriad joined #git
04:35 iamtakingiteasy joined #git
04:37 PioneerAxon joined #git
04:38 endiruna joined #git
04:40 iamtakingiteasy joined #git
04:42 kaldoran joined #git
04:43 sim590 joined #git
04:45 unreal joined #git
04:50 mizu_no_oto joined #git
04:50 hahuang61 joined #git
04:51 iamtakingiteasy joined #git
04:54 mischat joined #git
04:56 iamtakingiteasy joined #git
05:01 iamtakingiteasy joined #git
05:07 dsdeiz joined #git
05:07 dsdeiz joined #git
05:08 Darren_ joined #git
05:16 pur3eval joined #git
05:16 iamtakingiteasy joined #git
05:19 wiesel joined #git
05:20 sbulage joined #git
05:20 Derperperd joined #git
05:20 kfoonamalik joined #git
05:21 snowalpaca joined #git
05:21 safe joined #git
05:22 systemovich joined #git
05:25 roygbiv joined #git
05:27 iamtakingiteasy joined #git
05:27 Murr joined #git
05:28 ac3takwas joined #git
05:29 pur3eval joined #git
05:32 iamtakingiteasy joined #git
05:34 jimklo joined #git
05:42 iamtakingiteasy joined #git
05:45 venmx joined #git
05:45 patarr joined #git
05:47 iamtakingiteasy joined #git
05:50 AcuBcn joined #git
05:57 mohabaks joined #git
05:59 kfoonamalik joined #git
06:00 raspado joined #git
06:03 iamtakingiteasy joined #git
06:08 iamtakingiteasy joined #git
06:08 dermoth joined #git
06:13 iamtakingiteasy joined #git
06:13 Anthaas joined #git
06:18 iamtakingiteasy joined #git
06:23 iamtakingiteasy joined #git
06:28 iamtakingiteasy joined #git
06:29 raspado joined #git
06:30 mohabaks joined #git
06:31 packet0 joined #git
06:33 iamtakingiteasy joined #git
06:34 PioneerAxon joined #git
06:34 dermoth joined #git
06:35 mkoskar joined #git
06:35 mrkake joined #git
06:36 bket joined #git
06:38 iamtakingiteasy joined #git
06:39 tanuki joined #git
06:40 deepak__ joined #git
06:41 Tech joined #git
06:43 ertesx joined #git
06:43 iamtakingiteasy joined #git
06:44 funfunctor joined #git
06:45 hahuang61 joined #git
06:48 AcuBcn joined #git
06:48 iamtakingiteasy joined #git
06:51 svm_invictvs joined #git
06:56 MarioBranco_2 joined #git
06:59 iamtakingiteasy joined #git
07:01 kfoonama1ik joined #git
07:03 AcuBcn joined #git
07:04 iamtakingiteasy joined #git
07:07 iamtakingiteasy joined #git
07:07 Delta-One joined #git
07:09 jimklo joined #git
07:11 govg joined #git
07:15 bocaneri joined #git
07:15 MonsterKiller joined #git
07:16 souther joined #git
07:16 Delta-One left #git
07:19 YuGiOhJCJ joined #git
07:23 j_r left #git
07:25 MattMaker joined #git
07:28 ych joined #git
07:30 vuoto joined #git
07:30 raspado joined #git
07:35 mohabaks joined #git
07:37 raspado joined #git
07:38 MarioBranco joined #git
07:41 MrMojit0 joined #git
07:45 venmx joined #git
07:46 patarr joined #git
07:50 nutron joined #git
07:50 coco joined #git
07:53 MineCoins joined #git
07:54 netj joined #git
08:04 jagob joined #git
08:09 Derperperd joined #git
08:10 funfunctor joined #git
08:10 narendraj9 joined #git
08:11 lordjancso joined #git
08:11 tusharmalik joined #git
08:14 tusharmalik joined #git
08:14 thekrynn joined #git
08:16 glebihan joined #git
08:18 thekrynn joined #git
08:22 jagobdue joined #git
08:32 ych joined #git
08:40 ecuanaso joined #git
08:42 pks joined #git
08:44 kfoonamalik joined #git
08:44 funfunctor joined #git
08:47 hahuang61 joined #git
08:50 tvw joined #git
08:51 glebihan joined #git
08:52 theoceaniscool joined #git
08:54 iamtakingiteasy joined #git
08:58 diogenese joined #git
08:59 sunri5e joined #git
08:59 pks joined #git
09:00 zzz joined #git
09:04 pneuma joined #git
09:11 xbob joined #git
09:11 jnavila_ joined #git
09:11 pihpah joined #git
09:11 ramsub07 joined #git
09:12 t0by joined #git
09:12 t0by joined #git
09:14 xbob_ joined #git
09:15 denisMone joined #git
09:21 medeirosthiiago joined #git
09:24 spacelord_ joined #git
09:25 mischat joined #git
09:27 blackwind_123 joined #git
09:27 Tobbi joined #git
09:29 grawity joined #git
09:33 beny joined #git
09:33 AcuBcn joined #git
09:33 vuoto joined #git
09:36 eroux joined #git
09:40 _Marek_ joined #git
09:45 spacelord_ joined #git
09:46 venmx joined #git
09:47 patarr joined #git
09:47 pur3eval joined #git
09:49 Tobbi joined #git
09:50 mikecmpbll joined #git
09:52 Macaveli joined #git
09:56 spacelord_ joined #git
10:00 bernardio joined #git
10:00 MineCoins joined #git
10:03 mischat joined #git
10:07 venmx joined #git
10:09 Derperperd joined #git
10:10 garethdaine joined #git
10:14 PioneerAxon_ joined #git
10:16 Taikibansei joined #git
10:17 pks joined #git
10:20 robattila256 joined #git
10:21 robotroll joined #git
10:23 Lqs4 joined #git
10:29 hamdjan left #git
10:30 nidr0x joined #git
10:31 spacelord_ joined #git
10:32 gtristan joined #git
10:33 Tobbi joined #git
10:33 gtristan Lets say I have a repo, and I know there is no unstaged changes; it may be on a branch, it may be in a detatched head state or whatever
10:34 gtristan I would like to `git fetch` and then `git checkout`, in some way that if I give git checkout a commit sha, that should work, and if I give it a branch, it should also work
10:34 gtristan What should I do ?
10:35 gtristan Usually, if I'm already on a branch, and I git fetch, and then git checkout the branch; it wont move my local branch to the latest origin branch
10:35 gtristan but that's what I want
10:36 gtristan A forceful 'setting of my local state to a given ref' (where a ref is a commit, a tag, a branch or whateva)
10:36 gtristan Hmmm, actually I can compromise and say, it will always be a branch
10:37 gtristan So, after git fetch, can I forcefully ensure that my local state is "a local branch tracking a remote origin branch" and that it's at the latest of that remote ?
10:38 gtristan Possibly ignoring any local commits I might have on the local branch ?
10:40 Cogitabundus joined #git
10:42 dersand joined #git
10:45 patarr joined #git
10:46 gtristan Should be simple, goal is for an automated task which: A.) Clones-or-fetches-and-checks-out-latest-of-branch
10:46 gtristan B.) Does some automated stuff which stages changes
10:46 Wulf joined #git
10:46 DBag joined #git
10:47 gtristan C.) Pushes a branch off of whatever was cloned/fetched (which will end up being a gitlab CI / merge request)
10:47 DBag left #git
10:48 jnavila_ joined #git
10:48 gtristan The problem is only with (a) that I'm not sure about, the checkout if it exists just needs to be forcefully setup so that it is a local tracking branch of the remote branch, and is at the latest, after a fetch
10:48 hahuang61 joined #git
10:49 gtristan I'm trying 'git branch -D localbranch'... but... even with capital D, git doesnt want to delete the branch if I happen to be _on_ it
10:50 Whiskey I don´t get this
10:51 gtristan Whiskey, what I'm saying ? Or the next sentence you are about to say ? :)
10:51 Whiskey i did git init in root folder
10:52 Whiskey then "git remote add origin $protocol://${user}:${password}@$url/$user/${repositorie}.git" and "git pull" to get last version from remote
10:52 Whiskey but when i try to do "git status" i get "fatal: This operation must be run in a work tree"
10:54 GodGinrai joined #git
10:55 gtristan Whiskey, in / ?
10:55 gtristan considered ostree at all ?
10:56 Whiskey ?`
10:56 gtristan in / ?
10:56 Whiskey yes
10:56 Whiskey in root directory
10:56 gtristan I.e., you intend for you operating system to be updatable... *with git* ?
10:56 gtristan that's what ostree is for
10:57 Whiskey wtf are you talking about
10:57 gtristan Sigh.
10:57 * gtristan throws a pancake at Whiskey
10:57 gtristan there.
10:57 aavrug joined #git
10:59 * gtristan does a crazy dance with a temporary branch in order to delete local tracking branch and re-track the origin branch after a git fetch
11:00 gtristan in the absence of anyone knowing how to just forcefully do it in one step
11:00 Whiskey How do i sync my folder whit remote?
11:00 Whiskey I say i have alot thats not checked in but its only one file changes from the remote one
11:02 exussum joined #git
11:08 irqq_ joined #git
11:14 redhedded1 joined #git
11:19 Tobbi joined #git
11:21 ac3takwas joined #git
11:22 oskarkv joined #git
11:22 snowalpaca joined #git
11:25 manuelschneid3r joined #git
11:26 mohabaks joined #git
11:26 prg3 joined #git
11:28 overlord_tm joined #git
11:33 KevinDF joined #git
11:35 aavrug joined #git
11:36 packet0 joined #git
11:38 AcuBcn joined #git
11:39 borkr joined #git
11:42 souther joined #git
11:45 mischat joined #git
11:49 Tobbi joined #git
11:49 bernardio joined #git
11:50 mohabaks joined #git
11:55 miczac joined #git
12:01 Count_Dracula joined #git
12:03 Count_Dracula left #git
12:03 vuoto joined #git
12:05 venmx joined #git
12:05 doppo joined #git
12:08 Tobbi joined #git
12:11 Derperperd joined #git
12:12 doener joined #git
12:16 cbreak Whiskey: git doesn't care about synchronizing folders
12:17 cbreak just about transfering history
12:17 cbreak so if you want to transfer anything, commit it to make it history, then push it to transfer said history
12:18 cbreak Whiskey: naturally, this will not update any user visible folder on the destination
12:18 cbreak Whiskey: since pushing is usually done to !bare repos
12:18 gitinfo Whiskey: A bare repository is used to push/fetch (useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/
12:18 cbreak Whiskey: if you want to update the actual file system, then you'll have to hack around git, read !deploy
12:18 gitinfo Whiskey: 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
12:19 packet0 joined #git
12:19 grawity there is now receive.denyCurrentBranch=updateInstead
12:19 cbreak what does it do?
12:20 cbreak hmm, interesting
12:20 cbreak looks like a combination of requiring no local changes, and then doing something equivalent to merge --ff-only
12:22 jay-m joined #git
12:22 Tobbi joined #git
12:23 snowalpaca joined #git
12:26 b1tchcakes joined #git
12:39 bernardio joined #git
12:46 Electrometro joined #git
12:46 mischat joined #git
12:49 hahuang61 joined #git
12:51 mohabaks joined #git
12:53 NeverDie joined #git
12:55 GodGinrai joined #git
12:59 satifant joined #git
13:00 m0viefreak joined #git
13:08 swalladge joined #git
13:15 mikecmpbll joined #git
13:15 jimi_ joined #git
13:15 cdesai joined #git
13:17 ggherdov__ joined #git
13:17 ggherdov__ joined #git
13:21 bannakaffalatta joined #git
13:23 b100s joined #git
13:26 kasual joined #git
13:27 revoltingPeasant joined #git
13:29 finalbeta joined #git
13:29 Lea2 joined #git
13:29 b100s joined #git
13:37 btree joined #git
13:38 btree left #git
13:38 ispn joined #git
13:42 grayjoc joined #git
13:42 inflames joined #git
13:43 thebird joined #git
13:44 manuelschneid3r joined #git
13:46 deinspanjer joined #git
13:47 mischat joined #git
13:47 NeverDie joined #git
13:51 mohabaks joined #git
13:52 mohabaks left #git
13:54 metachr0n joined #git
13:54 finalbeta joined #git
13:57 manitu joined #git
13:58 b100s joined #git
14:02 iLembus joined #git
14:04 venmx joined #git
14:09 b100s joined #git
14:12 treia joined #git
14:12 CheckDavid joined #git
14:12 jameser joined #git
14:15 Vampire0 joined #git
14:15 Derperperd joined #git
14:17 jameser_ joined #git
14:25 miczac joined #git
14:27 cdesai joined #git
14:28 jameser joined #git
14:32 mohabaks joined #git
14:32 mohabaks left #git
14:37 rivarun joined #git
14:38 newbie1 joined #git
14:39 Jackneill_ joined #git
14:42 drodger joined #git
14:42 texinwien_ joined #git
14:45 jameser joined #git
14:48 mischat joined #git
14:49 hahuang61 joined #git
14:52 Cassiopaya joined #git
14:53 rivarun joined #git
14:55 robotroll joined #git
14:55 GodGinrai joined #git
14:56 PioneerAxon joined #git
14:56 [Brain]2 joined #git
14:58 kiltzman joined #git
14:59 kiltzman joined #git
15:00 kiltzman joined #git
15:00 acbg joined #git
15:01 kiltzman joined #git
15:04 kiltzman joined #git
15:04 kiltzman joined #git
15:05 byte512 joined #git
15:06 acbg joined #git
15:07 prg3 joined #git
15:07 kiltzman joined #git
15:08 dendazen joined #git
15:09 ynazarov joined #git
15:13 dreiss joined #git
15:17 fckfreenode joined #git
15:17 mjbeswick joined #git
15:17 King_Hual joined #git
15:18 Derperperd joined #git
15:23 treia joined #git
15:24 andschwa joined #git
15:31 DolpheenDream joined #git
15:33 basiclaser joined #git
15:35 bluepixel joined #git
15:37 mkoskar joined #git
15:38 m4sk1n joined #git
15:39 mda1_ joined #git
15:40 clemf joined #git
15:42 anuxivm joined #git
15:43 b100s joined #git
15:44 madewokherd joined #git
15:44 diddlydoo joined #git
15:47 Jackneill_ joined #git
15:47 perrier-jouet joined #git
15:48 perrier-jouet joined #git
15:49 eb0t joined #git
15:49 mischat joined #git
15:51 ffilozov joined #git
15:52 zzz_ joined #git
16:01 publio joined #git
16:01 Nilesh_ joined #git
16:08 watabou joined #git
16:09 thebird joined #git
16:10 thebird joined #git
16:11 ffilozov joined #git
16:12 anuxivm left #git
16:13 kaldoran joined #git
16:13 b100s joined #git
16:13 sim590 joined #git
16:16 ynazarov joined #git
16:17 YuGiOhJCJ joined #git
16:17 alhariel joined #git
16:17 BlackMaria_netsp joined #git
16:20 BlackMaria_netsp joined #git
16:21 kfoonamalik joined #git
16:23 zzz_ joined #git
16:30 BlackMaria joined #git
16:34 glspi joined #git
16:38 sarri joined #git
16:38 sarri joined #git
16:43 BlackMaria joined #git
16:44 Derperperd joined #git
16:45 rominronin joined #git
16:49 jnavila_ joined #git
16:50 mischat joined #git
16:50 hahuang61 joined #git
16:51 sq-one joined #git
16:52 kexmex joined #git
16:52 ismaris-tmp joined #git
16:52 ecuanaso joined #git
16:52 kexmex Hey guys. What's a good merge strategy when using Feature branches? Should parent branch be merged into Feature branch and then FF into Parent ?
16:53 grawity I don't see any point in that, over just merging feature into parent directly
16:53 moritz and if you want to avoid merge conflicts, you could rebase the feature branch first, and then merge with --no-ff
16:53 cbreak kexmex: sounds bad, I'd recommend against that strongly
16:53 cbreak kexmex: instead, merge with --no-ff
16:53 kexmex well if feature branch was already pushed to remote
16:54 cbreak that'd at least give you consistent parent ordering
16:54 kexmex how do i rebase? currently i am rebasing on top of Parent branch and force pushing
16:54 manuelschneid3r joined #git
16:54 kexmex but I lose dates etc
16:54 grawity rewriting feature branches isn't uncommon
16:54 kexmex I like it except for loss of dates
16:54 kexmex it all comes out with current date :(
16:55 moritz that sounds wrong
16:55 kexmex i do something like:  git pull origin ver_2.0.2 --rebase
16:55 kexmex git push --force-with-lease
16:55 miczac joined #git
16:56 GodGinrai joined #git
16:56 kexmex I like rebase because then I don't get that fugly tree
16:57 kexmex it's horrible
16:57 venmx joined #git
16:57 kexmex also less merge conflicts it seems
16:58 johnmilton joined #git
16:59 kexmex cbreak : isn't --no-ff  default?
17:00 cbreak no
17:00 watabou joined #git
17:00 Bin4ry joined #git
17:01 kexmex so if I merge all the time
17:01 kexmex then commit history on version branch will always be like   "merge...merge....merge"
17:01 kexmex and the diff there will be for all commits from feature bundled in one
17:01 kexmex no?
17:01 kexmex doesn't that suck if you want to see changes for a particular version?
17:04 mizu_no_oto joined #git
17:04 hasc joined #git
17:06 raspado joined #git
17:07 cbreak no need to merge all the time
17:07 cbreak feature branches get merged into master exactly once
17:07 cbreak when the feature is done
17:08 cdg joined #git
17:10 buckowski joined #git
17:10 grayjoc joined #git
17:11 peeps[lappy] joined #git
17:11 cdg joined #git
17:13 Vampire0_ joined #git
17:13 nidr0x joined #git
17:14 rominron_ joined #git
17:15 robattila256 joined #git
17:15 sarbs joined #git
17:16 menip joined #git
17:16 miczac joined #git
17:18 thebird joined #git
17:20 Afforess joined #git
17:20 Bin4ry joined #git
17:21 mathematic-alpha joined #git
17:21 chipotle joined #git
17:23 mda1 joined #git
17:24 snowalpaca joined #git
17:26 ffilozov joined #git
17:27 mischat joined #git
17:27 User458764 joined #git
17:27 rmbeer joined #git
17:27 rmbeer hello
17:28 rmbeer the git have any method for save info where this cut power?
17:29 ffilozov rmbeer, I don't understand your question.
17:30 diogenese joined #git
17:32 rmbeer where my machine cut power with git working
17:32 BlackMaria joined #git
17:32 dimi1947 joined #git
17:32 ac3takwas joined #git
17:33 ffilozov You lost power while git was doing something?
17:33 Gustavo6046 joined #git
17:35 dimi1947 I assume this is the correct command to squash/combine two commits:pick b76d157 b
17:35 dimi1947 s a931ac7 c (b and c are respective commit messages)
17:37 ffilozov dimi1947, Yes.
17:37 Armin` joined #git
17:38 kadoban rmbeer: What was git doing when power got cut? What has gone wrong because of that? What problem are you seeing?
17:38 dimi1947 ffilozov:before attemtping it I would like to ask how I will insure that the new commit gets a new message?
17:38 dimi1947 a new description
17:38 ffilozov dimi1947, It will ask you.
17:39 dimi1947 ffilozov:ok..thanks
17:39 ffilozov All the things that have been squashed will be shown to you, and you'll be able to enter a new commit message.
17:40 rmbeer kadoban, nothing, not view nothing... unknown if must have any problem...
17:41 kadoban rmbeer: Then I don't understand what you're asking.
17:41 dimi1947 ffilozov:how am I acually going to execute the command in the editor?
17:42 ffilozov Which command?
17:42 rmbeer kadoban, is best the prevention that the remedy...
17:43 dimi1947 the squash command I typed above
17:43 BlessJah joined #git
17:43 dimi1947 how this is executed?
17:43 ffilozov Have you ever done an interactive rebase?
17:44 rmbeer i have a unstable machine, and have more possibility of make a chaos in the information...
17:44 kadoban rmbeer: Okay. But I still have little idea what you're asking.
17:44 iLembus_ joined #git
17:44 dimi1947 yes...but it's been a while and I cannot remember
17:44 PioneerAxon joined #git
17:44 rmbeer always cut the power.....
17:44 ffilozov dimi1947, I would recommend looking at a tutorial before you do that.
17:44 ffilozov Otherwise, you might get confused.
17:45 pur3eval joined #git
17:45 rmbeer kadoban, for example, in one cut i just save a .txt in the edit text, result? make a 0 byte in the .txt and lost all information
17:46 ffilozov Essentially, you don't execute the squash command. You choose what you want to be done to your commits, and you exit the editor, and git will do it for you.
17:46 kadoban rmbeer: That's really up to your editor more than git.
17:46 rmbeer now make a copy of security in the property
17:48 rmbeer kadoban, yes, but git also can have the problem if not make a copy of security where working with files and cut power in the same time...
17:49 prg3 joined #git
17:50 tusharmalik joined #git
17:51 dimi1947 ffilozov:I cannot exit the editor...I press esq and nothing happens
17:51 ffilozov dimi1947, I'm not sure which edit you're using.
17:51 dimi1947 ffilozov:VIM
17:52 ffilozov dimi1947, How did you set git to use vim if you don't know vim?
17:53 dimi1947 ffilozov:I do not remember
17:53 ffilozov I'm no vim expert, but you can write and quit with :wq
17:56 eblip joined #git
17:56 User458764 joined #git
17:56 raspado joined #git
18:00 rmbeer left #git
18:00 svm_invictvs joined #git
18:01 DBag joined #git
18:01 DBag left #git
18:01 lhx left #git
18:01 vuoto joined #git
18:04 eroux joined #git
18:05 Taikibansei joined #git
18:05 Murii joined #git
18:06 armyriad joined #git
18:09 mohabaks joined #git
18:09 Derperperd joined #git
18:10 mohabaks left #git
18:11 User458764 joined #git
18:13 xRob_ joined #git
18:13 xRob_ Yo #git.
18:14 xRob_ I'm new to git, and reading Pro Git. I just don't understand the difference the 'snapshot of filesystem' git approach versus the 'change of files' in other VCSs?
18:17 zzz joined #git
18:21 ffilozov xRob_, Each git commit doesn't just store a delta that it applies to it's parent.  Each one stores all the data that was there when you made the commit.
18:21 ffilozov its*
18:22 ffilozov Even if you destroy the parent commits, that wouldn't affect the child.
18:23 xRob_ Interesting.
18:24 xRob_ I guess saving the entire program again, instead of the change of the file, doesn't have too much overhead?
18:24 ffilozov It's clever. It reuses the same data objects the parent commit use.
18:24 bremner internally git uses delta compression as well
18:25 xRob_ What about time?
18:25 ffilozov But it duplicates those that have been changed, and then it may do some optimization that bremner mentioned.
18:25 xRob_ It seems that VCSs store different version of a file by changes, not time...
18:27 bremner time is not very meaningful (or at least quite hard to make meaningful) in a distributed system
18:27 Tobbi joined #git
18:27 xRob_ true
18:29 dreiss joined #git
18:30 Taikibansei joined #git
18:33 zzz joined #git
18:33 iLembus joined #git
18:33 dsdeiz joined #git
18:33 dsdeiz joined #git
18:35 justan0theruser joined #git
18:37 zzz joined #git
18:38 bluepixel joined #git
18:38 EV3RYDAYPR0GRESS joined #git
18:39 matoro joined #git
18:43 math-alpha joined #git
18:44 saedelaere joined #git
18:45 saedelaere joined #git
18:45 daemoneye joined #git
18:45 dave0x6d joined #git
18:51 hahuang61 joined #git
18:51 kexmex cbreak : why into master and not version branch?
18:51 kexmex i thought we merge feature branch into version branch and once version is released it gets merged to master?
18:52 kexmex yea that's what i meant, it gets merged exactly once so all change history from the branch is condensed into one commit
18:52 Raed joined #git
18:55 Lyqyd joined #git
18:55 dviola joined #git
18:56 JanC_ joined #git
18:58 mischat joined #git
19:07 m4sk1n joined #git
19:09 kiltzman joined #git
19:10 pks joined #git
19:11 kiltzman joined #git
19:12 kiltzman joined #git
19:13 kiltzman joined #git
19:14 dsdeiz joined #git
19:14 kiltzman joined #git
19:15 kiltzman joined #git
19:16 medeirosthiiago joined #git
19:17 kiltzman joined #git
19:17 xaviergmail_ joined #git
19:21 kent\n joined #git
19:22 jnavila_ joined #git
19:25 BSaboia joined #git
19:28 sagerdearia joined #git
19:28 dviola joined #git
19:29 matoro joined #git
19:29 MarioBranco joined #git
19:29 pur3eval joined #git
19:32 mda1 joined #git
19:35 atomi joined #git
19:40 variable joined #git
19:42 flavius joined #git
19:45 dendazen joined #git
19:46 raynold joined #git
19:46 jimi_ joined #git
19:49 Dougie187 joined #git
19:49 User458764 joined #git
19:49 matoro joined #git
19:52 Darren_ joined #git
19:55 Noldorin joined #git
19:56 learning joined #git
19:59 mischat joined #git
20:02 zzz joined #git
20:03 Vampire0 joined #git
20:05 User458764 joined #git
20:13 dviola joined #git
20:16 Taikibansei joined #git
20:17 MineCoins joined #git
20:17 Ryanar joined #git
20:17 venmx joined #git
20:18 Ryanar joined #git
20:18 crawler joined #git
20:19 scoobertron joined #git
20:21 acetakwas joined #git
20:21 acetakwas joined #git
20:24 NeverDie joined #git
20:25 physikoi joined #git
20:25 ozmage joined #git
20:26 physikoi hello #git. Why should conflicts ever happen with "dist" files; that is, why would there be conflicts with merged production files, but not merged development files?
20:28 ecuanaso joined #git
20:28 nedbat physikoi: what is a dist file?
20:29 rgrinberg joined #git
20:30 physikoi nedbat: prodution file? EG, you've got a file file.css that is transformed by your build process into file.min.css. File.min.css would be a "dist" file. Named so simply because it lives in a directory called "dist".
20:30 hhee joined #git
20:30 bremner generally, you should not version control build output
20:31 pks joined #git
20:32 physikoi bremner: ok, i'm all ears. But, what is best practice? Some of the most used projects on GitHub include production ready files. What are they doing differently?
20:34 Vampire0 joined #git
20:35 bremner minified files are effectively binary, in terms of how well they merge.
20:35 ozmage_ joined #git
20:36 MattMaker joined #git
20:36 svm_invictvs joined #git
20:36 mda1_ joined #git
20:36 denisMone joined #git
20:37 bremner the best strategy (if you insist on checking in non-mergeable things) is never to need a merge; !deploy may have some hints
20:37 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
20:37 MattMaker joined #git
20:39 b100s joined #git
20:39 DolpheenDream joined #git
20:40 iLembus_ joined #git
20:43 physikoi bremner: thanks again for your input. I'm actually not insisting on anything, just trying to figure out best practice.
20:43 iLembus__ joined #git
20:43 physikoi I'm checking your provided reference now.
20:45 pur3eval joined #git
20:47 UTAN_dev_ joined #git
20:51 hahuang61 joined #git
20:52 snowalpaca joined #git
20:53 matoro joined #git
20:56 User458764 joined #git
20:59 shgysk8zer0_ joined #git
21:00 ecuanaso joined #git
21:00 acetakwas joined #git
21:00 mischat joined #git
21:03 gtristan joined #git
21:05 bomb-on joined #git
21:06 NumberStation08 joined #git
21:07 Guest9 joined #git
21:08 diogenese joined #git
21:10 netj joined #git
21:11 cagmz joined #git
21:15 theoceaniscool joined #git
21:19 dreiss joined #git
21:19 iLembus_ joined #git
21:20 Khisanth joined #git
21:21 Ovsyanka joined #git
21:23 trip joined #git
21:24 ynazarov joined #git
21:28 sim590 joined #git
21:28 kaldoran joined #git
21:32 ratdeptrai joined #git
21:35 Murii joined #git
21:39 ynazarov joined #git
21:43 ynazarov joined #git
21:43 crawler joined #git
21:45 NeverTired joined #git
21:45 lowercaseman joined #git
21:46 pur3eval joined #git
21:47 wcpan joined #git
21:47 bmahe joined #git
21:47 netj joined #git
21:55 troulouliou_dev joined #git
21:58 variable joined #git
21:58 DolpheenDream joined #git
22:01 User458764 joined #git
22:01 mischat joined #git
22:02 tristanp joined #git
22:02 Rodya_ joined #git
22:03 physikoi is there someway for git diff to only printout code removals?
22:03 thiago no
22:03 thiago you can grep the parts you want or you don't want
22:04 physikoi thiago: darn. thanks
22:07 rivarun joined #git
22:10 thiago what are you trying to do?
22:11 dminuoso joined #git
22:15 wilbert joined #git
22:17 venmx joined #git
22:18 physikoi thiago: sorry, didn't see reply. I'm working on an experiment. Basically, I'm exploring how to compare the config template of project's latest major release with that of a user's config file associated with a previous major release.
22:18 physikoi This, say, script would be part of said project's development tools
22:19 physikoi i think i just thought of an easier way tho
22:22 hahuang61 joined #git
22:25 paultreny joined #git
22:26 Guest75078 joined #git
22:26 mand0 joined #git
22:28 zzz_ joined #git
22:30 User458764 joined #git
22:31 deinspanjer joined #git
22:33 xaviergmail_ joined #git
22:34 overlord_tm joined #git
22:37 dave0x6d joined #git
22:37 jagob joined #git
22:39 ramsub07 joined #git
22:42 nowhereman joined #git
22:42 mda1 joined #git
22:44 Doow joined #git
22:45 physikoi left #git
22:46 lowercaseman joined #git
22:47 pur3eval joined #git
22:47 User458764 joined #git
22:52 mjbeswick joined #git
22:52 glspi joined #git
22:53 cdg joined #git
22:55 peeps[lappy] joined #git
22:57 peeps[lappy] hi, i want to clone from a local repository but it says the repository doesn't exist
22:58 boombatower joined #git
22:58 ybden left #git
23:01 fmeerkoetter joined #git
23:02 miczac joined #git
23:03 bmahe joined #git
23:03 crawler joined #git
23:03 mischat joined #git
23:04 thiago peeps[lappy]: don't doubt git
23:04 thiago if it tells you that the path you gave is not a git repository, it isn't
23:04 Sapio joined #git
23:04 thiago check the path
23:04 peeps[lappy] ok, yeah i just realized my mistake
23:05 cdown joined #git
23:06 Sapio I just downloaded the git tools and am learning how to use Git Bash. I've set my name and e-mail on the config. I also have an account on Github. One thing I'm not clear on is, how to I create a remote repository under my account in Github?
23:06 wachpwnski-mobi joined #git
23:06 thiago Sapio: using your web browser
23:06 Peuc joined #git
23:06 Sapio I see. I thought there would have been a way to do this via cmd line.
23:07 Sapio This is probably why no tutorials mentioned setting up a password on the config file.
23:07 thiago Sapio: GitHub is not git
23:08 thiago Sapio: that's a website that provides some services.
23:09 Sapio I'm still trying to understand all this. So Github is just a front end for Git (which is a backend service)?
23:12 thiago no
23:12 thiago GitHub is a website
23:14 WaReZ joined #git
23:16 nedbat Sapio: you can o it from the command line too, if you get the "hub" command-line tool
23:16 nedbat *do it
23:16 Atm0spher1c joined #git
23:17 kiltzman joined #git
23:17 kiltzman joined #git
23:18 kiltzman joined #git
23:19 kiltzman joined #git
23:20 fragMental joined #git
23:20 Sapio Interesting, git push -u origin master asks me for my github login even though I'm already logged into the website.
23:21 kiltzman joined #git
23:21 DolpheenDream joined #git
23:21 thiago git doesn't care about your web browser
23:21 kiltzman joined #git
23:21 OR joined #git
23:23 theoceaniscool joined #git
23:25 User458764 joined #git
23:25 dviola joined #git
23:25 cyberz joined #git
23:28 a3Dman joined #git
23:32 webdev007 joined #git
23:34 MattMaker joined #git
23:37 zulutango joined #git
23:40 wilbert Sapio: you need to have some sort of credential manager outside of your browser ala OS X keychain, gnome-keyring, etc.
23:40 wilbert Sapio: that's what git ends up hitting
23:40 wilbert Sapio: github provides a public place to host git repositories among other project related things like issue tracking, wiki's, etc.
23:42 miczac joined #git
23:43 UTAN_dev joined #git
23:43 xaviergmail_ joined #git
23:44 Sapio Thanks for the clarification everyone. Now I'm just trying to wrap my head around branches.
23:45 mand0 joined #git
23:47 User458764 joined #git
23:48 pur3eval joined #git
23:55 deinspanjer joined #git
23:57 rivarun joined #git

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