Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-27

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

All times shown according to UTC.

Time Nick Message
00:00 hahuang65 joined #git
00:02 fatalhalt joined #git
00:02 Peetz0r joined #git
00:04 Rodya_ joined #git
00:05 KnownSyntax joined #git
00:05 ochorocho__ joined #git
00:06 fragMental joined #git
00:07 spacelord joined #git
00:14 kadoban joined #git
00:14 Masber_080 joined #git
00:14 anuxivm joined #git
00:14 werdfriek joined #git
00:17 mephistorium joined #git
00:18 whitby joined #git
00:19 werdfriek With a linux platform under consideration, If directory A is initialized with a git repository, can directories 1, 2, 3, ... n  be soft linked to A and be able to edit from multiple different locations as if you were doing the work right in A ?
00:20 werdfriek I'm thinking about managing a project portfolio repository where I group all my pm under one umbrella, but I want to crud my content from within the project (where the code lives)
00:20 spacelord_ joined #git
00:22 kulelu88 joined #git
00:22 arescorpio joined #git
00:26 NeverDie joined #git
00:26 hahuang65 joined #git
00:27 Spec-Chum joined #git
00:28 raijin joined #git
00:28 felixjet joined #git
00:30 venmx joined #git
00:34 svm_invictvs joined #git
00:35 davimore__ joined #git
00:39 dunpeal joined #git
00:40 Rodya_ joined #git
00:40 thiago werdfriek: only files that are physically located inside the git dir are included in the repository
00:40 pks joined #git
00:40 dunpeal Hi. I'm trying to merge a conflicting file. Because it contains a lot of similar structures, Git's attemp to merge is suboptimal (e.g. parts of the file that are different are misidentified as the same).
00:40 dunpeal Is there a good way to tackle this?
00:40 sunri5e joined #git
00:41 thiago dunpeal: you don't merge files
00:41 thiago you merge histories
00:41 werdfriek thiago: What does that mean as far as how soft links in linux work I wonder (could it be it works linking in one direction but not the other?)
00:41 dunpeal thiago: OK...?
00:42 thiago anyway, try a good mergetool that is able to understan the issue
00:42 thiago I use kdiff3, but I have no idea whether it's good for you
00:42 thiago werdfriek: if by "soft link" you mean "symbolic link", then Git would store the link itself, not the target linked to
00:44 dunpeal I've been trying to use vimdiff, but I think the problem is git itself
00:44 werdfriek I'm sorry I think I found out ... I was playing with it while I waited
00:44 dunpeal the way it annotates the file is wrong
00:44 werdfriek The way I have it linked it looks like it's traking it from the other dirs
00:44 thiago dunpeal: no, it isn't
00:44 werdfriek working
00:44 dunpeal Not entirely sure how a different mergetool would change that...
00:44 thiago dunpeal: the problem is the tool you're using to visualise and merge
00:45 thiago dunpeal: because Git doesn't track at all. You have three files: common base, left side, right side
00:45 thiago dunpeal: the annotation is irrelevant. The important part is to determine how to merge these three things.
00:46 dunpeal Sure, but the initial decisions Git is making are wrong. Not saying that to be critical, just the reality.
00:46 rorro joined #git
00:46 thiago dunpeal: the decisions are not wrong. They are what they are.
00:47 dunpeal The current annotations indicate Git is identifying parts taht are different as if they are the same (with minor differences)
00:47 thiago dunpeal: the annotation is not relevant, provided you can restore the three files.
00:47 thiago dunpeal: anyway, git mergetool extracts the 3 forms without use of annotations. So the annotations cannot be the problem.
00:47 dunpeal so what creates the annotation?
00:48 thiago git merge
00:48 dunpeal I'm using vimdiff as my mergetool, and when I launch it, there's 3 views
00:48 Darren_ joined #git
00:48 dunpeal OK.
00:48 thiago how do you launch it?
00:48 dunpeal vim -n -d -c 'wincmd l' \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
00:49 thiago so you didn't use git mergetool
00:49 sarbs joined #git
00:49 dunpeal that's from my ~/.gitconfig
00:49 thiago are you extracting the three forms manually?
00:49 thiago sorry, let me rephrase: are you launching vimdiff from git mergetool?
00:50 dunpeal yes.
00:50 thiago ok, so there are no annotations in the first place
00:50 thiago you have three pristine forms of the same file
00:50 thiago now, merge them
00:50 dunpeal what do you mean by "there are no annotations"?
00:51 thiago there are no annotations in those three forms
00:51 dunpeal I did `git checkout master; git merge foo`, was informed that there are conflicts
00:51 dunpeal then ran `git mergetool`, and the $MERGED file does have stuff like <<<< HEAD
00:51 thiago yes, fix them
00:52 dunpeal right, that's where I'm at right now
00:52 dunpeal the annotations are making it more difficult to fix.
00:52 thiago then ignore them
00:52 thiago write the file anew from the three original forms
00:52 thiago often, looking at how the file changed helps too:
00:52 thiago git log -p MERGE_HEAD.. -- filename
00:53 thiago and: git log -p ..MERGE_HEAD -- filename
00:53 dunpeal I have two pristine forms: $LOCAL and $REMOTE. where's the original/pristine MERGED?
00:53 thiago the third form is $BASE, which you did not include in your command
00:53 osse dunpeal: there cannot be a pristine MERGED. That's the whole point
00:53 thiago $MERGED is not a pristine form. It's where you put the result of merging.
00:53 dunpeal OK
00:53 osse if there was, then there wouldn't be any conflicts
00:53 dunpeal sure.
00:54 dunpeal so perhaps in some cases, you want to use a different mergetool command
00:54 thiago yes
00:54 dunpeal to do a LOCAL | BASE | REMOTE
00:54 thiago kdiff3 can do that
00:54 dunpeal instead of LOCAL | MERGED | REMOTE
00:54 thiago it shows you BASE, LOCAL, REMOTE
00:54 dunpeal vimdiff should be able to do that too.
00:54 thiago and below: MERGED
00:55 thiago you tell me
00:55 thiago you're the vimdiff expert between the two of us here :-)
00:55 Defcronyke left #git
00:55 dunpeal haha, hardly. but it is possible, with a horizontal split. only question is how I can get the BASE now.
00:55 dunpeal into vimdiff.
00:55 osse the default way git invokes vim already includes BASE
00:56 thiago let me put it this way, do you know what vimdiff looks like when it's showing the two forms and the result?
00:56 thiago if you've ever seen vimdiff running, you know more than I do
00:57 _xor joined #git
00:57 thiago the only command in vim that I need to know is :q because something launched it when I didn't want it to
00:59 dunpeal you are missing out on the finer things in life :>
00:59 dunpeal osse: what's your favorite mergetool?
01:00 skunkz joined #git
01:00 Darren_ joined #git
01:00 dunpeal thiago: very simple: http://www.rosipov.com/blog/use-vimdiff-as-git-mergetool/
01:00 dunpeal key config is: git config merge.conflictstyle diff3
01:01 * thiago will stick to kdiff3 and emacs, thanks
01:01 dunpeal it creates 3 views at the top: LOCAL | BASE | REMOTE
01:01 dunpeal and one MERGED at the bottom.
01:01 osse dunpeal: vimdiff
01:01 dunpeal i.e. horizontal split, with MERGED at the bottom, and vertically split LOCAL | BASE | REMOTE at the top
01:01 * dunpeal highfives osse
01:01 osse that's EXACTLY what git does by default!
01:02 osse just remove all your config
01:02 dunpeal osse: really?  I do have to specify vimdiff somewhere, no?
01:02 dunpeal also, do you recommend any other setting?  or is that what you use too?
01:02 ejb joined #git
01:02 dunpeal quite frankly, for most easy merges, I just do LOCAL | MERGED | REMOTE
01:02 dunpeal (no BASE)
01:03 hahuang65 joined #git
01:03 jaguarmagenta joined #git
01:05 dunpeal OK, yeah, just set merge.tool to vimdiff et voila
01:06 jaguarma_ joined #git
01:06 crayon joined #git
01:07 dunpeal How do I get help about a particular config setting?
01:07 dunpeal e.g. merge.conflictstyle?
01:11 irco joined #git
01:15 jaguarmagenta joined #git
01:16 osse dunpeal: man git-config
01:16 gitinfo dunpeal: the git-config manpage is available at http://jk.gs/git-config.html
01:17 thebope joined #git
01:21 anuxivm joined #git
01:22 Gsham joined #git
01:25 therealGent joined #git
01:25 therealGent joined #git
01:27 M-meznak joined #git
01:28 daithioc joined #git
01:29 MrWoohoo joined #git
01:29 dunpeal thanks.
01:30 daithioc left #git
01:32 NeverDie joined #git
01:33 tnecniv joined #git
01:36 Orbitrix joined #git
01:37 Orbitrix joined #git
01:37 snthsnth joined #git
01:40 qpdb joined #git
01:43 dsdeiz joined #git
01:43 dsdeiz joined #git
01:44 Ragnor joined #git
01:49 dsdeiz joined #git
01:51 jstimm joined #git
01:52 inflames joined #git
01:52 dunpeal Is there a flag to commit that would do `git add -A` just prior to the commit?
01:52 dunpeal i.e. like -a, but also add any new files in the working directory.
01:52 vktec dunpeal: Make an alias
01:53 vktec alias gitaddcommit='git add -A; git commit'
01:53 vktec (untested)
01:53 truedichotomy joined #git
01:55 watabou joined #git
01:56 dsdeiz joined #git
01:57 Thorn joined #git
01:57 dunpeal vktec: thanks.
01:57 vktec np
01:57 dunpeal How do I list untacked files in the current directory that are being ignored?
01:59 vktec git ls-files -i
01:59 vktec I think
01:59 vktec No, wait
01:59 vktec That's wrong
01:59 bremner git status --ignored
02:00 spacelord_ joined #git
02:02 jaguarmagenta joined #git
02:09 dunpeal thanks.
02:12 d^sh_ joined #git
02:12 thebope joined #git
02:12 finalbeta joined #git
02:14 Starky joined #git
02:15 cool_boy joined #git
02:15 hhee joined #git
02:21 dunpeal joined #git
02:21 ResidentBiscuit joined #git
02:22 cdg joined #git
02:26 pks joined #git
02:26 hahuang65 joined #git
02:32 Vampire0_ joined #git
02:39 Learath2 joined #git
02:46 johnny56_ joined #git
02:46 it_tard joined #git
02:50 hhee guys, tell me about merge plz. what is it fast-forward, and what else does exists?
02:51 aidalgol joined #git
02:52 hhee and how i can use stash? what workflow typical for stash?
02:54 vktec hhee: If you're new to Git, Pro Git may be worth a read. It's available for free online at https://git-scm.com/book/en/v2
02:55 sangy joined #git
02:56 hhee vktec, got it, thx
02:56 vktec :)
02:59 gmn8719 joined #git
02:59 Rodya_ joined #git
03:06 thebope joined #git
03:07 ochorocho__ joined #git
03:08 netj joined #git
03:10 hhee vktec, cool nick. seems quite familiar :)
03:10 vktec I see
03:10 vktec We may have bumped into each other before. I pop in and out of quite a few IRC channels :)
03:11 hhee vktec, maybe :)
03:11 hhee vktec, but anyway, i added you in friend list :)
03:11 vktec :)
03:13 snthsnth joined #git
03:13 hhee vktec, irc client hexchat has this feature like one of social network :)
03:14 hhee vktec, glad to see you, see yo later, i need to work. :)
03:14 vktec Hmm... perhaps you recognise me from #vim or #bash?
03:14 jaguarmagenta joined #git
03:14 cdg joined #git
03:14 vktec (gotta love grep for finding people in IRC logs :P)
03:17 Pseudocrat joined #git
03:17 hhee :) maybe in vim
03:17 hhee vktec, or maybe you nick just remember me some socialnetwork site
03:17 vktec :)
03:18 hexagoxel joined #git
03:21 hhee vktec, oh. can i ask. are you using telegram? :)
03:21 vktec Nope
03:21 vktec The best way to contact me is IRC :P
03:21 hhee vktec, only irc only hardcore!
03:21 hhee :)
03:21 vktec 'cos I'm an old school privacy freak ;)
03:22 hhee vktec, what's why you have to give up you phone :)
03:23 vktec Erm... could you rephrase that?
03:24 hhee vktec, did you buy  smth interesting in black friday? i meant our phones tracking us
03:24 vktec It was black Friday?
03:24 hhee vktec, opsos always know where we are
03:24 * vktec lives with his head under aa rock, in the sand, in a cave :P
03:24 hhee vktec, i think so
03:25 hhee vktec, and using metal hat :D
03:25 vktec :D
03:25 hhee vktec, see later, work is waiting for me :)
03:25 vktec cya
03:29 Mixologic joined #git
03:31 rominronin joined #git
03:36 EricPoe joined #git
03:40 YottaByte joined #git
03:40 YottaByte are branches always created from the master branch?
03:40 preaction not always, no
03:41 sunri5e joined #git
03:41 vktec They're created from the current HEAD, by default
03:41 YottaByte current branch HEAD?
03:41 vktec Your currently checked out branch, tag or commit
03:41 YottaByte gotcha
03:42 YottaByte I also noticed, I once tried to merge master into my branch, but it didn't let me for some reason, and then I fixed it by doing git checkout master, git pull (to get up to date to master), and then I was able to merge into my other branch
03:43 YottaByte does the merge not get the latest code from the repo?
03:46 vktec Nope. Git won't fetch unless you tell it to
03:47 vktec I'm not sure why it didn't let you merge, however
03:48 vktec Also, why were you merging master into a different branch? I'd usually rebase instead of merge, and then merge your branch into master when you've finished working on it
03:48 vktec Or not rebase at all
03:48 YottaByte why rebase instead of merge?
03:48 vktec Well, I just don't see a need to merge master into a different branch, is all
03:49 YottaByte so we have 2 teams working on 1 application, we each have our own branch, and we take turns merging into master
03:49 YottaByte then once master is merged into, we merge each other's work back into our branch
03:52 vktec I see
03:52 Dougie187 left #git
03:52 vktec Often, a team will focus on one feature, on one branch, then merge that into master when finished, and move on to the next feature
03:53 vktec brb
03:54 vktec joined #git
03:57 vktec joined #git
03:57 chachasmooth joined #git
04:00 AfroThundr joined #git
04:00 thebope joined #git
04:00 Rodya_ joined #git
04:04 jost_ joined #git
04:04 EricPoe joined #git
04:07 Puffball_ joined #git
04:09 truedichotomy joined #git
04:10 gmn8719 joined #git
04:11 Puffball joined #git
04:13 anonymuse joined #git
04:13 donmichelangelo joined #git
04:13 justanotheruser joined #git
04:15 Vortex34 joined #git
04:16 EricPoe joined #git
04:17 cdg joined #git
04:17 pijiu2 joined #git
04:17 vktec joined #git
04:23 werdfriek joined #git
04:27 Nilesh_ joined #git
04:28 d0nn1e joined #git
04:29 anonymuse joined #git
04:41 ljc joined #git
04:42 fstd_ joined #git
04:43 ochorocho__ joined #git
04:48 dodobrain joined #git
04:49 howdoi joined #git
04:54 thebope joined #git
04:56 Mixologic joined #git
05:02 Rodya_ joined #git
05:04 gmn8719 joined #git
05:06 _ng joined #git
05:08 Cabanossi joined #git
05:09 svm_invictvs joined #git
05:13 sssilver joined #git
05:17 lolmac joined #git
05:19 Mixologic joined #git
05:27 Mixologic joined #git
05:32 dsantiago joined #git
05:36 subhojit777 joined #git
05:40 Mobutils joined #git
05:43 Mixologic joined #git
05:44 ochorocho__ joined #git
05:45 Sasazuka joined #git
05:46 vuoto joined #git
05:47 languitar joined #git
05:48 Darren_ joined #git
05:48 thebope joined #git
05:49 Mixologic joined #git
05:56 cdg_ joined #git
05:56 Mixologic joined #git
05:58 brandonw joined #git
05:59 Mixologic_ joined #git
05:59 tnecniv joined #git
06:02 wolo21 joined #git
06:03 _leb joined #git
06:03 Rodya_ joined #git
06:04 wolo21 how do I do something similar to this in my repository?:    https://github.com/garybernhardt/dotfiles/tree/master/.vim/bundle
06:04 wolo21 he's got a reference to another repo in his repo
06:07 anonymuse joined #git
06:11 moritz look up submodules
06:11 wolo21 thanks
06:19 StuartMI joined #git
06:21 holodoc joined #git
06:22 buzzLightBeer joined #git
06:27 Rickmasta joined #git
06:36 jokajak joined #git
06:40 skirk joined #git
06:42 jokajak joined #git
06:42 thebope joined #git
06:44 roflin joined #git
06:46 LucaTM joined #git
06:47 roflin joined #git
06:52 venmx joined #git
07:00 Rodya_ joined #git
07:02 jokajak joined #git
07:08 eb0t_ joined #git
07:11 realz joined #git
07:13 derk0pf joined #git
07:14 Siegfried joined #git
07:15 sea-gull_ joined #git
07:15 anonymuse joined #git
07:16 jokajak joined #git
07:17 jokajak joined #git
07:18 roentgen joined #git
07:28 pks joined #git
07:34 Ragnor joined #git
07:35 ShapeShifter499 joined #git
07:37 thebope joined #git
07:38 chris2 joined #git
07:41 A5101 joined #git
07:44 pks joined #git
07:45 ochorocho__ joined #git
07:46 austin987 joined #git
07:47 cdg joined #git
07:50 Random832 joined #git
07:58 vuoto joined #git
08:02 Rodya_ joined #git
08:02 robotroll joined #git
08:02 vuoto joined #git
08:03 vuoto joined #git
08:04 vuoto joined #git
08:06 c0ded joined #git
08:15 qws-user-1228 joined #git
08:20 StuartMI joined #git
08:20 SwiftMatt joined #git
08:24 m___ joined #git
08:24 iota_pi joined #git
08:25 random-nick joined #git
08:31 thebope joined #git
08:32 kerrick joined #git
08:32 m___ joined #git
08:32 vuoto joined #git
08:46 lordjancso joined #git
08:48 InfoTest joined #git
08:52 Guest129290 joined #git
08:53 Guest129290 left #git
08:54 _Ace joined #git
08:54 vuoto joined #git
08:57 Siegfried joined #git
09:01 qws-user-1228 joined #git
09:02 Rodya_ joined #git
09:09 cloudbud joined #git
09:10 cloudbud Hi I want to nderstand wht is the difference ebwteen git merge and git rebase ? Where to use when ?
09:12 CrashOverride joined #git
09:13 oskarkv joined #git
09:17 lindenle joined #git
09:23 inflames joined #git
09:25 thebope joined #git
09:27 moritz cloudbud: have you googled for that? there are literally hundreds of explanations out there
09:30 cloudbud done that.How to clone the code that has been latestly pushed without the history.
09:31 cloudbud git clone --depth=1 <remote_repo_url>
09:31 cloudbud will this work
09:32 moritz !tias
09:32 gitinfo Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.
09:33 afuentes joined #git
09:37 LucaTM joined #git
09:41 navidr joined #git
09:42 finalbeta joined #git
09:42 venmx joined #git
09:43 SwiftMatt joined #git
09:50 crazyphil_i joined #git
09:52 atesc joined #git
09:53 atesc joined #git
09:54 fugiman joined #git
09:58 vdv joined #git
10:02 satifant joined #git
10:03 Rodya_ joined #git
10:10 barduck joined #git
10:10 MrFeedback joined #git
10:14 flavius joined #git
10:15 mablae joined #git
10:17 catsup joined #git
10:18 catsup joined #git
10:19 thebope joined #git
10:23 MrFeedback when i try to checkout a remote branch (under windows) i get this error: "fatal: cannot create directory at 'wp-content/plugins/orbitvu-sh/_orbitvu_presentations/Jadise /_orbitvu_resized_images': No such file or directory" could this happen through the whitespace after "Jadise" ?
10:24 msonntag joined #git
10:25 a_thakur joined #git
10:26 dan2k3k4 joined #git
10:26 a_thakur_ joined #git
10:26 spacelord_ joined #git
10:28 fbwnd joined #git
10:30 moritz MrFeedback: spaces should be fine, I think
10:31 moritz other possible errors include one of the path components being a file  in your file system, so git can't create it as a directory
10:31 moritz or path length limits of the file system in user
10:31 moritz s/user/use/
10:31 MrFeedback yes thats what i am testing right now
10:33 MrFeedback ok pathlength can´t be the issue either. now the path would be d:/xxxxxxx_2/wp-content/plugins/orbitvu-sh/_orbitvu_presentations/Jadise /_orbitvu_resized_images and it doesn´t work either
10:33 MrFeedback in my virtual machine under debian it works
10:34 APic joined #git
10:34 adac joined #git
10:34 xall joined #git
10:36 fugiman joined #git
10:36 MrFeedback for me it seems like this is a bug in windows git. i just used my vagrant machine which has mounted this folder to checkout the branch and it worked
10:37 MrFeedback ok.no it didn´t work as it should. seems like vagrant machine did not see that its not able to create the files damn... runnign out of options here :(
10:40 aard_ joined #git
10:44 SwiftMatt joined #git
10:45 a_thakur joined #git
10:47 Masber joined #git
10:48 Nilesh_ joined #git
10:50 ok91 joined #git
10:51 derk0pf joined #git
10:54 v-y left #git
10:55 a_thakur joined #git
11:03 cyan__ joined #git
11:04 Rodya_ joined #git
11:05 Murii joined #git
11:07 ok91 joined #git
11:08 a_thakur joined #git
11:10 ochorocho__ joined #git
11:10 Gloomy joined #git
11:10 Phylock joined #git
11:12 ome joined #git
11:13 thebope joined #git
11:14 SteffanW joined #git
11:15 atesc joined #git
11:18 King_Hual joined #git
11:19 aax joined #git
11:20 seishun joined #git
11:21 m0viefreak joined #git
11:22 Gloomy joined #git
11:27 anonymuse joined #git
11:27 Gloomy joined #git
11:28 atesc joined #git
11:28 vdv joined #git
11:30 Cavallari joined #git
11:38 manuel joined #git
11:38 PioneerAxon joined #git
11:38 jaguarmagenta joined #git
11:38 msonntag joined #git
11:39 ResidentBiscuit joined #git
11:41 leeN joined #git
11:43 askb_ joined #git
11:50 fugiman joined #git
11:50 Mobutils joined #git
11:52 Achylles joined #git
11:53 cool_boy joined #git
11:53 blackwind_123 joined #git
12:02 tillo_ joined #git
12:04 rorro joined #git
12:05 Rodya_ joined #git
12:07 thebope joined #git
12:10 mei[m] joined #git
12:12 anuxivm joined #git
12:13 davimore joined #git
12:14 raijin joined #git
12:14 davimore_ joined #git
12:17 Siegfried joined #git
12:18 Guest24 joined #git
12:22 ahmedelgabri joined #git
12:24 vuoto joined #git
12:26 buffal0 joined #git
12:27 Starky joined #git
12:30 buffal0 joined #git
12:31 sprremix joined #git
12:32 Starky joined #git
12:34 paul424 joined #git
12:35 Starky joined #git
12:38 dsdeiz joined #git
12:43 Starky joined #git
12:43 anonymuse joined #git
12:44 robotroll joined #git
12:45 PioneerAxon joined #git
12:46 Quibus joined #git
12:47 Quibus hi all, I'm trying to convert a small CVS repo into git using git cvsimport, but I'm having problems. Can someone help?
12:47 grawity consider using `cvs-fast-export | git fast-import` instead
12:49 Quibus grawity: I'll give it a try
12:52 Quibus that seems to have been successful! :-)
12:55 Quibus thanks
12:57 sdothum joined #git
12:59 Rodya_ joined #git
13:01 thebope joined #git
13:01 hhee joined #git
13:01 Vinnie_win joined #git
13:02 paul424 joined #git
13:03 irco joined #git
13:04 vuoto joined #git
13:05 jstein_ joined #git
13:09 roentgen joined #git
13:09 vuoto joined #git
13:09 hhee1 joined #git
13:12 Vaelatern joined #git
13:15 hendry joined #git
13:16 buffal0 joined #git
13:17 jstein_ joined #git
13:17 robattila256 joined #git
13:17 jstein____ joined #git
13:23 jstein joined #git
13:24 nowhere_man joined #git
13:25 hhee1 joined #git
13:28 Discovery joined #git
13:30 IlNominePatre joined #git
13:31 pijiu2 joined #git
13:31 raijin joined #git
13:32 nixdork joined #git
13:32 pijiu2 joined #git
13:33 pijiu2 joined #git
13:35 re1 joined #git
13:35 dan2k3k4 joined #git
13:39 HoierM joined #git
13:39 Starky joined #git
13:39 jaguarmagenta joined #git
13:45 anonymuse joined #git
13:49 _ikke_ grawity to the rescue
13:50 ismaris joined #git
13:50 bremner grawity never lets you down, unlike gravity
13:51 stefanct left #git
13:55 djb-irc joined #git
13:55 thebope joined #git
13:57 jmpp_ joined #git
13:57 Rodya_ joined #git
14:01 mizu_no_oto joined #git
14:01 raijin joined #git
14:05 hhee guys, how can i setup two-side diff in git?
14:06 shinnya joined #git
14:06 hhee not unix diff
14:06 bremner what is two-side diff?
14:06 hhee bremner, well, two-panel diff
14:06 _ikke_ I guess side-by-side
14:06 hhee _ikke_, yeah :)
14:06 bremner man git difftool
14:06 gitinfo the git-difftool manpage is available at http://jk.gs/git-difftool.html
14:06 GavinMagnus joined #git
14:06 hhee bremner, thx
14:07 hhee seems like i can install vim as difftool
14:08 _ikke_ that's used as default
14:09 TestingIRC joined #git
14:11 TestingIRC so I have this link: https://github.com/programm/programm.github.io/raw/master/source_code.c but when I try to download that link with wget it downlodas html page, how to download that file without opening that link in web browser ?
14:11 JustinHitla joined #git
14:11 anuxivm joined #git
14:11 sergcp joined #git
14:12 slayerjain joined #git
14:12 TestingIRC no wait
14:12 mizu_no_oto joined #git
14:12 TestingIRC I mean this link: https://github.com/programm/programm.github.io/blob/master/source_code.c
14:13 TestingIRC so should I just replace "blob" into "raw" ?
14:13 TestingIRC or can I use "git" command line tool ?
14:13 TestingIRC something like:
14:13 TestingIRC git clown https://github.com/programm/programm.github.io/blob/master/source_code.c
14:13 bremner no. you clone repositories, not files
14:14 TestingIRC so the only way is to open the link in browser ?
14:14 bremner dunno. Not a big github user. Usually there is a way, if you know the web interface
14:14 bremner I'd say just clone the repo and be done
14:14 JustinHitla 1
14:15 seishun joined #git
14:16 TestingIRC what was git-jokes project ?
14:16 JustinHitla left #git
14:17 done joined #git
14:18 buffal0 joined #git
14:20 Gsham joined #git
14:20 BigDawg joined #git
14:21 overlord_tm joined #git
14:22 rorro joined #git
14:22 Vaelatern joined #git
14:22 hhee guys, when i have to do git pull - after or before git push?
14:22 hhee git pull - is this same as git checkout
14:22 bremner before, usually
14:22 hhee ?
14:22 bremner no
14:22 bremner !tutorial
14:22 gitinfo A list of interactive git tutorials: http://try.github.com
14:22 hhee bremner, thx
14:22 bremner man gittutorial
14:22 gitinfo the gittutorial manpage is available at http://jk.gs/gittutorial.html
14:23 hhee bremner, thx a lot
14:27 dsdeiz joined #git
14:29 EricPoe joined #git
14:33 ahmedelgabri joined #git
14:34 MrFeedback joined #git
14:34 fatalhalt joined #git
14:34 MrFeedback hey, maybe one of you can help me, if this is a git issue or a windows issue? http://stackoverflow.com/questions/40828718/why-do-i-get-cannot-create-directory-when-checkout-a-git-remote-branch-windows
14:35 _ikke_ not sure, but looks like a windows issue
14:36 MrFeedback hmm would be really sad, as this would push me to use a unix based os to code just by the cause of a "simple" whitespace :(
14:37 _ikke_ I've checked, but whitespace does not seem to be reserverd
14:38 MrFeedback _ikke_ ia am not sure what you mean
14:38 _ikke_ MrFeedback: You assume the problem is the space in the folder name, right?
14:38 MrFeedback yes, thats my assumption
14:38 Noldorin joined #git
14:39 MrFeedback but only in the case that it is at the end of the folder name
14:39 _ikke_ MrFeedback: You can verify by creating one manually
14:39 _ikke_ Though explorer might trim the name
14:40 MrFeedback yep, and i think this is what happens as even debian does not show the white space in the cli when i am in the directory
14:42 TestingIRC left #git
14:43 cdg joined #git
14:44 blueyed Is there a tool already that would find the correct argument to "git commit --fixup" from what is in the index currently?  The manual process is to blame the file at HEAD, and get the commit to be fixed from there.
14:45 _ikke_ I'm not aware of any, but I do agree such a tool is convenient
14:46 ahmedelgabri joined #git
14:46 jimi_ joined #git
14:49 hhee guys, and how can i setup email notify about new push on server? (i have remote vps server, with test.git directory and im working thought ssh)
14:49 rbern joined #git
14:49 thebope joined #git
14:49 Jellyg00se joined #git
14:50 hhee our team in 2 junior developer need mail notification :)
14:51 sammyo joined #git
14:53 dsfreak93 joined #git
14:55 anonymuse joined #git
14:55 hhee found this https://www.treshna.com/steps-to-setup-git-notify-emails/
14:57 jaguarmagenta joined #git
14:59 rivarun joined #git
15:01 PCatinean joined #git
15:02 GavinMagnus left #git
15:03 hhee but got remote: hooks/post-receive: 1: eval: “git: not found
15:04 robotroll joined #git
15:04 buffal0 joined #git
15:06 seishun joined #git
15:06 ahmedelgabri joined #git
15:07 hhee maybe post server issue
15:07 PioneerAxon joined #git
15:08 nowhere_man joined #git
15:08 xcesariox joined #git
15:09 meth joined #git
15:11 nidr0x joined #git
15:12 sammyo check the path
15:12 buffffal00 joined #git
15:17 dimi1947 joined #git
15:18 hhee sammyo, seems like i found this. can receive mail. now question in format. i need not only summary, but include diff in letter
15:18 hhee code from here https://www.treshna.com/steps-to-setup-git-notify-emails/
15:18 hhee work not as expected
15:20 cdg joined #git
15:22 m___ joined #git
15:25 aard_ joined #git
15:25 barduck joined #git
15:27 sammyo try tweaking the git diff-tree line in the script
15:27 sammyo (sorry I'm far from an expert)
15:27 chris2 joined #git
15:28 sammyo perhaps remove the -summary arg
15:29 dviola joined #git
15:30 Guest68411 joined #git
15:30 Karazhan joined #git
15:31 Gsham joined #git
15:31 hhee sammyo, by default it was - git diff-tree –stat –summary –find-copies-harder
15:31 hhee i removed  –stat –summary
15:32 hhee and in mail became like Summary of changes: main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
15:32 hhee became :100644 100644 e7757ebadcf8e757de10a5d7a58aad542a8e2095 f68bda50cbeeff0961f9370e9e84dc68b0e95250 M main.html
15:32 sammyo try adding --raw
15:32 thierryp joined #git
15:32 anonymuse joined #git
15:32 hhee sammyo, thx i'll try
15:33 sammyo whew diff-tree has a bunch of args
15:34 hhee sammyo, yeah, but cann't even google needed
15:34 stux|RC-only joined #git
15:34 hhee sammyo, tried --raw - but nope
15:34 sammyo and beware a full diff could make for pretty huge emails
15:34 hhee sammyo, got it
15:35 hhee sammyo, project with im working with lightweight, and not heavy traffic there
15:37 eivarv joined #git
15:39 hhee sammyo, yep. i needed -p option
15:39 buffal0 joined #git
15:39 hhee like -p –find-copies-harder
15:39 hhee sammyo, and work quite as expected
15:41 sammyo interesting, "patch" would not have been my first guess but it makes some sense
15:41 djb-irc joined #git
15:43 thebope joined #git
15:49 shubhnik joined #git
15:54 ok91 joined #git
15:56 dreiss joined #git
15:58 sq-one joined #git
15:58 Karazhan joined #git
16:03 robattila256 joined #git
16:04 goTAN joined #git
16:05 anonymuse joined #git
16:06 rbern joined #git
16:09 adac joined #git
16:09 jaguarmagenta joined #git
16:09 Gsham joined #git
16:11 ojdo joined #git
16:11 blueyed _ikke_: I came up with https://github.com/blueyed/dotfiles/blob/master/usr/bin/git-auto-fixup
16:12 ResidentBiscuit joined #git
16:16 ismaris joined #git
16:16 sunri5e joined #git
16:17 zeroed joined #git
16:18 buffal0 joined #git
16:22 vuoto joined #git
16:23 Jackneill joined #git
16:23 xall joined #git
16:29 giraffe joined #git
16:31 arand joined #git
16:31 skunkz joined #git
16:32 jaguarmagenta joined #git
16:32 sea-gull_ joined #git
16:32 cool_boy joined #git
16:33 lindenle joined #git
16:36 anonymus_ joined #git
16:37 cagmz joined #git
16:37 thebope joined #git
16:40 inflames joined #git
16:44 courrier joined #git
16:52 ThunderChicken joined #git
16:52 ThunderChicken joined #git
16:58 buffal0 joined #git
16:59 pijiu2 joined #git
17:01 pijiu2 joined #git
17:02 CheckDavid joined #git
17:05 Mixologic joined #git
17:06 ahmedelgabri joined #git
17:07 anonymuse joined #git
17:08 Darren_ joined #git
17:08 gmn8719 joined #git
17:09 dan2k3k4 joined #git
17:11 buffffal00 joined #git
17:12 NeverDie_ joined #git
17:14 BigDawg joined #git
17:15 stux|RC joined #git
17:22 mizu_no_oto joined #git
17:24 bloxy1 joined #git
17:25 thebope joined #git
17:25 nidr0x joined #git
17:26 seishun joined #git
17:29 vuoto joined #git
17:30 pikajude joined #git
17:31 bloxy1 left #git
17:35 buffal0 joined #git
17:35 pikajude joined #git
17:35 zacts joined #git
17:36 ljubak joined #git
17:38 jaguarmagenta joined #git
17:40 anonymuse joined #git
17:44 isysd joined #git
17:44 stux|RC joined #git
17:45 pikajude joined #git
17:48 systeem joined #git
17:49 Glooomy joined #git
17:49 CEnnis91 joined #git
17:51 dikiaap joined #git
17:52 Reujea0 joined #git
17:52 Reujea0 how can i cherry pick this https://android.googlesource.com/kernel/common/+/cb60e3e65c1b96a4d6444a7a13dc7dd48bc15a2b to my github kernel ?
17:54 safe joined #git
17:54 mischat joined #git
17:55 mischat joined #git
17:56 Starkythefox joined #git
17:57 Gsham joined #git
17:58 cloudbud joined #git
17:59 cloudbud how to create a branch from existing branch in git
18:00 grawity `git branch new old`
18:00 cloudbud thanks :)
18:00 Rodya_ joined #git
18:03 romerocesar joined #git
18:04 finalbeta joined #git
18:06 madewokherd joined #git
18:08 chris2 joined #git
18:08 nfk joined #git
18:10 jozwior joined #git
18:11 NeverDie joined #git
18:12 madewokherd` joined #git
18:21 Murii joined #git
18:21 Murii joined #git
18:22 venmx joined #git
18:22 nicksloan joined #git
18:23 dreiss joined #git
18:24 InfoTest joined #git
18:25 cagedwisdom joined #git
18:27 polyrob joined #git
18:30 xaa__ joined #git
18:32 cool_boy joined #git
18:32 Mixologic joined #git
18:34 ljubak joined #git
18:35 djb-irc joined #git
18:36 nowhere_man joined #git
18:39 venmx joined #git
18:39 hahuang65 joined #git
18:40 tnecniv joined #git
18:41 TheMoonMaster joined #git
18:44 roelmonnens joined #git
18:47 Juzzika joined #git
18:48 Jimmy90210 joined #git
18:48 ispn joined #git
18:49 kulelu88 joined #git
18:51 mephistorium joined #git
18:54 A5101 joined #git
18:55 djb-irc joined #git
18:57 shams joined #git
18:57 HM joined #git
19:00 aard_ joined #git
19:01 rbern joined #git
19:03 buffal0 joined #git
19:04 cdown joined #git
19:06 InfoTest joined #git
19:06 overlord_tm joined #git
19:07 SwiftMatt joined #git
19:11 Guest26575 left #git
19:12 sssilver joined #git
19:14 zeroed joined #git
19:15 _ikke_ blueyed: Nice, gonna give it a try when I need it
19:16 dreiss joined #git
19:19 HM joined #git
19:19 paul424 joined #git
19:20 Helithumper joined #git
19:25 eivarv joined #git
19:26 govg joined #git
19:29 anonymuse joined #git
19:31 fmcgeough joined #git
19:34 jfelchner joined #git
19:37 eivarv joined #git
19:37 a3Dman joined #git
19:39 gunnaro joined #git
19:39 davimore__ joined #git
19:39 rbern joined #git
19:42 kerrick joined #git
19:46 Rodya_ joined #git
19:48 ochorocho__ joined #git
19:49 Rodya__ joined #git
19:50 multi_io joined #git
19:50 mischat joined #git
19:51 hhee joined #git
19:51 garethdaine joined #git
19:51 bcc joined #git
19:51 bcc joined #git
19:53 venmx joined #git
19:56 dirtyroshi joined #git
19:59 davimore joined #git
20:00 _leb joined #git
20:01 cheater joined #git
20:02 d0nn1e joined #git
20:02 cheater hi
20:02 cheater is there a way to make git log display the last 7 days, no matter what day it is? i tried something like git log --after='7 days ago' but that hasn't worked.
20:03 cheater the only way i can come up with is to calculated what date it was 7 days ago but i wouldn't like to have to do that, especially in bash...
20:04 m0viefreak joined #git
20:04 Rodya_ joined #git
20:05 _leb joined #git
20:07 Seveas cheater: 'the last 7 days' isn't really a sensible question.
20:08 Seveas do you mean commits made in the last 7 days? Including rebases/amends? Or  whatever HEAD was pointing to in the last 7 days?
20:09 cheater hey thanks Seveas, someone helped me in #linux without telling me i make no sense.
20:10 venmx joined #git
20:10 cheater so never mind
20:10 jast what's the solution?
20:13 aidalgol joined #git
20:14 justanotheruser joined #git
20:14 ResidentBiscuit joined #git
20:15 LBV_User joined #git
20:16 cool_boy joined #git
20:16 pbrewczynski joined #git
20:17 rorro joined #git
20:22 ljubak joined #git
20:23 Rodya_ joined #git
20:23 eivarv joined #git
20:25 pyfoo joined #git
20:26 PioneerAxon joined #git
20:33 _ikke_ STart[[
20:33 _ikke_ ]
20:33 _ikke_ ]
20:33 _ikke_ oops
20:33 _ikke_ STare
20:33 _ikke_ ARg\
20:33 _ikke_ My keyboard is messing me around
20:33 _ikke_ Start making sense*
20:33 jast sure, blame it all on hardware
20:34 _ikke_ sorry 'bout that
20:34 jast no need, you're livening things up so that's good actually
20:35 cheater jast: the solution was --since="7 day ago" and also --after="7 days ago" should have worked, i got no output because i was on a branch that had no activity in the last 7 days.
20:35 endiruna joined #git
20:35 jast oh, okay
20:36 jast that's an easy solution, then. I like those. :)
20:41 Rodya_ joined #git
20:43 dmin7b5 joined #git
20:43 bmahe joined #git
20:44 buttbutter joined #git
20:44 buttbutter I'm learning git and I'm confused about how to deal with this scenario: my friend and I both implemented foo.c on separate. We wanted to combine our implementations by choosing the best from both. How can I do that with git?
20:45 bodhi joined #git
20:45 jast the best way is to sit down together with your implementations :)
20:46 jast if both of you made the same entirely new file, git isn't going to be able to help you do anything significantly fancier
20:46 buttbutter So...manually copy one implementation to the other's branch and combine them?
20:46 jast you can use 'git merge', but all git can do is mark the entire file as one huge conflict
20:46 nwkj86 joined #git
20:46 buttbutter But isn't merging for branches only? I want to do it file-by-file.
20:47 jast so the process will be able the same... the only difference then is that you have a clear record of "we merged these two things together"
20:47 ChaosMonkey joined #git
20:47 jast well, yes... that's why people who want to merge individual things often make a separate branch for each feature
20:48 jast it might be too late to do that in this situation, but it's something to consider for the next steps, maybe
20:48 buttbutter Hah, right.
20:48 buttbutter Yeah. I don't know. Maybe Git is the wrong tool to collaborate on assignments.
20:49 jast I don't think there's a tool that will help you with that... except for screen sharing, I guess, if you can't physically pair up
20:49 mindriot101 joined #git
20:50 buttbutter The issue I sort of have so far is that from what I've learned from Git it really is "Hey, create a branch and implement feature XYZ and then merge it." As opposed to "Hey let's implement this simulatenously and take the best of both implementations/have lots of overlap"
20:50 buttbutter Oh well :)
20:51 LBV_User joined #git
20:51 jfelchner joined #git
20:51 jast yeah, Git doesn't really help you collaborate on that level... neither does anything else, as far as I can tell
20:52 OnBrokenWings joined #git
20:52 buttbutter I think there are some collaborative IDEs out there. Or some Eclipse plug-ins or something. Maybe I'll try that.
20:52 buttbutter Thanks for the advice. :)
20:53 jast oh, yeah, a bunch of realtime shared editors exist
20:53 jast comparable to screen sharing, except you can work on different sections of the same file at the same time if you want to
20:54 buttbutter Precisely. Really, the boon is having a single in-sync file across users.
20:54 sea-gull_ joined #git
20:57 hhee guys, i need put my file to server, but if i git pull - it fetch from ther master right? can i git pull from branch?
20:58 ukleinek joined #git
20:58 vktec hhee: man git-checkout
20:58 gitinfo hhee: the git-checkout manpage is available at http://jk.gs/git-checkout.html
20:58 vktec man git-pull
20:58 gitinfo the git-pull manpage is available at http://jk.gs/git-pull.html
20:58 vktec etc
20:58 ukleinek does someone here know what went wrong when gitk looks like http://i.imgur.com/V7BbSPv.png ?
20:59 _ikke_ ukleinek: that's an odd one
20:59 _ikke_ ukleinek: Happens if you restart gitk?
21:00 skunkz joined #git
21:00 ukleinek _ikke_: it's reproducible here 100%
21:00 ukleinek and not only for me: https://bugs.debian.org/833930
21:01 ukleinek I don't need to do anything, it's like that from the start
21:01 _ikke_ Perhaps some kind of library version mismatch?
21:02 mischat joined #git
21:02 * ukleinek suspects tcl/tk
21:02 _ikke_ right
21:05 * ukleinek has tk8.6 and tcl8.6
21:06 re1_ joined #git
21:06 hhee vktec, oh cool, thx :)
21:08 _leb joined #git
21:09 Siegfried joined #git
21:13 buffal0 joined #git
21:13 chrisml is git add --all the same as git add . ?
21:13 holodoc joined #git
21:14 thiago no
21:14 jaguarmagenta joined #git
21:15 vuoto joined #git
21:15 a3Dman joined #git
21:15 mindriot101 joined #git
21:16 thiago actually, looks like it is. The behaviour changed.
21:16 salamanderrake joined #git
21:16 thiago (provided you're in the top dir)
21:16 chrisml :D
21:16 chrisml thiago thx
21:16 thiago the manpage is confusing
21:16 chrisml yeah
21:17 thiago the option for --no-all says "This option is a no-op when no <pathspec> is used." which implies it's the default
21:17 thiago the next paragraph says that --no-all is provided for compatibility
21:17 qws-user-1229 joined #git
21:20 hhee another question. how set project name in git config?
21:21 thiago hhee: you don't
21:21 vktec hhee: "project name"? What do you mean?
21:22 nowhere_man joined #git
21:25 andlabs joined #git
21:25 andlabs Hi. If I make a branch, then delete a file from master, will the file go away when I merge the branch back?
21:25 andlabs I want to split some WIP stuff to a branch that I forgot to branch off before
21:26 osse andlabs: yes, provided the branch does not make changes to it
21:27 HoierM joined #git
21:28 courrier_ joined #git
21:32 HoierM joined #git
21:32 BackEndCoder joined #git
21:34 andlabs osse: so how do I properly split these files into a branch
21:35 anonymuse joined #git
21:37 seishun joined #git
21:37 andlabs starting from the current HEAD
21:37 andlabs I'll probably be merging master in ove the course of developing this feature adn then merging it back into master when done
21:38 andlabs I might as wel start doing things properly now that my features are becoming more ambitious
21:38 jast have you actually committed any of the WIP stuff yet?
21:38 andlabs yes
21:38 andlabs this is stuff that has been in the repo for months
21:38 andlabs but never quite complete
21:38 andlabs I should have made a branch the first time but too late now
21:38 bmahe joined #git
21:38 jast okay
21:38 andlabs now I want to isolate them in a branch, keeping them out of future commits on master until I merge back
21:39 jast is it causing any issues in master at this point?
21:39 jast because if not, you might just leave it in, and do all the new work in a separate branch... less hassle that way
21:40 andlabs the only issue is that one of the target platforms won't build because the feature isn't implemented there
21:40 jast right, that would be a little annoying...
21:40 cagedwisdom joined #git
21:41 jast well, if you just branch off and then delete it on master, that will work. of course when you merge back, git will notice that there are changes on your separate branch and a deletion on master, and it will present you with a "delete/modify" conflict
21:41 jast so all you have to do then is to 'git add' the file(s) again, and finish the merge
21:42 tnecniv joined #git
21:42 andlabs so it won't delete the file silently like osse seems to have implied? good
21:42 jast you have to be careful, though, because if there are any files you delete on master and don't touch on the separate branch, git will assume it's okay to delete them as part of the merge, so you may have to re-add them when merging... not particularly tricky, but important to pay attention to
21:44 andlabs right, that's what I'm worrying about ^^;
21:44 jmpp joined #git
21:44 nettoweb joined #git
21:44 jast one cheaty way to avoid it is to modify each of the files once on the branch
21:45 jast the other way would be to delete them *before* branching off, and then re-adding them in the branch
21:45 crawler joined #git
21:46 jast that way git will treat them as entirely new changes and definitely pick them up in the merge
21:46 jast basically like this: 'git rm <files>; git commit; git checkout -b myfeaturebranch; git checkout master <files>'
21:47 jast the history might be slightly weird in retrospect if you do this, but that might be acceptable
21:47 buffal0 joined #git
21:47 jast actually that last bit should be 'git checkout master~ <files>' because at the top of master you've already deleted those files :)
21:48 andlabs hmm
21:50 bmahe joined #git
21:51 SwiftMatt joined #git
21:52 andlabs I could just go for the path of least resistance and just make it build on Windows
21:52 andlabs maybe
21:52 anonymuse joined #git
21:52 andlabs without actually implementing anything
21:52 andlabs not sure how dangerous that would be
21:53 shashin joined #git
21:55 andlabs also how can I know if deleting a long-ago-fast-forward-merged branch will nuke certain commits or not?
21:55 mizu_no_oto joined #git
21:56 ukleinek andlabs: git branch -d $name will refuse to remove if not all commits are included in HEAD IIRC
21:57 askb joined #git
21:58 Goplat joined #git
22:01 Quibus good night
22:01 Quibus left #git
22:01 dreiss joined #git
22:02 mischat joined #git
22:04 mindriot101 joined #git
22:05 msonntag joined #git
22:06 krillr joined #git
22:09 cdown joined #git
22:19 anonymuse joined #git
22:21 mischat joined #git
22:23 Phylock joined #git
22:25 tlaxkit joined #git
22:26 kyan joined #git
22:27 _28_ria joined #git
22:27 dsdeiz joined #git
22:27 dan2k3k4 joined #git
22:29 buffal0 joined #git
22:30 bcc joined #git
22:30 bcc joined #git
22:30 Rodya_ joined #git
22:38 tvw joined #git
22:39 CrashOverride joined #git
22:46 buffal0 joined #git
22:46 jaguarmagenta joined #git
22:47 hhee guys, can i set projectdesc in git config?
22:48 JanC_ joined #git
22:50 eragnarok joined #git
22:51 dirtyroshi joined #git
22:53 eragnarok I'm trying to merge branch a into branch b. I have files that are the same in each branch, where the only difference is the filenames. When I merge a into b, the filenames for a overwrite b, is there a way to stop this?
22:54 eragnarok these files are also in a directory, it would be good if I could prevent any file being renamed in that directory
22:57 Gsham joined #git
23:02 osse eragnarok: Trying git merge -X --no-renames
23:04 eragnarok do I go git merge a -X --no-renames? if I want to use the a branch?
23:04 osse eragnarok: The a usually goes at the end
23:05 Spec-Chum joined #git
23:05 eragnarok "fatal: Unknown option for merge-recursive: -X--no-renames"
23:05 eragnarok I used:  git merge -X --no-renames a
23:06 buzzLightBeer joined #git
23:07 osse Hmm
23:07 osse eragnarok: Trying git merge -s recursive -X --no-renames
23:08 osse Oh huh
23:08 eragnarok nah doesn't like it, same error
23:08 osse I mean - X no-renames
23:08 osse No -- in front
23:08 cdg joined #git
23:08 kadoban joined #git
23:09 eragnarok oh wow that worked
23:10 eragnarok I spent all friday trying to figure that out
23:10 eragnarok thank you very much :)
23:10 aapaaal joined #git
23:10 dreiss joined #git
23:14 osse eragnarok: There are several ways to control how the merge is resolved. It's all in man git-merge
23:14 gitinfo eragnarok: the git-merge manpage is available at http://jk.gs/git-merge.html
23:15 eragnarok yeah thanks, I just had a look at it. I also needed -s ours in this particular case
23:15 eragnarok can you have multiple strategies?
23:17 osse eragnarok: I don't think you actually need the -s. Recursive is the default strategy.
23:17 osse I think the problem was the misspelling of the thing after -X.
23:17 Siegfried joined #git
23:17 osse Not sure about multiple strategies,but I doubt it
23:18 eragnarok ah ok
23:20 dan2k3k4 joined #git
23:21 thiago only one per merge
23:26 buffal0 joined #git
23:27 mgrimes joined #git
23:33 mugurel joined #git
23:33 jnewt joined #git
23:34 floatingman joined #git
23:34 mugurel left #git
23:35 mugurel joined #git
23:35 justanotheruser joined #git
23:35 mugurel joined #git
23:36 mugurel Hello, I have a problem with pull request on a specific tag. The repo I want to make a pull request to has v2.2.0 tag(there's the issue I am solving) but the current one in v3. How can I make a pull request to a specific tag?
23:37 [cust] joined #git
23:39 dirtyroshi joined #git
23:40 floatingman joined #git
23:40 osse I think you can only make pull requests to branches
23:41 BigDawg joined #git
23:41 osse tags are etched in stone. submitting requests from them to change sounds weird
23:41 zivester joined #git
23:44 mischat joined #git
23:45 mischat joined #git
23:46 mischat joined #git
23:46 jimi_ joined #git
23:47 mischat joined #git
23:47 ToBeCloud joined #git
23:47 mischat joined #git
23:47 afuentes joined #git
23:48 Gsham joined #git
23:48 mischat joined #git
23:49 mugurel the thing is that my PR is for a ruby gem, and some tags are used for that version
23:49 floatingman joined #git
23:50 Kaisyu joined #git

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