Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-04

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

All times shown according to UTC.

Time Nick Message
00:00 EvilPenguin joined #git
00:00 tabakhase__ left #git
00:00 tabakhase joined #git
00:01 zg left #git
00:02 IWishIKnew joined #git
00:03 ffabi joined #git
00:06 Shentino joined #git
00:10 cd83x joined #git
00:10 jackburton joined #git
00:12 espindola joined #git
00:13 lindenle joined #git
00:14 gravitron_ left #git
00:18 gravitron joined #git
00:19 interne7y joined #git
00:20 cd83x joined #git
00:21 WaReZ joined #git
00:23 drodger joined #git
00:24 hahuang65 joined #git
00:27 nick123_ joined #git
00:28 siprbaum joined #git
00:29 ajf- joined #git
00:30 dreiss joined #git
00:31 Noldorin joined #git
00:35 denimsoft joined #git
00:38 devster31 can I add a single file from repository A into repository B keeping history and the remote upstream branch?
00:41 fscala joined #git
00:42 nhende joined #git
00:42 watabou joined #git
00:43 i7c No. Unless you only have this very file tracked in the history.
00:43 italoacasas joined #git
00:44 i7c You can push the history of one repository into another but it will come along with all files not just one.
00:44 r4z3r joined #git
00:47 italoacasas joined #git
00:48 devster31 I do have just this file, and I don't really care about the changes, I just want to be able to pull from upstream
00:50 i7c Just push it to any free branch name on the remote?
00:51 droidicus joined #git
00:52 Topic for #git is now Welcome to #git, the place for git help and hostage situations | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | I will be executing hostages until there are more https://madeitwor.se/git-jokes
00:52 _ikke_ was kicked by Eugene: You are the first victim
00:53 Eugene Do not take my demands lightly.
00:54 devster31 the problem with git jokes is that everyone has their own version
00:56 Fr4n joined #git
00:57 Shentino joined #git
00:58 rom1504 but I can force my version so it's okay
00:58 aardvark_ joined #git
00:58 milki you mean --force
01:03 devster31 i7c: I was looking for submodules and subtree, I need to read about them though
01:05 medeirosthiiago joined #git
01:05 i7c They're basically a way to keep a repo within a repo under some path.
01:07 CheckDavid joined #git
01:09 denimsoft joined #git
01:12 Gamecubic joined #git
01:14 ril joined #git
01:14 mizu_no_oto joined #git
01:16 Fr4n joined #git
01:19 hanthings_ joined #git
01:19 cd83x joined #git
01:20 interne7y joined #git
01:20 fstd_ joined #git
01:24 Sasazuka joined #git
01:25 snufft joined #git
01:31 pwnz0r joined #git
01:32 drodger joined #git
01:33 pks joined #git
01:35 ensyde joined #git
01:39 nandi_ge___ joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and hostage situations | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | I will be executing hostages until there are more https://madeitwor.se/git-jokes
01:48 cd83x joined #git
01:49 meLon joined #git
01:49 strayArch joined #git
01:49 Fr4n joined #git
01:52 aardvark__ joined #git
01:53 Goplat joined #git
01:55 fracting joined #git
01:58 sdothum joined #git
02:03 drbean joined #git
02:04 flopsec joined #git
02:04 illusionmedic joined #git
02:04 ril joined #git
02:07 nilsi joined #git
02:11 hubbub joined #git
02:11 Shentino joined #git
02:12 meLon joined #git
02:14 MattMaker joined #git
02:14 hubbub Hi #git, sorry if this is a silly question, but I've got some staged changes, where I renamed one file, and made a new file with the first file's old name.  Git thinks I copied the old file, then modified it.  How can I convince it that I did a rename/newfile and not a copy/modify?
02:16 hexagoxel joined #git
02:16 preaction git only knows that there's a new file and a deleted file. the "rename" heuristics are applied later
02:16 preaction "rename" isn't a special type of change, it's detected when needed
02:17 fracting joined #git
02:18 hubbub So when I type `git status` and it shows me a bunch of new, modified, renamed and deleted files, I don't have to worry about what it says happened to the file, just that the file is there?
02:18 ojacobson hubbub: git is, at heart, _purely_ snapshot-based
02:18 ojacobson all diffs -- structural diffs like renames, content diffs like patches, etc -- are inferred.
02:19 hubbub So basically don't worry, just commit?
02:19 ojacobson If it infers wrong, that's largely harmless; the only time it could matter is during a merge, and even then you can tweak the detection behaviour (or overrule it)
02:19 hubbub I suppose the state is more important than the history
02:20 hubbub Thanks for the replies, preaction, ojacobson
02:20 interne7y joined #git
02:22 d4rklit3 joined #git
02:22 chachasmooth joined #git
02:22 sargas joined #git
02:28 ome joined #git
02:29 hahuang65 joined #git
02:30 bq joined #git
02:32 Grievre joined #git
02:34 d4rklit3 joined #git
02:43 nnyk_ joined #git
02:45 drodger joined #git
02:46 d4rklit3 joined #git
02:46 alilashen joined #git
02:48 mischat joined #git
02:49 gigq joined #git
02:50 fahadash joined #git
02:58 dmj joined #git
02:58 lindenle_ joined #git
02:58 espindola joined #git
03:00 BSAlb joined #git
03:01 denimsoft joined #git
03:04 ochorocho__ joined #git
03:06 alilashen joined #git
03:07 slipperd joined #git
03:13 Limes__ joined #git
03:15 hahuang65 joined #git
03:19 lindenle joined #git
03:20 liuzhen joined #git
03:20 k3rn31 joined #git
03:21 interne7y joined #git
03:23 liuzhen joined #git
03:28 lindenle_ joined #git
03:30 dreiss joined #git
03:30 arescorpio joined #git
03:45 zmanfx joined #git
03:46 Mowgli joined #git
03:47 lindenle joined #git
03:48 mingramm_ joined #git
03:54 wspider left #git
03:56 k3rn31 joined #git
03:58 PaulCape_ joined #git
03:59 PaulCape_ joined #git
04:00 phaleth joined #git
04:03 Lyqyd joined #git
04:05 PaulCapestany joined #git
04:10 lindenle joined #git
04:13 denimsoft joined #git
04:16 lindenle joined #git
04:19 kugel joined #git
04:19 medeirosthiiago joined #git
04:21 aidalgol joined #git
04:24 hahuang65 joined #git
04:24 lindenle joined #git
04:24 kugel joined #git
04:26 Cabanossi joined #git
04:33 sword joined #git
04:35 josuebrunel joined #git
04:38 k3rn31 joined #git
04:38 lindenle joined #git
04:48 diegoaguilar joined #git
04:49 mablae joined #git
04:52 lindenle joined #git
04:52 eletuchy joined #git
04:58 gsingh joined #git
04:59 dmj joined #git
05:05 hahuang65 joined #git
05:05 diegoaguilar joined #git
05:05 aardvark__ joined #git
05:09 slipperd joined #git
05:13 jerematic joined #git
05:16 cd83x joined #git
05:17 astrofog joined #git
05:18 moei joined #git
05:18 bq joined #git
05:23 interne7y joined #git
05:26 nitin joined #git
05:29 zrr joined #git
05:30 fahadash joined #git
05:31 jaguarmagenta joined #git
05:32 netj joined #git
05:32 gigq joined #git
05:35 SwiftMatt joined #git
05:36 MattMaker joined #git
05:36 _ikke_ joined #git
05:38 muthu joined #git
05:42 eletuchy joined #git
05:44 Lyqyd joined #git
05:45 drodger joined #git
05:47 Sasazuka joined #git
05:47 zrr joined #git
05:49 eletuchy joined #git
05:50 radsy joined #git
05:50 hahuang65 joined #git
05:51 clemf joined #git
05:53 nettoweb joined #git
05:54 eletuchy joined #git
05:55 moei joined #git
05:56 nettoweb joined #git
05:57 mohabaks joined #git
05:57 NeverDie_ joined #git
06:01 fracting joined #git
06:03 diegoaguilar joined #git
06:04 Myrl-saki joined #git
06:06 Myrl-saki Good afternoon. There are 2 repos, one is one that I'm working on, and one is a general resource repo. If I want to include certain files from the resource repo, how do I properly give credits to the creator?
06:06 aardvark__ joined #git
06:06 david007 joined #git
06:06 Myrl-saki I think it's against our repo rules to put an author section over the file, and to some extent I agree with that.
06:07 Myrl-saki The only thing I can think of is to directly reference the file's source through comments on the file.
06:10 cd83x joined #git
06:14 cyan__ joined #git
06:14 arooni joined #git
06:14 t0by joined #git
06:15 nilsi joined #git
06:19 sargas joined #git
06:20 gigq joined #git
06:22 nidr0x joined #git
06:24 interne7y joined #git
06:26 blackwind_123 joined #git
06:26 dmj joined #git
06:29 [BNC]fhackdroid joined #git
06:32 hahuang65 joined #git
06:34 gsingh joined #git
06:37 sauvin joined #git
06:38 ciampix joined #git
06:41 nick123 joined #git
06:44 clemf joined #git
06:46 fhackdroid joined #git
06:56 blackwind_123 joined #git
06:59 orbitphreak joined #git
07:01 jerematic joined #git
07:04 cd83x joined #git
07:09 SwiftMatt joined #git
07:10 Literphor joined #git
07:11 toogley joined #git
07:12 elsevero joined #git
07:13 hahuang65 joined #git
07:17 col joined #git
07:18 david007 joined #git
07:18 aardvark__ joined #git
07:25 interne7y joined #git
07:25 narendraj9 joined #git
07:28 neanderslob joined #git
07:28 Psychiatrist joined #git
07:30 hooli joined #git
07:32 jaguarmagenta joined #git
07:33 Dazzyp joined #git
07:38 ribasushi joined #git
07:45 Junior joined #git
07:49 emPi joined #git
07:51 elastix joined #git
07:56 jost joined #git
07:59 cd83x joined #git
08:00 TomyLobo joined #git
08:01 sword joined #git
08:01 ochorocho__ joined #git
08:02 NeverDie joined #git
08:02 blackwind_123 joined #git
08:03 mehola joined #git
08:06 cdown joined #git
08:07 offlink left #git
08:07 d0nn1e joined #git
08:08 UbuntuDude joined #git
08:08 nvngpt31 joined #git
08:08 hahuang65 joined #git
08:10 ochorocho__ joined #git
08:11 gsingh joined #git
08:11 UbuntuDude I'm totally confused between origin and master locally and remotely! first of all what are they? are they fixed terms or interchangeble? I know for example git remote add (origin) (url) is some action we do to specify the remote repository that makes it a repo, but then I see git push origin master what is that?
08:12 UbuntuDude what is branches? are they forks from the original repository?
08:12 garethdaine joined #git
08:15 zadock joined #git
08:17 j416 UbuntuDude: "origin" and "master" are separate concepts. One is a remote, the other is a branch.
08:18 j416 (in a default setup)
08:18 j416 UbuntuDude: !book
08:18 gitinfo UbuntuDude: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
08:19 aardvark__ joined #git
08:20 zadock left #git
08:21 codebam joined #git
08:22 King_Hual joined #git
08:23 ahmedelgabri joined #git
08:23 aardvark__ joined #git
08:26 interne7y joined #git
08:31 PCatinean joined #git
08:33 Fijit joined #git
08:38 aardvark___ joined #git
08:41 t0by joined #git
08:41 evil-t0by joined #git
08:42 t0by joined #git
08:43 King_Hual joined #git
08:43 nilsi_ joined #git
08:44 robotroll joined #git
08:47 robotroll joined #git
08:48 jimmyeatworld joined #git
08:49 hahuang65 joined #git
08:53 cd83x joined #git
08:56 UbuntuDude j416: please correct me if I'm wrong, MASTER is the main branch or what they call a trunk for any repository, regardless the name or location of that repository. therefore master is keyword .. right?
08:56 emPi joined #git
08:57 UbuntuDude origin is a convention used to name the remote repo ... it can be replaced by any other name
08:58 elastix joined #git
09:01 mohabaks joined #git
09:02 saedelaere joined #git
09:02 jerematic joined #git
09:03 satifant joined #git
09:03 fscala joined #git
09:08 mischat joined #git
09:08 cbreak UbuntuDude: nope
09:09 Grievre Is there a way to override the username that gets associated with commits?
09:09 cbreak UbuntuDude: all of those names are user chosen
09:09 Grievre I can find ways to change the realname but not the username
09:09 cbreak the only name you can't chose is HEAD
09:09 cbreak Grievre: sure
09:09 cbreak git config user.name foobar
09:10 Grievre That's the realname
09:10 Grievre not the username
09:10 cbreak Grievre: nope
09:10 cbreak it's the user name
09:10 Grievre huh
09:10 cbreak git commits contain only two pieces of user info: user.name and user.email
09:10 cbreak nothing else
09:10 cbreak you can obviously configure both
09:11 cbreak there are also command line overrides
09:11 Grievre oh huh
09:11 slipperd joined #git
09:11 liuzhen joined #git
09:11 cbreak a commit stores both for both the author and the committer. Normally they are the same, but for some commits, the author and committer are different
09:12 nwkj86 joined #git
09:12 circ-user-dA86c joined #git
09:12 Grievre okay wait. Github is somehow associating my commits with my username despite my github account not having my full name, which is what my user.name is set to
09:13 Grievre and it doesn't associate /all/ of my commits with my username, only the ones that were committed in an environment where that was my username
09:14 cbreak github is irrelevant
09:14 circ-user-dA86c how do I stop the crappy reflog?
09:14 cbreak Grievre: if you want to see the truth, use git log
09:14 Grievre oh it's using the email address duh
09:14 Industrial joined #git
09:14 * Grievre headshake
09:14 Grievre why didn't I think of that
09:14 circ-user-dA86c I cannot use reflog!! My command prompt is captured by reflog!!
09:14 Industrial Hi! Is there a git command for pushing all branches, setting them to track if not already and also all tags?
09:14 cbreak Grievre: you want to fix that? You can with history rewriting by git filter-branch
09:14 settermjd joined #git
09:14 circ-user-dA86c How do I stop it?
09:14 cbreak circ-user-dA86c: you must be confused
09:15 circ-user-dA86c I am pissed off
09:15 circ-user-dA86c I see (END) in the command prompt. What is that crap?
09:15 cbreak Industrial: git push --all -u and git push --tags
09:15 Industrial oh, git push --set-upstream --tags --all
09:15 Industrial right
09:15 cbreak circ-user-dA86c: it means you reached the end, duh
09:15 Industrial ty XD
09:16 cbreak Industrial: I don't think you can combine tags with all
09:16 cbreak maybe you can nowadays
09:16 circ-user-dA86c I understand that I reaced the end!! How do I exit the end?
09:16 cbreak with q, as always, duh
09:16 Industrial cbreak: no, I'll use 2 commands :)
09:16 cbreak ctrl-c also works, as always
09:16 cbreak it's a normal page
09:17 Dyonisos joined #git
09:17 Industrial cbreak: I'm using the git-up ruby gem which does some cool stuff; fetch stash merge unstash, rewind on conflict so you can do it manually.
09:17 circ-user-dA86c Thanks, q helped
09:17 gsingh joined #git
09:17 Industrial cbreak: I've aliased 'u' to do a complete git pull then push flow xD
09:17 circ-user-dA86c No, it did not
09:18 fees joined #git
09:18 circ-user-dA86c It just looks like normal bash prompt has appeared but reflog (END) comes back as soon as I try to enter anything!
09:19 circ-user-dA86c Finally, it is gone. I had to enter q many times
09:27 interne7y joined #git
09:28 slipperd joined #git
09:29 yaewa joined #git
09:33 jaguarmagenta joined #git
09:34 Calrik joined #git
09:37 joki joined #git
09:40 hahuang65 joined #git
09:42 NeverDie joined #git
09:43 mmkumr joined #git
09:45 mmkumr How to create a remote repository using terminal?
09:46 jhass mmkumr: elaborate a bit, do you want to initialize a repository somewhere else? where? Or do you want to add an existing repository as a remote to your local repository?
09:46 furnate joined #git
09:47 mmkumr Want to initialize a new repository.
09:47 cd83x joined #git
09:47 jhass now the "where" part ;)
09:48 zeroed joined #git
09:49 acetakwas joined #git
09:50 settermjd joined #git
09:50 garethdaine joined #git
09:50 jhass mmkumr: so?
09:51 mmkumr jhass: I am creating a local repository in my terminal but when I am trying to push then it is showing error so that why I am going to github and creating one repository then I am creating in local is there any shortcut way to do this process.
09:51 jhass you could use https://github.com/github/hub
09:51 jhass git init; hub create
09:51 moei joined #git
09:52 mmkumr jhass: syntax for using this command hub create.
09:53 jhass is that a question?
09:55 mmkumr jhass: no I am comfused sorry but that command is used to in initiaizing the git working directory.
09:56 jhass it's two commands, ; is the same as a newline in shell
09:56 mmkumr jhass: hub create?
09:57 jhass yes
09:57 zeroed joined #git
09:57 zeroed joined #git
09:58 mmkumr jhass: what this whole command does
09:58 jhass did you take a look at the readme or help (hub help, hub help create) at all?
10:00 mmkumr jhass:ok I am checking.
10:01 Junior joined #git
10:07 star_prone joined #git
10:08 _ikke_ hub is specifically for github
10:10 mmkumr _ikke_: yes but now when I am trying to install it, it is showing error './script/build: line 47: go: command not found'.
10:11 jhass mmkumr: let me quote the readme "To install hub from source, you need to have a Go development environment"
10:11 Jackneill joined #git
10:12 UbuntuDude left #git
10:13 mmkumr jhass: ok seen that. Now download.
10:14 liuzhen joined #git
10:14 leeN joined #git
10:16 Rooxo joined #git
10:16 devster31 is there a "better" or easier option between submodule and subtree? as far as I can see submodule is a git native command and subtree isn't, but I can't move a file in a submodule, I need to edit the original repository, right?
10:19 _ikke_ It remains a separate repository
10:19 _ikke_ when you change anything, you need to commit and push it to the original reposiroy
10:20 circ-user-ZA8Cm joined #git
10:20 devster31 and this isn't true the subtree (git subtree), right?
10:21 _ikke_ subtree merge incorporates the history of another repository in the current repository, so they'll become one
10:21 davisonio joined #git
10:23 radsy joined #git
10:24 devster31 ok, thanks, I think I prefer the subtree this time
10:25 liuzhen joined #git
10:27 artemisart joined #git
10:27 ochorocho__ joined #git
10:27 interne7y joined #git
10:28 lindenle joined #git
10:30 hahuang65 joined #git
10:31 zeroed joined #git
10:32 Repox joined #git
10:36 ochorocho__ joined #git
10:40 pungi-man joined #git
10:41 cd83x joined #git
10:42 Lynxium joined #git
10:46 zeroed joined #git
10:48 nadim joined #git
10:52 spoonUltra joined #git
10:54 spoonUltra How do I checkout the repository in Github from the Terminal?
10:55 _ikke_ You have to clone it
10:55 _ikke_ You can find the clone url on github
10:56 spoonUltra I have a local clone
10:56 spoonUltra I removed a folder and pushed, but the folder still appears online.
10:56 spoonUltra I always run into trouble when I try to take away from the repo.
10:58 _ikke_ spoonUltra: What does git status say?
10:58 slipperd joined #git
10:58 avar joined #git
10:59 spoonUltra deleted
10:59 spoonUltra oh, I need git checkout instead of git rm?
11:00 spoonUltra Is working directory the one online, or the local clone?
11:00 mdw joined #git
11:02 Industrial left #git
11:02 spoonUltra _ikke_
11:03 artemisart joined #git
11:05 jerematic joined #git
11:05 jhass spoonUltra: local. You have to git commit the deletion, so git rm -r folder; git commit -m "remove folder"; git push
11:05 mohabaks joined #git
11:06 spoonUltra thanks
11:09 k3rn31 joined #git
11:11 pungi-man_ joined #git
11:11 liuzhen_ joined #git
11:16 hahuang65 joined #git
11:17 narendraj9 joined #git
11:19 njbair joined #git
11:20 acetakwas joined #git
11:21 toogley joined #git
11:23 |meta joined #git
11:23 k3rn31 joined #git
11:24 nadim joined #git
11:24 Sasazuka joined #git
11:26 sdothum joined #git
11:27 ochorocho__ joined #git
11:28 toogley joined #git
11:29 interne7y joined #git
11:31 zeroed_ joined #git
11:32 jaguarmagenta joined #git
11:32 zeroed_ joined #git
11:34 heinrich5991 joined #git
11:36 cd83x joined #git
11:38 kenansulayman joined #git
11:39 Infamous joined #git
11:40 boudiccas joined #git
11:41 shinnya joined #git
11:42 Ediz joined #git
11:43 ciroecn joined #git
11:44 netj joined #git
11:45 liuzhen joined #git
11:46 shinnya joined #git
11:49 phanimahesh joined #git
11:55 nilsi joined #git
11:57 thiago joined #git
11:57 hahuang65 joined #git
11:58 ams__ joined #git
11:58 toogley joined #git
12:08 grift joined #git
12:10 MattMaker joined #git
12:12 ncd|leeN joined #git
12:15 Gamecubic joined #git
12:15 mdw joined #git
12:16 kugel_ joined #git
12:16 kugel_ joined #git
12:17 watabou joined #git
12:20 przemoc joined #git
12:21 jost_ joined #git
12:23 nidr0x joined #git
12:24 piling joined #git
12:29 interne7y joined #git
12:30 lindenle joined #git
12:30 cd83x joined #git
12:30 Slown_ joined #git
12:31 Slown_ Hello guys
12:31 gitinfo Slown_: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
12:31 Slown_ I need your assistance
12:31 Slown_ I have some commits
12:31 Slown_ and I want to erase the one before the last
12:31 Slown_ and just keep the latest version
12:31 Slown_ is it possible ?
12:31 Slown_ because git reset HEAD^^
12:31 elastix joined #git
12:32 Slown_ doesn't seem appropriate
12:32 Slown_ I'm waiting for answers
12:36 grift joined #git
12:37 satifant look at git rebase -i
12:42 holodoc joined #git
12:42 zivester joined #git
12:42 mingrammer_ Hi
12:42 gitinfo mingrammer_: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
12:43 hahuang65 joined #git
12:43 ming_ joined #git
12:44 mingramm_ joined #git
12:47 mingramm_ joined #git
12:54 tjone270 joined #git
12:58 przemoc joined #git
13:00 ocbtec joined #git
13:02 zeroed joined #git
13:02 holodoc joined #git
13:05 star_prone joined #git
13:05 t0by joined #git
13:07 jerematic joined #git
13:08 mdw joined #git
13:09 davisonio joined #git
13:09 raijin joined #git
13:09 madewokherd joined #git
13:11 k3rn31 joined #git
13:13 kutsuya joined #git
13:16 Bucciarati joined #git
13:16 fscala joined #git
13:17 happy-dude joined #git
13:24 cd83x joined #git
13:24 hahuang65 joined #git
13:25 jraccoon joined #git
13:28 mdw joined #git
13:28 Literphor joined #git
13:30 interne7y joined #git
13:35 a3Dman joined #git
13:36 davisonio joined #git
13:36 quenode joined #git
13:38 moobee joined #git
13:43 ochorocho__ joined #git
13:47 jaguarmagenta joined #git
13:48 slipperd joined #git
13:52 kenifanying joined #git
13:54 jfc joined #git
13:54 kenifanying hi all, it's seems that git for windows will force change all filenames to utf-8 encoding, how can i disable this behavior?
13:56 Literphor joined #git
14:00 grawity why would you
14:00 grawity I mean, aren't they in utf-8 in the first place?
14:00 grawity commit messages have an 'encoding' header for some weird situations, but...
14:01 grawity in Windows itself, all filenames are always Unicode
14:01 bremner utf8 or ucs16, or ...?
14:02 bremner did windows give up on the widechar thing?
14:02 grawity in memory, UTF-16 (I *think* recent versions have finally upgraded from UCS-2)
14:02 kenifanying I have some code using full gbk encoding, include the filename, and i can't change that
14:02 grawity on disk as well, both NTFS and even FAT
14:02 grawity you might have more luck with Cygwin-based Git, but...
14:03 paul424 joined #git
14:04 kenifanying Yes, I use cygwin based git before, and if I set LANG to zh_CN.GBK,  it work as expected.
14:04 mohabaks joined #git
14:04 Eyaiy joined #git
14:05 grawity Cygwin tries harder to pretend to be linux, so it has locale support and all... I guess it magically converts filenames to the current locale when the program asks for them
14:05 raijin joined #git
14:06 hahuang65 joined #git
14:07 kenifanying but git for windows always complain my repo have untracked file even if I set locale to zh_CN.GBK too.
14:07 SwiftMatt joined #git
14:11 kenifanying grawity, it's strange msys2 pretend to be linux too :)
14:11 cd83x joined #git
14:11 GT joined #git
14:12 espindola joined #git
14:15 howdoi joined #git
14:16 slipperd joined #git
14:19 watabou joined #git
14:19 hahuang65 joined #git
14:20 Literphor joined #git
14:21 jost__ joined #git
14:26 compeman joined #git
14:29 MattMaker joined #git
14:31 interne7y joined #git
14:32 espindola joined #git
14:34 SwiftMatt joined #git
14:36 ocbtec joined #git
14:36 BrianBlaze420 joined #git
14:41 xorox90 joined #git
14:43 cyan__ joined #git
14:45 pungi-man__ joined #git
14:46 ruskie joined #git
14:49 unbalancedparen joined #git
14:52 yqt joined #git
14:56 elementalest joined #git
14:56 King_Hual joined #git
14:57 durham joined #git
14:57 star_prone joined #git
14:58 fahadash joined #git
14:59 BrianBlaze420 joined #git
15:00 durham joined #git
15:03 raininja joined #git
15:04 eletuchy joined #git
15:13 segment-fault joined #git
15:16 espindola joined #git
15:17 BrianBlaze420 joined #git
15:23 zerox2a joined #git
15:25 Goplat joined #git
15:25 treehug88 joined #git
15:26 jfc^2 joined #git
15:27 Repox joined #git
15:29 uhmgawa joined #git
15:32 sargas joined #git
15:32 interne7y joined #git
15:33 dmj joined #git
15:39 BrianBla- joined #git
15:40 BrianBla- joined #git
15:43 BombStrike joined #git
15:46 ajf- joined #git
15:47 col joined #git
15:48 jaguarmagenta joined #git
15:48 elastix joined #git
15:49 jost joined #git
15:52 bollullera joined #git
15:53 GandalfTheWizar1 joined #git
15:55 marchelzo joined #git
15:55 marchelzo hello
15:55 tlaxkit joined #git
15:55 nick123_ joined #git
15:56 marchelzo when is it useful to move branches around? (git branch -f)
15:59 dreiss joined #git
16:00 jhass in the case that you want to do it?
16:00 * jhass doesn't quite get the motivation of that question
16:00 eletuchy joined #git
16:02 bremner e.g. when the boss tells you branch-names make not refer to customers with obscenities
16:03 thiago joined #git
16:03 marchelzo jhass: but why would you want to do it?
16:04 nick123 joined #git
16:04 jhass because I have a reason in that moment
16:04 marchelzo jhass: what might that reason be?
16:05 bremner it's like a reset without checking it out first, right?
16:05 jhass marchelzo: let's flip the question, maybe we can get to your motivation that way: What arguments are there for never allowing a branch to be renamed or reset?
16:05 canton7 maybe I want to update master to point to origin/master, without first checking it out?
16:06 bremner so, it won't help at all with the obscene branch name problem, sorry for that misinformation.
16:06 BSAlb marchelzo, renaming
16:06 canton7 it's the same argument as "why would I never want to reset a branch in order to change which commit it points to", except that here you don't have the branch checked out
16:06 BSAlb for instance
16:06 canton7 BSAlb, no, branch -f isn't used for renmaing. that's branch -r...
16:06 BSAlb canton7, sorry then, I think I use branch -m
16:06 jhass -m
16:06 canton7 oops, -m even
16:06 BSAlb yeah
16:07 liquidjamm joined #git
16:07 BSAlb I just saw that he said move
16:07 BSAlb not the underlying command. my bad
16:07 * jhass gets the feeling marchelzo is an elaborate troll
16:07 marchelzo really? i've asked a simple question. i'm just trying to learn git. how could you possibly interpret this as trolling?
16:08 canton7 I think that's too harsh - understanding why you might use a command is useful: it might tell you there's a way to use git that you hadn't thought about
16:08 marchelzo exactly
16:08 jhass marchelzo: asking it vague enough so the channel gets into an argument ;)
16:08 marchelzo canton7: i can't think of why you would want to make the current branch point to origin/master instead of just checking out origin/master
16:08 canton7 huh? that's not the kind of thing which gets people arguing
16:09 osse marchelzo: -m is used to rename
16:09 mizu_no_oto joined #git
16:09 jerematic joined #git
16:09 canton7 marchelzo, you can't checkout origin/master
16:09 marchelzo oh, right
16:10 marchelzo so what happens if you are on branch foo and you do 'git branch -f foo origin/master'? is that invalid?
16:11 osse marchelzo: not sure. I think Git will refuse since it's checked out
16:11 osse it definitely works if you've checked out bar instead
16:11 marchelzo oh. so what does it mean to make a branch point to origin/master?
16:12 espindola joined #git
16:13 marchelzo if i'm on branch bar, and i do 'git branch -f foo origin/master' and then 'git checkout foo', what happens?
16:13 canton7 marchelzo, you might want to read !book
16:13 gitinfo marchelzo: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
16:13 osse marchelzo: it is equivalent to deleting it and creating a branch with the same name
16:13 osse marchelzo: like if you created it in the wrong place to begin with
16:13 marchelzo ok that makes perfect sense
16:13 marchelzo so there is nothing deep about git branch -f
16:14 osse an inch or two. nothing more
16:14 marchelzo canton7: i'm currently following this little interactive guide to branching: http://learngitbranching.js.org/
16:15 osse marchelzo: here's one clever thing i use it for though: if I see that master is trailing behind origin/master and I want to update it, then normally I would have to git checkout master; git merge origin/master.  But this will touch a lot of files triggering a big rebuild. Ain't nobody got time for that!  git branch -f master origin/master and BOOM!
16:16 marchelzo ok. why would you care if master is lagging behind origin/master if you're working on some other branch?
16:16 marchelzo can't you wait until you need to do something on master before bothering to bring it back up to date?
16:17 osse marchelzo: I don't care *that* much. It just makes the log look nicer imho.  If I didn't know of this trick I would bother doing it (yet)
16:18 marchelzo ah, ok
16:18 Lulzon joined #git
16:18 marchelzo thank you all :)
16:19 mohabaks joined #git
16:19 steven_a_s joined #git
16:19 Lulzon dumb question - if i want to do a "complete rewrite" of an app in a branch, what should i do? just "git rm -rf *" in a new branch and start there?
16:19 canton7 new branch, 'git rm -rf .'
16:19 Lulzon or i could just start a whole new repo
16:20 Lulzon cool, figured as much, ty canton7
16:20 jhass Lulzon: you could also consider to start a new commit history entirely, it would sort of be a second repo living in the same
16:20 canton7 (git checkout --orphan)
16:21 Lulzon jhass, ah, didn't know that was possible, would make sense
16:24 _0xbadc0de joined #git
16:27 tomboy64 joined #git
16:27 Lulzon exactly what i was looking for ;)
16:29 tomboy64 joined #git
16:31 charolastra____ joined #git
16:32 tomboy64 joined #git
16:33 interne7y joined #git
16:34 robotroll joined #git
16:37 italoacasas joined #git
16:45 artemisart joined #git
16:46 mizu_no_oto joined #git
16:49 espindola joined #git
16:50 BrunoSaboia joined #git
16:57 dreiss joined #git
17:01 artemisart joined #git
17:02 nezZario I don' get it .. for the name/path of the repository ... is having two slashes / nesting more than 1-directory deep considered terrible practice or something ?   a couple pieces of git software seem to be chopping off all/leading/except/last-two-here/ when hosting git repos
17:03 Fr4n joined #git
17:03 seitensei joined #git
17:04 osse nezZario: you can have as many as you like
17:04 osse as far as git is concerned I mean
17:04 devster31 any config options which can make it easier to compare plain text files? I usually try to keep the length of a line inside 120-150 chars, but if I make some corrections sometimes I need to add a new one and the diff is much bigger than the edited text
17:05 osse nezZario: what hosting software do is up to them. person/project.git  or  organisation/project.git  is very common
17:05 osse devster31: try git diff --word-diff
17:05 devster31 that's the one, can I make it permanent? for md files for example?
17:06 acetakwas joined #git
17:06 osse devster31: using .gitattributes you can override how git produces a diff. So you can override it with something that essentially runs git diff --word-diff
17:07 italoacasas joined #git
17:07 osse aand you need a snippet in .gitconfig :/
17:08 devster31 osse: thank you, neat trick
17:09 Sound_ joined #git
17:09 jbitdrop joined #git
17:10 bollullera left #git
17:15 PCatinean joined #git
17:17 sargas joined #git
17:17 osse devster31: try this:
17:17 osse echo '*.md diff=omglol' >.git/info/attributes
17:17 osse git config --global diff.omglol.command 'git diff --word-diff $2 $5 && :'
17:18 osse I get 'fatal: external diff died' for some reason, but it does actually work
17:19 nettoweb joined #git
17:20 devster31 I suppose I can change omglol
17:21 devster31 what's the last part for? $2 $5 && :
17:21 SJr joined #git
17:21 osse no, omglol needs to stay. that's the special ingredient
17:22 osse the command is invoked as a shell command, with seven args appended. we want $2 and $5 and ignore the rest
17:22 osse it is interpreting the exit status of diff or something. this works:
17:22 osse git config --global diff.omglol.command 'git diff --word-diff "$2" "$5"; :'
17:23 osse I also quoted the variables to be proper
17:23 osse devster31: see the GIT_EXTERNAL_DIFF section in man git
17:23 gitinfo devster31: the git manpage is available at http://jk.gs/git.html
17:25 devster31 yep, it's working
17:25 osse devster31: use .gitattributes if you want it as part of the repo itself so it carries around
17:26 osse except the config part because that's not possibru
17:26 devster31 yes, I did, you said in the previous message .gitattributes
17:28 osse no that was the first one
17:28 osse later I said .git/info/attributes :P
17:28 Fr4n joined #git
17:28 fscala joined #git
17:29 devster31 oh, didn't notice, I rewrote the command instead of copypasting
17:30 osse okt hen
17:30 osse use .git/info/attributes if you don't want it as part of the repo itself so it doesn't carry around :p
17:33 watabou joined #git
17:34 dreiss joined #git
17:34 interne7y joined #git
17:34 mdw joined #git
17:34 Ahmed-90 joined #git
17:35 Ahmed90 joined #git
17:35 McNozes joined #git
17:36 seitensei joined #git
17:42 medeirosthiiago joined #git
17:42 watabou joined #git
17:44 oded_ joined #git
17:44 rahtgaz joined #git
17:46 mizu_no_oto joined #git
17:46 acetakwas joined #git
17:47 k3rn31 joined #git
17:49 f3r70rr35f joined #git
17:49 eletuchy joined #git
17:54 oded_ joined #git
17:55 oded_ joined #git
17:56 fstd joined #git
17:59 ochorocho__ joined #git
17:59 CheckDavid joined #git
18:01 WayToDoor joined #git
18:03 Literphor joined #git
18:06 axiom_1 joined #git
18:06 Fijit joined #git
18:07 fees joined #git
18:08 nezZario osse: cool thanks, .. it's just this gitlist (php frontend) software, then.
18:10 eletuchy joined #git
18:10 nettoweb joined #git
18:10 jerematic joined #git
18:11 CEnnis91 joined #git
18:12 justanot1eruser joined #git
18:13 WayToDoor joined #git
18:13 SwiftMatt joined #git
18:17 jaguarmagenta joined #git
18:18 Repox joined #git
18:21 Literphor joined #git
18:22 glebihan joined #git
18:23 Lynxium joined #git
18:24 NeverDie joined #git
18:26 WayToDoor joined #git
18:26 dsfreak93 joined #git
18:26 johnmilton joined #git
18:27 toogley joined #git
18:27 jbitdrop joined #git
18:29 acetakwas joined #git
18:30 toogley joined #git
18:31 eletuchy joined #git
18:33 lindenle joined #git
18:35 SteffanW joined #git
18:35 multi_io joined #git
18:35 interne7y joined #git
18:38 Literphor joined #git
18:38 Rodya_ joined #git
18:40 toogley joined #git
18:41 Corneliu joined #git
18:47 phanimahesh1 joined #git
18:48 phanimahesh1 left #git
18:48 mmlb joined #git
18:50 durham joined #git
18:50 Literphor joined #git
18:50 phanimahesh1 joined #git
18:51 phanimahesh1 left #git
18:51 |meta joined #git
18:54 nezZario so hey guys.. does this sound sane? .. i want to provide hosting env. to the devs underneath me (especially the 2 guys who can barely use git) .. i was going to setup all 5-6 of us copies of each relevant repo hosted on a server (same server 'origin' repos is sitting on) .. and then for each repo have a staging repo that anybody can push to so we can merge
18:54 nezZario all of our changes & do QA there
18:55 cd83x joined #git
18:55 j416 nezZario: why not just have one remote repo?
18:55 nezZario (sorry about the wrap^) .. but something just seems off.. because for e.x. right now I just have my own local copies of the repos so I can commit/merge/rebase etc locally from cli.. and if I setup the hosting remotely then that'll be another copy of the repo...
18:55 nnyk_ joined #git
18:57 espindola joined #git
18:57 nezZario j416: well that's what seems off.  the only thing that is slightly 'special' about the situation is 2 of the guys will not/would not be able to run/maintain/etc the local testing database/webserver/etc on their own PCs ..
18:58 j416 I don't understand the problem.
18:58 j416 one shared remote, that everyone clones.
18:58 j416 done
18:59 hahuang65 joined #git
19:00 nezZario j416: right, and that's what I'm going to do, .. basically ... but in addition basically i'm going to act like a hosting provider for a couple of the guys, too.
19:00 nezZario so yeah that actually makes sense now.. it's a normal single/shared remote + just a hosting setup, I guess
19:01 paul424 joined #git
19:09 Chunk2 joined #git
19:09 ril joined #git
19:10 mdw joined #git
19:11 thiago joined #git
19:13 Lunatrius` joined #git
19:13 arooni joined #git
19:14 toogley joined #git
19:15 cdg joined #git
19:16 toogley joined #git
19:17 nitin joined #git
19:17 Kicer86 joined #git
19:18 Literphor joined #git
19:19 johnmilton joined #git
19:20 toogley joined #git
19:20 mizu_no_oto joined #git
19:21 arooni joined #git
19:22 toogley joined #git
19:23 trobotham joined #git
19:28 souther joined #git
19:28 doppo joined #git
19:30 gsingh joined #git
19:30 arooni joined #git
19:30 toogley joined #git
19:31 nnyk_ joined #git
19:35 toogley joined #git
19:35 dfr33zy joined #git
19:36 interne7y joined #git
19:40 star_prone joined #git
19:43 irco joined #git
19:44 boombatower joined #git
19:44 ciampix joined #git
19:45 denimsoft joined #git
19:45 eletuchy joined #git
19:50 gigq joined #git
19:53 denimsoft joined #git
19:54 sargas joined #git
19:54 mdw_ joined #git
19:54 ajf- joined #git
19:55 yqt joined #git
19:58 Rodya_ joined #git
20:00 watabou joined #git
20:01 ToBeCloud joined #git
20:06 eletuchy joined #git
20:07 hahuang65 joined #git
20:10 justanotheruser joined #git
20:12 jerematic joined #git
20:13 zerox2a joined #git
20:14 myndzi left #git
20:16 mohabaks joined #git
20:18 nilg joined #git
20:18 clemf joined #git
20:25 xz0r joined #git
20:27 xz0r Hi, By mistake I committed a file along with others in my last commit, but I want that file to be in a separate commit, now how do I do that?
20:27 eletuchy joined #git
20:28 j416 xz0r: git reset HEAD^ # then redo the commit
20:28 j416 xz0r: you can git reset --soft HEAD^ # to avoid having to stage all files again, then just git reset -- thatfile # to remove only that
20:29 sword joined #git
20:29 xz0r j416: Thanks
20:30 j416 welcome
20:31 sargas joined #git
20:31 xz0r j416: What if I already pushed the code? I am the only one working with this repository.
20:31 Eugene Then you'll need to !force your next push
20:31 gitinfo [!force_push] If you need to overwrite the history of a remote git repository (very bad idea, see !rewrite), you can do so with `git push --force-with-lease`. Note the remote server may reject this. See man git-config and search for receive.denyNonFastForwards. Best practice is for upstream servers to denyNonFastForwards.
20:33 thiago joined #git
20:33 _ikke_ Eugene: You've missed me
20:33 _ikke_ was kicked by Eugene: No I didn't
20:34 _ikke_ joined #git
20:36 xz0r Thank Eugene
20:36 j416 thank you Eugene
20:36 interne7y joined #git
20:40 ojdo joined #git
20:42 domgetter joined #git
20:42 dietr1ch joined #git
20:42 john__ joined #git
20:43 ceaucari joined #git
20:43 jaguarmagenta joined #git
20:45 jaguarma_ joined #git
20:46 tomog999_ joined #git
20:49 hahuang65 joined #git
20:51 Rodya_ joined #git
20:53 Padawan joined #git
20:54 t-mart joined #git
20:57 nilg joined #git
21:02 circ-user-8Ebll joined #git
21:03 eletuchy joined #git
21:06 jaguarmagenta joined #git
21:07 newbsie joined #git
21:08 newbsie How do I get git to update refresh the "git status"? Git have discovered some new files that I deleted before committing and now list them in two places, as a new file, and deleted file.
21:13 zarel joined #git
21:13 jaguarma_ joined #git
21:16 drupald joined #git
21:17 rgrinberg joined #git
21:22 watabou joined #git
21:23 piling_ joined #git
21:23 anberg joined #git
21:25 cdown joined #git
21:29 jaguarmagenta joined #git
21:30 hahuang65 joined #git
21:31 nhawdge joined #git
21:32 j416 newbsie: that is correct.
21:33 j416 newbsie: !book and learn about the index
21:33 gitinfo newbsie: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
21:33 j416 newbsie: short answer: git reset
21:33 j416 newbsie: (as 'git status' also tells you)
21:34 nhawdge Hi all, I'm trying to setup a personal/3 user git server on an Ubuntu server and I'm having a tough time following the git-scm page on setting it up for HTTP. Is there a way I can verify my daemon started properly or see what URL I should enter to allow git remote add <url> to work?
21:36 jaguarma_ joined #git
21:37 HedgeMage nhawdge: check out gitolite...it's way more secure than the way you are trying to do it and MUCH easier to set up.  Only drawback is that it is text-mode and doesn't have a web gui, but honestly it's easier to use anyhow (as it's even administered via git!)
21:37 interne7y joined #git
21:39 Literphor joined #git
21:39 nhawdge HedgeMage:  Oh thanks a bunch! I'm installing it now
21:39 marchelzo joined #git
21:41 nhawdge HedgeMage: I hate to be a bother, but any chance you can point me to where I can locate my SSH key for the admin setup?
21:41 fscala joined #git
21:43 robotroll joined #git
21:44 _0xbadc0de joined #git
21:47 jon-mac joined #git
21:49 bittin joined #git
21:49 HedgeMage nhawdge: So if I'm setting up gitolite to run as the 'git' user and keep everything in '/home/git', I just stick it temporarily in /home/git/mykey.pub and run the gitolite setup command specifying that key.
21:50 HedgeMage nhawdge: That's one of the best things about gitolite: you can run it as its own user, isolating it from a bunch of stuff it should be isolated from with very little effort. :)
21:52 nhawdge That is pretty nice! so I installed gitolite3 from apt-get and added the user, but I don't seem to have any keys in my ./ssh/ folder
21:54 holodoc joined #git
21:56 jaguarmagenta joined #git
21:56 sdothum joined #git
21:57 eletuchy joined #git
22:00 nhawdge HedgeMage: Bah I feel silly. I haven't run ssh-keygen since my days as a youth.
22:01 garethdaine joined #git
22:02 alex1a joined #git
22:03 HedgeMage nhawdge: it has an interactive mode that's pretty helpful, just remember to specify the absolute path of where you want the key to go, usually ~/.ssh/keyname
22:05 nhawdge Yes, that did work very well! now I'm just figuring out how to setup my repos. I'm very new to Git. I've never "needed" it before. I spent the last day reading everything I can on that git-scm page
22:06 HedgeMage gitolite.com has excellent docs
22:07 nhawdge HedgeMage: I agree, it's a good read so far. Thank you for the help!
22:08 HedgeMage You are welcome!
22:11 gsingh joined #git
22:12 Padawan joined #git
22:17 mischat joined #git
22:17 Fr4n joined #git
22:18 leeN joined #git
22:24 arooni joined #git
22:30 diegoaguilar joined #git
22:31 ynanm joined #git
22:33 arooni joined #git
22:36 LaptopBrain joined #git
22:36 mischat joined #git
22:38 interne7y joined #git
22:39 MattMaker joined #git
22:39 zarel joined #git
22:39 ozzloy i have been using gitolite for years, and i approve of this message
22:47 mischat joined #git
22:51 Tyrannosaur joined #git
22:51 eletuchy joined #git
22:54 Literphor joined #git
22:57 diogenese joined #git
22:58 Literphor joined #git
22:59 fabregas88 joined #git
23:04 Tyrannosaur left #git
23:04 CEnnis91 joined #git
23:04 fabregas88 joined #git
23:05 MattMaker joined #git
23:07 kus joined #git
23:08 fabregas88 joined #git
23:11 ril joined #git
23:11 Noldorin joined #git
23:14 jerematic joined #git
23:19 ffabi joined #git
23:21 ybden joined #git
23:22 a3Dman joined #git
23:23 mablae_ joined #git
23:24 mozzarella joined #git
23:32 elsevero joined #git
23:37 thiago_ joined #git
23:39 interne7y joined #git
23:40 mattfoo joined #git
23:43 Rodya_ joined #git
23:45 eletuchy joined #git
23:48 MattMaker joined #git
23:48 dietr1ch- joined #git
23:51 dietr1ch joined #git
23:51 trobotham joined #git

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