Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-02

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

All times shown according to UTC.

Time Nick Message
00:00 Rodya_ joined #git
00:01 de-facto joined #git
00:04 ozmage joined #git
00:06 dreiss joined #git
00:06 ozmage_ joined #git
00:06 unbalancedparen joined #git
00:10 darkmist_ joined #git
00:14 nowhere_man joined #git
00:14 mizu_no_oto joined #git
00:19 svm_invictvs joined #git
00:19 matoro joined #git
00:20 tmsmith joined #git
00:21 sunrunner20 joined #git
00:24 zulutango joined #git
00:24 luke_nukem joined #git
00:26 navidr joined #git
00:30 jeffreylevesque joined #git
00:33 theiostream joined #git
00:34 jameser joined #git
00:34 MarioBranco joined #git
00:35 zeroed joined #git
00:38 johnny56 joined #git
00:43 raijin joined #git
00:46 thebope joined #git
00:46 porfiriopaiz joined #git
00:50 peterbecich joined #git
00:50 Emperor_Earth joined #git
00:56 safe joined #git
00:57 sarbs joined #git
00:59 cyphase joined #git
01:00 telephone joined #git
01:00 telephone joined #git
01:00 aw1 joined #git
01:01 aw1 joined #git
01:06 raijin joined #git
01:10 pionen joined #git
01:11 souther joined #git
01:11 mpeter joined #git
01:13 SwiftMatt joined #git
01:14 maroloccio joined #git
01:20 Taikibansei joined #git
01:22 marianina8 joined #git
01:22 aidalgol joined #git
01:22 brokensyntax joined #git
01:23 cyberz joined #git
01:24 fstd__ joined #git
01:25 Cabanossi joined #git
01:29 Atm0spher1c joined #git
01:30 pks joined #git
01:31 dave0x6d joined #git
01:35 Wulf4 joined #git
01:40 sunri5e joined #git
01:40 pks joined #git
01:40 thebope joined #git
01:42 nckpz joined #git
01:49 ilbot3 joined #git
01:49 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.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:51 gugah joined #git
01:52 Gsham joined #git
01:54 sunrunner20 joined #git
01:55 a_thakur joined #git
01:55 Cabanossi joined #git
01:57 mizu_no_oto joined #git
01:58 d^sh joined #git
02:01 raynold joined #git
02:01 theiostream joined #git
02:02 Vortex34 joined #git
02:04 nd_ joined #git
02:07 Gsham joined #git
02:09 venmx joined #git
02:12 jameser joined #git
02:17 lagothrix joined #git
02:21 andrew710 joined #git
02:21 Goplat joined #git
02:22 hexagoxel joined #git
02:25 jameser joined #git
02:30 orbyt_ joined #git
02:31 a_thakur joined #git
02:34 thebope joined #git
02:35 zeroed joined #git
02:35 zeroed joined #git
02:35 jameser joined #git
02:38 chachasmooth joined #git
02:39 xall joined #git
02:41 livingstn joined #git
02:45 kbs joined #git
02:48 duderonomy joined #git
02:49 steeze joined #git
02:49 dnukem joined #git
02:53 mizu_no_oto joined #git
02:54 Cabanossi joined #git
02:59 Vortex35 joined #git
03:03 pks joined #git
03:06 ojdo joined #git
03:07 Oatmeal joined #git
03:08 catch22 joined #git
03:10 HoierM joined #git
03:11 justanotheruser joined #git
03:14 raijin joined #git
03:16 armyriad joined #git
03:23 bmahe joined #git
03:24 dsdeiz joined #git
03:24 dsdeiz joined #git
03:25 Cabanossi joined #git
03:25 SwiftMatt joined #git
03:27 a_thakur joined #git
03:28 Vaelatern joined #git
03:28 thebope joined #git
03:29 Vaelatern joined #git
03:29 madgoat joined #git
03:31 madgoat left #git
03:34 Vaelatern joined #git
03:35 de-facto left #git
03:40 dreiss joined #git
03:41 hvxgr joined #git
03:43 oskarkv joined #git
03:44 catch22_ joined #git
03:45 bmahe joined #git
03:45 kegster joined #git
03:46 thebope joined #git
03:48 bmahe joined #git
03:49 luke_nukem_ joined #git
03:50 rchavik joined #git
03:51 thebope_ joined #git
03:53 mog_ joined #git
03:54 Cabanossi joined #git
03:54 mog_ left #git
04:00 learning joined #git
04:01 cyberz joined #git
04:02 tmsmith joined #git
04:13 SrPx joined #git
04:13 SrPx How can I copy the markdown of a github issue?
04:15 thebope joined #git
04:19 xall_ joined #git
04:20 dsdeiz joined #git
04:21 aboccia joined #git
04:23 Ph_ joined #git
04:23 Cabanossi joined #git
04:24 mizu_no_oto joined #git
04:25 raatiniemi joined #git
04:25 Andre_work joined #git
04:25 dsdeiz_ joined #git
04:25 Duality joined #git
04:25 Ovsyanka joined #git
04:26 dan2k3k4 joined #git
04:26 chadi joined #git
04:26 monty joined #git
04:28 tristanp joined #git
04:28 Takumo joined #git
04:28 Takumo joined #git
04:29 bronson joined #git
04:29 hanthings_ joined #git
04:32 jj- joined #git
04:32 j416 joined #git
04:33 rigid joined #git
04:33 rigid joined #git
04:33 WebDawg joined #git
04:33 vamiry joined #git
04:33 steeze joined #git
04:33 jerkey joined #git
04:35 tmg joined #git
04:35 zeroed joined #git
04:35 zeroed joined #git
04:36 nemesit|znc joined #git
04:36 blunaxela joined #git
04:37 MarioBranco joined #git
04:38 Nilesh_ joined #git
04:39 MarioBranco joined #git
04:41 zumba_addict joined #git
04:42 zumba_addict hey folks. I ran git config user.name and also user.email pointing to another account but when I git push, it's using my other account. I also ran `git commit --amend --reset-author` before I ran git push. What am I missing?
04:42 jameser joined #git
04:42 chu joined #git
04:42 zumba_addict .git/config is showing the correct one on my project
04:43 kbeflo joined #git
04:44 zumba_addict searched the project dir and I'm wondering why my other account I don't want to used is getting used
04:44 zumba_addict maybe because I ran git init first before I ran git config user.email/name?
04:45 zumba_addict i'll rm -rf .git directory and I'll retry
04:46 zumba_addict still failed. Still using my other account
04:47 matoro joined #git
04:53 theiostream joined #git
04:57 peltmac joined #git
04:59 causasui joined #git
04:59 zumba_addict can't figure it out. It's not using .git/config settings :(
04:59 jstimm joined #git
05:00 govg joined #git
05:02 learning joined #git
05:03 zumba_addict I think I know why. The git tool will assume if id_rsa exists in ~/.ssh/config. That's bad :(
05:04 thiago zumba_addict: git push does not use user.email account
05:04 thiago the account is selected by the remote's URL
05:04 zumba_addict I was right! It was using it. I renamed it and see what I got now - no such identity: /Users/neil/.ssh/iid_rsa: No such file or directory
05:04 thiago what is the URL you're pushing to?
05:05 zumba_addict https://github.com/v1rt/master-server-urls
05:05 thiago that's not SSH
05:05 zumba_addict it's not but it's using ~/.ssh/config configuration
05:05 thiago no, it's not
05:05 thiago ~/.ssh/config is for SSH. Your URL is HTTPS.
05:06 rtrsnd joined #git
05:06 thiago so you must be mistaken somewhere
05:06 zumba_addict I changed /Users/neil/.ssh/id_rsa entry in .git/config  to /Users/neil/.ssh/iid_rsa and then i reran git push -u origin master. See error above
05:07 thiago confirm the URL
05:07 thiago run git remote -v
05:07 zumba_addict originssh://git@github.com/v1rt/master-server-urls.git (fetch)
05:07 zumba_addict and originssh://git@github.com/v1rt/master-server-urls.git (push)
05:07 thiago there you go, it's SSH
05:08 thebope joined #git
05:08 zumba_addict I just shared the https of the project I was working on
05:08 thiago yeah, but that was not the question I asked
05:08 zumba_addict oh
05:08 thiago I asked what URL you were pushing to
05:08 zumba_addict ah, you're right :)
05:08 thiago anyway, the SSH key that ssh will use is determined by ~/.ssh/config
05:08 thiago Git is not involve
05:08 zumba_addict yeah which i don't have
05:08 thiago involved
05:09 zumba_addict i only have an ssh key for my other account
05:09 zumba_addict so I guess, I will have to add another entry in .ssh/config
05:09 thiago do you have two GitHub accounts?
05:09 zumba_addict yes
05:09 thiago ok, you need to distinguish by using two different hostnames
05:10 thiago add a Host entry with a name like "work-github"
05:10 zumba_addict ok, how do I do that in the config
05:10 zumba_addict ah
05:10 thiago set HostName and IdentityFile in that
05:10 zumba_addict got it
05:10 msonntag joined #git
05:10 thiago then change your remote URL to ssh://work-github/v1rt/master-server-urls.git
05:10 zumba_addict neat! awesome!
05:10 zumba_addict learned something new tonight! woohoo! Thanks thiago
05:11 thiago you're welcome
05:12 zumba_addict can I also make the change in github so that everytime I create a new project, it will use work-github?
05:12 thiago that I can't help you with
05:12 thiago that's a GitHub question, not a Git question
05:12 zumba_addict or will i always have to do git remote add origin https://work-github/v1rt/master-server-urls.git
05:12 zumba_addict for every new project
05:16 TbobbyZ joined #git
05:19 zumba_addict fyi thiago, I was able to push it
05:23 matoro joined #git
05:24 Cabanossi joined #git
05:24 TbobbyZ joined #git
05:25 rtrsnd left #git
05:26 d^sh joined #git
05:29 TbobbyZ joined #git
05:34 MrWoohoo joined #git
05:38 learning joined #git
05:46 ayogi joined #git
05:53 cyberz joined #git
05:57 a_thakur joined #git
05:59 Murii joined #git
06:00 diogenese joined #git
06:00 overlord_tm joined #git
06:00 dermoth joined #git
06:01 a_thakur joined #git
06:02 dvaske joined #git
06:02 zefferno joined #git
06:05 zefferno joined #git
06:20 Oatmeal joined #git
06:22 a_thakur joined #git
06:24 Cabanossi joined #git
06:28 TbobbyZ joined #git
06:28 ayogi joined #git
06:31 zefferno joined #git
06:32 nivag joined #git
06:38 dvaske joined #git
06:41 gtristan joined #git
06:45 jagob joined #git
06:47 Shakeel_ joined #git
06:48 mar77i joined #git
06:48 durham joined #git
06:48 durham joined #git
06:51 shinnya joined #git
06:54 Cabanossi joined #git
07:12 socxon joined #git
07:13 pks joined #git
07:18 YuGiOhJCJ joined #git
07:19 saedelaere joined #git
07:23 Cabanossi joined #git
07:23 ToxicFrog joined #git
07:30 Levex joined #git
07:30 mkoskar joined #git
07:34 a_thakur joined #git
07:38 planigan joined #git
07:48 Levex joined #git
07:53 Cabanossi joined #git
07:56 MarioBranco joined #git
07:58 flaguy48_ joined #git
08:02 jameser joined #git
08:03 cyberz joined #git
08:04 theoceaniscool joined #git
08:05 schleppel joined #git
08:08 jnavila joined #git
08:10 kegster joined #git
08:13 prg3 joined #git
08:13 a_thakur joined #git
08:15 drodger joined #git
08:16 jnavila joined #git
08:17 Murii joined #git
08:17 cyberz joined #git
08:18 mar77i joined #git
08:18 johnny56 joined #git
08:19 h12o joined #git
08:23 zeroed joined #git
08:25 Eragon joined #git
08:26 amrits joined #git
08:26 fahadash joined #git
08:28 Levex joined #git
08:29 anuxivm joined #git
08:30 peacememories joined #git
08:31 julius left #git
08:34 zerow joined #git
08:35 DistantStar joined #git
08:37 anuxivm left #git
08:37 TomyLobo2 joined #git
08:38 j08nY joined #git
08:41 rokups joined #git
08:48 kexmex joined #git
08:50 Masber joined #git
08:50 anuxivm joined #git
08:50 vrach joined #git
08:56 scoobertron joined #git
08:58 jameser joined #git
08:59 Tobbi joined #git
09:00 h12o joined #git
09:06 diogenese joined #git
09:12 xaa joined #git
09:14 acbg joined #git
09:15 t0by joined #git
09:15 t0by joined #git
09:18 robotroll joined #git
09:20 digidog joined #git
09:23 h12o joined #git
09:24 Levex joined #git
09:24 dnukem joined #git
09:26 kegster joined #git
09:29 adymitruk joined #git
09:29 sarbs joined #git
09:32 govg joined #git
09:33 tymczenko joined #git
09:33 catsup joined #git
09:34 mar77i_ joined #git
09:34 catsup joined #git
09:39 Jackneill joined #git
09:43 wget joined #git
09:43 borkr joined #git
09:44 lmatteis joined #git
09:45 jnavila joined #git
09:45 Jackneill_ joined #git
09:46 ethali joined #git
09:47 dersand joined #git
09:48 paul424 joined #git
09:52 bket joined #git
09:56 learning joined #git
09:57 TheWild joined #git
09:57 TheWild hello
09:59 TheWild suppose: `git pull`. It points out that I have uncommited changes with which git pull conflicted. I don't care about them. `git reset --hard`. Then my internet connection is down.
10:00 TheWild now what? Did git pull download up-to-date repository. If so, what is the way to go to the highest commit?
10:01 m0viefreak joined #git
10:01 immae TheWild: yes, it's already downloaded, now you can do simply a git merge
10:05 immae by default, "git pull <remote> <branch>" is roughly (exactly?) equivalent to "git fetch <remote>" + "git merge <remote>/<branch>", and the first command has already ran the first time, so only the second remains and it doesn't need an internet connection
10:06 TheWild but I don't want to merge. The changes that prevented proper git pull we're done by me to just test something and I don't care about them.
10:06 immae so I don"t understand what you want to do
10:06 cbreak TheWild: just git merge
10:07 cbreak if you want what pull would give you, merge @{u}
10:07 cbreak or specify the tracking branch: origin/foobar (or what ever)
10:07 chadi joined #git
10:08 khmarbaise joined #git
10:08 Cabanossi joined #git
10:10 TheWild yay, it worked!
10:10 TheWild cbreak, immae: thank you very much
10:11 dumacdev joined #git
10:11 a_thakur joined #git
10:11 mehola joined #git
10:12 zulutango joined #git
10:12 a_thakur joined #git
10:12 aether11 joined #git
10:12 King_Hual joined #git
10:16 ankit01ojha joined #git
10:17 Acerific joined #git
10:17 Acerific joined #git
10:19 King_Hual joined #git
10:20 joki joined #git
10:25 acetakwas joined #git
10:25 TheWild another question: if HEAD hashes are equal of two repositories and `git status` doesn't show any modifications of neither tracked nor untracked files, can I safely assume that contents of all files are equal?
10:28 zeroed joined #git
10:28 zeroed joined #git
10:30 YuGiOhJCJ joined #git
10:36 manuelschneid3r joined #git
10:37 h12o joined #git
10:38 cbreak TheWild: on all files that are in HEAD
10:38 cbreak TheWild: there could be other branches that are not the same
10:38 jameser joined #git
10:38 TheWild ok, fine. thanks.
10:40 joki joined #git
10:45 byte512 joined #git
10:50 Vampire0 TheWild, and you only look at unignored untracked files
10:50 romancer joined #git
10:51 Vampire0 TheWild, you need to tell git status to also show ignored files and then still none should be shown for making sure the files are all identical
10:55 Eryn_1983_FL joined #git
10:56 midnightmagic joined #git
10:59 TheWild I have one repository that I cloned long time ago and over time did `git pull` a couple of times. Today I did again `git pull` of old repository, but also cloned the repository from the same source to another directory.
11:00 TheWild Fact is that `git rev-list --all --parents` of both has equal beginnings and ends, but middle differs slightly.
11:03 telephone joined #git
11:03 telephone joined #git
11:04 TheWild got it. There are few branches that were removed from official repository, but I still have them locally.
11:04 TheWild heh, still learning git.
11:07 h12o joined #git
11:11 govg joined #git
11:11 Gustavo6046 joined #git
11:13 robotroll joined #git
11:13 Zialus joined #git
11:14 Ryanar joined #git
11:19 a_thakur joined #git
11:20 elsevero joined #git
11:22 henriknj joined #git
11:23 cyberz joined #git
11:23 Cabanossi joined #git
11:25 zxd joined #git
11:25 zxd hi
11:26 zxd it says MERGE_HEAD contains commit of the other branch we are merging in, what if a merge contains more than 1 commit
11:26 zxd what will MERGE_HEAD contain
11:33 byte512 joined #git
11:35 _ng joined #git
11:37 zxd omg, git with attitude: arning: read-tree: emptying the index with no arguments is deprecated; use --empty fatal: just how do you expect me to merge 0 trees?
11:37 zxd Warning*
11:40 roby10 joined #git
11:40 amrits joined #git
11:41 Darcidride joined #git
11:41 peacememories joined #git
11:42 midnightmagic joined #git
11:42 gtristan joined #git
11:45 peacememories joined #git
11:46 h12o joined #git
11:48 oskarkv joined #git
11:51 idmistir joined #git
11:51 idmistir joined #git
11:52 acbg joined #git
11:52 aard_ joined #git
11:56 timmah_ joined #git
11:59 cvcxc joined #git
12:00 nowhere_man joined #git
12:01 dtbn joined #git
12:03 theiostream joined #git
12:04 wget_ joined #git
12:04 matt__ joined #git
12:06 courrier joined #git
12:08 Cabanossi joined #git
12:11 Darcidride joined #git
12:16 h12o joined #git
12:35 overlord_tm joined #git
12:36 h12o joined #git
12:36 jozwior joined #git
12:38 fakenerd joined #git
12:43 miczac joined #git
12:44 Rodya_ joined #git
12:46 tinanoo joined #git
12:46 Gsham joined #git
12:49 dtbn joined #git
12:53 fakenerd joined #git
12:54 Cabanossi joined #git
12:55 wget joined #git
12:55 wget joined #git
13:03 roby10_ joined #git
13:05 aw1 joined #git
13:05 h12o joined #git
13:06 hvxgr joined #git
13:07 xall_ joined #git
13:11 Gsham joined #git
13:16 miklcct_ joined #git
13:17 learning joined #git
13:18 HoierM joined #git
13:21 theiostream joined #git
13:24 Cabanossi joined #git
13:25 a3Dman joined #git
13:25 h12o joined #git
13:26 teprrr joined #git
13:32 teprrr hi, any ideas how to start tackling this problem: https://gist.github.com/anonymous/cff9a7bea7efcc915fd8b8de68069fd4 ?
13:32 teprrr communication over https doesn't work at all. error:0B06A041:x509 certificate routines:build_chain:malloc failure
13:32 SCHAAP137 joined #git
13:32 Taikibansei joined #git
13:34 teprrr git-remote-https seems to be linked against both openssl 1.0 and 1.1. the 1.1 is used by openssl client tool, and it's working just fine
13:34 theiostream joined #git
13:34 xall_ joined #git
13:35 Starky joined #git
13:36 Ploppz joined #git
13:37 bitmod_ joined #git
13:38 a3Dman joined #git
13:39 rominronin joined #git
13:40 govg joined #git
13:41 Ploppz I cloned a repo with several submodules and did some work inside one of the submodules. In the root dir, `git diff` writes things like: https://bpaste.net/show/ae83f867a38c - does this mean that there is actually something to commit in the root dir? or is it sufficient to commit in the submodule and push to remote? I see that `.gitmodules` doesn't have any information on what branch is used
13:41 theiostream joined #git
13:42 robotroll joined #git
13:43 jozwior joined #git
13:50 aw1 joined #git
13:51 livingstn joined #git
13:53 Tobbi Hey. Just wondering: What does HEAD^^ refer to? I am specifically asking about those "^^"'s
13:55 h12o joined #git
13:55 immae Tobbi: each ^ search for the parent, so here: grand-parent commit of HEAD
13:57 rudi_s Tobbi: man gitrevisions for details
13:57 gitinfo Tobbi: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
13:57 theiostream joined #git
13:58 Tobbi Ah, thanks.
13:58 livingstn joined #git
14:00 dendazen joined #git
14:03 marianina8 joined #git
14:04 Masber joined #git
14:07 Levex joined #git
14:07 dave0x6d joined #git
14:10 Darcidride joined #git
14:10 livingstn joined #git
14:13 Muzer joined #git
14:13 Noldorin joined #git
14:14 theiostream joined #git
14:19 eahmedshendy joined #git
14:21 felixjet joined #git
14:21 livingstn joined #git
14:24 Cabanossi joined #git
14:24 h12o joined #git
14:26 leeN joined #git
14:26 Mjeh0 joined #git
14:30 theiostream joined #git
14:32 Rodya_ joined #git
14:34 livingstn joined #git
14:34 fstd__ left #git
14:36 rominron_ joined #git
14:37 dave_uy joined #git
14:38 Silenced joined #git
14:38 dave_uy joined #git
14:40 Silenced joined #git
14:40 theiostream joined #git
14:45 livingstn joined #git
14:48 eihabarabia joined #git
14:49 Tobbi joined #git
14:50 publio joined #git
14:51 khmarbaise joined #git
14:51 netj joined #git
14:53 TikityTik joined #git
14:54 h12o joined #git
14:56 crank1988 joined #git
14:56 Xanather joined #git
14:56 Xanather different between .gitignore directory exclude: 'Debug/' vs 'Debug/*' ?
14:57 Xanather difference*
14:59 iamthad joined #git
14:59 thebope joined #git
15:00 rudi_s Xanather: man gitignore - the first ignores everything in the directory "Debug", the second only everything in the first level of "Debug".
15:00 gitinfo Xanather: the gitignore manpage is available at http://jk.gs/gitignore.html
15:00 zxd I don't understand the point of  git merge -s ours  --no-commit    in https://help.github.com/articles/about-git-subtree-merges/   what does git actually change if it dosen't take anything from the merging branch and also not creating any commits
15:00 Darcidride joined #git
15:02 Xanather rudi_s, ahh, okay thanks
15:02 a_thakur joined #git
15:05 a_thakur joined #git
15:08 Cabanossi joined #git
15:09 kbs joined #git
15:12 Khisanth joined #git
15:16 safe joined #git
15:16 a_thakur joined #git
15:17 jozwior joined #git
15:18 madewokherd joined #git
15:19 ethali_ joined #git
15:19 dtbn joined #git
15:21 kexmex joined #git
15:24 h12o joined #git
15:27 alexandre9099 joined #git
15:28 drodger joined #git
15:33 Rodya_ joined #git
15:34 blackwind_123 joined #git
15:35 justanotheruser joined #git
15:36 kjsaihs joined #git
15:40 matoro joined #git
15:40 orbyt_ joined #git
15:42 ankit01ojha joined #git
15:42 shinnya joined #git
15:43 h12o joined #git
15:44 oskarkv_ joined #git
15:47 Rr4sT joined #git
15:49 dirtyroshi joined #git
15:58 mizu_no_oto joined #git
15:58 neuro_sys joined #git
15:58 Tobbi joined #git
16:00 neuro_sys I've realized something about --fixup commits. When I fixup an old commit with, say, a single line, and rebasing them with autosquash, there becomes a merge conflict with changes that were introduced after the commit that is fixed-up against and up until the fixup was made.
16:01 JanC_ joined #git
16:05 a_thakur joined #git
16:07 dreiss joined #git
16:08 gugah joined #git
16:09 ggsmid joined #git
16:10 Acerific joined #git
16:10 Acerific joined #git
16:12 oleo joined #git
16:12 Eragon joined #git
16:13 h12o joined #git
16:13 raynold joined #git
16:15 SwiftMatt joined #git
16:17 learning joined #git
16:20 nowhere_man joined #git
16:22 overlord_tm joined #git
16:27 thiago joined #git
16:28 crank1988 joined #git
16:28 khmarbaise joined #git
16:29 kegster joined #git
16:31 bronson_ joined #git
16:31 ethali joined #git
16:31 exotime joined #git
16:33 h12o joined #git
16:34 Rodya_ joined #git
16:34 exotime joined #git
16:40 kegster joined #git
16:41 rosiu joined #git
16:44 khmarbaise_ joined #git
16:44 khmarbaise_ joined #git
16:46 bitmod_ joined #git
16:47 Lyqyd joined #git
16:50 Achylles joined #git
16:50 raijin joined #git
16:51 ayogi joined #git
16:51 xall_ joined #git
16:51 Atm0spher1c joined #git
16:55 kbeflo joined #git
17:01 SophieG joined #git
17:06 anolir joined #git
17:07 a_thakur joined #git
17:09 Taikibansei joined #git
17:11 cyberz joined #git
17:12 GT4066 joined #git
17:12 h12o joined #git
17:13 codematt joined #git
17:14 miczac joined #git
17:17 roelmonnens joined #git
17:20 cagmz joined #git
17:20 mda1 joined #git
17:21 a3Dman joined #git
17:22 nd joined #git
17:23 Cabanossi joined #git
17:26 codematt joined #git
17:27 blackwind_123 joined #git
17:27 matoro joined #git
17:28 paul424 joined #git
17:28 hahuang61 joined #git
17:28 ToBeFree joined #git
17:33 jozwior joined #git
17:35 XVar joined #git
17:35 nowhere_man joined #git
17:36 Rodya_ joined #git
17:36 Levex joined #git
17:37 jungsubk joined #git
17:37 oleo joined #git
17:37 raijin joined #git
17:38 bariscant joined #git
17:41 webdev007 joined #git
17:41 sunri5e joined #git
17:42 h12o joined #git
17:43 cyberz joined #git
17:44 XVar joined #git
17:45 abcdefy joined #git
17:46 aw1 joined #git
17:47 davimore joined #git
17:49 ayogi joined #git
17:49 ispn joined #git
17:50 Goplat joined #git
17:50 jagobdue joined #git
17:51 King_Hual joined #git
17:52 kbeflo joined #git
17:53 Cabanossi joined #git
17:54 exotime joined #git
17:54 zxd joined #git
17:55 zxd what does 'back out the merge' mean in 'With rerere turned on you can merge occasionally, resolve the conflicts, then back out the merge.'
17:55 zxd continue the merge?
17:55 kegster joined #git
17:56 kegster joined #git
17:56 Es0teric joined #git
17:56 neuro_sys zxd: sounds like the opposite to me
17:57 blackwind_123 joined #git
17:57 Impaloo joined #git
18:00 saedelaere joined #git
18:04 bariscant joined #git
18:04 paul424 joined #git
18:05 thiago "back out" in this case must mean reset to a commit prior to the merge
18:11 YuGiOhJCJ joined #git
18:11 diogenese joined #git
18:11 xall_ joined #git
18:11 h12o joined #git
18:12 paul424 My fork is : This branch is 1 commit ahead, 64 commits behind OpenDungeons:development.
18:12 paul424 How do I resync to the https://github.com/OpenDungeons/OpenDungeons
18:12 ertesx joined #git
18:12 paul424 btw: nobody uses my fork apart from me
18:13 stevenbenner joined #git
18:13 blackwind_123 joined #git
18:15 bwn joined #git
18:15 kegster joined #git
18:17 thiago paul424: fetch from OpenDungeons, rebase, then push to your fork
18:18 learning joined #git
18:19 menip joined #git
18:19 whtfldsqr joined #git
18:21 tmsmith joined #git
18:21 ok91 joined #git
18:23 blackwind_123 joined #git
18:23 LBV_User joined #git
18:23 mda1 joined #git
18:24 Cabanossi joined #git
18:24 davimore joined #git
18:26 a_thakur joined #git
18:29 mda1 joined #git
18:31 h12o joined #git
18:32 blackwind_123 joined #git
18:33 matoro joined #git
18:33 paul424 http://pasted.co/83c37553 thiago I did fetch and rebase
18:33 paul424 but on push I get that <-
18:35 learning joined #git
18:36 Rodya_ joined #git
18:38 bronson joined #git
18:40 paul424 thiago: ???
18:41 zxd when to rebase vs when to merge
18:43 matumbo joined #git
18:44 cyberz joined #git
18:44 jost_ joined #git
18:46 thiago paul424: push -f
18:47 paul424 thiago: hmm oki
18:47 [Brain] joined #git
18:47 bariscant joined #git
18:49 CEnnis91 joined #git
18:56 Levex joined #git
18:59 levex_ joined #git
19:01 h12o joined #git
19:04 chipotle joined #git
19:05 Bin4ry joined #git
19:07 Achylles joined #git
19:08 blackwind_123 joined #git
19:09 jon-mac joined #git
19:09 theiostream joined #git
19:14 chipotle joined #git
19:17 peepsalot joined #git
19:17 jameser joined #git
19:20 t-mart joined #git
19:21 h12o joined #git
19:22 blackwind_123 joined #git
19:23 perrier-jouet joined #git
19:23 Lunatrius joined #git
19:23 vals_ joined #git
19:24 Cabanossi joined #git
19:24 Levex joined #git
19:25 cyberz joined #git
19:26 voxx joined #git
19:27 dvaske joined #git
19:28 elsevero joined #git
19:30 hahuang61 joined #git
19:31 kegster joined #git
19:34 matoro joined #git
19:34 SophieG joined #git
19:36 Ploppz when I have already pushed commits to remote, does it make sense to  `rebase -i`?
19:36 roelmonnens joined #git
19:37 freimatz joined #git
19:37 Rodya_ joined #git
19:38 bremner Ploppz: see !rewrite
19:38 gitinfo Ploppz: 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
19:39 bremner "It depends (TM)"
19:39 Ploppz alright, thanks
19:41 dreiss joined #git
19:42 SebastianFlyte joined #git
19:42 zxd what does it mean Everyone who has pulled the old history will have to do work ?
19:43 MacGyver That's pretty much explained in the link.
19:43 finalbeta joined #git
19:44 blackwind_123 joined #git
19:47 qsx joined #git
19:48 MrMojit01 joined #git
19:48 zxd so it's just because of duplicate commits in the history?
19:48 zxd just for eye candy?
19:50 drodger joined #git
19:50 h12o joined #git
19:51 luke_nukem joined #git
19:53 kegster joined #git
19:53 wilbert joined #git
19:55 bremner no.
19:55 dsdeiz joined #git
19:55 dsdeiz joined #git
19:56 theiostream joined #git
19:57 kegster joined #git
20:00 buffal0 joined #git
20:01 finalbeta joined #git
20:01 Lunatrius` joined #git
20:04 luke_nukem joined #git
20:06 blackwind_123 joined #git
20:07 learning joined #git
20:08 anuxivm left #git
20:08 Levex joined #git
20:10 qsx joined #git
20:10 h12o joined #git
20:12 xinsu joined #git
20:12 overlord_tm joined #git
20:13 xinsu left #git
20:13 cyberz joined #git
20:14 m0viefreak joined #git
20:16 Simplicity left #git
20:22 ndowens08 joined #git
20:23 metachr0n joined #git
20:23 NwS joined #git
20:24 alexandre9099 joined #git
20:26 ndowens08 Can someone give me tips on how to avoid, when pushing to a pull request, of adding several unrelated commits and files; Like sometimes it gives me that branch has diverged from master or when trying to push it gets rejected because the head is no longer at tip of branch or w/e and if I try and git pull or fetch to sync the branch, and later push it adds the changes from pull/fetch to my file I am pushing
20:26 Darcidride joined #git
20:27 a_thakur joined #git
20:27 ndowens08 to the PR; gets annoying to fix :)
20:28 qsx joined #git
20:29 orbyt_ joined #git
20:30 h12o joined #git
20:30 jackhum joined #git
20:32 jackhum joined #git
20:33 roelmonnens joined #git
20:34 gunnaro joined #git
20:35 cyphase joined #git
20:35 ndowens08 left #git
20:38 Rodya_ joined #git
20:39 zerow joined #git
20:41 cyberz joined #git
20:41 dsdeiz joined #git
20:43 jackhum joined #git
20:43 tymczenko joined #git
20:44 Lunatrius joined #git
20:45 jackhum joined #git
20:45 cyphase joined #git
20:48 drodger joined #git
20:52 ToBeFree joined #git
20:56 khmarbaise left #git
20:56 Levex joined #git
20:56 raijin joined #git
20:57 MineCoins joined #git
20:59 h12o joined #git
21:03 kexmex joined #git
21:07 Achylles joined #git
21:09 Cabanossi joined #git
21:11 armyriad joined #git
21:12 warthog9 joined #git
21:13 BackEndCoder joined #git
21:15 jost__ joined #git
21:15 mehola joined #git
21:19 alexandre9099 joined #git
21:20 raijin joined #git
21:22 jaggz joined #git
21:22 chipotle joined #git
21:29 Ryanar joined #git
21:29 h12o joined #git
21:31 hahuang61 joined #git
21:34 armyriad joined #git
21:38 jaggz left #git
21:39 Rodya_ joined #git
21:39 cyphase joined #git
21:41 gugah joined #git
21:42 pifon joined #git
21:44 blackwind_123 joined #git
21:45 learning joined #git
21:49 raijin joined #git
21:52 livingstn joined #git
21:55 tymczenko joined #git
21:55 blackwind_123 joined #git
21:56 alexandre9099 joined #git
21:59 h12o joined #git
22:02 buffal0 joined #git
22:02 Masber joined #git
22:04 cyphase joined #git
22:06 scorphus joined #git
22:06 molgrum joined #git
22:06 molgrum joined #git
22:08 learning joined #git
22:12 BackEndCoder joined #git
22:23 Cabanossi joined #git
22:26 cbreak rebase your feature branch onto master
22:32 hahuang61 joined #git
22:32 pzp joined #git
22:34 aidalgol joined #git
22:39 Rodya_ joined #git
22:41 theiostream joined #git
22:44 blackwind_123 joined #git
22:45 raijin joined #git
22:49 drodger joined #git
22:50 dnukem joined #git
22:51 cyberz joined #git
22:52 acetakwas joined #git
22:56 blackwind_123 joined #git
22:57 aw1 joined #git
22:57 paul424 joined #git
22:58 telephone joined #git
22:58 telephone joined #git
22:59 Gustavo6046 joined #git
23:00 matoro joined #git
23:04 askb joined #git
23:08 blackwind_123 joined #git
23:09 cyberz joined #git
23:09 raijin joined #git
23:09 bratchley joined #git
23:12 netj joined #git
23:13 TooLmaN joined #git
23:14 niax joined #git
23:17 RWAG joined #git
23:18 mizu_no_oto joined #git
23:20 learning joined #git
23:20 sparr joined #git
23:20 mizu_no_oto joined #git
23:20 pks joined #git
23:23 VladGh joined #git
23:25 roelmonnens joined #git
23:26 elsevero joined #git
23:27 blackwind_123 joined #git
23:28 tmg joined #git
23:31 thanwer joined #git
23:33 blackwind_123 joined #git
23:33 hahuang61 joined #git
23:36 bgerber joined #git
23:37 thanwer joined #git
23:37 thanwer left #git
23:37 raijin joined #git
23:38 Cabanossi joined #git
23:39 tmsmith joined #git
23:39 livingstn joined #git
23:41 urda joined #git
23:45 blackwind_123 joined #git
23:47 Oatmeal joined #git
23:49 drodger joined #git
23:52 blackwind_123 joined #git
23:54 drodger joined #git
23:55 tmsmith joined #git
23:55 theiostream joined #git
23:57 matoro joined #git
23:57 Kaisyu joined #git
23:59 theiostream joined #git
23:59 tmsmith joined #git

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